Version 3.0.49. Update news.

[yaz-moved-to-github.git] / yaz-config.in

diff --git a/yaz-config.in b/yaz-config.in
index 76b9152..57886b6 100644 (file)
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,5 +1,7 @@
 #!/bin/sh
-# $Id: yaz-config.in,v 1.31 2007-10-22 12:21:38 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,9 @@ while test $# -gt 0; do
            lib_thread=yes
            ;;
        icu)
-           lib_icu=yes
+           if test "$ICU_CPPFLAGS"; then
+               lib_icu=yes
+           fi
            ;;
        server)
            lib_thread=yes
@@ -103,16 +113,22 @@ 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
        YAZLALIB="${yaz_build_root}/src/libyaz_server.la $YAZLALIB"
     fi
-    YAZLALIB="$YAZLALIB $yazextralibs"
+    if test "$lib_icu" = "yes"; then
+       YAZLALIB="${yaz_build_root}/src/libyaz_icu.la $YAZLALIB"
+    fi
+    YAZLALIB="$YAZLALIB $LIBS"
 
     YAZINC="-I${yaz_src_root}/include $YAZINC"
     YAZCOMP=${yaz_src_root}/util/yaz-asncomp
@@ -123,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"