summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2015-12-10 10:19:13 -0500
committerTom Lane <tgl@sss.pgh.pa.us>2015-12-10 10:19:18 -0500
commit2355faae010591febd2b39e74b209a5236f6682a (patch)
treece0c42669e8f1ddfc0b78a51fcbdd76bbea1c3b1
parentc3c5c02881d47b3bf8d9e1e1e3460ef348863035 (diff)
downloadpostgresql-2355faae010591febd2b39e74b209a5236f6682a.tar.gz
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
-rw-r--r--src/tools/msvc/pgflex.pl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/msvc/pgflex.pl b/src/tools/msvc/pgflex.pl
index c5b90adb81..0410e3aa02 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";