Added several type casts for C++ compilation. ZOOM fixes.

[yaz-moved-to-github.git] / configure.in

diff --git a/configure.in b/configure.in
index 61c29d3..c971eff 100644 (file)
--- 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.92 2002-09-24 08:05:41 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)
@@ -140,11 +140,73 @@ 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
+AC_MSG_CHECKING([for socklen_t])
+AC_CACHE_VAL(ac_cv_check_socklen_t,[ac_cv_check_socklen_t=''
+       AC_TRY_COMPILE([
+       #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])
@@ -175,7 +237,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 +344,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