jani Wed Jul 11 10:35:47 2007 UTC
Modified files:
/php-src acinclude.m4
Log:
- Improved PHP_SETUP_ICU
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.372&r2=1.373&diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.372 php-src/acinclude.m4:1.373
--- php-src/acinclude.m4:1.372 Wed Jul 11 10:27:16 2007
+++ php-src/acinclude.m4 Wed Jul 11 10:35:47 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.372 2007/07/11 10:27:16 jani Exp $
+dnl $Id: acinclude.m4,v 1.373 2007/07/11 10:35:47 jani Exp $
dnl
dnl This file contains local autoconf functions.
dnl
@@ -2122,30 +2122,16 @@
dnl Common setup macro for ICU
dnl
AC_DEFUN([PHP_SETUP_ICU],[
- unset PHP_ICU_DIR
+ PHP_ARG_WITH(icu-dir, for location of ICU headers and libraries,
+ [ --with-icu-dir=DIR Specify where ICU libraries and headers can be
found], DEFAULT, no)
- AC_MSG_CHECKING([for location of ICU headers and libraries])
-
- AC_ARG_WITH(icu-dir,
- [ --with-icu-dir=DIR Specify where ICU libraries and headers can be
found],
- [
- if test "x$withval" != "xyes"; then
- PHP_ICU_DIR=$withval
- else
- PHP_ICU_DIR=DEFAULT
- fi
- ], [
+ if test "$PHP_ICU_DIR" = "no"; then
PHP_ICU_DIR=DEFAULT
- ])
+ fi
if test "$PHP_ICU_DIR" = "DEFAULT"; then
- ICU_CONFIG=icu-config
- for i in /usr/local/bin /usr/bin; do
- if test -x "$i/icu-config"; then
- ICU_CONFIG=$i/icu-config
- break;
- fi
- done
+ dnl Try to find icu-config
+ AC_PATH_PROG(ICU_CONFIG, icu-config, no, [$PATH:/usr/local/bin])
else
ICU_CONFIG="$PHP_ICU_DIR/bin/icu-config"
fi
@@ -2167,7 +2153,7 @@
IFS=$ac_IFS
icu_version=`expr [$]1 \* 1000 + [$]2`
AC_MSG_RESULT([found $icu_version_full])
-
+
if test "$icu_version" -lt "3004"; then
AC_MSG_ERROR([ICU version 3.4 or later is required])
fi
@@ -2179,7 +2165,6 @@
fi
])
-
dnl
dnl PHP_SETUP_KERBEROS(shared-add [, action-found [, action-not-found]])
dnl
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
