[libgda/LIBGDA_4.0] Don't check for GnomeVFS if Gio has been found, bug #585108

[Vivien Malerba <vivien src gnome org>]

commit 58e7a5c551570be2cc97e380e2d05a23135eb045
Author: Vivien Malerba <malerba gnome-db org>
Date:   Mon Jun 8 20:16:17 2009 +0200

    Don't check for GnomeVFS if Gio has been found, bug #585108
---
 ChangeLog    |    2 ++
 configure.in |   14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 44d4c3f..7c4760e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
 	* libgda-report/RML/trml2pdf/Makefile.am: applied patch
 	for bug #579458 (Gilles Dartiguelongue) for more standard install
 	methods
+	* configure.in: don't check for GnomeVFS if Gio has been found,
+	fixed bug #585108
 
 2009-06-05  Vivien Malerba <malerba gnome-db org>
 
diff --git a/configure.in b/configure.in
index e1d1b89..c81d549 100644
--- a/configure.in
+++ b/configure.in
@@ -205,13 +205,6 @@ dnl Checks for GIO or Gnome VFS, use GIO preferably
 dnl if GIO is not found, then see if FAM or gamin are found
 dnl *******************************************************
 
-GNOMEVFS_MODULES="gnome-vfs-2.0 >= 2.20"
-PKG_CHECK_MODULES(GNOMEVFS, $GNOMEVFS_MODULES, have_gnomevfs=yes, have_gnomevfs=no)
-if test x"$have_gnomevfs" = "xyes"
-then
-        GNOMEVFS_CFLAGS="$GNOMEVFS_CFLAGS -DHAVE_GNOMEVFS"
-fi
-
 GIO_MODULES="gio-2.0 >= 2.16"
 PKG_CHECK_MODULES(GIO, $GIO_MODULES, have_gio=yes, have_gio=no)
 AM_CONDITIONAL(HAVE_GIO, test x"$have_gio" = "xyes")
@@ -222,6 +215,13 @@ then
 	GNOMEVFS_LIBS=""
 	have_gnomevfs=no
 else
+	GNOMEVFS_MODULES="gnome-vfs-2.0 >= 2.20"
+	PKG_CHECK_MODULES(GNOMEVFS, $GNOMEVFS_MODULES, have_gnomevfs=yes, have_gnomevfs=no)
+	if test x"$have_gnomevfs" = "xyes"
+	then
+	        GNOMEVFS_CFLAGS="$GNOMEVFS_CFLAGS -DHAVE_GNOMEVFS"
+	fi
+
 	FAM_LIBS=
 	FAM_CFLAGS=
 	FAM_MISSING_WARNING="Libgda depends on FAM to provide notification when configuration files are changed, without FAM support any application using Libgda will have to be restarted when configuration files are changed to take into account those changes"