summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-09-08 14:49:36 +0000
committerrubidium <rubidium@openttd.org>2009-09-08 14:49:36 +0000
commitcf5f70a1c18b32bfe611132de9d6d27372ce39dc (patch)
treebd62bb3555e91bd77f93dd492a2403e2dd50fd7d
parent472ed0dc76894928570e8a04d79c7d22b5fdca15 (diff)
downloadopenttd-cf5f70a1c18b32bfe611132de9d6d27372ce39dc.tar.xz
(svn r17474) -Fix: in some cases compilation failed because the search path for ICU wasn't added to the ldflags
-rw-r--r--config.lib8
1 files changed, 4 insertions, 4 deletions
diff --git a/config.lib b/config.lib
index 77f663a3e..3cf59ba63 100644
--- a/config.lib
+++ b/config.lib
@@ -1366,7 +1366,7 @@ make_cflags_and_ldflags() {
CFLAGS="$CFLAGS -DWITH_ICU"
CFLAGS="$CFLAGS `$icu_config --cppflags | tr '\n\r' ' '`"
- LIBS="$LIBS `$icu_config --ldflags-libsonly | tr '\n\r' ' '`"
+ LIBS="$LIBS `$icu_config --ldflags-searchpath --ldflags-libsonly | tr '\n\r' ' '`"
fi
@@ -2409,9 +2409,9 @@ detect_icu() {
log 2 " returned $version"
log 2 " exit code $ret"
- if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$shortversion" -lt "20" ]; then
- if [ -n "$shortversion" ] && [ "$shortversion" -lt "20" ]; then
- log 1 "checking libicu... needs at least version 2.0.0, icu NOT enabled"
+ if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$shortversion" -lt "22" ]; then
+ if [ -n "$shortversion" ] && [ "$shortversion" -lt "22" ]; then
+ log 1 "checking libicu... needs at least version 2.2.0, icu NOT enabled"
else
log 1 "checking libicu... not found"
fi