mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-07 18:04:46 +00:00
Bug 1294803 - Move BUILD_CTYPES to Python configure. r=glandium
MozReview-Commit-ID: 3TlgdpNDLZW
This commit is contained in:
parent
269e8590e8
commit
872c57fe84
@ -13,3 +13,25 @@ system_ffi = pkg_check_modules('MOZ_FFI', 'libffi > 3.0.9', use_system_ffi)
|
||||
|
||||
set_config('MOZ_SYSTEM_FFI', system_ffi)
|
||||
add_old_configure_assignment('MOZ_SYSTEM_FFI', system_ffi)
|
||||
|
||||
@depends(building_js, '--help')
|
||||
def ctypes_default(building_js, _):
|
||||
return not building_js
|
||||
|
||||
js_option('--enable-ctypes', help='Enable js-ctypes',
|
||||
default=ctypes_default)
|
||||
|
||||
build_ctypes = depends_if('--enable-ctypes')(lambda _: True)
|
||||
|
||||
set_config('BUILD_CTYPES', build_ctypes)
|
||||
set_define('BUILD_CTYPES', build_ctypes)
|
||||
add_old_configure_assignment('BUILD_CTYPES', build_ctypes)
|
||||
|
||||
@depends(build_ctypes, building_js)
|
||||
def js_has_ctypes(ctypes, js):
|
||||
if ctypes and js:
|
||||
return True
|
||||
|
||||
set_config('JS_HAS_CTYPES', js_has_ctypes)
|
||||
set_define('JS_HAS_CTYPES', js_has_ctypes)
|
||||
add_old_configure_assignment('JS_HAS_CTYPES', js_has_ctypes)
|
||||
|
@ -169,7 +169,6 @@ def old_configure_options(*options):
|
||||
'--enable-cookies',
|
||||
'--enable-cpp-rtti',
|
||||
'--enable-crashreporter',
|
||||
'--enable-ctypes',
|
||||
'--enable-dbus',
|
||||
'--enable-debug-js-modules',
|
||||
'--enable-directshow',
|
||||
|
@ -2097,22 +2097,13 @@ dnl =
|
||||
dnl ========================================================
|
||||
MOZ_ARG_HEADER(Standalone module options (Not for building Mozilla))
|
||||
|
||||
dnl ========================================================
|
||||
dnl = Build jsctypes if it's enabled
|
||||
dnl ========================================================
|
||||
MOZ_ARG_ENABLE_BOOL(ctypes,
|
||||
[ --enable-ctypes Enable js-ctypes (default=no)],
|
||||
BUILD_CTYPES=1,
|
||||
BUILD_CTYPES= )
|
||||
JS_HAS_CTYPES=$BUILD_CTYPES
|
||||
AC_SUBST(JS_HAS_CTYPES)
|
||||
AC_SUBST(BUILD_CTYPES)
|
||||
if test "$JS_HAS_CTYPES"; then
|
||||
dnl JS_HAS_CTYPES is defined by Python configure. This check remains
|
||||
dnl as long as determining $AS remains in old-configure.
|
||||
dnl Error out if we're on MSVC and MASM is unavailable.
|
||||
if test -n "$_MSC_VER" -a \( "$AS" != "ml.exe" -a "$AS" != "ml64.exe" \); then
|
||||
AC_MSG_ERROR([\"$AS\" is not a suitable assembler to build js-ctypes. If you are building with MS Visual Studio 8 Express, you may download the MASM 8.0 package, upgrade to Visual Studio 9 Express, or install the Vista SDK. Or do not use --enable-ctypes.])
|
||||
fi
|
||||
AC_DEFINE(JS_HAS_CTYPES)
|
||||
fi
|
||||
|
||||
dnl ========================================================
|
||||
|
@ -2353,7 +2353,6 @@ NECKO_PROTOCOLS_DEFAULT="about data file ftp http res viewsource websocket wyciw
|
||||
if test -n "$MOZ_RTSP"; then
|
||||
NECKO_PROTOCOLS_DEFAULT="$NECKO_PROTOCOLS_DEFAULT rtsp"
|
||||
fi
|
||||
BUILD_CTYPES=1
|
||||
MOZ_USE_NATIVE_POPUP_WINDOWS=
|
||||
MOZ_EXCLUDE_HYPHENATION_DICTIONARIES=
|
||||
MOZ_INSTALL_TRACKING=
|
||||
@ -5604,18 +5603,6 @@ if test "$ENABLE_MARIONETTE"; then
|
||||
AC_DEFINE(ENABLE_MARIONETTE)
|
||||
fi
|
||||
|
||||
dnl
|
||||
dnl Build jsctypes on the platforms we can, unless it's explicitly disabled.
|
||||
dnl
|
||||
MOZ_ARG_DISABLE_BOOL(ctypes,
|
||||
[ --disable-ctypes Disable js-ctypes],
|
||||
BUILD_CTYPES=,
|
||||
BUILD_CTYPES=1)
|
||||
AC_SUBST(BUILD_CTYPES)
|
||||
if test "$BUILD_CTYPES"; then
|
||||
AC_DEFINE(BUILD_CTYPES)
|
||||
fi
|
||||
|
||||
dnl ========================================================
|
||||
if test "$MOZ_DEBUG" -o "$MOZ_DMD"; then
|
||||
MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS=
|
||||
@ -6291,10 +6278,6 @@ if test "$_INTL_API" = no; then
|
||||
ac_configure_args="$ac_configure_args --without-intl-api"
|
||||
fi
|
||||
|
||||
if test "$BUILD_CTYPES"; then
|
||||
# Build js-ctypes on the platforms we can.
|
||||
ac_configure_args="$ac_configure_args --enable-ctypes"
|
||||
fi
|
||||
if test -n "$NSPR_CFLAGS" -o -n "$NSPR_LIBS"; then
|
||||
ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'"
|
||||
ac_configure_args="$ac_configure_args --with-nspr-libs='$NSPR_LIBS'"
|
||||
|
Loading…
Reference in New Issue
Block a user