X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=10468715f7f0ecd7e72310f2772cb21f5748ce9f;hb=fa6e929aaa0e09d27aa9ed9e9eebca3faa4fa51f;hp=61c29d32c1976b52e62919a9426f590029242f7a;hpb=5f780a431cd088035d164277d8981bf9bd35a16e;p=yaz-moved-to-github.git

diff --git a/configure.in b/configure.in
index 61c29d3..1046871 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
 dnl YAZ Toolkit, Index Data 1994-2002
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.82 2002-08-29 16:18:34 mike Exp $
+dnl $Id: configure.in,v 1.87 2002-09-11 21:25:56 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 1.8.9)
+AM_INIT_AUTOMAKE(yaz, 1.9.1)
 dnl
 AC_SUBST(READLINE_LIBS)
 AC_SUBST(YAZ_CONF_CFLAGS)
@@ -141,10 +141,56 @@ if test "$ac_cv_lib_readline_readline" = "yes"; then
         LIBS=$xLIBS
 fi
 dnl ------ various functions
-AC_CHECK_FUNCS(vsnprintf gettimeofday poll)
+AC_CHECK_FUNCS(vsnprintf gettimeofday poll iconv_open)
 if test "$ac_cv_func_poll" = "yes"; then
         AC_CHECK_HEADERS(sys/poll.h)
 fi
+if test "$ac_cv_func_iconv_open" = "no"; then
+	oldLibs=$LIBS
+	LIBS="$LIBS -liconv"
+	AC_CHECK_FUNCS(iconv_open)
+	if test "$ac_cv_func_iconv_open" = "no"; then
+		LIBS=$oldLibs
+	fi
+fi
+if test "$ac_cv_func_iconv_open" = "yes"; then
+        AC_CHECK_HEADERS(iconv.h)
+fi
+dnl ------ socklen_t
+dnl AC_CHECK_TYPES(socklen_t)
+AC_MSG_CHECKING(for socklen_t)
+AC_CACHE_VAL(ac_cv_check_socklen_t,
+[ac_cv_check_socklen_t=''
+AC_TRY_COMPILE([
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/socket.h>
+],
+       [socklen_t len;],
+       ac_cv_check_socklen_t=yes,
+       ac_cv_check_socklen_t=no)])
+AC_MSG_RESULT($ac_cv_check_socklen_t)
+if test "$ac_cv_check_socklen_t" = "yes"; then
+	AC_DEFINE(HAVE_SOCKLEN_T)
+else
+	AC_MSG_CHECKING(whether net size is of type size_t)
+	AC_CACHE_VAL(ac_cv_check_getpeername_accepts_size_t,
+	[ac_cv_check_getpeername_accepts_size_t=''
+	AC_TRY_COMPILE([
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/socket.h>
+],
+	[getpeername(0, (struct sockaddr *)NULL, (size_t *)0);],
+	ac_cv_check_getpeername_accepts_size_t=yes,
+	ac_cv_check_getpeername_accepts_size_t=no)])
+	AC_MSG_RESULT($ac_cv_check_getpeername_accepts_size_t)
+	if test "$ac_cv_check_getpeername_accepts_size_t" = yes; then
+		AC_DEFINE(GETPEERNAME_ACCEPTS_SIZE_T_FOR_THIRD_ARGUMENT)
+	fi
+fi
 dnl
 dnl ------ tcpd
 AC_ARG_ENABLE(tcpd,[  --enable-tcpd[=PREFIX]  enable TCP wrapper for server if available])
@@ -175,7 +221,7 @@ if test "$enable_tcpd" != ""; then
 fi
 dnl
 dnl ------ Headers
-AC_CHECK_HEADERS(fnmatch.h iconv.h)
+AC_CHECK_HEADERS(fnmatch.h)
 AC_STDC_HEADERS
 if test "$ac_cv_header_stdc" = "no"; then
 	AC_MSG_WARN(Your system doesn't seem to support ANSI C)