You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@serf.apache.org by as...@apache.org on 2017/08/19 09:31:17 UTC

svn commit: r1805496 - /serf/trunk/SConstruct

Author: astieger
Date: Sat Aug 19 09:31:17 2017
New Revision: 1805496

URL: http://svn.apache.org/viewvc?rev=1805496&view=rev
Log:
Follow-up to r1805462, more OpenSSL 1.1/1.0 fixes

* SConstruct: improve OPENSSL_malloc_init detection

Modified:
    serf/trunk/SConstruct

Modified: serf/trunk/SConstruct
URL: http://svn.apache.org/viewvc/serf/trunk/SConstruct?rev=1805496&r1=1805495&r2=1805496&view=diff
==============================================================================
--- serf/trunk/SConstruct (original)
+++ serf/trunk/SConstruct Sat Aug 19 09:31:17 2017
@@ -454,10 +454,7 @@ if not conf.CheckFunc('X509_STORE_get0_p
   env.Append(CPPDEFINES=['SERF_NO_SSL_X509_STORE_WRAPPERS'])
 if conf.CheckFunc('CRYPTO_set_locking_callback'):
   env.Append(CPPDEFINES=['SERF_HAVE_SSL_LOCKING_CALLBACKS'])
-if conf.CheckFunc('OPENSSL_malloc_init'):
-  env.Append(CPPDEFINES=['SERF_HAVE_OPENSSL_MALLOC_INIT'])
-# In OpenSSL 1.1.x, OPENSSL_malloc_init is a function macro
-if conf.CheckDeclaration('OPENSSL_malloc_init()'):
+if conf.CheckFunc('OPENSSL_malloc_init', '#include <openssl/crypto.h>'):
   env.Append(CPPDEFINES=['SERF_HAVE_OPENSSL_MALLOC_INIT'])
 if conf.CheckFunc('SSL_set_alpn_protos'):
   env.Append(CPPDEFINES=['SERF_HAVE_OPENSSL_ALPN'])