Changeset 52558a in git

Timestamp:

Apr 1, 2020, 6:42:44 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4cb8c8b789638ea52b5caa93a88616e1e21c1653

Parents:

04929b7464b309106ba29576ca010079b1acdefc

Message:

fix: make distcheck (python stuff, require 2.7)

Files:

• Singular/dyn_modules/machinelearning/tests/test_init_ml.c (modified) (1 diff)
• m4/ax_python_embed.m4 (modified) (5 diffs)

Singular/dyn_modules/machinelearning/tests/test_init_ml.c

@@ -2 +2 @@
 #include <stdlib.h>
 #include "kernel/mod2.h"
+#if defined(HAVE_READLINE) && defined(HAVE_READLINE_READLINE_H)
+#ifdef HAVE_PYTHON
 #include <Python.h>
 #include "mlpredict.h"
 
-#if defined(HAVE_READLINE) && defined(HAVE_READLINE_READLINE_H)
-#ifdef HAVE_PYTHON
 
 /* this is found as an internal function in mlpredict.c, for use in testing */

m4/ax_python_embed.m4

@@ -324 +324 @@
 [
     AC_ARG_VAR( [PYTHON], [Python Executable Path] )
-    AC_PATH_PROG( PYTHON, python, [], $1 )
+    #AC_PATH_PROG( PYTHON, python, [], $1 )
     if test -z "$PYTHON"
     then
-        AC_MSG_ERROR([Python Executable not found])
+        AC_MSG_RESULT([Python Executable not found])
     else
         ax_python_use=true
@@ -385 +385 @@
 # AX_PYTHON_VERSION_CHECK( VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE] )
 # -----------------------------------------------------------------------------
-# Run ACTION-IF-TRUE if the Python interpreter has version >= VERSION.
+# Run ACTION-IF-TRUE if the Python interpreter has version == VERSION.
 # Run ACTION-IF-FALSE otherwise.
 # This test uses sys.hexversion instead of the string equivalent (first
@@ -397 +397 @@
     if test -n "$PYTHON"
     then
-        AC_MSG_CHECKING([whether $PYTHON version >= $1])
+        AC_MSG_CHECKING([whether $PYTHON version == $1])
         AX_PYTHON_RUN([
 import sys
@@ -409 +409 @@
 for i in range(0, 4): minverhex = (minverhex << 8) + minver[[i]]
 if sys.hexversion >= minverhex:
-    sys.exit( 0 )
+    if sys.hexversion <=0x03000000:
+        sys.exit( 0 )
+    else:
+        sys.exit( 1 )
+    fi
 else:
     sys.exit( 1 )
@@ -437 +441 @@
         [$1],
         [AC_MSG_RESULT(yes)],
-        [AC_MSG_ERROR(too old)]
+        [AC_MSG_RESULT(no)
+        PYTHON=""
+        ax_ython_use=false]
     )
 ])