technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

PHP: rearranged feature checks in ./configure.

Browse Source 
Now it prints version even if PHP was built without embed SAPI.
This commit is contained in:
Valentin Bartenev
2020-03-04 15:24:27 +03:00
parent 80763b3e64
commit 75cb2a947d
1 changed files with 49 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
auto/modules/php
View File

@@ -110,53 +110,6 @@ if /bin/sh -c "${NXT_PHP_CONFIG} --version" >> $NXT_AUTOCONF_ERR 2>&1; then
fi
fi
nxt_feature="PHP embed SAPI"
nxt_feature_name=""
nxt_feature_run=no
nxt_feature_incs="${NXT_PHP_INCLUDE}"
nxt_feature_libs="${NXT_PHP_LIB} ${NXT_PHP_LDFLAGS}"
nxt_feature_test="
#include <php.h>
#include <php_main.h>
int main() {
php_module_startup(NULL, NULL, 0);
return 0;
}"
. auto/feature
if [ $nxt_found = no ]; then
$echo
$echo $0: error: no PHP embed SAPI found.
$echo
exit 1;
fi
# Bug #71041 (https://bugs.php.net/bug.php?id=71041).
nxt_feature="PHP zend_signal_startup()"
nxt_feature_name=""
nxt_feature_run=no
nxt_feature_incs="${NXT_PHP_INCLUDE}"
nxt_feature_libs="${NXT_PHP_LIB} ${NXT_PHP_LDFLAGS}"
nxt_feature_test="
#include <php.h>
#include <php_main.h>
int main() {
zend_signal_startup();
return 0;
}"
. auto/feature
if [ $nxt_found = yes ]; then
NXT_ZEND_SIGNAL_STARTUP=1
else
NXT_ZEND_SIGNAL_STARTUP=0
fi
else
$echo
$echo $0: error: no PHP found.
@@ -181,6 +134,55 @@ nxt_feature_test="
. auto/feature
nxt_feature="PHP embed SAPI"
nxt_feature_name=""
nxt_feature_run=no
nxt_feature_incs="${NXT_PHP_INCLUDE}"
nxt_feature_libs="${NXT_PHP_LIB} ${NXT_PHP_LDFLAGS}"
nxt_feature_test="
#include <php.h>
#include <php_main.h>
int main() {
php_module_startup(NULL, NULL, 0);
return 0;
}"
. auto/feature
if [ $nxt_found = no ]; then
$echo
$echo $0: error: no PHP embed SAPI found.
$echo
exit 1;
fi
# Bug #71041 (https://bugs.php.net/bug.php?id=71041).
nxt_feature="PHP zend_signal_startup()"
nxt_feature_name=""
nxt_feature_run=no
nxt_feature_incs="${NXT_PHP_INCLUDE}"
nxt_feature_libs="${NXT_PHP_LIB} ${NXT_PHP_LDFLAGS}"
nxt_feature_test="
#include <php.h>
#include <php_main.h>
int main() {
zend_signal_startup();
return 0;
}"
. auto/feature
if [ $nxt_found = yes ]; then
NXT_ZEND_SIGNAL_STARTUP=1
else
NXT_ZEND_SIGNAL_STARTUP=0
fi
if grep ^$NXT_PHP_MODULE: $NXT_MAKEFILE 2>&1 > /dev/null; then
$echo
$echo $0: error: duplicate \"$NXT_PHP_MODULE\" module configured.