Changeset 9bed75 in git

Timestamp:

Mar 26, 2020, 2:35:26 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

5285968d9d479152f41737f372e71e646b0ae0ee

Parents:

6e9f7be6e3d0003bc83b31dcd6f5711c4c12e09c

Message:

config: test for Python.h

Files:

• Singular/dyn_modules/machinelearning/machinelearning.cc (modified) (2 diffs)
• Singular/dyn_modules/machinelearning/mlpredict.c (modified) (1 diff)
• Singular/dyn_modules/machinelearning/mlpredict.h (modified) (1 diff)
• Singular/dyn_modules/pyobject/pyobject.cc (modified) (2 diffs)
• Singular/dyn_modules/python/python_module.cc (modified) (2 diffs)
• configure.ac (modified) (1 diff)

Singular/dyn_modules/machinelearning/machinelearning.cc

@@ -8 +8 @@
 
 #ifdef HAVE_PYTHON
+#ifdef HAVE_PYTHON_H
 
 #include "mlpredict.h"
@@ -81 +82 @@
 #endif
 #endif
+#endif

Singular/dyn_modules/machinelearning/mlpredict.c

@@ -12 +12 @@
 #include "kernel/mod2.h"
 #if defined(HAVE_READLINE) && defined(HAVE_READLINE_READLINE_H)
-#ifdef HAVE_PYTHON
+#if deffined(HAVE_PYTHON) && defined(HAVE_PYTHON_H)
 
 #include <Python.h>

Singular/dyn_modules/machinelearning/mlpredict.h

@@ -10 +10 @@
 
 #if defined(HAVE_READLINE) && defined(HAVE_READLINE_READLINE_H)
-#ifdef HAVE_PYTHON
+#if defined(HAVE_PYTHON) && defined(HAVE_PYTHON_H)
 #ifdef __cplusplus
 extern "C" {

Singular/dyn_modules/pyobject/pyobject.cc

@@ -15 +15 @@
 #include "kernel/mod2.h"
 #ifdef HAVE_PYTHON
+#ifdef HAVE_PYTHON_H
 
 #include "omalloc/omalloc.h"
@@ -742 +743 @@
 #undef PYOBJECT_ADD_C_PROC
 
+#endif /* HAVE_PYTHON_H */
 #endif /* HAVE_PYTHON */

Singular/dyn_modules/python/python_module.cc

@@ -1 +1 @@
 #include "kernel/mod2.h"
 #ifdef HAVE_PYTHON_MOD
+#ifdef HAVE_PYTHON_H
 #include <stdlib.h>
 #include <stdio.h>
@@ -83 +84 @@
 }
 #endif
+#endif

configure.ac

@@ -129 +129 @@
 AX_PYTHON_WITH_VERSION([2.4])
 AX_PYTHON_DEVEL()
+AC_CHECK_HEADERS(Python.h)
 
 LB_CHECK_MATHICGB