| From b4a354ae8d4f7c2ec3ec421c7d8a790cc57e77a9 Mon Sep 17 00:00:00 2001 |
| From: Li xin <lixin.fnst@cn.fujitsu.com> |
| Date: Sat, 18 Jul 2015 23:03:30 +0900 |
| Subject: [PATCH] configure.ac - Avoid an incorrect check for python. |
| Makefile.am - avoid hard coded host include paths. |
| |
| Upstream-Status: pending |
| |
| Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
| Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> |
| Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
| --- |
| bindings/python/Makefile.am | 4 +++- |
| configure.ac | 17 ++--------------- |
| 2 files changed, 5 insertions(+), 16 deletions(-) |
| |
| diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am |
| index 999b184..c8e49db 100644 |
| --- a/bindings/python/Makefile.am |
| +++ b/bindings/python/Makefile.am |
| @@ -23,7 +23,9 @@ |
| SUBDIRS = test |
| CONFIG_CLEAN_FILES = *.loT *.rej *.orig |
| AM_CFLAGS = -fPIC -DPIC |
| -AM_CPPFLAGS = -I. -I$(top_builddir) -I@PYINCLUDEDIR@ |
| +PYLIBVER ?= python$(PYTHON_VERSION) |
| +PYINC ?= /usr/include/$(PYLIBVER) |
| +AM_CPPFLAGS = -I. -I$(top_builddir) -I$(PYINC) |
| SWIG_FLAGS = -python |
| SWIG_INCLUDES = ${AM_CPPFLAGS} |
| pyexec_PYTHON = capng.py |
| diff --git a/configure.ac b/configure.ac |
| index 7f66179..079d026 100644 |
| --- a/configure.ac |
| +++ b/configure.ac |
| @@ -123,21 +123,8 @@ if test x$use_python = xno ; then |
| else |
| AC_MSG_RESULT(testing) |
| AM_PATH_PYTHON |
| -PYINCLUDEDIR=`python${am_cv_python_version} -c "from distutils import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'))"` |
| -if test -f ${PYINCLUDEDIR}/Python.h ; then |
| - python_found="yes" |
| - AC_SUBST(PYINCLUDEDIR) |
| - pybind_dir="python" |
| - AC_SUBST(pybind_dir) |
| - AC_MSG_NOTICE(Python bindings will be built) |
| -else |
| - python_found="no" |
| - if test x$use_python = xyes ; then |
| - AC_MSG_ERROR([Python explicitly requested and python headers were not found]) |
| - else |
| - AC_MSG_WARN("Python headers not found - python bindings will not be made") |
| - fi |
| -fi |
| +python_found="yes" |
| +AC_MSG_NOTICE(Python bindings will be built) |
| fi |
| AM_CONDITIONAL(HAVE_PYTHON, test ${python_found} = "yes") |
| |
| -- |
| 2.7.4 |
| |