Bump automake requirement to 1.10 and autoconf to 2.60

For maintainability reasons and $(builddir).

See #622944.
This commit is contained in:
Tim-Philipp Müller 2010-06-28 15:44:06 +01:00
parent cf8dddd5c7
commit 8d0d93bcc6
2 changed files with 6 additions and 7 deletions

View file

@ -36,10 +36,10 @@ autogen_options $@
printf "+ check for build tools" printf "+ check for build tools"
if test ! -z "$NOCHECK"; then echo " skipped"; else echo; fi if test ! -z "$NOCHECK"; then echo " skipped"; else echo; fi
version_check "autoconf" "$AUTOCONF autoconf autoconf-2.54 autoconf-2.53 autoconf-2.52" \ version_check "autoconf" "$AUTOCONF autoconf autoconf270 autoconf269 autoconf268 autoconf267 autoconf266 autoconf265 autoconf264 autoconf263 autoconf262 autoconf261 autoconf260" \
"ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 52 || DIE=1 "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 60 || 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" \ version_check "automake" "$AUTOMAKE automake automake-1.11 automake-1.10" \
"ftp://ftp.gnu.org/pub/gnu/automake/" 1 7 || DIE=1 "ftp://ftp.gnu.org/pub/gnu/automake/" 1 10 || DIE=1
version_check "autopoint" "autopoint" \ version_check "autopoint" "autopoint" \
"ftp://ftp.gnu.org/pub/gnu/gettext/" 0 17 || DIE=1 "ftp://ftp.gnu.org/pub/gnu/gettext/" 0 17 || DIE=1
version_check "libtoolize" "$LIBTOOLIZE libtoolize glibtoolize" \ version_check "libtoolize" "$LIBTOOLIZE libtoolize glibtoolize" \
@ -49,7 +49,6 @@ version_check "pkg-config" "" \
die_check $DIE die_check $DIE
autoconf_2_52d_check || DIE=1
aclocal_check || DIE=1 aclocal_check || DIE=1
autoheader_check || DIE=1 autoheader_check || DIE=1

View file

@ -1,4 +1,4 @@
AC_PREREQ(2.52) AC_PREREQ(2.60)
dnl please read gstreamer/docs/random/autotools before changing this file 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 AG_GST_INIT
dnl initialize automake dnl initialize automake
AM_INIT_AUTOMAKE([-Wno-portability]) AM_INIT_AUTOMAKE([-Wno-portability 1.10])
dnl define PACKAGE_VERSION_* variables dnl define PACKAGE_VERSION_* variables
AS_VERSION AS_VERSION