tony2001 Mon Jan 15 14:07:18 2007 UTC
Modified files:
/php-src acinclude.m4
Log:
tabs -> ws
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.359&r2=1.360&diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.359 php-src/acinclude.m4:1.360
--- php-src/acinclude.m4:1.359 Mon Jan 15 14:03:55 2007
+++ php-src/acinclude.m4 Mon Jan 15 14:07:18 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.359 2007/01/15 14:03:55 tony2001 Exp $
+dnl $Id: acinclude.m4,v 1.360 2007/01/15 14:07:18 tony2001 Exp $
dnl
dnl This file contains local autoconf functions.
dnl
@@ -2098,25 +2098,25 @@
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 @@
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
])
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
