diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2015-12-10 10:19:13 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2015-12-10 10:19:22 -0500 |
| commit | ee0df4d77c9f3e3aa6c5e23fa2dbc66e9cd6deae (patch) | |
| tree | 0042c85fde3d99e4ef83546a49e4dc80dad2f8c0 | |
| parent | 7145d35c1727e12cc492c60a2c34392b5ed0dfa5 (diff) | |
| download | postgresql-ee0df4d77c9f3e3aa6c5e23fa2dbc66e9cd6deae.tar.gz postgresql-ee0df4d77c9f3e3aa6c5e23fa2dbc66e9cd6deae.zip | |
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.pl | 3 |
1 files changed, 2 insertions, 1 deletions
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"; |