diff options
| author | Gregg Lewis Smith <gsmith@apache.org> | 2017-04-20 20:01:47 +0000 |
|---|---|---|
| committer | Gregg Lewis Smith <gsmith@apache.org> | 2017-04-20 20:01:47 +0000 |
| commit | 6cff61b7d40009a5daaff8f1dbe285a2328e6f89 (patch) | |
| tree | d75307008b1ce390315f6c3767e4c97514d74221 /Makefile.win | |
| parent | 9aa5af816df6d40cbc45e890b802f50e0be629b7 (diff) | |
| download | httpd-6cff61b7d40009a5daaff8f1dbe285a2328e6f89.tar.gz | |
fix makefile.win breakage
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1792143 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.win')
| -rw-r--r-- | Makefile.win | 47 |
1 files changed, 22 insertions, 25 deletions
diff --git a/Makefile.win b/Makefile.win index 751e8f93d7..8f10c0aad4 100644 --- a/Makefile.win +++ b/Makefile.win @@ -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 .. |