From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Sun, 27 Oct 2013 14:30:57 +0000 (+0000)
Subject: autogen: use autoreconf -si
X-Git-Tag: 5.1.1~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/c37132f22eb3ee6fa48da5a56f0dd88a9d8ca5ae

autogen: use autoreconf -si
---

diff --git a/autogen.sh b/autogen.sh
index 90a5b88..b51a363 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -21,15 +21,5 @@ set -e
 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 a07f74d..28665f6 100644
--- 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.
-# 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
@@ -20,7 +20,7 @@
 
 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])