From: Bradley Nicholes <bnicholes@apache.org>
Date: Mon, 18 Apr 2005 19:54:33 +0000 (+0000)
Subject: Link to the correct socket library depending on which one is selected
X-Git-Tag: 2.1.5~170
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93e638300b205ecd4b5cc7c55461196f26a0d9cd;p=thirdparty%2Fapache%2Fhttpd.git

Link to the correct socket library depending on which one is selected

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

diff --git a/modules/dav/fs/NWGNUmakefile b/modules/dav/fs/NWGNUmakefile
index d4307a76738..3e596613fbc 100644
--- a/modules/dav/fs/NWGNUmakefile
+++ b/modules/dav/fs/NWGNUmakefile
@@ -219,10 +219,15 @@ FILES_nlm_Ximports = \
 	@libc.imp \
 	@$(APR)/aprlib.imp \
 	@httpd.imp \
-	@ws2nlm.imp \
 	@../main/dav.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/metadata/NWGNUuniqueid b/modules/metadata/NWGNUuniqueid
index 3928d319523..699ac227c64 100644
--- a/modules/metadata/NWGNUuniqueid
+++ b/modules/metadata/NWGNUuniqueid
@@ -208,9 +208,14 @@ FILES_nlm_Ximports = \
 	@$(APR)/aprlib.imp \
 	@$(NWOS)/httpd.imp \
 	@libc.imp \
-	@ws2nlm.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/NWGNUproxy b/modules/proxy/NWGNUproxy
index cbed9d17050..ac36e50beab 100644
--- a/modules/proxy/NWGNUproxy
+++ b/modules/proxy/NWGNUproxy
@@ -212,9 +212,14 @@ FILES_nlm_Ximports = \
 	@$(APR)/aprlib.imp \
 	@$(NWOS)/httpd.imp \
 	@libc.imp \
-	@ws2nlm.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 88372f68137..3d65d706c43 100644
--- a/modules/proxy/NWGNUproxyajp
+++ b/modules/proxy/NWGNUproxyajp
@@ -214,7 +214,6 @@ FILES_nlm_Ximports = \
 	@$(APR)/aprlib.imp \
 	@$(NWOS)/httpd.imp \
 	@libc.imp \
-	@ws2nlm.imp \
 	proxy_module \
 	proxy_hook_scheme_handler \
 	proxy_hook_canon_handler \
@@ -225,6 +224,12 @@ FILES_nlm_Ximports = \
 	ap_proxy_ssl_val \
 	$(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 950f2d4cc73..5b93cac8949 100644
--- a/modules/proxy/NWGNUproxybalancer
+++ b/modules/proxy/NWGNUproxybalancer
@@ -211,7 +211,6 @@ FILES_nlm_Ximports = \
 	@$(APR)/aprlib.imp \
 	@$(NWOS)/httpd.imp \
 	@libc.imp \
-	@ws2nlm.imp \
 	proxy_module \
 	proxy_hook_scheme_handler \
 	proxy_hook_canon_handler \
@@ -222,6 +221,12 @@ FILES_nlm_Ximports = \
 	ap_proxy_ssl_disable \
 	$(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 b2c99ba9d92..c8a1bd846dd 100644
--- a/modules/proxy/NWGNUproxyftp
+++ b/modules/proxy/NWGNUproxyftp
@@ -211,7 +211,6 @@ FILES_nlm_Ximports = \
 	@$(APR)/aprlib.imp \
 	@$(NWOS)/httpd.imp \
 	@libc.imp \
-	@ws2nlm.imp \
 	proxy_module \
 	proxy_hook_scheme_handler \
 	proxy_hook_canon_handler \
@@ -219,6 +218,12 @@ FILES_nlm_Ximports = \
 	ap_proxy_ssl_disable \
 	$(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 73042fda137..bf4f870123f 100644
--- a/modules/proxy/NWGNUproxyhtp
+++ b/modules/proxy/NWGNUproxyhtp
@@ -211,7 +211,6 @@ FILES_nlm_Ximports = \
 	@$(APR)/aprlib.imp \
 	@$(NWOS)/httpd.imp \
 	@libc.imp \
-	@ws2nlm.imp \
 	proxy_module \
 	proxy_hook_scheme_handler \
 	proxy_hook_canon_handler \
@@ -220,6 +219,12 @@ FILES_nlm_Ximports = \
 	ap_proxy_ssl_disable \
 	$(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/support/NWGNUlogres b/support/NWGNUlogres
index 023c8e44da3..982cdb78b1f 100644
--- a/support/NWGNUlogres
+++ b/support/NWGNUlogres
@@ -211,9 +211,14 @@ FILE_nlm_copyright =
 FILES_nlm_Ximports = \
 	@$(APR)/aprlib.imp \
 	@libc.imp \
-	@ws2nlm.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
 #