[xen staging] configure: also add EXTRA_PREFIX to {CPP/LD}FLAGS

[patchbot@xxxxxxx]

commit 8a6b1665d987d043c12dc723d758a7d2ca765264
Author:     Roger Pau Monne <roger.pau@xxxxxxxxxx>
AuthorDate: Tue May 5 11:24:53 2020 +0200
Commit:     Wei Liu <wl@xxxxxxx>
CommitDate: Wed May 6 17:42:26 2020 +0100

    configure: also add EXTRA_PREFIX to {CPP/LD}FLAGS
    
    The path provided by EXTRA_PREFIX should be added to the search path
    of the configure script, like it's done in Config.mk. Not doing so
    makes the search path for configure differ from the search path used
    by the build.
    
    Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
    [ wei: run autogen.sh ]
    Acked-by: Wei Liu <wl@xxxxxxx>
---
 m4/set_cflags_ldflags.m4 | 4 ++++
 tools/configure          | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/m4/set_cflags_ldflags.m4 b/m4/set_cflags_ldflags.m4
index cbad3c10b0..08f5c983cc 100644
--- a/m4/set_cflags_ldflags.m4
+++ b/m4/set_cflags_ldflags.m4
@@ -15,6 +15,10 @@ for ldflag in $APPEND_LIB
 do
     APPEND_LDFLAGS="$APPEND_LDFLAGS -L$ldflag"
 done
+if [ ! -z $EXTRA_PREFIX ]; then
+    CPPFLAGS="$CPPFLAGS -I$EXTRA_PREFIX/include"
+    LDFLAGS="$LDFLAGS -L$EXTRA_PREFIX/lib"
+fi
 CPPFLAGS="$PREPEND_CPPFLAGS $CPPFLAGS $APPEND_CPPFLAGS"
 LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPEND_LDFLAGS"])
 
diff --git a/tools/configure b/tools/configure
index 375430df3f..36596389b8 100755
--- a/tools/configure
+++ b/tools/configure
@@ -4678,6 +4678,10 @@ for ldflag in $APPEND_LIB
 do
     APPEND_LDFLAGS="$APPEND_LDFLAGS -L$ldflag"
 done
+if  ! -z $EXTRA_PREFIX ; then
+    CPPFLAGS="$CPPFLAGS -I$EXTRA_PREFIX/include"
+    LDFLAGS="$LDFLAGS -L$EXTRA_PREFIX/lib"
+fi
 CPPFLAGS="$PREPEND_CPPFLAGS $CPPFLAGS $APPEND_CPPFLAGS"
 LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPEND_LDFLAGS"
 
--
generated by git-patchbot for /home/xen/git/xen.git#staging