From a6daded1a4b7d715d9b1585fe9df269ca73e2bac Mon Sep 17 00:00:00 2001
From: Peter Kokot <peterkokot@gmail.com>
Date: Thu, 11 Jul 2019 02:00:51 +0200
Subject: Refactor undefining PACKAGE_* symbols

Instead of patching configuration headers template generated by
the given tools - autoheader, this moves patching these symbols to
the configure step before creating and invoking the config.status
and before the configuration header file is generated from the
patched template.

Closes GH-4374
---
 scripts/phpize.in | 4 ----
 scripts/phpize.m4 | 2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/scripts/phpize.in b/scripts/phpize.in
index 0d89341a75..04864733ae 100644
--- a/scripts/phpize.in
+++ b/scripts/phpize.in
@@ -163,10 +163,6 @@ phpize_autotools()
 
   $PHP_AUTOCONF   || exit 1
   $PHP_AUTOHEADER || exit 1
-
-  # Disable PACKAGE_* symbols in config.h.in
-  $SED -e 's/^#undef PACKAGE_[^ ]*/\/\* & \*\//g' < config.h.in > config.h.in.tmp
-  mv config.h.in.tmp config.h.in
 }
 
 # Main script
diff --git a/scripts/phpize.m4 b/scripts/phpize.m4
index f583a52146..cdd0e12989 100644
--- a/scripts/phpize.m4
+++ b/scripts/phpize.m4
@@ -210,4 +210,6 @@ test -d modules || $php_shtool mkdir modules
 
 AC_CONFIG_HEADERS([config.h])
 
+AC_CONFIG_COMMANDS_PRE([PHP_PATCH_CONFIG_HEADERS([config.h.in])])
+
 AC_OUTPUT
-- 
cgit v1.2.1