postgres.git / summary / log / commit / refs
commit 5e7a7703bd5d51628b2ff4999a6b08455e25f1ca
Author: Tom Lane <tgl@sss.pgh.pa.us>
Date: Mon May 02 15:18:10 2016 +0000
First released in: 9.6.0, 9.1.22, 9.2.17, 9.3.13, 9.4.8, 9.5.3
Fix configure's incorrect version tests for flex and perl.
awk's equality-comparison operator is "==" not "=". We got this right
in many places, but not in configure's checks for supported version
numbers of flex and perl. It hadn't been noticed because unsupported
versions are so old as to be basically extinct in the wild, and because
the only consequence is whether or not a WARNING flies by during
configure.
Daniel Gustafsson noted the problem with respect to the test for flex,
I found the other by reviewing other awk calls.
config/perl.m4 | 2 +-
config/programs.m4 | 2 +-
configure | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/config/perl.m4 b/config/perl.m4
index 0b43b04742e..bed2eae57fe 100644
--- a/config/perl.m4
+++ b/config/perl.m4
@@ -13,7 +13,7 @@ if test "$PERL"; then
pgac_perl_version=`$PERL -v 2>/dev/null | sed -n ['s/This is perl.*v[a-z ]*\([0-9]\.[0-9][0-9.]*\).*$/\1/p']`
AC_MSG_NOTICE([using perl $pgac_perl_version])
if echo "$pgac_perl_version" | sed ['s/[.a-z_]/ /g'] | \
- $AWK '{ if ([$]1 = 5 && [$]2 >= 8) exit 1; else exit 0;}'
+ $AWK '{ if ([$]1 == 5 && [$]2 >= 8) exit 1; else exit 0;}'
then
AC_MSG_WARN([
*** The installed version of Perl, $PERL, is too old to use with PostgreSQL.
diff --git a/config/programs.m4 b/config/programs.m4
index 8e4d4c5490e..65621df3095 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 || ([$]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 3fa4f29fbaa..30610546f51 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 || ($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
@@ -7370,7 +7370,7 @@ if test "$PERL"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: using perl $pgac_perl_version" >&5
$as_echo "$as_me: using perl $pgac_perl_version" >&6;}
if echo "$pgac_perl_version" | sed 's/[.a-z_]/ /g' | \
- $AWK '{ if ($1 = 5 && $2 >= 8) exit 1; else exit 0;}'
+ $AWK '{ if ($1 == 5 && $2 >= 8) exit 1; else exit 0;}'
then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
*** The installed version of Perl, $PERL, is too old to use with PostgreSQL.
[parent: ad5993d866f9]