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

[Vivien Malerba <vivien src gnome org>]

commit 87a01d0c3bdb58f94956ec5dbdc83e85d7482c78
Author: Vivien Malerba <malerba gnome-db org>
Date:   Mon Jun 8 20:31:22 2009 +0200

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

diff --git a/ChangeLog b/ChangeLog
index 721a2ce..893a0d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-06-08  Vivien Malerba <malerba gnome-db org>
+
+	* libgda-report/RML/trml2html/Makefile.am:
+	* 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>
 
 	* tools/gda-sql.c: overwrite any existing definition of a saved statement with
diff --git a/configure.in b/configure.in
index 0d3a2a9..23746bb 100644
--- a/configure.in
+++ b/configure.in
@@ -207,13 +207,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")
@@ -224,6 +217,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"