gimp r26300 - in trunk: . plug-ins/uri

[neo svn gnome org]

Author: neo
Date: Thu Jul 24 14:47:48 2008
New Revision: 26300
URL: http://svn.gnome.org/viewvc/gimp?rev=26300&view=rev

Log:
2008-07-24  Sven Neumann  <sven gimp org>

	* configure.in: minor cleanup of the checks for the URI plug-in.

	* plug-ins/uri/Makefile.am: changed accordingly.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/plug-ins/uri/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Jul 24 14:47:48 2008
@@ -1319,8 +1319,6 @@
 AM_CONDITIONAL(HAVE_GVFS, test "x$with_gvfs" != xno)
 
 
-gnome_vfs_modules="gnome-vfs-2.0 >= gnome_vfs_required_version"
-
 AC_ARG_WITH(gnomevfs, [  --without-gnomevfs      build without gnomevfs support])
 
 have_gnomeui="no (disabled)"
@@ -1329,6 +1327,8 @@
 
 if test "x$with_gnomevfs" != xno; then
 
+gnome_vfs_modules="gnome-vfs-2.0 >= gnome_vfs_required_version"
+
 if $PKG_CONFIG --atleast-version=gnomeui_required_version libgnomeui-2.0; then
   have_gnomeui=yes
   gnome_vfs_modules="$gnome_vfs_modules libgnomeui-2.0"
@@ -1343,7 +1343,7 @@
   have_gnome_keyring="no (gnome-keyring-1 not found)"
 fi
 
-PKG_CHECK_MODULES(URI_GNOME_VFS, $gnome_vfs_modules,
+PKG_CHECK_MODULES(GNOME_VFS, $gnome_vfs_modules,
   have_gnomevfs=yes,
   have_gnomevfs="no (gnome-vfs-2.0 not found)")
 
@@ -1352,15 +1352,13 @@
 AM_CONDITIONAL(HAVE_GNOMEVFS, test "x$have_gnomevfs" = xyes)
 
 
-libcurl_modules="libcurl >= libcurl_required_version"
-
 AC_ARG_WITH(libcurl,  [  --without-libcurl       build without curl support])
 
 have_libcurl="no (disabled)"
 
 if test "x$with_libcurl" != xno; then
 
-PKG_CHECK_MODULES(URI_LIBCURL, $libcurl_modules,
+PKG_CHECK_MODULES(CURL, libcurl >= libcurl_required_version,
   have_libcurl=yes,
   have_libcurl="no (libcurl not found)")
 

Modified: trunk/plug-ins/uri/Makefile.am
==============================================================================
--- trunk/plug-ins/uri/Makefile.am	(original)
+++ trunk/plug-ins/uri/Makefile.am	Thu Jul 24 14:47:48 2008
@@ -25,13 +25,13 @@
 else
 if HAVE_GNOMEVFS
 backend_sources = uri-backend-gnomevfs.c
-backend_cflags = $(URI_GNOME_VFS_CFLAGS)
-backend_libs = $(URI_GNOME_VFS_LIBS)
+backend_cflags = $(GNOME_VFS_CFLAGS)
+backend_libs = $(GNOME_VFS_LIBS)
 else
 if HAVE_LIBCURL
 backend_sources = uri-backend-libcurl.c
-backend_cflags = $(URI_LIBCURL_CFLAGS)
-backend_libs = $(URI_LIBCURL_LIBS)
+backend_cflags = $(CURL_CFLAGS)
+backend_libs = $(CURL_LIBS)
 else
 backend_sources = uri-backend-wget.c
 backend_cflags =