author | Jacek Caban <jacek@codeweavers.com> |
Mon, 02 Sep 2013 12:23:43 +0200 | |
changeset 145221 | afcc9a2bd94c23b8a159717f00785b87cdfb2890 |
parent 145220 | 0dce2a6b6e3d85e1889c4b2134e76b2d6f4ccfce |
child 145222 | 692acb03e357953de84e75da5314d0a11437ad79 |
push id | 33200 |
push user | jacek@codeweavers.com |
push date | Mon, 02 Sep 2013 10:23:52 +0000 |
treeherder | mozilla-inbound@692acb03e357 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | glandium |
bugs | 910638 |
milestone | 26.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
configure.in | file | annotate | diff | comparison | revisions |
--- a/configure.in +++ b/configure.in @@ -9222,29 +9222,42 @@ if test -n "$ENABLE_CLANG_PLUGIN"; then AC_OUTPUT_SUBDIRS(build/clang-plugin) fi # Run the SpiderMonkey 'configure' script. dist=$MOZ_BUILD_ROOT/dist ac_configure_args="$_SUBDIR_CONFIG_ARGS" ac_configure_args="$ac_configure_args --enable-threadsafe" + +MOZ_ARG_WITH_STRING(intl-api, +[ --with-intl-api, --with-intl-api=build, --without-intl-api + Determine the status of the ECMAScript Internationalization API. The first + (or lack of any of these) builds and exposes the API. The second builds it + but doesn't use ICU or expose the API to script. The third doesn't build + ICU at all.], + WITH_INTL="--with-intl-api=$withval" +]) +if test -z "$WITH_INTL"; then if test "$NIGHTLY_BUILD" = "1" -a "$MOZ_BUILD_APP" = "browser"; then # In desktop nightlies the Internationalization API is disabled, but all # code for it is still built. Bug 853301 will remove this so that it's # built and the API is enabled. - ac_configure_args="$ac_configure_args --with-intl-api=build" + WITH_INTL="--with-intl-api=build" else # Internationalization isn't built or exposed by default in non-desktop and # non-nightly builds. Bugs to enable: # # Android: bug 864843 # B2G: bug 866301 - ac_configure_args="$ac_configure_args --without-intl-api" -fi + WITH_INTL="--without-intl-api" +fi +fi +ac_configure_args="$ac_configure_args $WITH_INTL" + if test "$BUILD_CTYPES"; then # Build js-ctypes on the platforms we can. ac_configure_args="$ac_configure_args --enable-ctypes" fi if test -z "$JS_SHARED_LIBRARY" ; then ac_configure_args="$ac_configure_args --disable-shared-js" fi if test -z "$MOZ_NATIVE_NSPR"; then