You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by bn...@apache.org on 2005/04/18 21:54:37 UTC
svn commit: r161791 - in httpd/httpd/trunk: modules/dav/fs/NWGNUmakefile
modules/metadata/NWGNUuniqueid modules/proxy/NWGNUproxy
modules/proxy/NWGNUproxyajp modules/proxy/NWGNUproxybalancer
modules/proxy/NWGNUproxyftp modules/proxy/NWGNUproxyhtp support/NWGNUlogres
Author: bnicholes
Date: Mon Apr 18 12:54:33 2005
New Revision: 161791
URL: http://svn.apache.org/viewcvs?view=rev&rev=161791
Log:
Link to the correct socket library depending on which one is selected
Modified:
httpd/httpd/trunk/modules/dav/fs/NWGNUmakefile
httpd/httpd/trunk/modules/metadata/NWGNUuniqueid
httpd/httpd/trunk/modules/proxy/NWGNUproxy
httpd/httpd/trunk/modules/proxy/NWGNUproxyajp
httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer
httpd/httpd/trunk/modules/proxy/NWGNUproxyftp
httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp
httpd/httpd/trunk/support/NWGNUlogres
Modified: httpd/httpd/trunk/modules/dav/fs/NWGNUmakefile
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/dav/fs/NWGNUmakefile?view=diff&r1=161790&r2=161791
==============================================================================
--- httpd/httpd/trunk/modules/dav/fs/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/dav/fs/NWGNUmakefile Mon Apr 18 12:54:33 2005
@@ -219,9 +219,14 @@
@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
Modified: httpd/httpd/trunk/modules/metadata/NWGNUuniqueid
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/metadata/NWGNUuniqueid?view=diff&r1=161790&r2=161791
==============================================================================
--- httpd/httpd/trunk/modules/metadata/NWGNUuniqueid (original)
+++ httpd/httpd/trunk/modules/metadata/NWGNUuniqueid Mon Apr 18 12:54:33 2005
@@ -208,8 +208,13 @@
@$(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
Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxy
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/NWGNUproxy?view=diff&r1=161790&r2=161791
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxy (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxy Mon Apr 18 12:54:33 2005
@@ -212,8 +212,13 @@
@$(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
Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxyajp
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/NWGNUproxyajp?view=diff&r1=161790&r2=161791
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxyajp (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxyajp Mon Apr 18 12:54:33 2005
@@ -214,7 +214,6 @@
@$(APR)/aprlib.imp \
@$(NWOS)/httpd.imp \
@libc.imp \
- @ws2nlm.imp \
proxy_module \
proxy_hook_scheme_handler \
proxy_hook_canon_handler \
@@ -224,6 +223,12 @@
ap_proxy_conn_is_https \
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
Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer?view=diff&r1=161790&r2=161791
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer Mon Apr 18 12:54:33 2005
@@ -211,7 +211,6 @@
@$(APR)/aprlib.imp \
@$(NWOS)/httpd.imp \
@libc.imp \
- @ws2nlm.imp \
proxy_module \
proxy_hook_scheme_handler \
proxy_hook_canon_handler \
@@ -221,6 +220,12 @@
ap_proxy_ssl_enable \
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
Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxyftp
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/NWGNUproxyftp?view=diff&r1=161790&r2=161791
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxyftp (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxyftp Mon Apr 18 12:54:33 2005
@@ -211,13 +211,18 @@
@$(APR)/aprlib.imp \
@$(NWOS)/httpd.imp \
@libc.imp \
- @ws2nlm.imp \
proxy_module \
proxy_hook_scheme_handler \
proxy_hook_canon_handler \
ap_proxy_ssl_enable \
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
Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp?view=diff&r1=161790&r2=161791
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp Mon Apr 18 12:54:33 2005
@@ -211,7 +211,6 @@
@$(APR)/aprlib.imp \
@$(NWOS)/httpd.imp \
@libc.imp \
- @ws2nlm.imp \
proxy_module \
proxy_hook_scheme_handler \
proxy_hook_canon_handler \
@@ -219,6 +218,12 @@
ap_proxy_ssl_enable \
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
Modified: httpd/httpd/trunk/support/NWGNUlogres
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/support/NWGNUlogres?view=diff&r1=161790&r2=161791
==============================================================================
--- httpd/httpd/trunk/support/NWGNUlogres (original)
+++ httpd/httpd/trunk/support/NWGNUlogres Mon Apr 18 12:54:33 2005
@@ -211,9 +211,14 @@
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
#