apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r661782 - /apr/apr-util/branches/1.3.x/Makefile.win
Date Fri, 30 May 2008 16:28:30 GMT
Author: wrowe
Date: Fri May 30 09:28:30 2008
New Revision: 661782

URL: http://svn.apache.org/viewvc?rev=661782&view=rev
Log:
Not part of trunk at the present time, this lives
over on the sandbox.

Backports: r661781

Modified:
    apr/apr-util/branches/1.3.x/Makefile.win

Modified: apr/apr-util/branches/1.3.x/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/Makefile.win?rev=661782&r1=661781&r2=661782&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/Makefile.win (original)
+++ apr/apr-util/branches/1.3.x/Makefile.win Fri May 30 09:28:30 2008
@@ -65,17 +65,10 @@
 API_PATH=..\apr-iconv
 APU_PATH=..\apr-util
 
-# Never build ssl by default, plus this needs work
-#
-#OPENSSL_DIR=..\openssl
-
 !MESSAGE ARCH        = $(ARCH)
 !MESSAGE APR_PATH    = $(APR_PATH)
 !MESSAGE API_PATH    = $(API_PATH)  (apr-iconv)
 !MESSAGE APU_PATH    = $(APU_PATH)  (apr-util)
-!IFDEF OPENSSL_DIR
-!MESSAGE OPENSSL_DIR = $(OPENSSL_DIR)  (openssl)
-!ENDIF
 !MESSAGE PREFIX      = $(PREFIX)  (install path)
 
 
@@ -298,81 +291,6 @@
 	copy $(APU_PATH)\ldap\$(ARCHPATH)\apr_ldap-1.pdb "$(PREFIX)\bin\" <.y
 	xcopy $(API_PATH)\$(ARCHPATH)\iconv\*.so  "$(PREFIX)\bin\iconv\" /d < .a
 	xcopy $(API_PATH)\$(ARCHPATH)\iconv\*.pdb "$(PREFIX)\bin\iconv\" /d < .a
-!IFDEF OPENSSL_DIR
-	copy $(OPENSSL_DIR)\$(SSLBIN)\openssl.exe	"$(PREFIX)\bin\" <.y
-	copy $(OPENSSL_DIR)\$(SSLBIN)\openssl.pdb	"$(PREFIX)\bin\" <.y
-	copy $(OPENSSL_DIR)\$(SSLBIN)\libeay32.dll	"$(PREFIX)\bin\" <.y
-	copy $(OPENSSL_DIR)\$(SSLBIN)\libeay32.pdb	"$(PREFIX)\bin\" <.y
-	copy $(OPENSSL_DIR)\$(SSLBIN)\ssleay32.dll	"$(PREFIX)\bin\" <.y
-	copy $(OPENSSL_DIR)\$(SSLBIN)\ssleay32.pdb	"$(PREFIX)\bin\" <.y
-	@if NOT EXIST "$(PREFIX)\conf\." mkdir "$(PREFIX)\conf"
-	copy $(OPENSSL_DIR)\apps\openssl.cnf "$(PREFIX)\conf\openssl.cnf" <.y
-	type << >> "$(PREFIX)\NOTICE.txt"
-
-  This binary distribution includes cryptographic software written by
-  Eric Young (eay@cryptsoft.com), software written by Tim Hudson 
-  (tjh@cryptsoft.com), and software developed by the OpenSSL Project 
-  for use in the OpenSSL Toolkit <http://www.openssl.org/>.
-<<
-	copy LICENSE + << + "$(OPENSSL_DIR)\LICENSE" "$(PREFIX)\LICENSE.txt" <.y
-
-For the libeay32.dll, ssleay32.dll and openssl.exe components:
-
-<<
-	copy << + $(OPENSSL_DIR)\NEWS "$(PREFIX)\OPENSSL-NEWS.txt" <.y
-
- Apache Portablity Runtime (APR) 1.3 Limited OpenSSL Distribution
-
- This binary distribution includes the minimal components of OpenSSL required
- to support aprutil 1.3 and later libraries from the Apache APR Project.
- (Details are listed in OPENSSL-README.txt.)  For the complete list of CHANGES
- to this and later versions of OpenSSL, please refer to the definative source,
- <http://www.openssl.org/news/changelog.html>, or see the CHANGES file in the
- full binary or source distribution package from <http://www.openssl.org/>.
-
- These OpenSSL binaries were built for distribution from the U.S. without 
- support for the patented encryption methods IDEA, MDC-2 or RC5.
-
---------------------------------------------------------------------------------
-<<
-	copy << + $(OPENSSL_DIR)\README "$(PREFIX)\OPENSSL-README.txt" <.y
-
- Apache Portablity Runtime APR-util Limited OpenSSL Distribution
-
- This binary installation of OpenSSL is a limited distribution of the
- files derived from the OpenSSL project:
-
-   LICENSE.txt (includes openssl LICENSE)
-   OPENSSL-NEWS.txt
-   OPENSSL-README.txt
-   conf\openssl.cnf
-   bin\libeay32.dll
-   bin\libeay32.pdb
-   bin\ssleay32.dll
-   bin\ssleay32.pdb
-   bin\openssl.exe
-   bin\openssl.pdb
-
- These are the minimal libraries and tools required to use the aprutil 1.3
- and later library releases distributed by the Apache APR project.  No library
- link files, headers or sources are distributed with this binary distribution.
- Please refer to the <http://www.openssl.org/> site for complete source or
- binary distributions.
-
- These OpenSSL binaries were built for distribution from the U.S. without 
- support for the patented encryption methods IDEA, MDC-2 or RC5.
-
- The Apache APR Project only supports the binary distribution of these files
- and development of the mod_ssl module.  We cannot provide support assistance
- for using or configuring the OpenSSL package or these modules.  Please refer
- all installation and configuration questions to the appropriate forum,
- such as the user supported lists, <http://apr.apache.org/mailing-lists.html> 
- the Apache APR Projects developer list or <http://www.openssl.org/support/> 
- the OpenSSL support page.
-
---------------------------------------------------------------------------------
-<<
-!ENDIF
 	del .y
 	del .a
 



Mime
View raw message