Remove sqlite header check, it turns out to be wrong

diff --git a/configure.in b/configure.in
index 38d2ff3baadb9221db543e3d5bb3a417824e9a0e..931fb76944d2ddf179d0f65019ebd42d3c6cd56a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -76,7 +76,7 @@ AC_DEFINE_UNQUOTED(HAVE_LIBXML,$have_libxml, [Whether LibXML is available])
 PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= 3.0], have_sqlite3=1, have_sqlite3=0)
 AC_SUBST([SQLITE3_CFLAGS])
 AC_SUBST([SQLITE3_LIBS])
-AC_DEFINE_UNQUOTED(HAVE_SQLITE3,$have_sqlite3, [Whether sqlite3 is available])
+AC_DEFINE_UNQUOTED(HAVE_SQLITE,$have_sqlite3, [Whether sqlite3 is available])
 
 # i18n
 GETTEXT_PACKAGE=midori

diff --git a/midori/main.c b/midori/main.c
index 1e0102c9d010f9fb8064a93b12ecc4368e0bb0e4..65c0ba047e9d511f004b594b3994e49222461198 100644 (file)
--- a/midori/main.c
+++ b/midori/main.c
@@ -29,10 +29,8 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
-#if HAVE_SQLITE3_H
+#ifdef HAVE_SQLITE
     #include <sqlite3.h>
-#elif HAVE_SQLITE_H
-    #include <sqlite.h>
 #endif
 
 #if ENABLE_NLS

diff --git a/wscript b/wscript
index 72201fe0b4714638e48323564d6fb968a8b8fa7d..1bc78376411cb4995a70491a2396a4fa878465c3 100644 (file)
--- a/wscript
+++ b/wscript
@@ -105,8 +105,6 @@ def configure (conf):
     if not Params.g_options.disable_sqlite:
         conf.check_pkg ('sqlite3', destvar='SQLITE', vnum='3.0', mandatory=False)
         sqlite = ['not available','yes'][conf.env['HAVE_SQLITE'] == 1]
-        if not conf.check_header ('sqlite3.h', 'HAVE_SQLITE3_H'):
-            conf.check_header ('sqlite.h', 'HAVE_SQLITE_H')
     else:
         sqlite = 'no'
     conf.check_message_custom ('history database', 'support', sqlite)