Remove autogen.sh; use autoreconf -is instead.

diff --git a/README b/README
index 3624a2358346061ab15c29aef5d8ac6d4a1061b0..2a340c40a8b4437b7bd10e189cb0c36cac0ad8cb 100644 (file)
--- a/README
+++ b/README
@@ -7,16 +7,20 @@ The intended use is to verify that storage media work properly.
 Installation
 ============
 
+If you got it from git:
+
+  autoreconf -is
+
+In any case:
+
   ./configure
   make
   sudo make install
 
-If building from git, do './autogen.sh' first.
-
 Author
 ======
 
-Copyright (C) 2011 Richard Kettlewell
+Copyright (C) 2011, 2013 Richard Kettlewell
 Copyright (C) 2000, 2001, 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
 
 This program is free software: you can redistribute it and/or modify

diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755 (executable)
index 3ca74e0..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /bin/bash
-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
-autoconf
-autoheader
-automake -a || true            # for INSTALL
-automake --foreign -a

diff --git a/configure.ac b/configure.ac
index 02ecfb6664a84509782d3624d1b8f9176c4bf3d8..4c3c2902b8c438bf41050af81c37d84317e7e69a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.61])
 AC_INIT([vbig], [0.0.DEV], [rjk@greenend.org.uk])
 m4_include([m4/ax_random_device.m4])
 AC_CONFIG_AUX_DIR([config.aux])
-AM_INIT_AUTOMAKE([1.10])
+AM_INIT_AUTOMAKE([foreign])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 AC_CONFIG_SRCDIR([vbig.cc])
 AM_CONFIG_HEADER([config.h])