From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 24 Nov 2008 10:29:18 +0000 (+0100)
Subject: Avoid -L/usr/lib from icu-config
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=0f3a69de2f8521acad717e692d0a182a9614cc5b;p=m4-moved-to-github.git

Avoid -L/usr/lib from icu-config
---

diff --git a/ac_check_icu.m4 b/ac_check_icu.m4
index 77c9e02..d15b61c 100644
--- a/ac_check_icu.m4
+++ b/ac_check_icu.m4
@@ -41,6 +41,8 @@ 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`""
 		    AC_MSG_RESULT($ICU_CPPFLAGS)
@@ -54,7 +56,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=""