commit 0b321a3b00c574152b83fb71540fe006e17c9883
author Bert Huijben <rhuijben@apache.org> Thu Nov 09 11:53:05 2017 +0000
committer Bert Huijben <rhuijben@apache.org> Thu Nov 09 11:53:05 2017 +0000
tree 9826a811fcb81ca3dcc2d6d4cecf8090bfc9e20a
parent cf7ccc5f19cf28190505f6a8cca0444e2218e5d3

Merge r1814714 from trunk, which was accidentally already marked merged at branch creation

git-svn-id: https://svn.apache.org/repos/asf/serf/branches/1.3.x-r1814714@1814717 13f79535-47bb-0310-9956-ffa450edef68

SConstruct

diff --git a/SConstruct b/SConstruct
index 4358a23..8129a0b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -335,7 +335,6 @@
                LIBPATH=['$ZLIB'])
 
   # openssl
-  env.Append(LIBS=['libeay32.lib', 'ssleay32.lib'])
   if not env.get('SOURCE_LAYOUT', None):
     env.Append(CPPPATH=['$OPENSSL/include/openssl'],
                LIBPATH=['$OPENSSL/lib'])
@@ -345,6 +344,14 @@
   else:
     env.Append(CPPPATH=['$OPENSSL/inc32'],
                LIBPATH=['$OPENSSL/out32dll'])
+  conf = Configure(env)
+  if conf.CheckLib('libcrypto'):
+    # OpenSSL 1.1.0+
+    env.Append(LIBS=['libcrypto.lib', 'libssl.lib'])
+  else:
+    # Legacy OpenSSL
+    env.Append(LIBS=['libeay32.lib', 'ssleay32.lib'])
+  conf.Finish()
 else:
   if os.path.isdir(apr):
     apr = os.path.join(apr, 'bin', 'apr-1-config')