Bug 947402 - Don't attempt to package shared ICU for --with-system-icu; r=glandium

browser/installer/Makefile.in

@@ -112,6 +112,9 @@ endif
 DEFINES += -DBINPATH=$(BINPATH)
 
 DEFINES += -DMOZ_ICU_VERSION=$(MOZ_ICU_VERSION)
+ifdef MOZ_NATIVE_ICU
+DEFINES += -DMOZ_NATIVE_ICU
+endif
 ifdef MOZ_SHARED_ICU
 DEFINES += -DMOZ_SHARED_ICU
 endif

browser/installer/package-manifest.in

@@ -101,6 +101,7 @@
 #endif
 #endif
 #endif
+#ifndef MOZ_NATIVE_ICU
 #ifdef MOZ_SHARED_ICU
 #ifdef XP_WIN
 #ifdef MOZ_DEBUG
@@ -122,6 +123,7 @@
 @BINPATH@/libicuuc.so.@MOZ_ICU_VERSION@
 #endif
 #endif
+#endif
 
 [browser]
 ; [Base Browser Files]