[yoda-svn] yoda: 3 new changesets

[YODA Mercurial]

details:   https://yoda.hepforge.org/hg/yoda/rev/b56515eca387
branches:  release-1-6
changeset: 1290:b56515eca387
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Sep 06 12:40:19 2016 +0100
description:
Update Python-detection m4 macros

details:   https://yoda.hepforge.org/hg/yoda/rev/fab0cc849370
branches:  release-1-6
changeset: 1291:fab0cc849370
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Sep 06 12:47:47 2016 +0100
description:
More configure tweaks

details:   https://yoda.hepforge.org/hg/yoda/rev/c4c37005f116
branches:  release-1-6
changeset: 1292:c4c37005f116
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Sep 06 12:49:36 2016 +0100
description:
Update ChangeLog re. Python macros

diffs (truncated from 1194 to 50 lines):

--- a/ChangeLog	Tue Aug 09 20:08:53 2016 +0100
+++ b/ChangeLog	Tue Sep 06 12:49:36 2016 +0100
@@ -1,3 +1,7 @@
+2016-09-06  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Update configure scripts to use newer (Py3-safe) Python testing macros.
+
 2016-08-09  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Version 1.6.3 release!
--- a/configure.ac	Tue Aug 09 20:08:53 2016 +0100
+++ b/configure.ac	Tue Sep 06 12:49:36 2016 +0100
@@ -108,35 +108,30 @@
 AC_ARG_ENABLE(pyext, [AC_HELP_STRING(--disable-pyext,
   [don't build Python module (default=build)])],
   [], [enable_pyext=yes])
-AZ_PYTHON_DEFAULT
 ## Basic Python checks
 if test x$enable_pyext = xyes; then
-  AZ_PYTHON_PATH
-  AZ_PYTHON_VERSION_ENSURE([2.5])
-  PYTHON_VERSION=`$PYTHON -c "import sys; print '.'.join(map(str, sys.version_info@<:@:2@:>@));"`
+  AX_PYTHON_DEVEL([>= '2.6'])
   AC_SUBST(PYTHON_VERSION)
   YODA_PYTHONPATH=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(prefix='$prefix', plat_specific=True);"`
   AC_SUBST(YODA_PYTHONPATH)
-  ## Test for Python header
-  if test -x "$PYTHON"; then
-    AC_MSG_CHECKING([for Python include path])
-    python_incpath=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_inc();"`
-    AC_MSG_RESULT([$python_incpath])
-    python_header="$python_incpath/Python.h"
-    if test -z "$python_incpath"; then
-     AC_MSG_ERROR([Can't build Python extension since include directory cannot be determined from distutils])
-      enable_pyext=no
-    elif test ! -e "$python_header"; then
-      AC_MSG_ERROR([Can't build Python extension since header file $python_header cannot be found])
-      enable_pyext=no
-    fi
-  else
+  if test -z "$PYTHON"; then
     AC_MSG_ERROR([Can't build Python extension since python can't be found])
     enable_pyext=no
   fi
+  if test -z "$PYTHON_CPPFLAGS"; then
+    AC_MSG_ERROR([Can't build Python extension since Python.h header file cannot be found])
+    enable_pyext=no
+  fi
 fi
-## Finish Python extension testing