Bug 1295480 - Move --enable-dbm to python configure. r=chmanchester

b2g/confvars.sh

@@ -21,7 +21,6 @@ MOZ_SAFE_BROWSING=1
 
 MOZ_NO_SMART_CARDS=1
 MOZ_APP_STATIC_INI=1
-NSS_DISABLE_DBM=1
 MOZ_NO_EV_CERTS=1
 
 MOZ_WEBSPEECH=1

b2g/graphene/confvars.sh

@@ -30,7 +30,6 @@ MOZ_CAPTIVEDETECT=1
 MOZ_NO_SMART_CARDS=1
 MOZ_APP_STATIC_INI=1
 NSS_NO_LIBPKIX=1
-NSS_DISABLE_DBM=1
 
 if test "$OS_TARGET" = "Android"; then
 MOZ_CAPTURE=1

build/moz.configure/old.configure

@@ -169,7 +169,6 @@ def old_configure_options(*options):
     '--enable-cpp-rtti',
     '--enable-crashreporter',
     '--enable-ctypes',
-    '--enable-dbm',
     '--enable-dbus',
     '--enable-debug-js-modules',
     '--enable-directshow',

old-configure.in

@@ -2357,7 +2357,6 @@ MOZ_URL_CLASSIFIER=
 MOZ_XUL=1
 MOZ_ZIPWRITER=1
 MOZ_NO_SMART_CARDS=
-NSS_DISABLE_DBM=
 NECKO_COOKIES=1
 NECKO_PROTOCOLS_DEFAULT="about data file ftp http res viewsource websocket wyciwyg device"
 if test -n "$MOZ_RTSP"; then
@@ -2387,7 +2386,6 @@ esac
 
 case "${target}" in
     *-android*|*-linuxandroid*)
-        NSS_DISABLE_DBM=1
         MOZ_THEME_FASTSTRIPE=1
         MOZ_TREE_FREETYPE=1
         MOZ_RAW=1
@@ -2879,14 +2877,6 @@ if test -n "$MOZ_INSTALL_TRACKING"; then
     fi
 fi
 
-dnl ========================================================
-dnl = Disable building dbm
-dnl ========================================================
-MOZ_ARG_DISABLE_BOOL(dbm,
-[  --disable-dbm           Disable building dbm],
-    NSS_DISABLE_DBM=1,
-    NSS_DISABLE_DBM=)
-
 dnl ========================================================
 dnl accessibility support on by default on all platforms
 dnl ========================================================
@@ -6013,7 +6003,6 @@ AC_SUBST_LIST(MOZ_PNG_LIBS)
 AC_SUBST(MOZ_SYSTEM_NSPR)
 
 AC_SUBST(MOZ_SYSTEM_NSS)
-AC_SUBST(NSS_DISABLE_DBM)
 
 HOST_CMFLAGS=-fobjc-exceptions
 HOST_CMMFLAGS=-fobjc-exceptions

toolkit/moz.configure

@@ -563,3 +563,5 @@ option('--enable-ipdl-tests', help='Enable expensive IPDL tests')
 
 set_config('MOZ_IPDL_TESTS',
            depends_if('--enable-ipdl-tests')(lambda _: True))
+
+include('nss.configure')

toolkit/nss.configure

@@ -0,0 +1,16 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+# DBM support in NSS
+# ==============================================================
+@depends(build_project, '--help')
+def dbm_default(build_project, _):
+    return build_project not in ('mobile/android', 'b2g', 'b2g/graphene')
+
+option('--enable-dbm', default=dbm_default, help='Enable building DBM')
+
+set_config('NSS_DISABLE_DBM', depends('--enable-dbm')(lambda x: not x))