summaryrefslogtreecommitdiffstats
path: root/toolkit
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-02-28 16:21:05 -0500
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-14 13:01:21 +0200
commit9816a810e6197aaaf549e4fe04e77cd2a9d2e865 (patch)
tree66a255842cffbc4e0eb905629e464cc2874ef978 /toolkit
parent9a8068ea3fd3844b4b8f73893a852406b3d08f12 (diff)
downloadUXP-9816a810e6197aaaf549e4fe04e77cd2a9d2e865.tar
UXP-9816a810e6197aaaf549e4fe04e77cd2a9d2e865.tar.gz
UXP-9816a810e6197aaaf549e4fe04e77cd2a9d2e865.tar.lz
UXP-9816a810e6197aaaf549e4fe04e77cd2a9d2e865.tar.xz
UXP-9816a810e6197aaaf549e4fe04e77cd2a9d2e865.zip
Issue #251 - Move --disable-dbm to ac configure
Also Tag #1467
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/moz.configure2
-rw-r--r--toolkit/nss.configure16
2 files changed, 0 insertions, 18 deletions
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))