Update ax_python_devel.m4

diff --git a/ax_python_devel.m4 b/ax_python_devel.m4
index 2ce6afe835096033dcfa8138c600ffc1455cc625..cf2163c9b5fc69cd1d7c74c8870ec5dd2439c163 100644 (file)
--- a/ax_python_devel.m4
+++ b/ax_python_devel.m4
@@ -34,11 +34,12 @@
 # LICENSE
 #
 #   Copyright (c) 2009 Sebastian Huber <sebastian-huber@web.de>
-#   Copyright (c) 2009 Alan W. Irwin <irwin@beluga.phys.uvic.ca>
+#   Copyright (c) 2009 Alan W. Irwin
 #   Copyright (c) 2009 Rafael Laboissiere <rafael@laboissiere.net>
-#   Copyright (c) 2009 Andrew Collier <colliera@ukzn.ac.za>
+#   Copyright (c) 2009 Andrew Collier
 #   Copyright (c) 2009 Matteo Settenvini <matteo@member.fsf.org>
 #   Copyright (c) 2009 Horst Knorr <hk_classes@knoda.org>
+#   Copyright (c) 2013 Daniel Mullner <muellner@math.stanford.edu>
 #
 #   This program is free software: you can redistribute it and/or modify it
 #   under the terms of the GNU General Public License as published by the
@@ -66,7 +67,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 8
+#serial 16
 
 AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL])
 AC_DEFUN([AX_PYTHON_DEVEL],[
@@ -153,8 +154,14 @@ $ac_distutils_result])
        if test -z "$PYTHON_CPPFLAGS"; then
                python_path=`$PYTHON -c "import distutils.sysconfig; \
                        print (distutils.sysconfig.get_python_inc ());"`
+               plat_python_path=`$PYTHON -c "import distutils.sysconfig; \
+                       print (distutils.sysconfig.get_python_inc (plat_specific=1));"`
                if test -n "${python_path}"; then
-                       python_path="-I$python_path"
+                       if test "${plat_python_path}" != "${python_path}"; then
+                               python_path="-I$python_path -I$plat_python_path"
+                       else
+                               python_path="-I$python_path"
+                       fi
                fi
                PYTHON_CPPFLAGS=$python_path
        fi
@@ -173,13 +180,10 @@ $ac_distutils_result])
 # join all versioning strings, on some systems
 # major/minor numbers could be in different list elements
 from distutils.sysconfig import *
-ret = ''
-for e in get_config_vars ('VERSION'):
-       if (e != None):
-               ret += e
-print (ret)
-EOD
-`
+e = get_config_var('VERSION')
+if e is not None:
+       print(e)
+EOD`
 
                if test -z "$ac_python_version"; then
                        if test -n "$PYTHON_VERSION"; then
@@ -199,34 +203,27 @@ EOD
 
 # There should be only one
 import distutils.sysconfig
-for e in distutils.sysconfig.get_config_vars ('LIBDIR'):
-       if e != None:
-               print (e)
-               break
-EOD
-`
-
-               # Before checking for libpythonX.Y, we need to know
-               # the extension the OS we're on uses for libraries
-               # (we take the first one, if there's more than one fix me!):
-               ac_python_soext=`$PYTHON -c \
-                 "import distutils.sysconfig; \
-                 print (distutils.sysconfig.get_config_vars('SO')[[0]])"`
+e = distutils.sysconfig.get_config_var('LIBDIR')
+if e is not None:
+       print (e)
+EOD`
 
                # Now, for the library:
-               ac_python_soname=`$PYTHON -c \
-                 "import distutils.sysconfig; \
-                 print (distutils.sysconfig.get_config_vars('LDLIBRARY')[[0]])"`
+               ac_python_library=`cat<<EOD | $PYTHON -
 
-               # Strip away extension from the end to canonicalize its name:
-               ac_python_library=`echo "$ac_python_soname" | sed "s/${ac_python_soext}$//"`
+import distutils.sysconfig
+c = distutils.sysconfig.get_config_vars()
+if 'LDVERSION' in c:
+       print ('python'+c[['LDVERSION']])
+else:
+       print ('python'+c[['VERSION']])
+EOD`
 
                # This small piece shamelessly adapted from PostgreSQL python macro;
                # credits goes to momjian, I think. I'd like to put the right name
                # in the credits, if someone can point me in the right direction... ?
                #
-               if test -n "$ac_python_libdir" -a -n "$ac_python_library" \
-                       -a x"$ac_python_library" != x"$ac_python_soname"
+               if test -n "$ac_python_libdir" -a -n "$ac_python_library"
                then
                        # use the official shared library
                        ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"`
@@ -256,7 +253,7 @@ EOD
        AC_MSG_CHECKING([for Python site-packages path])
        if test -z "$PYTHON_SITE_PKG"; then
                PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
-                       print (distutils.sysconfig.get_python_lib(1,0));"`
+                       print (distutils.sysconfig.get_python_lib(0,0));"`
        fi
        AC_MSG_RESULT([$PYTHON_SITE_PKG])
        AC_SUBST([PYTHON_SITE_PKG])
@@ -268,7 +265,7 @@ EOD
        if test -z "$PYTHON_EXTRA_LIBS"; then
           PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
                 conf = distutils.sysconfig.get_config_var; \
-                print (conf('LOCALMODLIBS') + ' ' + conf('LIBS'))"`
+                print (conf('LIBS'))"`
        fi
        AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
        AC_SUBST(PYTHON_EXTRA_LIBS)