From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Thu, 2 Oct 2014 08:03:55 +0000 (+0200)
Subject: configure: Prepend pixman and ftd flags to overrule system-provided ones
X-Git-Tag: qemu-xen-4.6.0-rc1~126^2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=50e12060696711eca1b09b82b9215ccdeaadfd09;p=qemu-upstream-4.6-testing.git

configure: Prepend pixman and ftd flags to overrule system-provided ones

Other packages may provide includes for pixman as well if the host has a
devel package installed. So add ours to the front to unsure that the
right version is used.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/configure b/configure
index 9ac260023..a9e4d4948 100755
--- a/configure
+++ b/configure
@@ -4211,9 +4211,9 @@ EOF
   fi
 fi
 
-# add pixman flags after all config tests are done
-QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags $fdt_cflags"
-libs_softmmu="$libs_softmmu $pixman_libs"
+# prepend pixman and ftd flags after all config tests are done
+QEMU_CFLAGS="$pixman_cflags $fdt_cflags $QEMU_CFLAGS"
+libs_softmmu="$pixman_libs $libs_softmmu"
 
 echo "Install prefix    $prefix"
 echo "BIOS directory    `eval echo $qemu_datadir`"