X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz-config.in;h=76b9152133a61fd23d713fc4372b9d15066c2d47;hp=d2325ab37fe8600b810032c7b3609b40783043cb;hb=0ffb25b0bf78f53399267664b71206c88980c4da;hpb=bb7daed8b7299999f1c25e4e768e5e510d4b7e98

diff --git a/yaz-config.in b/yaz-config.in
index d2325ab..76b9152 100644
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: yaz-config.in,v 1.24 2006-06-13 15:36:09 adam Exp $
+# $Id: yaz-config.in,v 1.31 2007-10-22 12:21:38 adam Exp $
 yazprefix=@prefix@
 yaz_echo_cflags=no
 yaz_echo_libs=no
@@ -9,6 +9,10 @@ yaz_echo_lalibs=no
 yaz_echo_comp=no
 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@
@@ -63,8 +67,15 @@ while test $# -gt 0; do
 	threads)
 	    lib_thread=yes
 	    ;;
-	malloc)
-	    lib_malloc=yes
+	icu)
+	    lib_icu=yes
+	    ;;
+	server)
+	    lib_thread=yes
+	    lib_server=yes
+	    ;;
+	static)
+	    lib_static=yes
 	    ;;
 	-*)
 	    yaz_echo_help=yes
@@ -74,34 +85,61 @@ 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
+
+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="-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
+    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
+    YAZLALIB="$YAZLALIB $yazextralibs"
+
+    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 $yazextralibs"
     YAZLALIB=$YAZLIB
-    if test "$yazprefix" = "/usr"; then
-	YAZINC=
-    else
-	YAZINC=-I$yazprefix/include
+    if test "$yazprefix" != "/usr"; then
+	YAZINC="-I$yazprefix/include $YAZINC"
     fi
 fi
 
-YAZINC="$YAZINC @YAZ_CONF_CFLAGS@"
-
 if test "$lib_thread" = "yes"; then
-    YAZINC="$YAZINC @THREAD_CFLAGS@"
+    YAZINC="$PTHREAD_CFLAGS $YAZINC"
+    YAZLIB="$YAZLIB $PTHREAD_LIBS"
+    YAZLALIB="$YAZLALIB $PTHREAD_LIBS"
+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