X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=884c03f0064759901fb8067e12d69bfc971f416b;hb=fe575eb97799f141b6e97d17c0e64619c4a9cd03;hp=d91ca7d219fdb26ffb843e2be30d92ec28dc9cff;hpb=f53079fadcadb1eeef45e1e6d254801d984d6068;p=yaz-moved-to-github.git

diff --git a/configure.in b/configure.in
index d91ca7d..884c03f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
-dnl YAZ Toolkit, Index Data 1994-2004
+dnl YAZ Toolkit, Index Data 1994-2005
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.156 2004-10-03 22:34:07 adam Exp $
+dnl $Id: configure.in,v 1.169 2005-01-17 10:10:00 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 2.0.26)
+AM_INIT_AUTOMAKE(yaz, 2.0.33)
 AM_MAINTAINER_MODE
 dnl
 AC_SUBST(READLINE_LIBS)
@@ -19,6 +19,16 @@ AC_PATH_PROG(pkgconfigpath, pkg-config, NONE)
 dnl
 YAZ_DOC
 dnl 
+dnl
+dnl ------ Headers
+AC_CHECK_HEADERS(dirent.h fnmatch.h wchar.h locale.h langinfo.h pwd.h sys/poll.h sys/select.h sys/socket.h sys/stat.h sys/time.h sys/types.h sys/un.h sys/wait.h unistd.h)
+AC_HEADER_STDC
+if test "$ac_cv_header_stdc" = "no"; then
+	AC_MSG_WARN(Your system doesn't seem to support ANSI C)
+fi
+dnl ----- Types
+AC_CHECK_TYPES([long long])
+dnl
 dnl ----- Sockets
 checkBoth=0
 AC_CHECK_FUNC(connect)
@@ -33,9 +43,9 @@ fi
 AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
 dnl
 dnl ------ OpenSSL
+AC_SUBST(SSL_CFLAGS)
 openssl=no
 AC_ARG_WITH(openssl, [  --with-openssl[=PREFIX]   OpenSSL library in PREFIX], [openssl=$withval])
-USE_SSL=0
 SSL_CFLAGS=""
 SSL_LIBPATH=""
 if test "$openssl" != "no"; then
@@ -79,12 +89,15 @@ if test "$openssl" != "no"; then
 		fi
 		CPPFLAGS="$xCPPFLAGS"
 	fi
+	AC_MSG_CHECKING([for SSL])
 	if test "$sslver" != "no"; then
-		CFLAGS="$CFLAGS -DHAVE_OPENSSL_SSL_H=1 $SSL_CFLAGS"
-		USE_SSL=1
+		SSL_CFLAGS="-DHAVE_OPENSSL_SSL_H=1 $SSL_CFLAGS"
+		AC_MSG_RESULT([$sslver])
+	else
+		SSL_CFLAGS=""
+		AC_MSG_RESULT([None])
+		AC_MSG_ERROR([OpenSSL development libraries missing])
 	fi
-	AC_MSG_CHECKING([for SSL])
-	AC_MSG_RESULT($sslver)
 fi
 dnl
 dnl ------ GNU Readline
@@ -200,6 +213,7 @@ extern int accept(int, struct sockaddr *, size_t t *);
 ])
 AC_MSG_RESULT($ac_cv_check_socklen_t)
 AC_DEFINE_UNQUOTED(YAZ_SOCKLEN_T,$ac_cv_check_socklen_t)
+AC_DEFINE(YAZ_USE_NEW_LOG)
 dnl
 dnl ------ tcpd
 AC_ARG_ENABLE(tcpd,[  --enable-tcpd[=PREFIX]  enable TCP wrapper for server if available])
@@ -230,13 +244,6 @@ if test "$enable_tcpd" -a "$enable_tcpd" != "no"; then
 	fi
 fi
 dnl
-dnl ------ Headers
-AC_CHECK_HEADERS(fnmatch.h wchar.h locale.h langinfo.h)
-AC_STDC_HEADERS
-if test "$ac_cv_header_stdc" = "no"; then
-	AC_MSG_WARN(Your system doesn't seem to support ANSI C)
-fi
-dnl
 AC_SUBST(LIBTHREAD)
 AC_SUBST(CFLAGSTHREADS)
 HAVETHREADS=0