X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=configure.ac;h=d2bad3be4f0cf5ff8235edb935edc13dbc3d610f;hb=05508d396828b2539754254e9e26f823856777d8;hp=3d5347a68453c4dabf799f023cdbb34eb57586b8;hpb=457a3a9840021df49859ff1c76c959c68b78f257;p=supertux.git

diff --git a/configure.ac b/configure.ac
index 3d5347a68..d2bad3be4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,22 +1,29 @@
 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_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
 
 AC_PROG_CC
+AC_PROG_CXX
 AC_PROG_INSTALL
-AC_LANG(C)
+AC_PROG_LIBTOOL
 
 dnl Checks for header files.
 AC_HEADER_DIRENT
@@ -33,7 +40,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,63 +48,66 @@ 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 -Werror -DDEBUG -O3 -g"
     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
+AM_GNU_GETTEXT
 
 dnl ===========================================================================
 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
-  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=\\\"$PWD/data\\\" -DLINUX"
+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:"
@@ -105,7 +115,6 @@ echo "========="
 echo " Profile Mode:   $enable_gprof"
 echo " Debug Mode:     $enable_debug"
 echo " OpenGL Support: $enable_opengl"
-echo " Sound Support:  $enable_sound"
 echo ""
 
 # EOF #