X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=yaz-config.in;h=f0ec873bc435cd0325befc44e7bfad7de4a63ee1;hb=f722c8d9517ec491e2469cdc91a3751dd5e7a6df;hp=1ccd01b81a70b640ebc05635fe8787d599c8a591;hpb=e9410a4de52da8f1ba857f3ebaba52349c331077;p=yaz-moved-to-github.git

diff --git a/yaz-config.in b/yaz-config.in
index 1ccd01b..f0ec873 100644
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: yaz-config.in,v 1.8 2001-09-28 10:42:28 adam Exp $
+# $Id: yaz-config.in,v 1.11 2001-11-13 23:00:42 adam Exp $
 yazprefix=@prefix@
 yaz_echo_cflags=no
 yaz_echo_libs=no
@@ -28,6 +28,7 @@ Options:
 	[--comp]
 Libraries:
 	threads
+        malloc
 EOF
 	exit $1
 }
@@ -72,6 +73,9 @@ while test $# -gt 0; do
     threads)
       lib_thread=yes
       ;;
+    malloc)
+      lib_malloc=yes
+      ;;
     -*)
       yaz_echo_help=yes
       ;;
@@ -79,20 +83,27 @@ while test $# -gt 0; do
   shift
 done
 
-if test "$lib_thread" = "yes" -a -n "@LIBTHREAD@"; 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 "$lib_malloc" = "yes"; then
+    lyaz="-lyazmalloc $lyaz"
+fi
+
 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
-        YAZLALIB="${yaz_build_root}/lib/libyazthread.la ${yaz_build_root}/lib/libyaz.la $yazextralibs"
-    else
-        YAZLALIB="${yaz_build_root}/lib/libyaz.la $yazextralibs"
+    YAZLALIB="${yaz_build_root}/lib/libyaz.la $yazextralibs"
+    if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then
+        YAZLALIB="${yaz_build_root}/lib/libyazthread.la $YAZLALIB"
+    fi
+    if test "$lib_malloc" = "yes"; then
+        YAZLALIB="${yaz_build_root}/lib/libyazmalloc.la $YAZLALIB"
     fi
     YAZINC="-I${yaz_src_root}/include"
     YAZCOMP=${yaz_src_root}/util/yaz-comp
@@ -115,7 +126,7 @@ else
 fi
 
 if test "$lib_thread" = "yes"; then
-    YAZINC="$YAZINC -D_REENTRANT"
+    YAZINC="$YAZINC @CFLAGSTHREADS@"
 fi
 
 if test "$yaz_echo_help" = "yes"; then