From 2b120099cba7ae03a7e7e2e30c5cd8468401ee92 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Mon, 8 Jul 2024 16:23:24 +0200 Subject: [PATCH] Autotools: Remove unused DEBUG_CFLAGS variable This removes the unused DEBUG_CFLAGS variable from configure.ac. It has been once set in the build files similarly to Zend.m4 but was then removed and simplified. CS synced and DEBUG_CFLAGS checked and appended with AS_VAR_* macros. --- Zend/Zend.m4 | 2 +- configure.ac | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Zend/Zend.m4 b/Zend/Zend.m4 index 2c801c34e057..c4e6086d0f7f 100644 --- a/Zend/Zend.m4 +++ b/Zend/Zend.m4 @@ -190,7 +190,7 @@ AX_CHECK_COMPILE_FLAG([-Wformat-truncation], CFLAGS="-Wformat-truncation $CFLAGS AX_CHECK_COMPILE_FLAG([-Wstrict-prototypes], CFLAGS="-Wstrict-prototypes $CFLAGS", , [-Werror]) AX_CHECK_COMPILE_FLAG([-fno-common], CFLAGS="-fno-common $CFLAGS", , [-Werror]) -test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS" +AS_VAR_IF([DEBUG_CFLAGS],,, [AS_VAR_APPEND([CFLAGS], [" $DEBUG_CFLAGS"])]) if test "$ZEND_ZTS" = "yes"; then AC_DEFINE(ZTS,1,[ ]) diff --git a/configure.ac b/configure.ac index eee1e3a60fdd..5374a179deb3 100644 --- a/configure.ac +++ b/configure.ac @@ -938,8 +938,6 @@ if test "$PHP_CONFIG_FILE_SCAN_DIR" = "DEFAULT"; then fi AC_MSG_RESULT([$PHP_CONFIG_FILE_SCAN_DIR]) -test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS" - PHP_ARG_ENABLE([sigchild], [whether to enable PHP's own SIGCHLD handler], [AS_HELP_STRING([--enable-sigchild],