From: Rainer Jung <rjung@apache.org>
Date: Sat, 6 Feb 2016 19:13:42 +0000 (+0000)
Subject: Netware: pull up ws2nlm imports from all (most)
X-Git-Tag: 2.5.0-alpha~2182
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc4ce52b9fd62dad25d0c22d8a6cb2f454fd03d5;p=thirdparty%2Fapache%2Fhttpd.git

Netware: pull up ws2nlm imports from all (most)
proxy module makefiles to the main proxy makefile.


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

diff --git a/modules/proxy/NWGNUmakefile b/modules/proxy/NWGNUmakefile
index f740d50e632..b1f38e1ce00 100644
--- a/modules/proxy/NWGNUmakefile
+++ b/modules/proxy/NWGNUmakefile
@@ -228,6 +228,12 @@ FILE_nlm_copyright =
 FILES_nlm_Ximports = \
 	$(EOLIST)
 
+# Don't link with Winsock if standard sockets are being used
+ifndef USE_STDSOCKETS
+FILES_nlm_Ximports += @ws2nlm.imp \
+	$(EOLIST)
+endif
+
 #
 # Any symbols exported to here
 #
diff --git a/modules/proxy/NWGNUproxy b/modules/proxy/NWGNUproxy
index c9c07826533..39b28410bb6 100644
--- a/modules/proxy/NWGNUproxy
+++ b/modules/proxy/NWGNUproxy
@@ -210,12 +210,6 @@ FILES_nlm_Ximports = \
 	@libc.imp \
 	$(EOLIST)
 
-# Don't link with Winsock if standard sockets are being used
-ifndef USE_STDSOCKETS
-FILES_nlm_Ximports += @ws2nlm.imp \
-	$(EOLIST)
-endif
-
 #
 # Any symbols exported to here
 #
diff --git a/modules/proxy/NWGNUproxyajp b/modules/proxy/NWGNUproxyajp
index 8ea3a6b5541..3cbdc694afb 100644
--- a/modules/proxy/NWGNUproxyajp
+++ b/modules/proxy/NWGNUproxyajp
@@ -213,12 +213,6 @@ FILES_nlm_Ximports = \
 	@libc.imp \
 	$(EOLIST)
 
-# Don't link with Winsock if standard sockets are being used
-ifndef USE_STDSOCKETS
-FILES_nlm_Ximports += @ws2nlm.imp \
-	$(EOLIST)
-endif
-
 #
 # Any symbols exported to here
 #
diff --git a/modules/proxy/NWGNUproxybalancer b/modules/proxy/NWGNUproxybalancer
index 76c91ee7f3d..26727fd4727 100644
--- a/modules/proxy/NWGNUproxybalancer
+++ b/modules/proxy/NWGNUproxybalancer
@@ -209,12 +209,6 @@ FILES_nlm_Ximports = \
 	@libc.imp \
 	$(EOLIST)
 
-# Don't link with Winsock if standard sockets are being used
-ifndef USE_STDSOCKETS
-FILES_nlm_Ximports += @ws2nlm.imp \
-	$(EOLIST)
-endif
-
 #
 # Any symbols exported to here
 #
diff --git a/modules/proxy/NWGNUproxyexpress b/modules/proxy/NWGNUproxyexpress
index d9786de0d20..01536124d0e 100644
--- a/modules/proxy/NWGNUproxyexpress
+++ b/modules/proxy/NWGNUproxyexpress
@@ -208,12 +208,6 @@ FILES_nlm_Ximports = \
 	@libc.imp \
 	$(EOLIST)
 
-# Don't link with Winsock if standard sockets are being used
-ifndef USE_STDSOCKETS
-FILES_nlm_Ximports += @ws2nlm.imp \
-	$(EOLIST)
-endif
-
 #
 # Any symbols exported to here
 #
