more up-to-date autotools practices

* use proper AC_INIT / AM_INIT_AUTOMAKE arguments
* install macros in m4/
* install junk build files in build-aux/
* replace hand-rolled autogen.sh by autoreconf -i
* sync .gitignore

4 files changed, 16 insertions, 20 deletions

diff --git a/.gitignore b/.gitignore
index d0e29b3..94777dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 *~
+/build-aux/
+/m4/
 configure
 Makefile
 Makefile.in
@@ -6,11 +8,6 @@ aclocal.m4
 autom4te.cache
 config.status
 config.log
-config.guess
-config.sub
-depcomp
-install-sh
-missing
 ratpoison-*.tar.gz
 ratpoison-*.tar.gz.sig
 TAGS
diff --git a/Makefile.am b/Makefile.am
index e3d67a4..a9e226e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,11 +21,12 @@
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
+ACLOCAL_AMFLAGS = -I m4 --install
 
 CLEANFILES		= *~ gmon.out
-MAINTAINERCLEANFILES	= Makefile.in aclocal.m4 \
-			config.guess config.h.in config.sub configure \
-			install-sh missing mkinstalldirs stamp-h.in depcomp
+MAINTAINERCLEANFILES	= Makefile.in aclocal.m4 configure src/config.h.in \
+			build-aux/depcomp build-aux/install-sh  \
+			build-aux/missing build-aux/texinfo.tex
 
 SUBDIRS			= src doc contrib
 
diff --git a/autogen.sh b/autogen.sh
index 5a1be80..18a6495 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,13 +19,6 @@
 #
 # $Id: autogen.sh,v 1.8 2006/03/16 00:33:34 sabetts Exp $
 #
-# usage: ./autogen.sh [-f]
-# option "-f" means forcefully create symlinks for missing files
-#                   (by default: copies are made only if necessary)
+# This file is just a wrapper for autoreconf
 
-if [ x"$1" = x-f ]
-  then shift ; am_opt='--force'
-  else         am_opt='--copy'
-fi
-
-aclocal && autoheader && automake -a $am_opt && autoconf
+autoreconf -i "$@"
diff --git a/configure.in b/configure.in
index b60e103..e73304b 100644
--- a/configure.in
+++ b/configure.in
@@ -19,8 +19,12 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 dnl
 dnl $Id: configure.in,v 1.54 2006/12/19 22:13:07 sabetts Exp $
 
-AC_INIT(src/main.c)
-AM_INIT_AUTOMAKE(ratpoison, 1.4.6-GIT)
+
+AC_INIT([ratpoison], [1.4.6-GIT], [ratpoison-devel@nongnu.org])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_SRCDIR([src/main.c])
+AM_INIT_AUTOMAKE([-Wall -Werror gnu])
 
 AM_MAINTAINER_MODE
 
@@ -151,4 +155,5 @@ AC_CHECK_FUNCS(unsetenv usleep vsnprintf)
 
 AC_TYPE_SIGNAL
 
-AC_OUTPUT(Makefile doc/Makefile src/Makefile contrib/Makefile)
+AC_CONFIG_FILES([Makefile doc/Makefile src/Makefile contrib/Makefile])
+AC_OUTPUT