X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=configure.ac;h=f56ec9876176ec846c7115c40a9936b9c05d740f;hb=2dcdb5c4759e73d6961770fed7250a939be3063f;hp=422b03f86a78867a1638e285660d915259e1334d;hpb=4f0f0d2d17f5b12ef9c225b571c59319142270ae;p=supertux.git

diff --git a/configure.ac b/configure.ac
index 422b03f86..f56ec9876 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,18 +10,23 @@ 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_INIT(SuperTux, 0.2-cvs)
+AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_SRCDIR([src/supertux.cpp])
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(dist-bzip2)
+AM_INIT_AUTOMAKE
+dnl This is obsolete see automake1.7 // AM_CONFIG_HEADER
 
-SDL_VERSION=1.2.4
+# we don't want the stupid autoconf default -g -O2
+test ".$CXXFLAGS" = "." && CXXFLAGS=" "
+
+CXXFLAGS="$CXXFLAGS -ffast-math"
 
 AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_INSTALL
+AC_PROG_LIBTOOL
 
 dnl Checks for header files.
 AC_HEADER_DIRENT
@@ -36,8 +41,9 @@ dnl Give advanced users some options to play with
 
 AC_MSG_CHECKING(for gprof mode)
 AC_ARG_ENABLE(gprof,
-              AC_HELP_STRING([--enable-gprof], [enable GNU profiling support]),, enable_gprof="no")
-if test "x${enable_gprof}" != "xno"; then
+              AC_HELP_STRING([--enable-gprof], [enable GNU profiling support]),
+              [enable_gprof=$enableval], [enable_gprof=no])
+if test "$enable_gprof" = "yes"; then
     CXXFLAGS="$CXXFLAGS -pg"
     AC_MSG_RESULT([enabled])
 else
@@ -46,31 +52,39 @@ fi
 
 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"
+              AC_HELP_STRING([--enable-debug], [enable debugging mode]),
+              [enable_debug=$enableval], [enable_debug=no])
+if test "$enable_debug" = "yes"; then
+    AC_DEFINE([DEBUG], 1, [define to compile in debug checks])
+    CXXFLAGS="$CXXFLAGS -Wall -Werror -O0 -g3"
     AC_MSG_RESULT([enabled])
 else
+    CXXFLAGS="$CXXFLAGS -O2 -g"
     AC_MSG_RESULT([disabled])
 fi
 
 AC_MSG_CHECKING(wether OpenGL should be used)
 AC_ARG_ENABLE(opengl,
-              AC_HELP_STRING([--disable-opengl], [disable OpenGL support]),, enable_opengl="yes")
-if test "x${enable_opengl}" != "xno"; then
+              AC_HELP_STRING([--disable-opengl], [disable OpenGL support]),
+              [enable_opengl=$enableval], enable_opengl=yes)
+if test "$enable_opengl" = "yes"; then
     AC_MSG_RESULT([yes])
 else
     AC_MSG_RESULT([no])
 fi
 
+AM_GNU_GETTEXT
+
 dnl ===========================================================================
 dnl Check for SDL
+SDL_VERSION=1.2.4
 AM_PATH_SDL($SDL_VERSION,
             :,
 	    AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]))
 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,,
@@ -79,12 +93,12 @@ AC_CHECK_LIB(SDL_mixer, Mix_OpenAudio,,
 AC_CHECK_LIB(SDL_image, IMG_Load,,
 	AC_MSG_ERROR([SDL_image library required]))
 
-if test "x${enable_opengl}" != "xno"; then
+if test "$enable_opengl" = "yes"; then
   AX_CHECK_GL
 fi
-if test "x$no_gl" = "xyes" -o "x$enable_opengl" = "xno"; then
+if test "$no_gl" = "yes" -o "$enable_opengl" = "no"; then
   CXXFLAGS="$CXXFLAGS -DNOOPENGL"
-  enable_opengl="no"
+  enable_opengl=no
 else
   CFLAGS="$CFLAGS $GL_CFLAGS"
   CXXFLAGS="$CXXFLAGS $GL_CFLAGS"
@@ -98,7 +112,11 @@ 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
+	  lib/Makefile)
 
 echo ""
 echo "Features:"