X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=b50c583f5c88b814dd6e7cc29bb7543b0649546d;hb=bec71e151d306edbc5f58e19c7c139a196e867e9;hp=f8491479d7398180346d9e4cea8b78eea19a171d;hpb=2ceb6ed00ff5be1dfcca786fbf000bb2c7682c5c;p=yaz-moved-to-github.git

diff --git a/configure.in b/configure.in
index f849147..b50c583 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl YAZ Toolkit, Index Data 1994-2002
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.90 2002-09-18 20:55:54 adam Exp $
+dnl $Id: configure.in,v 1.93 2002-09-25 08:11:33 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
 AM_INIT_AUTOMAKE(yaz, 1.9.1)
 dnl
@@ -23,7 +23,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.2* \
          /usr/share/sgml/docbook/xml-dtd-4.1 \
          /usr/share/sgml/docbook/dtd/xml/4.0 \
 	    /usr/lib/sgml/dtd/docbook-xml 
@@ -47,8 +47,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/share/sgml/docbook/dsssl-stylesheets-1.* \
             /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh 
    do
      if test -f $d/html/docbook.dsl; then
@@ -179,40 +178,34 @@ 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_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>
-],
-	[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
+	#include <sys/types.h>
+	#include <sys/socket.h>
+	#ifdef __cplusplus
+	extern "C" {
+	#endif
+	extern int accept(int, struct sockaddr *, socklen_t *);
+	#ifdef __cplusplus
+	}
+	#endif
+	],,[ac_cv_check_socklen_t=socklen_t],[
+		AC_TRY_COMPILE([
+		#include <sys/types.h>
+		#include <sys/socket.h>
+		#ifdef __cplusplus
+		extern "C" {
+		#endif
+		extern int accept(int, struct sockaddr *, size_t t *);
+		#ifdef __cplusplus
+		}
+		#endif
+		],,[ac_cv_check_socklen_t=size_t],[ac_cv_check_socklen_t=int])
+	])
+])
+AC_MSG_RESULT($ac_cv_check_socklen_t)
+AC_DEFINE_UNQUOTED(YAZ_SOCKLEN_T,$ac_cv_check_socklen_t)
 dnl
 dnl ------ tcpd
 AC_ARG_ENABLE(tcpd,[  --enable-tcpd[=PREFIX]  enable TCP wrapper for server if available])