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

Improved Python configure test.

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

19
auto/modules/python/conf
View File

@@ -3,23 +3,24 @@
# Copyright (C) NGINX, Inc. # Copyright (C) NGINX, Inc.
$echo "checking for Python ..." >> $NXT_AUTOCONF_ERR
nxt_found=no
NXT_PYTHON_CONFIG="${NXT_PYTHON}-config" NXT_PYTHON_CONFIG="${NXT_PYTHON}-config"
NXT_PYTHON_VERSION=`${NXT_PYTHON} -c \ if /bin/sh -c "$NXT_PYTHON_CONFIG --prefix" >> $NXT_AUTOCONF_ERR 2>&1; then
'import sys; \
sys.stdout.write(sys.version[:3])'`
NXT_PYTHON_INCLUDE=`${NXT_PYTHON_CONFIG} --includes` NXT_PYTHON_INCLUDE=`${NXT_PYTHON_CONFIG} --includes`
NXT_PYTHON_LIBS=`${NXT_PYTHON_CONFIG} --ldflags` NXT_PYTHON_LIBS=`${NXT_PYTHON_CONFIG} --ldflags`
nxt_feature="Python" nxt_feature="Python"
nxt_feature_name=NXT_HAVE_PYTHON nxt_feature_name=NXT_HAVE_PYTHON
nxt_feature_run=no nxt_feature_run=no
nxt_feature_incs="${NXT_PYTHON_INCLUDE}" nxt_feature_incs="${NXT_PYTHON_INCLUDE}"
nxt_feature_libs="${NXT_PYTHON_LIBS}" nxt_feature_libs="${NXT_PYTHON_LIBS}"
nxt_feature_test="#include <Python.h> nxt_feature_test="
#include <Python.h>
int main() { int main() {
Py_Initialize(); Py_Initialize();
@@ -27,8 +28,10 @@ nxt_feature_test="#include <Python.h>
}" }"
. auto/feature . auto/feature
fi
if [ $nxt_found = no ]; then if [ $nxt_found = no ]; then
$echo "checking for Python ..."
$echo $echo
$echo $0: error: no Python found. $echo $0: error: no Python found.
$echo $echo
@@ -36,6 +39,10 @@ if [ $nxt_found = no ]; then
fi fi
NXT_PYTHON_VERSION=`${NXT_PYTHON} -c \
'import sys; \
sys.stdout.write(sys.version[:3])'`
$echo " + Python version: ${NXT_PYTHON_VERSION}" $echo " + Python version: ${NXT_PYTHON_VERSION}"