Bug 1746986 - Move --disable-universalchardet to python configure. r=…

…firefox-build-system-reviewers,mhentges

Differential Revision: https://phabricator.services.mozilla.com/D134344

build/moz.configure/old.configure

@@ -92,7 +92,6 @@ def old_configure_options(*options):
     "--cache-file",
     "--datadir",
     "--enable-official-branding",
-    "--enable-universalchardet",
     "--enable-updater",
     "--enable-zipwriter",
     "--includedir",

old-configure.in

@@ -1214,7 +1214,6 @@ MOZ_ARG_HEADER(Application)
 
 MOZ_BRANDING_DIRECTORY=
 MOZ_OFFICIAL_BRANDING=
-MOZ_UNIVERSALCHARDET=1
 MOZ_ZIPWRITER=1
 MOZ_NO_SMART_CARDS=
 MOZ_BINARY_EXTENSIONS=
@@ -1385,15 +1384,6 @@ if test -n "$MOZ_APPLEMEDIA"; then
 fi
 fi # COMPILE_ENVIRONMENT
 
-dnl ========================================================
-dnl = Universalchardet
-dnl ========================================================
-MOZ_ARG_DISABLE_BOOL(universalchardet,
-[  --disable-universalchardet
-                          Disable universal encoding detection],
-  MOZ_UNIVERSALCHARDET=,
-  MOZ_UNIVERSALCHARDET=1 )
-
 dnl ========================================================
 dnl Gamepad support
 dnl ========================================================
@@ -1763,7 +1753,6 @@ AC_SUBST_LIST(ASFLAGS)
 AC_SUBST_LIST(MOZ_DEBUG_LDFLAGS)
 AC_SUBST_LIST(WARNINGS_CFLAGS)
 
-AC_SUBST(MOZ_UNIVERSALCHARDET)
 AC_SUBST(MOZ_STUB_INSTALLER)
 AC_SUBST(MOZ_UPDATER)
 

toolkit/moz.configure

@@ -2855,3 +2855,11 @@ with only_when(compile_environment):
     # Set MOZ_PIXMAN_CFLAGS to an explicit empty value when --enable-system-pixman is *not* used,
     # for layout/style/extra-bindgen-flags
     set_config("MOZ_PIXMAN_CFLAGS", [], when=in_tree_pixman)
+
+
+# Universalchardet
+# ==============================================================
+with only_when(compile_environment):
+    option("--disable-universalchardet", help="Disable universal encoding detection")
+
+    set_config("MOZ_UNIVERSALCHARDET", True, when="--enable-universalchardet")