Olga Sergijenko / ctools

Commit dac2b7d4515852e2ab9d90d93b62d0d4de5ca3ad

Authored by Jürgen Knödlseder
1 parent d6e75179

Add Python include path in search for Python.h (#3329) 

# Conflicts:
#	NEWS
#	README.md
Inline Side-by-side
Showing 3 changed files with 14 additions and 5 deletions
ChangeLog
  View file @dac2b7d
@@ -4,11 +4,12 @@ @@ -4,11 +4,12 @@
4 ======================== 4 ========================
5 5
6 6
7 -2020-08-21 7 +2020-09-04
8 8
9 * Bug fix version 1.7.1 released 9 * Bug fix version 1.7.1 released
10 ================================ 10 ================================
11 11
  12 + Add Python include path in search for Python.h (#3329)
12 Test for Big Sur in configuration step (#3326) 13 Test for Big Sur in configuration step (#3326)
13 Copy Python module into pyext/ctools folder (#3322) 14 Copy Python module into pyext/ctools folder (#3322)
14 Add units to reference manual of response cube tools (#3321) 15 Add units to reference manual of response cube tools (#3321)
configure.ac
  View file @dac2b7d
@@ -686,7 +686,10 @@ else @@ -686,7 +686,10 @@ else
686 python_path=`$PYTHON -c "import distutils.sysconfig; \ 686 python_path=`$PYTHON -c "import distutils.sysconfig; \
687 print(distutils.sysconfig.get_python_inc());"` 687 print(distutils.sysconfig.get_python_inc());"`
688 if test -n "${python_path}"; then 688 if test -n "${python_path}"; then
689 - AC_CHECK_HEADERS($python_path/Python.h, [has_python_h="yes"], [has_python_h="no"]) 689 + SAVED_CPPFLAGS="$CPPFLAGS"
  690 + CPPFLAGS="$CPPFLAGS -I$python_path"
  691 + AC_CHECK_HEADERS($python_path/Python.h, [has_python_h="yes"], [has_python_h="no"])
  692 + CPPFLAGS=$SAVED_CPPFLAGS
690 python_path="-I$python_path" 693 python_path="-I$python_path"
691 fi 694 fi
692 PYTHON_CPPFLAGS=$python_path 695 PYTHON_CPPFLAGS=$python_path
@@ -727,8 +730,11 @@ else @@ -727,8 +730,11 @@ else
727 PY_INCLUDE="$PY_INCLUDE$PYTHON_VERSION" 730 PY_INCLUDE="$PY_INCLUDE$PYTHON_VERSION"
728 731
729 # Check if we have Python.h 732 # Check if we have Python.h
  733 + SAVED_CPPFLAGS="$CPPFLAGS"
  734 + CPPFLAGS="$CPPFLAGS -I$PY_INCLUDE"
730 AC_CHECK_HEADERS($PY_INCLUDE/Python.h, [has_python_h="yes"], [has_python_h="no"]) 735 AC_CHECK_HEADERS($PY_INCLUDE/Python.h, [has_python_h="yes"], [has_python_h="no"])
731 - 736 + CPPFLAGS=$SAVED_CPPFLAGS
  737 +
732 # Signal any problem 738 # Signal any problem
733 if test "x$has_python_h" = "xno"; then 739 if test "x$has_python_h" = "xno"; then
734 AC_MSG_WARN([No Python header file "$PY_INCLUDE/Python.h" found. Please install appropriate Python development package.]) 740 AC_MSG_WARN([No Python header file "$PY_INCLUDE/Python.h" found. Please install appropriate Python development package.])
doc/source/admin/release_history/1.7.1.rst
  View file @dac2b7d
1 .. _1.7.1: 1 .. _1.7.1:
2 2
3 -ctools 1.7.1 release (21 August 2020)  
4 -===================================== 3 +ctools 1.7.1 release (4 September 2020)
  4 +=======================================
5 5
6 Overview 6 Overview
7 -------- 7 --------
@@ -10,6 +10,8 @@ ctools 1.7.1 is a bug fix release for ctools release 1.7. @@ -10,6 +10,8 @@ ctools 1.7.1 is a bug fix release for ctools release 1.7.
10 10
11 The following bugs were fixed: 11 The following bugs were fixed:
12 12
  13 +* [`3329 <https://cta-redmine.irap.omp.eu/issues/3329>`_] -
  14 +Add Python include path in search for ``Python.h``
13 * [`3326 <https://cta-redmine.irap.omp.eu/issues/3326>`_] - 15 * [`3326 <https://cta-redmine.irap.omp.eu/issues/3326>`_] -
14 Test for Big Sur in configuration step 16 Test for Big Sur in configuration step
15 * [`3322 <https://cta-redmine.irap.omp.eu/issues/3322>`_] - 17 * [`3322 <https://cta-redmine.irap.omp.eu/issues/3322>`_] -