Commit 61a42ce2 authored by A. Karl Kornel's avatar A. Karl Kornel Committed by Russ Allbery
Browse files

Make Perl path configurable & check version

Use configure to determine the path to Perl, and error out if Perl is
not found or is too old.  This also means users can set a path to a
custom or weirdly-named Perl binary.
parent d06e318c
......@@ -236,7 +236,7 @@ perl/blib/lib/Wallet/Config.pm: $(srcdir)/perl/lib/Wallet/Config.pm
$(INSTALL_DATA) $(srcdir)/tests/tap/perl/Test/RRA.pm perl/t/lib/Test/
$(INSTALL_DATA) $(srcdir)/tests/tap/perl/Test/RRA/Config.pm \
perl/t/lib/Test/RRA/
cd perl && perl Build.PL $(WALLET_PERL_FLAGS)
cd perl && $(PERL) Build.PL $(WALLET_PERL_FLAGS)
cd perl && ./Build
# This is a really ugly hack to only honor prefix when running make install
......
......@@ -79,6 +79,15 @@ AS_IF([test x"$REMCTLD" != x],
[AC_DEFINE_UNQUOTED([PATH_REMCTLD], ["$REMCTLD"],
[Define to the full path to remctld to run remctl tests.])])
AC_ARG_VAR(PERL, [Path to the Perl binary])
AC_PATH_PROG(PERL, perl)
if test -z "$PERL"; then
AC_MSG_ERROR([Could not find Perl.])
fi
$PERL -e 'require 5.008;' || {
AC_MSG_ERROR([Perl 5.8 or better is required.])
}
dnl Enable appropriate warnings.
AM_CONDITIONAL([WARNINGS_GCC], [test x"$GCC" = xyes && test x"$CLANG" != xyes])
AM_CONDITIONAL([WARNINGS_CLANG], [test x"$CLANG" = xyes])
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment