From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 28 Apr 2010 13:40:46 +0000 (+0200)
Subject: yaz-config: don't list SSL/GNUTLS libs by default
X-Git-Tag: v4.0.6~10
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=28413a9ed5e61dc0da5ef34e3e96af116cda4890;p=yaz-moved-to-github.git

yaz-config: don't list SSL/GNUTLS libs by default

The yaz-config --libs output no longer lists SSL libs . Only
if argument 'ssl' is supplied to yaz-config it will list those
used to link with YAZ. This is to avoid having a dependency on
libgnutls-dev for libyaz4-dev.
---

diff --git a/debian/control b/debian/control
index 8eb991c..911d10e 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Description: documentation for the Z39.50 toolkit
  This package includes HTML documentation for YAZ.
 
 Package: libyaz4-dev
-Depends: libyaz4 (= ${Source-Version}), libxslt1-dev, libwrap0-dev, libicu36-dev|libicu-dev, libgnutls-dev, tcl8.3|tclsh
+Depends: libyaz4 (= ${Source-Version}), libxslt1-dev, libicu36-dev|libicu-dev, tcl8.3|tclsh
 Replaces: yaz-devel
 Conflicts: yaz-devel, libyaz-dev, libyaz2-dev, libyaz3-dev
 Section: libdevel
diff --git a/yaz-config.in b/yaz-config.in
index 89a2fcb..9898cb0 100644
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -78,6 +78,9 @@ while test $# -gt 0; do
 		lib_icu=yes
 	    fi
 	    ;;
+	ssl)
+	    lib_ssl=yes
+	    ;;
 	server)
 	    lib_thread=yes
 	    lib_server=yes
@@ -101,6 +104,10 @@ if test "$lib_icu" = "yes"; then
     lyaz="-lyaz_icu $lyaz"
 fi
 
+if test "$lib_ssl" = "yes"; then
+    LIBS="${SSL_LIBS} $LIBS"
+fi
+
 YAZINC="@YAZ_CONFIG_CFLAGS@"
 
 if test "$yaz_echo_source" = "yes"; then
@@ -117,7 +124,7 @@ if test "$yaz_echo_source" = "yes"; then
     else
         YAZLIB="-L${yaz_build_root}/src/.libs $lyaz"
     fi
-    YAZLIB="$YAZLIB ${SSL_LIBS} $LIBS"
+    YAZLIB="$YAZLIB $LIBS"
 
     YAZLALIB="${yaz_build_root}/src/libyaz.la"
     if test "$lib_server" = "yes"; then
@@ -137,7 +144,7 @@ else
     if test "$yazprefix" != "/usr"; then
 	YAZLIB="-L$yazprefix/lib"
     fi
-    YAZLIB="$YAZLIB $lyaz ${SSL_LIBS} $LIBS"
+    YAZLIB="$YAZLIB $lyaz $LIBS"
     YAZLALIB=$YAZLIB
     if test "$yazprefix" != "/usr"; then
 	YAZINC="-I$yazprefix/include $YAZINC"