summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorJohn Snow2015-05-22 20:13:42 +0200
committerJohn Snow2015-05-22 20:13:58 +0200
commitf40685c62b802c8c3f5c914e8d357dd5c4d4f9cc (patch)
treef8eff61eabdd1f39b9f4a383281250289b92362c /configure
parentMerge remote-tracking branch 'remotes/bkoppelmann/tags/pull-tricore-20150522'... (diff)
downloadqemu-f40685c62b802c8c3f5c914e8d357dd5c4d4f9cc.tar.gz
qemu-f40685c62b802c8c3f5c914e8d357dd5c4d4f9cc.tar.xz
qemu-f40685c62b802c8c3f5c914e8d357dd5c4d4f9cc.zip
configure: require glib 2.22
This provides g_ptr_array_new_with_free_func, as well as a few other functions that we've been hacking around in glib-compat.h. Cleaning up the compatibility headers will come later. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: John Snow <jsnow@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Message-id: 1431469140-22208-2-git-send-email-jsnow@redhat.com
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure7
1 files changed, 1 insertions, 6 deletions
diff --git a/configure b/configure
index f758f32061..9852aef526 100755
--- a/configure
+++ b/configure
@@ -2779,12 +2779,7 @@ fi
##########################################
# glib support probe
-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
+glib_req_ver=2.22
glib_modules=gthread-2.0
if test "$modules" = yes; then
glib_modules="$glib_modules gmodule-2.0"