summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim.muller@collabora.co.uk>2010-06-28 16:31:54 (GMT)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>2010-06-28 16:31:54 (GMT)
commit9559fb13d8ac5ee6e1f5a2de46f04f05b5820519 (patch)
treed5db6b5d92523eea8f43315d595bf252b824f482
parentaae225629db259217d66486a807f1027b7c79974 (diff)
Bump automake requirement to 1.10 and autoconf to 2.60.
-rwxr-xr-xautogen.sh9
-rw-r--r--configure.ac4
2 files changed, 6 insertions, 7 deletions
diff --git a/autogen.sh b/autogen.sh
index 9b734e8..3631f3e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -35,10 +35,10 @@ autogen_options $@
echo -n "+ check for build tools"
if test ! -z "$NOCHECK"; then echo ": skipped version checks"; else echo; fi
-version_check "autoconf" "$AUTOCONF autoconf autoconf259 autoconf257 autoconf-2.54 autoconf-2.53 autoconf253 autoconf-2.52 autoconf252" \
- "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 52 || DIE=1
-version_check "automake" "$AUTOMAKE automake automake-1.9 automake19 automake-1.8 automake18 automake-1.7 automake17 automake-1.6 automake16" \
- "ftp://ftp.gnu.org/pub/gnu/automake/" 1 7 || DIE=1
+version_check "autoconf" "$AUTOCONF autoconf autoconf270 autoconf269 autoconf268 autoconf267 autoconf266 autoconf265 autoconf264 autoconf263 autoconf262 autoconf261 autoconf260" \
+ "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 60 || DIE=1
+version_check "automake" "$AUTOMAKE automake automake-1.11 automake-1.10" \
+ "ftp://ftp.gnu.org/pub/gnu/automake/" 1 10 || DIE=1
version_check "autopoint" "autopoint" \
"ftp://ftp.gnu.org/pub/gnu/gettext/" 0 17 || DIE=1
version_check "libtoolize" "libtoolize libtoolize15 glibtoolize" \
@@ -48,7 +48,6 @@ version_check "pkg-config" "" \
die_check $DIE
-autoconf_2_52d_check || DIE=1
aclocal_check || DIE=1
autoheader_check || DIE=1
diff --git a/configure.ac b/configure.ac
index 77cd7ae..f8cb409 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ(2.52)
+AC_PREREQ(2.60)
dnl initialize autoconf
dnl when going to/from release please set the nano (fourth number) right !
@@ -10,7 +10,7 @@ AC_INIT(GNonLin, 0.10.15.1,
AG_GST_INIT
dnl initialize automake
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([-Wno-portability 1.10])
dnl define PACKAGE_VERSION_* variables
AS_VERSION