X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=yaz-config.in;h=ee9471076d5d4f32b5c6ace7cf2c081784800ab1;hb=8fb5c6c99b6fb42df8539ea457038aca8ac1f70b;hp=efa73985df734a4aeb896f1ec1fc7be0740b20d9;hpb=27743f316331a9ea508df5f204416a6864fc320f;p=yaz-moved-to-github.git diff --git a/yaz-config.in b/yaz-config.in index efa7398..ee94710 100644 --- a/yaz-config.in +++ b/yaz-config.in @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: yaz-config.in,v 1.14 2002-12-09 23:29:00 adam Exp $ +# $Id: yaz-config.in,v 1.19 2004-01-05 09:45:49 adam Exp $ yazprefix=@prefix@ yaz_echo_cflags=no yaz_echo_libs=no @@ -89,10 +89,6 @@ if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then lyaz="-lyazthread $lyaz" fi -if test "$lib_malloc" = "yes"; then - lyaz="-lyazmalloc $lyaz" -fi - if test "$lib_ssl" = "yes" -a -n "@SSL_LIBS@"; then yazextralibs="@SSL_LIBS@ $yazextralibs" lyaz="-lyazssl $lyaz" @@ -100,16 +96,13 @@ fi if test "$yaz_echo_source" = "yes"; then YAZBIN=${yaz_build_root}/bin - YAZLIB="-L${yaz_build_root}/lib/.libs $lyaz $yazextralibs" - YAZLALIB="${yaz_build_root}/lib/libyaz.la $yazextralibs" + YAZLIB="-L${yaz_build_root}/src/.libs $lyaz $yazextralibs" + YAZLALIB="${yaz_build_root}/src/libyaz.la $yazextralibs" if test "$lib_ssl" = "yes" -a -n "$SSL_LIBS@"; then - YAZLALIB="${yaz_build_root}/lib/libyazssl.la" + YAZLALIB="${yaz_build_root}/src/libyazssl.la" fi 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" + YAZLALIB="${yaz_build_root}/src/libyazthread.la $YAZLALIB" fi YAZINC="-I${yaz_src_root}/include" YAZCOMP=${yaz_src_root}/util/yaz-comp