X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=configure.in;h=f8491479d7398180346d9e4cea8b78eea19a171d;hb=56bb16e3c5714fc0ccb558d90eb927e3f80a3974;hp=cda284969d983ea1ca05af76bb816b953ac9f825;hpb=3c23d13ff10dd4fdc4059704f7b9df9e7a5d9fcf;p=yaz-moved-to-github.git

diff --git a/configure.in b/configure.in
index cda2849..f849147 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.83 2002-09-05 13:36:53 adam Exp $
+dnl $Id: configure.in,v 1.90 2002-09-18 20:55:54 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 1.9)
+AM_INIT_AUTOMAKE(yaz, 1.9.1)
 dnl
 AC_SUBST(READLINE_LIBS)
 AC_SUBST(YAZ_CONF_CFLAGS)
@@ -140,11 +140,79 @@ if test "$ac_cv_lib_readline_readline" = "yes"; then
         ],AC_DEFINE(HAVE_READLINE_RL_COMPLETION_MATCHES))
         LIBS=$xLIBS
 fi
+dnl ------ iconv
+AC_ARG_WITH(iconv, [  --with-iconv[=DIR]      iconv library in DIR])
+if test "$with_iconv" != "no"; then
+        AC_MSG_CHECKING(for iconv)
+	oldLIBS="$LIBS"
+       	oldCPPFLAGS="${CPPFLAGS}"
+	if test "$with_iconv" != "yes" -a "$with_iconv" != ""; then
+	        LIBS="$LIBS -L${with_iconv}/lib"
+       		CPPFLAGS="${CPPFLAGS} -I${with_iconv}/include"
+	fi
+        AC_TRY_LINK([
+		#include <iconv.h>
+	],[
+		static void f() {iconv_t t = iconv_open("", ""); }
+	],[
+		AC_DEFINE(HAVE_ICONV_H)
+		AC_MSG_RESULT(yes)
+	],[
+	        LIBS="$LIBS -liconv"
+	        AC_TRY_LINK([
+			#include <iconv.h>
+		],[
+			static void f() {iconv_t t = iconv_open("", ""); }
+		],[
+			AC_DEFINE(HAVE_ICONV_H)
+			AC_MSG_RESULT(yes)
+		],[
+			LIBS="$oldLIBS"
+			CPPFLAGS="$oldCPPFLAGS"
+			AC_MSG_RESULT(no)
+		])
+	])
+fi
 dnl ------ various functions
 AC_CHECK_FUNCS(vsnprintf gettimeofday poll)
 if test "$ac_cv_func_poll" = "yes"; then
         AC_CHECK_HEADERS(sys/poll.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>
+],
+	[size_t mylen; getpeername(0, (struct sockaddr *)NULL, &mylen);],
+	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 +243,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)
@@ -282,9 +350,9 @@ server/Makefile
 include/Makefile
 include/yaz/Makefile
 lib/Makefile
-zoom/Makefile
 client/Makefile
 ztest/Makefile
+zoom/Makefile
 doc/Makefile
 doc/yaz.xml
 doc/yazhtml.dsl