## 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
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
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
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`
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
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)
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
## 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
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@
## 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)
# 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
#!/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
yaz_src_root=@YAZ_SRC_ROOT@
yaz_build_root=@YAZ_BUILD_ROOT@
-yazextralibs="@SSL_LIBS@ @LIBS@"
+yazextralibs="@LIBS@"
YAZVERSION=@VERSION@
usage()
YAZINC="$YAZINC @CFLAGSTHREADS@"
fi
-YAZINC="$YAZINC @SSL_CFLAGS@"
-
if test "$yaz_echo_help" = "yes"; then
usage 1 1>&2
fi
-## $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
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
-## $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
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@