projects
/
m4-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
acee1cf
)
Avoid -L/usr/lib from icu-config
author
Adam Dickmeiss
<adam@indexdata.dk>
Mon, 24 Nov 2008 10:29:18 +0000
(11:29 +0100)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Mon, 24 Nov 2008 10:32:22 +0000
(11:32 +0100)
ac_check_icu.m4
patch
|
blob
|
history
diff --git
a/ac_check_icu.m4
b/ac_check_icu.m4
index
77c9e02
..
d15b61c
100644
(file)
--- 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=""