From: Tom Lane Date: Thu, 10 Dec 2015 15:19:13 +0000 (-0500) Subject: Accept flex > 2.5.x on Windows, too. X-Git-Tag: REL9_6_BETA1~1022 X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=9c779c49e39372c21214ad2dc5864dd78caee82d;p=postgresql.git 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 --- 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";