From 1f60ea7efc91cb2269bd39a280a0e9c396c05e89 Mon Sep 17 00:00:00 2001 From: Seif Lotfy Date: Wed, 20 Jun 2012 15:23:58 +0200 Subject: [PATCH] Experiments with berkeley db instead of sqlite db --- configure.ac | 4 +--- src/Makefile.am | 6 ++++-- src/sql-schema.vala | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index bc065ce..acc6b33 100644 --- a/configure.ac +++ b/configure.ac @@ -28,13 +28,11 @@ AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) GLIB_REQUIRED=2.26.0 -SQLITE_REQUIRED=3.7 ZEITGEIST_REQUIRED="glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gmodule-2.0 >= $GLIB_REQUIRED - gio-unix-2.0 >= $GLIB_REQUIRED - sqlite3 >= $SQLITE_REQUIRED" + gio-unix-2.0 >= $GLIB_REQUIRED" PKG_CHECK_MODULES(ZEITGEIST, [$ZEITGEIST_REQUIRED]) AC_SUBST(ZEITGEIST_CFLAGS) diff --git a/src/Makefile.am b/src/Makefile.am index bdb4a3b..bbe7c70 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,6 +5,7 @@ bin_PROGRAMS = zeitgeist-daemon AM_CPPFLAGS = \ $(ZEITGEIST_CFLAGS) \ -include $(CONFIG_HEADER) \ + -ldb_sql \ -w \ $(NULL) @@ -12,7 +13,7 @@ AM_VALAFLAGS = \ --target-glib=2.26 \ -D BUILTIN_EXTENSIONS \ --pkg gio-2.0 \ - --pkg sqlite3 \ + --pkg dbsql \ --pkg posix \ --pkg gmodule-2.0 \ $(top_srcdir)/config.vapi \ @@ -62,8 +63,9 @@ zeitgeist_daemon_SOURCES = \ $(extensions_VALASOURCES:.vala=.c) \ $(NULL) -zeitgeist_daemon_LDADD = \ + zeitgeist_daemon_LDADD = \ $(ZEITGEIST_LIBS) \ + -ldb_sql \ $(NULL) zeitgeist_daemon_LDFLAGS = -export-dynamic -no-undefined diff --git a/src/sql-schema.vala b/src/sql-schema.vala index c8cf31b..a218aa7 100644 --- a/src/sql-schema.vala +++ b/src/sql-schema.vala @@ -245,9 +245,9 @@ namespace Zeitgeist.SQLite if (Utils.get_data_path () == Utils.get_default_data_path ()) FileUtils.chmod (Utils.get_data_path (), 0700); - exec_query (database, "PRAGMA journal_mode = WAL"); - exec_query (database, "PRAGMA synchronous = NORMAL"); - exec_query (database, "PRAGMA locking_mode = NORMAL"); + //exec_query (database, "PRAGMA journal_mode = WAL"); + //exec_query (database, "PRAGMA synchronous = NORMAL"); + //exec_query (database, "PRAGMA locking_mode = NORMAL"); // URI exec_query (database, """ -- 1.7.9.5