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
Added break in reverse/'r' option check, or it would scan for iteration number.
[yaz-moved-to-github.git]
/
yaz-config.in
diff --git
a/yaz-config.in
b/yaz-config.in
index
9cd2b87
..
57886b6
100644
(file)
--- a/
yaz-config.in
+++ b/
yaz-config.in
@@
-18,6
+18,7
@@
ICU_CPPFLAGS="@ICU_CPPFLAGS@"
SSL_LIBS="@SSL_LIBS@"
LIBS="@LIBS@"
YAZVERSION=@VERSION@
SSL_LIBS="@SSL_LIBS@"
LIBS="@LIBS@"
YAZVERSION=@VERSION@
+VERSION_SHA1=@VERSION_SHA1@
usage()
{
usage()
{
@@
-30,6
+31,7
@@
Options:
[--lalibs]
[--cflags]
[--comp]
[--lalibs]
[--cflags]
[--comp]
+ [-V]
Libraries:
threads icu server
EOF
Libraries:
threads icu server
EOF
@@
-50,6
+52,10
@@
while test $# -gt 0; do
echo $yazprefix
exit 0
;;
echo $yazprefix
exit 0
;;
+ -V)
+ echo "$YAZVERSION $VERSION_SHA1"
+ exit 0
+ ;;
--version)
echo $YAZVERSION
exit 0
--version)
echo $YAZVERSION
exit 0
@@
-107,6
+113,9
@@
if test "$yaz_echo_source" = "yes"; then
if test "$lib_server" = "yes"; then
YAZLIB="${yaz_build_root}/src/.libs/libyaz_server.a $YAZLIB"
fi
if test "$lib_server" = "yes"; then
YAZLIB="${yaz_build_root}/src/.libs/libyaz_server.a $YAZLIB"
fi
+ if test "$lib_icu" = "yes"; then
+ YAZLIB="${yaz_build_root}/src/.libs/libyaz_icu.a $YAZLIB"
+ fi
else
YAZLIB="-L${yaz_build_root}/src/.libs $lyaz"
fi
else
YAZLIB="-L${yaz_build_root}/src/.libs $lyaz"
fi
@@
-130,7
+139,7
@@
else
if test "$yazprefix" != "/usr"; then
YAZLIB="-L$yazprefix/lib"
fi
if test "$yazprefix" != "/usr"; then
YAZLIB="-L$yazprefix/lib"
fi
- YAZLIB="$YAZLIB $lyaz $LIBS"
+ YAZLIB="$YAZLIB $lyaz ${SSL_LIBS} $LIBS"
YAZLALIB=$YAZLIB
if test "$yazprefix" != "/usr"; then
YAZINC="-I$yazprefix/include $YAZINC"
YAZLALIB=$YAZLIB
if test "$yazprefix" != "/usr"; then
YAZINC="-I$yazprefix/include $YAZINC"