aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Williams <peterw@src.gnome.org>2000-08-19 04:15:47 +0800
committerPeter Williams <peterw@src.gnome.org>2000-08-19 04:15:47 +0800
commitca572bccbdfcb4929646605430e01079f41fa8ea (patch)
tree8c68b9ab1bcafca1b39f80484cb24869204ec742
parentf3eb475d586bc226f4cd3d82547254273e106d7c (diff)
downloadgsoc2013-evolution-ca572bccbdfcb4929646605430e01079f41fa8ea.tar.gz
gsoc2013-evolution-ca572bccbdfcb4929646605430e01079f41fa8ea.tar.zst
gsoc2013-evolution-ca572bccbdfcb4929646605430e01079f41fa8ea.zip
Check for new enough gnome-vfs
svn path=/trunk/; revision=4874
-rw-r--r--ChangeLog5
-rw-r--r--configure.in11
2 files changed, 16 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 247e802323..3f3ea37f2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-18 Peter Williams <peterw@helixcode.com>
+
+ * configure.in (gnome-vfs): Check for new enough gnome-vfs
+ (needs gnome_vfs_mime_get_default_action_without_fallback)
+
2000-08-14 Federico Mena Quintero <federico@helixcode.com>
* configure.in (AC_OUTPUT): Generate
diff --git a/configure.in b/configure.in
index fb1cf06f9f..8e2beb49fb 100644
--- a/configure.in
+++ b/configure.in
@@ -342,6 +342,17 @@ GNOME_VFS_CFLAGS="`gnome-config --cflags vfs`"
AC_SUBST(GNOME_VFS_LIBS)
AC_SUBST(GNOME_VFS_CFLAGS)
+save_CFLAGS="$CFLAGS"
+save_LIBS="$LIBS"
+CFLAGS="$GNOME_VFS_CFLAGS"
+LIBS="$GNOME_VFS_LIBS"
+AC_CHECK_LIB(gnomevfs, gnome_vfs_mime_get_default_action_without_fallback,[],
+[
+ AC_MSG_ERROR([You need a newer Gnome VFS. Try the CVS version])
+])
+CFLAGS="$save_CFLAGS"
+LIBS="$save_LIBS"
+
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 `"
AC_SUBST(BONOBO_VFS_GNOME_LIBS)