Sergio Hernández Cadena / gammalib

Commit c7e07965b4cca95d47265d99b7261b6cb74c22a4

Authored by Jürgen Knödlseder
1 parent 6ea510bf

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

Inline Side-by-side
Showing 5 changed files with 19 additions and 6 deletions
ChangeLog
  View file @c7e0796
... ... @@ -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 modules into pyext/gammalib folder (#3322)
14 15 Write units of response cubes into FITS files (#3321)
... ...
1 1 New Features and Important Changes in GammaLib 1.7.1
2 2  
3   -20 August 2020
  3 +4 September 2020
4 4  
5 5  
6 6 1. Introduction
... ... @@ -38,6 +38,10 @@ The return value of the following methods has been changed:
38 38  
39 39 3. Configuration
40 40 -----------------
  41 +The Python include path was added in the Python.h header check in configure.ac
  42 +since due to a bug introduced in Python 3.8 the cpython/initconfig.h header was
  43 +not found (#3329).
  44 +
41 45 The configuration now checks for Big Sur and later so that the path names in
42 46 the Python modules are adapted as needed (#3326).
43 47  
... ...
README.md
  View file @c7e0796
1 1 GammaLib information
2 2 ====================
3   -* Version: 1.7.1 (20 August 2020)
  3 +* Version: 1.7.1 (4 September 2020)
4 4  
5 5 [![Build Status](https://cta-jenkins.irap.omp.eu/buildStatus/icon?job=gammalib-integrate-os)](https://cta-jenkins.irap.omp.eu/job/gammalib-integrate-os/)
6 6  
... ...
configure.ac
  View file @c7e0796
... ... @@ -921,7 +921,10 @@ else
921 921 python_path=`$PYTHON -c "import distutils.sysconfig; \
922 922 print(distutils.sysconfig.get_python_inc());"`
923 923 if test -n "${python_path}"; then
924   - AC_CHECK_HEADERS($python_path/Python.h, [has_python_h="yes"], [has_python_h="no"])
  924 + SAVED_CPPFLAGS="$CPPFLAGS"
  925 + CPPFLAGS="$CPPFLAGS -I$python_path"
  926 + AC_CHECK_HEADERS($python_path/Python.h, [has_python_h="yes"], [has_python_h="no"])
  927 + CPPFLAGS=$SAVED_CPPFLAGS
925 928 python_path="-I$python_path"
926 929 fi
927 930 PYTHON_CPPFLAGS=$python_path
... ... @@ -963,7 +966,10 @@ else
963 966 PY_INCLUDE="$PY_INCLUDE$PYTHON_VERSION"
964 967  
965 968 # Check if we have Python.h
  969 + SAVED_CPPFLAGS="$CPPFLAGS"
  970 + CPPFLAGS="$CPPFLAGS -I$PY_INCLUDE"
966 971 AC_CHECK_HEADERS($PY_INCLUDE/Python.h, [has_python_h="yes"], [has_python_h="no"])
  972 + CPPFLAGS=$SAVED_CPPFLAGS
967 973  
968 974 fi
969 975  
... ...
doc/source/admin/release_history/1.7.1.rst
  View file @c7e0796
1 1 .. _1.7.1:
2 2  
3   -GammaLib 1.7.1 release (21 August 2020)
4   -=======================================
  3 +GammaLib 1.7.1 release (4 September 2020)
  4 +=========================================
5 5  
6 6 Overview
7 7 --------
... ... @@ -10,6 +10,8 @@ GammaLib 1.7.1 is a bug fix release for GammaLib 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>`_] -
... ...