diff m4/ax_python.m4 @ 380:1e1970f93f94 stable-0-6-72

allow all 7 days in bydays recurring appointment, update for fedora python packaging
author Carl Byington <carl@five-ten-sg.com>
date Wed, 01 Aug 2018 08:15:34 -0700
parents 115b871c61a1
children 7eab29e13e61
line wrap: on
line diff
--- a/m4/ax_python.m4	Thu Dec 07 08:51:09 2017 -0800
+++ b/m4/ax_python.m4	Wed Aug 01 08:15:34 2018 -0700
@@ -1,5 +1,5 @@
 # ===========================================================================
-#               http://autoconf-archive.cryp.to/ax_python.html
+#        https://www.gnu.org/software/autoconf-archive/ax_python.html
 # ===========================================================================
 #
 # SYNOPSIS
@@ -10,9 +10,8 @@
 #
 #   This macro does a complete Python development environment check.
 #
-#   It recurses through several python versions (from 2.1 to 2.5 in this
-#   version), looking for an executable. When it finds an executable, it
-#   looks to find the header files and library.
+#   It checks for all known versions. When it finds an executable, it looks
+#   to find the header files and library.
 #
 #   It sets PYTHON_BIN to the name of the python executable,
 #   PYTHON_INCLUDE_DIR to the directory holding the header files, and
@@ -21,11 +20,7 @@
 #   This macro calls AC_SUBST on PYTHON_BIN (via AC_CHECK_PROG),
 #   PYTHON_INCLUDE_DIR and PYTHON_LIB.
 #
-# LAST MODIFICATION
-#
-#   2008-04-12
-#
-# COPYLEFT
+# LICENSE
 #
 #   Copyright (c) 2008 Michael Tindal
 #
@@ -40,7 +35,7 @@
 #   Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#   with this program. If not, see <https://www.gnu.org/licenses/>.
 #
 #   As a special exception, the respective Autoconf Macro's copyright owner
 #   gives unlimited permission to copy, distribute and modify the configure
@@ -51,28 +46,30 @@
 #   all other use of the material that constitutes the Autoconf Macro.
 #
 #   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Macro Archive. When you make and
-#   distribute a modified version of the Autoconf Macro, you may extend this
-#   special exception to the GPL to apply to your modified version as well.
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 18
 
 AC_DEFUN([AX_PYTHON],
-[
-AC_MSG_CHECKING(for python build information)
+[AC_MSG_CHECKING(for python build information)
 AC_MSG_RESULT([])
-for python in python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do
-    AC_CHECK_PROGS(PYTHON_BIN, [$python])
-    ax_python_bin=$PYTHON_BIN
-    if test x$ax_python_bin != x; then
-        AC_CHECK_LIB($ax_python_bin, main, ax_python_lib=$ax_python_bin, ax_python_lib=no)
-        AC_CHECK_HEADER([$ax_python_bin/Python.h],
-                        ax_python_header=yes,
-                        ax_python_header=no)
-        if test $ax_python_lib != no; then
-            if test $ax_python_header != no; then
-                break;
-            fi
-        fi
-    fi
+for python in python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do
+AC_CHECK_PROGS(PYTHON_BIN, [$python])
+ax_python_bin=$PYTHON_BIN
+if test x$ax_python_bin != x; then
+   AC_CHECK_LIB($ax_python_bin, main, ax_python_lib=$ax_python_bin, ax_python_lib=no)
+   if test x$ax_python_lib == xno; then
+     AC_CHECK_LIB(${ax_python_bin}m, main, ax_python_lib=${ax_python_bin}m, ax_python_lib=no)
+   fi
+   if test x$ax_python_lib != xno; then
+     ax_python_header=`$ax_python_bin -c "from distutils.sysconfig import *; print(get_config_var('CONFINCLUDEPY'))"`
+     if test x$ax_python_header != x; then
+       break;
+     fi
+   fi
+fi
 done
 if test x$ax_python_bin = x; then
    ax_python_bin=no
@@ -87,7 +84,12 @@
 AC_MSG_RESULT([  results of the Python check:])
 AC_MSG_RESULT([    Binary:      $ax_python_bin])
 AC_MSG_RESULT([    Library:     $ax_python_lib])
+AC_MSG_RESULT([    Include Dir: $ax_python_header])
 
+if test x$ax_python_header != xno; then
+  PYTHON_INCLUDE_DIR=$ax_python_header
+  AC_SUBST(PYTHON_INCLUDE_DIR)
+fi
 if test x$ax_python_lib != xno; then
   PYTHON_LIB=$ax_python_lib
   AC_SUBST(PYTHON_LIB)