Vote (adding relevent entries part of the backport proposal).

[apache] / NWGNUmakefile

diff --git a/NWGNUmakefile b/NWGNUmakefile
index 732935bce402e6579872e4ee1e29ff384540b931..904430d2c4532602ce54792b38b8ab9509501400 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
 
@@ -386,7 +390,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)
 #
-MKCNF  = $(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -v SSLPORT=$(SSLPORT) -v MODSSL=$(WITH_MOD_SSL) -v BSDSKT=$(USE_STDSOCKETS) -f build/mkconfNW.awk $1 > $2
+MKCNF  = $(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -v SSLPORT=$(SSLPORT) -v MODSSL=$(WITH_SSL) -v BSDSKT=$(USE_STDSOCKETS) -f build/mkconfNW.awk $1 > $2
 
 install :: nlms instscripts FORCE
        $(call COPY,$(OBJDIR)/$(NLM_NAME).nlm,                         $(INSTALLBASE)/)
@@ -416,7 +420,7 @@ install :: nlms instscripts FORCE
        $(call MKCNF,docs/conf/extra/httpd-userdir.conf.in,            $(INSTALLBASE)/conf/extra/httpd-userdir.conf)
        $(call MKCNF,docs/conf/extra/httpd-vhosts.conf.in,             $(INSTALLBASE)/conf/extra/httpd-vhosts.conf)
        $(call MKCNF,docs/conf/extra/httpd-ssl.conf.in,                $(INSTALLBASE)/conf/extra/httpd-ssl.conf)
-       $(call MKCNF,docs/conf/extra/proxy-html.conf.in,                $(INSTALLBASE)/conf/extra/proxy-html.conf)
+       $(call MKCNF,docs/conf/extra/proxy-html.conf.in,               $(INSTALLBASE)/conf/extra/proxy-html.conf)
        $(call COPYR,docs/docroot,                                     $(INSTALLBASE)/htdocs)
        $(call COPYR,docs/error,                                       $(INSTALLBASE)/error)
        $(call COPYR,docs/icons,                                       $(INSTALLBASE)/icons)
@@ -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/)
@@ -439,9 +444,9 @@ installdev :: FORCE
        $(call COPY,$(STDMOD)/loggers/mod_log_config.h,                $(INSTALLBASE)/include/)
        $(call COPY,$(STDMOD)/mappers/mod_rewrite.h,                   $(INSTALLBASE)/include/)
        $(call COPY,$(STDMOD)/proxy/mod_proxy.h,                       $(INSTALLBASE)/include/)
-       $(call COPY,$(STDMOD)/proxy/mod_serf.h,                        $(INSTALLBASE)/include/)
        $(call COPY,$(STDMOD)/session/mod_session.h,                   $(INSTALLBASE)/include/)
        $(call COPY,$(STDMOD)/ssl/mod_ssl.h,                           $(INSTALLBASE)/include/)
+       $(call COPY,$(STDMOD)/ssl/mod_ssl_openssl.h,                   $(INSTALLBASE)/include/)
        $(call COPY,$(APR)/*.imp,                                      $(INSTALLBASE)/lib/)
        $(call COPY,$(NWOS)/*.imp,                                     $(INSTALLBASE)/lib/)
        $(call COPY,$(NWOS)/*.xdc,                                     $(INSTALLBASE)/lib/)