X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=configure.ac;h=8224c97793fb75b7e04ba9250134a316ffb5ad89;hb=14a0e085bfcd271f878af25800186afee32b6ec6;hp=0aeb89d1a5896e570c7dfd87bb773643e5a1d2d1;hpb=3181262386659262786395df341544a24c667caf;p=supertux.git

diff --git a/configure.ac b/configure.ac
index 0aeb89d1a..8224c9779 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,23 +1,27 @@
 dnl ===========================================================================
 dnl    "configure.in"
 dnl
-dnl author: Duong-Khang NGUYEN
-dnl         neoneurone@users.sf.net
+dnl current contact:
+dnl          SuperTux development team
+dnl
+dnl original author:
+dnl          Duong-Khang NGUYEN
+dnl          neoneurone@users.sf.net
 dnl ===========================================================================
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(SuperTux, 0.0.7-cvs)
+AC_PREREQ([2.54])
+AC_INIT(SuperTux, 0.1.1)
 AC_CONFIG_SRCDIR([src/supertux.cpp])
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE(dist-bzip2)
 
 SDL_VERSION=1.2.4
 
 AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_INSTALL
-AC_LANG(C++)
 
 dnl Checks for header files.
 AC_HEADER_DIRENT
@@ -44,70 +48,53 @@ 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 -DDEBUG"
+    CXXFLAGS="$CXXFLAGS -Wall -Werror -DDEBUG -O0 -g3"
     AC_MSG_RESULT([enabled])
 else
     AC_MSG_RESULT([disabled])
 fi
 
-AC_MSG_CHECKING(weather OpenGL should be used)
+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
-    CXXFLAGS="$CXXFLAGS -D__OPENGL"
     AC_MSG_RESULT([yes])
 else
-    CXXFLAGS="$CXXFLAGS -DNOOPENGL"
-    AC_MSG_RESULT([no])
-fi
-
-AC_MSG_CHECKING(weather Sound should be supported)
-AC_ARG_ENABLE(sound,
-              AC_HELP_STRING([--disable-sound], [disable sound support]),, enable_sound="yes")
-if test "x${enable_sound}" != "xno"; then
-    CXXFLAGS="$CXXFLAGS -D__SOUND"
-    AC_MSG_RESULT([yes])
-else
-    CXXFLAGS="$CXXFLAGS -DNOSOUND"
     AC_MSG_RESULT([no])
 fi
 
 dnl ===========================================================================
 dnl Check for SDL
-AC_LANG_PUSH(C)
 AM_PATH_SDL($SDL_VERSION,
             :,
 	    AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]))
 CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
-LDFLAGS="$LDFLAGS $SDL_LIBS"
-AC_LANG_POP()
+CFLAGS="$CFLAGS $SDL_CFLAGS"
+LIBS="$LIBS $SDL_LIBS"
+GL_LIBS="-lGL"
 
 dnl Checks for additional libraries.
-if test "x${enable_sound}" != "xno"; then
-  AC_CHECK_LIB(SDL_mixer, SDL_OpenAudio,, 
-  [CXXFLAGS="$CXXFLAGS -DNOSOUND"
-   enable_sound="no"])
-fi
+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))
+AC_CHECK_LIB(SDL_image, IMG_Load,,
+	AC_MSG_ERROR([SDL_image library required]))
 
 if test "x${enable_opengl}" != "xno"; then
-  # grumbel: xlib path is needed on my system to get OpenGL right,
-  # else I end up with a black screen, might be a debian issue or a
-  # local issue on my system, not sure
-  AC_PATH_XTRA
-  CXXFLAGS="$CXXFLAGS $X_CFLAGS"
-  LDFLAGS="$LDFLAGS $X_LIBS"
-
-  AC_CHECK_LIB(GL, glBegin,, 
-  [CXXFLAGS="$CXXFLAGS -DNOOPENGL"
-   enable_opengl="no"])
+  AX_CHECK_GL
+fi
+if test "x$no_gl" = "xyes" -o "x$enable_opengl" = "xno"; then
+  CXXFLAGS="$CXXFLAGS -DNOOPENGL"
+  enable_opengl="no"
+else
+  CFLAGS="$CFLAGS $GL_CFLAGS"
+  CXXFLAGS="$CXXFLAGS $GL_CFLAGS"
+  LIBS="$LIBS $GL_LIBS"
 fi
 
 AC_CHECK_LIB(z, gzopen,, AC_MSG_ERROR([*** zlib is missing]))
 
-# FIXME: Evil
-CXXFLAGS="$CXXFLAGS -DDATA_PREFIX='\"$datadir/supertux/\"' -DLINUX"
+CXXFLAGS="$CXXFLAGS -DDATA_PREFIX='\"$datadir/supertux\"'" 
 
 dnl Checks for library functions.
 AC_CHECK_FUNCS(mkdir strdup strstr)
@@ -120,7 +107,6 @@ echo "========="
 echo " Profile Mode:   $enable_gprof"
 echo " Debug Mode:     $enable_debug"
 echo " OpenGL Support: $enable_opengl"
-echo " Sound Support:  $enable_sound"
 echo ""
 
 # EOF #