Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 144a2ec

Browse files
committed
Make the detection of nsgmls more robust for funny shells.
1 parent e4044ba commit 144a2ec

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

config/docbook.m4

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Header: /cvsroot/pgsql/config/docbook.m4,v 1.4 2002/07/16 00:51:37 momjian Exp $
1+
# $Header: /cvsroot/pgsql/config/docbook.m4,v 1.5 2003/11/06 10:30:42 petere Exp $
22

33
# PGAC_PROG_JADE
44
# --------------
@@ -31,11 +31,13 @@ AC_CACHE_CHECK([for DocBook V$1], [pgac_cv_check_docbook],
3131
</book>
3232
EOF
3333
34-
${NSGMLS-false} -s conftest.sgml 1>&AS_MESSAGE_LOG_FD 2>&1
35-
if test $? -eq 0; then
36-
pgac_cv_check_docbook=yes
37-
else
38-
pgac_cv_check_docbook=no
34+
pgac_cv_check_docbook=no
35+
36+
if test -n "$NSGMLS"; then
37+
$NSGMLS -s conftest.sgml 1>&AS_MESSAGE_LOG_FD 2>&1
38+
if test $? -eq 0; then
39+
pgac_cv_check_docbook=yes
40+
fi
3941
fi
4042
rm -f conftest.sgml])
4143

configure

+7-5
Original file line numberDiff line numberDiff line change
@@ -17441,11 +17441,13 @@ else
1744117441
</book>
1744217442
EOF
1744317443

17444-
${NSGMLS-false} -s conftest.sgml 1>&5 2>&1
17445-
if test $? -eq 0; then
17446-
pgac_cv_check_docbook=yes
17447-
else
17448-
pgac_cv_check_docbook=no
17444+
pgac_cv_check_docbook=no
17445+
17446+
if test -n "$NSGMLS"; then
17447+
$NSGMLS -s conftest.sgml 1>&5 2>&1
17448+
if test $? -eq 0; then
17449+
pgac_cv_check_docbook=yes
17450+
fi
1744917451
fi
1745017452
rm -f conftest.sgml
1745117453
fi

0 commit comments

Comments
 (0)