moved socket type string to build/NWGNUenvironment.inc.

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

diff --git a/NWGNUmakefile b/NWGNUmakefile
index 0cf5e5cb102da0af6e09ffcd27048ca6b7ee1078..3b5fb3530433efdb1eb80f7809c5e1b44e7160e6 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -120,11 +120,6 @@ NLM_NAME   = Apache2
 # This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
-ifdef USE_STDSOCKETS
-VERSION_SKT = (BSDSOCK)
-else
-VERSION_SKT = (WINSOCK)
-endif
 NLM_DESCRIPTION        = Apache Web Server $(VERSION_STR) $(VERSION_SKT)
 
 #

diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index 106b82b2a2e494f3e7d07c729173664b1e85618c..b65ad9b96c5000d9f326fed357812b460d8908d1 100644 (file)
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -111,10 +111,10 @@ endif
 #
 
 # MetroWerks NLM tools
-CC             = mwccnlm
-CPP            = mwccnlm
+CC     = mwccnlm
+CPP    = mwccnlm
 LINK   = mwldnlm
-LIB            = mwldnlm -type library -w nocmdline
+LIB    = mwldnlm -type library -w nocmdline
 
 ifdef IPV6
 ifndef USE_STDSOCKETS
@@ -132,12 +132,18 @@ ifneq "$(ZLIBSDK)" ""
 INCDIRS := $(INCDIRS);$(ZLIBSDK)
 endif
 
-DEFINES                = -DNETWARE 
+DEFINES        = -DNETWARE 
 ifndef USE_STDSOCKETS
-DEFINES += -DUSE_WINSOCK
+DEFINES        += -DUSE_WINSOCK
 endif
 ifndef DEBUG
-DEFINES += -DNDEBUG
+DEFINES        += -DNDEBUG
+endif
+
+ifdef USE_STDSOCKETS
+VERSION_SKT = (BSDSOCK)
+else
+VERSION_SKT = (WINSOCK)
 endif
 
 #