Author: markt
Date: Wed Oct 17 16:34:55 2018
New Revision: 1844126
URL: http://svn.apache.org/viewvc?rev=1844126&view=rev
Log:
Add option to build with OpenSSL 1.0.2 or 1.1.1
There is probably a better way to do this but this works.
Modified:
tomcat/native/trunk/native/NMAKEmakefile
Modified: tomcat/native/trunk/native/NMAKEmakefile
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/NMAKEmakefile?rev=1844126&r1=1844125&r2=1844126&view=diff
==============================================================================
--- tomcat/native/trunk/native/NMAKEmakefile (original)
+++ tomcat/native/trunk/native/NMAKEmakefile Wed Oct 17 16:34:55 2018
@@ -18,8 +18,9 @@
# NMAKEmakefile Master Tomcat Native makefile.
# Usage:
# APR_DECLARE_STATIC=1 Use static version of the APR
-# ENABLE_OCSP=1 Enable OpenSSL OCSP code
-# DEBUG=1 Build DEBUG version of TCN
+# ENABLE_OCSP=1 Enable OpenSSL OCSP code
+# OPENSSL_NEW_LIBS=1 Use new OpenSSL lib file names
+# DEBUG=1 Build DEBUG version of TCN
#
# Originally contributed by Mladen Turk <mturk redhat.com>
#
@@ -74,7 +75,11 @@ LFLAGS = $(LFLAGS) $(APR_LIB)
!IF DEFINED(WITH_FIPS)
LFLAGS = $(LFLAGS) libeayfips32.lib libeaycompat32.lib ssleay32.lib
/NODEFAULTLIB:LIBCMT
!ELSE
-LFLAGS = $(LFLAGS) libeay32.lib ssleay32.lib
+!IF DEFINED(OPENSSL_NEW_LIBS)
+LFLAGS = $(LFLAGS) libssl.lib libcrypto.lib crypt32.lib
+!ELSE
+LFLAGS = $(LFLAGS) libeay32.lib ssleay32.lib
+!ENDIF
!ENDIF
CFLAGS = $(CFLAGS) -DZLIB_WINAPI -DNO_IDEA -DNO_RC5 -DNO_MDC2
-DOPENSSL_NO_IDEA \
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
