postgres.git / summary / log / commit / refs

commit    32f15d05c80044335f97347b5406f6736c06a033
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Wed Nov 18 22:45:05 2015 +0000
First released in: 9.6.0, 9.1.20, 9.2.15, 9.3.11, 9.4.6, 9.5.0

    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.


 config/programs.m4 | 2 +-
 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


[parent: e07349045717]