X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz-config.in;h=1b2560f1ada3a5dd3a879cbf6dd271343be9bed3;hp=2e673df5eb05e29f14a00edd142ecb437678c7e6;hb=95d8bd04e10519a635972a24176270ef4dbe8d2c;hpb=e23eae6ada71a70849bcdab7ee179579aad248e1 diff --git a/yaz-config.in b/yaz-config.in index 2e673df..1b2560f 100644 --- a/yaz-config.in +++ b/yaz-config.in @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: yaz-config.in,v 1.21 2004-05-01 23:32:20 adam Exp $ +# $Id: yaz-config.in,v 1.23 2005-09-09 10:34:09 adam Exp $ yazprefix=@prefix@ yaz_echo_cflags=no yaz_echo_libs=no @@ -79,23 +79,15 @@ done lyaz="-lyaz" -if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then - yazextralibs="@LIBTHREAD@ $yazextralibs" - lyaz="-lyazthread $lyaz" -fi - if test "$yaz_echo_source" = "yes"; then YAZBIN=${yaz_build_root}/bin YAZLIB="-L${yaz_build_root}/src/.libs $lyaz $yazextralibs" YAZLALIB="${yaz_build_root}/src/libyaz.la $yazextralibs" - if test "$lib_thread" = "yes" -a -n "@CFLAGSTHREADS@"; then - YAZLALIB="${yaz_build_root}/src/libyazthread.la $YAZLALIB" - fi YAZINC="-I${yaz_src_root}/include" - YAZCOMP=${yaz_src_root}/util/yaz-comp + YAZCOMP=${yaz_src_root}/util/yaz-asncomp else YAZBIN=${yazprefix}/bin - YAZCOMP=${yazprefix}/bin/yaz-comp + YAZCOMP=${yazprefix}/bin/yaz-asncomp if test "$yazprefix" = "/usr"; then YAZLIB="$lyaz $yazextralibs" @@ -113,7 +105,7 @@ fi YAZINC="$YAZINC @YAZ_CONF_CFLAGS@" if test "$lib_thread" = "yes"; then - YAZINC="$YAZINC @CFLAGSTHREADS@" + YAZINC="$YAZINC @THREAD_CFLAGS@" fi if test "$yaz_echo_help" = "yes"; then