X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz-config.in;h=ad78247e630d87ef48fd7dd50591869c1b6621b9;hp=bffcd94539faa26b6406802a5dd2fc7ebaf8f1ba;hb=83178ddb2e40a3c9dbde8b7b3e6cf5e8918da990;hpb=494421584e146db0b9a2c45c6ec70daacb44364c diff --git a/yaz-config.in b/yaz-config.in index bffcd94..ad78247 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() @@ -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 $LIBS" YAZLALIB=$YAZLIB if test "$yazprefix" != "/usr"; then YAZINC="-I$yazprefix/include $YAZINC"