diff options
author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-04-26 09:50:24 +0100 |
---|---|---|
committer | João Valverde <j@v6e.pt> | 2016-05-10 15:15:48 +0000 |
commit | 2bc2b3e686df39bb655c54b101b11537507fb5a3 (patch) | |
tree | b44daa1175a59d123e6db89ea6cbe9969146d981 /configure.ac | |
parent | e4237b14d038899f15401fbf9ef1bda6dda874f6 (diff) |
Require automake 1.11 and move AM_SILENT_RULES macro
Change-Id: I94468dd971db7cb196be1e62ce529a70789256c5
Reviewed-on: https://code.wireshark.org/review/15255
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 12 |
1 files changed, 5 insertions, 7 deletions
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 |