X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=configure.ac;h=d27a79ce522690512c1f435e5d7f7e375d1ba6b6;hb=d3596a0112a17a4b1bfa600a7b18febfdfacf87d;hp=043aaaaa89701c4ce1c89d1c3a7bf0a65a3adcf2;hpb=795f0b283fcb1c8777723dc1cc850826d39c6806;p=supertux.git

diff --git a/configure.ac b/configure.ac
index 043aaaaa8..d27a79ce5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_INSTALL
 
-AC_CHECK_PROGS(XGETTEXT, xgettext)
+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
@@ -42,7 +42,7 @@ fi
 AC_PROG_LEX
 LEX_LIBS=$LEXLIB
 AC_SUBST([LEX_LIBS])
-AC_CHECK_PROGS([BISON], bison)
+AC_CHECK_PROGS([BISON], [bison bison.exe])
 AC_SUBST([BISON])
 
 dnl Checks for header files.
@@ -85,32 +85,10 @@ 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])
-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 +106,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]),
@@ -137,13 +117,18 @@ NP_FINDLIB([PHYSFS], [physfs], [physfs >= 1.0.0],
         [AC_MSG_ERROR([Please install physfs >= 1.0])])
 
 NP_FINDLIB([OPENAL], [OpenAL], [OpenAL],
-         NP_LANG_PROGRAM([#include <AL/alut.h>],
-           [alutInit(0, 0);]),
+         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
+
 dnl Checks for library functions.
 AC_CHECK_FUNCS(mkdir strdup strstr)
 
@@ -157,7 +142,6 @@ 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"