diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2003-11-06 10:28:54 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2003-11-06 10:28:54 +0000 |
| commit | b15cb18cb2c56cbca936119f16563dd681d19409 (patch) | |
| tree | b269e30a9caeb736e4f86a70a20086ebc4a8fbd2 | |
| parent | 5781237531d301b1e15e9c002786e7e135ef7f99 (diff) | |
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..93f34c25a87 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.4.6.1 2003/11/06 10:28:54 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 635ace535b6..b5289891754 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 |