diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-12-10 00:46:13 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-12-10 00:46:13 +0100 |
| commit | 47587d15b0749575e95a49443c6b0e17e0722678 (patch) | |
| tree | bb9df41ddf6cc776ce90ab2cb39779c89d44ea1e /configure.ac | |
| parent | 1a23ff8bad4a1188592a0879f31f0cce0b5201ab (diff) | |
| parent | c8e01d581a7e7c2445a139def46939a547951746 (diff) | |
| download | automake-47587d15b0749575e95a49443c6b0e17e0722678.tar.gz | |
Merge branch 'maint'
Commits merged from maint:
dist-xz, dist-bzip2: don't hard-code -9, honor envvar settings
news: fix typos, grammaros and suboptimal wording
maint: sync auxiliary files from upstream
tests: fix spurious failures due to missing 'yywrap()' function
depcomp: spelling fix
tests: fix 'distcheck-override-infodir.test' on Cygwin
cosmetics: typofix in comments
coverage: undistributed '.am' and '.m4' files are diagnosed
coverage: required but missing '.am' and '.m4' files are diagnosed
coverage: expose automake bug#10111 in the testsuite
fix: regenerate doc/Makefile
texinfo: work around Solaris 10 xpg4 shell bug in install rules
configure: report perl version in config.log
tests: fix spurious failure with older install-info
maintcheck: fix spurious failure in 'color2.test'
tests: fix spurious error in 'uninstall-fail.test' on Solaris
tests: fix typo in 'uninstall-fail.test'
Extra edits:
* ChangeLog: Remove mention of commit 6da46f31 (2010-10-05), which
has been superseded by commit c8e01d58 (2011-12-09). Fix entry
relative to that commit, to adapt to differences between maint and
master.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 437ce9f67..043a4d865 100644 --- a/configure.ac +++ b/configure.ac @@ -61,6 +61,8 @@ AC_PATH_PROG(PERL, perl) if test -z "$PERL"; then AC_MSG_ERROR([perl not found]) fi +# Save details about the selected perl interpreter in config.log. +AM_RUN_LOG([eval $PERL --version]) $PERL -e 'require 5.006;' || { AC_MSG_ERROR( [perl 5.6 or better is required; perl 5.8.2 or better |