build-from-git: depend on automake-1.10b

* bootstrap.conf (buildreq): Note the automake-1.10b requirement.
* configure.ac (AM_INIT_AUTOMAKE): Enable new automake options:
dist-xz, color-tests, parallel-tests, silent-rules.

diff --git a/bootstrap.conf b/bootstrap.conf
index 760da9f..e2b7225 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -114,7 +114,7 @@ mkdir -p gnulib-tests
 # Build prerequisites
 buildreq="\
 autoconf   2.61
-automake   1.10
+automake   1.10b
 autopoint  -
 gettext    -
 git        1.4.4

diff --git a/configure.ac b/configure.ac
index 65ddedc..5f3f7d9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl GNU Parted - a library and front end for manipulation hard disk partitions
-dnl Copyright (C) 1998-2002, 2005-2008 Free Software Foundation, Inc.
+dnl Copyright (C) 1998-2002, 2005-2009 Free Software Foundation, Inc.
 dnl
 dnl This file may be modified and/or distributed without restriction.
 
@@ -52,7 +52,7 @@ AC_SUBST([LT_CURRENT])
 AC_SUBST([LT_REVISION])
 AC_SUBST([LT_AGE])
 
-AM_INIT_AUTOMAKE([1.10 dist-bzip2])
+AM_INIT_AUTOMAKE([1.10b dist-xz color-tests parallel-tests silent-rules])
 
 AC_CANONICAL_HOST
 case "$host_os" in