Option --with-openssl now works when directory is specified.

diff --git a/CHANGELOG b/CHANGELOG
index e43e483..52da69b 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@ Possible compatibility problems with earlier versions marked with '*'.
 
 --- 1.8.5 2002/XX/XX
 
+Configure option --with-openssl=<dir> now works when a directory is
+specified. Patch provided by Morten Bøgeskov.
+
 New option for YAZ client, -u <auth>, that sets authentication.
 
 ZOOM fix: error information only cleared for Bib-diagnostics (not

diff --git a/configure.in b/configure.in
index cf57989..fe6f8cc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl YAZ Toolkit, Index Data 1994-2001
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.57 2002-01-11 20:17:03 adam Exp $
+dnl $Id: configure.in,v 1.58 2002-01-11 20:26:11 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
 AM_INIT_AUTOMAKE(yaz, 1.8.5)
 dnl
@@ -49,11 +49,20 @@ dnl
 dnl ------ Open SSL
 openssl=no
 AC_ARG_WITH(openssl, [  --with-openssl[=DIR]    OpenSSL library in DIR], [openssl=$withval])
-if test "$openssl" = "yes"; then
+if test "$openssl" != "no"; then
+       xLDFLAGS="$LDFLAGS";
+       xCFLAGS="$CFLAGS";
+       if test "$openssl" != "yes"; then
+               CFLAGS="-I$openssl/include -I$openssl/include/openssl $CFLAGS"
+               LDFLAGS="-L$openssl/lib $LDFLAGS"
+       fi
        AC_CHECK_LIB(crypto, main)
        AC_CHECK_LIB(ssl, SSL_new)
        if test "$ac_cv_lib_ssl_SSL_new" = "yes"; then
                AC_CHECK_HEADERS(openssl/ssl.h)
+       else
+               LDFLAGS="$xLDFLAGS";
+               CFLAGS="$xCFLAGS";
        fi
 fi
 dnl ------ GNU Readline