projects
/
yaz-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
363b51d
)
yaz-config: dont list SSL libs for shared libyaz
author
Adam Dickmeiss
<adam@indexdata.dk>
Thu, 29 Apr 2010 11:45:14 +0000
(13:45 +0200)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Thu, 29 Apr 2010 11:45:14 +0000
(13:45 +0200)
yaz-config.in
patch
|
blob
|
history
diff --git
a/yaz-config.in
b/yaz-config.in
index
23c2617
..
3420e35
100644
(file)
--- a/
yaz-config.in
+++ b/
yaz-config.in
@@
-104,7
+104,7
@@
if test "$lib_icu" = "yes"; then
YAZLIB="-lyaz_icu $YAZLIB"
fi
YAZLIB="-lyaz_icu $YAZLIB"
fi
-if test "$lib_ssl" = "yes" -o "$lib_static" = "yes"; then
+if test "$lib_ssl" = "yes"; then
LIBS="${SSL_LIBS} $LIBS"
fi
LIBS="${SSL_LIBS} $LIBS"
fi
@@
-113,7
+113,10
@@
YAZINC="@YAZ_CONFIG_CFLAGS@"
if test "$yaz_echo_source" = "yes"; then
YAZBIN=${yaz_build_root}/bin
if test "$yaz_echo_source" = "yes"; then
YAZBIN=${yaz_build_root}/bin
- if test "$lib_static" = "x"; 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"
if test "$lib_server" = "yes"; then
YAZLIB="${yaz_build_root}/src/.libs/libyaz_server.a $YAZLIB"
YAZLIB="${yaz_build_root}/src/.libs/libyaz.a"
if test "$lib_server" = "yes"; then
YAZLIB="${yaz_build_root}/src/.libs/libyaz_server.a $YAZLIB"