Fix boost not found on debian-testing MP-628

[m4-moved-to-github.git] / ac_check_icu.m4

diff --git a/ac_check_icu.m4 b/ac_check_icu.m4
index 8a2bb76..933b513 100644 (file)
--- 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`""
+                   ICU_CPPFLAGS=`$ICU_CONFIG --cppflags-searchpath`""
+                   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,16 @@ 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
+                   case $host_os in
+                       solaris*)
+                           AC_CHECK_LIB([Crun],[_fini],[ICU_LIBS="$ICU_LIBS -lCrun"])
+                           ;;
+                   esac
                    AC_MSG_RESULT($ICU_LIBS)
                else
                    ICU_CPPFLAGS=""