start modernizing autoconf infrastructure

* configure.ac: Slightly modernize.
* Makefile.am: Modernize, use dependencies.
* Makefile.am: Modernize, use dependencies.
* lib/Makefile.am: Remove ansi2knr.
* src/Makefile.am: Remove ansi2knr.

* .gitignore: Add INSTALL
* build-aux/.gitignore: New.

7 files changed, 21 insertions, 29 deletions

diff --git a/.gitignore b/.gitignore
index 4575e50d..8999fddb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 /config.status
 /stamp-h 
 /stamp-h1
+/INSTALL
 Makefile
 Makefile.in
 *.o
diff --git a/ChangeLog b/ChangeLog
index 0355d0d7..acea24e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2009-11-20  Paolo Bonzini  <bonzini@gnu.org>
 
+	* configure.ac: Slightly modernize.
+	* Makefile.am: Modernize, use dependencies.
+	* Makefile.am: Modernize, use dependencies.
+	* lib/Makefile.am: Remove ansi2knr.
+	* src/Makefile.am: Remove ansi2knr.
+
+	* .gitignore: Add INSTALL
+	* build-aux/.gitignore: New.
+
+2009-11-20  Paolo Bonzini  <bonzini@gnu.org>
+
 	* autogen.sh: Remove what is useless with git.
 
 2009-02-10  Tony Abou-Assaleh <taa@acm.org>
diff --git a/Makefile.am b/Makefile.am
index efec9aa3..b96b7772 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,27 +16,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-AUTOMAKE_OPTIONS = no-dependencies
+AUTOMAKE_OPTIONS = gnu
+ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = intl po lib doc src tests m4 vms bootstrap
 
 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
 
 # make cvs-clean blatantly stolen from KDE CVS ;)
 cvs-clean:
diff --git a/build-aux/.gitignore b/build-aux/.gitignore
new file mode 100644
index 00000000..1eb6e2af
--- /dev/null
+++ b/build-aux/.gitignore
@@ -0,0 +1,6 @@
+config.guess
+config.sub
+depcomp
+install-sh
+mdate-sh
+texinfo.tex
diff --git a/configure.ac.in b/configure.ac.in
index 67a9e89b..ac4706c0 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -20,6 +20,7 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_INIT(GNU grep, 2.6-cvs, bug-grep@gnu.org, grep)
+AC_CONFIG_AUX_DIR(build-aux)
 AC_CONFIG_SRCDIR(src/grep.c)
 AC_DEFINE(GREP, 1, [We are building grep])
 AC_PREREQ(2.53)
@@ -100,15 +101,6 @@ dnl check for the environ separator
 dnl sets SEP
 AM_SEP
 
-dnl OS specifics
-dnl sets {EXE,OBJ}EXT
-AC_EXEEXT
-dnl Invoke the (capitalized) ac_objext macro without spelling its name.
-dnl This works around a bug in automake 1.4 with ansi2knr.
-dnl Automake looks for (capitalized) ac_objext by grepping for it,
-dnl so it won't find it in this file.
-ifelse(,, [AC][_OBJEXT])
-
 dnl some folks ask for this, that's fine by me
 dnl hope they know what they're doing ...
 dnl if glibc2 regex is not included
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0ad35582..f62b1d98 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -14,8 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-AUTOMAKE_OPTIONS = ../src/ansi2knr
-
 SUBDIRS = posix
 
 noinst_LIBRARIES = libgreputils.a
diff --git a/src/Makefile.am b/src/Makefile.am
index c9fb26a4..8986489e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,8 +15,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AUTOMAKE_OPTIONS = ansi2knr
-
 LN = ln
 
 bin_PROGRAMS = grep egrep fgrep