cvs: php-src / acinclude.m4

From: Date: Thu, 12 Jul 2007 17:46:14 +0000
Subject: cvs: php-src / acinclude.m4
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-45308@lists.php.net to get a copy of this message
jani Thu Jul 12 17:46:14 2007 UTC Modified files: /php-src acinclude.m4 Log: fix the configure output http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.375&r2=1.376&diff_format=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.375 php-src/acinclude.m4:1.376 --- php-src/acinclude.m4:1.375 Wed Jul 11 21:47:04 2007 +++ php-src/acinclude.m4 Thu Jul 12 17:46:14 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.375 2007/07/11 21:47:04 jani Exp $ +dnl $Id: acinclude.m4,v 1.376 2007/07/12 17:46:14 jani Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -2119,7 +2119,7 @@ dnl Common setup macro for ICU dnl AC_DEFUN([PHP_SETUP_ICU],[ - PHP_ARG_WITH(icu-dir, for location of ICU headers and libraries, + PHP_ARG_WITH(icu-dir,, [ --with-icu-dir=DIR Specify where ICU libraries and headers can be found], DEFAULT, no) if test "$PHP_ICU_DIR" = "no"; then @@ -2133,13 +2133,15 @@ ICU_CONFIG="$PHP_ICU_DIR/bin/icu-config" fi + AC_MSG_CHECKING([for location of ICU headers and libraries]) + dnl Trust icu-config to know better what the install prefix is.. icu_install_prefix=$ICU_CONFIG --prefix 2> /dev/null if test "$?" != "0" || test -z "$icu_install_prefix"; then AC_MSG_RESULT([not found]) AC_MSG_ERROR([Unable to detect ICU prefix or $ICU_CONFIG failed. Please verify ICU install prefix and make sure icu-config works.]) else - AC_MSG_RESULT([found in $icu_install_prefix]) + AC_MSG_RESULT([$icu_install_prefix]) dnl Check ICU version AC_MSG_CHECKING([for ICU 3.4 or greater])

« previous php.cvs (#45308) next »