X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz-config.in;h=f0ec873bc435cd0325befc44e7bfad7de4a63ee1;hp=6f2cd240dd1ca7e1a70d0f64cd6ebfb7db361203;hb=fd4adcc80d442f84c6a1894e890b1b6ccd02615e;hpb=78942f568d83ea621661bfcd2d3f25eee3d316a1 diff --git a/yaz-config.in b/yaz-config.in index 6f2cd24..f0ec873 100644 --- a/yaz-config.in +++ b/yaz-config.in @@ -1,5 +1,5 @@ #!/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 @@ -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 +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" + YAZLALIB="${yaz_build_root}/lib/libyaz.la $yazextralibs" 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