cvs: peardoc / configure.in

From: Date: Sat, 10 Dec 2005 21:55:19 +0000
Subject: cvs: peardoc / configure.in
Groups: php.pear.doc 
Request: Send a blank email to pear-doc+get-7290@lists.php.net to get a copy of this message
techtonik Sat Dec 10 16:55:19 2005 EDT Modified files: /peardoc configure.in Log: + look for openjade in phpdoc-tools + use default openjade catalog from phpdoc or phpdoc-tools directory (it is missed in cygwin 1.3.3-1 distributive) * some ws and code replacements to anchor winmerge on sync with phpdoc http://cvs.php.net/diff.php/peardoc/configure.in?r1=1.22&r2=1.23&ty=u Index: peardoc/configure.in diff -u peardoc/configure.in:1.22 peardoc/configure.in:1.23 --- peardoc/configure.in:1.22 Sat Dec 10 11:54:36 2005 +++ peardoc/configure.in Sat Dec 10 16:55:18 2005 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.22 2005/12/10 16:54:36 techtonik Exp $ +dnl $Id: configure.in,v 1.23 2005/12/10 21:55:18 techtonik Exp $ dnl peardoc autoconf initialisation AC_INIT(global.ent) @@ -72,6 +72,12 @@ dnl use given argument, if any, else search in path AC_PATH_PROG(OPENJADECHK, "openjade", no) if test $OPENJADECHK = "no"; then + AC_MSG_CHECKING(for openjade in phpdoc-tools) + if test -e ../phpdoc-tools/openjade/bin/openjade.exe ; then + JADE=../phpdoc-tools/openjade/bin/openjade.exe + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) dnl OpenJade isnt present, so look for the older Jade instead AC_PATH_PROG(JADECHK, "jade", no) if test $JADECHK = "no"; then @@ -86,6 +92,7 @@ else JADE=$JADECHK fi + fi else JADE=$OPENJADECHK fi @@ -163,6 +170,8 @@ dnl }}} +dnl {{{ check for DocBook stuff + dnl AC_MSG_CHECKING(for DocBook doctype) dnl check_catalog_files() { dnl for catalog in $@; do @@ -196,15 +205,17 @@ DOCBOOK_DOCTYPE="-//Norman Walsh//DTD DocBk XML V1.4//EN" AC_SUBST(DOCBOOK_DOCTYPE) +dnl {{{ check for DSSSL stylesheets + 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 -d "$withval" ; then - DOCBOOK_HTML=$withval/html/docbook.dsl - AC_MSG_RESULT(in $withval) - fi + if test -f "$withval/html/docbook.dsl" ; then + DOCBOOK_HTML=$withval/html/docbook.dsl + AC_MSG_RESULT(in $withval) + fi ],[ for dir in \ /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh \ @@ -245,55 +256,33 @@ DOCBOOK_HTML="/usr/lib/sgml/stylesheets/nwalsh-modular/html/docbook.dsl" AC_MSG_RESULT(defaulting - WARNING!!! DSSSL NOT FOUND - WON'T WORK THIS WAY) fi + AC_SUBST(DOCBOOK_HTML) +dnl }}} + +dnl {{{ check for catalog files dnl Do something smart to find catalog-files CATALOG="" -case uname in - dnl SuSE 6.2/6.3 need this - Linux) if test -e /usr/share/sgml/CATALOG.docbk30 - then - CATALOG="$CATALOG -c /usr/share/sgml/CATALOG.docbk30" - fi - ;; - dnl Solaris 10 has almost everything installed by default, but - dnl in nonstandard paths - SunOS) if test uname -r = "5.10" - then - if test -e /usr/sfw/share/sgml/openjade/catalog - then - CATALOG="$CATALOG -c /usr/sfw/share/sgml/openjade/catalog" - fi - if test -e /var/lib/sgml/CATALOG.docbook_4 - then - CATALOG="$CATALOG -c /var/lib/sgml/CATALOG.docbook_4" - fi - dnl this file needs to be created manually with exactly - dnl this path since it is referenced in /usr/share/sgml/CATALOG.doc* - AC_MSG_CHECKING(for ISO 8879 entities) - if test ! -e /var/lib/sgml/CATALOG.iso_ent - then - AC_MSG_RESULT(not found) - AC_MSG_WARN(ISO 8879 entities are not included in Solaris 10) - AC_MSG_WARN(by default. You should download them from:) - AC_MSG_WARN() - AC_MSG_WARN(http://www.oasis-open.org/cover/ISOEnts.zip) - AC_MSG_WARN() - AC_MSG_WARN(and unzip them to /var/lib/sgml/entities/. You will) - AC_MSG_WARN(also need to create /var/lib/sgml/CATALOG.iso_ent ) - AC_MSG_WARN(catalog file by hand. Alternatively download one ) - AC_MSG_WARN(from:) - AC_MSG_WARN() - AC_MSG_WARN(http://www.appelsiini.net/~tuupola/php/download/CATALOG.iso_ent) - else - AC_MSG_RESULT(ok) - fi - fi - ;; -esac +dnl iso-ents catalog file +if test -e ../phpdoc/entities/ISO/catalog +then + CATALOG="$CATALOG -c ../phpdoc/entities/ISO/catalog" +else + if test -e ../phpdoc-tools/iso-entities/catalog + then + CATALOG="$CATALOG -c ../phpdoc-tools/iso-entities/catalog" + fi +fi + +dnl DSSSL catalog file +if test -e ../phpdoc-tools/dsssl/docbook/catalog +then + CATALOG="$CATALOG -c ../phpdoc-tools/dsssl/docbook/catalog" +fi dnl For windows (and maybe *nix too?) users lacking catalog-files @@ -303,26 +292,68 @@ then CATALOG="$CATALOG -c ../phpdoc-tools/jade/catalog" fi +dnl SuSE openjade setup +if test -e /usr/share/sgml/CATALOG.docbk41 +then + CATALOG="$CATALOG -c /usr/share/sgml/CATALOG.docbk41" +fi +if test -e /usr/share/sgml/CATALOG.jade_dsl +then + CATALOG="$CATALOG -c /usr/share/sgml/CATALOG.jade_dsl" +fi -dnl iso-ents catalog file -if test -e ../phpdoc-tools/iso-entities/catalog +dnl As a very last option, include default catalog files from phpdoc +dnl (imported from the openjade distribution) +if test -e ../phpdoc/dsssl/defaults/catalog then - CATALOG="$CATALOG -c ../phpdoc-tools/iso-entities/catalog" + CATALOG="$CATALOG -c ../phpdoc/dsssl/defaults/catalog" else - if test -e ../phpdoc/entities/ISO/catalog + if test -e ../phpdoc-tools/openjade/dsssl/catalog then - CATALOG="$CATALOG -c ../phpdoc/entities/ISO/catalog" + CATALOG="$CATALOG -c ../phpdoc-tools/openjade/dsssl/catalog" fi fi -dnl dsssl catalog file -if test -e ../phpdoc-tools/dsssl/docbook/catalog +dnl Solaris 10 has almost everything installed by default, but +dnl in nonstandard paths +if test "uname -sr" = "SunOS 5.10" then - CATALOG="$CATALOG -c ../phpdoc-tools/dsssl/docbook/catalog" + if test -e /usr/sfw/share/sgml/openjade/catalog + then + CATALOG="$CATALOG -c /usr/sfw/share/sgml/openjade/catalog" + fi + if test -e /var/lib/sgml/CATALOG.docbook_4 + then + CATALOG="$CATALOG -c /var/lib/sgml/CATALOG.docbook_4" + fi + dnl this file needs to be created manually with exactly + dnl this path since it is referenced in /usr/share/sgml/CATALOG.doc* + AC_MSG_CHECKING(for ISO 8879 entities) + if test ! -e /var/lib/sgml/CATALOG.iso_ent + then + AC_MSG_RESULT(not found) + AC_MSG_WARN(ISO 8879 entities are not included in Solaris 10) + AC_MSG_WARN(by default. You should download them from:) + AC_MSG_WARN() + AC_MSG_WARN(http://www.oasis-open.org/cover/ISOEnts.zip) + AC_MSG_WARN() + AC_MSG_WARN(and unzip them to /var/lib/sgml/entities/. You will) + AC_MSG_WARN(also need to create /var/lib/sgml/CATALOG.iso_ent ) + AC_MSG_WARN(catalog file by hand. Alternatively download one ) + AC_MSG_WARN(from:) + AC_MSG_WARN() + AC_MSG_WARN(http://www.appelsiini.net/~tuupola/php/download/CATALOG.iso_ent) + else + AC_MSG_RESULT(ok) + fi fi AC_SUBST(CATALOG) +dnl }}} + +dnl }}} + AC_MSG_CHECKING(for docbook.xsl) AC_ARG_WITH(xsl, [ --with-xsl=[URI] Look for XSL stylesheets at the specified URI],

« previous php.pear.doc (#7290) next »