mirror of
https://github.com/php/php-src.git
synced 2024-09-22 10:27:25 +00:00
- Improved PHP_SETUP_ICU
This commit is contained in:
parent
82dc2c505f
commit
d7401d3649
29
acinclude.m4
29
acinclude.m4
@ -2122,30 +2122,16 @@ dnl
|
||||
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 @@ AC_DEFUN([PHP_SETUP_ICU],[
|
||||
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 @@ AC_DEFUN([PHP_SETUP_ICU],[
|
||||
fi
|
||||
])
|
||||
|
||||
|
||||
dnl
|
||||
dnl PHP_SETUP_KERBEROS(shared-add [, action-found [, action-not-found]])
|
||||
dnl
|
||||
|
Loading…
Reference in New Issue
Block a user