Upgrade deprecated AC_OUTPUT macro calls

petk · petk · commit daaf706df07f · 2018-07-29T16:04:39.000+02:00
Autoconf 2.50 made several changes to macro calls. These include also arguments passed to AC_OUTPUT macro. The upgrading chapter in Autoconf documentation include an example of using AC_OUTPUT with AC_CONFIG_FILES and AC_CONFIG_COMMANDS: - https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Obsolete-Macros.html PHP 5.4 to 7.1 require Autoconf 2.59+, PHP 7.2+ require Autoconf 2.64+, and PHP 7.2 phpize script requires Autoconf 2.59+ which are all greater than above mentioned 2.50 version. Systems out there should well support this by now. This patch was created with the help of autoupdate script: autoupdate <file> More info on where exactly this got deprecated: - ftp://ftp.gnu.org/old-gnu/Manuals/autoconf-2.13/html_mono/autoconf.html - ftp://ftp.auckland.ac.nz/pub/gnu/Manuals/autoconf-2.52/html_chapter/autoconf_15.html - http://git.savannah.gnu.org/cgit/autoconf.git/tree/NEWS
diff --git a/TSRM/configure.ac b/TSRM/configure.ac
@@ -31,4 +31,5 @@ unistd.h \
 limits.h
 )
 
-AC_OUTPUT(Makefile)
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff --git a/Zend/configure.ac b/Zend/configure.ac
@@ -125,7 +125,8 @@ LIBZEND_OTHER_CHECKS
 ZEND_EXTRA_LIBS="$LIBS"
 LIBS=""
 AC_SUBST(ZEND_EXTRA_LIBS)
-AC_OUTPUT(Makefile)
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
 
 # Local Variables:
 # tab-width: 4
diff --git a/acinclude.m4 b/acinclude.m4
@@ -94,7 +94,7 @@ dnl
 dnl PHP_SUBST_OLD(varname)
 dnl
 dnl Same as PHP_SUBST() but also substitutes all @VARNAME@
-dnl instances in every file passed to AC_OUTPUT()
+dnl instances in every file passed to AC_OUTPUT
 dnl
 AC_DEFUN([PHP_SUBST_OLD],[
   PHP_SUBST($1)
diff --git a/configure.ac b/configure.ac
@@ -1567,7 +1567,8 @@ PHP_CHECK_CONFIGURE_OPTIONS
 dnl
 dnl Generate build files
 dnl
-AC_OUTPUT($ALL_OUTPUT_FILES, [], [
+AC_CONFIG_FILES([$ALL_OUTPUT_FILES])
+AC_CONFIG_COMMANDS([default],[],[
 
 if test "\$CONFIG_FILES" = "$ALL_OUTPUT_FILES" || test "\$CONFIG_FILES" = " $ALL_OUTPUT_FILES" || test -z "\$CONFIG_FILES"; then
   REDO_ALL=yes
@@ -1698,6 +1699,7 @@ Check '[$]0 --help' for available options
 
 fi
 ])
+AC_OUTPUT
 
 dnl ## Local Variables:
 dnl ## tab-width: 4
diff --git a/scripts/phpize.m4 b/scripts/phpize.m4
@@ -199,4 +199,4 @@ touch .deps
 
 AC_CONFIG_HEADERS([config.h])
 
-AC_OUTPUT()
+AC_OUTPUT

Original file line number	Diff line number	Diff line change
`@@ -31,4 +31,5 @@ unistd.h \`
`31`	`31`	`limits.h`
`32`	`32`	`)`
`33`	`33`
`34`		`-AC_OUTPUT(Makefile)`
	`34`	`+AC_CONFIG_FILES([Makefile])`
	`35`	`+AC_OUTPUT`
Original file line number	Diff line number	Diff line change
`@@ -199,4 +199,4 @@ touch .deps`
`199`	`199`
`200`	`200`	`AC_CONFIG_HEADERS([config.h])`
`201`	`201`
`202`		`-AC_OUTPUT()`
	`202`	`+AC_OUTPUT`