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

Allow httpd on NetWare to build using either the standard socket libraries or... 

Allow httpd on NetWare to build using either the standard socket libraries or the Winsock libraries.

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

NWGNUmakefile

+12 −2
Original line number Diff line number Diff line
@@ -216,7 +216,6 @@ FILES_nlm_objs = \ 
	$(OBJDIR)/mod_mime.o \

	$(OBJDIR)/mod_negotiation.o \

	$(OBJDIR)/mod_netware.o \

	$(OBJDIR)/mod_nw_ssl.o \

	$(OBJDIR)/mod_setenvif.o \

	$(OBJDIR)/mod_so.o \

	$(OBJDIR)/modules.o \
@@ -241,6 +240,12 @@ FILES_nlm_objs = \ 
	$(OBJDIR)/vhost.o \

	$(EOLIST)



# Build in mod_nw_ssl if Winsock is being used

ifndef USE_STDSOCKETS

FILES_nlm_objs += $(OBJDIR)/mod_nw_ssl.o \

	       $(EOLIST)

endif



#

# These are the LIB files needed to create the NLM target above.

# These will be added as a library command in the link.opt file.
@@ -280,10 +285,15 @@ FILES_nlm_Ximports = \ 
	@netware.imp \

	@$(APR)/aprlib.imp \

	@libc.imp \

	@ws2nlm.imp \

	GetCurrentAddressSpace \

	$(EOLIST)



# Build in mod_nw_ssl if Winsock is being used

ifndef USE_STDSOCKETS

FILES_nlm_Ximports += @ws2nlm.imp \

	       $(EOLIST)

endif

 

#   

# Any symbols exported to here

#

build/NWGNUenvironment.inc

+5 −0
Original line number Diff line number Diff line
@@ -127,6 +127,9 @@ INCDIRS := $(INCDIRS);$(ZLIBSDK) 
endif



DEFINES		= -DNETWARE

ifndef USE_STDSOCKETS

DEFINES += -DUSE_WINSOCK

endif



#

# MetroWerks static Libraries
@@ -271,6 +274,7 @@ SERVER = $(AP_WORK)/server 
SRC		= $(AP_WORK)

APR		= $(APR_WORK)

APRUTIL		= $(APU_WORK)

APULDAP		= $(APU_WORK)/ldap

SUPMOD		= $(AP_WORK)/support

PCRE		= $(AP_WORK)/srclib/pcre

APRTEST		= $(APR_WORK)/test
@@ -284,6 +288,7 @@ PREBUILD_INST = $(AP_WORK)\nwprebuild 


APRLIB		= $(APR)/$(OBJDIR)/aprlib.lib

APRUTLIB	= $(APRUTIL)/$(OBJDIR)/aprutil.lib

APULDAPLIB	= $(APULDAP)/$(OBJDIR)/apuldap.lib

STMODLIB	= $(STDMOD)/$(OBJDIR)/stdmod.lib

PCRELIB		= $(PCRE)/$(OBJDIR)/pcre.lib

NWOSLIB		= $(NWOS)/$(OBJDIR)/netware.lib

build/NWGNUmakefile

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ cc.opt : NWGNUmakefile $(AP_WORK)\build\NWGNUenvironment.inc $(AP_WORK)\build\NW 
	@echo -EP >> $@

	@echo -nosyspath >> $@

	@echo -w nocmdline >> $@

	@echo -DNETWARE >> $@

	@echo $(DEFINES) >> $@

	@echo -DCORE_PRIVATE >> $@

	@echo -I..\include >> $@

	@echo -I..\modules\http >> $@

build/NWGNUtail.inc

+1 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ endif 
ifneq "$(LDAPSDK)" ""

	@echo -l $(LDAPSDK)/lib/nlm >> $@

endif

	@echo -l $(APULDAP)/$(OBJDIR) >> $@

	@echo -l $(XML)/$(OBJDIR) >> $@

	@echo -nodefaults >> $@

	@echo -map $(OBJDIR)\$(NLM_NAME).map>> $@

modules/aaa/NWGNUauthnzldap

+8 −0
Original line number Diff line number Diff line
@@ -35,6 +35,14 @@ XCFLAGS += \ 
XDEFINES	+= \

			$(EOLIST)



#

#LDAP client requires the use of Winsock

#

ifdef USE_STDSOCKETS

XDEFINES += -DUSE_WINSOCK \

			$(EOLIST)

endif



#

# These flags will be added to the link.opt file

#