desktop-data-model r7268 - trunk

[otaylor svn gnome org]

Author: otaylor
Date: Wed Apr 16 18:34:09 2008
New Revision: 7268
URL: http://svn.gnome.org/viewvc/desktop-data-model?rev=7268&view=rev

Log:
- Make sqlite mandatory unless explicitly disabled
- Fix build with sqlite disabled

http://bugzilla.gnome.org/show_bug.cgi?id=528418, Marco Pesenti Gritti


Modified:
   trunk/Makefile-libengine.am
   trunk/configure.ac

Modified: trunk/Makefile-libengine.am
==============================================================================
--- trunk/Makefile-libengine.am	(original)
+++ trunk/Makefile-libengine.am	Wed Apr 16 18:34:09 2008
@@ -50,13 +50,17 @@
 	engine/hippo-platform.h			\
 	engine/hippo-settings.c			\
 	engine/hippo-settings.h			\
-	engine/hippo-sqlite-utils.c     	\
-	engine/hippo-sqlite-utils.h     	\
 	engine/hippo-title-pattern.c		\
 	engine/hippo-title-pattern.h		\
 	engine/hippo-xml-utils.c		\
 	engine/hippo-xml-utils.h
 
+if HAVE_SQLITE
+LIBENGINE_SOURCEFILES +=			\
+	engine/hippo-sqlite-utils.c     	\
+	engine/hippo-sqlite-utils.h
+endif
+
 LIBENGINE_BUILT_SOURCEFILES =			\
 	$(ENGINE_MARSHAL_HEADER)		\
 	$(ENGINE_MARSHAL_BODY)

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Apr 16 18:34:09 2008
@@ -307,10 +307,10 @@
 # SQLite checks
 
 AC_ARG_WITH(sqlite,
-	    AC_HELP_STRING([--with-sqlite=[yes/no/auto]],
-		           [Whether to use SQLite for offline caching]),
+	    AC_HELP_STRING([--without-sqlite],
+		           [Disable use of SQLite for caching and Firefox integration]),
 	    ,
-	    with_sqlite=auto)
+	    with_sqlite=yes)
 	    
 AC_MSG_CHECKING([for sqlite3])
 if test x"$with_sqlite" = xno ; then
@@ -319,19 +319,19 @@
 else
    HIPPO_PKG_CHECK_EXISTS(sqlite3 >= $SQLITE_REQUIRED, found_sqlite=yes, found_sqlite=no)
    AC_MSG_RESULT([$found_sqlite])
-fi
-
-if test $found_sqlite = yes ; then
-   SQLITE_MODULES=sqlite3
-   AC_DEFINE(HAVE_SQLITE, 1, [Define if you have SQLite database library])
-else
-   if test x"$with_sqlite" = xyes ; then
-      AC_MSG_ERROR([SQLite >= $SQLITE_REQUIRED not found])
+   
+   if test $found_sqlite = yes ; then
+      SQLITE_MODULES=sqlite3
+      AC_DEFINE(HAVE_SQLITE, 1, [Define if you have SQLite database library])
    else
-      AC_MSG_WARN([*** SQLite >= $SQLITE_REQUIRED not found, offline caching will be disabled])
+      if test x"$with_sqlite" = xyes ; then
+         AC_MSG_ERROR([SQLite >= $SQLITE_REQUIRED not found])
+      fi
    fi
 fi
 
+AM_CONDITIONAL(HAVE_SQLITE, test "x$found_sqlite" = xyes)
+
 # If we're building for Maemo, we don't need gnome-desktop
 if test "x$with_maemo" != xno ; then
    :