Tweak ICU detection a little.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@35500 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Niels Grewe 2012-09-03 12:58:48 +00:00
parent 2174f87ede
commit d2401da38c
3 changed files with 12 additions and 0 deletions

View file

@ -1,3 +1,9 @@
2012-09-03 Niels Grewe <niels.grewe@halbordnung.de>
* configure.ac: Fallback to the non icu-config check for ICU in
the general case.
* configure: Regenerate.
2012-09-01 Niels Grewe <niels.grewe@halbordnung.de>
* configure.ac: Implement `--disable-icu-config' switch to

3
configure vendored
View file

@ -28314,6 +28314,9 @@ echo "${ECHO_T}$ICU_LDFLAGS" >&6; }
fi
else
have_icu=no;
fi
if test "$have_icu" = "no"; then
{ echo "$as_me:$LINENO: checking for libicu (icu-config disabled)..." >&5
echo "$as_me: checking for libicu (icu-config disabled)..." >&6;}
if test "$icu_libdir" != "no"; then

View file

@ -3156,6 +3156,9 @@ if test $enable_icu = yes; then
if test "$enable_icu_config" = "yes"; then
AC_CHECK_ICU(4.0, have_icu=yes, have_icu=no)
else
have_icu=no;
fi
if test "$have_icu" = "no"; then
AC_CHECKING([for libicu (icu-config disabled)])
if test "$icu_libdir" != "no"; then
ICU_LDFLAGS="-I$icu_libdir";