wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-23 07:37:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #251 - Move --disable-dbm to ac configure

Browse source 
Also Tag #1467
This commit is contained in:
Matt A. Tobin 2020-02-28 16:21:05 -05:00 • committed by Roy Tam
commit 57552faa1d
4 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

1
build/moz.configure/old.configure
View file

@ -166,6 +166,7 @@ def old_configure_options(*options):
'--enable-cookies', '--enable-cookies',
'--enable-cpp-rtti', '--enable-cpp-rtti',
'--enable-crashreporter', '--enable-crashreporter',
'--enable-dbm',
'--enable-dbus', '--enable-dbus',
'--enable-debug-js-modules', '--enable-debug-js-modules',
'--enable-jetpack', '--enable-jetpack',

17
old-configure.in
View file

@ -2168,6 +2168,7 @@ MOZ_PLACES=1
MOZ_SERVICES_HEALTHREPORT=1 MOZ_SERVICES_HEALTHREPORT=1
MOZ_SERVICES_SYNC=1 MOZ_SERVICES_SYNC=1
MOZ_USERINFO=1 MOZ_USERINFO=1
NSS_DISABLE_DBM=
MOZ_MAILNEWS= MOZ_MAILNEWS=
MOZ_MAILNEWS_OAUTH2= MOZ_MAILNEWS_OAUTH2=
MOZ_LDAP_XPCOM= MOZ_LDAP_XPCOM=
@ -2708,6 +2709,22 @@ x86_64 | arm | aarch64 | x86 | ppc* | ia64)
esac 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 =========================================================
dnl = Don't fold mailnews related comps into libXUL dnl = Don't fold mailnews related comps into libXUL
dnl ========================================================= dnl =========================================================

2
toolkit/moz.configure
View file

@ -559,8 +559,6 @@ option('--enable-ipdl-tests', help='Enable expensive IPDL tests')
set_config('MOZ_IPDL_TESTS', set_config('MOZ_IPDL_TESTS',
depends_if('--enable-ipdl-tests')(lambda _: True)) depends_if('--enable-ipdl-tests')(lambda _: True))
include('nss.configure')
# Network protocol support # Network protocol support
# ============================================================== # ==============================================================
@depends(check_build_environment, '--help') @depends(check_build_environment, '--help')

16
toolkit/nss.configure
View file

@ -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))