Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 92e6a98

Browse files
committed
Adjust configure to insist on Perl version >= 5.8.3.
Previously it only checked for version >= 5.8.0, although the documentation has said that the minimum version is 5.8.3 since commit dea6ba9. Per the discussion leading up to that commit, I (tgl) left it that way intentionally because you could, at the time, do some bare-bones stuff with 5.8.0. But we aren't actually testing against anything older than 5.8.3, so who knows if that's still true. It's pretty unlikely that anyone would care anyway, so let's just make configure's version check match the docs. Dagfinn Ilmari Mannsåker Discussion: https://postgr.es/m/87y278s6iq.fsf@wibble.ilmari.org Discussion: https://postgr.es/m/16894.1501392088@sss.pgh.pa.us
1 parent 05798c9 commit 92e6a98

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

config/perl.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ if test "$PERL"; then
1111
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']`
1212
AC_MSG_NOTICE([using perl $pgac_perl_version])
1313
if echo "$pgac_perl_version" | sed ['s/[.a-z_]/ /g'] | \
14-
$AWK '{ if ([$]1 == 5 && [$]2 >= 8) exit 1; else exit 0;}'
14+
$AWK '{ if ([$]1 == 5 && ([$]2 > 8 || ($[2] == 8 && [$]3 >= 3))) exit 1; else exit 0;}'
1515
then
1616
AC_MSG_WARN([
1717
*** The installed version of Perl, $PERL, is too old to use with PostgreSQL.
18-
*** Perl version 5.8 or later is required, but this is $pgac_perl_version.])
18+
*** Perl version 5.8.3 or later is required, but this is $pgac_perl_version.])
1919
PERL=""
2020
fi
2121
fi

configure

+3-3
Original file line numberDiff line numberDiff line change
@@ -9949,14 +9949,14 @@ if test "$PERL"; then
99499949
{ $as_echo "$as_me:${as_lineno-$LINENO}: using perl $pgac_perl_version" >&5
99509950
$as_echo "$as_me: using perl $pgac_perl_version" >&6;}
99519951
if echo "$pgac_perl_version" | sed 's/[.a-z_]/ /g' | \
9952-
$AWK '{ if ($1 == 5 && $2 >= 8) exit 1; else exit 0;}'
9952+
$AWK '{ if ($1 == 5 && ($2 > 8 || ($2 == 8 && $3 >= 3))) exit 1; else exit 0;}'
99539953
then
99549954
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
99559955
*** The installed version of Perl, $PERL, is too old to use with PostgreSQL.
9956-
*** Perl version 5.8 or later is required, but this is $pgac_perl_version." >&5
9956+
*** Perl version 5.8.3 or later is required, but this is $pgac_perl_version." >&5
99579957
$as_echo "$as_me: WARNING:
99589958
*** The installed version of Perl, $PERL, is too old to use with PostgreSQL.
9959-
*** Perl version 5.8 or later is required, but this is $pgac_perl_version." >&2;}
9959+
*** Perl version 5.8.3 or later is required, but this is $pgac_perl_version." >&2;}
99609960
PERL=""
99619961
fi
99629962
fi

0 commit comments

Comments
 (0)