Bug 1425035 - move --enable-ui-locale to moz.configure; r=gps

We need MOZ_UI_LOCALE even when building the JS shell so
config/config.mk variable assignments don't run into issues.  But it
doesn't make any sense to configure a UI locale for the JS shell.  So
make --enable-ui-locale a normal `option`, but give it a `default`,
which is the value shell-only builds will always see.

--HG--
extra : amend_source : 047759dd6ec446d9d6f8f5992ed9cf6628ce859e

build/moz.configure/old.configure

@@ -226,7 +226,6 @@ def old_configure_options(*options):
     '--enable-tasktracer',
     '--enable-thread-sanitizer',
     '--enable-ubsan-int-overflow',
-    '--enable-ui-locale',
     '--enable-universalchardet',
     '--enable-updater',
     '--enable-valgrind',

js/src/old-configure.in

@@ -1394,15 +1394,6 @@ dnl =
 dnl ========================================================
 MOZ_ARG_HEADER(Components and Features)
 
-dnl ========================================================
-dnl = Localization
-dnl ========================================================
-MOZ_ARG_ENABLE_STRING(ui-locale,
-[  --enable-ui-locale=ab-CD
-                          Select the user interface locale (default: en-US)],
-    MOZ_UI_LOCALE=$enableval )
-AC_SUBST(MOZ_UI_LOCALE)
-
 dnl ========================================================
 dnl =
 dnl = Module specific options

moz.configure

@@ -280,6 +280,13 @@ def build_gtest(pgo, build_project, target, automation, enabled, enable_tests):
 
 set_config('LINK_GTEST_DURING_COMPILE', build_gtest)
 
+# Localization
+# ==============================================================
+option('--enable-ui-locale', default='en-US',
+       help='Select the user interface locale (default: en-US)')
+
+set_config('MOZ_UI_LOCALE', depends('--enable-ui-locale')(lambda x: x))
+
 # clang-plugin location
 # ==============================================================
 @depends(library_name_info, check_build_environment, when='--enable-clang-plugin')

old-configure.in

@@ -2006,7 +2006,6 @@ MOZ_PREF_EXTENSIONS=1
 MOZ_REFLOW_PERF=
 MOZ_SPELLCHECK=1
 MOZ_TOOLKIT_SEARCH=1
-MOZ_UI_LOCALE=en-US
 MOZ_UNIVERSALCHARDET=1
 MOZ_XUL=1
 MOZ_ZIPWRITER=1
@@ -2267,15 +2266,6 @@ dnl =
 dnl ========================================================
 MOZ_ARG_HEADER(Components and Features)
 
-dnl ========================================================
-dnl = Localization
-dnl ========================================================
-MOZ_ARG_ENABLE_STRING(ui-locale,
-[  --enable-ui-locale=ab-CD
-                          Select the user interface locale (default: en-US)],
-    MOZ_UI_LOCALE=$enableval )
-AC_SUBST(MOZ_UI_LOCALE)
-
 AC_SUBST(MOZ_OFFICIAL_BRANDING)
 if test -n "$MOZ_OFFICIAL_BRANDING"; then
   if test -z "$MOZ_OFFICIAL_BRANDING_DIRECTORY"; then