Add API protection against the deprecated v1.4 apr_crypto API.

[apache] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 8bbbc30275454f80b94bc6434b70d157b5ff3d34..d16e0580846dc6ae6cbbc5c3653aba012f378224 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,9 +19,10 @@ 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 \
        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/pkg/pkginfo build/config_vars.sh
 EXTRACLEAN_TARGETS = configure include/ap_config_auto.h.in generated_lists \
        httpd.spec
 
@@ -47,12 +48,14 @@ install-conf:
                        if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
                                sed -e 's#@@ServerRoot@@#$(prefix)#g' \
                                        -e 's#@@Port@@#$(PORT)#g' \
+                                       -e 's#@@SSLPort@@#$(SSLPORT)#g' \
                                        -e '/@@LoadModule@@/d' \
                                        < $$i; \
                        else \
                                sed -n -e '/@@LoadModule@@/q' \
                                        -e 's#@@ServerRoot@@#$(prefix)#g' \
                                        -e 's#@@Port@@#$(PORT)#g' \
+                                       -e 's#@@SSLPort@@#$(SSLPORT)#g' \
                                        -e 'p' \
                                        < $$i; \
                                for j in $(DSO_MODULES) "^EOL^"; do \
@@ -64,6 +67,7 @@ install-conf:
                                        -e '/@@LoadModule@@/d' \
                                        -e 's#@@ServerRoot@@#$(prefix)#g' \
                                        -e 's#@@Port@@#$(PORT)#g' \
+                                       -e 's#@@SSLPort@@#$(SSLPORT)#g' \
                                        < $$i; \
                        fi \
                ) > $(DESTDIR)$(sysconfdir)/original/$$i; \
@@ -85,7 +89,11 @@ install-conf:
            fi ; \
        fi
 
-install-build:
+# Create a sanitized config_vars.mk
+build/config_vars.out: build/config_vars.mk
+       @$(SHELL) build/config_vars.sh < build/config_vars.mk > build/config_vars.out
+
+install-build: build/config_vars.out
        @echo Installing build system files 
        @$(MKINSTALLDIRS) $(DESTDIR)$(installbuilddir) 
        @for f in $(top_srcdir)/build/*.mk build/*.mk; do \
@@ -96,16 +104,20 @@ install-build:
                  $(top_srcdir)/build/instdso.sh; do \
         $(INSTALL_PROGRAM) $$f $(DESTDIR)$(installbuilddir); \
        done
-       @sed "/^LIBTOOL/s#/[^ ]*/libtool \(.*\)#`$(APR_CONFIG) --apr-libtool` $(LTFLAGS)#" \
-           build/config_vars.mk > $(DESTDIR)$(installbuilddir)/config_vars.mk
+       @$(INSTALL_DATA) build/config_vars.out $(DESTDIR)$(installbuilddir)/config_vars.mk
+       @rm build/config_vars.out
 
 htdocs-srcdir = $(top_srcdir)/docs/docroot
 
-docs::
-       mkdir -p ./docs/api
-       srclib/apr/build/scandoc.pl -i./build/default.pl -p./docs/api/ ./include/*.h
+docs:
+       @if test -d $(top_srcdir)/docs/manual/build; then \
+           cd $(top_srcdir)/docs/manual/build && ./build.sh all; \
+       else \
+           echo 'For details on generating the docs, please read:'; \
+           echo '  http://httpd.apache.org/docs-project/docsformat.html'; \
+       fi
 
-dox::
+dox:
        doxygen $(top_srcdir)/docs/doxygen.conf
 
 install-htdocs:
@@ -114,8 +126,12 @@ install-htdocs:
         else \
            echo Installing HTML documents ; \
            $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \
-           test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
-           cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
+           if test -d $(htdocs-srcdir) && test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \
+               $(RSYNC) --exclude .svn -rlpt --numeric-ids $(htdocs-srcdir)/ $(DESTDIR)$(htdocsdir)/; \
+           else \
+               test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
+               cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
+           fi; \
        fi
 
 install-error:
@@ -166,15 +182,20 @@ INSTALL_HEADERS = \
        include/*.h \
        $(srcdir)/include/*.h \
        $(srcdir)/os/$(OS_DIR)/os.h \
-       $(srcdir)/server/mpm/$(MPM_SUBDIR_NAME)/*.h \
-       $(srcdir)/modules/aaa/mod_auth.h \
+       $(srcdir)/modules/arch/unix/mod_unixd.h \
+       $(srcdir)/modules/core/mod_so.h \
+       $(srcdir)/modules/core/mod_watchdog.h \
+       $(srcdir)/modules/cache/mod_cache.h \
+       $(srcdir)/modules/database/mod_dbd.h \
        $(srcdir)/modules/dav/main/mod_dav.h \
        $(srcdir)/modules/filters/mod_include.h \
        $(srcdir)/modules/generators/mod_cgi.h \
        $(srcdir)/modules/generators/mod_status.h \
        $(srcdir)/modules/loggers/mod_log_config.h \
-       $(srcdir)/modules/http/mod_core.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)/os/$(OS_DIR)/*.h
 
@@ -193,8 +214,12 @@ install-man:
        @test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
        @cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
        @cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
-       @(cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
-       @(cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null ) || true
+       @if test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \
+         $(RSYNC) --exclude .svn -rlpt --numeric-ids $(top_srcdir)/docs/manual/ $(DESTDIR)$(manualdir)/; \
+       else \
+         cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir); \
+         cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
+       fi
 
 install-suexec:
        @if test -f $(builddir)/support/suexec; then \
@@ -209,4 +234,5 @@ suexec:
 x-local-distclean:
        @rm -rf autom4te.cache
 
+# XXX: This looks awfully platform-specific [read: bad form and style]
 include $(top_srcdir)/os/os2/core.mk