phanto Mon Nov 12 18:02:59 2001 EDT
Modified files:
/phpdoc configure.in Makefile.in manual.xml.in
Log:
ZendAPI manual integration
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.79 phpdoc/configure.in:1.80
--- phpdoc/configure.in:1.79 Tue Oct 23 07:18:55 2001
+++ phpdoc/configure.in Mon Nov 12 18:02:58 2001
@@ -1,4 +1,6 @@
-dnl $Id: configure.in,v 1.79 2001/10/23 11:18:55 leszek Exp $
+
+
+dnl $Id: configure.in,v 1.80 2001/11/12 23:02:58 phanto Exp $
AC_INIT(global.ent)
@@ -144,6 +146,33 @@
PHP_BUILD_DATE=`date`
AC_SUBST(PHP_BUILD_DATE)
+AC_MSG_CHECKING(for ZendAPI)
+AC_ARG_WITH(zendapi,
+[ --with-zendapi=[DIR] Look for ZendAPI documentation in the specified
+directory],
+[
+ if test -d "$withval" ; then
+ ZENDAPI=$withval
+ fi
+],[
+ for dir in \
+ ./ZendAPI \
+ ../ZendAPI
+ do
+ if test -d "$dir"; then
+ ZENDAPI=$dir
+ AC_MSG_RESULT(autodetected: $dir)
+ break
+ fi
+ done
+
+ if test -d "$ZENDAPI"; then
+ ZEND_FIGURES="cp -r $ZENDAPI/figures ."
+ else
+ ZEND_FIGURES=""
+ fi
+])
+AC_SUBST(ZEND_FIGURES)
+
AC_MSG_CHECKING(for language)
AC_ARG_WITH(lang,
[ --with-lang=LANG Choose a language to work with],
@@ -439,6 +468,19 @@
DEPEND_FILES=""
rm -f chapters.ent
echo "<!-- DON'T TOUCH - AUTOGENERATED BY ./configure -->" > chapters.ent
+if test -d "$ZENDAPI"; then
+ echo >> chapters.ent
+ echo "<!-- begin ZendAPI integration -->" >> chapters.ent
+ echo "<!ENTITY % zend.defs SYSTEM \"$ZENDAPI/Extending_Zend.ent\">" >>
+chapters.ent
+ echo "<!ENTITY zend.api SYSTEM \"$ZENDAPI/Extending_Zend.xml\">" >>
+chapters.ent
+ echo >> chapters.ent
+ echo "%zend.defs;" >> chapters.ent
+ echo "<!-- end ZendAPI integration -->" >> chapters.ent
+ echo >> chapters.ent
+else
+ echo "<!-- ZendAPI not found -->" >> chapters.ent
+ echo "<!ENTITY zend.api \"\">" >> chapters.ent
+fi
for file in `find $srcdir/en -name "*.xml" | sed -e"s%^$srcdir\/en\/%%g" | sort`
do
name=`echo $file | sed -e"s/\//./g" -e"s/.xml$//g" -e "s/_/-/g"`
@@ -451,6 +493,6 @@
fi
DEPEND_FILES="$DEPEND_FILES $file"
echo "<!ENTITY $name SYSTEM \"$file\">" >> chapters.ent
-done
+done
chmod a-w chapters.ent
Index: phpdoc/Makefile.in
diff -u phpdoc/Makefile.in:1.76 phpdoc/Makefile.in:1.77
--- phpdoc/Makefile.in:1.76 Sat Nov 10 16:18:52 2001
+++ phpdoc/Makefile.in Mon Nov 12 18:02:58 2001
@@ -17,7 +17,7 @@
#
#
-# $Id: Makefile.in,v 1.76 2001/11/10 21:18:52 jimw Exp $
+# $Id: Makefile.in,v 1.77 2001/11/12 23:02:58 phanto Exp $
#
VPATH=@srcdir@
@@ -37,9 +37,9 @@
QUICKREF_STYLESHEET=quickref.dsl
KDEVELOP_TOC_STYLESHEET=kdevelop_toc.dsl
-HTML_DEPS=$(HTML_STYLESHEET) html-common.dsl html-locale.dsl common.dsl
+HTML_DEPS=$(HTML_STYLESHEET) html-common.dsl html-locale.dsl common.dsl zendapi
HOWTO_DEPS=$(HOWTO_STYLESHEET) html-common.dsl html-locale.dsl common.dsl
howto/howto.ent
-PRINT_DEPS=$(PRINT_STYLESHEET) common.dsl
+PRINT_DEPS=$(PRINT_STYLESHEET) common.dsl zendapi
PHPWEB_DEPS=$(PHPWEB_STYLESHEET) html-common.dsl common.dsl
QUICKREF_DEPS=quickref.dsl Makefile
KDEVELOP_TOC_DEPS=kdevelop_toc.dsl Makefile
@@ -71,6 +71,9 @@
.manual.xml: $(DEPEND_FILES) global.ent
touch .manual.xml
+zendapi:
+ @ZEND_FIGURES@
+
html: html/index.html
bightml: @MANUAL@.html
phpweb: php/index.php
@@ -223,7 +226,7 @@
$(NSGMLS) -wno-idref -i lang-$(LANG) -s $(srcdir)/phpdocxml.dcl $<
clean:
- rm -rf html php howto/html
+ rm -rf html php fancy figures howto/html
rm -f @MANUAL@.txt [a-z]*.html @MANUAL@.rtf manual.info
rm -f @MANUAL@.zip @MANUAL@.tar.gz .manual.xml
rm -f manual_*.pdb makedoc *.manifest
Index: phpdoc/manual.xml.in
diff -u phpdoc/manual.xml.in:1.85 phpdoc/manual.xml.in:1.86
--- phpdoc/manual.xml.in:1.85 Sun Nov 11 05:20:10 2001
+++ phpdoc/manual.xml.in Mon Nov 12 18:02:58 2001
@@ -193,6 +193,8 @@
&faq.misc;
</part>
+ &zend.api;
+
<part id="appendixes">
<title>&Appendixes;</title>
&appendices.migration;
