[tracker/tracker-0.6] Don't check for SQLite extension loader without FTS enabled
- From: Martyn James Russell <mr src gnome org>
- To: svn-commits-list gnome org
- Subject: [tracker/tracker-0.6] Don't check for SQLite extension loader without FTS enabled
- Date: Mon, 4 May 2009 11:48:06 -0400 (EDT)
commit 19cb233c32445e918aec318c4304f64a41bca354
Author: Martyn Russell <martyn imendio com>
Date: Mon May 4 16:47:46 2009 +0100
Don't check for SQLite extension loader without FTS enabled
---
configure.ac | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9852b9c..12c99d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -566,17 +566,30 @@ if test "$have_inotify" = "yes" ; then
fi
####################################################################
-# SQLite check
+# SQLite checks
####################################################################
SQLITE_REQUIRED=3.5
PKG_CHECK_MODULES(SQLITE3, [sqlite3 >= $SQLITE_REQUIRED])
-AC_CHECK_LIB([sqlite3], [sqlite3_enable_load_extension], [:],
- [AC_MSG_ERROR([SQLite must be configured with --enable-load-extenstion.])])
+
AC_SUBST(SQLITE3_CFLAGS)
AC_SUBST(SQLITE3_LIBS)
+AC_ARG_ENABLE([sqlite_fts],
+ AS_HELP_STRING([--enable-sqlite-fts],
+ [enable SQLite FTS support [[default=no]]]),,
+ [enable_sqlite_fts=no])
+
+if test "x$enable_sqlite_fts" != "xyes" ; then
+ enable_sqlite_fts="no (disabled)"
+else
+ AC_CHECK_LIB([sqlite3], [sqlite3_enable_load_extension], [:],
+ [AC_MSG_ERROR([SQLite must be configured with --enable-load-extension.])])
+fi
+
+AM_CONDITIONAL(ENABLE_SQLITE_FTS, test "$enable_sqlite_fts" = "yes")
+
##################################################################
# Enable UNAC support?
##################################################################
@@ -1270,21 +1283,6 @@ fi
AM_CONDITIONAL(HAVE_EVOLUTION_PLUGIN, test "$have_evolution_plugin" = "yes")
-##################################################################
-# Enable SQLite FTS support?
-##################################################################
-
-AC_ARG_ENABLE([sqlite_fts],
- AS_HELP_STRING([--enable-sqlite-fts],
- [enable SQLite FTS support [[default=no]]]),,
- [enable_sqlite_fts=no])
-
-if test "x$enable_sqlite_fts" != "xyes" ; then
- enable_sqlite_fts="no (disabled)"
-fi
-
-AM_CONDITIONAL(ENABLE_SQLITE_FTS, test "$enable_sqlite_fts" = "yes")
-
####################################################################
# Checks for gtk-doc and docbook-tools
####################################################################
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]