* configure, config.in: Rebuild.
* configure.ac (HAVE_LIBPYTHON2_7): New define. * python/python-internal.h: Handle HAVE_LIBPYTHON2_7.
This commit is contained in:
parent
a6cc4789c3
commit
11763c1856
5 changed files with 20 additions and 2 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
2010-07-06 Tom Tromey <tromey@redhat.com>
|
||||||
|
|
||||||
|
* configure, config.in: Rebuild.
|
||||||
|
* configure.ac (HAVE_LIBPYTHON2_7): New define.
|
||||||
|
* python/python-internal.h: Handle HAVE_LIBPYTHON2_7.
|
||||||
|
|
||||||
2010-07-06 Andreas Schwab <schwab@linux-m68k.org>
|
2010-07-06 Andreas Schwab <schwab@linux-m68k.org>
|
||||||
|
|
||||||
* breakpoint.c (_initialize_breakpoint): Add "cl" as alias for
|
* breakpoint.c (_initialize_breakpoint): Add "cl" as alias for
|
||||||
|
|
|
@ -229,6 +229,9 @@
|
||||||
/* Define if Python 2.6 is being used. */
|
/* Define if Python 2.6 is being used. */
|
||||||
#undef HAVE_LIBPYTHON2_6
|
#undef HAVE_LIBPYTHON2_6
|
||||||
|
|
||||||
|
/* Define if Python 2.7 is being used. */
|
||||||
|
#undef HAVE_LIBPYTHON2_7
|
||||||
|
|
||||||
/* Define if libunwind library is being used. */
|
/* Define if libunwind library is being used. */
|
||||||
#undef HAVE_LIBUNWIND
|
#undef HAVE_LIBUNWIND
|
||||||
|
|
||||||
|
|
6
gdb/configure
vendored
6
gdb/configure
vendored
|
@ -10809,7 +10809,11 @@ $as_echo "${found_usable_python}" >&6; }
|
||||||
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if test "${have_libpython}" = python2.6; then
|
if test "${have_libpython}" = python2.7; then
|
||||||
|
|
||||||
|
$as_echo "#define HAVE_LIBPYTHON2_7 1" >>confdefs.h
|
||||||
|
|
||||||
|
elif test "${have_libpython}" = python2.6; then
|
||||||
|
|
||||||
$as_echo "#define HAVE_LIBPYTHON2_6 1" >>confdefs.h
|
$as_echo "#define HAVE_LIBPYTHON2_6 1" >>confdefs.h
|
||||||
|
|
||||||
|
|
|
@ -792,7 +792,9 @@ else
|
||||||
${python_includes}, "${python_libs} -lpython2.4")
|
${python_includes}, "${python_libs} -lpython2.4")
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if test "${have_libpython}" = python2.6; then
|
if test "${have_libpython}" = python2.7; then
|
||||||
|
AC_DEFINE(HAVE_LIBPYTHON2_7, 1, [Define if Python 2.7 is being used.])
|
||||||
|
elif test "${have_libpython}" = python2.6; then
|
||||||
AC_DEFINE(HAVE_LIBPYTHON2_6, 1, [Define if Python 2.6 is being used.])
|
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; then
|
||||||
AC_DEFINE(HAVE_LIBPYTHON2_5, 1, [Define if Python 2.5 is being used.])
|
AC_DEFINE(HAVE_LIBPYTHON2_5, 1, [Define if Python 2.5 is being used.])
|
||||||
|
|
|
@ -50,6 +50,9 @@ typedef int Py_ssize_t;
|
||||||
#elif HAVE_LIBPYTHON2_6
|
#elif HAVE_LIBPYTHON2_6
|
||||||
#include "python2.6/Python.h"
|
#include "python2.6/Python.h"
|
||||||
#include "python2.6/frameobject.h"
|
#include "python2.6/frameobject.h"
|
||||||
|
#elif HAVE_LIBPYTHON2_7
|
||||||
|
#include "python2.7/Python.h"
|
||||||
|
#include "python2.7/frameobject.h"
|
||||||
#else
|
#else
|
||||||
#error "Unable to find usable Python.h"
|
#error "Unable to find usable Python.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue