| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From b01bb2694f66cd981e6d61523433dc3eb5ed32f2 Mon Sep 17 00:00:00 2001 |
| 2 | From: Li xin <lixin.fnst@cn.fujitsu.com> |
| 3 | Date: Sat, 18 Jul 2015 23:03:30 +0900 |
| 4 | Subject: [PATCH] configure.ac - Avoid an incorrect check for python. |
| 5 | Makefile.am - avoid hard coded host include paths. |
| 6 | |
| 7 | Upstream-Status: pending |
| 8 | |
| 9 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
| 10 | Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> |
| 11 | --- |
| 12 | bindings/python/Makefile.am | 3 ++- |
| 13 | configure.ac | 15 ++------------- |
| 14 | 2 files changed, 4 insertions(+), 14 deletions(-) |
| 15 | |
| 16 | diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am |
| 17 | index 82b9bb8..f9fe7a8 100644 |
| 18 | --- a/bindings/python/Makefile.am |
| 19 | +++ b/bindings/python/Makefile.am |
| 20 | @@ -23,7 +23,8 @@ SUBDIRS = test |
| 21 | CONFIG_CLEAN_FILES = *.loT *.rej *.orig |
| 22 | AM_CFLAGS = -fPIC -DPIC |
| 23 | PYLIBVER ?= python$(PYTHON_VERSION) |
| 24 | -AM_CPPFLAGS = -I. -I$(top_builddir) -I@PYINCLUDEDIR@ |
| 25 | +PYINC ?= /usr/include/$(PYLIBVER) |
| 26 | +AM_CPPFLAGS = -I. -I$(top_builddir) -I$(PYINC) |
| 27 | LIBS = $(top_builddir)/src/libcap-ng.la |
| 28 | SWIG_FLAGS = -python |
| 29 | SWIG_INCLUDES = ${AM_CPPFLAGS} |
| 30 | diff --git a/configure.ac b/configure.ac |
| 31 | index 1d777d5..9d90f64 100644 |
| 32 | --- a/configure.ac |
| 33 | +++ b/configure.ac |
| 34 | @@ -123,19 +123,8 @@ if test x$use_python = xno ; then |
| 35 | else |
| 36 | AC_MSG_RESULT(testing) |
| 37 | AM_PATH_PYTHON |
| 38 | -PYINCLUDEDIR=`python${am_cv_python_version} -c "from distutils import sysconfig; print(sysconfig.get_config_var('INCLUDEPY'))"` |
| 39 | -if test -f ${PYINCLUDEDIR}/Python.h ; then |
| 40 | - python_found="yes" |
| 41 | - AC_SUBST(PYINCLUDEDIR) |
| 42 | - AC_MSG_NOTICE(Python bindings will be built) |
| 43 | -else |
| 44 | - python_found="no" |
| 45 | - if test x$use_python = xyes ; then |
| 46 | - AC_MSG_ERROR([Python explicitly required and python headers found]) |
| 47 | - else |
| 48 | - AC_MSG_WARN("Python headers not found - python bindings will not be made") |
| 49 | - fi |
| 50 | -fi |
| 51 | +python_found="yes" |
| 52 | +AC_MSG_NOTICE(Python bindings will be built) |
| 53 | fi |
| 54 | AM_CONDITIONAL(HAVE_PYTHON, test ${python_found} = "yes") |
| 55 | |
| 56 | -- |
| 57 | 1.8.4.2 |
| 58 | |