- don't add new objects until end of Sector::action()

[supertux.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 851c492..2f132b6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -10,12 +10,11 @@ dnl          neoneurone@users.sf.net
 dnl ===========================================================================
 
 dnl Process this file with autoconf to produce a configure script.
-
 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
 
@@ -48,7 +47,7 @@ AC_MSG_CHECKING(for debug mode)
 AC_ARG_ENABLE(debug,
               AC_HELP_STRING([--enable-debug], [enable debugging mode]),, enable_debug="yes")
 if test "x${enable_debug}" != "xno"; then
-    CXXFLAGS="$CXXFLAGS -Wall -W -DDEBUG -O0 -g3"
+    CXXFLAGS="$CXXFLAGS -Wall -Werror -DDEBUG -O0 -g3"
     AC_MSG_RESULT([enabled])
 else
     AC_MSG_RESULT([disabled])
@@ -63,6 +62,8 @@ else
     AC_MSG_RESULT([no])
 fi
 
+AM_GNU_GETTEXT
+
 dnl ===========================================================================
 dnl Check for SDL
 AM_PATH_SDL($SDL_VERSION,
@@ -71,6 +72,7 @@ AM_PATH_SDL($SDL_VERSION,
 CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
 CFLAGS="$CFLAGS $SDL_CFLAGS"
 LIBS="$LIBS $SDL_LIBS"
+GL_LIBS="-lGL"
 
 dnl Checks for additional libraries.
 AC_CHECK_LIB(SDL_mixer, Mix_OpenAudio,,
@@ -88,7 +90,7 @@ if test "x$no_gl" = "xyes" -o "x$enable_opengl" = "xno"; then
 else
   CFLAGS="$CFLAGS $GL_CFLAGS"
   CXXFLAGS="$CXXFLAGS $GL_CFLAGS"
-  LIBS="$LIBS $GL_LIBS -lGL"
+  LIBS="$LIBS $GL_LIBS"
 fi
 
 AC_CHECK_LIB(z, gzopen,, AC_MSG_ERROR([*** zlib is missing]))
@@ -98,7 +100,10 @@ CXXFLAGS="$CXXFLAGS -DDATA_PREFIX='\"$datadir/supertux\"'"
 dnl Checks for library functions.
 AC_CHECK_FUNCS(mkdir strdup strstr)
 
-AC_OUTPUT(Makefile src/Makefile data/Makefile)
+AC_OUTPUT(Makefile m4/Makefile intl/Makefile
+          src/Makefile
+          data/Makefile
+          po/Makefile.in)
 
 echo ""
 echo "Features:"