X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz-config.in;h=3420e3502c6ca53c470f5e201b228e389e542220;hp=9898cb0e4446f60e029488d623d50705c95f956e;hb=df84e4897abc4565fe11adead30b99d9634b41b1;hpb=28413a9ed5e61dc0da5ef34e3e96af116cda4890

diff --git a/yaz-config.in b/yaz-config.in
index 9898cb0..3420e35 100644
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -31,7 +31,7 @@ Options:
 	[--comp]
         [-V]
 Libraries:
-	threads icu server
+	threads icu server static
 EOF
 	exit $1
 }
@@ -95,13 +95,13 @@ while test $# -gt 0; do
     shift
 done
 
-lyaz="-lyaz"
+YAZLIB="-lyaz"
 if test "$lib_server" = "yes"; then
-    lyaz="-lyaz_server $lyaz"
+    YAZLIB="-lyaz_server $YAZLIB"
 fi
 
 if test "$lib_icu" = "yes"; then
-    lyaz="-lyaz_icu $lyaz"
+    YAZLIB="-lyaz_icu $YAZLIB"
 fi
 
 if test "$lib_ssl" = "yes"; then
@@ -114,6 +114,9 @@ if test "$yaz_echo_source" = "yes"; then
     YAZBIN=${yaz_build_root}/bin
 
     if test "$lib_static" = "yes"; then
+        if test "$lib_ssl" != "yes"; then
+            LIBS="${SSL_LIBS} $LIBS"
+        fi
         YAZLIB="${yaz_build_root}/src/.libs/libyaz.a"
         if test "$lib_server" = "yes"; then
     	    YAZLIB="${yaz_build_root}/src/.libs/libyaz_server.a $YAZLIB"
@@ -122,7 +125,7 @@ if test "$yaz_echo_source" = "yes"; then
     	    YAZLIB="${yaz_build_root}/src/.libs/libyaz_icu.a $YAZLIB"
         fi
     else
-        YAZLIB="-L${yaz_build_root}/src/.libs $lyaz"
+        YAZLIB="-L${yaz_build_root}/src/.libs $YAZLIB"
     fi
     YAZLIB="$YAZLIB $LIBS"
 
@@ -142,9 +145,9 @@ else
     YAZCOMP=${yazprefix}/bin/yaz-asncomp
 
     if test "$yazprefix" != "/usr"; then
-	YAZLIB="-L$yazprefix/lib"
+	YAZLIB="-L$yazprefix/lib $YAZLIB"
     fi
-    YAZLIB="$YAZLIB $lyaz $LIBS"
+    YAZLIB="$YAZLIB $LIBS"
     YAZLALIB=$YAZLIB
     if test "$yazprefix" != "/usr"; then
 	YAZINC="-I$yazprefix/include $YAZINC"