beagle r4769 - trunk/beagle

[dbera svn gnome org]

Author: dbera
Date: Sun Jun  1 21:10:32 2008
New Revision: 4769
URL: http://svn.gnome.org/viewvc/beagle?rev=4769&view=rev

Log:
Instead of checking for sqlite3.pc, which we don't really need, look for the library libsqlite3 which is what we actually need. One less dependency!


Modified:
   trunk/beagle/configure.in

Modified: trunk/beagle/configure.in
==============================================================================
--- trunk/beagle/configure.in	(original)
+++ trunk/beagle/configure.in	Sun Jun  1 21:10:32 2008
@@ -144,14 +144,12 @@
 # mono-data-sqlite packages, and the mono build process itself
 # doesn't require it.  But we do, so check for it here.
 
-SQLITE_MAJ_VER="0"
-PKG_CHECK_MODULES(SQLITE3, sqlite3 >= 3.3 , SQLITE_MAJ_VER="3", do_nothing="1")
-if test "x$SQLITE_MAJ_VER" = "x0"; then
-	# Note we really need 3.3.1, but the pkgconfig file from upstream only
-	# reports 3.3 for all releases in the 3.3 line.  Make sure we error out
-	# with the correct 3.3.1 version requirement, though.
-	AC_MSG_ERROR([You need to install sqlite >= 3.3.1])
-fi
+# We really need sqlite 3.3.1+; the earlier pkgconfig based
+# test was also flawed. Hence check for the sqlite3_prepare_v2
+# API which was added in 3.3.9. 3.3.9 was released in Jan 07,
+# so we can assume everyone has a much much newer sqlite3
+AC_MSG_CHECKING([for sqlite3 >= 3.3.9])
+AC_CHECK_LIB(sqlite3, sqlite3_prepare_v2)
 
 AC_ARG_ENABLE([xss],
 	      AC_HELP_STRING([--disable-xss], [Disable monitoring xscreensaver to speed up indexing when user is idle]),