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
CCL: And-list / sub-phrase split-out YAZ-844
[yaz-moved-to-github.git]
/
yaz-config.in
diff --git
a/yaz-config.in
b/yaz-config.in
index
3420e35
..
979985d
100644
(file)
--- a/
yaz-config.in
+++ b/
yaz-config.in
@@
-1,21
+1,30
@@
#!/bin/sh
# This file is part of the YAZ toolkit.
#!/bin/sh
# This file is part of the YAZ toolkit.
-# Copyright (C) 1995-2008 Index Data
+# Copyright (C) Index Data
+# See the file LICENSE for details.
-yazprefix=@prefix@
-yaz_echo_cflags=no
-yaz_echo_libs=no
-yaz_echo_help=no
-yaz_echo_source=yes
-yaz_echo_lalibs=no
-yaz_echo_comp=no
-yaz_src_root=@YAZ_SRC_ROOT@
-yaz_build_root=@YAZ_BUILD_ROOT@
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+libdir="@libdir@"
+includedir="@includedir@"
+echo_cflags=no
+echo_libs=no
+echo_help=no
+echo_include=no
+echo_source=yes
+echo_lalibs=no
+echo_comp=no
+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@"
+MEMCACHED_LIBS="@MEMCACHED_LIBS@"
+HIREDIS_LIBS="@HIREDIS_LIBS@"
LIBS="@LIBS@"
LIBS="@LIBS@"
-YAZVERSION=@VERSION@
+VERSION=@VERSION@
+YAZVERSION=$VERSION
VERSION_SHA1=@VERSION_SHA1@
usage()
VERSION_SHA1=@VERSION_SHA1@
usage()
@@
-28,6
+37,7
@@
Options:
[--libs]
[--lalibs]
[--cflags]
[--libs]
[--lalibs]
[--cflags]
+ [--include]
[--comp]
[-V]
Libraries:
[--comp]
[-V]
Libraries:
@@
-44,31
+54,34
@@
while test $# -gt 0; do
case $1 in
--prefix=*)
case $1 in
--prefix=*)
- yazprefix=$optarg
+ prefix=$optarg
;;
--prefix)
;;
--prefix)
- echo $yazprefix
+ echo $prefix
exit 0
;;
-V)
exit 0
;;
-V)
- echo "$YAZVERSION $VERSION_SHA1"
+ echo "$VERSION $VERSION_SHA1"
exit 0
;;
--version)
exit 0
;;
--version)
- echo $YAZVERSION
+ echo $VERSION
exit 0
;;
--cflags)
exit 0
;;
--cflags)
- yaz_echo_cflags=yes
+ echo_cflags=yes
+ ;;
+ --include)
+ echo_include=yes
;;
--libs)
;;
--libs)
- yaz_echo_libs=yes
+ echo_libs=yes
;;
--lalibs)
;;
--lalibs)
- yaz_echo_lalibs=yes
+ echo_lalibs=yes
;;
--comp)
;;
--comp)
- yaz_echo_comp=yes
+ echo_comp=yes
;;
threads)
lib_thread=yes
;;
threads)
lib_thread=yes
@@
-89,7
+102,7
@@
while test $# -gt 0; do
lib_static=yes
;;
-*)
lib_static=yes
;;
-*)
- yaz_echo_help=yes
+ echo_help=yes
;;
esac
shift
;;
esac
shift
@@
-104,53
+117,52
@@
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@"
YAZINC="@YAZ_CONFIG_CFLAGS@"
-if test "$yaz_echo_source" = "yes"; then
- YAZBIN=${yaz_build_root}/bin
+if test "$echo_source" = "yes"; then
+ YAZBIN=${build_root}/bin
if test "$lib_static" = "yes"; then
if test "$lib_static" = "yes"; then
- if test "$lib_ssl" != "yes"; then
- LIBS="${SSL_LIBS} $LIBS"
- fi
- YAZLIB="${yaz_build_root}/src/.libs/libyaz.a"
+ YAZLIB="${build_root}/src/.libs/libyaz.a"
if test "$lib_server" = "yes"; then
if test "$lib_server" = "yes"; then
- YAZLIB="${yaz_build_root}/src/.libs/libyaz_server.a $YAZLIB"
+ YAZLIB="${build_root}/src/.libs/libyaz_server.a $YAZLIB"
fi
if test "$lib_icu" = "yes"; then
fi
if test "$lib_icu" = "yes"; then
- YAZLIB="${yaz_build_root}/src/.libs/libyaz_icu.a $YAZLIB"
+ YAZLIB="${build_root}/src/.libs/libyaz_icu.a $YAZLIB"
fi
else
fi
else
- YAZLIB="-L${yaz_build_root}/src/.libs $YAZLIB"
+ YAZLIB="-L${build_root}/src/.libs $YAZLIB"
fi
fi
+ LIBS="${SSL_LIBS} ${GCRYPT_LIBS} ${MEMCACHED_LIBS} ${HIREDIS_LIBS} $LIBS"
YAZLIB="$YAZLIB $LIBS"
YAZLIB="$YAZLIB $LIBS"
- YAZLALIB="${yaz_build_root}/src/libyaz.la"
+ YAZLALIB="${build_root}/src/libyaz.la"
if test "$lib_server" = "yes"; then
if test "$lib_server" = "yes"; then
- YAZLALIB="${yaz_build_root}/src/libyaz_server.la $YAZLALIB"
+ YAZLALIB="${build_root}/src/libyaz_server.la $YAZLALIB"
fi
if test "$lib_icu" = "yes"; then
fi
if test "$lib_icu" = "yes"; then
- YAZLALIB="${yaz_build_root}/src/libyaz_icu.la $YAZLALIB"
+ YAZLALIB="${build_root}/src/libyaz_icu.la $YAZLALIB"
fi
YAZLALIB="$YAZLALIB $LIBS"
fi
YAZLALIB="$YAZLALIB $LIBS"
- YAZINC="-I${yaz_src_root}/include $YAZINC"
- YAZCOMP=${yaz_src_root}/util/yaz-asncomp
+ YAZBINC="-I${src_root}/include"
+ YAZINC="$YAZBINC $YAZINC"
+ YAZCOMP="${src_root}/util/yaz-asncomp"
else
else
- YAZBIN=${yazprefix}/bin
- YAZCOMP=${yazprefix}/bin/yaz-asncomp
+ YAZBIN="${prefix}/bin"
+ YAZCOMP=${prefix}/bin/yaz-asncomp
- if test "$yazprefix" != "/usr"; then
- YAZLIB="-L$yazprefix/lib $YAZLIB"
+ 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
fi
YAZLIB="$YAZLIB $LIBS"
YAZLALIB=$YAZLIB
- if test "$yazprefix" != "/usr"; then
- YAZINC="-I$yazprefix/include $YAZINC"
+ if test "$prefix" != "/usr"; then
+ YAZBINC="-I${includedir}"
+ YAZINC="$YAZBINC $YAZINC"
fi
fi
fi
fi
@@
-164,19
+176,22
@@
if test "$lib_icu" = "yes"; then
YAZLALIB="$YAZLALIB $ICU_LIBS"
fi
YAZLALIB="$YAZLALIB $ICU_LIBS"
fi
-if test "$yaz_echo_help" = "yes"; then
+if test "$echo_help" = "yes"; then
usage 1 1>&2
fi
usage 1 1>&2
fi
-if test "$yaz_echo_cflags" = "yes"; then
+if test "$echo_include" = "yes"; then
+ echo $YAZBINC
+fi
+if test "$echo_cflags" = "yes"; then
echo $YAZINC
fi
echo $YAZINC
fi
-if test "$yaz_echo_libs" = "yes"; then
+if test "$echo_libs" = "yes"; then
echo $YAZLIB
fi
echo $YAZLIB
fi
-if test "$yaz_echo_lalibs" = "yes"; then
+if test "$echo_lalibs" = "yes"; then
echo $YAZLALIB
fi
echo $YAZLALIB
fi
-if test "$yaz_echo_comp" = "yes"; then
+if test "$echo_comp" = "yes"; then
echo $YAZCOMP
fi
# Local Variables:
echo $YAZCOMP
fi
# Local Variables: