From: Guenter Knauf <fuankg@apache.org>
Date: Mon, 31 Dec 2007 18:18:03 +0000 (+0000)
Subject: fixed comment, added comment, added logic to build mod_ssl by default if USE_STDSOCKE... 
X-Git-Tag: 2.2.7~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81344dd3d4e4b3f1fa42b861d4cdb7b9e9f10ac0;p=thirdparty%2Fapache%2Fhttpd.git

fixed comment, added comment, added logic to build mod_ssl by default if USE_STDSOCKETS is defined;
updated manual NetWare OpenSSL build section.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@607762 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/platform/netware.xml b/docs/manual/platform/netware.xml
index f5f2698bf74..898fcc48fed 100644
--- a/docs/manual/platform/netware.xml
+++ b/docs/manual/platform/netware.xml
@@ -615,17 +615,10 @@
       steps:</p>
 
       <ul>
-          <li>Download the latest NetWare patch for OpenSSL from the 
-          <a href="http://www.openssl.org/contrib/">OpenSSL Contribution</a>
-          page.</li>
-
-          <li>Download the corresponding OpenSSL source code from the
+          <li>Download the recent OpenSSL 0.9.8 release source code from the
           <a href="http://www.openssl.org/source/">OpenSSL Source</a>
-          page.</li>
-
-          <li>At the root of the OpenSSL source directory, apply the NetWare 
-          patch using the "patch" utility, for example:
-          <example>patch -p 1 -i netwarepatch-0.9.7g.diff</example></li>
+          page (older 0.9.7 versions need to be patched and are therefore not
+          recommended).</li>
 
           <li>Edit the file <code>NetWare/set_env.bat</code> and modify any 
           tools and utilities paths so that they correspond to your build 
@@ -634,14 +627,25 @@
           <li>From the root of the OpenSSL source directory, run the following
           scripts:
           <example>
-              Netware/set_env netware-libc<br />
-              Netware/build netware-libc
-          </example></li>
+              Netware\set_env netware-libc<br />
+              Netware\build netware-libc
+          </example>
+          For performance reasons you should enable to build with ASM code.
+          Download NASM from the <a href="http://nasm.sourceforge.net/">SF site</a>.
+          Then configure OpenSSL to use ASM code: 
+          <example>
+              Netware\build netware-libc nw-nasm enable-mdc2 enable-md5
+          </example>
+          Warning: dont use the CodeWarrior Assembler - it produces broken code!
+          </li>
 
           <li>Before building Apache, set the environment variable
           <code>OSSLSDK</code> to the full path to the root of the openssl
-          source code directory.
-          <example>Set OSSLSDK=d:\openssl-0.9.7x</example></li>
+          source code directory, and set WITH_MOD_SSL to 1.
+          <example>
+              Set OSSLSDK=d:\openssl-0.9.8x<br />
+              Set WITH_MOD_SSL=1
+          </example></li>
 
       </ul>
 
diff --git a/modules/NWGNUmakefile b/modules/NWGNUmakefile
index b7bc80b1a39..76d018d2cfa 100644
--- a/modules/NWGNUmakefile
+++ b/modules/NWGNUmakefile
@@ -3,6 +3,13 @@
 #
 # To build with exerimental modules set the environment 
 #  variable EXPERIMENTAL=1
+# To build with the mod_ssl module set the environment
+#  variable WITH_MOD_SSL=1
+
+# If USE_STDSOCKETS is defined we allways build mod_ssl
+ifdef USE_STDSOCKETS
+WITH_MOD_SSL=1
+endif
 
 SUBDIRS = \
 	aaa \
@@ -26,8 +33,8 @@ SUBDIRS += ldap \
 	$(EOLIST)
 endif
 
-# If OSSLSDK has been defined then build the mod_ssl module
-ifndef USE_STDSOCKETS
+# If WITH_MOD_SSL and OSSLSDK have been defined then build the mod_ssl module
+ifdef WITH_MOD_SSL
 ifneq "$(OSSLSDK)" ""
 SUBDIRS += ssl \
 	$(EOLIST)