X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz-config.in;h=93e168f5a53d4a7bcb68770a13ab40c8e40eacc7;hp=bffcd94539faa26b6406802a5dd2fc7ebaf8f1ba;hb=4a140e0b8cdecd8e80eec749153e8c4defe56436;hpb=494421584e146db0b9a2c45c6ec70daacb44364c

diff --git a/yaz-config.in b/yaz-config.in
index bffcd94..93e168f 100644
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -11,13 +11,12 @@ 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@"
-
-yazextralibs="@LIBS@"
+SSL_LIBS="@SSL_LIBS@"
+LIBS="@LIBS@"
 YAZVERSION=@VERSION@
+VERSION_SHA1=@VERSION_SHA1@
 
 usage()
 {
@@ -30,6 +29,7 @@ Options:
 	[--lalibs]
 	[--cflags]
 	[--comp]
+        [-V]
 Libraries:
 	threads icu server
 EOF
@@ -50,6 +50,10 @@ while test $# -gt 0; do
 	    echo $yazprefix
 	    exit 0
 	    ;;
+        -V)
+	    echo "$YAZVERSION $VERSION_SHA1"
+	    exit 0
+            ;;
 	--version)
 	    echo $YAZVERSION
 	    exit 0
@@ -74,6 +78,9 @@ while test $# -gt 0; do
 		lib_icu=yes
 	    fi
 	    ;;
+	ssl)
+	    lib_ssl=yes
+	    ;;
 	server)
 	    lib_thread=yes
 	    lib_server=yes
@@ -97,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
@@ -107,10 +118,13 @@ if test "$yaz_echo_source" = "yes"; then
         if test "$lib_server" = "yes"; then
     	    YAZLIB="${yaz_build_root}/src/.libs/libyaz_server.a $YAZLIB"
         fi
+        if test "$lib_icu" = "yes"; then
+    	    YAZLIB="${yaz_build_root}/src/.libs/libyaz_icu.a $YAZLIB"
+        fi
     else
         YAZLIB="-L${yaz_build_root}/src/.libs $lyaz"
     fi
-    YAZLIB="$YAZLIB $yazextralibs"
+    YAZLIB="$YAZLIB $LIBS"
 
     YAZLALIB="${yaz_build_root}/src/libyaz.la"
     if test "$lib_server" = "yes"; then
@@ -119,7 +133,7 @@ if test "$yaz_echo_source" = "yes"; then
     if test "$lib_icu" = "yes"; then
 	YAZLALIB="${yaz_build_root}/src/libyaz_icu.la $YAZLALIB"
     fi
-    YAZLALIB="$YAZLALIB $yazextralibs"
+    YAZLALIB="$YAZLALIB $LIBS"
 
     YAZINC="-I${yaz_src_root}/include $YAZINC"
     YAZCOMP=${yaz_src_root}/util/yaz-asncomp
@@ -130,7 +144,7 @@ else
     if test "$yazprefix" != "/usr"; then
 	YAZLIB="-L$yazprefix/lib"
     fi
-    YAZLIB="$YAZLIB $lyaz $yazextralibs"
+    YAZLIB="$YAZLIB $lyaz $LIBS"
     YAZLALIB=$YAZLIB
     if test "$yazprefix" != "/usr"; then
 	YAZINC="-I$yazprefix/include $YAZINC"
@@ -138,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