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

Jürgen Knödlseder
1 parent b4f00872
Showing 5 changed files with 19 additions and 8 deletions
ChangeLog
NEWS
README.md
configure.ac
doc/source/admin/release_history/1.7.1.rst
@@ -4,11 +4,12 @@
         ========================
-2020-08-21
+2020-09-04
         * Bug fix version 1.7.1 released
         ================================
+        Add Python include path in search for Python.h (#3329)
         Test for Big Sur in configuration step (#3326)
         Copy Python module into pyext/ctools folder (#3322)
         Add units to reference manual of response cube tools (#3321)
 New Features and Important Changes in ctools 1.7.1
-21 August 2020
+4 September 2020
 Introduction
@@ -11,7 +11,9 @@ ctools release with respect to the precedent release.
 Configuration
 -------------
-None
+The Python include path was added in the Python.h header check in configure.ac
+since due to a bug introduced in Python 3.8 the cpython/initconfig.h header was
+not found (#3329).
 Documentation
 ctools information
 ==================
-* Version:             1.7.1 (20 August 2019)
+* Version:             1.7.1 (4 September 2020)
 * GammaLib dependency: 1.7.1
 [![Build Status](https://cta-jenkins.irap.omp.eu/buildStatus/icon?job=ctools-integrate-os)](https://cta-jenkins.irap.omp.eu/job/ctools-integrate-os/)
@@ -686,7 +686,10 @@ else
       python_path=`$PYTHON -c "import distutils.sysconfig; \
                                print(distutils.sysconfig.get_python_inc());"`
       if test -n "${python_path}"; then
-        AC_CHECK_HEADERS($python_path/Python.h, [has_python_h="yes"], [has_python_h="no"]) 
+        SAVED_CPPFLAGS="$CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS -I$python_path"
+        AC_CHECK_HEADERS($python_path/Python.h, [has_python_h="yes"], [has_python_h="no"])
+        CPPFLAGS=$SAVED_CPPFLAGS
         python_path="-I$python_path"
       fi
       PYTHON_CPPFLAGS=$python_path
@@ -727,8 +730,11 @@ else
       PY_INCLUDE="$PY_INCLUDE$PYTHON_VERSION"
       # Check if we have Python.h
+      SAVED_CPPFLAGS="$CPPFLAGS"
+      CPPFLAGS="$CPPFLAGS -I$PY_INCLUDE"
       AC_CHECK_HEADERS($PY_INCLUDE/Python.h, [has_python_h="yes"], [has_python_h="no"])
-  
+      CPPFLAGS=$SAVED_CPPFLAGS
+
       # Signal any problem
       if test "x$has_python_h" = "xno"; then
         AC_MSG_WARN([No Python header file "$PY_INCLUDE/Python.h" found. Please install appropriate Python development package.])
 .. _1.7.1:
-ctools 1.7.1 release (21 August 2020)
-=====================================
+ctools 1.7.1 release (4 September 2020)
+=======================================
 Overview
 --------
@@ -10,6 +10,8 @@ ctools 1.7.1 is a bug fix release for ctools release 1.7.
 The following bugs were fixed:
+* [`3329 <https://cta-redmine.irap.omp.eu/issues/3329>`_] -
+Add Python include path in search for ``Python.h``
 * [`3326 <https://cta-redmine.irap.omp.eu/issues/3326>`_] -
   Test for Big Sur in configuration step
 * [`3322 <https://cta-redmine.irap.omp.eu/issues/3322>`_] -