From f35128d2df0ec1c75c2d6f331d722075b23ceeb5 Mon Sep 17 00:00:00 2001 From: Rainer Jung Date: Mon, 8 Feb 2016 23:21:57 +0000 Subject: [PATCH] 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 --- modules/proxy/NWGNUmakefile | 6 ------ modules/proxy/NWGNUproxy | 6 ++++++ modules/proxy/NWGNUproxyajp | 6 ++++++ modules/proxy/NWGNUproxybalancer | 6 ++++++ modules/proxy/NWGNUproxyexpress | 6 ++++++ modules/proxy/NWGNUproxyfcgi | 6 ++++++ modules/proxy/NWGNUproxyftp | 6 ++++++ modules/proxy/NWGNUproxyhcheck | 6 ++++++ modules/proxy/NWGNUproxyhtp | 6 ++++++ modules/proxy/NWGNUproxyscgi | 6 ++++++ modules/proxy/NWGNUserf | 6 ++++++ 11 files changed, 60 insertions(+), 6 deletions(-) diff --git a/modules/proxy/NWGNUmakefile b/modules/proxy/NWGNUmakefile index b1f38e1ce0..f740d50e63 100644 --- 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 39b28410bb..c9c0782653 100644 --- 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 3cbdc694af..8ea3a6b554 100644 --- 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 26727fd472..76c91ee7f3 100644 --- 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 01536124d0..d9786de0d2 100644 --- 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 5e38e7598d..a7074626e5 100644 --- 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 5d133ff2fa..b82108a00d 100644 --- 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 78c7f69d25..5f9e2b2b6d 100644 --- 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 c79585b211..83eff11356 100644 --- 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 b03280505d..d80968731c 100644 --- 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 5992ba4e46..a08a9efbb0 100644 --- 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 # -- 2.50.1