X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.in;h=5f5d9d603f9bb0995c23bd745e2f755951cc4abf;hp=935a2363f28c4aa628fc4cc457288bb89f75404d;hb=8dc67a9430644549801c18ec7e3a725e5a4ef782;hpb=95d3dcd343af68f6979dedb1e44f5781f1575df7

diff --git a/configure.in b/configure.in
index 935a236..5f5d9d6 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
-dnl YAZ Toolkit, Index Data 1994-2003
+dnl YAZ Toolkit, Index Data 1994-2004
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.119 2003-12-04 13:20:39 adam Exp $
+dnl $Id: configure.in,v 1.136 2004-04-17 08:24:03 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 2.0.6)
+AM_INIT_AUTOMAKE(yaz, 2.0.19)
 AM_MAINTAINER_MODE
 dnl
 AC_SUBST(READLINE_LIBS)
@@ -115,9 +115,9 @@ if test "$openssl" != "no"; then
 	xCFLAGS="$CFLAGS";
 	if test "$openssl" != "yes"; then
 		if $openssl/bin/pkg-config --exists openssl; then
-			SSL_CFLAGS=`$openssl/bin/pkgconfig --cflags openssl`
-			SSL_LIBS=`$openssl/bin/pkgconfig --libs openssl`
-			sslver=`$openssl/bin/pkgconfig --modversion openssl`
+			SSL_CFLAGS=`$openssl/bin/pkg-config --cflags openssl`
+			SSL_LIBS=`$openssl/bin/pkg-config --libs openssl`
+			sslver=`$openssl/bin/pkg-config --modversion openssl`
 		else
                 	SSL_CFLAGS="-I$openssl/include -I$openssl/include/openssl"
                 	SSL_LIBS="-L$openssl/lib"
@@ -139,11 +139,11 @@ 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
-		SSL_DEFS="-DHAVE_OPENSSL_H=1"
+		SSL_DEFS="-DHAVE_OPENSSL_SSL_H=1"
 		USE_SSL=1
 	fi
 	AC_MSG_CHECKING([for SSL])
@@ -275,7 +275,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