X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz-config.in;h=117806ae7c08b8a8c3ca5b8bafbb440e844de712;hp=9931978c9857e525d19bbe96666ae9f334c48d77;hb=62f4f43aa7b97890d7c4bf776e3749f25b2e1c5a;hpb=d940392c53c32ccf76fb287cc5b997b9e921a431 diff --git a/yaz-config.in b/yaz-config.in index 9931978..117806a 100644 --- a/yaz-config.in +++ b/yaz-config.in @@ -15,8 +15,8 @@ PTHREAD_LIBS="@PTHREAD_LIBS@" PTHREAD_CFLAGS="@PTHREAD_CFLAGS@" ICU_LIBS="@ICU_LIBS@" ICU_CPPFLAGS="@ICU_CPPFLAGS@" - -yazextralibs="@LIBS@" +SSL_LIBS="@SSL_LIBS@" +LIBS="@LIBS@" YAZVERSION=@VERSION@ usage() @@ -31,7 +31,7 @@ Options: [--cflags] [--comp] Libraries: - threads + threads icu server EOF exit $1 } @@ -107,10 +107,13 @@ if test "$yaz_echo_source" = "yes"; then if test "$lib_server" = "yes"; then YAZLIB="${yaz_build_root}/src/.libs/libyaz_server.a $YAZLIB" fi + if test "$lib_icu" = "yes"; then + YAZLIB="${yaz_build_root}/src/.libs/libyaz_icu.a $YAZLIB" + fi else YAZLIB="-L${yaz_build_root}/src/.libs $lyaz" fi - YAZLIB="$YAZLIB $yazextralibs" + YAZLIB="$YAZLIB ${SSL_LIBS} $LIBS" YAZLALIB="${yaz_build_root}/src/libyaz.la" if test "$lib_server" = "yes"; then @@ -119,7 +122,7 @@ if test "$yaz_echo_source" = "yes"; then if test "$lib_icu" = "yes"; then YAZLALIB="${yaz_build_root}/src/libyaz_icu.la $YAZLALIB" fi - YAZLALIB="$YAZLALIB $yazextralibs" + YAZLALIB="$YAZLALIB $LIBS" YAZINC="-I${yaz_src_root}/include $YAZINC" YAZCOMP=${yaz_src_root}/util/yaz-asncomp @@ -130,7 +133,7 @@ else if test "$yazprefix" != "/usr"; then YAZLIB="-L$yazprefix/lib" fi - YAZLIB="$YAZLIB $lyaz $yazextralibs" + YAZLIB="$YAZLIB $lyaz ${SSL_LIBS} $LIBS" YAZLALIB=$YAZLIB if test "$yazprefix" != "/usr"; then YAZINC="-I$yazprefix/include $YAZINC"