summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut2000-10-26 16:28:01 +0000
committerPeter Eisentraut2000-10-26 16:28:01 +0000
commit07ac8e94c73c8692a85e3059a568bab4228388f8 (patch)
treed06cf7ddafa6a2709af52ec22c1c1b6de0e7dd9d
parenta9adde36ea8228fd8b065eb45450cbe59c9f1987 (diff)
In flex --version test, redirect stdin to /dev/null, because some lex' hang
waiting for input. From Pete Forman <gsez020@kryten.bedford.waii.com>.
-rw-r--r--config/programs.m44
-rwxr-xr-xconfigure4
2 files changed, 4 insertions, 4 deletions
diff --git a/config/programs.m4 b/config/programs.m4
index 3e49b9a0eb1..660591bbd1f 100644
--- a/config/programs.m4
+++ b/config/programs.m4
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/pgsql/config/programs.m4,v 1.1 2000/08/28 11:53:13 petere Exp $
+# $Header: /cvsroot/pgsql/config/programs.m4,v 1.2 2000/10/26 16:28:00 petere Exp $
# PGAC_PATH_FLEX
@@ -22,7 +22,7 @@ else
for pgac_prog in flex lex; do
pgac_candidate="$pgac_dir/$pgac_prog"
if test -f "$pgac_candidate" \
- && $pgac_candidate --version >/dev/null 2>&1
+ && $pgac_candidate --version </dev/null >/dev/null 2>&1
then
echo '%%' > conftest.l
if $pgac_candidate -t conftest.l 2>/dev/null | grep FLEX_SCANNER >/dev/null 2>&1; then
diff --git a/configure b/configure
index 20f04268407..a329292367a 100755
--- a/configure
+++ b/configure
@@ -2550,7 +2550,7 @@ INSTALL_SHLIB="\${INSTALL} $INSTL_SHLIB_OPTS"
-for ac_prog in mawk gawk nawk awk
+for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -2602,7 +2602,7 @@ else
for pgac_prog in flex lex; do
pgac_candidate="$pgac_dir/$pgac_prog"
if test -f "$pgac_candidate" \
- && $pgac_candidate --version >/dev/null 2>&1
+ && $pgac_candidate --version </dev/null >/dev/null 2>&1
then
echo '%%' > conftest.l
if $pgac_candidate -t conftest.l 2>/dev/null | grep FLEX_SCANNER >/dev/null 2>&1; then