X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ac_check_icu.m4;h=508032c3b9f6692c2f4a0e53a02846f79f167b1f;hb=1fa0b45a8141955801938f967f1d1dca1b042c17;hp=8a2bb76d6e044193a040946b6cfb6952f25e2d95;hpb=ceea085d34fec783149865faab7769c6561ae2fb;p=m4-moved-to-github.git diff --git a/ac_check_icu.m4 b/ac_check_icu.m4 index 8a2bb76..508032c 100644 --- a/ac_check_icu.m4 +++ b/ac_check_icu.m4 @@ -24,7 +24,7 @@ AC_DEFUN([AC_CHECK_ICU],[ succeeded=no icudir=default - AC_ARG_WITH(icu,[ --with-icu[=PREFIX] use libicu in PREFIX],icudir=$withval) + AC_ARG_WITH(icu,[ --with-icu[=PREFIX] use ICU libs in PREFIX],icudir=$withval) if test "$icudir" != "no"; then if test "$icudir" = "yes" -o "$icudir" = "default"; then @@ -41,8 +41,13 @@ AC_DEFUN([AC_CHECK_ICU],[ AC_MSG_RESULT(yes) succeeded=yes + ICU_PREFIX=`$ICU_CONFIG --prefix` + AC_MSG_CHECKING(ICU_CPPFLAGS) ICU_CPPFLAGS=`$ICU_CONFIG --cppflags`"" + if test "$ICU_PREFIX" = "/usr"; then + ICU_CPPFLAGS=`echo $ICU_CPPFLAGS|sed 's@-I/usr/include@@'` + fi AC_MSG_RESULT($ICU_CPPFLAGS) AC_MSG_CHECKING(ICU_CFLAGS) @@ -54,7 +59,11 @@ AC_DEFUN([AC_CHECK_ICU],[ AC_MSG_RESULT($ICU_CXXFLAGS) AC_MSG_CHECKING(ICU_LIBS) - ICU_LIBS=`$ICU_CONFIG --ldflags` + if test "$ICU_PREFIX" = "/usr"; then + ICU_LIBS=`$ICU_CONFIG --ldflags-libsonly` + else + ICU_LIBS=`$ICU_CONFIG --ldflags` + fi AC_MSG_RESULT($ICU_LIBS) else ICU_CPPFLAGS=""