From 5d2aa42fd02878ec217f2a2eff90d36da7368611 Mon Sep 17 00:00:00 2001 From: Duong-Khang Nguyen Date: Mon, 7 Jun 2004 18:11:11 +0000 Subject: [PATCH] added AUTOMAKE_OPTIONS SVN-Revision: 1420 --- ChangeLog | 5 +++++ Makefile.am | 3 ++- autogen.sh | 4 +++- configure.ac | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c950a9403..56c25cb34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-06-07 neoneurone + + * Makefile.am, configure.ac, autogen.sh: minor changes + for using automake version 1.6 + 2004-06-02 gettextize * Makefile.am (SUBDIRS): Add intl, diff --git a/Makefile.am b/Makefile.am index 449a573a0..c19d0b1d2 100644 --- 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 7e64cbd35..2adc1a99a 100755 --- 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 2462fcf77..2f132b65b 100644 --- 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 -- 2.11.0