[Super-tux-commit] supertux configure.ac,1.42,1.43

[Matze B. <mat...@us...>]

Update of /cvsroot/super-tux/supertux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20278

Modified Files:
	configure.ac 
Log Message:
fix for people without libiconv in glibc

Index: configure.ac
===================================================================
RCS file: /cvsroot/super-tux/supertux/configure.ac,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- configure.ac	27 Nov 2004 14:48:10 -0000	1.42
+++ configure.ac	10 Dec 2004 21:52:13 -0000	1.43
@@ -79,9 +79,15 @@
     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