[cpp-msbuild] 03/03: CPPXT-137 Support OpenSSL 1.1.1

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository cpp-msbuild.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-msbuild.git;a=commit;h=c428b303967af77a5f09c1900c6ffb83ff33f109

commit c428b303967af77a5f09c1900c6ffb83ff33f109
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Oct 13 15:07:26 2018 +0100

    CPPXT-137 Support OpenSSL 1.1.1
    
    https://issues.shibboleth.net/jira/browse/CPPXT-137
    
    This requires different changed to the distribution prior to the
    build.
    
    https://wiki.shibboleth.net/confluence/display/SP3/WindowsBuild#WindowsBuild-Preconditions
---
 dependencies/dependency.make | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dependencies/dependency.make b/dependencies/dependency.make
index 2b25b07..4d49dc4 100644
--- a/dependencies/dependency.make
+++ b/dependencies/dependency.make
@@ -178,15 +178,15 @@ $(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)\include\openssl\opensslconf.h:
 $(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)Debug\include\openssl\opensslconf.h: 
 	nmake /f dependency.make openssl-clean-configure openssl-debug-configure openssl-build
 
-openssl-release-configure: openssl-test $(ROOT_DIR)\$(OPENSSL_DIR)\ConfigureR
+openssl-release-configure: openssl-test
 	title Build OpenSSL $(VSCMD_ARG_TGT_ARCH) Release
 	cd $(ROOT_DIR)\$(OPENSSL_DIR)
-	$(PERL) ConfigureR VC-$(OpenSSLName) --prefix=$(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)
+	$(PERL) Configure VC-$(OpenSSLName) --prefix=$(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)
 
-openssl-debug-configure: openssl-test $(ROOT_DIR)\$(OPENSSL_DIR)\ConfigureD
+openssl-debug-configure: openssl-test
 	title Build OpenSSL $(VSCMD_ARG_TGT_ARCH) Debug
 	cd $(ROOT_DIR)\$(OPENSSL_DIR)
-	$(PERL) ConfigureD debug-VC-$(OpenSSLName) --prefix=$(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)Debug
+	$(PERL) Configure debug-VC-$(OpenSSLName)D --prefix=$(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)Debug
 
 openssl-build: $(ROOT_DIR)\$(OPENSSL_DIR)\makefile
 	cd $(ROOT_DIR)\$(OPENSSL_DIR)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.