X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=configure.ac;h=5cd7ac1306d95cdd64942c98a02480e260119492;hb=7124d68eaa9f9f2099361c7073e4355d4f004339;hp=a504fd2551c395528f95870d33d9b50eeaec9c74;hpb=7ae3aef67ad305cb9c6ed584cdac6117da9eba88;p=supertux.git

diff --git a/configure.ac b/configure.ac
index a504fd255..5cd7ac130 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.
@@ -83,6 +83,8 @@ else
 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]),
@@ -115,21 +117,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("");]),
@@ -147,6 +136,14 @@ 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/al.h>],
+           [alcOpenDevice(0);]),
+         [], [-lopenal],
+         [],
+         [AC_MSG_ERROR([Please intall OpenAL])],
+         [], [])
+
 dnl Checks for library functions.
 AC_CHECK_FUNCS(mkdir strdup strstr)