diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2002-04-14 17:23:20 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2002-04-14 17:23:20 +0000 |
| commit | 2e32eca8d0a7177a71fccae6e010e6b54d027207 (patch) | |
| tree | 24837482c23494245988eb980d6aa1846ea2525d /config | |
| parent | 08479bcbca4c499a205547a172ed14928114fc18 (diff) | |
| download | postgresql-2e32eca8d0a7177a71fccae6e010e6b54d027207.tar.gz | |
Allow detection of collateindex.pl in stylesheet directory or in path,
which covers some recent installation schemes.
Add Mandrake installation layout to directories to check for stylesheets.
Allow documentation build to proceed if stylesheets were not found, in case
the stylesheets might be found through the SGML catalog mechanism.
Diffstat (limited to 'config')
| -rw-r--r-- | config/docbook.m4 | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/config/docbook.m4 b/config/docbook.m4 index 7e285383aa..b0b6ce0238 100644 --- a/config/docbook.m4 +++ b/config/docbook.m4 @@ -1,4 +1,4 @@ -# $Header: /cvsroot/pgsql/config/docbook.m4,v 1.2 2002/03/29 17:32:53 petere Exp $ +# $Header: /cvsroot/pgsql/config/docbook.m4,v 1.3 2002/04/14 17:23:20 petere Exp $ # PGAC_PROG_JADE # -------------- @@ -47,7 +47,8 @@ AC_SUBST([have_docbook]) # PGAC_PATH_DOCBOOK_STYLESHEETS # ----------------------------- AC_DEFUN([PGAC_PATH_DOCBOOK_STYLESHEETS], -[AC_MSG_CHECKING([for DocBook stylesheets]) +[AC_ARG_VAR(DOCBOOKSTYLE, [location of DocBook stylesheets])dnl +AC_MSG_CHECKING([for DocBook stylesheets]) AC_CACHE_VAL([pgac_cv_path_stylesheets], [if test -n "$DOCBOOKSTYLE"; then pgac_cv_path_stylesheets=$DOCBOOKSTYLE @@ -57,7 +58,8 @@ else for pgac_postfix in \ sgml/stylesheets/nwalsh-modular \ sgml/stylesheets/docbook \ - sgml/docbook/dsssl/modular + sgml/docbook/dsssl/modular \ + sgml/docbook/dsssl-stylesheets do pgac_candidate=$pgac_prefix/$pgac_infix/$pgac_postfix if test -r "$pgac_candidate/html/docbook.dsl" \ @@ -77,3 +79,15 @@ if test -n "$DOCBOOKSTYLE"; then else AC_MSG_RESULT(no) fi])# PGAC_PATH_DOCBOOK_STYLESHEETS + + +# PGAC_PATH_COLLATEINDEX +# ---------------------- +AC_DEFUN([PGAC_PATH_COLLATEINDEX], +[AC_REQUIRE([PGAC_PATH_DOCBOOK_STYLESHEETS])dnl +if test -n "$DOCBOOKSTYLE"; then + AC_PATH_PROGS(COLLATEINDEX, collateindex.pl, [], + [$DOCBOOKSTYLE/bin $PATH]) +else + AC_PATH_PROGS(COLLATEINDEX, collateindex.pl) +fi])# PGAC_PATH_COLLATEINDEX |