X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.ac;h=5f2e2441fab4bbd842ff97efbc33d0d2bdc46823;hb=492dc09547759f369a01a0eed82e44092acbda61;hp=e96169080140b8546261566246d963ae08fd8399;hpb=1fc0f13c2a7b6a257047edc96654b5737022b6b0;p=supertux.git

diff --git a/configure.ac b/configure.ac
index e96169080..5f2e2441f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,22 +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.6-cvs)
-AC_CONFIG_SRCDIR([src/supertux.c])
+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
@@ -33,7 +38,7 @@ 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
-    CFLAGS="$CFLAGS -pg"
+    CXXFLAGS="$CXXFLAGS -pg"
     AC_MSG_RESULT([enabled])
 else
     AC_MSG_RESULT([disabled])
@@ -41,33 +46,20 @@ fi
 
 AC_MSG_CHECKING(for debug mode)
 AC_ARG_ENABLE(debug,
-              AC_HELP_STRING([--enable-debug], [enable debugging mode]),, enable_debug="no")
+              AC_HELP_STRING([--enable-debug], [enable debugging mode]),, enable_debug="yes")
 if test "x${enable_debug}" != "xno"; then
-    CFLAGS="$CFLAGS -DDEBUG"
+    CXXFLAGS="$CXXFLAGS -Wall -W -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([--enable-opengl], [enable OpenGL support]),, enable_opengl="yes")
+              AC_HELP_STRING([--disable-opengl], [disable OpenGL support]),, enable_opengl="yes")
 if test "x${enable_opengl}" != "xno"; then
-    CFLAGS="$CFLAGS -D__OPENGL"
-    AC_MSG_RESULT([yes])
-else
-    CFLAGS="$CFLAGS -DNOOPENGL"
-    AC_MSG_RESULT([no])
-fi
-
-AC_MSG_CHECKING(weather Sound should be supported)
-AC_ARG_ENABLE(sound,
-              AC_HELP_STRING([--enable-sound], [enable sound support]),, enable_sound="yes")
-if test "x${enable_sound}" != "xno"; then
-    CFLAGS="$CFLAGS -D__SOUND"
     AC_MSG_RESULT([yes])
 else
-    CFLAGS="$CFLAGS -DNOSOUND"
     AC_MSG_RESULT([no])
 fi
 
@@ -76,30 +68,33 @@ dnl Check for SDL
 AM_PATH_SDL($SDL_VERSION,
             :,
 	    AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]))
-
+CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
 CFLAGS="$CFLAGS $SDL_CFLAGS"
-LDFLAGS="$LDFLAGS $SDL_LIBS"
+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, ,AC_MSG_ERROR(SDL_mixer library required))
-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
-  CFLAGS="$CFLAGS $X_CFLAGS"
-  LDFLAGS="$LDFLAGS $X_LIBS"
-
-  AC_CHECK_LIB(GL, glBegin, ,AC_MSG_ERROR(GL library required))
+  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
-CFLAGS="$CFLAGS -DDATA_PREFIX='\"$datadir/games/supertux/\"' -DLINUX"
+CXXFLAGS="$CXXFLAGS -DDATA_PREFIX='\"$datadir/supertux\"'" 
 
 dnl Checks for library functions.
 AC_CHECK_FUNCS(mkdir strdup strstr)
@@ -112,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 #