sniper Mon Aug 15 19:36:53 2005 EDT
Modified files:
/php-src configure.in
Log:
Fail gracefully if icu-config is not found
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.585&r2=1.586&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.585 php-src/configure.in:1.586
--- php-src/configure.in:1.585 Mon Aug 15 18:30:38 2005
+++ php-src/configure.in Mon Aug 15 19:36:52 2005
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.585 2005/08/15 22:30:38 sniper Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.586 2005/08/15 23:36:52 sniper Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -784,13 +784,14 @@
fi
if test -z "$ICU_DIR"; then
AC_MSG_RESULT(not found)
- AC_MSG_ERROR(Please specify where ICU libraries and header file are located)
+ AC_MSG_ERROR([Please specify where ICU libraries and header file are
located])
fi
ICU_CONFIG="icu-config"
-if ${ICU_DIR}/bin/icu-config --ldflags > /dev/null 2>&1; then
+if ! test -x "$ICU_DIR/bin/$ICU_CONFIG"; then
+ AC_MSG_ERROR([$ICU_CONFIG not found.])
+elif ${ICU_DIR}/bin/icu-config --ldflags > /dev/null 2>&1; then
ICU_CONFIG=${ICU_DIR}/bin/icu-config
fi
-
AC_MSG_CHECKING(for ICU 3.4 or greater)
icu_version_full=`$ICU_CONFIG --version`
icu_version=`echo ${icu_version_full} | awk 'BEGIN { FS = "."; } { printf
"%d", ($1 * 1000 + $2) ;}'`
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
