Fix up the netware build with the additions in the filter modules.

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

diff --git a/modules/filters/NWGNUmakefile b/modules/filters/NWGNUmakefile
index 780e02ee710a02806b534a0748ed6b9205db8636..de030a48f11ca3f523c37d7a933f7d1924bebe2d 100644 (file)
--- a/modules/filters/NWGNUmakefile
+++ b/modules/filters/NWGNUmakefile
@@ -157,6 +157,8 @@ TARGET_nlm = \
        $(OBJDIR)/mod_filter.nlm \
        $(OBJDIR)/mod_request.nlm \
        $(OBJDIR)/substitute.nlm \
+       $(OBJDIR)/modsed.nlm \
+       $(OBJDIR)/modbuffer.nlm \
        $(EOLIST)
 
 # If the zlib libraries source exists then build the mod_deflate module

diff --git a/modules/filters/NWGNUmodbuffer b/modules/filters/NWGNUmodbuffer
new file mode 100644 (file)
index 0000000..1ee29fd
--- /dev/null
+++ b/modules/filters/NWGNUmodbuffer
@@ -0,0 +1,258 @@
+#\r
+# Declare the sub-directories to be built here\r
+#\r
+\r
+SUBDIRS = \\r
+       $(EOLIST)\r
+\r
+#\r
+# Get the 'head' of the build environment.  This includes default targets and\r
+# paths to tools\r
+#\r
+\r
+include $(AP_WORK)\build\NWGNUhead.inc\r
+\r
+#\r
+# build this level's files\r
+\r
+#\r
+# Make sure all needed macro's are defined\r
+#\r
+\r
+#\r
+# These directories will be at the beginning of the include list, followed by\r
+# INCDIRS\r
+#\r
+XINCDIRS       += \\r
+                       $(AP_WORK)/include \\r
+                       $(NWOS) \\r
+                       $(AP_WORK)/modules/arch/netware \\r
+                       $(APR)/include \\r
+                       $(APRUTIL)/include \\r
+                       $(APR) \\r
+                       $(EOLIST)\r
+\r
+#\r
+# These flags will come after CFLAGS\r
+#\r
+XCFLAGS                += \\r
+                       $(EOLIST)\r
+\r
+#\r
+# These defines will come after DEFINES\r
+#\r
+XDEFINES       += \\r
+                       $(EOLIST)\r
+\r
+#\r
+# These flags will be added to the link.opt file\r
+#\r
+XLFLAGS                += \\r
+                       $(EOLIST)\r
+\r
+#\r
+# These values will be appended to the correct variables based on the value of\r
+# RELEASE\r
+#\r
+ifeq "$(RELEASE)" "debug"\r
+XINCDIRS       += \\r
+                       $(EOLIST)\r
+\r
+XCFLAGS                += \\r
+                       $(EOLIST)\r
+\r
+XDEFINES       += \\r
+                       $(EOLIST)\r
+\r
+XLFLAGS                += \\r
+                       $(EOLIST)\r
+endif\r
+\r
+ifeq "$(RELEASE)" "noopt"\r
+XINCDIRS       += \\r
+                       $(EOLIST)\r
+\r
+XCFLAGS                += \\r
+                       $(EOLIST)\r
+\r
+XDEFINES       += \\r
+                       $(EOLIST)\r
+\r
+XLFLAGS                += \\r
+                       $(EOLIST)\r
+endif\r
+\r
+ifeq "$(RELEASE)" "release"\r
+XINCDIRS       += \\r
+                       $(EOLIST)\r
+\r
+XCFLAGS                += \\r
+                       $(EOLIST)\r
+\r
+XDEFINES       += \\r
+                       $(EOLIST)\r
+\r
+XLFLAGS                += \\r
+                       $(EOLIST)\r
+endif\r
+\r
+#\r
+# These are used by the link target if an NLM is being generated\r
+# This is used by the link 'name' directive to name the nlm.  If left blank\r
+# TARGET_nlm (see below) will be used.\r
+#\r
+NLM_NAME       = modbuffer\r
+\r
+#\r
+# This is used by the link '-desc ' directive.\r
+# If left blank, NLM_NAME will be used.\r
+#\r
+NLM_DESCRIPTION        = Apache $(VERSION_STR) Buffer Module\r
+\r
+#\r
+# This is used by the '-threadname' directive.  If left blank,\r
+# NLM_NAME Thread will be used.\r
+#\r
+NLM_THREAD_NAME        = modbuffer\r
+\r
+#\r
+# If this is specified, it will override VERSION value in\r
+# $(AP_WORK)\build\NWGNUenvironment.inc\r
+#\r
+NLM_VERSION    =\r
+\r
+#\r
+# If this is specified, it will override the default of 64K\r
+#\r
+NLM_STACK_SIZE = 8192\r
+\r
+\r
+#\r
+# If this is specified it will be used by the link '-entry' directive\r
+#\r
+NLM_ENTRY_SYM  = _LibCPrelude\r
+\r
+#\r
+# If this is specified it will be used by the link '-exit' directive\r
+#\r
+NLM_EXIT_SYM   = _LibCPostlude\r
+\r
+#\r
+# If this is specified it will be used by the link '-check' directive\r
+#\r
+NLM_CHECK_SYM  =\r
+\r
+#\r
+# If these are specified it will be used by the link '-flags' directive\r
+#\r
+NLM_FLAGS      = AUTOUNLOAD, PSEUDOPREEMPTION\r
+\r
+#\r
+# If this is specified it will be linked in with the XDCData option in the def\r
+# file instead of the default of $(NWOS)/apache.xdc.  XDCData can be disabled\r
+# by setting APACHE_UNIPROC in the environment\r
+#\r
+XDCDATA                =\r
+\r
+#\r
+# If there is an NLM target, put it here\r
+#\r
+TARGET_nlm = \\r
+       $(OBJDIR)/modbuffer.nlm \\r
+       $(EOLIST)\r
+\r
+#\r
+# If there is an LIB target, put it here\r
+#\r
+TARGET_lib = \\r
+       $(EOLIST)\r
+\r
+#\r
+# These are the OBJ files needed to create the NLM target above.\r
+# Paths must all use the '/' character\r
+#\r
+FILES_nlm_objs = \\r
+       $(OBJDIR)/mod_buffer.o \\r
+       $(EOLIST)\r
+\r
+#\r
+# These are the LIB files needed to create the NLM target above.\r
+# These will be added as a library command in the link.opt file.\r
+#\r
+FILES_nlm_libs = \\r
+       libcpre.o \\r
+       $(EOLIST)\r
+\r
+#\r
+# These are the modules that the above NLM target depends on to load.\r
+# These will be added as a module command in the link.opt file.\r
+#\r
+FILES_nlm_modules = \\r
+       aprlib \\r
+       libc \\r
+       $(EOLIST)\r
+\r
+#\r
+# If the nlm has a msg file, put it's path here\r
+#\r
+FILE_nlm_msg =\r
+\r
+#\r
+# If the nlm has a hlp file put it's path here\r
+#\r
+FILE_nlm_hlp =\r
+\r
+#\r
+# If this is specified, it will override $(NWOS)\copyright.txt.\r
+#\r
+FILE_nlm_copyright =\r
+\r
+#\r
+# Any additional imports go here\r
+#\r
+FILES_nlm_Ximports = \\r
+       @$(APR)/aprlib.imp \\r
+       @$(NWOS)/httpd.imp \\r
+       @libc.imp \\r
+       $(EOLIST)\r
+\r
+#\r
+# Any symbols exported to here\r
+#\r
+FILES_nlm_exports = \\r
+       buffer_module \\r
+       $(EOLIST)\r
+\r
+#\r
+# These are the OBJ files needed to create the LIB target above.\r
+# Paths must all use the '/' character\r
+#\r
+FILES_lib_objs = \\r
+       $(EOLIST)\r
+\r
+#\r
+# implement targets and dependancies (leave this section alone)\r
+#\r
+\r
+libs :: $(OBJDIR) $(TARGET_lib)\r
+\r
+nlms :: libs $(TARGET_nlm)\r
+\r
+#\r
+# Updated this target to create necessary directories and copy files to the\r
+# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)\r
+#\r
+install :: nlms FORCE\r
+\r
+#\r
+# Any specialized rules here\r
+#\r
+\r
+#\r
+# Include the 'tail' makefile that has targets that depend on variables defined\r
+# in this makefile\r
+#\r
+\r
+include $(AP_WORK)\build\NWGNUtail.inc\r
+\r
+\r

