Commit c16aed9c authored by Mark Andrews's avatar Mark Andrews
Browse files

2209. [port] osx: linking against user supplied static OpenSSL

                        libraries failed as the system ones were still being
                        found. [RT #17078]
parent 2df06589
2209. [port] osx: linking against user supplied static OpenSSL
libraries failed as the system ones were still being
found. [RT #17078]
2208. [port] win32: make sure both build methods produce the 2208. [port] win32: make sure both build methods produce the
same output. [RT #17058] same output. [RT #17058]
......
This diff is collapsed.
...@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl ...@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
esyscmd([sed "s/^/# /" COPYRIGHT])dnl esyscmd([sed "s/^/# /" COPYRIGHT])dnl
AC_DIVERT_POP()dnl AC_DIVERT_POP()dnl
AC_REVISION($Revision: 1.429 $) AC_REVISION($Revision: 1.430 $)
AC_INIT(lib/dns/name.c) AC_INIT(lib/dns/name.c)
AC_PREREQ(2.59) AC_PREREQ(2.59)
...@@ -429,6 +429,21 @@ case "$use_openssl" in ...@@ -429,6 +429,21 @@ case "$use_openssl" in
*-hp-hpux*) *-hp-hpux*)
DNS_OPENSSL_LIBS="-L$use_openssl/lib -Wl,+b: -lcrypto" DNS_OPENSSL_LIBS="-L$use_openssl/lib -Wl,+b: -lcrypto"
;; ;;
*-apple-darwin*)
#
# Apple's ld seaches for serially for dynamic
# then static libraries. This means you can't
# use -L to override dynamic system libraries
# with static ones when linking. Instead
# we specify a absolute path.
#
if test -f "$use_openssl/lib/libcrypto.dylib"
then
DNS_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto"
else
DNS_OPENSSL_LIBS="$use_openssl/lib/libcrypto.a"
fi
;;
*) *)
DNS_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto" DNS_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto"
;; ;;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment