Modernise autoconf.

2 files changed, 5 insertions, 93 deletions

diff --git a/autogen.sh b/autogen.sh
index 6e23e5b..298a369 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,89 +1,2 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-# This was lifted from the Gimp, and adapted slightly by
-# Raph Levien, slightly hacked for xine by Daniel Caujolle-Bert.
-
-DIE=0
-
-PROG=anoid
-
-# Check how echo works in this /bin/sh
-case `echo -n` in
--n)     _echo_n=   _echo_c='\c';;
-*)      _echo_n=-n _echo_c=;;
-esac
-
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-        echo
-        echo "You must have autoconf installed to compile $PROG."
-        echo "Download the appropriate package for your distribution,"
-        echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-        DIE=1
-}
-
-(libtool --version) < /dev/null > /dev/null 2>&1 || {
-        echo
-        echo "You must have libtool installed to compile $PROG."
-        echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.4.tar.gz"
-        echo "(or a newer version if it is available)"
-        DIE=1
-}
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
-        echo
-        echo "You must have automake installed to compile $PROG."
-        echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
-        echo "(or a newer version if it is available)"
-        DIE=1
-}
-
-(aclocal --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "**Error**: Missing aclocal. The version of automake"
-	echo "installed doesn't appear recent enough."
-	echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
-	echo "(or a newer version if it is available)"
-	DIE=1
-}
-
-if [ "$DIE" -eq 1 ]; then
-        exit 1
-fi
-
-# Create testfiles
-TESTDIRS="src"
-for d in $TESTDIRS
-do
-		if [ ! -f $d/Makefile.am.test ]
-		then
-				touch $d/Makefile.am.test
-		fi
-done
-
-aclocalinclude="$ACLOCAL_FLAGS"; \
-(echo $_echo_n " + Running aclocal: $_echo_c"; \
-    aclocal $aclocalinclude; \
- echo "done.") && \
-(echo $_echo_n " + Running libtoolize: $_echo_c"; \
-    libtoolize --force --copy >/dev/null 2>&1; \
- echo "done.") && \
-(echo $_echo_n " + Running autoheader: $_echo_c"; \
-    autoheader; \
- echo "done.") && \
-(echo $_echo_n " + Running automake: $_echo_c"; \
-    automake --gnu --add-missing --copy; \
- echo "done.") && \
-(echo $_echo_n " + Running autoconf: $_echo_c"; \
-    autoconf; \
- echo "done.")
-
-rm -f config.cache
-
-for d in $TESTDIRS
-do
-		if [ -f $d/Makefile.am.test ]
-		then
-				rm $d/Makefile.am.test
-		fi
-done
+#!/bin/sh -e
+${AUTORECONF:-autoreconf} -fiv
diff --git a/configure.in b/configure.ac
index d4f48f0..01c69b4 100644
--- a/configure.in
+++ b/configure.ac
@@ -1,9 +1,8 @@
 # Filename: configure.in
 
-AC_INIT(src/muniad.cc)
-
-VERSION="0.0.1"
-AM_INIT_AUTOMAKE( munia, $VERSION )
+AC_INIT([muniad], [0.0.2])
+AC_CONFIG_SRCDIR([src/muniad.cc])
+AM_INIT_AUTOMAKE
 
 dnl ======================
 dnl Compile with debug options