Skip to content

Commit

Permalink
Upgrade deprecated AC_OUTPUT macro calls
Browse files Browse the repository at this point in the history
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
  • Loading branch information
petk committed Jul 29, 2018
1 parent 7394879 commit daaf706
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
3 changes: 2 additions & 1 deletion TSRM/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,5 @@ unistd.h \
limits.h
)

AC_OUTPUT(Makefile)
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
3 changes: 2 additions & 1 deletion Zend/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion acinclude.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 3 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -1698,6 +1699,7 @@ Check '[$]0 --help' for available options
fi
])
AC_OUTPUT

dnl ## Local Variables:
dnl ## tab-width: 4
Expand Down
2 changes: 1 addition & 1 deletion scripts/phpize.m4
Original file line number Diff line number Diff line change
Expand Up @@ -199,4 +199,4 @@ touch .deps

AC_CONFIG_HEADERS([config.h])

AC_OUTPUT()
AC_OUTPUT

0 comments on commit daaf706

Please sign in to comment.