[Super-tux-commit] supertux autogen.sh,1.13,1.14 configure.ac,1.40,1.41

[Matze B. <mat...@us...>]

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

Modified Files:
	autogen.sh configure.ac 
Log Message:
remove automake from configure.ac

Index: configure.ac
===================================================================
RCS file: /cvsroot/super-tux/supertux/configure.ac,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- configure.ac	25 Nov 2004 00:49:32 -0000	1.40
+++ configure.ac	25 Nov 2004 01:08:59 -0000	1.41
@@ -12,11 +12,11 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.54])
 AC_INIT(supertux, 0.2-cvs)
-AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_SRCDIR([src/supertux.cpp])
+AC_CONFIG_AUX_DIR([mk/autoconf])
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE
-dnl This is obsolete see automake1.7 // AM_CONFIG_HEADER
+
+AC_CONFIG_HEADERS(config.h)
 
 # we don't want the stupid autoconf default -g -O2
 test ".$CXXFLAGS" = "." && CXXFLAGS=" "
@@ -26,7 +26,6 @@
 AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_INSTALL
-AC_PROG_LIBTOOL
 
 dnl Checks for header files.
 AC_HEADER_DIRENT
@@ -78,7 +77,9 @@
     AC_MSG_RESULT([no])
 fi
 
-AM_ICONV
+AC_CHECK_LIB([iconv], [iconv_open])
+AC_TRY_LINK([#include <iconv.h>], [iconv_open(0, 0);],,
+    AC_MSG_ERROR([Couldn't find iconv library]))
 
 dnl ===========================================================================
 dnl Check for SDL
@@ -127,10 +128,7 @@
 AC_INIT_JAM
 AC_CONFIG_FILES([Jamconfig])
 
-AC_OUTPUT(Makefile
-          src/Makefile
-          data/Makefile
-	  lib/Makefile)
+AC_OUTPUT
 
 echo ""
 echo "Features:"
@@ -141,4 +139,5 @@
 echo ""
 echo ""
 echo "       NOTE: This project uses jam (and not make) as build tool"
+echo ""
 

Index: autogen.sh
===================================================================
RCS file: /cvsroot/super-tux/supertux/autogen.sh,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- autogen.sh	25 Nov 2004 00:49:32 -0000	1.13
+++ autogen.sh	25 Nov 2004 01:08:59 -0000	1.14
@@ -7,7 +7,6 @@
 fi
 
 autoheader
-libtoolize --force
 aclocal -I mk/autoconf
 
 # generate Jamconfig.in