goba Thu Jul 25 07:58:42 2002 EDT
Modified files:
/phpdoc configure.in
Log:
I don't know, how relative paths worked so far, while there were two
basedirs (the dsssl dir and the $srcdir) for dsssl sheet includes.
Just to make things consistent, I have "corrected" the dsssl sheets
path to be relative to the dsssl dir and not to $srcdir. As I have tested
it works OK, but we'll see, how it works...
Odd old manual XSL stylesheet option removed (I added it some time ago,
but it was just a bad workaround)
Some more old DSL checks removed, and added notes to some parts
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.161 phpdoc/configure.in:1.162
--- phpdoc/configure.in:1.161 Thu Jul 25 07:06:38 2002
+++ phpdoc/configure.in Thu Jul 25 07:58:41 2002
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.161 2002/07/25 11:06:38 goba Exp $
+dnl $Id: configure.in,v 1.162 2002/07/25 11:58:41 goba Exp $
dnl autoconf initialisation
AC_INIT()
@@ -226,8 +226,11 @@
AC_MSG_RESULT(in $withval)
fi
],[
- DOCBOOK_HTML="$srcdir/dsssl/docbook/html/docbook.dsl"
- DOCBOOK_PRINT="$srcdir/dsssl/docbook/print/docbook.dsl"
+ # these path values are relative to the phpdoc/dsssl directory!
+ # DOCBOOK_HTML and DOCBOOOK_PRINT are only substituted in that
+ # directory
+ DOCBOOK_HTML="./docbook/html/docbook.dsl"
+ DOCBOOK_PRINT="./docbook/print/docbook.dsl"
AC_MSG_RESULT([$srcdir/dsssl/docbook (default)])
])
if test -z "$DOCBOOK_HTML"; then
@@ -254,6 +257,7 @@
fi
],[
for dir in \
+ $srcdir/xsl/docbook \
$srcdir/phpdoc-tools/xsl \
$srcdir/phpdoc-tools/xsl/docbook \
$srcdir/../phpdoc-tools/xsl \
@@ -278,27 +282,6 @@
dnl }}}
-dnl {{{ manual XSLT stylesheets option [temp]
-
-AC_MSG_CHECKING(for manually specified docbook.xsl)
-
-AC_ARG_WITH(mxsl,
-[ --with-mxsl=[DIR] Look for XSL stylesheets in the manually specified DIR],
-[
- DOCBOOKXSL_BIGHTML=$withval/html/docbook.xsl
- DOCBOOKXSL_HTML=$withval/html/chunk.xsl
- DOCBOOKXSL_PRINT=$withval/fo/docbook.xsl
- AC_MSG_RESULT(in $withval)
-])
-if test -z "$DOCBOOKXSL_BIGHTML"; then
- AC_MSG_RESULT(not found)
-fi
-AC_SUBST(DOCBOOKXSL_BIGHTML)
-AC_SUBST(DOCBOOKXSL_HTML)
-AC_SUBST(DOCBOOKXSL_PRINT)
-
-dnl }}}
-
if test -z "$DOCBOOK_HTML" -a -z "$DOCBOOKXSL_HTML"; then
AC_MSG_ERROR(WARNING!!! NO STYLESHEETS FOUND - WON'T WORK THIS WAY)
fi
@@ -308,16 +291,11 @@
dnl Do something smart to find catalog-files
CATALOG=""
-dnl SuSE 6.2/6.3 need this
-dnl if test -e /usr/share/sgml/CATALOG.docbk30
-dnl then
-dnl CATALOG="$CATALOG -c /usr/share/sgml/CATALOG.docbk30"
-dnl fi
-
dnl For windows (and maybe *nix too?) users lacking catalog-files
dnl jade catalog file
# how about using JADEPATH? You should replace the last 4 chars ('jade') with catalog
+# !! JADEPATH may not properly be set on windows, so do not use it !!
if test -e ../phpdoc-tools/jade/catalog
then
CATALOG="$CATALOG -c ../phpdoc-tools/jade/catalog"
--
PHP Documentation Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
