X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=yaz-config.in;h=979985dd546c1a09baf7eec268f5162938d023b0;hp=56440325b9069744cd44ec0da3506f79f776d4ce;hb=70ce06b6fcbe3a53e94111ecedf0312848647c1b;hpb=c5f3f854bdd0d6264af0c7552ac7e3c7acdb9723 diff --git a/yaz-config.in b/yaz-config.in index 5644032..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-2012 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 @@ -129,7 +133,7 @@ if test "$echo_source" = "yes"; then else YAZLIB="-L${build_root}/src/.libs $YAZLIB" fi - LIBS="${SSL_LIBS} $LIBS" + LIBS="${SSL_LIBS} ${GCRYPT_LIBS} ${MEMCACHED_LIBS} ${HIREDIS_LIBS} $LIBS" YAZLIB="$YAZLIB $LIBS" YAZLALIB="${build_root}/src/libyaz.la" @@ -143,9 +147,9 @@ 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