Commit07ac8e9

committed

In flex --version test, redirect stdin to /dev/null, because some lex' hang

waiting for input. From Pete Forman <gsez020@kryten.bedford.waii.com>.

1 parenta9adde3 commit07ac8e9Copy full SHA for 07ac8e9

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# $Header: /cvsroot/pgsql/config/programs.m4,v 1.1 2000/08/28 11:53:13 petere Exp $`
	`1`	`+# $Header: /cvsroot/pgsql/config/programs.m4,v 1.2 2000/10/26 16:28:00 petere Exp $`
`2`	`2`
`3`	`3`
`4`	`4`	`# PGAC_PATH_FLEX`
`@@ -22,7 +22,7 @@ else`
`22`	`22`	`for pgac_prog in flex lex; do`
`23`	`23`	`pgac_candidate="$pgac_dir/$pgac_prog"`
`24`	`24`	`if test -f "$pgac_candidate" \`
`25`		`- && $pgac_candidate --version >/dev/null 2>&1`
	`25`	`+ && $pgac_candidate --version</dev/null>/dev/null 2>&1`
`26`	`26`	`then`
`27`	`27`	`echo '%%' > conftest.l`
`28`	`28`	`if $pgac_candidate -t conftest.l 2>/dev/null \| grep FLEX_SCANNER >/dev/null 2>&1; then`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2550,7 +2550,7 @@ INSTALL_SHLIB="\${INSTALL} $INSTL_SHLIB_OPTS"`
`2550`	`2550`
`2551`	`2551`
`2552`	`2552`
`2553`		`-forac_proginmawkgawk nawk awk`
	`2553`	`+forac_progin gawk mawk nawk awk`
`2554`	`2554`	`do`
`2555`	`2555`	`# Extract the first word of "$ac_prog", so it can be a program name with args.`
`2556`	`2556`	`set dummy$ac_prog; ac_word=$2`
`@@ -2602,7 +2602,7 @@ else`
`2602`	`2602`	`forpgac_progin flex lex;do`
`2603`	`2603`	`pgac_candidate="$pgac_dir/$pgac_prog"`
`2604`	`2604`	`iftest -f"$pgac_candidate" \`
`2605`		`-&&$pgac_candidate --version>/dev/null2>&1`
	`2605`	`+&&$pgac_candidate --version</dev/null>/dev/null2>&1`
`2606`	`2606`	`then`
`2607`	`2607`	`echo'%%'> conftest.l`
`2608`	`2608`	`if$pgac_candidate -t conftest.l2>/dev/null\| grep FLEX_SCANNER>/dev/null2>&1;then`

Comments

(0)