[gst-cvs] gst-ffmpeg: Bump automake requirement to 1.10, autoconf to 2. 60 and libtool to 1.5

[<tp...@ke...>]

Module: gst-ffmpeg
Branch: master
Commit: e90a2a7161ff0e8687d8863139e12f1e0f0728af
URL:    http://cgit.freedesktop.org/gstreamer/gst-ffmpeg/commit/?id=e90a2a7161ff0e8687d8863139e12f1e0f0728af

Author: Tim-Philipp Müller <tim...@co...>
Date:   Mon Jun 28 17:13:50 2010 +0100

Bump automake requirement to 1.10, autoconf to 2.60 and libtool to 1.5

For maintainability reasons. These are the versions we require in
other modules.

---

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

diff --git a/autogen.sh b/autogen.sh
index cb3bacf..24c7fc2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -68,18 +68,17 @@ 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 6 || DIE=1
-version_check "libtoolize" "$LIBTOOLIZE libtoolize libtoolize14 glibtoolize" \
-              "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 4 0 || 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 "libtoolize" "$LIBTOOLIZE libtoolize glibtoolize" \
+              "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 5 0 || DIE=1
 version_check "pkg-config" "" \
               "http://www.freedesktop.org/software/pkgconfig" 0 8 0 || DIE=1
 
 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 2487680..00e9a8f 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(GStreamer FFMpeg, 0.10.10.3,
 AG_GST_INIT
 
 dnl initialize automake
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([-Wno-portability 1.10])
 
 dnl define PACKAGE_VERSION_* variables
 AS_VERSION