X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.ac;h=54ccbcf1a9ed1d87bca9b4bb916d3b330c960be9;hb=27c877679c58750c12f19035089d7be12014bc6c;hp=5cd7ac1306d95cdd64942c98a02480e260119492;hpb=c1583b50b204a0c9e50c7b7750db50d24ff5f6fa;p=supertux.git

diff --git a/configure.ac b/configure.ac
index 5cd7ac130..54ccbcf1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,13 @@ CXXFLAGS="$CXXFLAGS -ffast-math"
 AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_INSTALL
+AC_PATH_PROG(AR, ar)
+if test "$AR" = "" ; then
+  AC_MSG_ERROR([Couldn't find ar])
+fi
+AR="$AR ru"
+
+AC_C_BIGENDIAN
 
 AC_CHECK_PROGS(XGETTEXT, [xgettext xgettext.exe])
 if test -n "$XGETTEXT" ; then
@@ -52,65 +59,51 @@ AC_CHECK_HEADERS(unistd.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
+AC_C_BIGENDIAN
+AC_CHECK_SIZEOF([void *])
+AH_BOTTOM([
+#if SIZEOF_VOID_P == 8
+#define _SQ64
+#endif
+])
 
 dnl ===========================================================================
 dnl Give advanced users some options to play with
 
 VARIANT=optimize
-AC_MSG_CHECKING(for gprof mode)
+AC_MSG_CHECKING([for build variant])
+
 AC_ARG_ENABLE(gprof,
               AC_HELP_STRING([--enable-gprof], [enable GNU profiling support]),
               [enable_gprof=$enableval], [enable_gprof=no])
 if test "$enable_gprof" = "yes"; then
-    #CXXFLAGS="$CXXFLAGS -pg"
     VARIANT=profile
-    AC_MSG_RESULT([enabled])
-else
-    AC_MSG_RESULT([disabled])
 fi
 
-AC_MSG_CHECKING(for debug mode)
 AC_ARG_ENABLE(debug,
               AC_HELP_STRING([--enable-debug], [enable debugging mode]),
               [enable_debug=$enableval], [enable_debug=no])
 if test "$enable_debug" = "yes"; then
     AC_DEFINE([DEBUG], 1, [define to compile in debug checks])
     VARIANT=debug
-    AC_MSG_RESULT([enabled])
 else
     VARIANT=optimize
-    AC_MSG_RESULT([disabled])
 fi
 AC_SUBST([VARIANT])
-
-AC_C_BIGENDIAN()
-
-AC_MSG_CHECKING(whether 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])
+AC_MSG_RESULT([$VARIANT])
+
+AC_ARG_ENABLE(sqdbg,
+              AC_HELP_STRING([--enable-sqdbg], [enable squirrel remote debugger]),
+              [enable_sqdbg=$enableval], [enable_sqdbg=no])
+if test "$enable_sqdbg" = "yes"; then
+    AC_DEFINE([ENABLE_SQDBG], 1, [define if sqdbg should be enabled])
+    AC_SUBST([enable_sqdbg])
 fi
 
 AM_ICONV
 AC_SUBST([ICONV_LIBS], [$LIBICONV])
 
 dnl ===========================================================================
-dnl Check for OpenGL
-if test "$enable_opengl" = "yes"; then
-  AX_CHECK_GL
-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"
-fi
-AC_SUBST([GL_AVAILABLE])
-
 dnl Check for SDL
 SDL_VERSION=1.2.4
 AM_PATH_SDL($SDL_VERSION,
@@ -128,7 +121,9 @@ NP_FINDLIB([SDLIMAGE], [SDL_image], [SDL_image >= 1.2],
         [$SDL_CFLAGS], [$SDL_LIBS])
 
 NP_FINDLIB([PHYSFS], [physfs], [physfs >= 1.0.0],
-        NP_LANG_PROGRAM([#include <physfs.h>
+        NP_LANG_PROGRAM([
+#include <stdio.h>
+#include <physfs.h>
 #if PHYSFS_VER_MAJOR < 1
 # error PHYSFS is too old
 #endif]),
@@ -144,6 +139,11 @@ NP_FINDLIB([OPENAL], [OpenAL], [OpenAL],
          [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
+
 dnl Checks for library functions.
 AC_CHECK_FUNCS(mkdir strdup strstr)
 
@@ -153,13 +153,6 @@ AC_CONFIG_FILES([Jamconfig])
 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 ""