Change the SSLCipherSuite default to a shorter, whitelist

[apache] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 594d4cfe8f04f4e12682f046e45b50e5b9ab6e9a..e5d75c8ac272c248270a309a7e3e59f28d9d272a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,7 +4,7 @@ CLEAN_SUBDIRS = test
 
 PROGRAM_NAME         = $(progname)
 PROGRAM_SOURCES      = modules.c
-PROGRAM_LDADD        = buildmark.o $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS)
+PROGRAM_LDADD        = buildmark.o $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(PCRE_LIBS) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS)
 PROGRAM_PRELINK      = $(COMPILE) -c $(top_srcdir)/server/buildmark.c
 PROGRAM_DEPENDENCIES = \
   server/libmain.la \
@@ -19,7 +19,7 @@ INSTALL_TARGETS = install-conf install-htdocs install-error install-icons \
        install-man
 
 DISTCLEAN_TARGETS  = include/ap_config_auto.h include/ap_config_layout.h \
-       include/apache_probes.h include/ap_ldap.h \
+       include/apache_probes.h \
        modules.c config.cache config.log config.status build/config_vars.mk \
        build/rules.mk docs/conf/httpd.conf docs/conf/extra/*.conf shlibtool \
        build/pkg/pkginfo build/config_vars.sh
@@ -41,7 +41,7 @@ install-conf:
        done; \
        for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
            cd $$j ; \
-           for i in httpd.conf extra/httpd-*.conf; do \
+           for i in httpd.conf extra/*.conf; do \
                if [ -f $$i ] ; then \
                ( \
                        n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
@@ -60,7 +60,15 @@ install-conf:
                                        < $$i; \
                                for j in $(DSO_MODULES) "^EOL^"; do \
                                        if test $$j != "^EOL^"; then \
-                                               echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
+                                               if echo ",$(ENABLED_DSO_MODULES),"|$(EGREP) ",$$j," > /dev/null ; then \
+                                                       loading_disabled=""; \
+                                               else \
+                                                       loading_disabled="#"; \
+                                               fi; \
+                                               if test "$(LOAD_ALL_MODULES)" = "yes"; then \
+                                                       loading_disabled=""; \
+                                               fi; \
+                                               echo "$${loading_disabled}LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
                                        fi; \
                                done; \
                                sed -e '1,/@@LoadModule@@/d' \
@@ -195,7 +203,7 @@ INSTALL_HEADERS = \
        $(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/session/mod_session.h \
        $(srcdir)/modules/ssl/mod_ssl.h \
        $(srcdir)/os/$(OS_DIR)/*.h