summaryrefslogtreecommitdiff
path: root/autogen.sh
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim.muller@collabora.co.uk>2010-06-28 15:43:30 +0100
committerTim-Philipp Müller <tim.muller@collabora.co.uk>2010-06-28 15:57:20 +0100
commita6fc8a8738b8645e3c0c042ff46004640a757441 (patch)
tree8ecb91d8bd3c40ea2d6ca5e8ee23128d93342768 /autogen.sh
parentb8005a3640864d6e67f1ed69c7cc965c021060f7 (diff)
Bump automake requirement to 1.10
For maintainability reasons and $(builddir). Fixes #622944.
Diffstat (limited to 'autogen.sh')
-rwxr-xr-xautogen.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/autogen.sh b/autogen.sh
index 2b9f2892f..70c5340a1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -38,8 +38,8 @@ printf "+ check for build tools"
if test ! -z "$NOCHECK"; then echo " skipped"; else echo; fi
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 automake-1.9 automake19 automake-1.7 automake-1.6 automake-1.5" \
- "ftp://ftp.gnu.org/pub/gnu/automake/" 1 7 || 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" \
@@ -49,7 +49,6 @@ version_check "pkg-config" "" \
die_check $DIE
-autoconf_2_52d_check || DIE=1
aclocal_check || DIE=1
autoheader_check || DIE=1