cvs: php-src / acinclude.m4

sniper Mon Jun 27 14:30:16 2005 EDT Modified files: /php-src acinclude.m4 Log: - Cache the xml2-config path http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.323&r2=1.324&ty=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.323 php-src/acinclude.m4:1.324 --- php-src/acinclude.m4:1.323 Wed Jun 22 02:50:24 2005 +++ php-src/acinclude.m4 Mon Jun 27 14:30:14 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.323 2005/06/22 06:50:24 sniper Exp $ +dnl $Id: acinclude.m4,v 1.324 2005/06/27 18:30:14 sniper Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -2305,15 +2305,18 @@ dnl Common setup macro for libxml dnl AC_DEFUN([PHP_SETUP_LIBXML], [ - +AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path, +[ for i in $PHP_LIBXML_DIR /usr/local /usr; do if test -x "$i/bin/xml2-config"; then - XML2_CONFIG="$i/bin/xml2-config" + ac_cv_php_xml2_config_path="$i/bin/xml2-config" break fi done +]) - if test -x "$XML2_CONFIG"; then + if test -x "$ac_cv_php_xml2_config_path"; then + XML2_CONFIG="$ac_cv_php_xml2_config_path" libxml_full_version=$XML2_CONFIG --version ac_IFS=$IFS IFS="."