forked from osmocom/wireshark
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>
This commit is contained in:
parent
e4237b14d0
commit
2bc2b3e686
|
@ -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_
|
||||
|
|
12
configure.ac
12
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
|
||||
|
|
Loading…
Reference in New Issue