@@ -79,13 +79,10 @@ if test "$PHP_APXS2" != "no"; then
79
79
LIBPHP_CFLAGS="-shared"
80
80
PHP_SUBST([ LIBPHP_CFLAGS] )
81
81
82
+ php_sapi_apache2handler_type=shared
82
83
AS_CASE ( [ $host_alias] ,
83
84
[ *aix*] , [
84
85
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp"
85
- PHP_SELECT_SAPI([ apache2handler] ,
86
- [ shared] ,
87
- [ mod_php.c sapi_apache2.c apache_config.c php_functions.c] ,
88
- [ $APACHE_CFLAGS] )
89
86
INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
90
87
] ,
91
88
[ *darwin*] , [
@@ -101,19 +98,16 @@ if test "$PHP_APXS2" != "no"; then
101
98
fi
102
99
MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS"
103
100
PHP_SUBST([ MH_BUNDLE_FLAGS] )
104
- PHP_SELECT_SAPI([ apache2handler] ,
105
- [ bundle] ,
106
- [ mod_php.c sapi_apache2.c apache_config.c php_functions.c] ,
107
- [ $APACHE_CFLAGS] )
101
+ php_sapi_apache2handler_type=bundle
108
102
SAPI_SHARED=libs/libphp.so
109
103
INSTALL_IT="$INSTALL_IT $SAPI_SHARED"
110
- ] , [
111
- PHP_SELECT_SAPI( [ apache2handler ] ,
112
- [ shared ] ,
113
- [ mod_php.c sapi_apache2.c apache_config.c php_functions.c ] ,
114
- [ $APACHE_CFLAGS ] )
115
- INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
116
- ] )
104
+ ] ,
105
+ [ INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" ] )
106
+
107
+ PHP_SELECT_SAPI( [ apache2handler ] ,
108
+ [ $php_sapi_apache2handler_type ] ,
109
+ [ mod_php.c sapi_apache2.c apache_config.c php_functions.c ] ,
110
+ [ $APACHE_CFLAGS ] )
117
111
118
112
AS_IF ( [ $APXS_HTTPD -V 2>/dev/null | grep 'threaded:.*yes' >/dev/null 2>&1] , [
119
113
APACHE_THREADED_MPM=yes
0 commit comments