[binutils-gdb] Fix "-Wl,--dynamic-list" gdb/configure test

[Pedro Alves <palves at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=1b4f615e4087a3ae9feba5912312cdcabc25e6a5

commit 1b4f615e4087a3ae9feba5912312cdcabc25e6a5
Author: Pedro Alves <palves@redhat.com>
Date:   Tue May 3 10:30:51 2016 +0100

    Fix "-Wl,--dynamic-list" gdb/configure test
    
    The -Wl,--dynamic-list test is currently broken on Fedora 23, when you
    configure with --with-python=python3.4.  We see:
    
     configure:13741: checking for the dynamic export flag
     configure:13796: gcc -o conftest -g3 -O0  -fno-strict-aliasing -DNDEBUG -fwrapv    -Wl,--dynamic-list=/home/pedro/gdb/mygit/src/gdb/proc-service.list conftest.c -ldl -lncurses -lm -ldl  -lpthread -ldl -lutil -lm -lpython3.4m -Xlinker -export-dynamic >&5
     conftest.c:182:30: fatal error: python3.4/Python.h: No such file or directory
     compilation terminated.
     configure:13796: $? = 1
    
    The correct -I path is in PYTHON_CPPFLAGS:
    
     PYTHON_CPPFLAGS='-I/usr/include/python3.4m -I/usr/include/python3.4m'
    
    (Other Python-related tests in the file are already doing this.)
    
    gdb/ChangeLog:
    2016-05-03  Pedro Alves  <palves@redhat.com>
    
    	* configure.ac (checking for the dynamic export flag): Add
    	$PYTHON_CPPFLAGS to CPPFLAGS.
    	* configure: Regenerate.

Diff:
---
 gdb/ChangeLog    | 6 ++++++
 gdb/configure    | 5 ++++-
 gdb/configure.ac | 5 ++++-
 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