aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog6
-rwxr-xr-xgdb/configure5
-rw-r--r--gdb/configure.ac5
3 files changed, 14 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1da02fd..e8d4ed1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2016-05-03 Pedro Alves <palves@redhat.com>
+
+ * configure.ac (checking for the dynamic export flag): Add
+ $PYTHON_CPPFLAGS to CPPFLAGS.
+ * configure: Regenerate.
+
2016-05-03 Kyrylo Tkachov <kyrylo.tkachov@arm.com>
* symfile.c (find_pc_overlay): Add braces to avoid -Wparentheses
diff --git a/gdb/configure b/gdb/configure
index 228cb99..bc6761f 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -13709,12 +13709,14 @@ rm -f core conftest.err conftest.$ac_objext \
CFLAGS="$CFLAGS $PYTHON_CFLAGS"
old_LIBS="$LIBS"
LIBS="$LIBS $PYTHON_LIBS"
+ old_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
if test "$cross_compiling" = yes; then :
true
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include "${have_libpython}/Python.h"
+#include "Python.h"
int
main ()
{
@@ -13736,6 +13738,7 @@ fi
LIBS="$old_LIBS"
CFLAGS="$old_CFLAGS"
+ CPPFLAGS="$old_CPPFLAGS"
fi
LDFLAGS="$old_LDFLAGS"
fi
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 3aa132a..d7b2e8a 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -1722,9 +1722,11 @@ if test "${gdb_native}" = yes; then
CFLAGS="$CFLAGS $PYTHON_CFLAGS"
old_LIBS="$LIBS"
LIBS="$LIBS $PYTHON_LIBS"
+ old_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
AC_RUN_IFELSE(
AC_LANG_PROGRAM(
- [#include "]${have_libpython}[/Python.h"],
+ [#include "Python.h"],
[int err;
Py_Initialize ();
err = PyRun_SimpleString ("import itertools\n");
@@ -1733,6 +1735,7 @@ if test "${gdb_native}" = yes; then
[dynamic_list=true], [], [true])
LIBS="$old_LIBS"
CFLAGS="$old_CFLAGS"
+ CPPFLAGS="$old_CPPFLAGS"
fi
LDFLAGS="$old_LDFLAGS"
fi