[Libreoffice-commits] .: configure.in

Jan Holesovsky kendy at kemper.freedesktop.org
Thu Oct 13 03:19:20 PDT 2011


 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8667bf02947dbd91043932842564cf2018ef37d6
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Oct 13 12:18:06 2011 +0200

    icu-config check that survives older icu versions.

diff --git a/configure.in b/configure.in
index c613ffb..d7b9a5c 100644
--- a/configure.in
+++ b/configure.in
@@ -6063,7 +6063,7 @@ if test -n "$with_system_icu" -o -n "$with_system_libs" && \
     AC_PATH_PROG(ICUCONFIG,icu-config,,[$ICUPATH])
 
     AC_MSG_CHECKING([ICU version])
-    ICU_VERSION=`$ICUCONFIG --noverify --version`
+    ICU_VERSION=`$ICUCONFIG --noverify --version 2>/dev/null || $ICUCONFIG --version`
     ICU_MAJOR=`echo $ICU_VERSION | cut -d"." -f1`
     ICU_MINOR=`echo $ICU_VERSION | cut -d"." -f2`
     ICU_MICRO=`echo $ICU_VERSION | cut -d"." -f3`


More information about the Libreoffice-commits mailing list