From be3968a60792190ba6a87b9c60513c1fa761f512 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Sat, 9 Oct 2004 08:03:26 +0000 Subject: [PATCH] Fixed bug #172: RPM builds does not enable SSL. --- client/Makefile.am | 4 +++- configure.in | 14 ++++++++------ src/Makefile.am | 4 ++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/client/Makefile.am b/client/Makefile.am index 47e223b..a5395d8 100644 --- 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.23 2004-05-01 23:32:20 adam Exp $ +## $Id: Makefile.am,v 1.24 2004-10-09 08:03:26 adam Exp $ bin_PROGRAMS=yaz-client EXTRA_PROGRAMS=bertorture @@ -10,6 +10,8 @@ EXTRA_DIST = default.bib COMMON=admin.c admin.h tabcomplete.c tabcomplete.h yaz_client_SOURCES=client.c $(COMMON) +AM_CPPFLAGS=$(SSL_CFLAGS) + yaz_client_LDADD = ../src/libyaz.la $(READLINE_LIBS) bertorture_LDADD = ../src/libyaz.la diff --git a/configure.in b/configure.in index d91ca7d..9062693 100644 --- 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.156 2004-10-03 22:34:07 adam Exp $ +dnl $Id: configure.in,v 1.157 2004-10-09 08:03:26 adam Exp $ AC_INIT(include/yaz/yaz-version.h) AM_INIT_AUTOMAKE(yaz, 2.0.26) AM_MAINTAINER_MODE @@ -33,9 +33,9 @@ fi AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"])) dnl dnl ------ OpenSSL +AC_SUBST(SSL_CFLAGS) openssl=no AC_ARG_WITH(openssl, [ --with-openssl[=PREFIX] OpenSSL library in PREFIX], [openssl=$withval]) -USE_SSL=0 SSL_CFLAGS="" SSL_LIBPATH="" if test "$openssl" != "no"; then @@ -79,12 +79,14 @@ if test "$openssl" != "no"; then fi CPPFLAGS="$xCPPFLAGS" fi + AC_MSG_CHECKING([for SSL]) if test "$sslver" != "no"; then - CFLAGS="$CFLAGS -DHAVE_OPENSSL_SSL_H=1 $SSL_CFLAGS" - USE_SSL=1 + SSL_CFLAGS="-DHAVE_OPENSSL_SSL_H=1 $SSL_CFLAGS" + AC_MSG_RESULT([$sslver]) + else + SSL_CFLAGS="" + AC_MSG_RESULT([None]) fi - AC_MSG_CHECKING([for SSL]) - AC_MSG_RESULT($sslver) fi dnl dnl ------ GNU Readline diff --git a/src/Makefile.am b/src/Makefile.am index aae6821..f659f86 100644 --- 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.16 2004-10-01 13:16:30 adam Exp $ +## $Id: Makefile.am,v 1.17 2004-10-09 08:03:26 adam Exp $ if ISTHR thrlib=libyazthread.la @@ -23,7 +23,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) +AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(SSL_CFLAGS) AM_YFLAGS=-p cql_ THREADED_FLAGS = @CFLAGSTHREADS@ -- 1.7.10.4