]> Git Repo - qemu.git/commitdiff
configure: require glib 2.12, 2.20 for mingw32
authorPaolo Bonzini <[email protected]>
Thu, 5 Apr 2012 11:01:54 +0000 (13:01 +0200)
committerBlue Swirl <[email protected]>
Sat, 7 Apr 2012 10:04:46 +0000 (10:04 +0000)
These are pretty sane requirements to move forward with glib usage.
2.12 is the version found in RHEL/CentOS 5, and 2.20 is the
first version to support g_poll.  Without g_poll, we cannot
integrate well with the glib main loop.

Signed-off-by: Paolo Bonzini <[email protected]>
Signed-off-by: Blue Swirl <[email protected]>
configure

index 4b3adc9bd4cbe64577f8c8808e120f486026d925..6f850a66c3a34fdd11251f6897b7f743596bf50a 100755 (executable)
--- a/configure
+++ b/configure
@@ -1993,13 +1993,21 @@ fi
 
 ##########################################
 # glib support probe
 
 ##########################################
 # glib support probe
-if $pkg_config --modversion gthread-2.0 > /dev/null 2>&1 ; then
+
+if test "$mingw32" = yes; then
+    # g_poll is required in order to integrate with the glib main loop.
+    glib_req_ver=2.20
+else
+    glib_req_ver=2.12
+fi
+if $pkg_config --atleast-version=$glib_req_ver gthread-2.0 > /dev/null 2>&1
+then
     glib_cflags=`$pkg_config --cflags gthread-2.0 2>/dev/null`
     glib_libs=`$pkg_config --libs gthread-2.0 2>/dev/null`
     LIBS="$glib_libs $LIBS"
     libs_qga="$glib_libs $libs_qga"
 else
     glib_cflags=`$pkg_config --cflags gthread-2.0 2>/dev/null`
     glib_libs=`$pkg_config --libs gthread-2.0 2>/dev/null`
     LIBS="$glib_libs $LIBS"
     libs_qga="$glib_libs $libs_qga"
 else
-    echo "glib-2.0 required to compile QEMU"
+    echo "glib-$glib_req_ver required to compile QEMU"
     exit 1
 fi
 
     exit 1
 fi
 
This page took 0.031707 seconds and 4 git commands to generate.