Fix stray reference to the old genbki.sh script.

[postgresql] / config / docbook.m4

diff --git a/config/docbook.m4 b/config/docbook.m4
index a016463e51de23e68312bfb07b135c1c5f0e23c8..4304fa7ea1374d6def90963d2b72ef8460e79d87 100644 (file)
--- a/config/docbook.m4
+++ b/config/docbook.m4
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/pgsql/config/docbook.m4,v 1.5 2003/11/06 10:30:42 petere Exp $
+# config/docbook.m4
 
 # PGAC_PROG_JADE
 # --------------
@@ -55,14 +55,17 @@ AC_CACHE_VAL([pgac_cv_path_stylesheets],
 [if test -n "$DOCBOOKSTYLE"; then
   pgac_cv_path_stylesheets=$DOCBOOKSTYLE
 else
-  for pgac_prefix in /usr /usr/local /opt; do
+  for pgac_prefix in /usr /usr/local /opt /sw; do
     for pgac_infix in share lib; do
       for pgac_postfix in \
         sgml/stylesheets/nwalsh-modular \
         sgml/stylesheets/docbook \
+        sgml/stylesheets/dsssl/docbook \
+        sgml/docbook-dsssl \
         sgml/docbook/dsssl/modular \
         sgml/docbook/stylesheet/dsssl/modular \
-        sgml/docbook/dsssl-stylesheets
+        sgml/docbook/dsssl-stylesheets \
+        sgml/dsssl/docbook-dsssl-nwalsh
       do
         pgac_candidate=$pgac_prefix/$pgac_infix/$pgac_postfix
         if test -r "$pgac_candidate/html/docbook.dsl" \
@@ -86,11 +89,14 @@ fi])# PGAC_PATH_DOCBOOK_STYLESHEETS
 
 # PGAC_PATH_COLLATEINDEX
 # ----------------------
+# Some DocBook installations provide collateindex.pl in $DOCBOOKSTYLE/bin,
+# but it's not necessarily marked executable, so we can't use AC_PATH_PROG
+# to check for it there.  Other installations just put it in the PATH.
 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])
+if test -n "$DOCBOOKSTYLE" -a -r "$DOCBOOKSTYLE/bin/collateindex.pl"; then
+  COLLATEINDEX="$DOCBOOKSTYLE/bin/collateindex.pl"
+  AC_SUBST([COLLATEINDEX])
 else
-  AC_PATH_PROGS(COLLATEINDEX, collateindex.pl)
+  AC_PATH_PROG(COLLATEINDEX, collateindex.pl)
 fi])# PGAC_PATH_COLLATEINDEX