Skip to content

Commit daaf706

Browse files
committed
Upgrade deprecated AC_OUTPUT macro calls
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
1 parent 7394879 commit daaf706

File tree

5 files changed

+9
-5
lines changed

5 files changed

+9
-5
lines changed

TSRM/configure.ac

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,5 @@ unistd.h \
3131
limits.h
3232
)
3333

34-
AC_OUTPUT(Makefile)
34+
AC_CONFIG_FILES([Makefile])
35+
AC_OUTPUT

Zend/configure.ac

+2-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ LIBZEND_OTHER_CHECKS
125125
ZEND_EXTRA_LIBS="$LIBS"
126126
LIBS=""
127127
AC_SUBST(ZEND_EXTRA_LIBS)
128-
AC_OUTPUT(Makefile)
128+
AC_CONFIG_FILES([Makefile])
129+
AC_OUTPUT
129130

130131
# Local Variables:
131132
# tab-width: 4

acinclude.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ dnl
9494
dnl PHP_SUBST_OLD(varname)
9595
dnl
9696
dnl Same as PHP_SUBST() but also substitutes all @VARNAME@
97-
dnl instances in every file passed to AC_OUTPUT()
97+
dnl instances in every file passed to AC_OUTPUT
9898
dnl
9999
AC_DEFUN([PHP_SUBST_OLD],[
100100
PHP_SUBST($1)

configure.ac

+3-1
Original file line numberDiff line numberDiff line change
@@ -1567,7 +1567,8 @@ PHP_CHECK_CONFIGURE_OPTIONS
15671567
dnl
15681568
dnl Generate build files
15691569
dnl
1570-
AC_OUTPUT($ALL_OUTPUT_FILES, [], [
1570+
AC_CONFIG_FILES([$ALL_OUTPUT_FILES])
1571+
AC_CONFIG_COMMANDS([default],[],[
15711572
15721573
if test "\$CONFIG_FILES" = "$ALL_OUTPUT_FILES" || test "\$CONFIG_FILES" = " $ALL_OUTPUT_FILES" || test -z "\$CONFIG_FILES"; then
15731574
REDO_ALL=yes
@@ -1698,6 +1699,7 @@ Check '[$]0 --help' for available options
16981699
16991700
fi
17001701
])
1702+
AC_OUTPUT
17011703

17021704
dnl ## Local Variables:
17031705
dnl ## tab-width: 4

scripts/phpize.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -199,4 +199,4 @@ touch .deps
199199

200200
AC_CONFIG_HEADERS([config.h])
201201

202-
AC_OUTPUT()
202+
AC_OUTPUT

0 commit comments

Comments
 (0)