summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorPaolo Bonzini2012-04-05 13:01:54 +0200
committerBlue Swirl2012-04-07 12:04:46 +0200
commita52d28afb4e825a5b28815370a268904a4c6dc11 (patch)
tree3af843a95cca1397a4f89841c89157459b18931a /configure
parentmain-loop: integrate glib sources for w32 (diff)
downloadqemu-a52d28afb4e825a5b28815370a268904a4c6dc11.tar.gz
qemu-a52d28afb4e825a5b28815370a268904a4c6dc11.tar.xz
qemu-a52d28afb4e825a5b28815370a268904a4c6dc11.zip
configure: require glib 2.12, 2.20 for mingw32
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 <pbonzini@redhat.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure12
1 files changed, 10 insertions, 2 deletions
diff --git a/configure b/configure
index 4b3adc9bd4..6f850a66c3 100755
--- a/configure
+++ b/configure
@@ -1993,13 +1993,21 @@ fi
##########################################
# 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
- echo "glib-2.0 required to compile QEMU"
+ echo "glib-$glib_req_ver required to compile QEMU"
exit 1
fi