Backed out changesets 3bb63d3b9eea and 901e2b4daebf (bug 1045958) bec…

…ause it was decided the bug isn't wanted on esr31 after all.

build/autoconf/icu.m4

@@ -51,20 +51,14 @@ yes)
     ;;
 esac
 
-if test -n "$ENABLE_INTL_API"; then
-    USE_ICU=1
-fi
-
 if test -n "$EXPOSE_INTL_API"; then
     AC_DEFINE(EXPOSE_INTL_API)
 fi
 
+dnl Settings for the implementation of the ECMAScript Internationalization API
 if test -n "$ENABLE_INTL_API"; then
     AC_DEFINE(ENABLE_INTL_API)
-fi
 
-dnl Settings for the implementation of the ECMAScript Internationalization API
-if test -n "$USE_ICU"; then
     icudir="$_topsrcdir/intl/icu/source"
     if test ! -d "$icudir"; then
         icudir="$_topsrcdir/../../intl/icu/source"
@@ -121,11 +115,10 @@ fi
 
 AC_SUBST(DBG_SUFFIX)
 AC_SUBST(ENABLE_INTL_API)
-AC_SUBST(USE_ICU)
 AC_SUBST(ICU_LIB_NAMES)
 AC_SUBST(MOZ_ICU_LIBS)
 
-if test -n "$USE_ICU" -a -z "$MOZ_NATIVE_ICU"; then
+if test -n "$ENABLE_INTL_API" -a -z "$MOZ_NATIVE_ICU"; then
     dnl We build ICU as a static library for non-shared js builds and as a shared library for shared js builds.
     if test -z "$MOZ_SHARED_ICU"; then
         AC_DEFINE(U_STATIC_IMPLEMENTATION)
@@ -142,7 +135,7 @@ AC_DEFUN([MOZ_SUBCONFIGURE_ICU], [
 
 if test -z "$BUILDING_JS" -o -n "$JS_STANDALONE"; then
 
-    if test -n "$USE_ICU" -a -z "$MOZ_NATIVE_ICU"; then
+    if test -n "$ENABLE_INTL_API" -a -z "$MOZ_NATIVE_ICU"; then
         # Set ICU compile options
         ICU_CPPFLAGS=""
         # don't use icu namespace automatically in client code

configure.in

@@ -8917,10 +8917,6 @@ else
     _INTL_API=no
 fi
 
-if test "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then
-    USE_ICU=1
-fi
-
 MOZ_CONFIG_ICU()
 
 if test -n "$MOZ_NATIVE_ICU"; then

intl/build/moz.build

@@ -12,8 +12,6 @@ LIBRARY_NAME = 'i18n'
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '../icu/source/common',
-    '../icu/source/i18n',
     '../locale/src',
     '../lwbrk/src',
     '../strres/src',

intl/icu/Makefile.in

@@ -5,7 +5,7 @@
 STANDALONE_MAKEFILE = 1
 
 # Ensure that this happens before including rules.mk
-ifdef USE_ICU
+ifdef ENABLE_INTL_API
   ifndef MOZ_NATIVE_ICU
   # Library names: On Windows, ICU uses modified library names for static
   # and debug libraries.
@@ -43,11 +43,11 @@ ifdef USE_ICU
       endif
     endif # MOZ_SHARED_ICU
   endif # !MOZ_NATIVE_ICU
-endif # USE_ICU
+endif # ENABLE_INTL_API
 
 include $(topsrcdir)/config/rules.mk
 
-ifdef USE_ICU
+ifdef ENABLE_INTL_API
 ifndef MOZ_NATIVE_ICU
 ifdef .PYMAKE
 ICU_MAKE = $(GMAKE)

intl/locale/src/mac/moz.build

@@ -13,7 +13,5 @@ UNIFIED_SOURCES += [
 FINAL_LIBRARY = 'i18n'
 LOCAL_INCLUDES += [
     '..',
-    '../../../icu/source/common',
-    '../../../icu/source/i18n',
 ]