Depend on gnome-vfs 0.3

	* configure.in, README: Depend on gnome-vfs 0.3

svn path=/trunk/; revision=4776

3 files changed, 23 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index 5cb88bbca8..b6c8ea98f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-12  Dan Winship  <danw@helixcode.com>
+
+	* configure.in, README: Depend on gnome-vfs 0.3
+
 2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
 
 	* widgets/e-text/.cvsignore, widgets/e-text/Makefile.am,
diff --git a/README b/README
index 12004c3c77..5ab1773bef 100644
--- a/README
+++ b/README
@@ -89,8 +89,9 @@ names. Most (but not all) of them are also available as tarballs on
 ftp.gnome.org. The (*)ed packages are available in Helix GNOME.
 (http://www.helixcode.com/desktop/)
 
- - gnome-xml - 1.8.7 (If you get this from GNOME CVS, use the tag
-   "LIB_XML_1_X".) (*)
+ - gnome-xml - 1.8.7 or later in the 1.0 series, but not from the 2.0
+   series (If you get this from GNOME CVS, use the tag "LIB_XML_1_X".)
+   (*)
 
  - gnome-print - 0.20 (*). The gnome-print CVS HEAD will NOT work.
 
@@ -103,13 +104,11 @@ ftp.gnome.org. The (*)ed packages are available in Helix GNOME.
    *** You should use the flag "--disable-more-warnings" when
    *** configuring oaf, or it may fail to build.
 
- - gnome-vfs - from CVS (0.2 mostly works, but has a bug where it
-   doesn't install one of its header files
-   [libgnomevfs/gnome-vfs-file-size.h] so you have to install it by
-   hand if you use that version.)
+ - gnome-vfs - 0.3 or later
 
-   *** You should use the flag "--disable-more-warnings" when
-   *** configuring gnome-vfs, or it may fail to build.
+   *** If you are using gnome-vfs from CVS, you should use the flag
+   *** "--disable-more-warnings" when configuring, or it may fail to
+   *** build.
 
  - bonobo - from CVS
 
diff --git a/configure.in b/configure.in
index 257b1d0ef9..ac6dcf8a07 100644
--- a/configure.in
+++ b/configure.in
@@ -285,11 +285,6 @@ BONOBO_HTML_GNOME_CFLAGS="`gnome-config --cflags bonobox libglade gdk_pixbuf gtk
 AC_SUBST(BONOBO_HTML_GNOME_LIBS)
 AC_SUBST(BONOBO_HTML_GNOME_CFLAGS)
 
-GNOME_VFS_LIBS="`gnome-config --libs vfs`"
-GNOME_VFS_CFLAGS="`gnome-config --cflags vfs`"
-AC_SUBST(GNOME_VFS_LIBS)
-AC_SUBST(GNOME_VFS_CFLAGS)
-
 dnl ******************************
 dnl GtkHTML checking
 dnl ******************************
@@ -323,24 +318,26 @@ dnl Gnome-VFS checking
 dnl ******************************
 AC_MSG_CHECKING(for GNOME-VFS)
 if gnome-config --libs vfs > /dev/null 2>&1; then
-	vfs_ok=true
+	vers=`gnome-config --modversion vfs`
+	case $vers
+	in
+	    gnome-vfs-0.[012]) vfs_ok=false ;;
+	    *) vfs_ok=true ;;
+	esac
 else
 	vfs_ok=false
 fi
 
 if $vfs_ok; then
-	AC_MSG_RESULT(found)
+	AC_MSG_RESULT($vers)
 else
-	AC_MSG_ERROR(GNOME-VFS is required to compile Evolution)
+	AC_MSG_ERROR(GNOME-VFS 0.3 or newer is required to compile Evolution)
 fi
 
-saved_CFLAGS="$CFLAGS"
-saved_LDFLAGS="$LDFLAGS"
-CFLAGS="$CFLAGS `gnome-config --cflags vfs`"
-LDFLAGS="$LDFLAGS `gnome-config --libs vfs`"
-AC_CHECK_FUNCS(gnome_vfs_mime_get_default_action_without_fallback)
-CFLAGS="$saved_CFLAGS"
-LDFLAGS="$saved_LDFLAGS"
+GNOME_VFS_LIBS="`gnome-config --libs vfs`"
+GNOME_VFS_CFLAGS="`gnome-config --cflags vfs`"
+AC_SUBST(GNOME_VFS_LIBS)
+AC_SUBST(GNOME_VFS_CFLAGS)
 
 BONOBO_VFS_GNOME_LIBS="`gnome-config --libs bonobox libglade gdk_pixbuf gnomecanvaspixbuf vfs gnomeui `"
 BONOBO_VFS_GNOME_CFLAGS="`gnome-config --cflags bonobox libglade gdk_pixbuf gnomecanvaspixbuf vfs gnomeui `"