diff options
Diffstat (limited to 'old-configure.in')
| -rw-r--r-- | old-configure.in | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/old-configure.in b/old-configure.in index 1670a90b6..3d6d40e56 100644 --- a/old-configure.in +++ b/old-configure.in @@ -2058,9 +2058,7 @@ if test -n "$_USE_SYSTEM_NSS"; then AM_PATH_NSS(3.28.6, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) fi -if test -n "$MOZ_SYSTEM_NSS"; then - NSS_LIBS="$NSS_LIBS -lcrmf" -else +if test -z "$MOZ_SYSTEM_NSS"; then NSS_CFLAGS="-I${DIST}/include/nss" fi @@ -2237,6 +2235,7 @@ LIBJPEG_TURBO_AS= LIBJPEG_TURBO_ASFLAGS= MOZ_PREF_EXTENSIONS=1 MOZ_REFLOW_PERF= +MOZ_SAFE_BROWSING= MOZ_SPELLCHECK=1 MOZ_TOOLKIT_SEARCH=1 MOZ_UI_LOCALE=en-US @@ -3952,8 +3951,24 @@ fi AC_SUBST(MOZ_SYSTEM_SQLITE) dnl ======================================================== +dnl = Enable Google safe browsing (anti-phishing) +dnl ======================================================== +MOZ_ARG_ENABLE_BOOL(safe-browsing, +[ --enable-safe-browsing Enable safe browsing (anti-phishing) implementation], + MOZ_SAFE_BROWSING=1, + MOZ_SAFE_BROWSING= ) +if test -n "$MOZ_SAFE_BROWSING"; then + AC_DEFINE(MOZ_SAFE_BROWSING) +fi +AC_SUBST(MOZ_SAFE_BROWSING) + +dnl ======================================================== dnl = Enable url-classifier dnl ======================================================== +dnl Implicitly enabled by default if building with safe-browsing +if test -n "$MOZ_SAFE_BROWSING"; then + MOZ_URL_CLASSIFIER=1 +fi MOZ_ARG_ENABLE_BOOL(url-classifier, [ --enable-url-classifier Enable url classifier module], MOZ_URL_CLASSIFIER=1, |