Fix typo concerning mod_proxy_scgi activation on

[apache] / NWGNUmakefile

diff --git a/NWGNUmakefile b/NWGNUmakefile
index 326c09fc34b7c1b8c4530d06f583bd556a295d65..9347fac79af831619a584342d18890eb0137f949 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -1,3 +1,34 @@
+#
+# Define our required macro's if not already done.
+#
+
+ifndef AP_WORK
+export AP_WORK = $(CURDIR)
+endif
+
+ifndef APR_WORK
+ifeq "$(wildcard $(AP_WORK)/srclib/apr)" "$(AP_WORK)/srclib/apr"
+export APR_WORK = $(AP_WORK)/srclib/apr
+endif
+endif
+ifneq "$(wildcard $(APR_WORK)/include/apr_version.h)" "$(APR_WORK)/include/apr_version.h"
+$(error APR_WORK does not point to a valid APR source tree) 
+endif
+
+ifndef APU_WORK
+ifeq "$(wildcard $(AP_WORK)/srclib/apr-util)" "$(AP_WORK)/srclib/apr-util"
+export APU_WORK = $(AP_WORK)/srclib/apr-util
+endif
+endif
+ifndef APU_WORK
+ifeq "$(wildcard $(APR_WORK)/include/apu_version.h)" "$(APR_WORK)/include/apu_version.h"
+export APU_WORK = $(APR_WORK)
+endif
+endif
+ifneq "$(wildcard $(APU_WORK)/include/apu_version.h)" "$(APU_WORK)/include/apu_version.h"
+$(error APU_WORK does not point to a valid APU source tree) 
+endif
+
 #
 # Declare the sub-directories to be built here
 #
@@ -39,17 +70,17 @@ XINCDIRS    += \
                        $(AP_WORK)/modules/loggers/ \
                        $(AP_WORK)/modules/mappers/ \
                        $(AP_WORK)/modules/proxy/ \
-                       $(AP_WORK)/os/NetWare \
-                       $(AP_WORK)/server/mpm/NetWare \
-                       $(PCRESDK) \
+                       $(AP_WORK)/modules/ssl/ \
+                       $(AP_WORK)/server/mpm/netware \
+                       $(PCRE) \
                        $(NWOS) \
-                       $(AP_WORK)/modules/ssl \
                        $(EOLIST)
 
 #
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
+                       -DHAVE_CONFIG_H \
                        $(EOLIST)
 
 #
@@ -186,6 +217,7 @@ TARGET_nlm = \
 # If there is an LIB target, put it here
 #
 TARGET_lib = \
+       $(OBJDIR)/pcre.lib \
        $(EOLIST)
 
 #
@@ -224,10 +256,10 @@ FILES_nlm_objs = \
        $(OBJDIR)/mod_netware.o \
        $(OBJDIR)/mod_setenvif.o \
        $(OBJDIR)/mod_so.o \
+       $(OBJDIR)/mod_watchdog.o \
        $(OBJDIR)/modules.o \
        $(OBJDIR)/mpm_common.o \
        $(OBJDIR)/mpm_netware.o \
-       $(OBJDIR)/pcre.o \
        $(OBJDIR)/protocol.o \
        $(OBJDIR)/provider.o \
        $(OBJDIR)/request.o \
@@ -243,6 +275,7 @@ FILES_nlm_objs = \
        $(OBJDIR)/util_mutex.o \
        $(OBJDIR)/util_nw.o \
        $(OBJDIR)/util_pcre.o \
+       $(OBJDIR)/util_regex.o \
        $(OBJDIR)/util_script.o \
        $(OBJDIR)/util_time.o \
        $(OBJDIR)/util_xml.o \
@@ -260,6 +293,7 @@ endif
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
+       $(PCRELIB) \
        libcpre.o \
        $(EOLIST)
 
@@ -314,7 +348,30 @@ FILES_nlm_exports = \
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
+ifeq "$(wildcard $(PCRE)/pcre.c)" "$(PCRE)/pcre.c"
+
 FILES_lib_objs = \
+       $(OBJDIR)/pcre.o \
+       $(EOLIST)
+
+else
+
+FILES_lib_objs = \
+       $(OBJDIR)/pcre_compile.o \
+       $(OBJDIR)/pcre_exec.o \
+       $(OBJDIR)/pcre_fullinfo.o \
+       $(OBJDIR)/pcre_globals.o \
+       $(OBJDIR)/pcre_info.o \
+       $(OBJDIR)/pcre_newline.o \
+       $(OBJDIR)/pcre_tables.o \
+       $(OBJDIR)/pcre_try_flipped.o \
+       $(OBJDIR)/pcre_version.o \
+       $(EOLIST)
+
+endif
+
+FILES_lib_objs += \
+       $(OBJDIR)/chartables.o \
        $(EOLIST)
 
 #
@@ -329,7 +386,7 @@ nlms :: libs $(TARGET_nlm)
 # Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
-install :: nlms FORCE
+install :: nlms instscripts FORCE
        -copy $(OBJDIR)\Apache2.nlm     $(INSTALL)\$(BASEDIR)\*.*
        -copy ABOUT_APACHE              $(INSTALL)\$(BASEDIR)\*.*
        -copy README                    $(INSTALL)\$(BASEDIR)\*.*
@@ -374,10 +431,10 @@ installdev :: FORCE
 
 prebuild :: FORCE
        $(MAKE) -C server -f NWGNUMakefile
-       $(MAKE) -C $(PCRESDK) -f NWGNUMakefile
+       $(MAKE) -C $(PCRE) -f NWGNUMakefile
        $(CHKNOT) $(PREBUILD_INST)\nul          mkdir $(PREBUILD_INST)
        -copy $(AP_WORK)\server\$(OBJDIR)\*.nlm $(PREBUILD_INST)\*.*
-       -copy $(PCRESDK)\$(basename $(OBJDIR))\*.nlm $(PREBUILD_INST)\*.*
+       -copy $(PCRE)\$(basename $(OBJDIR))\*.nlm $(PREBUILD_INST)\*.*
 
 #
 # Any specialized rules here
@@ -385,7 +442,7 @@ prebuild :: FORCE
 
 vpath %.c server:modules/arch/netware:modules/http:modules/aaa:modules/mappers
 vpath %.c modules/generators:modules/metadata:modules/filters:modules/loggers
-vpath %.c modules/core:os/netware:server/mpm/netware:$(PCRESDK)
+vpath %.c modules/core:os/netware:server/mpm/netware:$(PCRE)
 
 #
 # Include the 'tail' makefile that has targets that depend on variables defined
@@ -394,4 +451,6 @@ vpath %.c modules/core:os/netware:server/mpm/netware:$(PCRESDK)
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+include $(AP_WORK)\build\NWGNUscripts.inc
+