Index: configure.in
===================================================================
--- configure.in	(Revision 374)
+++ configure.in	(Arbeitskopie)
@@ -8,17 +8,15 @@
 AC_CONFIG_SRCDIR([src/trackerd/trackerd.c])
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
-AC_SUBST(PACKAGE_URL, [http://www.gnome.org/~jamiemcc/tracker/])
+AC_SUBST(PACKAGE_URL, [http://www.tracker-project.org])
 
-AM_CONFIG_HEADER(config.h)
-
 CFLAGS="$CFLAGS"
 
 # Checks for programs.
 AC_PROG_CC
 AC_HEADER_STDC
 
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 
 # Checks for header files.
 AC_HEADER_STDC
@@ -246,6 +244,10 @@
 	AC_SUBST(SQLITE3_LIBS)
 	AM_CONDITIONAL(USING_EXTERNAL_SQLITE, true)
 else
+	SQLITE3_CFLAGS="-I\$(top_srcdir)/src/sqlite3"
+	SQLITE3_LIBS="\$(top_builddir)/src/sqlite3/libsqlite-private.la"
+	AC_SUBST(SQLITE3_CFLAGS)
+	AC_SUBST(SQLITE3_LIBS)
 	AM_CONDITIONAL(USING_EXTERNAL_SQLITE, false)
 fi		
 
@@ -543,6 +545,8 @@
 	po/Makefile.in
 ])
 
+AC_CONFIG_HEADERS([config.h])
+
 AC_OUTPUT
 
 echo "
Index: src/trackerd/tracker-db-sqlite.h
===================================================================
--- src/trackerd/tracker-db-sqlite.h	(Revision 374)
+++ src/trackerd/tracker-db-sqlite.h	(Arbeitskopie)
@@ -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"
Index: src/trackerd/Makefile.am
===================================================================
--- src/trackerd/Makefile.am	(Revision 374)
+++ src/trackerd/Makefile.am	(Arbeitskopie)
@@ -1,13 +1,5 @@
-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 =	-g			\
+INCLUDES =				\
 	-DDATADIR=\""$(datadir)"\"	\
 	-DLIBDIR=\""$(libdir)"\"	\
 	-D_XOPEN_SOURCE_EXTENDED=1	\
@@ -24,8 +16,7 @@
 	$(GMIME_CFLAGS)			\
 	$(FAM_CFLAGS)			\
 	$(DBUS_CFLAGS)			\
-	$(additional_flags)		\
-	-I$(top_builddir)/src/libstemmer
+	$(SQLITE3_CFLAGS)
 
 
 if HAVE_INOTIFY
@@ -147,7 +138,7 @@
 	$(MYSQL_LIBS)			\
 	$(PANGO_LIBS)			\
 	$(GMIME_LIBS)			\
-	$(additional_libs)		\
+	$(SQLITE3_LIBS) 		\
 	$(GTHREAD_LIBS)			\
 	-lz				\
 	$(top_builddir)/src/libstemmer/libstemmer-private.la