X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz-config.in;h=89a2fcbe200def05ed88ac43ab211a4551f9f703;hp=0dc55ae262aa0411efa1693c093706aa231ce97e;hb=3e6398d15008d68aa36b0b985a18f142fcfa9a8f;hpb=2225afbde8949f3005ca9989724a3bd7e0f0c2f5

diff --git a/yaz-config.in b/yaz-config.in
index 0dc55ae..89a2fcb 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@"
 SSL_LIBS="@SSL_LIBS@"
-yazextralibs="@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
@@ -105,12 +109,15 @@ if test "$yaz_echo_source" = "yes"; then
     if test "$lib_static" = "yes"; then
         YAZLIB="${yaz_build_root}/src/.libs/libyaz.a"
         if test "$lib_server" = "yes"; then
-    	    YAZLIB="${yaz_build_root}/src/.libs/libyaz_server.a $YAZLIB ${SSL_LIBS}"
+    	    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 ${SSL_LIBS} $LIBS"
 
     YAZLALIB="${yaz_build_root}/src/libyaz.la"
     if test "$lib_server" = "yes"; then
@@ -119,7 +126,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 +137,7 @@ else
     if test "$yazprefix" != "/usr"; then
 	YAZLIB="-L$yazprefix/lib"
     fi
-    YAZLIB="$YAZLIB $lyaz $yazextralibs"
+    YAZLIB="$YAZLIB $lyaz ${SSL_LIBS} $LIBS"
     YAZLALIB=$YAZLIB
     if test "$yazprefix" != "/usr"; then
 	YAZINC="-I$yazprefix/include $YAZINC"
@@ -138,9 +145,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