nautilus r13744 - trunk

[alexl svn gnome org]

Author: alexl
Date: Wed Feb 13 20:59:41 2008
New Revision: 13744
URL: http://svn.gnome.org/viewvc/nautilus?rev=13744&view=rev

Log:
2008-02-13  Alexander Larsson  <alexl redhat com>

        * configure.in:
	Handle beagle >= 0.3.0




Modified:
   trunk/ChangeLog
   trunk/configure.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Feb 13 20:59:41 2008
@@ -296,7 +296,14 @@
 AC_ARG_ENABLE(beagle, [  --disable-beagle     build without beagle support])
 msg_beagle=no
 if test "x$enable_beagle" != "xno"; then
-	PKG_CHECK_MODULES(BEAGLE, libbeagle-0.0 >= beagle_minver, [
+	BEAGLE_PKGCONFIG=
+	if $PKG_CONFIG --exists libbeagle-1.0; then
+		BEAGLE_PKGCONFIG=libbeagle-1.0
+	else
+		BEAGLE_PKGCONFIG=libbeagle-0.0
+	fi
+
+	PKG_CHECK_MODULES(BEAGLE, $BEAGLE_PKGCONFIG >= beagle_minver, [
 		  	  AM_CONDITIONAL(HAVE_BEAGLE, true)
 			  AC_DEFINE(HAVE_BEAGLE, 1, [Define to enable beagle support])
 			  ]