Separate malloc debug library. Removal of ASN_COMPILED-#ifdefs.

[yaz-moved-to-github.git] / yaz-config.in

diff --git a/yaz-config.in b/yaz-config.in
index 6f2cd24..f0ec873 100644 (file)
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,5 +1,5 @@
 #!/bin/sh
 #!/bin/sh

-# $Id: yaz-config.in,v 1.10 2001-10-15 20:37:08 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
 yazprefix=@prefix@
 yaz_echo_cflags=no
 yaz_echo_libs=no

@@ -28,6 +28,7 @@ Options:
        [--comp]
 Libraries:
        threads
        [--comp]
 Libraries:
        threads

+        malloc

 EOF
        exit $1
 }
 EOF
        exit $1
 }

@@ -72,6 +73,9 @@ while test $# -gt 0; do
     threads)
       lib_thread=yes
       ;;
     threads)
       lib_thread=yes
       ;;

+    malloc)
+      lib_malloc=yes
+      ;;

     -*)
       yaz_echo_help=yes
       ;;
     -*)
       yaz_echo_help=yes
       ;;

@@ -79,20 +83,27 @@ while test $# -gt 0; do
   shift
 done
 
   shift
 done
 

+lyaz="-lyaz"
+

 if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then
     yazextralibs="@LIBTHREAD@ $yazextralibs"
 if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then
     yazextralibs="@LIBTHREAD@ $yazextralibs"

-    lyaz="-lyazthread -lyaz"
-else
-    lyaz="-lyaz"
+    lyaz="-lyazthread $lyaz"

 fi 
 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 "$yaz_echo_source" = "yes"; then
     YAZTAB=${yaz_src_root}/tab
     YAZBIN=${yaz_build_root}/bin
     YAZLIB="-L${yaz_build_root}/lib/.libs $lyaz $yazextralibs"

+    YAZLALIB="${yaz_build_root}/lib/libyaz.la $yazextralibs"

     if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; 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"
+        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
     fi
     YAZINC="-I${yaz_src_root}/include"
     YAZCOMP=${yaz_src_root}/util/yaz-comp