Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.9-20170403' into staging

[mirror_qemu.git] / configure

diff --git a/configure b/configure
index 4901b9ab05e0ae4cced6169008063e99667382fe..8c6151af8d72d0f348e1b580fbf8d4c7d8b0409b 100755 (executable)
--- a/configure
+++ b/configure
@@ -3078,6 +3078,13 @@ if test "$modules" = yes; then
     glib_modules="$glib_modules gmodule-2.0"
 fi
 
+# This workaround is required due to a bug in pkg-config file for glib as it
+# doesn't define GLIB_STATIC_COMPILATION for pkg-config --static
+
+if test "$static" = yes -a "$mingw32" = yes; then
+    QEMU_CFLAGS="-DGLIB_STATIC_COMPILATION $QEMU_CFLAGS"
+fi
+
 for i in $glib_modules; do
     if $pkg_config --atleast-version=$glib_req_ver $i; then
         glib_cflags=$($pkg_config --cflags $i)