You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by yl...@apache.org on 2023/04/21 17:30:20 UTC
svn commit: r1909333 - in /apr/apr-util/branches/1.6.x: ./ build/crypto.m4
Author: ylavic
Date: Fri Apr 21 17:30:20 2023
New Revision: 1909333
URL: http://svn.apache.org/viewvc?rev=1909333&view=rev
Log:
Follow up to r1908503: restore INCLUDES setting.
Merges r1908749 from trunk.
Merges r1909332 from 1.7.x.
Submitted by: ylavic
Modified:
apr/apr-util/branches/1.6.x/ (props changed)
apr/apr-util/branches/1.6.x/build/crypto.m4
Propchange: apr/apr-util/branches/1.6.x/
------------------------------------------------------------------------------
Merged /apr/apr/trunk:r1908749
Merged /apr/apr-util/branches/1.7.x:r1909332
Modified: apr/apr-util/branches/1.6.x/build/crypto.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/build/crypto.m4?rev=1909333&r1=1909332&r2=1909333&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/build/crypto.m4 (original)
+++ apr/apr-util/branches/1.6.x/build/crypto.m4 Fri Apr 21 17:30:20 2023
@@ -107,6 +107,7 @@ AC_DEFUN([APU_CHECK_CRYPTO_OPENSSL], [
AC_CHECK_HEADERS(openssl/x509.h, [openssl_have_headers=1])
AC_CHECK_LIB(crypto, EVP_CIPHER_CTX_new, AC_CHECK_LIB(ssl, SSL_accept, [openssl_have_libs=1],,-lcrypto))
if test "$openssl_have_headers" = "1" && test "$openssl_have_libs" = "1"; then
+ APR_ADDTO(INCLUDES, [$openssl_CPPFLAGS])
apu_have_openssl=1
APR_ADDTO(APRUTIL_INCLUDES, [$openssl_CPPFLAGS])
APR_ADDTO(APRUTIL_LDFLAGS, [$openssl_LDFLAGS])