From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Sun, 25 Sep 2016 20:57:48 +0000 (+0400)
Subject: build-sys: put glib_cflags in QEMU_CFLAGS
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4a0588996a5848ce9550188d0f60642636815059;p=qemu.git

build-sys: put glib_cflags in QEMU_CFLAGS

This way, overriding CFLAGS on make command line keeps glib-cflags
and doesn't break the build.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20160925205748.6280-2-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/configure b/configure
index c83160025e..5412d4f0b7 100755
--- a/configure
+++ b/configure
@@ -2933,7 +2933,7 @@ for i in $glib_modules; do
     if $pkg_config --atleast-version=$glib_req_ver $i; then
         glib_cflags=$($pkg_config --cflags $i)
         glib_libs=$($pkg_config --libs $i)
-        CFLAGS="$glib_cflags $CFLAGS"
+        QEMU_CFLAGS="$glib_cflags $QEMU_CFLAGS"
         LIBS="$glib_libs $LIBS"
         libs_qga="$glib_libs $libs_qga"
     else