diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2003-11-06 10:30:42 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2003-11-06 10:30:42 +0000 |
| commit | 144a2ecd57590c6cce9981a2b28cee5f5805bd5d (patch) | |
| tree | 9f6a9f4f9a2e902116651561d6956fd3d9cdfef1 | |
| parent | e4044ba2d7487839ae7113074a65f1457fda56d7 (diff) | |
| download | postgresql-144a2ecd57590c6cce9981a2b28cee5f5805bd5d.tar.gz postgresql-144a2ecd57590c6cce9981a2b28cee5f5805bd5d.zip | |
Make the detection of nsgmls more robust for funny shells.
| -rw-r--r-- | config/docbook.m4 | 14 | ||||
| -rwxr-xr-x | configure | 12 |
2 files changed, 15 insertions, 11 deletions
diff --git a/config/docbook.m4 b/config/docbook.m4 index c2b9568ac05..a016463e51d 100644 --- a/config/docbook.m4 +++ b/config/docbook.m4 @@ -1,4 +1,4 @@ -# $Header: /cvsroot/pgsql/config/docbook.m4,v 1.4 2002/07/16 00:51:37 momjian Exp $ +# $Header: /cvsroot/pgsql/config/docbook.m4,v 1.5 2003/11/06 10:30:42 petere Exp $ # PGAC_PROG_JADE # -------------- @@ -31,11 +31,13 @@ AC_CACHE_CHECK([for DocBook V$1], [pgac_cv_check_docbook], </book> EOF -${NSGMLS-false} -s conftest.sgml 1>&AS_MESSAGE_LOG_FD 2>&1 -if test $? -eq 0; then - pgac_cv_check_docbook=yes -else - pgac_cv_check_docbook=no +pgac_cv_check_docbook=no + +if test -n "$NSGMLS"; then + $NSGMLS -s conftest.sgml 1>&AS_MESSAGE_LOG_FD 2>&1 + if test $? -eq 0; then + pgac_cv_check_docbook=yes + fi fi rm -f conftest.sgml]) diff --git a/configure b/configure index e23dae792ae..d4cfc5b26b5 100755 --- a/configure +++ b/configure @@ -17441,11 +17441,13 @@ else </book> EOF -${NSGMLS-false} -s conftest.sgml 1>&5 2>&1 -if test $? -eq 0; then - pgac_cv_check_docbook=yes -else - pgac_cv_check_docbook=no +pgac_cv_check_docbook=no + +if test -n "$NSGMLS"; then + $NSGMLS -s conftest.sgml 1>&5 2>&1 + if test $? -eq 0; then + pgac_cv_check_docbook=yes + fi fi rm -f conftest.sgml fi |