From 9abb753cc4a7d64c73e693ac1d310af8feb8d127 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 8 Nov 2008 13:12:54 +0100 Subject: [PATCH] Remove sqlite header check, it turns out to be wrong --- configure.in | 2 +- midori/main.c | 4 +--- wscript | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/configure.in b/configure.in index 38d2ff3b..931fb769 100644 --- 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 1e0102c9..65c0ba04 100644 --- a/midori/main.c +++ b/midori/main.c @@ -29,10 +29,8 @@ #include #include -#if HAVE_SQLITE3_H +#ifdef HAVE_SQLITE #include -#elif HAVE_SQLITE_H - #include #endif #if ENABLE_NLS diff --git a/wscript b/wscript index 72201fe0..1bc78376 100644 --- 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)