goba Thu Jul 25 07:06:39 2002 EDT
Modified files:
/phpdoc configure.in
Log:
Removing (all these were already commented out for some time):
- DTD checks (we use DocBook 4.1.2)
- DSSSL sheets check (we have a DSSSL distro in dsssl/docbok)
- DCL checks for suse 6.x (we use our own: dtds/dbxml-4.1.2/phpdoc.dcl)
- old print style sheets checks (correct in current sheets)
Index: phpdoc/configure.in
diff -u phpdoc/configure.in:1.160 phpdoc/configure.in:1.161
--- phpdoc/configure.in:1.160 Sat Jul 20 11:49:37 2002
+++ phpdoc/configure.in Thu Jul 25 07:06:38 2002
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.160 2002/07/20 15:49:37 goba Exp $
+dnl $Id: configure.in,v 1.161 2002/07/25 11:06:38 goba Exp $
dnl autoconf initialisation
AC_INIT()
@@ -213,56 +213,6 @@
dnl {{{ check for DocBook stuff
-dnl {{{ check for docbook DTD
-
-dnl AC_MSG_CHECKING(for DocBook doctype)
-dnl check_catalog_files() {
-dnl for catalog in $@; do
-dnl DBDT=`grep -E '^PUBLIC.*"docbook.dtd".*$' $catalog 2>/dev/null | cut -d'"' -f
2 `
-dnl if test -n "$DBDT" ; then
-dnl DOCBOOK_DOCTYPE=$DBDT
-dnl return 1
-dnl fi
-dnl MORECATS=`grep -i '^catalog' $catalog 2>/dev/null | cut -d'"' -f 2`
-dnl if test -n "$MORECATS" ; then
-dnl if check_catalog_files $MORECATS ; then
-dnl return 1
-dnl else
-dnl return 0
-dnl fi
-dnl fi
-dnl return 0
-dnl done
-dnl return 0
-dnl }
-dnl if test -n "$SGML_CATALOG_FILES" ; then
-dnl CATFILES=`echo $SGML_CATALOG_FILES | sed -e 's/:/ /'g`
-dnl check_catalog_files $CATFILES
-dnl fi
-dnl if test -n "$DOCBOOK_DOCTYPE"; then
-dnl AC_MSG_RESULT(got $DOCBOOK_DOCTYPE)
-dnl else
-dnl DOCBOOK_DOCTYPE="-//Davenport//DTD DocBook V3.0//EN"
-dnl AC_MSG_RESULT(defaulting to $DOCBOOK_DOCTYPE)
-dnl fi
-
-dnl if grep -q methodsynopsis $srcdir/en/functions/array.xml; then
-dnl DOCBOOK_DOCTYPE="-//OASIS//DTD DocBook XML V4.1.2//EN"
-dnl DOCBOOK_VERSION="4.1.2"
-dnl else
-dnl DOCBOOK_DOCTYPE="-//Norman Walsh//DTD DocBk XML V3.1.7//EN"
-dnl DOCBOOK_VERSION="3.1.7"
-dnl fi
-
-dnl always use DocBook version 4.1.2
-DOCBOOK_DOCTYPE="-//OASIS//DTD DocBook XML V4.1.2//EN"
-DOCBOOK_VERSION="4.1.2"
-
-AC_SUBST(DOCBOOK_DOCTYPE)
-AC_SUBST(DOCBOOK_VERSION)
-
-dnl }}}
-
dnl {{{ check for DSSSL stylesheets
AC_MSG_CHECKING(for docbook.dsl)
@@ -276,38 +226,9 @@
AC_MSG_RESULT(in $withval)
fi
],[
-dnl for dir1 in $srcdir/phpdoc-tools/dsssl \
-dnl $srcdir/../phpdoc-tools/dsssl \
-dnl /usr/share/sgml \
-dnl /usr/local/share/sgml \
-dnl /usr/lib/sgml \
-dnl /usr/lib/dsssl \
-dnl /usr/local/lib/sgml \
-dnl /usr/local/lib/dsssl \
-dnl /opt/sgml/lib
-dnl do
-dnl for dir2 in docbook \
-dnl docbook/dsssl-stylesheets-1.59 \
-dnl docbook/dsssl-stylesheets \
-dnl docbook/dsssl/modular \
-dnl docbook/stylesheet/dsssl/modular \
-dnl docbk30/dsl \
-dnl docbkdsl \
-dnl stylesheets/docbook \
-dnl stylesheets/nwalsh-modular
-dnl do
-dnl if test -f "$dir1/$dir2/html/docbook.dsl"; then
-dnl DOCBOOK_HTML="$dir1/$dir2/html/docbook.dsl"
-dnl DOCBOOK_PRINT="$dir1/$dir2/print/docbook.dsl"
-dnl AC_MSG_RESULT(autodetected: $dir1/$dir2)
-dnl break
-dnl fi
-dnl done
-dnl if test ! -z "$DOCBOOK_HTML"; then break; fi
-dnl done
-DOCBOOK_HTML="$srcdir/dsssl/docbook/html/docbook.dsl"
-DOCBOOK_PRINT="$srcdir/dsssl/docbook/print/docbook.dsl"
-AC_MSG_RESULT(default: $srcdir/dsssl/docbook)
+ DOCBOOK_HTML="$srcdir/dsssl/docbook/html/docbook.dsl"
+ DOCBOOK_PRINT="$srcdir/dsssl/docbook/print/docbook.dsl"
+ AC_MSG_RESULT([$srcdir/dsssl/docbook (default)])
])
if test -z "$DOCBOOK_HTML"; then
AC_MSG_RESULT(not found)
@@ -700,42 +621,6 @@
AC_SUBST(SP_OPTIONS)
AC_SUBST(HTMLHELP_ENCODING)
-
-dnl }}}
-
-dnl {{{ check for some common sources of trouble
-
-dnl sanity checks for SuSE 6.x
-dnl if test -e /usr/share/sgml/docbk30/docbook.dcl
-dnl then
-dnl if grep -n "NAMELEN.\+44" /usr/share/sgml/docbk30/docbook.dcl /dev/null
-dnl then
-dnl AC_MSG_WARN(please change this to e.g. 'NAMELEN 54' in
/usr/share/sgml/docbk30/docbook.dcl )
-dnl fi
-dnl if grep -n "OMITTAG.\+NO" /usr/share/sgml/docbk30/docbook.dcl /dev/null
-dnl then
-dnl AC_MSG_WARN(please change this to 'OMITTAG YES' in
/usr/share/sgml/docbk30/docbook.dcl )
-dnl fi
-
-dnl look for tex bug in print stylesheet
-dnl if test -e /usr/share/sgml/docbkdsl/print/dbprint.dsl
-dnl then
-dnl if test 2 -eq `grep -c tex /usr/share/sgml/docbkdsl/print/dbprint.dsl`
-dnl then
-dnl if fgrep -q 'country: (dsssl-country-code)'
/usr/share/sgml/docbkdsl/print/dbprint.dsl
-dnl then
-dnl if ! grep -q ';;.*country:' /usr/share/sgml/docbkdsl/print/dbprint.dsl
-dnl then
-dnl AC_MSG_WARN(to prevent a tex bug you should comment out )
-dnl AC_MSG_WARN('country: (dsssl-country-code)' )
-dnl AC_MSG_WARN(in /usr/share/sgml/docbkdsl/print/dbprint.dsl )
-dnl AC_MSG_WARN(or update your DSSSL-Stylesheets)
-dnl AC_MSG_WARN(to at least version 1.54)
-dnl fi
-dnl fi
-dnl fi
-dnl fi
-dnl fi
dnl }}}
--
PHP Documentation Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
