techtonik Tue Mar 1 06:38:30 2005 EDT
Modified files: /phpdoc configure.in Log: + attempt to detect php binary path from pear environment http://cvs.php.net/diff.php/phpdoc/configure.in?r1=1.216&r2=1.217&ty=u Index: phpdoc/configure.in diff -u phpdoc/configure.in:1.216 phpdoc/configure.in:1.217 --- phpdoc/configure.in:1.216 Thu Feb 24 18:08:33 2005 +++ phpdoc/configure.in Tue Mar 1 06:38:30 2005 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.216 2005/02/24 23:08:33 derick Exp $ +dnl $Id: configure.in,v 1.217 2005/03/01 11:38:30 techtonik Exp $ dnl autoconf initialisation AC_INIT() @@ -41,10 +41,16 @@ PHP=../phpdoc-tools/php.bat AC_MSG_RESULT($PHP) else - AC_PATH_PROG(PHP,"php",no) - if test $PHP = "no"; then - AC_PATH_PROG(PHP4,"php4",no) - PHP=$PHP4 + if test -e "$PHP_PEAR_BIN_DIR/cli/php" ; then + AC_MSG_CHECKING([for php]) + PHP="$PHP_PEAR_BIN_DIR/cli/php" + AC_MSG_RESULT($PHP) + else + AC_PATH_PROG(PHP,"php",no) + if test $PHP = "no"; then + AC_PATH_PROG(PHP4,"php4",no) + PHP=$PHP4 + fi fi fi fi @@ -54,10 +60,16 @@ PHP=../phpdoc-tools/php.bat AC_MSG_RESULT($PHP) else - AC_PATH_PROG(PHP,"php",no) - if test $PHP = "no"; then - AC_PATH_PROG(PHP4,"php4",no) - PHP=$PHP4 + if test -e "$PHP_PEAR_BIN_DIR/cli/php" ; then + AC_MSG_CHECKING([for php]) + PHP="$PHP_PEAR_BIN_DIR/cli/php" + AC_MSG_RESULT($PHP) + else + AC_PATH_PROG(PHP,"php",no) + if test $PHP = "no"; then + AC_PATH_PROG(PHP4,"php4",no) + PHP=$PHP4 + fi fi fi ]