From 0db0a571f52e6905d2bd5680c6d9d63c3aa82316 Mon Sep 17 00:00:00 2001
From: Peter Kokot <peterkokot@gmail.com>
Date: Sun, 7 Jul 2019 18:24:52 +0200
Subject: [PATCH] Remove PHP_OUTPUT

- Using AC_CONFIG_FILES instead of custom PHP_OUTPUT
- config.status refactorings:
  - Instead of setting the REDO_ALL variable commands can be used
    and newer config.status invocation where needed.
---
 build/php.m4          |  10 ----
 configure.ac          | 111 ++++++++++++++++++++++--------------------
 ext/phar/config.m4    |   2 +-
 sapi/cgi/config9.m4   |   2 +-
 sapi/cli/config.m4    |   2 +-
 sapi/fpm/config.m4    |  11 ++++-
 sapi/phpdbg/config.m4 |   2 +-
 scripts/Makefile.frag |   4 +-
 8 files changed, 75 insertions(+), 69 deletions(-)

diff --git a/build/php.m4 b/build/php.m4
index a17a4b9b6066e..a052227492b56 100644
--- a/build/php.m4
+++ b/build/php.m4
@@ -99,16 +99,6 @@ AC_DEFUN([PHP_SUBST_OLD],[
   AC_SUBST($1)
 ])
 
-dnl
-dnl PHP_OUTPUT(file)
-dnl
-dnl Adds "file" to the list of files generated by AC_OUTPUT. This macro can be
-dnl used several times.
-dnl
-AC_DEFUN([PHP_OUTPUT],[
-  PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES $1"
-])
-
 dnl ----------------------------------------------------------------------------
 dnl Build system base macros.
 dnl ----------------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 336f0832a45d8..d860b5413b6db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1563,57 +1563,43 @@ AC_DEFINE([HAVE_BUILD_DEFS_H], 1, [ ])
 $php_shtool mkdir -p scripts
 $php_shtool mkdir -p scripts/man1
 
-ALL_OUTPUT_FILES="main/build-defs.h \
-scripts/phpize scripts/man1/phpize.1 \
-scripts/php-config scripts/man1/php-config.1 \
-$PHP_OUTPUT_FILES"
-
 dnl Generate build files.
