X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=configure.ac;h=a504fd2551c395528f95870d33d9b50eeaec9c74;hb=e409aaf88c618c2fc47ff8f9bbe523b8f271c795;hp=699bf968dbed77d013e23610d0ff2887988ac119;hpb=8daad02cf03b9cef0bc47c068cf216d5971c543b;p=supertux.git

diff --git a/configure.ac b/configure.ac
index 699bf968d..a504fd255 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,8 +11,8 @@ dnl ===========================================================================
 
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.54])
-AC_INIT(supertux, 0.2-cvs)
-AC_CONFIG_SRCDIR([src/supertux.cpp])
+AC_INIT(supertux, 0.2-svn)
+AC_CONFIG_SRCDIR([src/main.cpp])
 AC_CONFIG_AUX_DIR([mk/autoconf])
 AC_CANONICAL_TARGET
 
@@ -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)
+AC_SUBST([BISON])
+
 dnl Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
@@ -69,17 +75,15 @@ AC_ARG_ENABLE(debug,
               [enable_debug=$enableval], [enable_debug=no])
 if test "$enable_debug" = "yes"; then
     AC_DEFINE([DEBUG], 1, [define to compile in debug checks])
-    #CXXFLAGS="$CXXFLAGS -Wall -Werror -O0 -g3"
     VARIANT=debug
     AC_MSG_RESULT([enabled])
 else
-    #CXXFLAGS="$CXXFLAGS -O2 -g"
     VARIANT=optimize
     AC_MSG_RESULT([disabled])
 fi
 AC_SUBST([VARIANT])
 
-AC_MSG_CHECKING(wether OpenGL should be used)
+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)
@@ -89,17 +93,22 @@ 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,
@@ -129,16 +138,14 @@ 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])])
 
 dnl Checks for library functions.
 AC_CHECK_FUNCS(mkdir strdup strstr)