Bug 899722 Part 3: Fix build on BSD after bug 853301 by properly enabling the ECMAScript intl API. r=glandium
authorLandry Breuil <landry@openbsd.org>
Wed, 14 Aug 2013 13:05:06 +0200
changeset 142523 65822b58fa9b65526375a2cba675a184c5412367
parent 142522 02017a95970f98893f146c8c09cb2c4fe41aeed6
child 142524 becd6422ddc78b675fb07826fc2aa87960c688eb
push id32439
push userlandry@openbsd.org
push dateWed, 14 Aug 2013 11:05:39 +0000
treeherdermozilla-inbound@65822b58fa9b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs899722, 853301
milestone26.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
Bug 899722 Part 3: Fix build on BSD after bug 853301 by properly enabling the ECMAScript intl API. r=glandium
js/src/configure.in
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -4285,17 +4285,17 @@ if test -n "$ENABLE_INTL_API"; then
     AC_DEFINE(ENABLE_INTL_API)
     # We build ICU as a static library.
     AC_DEFINE(U_STATIC_IMPLEMENTATION)
 
     case "$OS_TARGET" in
         WINNT)
             ICU_LIB_NAMES="icuin icuuc icudt"
             ;;
-        Darwin|Linux)
+        Darwin|Linux|DragonFly|FreeBSD|NetBSD|OpenBSD)
             ICU_LIB_NAMES="icui18n icuuc icudata"
             ;;
         *)
             AC_MSG_ERROR([ECMAScript Internationalization API is not yet supported on this platform])
     esac
 
     ICU_LIBS='$(call EXPAND_LIBNAME_PATH,$(ICU_LIB_NAMES),$(DEPTH)/intl/icu/lib)'
 else
@@ -4332,16 +4332,19 @@ if test -n "$ENABLE_INTL_API" ; then
             ICU_TARGET=MacOSX
             ;;
         Linux)
             ICU_TARGET=Linux
             ;;
         WINNT)
             ICU_TARGET=MSYS/MSVC
             ;;
+        DragonFly|FreeBSD|NetBSD|OpenBSD)
+            ICU_TARGET=BSD
+            ;;
     esac
 
     # To reduce library size, use static linking
     ICU_LINK_OPTS="--enable-static --disable-shared"
     # Force the ICU static libraries to be position independent code
     ICU_CFLAGS="$DSO_PIC_CFLAGS"
     ICU_CXXFLAGS="$DSO_PIC_CFLAGS"