[Libreoffice-commits] .: configure.ac

[Libreoffice Gerrit user]

 configure.ac |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 14d0efcd5387a26c8e364efbd4b7a6fd1f925194
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Jan 28 06:36:10 2013 +0100

    Check for icu CXXFLAGS in pkg-config branch too

diff --git a/configure.ac b/configure.ac
index 446aa40..cf5d9bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,16 +65,20 @@ AC_SUBST(ZLIB_LIBS)
 # ========
 # Find icu
 # ========
-PKG_CHECK_MODULES([ICU],[icu-i18n],[],[
+AS_IF([test "${ICU_CFLAGS+set}" = set],[
+	ICU_CFLAGS_overriden=yes],[
+	ICU_CFLAGS_overriden=no])
+PKG_CHECK_MODULES([ICU],[icu-i18n],[
+	AS_IF([test "${ICU_CFLAGS_overriden}" = no], [
+		ICU_CFLAGS="${ICU_CFLAGS} `${PKG_CONFIG} icu-i18n --variable=CXXFLAGS`"])
+	], [
 	AC_PATH_PROG([ICU_CONFIG],[icu-config])
 	AC_MSG_CHECKING([ICU installation])
-	if ${ICU_CONFIG} --cflags >/dev/null 2>&1; then
+	AS_IF([${ICU_CONFIG} --cflags >/dev/null 2>&1],[
 		ICU_CFLAGS=`${ICU_CONFIG} --cppflags-searchpath --cxxflags`
 		ICU_LIBS=`${ICU_CONFIG} --ldflags`
-		AC_MSG_RESULT([found])
-	else
-		AC_MSG_ERROR([libicu config program icu-config not found])
-	fi]
+		AC_MSG_RESULT([found])],[
+		AC_MSG_ERROR([libicu config program icu-config not found])])]
 )
 AC_SUBST(ICU_CFLAGS)
 AC_SUBST(ICU_LIBS)