Make the detection of nsgmls more robust for funny shells.

22 years ago · 144a2ecd57
parent e4044ba2d7
commit 144a2ecd57
2 changed files with 15 additions and 11 deletions
--- 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
+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
-else
-  pgac_cv_check_docbook=no
+  fi
 fi
 rm -f conftest.sgml])

--- a/8
+++ b/8
@ -17441,11 +17441,13 @@ else
 </book>
 EOF

-${NSGMLS-false} -s conftest.sgml 1>&5 2>&1
+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
-else
-  pgac_cv_check_docbook=no
+  fi
 fi
 rm -f conftest.sgml
 fi