Fix typo concerning mod_proxy_scgi activation on

[apache] / NWGNUmakefile

diff --git a/NWGNUmakefile b/NWGNUmakefile
index 6995c773fc517bc47010db9cc38b8e7f88734181..9347fac79af831619a584342d18890eb0137f949 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -71,9 +71,8 @@ XINCDIRS      += \
                        $(AP_WORK)/modules/mappers/ \
                        $(AP_WORK)/modules/proxy/ \
                        $(AP_WORK)/modules/ssl/ \
-                       $(AP_WORK)/os/NetWare \
-                       $(AP_WORK)/server/mpm/NetWare \
-                       $(PCRESDK) \
+                       $(AP_WORK)/server/mpm/netware \
+                       $(PCRE) \
                        $(NWOS) \
                        $(EOLIST)
 
@@ -81,6 +80,7 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
+                       -DHAVE_CONFIG_H \
                        $(EOLIST)
 
 #
@@ -217,6 +217,7 @@ TARGET_nlm = \
 # If there is an LIB target, put it here
 #
 TARGET_lib = \
+       $(OBJDIR)/pcre.lib \
        $(EOLIST)
 
 #
@@ -259,7 +260,6 @@ FILES_nlm_objs = \
        $(OBJDIR)/modules.o \
        $(OBJDIR)/mpm_common.o \
        $(OBJDIR)/mpm_netware.o \
-       $(OBJDIR)/pcre.o \
        $(OBJDIR)/protocol.o \
        $(OBJDIR)/provider.o \
        $(OBJDIR)/request.o \
@@ -275,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 \
@@ -292,6 +293,7 @@ endif
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
+       $(PCRELIB) \
        libcpre.o \
        $(EOLIST)
 
@@ -346,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)
 
 #
@@ -406,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
@@ -417,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:$(PCRESRC)
+vpath %.c modules/core:os/netware:server/mpm/netware:$(PCRE)
 
 #
 # Include the 'tail' makefile that has targets that depend on variables defined