[Super-tux-commit] supertux ChangeLog,1.7,1.8 Makefile.am,1.6,1.7 autogen.sh,1.7,1.8 configure.ac,1.26,1.27

[Duong-Khang N. <neo...@us...>]

Update of /cvsroot/super-tux/supertux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8234

Modified Files:
	ChangeLog Makefile.am autogen.sh configure.ac 
Log Message:
added AUTOMAKE_OPTIONS

Index: configure.ac
===================================================================
RCS file: /cvsroot/super-tux/supertux/configure.ac,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- configure.ac	2 Jun 2004 23:00:26 -0000	1.26
+++ configure.ac	7 Jun 2004 18:11:11 -0000	1.27
@@ -14,7 +14,7 @@
 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
 

Index: Makefile.am
===================================================================
RCS file: /cvsroot/super-tux/supertux/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am	3 Jun 2004 11:27:19 -0000	1.6
+++ Makefile.am	7 Jun 2004 18:11:09 -0000	1.7
@@ -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

Index: autogen.sh
===================================================================
RCS file: /cvsroot/super-tux/supertux/autogen.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- autogen.sh	3 Jun 2004 11:27:19 -0000	1.7
+++ autogen.sh	7 Jun 2004 18:11:10 -0000	1.8
@@ -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

Index: ChangeLog
===================================================================
RCS file: /cvsroot/super-tux/supertux/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ChangeLog	3 Jun 2004 11:27:19 -0000	1.7
+++ ChangeLog	7 Jun 2004 18:11:02 -0000	1.8
@@ -1,3 +1,8 @@
+2004-06-07 neoneurone <neo...@us...>
+
+	* Makefile.am, configure.ac, autogen.sh: minor changes
+	for using automake version 1.6
+
 2004-06-02  gettextize  <bug...@gn...>
 
 	* Makefile.am (SUBDIRS): Add intl,