X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=3c031df09162c1b1fa633bcf150cef7f30f5b38e;hp=ec9e87de949a40a0e47812462cb49d56b8340cbe;hb=6bcdcffef00ff117eecf1b5447b9e849698d02e5;hpb=b5746a0b332eee44bb10247d3454365e7f7bcf7e

diff --git a/configure.ac b/configure.ac
index ec9e87de..3c031df0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -174,6 +174,30 @@ AC_CHECK_LIB([c], [socket],
 	[socket_ldflags="-lsocket"]
 )
 AC_SUBST(socket_ldflags)
+########################################################################## iconv
+STASH_FLAGS
+LIBS=
+AC_SEARCH_LIBS([libiconv_open], [iconv],
+	[iconv_ldflags="$LIBS"],
+	[]
+)
+AC_SUBST(iconv_ldflags)
+AC_MSG_CHECKING([whether iconv needs const char ** cast])
+AC_COMPILE_IFELSE([
+        AC_LANG_PROGRAM([
+                #include <iconv.h>
+        ],[
+                size_t iconv(iconv_t cd, const char **inbuf,
+                        size_t *inbytesleft, char **outbuf,
+                        size_t *outbytesleft);
+        ])
+],
+        [cast='(const char **)'; msg=yes],
+        [cast=; msg=no]
+)
+AC_DEFINE_UNQUOTED(ICONV_CAST, $cast, [cast for second arg to iconv()])
+AC_MSG_RESULT($msg)
+UNSTASH_FLAGS
 ########################################################################### libnsl
 AC_CHECK_LIB([c], [gethostbyname],
 	[nsl_ldflags=],
@@ -208,7 +232,7 @@ LIB_ARG_WITH([curses], [])
 HAVE_CURSES=yes
 AC_CHECK_HEADER(curses.h, [], [HAVE_CURSES=no])
 AC_SEARCH_LIBS([initscr], [ncursesw curses], [], [HAVE_CURSES=no])
-curses_ldflags="$LIBS"
+curses_ldflags="$curses_ldflags $LIBS"
 LIB_SUBST_FLAGS(curses)
 UNSTASH_FLAGS
 ########################################################################### ip_mreqn
@@ -248,6 +272,8 @@ LIB_ARG_WITH([ogg], [-logg])
 HAVE_OGG=yes
 AC_CHECK_HEADERS([ogg/ogg.h], [], [HAVE_OGG=no])
 AC_CHECK_LIB([ogg], [ogg_stream_init], [], [HAVE_OGG=no])
+AC_CHECK_LIB([ogg], [ogg_stream_flush_fill], [
+	AC_DEFINE(HAVE_OGG_STREAM_FLUSH_FILL, 1, [libogg >= 1.3.0])])
 LIB_SUBST_FLAGS(ogg)
 UNSTASH_FLAGS
 ######################################################################### vorbis