diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-01-24 10:10:49 +0100 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-01-24 10:10:49 +0100 |
commit | be6b5a214a365dedb8351014a90604d30b3bd4ac (patch) | |
tree | 51c0023763e31eab330231ee4db8f24f03ba95e6 | |
parent | 27334faa41525b7f85fd193817956d4e34390fde (diff) |
Detect ICU by pkg-config first and fallback on icu-config only after
-rw-r--r-- | configure.ac | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 9ae19b8..ddd0f71 100644 --- a/configure.ac +++ b/configure.ac @@ -68,15 +68,17 @@ AC_CHECK_HEADER( # ======== # Find icu # ======== -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` - ICU_LIBS=`${ICU_CONFIG} --ldflags` - AC_MSG_RESULT([found]) -else - AC_MSG_ERROR([libicu config program icu-config not found]) -fi +PKG_CHECK_MODULES([ICU],[icu-i18n],[],[ + 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` + ICU_LIBS=`${ICU_CONFIG} --ldflags` + AC_MSG_RESULT([found]) + else + AC_MSG_ERROR([libicu config program icu-config not found]) + fi] +) AC_SUBST(ICU_CFLAGS) AC_SUBST(ICU_LIBS) |