Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2020-04-03 09:57:28 +08:00
commit 4ecaa49dd0
102 changed files with 772 additions and 102069 deletions

View file

@ -2165,6 +2165,7 @@ MOZ_JETPACK=1
MOZ_DEVTOOLS_SERVER=1
MOZ_DEVTOOLS=
MOZ_PLACES=1
MOZ_SECURITY_SQLSTORE=
MOZ_SERVICES_HEALTHREPORT=1
MOZ_SERVICES_SYNC=1
MOZ_USERINFO=1
@ -2725,6 +2726,24 @@ fi
AC_SUBST(NSS_DISABLE_DBM)
dnl =========================================================
dnl = NSS SQL storage format
dnl =========================================================
MOZ_ARG_ENABLE_BOOL(security-sqlstore,
[ --enable-security-sqlstore Enable the use of SQL storage for NSS],
MOZ_SECURITY_SQLSTORE=1,
MOZ_SECURITY_SQLSTORE=)
if test -n "$NSS_DISABLE_DBM" -a -z "$MOZ_SECURITY_SQLSTORE"; then
AC_MSG_ERROR([DBM storage support is required if not using NSS SQL storage])
fi
if test -n "$MOZ_SECURITY_SQLSTORE"; then
AC_DEFINE(MOZ_SECURITY_SQLSTORE)
fi
AC_SUBST(MOZ_SECURITY_SQLSTORE)
dnl =========================================================
dnl = Don't fold mailnews related comps into libXUL
dnl =========================================================