-AC_CONFIG_FILES([$ALL_OUTPUT_FILES])
-
-AC_CONFIG_COMMANDS_PRE([PHP_PATCH_CONFIG_HEADERS([main/php_config.h.in])])
-
-AC_CONFIG_COMMANDS([default],[
-cat <<X
-
-+--------------------------------------------------------------------+
-| License:                                                           |
-| This software is subject to the PHP License, available in this     |
-| distribution in the file LICENSE. By continuing this installation  |
-| process, you are bound by the terms of this license agreement.     |
-| If you do not agree with the terms of this license, you must abort |
-| the installation process at this point.                            |
-+--------------------------------------------------------------------+
-
-Thank you for using PHP.
+AC_CONFIG_FILES([
+  main/build-defs.h
+  scripts/man1/phpize.1
+  scripts/man1/php-config.1
+  scripts/phpize
+  scripts/php-config
+])
 
-X
+AC_CONFIG_FILES([
+  main/internal_functions.c
+],[
+  AWK="$AWK" sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_STATIC" > main/internal_functions.c
 ],[
+  EXT_STATIC="$EXT_STATIC"
+  AWK="$AWK"
+])
 
-if test "\$CONFIG_FILES" = "$ALL_OUTPUT_FILES" || test "\$CONFIG_FILES" = " $ALL_OUTPUT_FILES" || test -z "\$CONFIG_FILES"; then
-  REDO_ALL=yes
-fi
+AC_CONFIG_FILES([
+  main/internal_functions_cli.c:main/internal_functions.c.in
+],[
+  AWK="$AWK" sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_CLI_STATIC" > main/internal_functions_cli.c
+],[
+  EXT_CLI_STATIC="$EXT_CLI_STATIC"
+  AWK="$AWK"
+])
 
-dnl Create configuration headers.
-dnl ----------------------------------------------------------------------------
-test -d Zend || $php_shtool mkdir Zend
+AC_CONFIG_COMMANDS_PRE([PHP_PATCH_CONFIG_HEADERS([main/php_config.h.in])])
 
-cat >Zend/zend_config.h <<FEO
+AC_CONFIG_COMMANDS([default],[
+  test -d Zend || $php_shtool mkdir Zend
+  cat >Zend/zend_config.h <<FEO
 #include <../main/php_config.h>
 FEO
 
-dnl Run this only when generating all the files.
-if test -n "\$REDO_ALL"; then
-  echo "creating main/internal_functions.c"
-  AWK="$AWK" sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_STATIC" > main/internal_functions.c
-
-  echo "creating main/internal_functions_cli.c"
-  AWK="$AWK" sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_CLI_STATIC" > main/internal_functions_cli.c
-
-    if test "$PHP_SAPI" = "apache2handler"; then
-      if test "$APACHE_VERSION" -ge 2004001; then
-        if test -z "$APACHE_THREADED_MPM"; then
-cat <<X
+  if test "x$php_warning_apache" != "x"; then
+    cat <<X
 +--------------------------------------------------------------------+
 |                        *** WARNING ***                             |
 |                                                                    |
@@ -1621,28 +1607,49 @@ cat <<X
 | If you change Apache to use a threaded MPM you must reconfigure    |
 | PHP with --enable-maintainer-zts                                   |
 X
-        fi
-      fi
-    fi
+  fi
 
-  dnl Warn about Apache if oci8 extension is enabled on Linux.
-  if test "$PHP_OCI8" != "no"; then
-    if test "$PHP_SIGCHILD" != "yes"; then
-      if test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
-cat <<X
+  if test "x$php_warning_oci8" != "x"; then
+    cat <<X
 +--------------------------------------------------------------------+
 | Notice:                                                            |
 | If you encounter <defunc> processes when using a local Oracle      |
 | database, set the value BEQUEATH_DETACH=YES in Oracle Net's        |
 | sqlnet.ora file on the PHP host, or set the environment variable   |
-| BEQUEATH_DETACH to YES before starting Apache.  If the problem     |
+| BEQUEATH_DETACH to YES before starting Apache. If the problem      |
 | still occurs, then recompile PHP and specify --enable-sigchild     |
 | when configuring.                                                  |
 X
+  fi
+
+  cat <<X
++--------------------------------------------------------------------+
+| License:                                                           |
+| This software is subject to the PHP License, available in this     |
+| distribution in the file LICENSE. By continuing this installation  |
+| process, you are bound by the terms of this license agreement.     |
+| If you do not agree with the terms of this license, you must abort |
+| the installation process at this point.                            |
++--------------------------------------------------------------------+
+
+Thank you for using PHP.
+
+X
+],[
+  if test "$PHP_SAPI" = "apache2handler"; then
+    if test "$APACHE_VERSION" -ge 2004001; then
+      if test -z "$APACHE_THREADED_MPM"; then
+        php_warning_apache=1
       fi
     fi
   fi
 
-fi
+  if test "$PHP_OCI8" != "no"; then
+    if test "$PHP_SIGCHILD" != "yes"; then
+      if test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
+        php_warning_oci8=1
+      fi
+    fi
+  fi
 ])
 AC_OUTPUT
diff --git a/ext/phar/config.m4 b/ext/phar/config.m4
index 257d961faf51c..d91579710a46c 100644
--- a/ext/phar/config.m4
+++ b/ext/phar/config.m4
@@ -23,5 +23,5 @@ if test "$PHP_PHAR" != "no"; then
 
   PHP_INSTALL_HEADERS([ext/phar], [php_phar.h])
 
-  PHP_OUTPUT(ext/phar/phar.1 ext/phar/phar.phar.1)
+  AC_CONFIG_FILES([ext/phar/phar.1 ext/phar/phar.phar.1])
 fi
diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4
index a26f4179333a6..3070aa479a63d 100644
--- a/sapi/cgi/config9.m4
+++ b/sapi/cgi/config9.m4
@@ -69,7 +69,7 @@ if test "$PHP_CGI" != "no"; then
     PHP_SUBST(SAPI_CGI_PATH)
     PHP_SUBST(BUILD_CGI)
 
-    PHP_OUTPUT(sapi/cgi/php-cgi.1)
+    AC_CONFIG_FILES([sapi/cgi/php-cgi.1])
 else
   AC_MSG_RESULT(no)
 fi
diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4
index 917d45fad17ac..39455f0b1126a 100644
--- a/sapi/cli/config.m4
+++ b/sapi/cli/config.m4
@@ -54,7 +54,7 @@ if test "$PHP_CLI" != "no"; then
   PHP_SUBST(SAPI_CLI_PATH)
   PHP_SUBST(BUILD_CLI)
 
-  PHP_OUTPUT(sapi/cli/php.1)
+  AC_CONFIG_FILES([sapi/cli/php.1])
 
   PHP_INSTALL_HEADERS([sapi/cli/cli.h])
 fi
diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4
index 24d42d2bf06d2..67aae8593a61d 100644
--- a/sapi/fpm/config.m4
+++ b/sapi/fpm/config.m4
@@ -634,7 +634,16 @@ if test "$PHP_FPM" != "no"; then
 
   PHP_ADD_BUILD_DIR(sapi/fpm/fpm)
   PHP_ADD_BUILD_DIR(sapi/fpm/fpm/events)
-  PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/www.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html)
+
+  AC_CONFIG_FILES([
+    sapi/fpm/init.d.php-fpm
+    sapi/fpm/php-fpm.8
+    sapi/fpm/php-fpm.conf
+    sapi/fpm/php-fpm.service
+    sapi/fpm/status.html
+    sapi/fpm/www.conf
+  ])
+
   PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag])
 
   SAPI_FPM_PATH=sapi/fpm/php-fpm
diff --git a/sapi/phpdbg/config.m4 b/sapi/phpdbg/config.m4
index d4bceed4f78a4..076d99987b35b 100644
--- a/sapi/phpdbg/config.m4
+++ b/sapi/phpdbg/config.m4
@@ -88,7 +88,7 @@ if test "$BUILD_PHPDBG" = "" && test "$PHP_PHPDBG" != "no"; then
   PHP_SUBST(BUILD_PHPDBG)
   PHP_SUBST(BUILD_PHPDBG_SHARED)
 
-  PHP_OUTPUT(sapi/phpdbg/phpdbg.1)
+  AC_CONFIG_FILES([sapi/phpdbg/phpdbg.1])
 fi
 
 if test "$PHP_PHPDBG_WEBHELPER" != "no"; then
diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag
index bfbac62ab3dd3..5634435cad3dc 100644
--- a/scripts/Makefile.frag
+++ b/scripts/Makefile.frag
@@ -47,7 +47,7 @@ install-programs: $(builddir)/phpize $(builddir)/php-config
 	done
 
 $(builddir)/phpize: $(srcdir)/phpize.in $(top_builddir)/config.status
-	(CONFIG_FILES=$@ CONFIG_HEADERS= $(top_builddir)/config.status)
+	$(top_builddir)/config.status $@
 
 $(builddir)/php-config: $(srcdir)/php-config.in $(top_builddir)/config.status
-	(CONFIG_FILES=$@ CONFIG_HEADERS= $(top_builddir)/config.status)
+	$(top_builddir)/config.status $@