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

Commit 1593998

Browse files
committed
Report found versions of required perl modules
Configure tests for the presence of perl modules required for TAP tests, and that they meet specified minimum version requirements. This patch makes it report the version of the module that's actually found rather than just an 'ok' message. This will help in deciding if we can upgrade minimum requirements for these modules. Discussion: https://postgr.es/m/f5e1d308-4e33-37a7-bdf1-f6e0c75119de@dunslane.net
1 parent a45ed97 commit 1593998

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

config/ax_prog_perl_modules.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ if test "x$PERL" != x; then
5555
AC_MSG_CHECKING(for perl module $ax_perl_module)
5656
5757
# Would be nice to log result here, but can't rely on autoconf internals
58-
$PERL -e "use $ax_perl_module; exit" > /dev/null 2>&1
58+
modversion=`$PERL -e "use $ax_perl_module; my \\\$x=q($ax_perl_module); \\\$x =~ s/ .*//; \\\$x .= q(::VERSION); eval qq{print \\\\$\\\$x\\n}; exit;" 2>/dev/null`
5959
if test $? -ne 0; then
6060
AC_MSG_RESULT(no);
6161
ax_perl_modules_failed=1
6262
else
63-
AC_MSG_RESULT(ok);
63+
AC_MSG_RESULT($modversion);
6464
fi
6565
done
6666

configure

+3-3
Original file line numberDiff line numberDiff line change
@@ -19301,14 +19301,14 @@ if test "x$PERL" != x; then
1930119301
$as_echo_n "checking for perl module $ax_perl_module... " >&6; }
1930219302

1930319303
# Would be nice to log result here, but can't rely on autoconf internals
19304-
$PERL -e "use $ax_perl_module; exit" > /dev/null 2>&1
19304+
modversion=`$PERL -e "use $ax_perl_module; my \\\$x=q($ax_perl_module); \\\$x =~ s/ .*//; \\\$x .= q(::VERSION); eval qq{print \\\\$\\\$x\\n}; exit;" 2>/dev/null`
1930519305
if test $? -ne 0; then
1930619306
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1930719307
$as_echo "no" >&6; };
1930819308
ax_perl_modules_failed=1
1930919309
else
19310-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
19311-
$as_echo "ok" >&6; };
19310+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $modversion" >&5
19311+
$as_echo "$modversion" >&6; };
1931219312
fi
1931319313
done
1931419314

0 commit comments

Comments
 (0)