Skip to content

Commit e7874f2

Browse files
authored
Autotools: Move Zend/zend_config.h to AC_CONFIG_COMMANDS (#15538)
Instead of creating Zend/zend_config.h header file in an initialization argument of "default" commands, this creates it in its own wrapper when config.status is called.
1 parent 6a51062 commit e7874f2

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

configure.ac

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1796,6 +1796,12 @@ AC_CONFIG_FILES([
17961796

17971797
AC_CONFIG_COMMANDS_PRE([PHP_PATCH_CONFIG_HEADERS([main/php_config.h.in])])
17981798

1799+
AC_CONFIG_COMMANDS([Zend/zend_config.h], [
1800+
cat >Zend/zend_config.h <<FEO
1801+
#include <../main/php_config.h>
1802+
FEO
1803+
])
1804+
17991805
AC_CONFIG_COMMANDS([main/internal_functions.c], [], [
18001806
AWK="$AWK" $SHELL $srcdir/build/genif.sh \
18011807
$srcdir/main/internal_functions.c.in \
@@ -1808,7 +1814,7 @@ AC_CONFIG_COMMANDS([main/internal_functions_cli.c], [], [
18081814
"$EXT_CLI_STATIC" > main/internal_functions_cli.c
18091815
])
18101816

1811-
AC_CONFIG_COMMANDS([default],[
1817+
AC_CONFIG_COMMANDS([default], [
18121818
cat <<X
18131819
18141820
+--------------------------------------------------------------------+
@@ -1823,11 +1829,5 @@ cat <<X
18231829
Thank you for using PHP.
18241830
18251831
X
1826-
],[
1827-
dnl Create configuration headers.
1828-
dnl ----------------------------------------------------------------------------
1829-
cat >Zend/zend_config.h <<FEO
1830-
#include <../main/php_config.h>
1831-
FEO
18321832
])
18331833
AC_OUTPUT

0 commit comments

Comments
 (0)