X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz-config.in;h=3420e3502c6ca53c470f5e201b228e389e542220;hp=e04767b8edcdd6d34e2c341861331f6825b59eda;hb=1bb2934164457d2908fdceef0d415a52b704651b;hpb=d3bfd05c8ad9e4f9b6f58a9510778079eab446fc

diff --git a/yaz-config.in b/yaz-config.in
index e04767b..3420e35 100644
--- 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@"
@@ -31,8 +29,9 @@ Options:
 	[--lalibs]
 	[--cflags]
 	[--comp]
+        [-V]
 Libraries:
-	threads icu server
+	threads icu server static
 EOF
 	exit $1
 }
@@ -79,6 +78,9 @@ while test $# -gt 0; do
 		lib_icu=yes
 	    fi
 	    ;;
+	ssl)
+	    lib_ssl=yes
+	    ;;
 	server)
 	    lib_thread=yes
 	    lib_server=yes
@@ -93,13 +95,17 @@ 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
+    LIBS="${SSL_LIBS} $LIBS"
 fi
 
 YAZINC="@YAZ_CONFIG_CFLAGS@"
@@ -108,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"
@@ -116,9 +125,9 @@ 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 ${SSL_LIBS} $LIBS"
+    YAZLIB="$YAZLIB $LIBS"
 
     YAZLALIB="${yaz_build_root}/src/libyaz.la"
     if test "$lib_server" = "yes"; then
@@ -136,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 ${SSL_LIBS} $LIBS"
+    YAZLIB="$YAZLIB $LIBS"
     YAZLALIB=$YAZLIB
     if test "$yazprefix" != "/usr"; then
 	YAZINC="-I$yazprefix/include $YAZINC"
@@ -146,9 +155,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