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

Improved PHP configure test.

Browse Source
This commit is contained in:
Igor Sysoev
2017-07-26 12:17:41 +03:00
parent 237bd6b1c2
commit 145eeb8476
1 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
auto/modules/php/conf
View File

@@ -3,18 +3,26 @@
# Copyright (C) NGINX, Inc. # Copyright (C) NGINX, Inc.
NXT_PHP_CONFIG="${NXT_PHP}-config" $echo "checking for PHP ..." >> $NXT_AUTOCONF_ERR
NXT_PHP_VERSION="`${NXT_PHP_CONFIG} --version`"
NXT_PHP_INCLUDE="`${NXT_PHP_CONFIG} --includes`"
NXT_PHP_LIB="-lphp${NXT_PHP_VERSION%%.*}"
NXT_PHP_LIBS="`${NXT_PHP_CONFIG} --ldflags`"
nxt_feature="PHP" nxt_found=no
nxt_feature_name=NXT_HAVE_PHP
nxt_feature_run=no NXT_PHP_CONFIG="${NXT_PHP}-config"
nxt_feature_incs="${NXT_PHP_INCLUDE}"
nxt_feature_libs="${NXT_PHP_LIB} ${NXT_PHP_LIBS}" if /bin/sh -c "${NXT_PHP_CONFIG} --version" >> $NXT_AUTOCONF_ERR 2>&1; then
nxt_feature_test="#include <php.h>
NXT_PHP_VERSION="`${NXT_PHP_CONFIG} --version`"
NXT_PHP_INCLUDE="`${NXT_PHP_CONFIG} --includes`"
NXT_PHP_LIB="-lphp${NXT_PHP_VERSION%%.*}"
NXT_PHP_LIBS="`${NXT_PHP_CONFIG} --ldflags`"
nxt_feature="PHP"
nxt_feature_name=NXT_HAVE_PHP
nxt_feature_run=no
nxt_feature_incs="${NXT_PHP_INCLUDE}"
nxt_feature_libs="${NXT_PHP_LIB} ${NXT_PHP_LIBS}"
nxt_feature_test="
#include <php.h>
#include <php_main.h> #include <php_main.h>
int main() { int main() {
@@ -22,16 +30,18 @@ nxt_feature_test="#include <php.h>
return 0; return 0;
}" }"
. auto/feature . auto/feature
fi
if [ $nxt_found = no ]; then if [ $nxt_found = no ]; then
$echo "checking for PHP ..."
$echo $echo
$echo $0: error: no php found. $echo $0: error: no PHP found.
$echo $echo
exit 1; exit 1;
fi fi
$echo " + php version: ${NXT_PHP_VERSION}" $echo " + PHP version: ${NXT_PHP_VERSION}"
NXT_PHP_MODULE_SRCS=" \ NXT_PHP_MODULE_SRCS=" \
src/nxt_php_sapi.c \ src/nxt_php_sapi.c \