Really support (and prefer) sqlite 3.x - requires a modified connection string. Index: configure.in =================================================================== RCS file: /cvs/gnome/beagle/configure.in,v retrieving revision 1.170 diff -u -B -p -r1.170 configure.in --- configure.in 19 Aug 2005 15:54:49 -0000 1.170 +++ configure.in 20 Aug 2005 22:51:02 -0000 @@ -91,13 +91,16 @@ AM_GLIB_GNU_GETTEXT # Many distros don't have a dependency on sqlite for their # mono-data-sqlite packages, and the mono build process itself # doesn't require it. But we do, so check for it here. -PKG_CHECK_MODULES(SQLITE, sqlite, have_sqlite2="yes", have_sqlite2="no") -PKG_CHECK_MODULES(SQLITE, sqlite3, have_sqlite3="yes", have_sqlite3="no") +SQLITE_MAJ_VER="0" +PKG_CHECK_MODULES(SQLITE, sqlite, SQLITE_MAJ_VER="2", do_nothing="1") +PKG_CHECK_MODULES(SQLITE, sqlite3, SQLITE_MAJ_VER="3", do_nothing="1") -if test "x$have_sqlite2" = "xno" -a "x$have_sqlite3" = "xno"; then +if test "x$SQLITE_MAJ_VER" = "x0"; then AC_MSG_ERROR([You need to install either sqlite2 or sqlite3]) fi +AC_SUBST(SQLITE_MAJ_VER) + # Needed by glue/screensaver-glue.c # The OLD_CFLAGS/CFLAGS hack is needed to build on Ubuntu Breezy Badger OLD_CFLAGS="$CFLAGS" @@ -610,6 +613,7 @@ echo " libchm? ${has_libchm} Local SqliteClient? ${use_local_sqlite} + Sqlite version: ${SQLITE_MAJ_VER}.x Enable WebServices ${enable_webservices} Enable libbeagle ${enable_libbeagle}" Index: Util/ExternalStringsHack.cs.in =================================================================== RCS file: /cvs/gnome/beagle/Util/ExternalStringsHack.cs.in,v retrieving revision 1.6 diff -u -B -p -r1.6 ExternalStringsHack.cs.in --- Util/ExternalStringsHack.cs.in 30 Jun 2005 16:44:48 -0000 1.6 +++ Util/ExternalStringsHack.cs.in 20 Aug 2005 22:51:02 -0000 @@ -41,5 +41,6 @@ namespace Beagle.Util { } public const string XattrLib = "@XATTR_LIB@"; - } + public const string SqliteVersion = "@SQLITE_MAJ_VER@"; + } } Index: Util/Makefile.am =================================================================== RCS file: /cvs/gnome/beagle/Util/Makefile.am,v retrieving revision 1.68 diff -u -B -p -r1.68 Makefile.am --- Util/Makefile.am 10 Aug 2005 19:22:34 -0000 1.68 +++ Util/Makefile.am 20 Aug 2005 22:51:04 -0000 @@ -39,6 +39,7 @@ $(EXTSTR): $(EXTSTR_IN) -e "s|\@GNOME_PREFIX\@|$(GNOME_PREFIX)|g" \ -e "s|\@KDE_PREFIX\@|$(KDE_PREFIX)|g" \ -e "s|\@XATTR_LIB\@|$(XATTR_LIB)|g" \ + -e "s|\@SQLITE_MAJ_VER\@|$(SQLITE_MAJ_VER)|g" \ < $(EXTSTR_IN) > $@ CSFILES = \ Index: beagled/FileAttributesStore_Sqlite.cs =================================================================== RCS file: /cvs/gnome/beagle/beagled/FileAttributesStore_Sqlite.cs,v retrieving revision 1.17 diff -u -B -p -r1.17 FileAttributesStore_Sqlite.cs --- beagled/FileAttributesStore_Sqlite.cs 11 Aug 2005 18:24:50 -0000 1.17 +++ beagled/FileAttributesStore_Sqlite.cs 20 Aug 2005 22:51:04 -0000 @@ -159,7 +159,8 @@ namespace Beagle.Daemon { { SqliteConnection c; c = new SqliteConnection (); - c.ConnectionString = "URI=file:" + GetDbPath (directory); + c.ConnectionString = "version=" + ExternalStringsHack.SqliteVersion + + ",URI=file:" + GetDbPath (directory); c.Open (); return c; } Index: beagled/TextCache.cs =================================================================== RCS file: /cvs/gnome/beagle/beagled/TextCache.cs,v retrieving revision 1.21 diff -u -B -p -r1.21 TextCache.cs --- beagled/TextCache.cs 18 Aug 2005 17:51:26 -0000 1.21 +++ beagled/TextCache.cs 20 Aug 2005 22:51:05 -0000 @@ -86,7 +86,8 @@ namespace Beagle.Daemon { create_new_db = true; connection = new SqliteConnection (); - connection.ConnectionString = "URI=file:" + db_filename; + connection.ConnectionString = "version=" + ExternalStringsHack.SqliteVersion + + ",URI=file:" + db_filename; connection.Open (); if (create_new_db) {