svn commit: r526617 - in /httpd/httpd/trunk: NWGNUmakefile build/NWGNUenvironment.inc

[fu...@apache.org]

Author: fuankg
Date: Sun Apr  8 16:21:00 2007
New Revision: 526617

URL: http://svn.apache.org/viewvc?view=rev&rev=526617
Log:
moved socket type string to build/NWGNUenvironment.inc.

Modified:
    httpd/httpd/trunk/NWGNUmakefile
    httpd/httpd/trunk/build/NWGNUenvironment.inc

Modified: httpd/httpd/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/NWGNUmakefile?view=diff&rev=526617&r1=526616&r2=526617
==============================================================================
--- httpd/httpd/trunk/NWGNUmakefile (original)
+++ httpd/httpd/trunk/NWGNUmakefile Sun Apr  8 16:21:00 2007
@@ -120,11 +120,6 @@
 # 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)
 
 #

Modified: httpd/httpd/trunk/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/NWGNUenvironment.inc?view=diff&rev=526617&r1=526616&r2=526617
==============================================================================
--- httpd/httpd/trunk/build/NWGNUenvironment.inc (original)
+++ httpd/httpd/trunk/build/NWGNUenvironment.inc Sun Apr  8 16:21:00 2007
@@ -111,10 +111,10 @@
 #
 
 # 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 @@
 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
 
 #