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

Commit dc43e2f

Browse files
committed
Fix configure's regexp for extracting the Perl version number from perl -v
output. Per bug #5339, Perl 5.11 has changed the format of that output enough to break the previous coding. Alex Hunsaker
1 parent 1bc8acc commit dc43e2f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

config/perl.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/config/perl.m4,v 1.8 2010/02/22 21:16:50 momjian Exp $
1+
# $PostgreSQL: pgsql/config/perl.m4,v 1.9 2010/02/23 18:35:06 tgl Exp $
22

33

44
# PGAC_PATH_PERL
@@ -10,7 +10,7 @@ if test -z "$PERL"; then
1010
fi
1111
1212
if test "$PERL"; then
13-
pgac_perl_version=`$PERL -v 2>/dev/null | sed -n ['s/This is perl, v[a-z ]*//p'] | sed ['s/ .*//']`
13+
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']`
1414
AC_MSG_NOTICE([using perl $pgac_perl_version])
1515
if echo "$pgac_perl_version" | sed ['s/[.a-z_]/ /g'] | \
1616
$AWK '{ if ([$]1 = 5 && [$]2 >= 8) exit 1; else exit 0;}'

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6867,7 +6867,7 @@ fi
68676867
fi
68686868

68696869
if test "$PERL"; then
6870-
pgac_perl_version=`$PERL -v 2>/dev/null | sed -n 's/This is perl, v[a-z ]*//p' | sed 's/ .*//'`
6870+
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'`
68716871
{ $as_echo "$as_me:$LINENO: using perl $pgac_perl_version" >&5
68726872
$as_echo "$as_me: using perl $pgac_perl_version" >&6;}
68736873
if echo "$pgac_perl_version" | sed 's/[.a-z_]/ /g' | \

0 commit comments

Comments
 (0)