Something went wrong. Try again.
What happens if I push all of nixpkgs
Something went wrong. Try again.
22 kB · 647 lines
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am--- a/lang/python/Makefile.am+++ b/lang/python/Makefile.am@@ -34,8 +34,8 @@ .PHONY: prepare prepare: copystamp -# For VPATH builds we need to copy some files because Python's-# distutils are not VPATH-aware.+# For VPATH builds we need to copy some files because Python+# is not VPATH-aware. copystamp: ln -sf "$(top_srcdir)/src/data.h" . ln -sf "$(top_builddir)/conf/config.h" .@@ -48,7 +48,7 @@ CFLAGS="$(CFLAGS)" \ srcdir="$(srcdir)" \ top_builddir="$(top_builddir)" \- $$PYTHON setup.py build --verbose --build-base="$$(basename "$${PYTHON}")-gpg" ; \+ $$PYTHON -m pip --verbose install --no-index --no-build-isolation --root="$$(basename "$${PYTHON}")-gpg" ${srcdir} ; \ done python$(PYTHON_VERSION)-gpg/dist/gpg-$(VERSION).tar.gz.asc: copystamp@@ -57,8 +57,7 @@ CFLAGS="$(CFLAGS)" \ srcdir="$(srcdir)" \ top_builddir="$(top_builddir)" \- $(PYTHON) setup.py sdist --verbose --dist-dir=python$(PYTHON_VERSION)-gpg-dist \- --manifest=python$(PYTHON_VERSION)-gpg-dist/MANIFEST+ $(PYTHON) -m build --sdist --outdir=python$(PYTHON_VERSION)-gpg-dist gpgbin=gpgconf --list-components | grep OpenPGP | sed -e 's/gpg:OpenPGP://g' $(gpgbin) --detach-sign --armor python$(PYTHON_VERSION)-gpg-dist/gpg-$(VERSION).tar.gz @@ -92,17 +91,16 @@ CFLAGS="$(CFLAGS)" \ srcdir="$(srcdir)" \ top_builddir="$(top_builddir)" \- $$PYTHON setup.py \- build \- --build-base="$$(basename "$${PYTHON}")-gpg" \+ $$PYTHON -m pip --verbose \ install \+ --no-index --no-build-isolation \ --prefix "$(DESTDIR)$(prefix)" \- --verbose ; \+ ${srcdir} ; \ done uninstall-local: set -x; GV=$$(echo $(VERSION) | tr - _); for PYTHON in $(PYTHONS); do \ PLATLIB="$(prefix)/$$("$${PYTHON}" -c 'import sysconfig, os; print(os.path.relpath(sysconfig.get_path("platlib", scheme="posix_prefix"), sysconfig.get_config_var("prefix")))')" ; \ rm -rf -- "$(DESTDIR)$${PLATLIB}/gpg" \- "$(DESTDIR)$${PLATLIB}"/gpg-$$GV-py*.egg-info ; \+ "$(DESTDIR)$${PLATLIB}"/gpg-$$GV.dist-info ; \ donediff --git a/lang/python/doc/src/gpgme-python-howto.org b/lang/python/doc/src/gpgme-python-howto.org--- a/lang/python/doc/src/gpgme-python-howto.org+++ b/lang/python/doc/src/gpgme-python-howto.org@@ -2945,7 +2945,7 @@ =setup.py= file which contains this: #+BEGIN_SRC python -i-from distutils.core import setup+from setuptools import setup from Cython.Build import cythonize setup(diff --git a/lang/python/examples/howto/advanced/cython/setup.py b/lang/python/examples/howto/advanced/cython/setup.py--- a/lang/python/examples/howto/advanced/cython/setup.py+++ b/lang/python/examples/howto/advanced/cython/setup.py@@ -1,4 +1,4 @@-from distutils.core import setup+from setuptools import setup from Cython.Build import cythonize setup(diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in--- a/lang/python/setup.py.in+++ b/lang/python/setup.py.in@@ -18,8 +18,8 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -from distutils.core import setup, Extension-from distutils.command.build import build+from setuptools import setup, Extension+from setuptools.command.build import build import glob import os@@ -225,9 +225,8 @@ build.run(self) -py3 = [] if sys.version_info.major < 3 else ['-py3'] swig_sources = []-swig_opts = ['-threads'] + py3 + extra_swig_opts+swig_opts = ['-threads'] + extra_swig_opts swige = Extension( 'gpg._gpgme', sources=swig_sources,diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4--- a/m4/ax_python_devel.m4+++ b/m4/ax_python_devel.m4@@ -1,10 +1,10 @@ # ===========================================================================-# https://www.gnu.org/software/autoconf-archive/ax_python_devel.html+# https://www.gnu.org/software/autoconf-archive/ax_python_devel.html # =========================================================================== # # SYNOPSIS #-# AX_PYTHON_DEVEL([version])+# AX_PYTHON_DEVEL([version[,optional]]) # # DESCRIPTION #@@ -12,8 +12,8 @@ # in your configure.ac. # # This macro checks for Python and tries to get the include path to-# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS)-# output variables. It also exports $(PYTHON_EXTRA_LIBS) and+# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LIBS) output+# variables. It also exports $(PYTHON_EXTRA_LIBS) and # $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code. # # You can search for some particular version of Python by passing a@@ -23,6 +23,11 @@ # version number. Don't use "PYTHON_VERSION" for this: that environment # variable is declared as precious and thus reserved for the end-user. #+# By default this will fail if it does not detect a development version of+# python. If you want it to continue, set optional to true, like+# AX_PYTHON_DEVEL([], [true]). The ax_python_devel_found variable will be+# "no" if it fails.+# # This macro should work for all versions of Python >= 2.1.0. As an end # user, you can disable the check for the python version by setting the # PYTHON_NOVERSIONCHECK environment variable to something else than the@@ -67,10 +72,18 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -#serial 17+#serial 36 AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL]) AC_DEFUN([AX_PYTHON_DEVEL],[+ # Get whether it's optional+ if test -z "$2"; then+ ax_python_devel_optional=false+ else+ ax_python_devel_optional=$2+ fi+ ax_python_devel_found=yes+ # # Allow the use of a (user set) custom python version #@@ -81,81 +94,147 @@ AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]]) if test -z "$PYTHON"; then- AC_MSG_ERROR([Cannot find python$PYTHON_VERSION in your system path])+ AC_MSG_WARN([Cannot find python$PYTHON_VERSION in your system path])+ if ! $ax_python_devel_optional; then+ AC_MSG_ERROR([Giving up, python development not available])+ fi+ ax_python_devel_found=no PYTHON_VERSION="" fi - #- # Check for a version of Python >= 2.1.0- #- AC_MSG_CHECKING([for a version of Python >= '2.1.0'])- ac_supports_python_ver=`$PYTHON -c "import sys; \+ if test $ax_python_devel_found = yes; then+ #+ # Check for a version of Python >= 2.1.0+ #+ AC_MSG_CHECKING([for a version of Python >= '2.1.0'])+ ac_supports_python_ver=`$PYTHON -c "import sys; \ ver = sys.version.split ()[[0]]; \ print (ver >= '2.1.0')"`- if test "$ac_supports_python_ver" != "True"; then+ if test "$ac_supports_python_ver" != "True"; then if test -z "$PYTHON_NOVERSIONCHECK"; then AC_MSG_RESULT([no])- AC_MSG_FAILURE([+ AC_MSG_WARN([ This version of the AC@&t@_PYTHON_DEVEL macro doesn't work properly with versions of Python before 2.1.0. You may need to re-run configure, setting the-variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG,+variables PYTHON_CPPFLAGS, PYTHON_LIBS, PYTHON_SITE_PKG, PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. Moreover, to disable this check, set PYTHON_NOVERSIONCHECK to something else than an empty string. ])+ if ! $ax_python_devel_optional; then+ AC_MSG_FAILURE([Giving up])+ fi+ ax_python_devel_found=no+ PYTHON_VERSION="" else AC_MSG_RESULT([skip at user request]) fi- else+ else AC_MSG_RESULT([yes])+ fi fi - #- # if the macro parameter ``version'' is set, honour it- #- if test -n "$1"; then+ if test $ax_python_devel_found = yes; then+ #+ # If the macro parameter ``version'' is set, honour it.+ # A Python shim class, VPy, is used to implement correct version comparisons via+ # string expressions, since e.g. a naive textual ">= 2.7.3" won't work for+ # Python 2.7.10 (the ".1" being evaluated as less than ".3").+ #+ if test -n "$1"; then AC_MSG_CHECKING([for a version of Python $1])- ac_supports_python_ver=`$PYTHON -c "import sys; \- ver = sys.version.split ()[[0]]; \+ cat << EOF > ax_python_devel_vpy.py+class VPy:+ def vtup(self, s):+ return tuple(map(int, s.strip().replace("rc", ".").split(".")))+ def __init__(self):+ import sys+ self.vpy = tuple(sys.version_info)[[:3]]+ def __eq__(self, s):+ return self.vpy == self.vtup(s)+ def __ne__(self, s):+ return self.vpy != self.vtup(s)+ def __lt__(self, s):+ return self.vpy < self.vtup(s)+ def __gt__(self, s):+ return self.vpy > self.vtup(s)+ def __le__(self, s):+ return self.vpy <= self.vtup(s)+ def __ge__(self, s):+ return self.vpy >= self.vtup(s)+EOF+ ac_supports_python_ver=`$PYTHON -c "import ax_python_devel_vpy; \+ ver = ax_python_devel_vpy.VPy(); \ print (ver $1)"`+ rm -rf ax_python_devel_vpy*.py* __pycache__/ax_python_devel_vpy*.py* if test "$ac_supports_python_ver" = "True"; then- AC_MSG_RESULT([yes])+ AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no])- AC_MSG_ERROR([this package requires Python $1.+ AC_MSG_WARN([this package requires Python $1. If you have it installed, but it isn't the default Python interpreter in your system path, please pass the PYTHON_VERSION variable to configure. See ``configure --help'' for reference. ])+ if ! $ax_python_devel_optional; then+ AC_MSG_ERROR([Giving up])+ fi+ ax_python_devel_found=no PYTHON_VERSION="" fi+ fi fi - #- # Check if you have distutils, else fail- #- AC_MSG_CHECKING([for the distutils Python package])- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`- if test -z "$ac_distutils_result"; then+ if test $ax_python_devel_found = yes; then+ #+ # Check if you have distutils, else fail+ #+ AC_MSG_CHECKING([for the sysconfig Python package])+ ac_sysconfig_result=`$PYTHON -c "import sysconfig" 2>&1`+ if test $? -eq 0; then AC_MSG_RESULT([yes])- else+ IMPORT_SYSCONFIG="import sysconfig"+ else AC_MSG_RESULT([no])- AC_MSG_ERROR([cannot import Python module "distutils".++ AC_MSG_CHECKING([for the distutils Python package])+ ac_sysconfig_result=`$PYTHON -c "from distutils import sysconfig" 2>&1`+ if test $? -eq 0; then+ AC_MSG_RESULT([yes])+ IMPORT_SYSCONFIG="from distutils import sysconfig"+ else+ AC_MSG_WARN([cannot import Python module "distutils". Please check your Python installation. The error was:-$ac_distutils_result])- PYTHON_VERSION=""+$ac_sysconfig_result])+ if ! $ax_python_devel_optional; then+ AC_MSG_ERROR([Giving up])+ fi+ ax_python_devel_found=no+ PYTHON_VERSION=""+ fi+ fi fi - #- # Check for Python include path- #- AC_MSG_CHECKING([for Python include path])- 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 $ax_python_devel_found = yes; then+ #+ # Check for Python include path+ #+ AC_MSG_CHECKING([for Python include path])+ if test -z "$PYTHON_CPPFLAGS"; then+ if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then+ # sysconfig module has different functions+ python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \+ print (sysconfig.get_path ('include'));"`+ plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \+ print (sysconfig.get_path ('platinclude'));"`+ else+ # old distutils way+ python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \+ print (sysconfig.get_python_inc ());"`+ plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \+ print (sysconfig.get_python_inc (plat_specific=1));"`+ fi if test -n "${python_path}"; then if test "${plat_python_path}" != "${python_path}"; then python_path="-I$python_path -I$plat_python_path"@@ -164,22 +243,22 @@ fi fi PYTHON_CPPFLAGS=$python_path- fi- AC_MSG_RESULT([$PYTHON_CPPFLAGS])- AC_SUBST([PYTHON_CPPFLAGS])+ fi+ AC_MSG_RESULT([$PYTHON_CPPFLAGS])+ AC_SUBST([PYTHON_CPPFLAGS]) - #- # Check for Python library path- #- AC_MSG_CHECKING([for Python library path])- if test -z "$PYTHON_LDFLAGS"; then+ #+ # Check for Python library path+ #+ AC_MSG_CHECKING([for Python library path])+ if test -z "$PYTHON_LIBS"; then # (makes two attempts to ensure we've got a version number # from the interpreter) ac_python_version=`cat<<EOD | $PYTHON - # join all versioning strings, on some systems # major/minor numbers could be in different list elements-from distutils.sysconfig import *+from sysconfig import * e = get_config_var('VERSION') if e is not None: print(e)@@ -190,7 +269,7 @@ ac_python_version=$PYTHON_VERSION else ac_python_version=`$PYTHON -c "import sys; \- print (sys.version[[:3]])"`+ print ("%d.%d" % sys.version_info[[:2]])"` fi fi @@ -205,8 +284,8 @@ ac_python_libdir=`cat<<EOD | $PYTHON - # There should be only one-import distutils.sysconfig-e = distutils.sysconfig.get_config_var('LIBDIR')+$IMPORT_SYSCONFIG+e = sysconfig.get_config_var('LIBDIR') if e is not None: print (e) EOD`@@ -214,8 +293,8 @@ # Now, for the library: ac_python_library=`cat<<EOD | $PYTHON - -import distutils.sysconfig-c = distutils.sysconfig.get_config_vars()+$IMPORT_SYSCONFIG+c = sysconfig.get_config_vars() if 'LDVERSION' in c: print ('python'+c[['LDVERSION']]) else:@@ -230,97 +309,163 @@ then # use the official shared library ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"`- PYTHON_LDFLAGS="-L$ac_python_libdir -l$ac_python_library"+ PYTHON_LIBS="-L$ac_python_libdir -l$ac_python_library" else # old way: use libpython from python_configdir ac_python_libdir=`$PYTHON -c \- "from distutils.sysconfig import get_python_lib as f; \+ "from sysconfig import get_python_lib as f; \ import os; \ print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"`- PYTHON_LDFLAGS="-L$ac_python_libdir -lpython$ac_python_version"+ PYTHON_LIBS="-L$ac_python_libdir -lpython$ac_python_version" fi - if test -z "PYTHON_LDFLAGS"; then- AC_MSG_ERROR([+ if test -z "PYTHON_LIBS"; then+ AC_MSG_WARN([ Cannot determine location of your Python DSO. Please check it was installed with- dynamic libraries enabled, or try setting PYTHON_LDFLAGS by hand.+ dynamic libraries enabled, or try setting PYTHON_LIBS by hand. ])+ if ! $ax_python_devel_optional; then+ AC_MSG_ERROR([Giving up])+ fi+ ax_python_devel_found=no+ PYTHON_VERSION="" fi+ fi fi- AC_MSG_RESULT([$PYTHON_LDFLAGS])- AC_SUBST([PYTHON_LDFLAGS]) - #- # Check for site packages- #- 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(0,0));"`- fi- AC_MSG_RESULT([$PYTHON_SITE_PKG])- AC_SUBST([PYTHON_SITE_PKG])+ if test $ax_python_devel_found = yes; then+ AC_MSG_RESULT([$PYTHON_LIBS])+ AC_SUBST([PYTHON_LIBS]) - #- # libraries which must be linked in when embedding- #- AC_MSG_CHECKING(python extra libraries)- if test -z "$PYTHON_EXTRA_LIBS"; then- PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \- conf = distutils.sysconfig.get_config_var; \+ #+ # Check for site packages+ #+ AC_MSG_CHECKING([for Python site-packages path])+ if test -z "$PYTHON_SITE_PKG"; then+ if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then+ PYTHON_SITE_PKG=`$PYTHON -c "+$IMPORT_SYSCONFIG;+if hasattr(sysconfig, 'get_default_scheme'):+ scheme = sysconfig.get_default_scheme()+else:+ scheme = sysconfig._get_default_scheme()+if scheme == 'posix_local':+ # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/+ scheme = 'posix_prefix'+prefix = '$prefix'+if prefix == 'NONE':+ prefix = '$ac_default_prefix'+sitedir = sysconfig.get_path('purelib', scheme, vars={'base': prefix})+print(sitedir)"`+ else+ # distutils.sysconfig way+ PYTHON_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \+ print (sysconfig.get_python_lib(0,0));"`+ fi+ fi+ AC_MSG_RESULT([$PYTHON_SITE_PKG])+ AC_SUBST([PYTHON_SITE_PKG])++ #+ # Check for platform-specific site packages+ #+ AC_MSG_CHECKING([for Python platform specific site-packages path])+ if test -z "$PYTHON_PLATFORM_SITE_PKG"; then+ if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then+ PYTHON_PLATFORM_SITE_PKG=`$PYTHON -c "+$IMPORT_SYSCONFIG;+if hasattr(sysconfig, 'get_default_scheme'):+ scheme = sysconfig.get_default_scheme()+else:+ scheme = sysconfig._get_default_scheme()+if scheme == 'posix_local':+ # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/+ scheme = 'posix_prefix'+prefix = '$prefix'+if prefix == 'NONE':+ prefix = '$ac_default_prefix'+sitedir = sysconfig.get_path('platlib', scheme, vars={'platbase': prefix})+print(sitedir)"`+ else+ # distutils.sysconfig way+ PYTHON_PLATFORM_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \+ print (sysconfig.get_python_lib(1,0));"`+ fi+ fi+ AC_MSG_RESULT([$PYTHON_PLATFORM_SITE_PKG])+ AC_SUBST([PYTHON_PLATFORM_SITE_PKG])++ #+ # libraries which must be linked in when embedding+ #+ AC_MSG_CHECKING(python extra libraries)+ if test -z "$PYTHON_EXTRA_LIBS"; then+ PYTHON_EXTRA_LIBS=`$PYTHON -c "$IMPORT_SYSCONFIG; \+ conf = sysconfig.get_config_var; \ print (conf('LIBS') + ' ' + conf('SYSLIBS'))"`- fi- AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])- AC_SUBST(PYTHON_EXTRA_LIBS)+ fi+ AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])+ AC_SUBST(PYTHON_EXTRA_LIBS) - #- # linking flags needed when embedding- #- AC_MSG_CHECKING(python extra linking flags)- if test -z "$PYTHON_EXTRA_LDFLAGS"; then- PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \- conf = distutils.sysconfig.get_config_var; \+ #+ # linking flags needed when embedding+ #+ AC_MSG_CHECKING(python extra linking flags)+ if test -z "$PYTHON_EXTRA_LDFLAGS"; then+ PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "$IMPORT_SYSCONFIG; \+ conf = sysconfig.get_config_var; \ print (conf('LINKFORSHARED'))"`- fi- AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS])- AC_SUBST(PYTHON_EXTRA_LDFLAGS)+ # Hack for macos, it sticks this in here.+ PYTHON_EXTRA_LDFLAGS=`echo $PYTHON_EXTRA_LDFLAGS | sed 's/CoreFoundation.*$/CoreFoundation/'`+ fi+ AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS])+ AC_SUBST(PYTHON_EXTRA_LDFLAGS) - #- # final check to see if everything compiles alright- #- AC_MSG_CHECKING([consistency of all components of python development environment])- # save current global flags- ac_save_LIBS="$LIBS"- ac_save_CPPFLAGS="$CPPFLAGS"- LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LDFLAGS $PYTHON_EXTRA_LIBS"- CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"- AC_LANG_PUSH([C])- AC_LINK_IFELSE([+ #+ # final check to see if everything compiles alright+ #+ AC_MSG_CHECKING([consistency of all components of python development environment])+ # save current global flags+ ac_save_LIBS="$LIBS"+ ac_save_LDFLAGS="$LDFLAGS"+ ac_save_CPPFLAGS="$CPPFLAGS"+ LIBS="$ac_save_LIBS $PYTHON_LIBS $PYTHON_EXTRA_LIBS"+ LDFLAGS="$ac_save_LDFLAGS $PYTHON_EXTRA_LDFLAGS"+ CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"+ AC_LANG_PUSH([C])+ AC_LINK_IFELSE([ AC_LANG_PROGRAM([[#include <Python.h>]], [[Py_Initialize();]]) ],[pythonexists=yes],[pythonexists=no])- AC_LANG_POP([C])- # turn back to default flags- CPPFLAGS="$ac_save_CPPFLAGS"- LIBS="$ac_save_LIBS"+ AC_LANG_POP([C])+ # turn back to default flags+ CPPFLAGS="$ac_save_CPPFLAGS"+ LIBS="$ac_save_LIBS"+ LDFLAGS="$ac_save_LDFLAGS" - AC_MSG_RESULT([$pythonexists])+ AC_MSG_RESULT([$pythonexists]) - if test ! "x$pythonexists" = "xyes"; then- AC_MSG_WARN([+ if test ! "x$pythonexists" = "xyes"; then+ AC_MSG_WARN([ Could not link test program to Python. Maybe the main Python library has been installed in some non-standard library path. If so, pass it to configure,- via the LDFLAGS environment variable.- Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib"+ via the LIBS environment variable.+ Example: ./configure LIBS="-L/usr/non-standard-path/python/lib" ============================================================================+ ERROR! You probably have to install the development version of the Python package for your distribution. The exact name of this package varies among them. ============================================================================- ])- PYTHON_VERSION=""+ ])+ if ! $ax_python_devel_optional; then+ AC_MSG_ERROR([Giving up])+ fi+ ax_python_devel_found=no+ PYTHON_VERSION=""+ fi fi # # all done! #-])+])\ No newline at end of filediff --git a/m4/python.m4 b/m4/python.m4--- a/m4/python.m4+++ b/m4/python.m4@@ -41,7 +41,7 @@ m4_define_default([_AM_PYTHON_INTERPRETER_LIST], [python2 python2.7 dnl python dnl- python3 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4+ python3 python3.12 python3.11 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 ]) AC_ARG_VAR([PYTHON], [the Python interpreter])