From 2f1ad68193fa6825fc561a09684585280bd67895 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Sun, 2 May 2004 00:07:34 +0000 Subject: [PATCH] Better check for SSL on non pkg-config systems --- configure.in | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/configure.in b/configure.in index 5f5648b..da1694a 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.139 2004-05-01 23:32:20 adam Exp $ +dnl $Id: configure.in,v 1.140 2004-05-02 00:07:34 adam Exp $ AC_INIT(include/yaz/yaz-version.h) AM_INIT_AUTOMAKE(yaz, 2.0.19) AM_MAINTAINER_MODE @@ -50,11 +50,17 @@ if test "$openssl" != "no"; then SSL_LIBS="-L$openssl/lib" fi else - if $pkgconfig --exists openssl; then - SSL_CFLAGS=`$pkgconfig --cflags openssl` - SSL_LIBS=`$pkgconfig --libs openssl` - sslver=`$pkgconfig --modversion openssl` - fi + if test "$pkgconfig" != "NONE"; then + if $pkgconfig --exists openssl; then + SSL_CFLAGS=`$pkgconfig --cflags openssl` + SSL_LIBS=`$pkgconfig --libs openssl` + sslver=`$pkgconfig --modversion openssl` + fi + fi + if test "$sslver" = "no"; then + SSL_CFLAGS="-I/usr/include/openssl" + SSL_LIBS="" + fi fi if test "$sslver" = "no"; then xLIBS="$LIBS"; -- 1.7.10.4