From c5f3f854bdd0d6264af0c7552ac7e3c7acdb9723 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 29 Nov 2012 14:04:20 +0100 Subject: [PATCH] Provide SSL libs for in-source yaz-config --- yaz-config.in | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/yaz-config.in b/yaz-config.in index 78fe61d..5644032 100644 --- a/yaz-config.in +++ b/yaz-config.in @@ -113,19 +113,12 @@ if test "$lib_icu" = "yes"; then YAZLIB="-lyaz_icu $YAZLIB" fi -if test "$lib_ssl" = "yes"; then - LIBS="${SSL_LIBS} $LIBS" -fi - YAZINC="@YAZ_CONFIG_CFLAGS@" if test "$echo_source" = "yes"; then YAZBIN=${build_root}/bin if test "$lib_static" = "yes"; then - if test "$lib_ssl" != "yes"; then - LIBS="${SSL_LIBS} $LIBS" - fi YAZLIB="${build_root}/src/.libs/libyaz.a" if test "$lib_server" = "yes"; then YAZLIB="${build_root}/src/.libs/libyaz_server.a $YAZLIB" @@ -136,6 +129,7 @@ if test "$echo_source" = "yes"; then else YAZLIB="-L${build_root}/src/.libs $YAZLIB" fi + LIBS="${SSL_LIBS} $LIBS" YAZLIB="$YAZLIB $LIBS" YAZLALIB="${build_root}/src/libyaz.la" @@ -157,6 +151,9 @@ else if test "$prefix" != "/usr"; then YAZLIB="-L$libdir $YAZLIB" fi + if test "$lib_ssl" = "yes"; then + LIBS="${SSL_LIBS} $LIBS" + fi YAZLIB="$YAZLIB $LIBS" YAZLALIB=$YAZLIB if test "$prefix" != "/usr"; then -- 1.7.10.4