Merge r1734006 from trunk:

[apache] / NWGNUmakefile

diff --git a/NWGNUmakefile b/NWGNUmakefile
index 1dc02f7d42cae6a1faa18d8da40c57db4edcc213..e382203d4c8497145f61ac5f10950c09f60e72e7 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -273,6 +273,7 @@ FILES_nlm_objs = \
        $(OBJDIR)/util_expr_eval.o \
        $(OBJDIR)/util_expr_parse.o \
        $(OBJDIR)/util_expr_scan.o \
+       $(OBJDIR)/util_fcgi.o \
        $(OBJDIR)/util_filter.o \
        $(OBJDIR)/util_md5.o \
        $(OBJDIR)/util_mutex.o \
@@ -360,17 +361,20 @@ FILES_lib_objs = \
 else
 
 FILES_lib_objs = \
+       $(OBJDIR)/chartables.o \
        $(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 \
-       $(OBJDIR)/chartables.o \
        $(EOLIST)
+ifeq "$(wildcard $(PCRE)/pcre_try_flipped.c)" "$(PCRE)/pcre_try_flipped.c"
+FILES_lib_objs += \
+       $(OBJDIR)/pcre_try_flipped.o \
+       $(EOLIST)
+endif 
 
 endif
 
@@ -431,6 +435,7 @@ installdev :: FORCE
        $(call COPY,$(STDMOD)/core/mod_so.h,                           $(INSTALLBASE)/include/)
        $(call COPY,$(STDMOD)/core/mod_watchdog.h,                     $(INSTALLBASE)/include/)
        $(call COPY,$(STDMOD)/cache/mod_cache.h,                       $(INSTALLBASE)/include/)
+       $(call COPY,$(STDMOD)/cache/cache_common.h,                    $(INSTALLBASE)/include/)
        $(call COPY,$(STDMOD)/database/mod_dbd.h,                      $(INSTALLBASE)/include/)
        $(call COPY,$(STDMOD)/dav/main/mod_dav.h,                      $(INSTALLBASE)/include/)
        $(call COPY,$(STDMOD)/filters/mod_include.h,                   $(INSTALLBASE)/include/)