hholzgra Tue Jan 15 06:30:53 2002 EDT
Modified files:
/phpdoc configure.in
Log:
- check for presence of needed Zend API XML file instead of just the dir
still won't work with new file layout in current Zend API CVS,
but it will at least ignore it then
let's see what breaks this night ...
- improve debug output of .in file versions
- whitespace in --help
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.115 phpdoc/configure.in:1.116
--- phpdoc/configure.in:1.115 Mon Jan 14 07:41:02 2002
+++ phpdoc/configure.in Tue Jan 15 06:30:53 2002
@@ -1,11 +1,13 @@
-dnl $Id: configure.in,v 1.115 2002/01/14 12:41:02 hholzgra Exp $
+dnl $Id: configure.in,v 1.116 2002/01/15 11:30:53 hholzgra Exp $
dnl autoconf initialisation
AC_INIT()
dnl debug output
echo "file versions"
-fgrep '$Id' *.in | head -1 | sed -e"s/^.*: //g" | sed -e"s/200.\/.*$//g"
+for $file in $srcdir/*.in; do
+ fgrep '$Id' $file | head -1 | sed -e"s/^.*: //g" | sed -e"s/200.\/.*$//g"
+done
echo "configure options: $@"
echo
@@ -183,7 +185,7 @@
AC_MSG_CHECKING(for docbook.dsl)
AC_ARG_WITH(dsssl,
-[ --with-dsssl=[DIR] Look for DSSSL stylesheets in the specified directory],
+[ --with-dsssl=[DIR] Look for DSSSL stylesheets in the specified directory],
[
if test -f "$withval/html/docbook.dsl" ; then
DOCBOOK_HTML=$withval/html/docbook.dsl
@@ -234,7 +236,7 @@
AC_MSG_CHECKING(for docbook.xsl)
AC_ARG_WITH(xsl,
-[ --with-xsl=[URI] Look for XSL stylesheets at the specified URI],
+[ --with-xsl=[URI] Look for XSL stylesheets at the specified URI],
[
if test -f "$dir/html/docbook.xsl"; then
DOCBOOKXSL_BIGHTML=$withval/html/docbook.xsl
@@ -322,7 +324,7 @@
AC_MSG_CHECKING(for PHP source path)
AC_ARG_WITH(source,
-[ --with-source=[DIR] Look at the specified source directory],
+[ --with-source=[DIR] Look at the specified source directory],
[
if test -d "$withval" ; then
PHP_SOURCE=$withval
@@ -347,7 +349,7 @@
AC_ARG_WITH(zendapi,
[ --with-zendapi=[DIR] Look for ZendAPI documentation in the specified
directory],
[
- if test -d "$withval" ; then
+ if test -f "$withval/Extending_Zend.xml" ; then
ZENDAPI=$withval
fi
],[
@@ -356,8 +358,8 @@
$srcdir/ZendAPI \
$srcdir/../ZendAPI
do
- if test -d "$dir"; then
- ZENDAPI="autodetected $dir"
+ if test -f "$dir/Extending_Zend.xml"; then
+ ZENDAPI="$dir"
break
fi
done
@@ -640,7 +642,7 @@
echo "%zend.defs;" >> entities/chapters.ent
echo "<!-- end ZendAPI integration -->" >> entities/chapters.ent
echo >> entities/chapters.ent
- else
+else
echo "<!-- ZendAPI not found -->" >> entities/chapters.ent
echo "<!ENTITY zend.api \"\">" >> entities/chapters.ent
fi
