diff options
| author | Edward Hervey <bilboed@bilboed.com> | 2010-06-30 10:25:50 +0200 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2010-06-30 10:25:50 +0200 |
| commit | e1843c5f8fbabfee31aa42703e5de288bb0bc919 (patch) | |
| tree | 95b3f8b2a4b0643301b10e7bc468edfbf78443fc | |
| parent | 437837f31222ddd8071f3cd951f11c65e78e2bd7 (diff) | |
Bump automake requirements to 1.10 and autoconf to 2.60
| -rwxr-xr-x | autogen.sh | 9 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 6 insertions, 7 deletions
@@ -39,10 +39,10 @@ autogen_options $@ echo -n "+ 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.9 automake-1.8 automake-1.7 automake-1.6" \ - "ftp://ftp.gnu.org/pub/gnu/automake/" 1 6 || 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" "" \ @@ -50,7 +50,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 4217660..5d6ecce 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 Python Bindings, 0.10.18.2, AG_GST_INIT dnl initialize automake -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([-Wno-portability 1.10]) dnl define PACKAGE_VERSION_* variables AS_VERSION |