[Qemu-devel] [PATCH] configure: Filter out system includes for pixman

[Jan Kiszka]

Other packages may provide includes for pixman as well if the host has a
devel package installed. Remove them from QEMU_CFLAGS before adding our
version to unsure that the right headers are used.

Signed-off-by: Jan Kiszka <address@hidden>
---
 configure | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 9ac2600..98c7cc8 100755
--- a/configure
+++ b/configure
@@ -4211,8 +4211,9 @@ EOF
   fi
 fi
 
-# add pixman flags after all config tests are done
-QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags $fdt_cflags"
+# add pixman flags after all config tests are done,
+# filtering out conflicting includes paths
+QEMU_CFLAGS=`echo "$QEMU_CFLAGS" | sed "s/-I[^ ]*pixman-1//"`" $pixman_cflags 
$fdt_cflags"
 libs_softmmu="$libs_softmmu $pixman_libs"
 
 echo "Install prefix    $prefix"
-- 
1.8.1.1.298.ge7eed54