* Makefile.am (ACLOCAL_AMFLAGS): Specify that aclocal install
ordinarily system-wide macros into m4 (libtool.m4, specifically).
This makes it easier for packagers to modify autoconfery since
aclocal is no longer a destructive event.
* configure.ac (AM_INIT_AUTOMAKE): Increase Automake requirement to
1.10 to ensure we have aclocal --instal
* HACKING: Increase Automake version in the docs.

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 5a0b777..0e8eb97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-10-08  Scott James Remnant  <scott@netsplit.com>
+
+	* Makefile.am (ACLOCAL_AMFLAGS): Specify that aclocal install
+	ordinarily system-wide macros into m4 (libtool.m4, specifically).
+	This makes it easier for packagers to modify autoconfery since
+	aclocal is no longer a destructive event.
+	* configure.ac (AM_INIT_AUTOMAKE): Increase Automake requirement to
+	1.10 to ensure we have aclocal --instal
+	* HACKING: Increase Automake version in the docs.
+
 2007-06-22  Scott James Remnant  <scott@netsplit.com>
 
 	* nih/tests/test_tree.c (test_next, test_prev, test_next_pre)

HACKING

diff --git a/HACKING b/HACKING
index c2dff51..99e5328 100644
--- a/HACKING
+++ b/HACKING
@@ -26,7 +26,7 @@
 installed.
 
 	* GNU Autoconf 2.60
-	* GNU Automake 1.9
+	* GNU Automake 1.10
 	* GNU Libtool 1.5.22
 	* GNU Gettext 0.15
 

Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1270457..50a3557 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,4 +4,4 @@
 
 EXTRA_DIST = HACKING
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = --install -I m4

configure.ac

diff --git a/configure.ac b/configure.ac
index ad21231..e6f0a4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@
 
 AC_GNU_SOURCE
 
-AM_INIT_AUTOMAKE([1.9 gnu nostdinc check-news dist-bzip2])
+AM_INIT_AUTOMAKE([1.10 gnu nostdinc check-news dist-bzip2])
 
 AM_GNU_GETTEXT_VERSION([0.15])
 AM_GNU_GETTEXT()