CPPFLAGS="$CPPFLAGS $new_CPPFLAGS"
LIBS="$LIBS $new_LIBS"
found_usable_python=no
- AC_LINK_IFELSE(AC_LANG_PROGRAM([[#include "${version}/Python.h"]],
+ AC_LINK_IFELSE(AC_LANG_PROGRAM([[#include "Python.h"]],
[[Py_Initialize ();]]),
[have_libpython_var=${version}
- found_usable_python=yes],
- [CPPFLAGS=$save_CPPFLAGS
- LIBS=$save_LIBS])
+ found_usable_python=yes
+ PYTHON_CPPFLAGS=$new_CPPFLAGS
+ PYTHON_LIBS=$new_LIBS])
+ CPPFLAGS=$save_CPPFLAGS
+ LIBS=$save_LIBS
AC_MSG_RESULT([${found_usable_python}])
])
# Assume the python binary is ${with_python}/bin/python.
python_prog="${with_python}/bin/python"
python_prefix=
+ # If python does not exit ${with_python}/bin, then try in
+ # ${with_python}. On Windows/MinGW, this is where the Python
+ # executable is.
+ if test ! -x "${python_prog}"; then
+ python_prog="${with_python}/python"
+ python_prefix=
+ fi
if test ! -x "${python_prog}"; then
# Fall back to gdb 7.0/7.1 behaviour.
python_prog=missing
fi
fi
else
- # Fall back to gdb 7.0/7.1 behaviour.
- if test -z ${python_prefix}; then
- python_includes=
- python_libs=
- else
- python_includes="-I${python_prefix}/include"
- python_libs="-L${python_prefix}/lib"
- fi
+ # We do not have a python executable we can use to determine where
+ # to find the Python headers and libs. We cannot guess the include
+ # path from the python_prefix either, because that include path
+ # depends on the Python version. So, there is nothing much we can
+ # do except assume that the compiler will be able to find those files.
+ python_includes=
+ python_libs=
have_python_config=no
fi
- # Having "/pythonX.Y" in the include path is awkward.
- # All those python headers get bubbled up to the top inviting lots
- # of random collisions. GDB originally didn't use python-config to
- # find the compilation parameters and includes "pythonX.Y/" in the
- # path of the, umm, include file. So strip away this part of the
- # output of python-config --includes.
- python_includes=`echo "${python_includes} " \
- | sed -e 's,/python[[0-9]]*[[.]][[0-9]]* , ,g'`
-
# If we have python-config, only try the configuration it provides.
# Otherwise fallback on the old way of trying different versions of
# python in turn.
have_libpython=no
if test "${have_python_config}" = yes; then
+ # Determine the Python version by extracting "-lpython<version>"
+ # part of the python_libs. <version> is usually X.Y with X and Y
+ # being decimal numbers, but can also be XY (seen on Windows).
+ #
+ # The extraction is performed using sed with a regular expression.
+ # Initially, the regexp used was using the '?' quantifier to make
+ # the dot in the version number optional. Unfortunately, this
+ # does not work with non-GNU versions of sed because, because of
+ # what looks like a limitation (the '?' quantifier does not work
+ # with back-references). We work around this limitation by using
+ # the '*' quantifier instead. It means that, in theory, we might
+ # match unexpected version strings such as "-lpython2..7", but
+ # this seems unlikely in practice. And even if that happens,
+ # an error will be triggered later on, when checking that version
+ # number.
python_version=`echo " ${python_libs} " \
- | sed -e 's,^.* -l\(python[[0-9]]*[[.]][[0-9]]*\) .*$,\1,'`
+ | sed -e 's,^.* -l\(python[[0-9]]*[[.]]*[[0-9]]*\).*$,\1,'`
case "${python_version}" in
python*)
AC_TRY_LIBPYTHON(${python_version}, have_libpython,
${python_includes}, "${python_libs} -lpython2.4")
fi
fi
- if test "${have_libpython}" = python2.7; then
+ if test "${have_libpython}" = python2.7 -o "${have_libpython}" = python27; then
AC_DEFINE(HAVE_LIBPYTHON2_7, 1, [Define if Python 2.7 is being used.])
- elif test "${have_libpython}" = python2.6; then
+ elif test "${have_libpython}" = python2.6 -o "${have_libpython}" = python26; then
AC_DEFINE(HAVE_LIBPYTHON2_6, 1, [Define if Python 2.6 is being used.])
- elif test "${have_libpython}" = python2.5; then
+ elif test "${have_libpython}" = python2.5 -o "${have_libpython}" = python25; then
AC_DEFINE(HAVE_LIBPYTHON2_5, 1, [Define if Python 2.5 is being used.])
- elif test "${have_libpython}" = python2.4; then
+ elif test "${have_libpython}" = python2.4 -o "${have_libpython}" = python24; then
AC_DEFINE(HAVE_LIBPYTHON2_4, 1, [Define if Python 2.4 is being used.])
fi
python/py-prettyprint.c python/py-auto-load.c"
fi
AC_SUBST(PYTHON_CFLAGS)
+AC_SUBST(PYTHON_CPPFLAGS)
+AC_SUBST(PYTHON_LIBS)
# ------------------------- #
# Checks for header files. #
CONFIG_SRCS="${CONFIG_SRCS} aix-thread.c"
CONFIG_OBS="${CONFIG_OBS} aix-thread.o"
CONFIG_LDFLAGS="${CONFIG_LDFLAGS} -lpthdebug"
+
+ # Older versions of AIX do not provide the declaration for
+ # the getthrds function (it appears that it was introduced
+ # with AIX 6.x).
+ AC_CHECK_DECLS(getthrds, [], [], [[#include <procinfo.h>]])
fi
;;
esac