osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Explicitly require autoconf 2.64. 

AX_APPEND_FLAG requires it, and we use AX_APPEND_FLAG, so explicitly
require it up front.

Change-Id: Ieff378e63eba245fdf1454bc388b6be7fc94a10c
Reviewed-on: https://code.wireshark.org/review/14084
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2016-02-22 18:45:30 -08:00
parent 08d49ff2e0
commit 7282e80e68
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
autogen.sh
View File

@ -59,10 +59,10 @@ esac
ACVER=`$AUTOCONF --version | grep '^autoconf' | sed 's/.*) *//'`
case "$ACVER" in
'' | 0.* | 1.* | 2.[0-5]* )
'' | 0.* | 1.* | 2.[0-5]* | 2.6[0123]* )
cat >&2 <<_EOF_
You must have autoconf 2.60 or later installed to compile $PROJECT.
You must have autoconf 2.64 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/autoconf/
_EOF_

4
configure.ac
View File

@ -16,9 +16,9 @@ CONFIG_ARGS="$*"
AC_SUBST(CONFIG_ARGS)
# Minimum autoconf version we require.
AC_PREREQ(2.60)
AC_PREREQ(2.64)
# Variable expansion doesn't work in AC_PREREQ()
AC_MIN_VERSION=2.60
AC_MIN_VERSION=2.64
AC_SUBST(AC_MIN_VERSION)
dnl Make sure to keep ACLOCAL_AMFLAGS in Makefile.am and AC_CONFIG_MACRO_DIRS