techtonik Tue Mar 1 12:28:40 2005 EDT
Modified files:
/phpdoc configure.in
Log:
* proper openjade detection on win32
http://cvs.php.net/diff.php/phpdoc/configure.in?r1=1.217&r2=1.218&ty=u
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.217 phpdoc/configure.in:1.218
--- phpdoc/configure.in:1.217 Tue Mar 1 06:38:30 2005
+++ phpdoc/configure.in Tue Mar 1 12:28:40 2005
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.217 2005/03/01 11:38:30 techtonik Exp $
+dnl $Id: configure.in,v 1.218 2005/03/01 17:28:40 techtonik Exp $
dnl autoconf initialisation
AC_INIT()
@@ -130,16 +130,17 @@
JADE=../phpdoc-tools/jade/jade.exe
AC_MSG_RESULT($JADE)
else
- AC_CHECK_PROG(OPENJADE,"openjade.exe","openjade.exe",no)
- if test $OPENJADE = "no"; then
+ if test -e ../phpdoc-tools/openjade/openjade.exe ; then
+ AC_MSG_CHECKING([for jade])
+ 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
- else
- JADE=$OPENJADE
fi
fi
fi
@@ -149,16 +150,17 @@
JADE=../phpdoc-tools/jade/jade.exe
AC_MSG_RESULT($JADE)
else
- AC_CHECK_PROG(OPENJADE,"openjade.exe","openjade.exe",no)
- if test $OPENJADE = "no"; then
+ if test -e ../phpdoc-tools/openjade/openjade.exe ; then
+ AC_MSG_CHECKING([for jade])
+ 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
- else
- JADE=$OPENJADE
fi
fi
]
@@ -190,16 +192,17 @@
NSGMLS=../phpdoc-tools/jade/nsgmls.exe
AC_MSG_RESULT($NSGMLS)
else
- AC_CHECK_PROG(ONSGMLS,"onsgmls.exe","onsgmls.exe",no)
- if test $ONSGMLS = "no"; then
+ if test -e ../phpdoc-tools/openjade/onsgmls.exe ; then
+ AC_MSG_CHECKING([for nsgmls])
+ 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
- else
- NSGMLS=$ONSGMLS
fi
fi
fi
@@ -209,16 +212,17 @@
NSGMLS=../phpdoc-tools/jade/nsgmls.exe
AC_MSG_RESULT($NSGMLS)
else
- AC_CHECK_PROG(ONSGMLS,"onsgmls.exe","onsgmls.exe",no)
- if test $ONSGMLS = "no"; then
+ if test -e ../phpdoc-tools/openjade/onsgmls.exe ; then
+ AC_MSG_CHECKING([for nsgmls])
+ 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
- else
- NSGMLS=$ONSGMLS
fi
fi
]
