Moved zoom implementation to zutil. Man page for zoomsh

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

diff --git a/configure.in b/configure.in
index cabeb56..c5d35b0 100644 (file)
--- 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.85 2002-09-10 20:56:34 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.9.1)
 dnl
@@ -141,10 +141,22 @@ 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,
@@ -160,23 +172,24 @@ AC_TRY_COMPILE([
        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)
-fi
-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([
+       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);],
+       [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)
+       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
@@ -208,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)
@@ -315,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