projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set VS_REDIST_EXE for all architectures
[yaz-moved-to-github.git]
/
yaz-config.in
diff --git
a/yaz-config.in
b/yaz-config.in
index
2374032
..
a5d7384
100644
(file)
--- a/
yaz-config.in
+++ b/
yaz-config.in
@@
-1,11
+1,12
@@
#!/bin/sh
# This file is part of the YAZ toolkit.
#!/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
echo_cflags=no
echo_libs=no
echo_help=no
@@
-13,11
+14,15
@@
echo_include=no
echo_source=yes
echo_lalibs=no
echo_comp=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@"
ICU_LIBS="@ICU_LIBS@"
ICU_CPPFLAGS="@ICU_CPPFLAGS@"
SSL_LIBS="@SSL_LIBS@"
+GCRYPT_LIBS="@GCRYPT_LIBS@"
+NETTLE_LIBS="@NETTLE_LIBS@"
+MEMCACHED_LIBS="@MEMCACHED_LIBS@"
+HIREDIS_LIBS="@HIREDIS_LIBS@"
LIBS="@LIBS@"
VERSION=@VERSION@
YAZVERSION=$VERSION
LIBS="@LIBS@"
VERSION=@VERSION@
YAZVERSION=$VERSION
@@
-113,19
+118,12
@@
if test "$lib_icu" = "yes"; then
YAZLIB="-lyaz_icu $YAZLIB"
fi
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
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"
YAZLIB="${build_root}/src/.libs/libyaz.a"
if test "$lib_server" = "yes"; then
YAZLIB="${build_root}/src/.libs/libyaz_server.a $YAZLIB"
@@
-136,6
+134,7
@@
if test "$echo_source" = "yes"; then
else
YAZLIB="-L${build_root}/src/.libs $YAZLIB"
fi
else
YAZLIB="-L${build_root}/src/.libs $YAZLIB"
fi
+ LIBS="${SSL_LIBS} ${GCRYPT_LIBS} ${NETTLE_LIBS} ${MEMCACHED_LIBS} ${HIREDIS_LIBS} $LIBS"
YAZLIB="$YAZLIB $LIBS"
YAZLALIB="${build_root}/src/libyaz.la"
YAZLIB="$YAZLIB $LIBS"
YAZLALIB="${build_root}/src/libyaz.la"
@@
-149,14
+148,17
@@
if test "$echo_source" = "yes"; then
YAZBINC="-I${src_root}/include"
YAZINC="$YAZBINC $YAZINC"
YAZBINC="-I${src_root}/include"
YAZINC="$YAZBINC $YAZINC"
- YAZCOMP=${src_root}/util/yaz-asncomp
+ YAZCOMP="${src_root}/util/yaz-asncomp"
else
else
- YAZBIN=${prefix}/bin
+ YAZBIN="${prefix}/bin"
YAZCOMP=${prefix}/bin/yaz-asncomp
if test "$prefix" != "/usr"; then
YAZLIB="-L$libdir $YAZLIB"
fi
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
YAZLIB="$YAZLIB $LIBS"
YAZLALIB=$YAZLIB
if test "$prefix" != "/usr"; then