X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=configure.ac;h=61345ae58696d5f028d054b098c503195479b253;hb=bae86b4ced11d9f680bd3115f8eb1db92dbf3bcb;hp=98ded9453609f15016feae3b0a8432efb64152c4;hpb=f754e96b35665c5be11c4ea82a878463fc5a92df;p=supertux.git

diff --git a/configure.ac b/configure.ac
index 98ded9453..61345ae58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,18 +11,19 @@ dnl ===========================================================================
 
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.54])
-AC_INIT(SuperTux, 0.1.1)
-AC_CONFIG_HEADER(config.h)
+AC_INIT(SuperTux, 0.2-cvs)
+AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_SRCDIR([src/supertux.cpp])
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
-AM_CONFIG_HEADER
+dnl This is obsolete see automake1.7 // AM_CONFIG_HEADER
 
 SDL_VERSION=1.2.4
 
 AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_INSTALL
+AC_PROG_LIBTOOL
 
 dnl Checks for header files.
 AC_HEADER_DIRENT
@@ -37,8 +38,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" = "no"; then
     CXXFLAGS="$CXXFLAGS -pg"
     AC_MSG_RESULT([enabled])
 else
@@ -47,9 +49,10 @@ 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 -Werror -DDEBUG -O3 -g"
+              AC_HELP_STRING([--enable-debug], [enable debugging mode]),
+              [enable_debug=$enableval], [enable_debug=no])
+if test "$enable_debug" = "yes"; then
+    CXXFLAGS="$CXXFLAGS -Wall -Werror -DDEBUG -O0 -g3"
     AC_MSG_RESULT([enabled])
 else
     AC_MSG_RESULT([disabled])
@@ -57,8 +60,9 @@ 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])
@@ -83,12 +87,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"
@@ -105,7 +109,8 @@ AC_CHECK_FUNCS(mkdir strdup strstr)
 AC_OUTPUT(Makefile m4/Makefile intl/Makefile
           src/Makefile
           data/Makefile
-          po/Makefile.in)
+          po/Makefile.in
+	  lib/Makefile)
 
 echo ""
 echo "Features:"