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:
a869081
)
Provide SSL libs for in-source yaz-config
author
Adam Dickmeiss
<adam@indexdata.dk>
Thu, 29 Nov 2012 13:04:20 +0000
(14:04 +0100)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Thu, 29 Nov 2012 13:04:20 +0000
(14:04 +0100)
yaz-config.in
patch
|
blob
|
history
diff --git
a/yaz-config.in
b/yaz-config.in
index
78fe61d
..
5644032
100644
(file)
--- a/
yaz-config.in
+++ b/
yaz-config.in
@@
-113,19
+113,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
+129,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} $LIBS"
YAZLIB="$YAZLIB $LIBS"
YAZLALIB="${build_root}/src/libyaz.la"
YAZLIB="$YAZLIB $LIBS"
YAZLALIB="${build_root}/src/libyaz.la"
@@
-157,6
+151,9
@@
else
if test "$prefix" != "/usr"; then
YAZLIB="-L$libdir $YAZLIB"
fi
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