diff --git a/modules/proxy/NWGNUproxyfcgi b/modules/proxy/NWGNUproxyfcgi
index a7074626e53..5e38e7598d7 100644
--- a/modules/proxy/NWGNUproxyfcgi
+++ b/modules/proxy/NWGNUproxyfcgi
@@ -210,12 +210,6 @@ FILES_nlm_Ximports = \
 	@libc.imp \
 	$(EOLIST)
 
-# Don't link with Winsock if standard sockets are being used
-ifndef USE_STDSOCKETS
-FILES_nlm_Ximports += @ws2nlm.imp \
-	$(EOLIST)
-endif
-
 #
 # Any symbols exported to here
 #
diff --git a/modules/proxy/NWGNUproxyftp b/modules/proxy/NWGNUproxyftp
index b82108a00d1..5d133ff2fa7 100644
--- a/modules/proxy/NWGNUproxyftp
+++ b/modules/proxy/NWGNUproxyftp
@@ -209,12 +209,6 @@ FILES_nlm_Ximports = \
 	@libc.imp \
 	$(EOLIST)
 
-# Don't link with Winsock if standard sockets are being used
-ifndef USE_STDSOCKETS
-FILES_nlm_Ximports += @ws2nlm.imp \
-	$(EOLIST)
-endif
-
 #
 # Any symbols exported to here
 #
diff --git a/modules/proxy/NWGNUproxyhcheck b/modules/proxy/NWGNUproxyhcheck
index 5f9e2b2b6dd..78c7f69d25e 100644
--- a/modules/proxy/NWGNUproxyhcheck
+++ b/modules/proxy/NWGNUproxyhcheck
@@ -209,12 +209,6 @@ FILES_nlm_Ximports = \
 	@libc.imp \
 	$(EOLIST)
 
-# Don't link with Winsock if standard sockets are being used
-ifndef USE_STDSOCKETS
-FILES_nlm_Ximports += @ws2nlm.imp \
-	$(EOLIST)
-endif
-
 #
 # Any symbols exported to here
 #
diff --git a/modules/proxy/NWGNUproxyhtp b/modules/proxy/NWGNUproxyhtp
index 83eff113565..c79585b211e 100644
--- a/modules/proxy/NWGNUproxyhtp
+++ b/modules/proxy/NWGNUproxyhtp
@@ -209,12 +209,6 @@ FILES_nlm_Ximports = \
 	@libc.imp \
 	$(EOLIST)
 
-# Don't link with Winsock if standard sockets are being used
-ifndef USE_STDSOCKETS
-FILES_nlm_Ximports += @ws2nlm.imp \
-	$(EOLIST)
-endif
-
 #
 # Any symbols exported to here
 #
diff --git a/modules/proxy/NWGNUproxyscgi b/modules/proxy/NWGNUproxyscgi
index d80968731cb..b03280505d3 100644
--- a/modules/proxy/NWGNUproxyscgi
+++ b/modules/proxy/NWGNUproxyscgi
@@ -209,12 +209,6 @@ FILES_nlm_Ximports = \
 	@libc.imp \
 	$(EOLIST)
 
-# Don't link with Winsock if standard sockets are being used
-ifndef USE_STDSOCKETS
-FILES_nlm_Ximports += @ws2nlm.imp \
-	$(EOLIST)
-endif
-
 #
 # Any symbols exported to here
 #
diff --git a/modules/proxy/NWGNUserf b/modules/proxy/NWGNUserf
index a08a9efbb00..5992ba4e46a 100644
--- a/modules/proxy/NWGNUserf
+++ b/modules/proxy/NWGNUserf
@@ -296,12 +296,6 @@ FILES_nlm_Ximports = \
 	GetSuperHighResolutionTimer \
 	$(EOLIST)
 
-# Don't link with Winsock if standard sockets are being used
-ifndef USE_STDSOCKETS
-FILES_nlm_Ximports += @ws2nlm.imp \
-	$(EOLIST)
-endif
-
 #
 # Any symbols exported to here
 #