X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz-config.in;h=979985dd546c1a09baf7eec268f5162938d023b0;hp=23740328a403abd1c58c8053743229116e5e8986;hb=9a50808021be48e8ff272f762b9f8245330a79e4;hpb=9471482ee33ba4513858f9bcc654327af4fe1b99

diff --git a/yaz-config.in b/yaz-config.in
index 2374032..979985d 100644
--- a/yaz-config.in
+++ b/yaz-config.in
@@ -1,11 +1,12 @@
 #!/bin/sh
 # This file is part of the YAZ toolkit.
-# Copyright (C) 1995-2011 Index Data
+# Copyright (C) Index Data
+# See the file LICENSE for details.
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+libdir="@libdir@"
+includedir="@includedir@"
 echo_cflags=no
 echo_libs=no
 echo_help=no
@@ -13,11 +14,14 @@ echo_include=no
 echo_source=yes
 echo_lalibs=no
 echo_comp=no
-src_root=@abs_top_srcdir@
-build_root=@abs_top_builddir@
+src_root="@abs_top_srcdir@"
+build_root="@abs_top_builddir@"
 ICU_LIBS="@ICU_LIBS@"
 ICU_CPPFLAGS="@ICU_CPPFLAGS@"
 SSL_LIBS="@SSL_LIBS@"
+GCRYPT_LIBS="@GCRYPT_LIBS@"
+MEMCACHED_LIBS="@MEMCACHED_LIBS@"
+HIREDIS_LIBS="@HIREDIS_LIBS@"
 LIBS="@LIBS@"
 VERSION=@VERSION@
 YAZVERSION=$VERSION
@@ -113,19 +117,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 +133,7 @@ if test "$echo_source" = "yes"; then
     else
         YAZLIB="-L${build_root}/src/.libs $YAZLIB"
     fi
+    LIBS="${SSL_LIBS} ${GCRYPT_LIBS} ${MEMCACHED_LIBS} ${HIREDIS_LIBS} $LIBS"
     YAZLIB="$YAZLIB $LIBS"
 
     YAZLALIB="${build_root}/src/libyaz.la"
@@ -149,14 +147,17 @@ if test "$echo_source" = "yes"; then
 
     YAZBINC="-I${src_root}/include"
     YAZINC="$YAZBINC $YAZINC"
-    YAZCOMP=${src_root}/util/yaz-asncomp
+    YAZCOMP="${src_root}/util/yaz-asncomp"
 else
-    YAZBIN=${prefix}/bin
+    YAZBIN="${prefix}/bin"
     YAZCOMP=${prefix}/bin/yaz-asncomp
 
     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