X-Git-Url: http://git.indexdata.com/?p=m4-moved-to-github.git;a=blobdiff_plain;f=ac_check_icu.m4;h=933b513349fc9862692178fac7071b9143247e11;hp=d15b61cae4de2c5d12175373cc01cafb46693525;hb=HEAD;hpb=0f3a69de2f8521acad717e692d0a182a9614cc5b

diff --git a/ac_check_icu.m4 b/ac_check_icu.m4
index d15b61c..933b513 100644
--- a/ac_check_icu.m4
+++ b/ac_check_icu.m4
@@ -44,7 +44,10 @@ 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
 		    AC_MSG_RESULT($ICU_CPPFLAGS)
 		    
 		    AC_MSG_CHECKING(ICU_CFLAGS)
@@ -61,6 +64,11 @@ AC_DEFUN([AC_CHECK_ICU],[
 	            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=""