X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz-config.in;h=2e673df5eb05e29f14a00edd142ecb437678c7e6;hp=d4282a8eecba6d9bdd21203db20535632eb53c28;hb=e23eae6ada71a70849bcdab7ee179579aad248e1;hpb=8e4eabe621f8b8195faa6625a38a2e1ae7b68aa1

diff --git a/yaz-config.in b/yaz-config.in
index d4282a8..2e673df 100644
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,13 +1,14 @@
 #!/bin/sh
-# $Id: yaz-config.in,v 1.4 2000-11-23 10:58:32 adam Exp $
+# $Id: yaz-config.in,v 1.21 2004-05-01 23:32:20 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@
 
 yazextralibs="@LIBS@"
 YAZVERSION=@VERSION@
@@ -22,7 +23,7 @@ Options:
 	[--libs]
 	[--lalibs]
 	[--cflags]
-	[--tabs]
+	[--comp]
 Libraries:
 	threads
 EOF
@@ -57,15 +58,18 @@ while test $# -gt 0; do
     --libs)
       yaz_echo_libs=yes
       ;;
-    --tabs)
-      yaz_echo_tabs=yes
-      ;;
     --lalibs)
       yaz_echo_lalibs=yes
       ;;
+    --comp)
+      yaz_echo_comp=yes
+      ;;
     threads)
       lib_thread=yes
       ;;
+    malloc)
+      lib_malloc=yes
+      ;;
     -*)
       yaz_echo_help=yes
       ;;
@@ -73,25 +77,25 @@ while test $# -gt 0; do
   shift
 done
 
-if test "$lib_thread" = "yes"; then
+lyaz="-lyaz"
+
+if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then
     yazextralibs="@LIBTHREAD@ $yazextralibs"
-    lyaz="-lyazthread -lyaz"
-else
-    lyaz="-lyaz"
+    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 $yazextralibs"
-    if test "$lib_thread" = "yes"; then
-        YAZLALIB="${yaz_src_root}/lib/libyazthread.la ${yaz_src_root}/lib/libyaz.la $yazextralibs"
-    else
-        YAZLALIB="${yaz_src_root}/lib/libyazthread.la $yazextralibs"
+    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-comp
 else
-    YAZTAB=$yazprefix/share/yaz/tab
-    YAZBIN=$yazprefix/bin
+    YAZBIN=${yazprefix}/bin
+    YAZCOMP=${yazprefix}/bin/yaz-comp
 
     if test "$yazprefix" = "/usr"; then
 	YAZLIB="$lyaz $yazextralibs"
@@ -106,8 +110,10 @@ else
     fi
 fi
 
+YAZINC="$YAZINC @YAZ_CONF_CFLAGS@"
+
 if test "$lib_thread" = "yes"; then
-    YAZINC="$YAZINC -D_REENTRANT"
+    YAZINC="$YAZINC @CFLAGSTHREADS@"
 fi
 
 if test "$yaz_echo_help" = "yes"; then
@@ -119,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