From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca@debian.org>
Date: Fri, 17 Apr 2020 12:18:00 +0200
Subject: Added an extra_compile_args to setup.py

---
 Makefile       |  8 +++++---
 m4/setup_py.m4 | 15 ++++++++-------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index ca92069..a4b4d1e 100644
--- a/Makefile
+++ b/Makefile
@@ -1788,7 +1788,7 @@ $(PY2CBF)/py2cbfuserinstall: $(PY2CBF)/pycbf.py
 
 $(PY2CBF)/py2setup.py: $(PY2CBF)/py2setup_py.m4
 	(m4 -P -Dregexlib=$(REGEX_LIB) -Dregexlib2=$(REGEX_LIB2) \
-	   -Dregexlibdir=$(REGEX_LIBDIR) -Dhdf5_prefix=$(HDF5_PREFIX) \
+	   -Dregexlibdir=$(REGEX_LIBDIR) -Dhdf5_prefix=$(HDF5_PREFIX) -Dextra_compile_args=$(HDF5include)\
 	   $(PY2CBF)/py2setup_py.m4 > $@)
 
 $(PY2CBF)/py2setup_MINGW.py: $(PY2CBF)/setup_py.m4
@@ -1857,10 +1857,12 @@ $(PY3CBF)/py3cbfinstall: $(PY3CBF)/pycbf.py
 $(PY3CBF)/py3cbfuserinstall: $(PY3CBF)/pycbf.py
 	(cd $(PY3CBF); $(PYTHON3) $(INSTALLSETUP_PY) install $(PY3CBFIOPT) --user)
 
-$(PY3CBF)/py3setup.py: $(PY3CBF)/py3setup_py.m4
+$(PY3CBF)/setup.py: $(M4)/setup_py.m4
 	(m4 -P -Dregexlib=$(REGEX_LIB) -Dregexlib2=$(REGEX_LIB2) \
+	   -Ddefine_macros="('SWIG_PYTHON_STRICT_BYTE_CHAR', None)" \
+	   -Dextra_compile_args=$(HDF5include) \
 	   -Dregexlibdir=$(REGEX_LIBDIR) -Dhdf5_prefix=$(HDF5_PREFIX) \
-	   $(PY3CBF)/py3setup_py.m4 > $@)
+	   $(M4)/setup_py.m4 > $@)
 
 $(PY3CBF)/py3setup_MINGW.py: $(PY3CBF)/py3setup_py.m4
 	   (m4 -P -Dregexlib=$(REGEX_LIB) -Dregexlib2=$(REGEX_LIB2) \
diff --git a/m4/setup_py.m4 b/m4/setup_py.m4
index c4c613a..ca606c5 100644
--- a/m4/setup_py.m4
+++ b/m4/setup_py.m4
@@ -1,6 +1,6 @@
 #
 #  pycbf/setup.py generated from m4/setup_py.m4
-# 
+#
 
 `# Import the things to build python binary extensions
 
@@ -10,10 +10,11 @@ from distutils.core import setup, Extension
 
 e = Extension(''`_pycbf''`,
               sources = ["pycbf_wrap.c","../src/cbf_simple.c"],
-         extra_compile_args=["-g"],
-         'm4_ifelse(regexlibdir,`NOREGEXLIBDIR',`library_dirs=["../solib/","../lib/"],',`library_dirs=["../solib/","../lib/","'regexlibdir`"],')`
-         'm4_ifelse(regexlib,`',`libraries=["cbf"],', `m4_ifelse(regexlib2,`',`libraries=["cbf","'regexlib`"],',`libraries=["cbf","'regexlib`","'regexlib2`"],')'  )`
-         include_dirs = ["../include","'hdf5_prefix`/include"] )
-            
+              define_macros=['define_macros`],
+              extra_compile_args=["'extra_compile_args`"],
+              'm4_ifelse(regexlibdir,`NOREGEXLIBDIR',`library_dirs=["../solib/","../lib/"],',`library_dirs=["../solib/","../lib/","'regexlibdir`"],')`
+              'm4_ifelse(regexlib,`',`libraries=["cbf"],', `m4_ifelse(regexlib2,`',`libraries=["cbf","'regexlib`"],',`libraries=["cbf","'regexlib`","'regexlib2`"],')'  )`
+              include_dirs = ["../include","'hdf5_prefix`/include"])
+
 # Build it
-setup(name="_pycbf",ext_modules=[e],)'
+setup(name="_pycbf",ext_modules=[e],py_modules = ["pycbf"])'