Skip to content

Commit 49a08d5

Browse files
authored
Autotools: Move HAVE_DTRACE to configure.ac (#15160)
Following 32210ce and 9ea290b, 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.
1 parent 4d46f26 commit 49a08d5

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

build/php.m4

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2387,7 +2387,6 @@ EOF
23872387
;;
23882388
esac
23892389
2390-
AC_DEFINE([HAVE_DTRACE], [1], [Define to 1 if DTrace support is enabled.])
23912390
PHP_SUBST([PHP_DTRACE_OBJS])
23922391
])
23932392

configure.ac

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,15 +1013,17 @@ PHP_ARG_ENABLE([dtrace],
10131013
[no],
10141014
[no])
10151015

1016-
AS_VAR_IF([PHP_DTRACE], [yes],
1017-
[PHP_INIT_DTRACE([Zend/zend_dtrace.d], [Zend/zend_dtrace_gen.h], [
1016+
AS_VAR_IF([PHP_DTRACE], [yes], [
1017+
PHP_INIT_DTRACE([Zend/zend_dtrace.d], [Zend/zend_dtrace_gen.h], [
10181018
main/main.c
10191019
Zend/zend_API.c
10201020
Zend/zend_dtrace.c
10211021
Zend/zend_exceptions.c
10221022
Zend/zend_execute.c
10231023
Zend/zend.c
1024-
])])
1024+
])
1025+
AC_DEFINE([HAVE_DTRACE], [1], [Define to 1 if DTrace support is enabled.])
1026+
])
10251027

10261028
AC_MSG_CHECKING([how big to make fd sets])
10271029
PHP_ARG_ENABLE([fd-setsize],,

0 commit comments

Comments
 (0)