goba Sat Jul 27 08:55:38 2002 EDT
Modified files:
/phpdoc configure.in
Log:
Changed chmonly integration to a simpler model
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.165 phpdoc/configure.in:1.166
--- phpdoc/configure.in:1.165 Thu Jul 25 13:03:03 2002
+++ phpdoc/configure.in Sat Jul 27 08:55:38 2002
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.165 2002/07/25 17:03:03 goba Exp $
+dnl $Id: configure.in,v 1.166 2002/07/27 12:55:38 goba Exp $
dnl autoconf initialisation
AC_INIT()
@@ -411,16 +411,25 @@
[
if test "$withval" = "yes"; then
CHMENABLED=yes
+ CHMONLY_INCL_BEGIN=""
+ CHMONLY_INCL_END=""
AC_MSG_RESULT([enabled])
else
CHMENABLED=no
+ CHMONLY_INCL_BEGIN="<!--"
+ CHMONLY_INCL_END="-->"
AC_MSG_RESULT([disabled])
fi
],[
CHMENABLED=no
+ CHMONLY_INCL_BEGIN="<!--"
+ CHMONLY_INCL_END="-->"
AC_MSG_RESULT([disabled (default)])
])
+AC_SUBST(CHMONLY_INCL_BEGIN)
+AC_SUBST(CHMONLY_INCL_END)
+
dnl }}}
dnl }}}
@@ -666,7 +675,7 @@
if test $PHP != "no"
then
dnl note that the # signs are all just part of a workaround for the Windows PHP
invocation which has some problems
- $PHP -c $srcdir/scripts -q $srcdir/scripts/file-entities.php
$LANGDIR#$srcdir#`pwd`#$DOCBOOKXSL_USED#$CHMENABLED#$ZENDAPI
+ $PHP -c $srcdir/scripts -q $srcdir/scripts/file-entities.php
+$LANGDIR#$srcdir#`pwd`#$DOCBOOKXSL_USED#$ZENDAPI
else
echo creating entities/file-entities.ent [in configure]
@@ -691,22 +700,6 @@
echo "<!ENTITY zendapi.toc \"\">" >> entities/file-entities.ent
echo >> entities/file-entities.ent
echo " Zend part not found"
- fi
-
- dnl }}}
-
- dnl {{{ .CHM entities
-
- if test "$CHMENABLED" = "yes"; then
- echo "<!-- chmonly pages inclusion enabled -->" >> entities/file-entities.ent
- echo "<!ENTITY chmonly SYSTEM 'chmonly.xml'>" >> entities/file-entities.ent
- echo >> entities/file-entities.ent
- echo " CHM inclusion enabled"
- else
- echo "<!-- chmonly pages inclusion disabled -->" >> entities/file-entities.ent
- echo "<!ENTITY chmonly ''>" >> entities/file-entities.ent
- echo >> entities/file-entities.ent
- echo " CHM inclusion disabled"
fi
dnl }}}
--
PHP Documentation Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
