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 d4307a76738cb28f6914f75a4b990dc13dadabf6..3e596613fbc9be1f4344933569e94c97748d23e9 100644 (file)
--- 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 3928d31952314fe7ab9daef0102c37e0b91c94ef..699ac227c6471cedeede7c17e720d934fb521b28 100644 (file)
--- 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 cbed9d170505b6cb169376e3fb32d34810adb762..ac36e50beab5d886ad6c92c37f0bf07826b11cc7 100644 (file)
--- 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 88372f681373ab4c55e68816d2a6463043437971..3d65d706c43a36bf1fd35f0ab7a88f68ab37d81d 100644 (file)
--- 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 950f2d4cc7347d8fa73b4a2578a09b0a5fe46054..5b93cac894946bcfc8068877a723bcc65e73faac 100644 (file)
--- 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 b2c99ba9d9223d842c87e81543b2b9732dcf9149..c8a1bd846dd5378b8612375a887f3f17b5d46ed7 100644 (file)
--- 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 73042fda13764086b2c32179979188164605b922..bf4f870123f1c1ebfbf6a815fc41059eb7173ea5 100644 (file)
--- 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 023c8e44da33209cbd04c6b02d9c8e9b9e114ee4..982cdb78b1f1350c679541ff8811f09386d8b6ba 100644 (file)
--- 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
 #