Move --disable-dbm to ac configure.
This commit is contained in:
parent
b09c5594de
commit
a893aba1ad
|
@ -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',
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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')
|
||||
|
|
|
@ -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))
|
Loading…
Reference in New Issue