4 files changed, 18 insertions, 18 deletions
diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
index df955f001..72c294706 100644
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -166,6 +166,7 @@ def old_configure_options(*options):
     '--enable-cookies',
     '--enable-cpp-rtti',
     '--enable-crashreporter',
+    '--enable-dbm',
     '--enable-dbus',
     '--enable-debug-js-modules',
     '--enable-jetpack',
diff --git a/old-configure.in b/old-configure.in
index c99c49eec..d438d9ea3 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -2159,6 +2159,7 @@ MOZ_PLACES=1
 MOZ_SERVICES_HEALTHREPORT=1
 MOZ_SERVICES_SYNC=1
 MOZ_USERINFO=1
+NSS_DISABLE_DBM=
 MOZ_MAILNEWS=
 MOZ_MAILNEWS_OAUTH2=
 MOZ_LDAP_XPCOM=
@@ -2700,6 +2701,22 @@ x86_64 | arm | aarch64 | x86 | ppc* | ia64)
 esac
 
 dnl =========================================================
+dnl = NSS DBM (BerkeleyDB) Support
+dnl = NOTE: Because we don't expressly control the name of
+dnl = this var --disable-dbm means NSS_DISABLE_DBM=1
+dnl =========================================================
+MOZ_ARG_DISABLE_BOOL(dbm,
+[  --disable-dbm         Disable DBM support in nss],
+    NSS_DISABLE_DBM=1,
+    NSS_DISABLE_DBM=)
+
+if test -n "$NSS_DISABLE_DBM"; then
+  AC_DEFINE(NSS_DISABLE_DBM)
+fi
+
+AC_SUBST(NSS_DISABLE_DBM)
+
+dnl =========================================================
 dnl = Don't fold mailnews related comps into libXUL
 dnl =========================================================
 MOZ_ARG_ENABLE_BOOL(incomplete-external-linkage,
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index ca7f91e6e..128402257 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -559,8 +559,6 @@ option('--enable-ipdl-tests', help='Enable expensive IPDL tests')
 set_config('MOZ_IPDL_TESTS',
            depends_if('--enable-ipdl-tests')(lambda _: True))
 
-include('nss.configure')
-
 # Network protocol support
 # ==============================================================
 @depends(check_build_environment, '--help')
diff --git a/toolkit/nss.configure b/toolkit/nss.configure
deleted file mode 100644
index 0febafb34..000000000
--- a/toolkit/nss.configure
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- 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 True
-
-option('--enable-dbm', default=dbm_default, help='Enable building DBM')
-
-set_config('NSS_DISABLE_DBM', depends('--enable-dbm')(lambda x: not x))