X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz-config.in;h=cae1175693f505e7b91baa8c207876a9ac1926be;hp=23740328a403abd1c58c8053743229116e5e8986;hb=457156ca85763b2329eaf066918e2d379c61d47d;hpb=9471482ee33ba4513858f9bcc654327af4fe1b99 diff --git a/yaz-config.in b/yaz-config.in index 2374032..cae1175 100644 --- a/yaz-config.in +++ b/yaz-config.in @@ -1,6 +1,6 @@ #!/bin/sh # This file is part of the YAZ toolkit. -# Copyright (C) 1995-2011 Index Data +# Copyright (C) 1995-2013 Index Data prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -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