X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=configure.ac;h=699bf968dbed77d013e23610d0ff2887988ac119;hb=a86c3ea2f60fd4f8da0133ea9e7b34adfb5af7e1;hp=ca7065c0d5f32095aeb84f3081d41a39705980de;hpb=ff047aa9eb7ff87773293c94fa51180c51c93f3b;p=supertux.git

diff --git a/configure.ac b/configure.ac
index ca7065c0d..699bf968d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,16 @@ 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
@@ -79,9 +89,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