Revert r1728874:

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

The individual module Makefiles overwrite
FILES_nlm_Ximports instead of appending.
Furthermore, now we know which modules need
this import so we can set it specifically
for those.

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

diff --git a/modules/proxy/NWGNUmakefile b/modules/proxy/NWGNUmakefile
index b1f38e1ce001be422502ccb1ebc70a9a82491de2..f740d50e6324dafbde81c0bbf1e06a5415d8c3e4 100644 (file)
--- a/modules/proxy/NWGNUmakefile
+++ b/modules/proxy/NWGNUmakefile
@@ -228,12 +228,6 @@ 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 39b28410bb6428a6781435d34f3657b2ac012fa8..c9c07826533700077371059e2545638bdc07e66c 100644 (file)
--- a/modules/proxy/NWGNUproxy
+++ b/modules/proxy/NWGNUproxy
@@ -210,6 +210,12 @@ 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 3cbdc694afbe7cf930f140fb9e561495ee1fd89a..8ea3a6b55410b56a229357e9a98f9b8e7ca2dfad 100644 (file)
--- a/modules/proxy/NWGNUproxyajp
+++ b/modules/proxy/NWGNUproxyajp
@@ -213,6 +213,12 @@ 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 26727fd4727784fc672cfdb1fe8137d6100ff34f..76c91ee7f3dc119e2a7605a0f05c3cc65cd4c9f7 100644 (file)
--- a/modules/proxy/NWGNUproxybalancer
+++ b/modules/proxy/NWGNUproxybalancer
@@ -209,6 +209,12 @@ 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 01536124d0e7eead5e27a1aab7d6050b7375658b..d9786de0d200b128314adca0fd3b377f1c220379 100644 (file)
--- a/modules/proxy/NWGNUproxyexpress
+++ b/modules/proxy/NWGNUproxyexpress
@@ -208,6 +208,12 @@ 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 5e38e7598d70cf5d3eafe116b4979165a6a156ca..a7074626e531a86dd6560c340a8d15e0c1c611a3 100644 (file)
--- a/modules/proxy/NWGNUproxyfcgi
+++ b/modules/proxy/NWGNUproxyfcgi
@@ -210,6 +210,12 @@ 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 5d133ff2fa7e44071bbd2572bbc1fa5a3a4cba43..b82108a00d134dfacd1716d9ccf41314d186b54c 100644 (file)
--- a/modules/proxy/NWGNUproxyftp
+++ b/modules/proxy/NWGNUproxyftp
@@ -209,6 +209,12 @@ 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 78c7f69d25ea8be3d66f27f47f00d9758924b584..5f9e2b2b6ddd8864631dcb26dda11ac935633d32 100644 (file)
--- a/modules/proxy/NWGNUproxyhcheck
+++ b/modules/proxy/NWGNUproxyhcheck
@@ -209,6 +209,12 @@ 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 c79585b211e3fd6533191e9e5bc5c4f3bef7c267..83eff1135657ce9217a92d0919b55b4a7016f241 100644 (file)
--- a/modules/proxy/NWGNUproxyhtp
+++ b/modules/proxy/NWGNUproxyhtp
@@ -209,6 +209,12 @@ 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 b03280505d3dc706d661f5cd4cdc4fb297b0a5a6..d80968731cb02137b1986f04c4c089690260acf9 100644 (file)
--- a/modules/proxy/NWGNUproxyscgi
+++ b/modules/proxy/NWGNUproxyscgi
@@ -209,6 +209,12 @@ 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 5992ba4e46a768fd460e441a5ebf78bd9f56bfc8..a08a9efbb00796e1d1b5623191f56f5bbeb0610a 100644 (file)
--- a/modules/proxy/NWGNUserf
+++ b/modules/proxy/NWGNUserf
@@ -296,6 +296,12 @@ 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
 #