Skip to content

Commit a2237d2

Browse files
wrowewrowe
committed
 New changes to win32 docs, regenerated git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@419669 13f79535-47bb-0310-9956-ffa450edef68
1 parent b0c3e71 commit a2237d2

2 files changed

Lines changed: 18 additions & 9 deletions

File tree

‎docs/manual/platform/win_compiling.html.en‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -132,29 +132,38 @@
132132
<code>openssl</code>, obtained from <a href="http://www.openssl.org/source/">http://www.openssl.org/source/</a>, in order to compile <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code>
133133
or the abs project (<code>ab.exe</code> with SSL support.) To prepare OpenSSL
134134
for both <code>release</code> and <code>debug</code> builds of Apache, and
135-
disable the patent protected features in 0.9.7, you might use the following
135+
disable the patent protected features in OpenSSL, you might use the following
136136
build commands:</p>
137137

138138
<div class="example"><p><code>
139139
perl Configure VC-WIN32<br />
140140
perl util\mkfiles.pl &gt;MINFO<br />
141-
perl util\mk1mf.pl dll no-asm no-mdc2 no-rc5 no-idea VC-WIN32 &gt;makefile<br />
141+
perl util\mk1mf.pl dll no-asm no-mdc2 no-rc5 no-idea VC-WIN32 &gt;makefile.rel<br />
142142
perl util\mk1mf.pl dll debug no-asm no-mdc2 no-rc5 no-idea VC-WIN32 &gt;makefile.dbg<br />
143143
perl util\mkdef.pl 32 libeay no-asm no-mdc2 no-rc5 no-idea &gt;ms\libeay32.def<br />
144144
perl util\mkdef.pl 32 ssleay no-asm no-mdc2 no-rc5 no-idea &gt;ms\ssleay32.def<br />
145-
nmake<br />
145+
nmake -f makefile.rel<br />
146146
nmake -f makefile.dbg
147147
</code></p></div>
148148

149+
<p>Note; you can use the scripts in the <code>ms\</code> subdirectory, however,
150+
it's rather tricky to force <code>ms\do_masm.bat</code>, for example, to perform
151+
the patent encumberances as mentioned above. Patches to add the $* argument list
152+
to the appropriate .bat lines in these scripts aren't incorporated, thus far.</p>
149153
</li>
150154

151155
<li>
152-
<p>[Optional] zlib sources (for <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code>)</p>
156+
<p>[Optional] zlib library (for <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code>)</p>
153157
<p>Zlib must be installed into a <code>srclib</code> subdirectory named
154-
<code>zlib</code>, however those sources need not be compiled. The build system
155-
will compile the compression sources directly into the <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code>
156-
module. Zlib can be obtained from <a href="http://www.gzip.org/zlib/">http://www.gzip.org/zlib/</a> -- <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> is
157-
confirmed to build correctly with version 1.1.4.</p>
158+
<code>zlib</code>. This must be built in-place. Zlib can be obtained
159+
from <a href="http://www.zlib.net/">http://www.zlib.net/</a> -- the
160+
<code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> is confirmed to work correctly with
161+
version 1.2.3.</p>
162+
163+
<div class="example"><p><code>
164+
nmake -f win32\Makefile.msc<br />
165+
nmake -f win32\Makefile.msc test
166+
</code></p></div>
158167
</li>
159168

160169
</ul>

‎docs/manual/platform/win_compiling.xml.ko‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="EUC-KR" ?>
22
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
33
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
4-
<!-- English Revision: 105989:395228 (outdated) -->
4+
<!-- English Revision: 105989:419635 (outdated) -->
55

66
<!--
77
Copyright 2004-2006 The Apache Software Foundation or its licensors,

0 commit comments

Comments
 (0)