slightly reworked autotools

introduced aux.d directory and prettified and improved autogen.bash to run from the build
directory in case it differs from source.

Signed-off-by: Michael Krelin <hacker@klever.net>

4 files changed, 11 insertions, 11 deletions

diff --git a/.gitignore b/.gitignore
index f99d160..6b59f6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,14 @@
 Makefile
 Makefile.in
 /aclocal.m4
 /autom4te.cache
 /config.h
 /config.h.in
 /config.log
 /config.status
 /configure
 /stamp-h1
 /INSTALL
-/depcomp
-/install-sh
-/missing
 /NEWS
 TAGS
+/aux.d
diff --git a/autogen.bash b/autogen.bash
new file mode 100644
index 0000000..a798fad
--- a/dev/null
+++ b/autogen.bash
@@ -0,0 +1,9 @@
+#!/bin/bash
+( cd "$(dirname "$0")" \
+&& mkdir -p aux.d \
+&& aclocal \
+&& autoheader \
+&& automake -a \
+&& autoconf \
+&& "$(dirname "$0")"/configure "$@" \
+)
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100644
index 86d2d88..0000000
--- a/autogen.sh
+++ b/dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-WANT_AUTOMAKE=1.8
-export WANT_AUTOMAKE
-   aclocal \
-&& autoheader \
-&& automake -a \
-&& autoconf \
-&& ./configure "$@"
diff --git a/configure.ac b/configure.ac
index c814b53..1e0e42c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,14 +1,15 @@
 AC_INIT([iii], [0.3], [iii-bugs@klever.net])
 AC_CONFIG_SRCDIR([src/iiid.cc])
+AC_CONFIG_AUX_DIR([aux.d])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([dist-bzip2])
 
 AC_PROG_INSTALL
 AC_PROG_CXX
 AC_PROG_CC
 PKG_PROG_PKG_CONFIG
 
 AC_HEADER_STDC
 
 AC_PATH_PROG([XSLTPROC],[xsltproc],[true])