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

Introducing configure option --with-php-ldflags=.

Browse Source
This commit is contained in:
Igor Sysoev
2017-08-04 08:21:22 +03:00
parent fc6c4fdeb6
commit e62840cd54
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
auto/modules/php/conf
View File

@@ -3,6 +3,7 @@
# Copyright (C) NGINX, Inc. # Copyright (C) NGINX, Inc.
$echo -n "checking for PHP ..."
$echo "checking for PHP ..." >> $NXT_AUTOCONF_ERR $echo "checking for PHP ..." >> $NXT_AUTOCONF_ERR
nxt_found=no nxt_found=no
@@ -11,16 +12,21 @@ NXT_PHP_CONFIG="${NXT_PHP}-config"
if /bin/sh -c "${NXT_PHP_CONFIG} --version" >> $NXT_AUTOCONF_ERR 2>&1; then if /bin/sh -c "${NXT_PHP_CONFIG} --version" >> $NXT_AUTOCONF_ERR 2>&1; then
$echo " found"
NXT_PHP_VERSION="`${NXT_PHP_CONFIG} --version`" NXT_PHP_VERSION="`${NXT_PHP_CONFIG} --version`"
$echo " + PHP version: ${NXT_PHP_VERSION}"
$echo " + PHP SAPI: [`${NXT_PHP_CONFIG} --php-sapis`]"
NXT_PHP_INCLUDE="`${NXT_PHP_CONFIG} --includes`" NXT_PHP_INCLUDE="`${NXT_PHP_CONFIG} --includes`"
NXT_PHP_LIB="-lphp${NXT_PHP_VERSION%%.*}" NXT_PHP_LIB="-lphp${NXT_PHP_VERSION%%.*}"
NXT_PHP_LIBS="`${NXT_PHP_CONFIG} --ldflags`" # "php-config --ldflags" does not contain path to libphp.
nxt_feature="PHP" nxt_feature="PHP embed SAPI"
nxt_feature_name=NXT_HAVE_PHP nxt_feature_name=NXT_HAVE_PHP
nxt_feature_run=no nxt_feature_run=no
nxt_feature_incs="${NXT_PHP_INCLUDE}" nxt_feature_incs="${NXT_PHP_INCLUDE}"
nxt_feature_libs="${NXT_PHP_LIB} ${NXT_PHP_LIBS}" nxt_feature_libs="${NXT_PHP_LIB} ${NXT_PHP_LDFLAGS}"
nxt_feature_test=" nxt_feature_test="
#include <php.h> #include <php.h>
#include <php_main.h> #include <php_main.h>
@@ -34,15 +40,12 @@ if /bin/sh -c "${NXT_PHP_CONFIG} --version" >> $NXT_AUTOCONF_ERR 2>&1; then
fi 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 embed SAPI found.
$echo $echo
exit 1; exit 1;
fi fi
$echo " + PHP version: ${NXT_PHP_VERSION}"
NXT_PHP_MODULE_SRCS=" \ NXT_PHP_MODULE_SRCS=" \
src/nxt_php_sapi.c \ src/nxt_php_sapi.c \
" "
@@ -50,4 +53,4 @@ NXT_PHP_MODULE_SRCS=" \
NXT_MODULES_INIT="$NXT_MODULES_INIT nxt_php_sapi_init" NXT_MODULES_INIT="$NXT_MODULES_INIT nxt_php_sapi_init"
NXT_MODULES_SRCS="$NXT_MODULES_SRCS $NXT_PHP_MODULE_SRCS" NXT_MODULES_SRCS="$NXT_MODULES_SRCS $NXT_PHP_MODULE_SRCS"
NXT_LIB_AUX_LIBS="$NXT_LIB_AUX_LIBS $NXT_PHP_LIB $NXT_PHP_LIBS" NXT_LIB_AUX_LIBS="$NXT_LIB_AUX_LIBS $NXT_PHP_LIB $NXT_PHP_LDFLAGS"

2
auto/options
View File

@@ -45,6 +45,7 @@ NXT_PYTHON=python
NXT_PYTHON_MODULE=NO NXT_PYTHON_MODULE=NO
NXT_PHP=php NXT_PHP=php
NXT_PHP_LDFLAGS=
NXT_PHP_MODULE=NO NXT_PHP_MODULE=NO
NXT_GO=go NXT_GO=go
@@ -99,6 +100,7 @@ do
--with-python_module) NXT_PYTHON_MODULE=YES ;; --with-python_module) NXT_PYTHON_MODULE=YES ;;
--with-php=*) NXT_PHP="$value" ;; --with-php=*) NXT_PHP="$value" ;;
--with-php-ldflags=*) NXT_PHP_LDFLAGS="$value" ;;
--with-php_module) NXT_PHP_MODULE=YES ;; --with-php_module) NXT_PHP_MODULE=YES ;;
--with-go=*) NXT_GO="$value" ;; --with-go=*) NXT_GO="$value" ;;