postgres.git / summary / log / commit / refs

commit    9c779c49e39372c21214ad2dc5864dd78caee82d
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Thu Dec 10 15:19:13 2015 +0000
First released in: 9.6.0, 9.2.15, 9.3.11, 9.4.6, 9.5.0

    Accept flex > 2.5.x on Windows, too.
    
    Commit 32f15d05c fixed this in configure, but missed the similar check
    in the MSVC scripts.
    
    Michael Paquier, per report from Victor Wagner


 src/tools/msvc/pgflex.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/tools/msvc/pgflex.pl b/src/tools/msvc/pgflex.pl
index c5b90adb81d..0410e3aa02b 100644
--- a/src/tools/msvc/pgflex.pl
+++ b/src/tools/msvc/pgflex.pl
@@ -16,7 +16,8 @@ my ($flexver) = `flex -V`;    # grab first line
 $flexver = (split(/\s+/, $flexver))[1];
 $flexver =~ s/[^0-9.]//g;
 my @verparts = split(/\./, $flexver);
-unless ($verparts[0] == 2 && $verparts[1] == 5 && $verparts[2] >= 31)
+unless ($verparts[0] == 2 &&
+	    ($verparts[1] > 5 || ($verparts[1] == 5 && $verparts[2] >= 31)))
 {
 	print "WARNING! Flex install not found, or unsupported Flex version.\n";
 	print "echo Attempting to build without.\n";


[parent: c00239ea6a06]