autogen: use autoreconf -si

diff --git a/autogen.sh b/autogen.sh
index 90a5b88d0c7de7fb9f12314696178e15a72255ce..b51a3632cd12b2b05fa122e123637c5fffe54492 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -21,15 +21,5 @@ set -e
 srcdir=$(dirname $0)
 here=$(pwd)
 cd $srcdir
 srcdir=$(dirname $0)
 here=$(pwd)
 cd $srcdir

-mkdir -p config.aux
-if test -d $HOME/share/aclocal; then
-  aclocal --acdir=$HOME/share/aclocal
-else
-  aclocal
-fi
-libtoolize
-autoconf
-autoheader
-automake -a || true            # for INSTALL
-automake --foreign -a
-
+mkdir -p m4
+autoreconf -si

diff --git a/configure.ac b/configure.ac
index a07f74d5f21e9b92e089ffca542ada4cb419c936..28665f61aaa15a2d3b9e9efd2b060257258fb2a5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 #
 # This file is part of DisOrder.
 # Process this file with autoconf to produce a configure script.
 #
 # This file is part of DisOrder.

-# Copyright (C) 2004-2010 Richard Kettlewell
+# Copyright (C) 2004-2013 Richard Kettlewell

 # Portions copyright (C) 2007 Ross Younger
 #
 # This program is free software: you can redistribute it and/or modify
 # Portions copyright (C) 2007 Ross Younger
 #
 # This program is free software: you can redistribute it and/or modify


@@ -20,7 +20,7 @@
 
 AC_INIT([disorder], [5.1], [richard+disorder@sfere.greenend.org.uk])
 AC_CONFIG_AUX_DIR([config.aux])
 
 AC_INIT([disorder], [5.1], [richard+disorder@sfere.greenend.org.uk])
 AC_CONFIG_AUX_DIR([config.aux])

-AM_INIT_AUTOMAKE(disorder, [5.1])
+AM_INIT_AUTOMAKE([foreign])

 AC_CONFIG_SRCDIR([server/disorderd.c])
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([server/disorderd.c])
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])