X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz-config.in;h=57886b6d34cafe29b6d8142d2aaad477f07c0d9d;hp=f61d007a447f4988f1c3af85092d1ac919ed06fc;hb=eda96f8cca72ec56811eff40f23b881b339afa56;hpb=0402f8526787fc555058e44d8348b492c7b223a8

diff --git a/yaz-config.in b/yaz-config.in
index f61d007..57886b6 100644
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,5 +1,7 @@
 #!/bin/sh
-# $Id: yaz-config.in,v 1.33 2008-01-16 11:30:51 adam Exp $
+# This file is part of the YAZ toolkit.
+# Copyright (C) 1995-2008 Index Data
+
 yazprefix=@prefix@
 yaz_echo_cflags=no
 yaz_echo_libs=no
@@ -13,9 +15,10 @@ 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()
 {
@@ -28,8 +31,9 @@ Options:
 	[--lalibs]
 	[--cflags]
 	[--comp]
+        [-V]
 Libraries:
-	threads
+	threads icu server
 EOF
 	exit $1
 }
@@ -48,6 +52,10 @@ while test $# -gt 0; do
 	    echo $yazprefix
 	    exit 0
 	    ;;
+        -V)
+	    echo "$YAZVERSION $VERSION_SHA1"
+	    exit 0
+            ;;
 	--version)
 	    echo $YAZVERSION
 	    exit 0
@@ -68,7 +76,7 @@ while test $# -gt 0; do
 	    lib_thread=yes
 	    ;;
 	icu)
-	    if test "$ICU_LIBS"; then
+	    if test "$ICU_CPPFLAGS"; then
 		lib_icu=yes
 	    fi
 	    ;;
@@ -105,10 +113,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 ${SSL_LIBS} $LIBS"
 
     YAZLALIB="${yaz_build_root}/src/libyaz.la"
     if test "$lib_server" = "yes"; then
@@ -117,7 +128,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
@@ -128,7 +139,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"