techtonik Thu Mar 10 09:59:44 2005 EDT
Modified files:
/phpdoc configure.in
Log:
* optimize tools autodetection code
http://cvs.php.net/diff.php/phpdoc/configure.in?r1=1.220&r2=1.221&ty=u
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.220 phpdoc/configure.in:1.221
--- phpdoc/configure.in:1.220 Sun Mar 6 12:00:40 2005
+++ phpdoc/configure.in Thu Mar 10 09:59:43 2005
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.220 2005/03/06 17:00:40 tony2001 Exp $
+dnl $Id: configure.in,v 1.221 2005/03/10 14:59:43 techtonik Exp $
dnl autoconf initialisation
AC_INIT()
@@ -46,11 +46,7 @@
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
+ AC_PATH_PROGS(PHP,"php php4",no)
fi
fi
fi
@@ -65,11 +61,7 @@
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
+ AC_PATH_PROGS(PHP,"php php4",no)
fi
fi
]
@@ -135,12 +127,7 @@
JADE=../phpdoc-tools/openjade/openjade.exe
AC_MSG_RESULT($JADE)
else
- AC_PATH_PROG(OPENJADE,"openjade",no)
- if test $OPENJADE = "no"; then
- AC_PATH_PROG(JADE,"jade",no)
- else
- JADE=$OPENJADE
- fi
+ AC_PATH_PROGS(JADE,"openjade jade",no)
fi
fi
fi
@@ -155,12 +142,7 @@
JADE=../phpdoc-tools/openjade/openjade.exe
AC_MSG_RESULT($JADE)
else
- AC_PATH_PROG(OPENJADE,"openjade",no)
- if test $OPENJADE = "no"; then
- AC_PATH_PROG(JADE,"jade",no)
- else
- JADE=$OPENJADE
- fi
+ AC_PATH_PROGS(JADE,"openjade jade",no)
fi
fi
]
@@ -197,12 +179,7 @@
NSGMLS=../phpdoc-tools/openjade/onsgmls.exe
AC_MSG_RESULT($NSGMLS)
else
- AC_PATH_PROG(ONSGMLS,"onsgmls",no)
- if test $ONSGMLS = "no"; then
- AC_PATH_PROG(NSGMLS,"nsgmls",no)
- else
- NSGMLS=$ONSGMLS
- fi
+ AC_PATH_PROGS(NSGMLS,"onsgmls nsgmls",no)
fi
fi
fi
@@ -217,12 +194,7 @@
NSGMLS=../phpdoc-tools/openjade/onsgmls.exe
AC_MSG_RESULT($NSGMLS)
else
- AC_PATH_PROG(ONSGMLS,"onsgmls",no)
- if test $ONSGMLS = "no"; then
- AC_PATH_PROG(NSGMLS,"nsgmls",no)
- else
- NSGMLS=$ONSGMLS
- fi
+ AC_PATH_PROGS(NSGMLS,"onsgmls nsgmls",no)
fi
fi
]
