serf-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1814717 - /serf/branches/1.3.x-r1814714/SConstruct
Date Thu, 09 Nov 2017 11:53:05 GMT
Author: rhuijben
Date: Thu Nov  9 11:53:05 2017
New Revision: 1814717

URL: http://svn.apache.org/viewvc?rev=1814717&view=rev
Log:
Merge r1814714 from trunk, which was accidentally already marked merged at branch creation

Modified:
    serf/branches/1.3.x-r1814714/SConstruct

Modified: serf/branches/1.3.x-r1814714/SConstruct
URL: http://svn.apache.org/viewvc/serf/branches/1.3.x-r1814714/SConstruct?rev=1814717&r1=1814716&r2=1814717&view=diff
==============================================================================
--- serf/branches/1.3.x-r1814714/SConstruct (original)
+++ serf/branches/1.3.x-r1814714/SConstruct Thu Nov  9 11:53:05 2017
@@ -335,7 +335,6 @@ if sys.platform == 'win32':
                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 @@ if sys.platform == 'win32':
   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')



Mime
View raw message