From 49a08d5ca31ba7118e02f296dd416afb59f77b4c Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Tue, 30 Jul 2024 07:47:11 +0200 Subject: [PATCH] Autotools: Move HAVE_DTRACE to configure.ac (#15160) Following 32210ce967e169845c8e226286d5f736421953f0 and 9ea290b72b8ba5413c3d9737cd05dfc71ed938d2, this moves the HAVE_DTRACE preprocessor macro definition back to configure.ac so that PHP_INIT_DTRACE Autoconf macro can be used in extensions without redefinition interference. --- build/php.m4 | 1 - configure.ac | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build/php.m4 b/build/php.m4 index 64934c68a02..47cb64eae60 100644 --- a/build/php.m4 +++ b/build/php.m4 @@ -2387,7 +2387,6 @@ EOF ;; esac -AC_DEFINE([HAVE_DTRACE], [1], [Define to 1 if DTrace support is enabled.]) PHP_SUBST([PHP_DTRACE_OBJS]) ]) diff --git a/configure.ac b/configure.ac index 36e74a9cd02..5422e98f995 100644 --- a/configure.ac +++ b/configure.ac @@ -1013,15 +1013,17 @@ PHP_ARG_ENABLE([dtrace], [no], [no]) -AS_VAR_IF([PHP_DTRACE], [yes], - [PHP_INIT_DTRACE([Zend/zend_dtrace.d], [Zend/zend_dtrace_gen.h], [ +AS_VAR_IF([PHP_DTRACE], [yes], [ + PHP_INIT_DTRACE([Zend/zend_dtrace.d], [Zend/zend_dtrace_gen.h], [ main/main.c Zend/zend_API.c Zend/zend_dtrace.c Zend/zend_exceptions.c Zend/zend_execute.c Zend/zend.c - ])]) + ]) + AC_DEFINE([HAVE_DTRACE], [1], [Define to 1 if DTrace support is enabled.]) +]) AC_MSG_CHECKING([how big to make fd sets]) PHP_ARG_ENABLE([fd-setsize],,