From 34006b183b306e16f4b795fa84af0fd7a295f2df Mon Sep 17 00:00:00 2001
From: Michael Biebl <michael pluto milchstrasse xx>
Date: Thu, 11 Jan 2007 03:20:32 +0100
Subject: [PATCH] external sqlite fixes

---
 configure.in                     |   12 ++++++------
 src/trackerd/Makefile.am         |   13 ++-----------
 src/trackerd/tracker-db-sqlite.h |    2 +-
 4 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/configure.in b/configure.in
index 8917882..1622f1e 100644
--- a/configure.in
+++ b/configure.in
@@ -226,18 +226,18 @@ AC_ARG_ENABLE(external_sqlite,
 		[build using system's sqlite which must be a threadsafe version]),,
 	[enable_external_sqlite=no])
 
-if test "x$enable_external_sqlite" = "xyes"; 
-then
-	
-	# Check for SQLite3
+if test "x$enable_external_sqlite" = "xyes"; then
 	PKG_CHECK_MODULES(SQLITE3, [ sqlite3 >= $SQLITE_REQUIRED ])
-	AC_SUBST(SQLITE3_CFLAGS)
-	AC_SUBST(SQLITE3_LIBS)
 	AM_CONDITIONAL(USING_EXTERNAL_SQLITE, true)
 else
+	SQLITE3_CFLAGS="-I\$(top_srcdir)/src/sqlite3"
+	SQLITE3_LIBS="\$(top_srcdir)/src/sqlite3/libsqlite-private.la"
 	AM_CONDITIONAL(USING_EXTERNAL_SQLITE, false)
 fi		
 
+AC_SUBST(SQLITE3_CFLAGS)
+AC_SUBST(SQLITE3_LIBS)
+
 
 ###############################################################################
 # Check for file monitor backends
diff --git a/src/trackerd/Makefile.am b/src/trackerd/Makefile.am
index 2340336..7560f5b 100644
--- a/src/trackerd/Makefile.am
+++ b/src/trackerd/Makefile.am
@@ -1,12 +1,3 @@
-if USING_EXTERNAL_SQLITE
-additional_flags= $(SQLITE3_CFLAGS)
-additional_libs= $(SQLITE3_LIBS)
-else
-additional_flags= -I$(top_builddir)/src/sqlite3
-additional_libs= $(top_builddir)/src/sqlite3/libsqlite-private.la
-endif
-
-
 INCLUDES =				\
 	-DDATADIR=\""$(datadir)"\"	\
 	-DLIBDIR=\""$(libdir)"\"	\
@@ -24,7 +15,7 @@ INCLUDES =				\
 	$(GMIME_CFLAGS)			\
 	$(FAM_CFLAGS)			\
 	$(DBUS_CFLAGS)			\
-	$(additional_flags)		\
+	$(SQLITE3_CFLAGS)		\
 	-I$(top_builddir)/src/libstemmer
 
 
@@ -152,7 +143,7 @@ trackerd_LDADD =			\
 	$(DBUS_LIBS)			\
 	$(PANGO_LIBS)			\
 	$(GMIME_LIBS)			\
-	$(additional_libs)		\
+	$(SQLITE3_LIBS)			\
 	$(GTHREAD_LIBS)			\
 	-lz				\
 	$(top_builddir)/src/libstemmer/libstemmer-private.la
diff --git a/src/trackerd/tracker-db-sqlite.h b/src/trackerd/tracker-db-sqlite.h
index d462d1a..66772c9 100644
--- a/src/trackerd/tracker-db-sqlite.h
+++ b/src/trackerd/tracker-db-sqlite.h
@@ -22,7 +22,7 @@
 #ifndef _TRACKER_SQLITE_DB_H_
 #define _TRACKER_SQLITE_DB_H_
 
-#include "../sqlite3/sqlite3.h"
+#include <sqlite3.h>
 #include <glib.h>
 
 #include "tracker-utils.h"
-- 
1.4.4.3