X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz-config.in;h=6f2cd240dd1ca7e1a70d0f64cd6ebfb7db361203;hp=99e2ed22c0e08da5960d9dff9a0e56e3750f694a;hb=e46cd1b274c0f3328ebb091fa61fb41352638778;hpb=083dedcf7d9f7eac974a48dc49d5a23e284d9760

diff --git a/yaz-config.in b/yaz-config.in
index 99e2ed2..6f2cd24 100644
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: yaz-config.in,v 1.6 2001-03-20 15:58:24 adam Exp $
+# $Id: yaz-config.in,v 1.10 2001-10-15 20:37:08 adam Exp $
 yazprefix=@prefix@
 yaz_echo_cflags=no
 yaz_echo_libs=no
@@ -7,6 +7,7 @@ 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@
 
@@ -24,6 +25,7 @@ Options:
 	[--lalibs]
 	[--cflags]
 	[--tabs]
+	[--comp]
 Libraries:
 	threads
 EOF
@@ -64,6 +66,9 @@ while test $# -gt 0; do
     --lalibs)
       yaz_echo_lalibs=yes
       ;;
+    --comp)
+      yaz_echo_comp=yes
+      ;;
     threads)
       lib_thread=yes
       ;;
@@ -74,7 +79,7 @@ while test $# -gt 0; do
   shift
 done
 
-if test "$lib_thread" = "yes"; then
+if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then
     yazextralibs="@LIBTHREAD@ $yazextralibs"
     lyaz="-lyazthread -lyaz"
 else
@@ -84,15 +89,17 @@ if test "$yaz_echo_source" = "yes"; then
     YAZTAB=${yaz_src_root}/tab
     YAZBIN=${yaz_build_root}/bin
     YAZLIB="-L${yaz_build_root}/lib/.libs $lyaz $yazextralibs"
-    if test "$lib_thread" = "yes"; then
+    if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then
         YAZLALIB="${yaz_build_root}/lib/libyazthread.la ${yaz_build_root}/lib/libyaz.la $yazextralibs"
     else
         YAZLALIB="${yaz_build_root}/lib/libyaz.la $yazextralibs"
     fi
     YAZINC="-I${yaz_src_root}/include"
+    YAZCOMP=${yaz_src_root}/util/yaz-comp
 else
-    YAZTAB=$yazprefix/share/yaz/tab
-    YAZBIN=$yazprefix/bin
+    YAZTAB=${yazprefix}/share/yaz/tab
+    YAZBIN=${yazprefix}/bin
+    YAZCOMP=${yazprefix}/bin/yaz-comp
 
     if test "$yazprefix" = "/usr"; then
 	YAZLIB="$lyaz $yazextralibs"
@@ -108,7 +115,7 @@ else
 fi
 
 if test "$lib_thread" = "yes"; then
-    YAZINC="$YAZINC -D_REENTRANT"
+    YAZINC="$YAZINC @CFLAGSTHREADS@"
 fi
 
 if test "$yaz_echo_help" = "yes"; then
@@ -126,3 +133,6 @@ fi
 if test "$yaz_echo_lalibs" = "yes"; then
 	echo $YAZLALIB
 fi
+if test "$yaz_echo_comp" = "yes"; then
+	echo $YAZCOMP
+fi