yaz-config: List SSL libs for static mode

[yaz-moved-to-github.git] / yaz-config.in

diff --git a/yaz-config.in b/yaz-config.in
index 57886b6..93e168f 100644 (file)
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -11,8 +11,6 @@ yaz_echo_lalibs=no
 yaz_echo_comp=no
 yaz_src_root=@YAZ_SRC_ROOT@
 yaz_build_root=@YAZ_BUILD_ROOT@
-PTHREAD_LIBS="@PTHREAD_LIBS@"
-PTHREAD_CFLAGS="@PTHREAD_CFLAGS@"
 ICU_LIBS="@ICU_LIBS@"
 ICU_CPPFLAGS="@ICU_CPPFLAGS@"
 SSL_LIBS="@SSL_LIBS@"
@@ -80,6 +78,9 @@ while test $# -gt 0; do
                lib_icu=yes
            fi
            ;;
+       ssl)
+           lib_ssl=yes
+           ;;
        server)
            lib_thread=yes
            lib_server=yes
@@ -103,6 +104,10 @@ if test "$lib_icu" = "yes"; then
     lyaz="-lyaz_icu $lyaz"
 fi
 
+if test "$lib_ssl" = "yes" -o "$lib_static" = "yes"; then
+    LIBS="${SSL_LIBS} $LIBS"
+fi
+
 YAZINC="@YAZ_CONFIG_CFLAGS@"
 
 if test "$yaz_echo_source" = "yes"; then
@@ -119,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
@@ -139,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"
@@ -147,9 +152,7 @@ else
 fi
 
 if test "$lib_thread" = "yes"; then
-    YAZINC="$PTHREAD_CFLAGS $YAZINC"
-    YAZLIB="$YAZLIB $PTHREAD_LIBS"
-    YAZLALIB="$YAZLALIB $PTHREAD_LIBS"
+    :
 fi
 
 if test "$lib_icu" = "yes"; then