Veronika Vodeb / ctools

Commit 59ac8cd65f50a8d71c4eb4164c7fb37f8d289ec3

Authored by Jürgen Knödlseder
1 parent b4f00872

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

Inline Side-by-side
Showing 5 changed files with 19 additions and 8 deletions
ChangeLog
  View file @59ac8cd
... ... @@ -4,11 +4,12 @@
4 4 ========================
5 5  
6 6  
7   -2020-08-21
  7 +2020-09-04
8 8  
9 9 * Bug fix version 1.7.1 released
10 10 ================================
11 11  
  12 + Add Python include path in search for Python.h (#3329)
12 13 Test for Big Sur in configuration step (#3326)
13 14 Copy Python module into pyext/ctools folder (#3322)
14 15 Add units to reference manual of response cube tools (#3321)
... ...
1 1 New Features and Important Changes in ctools 1.7.1
2 2  
3   -21 August 2020
  3 +4 September 2020
4 4  
5 5  
6 6 Introduction
... ... @@ -11,7 +11,9 @@ ctools release with respect to the precedent release.
11 11  
12 12 Configuration
13 13 -------------
14   -None
  14 +The Python include path was added in the Python.h header check in configure.ac
  15 +since due to a bug introduced in Python 3.8 the cpython/initconfig.h header was
  16 +not found (#3329).
15 17  
16 18  
17 19 Documentation
... ...
README.md
  View file @59ac8cd
1 1 ctools information
2 2 ==================
3   -* Version: 1.7.1 (20 August 2019)
  3 +* Version: 1.7.1 (4 September 2020)
4 4 * GammaLib dependency: 1.7.1
5 5  
6 6 [![Build Status](https://cta-jenkins.irap.omp.eu/buildStatus/icon?job=ctools-integrate-os)](https://cta-jenkins.irap.omp.eu/job/ctools-integrate-os/)
... ...
configure.ac
  View file @59ac8cd
... ... @@ -686,7 +686,10 @@ else
686 686 python_path=`$PYTHON -c "import distutils.sysconfig; \
687 687 print(distutils.sysconfig.get_python_inc());"`
688 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 693 python_path="-I$python_path"
691 694 fi
692 695 PYTHON_CPPFLAGS=$python_path
... ... @@ -727,8 +730,11 @@ else
727 730 PY_INCLUDE="$PY_INCLUDE$PYTHON_VERSION"
728 731  
729 732 # Check if we have Python.h
  733 + SAVED_CPPFLAGS="$CPPFLAGS"
  734 + CPPFLAGS="$CPPFLAGS -I$PY_INCLUDE"
730 735 AC_CHECK_HEADERS($PY_INCLUDE/Python.h, [has_python_h="yes"], [has_python_h="no"])
731   -
  736 + CPPFLAGS=$SAVED_CPPFLAGS
  737 +
732 738 # Signal any problem
733 739 if test "x$has_python_h" = "xno"; then
734 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 @59ac8cd
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 6 Overview
7 7 --------
... ... @@ -10,6 +10,8 @@ ctools 1.7.1 is a bug fix release for ctools release 1.7.
10 10  
11 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 15 * [`3326 <https://cta-redmine.irap.omp.eu/issues/3326>`_] -
14 16 Test for Big Sur in configuration step
15 17 * [`3322 <https://cta-redmine.irap.omp.eu/issues/3322>`_] -
... ...