Sophie

Sophie

distrib > Mageia > 5 > x86_64 > media > core-updates-src > by-pkgid > 080db94901af40d7e638c4e1885a075f > files > 7

iceape-2.38-1.mga5.src.rpm

diff -up comm-release/mozilla/configure.in.shared-icu comm-release/mozilla/configure.in
--- comm-release/mozilla/configure.in.shared-icu	2014-05-12 22:50:03.757008489 +0200
+++ comm-release/mozilla/configure.in	2014-05-12 22:57:34.990187024 +0200
@@ -3923,6 +3923,7 @@ dnl ====================================
 dnl System ICU Support
 dnl ========================================================
 MOZ_NATIVE_ICU=
+MOZ_SHARED_ICU=
 MOZ_ARG_WITH_BOOL(system-icu,
 [  --with-system-icu
                           Use system ICU (located with pkgconfig)],
@@ -3930,7 +3931,6 @@ MOZ_ARG_WITH_BOOL(system-icu,
 
 if test -n "$MOZ_NATIVE_ICU"; then
     PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1)
-    MOZ_JS_STATIC_LIBS="$MOZ_JS_STATIC_LIBS $MOZ_ICU_LIBS"
     MOZ_SHARED_ICU=1
 else
     MOZ_ICU_CFLAGS='-I$(topsrcdir)/intl/icu/source/common -I$(topsrcdir)/intl/icu/source/i18n'
@@ -3938,6 +3938,7 @@ else
 fi
 
 AC_SUBST(MOZ_NATIVE_ICU)
+AC_SUBST(MOZ_SHARED_ICU)
 
 dnl ========================================================
 dnl Java SDK support
diff -up comm-release/mozilla/js/src/configure.in.shared-icu comm-release/mozilla/js/src/configure.in
--- comm-release/mozilla/js/src/configure.in.shared-icu	2014-04-29 07:02:54.000000000 +0200
+++ comm-release/mozilla/js/src/configure.in	2014-05-12 22:50:03.932006620 +0200
@@ -4221,6 +4221,7 @@ dnl ECMAScript Internationalization API
 dnl ========================================================
 ICU_LIB_NAMES=
 MOZ_NATIVE_ICU=
+MOZ_SHARED_ICU=
 MOZ_ARG_WITH_BOOL(system-icu,
 [  --with-system-icu
                           Use system ICU (located with pkgconfig)],
@@ -4308,6 +4309,7 @@ AC_SUBST(ENABLE_INTL_API)
 AC_SUBST(ICU_LIB_NAMES)
 AC_SUBST(MOZ_ICU_LIBS)
 AC_SUBST(MOZ_NATIVE_ICU)
+AC_SUBST(MOZ_SHARED_ICU)
 
 dnl Settings for ICU
 if test -n "$ENABLE_INTL_API" -a -z "$MOZ_NATIVE_ICU"; then