X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=configure.in;h=084c528b4dd5da6157e5774cce8443860f380ac3;hb=e72e394106dd25d6a8a8c7c2fa677f40ef5e7eb6;hp=7cee10cbe25e48b0be1db20256939f41317d6ab8;hpb=06395306e21cd9e9235e14483a88ba70c3325030;p=yaz-moved-to-github.git

diff --git a/configure.in b/configure.in
index 7cee10c..084c528 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.126 2004-02-16 11:30:33 adam Exp $
+dnl $Id: configure.in,v 1.137 2004-04-28 22:44:58 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 2.0.11)
+AM_INIT_AUTOMAKE(yaz, 2.0.19)
 AM_MAINTAINER_MODE
 dnl
 AC_SUBST(READLINE_LIBS)
@@ -139,7 +139,7 @@ if test "$openssl" != "no"; then
 			AC_CHECK_HEADER(openssl/ssl.h,[sslver=yes])
 		fi
 		if test "$sslver" = "yes"; then
-			SSL_LIBS="$SSL_LIBS -lssl"
+			SSL_LIBS="-lssl $SSL_LIBS"
 		fi
 	fi
 	if test "$sslver" != "no"; then
@@ -151,7 +151,6 @@ if test "$openssl" != "no"; then
 	LIBS="$xLIBS"
 	CFLAGS="$xCFLAGS"
 fi
-AM_CONDITIONAL(ISSSL, test $USE_SSL = "1")
 dnl
 dnl ------ GNU Readline
 READLINE_SHARED_LIBADD=""
@@ -275,7 +274,7 @@ 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])
-if test "$enable_tcpd" != ""; then
+if test "$enable_tcpd" != "" && test "$enable_tcpd" != "no"; then
 	oldLibs=$LIBS
 	oldCPPFLAGS=$CPPFLAGS
 	if test "$enable_tcpd" != "yes"; then