From 8f429e0dafc8bdb0a731497a5def1751c7bc7301 Mon Sep 17 00:00:00 2001 From: Thomas Groman Date: Mon, 15 Jun 2020 23:59:47 -0700 Subject: Revert "Issue #1342 - Remove support for system sqlite" This reverts commit d41ba28f5257f7c1425a0bde210e69fc5bb34a37. --- old-configure.in | 169 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 169 insertions(+) (limited to 'old-configure.in') diff --git a/old-configure.in b/old-configure.in index 2748bbe82..68fc4c7f3 100644 --- a/old-configure.in +++ b/old-configure.in @@ -3759,6 +3759,175 @@ else fi fi +dnl ======================================================== +dnl Check for sqlite +dnl ======================================================== + +MOZ_SYSTEM_SQLITE= +MOZ_ARG_ENABLE_BOOL(system-sqlite, +[ --enable-system-sqlite Use system sqlite (located with pkgconfig)], +MOZ_SYSTEM_SQLITE=1, +MOZ_SYSTEM_SQLITE= ) + +if test -n "$MOZ_SYSTEM_SQLITE" +then + dnl ============================ + dnl === SQLite Version check === + dnl ============================ + dnl Check to see if the system SQLite package is new enough. + PKG_CHECK_MODULES(SQLITE, sqlite3 >= $SQLITE_VERSION) + + dnl ================================== + dnl === SQLITE_SECURE_DELETE check === + dnl ================================== + dnl Check to see if the system SQLite package is compiled with + dnl SQLITE_SECURE_DELETE enabled. + AC_MSG_CHECKING(for SQLITE_SECURE_DELETE support in system SQLite) + _SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $SQLITE_CFLAGS" + _SAVE_LIBS="$LIBS" + LIBS="$LIBS $SQLITE_LIBS" + AC_CACHE_VAL(ac_cv_sqlite_secure_delete,[ + AC_TRY_RUN([ + #include "sqlite3.h" + + int main(int argc, char **argv){ + return !sqlite3_compileoption_used("SQLITE_SECURE_DELETE"); + }], + ac_cv_sqlite_secure_delete=yes, + ac_cv_sqlite_secure_delete=no, + ac_cv_sqlite_secure_delete=no + ) + ]) + AC_MSG_RESULT($ac_cv_sqlite_secure_delete) + CFLAGS="$_SAVE_CFLAGS" + LIBS="$_SAVE_LIBS" + if test "x$ac_cv_sqlite_secure_delete" = "xno"; then + AC_MSG_ERROR([System SQLite library is not compiled with SQLITE_SECURE_DELETE.]) + fi + + dnl =============================== + dnl === SQLITE_THREADSAFE check === + dnl =============================== + dnl Check to see if the system SQLite package is compiled with + dnl SQLITE_THREADSAFE enabled. + AC_MSG_CHECKING(for SQLITE_THREADSAFE support in system SQLite) + _SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $SQLITE_CFLAGS" + _SAVE_LIBS="$LIBS" + LIBS="$LIBS $SQLITE_LIBS" + AC_CACHE_VAL(ac_cv_sqlite_threadsafe,[ + AC_TRY_RUN([ + #include "sqlite3.h" + + int main(int argc, char **argv){ + return !sqlite3_compileoption_used("SQLITE_THREADSAFE=1"); + }], + ac_cv_sqlite_threadsafe=yes, + ac_cv_sqlite_threadsafe=no, + ac_cv_sqlite_threadsafe=no + ) + ]) + AC_MSG_RESULT($ac_cv_sqlite_threadsafe) + CFLAGS="$_SAVE_CFLAGS" + LIBS="$_SAVE_LIBS" + if test "x$ac_cv_sqlite_threadsafe" = "xno"; then + AC_MSG_ERROR([System SQLite library is not compiled with SQLITE_THREADSAFE.]) + fi + + dnl ================================ + dnl === SQLITE_ENABLE_FTS3 check === + dnl ================================ + dnl check to see if the system SQLite package is compiled with + dnl SQLITE_ENABLE_FTS3 enabled. + AC_MSG_CHECKING(for SQLITE_ENABLE_FTS3 support in system SQLite) + _SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $SQLITE_CFLAGS" + _SAVE_LIBS="$LIBS" + LIBS="$LIBS $SQLITE_LIBS" + AC_CACHE_VAL(ac_cv_sqlite_enable_fts3,[ + AC_TRY_RUN([ + #include "sqlite3.h" + + int main(int argc, char **argv){ + return !sqlite3_compileoption_used("SQLITE_ENABLE_FTS3"); + }], + ac_cv_sqlite_enable_fts3=yes, + ac_cv_sqlite_enable_fts3=no, + ac_cv_sqlite_enable_fts3=no + ) + ]) + AC_MSG_RESULT($ac_cv_sqlite_enable_fts3) + CFLAGS="$_SAVE_CFLAGS" + LIBS="$_SAVE_LIBS" + if test "x$ac_cv_sqlite_enable_fts3" = "xno"; then + AC_MSG_ERROR([System SQLite library is not compiled with SQLITE_ENABLE_FTS3.]) + fi + + dnl ========================================= + dnl === SQLITE_ENABLE_UNLOCK_NOTIFY check === + dnl ========================================= + dnl check to see if the system SQLite package is compiled with + dnl SQLITE_ENABLE_UNLOCK_NOTIFY enabled. + AC_MSG_CHECKING(for SQLITE_ENABLE_UNLOCK_NOTIFY support in system SQLite) + _SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $SQLITE_CFLAGS" + _SAVE_LIBS="$LIBS" + LIBS="$LIBS $SQLITE_LIBS" + AC_CACHE_VAL(ac_cv_sqlite_enable_unlock_notify,[ + AC_TRY_RUN([ + #include "sqlite3.h" + + int main(int argc, char **argv){ + return !sqlite3_compileoption_used("SQLITE_ENABLE_UNLOCK_NOTIFY"); + }], + ac_cv_sqlite_enable_unlock_notify=yes, + ac_cv_sqlite_enable_unlock_notify=no, + ac_cv_sqlite_enable_unlock_notify=no + ) + ]) + AC_MSG_RESULT($ac_cv_sqlite_enable_unlock_notify) + CFLAGS="$_SAVE_CFLAGS" + LIBS="$_SAVE_LIBS" + if test "x$ac_cv_sqlite_enable_unlock_notify" = "xno"; then + AC_MSG_ERROR([System SQLite library is not compiled with SQLITE_ENABLE_UNLOCK_NOTIFY.]) + fi + + dnl ========================================= + dnl === SQLITE_ENABLE_DBSTAT_VTAB check === + dnl ========================================= + dnl check to see if the system SQLite package is compiled with + dnl SQLITE_ENABLE_DBSTAT_VTAB. + AC_MSG_CHECKING(for SQLITE_ENABLE_DBSTAT_VTAB support in system SQLite) + _SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $SQLITE_CFLAGS" + _SAVE_LIBS="$LIBS" + LIBS="$LIBS $SQLITE_LIBS" + AC_CACHE_VAL(ac_cv_sqlite_dbstat_vtab,[ + AC_TRY_RUN([ + #include "sqlite3.h" + + int main(int argc, char **argv){ + return !sqlite3_compileoption_used("SQLITE_ENABLE_DBSTAT_VTAB"); + }], + ac_cv_sqlite_dbstat_vtab=yes, + ac_cv_sqlite_dbstat_vtab=no, + ac_cv_sqlite_dbstat_vtab=no + ) + ]) + AC_MSG_RESULT($ac_cv_sqlite_dbstat_vtab) + CFLAGS="$_SAVE_CFLAGS" + LIBS="$_SAVE_LIBS" + if test "x$ac_cv_sqlite_dbstat_vtab" = "xno"; then + AC_MSG_ERROR([System SQLite library is not compiled with SQLITE_ENABLE_DBSTAT_VTAB.]) + fi +fi + +if test -n "$MOZ_SYSTEM_SQLITE"; then + AC_DEFINE(MOZ_SYSTEM_SQLITE) +fi +AC_SUBST(MOZ_SYSTEM_SQLITE) + dnl ======================================================== dnl = Enable Google safe browsing (anti-phishing) dnl ======================================================== -- cgit v1.2.3