X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.ac;h=0affc1a37fb44f94cbf3c2c0ee1f3faf35e8420c;hb=86181b0a14d89cf45daf97199c3556c4dd1ee7b7;hp=ef4ac99d624a35061cbbd0051861e189b84d78b6;hpb=ac9e53e5d668d20fcae8c6ac728602d5359a6004;p=supertux.git

diff --git a/configure.ac b/configure.ac
index ef4ac99d6..0affc1a37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,12 +11,12 @@ dnl ===========================================================================
 
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.54])
-AC_INIT(supertux, 0.2-cvs)
-AC_CONFIG_HEADERS(config.h)
-AC_CONFIG_SRCDIR([src/supertux.cpp])
+AC_INIT(supertux, 0.2-svn)
+AC_CONFIG_SRCDIR([src/main.cpp])
+AC_CONFIG_AUX_DIR([mk/autoconf])
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE
-dnl This is obsolete see automake1.7 // AM_CONFIG_HEADER
+
+AC_CONFIG_HEADERS(config.h)
 
 # we don't want the stupid autoconf default -g -O2
 test ".$CXXFLAGS" = "." && CXXFLAGS=" "
@@ -26,7 +26,24 @@ CXXFLAGS="$CXXFLAGS -ffast-math"
 AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_INSTALL
-AC_PROG_LIBTOOL
+
+AC_CHECK_PROGS(XGETTEXT, [xgettext xgettext.exe])
+if test -n "$XGETTEXT" ; then
+    AC_MSG_CHECKING([if xgettext supports lisp])
+    if echo '(gettext "test")' | xgettext -o - -L Lisp - >& /dev/null; then
+        AC_MSG_RESULT(yes)
+    else
+        AC_MSG_RESULT(no)
+        AC_MSG_WARN([It seems your gettext installation is too old, try updating it])
+        XGETTEXT=""
+    fi
+fi
+
+AC_PROG_LEX
+LEX_LIBS=$LEXLIB
+AC_SUBST([LEX_LIBS])
+AC_CHECK_PROGS([BISON], [bison bison.exe])
+AC_SUBST([BISON])
 
 dnl Checks for header files.
 AC_HEADER_DIRENT
@@ -58,27 +75,18 @@ AC_ARG_ENABLE(debug,
               [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=$enableval], enable_opengl=yes)
-if test "$enable_opengl" = "yes"; then
-    AC_MSG_RESULT([yes])
-else
-    AC_MSG_RESULT([no])
-fi
+AC_C_BIGENDIAN()
 
 AM_ICONV
+AC_SUBST([ICONV_LIBS], [$LIBICONV])
 
 dnl ===========================================================================
 dnl Check for SDL
@@ -87,21 +95,8 @@ AM_PATH_SDL($SDL_VERSION,
             :,
 	    AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]))
 
-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])
+XIPH_PATH_VORBIS(, [AC_MSG_ERROR([Please install libvorbis])])
+XIPH_PATH_OGG(, [AC_MSG_ERROR([Please install libogg])])
 
 NP_FINDLIB([SDLIMAGE], [SDL_image], [SDL_image >= 1.2],
         NP_LANG_PROGRAM([#include <SDL_image.h>], [IMG_Load("");]),
@@ -110,16 +105,33 @@ NP_FINDLIB([SDLIMAGE], [SDL_image], [SDL_image >= 1.2],
         [AC_MSG_ERROR([Please install SDLImage >= 1.2.1])],
         [$SDL_CFLAGS], [$SDL_LIBS])
 
-if test "$enable_opengl" = "yes"; then
-  AX_CHECK_GL
+NP_FINDLIB([PHYSFS], [physfs], [physfs >= 1.0.0],
+        NP_LANG_PROGRAM([
+#include <stdio.h>
+#include <physfs.h>
+#if PHYSFS_VER_MAJOR < 1
+# error PHYSFS is too old
+#endif]),
+        [], [-lphysfs],
+        [],
+        [AC_MSG_ERROR([Please install physfs >= 1.0])])
+
+NP_FINDLIB([OPENAL], [OpenAL], [OpenAL],
+         NP_LANG_PROGRAM([#include <AL/al.h>],
+           [alcOpenDevice(0);]),
+         [], [-lopenal],
+         [],
+         [AC_MSG_ERROR([Please intall OpenAL])],
+         [], [])
+
+AX_CHECK_GL
+if test "$no_gl" = "yes"; then
+  AC_MSG_ERROR([Please install opengl libraries and headers])
 fi
-if test "$no_gl" = "yes" -o "$enable_opengl" = "no"; then
-  GL_AVAILABLE="no"
-  AC_DEFINE([NOOPENGL],, [Define if opengl should not be used])
-else
-  GL_AVAILABLE="yes"
+AX_CHECK_GLU
+if test "$no_glu" = "yes"; then
+  AC_MSG_ERROR([Please install opengl utility libraries and headers])
 fi
-AC_SUBST([GL_AVAILABLE])
 
 dnl Checks for library functions.
 AC_CHECK_FUNCS(mkdir strdup strstr)
@@ -127,15 +139,15 @@ AC_CHECK_FUNCS(mkdir strdup strstr)
 AC_INIT_JAM
 AC_CONFIG_FILES([Jamconfig])
 
-AC_OUTPUT(Makefile
-          src/Makefile
-          data/Makefile
-	  lib/Makefile)
+AC_OUTPUT
 
 echo ""
 echo "Features:"
 echo "========="
 echo " Profile Mode:   $enable_gprof"
 echo " Debug Mode:     $enable_debug"
-echo " OpenGL Support: $enable_opengl"
 echo ""
+echo ""
+echo "       NOTE: This project uses jam (and not make) as build tool"
+echo ""
+