Return-Path: 
 <cvs-return-25287-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: (qmail 83527 invoked from network); 6 Jul 2006 18:08:08 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 6 Jul 2006 18:08:08 -0000
Received: (qmail 63027 invoked by uid 500); 6 Jul 2006 18:08:07 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 62982 invoked by uid 500); 6 Jul 2006 18:08:07 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:cvs@httpd.apache.org>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 62971 invoked by uid 99); 6 Jul 2006 18:08:07 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Jul 2006 11:08:07 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Jul 2006 11:08:06 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 780A51A981A; Thu,  6 Jul 2006 11:07:46 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r419637 -
 /httpd/httpd/branches/2.2.x/docs/manual/platform/win_compiling.xml
Date: Thu, 06 Jul 2006 18:07:46 -0000
To: cvs@httpd.apache.org
From: wrowe@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060706180746.780A51A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: wrowe
Date: Thu Jul  6 11:07:45 2006
New Revision: 419637

URL: http://svn.apache.org/viewvc?rev=419637&view=rev
Log:

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

Backports: 419635

Modified:
    httpd/httpd/branches/2.2.x/docs/manual/platform/win_compiling.xml

Modified: httpd/httpd/branches/2.2.x/docs/manual/platform/win_compiling.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/platform/win_compiling.xml?rev=419637&r1=419636&r2=419637&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/platform/win_compiling.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/platform/win_compiling.xml Thu Jul  6 11:07:45 2006
@@ -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>