summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2016-02-22 18:45:30 -0800
committerGuy Harris <guy@alum.mit.edu>2016-02-23 02:46:29 +0000
commit7282e80e68aade3e56e94095eb019c292b3a7b54 (patch)
tree640df209ab24179b7d3ce0a1e0293ddfe62ef17c
parent08d49ff2e06cb35dc9084735aa60c83686afdd9c (diff)
downloadwireshark-7282e80e68aade3e56e94095eb019c292b3a7b54.tar.gz
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>
-rwxr-xr-xautogen.sh4
-rw-r--r--configure.ac4
2 files changed, 4 insertions, 4 deletions
diff --git a/autogen.sh b/autogen.sh
index cbe7e51b7a..19b4e8516d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -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_
diff --git a/configure.ac b/configure.ac
index d84212f891..ec1b65ef56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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