X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=configure.ac;h=9ccca3f1e8434380e19b8d172386ebed87788c39;hb=91bdd7025597eabbaecf40cff6062d753ca25f76;hp=9c6f8a57ccb933be19107afae287131c5a5595d1;hpb=6c3a5307b87bc3fff19e819281cf2b87a2b5010b;p=supertux.git

diff --git a/configure.ac b/configure.ac
index 9c6f8a57c..9ccca3f1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,12 +11,12 @@ dnl ===========================================================================
 
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.54])
-AC_INIT(supertux, 0.2-cvs)
-AC_CONFIG_HEADERS(config.h)
-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
-AM_INIT_AUTOMAKE
-dnl This is obsolete see automake1.7 // AM_CONFIG_HEADER
+
+AC_CONFIG_HEADERS(config.h)
 
 # we don't want the stupid autoconf default -g -O2
 test ".$CXXFLAGS" = "." && CXXFLAGS=" "
@@ -26,7 +26,24 @@ CXXFLAGS="$CXXFLAGS -ffast-math"
 AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_INSTALL
-AC_PROG_LIBTOOL
+
+AC_CHECK_PROGS(XGETTEXT, xgettext)
+if test -n "$XGETTEXT" ; then
+    AC_MSG_CHECKING([if xgettext supports lisp])
+    if echo '(gettext "test")' | xgettext -o - -L Lisp - >& /dev/null; then
+        AC_MSG_RESULT(yes)
+    else
+        AC_MSG_RESULT(no)
+        AC_MSG_WARN([It seems your gettext installation is too old, try updating it])
+        XGETTEXT=""
+    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
@@ -58,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)
@@ -78,7 +93,15 @@ else
     AC_MSG_RESULT([no])
 fi
 
-AM_GNU_GETTEXT
+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]))
 
 dnl ===========================================================================
 dnl Check for SDL
@@ -127,11 +150,7 @@ AC_CHECK_FUNCS(mkdir strdup strstr)
 AC_INIT_JAM
 AC_CONFIG_FILES([Jamconfig])
 
-AC_OUTPUT(Makefile intl/Makefile
-          src/Makefile
-          data/Makefile
-          po/Makefile.in
-	  lib/Makefile)
+AC_OUTPUT
 
 echo ""
 echo "Features:"
@@ -140,3 +159,7 @@ 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"
+echo ""
+