sniper Thu Aug 11 20:15:08 2005 EDT
Modified files:
/php-src configure.in
Log:
No tabs in config* files!
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.582&r2=1.583&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.582 php-src/configure.in:1.583
--- php-src/configure.in:1.582 Thu Aug 11 20:10:26 2005
+++ php-src/configure.in Thu Aug 11 20:15:03 2005
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.582 2005/08/12 00:10:26 sniper Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.583 2005/08/12 00:15:03 sniper Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -769,27 +769,28 @@
PHP_ARG_WITH(icu-dir,[location of ICU headers and libraries],
[ --with-icu-dir=DIR Specify where ICU libraries and headers can be
found], DEFAULT, no)
if test "$PHP_ICU_DIR" = "DEFAULT"; then
- AC_MSG_CHECKING(for ICU in default path)
- for i in /usr/local /usr; do
- if test -r $i/include/unicode/utypes.h; then
- ICU_DIR=$i
- AC_MSG_RESULT(found in $i)
- break
- fi
- done
+ AC_MSG_CHECKING(for ICU in default path)
+ for i in /usr/local /usr; do
+ if test -r $i/include/unicode/utypes.h; then
+ ICU_DIR=$i
+ AC_MSG_RESULT(found in $i)
+ break
+ fi
+ done
else
- if test -f $PHP_ICU_DIR/include/unicode/utypes.h; then
- ICU_DIR=$PHP_ICU_DIR
- fi
+ if test -f $PHP_ICU_DIR/include/unicode/utypes.h; then
+ ICU_DIR=$PHP_ICU_DIR
+ fi
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_RESULT(not found)
+ 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
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
