From 83e0fff02782b0cc04c03004987114628a3090d2 Mon Sep 17 00:00:00 2001
From: Michael Biebl <michael pluto milchstrasse xx>
Date: Thu, 11 Jan 2007 03:09:00 +0100
Subject: [PATCH] Remove USING_SQLITE

---
 configure.in                             |    6 ++----
 src/trackerd/tracker-db.h                |    2 --
 src/trackerd/tracker-email-evolution.h   |    4 +---
 src/trackerd/tracker-email-kmail.h       |    4 +---
 src/trackerd/tracker-email-thunderbird.h |    4 +---
 src/trackerd/tracker-email.h             |    4 +---
 6 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/configure.in b/configure.in
index c857c81..8917882 100644
--- a/configure.in
+++ b/configure.in
@@ -215,13 +215,10 @@ fi
 
 
 ####################################################################
-# Optional database/indexer component checks
+# External SQLite check
 ####################################################################
 
-
 SQLITE_REQUIRED=3.2
-AC_DEFINE(USING_SQLITE, [], [Define if we are using sqlite])
-AM_CONDITIONAL(USING_SQLITE, true)
 
 AC_ARG_ENABLE(external_sqlite, 
 	AC_HELP_STRING(
@@ -241,6 +238,7 @@ else
 	AM_CONDITIONAL(USING_EXTERNAL_SQLITE, false)
 fi		
 
+
 ###############################################################################
 # Check for file monitor backends
 ###############################################################################
diff --git a/src/trackerd/tracker-db.h b/src/trackerd/tracker-db.h
index cd31f31..b178377 100644
--- a/src/trackerd/tracker-db.h
+++ b/src/trackerd/tracker-db.h
@@ -28,9 +28,7 @@
 
 #include "config.h"
 
-#ifdef USING_SQLITE
 #include "tracker-db-sqlite.h"
-#endif
 
 gboolean	tracker_db_is_file_up_to_date 	(DBConnection *db_con, const char *uri, guint32 *id);
 FileInfo *	tracker_db_get_file_info	(DBConnection *db_con, FileInfo *info);
diff --git a/src/trackerd/tracker-email-evolution.h b/src/trackerd/tracker-email-evolution.h
index 7e02ee4..b1088ef 100644
--- a/src/trackerd/tracker-email-evolution.h
+++ b/src/trackerd/tracker-email-evolution.h
@@ -26,9 +26,7 @@
 
 #include "config.h"
 
-#ifdef USING_SQLITE
-#   include "tracker-db-sqlite.h"
-#endif
+#include "tracker-db-sqlite.h"
 
 
 /*
diff --git a/src/trackerd/tracker-email-kmail.h b/src/trackerd/tracker-email-kmail.h
index 7ad80c2..eff0be6 100644
--- a/src/trackerd/tracker-email-kmail.h
+++ b/src/trackerd/tracker-email-kmail.h
@@ -26,9 +26,7 @@
 
 #include "config.h"
 
-#ifdef USING_SQLITE
-#   include "tracker-db-sqlite.h"
-#endif
+#include "tracker-db-sqlite.h"
 
 
 /*
diff --git a/src/trackerd/tracker-email-thunderbird.h b/src/trackerd/tracker-email-thunderbird.h
index eb43571..95949fd 100644
--- a/src/trackerd/tracker-email-thunderbird.h
+++ b/src/trackerd/tracker-email-thunderbird.h
@@ -28,9 +28,7 @@
 
 #include "config.h"
 
-#ifdef USING_SQLITE
-#   include "tracker-db-sqlite.h"
-#endif
+#include "tracker-db-sqlite.h"
 
 
 /*
diff --git a/src/trackerd/tracker-email.h b/src/trackerd/tracker-email.h
index 0385d66..448bd19 100644
--- a/src/trackerd/tracker-email.h
+++ b/src/trackerd/tracker-email.h
@@ -25,9 +25,7 @@
 
 #include "config.h"
 
-#ifdef USING_SQLITE
-#   include "tracker-db-sqlite.h"
-#endif
+#include "tracker-db-sqlite.h"
 
 void		tracker_email_watch_emails		(DBConnection *db_con);
 void		tracker_email_end_email_watching	(void);
-- 
1.4.4.3