Skip to content

Autotools: Simplify PHP_SELECT_SAPI in apache2handler SAPI #15444

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

Merged
merged 1 commit into from
Aug 16, 2024
Merged

Autotools: Simplify PHP_SELECT_SAPI in apache2handler SAPI #15444

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 9 additions & 15 deletions sapi/apache2handler/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,10 @@ if test "$PHP_APXS2" != "no"; then
LIBPHP_CFLAGS="-shared"
PHP_SUBST([LIBPHP_CFLAGS])

php_sapi_apache2handler_type=shared
AS_CASE([$host_alias],
[*aix*], [
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp"
PHP_SELECT_SAPI([apache2handler],
[shared],
[mod_php.c sapi_apache2.c apache_config.c php_functions.c],
[$APACHE_CFLAGS])
INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
],
[*darwin*], [
Expand All @@ -101,19 +98,16 @@ if test "$PHP_APXS2" != "no"; then
fi
MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS"
PHP_SUBST([MH_BUNDLE_FLAGS])
PHP_SELECT_SAPI([apache2handler],
[bundle],
[mod_php.c sapi_apache2.c apache_config.c php_functions.c],
[$APACHE_CFLAGS])
php_sapi_apache2handler_type=bundle
SAPI_SHARED=libs/libphp.so
INSTALL_IT="$INSTALL_IT $SAPI_SHARED"
], [
PHP_SELECT_SAPI([apache2handler],
[shared],
[mod_php.c sapi_apache2.c apache_config.c php_functions.c],
[$APACHE_CFLAGS])
INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
])
],
[INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"])

PHP_SELECT_SAPI([apache2handler],
[$php_sapi_apache2handler_type],
[mod_php.c sapi_apache2.c apache_config.c php_functions.c],
[$APACHE_CFLAGS])

AS_IF([$APXS_HTTPD -V 2>/dev/null | grep 'threaded:.*yes' >/dev/null 2>&1], [
APACHE_THREADED_MPM=yes
Expand Down
Loading