debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove sqlite header check, it turns out to be wrong

Browse source
This commit is contained in:
Christian Dywan 2008-11-08 13:12:54 +01:00
parent 0c093cb335
commit 9abb753cc4
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.in
View file

@ -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) PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= 3.0], have_sqlite3=1, have_sqlite3=0)
AC_SUBST([SQLITE3_CFLAGS]) AC_SUBST([SQLITE3_CFLAGS])
AC_SUBST([SQLITE3_LIBS]) 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 # i18n
GETTEXT_PACKAGE=midori GETTEXT_PACKAGE=midori

4
midori/main.c
View file

@ -29,10 +29,8 @@
#include <libxml/parser.h> #include <libxml/parser.h>
#include <libxml/tree.h> #include <libxml/tree.h>
#if HAVE_SQLITE3_H #ifdef HAVE_SQLITE
#include <sqlite3.h> #include <sqlite3.h>
#elif HAVE_SQLITE_H
#include <sqlite.h>
#endif #endif
#if ENABLE_NLS #if ENABLE_NLS

2
wscript
View file

@ -105,8 +105,6 @@ def configure (conf):
if not Params.g_options.disable_sqlite: if not Params.g_options.disable_sqlite:
conf.check_pkg ('sqlite3', destvar='SQLITE', vnum='3.0', mandatory=False) conf.check_pkg ('sqlite3', destvar='SQLITE', vnum='3.0', mandatory=False)
sqlite = ['not available','yes'][conf.env['HAVE_SQLITE'] == 1] 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: else:
sqlite = 'no' sqlite = 'no'
conf.check_message_custom ('history database', 'support', sqlite) conf.check_message_custom ('history database', 'support', sqlite)