Mercurial > hg > openttd
changeset 12980:bae510cf1644 draft
(svn r17474) -Fix: in some cases compilation failed because the search path for ICU wasn't added to the ldflags
author | rubidium <rubidium@openttd.org> |
---|---|
date | Tue, 08 Sep 2009 14:49:36 +0000 |
parents | 6266831f418a |
children | bee7b7b5b53e |
files | config.lib |
diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/config.lib +++ b/config.lib @@ -1366,7 +1366,7 @@ 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 @@ 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