X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz-config.in;h=e1b7cd64fcde9f5a978f9373b416099be289ebc4;hp=b047e6da1dd560dfd09d3bc6b412b9a6b494b7d7;hb=c43b2d080cc557adb59b37b3d8f427871481c7e8;hpb=180d8e06b6f1e7fe34b1a80ca1edde0dddf113f1

diff --git a/yaz-config.in b/yaz-config.in
index b047e6d..e1b7cd6 100644
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,15 +1,16 @@
 #!/bin/sh
-# $Id: yaz-config.in,v 1.2 2000-10-11 10:40:56 adam Exp $
+# $Id: yaz-config.in,v 1.22 2004-10-27 08:18:55 adam Exp $
 yazprefix=@prefix@
 yaz_echo_cflags=no
 yaz_echo_libs=no
 yaz_echo_help=no
-yaz_echo_tabs=no
 yaz_echo_source=yes
 yaz_echo_lalibs=no
+yaz_echo_comp=no
 yaz_src_root=@YAZ_SRC_ROOT@
+yaz_build_root=@YAZ_BUILD_ROOT@
 
-yazlibs="@LIBS@"
+yazextralibs="@LIBS@"
 YAZVERSION=@VERSION@
 
 usage()
@@ -22,7 +23,9 @@ Options:
 	[--libs]
 	[--lalibs]
 	[--cflags]
-	[--tabs]
+	[--comp]
+Libraries:
+	threads
 EOF
 	exit $1
 }
@@ -55,15 +58,18 @@ while test $# -gt 0; do
     --libs)
       yaz_echo_libs=yes
       ;;
-    --tabs)
-      yaz_echo_tabs=yes
-      ;;
-    --source)
-      yaz_echo_source=yes
-      ;;
     --lalibs)
       yaz_echo_lalibs=yes
       ;;
+    --comp)
+      yaz_echo_comp=yes
+      ;;
+    threads)
+      lib_thread=yes
+      ;;
+    malloc)
+      lib_malloc=yes
+      ;;
     -*)
       yaz_echo_help=yes
       ;;
@@ -71,20 +77,30 @@ while test $# -gt 0; do
   shift
 done
 
+lyaz="-lyaz"
+
+if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then
+    yazextralibs="@LIBTHREAD@ $yazextralibs"
+    lyaz="-lyazthread $lyaz"
+fi 
+
 if test "$yaz_echo_source" = "yes"; then
-    YAZTAB=${yaz_src_root}/tab
-    YAZBIN=${yaz_src_root}/bin
-    YAZLIB="-L${yaz_src_root}/lib/.libs -lyaz $yazlibs"
-    YAZLALIB="${yaz_src_root}/lib/libyaz.la $yazlibs"
+    YAZBIN=${yaz_build_root}/bin
+    YAZLIB="-L${yaz_build_root}/src/.libs $lyaz $yazextralibs"
+    YAZLALIB="${yaz_build_root}/src/libyaz.la $yazextralibs"
+    if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then
+        YAZLALIB="${yaz_build_root}/src/libyazthread.la $YAZLALIB"
+    fi
     YAZINC="-I${yaz_src_root}/include"
+    YAZCOMP=${yaz_src_root}/util/yaz-asncomp
 else
-    YAZTAB=$yazprefix/share/yaz/tab
-    YAZBIN=$yazprefix/bin
+    YAZBIN=${yazprefix}/bin
+    YAZCOMP=${yazprefix}/bin/yaz-asncomp
 
     if test "$yazprefix" = "/usr"; then
-	YAZLIB="-lyaz $yazlibs"
+	YAZLIB="$lyaz $yazextralibs"
     else
-	YAZLIB="-L$yazprefix/lib -lyaz $yazlibs"
+	YAZLIB="-L$yazprefix/lib $lyaz $yazextralibs"
     fi
     YAZLALIB=$YAZLIB
     if test "$yazprefix" = "/usr"; then
@@ -94,6 +110,12 @@ else
     fi
 fi
 
+YAZINC="$YAZINC @YAZ_CONF_CFLAGS@"
+
+if test "$lib_thread" = "yes"; then
+    YAZINC="$YAZINC @CFLAGSTHREADS@"
+fi
+
 if test "$yaz_echo_help" = "yes"; then
 	usage 1 1>&2
 fi
@@ -103,9 +125,9 @@ fi
 if test "$yaz_echo_libs" = "yes"; then
 	echo $YAZLIB
 fi
-if test "$yaz_echo_tabs" = "yes"; then
-	echo $YAZTAB
-fi
 if test "$yaz_echo_lalibs" = "yes"; then
 	echo $YAZLALIB
 fi
+if test "$yaz_echo_comp" = "yes"; then
+	echo $YAZCOMP
+fi