Index: Makefile.am
===================================================================
RCS file: /sources/grep/grep/Makefile.am,v
retrieving revision 1.19
diff -u -r1.19 Makefile.am
--- Makefile.am	29 Apr 2005 10:37:09 -0000	1.19
+++ Makefile.am	11 Feb 2008 16:54:19 -0000
@@ -5,21 +5,7 @@
 
 EXTRA_DIST = TODO README README-alpha
 
-# We should be able to just define `ACLOCAL_AMFLAGS = --acdir=m4',
-# but this runs afoul of a bug in automake 1.
-# The following hack works around this bug by creating acinclude.m4 manually.
-ACLOCAL_AMFLAGS =
-M4DIR = $(srcdir)/m4
-ACINCLUDE_INPUTS = $(M4DIR)/decl.m4 $(M4DIR)/djgpp.m4 $(M4DIR)/dosfile.m4 \
-  $(M4DIR)/envsep.m4 $(M4DIR)/error.m4 $(M4DIR)/gettext.m4 $(M4DIR)/glibc.m4 \
-  $(M4DIR)/header.m4 $(M4DIR)/init.m4 $(M4DIR)/install.m4 \
-  $(M4DIR)/inttypes_h.m4 $(M4DIR)/isc-posix.m4 $(M4DIR)/largefile.m4 \
-  $(M4DIR)/lcmessage.m4 $(M4DIR)/malloc.m4 $(M4DIR)/mbstate_t.m4 \
-  $(M4DIR)/missing.m4 $(M4DIR)/progtest.m4 $(M4DIR)/realloc.m4 \
-  $(M4DIR)/regex.m4 $(M4DIR)/sanity.m4 $(M4DIR)/strerror_r.m4 \
-  $(M4DIR)/uintmax_t.m4 $(M4DIR)/ulonglong.m4 $(M4DIR)/xstrtoumax.m4
-$(srcdir)/acinclude.m4 : $(ACINCLUDE_INPUTS)
-	cat $(ACINCLUDE_INPUTS) >$(srcdir)/acinclude.m4
+ACLOCAL_AMFLAGS = -I m4
 
 # make cvs-clean blatantly stolen from KDE CVS ;)
 cvs-clean:
Index: autogen.sh
===================================================================
RCS file: /sources/grep/grep/autogen.sh,v
retrieving revision 1.8
diff -u -r1.8 autogen.sh
--- autogen.sh	18 Aug 2006 21:16:07 -0000	1.8
+++ autogen.sh	11 Feb 2008 16:54:19 -0000
@@ -14,10 +14,7 @@
 
 # Let auto* do its work
 if \
-aclocal -I m4 &&
-autoheader &&
-automake -a &&
-autoconf
+autoreconf -f -i
 then
 	echo "Next, run ./configure && make && make check"
 else