Bug 1746541 - Move --disable-negotiateauth to python configure. r=firefox-build-system-reviewers,andi

Differential Revision: https://phabricator.services.mozilla.com/D134100
This commit is contained in:
Mike Hommey 2021-12-17 22:52:10 +00:00
Родитель 86100100a6
Коммит 9ad5b8ec2a
3 изменённых файлов: 8 добавлений и 15 удалений

Просмотреть файл

@ -91,7 +91,6 @@ def old_configure_options(*options):
@old_configure_options(
"--cache-file",
"--datadir",
"--enable-negotiateauth",
"--enable-official-branding",
"--enable-parental-controls",
"--enable-sandbox",

Просмотреть файл

@ -1214,7 +1214,6 @@ MOZ_ARG_HEADER(Application)
ENABLE_SYSTEM_EXTENSION_DIRS=1
MOZ_BRANDING_DIRECTORY=
MOZ_OFFICIAL_BRANDING=
MOZ_AUTH_EXTENSION=1
MOZ_UNIVERSALCHARDET=1
MOZ_ZIPWRITER=1
MOZ_NO_SMART_CARDS=
@ -1389,18 +1388,6 @@ if test -n "$MOZ_APPLEMEDIA"; then
fi
fi # COMPILE_ENVIRONMENT
dnl ========================================================
dnl NegotiateAuth
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(negotiateauth,
[ --disable-negotiateauth Disable GSS-API negotiation ],
MOZ_AUTH_EXTENSION=,
MOZ_AUTH_EXTENSION=1 )
if test "$MOZ_AUTH_EXTENSION"; then
AC_DEFINE(MOZ_AUTH_EXTENSION)
fi
dnl ========================================================
dnl Searching of system directories for extensions.
dnl Note: this switch is meant to be used for test builds
@ -1866,7 +1853,6 @@ dnl =
dnl ========================================================
AC_SUBST_LIST(ASFLAGS)
AC_SUBST(MOZ_AUTH_EXTENSION)
AC_SUBST_LIST(MOZ_DEBUG_LDFLAGS)
AC_SUBST_LIST(WARNINGS_CFLAGS)

Просмотреть файл

@ -2762,3 +2762,11 @@ option(
)
set_define("NS_BUILD_REFCNT_LOGGING", True, when="--enable-logrefcnt")
# NegotiateAuth
# ==============================================================
option("--disable-negotiateauth", help="Disable GSS-API negotiation")
set_config("MOZ_AUTH_EXTENSION", True, when="--enable-negotiateauth")
set_define("MOZ_AUTH_EXTENSION", True, when="--enable-negotiateauth")