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.

Sign up for GitHub

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

Improve autotools AC_ARG_ENABLE usage #193

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Improve autotools AC_ARG_ENABLE usage #193

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce77476
Improve autotools AC_ARG_ENABLE usage
Aug 10, 2016
aa8dfdd
Clean up enable/disable valgrind as well
Aug 10, 2016
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
87 changes: 40 additions & 47 deletions config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,59 +6,52 @@ PHP_ARG_ENABLE(apcu, whether to enable APCu support,

AC_MSG_CHECKING(if APCu should be allowed to use rwlocks)
AC_ARG_ENABLE(apcu-rwlocks,
[ --disable-apcu-rwlocks Disable rwlocks in APCu],
[
PHP_APCU_RWLOCKS=no
AC_MSG_RESULT(no)
],
[
PHP_APCU_RWLOCKS=yes
AC_MSG_RESULT(yes)
])
AS_HELP_STRING([--disable-apcu-rwlocks], [Disable rwlocks in APCu]))
AS_IF([test "x$enable_apcu_rwlocks" != "xno"],
[ PHP_APCU_RWLOCKS=yes ],
[ PHP_APCU_RWLOCKS=no ])
AC_MSG_RESULT($PHP_APCU_RWLOCKS)

AC_MSG_CHECKING(if APCu should be built in debug mode)
AC_ARG_ENABLE(apcu-debug,
[ --enable-apcu-debug Enable APCu debugging],
[
PHP_APCU_DEBUG=$enableval
],
[
PHP_APCU_DEBUG=no
])
AS_HELP_STRING([--enable-apcu-debug], [Enable APCu debugging]))
AS_IF([test "x$enable_apcu_debug" = "xyes"],
[ PHP_APCU_DEBUG=yes ],
[ PHP_APCU_DEBUG=no ])
AC_MSG_RESULT($PHP_APCU_DEBUG)

AC_MSG_CHECKING(if APCu should clear on SIGUSR1)
AC_ARG_ENABLE(apcu-clear-signal,
[ --enable-apcu-clear-signal Enable SIGUSR1 clearing handler],
[
AC_DEFINE(APC_CLEAR_SIGNAL, 1, [ ])
AC_MSG_RESULT(yes)
],
[
AC_MSG_RESULT(no)
])
AS_HELP_STRING([--enable-apcu-clear-signal], [Enable SIGUSR1 clearing handler]))
AS_IF([test "x$enable_apcu_clear_signal" = "xyes"],
[
AC_DEFINE(APC_CLEAR_SIGNAL, 1, [ ])
AC_MSG_RESULT(yes)
],
[ AC_MSG_RESULT(no) ]
)

AC_MSG_CHECKING(if APCu will use mmap or shm)
AC_ARG_ENABLE(apcu-mmap,
[ --disable-apcu-mmap Disable mmap, falls back on shm],
[
PHP_APCU_MMAP=no
AC_MSG_RESULT(shm)
], [
PHP_APCU_MMAP=yes
AC_MSG_RESULT(mmap)
])
AS_HELP_STRING([--disable-apcu-mmap], [Disable mmap, falls back on shm]))
AS_IF([test "x$enable_apcu_mmap" != "xno"],
[
PHP_APCU_MMAP=yes
AC_MSG_RESULT(mmap)
],
[
PHP_APCU_MMAP=no
AC_MSG_RESULT(shm)
]
)

PHP_APCU_SPINLOCK=no
AC_MSG_CHECKING(if APCu should utilize spinlocks before flocks)
AC_ARG_ENABLE(apcu-spinlocks,
[ --enable-apcu-spinlocks Use spinlocks before flocks],
[ if test "x$enableval" = "xno"; then
PHP_APCU_SPINLOCK=no
else
PHP_APCU_SPINLOCK=yes
fi
])
AS_HELP_STRING([--enable-apcu-spinlocks], [Use spinlocks before flocks]))
AS_IF([test "x$enable_apcu_spinlocks" = "xyes"],
[ PHP_APCU_SPINLOCK=yes ],
[ PHP_APCU_SPINLOCK=no ])
AC_MSG_RESULT($PHP_APCU_SPINLOCK)

if test "$PHP_APCU" != "no"; then
Expand Down Expand Up @@ -234,15 +227,15 @@ if test "$PHP_APCU" != "no"; then
fi

AC_ARG_ENABLE(valgrind-checks,
[ --disable-valgrind-checks
Disable valgrind based memory checks],
[
PHP_APCU_VALGRIND=no
], [
PHP_APCU_VALGRIND=yes
AC_CHECK_HEADER(valgrind/memcheck.h,
AS_HELP_STRING([--disable-valgrind-checks], [Disable valgrind based memory checks]))
AS_IF([test "x$enable_valgrind_checks" != "xno"],
[
PHP_APCU_VALGRIND=yes
AC_CHECK_HEADER(valgrind/memcheck.h,
[AC_DEFINE([HAVE_VALGRIND_MEMCHECK_H],1, [enable valgrind memchecks])])
])
],
[ PHP_APCU_VALGRIND=no ]
)

apc_sources="apc.c apc_lock.c php_apc.c \
apc_cache.c \
Expand Down