diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/docbook.m4 | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/config/docbook.m4 b/config/docbook.m4 index 636aefed4c..4304fa7ea1 100644 --- a/config/docbook.m4 +++ b/config/docbook.m4 @@ -89,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 |