X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz-config.in;h=57886b6d34cafe29b6d8142d2aaad477f07c0d9d;hp=a1be1333bea42cdfa0a85b0f4f6597e2dfab047c;hb=1aac63eecd76d5d060da84037a355c153d747ca7;hpb=965d5409daba88b43bbffb5bed90b58383c0cc3f

diff --git a/yaz-config.in b/yaz-config.in
index a1be133..57886b6 100644
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,5 +1,7 @@
 #!/bin/sh
-# $Id: yaz-config.in,v 1.29 2007-04-18 13:40:19 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
@@ -11,9 +13,12 @@ yaz_src_root=@YAZ_SRC_ROOT@
 yaz_build_root=@YAZ_BUILD_ROOT@
 PTHREAD_LIBS="@PTHREAD_LIBS@"
 PTHREAD_CFLAGS="@PTHREAD_CFLAGS@"
-
-yazextralibs="@LIBS@"
+ICU_LIBS="@ICU_LIBS@"
+ICU_CPPFLAGS="@ICU_CPPFLAGS@"
+SSL_LIBS="@SSL_LIBS@"
+LIBS="@LIBS@"
 YAZVERSION=@VERSION@
+VERSION_SHA1=@VERSION_SHA1@
 
 usage()
 {
@@ -26,8 +31,9 @@ Options:
 	[--lalibs]
 	[--cflags]
 	[--comp]
+        [-V]
 Libraries:
-	threads
+	threads icu server
 EOF
 	exit $1
 }
@@ -46,6 +52,10 @@ while test $# -gt 0; do
 	    echo $yazprefix
 	    exit 0
 	    ;;
+        -V)
+	    echo "$YAZVERSION $VERSION_SHA1"
+	    exit 0
+            ;;
 	--version)
 	    echo $YAZVERSION
 	    exit 0
@@ -65,6 +75,11 @@ while test $# -gt 0; do
 	threads)
 	    lib_thread=yes
 	    ;;
+	icu)
+	    if test "$ICU_CPPFLAGS"; then
+		lib_icu=yes
+	    fi
+	    ;;
 	server)
 	    lib_thread=yes
 	    lib_server=yes
@@ -84,6 +99,10 @@ if test "$lib_server" = "yes"; then
     lyaz="-lyaz_server $lyaz"
 fi
 
+if test "$lib_icu" = "yes"; then
+    lyaz="-lyaz_icu $lyaz"
+fi
+
 YAZINC="@YAZ_CONFIG_CFLAGS@"
 
 if test "$yaz_echo_source" = "yes"; then
@@ -94,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
@@ -114,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"
@@ -123,10 +148,14 @@ fi
 
 if test "$lib_thread" = "yes"; then
     YAZINC="$PTHREAD_CFLAGS $YAZINC"
+    YAZLIB="$YAZLIB $PTHREAD_LIBS"
+    YAZLALIB="$YAZLALIB $PTHREAD_LIBS"
 fi
 
-if test "$lib_thread" = "yes"; then
-    YAZLIB="$YAZLIB $PTHREAD_LIBS"
+if test "$lib_icu" = "yes"; then
+    YAZINC="$YAZINC $ICU_CPPFLAGS"
+    YAZLIB="$YAZLIB $ICU_LIBS"
+    YAZLALIB="$YAZLALIB $ICU_LIBS"
 fi
 
 if test "$yaz_echo_help" = "yes"; then