Merge of 1761434,1761477 from trunk:

[apache] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index e5d75c8ac272c248270a309a7e3e59f28d9d272a..6d952b24a1eedce048235d2cffdc1a16a22100e9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -12,8 +12,8 @@ PROGRAM_DEPENDENCIES = \
   $(MPM_LIB) \
   os/$(OS_DIR)/libos.la
 
-PROGRAMS        = $(PROGRAM_NAME)
-TARGETS         = $(PROGRAMS) $(shared_build) $(other_targets)
+sbin_PROGRAMS   = $(PROGRAM_NAME)
+TARGETS         = $(sbin_PROGRAMS) $(shared_build) $(other_targets)
 INSTALL_TARGETS = install-conf install-htdocs install-error install-icons \
        install-other install-cgi install-include install-suexec install-build \
        install-man
@@ -58,6 +58,16 @@ install-conf:
                                        -e 's#@@SSLPort@@#$(SSLPORT)#g' \
                                        -e 'p' \
                                        < $$i; \
+                               if echo " $(DSO_MODULES) "|$(EGREP) " cgi " > /dev/null ; then \
+                                       have_cgi="1"; \
+                               else \
+                                       have_cgi="0"; \
+                               fi; \
+                               if echo " $(DSO_MODULES) "|$(EGREP) " cgid " > /dev/null ; then \
+                                       have_cgid="1"; \
+                               else \
+                                       have_cgid="0"; \
+                               fi; \
                                for j in $(DSO_MODULES) "^EOL^"; do \
                                        if test $$j != "^EOL^"; then \
                                                if echo ",$(ENABLED_DSO_MODULES),"|$(EGREP) ",$$j," > /dev/null ; then \
@@ -68,8 +78,18 @@ install-conf:
                                                if test "$(LOAD_ALL_MODULES)" = "yes"; then \
                                                        loading_disabled=""; \
                                                fi; \
-                                               echo "$${loading_disabled}LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
-                                       fi; \
+                                                       if test $$j = "cgid" -a "$$have_cgi" = "1"; then \
+                                                               echo "<IfModule !mpm_prefork_module>"; \
+                                                               echo "  $${loading_disabled}LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
+                                                               echo "</IfModule>"; \
+                                                       elif test $$j = "cgi" -a "$$have_cgid" = "1"; then \
+                                                               echo "<IfModule mpm_prefork_module>"; \
+                                                               echo "  $${loading_disabled}LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
+                                                               echo "</IfModule>"; \
+                                                       else \
+                                                               echo "$${loading_disabled}LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
+                                                       fi; \
+                                               fi; \
                                done; \
                                sed -e '1,/@@LoadModule@@/d' \
                                        -e '/@@LoadModule@@/d' \
@@ -125,6 +145,14 @@ docs:
            echo '  http://httpd.apache.org/docs-project/docsformat.html'; \
        fi
 
+validate-xml:
+       @if test -d $(top_srcdir)/docs/manual/build; then \
+           cd $(top_srcdir)/docs/manual/build && ./build.sh validate-xml; \
+       else \
+           echo 'For details on generating the docs, please read:'; \
+           echo '  http://httpd.apache.org/docs-project/docsformat.html'; \
+       fi
+
 dox:
        doxygen $(top_srcdir)/docs/doxygen.conf
 
@@ -194,17 +222,19 @@ INSTALL_HEADERS = \
        $(srcdir)/modules/core/mod_so.h \
        $(srcdir)/modules/core/mod_watchdog.h \
        $(srcdir)/modules/cache/mod_cache.h \
+       $(srcdir)/modules/cache/cache_common.h \
        $(srcdir)/modules/database/mod_dbd.h \
        $(srcdir)/modules/dav/main/mod_dav.h \
        $(srcdir)/modules/filters/mod_include.h \
+       $(srcdir)/modules/filters/mod_xml2enc.h \
        $(srcdir)/modules/generators/mod_cgi.h \
        $(srcdir)/modules/generators/mod_status.h \
        $(srcdir)/modules/loggers/mod_log_config.h \
        $(srcdir)/modules/mappers/mod_rewrite.h \
        $(srcdir)/modules/proxy/mod_proxy.h \
-       $(srcdir)/modules/proxy/mod_serf.h \
         $(srcdir)/modules/session/mod_session.h \
        $(srcdir)/modules/ssl/mod_ssl.h \
+       $(srcdir)/modules/ssl/mod_ssl_openssl.h \
        $(srcdir)/os/$(OS_DIR)/*.h
 
 install-include: