readd suexec setuid and user check

[apache] / NWGNUmakefile

diff --git a/NWGNUmakefile b/NWGNUmakefile
index b0082d98835d42cbf3f3c9da1509754b47a8faa7..f5a9ee4cd3a7bdf764668da725e3f8169c0d5b2b 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -195,6 +195,7 @@ FILES_nlm_objs = \
        $(OBJDIR)/config.o \
        $(OBJDIR)/connection.o \
        $(OBJDIR)/core.o \
+       $(OBJDIR)/eoc_bucket.o \
        $(OBJDIR)/error_bucket.o \
        $(OBJDIR)/http_core.o \
        $(OBJDIR)/http_protocol.o \
@@ -331,16 +332,15 @@ install :: nlms FORCE
        @echo xcopy docs\man $(INSTALL)\Apache2\man /E /Y >> xc.bat
        @echo xcopy docs\manual $(INSTALL)\Apache2\manual /E /Y >> xc.bat
        $(CMD) xc.bat
+       $(DEL) xc.bat
 
 
     
 installdev :: FORCE
        -copy $(subst /,\,$(AP_WORK))\include\*.h           $(INSTALL)\Apache2\include\*.*
        -copy $(subst /,\,$(AP_WORK))\os\netware\*.h        $(INSTALL)\Apache2\include\*.*
-       -copy $(subst /,\,$(NWOS))\include\*.h              $(INSTALL)\Apache2\include\*.*
        -copy $(subst /,\,$(NWOS))\*.imp                    $(INSTALL)\Apache2\lib\*.*
        -copy $(subst /,\,$(APR))\include\*.h               $(INSTALL)\Apache2\include\*.*
-       -copy $(subst /,\,$(APR))\arch\netware\include\*.h  $(INSTALL)\Apache2\include\*.*
        -copy $(subst /,\,$(APRUTIL))\include\*.h           $(INSTALL)\Apache2\include\*.*
        -copy $(subst /,\,$(APR))\*.imp                     $(INSTALL)\Apache2\lib\*.*
        -copy $(subst /,\,$(NWOS))\*.xdc                    $(INSTALL)\Apache2\lib\*.*
@@ -349,53 +349,53 @@ installdev :: FORCE
 # Any specialized rules here
 #
 
-$(OBJDIR)/%.o: server/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: server/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
        @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: modules/arch/netware/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: modules/arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
        @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: modules/http/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: modules/http/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
        @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: modules/aaa/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: modules/aaa/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
        @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: modules/mappers/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: modules/mappers/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
        @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: modules/generators/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: modules/generators/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
        @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: modules/metadata/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: modules/metadata/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
        @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: modules/filters/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: modules/filters/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
        @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: modules/loggers/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: modules/loggers/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
        @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: os/netware/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: os/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
        @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: server/mpm/netware/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: server/mpm/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
        @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: srclib/pcre/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: srclib/pcre/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
        @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
 #
 # Include the 'tail' makefile that has targets that depend on variables defined