From: William A. Rowe Jr <wrowe@apache.org>
Date: Thu, 6 Jul 2006 18:07:03 +0000 (+0000)
Subject:   Update the instructions slightly for openssl and zlib based on 2.2.0
X-Git-Tag: 2.3.0~2295
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59655fa606a73b32f9318ad849e21233b6945020;p=thirdparty%2Fapache%2Fhttpd.git

  Update the instructions slightly for openssl and zlib based on 2.2.0
  and later builds of httpd on windows.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@419635 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/platform/win_compiling.xml b/docs/manual/platform/win_compiling.xml
index 8f5a9fbf18a..688eaa7f266 100644
--- a/docs/manual/platform/win_compiling.xml
+++ b/docs/manual/platform/win_compiling.xml
@@ -136,30 +136,38 @@
         >http://www.openssl.org/source/</a>, in order to compile <module>mod_ssl</module>
         or the abs project (<code>ab.exe</code> with SSL support.) To prepare OpenSSL
         for both <code>release</code> and <code>debug</code> builds of Apache, and
-        disable the patent protected features in 0.9.7,  you might use the following
+        disable the patent protected features in OpenSSL,  you might use the following
         build commands:</p>
 
         <example>
           perl Configure VC-WIN32<br />
           perl util\mkfiles.pl &gt;MINFO<br />
-          perl util\mk1mf.pl dll no-asm no-mdc2 no-rc5 no-idea VC-WIN32 &gt;makefile<br />
+          perl util\mk1mf.pl dll no-asm no-mdc2 no-rc5 no-idea VC-WIN32 &gt;makefile.rel<br />
           perl util\mk1mf.pl dll debug no-asm no-mdc2 no-rc5 no-idea VC-WIN32 &gt;makefile.dbg<br />
           perl util\mkdef.pl 32 libeay no-asm no-mdc2 no-rc5 no-idea &gt;ms\libeay32.def<br />
           perl util\mkdef.pl 32 ssleay no-asm no-mdc2 no-rc5 no-idea &gt;ms\ssleay32.def<br />
-          nmake<br />
+          nmake -f makefile.rel<br />
           nmake -f makefile.dbg
         </example>
 
+        <p>Note; you can use the scripts in the <code>ms\</code> subdirectory, however,
+        it's rather tricky to force <code>ms\do_masm.bat</code>, for example, to perform
+        the patent encumberances as mentioned above.  Patches to add the $* argument list
+        to the appropriate .bat lines in these scripts aren't incorporated, thus far.</p>
       </li>
 
       <li>
-        <p>[Optional] zlib sources (for <module>mod_deflate</module>)</p>
+        <p>[Optional] zlib library (for <module>mod_deflate</module>)</p>
         <p>Zlib must be installed into a <code>srclib</code> subdirectory named
-        <code>zlib</code>, however those sources need not be compiled. The build system
-        will compile the compression sources directly into the <module>mod_deflate</module>
-        module. Zlib can be obtained from <a href="http://www.gzip.org/zlib/"
-        >http://www.gzip.org/zlib/</a> -- <module>mod_deflate</module> is
-        confirmed to build correctly with version 1.1.4.</p>
+        <code>zlib</code>.  This must be built in-place.  Zlib can be obtained 
+        from <a href="http://www.zlib.net/">http://www.zlib.net/</a> -- the
+        <module>mod_deflate</module> is confirmed to work correctly with 
+        version 1.2.3.</p>
+
+        <example>
+          nmake -f win32\Makefile.msc<br />
+          nmake -f win32\Makefile.msc test
+        </example>
       </li>
 
     </ul>