X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=configure.ac;h=5cd7ac1306d95cdd64942c98a02480e260119492;hb=ac497ed832a0a8352c45ffeb11b195850f88beb9;hp=a2c8befc1fe0aa67f56aa79dfd4bff243d371a6e;hpb=0614cf0d1891a5f3f191eecfd021efe49b6601ea;p=supertux.git

diff --git a/configure.ac b/configure.ac
index a2c8befc1..5cd7ac130 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-cvs)
+AC_INIT(supertux, 0.2-svn)
 AC_CONFIG_SRCDIR([src/main.cpp])
 AC_CONFIG_AUX_DIR([mk/autoconf])
 AC_CANONICAL_TARGET
@@ -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
@@ -39,6 +39,12 @@ if test -n "$XGETTEXT" ; then
     fi
 fi
 
+AC_PROG_LEX
+LEX_LIBS=$LEXLIB
+AC_SUBST([LEX_LIBS])
+AC_CHECK_PROGS([BISON], [bison bison.exe])
+AC_SUBST([BISON])
+
 dnl Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
@@ -77,7 +83,9 @@ else
 fi
 AC_SUBST([VARIANT])
 
-AC_MSG_CHECKING(wether OpenGL should be used)
+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)
@@ -87,38 +95,30 @@ else
     AC_MSG_RESULT([no])
 fi
 
-iconv_found=no
-AC_MSG_CHECKING([for iconv])
-AC_TRY_LINK([#include <iconv.h>], [iconv_open(0, 0);], [iconv_found="yes"])
-AS_IF([test "$iconv_found" = no],
-    LIBS="$LIBS -liconv"
-    AC_TRY_LINK([#include <iconv.h>], [iconv_open(0, 0);], [iconv_found="yes"]))
-AS_IF([test "$iconv_found" = no],
-    AC_MSG_ERROR([Couldn't find iconv library]),
-    AC_MSG_RESULT([found]))
+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,
             :,
 	    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("");]),
@@ -127,16 +127,22 @@ NP_FINDLIB([SDLIMAGE], [SDL_image], [SDL_image >= 1.2],
         [AC_MSG_ERROR([Please install SDLImage >= 1.2.1])],
         [$SDL_CFLAGS], [$SDL_LIBS])
 
-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])
+NP_FINDLIB([PHYSFS], [physfs], [physfs >= 1.0.0],
+        NP_LANG_PROGRAM([#include <physfs.h>
+#if PHYSFS_VER_MAJOR < 1
+# error PHYSFS is too old
+#endif]),
+        [], [-lphysfs],
+        [],
+        [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)