diff options
| author | ylavic <ylavic@13f79535-47bb-0310-9956-ffa450edef68> | 2018-06-12 21:33:39 +0000 |
|---|---|---|
| committer | ylavic <ylavic@13f79535-47bb-0310-9956-ffa450edef68> | 2018-06-12 21:33:39 +0000 |
| commit | b85edf4329789a10c744d23e87ae78afa4bb3550 (patch) | |
| tree | bff5b2e7e9c5115ee7f2549a6f8486c8bf645df2 /build | |
| parent | 71eced3a19109e035dc53d01368f0ec568851be9 (diff) | |
| download | libapr-b85edf4329789a10c744d23e87ae78afa4bb3550.tar.gz | |
apr_crypto: follow up to r1833359: export full <lib>_LDFLAGS.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@1833425 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build')
| -rw-r--r-- | build/crypto.m4 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/build/crypto.m4 b/build/crypto.m4 index c92948510..d4719b34f 100644 --- a/build/crypto.m4 +++ b/build/crypto.m4 @@ -132,7 +132,7 @@ AC_DEFUN([APU_CHECK_CRYPTO_OPENSSL], [ dnl Since we have already done the AC_CHECK_LIB tests, if we have it, dnl we know the library is there. if test "$apu_have_openssl" = "1"; then - APR_ADDTO(LDADD_crypto_openssl, [$openssl_LDFLAGS -lssl -lcrypto]) + APR_ADDTO(LDADD_crypto_openssl, [$openssl_LDFLAGS -lcrypto]) apu_have_crypto=1 AC_MSG_CHECKING([for const input buffers in OpenSSL]) @@ -161,8 +161,8 @@ AC_DEFUN([APU_CHECK_CRYPTO_OPENSSL], [ LDFLAGS="$old_ldflags" if test "$apu_have_openssl" = "1"; then - APR_ADDTO(APRUTIL_EXPORT_LIBS, [-lcrypto]) - APR_ADDTO(LIBS, [-lcrypto]) + APR_ADDTO(APRUTIL_EXPORT_LIBS, [$LDADD_crypto_openssl]) + APR_ADDTO(LIBS, [$LDADD_crypto_openssl]) fi ]) @@ -242,8 +242,8 @@ AC_DEFUN([APU_CHECK_CRYPTO_NSS], [ LDFLAGS="$old_ldflags" if test "$apu_have_nss" = "1"; then - APR_ADDTO(APRUTIL_EXPORT_LIBS, [-lnspr4 -lnss3]) - APR_ADDTO(LIBS, [-lnspr4 -lnss3]) + APR_ADDTO(APRUTIL_EXPORT_LIBS, [$LDADD_crypto_nss]) + APR_ADDTO(LIBS, [$LDADD_crypto_nss]) fi ]) @@ -303,8 +303,8 @@ AC_DEFUN([APU_CHECK_CRYPTO_COMMONCRYPTO], [ LDFLAGS="$old_ldflags" if test "$apu_have_commoncrypto" = "1"; then - APR_ADDTO(APRUTIL_EXPORT_LIBS, [-lcrypto]) - APR_ADDTO(LIBS, [-lcrypto]) + APR_ADDTO(APRUTIL_EXPORT_LIBS, [$LDADD_crypto_commoncrypto]) + APR_ADDTO(LIBS, [$LDADD_crypto_commoncrypto]) fi ]) |