summaryrefslogtreecommitdiffstats
path: root/old-configure.in
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2020-03-16 13:38:19 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-03-16 13:38:19 +0100
commit2a4827ea40d1e629318bcbb17ed07cc64a1431b5 (patch)
treeb146fd98af424399b43851a73aca15bb3abdd0bb /old-configure.in
parent6d504711a01e9be34725f9add22cc7aa311cb14f (diff)
downloadUXP-2a4827ea40d1e629318bcbb17ed07cc64a1431b5.tar
UXP-2a4827ea40d1e629318bcbb17ed07cc64a1431b5.tar.gz
UXP-2a4827ea40d1e629318bcbb17ed07cc64a1431b5.tar.lz
UXP-2a4827ea40d1e629318bcbb17ed07cc64a1431b5.tar.xz
UXP-2a4827ea40d1e629318bcbb17ed07cc64a1431b5.zip
Issue #1467 - Part 1: Set up conditional NSS-SQL builds.
- Adds buildconfig option --enable-nss-sqlstore - Prefixes NSS dbinit with either sql: or dbm: depending on config - Pre-initializes mozStorage when NSS-SQL storage is used to prevent an sqlite3_config race in NSS Init
Diffstat (limited to 'old-configure.in')
-rw-r--r--old-configure.in19
1 files changed, 19 insertions, 0 deletions
diff --git a/old-configure.in b/old-configure.in
index d438d9ea3..6c0b80d7b 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -2160,6 +2160,7 @@ MOZ_SERVICES_HEALTHREPORT=1
MOZ_SERVICES_SYNC=1
MOZ_USERINFO=1
NSS_DISABLE_DBM=
+NSS_SQLSTORE=
MOZ_MAILNEWS=
MOZ_MAILNEWS_OAUTH2=
MOZ_LDAP_XPCOM=
@@ -2717,6 +2718,24 @@ fi
AC_SUBST(NSS_DISABLE_DBM)
dnl =========================================================
+dnl = NSS SQL storage format
+dnl =========================================================
+MOZ_ARG_ENABLE_BOOL(nss-sqlstore,
+[ --enable-nss-sqlstore Enable the us of SQL storage for NSS],
+ NSS_SQLSTORE=1,
+ NSS_SQLSTORE=)
+
+if test -n "$NSS_DISABLE_DBM" -a -z "$NSS_SQLSTORE"; then
+ AC_MSG_ERROR([DBM storage support is required if not using NSS SQL storage])
+fi
+
+if test -n "$NSS_SQLSTORE"; then
+ AC_DEFINE(NSS_SQLSTORE)
+fi
+
+AC_SUBST(NSS_SQLSTORE)
+
+dnl =========================================================
dnl = Don't fold mailnews related comps into libXUL
dnl =========================================================
MOZ_ARG_ENABLE_BOOL(incomplete-external-linkage,