From 2bc2b3e686df39bb655c54b101b11537507fb5a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Tue, 26 Apr 2016 09:50:24 +0100 Subject: Require automake 1.11 and move AM_SILENT_RULES macro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I94468dd971db7cb196be1e62ce529a70789256c5 Reviewed-on: https://code.wireshark.org/review/15255 Reviewed-by: João Valverde --- autogen.sh | 4 ++-- configure.ac | 12 +++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/autogen.sh b/autogen.sh index d4d435056f..a9bf30575e 100755 --- a/autogen.sh +++ b/autogen.sh @@ -73,14 +73,14 @@ esac AMVER=`$AUTOMAKE --version | grep '^automake' | sed 's/.*) *//'` case "$AMVER" in -1.9* | 1.[1][0-9]*) +1.11* | 1.1[2-9]*) ;; *) cat >&2 <<_EOF_ - You must have automake 1.9 or later installed to compile $PROJECT. + You must have automake 1.11 or later installed to compile $PROJECT. Download the appropriate package for your distribution/OS, or get the source tarball at ftp://ftp.gnu.org/pub/gnu/automake/ _EOF_ diff --git a/configure.ac b/configure.ac index d142736925..41865f3765 100644 --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,11 @@ dnl AC_CANONICAL_BUILD dnl AC_CANONICAL_HOST AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE([1.9 tar-ustar dist-bzip2 no-dist-gzip subdir-objects]) +AM_INIT_AUTOMAKE([1.11 tar-ustar dist-bzip2 no-dist-gzip subdir-objects]) + +# Enable silent builds by default. Verbose builds can be enabled with "./configure +# --enable-silent-rules ..." or "make V=1 ..." +AM_SILENT_RULES([yes]) # Make Wireshark's version available in config.h AC_DEFINE(VERSION_MAJOR, version_major, [Wireshark's major version]) @@ -1343,12 +1347,6 @@ cygwin*) esac AC_SUBST(LDFLAGS_SHAREDLIB) -# Enable silent builds by default -# Verbose builds can be enabled with "./configure -# --enable-silent-rules ..." or "make V=1 ..." -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], - [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])]) - # # On "Darwin", which we assume to mean "OS X" rather than "iOS" or # "just Darwin" (as we don't currently support iOS, and as I don't -- cgit v1.2.1