# 
# 
# patch "ChangeLog"
#  from [7d9b8bd19695ce2b4b99b698dcc852359eb7008b]
#    to [475062157c989b538b1defb233135789b9110fc4]
# 
# patch "configure.ac"
#  from [a7ad3af487181961dca755f49b9afd41d2d451b1]
#    to [5d3a08a99f75eccbf9361d9b98b3515aa863befa]
# 
============================================================
--- ChangeLog	7d9b8bd19695ce2b4b99b698dcc852359eb7008b
+++ ChangeLog	475062157c989b538b1defb233135789b9110fc4
@@ -1,5 +1,11 @@
 2006-06-20  Nathaniel Smith  <address@hidden>
 
+	* configure.ac: Remove autotest-related configury.  
+	Add magic AM_INIT_AUTOMAKE options to make tar handle the long
+	filenames in the new test suite (automake 1.9 is now required).
+
+2006-06-20  Nathaniel Smith  <address@hidden>
+
 	* Makefile.am (EXTRA_DIST): The auto* gods demand sacrifice;
 	remove an extra / to balance previous change.
 	(NB: apparently a trailing / on a directory in EXTRA_DIST does
============================================================
--- configure.ac	a7ad3af487181961dca755f49b9afd41d2d451b1
+++ configure.ac	5d3a08a99f75eccbf9361d9b98b3515aa863befa
@@ -1,11 +1,10 @@
 # -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.58)
 AC_INIT(monotone, 0.27, address@hidden)
-AM_INIT_AUTOMAKE(1.7.1)
+AM_INIT_AUTOMAKE([1.9 tar-ustar check-news std-options])
 AC_CONFIG_SRCDIR([app_state.cc])
-AC_CONFIG_TESTDIR([tests])
 AM_CONFIG_HEADER([config.h])
 
 # Checks for programs.
@@ -578,6 +577,6 @@
 AC_SUBST(LIB3RDPARTY_CFLAGS)
 AC_SUBST(LIB3RDPARTY_CXXFLAGS)
 
-AC_CONFIG_FILES([Makefile tests/atlocal])
+AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([po/Makefile.in], [cat xgettext.opts >>po/Makefile.in])
 AC_OUTPUT