diff options
| author | Philip Chimento <philip@endlessm.com> | 2017-03-01 11:23:44 -0800 |
|---|---|---|
| committer | Philip Chimento <philip@endlessm.com> | 2017-03-01 11:29:13 -0800 |
| commit | 192801c2bbd9f8051633a42de526c1bb48426435 (patch) | |
| tree | 0c0537f5d3aec048f72305b3ffedbb75e2ce75fa | |
| parent | ce717c5f270bad92094db30faa7414568ddab91c (diff) | |
| download | gjs-192801c2bbd9f8051633a42de526c1bb48426435.tar.gz | |
Revert "build: Check for Intl API in mozjs"
This reverts commit 04e9f3c5a1e8e8c72499f2ff95285ee6425ad701.
I heard recently from Mozilla (b.m.o bug 1339931) that the js executable
isn't really meant to be distributed. They may yet remove it from the
standalone distribution of mozjs52. Fedora also doesn't distribute it
with their mozjs38.
Sadly, that means there is no way to check at build time whether the Intl
API was compiled into mozjs. We'll have to rely once again on the tests
passing.
https://bugzilla.gnome.org/show_bug.cgi?id=779412
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index ff7b29e8..65fd298c 100644 --- a/configure.ac +++ b/configure.ac @@ -57,10 +57,9 @@ m4_define(glib_required_version, 2.50.0) GOBJECT_INTROSPECTION_REQUIRE([1.41.4]) -ESR=38 GOBJECT_REQUIREMENT="gobject-2.0 >= glib_required_version" gjs_base_packages="$GOBJECT_REQUIREMENT gio-2.0" -common_packages="gthread-2.0 gio-2.0 >= glib_required_version mozjs-$ESR" +common_packages="gthread-2.0 gio-2.0 >= glib_required_version mozjs-38" gjs_packages="gobject-introspection-1.0 libffi $common_packages" gjs_cairo_packages="cairo cairo-gobject $common_packages" gjs_gtk_packages="gtk+-3.0 >= 3.20" @@ -73,16 +72,6 @@ PKG_CHECK_MODULES([GJS_GDBUS], [$gjs_base_packages]) PKG_CHECK_MODULES([GJS_CONSOLE], [$gjs_base_packages]) PKG_CHECK_MODULES([GJSTESTS], [$gjstests_packages]) -# Check that SpiderMonkey was compiled --with-intl-api. Easiest way to do -# this is to check and see if the JS source "Intl" executes correctly. -AC_PATH_PROG([JS_INTERP], ["js$ESR" js]) -AC_MSG_CHECKING([for SpiderMonkey with ES6 Intl API]) -"$JS_INTERP" -e Intl >>config.log 2>&1 -AS_IF([test $? -eq 0], [AC_MSG_RESULT([found])], [AC_MSG_ERROR([not found -The detected SpiderMonkey executable, $JS_INTERP, -does not have the ECMAScript Internationalization API compiled in. Make -sure to add the --with-intl-api configure flag to SpiderMonkey.])]) - # Optional cairo dep (enabled by default) AC_ARG_WITH(cairo, [AS_HELP_STRING([--without-cairo], [Don't build cairo module])]) |