X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=4b16380cdfdba9e21336b315f87433cc47942b61;hb=6c35039e69102dbbce08e8f39a2fbbade4406c16;hp=1d53a51763f27b8597de3fd19e2d9b1e2c78b539;hpb=26f5b2f33c2302130ed2301084620f55a7df7af4;p=yaz-moved-to-github.git

diff --git a/configure.in b/configure.in
index 1d53a51..4b16380 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
 dnl YAZ Toolkit, Index Data 1994-2004
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.155 2004-10-01 23:01:26 adam Exp $
+dnl $Id: configure.in,v 1.163 2005-01-03 13:28:35 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 2.0.26)
+AM_INIT_AUTOMAKE(yaz, 2.0.30)
 AM_MAINTAINER_MODE
 dnl
 AC_SUBST(READLINE_LIBS)
@@ -33,9 +33,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 +79,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 +203,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])
@@ -366,4 +370,5 @@ doc/tkl.xsl
 doc/yazhtml.xsl
 etc/Makefile
 yaz-config
+Doxyfile
 ],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config > util/yaz-config && chmod +x yaz-config util/yaz-config])