Add mod_forensic to the NetWare build

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

diff --git a/NWGNUmakefile b/NWGNUmakefile
index 7f058cb1ea9d29e9d76ece8890f6dec32cedf642..4b4fafdf131d5895e29de9cdcb6922fcd7387284 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -322,6 +322,7 @@ install :: nlms FORCE
        -copy CHANGES                   $(INSTALL)\Apache2\*.*
        -copy support\dbmmanage.in      $(INSTALL)\Apache2\bin\dbmmanage.pl
        -copy support\logresolve.pl.in  $(INSTALL)\Apache2\bin\logresolve.pl
+       -copy support\check_forensic    $(INSTALL)\Apache2\bin\check_forensic
        -awk  -f build\mkconfnw.awk docs\conf\httpd-std.conf.in >$(INSTALL)\Apache2\conf\httpd.conf
        -copy docs\conf\magic           $(INSTALL)\Apache2\conf\magic
        -copy docs\conf\mime.types      $(INSTALL)\Apache2\conf\mime.types

diff --git a/build/mkconfNW.awk b/build/mkconfNW.awk
index acab45a18c74af5b46cef7588febfddbf091a8f6..8ae207693c7caf31aea6c563d81f4b63f6612f30 100644 (file)
--- a/build/mkconfNW.awk
+++ b/build/mkconfNW.awk
@@ -48,6 +48,7 @@ BEGIN {
     print "#LoadModule file_cache_module modules/filecach.nlm"
     print "#LoadModule headers_module modules/headers.nlm"
     print "#LoadModule info_module modules/info.nlm"
+    print "#LoadModule log_forensic_module modules/forensic.nlm"
     print "#LoadModule logio_module modules/modlogio.nlm"
     print "#LoadModule mime_magic_module modules/mimemagi.nlm"
     print "#LoadModule proxy_module modules/proxy.nlm"

diff --git a/modules/loggers/NWGNUmakefile b/modules/loggers/NWGNUmakefile
index 21d68b9673c1b671a0aef12afa78c0a67a49fe67..9c42c52fd04b22c67ffa0483b4c8f0f6b623f320 100644 (file)
--- a/modules/loggers/NWGNUmakefile
+++ b/modules/loggers/NWGNUmakefile
@@ -24,19 +24,12 @@ include $(AP_WORK)\build\NWGNUhead.inc
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
                        $(EOLIST)
 
 #
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -102,19 +95,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               = logio
+NLM_NAME               =
 
 #
 # This is used by the link '-desc ' directive. 
 # If left blank, NLM_NAME will be used.
 #
-NLM_DESCRIPTION        = Apache $(VERSION_STR) IO Logging Module
+NLM_DESCRIPTION        =
 
 #
 # This is used by the '-threadname' directive.  If left blank,
 # NLM_NAME Thread will be used.
 #
-NLM_THREAD_NAME        = Logio Module
+NLM_THREAD_NAME        =
 
 #
 # If this is specified, it will override VERSION value in 
@@ -125,18 +118,18 @@ NLM_VERSION               =
 #
 # If this is specified, it will override the default of 64K
 #
-NLM_STACK_SIZE = 8192
+NLM_STACK_SIZE =
 
 
 #
 # If this is specified it will be used by the link '-entry' directive
 #
-NLM_ENTRY_SYM  = _LibCPrelude
+NLM_ENTRY_SYM  =
 
 #
 # If this is specified it will be used by the link '-exit' directive
 #
-NLM_EXIT_SYM   = _LibCPostlude
+NLM_EXIT_SYM   =
 
 #
 # If this is specified it will be used by the link '-check' directive
@@ -146,7 +139,7 @@ NLM_CHECK_SYM       =
 #
 # If these are specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS              =  AUTOUNLOAD, PSEUDOPREEMPTION
+NLM_FLAGS              =
 
 #
 # If this is specified it will be linked in with the XDCData option in the def 
@@ -160,6 +153,7 @@ XDCDATA         =
 #
 TARGET_nlm = \
        $(OBJDIR)/modlogio.nlm \
+       $(OBJDIR)/forensic.nlm \
        $(EOLIST)
 
 #
@@ -173,7 +167,6 @@ TARGET_lib = \
 # Paths must all use the '/' character
 #
 FILES_nlm_objs = \
-       $(OBJDIR)/mod_logio.o \
        $(EOLIST)
 
 #
@@ -181,7 +174,6 @@ FILES_nlm_objs = \
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
-       libcpre.o \
        $(EOLIST)
 
 #
@@ -189,8 +181,6 @@ FILES_nlm_libs = \
 # These will be added as a module command in the link.opt file.
 #
 FILES_nlm_modules = \
-       aprlib \
-       libc \
        $(EOLIST)
 
 #
@@ -212,16 +202,12 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
-       @libc.imp \
        $(EOLIST)
  
 #   
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
-       logio_module \
        $(EOLIST)
        
 #