httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gsm...@apache.org
Subject svn commit: r1792143 - /httpd/httpd/branches/2.4.x/Makefile.win
Date Thu, 20 Apr 2017 20:01:47 GMT
Author: gsmith
Date: Thu Apr 20 20:01:47 2017
New Revision: 1792143

URL: http://svn.apache.org/viewvc?rev=1792143&view=rev
Log:
fix makefile.win breakage

Modified:
    httpd/httpd/branches/2.4.x/Makefile.win

Modified: httpd/httpd/branches/2.4.x/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/Makefile.win?rev=1792143&r1=1792142&r2=1792143&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/Makefile.win (original)
+++ httpd/httpd/branches/2.4.x/Makefile.win Thu Apr 20 20:01:47 2017
@@ -57,29 +57,6 @@ USEMAK=0
 USEDSW=1
 !ENDIF
 
-!IF EXIST("srclib\openssl")
-!IF "$(LONG)" == "Debug" && EXIST("srclib\openssl\out32dll.dbg\openssl.exe")
-SSLBIN=out32dll.dbg
-SSLAPP=out32dll.dbg
-SSLCRP=libeay32
-SSLLIB=ssleay32
-!ELSE
-!IF EXIST("srclib\openssl\libcrypto.lib")
-!MESSAGE Building with OpenSSL 1.1.0
-!MESSAGE 
-SSLBIN=.
-SSLAPP=apps
-SSLCRP=libcrypto
-SSLLIB=libssl
-SSLOPT=_HAVE_OSSL110=1
-!ELSE
-SSLBIN=out32dll
-SSLAPP=out32dll
-SSLCRP=libeay32
-SSLLIB=ssleay32
-!ENDIF
-!ENDIF
-
 # APU 1.6 (and up?)
 !IF EXIST("srclib\apr-util\xml\xml.mak")
 EXPAT=xml
@@ -132,6 +109,26 @@ UTILDIR=apr-util
 #
 
 !IF EXIST("srclib\openssl")
+!IF "$(LONG)" == "Debug" && EXIST("srclib\openssl\out32dll.dbg\openssl.exe")
+SSLBIN=out32dll.dbg
+SSLAPP=out32dll.dbg
+SSLCRP=libeay32
+SSLLIB=ssleay32
+!ELSEIF EXIST("srclib\openssl\libcrypto.lib")
+!MESSAGE Building with OpenSSL 1.1.0
+!MESSAGE 
+SSLBIN=.
+SSLAPP=apps
+SSLCRP=libcrypto
+SSLLIB=libssl
+SSLOPT=_HAVE_OSSL110=1
+!ELSE
+SSLBIN=out32dll
+SSLAPP=out32dll
+SSLCRP=libeay32
+SSLLIB=ssleay32
+!ENDIF
+
 
 _tryssl:
 !IF $(USEMAK) == 1
@@ -405,8 +402,8 @@ _build:
 	cd srclib\apr-util\$(EXPAT)
 	 $(MAKE) $(MAKEOPT) -f xml.mak             CFG="xml - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	cd $(EXPBCK)
-	 $(MAKE) $(MAKEOPT) -f aprutil.mak         CFG="aprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-	 $(MAKE) $(MAKEOPT) -f libaprutil.mak      CFG="libaprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+	 $(MAKE) $(MAKEOPT) $(SSLOPT) -f aprutil.mak         CFG="aprutil - Win32 $(LONG)" RECURSE=0
$(CTARGET)
+	 $(MAKE) $(MAKEOPT) $(SSLOPT) -f libaprutil.mak      CFG="libaprutil - Win32 $(LONG)" RECURSE=0
$(CTARGET)
 	cd ldap
 	 $(MAKE) $(MAKEOPT) -f apr_ldap.mak        CFG="apr_ldap - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	cd ..



Mime
View raw message