8000 Accept flex > 2.5.x in configure. · zenus/postgres@6e1d26f · GitHub
[go: up one dir, main page]

Skip to content

Commit 6e1d26f

Browse files
committed
Accept flex > 2.5.x in configure.
Per buildfarm member anchovy, 2.6.0 exists in the wild now. Hopefully it works with Postgres; if not, we'll have to do something about that, but in any case claiming it's "too old" is pretty silly.
1 parent c47bdb3 commit 6e1d26f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

config/programs.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ else
6969
echo '%%' > conftest.l
7070
if $pgac_candidate -t conftest.l 2>/dev/null | grep FLEX_SCANNER >/dev/null 2>&1; then
7171
pgac_flex_version=`$pgac_candidate --version 2>/dev/null`
72-
if echo "$pgac_flex_version" | sed ['s/[.a-z]/ /g'] | $AWK '{ if ([$]1 = 2 && [$]2 = 5 && [$]3 >= 31) exit 0; else exit 1;}'
72+
if echo "$pgac_flex_version" | sed ['s/[.a-z]/ /g'] | $AWK '{ if ([$]1 = 2 && ([$]2 > 5 || ([$]2 = 5 && [$]3 >= 31))) exit 0; else exit 1;}'
7373
then
7474
pgac_cv_path_flex=$pgac_candidate
7575
break 2

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7164,7 +7164,7 @@ else
71647164
echo '%%' > conftest.l
71657165
if $pgac_candidate -t conftest.l 2>/dev/null | grep FLEX_SCANNER >/dev/null 2>&1; then
71667166
pgac_flex_version=`$pgac_candidate --version 2>/dev/null`
7167-
if echo "$pgac_flex_version" | sed 's/[.a-z]/ /g' | $AWK '{ if ($1 = 2 && $2 = 5 && $3 >= 31) exit 0; else exit 1;}'
7167+
if echo "$pgac_flex_version" | sed 's/[.a-z]/ /g' | $AWK '{ if ($1 = 2 && ($2 > 5 || ($2 = 5 && $3 >= 31))) exit 0; else exit 1;}'
71687168
then
71697169
pgac_cv_path_flex=$pgac_candidate
71707170
break 2

0 commit comments

Comments
 (0)
0