foxygit / doom Log in
commit 056415e2d68e261583a6fcfe1df24d5724ef91a8
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Tue Sep 11 09:02:24 2007 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Tue Sep 11 09:02:24 2007 +0000

    Remove obsolete autotools scripts from dist, require automake 1.8
    (please upgrade!)

    Subversion-branch: /trunk/chocolate-doom
    Subversion-revision: 970
---
 Makefile.am  | 5 +----
 configure.in | 4 +++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 1e199d1c..426854b1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,6 @@
 AUX_DIST_GEN =                          \
-        $(ac_aux_dir)/config.guess      \
-        $(ac_aux_dir)/config.sub        \
         $(ac_aux_dir)/install-sh        \
-        $(ac_aux_dir)/missing           \
-        $(ac_aux_dir)/mkinstalldirs
+        $(ac_aux_dir)/missing

 MSVC_FILES=                             \
         msvc/README                     \
diff --git a/configure.in b/configure.in
index 3932fa3a..7f0e68e3 100644
--- a/configure.in
+++ b/configure.in
@@ -48,7 +48,9 @@ AC_CHECK_TOOL(WINDRES, windres, )
 AM_CONDITIONAL(HAVE_WINDRES, test "$WINDRES" != "")
 AM_CONDITIONAL(HAVE_PYTHON, $HAVE_PYTHON)

-AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME,AC_PACKAGE_VERSION)
+dnl Automake v1.8.0 is required, please upgrade!
+
+AM_INIT_AUTOMAKE([1.8.0])

 WINDOWS_RC_VERSION=`echo $PACKAGE_VERSION.0 | sed 's/\./, /g' `