aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7>2004-03-03 21:35:57 +0000
committerjmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7>2004-03-03 21:35:57 +0000
commit745aaf0adf25a41574a0e67aff7fec539ccca550 (patch)
treef423eb0a84652b54756c4182c0f17eae5a69b0d0
parentaf568443b302228618ea5b33faa52c2c1e4bfbb0 (diff)
Require autoconf 2.53 and automake 1.6
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10287 f5534014-38df-0310-8fa8-9805f1628bb7
-rwxr-xr-xautogen.sh12
-rw-r--r--configure.in4
-rw-r--r--epan/configure.in4
-rw-r--r--wiretap/configure.in4
4 files changed, 12 insertions, 12 deletions
diff --git a/autogen.sh b/autogen.sh
index 6ada74cd08..ee479bfe8a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,7 +2,7 @@
#
# Run this to generate all the initial makefiles.
#
-# $Id: autogen.sh,v 1.26 2003/06/22 22:50:40 jmayer Exp $
+# $Id: autogen.sh,v 1.27 2004/03/03 21:35:55 jmayer Exp $
DIE=true
PROJECT="Ethereal"
@@ -23,11 +23,11 @@ fi
ACVER=`autoconf --version | grep '^autoconf' | sed 's/.*)//'`
case "$ACVER" in
-0* | 1\.* | 2\.[0-9] | 2\.[0-9][a-z]* | \
-2\.1[0-2] | 2\.1[0-2][a-z]* )
+0* | 1\.* | 2\.[0-4]* | \
+2\.5[0-2] | 2\.5[0-2][a-z]* )
cat >&2 <<_EOF_
- You must have autoconf 2.13 or later installed to compile $PROJECT.
+ You must have autoconf 2.53 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_
@@ -38,11 +38,11 @@ esac
AMVER=`automake --version | grep '^automake' | sed 's/.*)//'`
case "$AMVER" in
-0* | 1\.[0-3] | 1\.[0-3][a-z]* )
+0* | 1\.[0-5] | 1\.[0-5][a-z]* )
cat >&2 <<_EOF_
- You must have automake 1.4 or later installed to compile $PROJECT.
+ You must have automake 1.6 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.in b/configure.in
index d27b214aa3..43576d5832 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.248 2004/02/23 21:53:05 gerald Exp $
+# $Id: configure.in,v 1.249 2004/03/03 21:35:56 jmayer Exp $
dnl
dnl Process this file with autoconf 2.13 or later to produce a
dnl configure script; 2.12 doesn't generate a "configure" script that
@@ -11,7 +11,7 @@ dnl with pre-2.13 "autoconf" as well.
dnl
AC_INIT(etypes.h)
-AC_PREREQ(2.13)
+AC_PREREQ(2.53)
dnl Check for CPU / vendor / OS
AC_CANONICAL_HOST
diff --git a/epan/configure.in b/epan/configure.in
index 05b13db41b..64ffabb036 100644
--- a/epan/configure.in
+++ b/epan/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.62 2004/03/02 23:53:10 jmayer Exp $
+# $Id: configure.in,v 1.63 2004/03/03 21:35:56 jmayer Exp $
dnl
dnl Process this file with autoconf 2.13 or later to produce a
dnl configure script; 2.12 doesn't generate a "configure" script that
@@ -11,7 +11,7 @@ dnl with pre-2.13 "autoconf" as well.
dnl
AC_INIT(epan.c)
-AC_PREREQ(2.13)
+AC_PREREQ(2.53)
dnl Check for CPU / vendor / OS
AC_CANONICAL_HOST
diff --git a/wiretap/configure.in b/wiretap/configure.in
index a352452e3d..691a7e5544 100644
--- a/wiretap/configure.in
+++ b/wiretap/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.54 2004/02/08 14:11:48 jmayer Exp $
+# $Id: configure.in,v 1.55 2004/03/03 21:35:57 jmayer Exp $
dnl
dnl Process this file with autoconf 2.13 or later to produce a
dnl configure script; 2.12 doesn't generate a "configure" script that
@@ -11,7 +11,7 @@ dnl with pre-2.13 "autoconf" as well.
dnl
AC_INIT(wtap.c)
-AC_PREREQ(2.13)
+AC_PREREQ(2.53)
AC_CANONICAL_HOST
AC_CANONICAL_TARGET