X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=f6aca78ee80733ad211f4bea255a16f34d164e1f;hb=b221f746629259e96f248a336fe4f4e37e3385e0;hp=54ccbcf1a9ed1d87bca9b4bb916d3b330c960be9;hpb=c62711567861587107d124642db29e2674ee6533;p=supertux.git

diff --git a/configure.ac b/configure.ac
index 54ccbcf1a..f6aca78ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ dnl ===========================================================================
 
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.54])
-AC_INIT(supertux, 0.2-svn)
+AC_INIT(supertux2, 0.3.0-SVN)
 AC_CONFIG_SRCDIR([src/main.cpp])
 AC_CONFIG_AUX_DIR([mk/autoconf])
 AC_CANONICAL_TARGET
@@ -100,18 +100,27 @@ if test "$enable_sqdbg" = "yes"; then
     AC_SUBST([enable_sqdbg])
 fi
 
+dnl binreloc
+AM_BINRELOC
+
 AM_ICONV
 AC_SUBST([ICONV_LIBS], [$LIBICONV])
 
 dnl ===========================================================================
+dnl Check for libcurl
+
+LIBCURL_CHECK_CONFIG
+AC_SUBST([LIBCURL_LIBS], [$LIBCURL])
+
+dnl ===========================================================================
 dnl Check for SDL
 SDL_VERSION=1.2.4
 AM_PATH_SDL($SDL_VERSION,
             :,
 	    AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]))
 
-XIPH_PATH_VORBIS(, [AC_MSG_ERROR([Please install libvorbis])])
 XIPH_PATH_OGG(, [AC_MSG_ERROR([Please install libogg])])
+XIPH_PATH_VORBIS(, [AC_MSG_ERROR([Please install libvorbis])])
 
 NP_FINDLIB([SDLIMAGE], [SDL_image], [SDL_image >= 1.2],
         NP_LANG_PROGRAM([#include <SDL_image.h>], [IMG_Load("");]),
@@ -131,17 +140,29 @@ NP_FINDLIB([PHYSFS], [physfs], [physfs >= 1.0.0],
         [],
         [AC_MSG_ERROR([Please install physfs >= 1.0])])
 
+if test "x`uname -s`" = "xDarwin"; then
+  allib="-framework OpenAL"
+else
+  allib="-lopenal"
+fi
+
 NP_FINDLIB([OPENAL], [OpenAL], [OpenAL],
          NP_LANG_PROGRAM([#include <AL/al.h>],
            [alcOpenDevice(0);]),
-         [], [-lopenal],
+         [], [$allib],
          [],
          [AC_MSG_ERROR([Please intall OpenAL])],
          [], [])
 
-AX_CHECK_GL
-if test "$no_gl" = "yes"; then
-  AC_MSG_ERROR([Please install opengl libraries and headers])
+AC_ARG_ENABLE(opengl,
+              AC_HELP_STRING([--enable-opengl], [enable opengl support]),
+              [enable_opengl=$enableval], [enable_opengl=yes])
+
+if test "$enable_opengl" = "yes"; then
+  AX_CHECK_GL
+  if test "$no_gl" != "yes"; then
+    AC_DEFINE_UNQUOTED(HAVE_OPENGL, 1, Define if OpenGL is present on the system)
+  fi
 fi
 
 dnl Checks for library functions.