* configure, config.in: Rebuild.

	* configure.ac (HAVE_LIBPYTHON2_7): New define.
	* python/python-internal.h: Handle HAVE_LIBPYTHON2_7.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2486faa6867ff0e9ad4baedb127b1160d3ca6d97..2baef12e93a81cc731b93f94911b6ebd23b2acdd 100644 (file)
--- 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 76cb363083dfe6a24d8cce8173c4d899125e2df4..1fc457daf4d8ad4423f73069085bbea2a7b70e0a 100644 (file)
--- 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 f557aa1f217a661f6ace63f4d25df61fb308ba7d..174c186d4cd292463b83fc33206861502647c378 100755 (executable)
--- 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 7ddb67fa0d70c90dbe0abc3be2efb45d8efa782e..bfe1803786bb5b4a8bf8344891f43055909cb7d4 100644 (file)
--- 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 630d191df676e74bf1987f588bbace6e29730d4e..2b8d3012c66777ae575d5b307c3bc29f8237ed5e 100644 (file)
--- 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