Merge branch 'master' of git://git.indexdata.com/m4

diff --git a/ac_check_icu.m4 b/ac_check_icu.m4
index 9bdf505..933b513 100644 (file)
--- a/ac_check_icu.m4
+++ b/ac_check_icu.m4
@@ -44,7 +44,7 @@ AC_DEFUN([AC_CHECK_ICU],[
                    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
@@ -66,7 +66,7 @@ AC_DEFUN([AC_CHECK_ICU],[
                    fi
                    case $host_os in
                        solaris*)
-                           ICU_LIBS="$ICU_LIBS -lCrun"
+                           AC_CHECK_LIB([Crun],[_fini],[ICU_LIBS="$ICU_LIBS -lCrun"])
                            ;;
                    esac
                    AC_MSG_RESULT($ICU_LIBS)