[gst-cvs] gst-plugins-ugly: Bump automake requirement to 1.10 and autoconf to 2.60

[Tim Müller]

Module: gst-plugins-ugly
Branch: master
Commit: 95d6c2c67c0ea5c244d592ca852d72f3f8c6e022
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-ugly/commit/?id=95d6c2c67c0ea5c244d592ca852d72f3f8c6e022

Author: Tim-Philipp Müller <tim.muller at collabora.co.uk>
Date:   Mon Jun 28 16:12:12 2010 +0100

Bump automake requirement to 1.10 and autoconf to 2.60

For maintainability reasons and $(builddir).

See #622944.

---

 autogen.sh   |    8 ++++----
 configure.ac |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 7eef134..8953133 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" \
diff --git a/configure.ac b/configure.ac
index 8338ae9..3d2f4f9 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 Ugly Plug-ins, 0.10.15.1,
 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