X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=21cc7650425d15fa50ad254cfdda7f7c81b742ac;hb=c0c4838b917943354c150d56ab970ca249267037;hp=cb7926e1c25d34e777f00d5a2c11e8a832ca26c5;hpb=218a7bd54e890607af8c9567036ffb78e9591715;p=supertux.git

diff --git a/configure.ac b/configure.ac
index cb7926e1c..21cc76504 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,15 @@ 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)
+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 +49,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 +92,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 +113,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 +131,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)
 
@@ -157,7 +149,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"