From: Antony Dovgal Date: Mon, 15 Jan 2007 14:07:18 +0000 (+0000) Subject: tabs -> ws X-Git-Tag: RELEASE_1_0_0RC1~262 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0cbf04266d309483fd986c8e8f718b1d7e43e14c;p=php tabs -> ws --- diff --git a/acinclude.m4 b/acinclude.m4 index a9ffc0d02e..8ddc6e3933 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2098,25 +2098,25 @@ AC_DEFUN([PHP_SETUP_ICU],[ 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 "x$withval" != "xyes"; then + PHP_ICU_DIR=$withval + else + PHP_ICU_DIR=DEFAULT + fi ], [ - PHP_ICU_DIR=DEFAULT + PHP_ICU_DIR=DEFAULT ]) 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 + 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 else - ICU_CONFIG="$PHP_ICU_DIR/bin/icu-config" + ICU_CONFIG="$PHP_ICU_DIR/bin/icu-config" fi dnl Trust icu-config to know better what the install prefix is.. @@ -2127,23 +2127,24 @@ AC_DEFUN([PHP_SETUP_ICU],[ else AC_MSG_RESULT([found in $icu_install_prefix]) - dnl Check ICU version - AC_MSG_CHECKING([for ICU 3.4 or greater]) - icu_version_full=`$ICU_CONFIG --version` - ac_IFS=$IFS - IFS="." - set $icu_version_full - 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 - - ICU_INCS=`$ICU_CONFIG --cppflags-searchpath` - ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio` - PHP_EVAL_INCLINE($ICU_INCS) - PHP_EVAL_LIBLINE($ICU_LIBS, $1) + dnl Check ICU version + AC_MSG_CHECKING([for ICU 3.4 or greater]) + icu_version_full=`$ICU_CONFIG --version` + ac_IFS=$IFS + IFS="." + set $icu_version_full + 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 + + ICU_INCS=`$ICU_CONFIG --cppflags-searchpath` + ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio` + PHP_EVAL_INCLINE($ICU_INCS) + PHP_EVAL_LIBLINE($ICU_LIBS, $1) fi ])