configure.ac | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
New commits:
commit 8e01e195d20dba9f32ee0954fd7e3374ac02f16a
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Mon Jan 28 06:36:55 2013 +0100
Check for icu CXXFLAGS too
diff --git a/configure.ac b/configure.ac
index ddd0f71..885ce3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,16 +68,20 @@ AC_CHECK_HEADER(
# ========
# 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
- ICU_CFLAGS=`${ICU_CONFIG} --cppflags-searchpath`
+ 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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
