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

diff --git a/yaz-config.in b/yaz-config.in
index 59bdb1d..93e168f 100644
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,5 +1,7 @@
 #!/bin/sh
-# $Id: yaz-config.in,v 1.26 2007-02-25 14:46:50 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
@@ -9,9 +11,12 @@ yaz_echo_lalibs=no
 yaz_echo_comp=no
 yaz_src_root=@YAZ_SRC_ROOT@
 yaz_build_root=@YAZ_BUILD_ROOT@
-
-yazextralibs="@LIBS@"
+ICU_LIBS="@ICU_LIBS@"
+ICU_CPPFLAGS="@ICU_CPPFLAGS@"
+SSL_LIBS="@SSL_LIBS@"
+LIBS="@LIBS@"
 YAZVERSION=@VERSION@
+VERSION_SHA1=@VERSION_SHA1@
 
 usage()
 {
@@ -24,8 +29,9 @@ Options:
 	[--lalibs]
 	[--cflags]
 	[--comp]
+        [-V]
 Libraries:
-	threads
+	threads icu server
 EOF
 	exit $1
 }
@@ -44,6 +50,10 @@ while test $# -gt 0; do
 	    echo $yazprefix
 	    exit 0
 	    ;;
+        -V)
+	    echo "$YAZVERSION $VERSION_SHA1"
+	    exit 0
+            ;;
 	--version)
 	    echo $YAZVERSION
 	    exit 0
@@ -63,8 +73,20 @@ while test $# -gt 0; do
 	threads)
 	    lib_thread=yes
 	    ;;
-	malloc)
-	    lib_malloc=yes
+	icu)
+	    if test "$ICU_CPPFLAGS"; then
+		lib_icu=yes
+	    fi
+	    ;;
+	ssl)
+	    lib_ssl=yes
+	    ;;
+	server)
+	    lib_thread=yes
+	    lib_server=yes
+	    ;;
+	static)
+	    lib_static=yes
 	    ;;
 	-*)
 	    yaz_echo_help=yes
@@ -74,30 +96,71 @@ while test $# -gt 0; do
 done
 
 lyaz="-lyaz"
+if test "$lib_server" = "yes"; then
+    lyaz="-lyaz_server $lyaz"
+fi
+
+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
     YAZBIN=${yaz_build_root}/bin
-    YAZLIB="-L${yaz_build_root}/src/.libs $lyaz $yazextralibs"
-    YAZLALIB="${yaz_build_root}/src/libyaz.la $yazextralibs"
-    YAZINC="$YAZINC -I${yaz_src_root}/include"
+
+    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"
+        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 $LIBS"
+
+    YAZLALIB="${yaz_build_root}/src/libyaz.la"
+    if test "$lib_server" = "yes"; then
+	YAZLALIB="${yaz_build_root}/src/libyaz_server.la $YAZLALIB"
+    fi
+    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
 else
     YAZBIN=${yazprefix}/bin
     YAZCOMP=${yazprefix}/bin/yaz-asncomp
 
-    if test "$yazprefix" = "/usr"; then
-	YAZLIB="$lyaz $yazextralibs"
-    else
-	YAZLIB="-L$yazprefix/lib $lyaz $yazextralibs"
+    if test "$yazprefix" != "/usr"; then
+	YAZLIB="-L$yazprefix/lib"
     fi
+    YAZLIB="$YAZLIB $lyaz $LIBS"
     YAZLALIB=$YAZLIB
     if test "$yazprefix" != "/usr"; then
-	YAZINC="$YAZINC -I$yazprefix/include"
+	YAZINC="-I$yazprefix/include $YAZINC"
     fi
 fi
 
+if test "$lib_thread" = "yes"; then
+    :
+fi
+
+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
     usage 1 1>&2
 fi