Commit a9db9a0c authored by Bradley Nicholes's avatar Bradley Nicholes
Browse files

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
parent ec430dec
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -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
#
+6 −1
Original line number Diff line number Diff line
@@ -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
#
+6 −1
Original line number Diff line number Diff line
@@ -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
#
+6 −1
Original line number Diff line number Diff line
@@ -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
#
+6 −1
Original line number Diff line number Diff line
@@ -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
#
Loading