cvs: phpdoc / configure.in

hholzgra Sat Jan 5 15:45:05 2002 EDT Modified files: /phpdoc configure.in Log: somewhat cleand up the dsssl stylesheet detection modified warning to be emitted only if neither DSSSL nor XSL stylesheets found Index: phpdoc/configure.in diff -u phpdoc/configure.in:1.95 phpdoc/configure.in:1.96 --- phpdoc/configure.in:1.95 Sat Jan 5 15:13:53 2002 +++ phpdoc/configure.in Sat Jan 5 15:45:05 2002 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.95 2002/01/05 20:13:53 hholzgra Exp $ +dnl $Id: configure.in,v 1.96 2002/01/05 20:45:05 hholzgra Exp $ dnl autoconf initialisation AC_INIT() @@ -114,13 +114,13 @@ fi fi ],[ - if test -e ../phpdoc-tools/jade/nsgmls.exe ; then - AC_MSG_CHECKING([for nsgmls]) - NSGMLS=../phpdoc-tools/jade/nsgmls.exe - AC_MSG_RESULT($NSGMLS) - else - AC_PATH_PROG(NSGMLS,"nsgmls",no) - fi + if test -e ../phpdoc-tools/jade/nsgmls.exe ; then + AC_MSG_CHECKING([for nsgmls]) + NSGMLS=../phpdoc-tools/jade/nsgmls.exe + AC_MSG_RESULT($NSGMLS) + else + AC_PATH_PROG(NSGMLS,"nsgmls",no) + fi ] ) AC_SUBST(NSGMLS) @@ -175,51 +175,39 @@ AC_ARG_WITH(dsssl, [ --with-dsssl=[DIR] Look for DSSSL stylesheets in the specified directory], [ - if test -d "$withval" ; then - DOCBOOK_HTML=$withval/html/docbook.dsl - DOCBOOK_PRINT=$withval/print/docbook.dsl - AC_MSG_RESULT(in $withval) - fi + if test -d "$withval" ; then + DOCBOOK_HTML=$withval/html/docbook.dsl + DOCBOOK_PRINT=$withval/print/docbook.dsl + AC_MSG_RESULT(in $withval) + fi ],[ - for dir in \ - /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh \ - /usr/local/share/sgml/docbook/dsssl/modular \ - /usr/lib/dsssl/stylesheets/docbook \ - /usr/lib/dsssl/stylesheets/nwalsh-modular \ - /usr/lib/dsssl/stylesheets/docbook \ - /usr/lib/sgml/stylesheets/nwalsh-modular \ - /usr/lib/sgml/docbook\ - /usr/lib/sgml/stylesheets/docbook \ - /opt/sgml/lib/stylesheets/docbook \ - /usr/share/sgml/docbk30/dsl \ - /usr/share/sgml/docbkdsl \ - /usr/share/sgml/stylesheets/docbook \ - /usr/share/sgml/docbook/stylesheet/dsssl/modular \ - /usr/share/sgml/docbook/dsssl-stylesheets \ - /usr/local/lib/dsssl/stylesheets/docbook \ - /usr/local/lib/dsssl/stylesheets/nwalsh-modular \ - /usr/local/lib/sgml/stylesheets/docbook \ - /usr/local/lib/sgml/stylesheets/nwalsh-modular \ - /usr/local/lib/sgml/docbook \ - /usr/local/share/sgml/docbook/dsssl/modular \ - ../phpdoc-tools/dsssl/docbook \ - ../phpdoc-tools/dsssl \ - phpdoc-tools/dsssl/docbook \ - phpdoc-tools/dsssl + for dir1 in /usr/share/sgml \ + /usr/lib/sgml \ + /usr/lib/dsssl \ + /usr/local/lib/sgml \ + /usr/local/lib/dsssl \ + /opt/sgml/lib + do + for dir2 in docbook \ + docbook/dsssl-stylesheets \ + docbook/stylesheet/dsssl/modular \ + docbk30/dsl \ + docbkdsl \ + stylesheets/docbook \ + stylesheets/nwalsh-modular do - if test -f "$dir/html/docbook.dsl"; then - DOCBOOK_HTML="$dir/html/docbook.dsl" - DOCBOOK_PRINT="$dir/print/docbook.dsl" - AC_MSG_RESULT(autodetected: $dir) - break - fi + if test -f "$dir1/$dir2/html/docbook.dsl"; then + DOCBOOK_HTML="$dir1/$dir2/html/docbook.dsl" + DOCBOOK_PRINT="$dir1/$dir2/print/docbook.dsl" + AC_MSG_RESULT(autodetected: $dir1/$dir2) + break + fi done + if test ! -z "$DOCBOOK_HTML"; then break; fi + done ]) -if test -z "$DOCBOOK_HTML"; then - AC_MSG_ERROR(WARNING!!! DSSSL NOT FOUND - WON'T WORK THIS WAY) -fi -AC_SUBST(DOCBOOK_HTML) +AC_SUBST(DOCBOOK_HTML) AC_SUBST(DOCBOOK_PRINT) dnl }}} @@ -268,6 +256,12 @@ 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 + + dnl {{{ check for catalog files