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

diff --git a/configure.ac b/configure.ac
index 1790abe34..a2c8befc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ 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_CONFIG_SRCDIR([src/main.cpp])
 AC_CONFIG_AUX_DIR([mk/autoconf])
 AC_CANONICAL_TARGET
 
@@ -27,6 +27,18 @@ AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_INSTALL
 
+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
+
 dnl Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
@@ -57,11 +69,9 @@ 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
@@ -77,9 +87,15 @@ else
     AC_MSG_RESULT([no])
 fi
 
-AC_CHECK_LIB([iconv], [iconv_open])
-AC_TRY_LINK([#include <iconv.h>], [iconv_open(0, 0);],,
-    AC_MSG_ERROR([Couldn't find iconv library]))
+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