Fixed compilation for SSL

diff --git a/CHANGELOG b/CHANGELOG
index 644b8b0..a5b557d 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 Possible compatibility problems with earlier versions marked with '*'.
 
+Fixed compilation for SSL which wasn't properly enabled for all platforms.
+
 --- 2.0.10 2004/02/05 
 
 For yaz.m4, allow second argument for YAZ_INIT to hold minimal version of

diff --git a/configure.in b/configure.in
index d77a7de..16adf90 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl YAZ Toolkit, Index Data 1994-2004
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.124 2004-02-05 11:55:56 adam Exp $
+dnl $Id: configure.in,v 1.125 2004-02-09 09:54:58 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
 AM_INIT_AUTOMAKE(yaz, 2.0.10)
 AM_MAINTAINER_MODE
@@ -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"
@@ -143,7 +143,7 @@ if test "$openssl" != "no"; then
                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])

diff --git a/src/Makefile.am b/src/Makefile.am
index 897df40..8964796 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 ## Copyright (C) 1994-2003, Index Data
 ## All rights reserved.
-## $Id: Makefile.am,v 1.5 2004-01-12 12:11:57 adam Exp $
+## $Id: Makefile.am,v 1.6 2004-02-09 09:54:58 adam Exp $
 
 if ISTHR
 thrlib=libyazthread.la
@@ -159,9 +159,9 @@ thr-eventl.lo: eventl.c
 
 # SSL versions of objects.
 ssl-comstack.lo: comstack.c
-       $(LTCOMPILE) $(SSL_FLAGS) -c $(srcdir)/comstack.c -o ssl-comstack.lo
+       $(LTCOMPILE) $(SSL_CFLAGS) $(SSL_DEFS) -c $(srcdir)/comstack.c -o ssl-comstack.lo
 
 ssl-tcpip.lo: tcpip.c
-       $(LTCOMPILE) $(SSL_FLAGS) -c $(srcdir)/tcpip.c -o ssl-tcpip.lo
+       $(LTCOMPILE) $(SSL_CFLAGS) $(SSL_DEFS) -c $(srcdir)/tcpip.c -o ssl-tcpip.lo