diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2015-11-18 17:45:05 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2015-11-18 17:45:05 -0500 |
| commit | 32f15d05c80044335f97347b5406f6736c06a033 (patch) | |
| tree | aae4b7afc23cc69ff9d1720afae5f91b1a824c96 | |
| parent | e073490457176805bc31b8f7c7829ce1b71a6e76 (diff) | |
| download | postgresql-32f15d05c80044335f97347b5406f6736c06a033.tar.gz postgresql-32f15d05c80044335f97347b5406f6736c06a033.zip | |
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.
| -rw-r--r-- | config/programs.m4 | 2 | ||||
| -rwxr-xr-x | configure | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/programs.m4 b/config/programs.m4 index 7ac948d4fd3..87f63b6d10c 100644 --- a/config/programs.m4 +++ b/config/programs.m4 @@ -77,7 +77,7 @@ else echo '%%' > conftest.l if $pgac_candidate -t conftest.l 2>/dev/null | grep FLEX_SCANNER >/dev/null 2>&1; then pgac_flex_version=`$pgac_candidate --version 2>/dev/null` - if echo "$pgac_flex_version" | sed ['s/[.a-z]/ /g'] | $AWK '{ if ([$]1 = 2 && [$]2 = 5 && [$]3 >= 31) exit 0; else exit 1;}' + 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;}' then pgac_cv_path_flex=$pgac_candidate break 2 diff --git a/configure b/configure index b771a835559..8c61390ca77 100755 --- a/configure +++ b/configure @@ -7272,7 +7272,7 @@ else echo '%%' > conftest.l if $pgac_candidate -t conftest.l 2>/dev/null | grep FLEX_SCANNER >/dev/null 2>&1; then pgac_flex_version=`$pgac_candidate --version 2>/dev/null` - if echo "$pgac_flex_version" | sed 's/[.a-z]/ /g' | $AWK '{ if ($1 = 2 && $2 = 5 && $3 >= 31) exit 0; else exit 1;}' + 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;}' then pgac_cv_path_flex=$pgac_candidate break 2 |