diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-11-16 14:50:02 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-11-16 14:50:02 +0100 |
| commit | 1efb88cadad61a031d1c297310bc2634562f2e87 (patch) | |
| tree | 84eb7fb42013de443030961e7bf3a740e179d3a2 /configure.ac | |
| parent | 92bd5d25c2ba94b8664202990d0152e68d440632 (diff) | |
| parent | b1e58545f392151970f930be4c89b75b47c087a5 (diff) | |
| download | automake-1efb88cadad61a031d1c297310bc2634562f2e87.tar.gz | |
Merge branch 'maint'
* maint:
maintcheck: avoid failures, sync with 'ng/master' more
maintcheck: remove 'sc_perl_syntax'
sync: update files from upstream with "make fetch"
maint: get rid of $perllibdir environment variable hack
configure: respect the '-q' option better
cosmetics: de-tabify configure.ac
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 90985da11..00ccc1f75 100644 --- a/configure.ac +++ b/configure.ac @@ -95,11 +95,11 @@ AC_CACHE_CHECK([whether $PERL supports ithreads], [am_cv_prog_PERL_ithreads], use Config; if ($Config{useithreads}) { - require threads; - import threads; - require Thread::Queue; - import Thread::Queue; - exit 0; + require threads; + import threads; + require Thread::Queue; + import Thread::Queue; + exit 0; } exit 1;' >&AS_MESSAGE_LOG_FD 2>&1 then @@ -611,10 +611,10 @@ AC_CONFIG_LINKS([GNUmakefile:GNUmakefile]) AC_CONFIG_FILES([t/wrap/aclocal-${APIVERSION}:t/wrap/aclocal.in], [chmod +x t/wrap/aclocal-${APIVERSION}], - [APIVERSION=$APIVERSION]) + [APIVERSION=$APIVERSION]) AC_CONFIG_FILES([t/wrap/automake-${APIVERSION}:t/wrap/automake.in], [chmod +x t/wrap/automake-${APIVERSION}], - [APIVERSION=$APIVERSION]) + [APIVERSION=$APIVERSION]) AC_OUTPUT @@ -632,7 +632,8 @@ am_release_type=`AS_ECHO(["$PACKAGE_VERSION"]) | LC_ALL=C awk [" /^$am_beta_version_rx$/ { print \"beta version\"; exit(0); } { print \"development snapshot\"; }"]` -test "$am_release_type" = stable || cat <<EOF +# '$silent' is set to yes if configure is passed the '--quiet' option. +test "$am_release_type" = stable || test "$silent" = yes || cat <<EOF WARNING: You are about to use a $am_release_type of automake. WARNING: It might easily suffer from new bugs or regressions. |