Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Autotools: Refactor dmalloc check #14726

Merged
merged 1 commit into from
Jul 7, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -995,15 +995,12 @@ PHP_ARG_ENABLE([dmalloc],
[no],
[no])

if test "$PHP_DMALLOC" = "yes"; then
AC_CHECK_LIB(dmalloc, dmalloc_error, [
PHP_ADD_LIBRARY(dmalloc)
AC_DEFINE(HAVE_DMALLOC,1,[Whether you have dmalloc])
CPPFLAGS="$CPPFLAGS -DDMALLOC_FUNC_CHECK"
], [
AC_MSG_ERROR([Problem with enabling dmalloc. Please check config.log for details.])
])
fi
AS_VAR_IF([PHP_DMALLOC], [yes],
[AC_CHECK_LIB([dmalloc], [dmalloc_error],
[PHP_ADD_LIBRARY([dmalloc])
AC_DEFINE([HAVE_DMALLOC], [1], [Define to 1 if you have dmalloc.])
AS_VAR_APPEND([CPPFLAGS], [" -DDMALLOC_FUNC_CHECK"])],
[AC_MSG_ERROR([Problem with enabling dmalloc. Please, check config.log for details.])])])

PHP_ARG_ENABLE([ipv6],
[whether to enable IPv6 support],
Expand Down
Loading