cvs: phpdoc / configure.in

jimw Thu Jul 4 16:59:26 2002 EDT Modified files: /phpdoc configure.in Log: * AC_PATH_PROGS() apparently doesn't work, so just use AC_PATH_PROG and a little more shell muscle. * die if php can't be found, it's a critical part of the build process now. * update java tests similarly, it wasn't being used at all Index: phpdoc/configure.in diff -u phpdoc/configure.in:1.153 phpdoc/configure.in:1.154 --- phpdoc/configure.in:1.153 Tue Jul 2 21:07:45 2002 +++ phpdoc/configure.in Thu Jul 4 16:59:26 2002 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.153 2002/07/03 01:07:45 jimw Exp $ +dnl $Id: configure.in,v 1.154 2002/07/04 20:59:26 jimw Exp $ dnl autoconf initialisation AC_INIT() @@ -37,7 +37,11 @@ PHP=../phpdoc-tools/php.bat AC_MSG_RESULT($PHP) else - AC_PATH_PROGS(PHP,"php php4",no) + AC_PATH_PROG(PHP,"php",no) + if test $PHP = "no"; then + AC_PATH_PROG(PHP4,"php4",no) + PHP=$PHP4 + fi fi fi ],[ @@ -46,12 +50,16 @@ PHP=../phpdoc-tools/php.bat AC_MSG_RESULT($PHP) else - AC_PATH_PROGS(PHP,"php php4",no) + AC_PATH_PROG(PHP,"php",no) + if test $PHP = "no"; then + AC_PATH_PROG(PHP4,"php4",no) + PHP=$PHP4 + fi fi ] ) if test $PHP = "no"; then - AC_MSG_WARN([no PHP binary found]) + AC_MSG_ERROR([no PHP binary found]) else AC_MSG_CHECKING([php version]) PHPVERSION=$PHP -qv @@ -59,7 +67,7 @@ AC_MSG_RESULT($PHPVERSION ok) else AC_MSG_RESULT($PHPVERSION) - AC_MSG_WARN([PHP version 4.0.0 or newer needed]) + AC_MSG_ERROR([PHP version 4.0.0 or newer needed]) PHP=no fi fi @@ -157,7 +165,7 @@ dnl use given argument, if any, else search in path AC_ARG_WITH(java, -[ --with-java=PATH Look for JAVA executable], +[ --with-java=PATH Look for Java runtime], [ if test $withval != "yes"; then AC_MSG_CHECKING([for java]) @@ -179,14 +187,22 @@ AC_MSG_ERROR([$withval: no java binary found]) fi else - AC_PATH_PROGS(JAVA,"java jre",no) + AC_PATH_PROG(JAVA,"java",no) + if test "$JAVA" = "no"; then + AC_PATH_PROG(JRE,"jre",no) + JAVA=$JRE + fi fi ],[ AC_PATH_PROGS(JAVA,"java jre",no) + if test "$JAVA" = "no"; then + AC_PATH_PROG(JRE,"jre",no) + JAVA=$JRE + fi ] ) if test $JAVA = "no"; then - AC_MSG_WARN([no JAVA binary found]) + AC_MSG_WARN([no Java runtime found]) fi AC_SUBST(JAVA)