diff --git a/modules/filters/NWGNUsed b/modules/filters/NWGNUmodsed
similarity index 95%
rename from modules/filters/NWGNUsed
rename to modules/filters/NWGNUmodsed
index 9f07d612034e3aad8a6157dad1eb32607de088d4..0ae066c150557cb212e6e419dbe45252395e95e6 100644 (file)
--- a/modules/filters/NWGNUsed
+++ b/modules/filters/NWGNUmodsed
@@ -101,19 +101,19 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME       = sed
+NLM_NAME       = modsed
 
 #
 # This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
-NLM_DESCRIPTION        = Apache $(VERSION_STR) sed Module
+NLM_DESCRIPTION        = Apache $(VERSION_STR) SED Module
 
 #
 # This is used by the '-threadname' directive.  If left blank,
 # NLM_NAME Thread will be used.
 #
-NLM_THREAD_NAME        = sed Module
+NLM_THREAD_NAME        = modsed Module
 
 #
 # If this is specified, it will override VERSION value in
@@ -158,7 +158,7 @@ XDCDATA             =
 # If there is an NLM target, put it here
 #
 TARGET_nlm = \
-       $(OBJDIR)/sed.nlm \
+       $(OBJDIR)/modsed.nlm \
        $(EOLIST)
 
 #
@@ -173,6 +173,9 @@ TARGET_lib = \
 #
 FILES_nlm_objs = \
        $(OBJDIR)/mod_sed.o \
+       $(OBJDIR)/regexp.o \
+       $(OBJDIR)/sed0.o \
+       $(OBJDIR)/sed1.o \
        $(EOLIST)
 
 #