X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=configure.in;h=c5d35b08d3792c950fce24e807254877aa19c4a6;hb=b28230ab11ea960e0bf0ea04ceeaf88131ab2f02;hp=9baa39adbaba26b666c2772aec0b15ceef6ed42f;hpb=8f3f8256752d09f66cd2c7a412cc8c30a0fc90ea;p=yaz-moved-to-github.git

diff --git a/configure.in b/configure.in
index 9baa39a..c5d35b0 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.80 2002-08-28 12:48:47 adam Exp $
+dnl $Id: configure.in,v 1.89 2002-09-16 18:45:13 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)
@@ -24,6 +24,7 @@ AC_ARG_WITH(dtd, [  --with-dtd[=DIR]        Use docbookx.dtd in DIR],
    AC_MSG_CHECKING(for docbookx.dtd)
    for d in /usr/share/sgml/docbook/dtd/xml/4.1.2 \
          /usr/share/sgml/docbook/xml-dtd-4.1.2 \
+         /usr/share/sgml/docbook/xml-dtd-4.1 \
          /usr/share/sgml/docbook/dtd/xml/4.0 \
 	    /usr/lib/sgml/dtd/docbook-xml 
    do
@@ -47,6 +48,7 @@ AC_ARG_WITH(dsssl,[  --with-dsssl[=DIR]      Use DSSSL in DIR/{html,print}/docbo
    AC_MSG_CHECKING(for docbook.dsl)
    for d in /usr/share/sgml/docbook/stylesheet/dsssl/modular \
             /usr/share/sgml/docbook/dsssl-stylesheets-1.64 \
+            /usr/share/sgml/docbook/dsssl-stylesheets-1.59 \
             /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh 
    do
      if test -f $d/html/docbook.dsl; then
@@ -139,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>
+],
+	[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])
@@ -173,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)
@@ -280,9 +328,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