diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-06-28 16:20:09 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-06-28 16:23:09 +0100 |
| commit | c6def75fc46babac0dbbe8b33612fee22addfdea (patch) | |
| tree | 8fc150db7a285a6d02ebb0f676ff7c49aef63121 | |
| parent | 380ec88b4ce3ef09e50fbe1349cda2652d2e3846 (diff) | |
Bump automake requirement to 1.10 and autoconf to 2.60
For maintainability reasons, $(builddir) and other things.
See #622944 and #570428.
| -rwxr-xr-x | autogen.sh | 9 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/autogen.sh b/autogen.sh index 8b88b9bf5..4ac0577d6 100755 --- a/autogen.sh +++ b/autogen.sh @@ -35,10 +35,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" \ @@ -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 1eaa1577c..532671adb 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 Bad Plug-ins, 0.10.19.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 |