added AUTOMAKE_OPTIONS

SVN-Revision: 1420

diff --git a/ChangeLog b/ChangeLog
index c950a94..56c25cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-07 neoneurone <neoneurone@users.sf.net>
+
+       * Makefile.am, configure.ac, autogen.sh: minor changes
+       for using automake version 1.6
+
 2004-06-02  gettextize  <bug-gnu-gettext@gnu.org>
 
        * Makefile.am (SUBDIRS): Add intl,

diff --git a/Makefile.am b/Makefile.am
index 449a573..c19d0b1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,4 @@
 SUBDIRS = intl m4 src data po
-EXTRA_DIST = config.rpath mkinstalldirs  config.rpath mkinstalldirs  config.rpath  config.rpath  LEVELDESIGN TODO contrib/levelconverter-0.0.6_0.0.7.py autogen.sh
+EXTRA_DIST = LEVELDESIGN TODO contrib/levelconverter-0.0.6_0.0.7.py autogen.sh
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = 1.6 dist-bzip2

diff --git a/autogen.sh b/autogen.sh
index 7e64cbd..2adc1a9 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
 
 # we need a minimum of automake 1.6 and automake 1.8 seems to be buggy
-export WANT_AUTOMAKE=1.6
+# this doesn't seem to work, commented out
+# see AUTOMAKE_OPTIONS in Makefile.am
+# export WANT_AUTOMAKE=1.6
 
 aclocal -I m4
 automake --copy --add-missing

diff --git a/configure.ac b/configure.ac
index 2462fcf..2f132b6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ AC_PREREQ([2.54])
 AC_INIT(SuperTux, 0.1.1)
 AC_CONFIG_SRCDIR([src/supertux.cpp])
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(dist-bzip2)
+AM_INIT_AUTOMAKE
 
 SDL_VERSION=1.2.4