X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz-config.in;h=cec991180506b3ed17f3c8a95b476ceeaccf079b;hp=e57da01f2ca71fad8303d861e243b74103bdd958;hb=46692c65fdb078ebbefb8a45e159fe65f528d8d8;hpb=dc4414aeda179bc8ebe3fc46ac53e4a24d265d16

diff --git a/yaz-config.in b/yaz-config.in
index e57da01..cec9911 100644
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: yaz-config.in,v 1.28 2007-04-17 20:26:18 adam Exp $
+# $Id: yaz-config.in,v 1.34 2008-01-16 12:18:51 adam Exp $
 yazprefix=@prefix@
 yaz_echo_cflags=no
 yaz_echo_libs=no
@@ -11,6 +11,8 @@ 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@"
 
 yazextralibs="@LIBS@"
 YAZVERSION=@VERSION@
@@ -65,10 +67,18 @@ 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
 	    ;;
+	static)
+	    lib_static=yes
+	    ;;
 	-*)
 	    yaz_echo_help=yes
 	    ;;
@@ -81,18 +91,32 @@ 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
     YAZBIN=${yaz_build_root}/bin
 
-    YAZLIB="-L${yaz_build_root}/src/.libs $lyaz"
+    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
+    else
+        YAZLIB="-L${yaz_build_root}/src/.libs $lyaz"
+    fi
     YAZLIB="$YAZLIB $yazextralibs"
 
     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 $yazextralibs"
 
     YAZINC="-I${yaz_src_root}/include $YAZINC"
@@ -113,10 +137,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