techtonik Sun Sep 19 08:59:30 2004 EDT
Modified files:
/phpdoc configure.in
Log:
[FIX] * Check for openjade on windows installed in path manually or from cygwin
package.
http://cvs.php.net/diff.php/phpdoc/configure.in?r1=1.204&r2=1.205&ty=u
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.204 phpdoc/configure.in:1.205
--- phpdoc/configure.in:1.204 Wed Sep 8 14:05:53 2004
+++ phpdoc/configure.in Sun Sep 19 08:59:30 2004
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.204 2004/09/08 18:05:53 dave Exp $
+dnl $Id: configure.in,v 1.205 2004/09/19 12:59:30 techtonik Exp $
dnl autoconf initialisation
AC_INIT()
@@ -118,9 +118,14 @@
JADE=../phpdoc-tools/jade/jade.exe
AC_MSG_RESULT($JADE)
else
- AC_PATH_PROG(OPENJADE,"openjade",no)
+ AC_CHECK_PROG(OPENJADE,"openjade.exe","openjade.exe",no)
if test $OPENJADE = "no"; then
- AC_PATH_PROG(JADE,"jade",no)
+ AC_PATH_PROG(OPENJADE,"openjade",no)
+ if test $OPENJADE = "no"; then
+ AC_PATH_PROG(JADE,"jade",no)
+ else
+ JADE=$OPENJADE
+ fi
else
JADE=$OPENJADE
fi
@@ -132,13 +137,18 @@
JADE=../phpdoc-tools/jade/jade.exe
AC_MSG_RESULT($JADE)
else
- AC_PATH_PROG(OPENJADE,"openjade",no)
+ AC_CHECK_PROG(OPENJADE,"openjade.exe","openjade.exe",no)
if test $OPENJADE = "no"; then
- AC_PATH_PROG(JADE,"jade",no)
+ AC_PATH_PROG(OPENJADE,"openjade",no)
+ if test $OPENJADE = "no"; then
+ AC_PATH_PROG(JADE,"jade",no)
+ else
+ JADE=$OPENJADE
+ fi
else
JADE=$OPENJADE
fi
- fi
+ fi
]
)
if test $JADE = "no"; then
@@ -168,9 +178,14 @@
NSGMLS=../phpdoc-tools/jade/nsgmls.exe
AC_MSG_RESULT($NSGMLS)
else
- AC_PATH_PROG(ONSGMLS,"onsgmls",no)
+ AC_CHECK_PROG(ONSGMLS,"onsgmls.exe","onsgmls.exe",no)
if test $ONSGMLS = "no"; then
- AC_PATH_PROG(NSGMLS,"nsgmls",no)
+ AC_PATH_PROG(ONSGMLS,"onsgmls",no)
+ if test $ONSGMLS = "no"; then
+ AC_PATH_PROG(NSGMLS,"nsgmls",no)
+ else
+ NSGMLS=$ONSGMLS
+ fi
else
NSGMLS=$ONSGMLS
fi
@@ -182,9 +197,14 @@
NSGMLS=../phpdoc-tools/jade/nsgmls.exe
AC_MSG_RESULT($NSGMLS)
else
- AC_PATH_PROG(ONSGMLS,"onsgmls",no)
+ AC_CHECK_PROG(ONSGMLS,"onsgmls.exe","onsgmls.exe",no)
if test $ONSGMLS = "no"; then
- AC_PATH_PROG(NSGMLS,"nsgmls",no)
+ AC_PATH_PROG(ONSGMLS,"onsgmls",no)
+ if test $ONSGMLS = "no"; then
+ AC_PATH_PROG(NSGMLS,"nsgmls",no)
+ else
+ NSGMLS=$ONSGMLS
+ fi
else
NSGMLS=$ONSGMLS
fi
