[gentoo-commits] gentoo-x86 commit in dev-libs/libxml2/files: libxml2-2.9.1-icu-pkgconfig.patch

[Alexandre Rostovtsev (tetromino)]

tetromino    13/12/30 05:31:08

  Added:                libxml2-2.9.1-icu-pkgconfig.patch
  Log:
  Add multilib support (bug #480404, thanks to David Heidelberger (okias) and  Alexis Ballier).
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

Revision  Changes    Path
1.1                  dev-libs/libxml2/files/libxml2-2.9.1-icu-pkgconfig.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/files/libxml2-2.9.1-icu-pkgconfig.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libxml2/files/libxml2-2.9.1-icu-pkgconfig.patch?rev=1.1&content-type=text/plain

Index: libxml2-2.9.1-icu-pkgconfig.patch
===================================================================
diff --git a/configure.in b/configure.in
index 7374564..13c8d4e 100644
--- a/configure.in
+++ b/configure.in
@@ -1444,19 +1444,11 @@ XML_LIBTOOLLIBS="libxml2.la"
 AC_SUBST(WITH_ICONV)
 
 WITH_ICU=0
-ICU_LIBS=""
 if test "$with_icu" != "yes" ; then
     echo Disabling ICU support
 else
-    ICU_CONFIG=icu-config
-    if ${ICU_CONFIG} --cflags >/dev/null 2>&1
-    then
-        ICU_LIBS=`${ICU_CONFIG} --ldflags`
-        WITH_ICU=1
-        echo Enabling ICU support
-    else
-        AC_MSG_ERROR([libicu config program icu-config not found])
-    fi
+    PKG_CHECK_MODULES(ICU, icu-i18n)
+    WITH_ICU=1
 fi
 AC_SUBST(WITH_ICU)
 AC_SUBST(ICU_LIBS)