X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.ac;h=ef4ac99d624a35061cbbd0051861e189b84d78b6;hb=3c9ecb9409672c6a8c62ceb64767287bc59de501;hp=cf81dc0e63d486a37dfff8d1c1215b3e7e1489d8;hpb=e102dba216f0c63847e30d0764dad1ed844ed05a;p=supertux.git

diff --git a/configure.ac b/configure.ac
index cf81dc0e6..ef4ac99d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,14 +11,17 @@ dnl ===========================================================================
 
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.54])
-AC_INIT(SuperTux, 0.2-cvs)
+AC_INIT(supertux, 0.2-cvs)
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_SRCDIR([src/supertux.cpp])
 AC_CANONICAL_TARGET
 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
@@ -36,11 +39,14 @@ AC_C_CONST
 dnl ===========================================================================
 dnl Give advanced users some options to play with
 
+VARIANT=optimize
 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
-    CXXFLAGS="$CXXFLAGS -pg"
+              AC_HELP_STRING([--enable-gprof], [enable GNU profiling support]),
+              [enable_gprof=$enableval], [enable_gprof=no])
+if test "$enable_gprof" = "yes"; then
+    #CXXFLAGS="$CXXFLAGS -pg"
+    VARIANT=profile
     AC_MSG_RESULT([enabled])
 else
     AC_MSG_RESULT([disabled])
@@ -48,65 +54,82 @@ fi
 
 AC_MSG_CHECKING(for debug mode)
 AC_ARG_ENABLE(debug,
-              AC_HELP_STRING([--enable-debug], [enable debugging mode]),, enable_debug="no")
-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
+    AC_DEFINE([DEBUG], 1, [define to compile in debug checks])
+    #CXXFLAGS="$CXXFLAGS -Wall -Werror -O0 -g3"
+    VARIANT=debug
     AC_MSG_RESULT([enabled])
 else
+    #CXXFLAGS="$CXXFLAGS -O2 -g"
+    VARIANT=optimize
     AC_MSG_RESULT([disabled])
 fi
+AC_SUBST([VARIANT])
 
 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
+AM_ICONV
 
 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,,
-	AC_MSG_ERROR([SDL_mixer library required]))
-
-AC_CHECK_LIB(SDL_image, IMG_Load,,
-	AC_MSG_ERROR([SDL_image library required]))
 
-if test "x${enable_opengl}" != "xno"; then
+NP_FINDLIB([SDLMIXER], [SDL_mixer], [SDL_mixer >= 1.2],
+        NP_LANG_PROGRAM([#include <SDL_mixer.h>
+#if MIX_MAJOR_VERSION < 1
+# error SDLMix too old
+#else
+# if MIX_MAJOR_VERSION == 1
+#  if MIX_MINOR_VERSION < 2
+#   error SDLMix too old
+#  endif
+# endif
+#endif], [Mix_OpenAudio(0, 0, 0, 0);]),
+        [], [-lSDL_mixer],
+        [],
+        [AC_MSG_ERROR([Please install SDLMixer >=1.2.2])],
+        [$SDL_CFLAGS], [$SDL_LIBS])
+
+NP_FINDLIB([SDLIMAGE], [SDL_image], [SDL_image >= 1.2],
+        NP_LANG_PROGRAM([#include <SDL_image.h>], [IMG_Load("");]),
+        [], [-lSDL_image],
+        [],
+        [AC_MSG_ERROR([Please install SDLImage >= 1.2.1])],
+        [$SDL_CFLAGS], [$SDL_LIBS])
+
+if test "$enable_opengl" = "yes"; then
   AX_CHECK_GL
 fi
-if test "x$no_gl" = "xyes" -o "x$enable_opengl" = "xno"; then
-  CXXFLAGS="$CXXFLAGS -DNOOPENGL"
-  enable_opengl="no"
+if test "$no_gl" = "yes" -o "$enable_opengl" = "no"; then
+  GL_AVAILABLE="no"
+  AC_DEFINE([NOOPENGL],, [Define if opengl should not be used])
 else
-  CFLAGS="$CFLAGS $GL_CFLAGS"
-  CXXFLAGS="$CXXFLAGS $GL_CFLAGS"
-  LIBS="$LIBS $GL_LIBS"
+  GL_AVAILABLE="yes"
 fi
-
-AC_CHECK_LIB(z, gzopen,, AC_MSG_ERROR([*** zlib is missing]))
-
-CXXFLAGS="$CXXFLAGS -DDATA_PREFIX='\"$datadir/supertux\"'" 
+AC_SUBST([GL_AVAILABLE])
 
 dnl Checks for library functions.
 AC_CHECK_FUNCS(mkdir strdup strstr)
 
-AC_OUTPUT(Makefile m4/Makefile intl/Makefile
+AC_INIT_JAM
+AC_CONFIG_FILES([Jamconfig])
+
+AC_OUTPUT(Makefile
           src/Makefile
           data/Makefile
-          po/Makefile.in
 	  lib/Makefile)
 
 echo ""
@@ -116,5 +139,3 @@ echo " Profile Mode:   $enable_gprof"
 echo " Debug Mode:     $enable_debug"
 echo " OpenGL Support: $enable_opengl"
 echo ""
-
-# EOF #