From 9871412b78c2717fdc79a247fefab832ba5305f7 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Fri, 23 Sep 2016 12:45:22 +0000 Subject: [PATCH] Merge r1753315, r1753316 from trunk: configure: move away from obsolete AC_OUTPUT args AC_OUTPUT's use with arguments was obsoleted back at or before autoconf 2.50. Replace it with the preferred AC_CONFIG_FILES/AC_CONFIG_COMMANDS calls. configure: remove orphaned APACHE_OUTPUT macro The last use of APACHE_OUTPUT appears to have been removed back in r87231. Submitted by: jchampion Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1762055 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 7 ------- acinclude.m4 | 7 ------- configure.in | 6 +++--- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/STATUS b/STATUS index 6015f5c54e..78617c74fd 100644 --- a/STATUS +++ b/STATUS @@ -117,13 +117,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) autoconf: minor cleanup and removal of some dead code. - trunk patch: http://svn.apache.org/r1753315 - http://svn.apache.org/r1753316 - 2.4.x patch: http://home.apache.org/~jchampion/patches/2.4.x-autoconf-cleanup.patch - (combines both patches and corrects for differences in the - AC_CONFIG_FILES list) - +1: jchampion, ylavic, jorton PATCHES PROPOSED TO BACKPORT FROM TRUNK: diff --git a/acinclude.m4 b/acinclude.m4 index bbe6d5cd7b..d0afed34ef 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -118,13 +118,6 @@ AC_DEFUN([APACHE_GEN_MAKEFILES],[ $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $BSD_MAKEFILE $APACHE_FAST_OUTPUT_FILES ]) -dnl ## APACHE_OUTPUT(file) -dnl ## adds "file" to the list of files generated by AC_OUTPUT -dnl ## This macro can be used several times. -AC_DEFUN([APACHE_OUTPUT], [ - APACHE_OUTPUT_FILES="$APACHE_OUTPUT_FILES $1" -]) - dnl dnl APACHE_TYPE_RLIM_T dnl diff --git a/configure.in b/configure.in index 289b231ca9..c59c54257c 100644 --- a/configure.in +++ b/configure.in @@ -862,6 +862,6 @@ AC_SUBST(ap_make_delimiter) dnl Ensure that docs/conf is created. test -d docs/conf||$mkdir_p docs/conf -AC_OUTPUT($APACHE_OUTPUT_FILES docs/conf/httpd.conf docs/conf/extra/httpd-autoindex.conf docs/conf/extra/httpd-dav.conf docs/conf/extra/httpd-default.conf docs/conf/extra/httpd-info.conf docs/conf/extra/httpd-languages.conf docs/conf/extra/httpd-manual.conf docs/conf/extra/httpd-mpm.conf docs/conf/extra/httpd-multilang-errordoc.conf docs/conf/extra/httpd-ssl.conf docs/conf/extra/httpd-userdir.conf docs/conf/extra/httpd-vhosts.conf docs/conf/extra/proxy-html.conf include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk build/pkg/pkginfo build/config_vars.sh,[true],[ - APACHE_GEN_MAKEFILES -]) +AC_CONFIG_FILES(docs/conf/httpd.conf docs/conf/extra/httpd-autoindex.conf docs/conf/extra/httpd-dav.conf docs/conf/extra/httpd-default.conf docs/conf/extra/httpd-info.conf docs/conf/extra/httpd-languages.conf docs/conf/extra/httpd-manual.conf docs/conf/extra/httpd-mpm.conf docs/conf/extra/httpd-multilang-errordoc.conf docs/conf/extra/httpd-ssl.conf docs/conf/extra/httpd-userdir.conf docs/conf/extra/httpd-vhosts.conf docs/conf/extra/proxy-html.conf include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk build/pkg/pkginfo build/config_vars.sh) +AC_CONFIG_COMMANDS([default], [true], [APACHE_GEN_MAKEFILES]) +AC_OUTPUT -- 2.49.0