From a893aba1ad8f425fbdd7c1552e1b0b7b189d0737 Mon Sep 17 00:00:00 2001
From: Fedor <fedor@mail.ru>
Date: Thu, 12 Mar 2020 20:43:58 +0300
Subject: [PATCH] Move --disable-dbm to ac configure.

---
 build/moz.configure/old.configure |  1 +
 old-configure.in                  | 17 +++++++++++++++++
 toolkit/moz.configure             |  2 --
 toolkit/nss.configure             | 16 ----------------
 4 files changed, 18 insertions(+), 18 deletions(-)
 delete mode 100644 toolkit/nss.configure

diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
index 7aa7fbcc6..3af05ffb8 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 f7bf7a19c..884d7beb8 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -2167,6 +2167,7 @@ MOZ_PLACES=1
 MOZ_SERVICES_HEALTHREPORT=1
 MOZ_SERVICES_SYNC=1
 MOZ_USERINFO=1
+NSS_DISABLE_DBM=
 
 case "$target_os" in
     mingw*)
@@ -2965,6 +2966,22 @@ if test -n "$MOZ_ALSA"; then
 fi
 
 AC_SUBST(MOZ_ALSA)
+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 = Disable PulseAudio
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index 3f72dac64..6d6bc5f44 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -598,8 +598,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 734f4f029..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 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))