Get rid of SSL_{CFLAGS,DEFS,LIBS}

diff --git a/client/Makefile.am b/client/Makefile.am
index 7ed3a24..47e223b 100644 (file)
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -1,6 +1,6 @@
 ## Copyright (C) 1995-2004, Index Data
 ## All rights reserved.
-## $Id: Makefile.am,v 1.22 2004-04-28 22:44:58 adam Exp $
+## $Id: Makefile.am,v 1.23 2004-05-01 23:32:20 adam Exp $
 
 bin_PROGRAMS=yaz-client 
 EXTRA_PROGRAMS=bertorture
@@ -10,10 +10,10 @@ EXTRA_DIST = default.bib
 COMMON=admin.c admin.h tabcomplete.c tabcomplete.h
 yaz_client_SOURCES=client.c $(COMMON)
 
-yaz_client_LDADD = ../src/libyaz.la $(READLINE_LIBS) $(SSL_LIBS)
-bertorture_LDADD = ../src/libyaz.la $(SSL_LIBS)
+yaz_client_LDADD = ../src/libyaz.la $(READLINE_LIBS) 
+bertorture_LDADD = ../src/libyaz.la 
 
 bertorture_SOURCES=bertorture.c
 
-AM_CPPFLAGS=-I$(top_srcdir)/include $(SSL_CFLAGS) $(SSL_DEFS)
+AM_CPPFLAGS=-I$(top_srcdir)/include
 

diff --git a/configure.in b/configure.in
index d1e0474..5f5648b 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.138 2004-04-30 19:34:05 adam Exp $
+dnl $Id: configure.in,v 1.139 2004-05-01 23:32:20 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
 AM_INIT_AUTOMAKE(yaz, 2.0.19)
 AM_MAINTAINER_MODE
@@ -35,17 +35,11 @@ dnl
 dnl ------ OpenSSL
 openssl=no
 AC_ARG_WITH(openssl, [  --with-openssl[=PREFIX] OpenSSL library in PREFIX], [openssl=$withval])
-AC_SUBST(SSL_CFLAGS)
-AC_SUBST(SSL_LIBS)
-AC_SUBST(SSL_DEFS)
 USE_SSL=0
 SSL_CFLAGS=""
 SSL_LIBS=""
-SSL_DEFS=""
 if test "$openssl" != "no"; then
        sslver=no
-       xLIBS="$LIBS";
-       xCFLAGS="$CFLAGS";
        if test "$openssl" != "yes"; then
                if $openssl/bin/pkg-config --exists openssl; then
                        SSL_CFLAGS=`$openssl/bin/pkg-config --cflags openssl`
@@ -54,8 +48,6 @@ if test "$openssl" != "no"; then
                else
                        SSL_CFLAGS="-I$openssl/include -I$openssl/include/openssl"
                        SSL_LIBS="-L$openssl/lib"
-                       CFLAGS="$SSL_CFLAGS $CFLAGS"
-                       LIBS="$SSL_LIBS $LIBS"
                fi
        else
                if $pkgconfig --exists openssl; then
@@ -65,6 +57,10 @@ if test "$openssl" != "no"; then
                fi      
        fi
        if test "$sslver" = "no"; then
+               xLIBS="$LIBS";
+               xCFLAGS="$CFLAGS";
+               CFLAGS="$CFLAGS $SSL_CFLAGS"
+               LIBS="$SSL_LIBS $LIBS"
                AC_CHECK_LIB(crypto, main,[SSL_LIBS="$SSL_LIBS -lcrypto"])
                LIBS="$LIBS $SSL_LIBS"
                AC_CHECK_LIB(ssl, SSL_new)
@@ -74,15 +70,16 @@ if test "$openssl" != "no"; then
                if test "$sslver" = "yes"; then
                        SSL_LIBS="-lssl $SSL_LIBS"
                fi
+               LIBS="$xLIBS"
+               CFLAGS="$xCFLAGS"
        fi
        if test "$sslver" != "no"; then
-               SSL_DEFS="-DHAVE_OPENSSL_SSL_H=1"
+               LIBS="$SSL_LIBS $LIBS"
+               CFLAGS="$CFLAGS -DHAVE_OPENSSL_SSL_H=1 $SSL_CFLAGS"
                USE_SSL=1
        fi
        AC_MSG_CHECKING([for SSL])
        AC_MSG_RESULT($sslver)
-       LIBS="$xLIBS"
-       CFLAGS="$xCFLAGS"
 fi
 dnl
 dnl ------ GNU Readline

diff --git a/src/Makefile.am b/src/Makefile.am
index d373ad6..1ef99f4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 ## Copyright (C) 1994-2004, Index Data
 ## All rights reserved.
-## $Id: Makefile.am,v 1.12 2004-04-28 22:44:59 adam Exp $
+## $Id: Makefile.am,v 1.13 2004-05-01 23:32:20 adam Exp $
 
 if ISTHR
 thrlib=libyazthread.la
@@ -25,7 +25,7 @@ EXTRA_DIST=$(tabdata_DATA) $(illdata_DATA) \
 YAZCOMP = $(top_srcdir)/util/yaz-asncomp
 YAZCOMPLINE = $(YAZCOMP) -d z.tcl -i yaz -I../include $(YCFLAGS)
 
-AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(SSL_CFLAGS) $(SSL_DEFS)
+AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) 
 AM_YFLAGS=-p cql_
 THREADED_FLAGS = @CFLAGSTHREADS@
 

diff --git a/util/Makefile.am b/util/Makefile.am
index e72ae1c..af3919f 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,6 +1,6 @@
 ## Copyright (C) 1994-2004, Index Data
 ## All rights reserved.
-## $Id: Makefile.am,v 1.26 2004-04-28 22:45:00 adam Exp $
+## $Id: Makefile.am,v 1.27 2004-05-01 23:32:20 adam Exp $
 
 TESTS = $(check_PROGRAMS)
 
@@ -17,24 +17,24 @@ noinst_PROGRAMS = cclsh cql2pqf cql2xcql srwtst yaz-benchmark
 
 # MARC dumper utility
 yaz_marcdump_SOURCES = marcdump.c
-yaz_marcdump_LDADD = ../src/libyaz.la $(SSL_LIBS)
+yaz_marcdump_LDADD = ../src/libyaz.la
 
 # YAZ Iconv utility
 yaz_iconv_SOURCES = yaziconv.c
-yaz_iconv_LDADD = ../src/libyaz.la $(SSL_LIBS)
+yaz_iconv_LDADD = ../src/libyaz.la
 
 srwtst_SOURCES=srwtst.c
-srwtst_LDADD = ../src/libyaz.la $(SSL_LIBS)
+srwtst_LDADD = ../src/libyaz.la
 
 cclsh_SOURCES=cclsh.c
-cclsh_LDADD = ../src/libyaz.la $(READLINE_LIBS) $(SSL_LIBS)
+cclsh_LDADD = ../src/libyaz.la $(READLINE_LIBS)
 
 cql2pqf_SOURCES = cql2pqf.c
-cql2pqf_LDADD = ../src/libyaz.la $(SSL_LIBS)
+cql2pqf_LDADD = ../src/libyaz.la
 
 cql2xcql_SOURCES = cql2xcql.c
-cql2xcql_LDADD = ../src/libyaz.la $(SSL_LIBS)
+cql2xcql_LDADD = ../src/libyaz.la
 
 yaz_benchmark_SOURCES = benchmark.c
-yaz_benchmark_LDADD = ../src/libyaz.la $(SSL_LIBS)
+yaz_benchmark_LDADD = ../src/libyaz.la
 

diff --git a/yaz-config.in b/yaz-config.in
index e8fb979..2e673df 100644 (file)
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: yaz-config.in,v 1.20 2004-04-28 22:44:58 adam Exp $
+# $Id: yaz-config.in,v 1.21 2004-05-01 23:32:20 adam Exp $
 yazprefix=@prefix@
 yaz_echo_cflags=no
 yaz_echo_libs=no
@@ -10,7 +10,7 @@ yaz_echo_comp=no
 yaz_src_root=@YAZ_SRC_ROOT@
 yaz_build_root=@YAZ_BUILD_ROOT@
 
-yazextralibs="@SSL_LIBS@ @LIBS@"
+yazextralibs="@LIBS@"
 YAZVERSION=@VERSION@
 
 usage()
@@ -116,8 +116,6 @@ if test "$lib_thread" = "yes"; then
     YAZINC="$YAZINC @CFLAGSTHREADS@"
 fi
 
-YAZINC="$YAZINC @SSL_CFLAGS@"
-
 if test "$yaz_echo_help" = "yes"; then
        usage 1 1>&2
 fi

diff --git a/zoom/Makefile.am b/zoom/Makefile.am
index a19a16c..7aaeb2f 100644 (file)
--- a/zoom/Makefile.am
+++ b/zoom/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.13 2004-04-28 22:45:00 adam Exp $
+## $Id: Makefile.am,v 1.14 2004-05-01 23:32:20 adam Exp $
 ## Copyright (C) 2001, Index Data
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
@@ -6,7 +6,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 EXTRA_PROGRAMS = zoomtst1 zoomtst2 zoomtst3 zoomtst4 zoomtst5 zoomtst6 zoomtst7 zoomtst8
 bin_PROGRAMS = zoomsh 
 
-LDADD = ../src/libyaz.la $(READLINE_LIBS) $(SSL_LIBS)
+LDADD = ../src/libyaz.la $(READLINE_LIBS)
 
 zoomtst1_SOURCES = zoomtst1.c
 zoomtst2_SOURCES = zoomtst2.c

diff --git a/ztest/Makefile.am b/ztest/Makefile.am
index 001e10a..6cd29b2 100644 (file)
--- a/ztest/Makefile.am
+++ b/ztest/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.16 2004-04-28 22:45:00 adam Exp $
+## $Id: Makefile.am,v 1.17 2004-05-01 23:32:21 adam Exp $
 
 bin_PROGRAMS=yaz-ztest
 
@@ -10,7 +10,7 @@ if ISTHR
 extra=../src/libyazthread.la
 endif
 
-yaz_ztest_LDADD=$(extra) ../src/libyaz.la $(SSL_LIBS) $(LIBTHREAD)
+yaz_ztest_LDADD=$(extra) ../src/libyaz.la $(LIBTHREAD)
 
 AM_CFLAGS=@CFLAGSTHREADS@