Changeset 6039c6 in git for m4/ax_python_embed.m4

Timestamp:

Apr 10, 2017, 3:44:33 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '98550b669234b32be762076c32b3be2c35188ac4')

Children:

7626a494d17999205045943cef22e9c6ab6c9f63

Parents:

8a20520a56cabf3ab18f0ccf689a7f4d0910d24a

Message:

update: ax_python_embed.m4 to version 15 (port: debian 9)

File:

• m4/ax_python_embed.m4 (modified) (12 diffs)

m4/ax_python_embed.m4

@@ -1 +1 @@
 # ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_python_embed.html
+#     https://www.gnu.org/software/autoconf-archive/ax_python_embed.html
 # ===========================================================================
 #
@@ -121 +121 @@
 #   warranty.
 
-#serial 8
+#serial 15
 
 # AX_PYTHON_DEFAULT( )
@@ -140 +140 @@
 # Input:
 #   $1 is the optional search path for the python executable if needed
-# Ouput:
+# Output:
 #   PYTHON_USE (AM_CONDITIONAL) is true if python executable found
 #   and --enable-python was requested; otherwise false.
@@ -171 +171 @@
                     # "yes" was specified, but we don't have a path
                     # for the executable.
-                    # So, let's searth the PATH Environment Variable.
+                    # So, let's search the PATH Environment Variable.
                     AC_MSG_RESULT(yes)
                     AC_PATH_PROG(
@@ -224 +224 @@
     if test -n "$PYTHON"
     then
-        ax_python_prefix=`${PYTHON}-config --prefix`
+        ax_python_prefix=`${PYTHON} -c "import sys; print(sys.prefix)"`
         if test -z "$ax_python_prefix"
         then
             AC_MSG_ERROR([Python Prefix is not known])
         fi
-#        ax_python_execprefix=`${PYTHON}-config --exec-prefix`
-#        ax_python_version=`$PYTHON -c "import sys; print sys.version[[:3]]"`
-#        ax_python_includespec="-I${ax_python_prefix}/include/python${ax_python_version}"
-#        if test x"$python_prefix" != x"$python_execprefix"; then
-#            ax_python_execspec="-I${ax_python_execprefix}/include/python${ax_python_version}"
-#            ax_python_includespec="${ax_python_includespec} $ax_python_execspec"
-#        fi
-        ax_python_cspec=`${PYTHON}-config --cflags | sed -e 's@ -mno-fused-madd @ @g'`
-        #   or -Qunused-arguments / clang :(
-#        ax_python_cspec="${ax_python_ccshared} ${ax_python_includespec}"
+        ax_python_execprefix=`${PYTHON} -c "import sys; print(sys.exec_prefix)"`
+        ax_python_version=`$PYTHON -c "import sys; print(sys.version[[:3]])"`
+        ax_python_includespec="-I${ax_python_prefix}/include/python${ax_python_version}"
+        if test x"$python_prefix" != x"$python_execprefix"; then
+            ax_python_execspec="-I${ax_python_execprefix}/include/python${ax_python_version}"
+            ax_python_includespec="${ax_python_includespec} $ax_python_execspec"
+        fi
+        ax_python_ccshared=`${PYTHON} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('CFLAGSFORSHARED'))"`
+        ax_python_cspec="${ax_python_ccshared} ${ax_python_includespec}"
         AC_SUBST([PYTHON_CSPEC], [${ax_python_cspec}])
         AC_MSG_NOTICE([PYTHON_CSPEC=${ax_python_cspec}])
@@ -270 +269 @@
 AC_DEFUN([AX_PYTHON_LSPEC],
 [
-
     AC_ARG_VAR( [PYTHON], [Python Executable Path] )
     if test -n "$PYTHON"
     then
-
         AX_PYTHON_RUN([
 import sys
@@ -304 +301 @@
     # other included Frameworks.  However, it is necessary
     # where someone has installed more than one frameworked
-    # Python.  Frameworks are really only used in Mac OS X.
+    # Python.  Frameworks are really only used in MacOSX.
     strLibFW = dictConfig.get("PYTHONFRAMEWORKPREFIX")
     if strLibFW and (strLibFW != ""):
         strLinkSpec += " -F%s" % (strLibFW)
 strLinkSpec += " %s" % (dictConfig.get('LINKFORSHARED'))
-print strLinkSpec
+print(strLinkSpec)
         ])
-
-#        AC_SUBST([PYTHON_LSPEC], [${ax_python_output}])
-#        AC_MSG_NOTICE([PYTHON_LSPEC=${ax_python_output}])
-
-        ax_python_lspec=`${PYTHON}-config --ldflags`
-        AC_SUBST([PYTHON_LSPEC], [${ax_python_lspec}])
-        AC_MSG_NOTICE([PYTHON_LSPEC=${ax_python_lspec}])
-
+        AC_SUBST([PYTHON_LSPEC], [${ax_python_output}])
+        AC_MSG_NOTICE([PYTHON_LSPEC=${ax_python_output}])
     fi
 ])
@@ -355 +346 @@
         AC_MSG_ERROR([Python Executable Path is not known])
     fi
-    ax_python_prefix=`${PYTHON} -c "import sys; print sys.prefix"`
-    ax_python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"`
+    ax_python_prefix=`${PYTHON} -c "import sys; print(sys.prefix)"`
+    ax_python_execprefix=`${PYTHON} -c "import sys; print(sys.exec_prefix)"`
     AC_SUBST([PYTHON_PREFIX], ["${ax_python_prefix}"])
     AC_SUBST([PYTHON_EXECPREFIX], ["${ax_python_execprefix}"])
@@ -395 +386 @@
 # 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 equivalant (first
+# This test uses sys.hexversion instead of the string equivalent (first
 # word of sys.version), in order to cope with versions such as 2.2c1.
 # hexversion has been introduced in Python 1.5.2; it's probably not
@@ -407 +398 @@
         AC_MSG_CHECKING([whether $PYTHON version >= $1])
         AX_PYTHON_RUN([
-import sys, string
+import sys
 # split strings by '.' and convert to numeric.  Append some zeros
 # because we need at least 4 digits for the hex conversion.
-minver = map(int, string.split('$1', '.')) + [[0, 0, 0]]
+# It accepts a string like "X[.Y[.Z]]" with X,Y,Z=digits
+# and [] means optional.
+minver = list(map(int, '$1'.split('.'))) + [[0, 0, 0]]
+minver[3] = 255
 minverhex = 0
-for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[[i]]
+for i in range(0, 4): minverhex = (minverhex << 8) + minver[[i]]
 if sys.hexversion >= minverhex:
     sys.exit( 0 )
@@ -453 +447 @@
 # Input:
 #   $1 is the optional search path for the python executable if needed
-# Ouput:
+# Output:
 #   PYTHON_USE (AM_CONDITIONAL) is true if python executable found
 #   and --with-python was requested; otherwise false.
@@ -484 +478 @@
                     # "yes" was specified, but we don't have a path
                     # for the executable.
-                    # So, let's searth the PATH Environment Variable.
+                    # So, let's search the PATH Environment Variable.
                     AC_MSG_RESULT(yes)
                     AC_PATH_PROG(