aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2010-07-06 19:03:12 +0000
committerTom Tromey <tromey@redhat.com>2010-07-06 19:03:12 +0000
commit11763c18565305217892e8e302eb55c7ced0cbcc (patch)
tree0ad607f5bc88007a6f3879ea83a8dc167f20f399
parenta6cc4789c3221ece1816cb1264d737d438c51f00 (diff)
downloadgdb-11763c18565305217892e8e302eb55c7ced0cbcc.zip
gdb-11763c18565305217892e8e302eb55c7ced0cbcc.tar.gz
gdb-11763c18565305217892e8e302eb55c7ced0cbcc.tar.bz2
* configure, config.in: Rebuild.
* configure.ac (HAVE_LIBPYTHON2_7): New define. * python/python-internal.h: Handle HAVE_LIBPYTHON2_7.
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/config.in3
-rwxr-xr-xgdb/configure6
-rw-r--r--gdb/configure.ac4
-rw-r--r--gdb/python/python-internal.h3
5 files changed, 20 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2486faa..2baef12 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -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>
* breakpoint.c (_initialize_breakpoint): Add "cl" as alias for
diff --git a/gdb/config.in b/gdb/config.in
index 76cb363..1fc457d 100644
--- a/gdb/config.in
+++ b/gdb/config.in
@@ -229,6 +229,9 @@
/* Define if Python 2.6 is being used. */
#undef HAVE_LIBPYTHON2_6
+/* Define if Python 2.7 is being used. */
+#undef HAVE_LIBPYTHON2_7
+
/* Define if libunwind library is being used. */
#undef HAVE_LIBUNWIND
diff --git a/gdb/configure b/gdb/configure
index f557aa1..174c186 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -10809,7 +10809,11 @@ $as_echo "${found_usable_python}" >&6; }
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
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 7ddb67f..bfe1803 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -792,7 +792,9 @@ else
${python_includes}, "${python_libs} -lpython2.4")
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.])
elif test "${have_libpython}" = python2.5; then
AC_DEFINE(HAVE_LIBPYTHON2_5, 1, [Define if Python 2.5 is being used.])
diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h
index 630d191..2b8d301 100644
--- a/gdb/python/python-internal.h
+++ b/gdb/python/python-internal.h
@@ -50,6 +50,9 @@ typedef int Py_ssize_t;
#elif HAVE_LIBPYTHON2_6
#include "python2.6/Python.h"
#include "python2.6/frameobject.h"
+#elif HAVE_LIBPYTHON2_7
+#include "python2.7/Python.h"
+#include "python2.7/frameobject.h"
#else
#error "Unable to find usable Python.h"
#endif