From: Tim-Philipp Müller <tim.muller@collabora.co.uk>
Date: Mon, 28 Jun 2010 14:44:06 +0000 (+0100)
Subject: Bump automake requirement to 1.10 and autoconf to 2.60
X-Git-Tag: 1.19.3~509^2~8366
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8d0d93bcc6acd2c021439f7a4afa47141e7045a6;p=platform%2Fupstream%2Fgstreamer.git

Bump automake requirement to 1.10 and autoconf to 2.60

For maintainability reasons and $(builddir).

See #622944.
---

diff --git a/autogen.sh b/autogen.sh
index 6031368..884e9fb 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -36,10 +36,10 @@ autogen_options $@
 
 printf "+ check for build tools"
 if test ! -z "$NOCHECK"; then echo " skipped"; else  echo; fi
-version_check "autoconf" "$AUTOCONF autoconf autoconf-2.54 autoconf-2.53 autoconf-2.52" \
-              "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 52 || DIE=1
-version_check "automake" "$AUTOMAKE automake automake-1.11 automake-1.10 automake-1.9 automake-1.7 automake-1.6 automake-1.5" \
-              "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 libtoolize glibtoolize" \
@@ -49,7 +49,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 101d397..573ad82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ(2.52)
+AC_PREREQ(2.60)
 
 dnl please read gstreamer/docs/random/autotools before changing this file
 
@@ -12,7 +12,7 @@ AC_INIT(GStreamer Good Plug-ins, 0.10.23.2,
 AG_GST_INIT
 
 dnl initialize automake
-AM_INIT_AUTOMAKE([-Wno-portability])
+AM_INIT_AUTOMAKE([-Wno-portability 1.10])
 
 dnl define PACKAGE_VERSION_* variables
 AS_VERSION