From f0abf6273cf7685129dbd5cd2c639f49d0a424f8 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Fri, 28 Feb 2020 16:21:05 -0500 Subject: Issue #251 - Move --disable-dbm to ac configure Also Tag #1467 --- toolkit/moz.configure | 2 -- toolkit/nss.configure | 16 ---------------- 2 files changed, 18 deletions(-) delete mode 100644 toolkit/nss.configure (limited to 'toolkit') 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)) -- cgit v1.2.3