Bug 714556. (Av1a) Remove Native uconv from the tree. r=mbanner.
authorSerge Gautherie <sgautherie.bz@free.fr>
Sat, 14 Jan 2012 02:33:27 +0100
changeset 10414 459717882b5b399efa4bbb84f9b9f27377a3c0a0
parent 10413 7c894b95efe463e247b483e330858ef1c3f0fe6c
child 10415 a66d30b82ac27c0deb2033c529e601d4d0b5497c
push idunknown
push userunknown
push dateunknown
reviewersmbanner
bugs714556
Bug 714556. (Av1a) Remove Native uconv from the tree. r=mbanner.
config/autoconf.mk.in
configure.in
suite/installer/Makefile.in
suite/installer/package-manifest.in
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -111,17 +111,16 @@ INCREMENTAL_LINKER = @INCREMENTAL_LINKER
 MACOSX_DEPLOYMENT_TARGET = @MACOSX_DEPLOYMENT_TARGET@
 MOZ_CALENDAR	= @MOZ_CALENDAR@
 MOZ_PLAINTEXT_EDITOR_ONLY = @MOZ_PLAINTEXT_EDITOR_ONLY@
 MOZ_COMPOSER = @MOZ_COMPOSER@
 ENABLE_TESTS	= @ENABLE_TESTS@
 IBMBIDI = @IBMBIDI@
 MOZ_UNIVERSALCHARDET = @MOZ_UNIVERSALCHARDET@
 ACCESSIBILITY = @ACCESSIBILITY@
-MOZ_USE_NATIVE_UCONV = @MOZ_USE_NATIVE_UCONV@
 MOZ_LDAP_XPCOM = @MOZ_LDAP_XPCOM@
 MOZ_BRANDING_DIRECTORY = @MOZ_BRANDING_DIRECTORY@
 MOZ_INSTALLER	= @MOZ_INSTALLER@
 MOZ_UPDATER	= @MOZ_UPDATER@
 MOZ_UPDATE_CHANNEL = @MOZ_UPDATE_CHANNEL@
 MOZ_UPDATE_PACKAGING	= @MOZ_UPDATE_PACKAGING@
 MOZ_NO_ACTIVEX_SUPPORT = @MOZ_NO_ACTIVEX_SUPPORT@
 MOZ_DISABLE_VISTA_SDK_REQUIREMENTS = @MOZ_DISABLE_VISTA_SDK_REQUIREMENTS@
--- a/configure.in
+++ b/configure.in
@@ -4547,17 +4547,16 @@ MOZ_RDF=1
 MOZ_SAFE_BROWSING=
 MOZ_HELP_VIEWER=
 MOZ_SPELLCHECK=1
 MOZ_STORAGE=1
 MOZ_TIMELINE=
 MOZ_UI_LOCALE=en-US
 MOZ_UNIVERSALCHARDET=1
 MOZ_URL_CLASSIFIER=
-MOZ_USE_NATIVE_UCONV=
 MOZ_XSLT_STANDALONE=
 MOZ_XTF=1
 MOZ_XUL=1
 MOZ_ZIPWRITER=1
 NS_PRINTING=1
 NSS_DISABLE_DBM=
 BUILD_CTYPES=1
 
@@ -5150,31 +5149,16 @@ if test "$MOZ_WIDGET_TOOLKIT" = "qt"; th
     NS_PRINTING=
 fi
 
 if test "$NS_PRINTING"; then
     AC_DEFINE(NS_PRINTING)
 fi
 
 dnl ========================================================
-dnl use native unicode converters
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(native-uconv,
-[  --enable-native-uconv   Enable iconv support],
-    MOZ_USE_NATIVE_UCONV=1,
-    MOZ_USE_NATIVE_UCONV= )
-if test "$MOZ_USE_NATIVE_UCONV"; then
-    AC_DEFINE(MOZ_USE_NATIVE_UCONV)
-fi
-if test "$OS_ARCH" != "WINCE" -a "$OS_ARCH" != "WINNT" -a "$MOZ_USE_NATIVE_UCONV" -a "$ac_cv_func_iconv" != "yes"; then
-    AC_MSG_ERROR([iconv() not found.  Cannot enable native uconv support.])
-fi
-
-
-dnl ========================================================
 dnl Libeditor can be build as plaintext-only,
 dnl or as a full html and text editing component.
 dnl We build both by default.
 dnl ========================================================
 MOZ_ARG_ENABLE_BOOL(plaintext-editor-only,
 [  --enable-plaintext-editor-only
                           Allow only plaintext editing],
     MOZ_PLAINTEXT_EDITOR_ONLY=1,
@@ -6825,17 +6809,16 @@ AC_SUBST(MOZ_DEBUG_FLAGS)
 AC_SUBST(MOZ_DEBUG_LDFLAGS)
 AC_SUBST(WARNINGS_AS_ERRORS)
 AC_SUBST(MOZ_JSDEBUGGER)
 AC_SUBST(MOZ_PLUGINS)
 AC_SUBST(MOZ_LOG_REFCNT)
 AC_SUBST(MOZ_JPROF)
 AC_SUBST(MOZ_SHARK)
 AC_SUBST(MOZ_PROFILING)
-AC_SUBST(MOZ_USE_NATIVE_UCONV)
 AC_SUBST(MOZ_QUANTIFY)
 AC_SUBST(MOZ_LDAP_XPCOM)
 AC_SUBST(LDAP_CFLAGS)
 AC_SUBST(LDAP_LIBS)
 AC_SUBST(LIBICONV)
 AC_SUBST(MOZ_PLACES_BOOKMARKS)
 AC_SUBST(MOZ_STORAGE)
 AC_SUBST(MOZ_FEEDS)
--- a/suite/installer/Makefile.in
+++ b/suite/installer/Makefile.in
@@ -95,20 +95,16 @@ endif
 ifdef _MSC_VER
 DEFINES += -D_MSC_VER=$(_MSC_VER)
 endif
 
 ifdef MOZ_URL_CLASSIFIER
 DEFINES += -DMOZ_URL_CLASSIFIER=1
 endif
 
-ifdef MOZ_USE_NATIVE_UCONV
-DEFINES += -DMOZ_USE_NATIVE_UCONV=1
-endif
-
 ifdef MOZ_UPDATER
 DEFINES += -DMOZ_UPDATER=1
 endif
 
 ifdef MOZ_MOVEMAIL
 DEFINES += -DMOZ_MOVEMAIL=1
 endif
 
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -269,19 +269,16 @@
 @BINPATH@/components/toolkitplaces.manifest
 @BINPATH@/components/toolkitprofile.xpt
 #ifdef UNIX_BUT_NOT_MAC
 @BINPATH@/components/toolkitremote.xpt
 #endif
 @BINPATH@/components/toolkitsearch.manifest
 @BINPATH@/components/txmgr.xpt
 @BINPATH@/components/txtsvc.xpt
-#ifdef MOZ_USE_NATIVE_UCONV
-@BINPATH@/components/ucnative.xpt
-#endif
 @BINPATH@/components/uconv.xpt
 @BINPATH@/components/unicharutil.xpt
 @BINPATH@/components/update.xpt
 @BINPATH@/components/uriloader.xpt
 @BINPATH@/components/urlformatter.xpt
 @BINPATH@/components/webBrowser_core.xpt
 @BINPATH@/components/webbrowserpersist.xpt
 @BINPATH@/components/widget.xpt