bug 212101 only build the NativeUConvService when needed

patch by Stephen Walker <sdwalker@myrealbox.com> r=mkaply sr=dougt a=mkaply

intl/uconv/Makefile.in

@@ -40,7 +40,13 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= uconv
 
-DIRS		= idl public util ucvja ucvcn ucvlatin ucvtw ucvtw2 ucvko ucvibm native src
+DIRS		= idl public util ucvja ucvcn ucvlatin ucvtw ucvtw2 ucvko ucvibm
+
+ifdef MOZ_USE_NATIVE_UCONV
+DIRS		+= native
+endif
+
+DIRS		+= src
 
 ifdef MOZ_MATHML
 DIRS           += ucvmath

intl/uconv/src/nsCharsetConverterManager.cpp

@@ -62,7 +62,10 @@
 #include "nsIUnicodeDecodeHelper.h"
 #include "nsIUnicodeEncodeHelper.h"
 #include "nsCharsetConverterManager.h"
+
+#ifdef MOZ_USE_NATIVE_UCONV
 #include "nsNativeUConvService.h"
+#endif
 
 static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
 static NS_DEFINE_CID(kCharsetAliasCID, NS_CHARSETALIAS_CID);

intl/uconv/src/nsCharsetConverterManager.h

@@ -43,7 +43,9 @@
 #include "nsIStringBundle.h"
 #include "nsISupportsArray.h"
 
+#ifdef MOZ_USE_NATIVE_UCONV
 #include "nsINativeUConvService.h"
+#endif
 
 class nsCharsetConverterManager : public nsICharsetConverterManager
 {