aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-06-29 15:04:20 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-06-29 15:04:20 +0100
commit75507f1aba6feb73ae43329922d51571550b9128 (patch)
treeafdc91cca05f534d22838da16dac63e13ace3307 /configure
parent109b25045b3651f9c5d02c3766c0b3ff63e6d193 (diff)
parente71e8cc035558eabd6b3e19f6d3254c754c027ef (diff)
Merge remote-tracking branch 'remotes/berrange/tags/min-glib-pull-request' into staging
glib: update the min required version This updates the minimum required glib version to 2.40 # gpg: Signature made Fri 29 Jun 2018 12:24:58 BST # gpg: using RSA key BE86EBB415104FDF # gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>" # gpg: aka "Daniel P. Berrange <berrange@redhat.com>" # Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF * remotes/berrange/tags/min-glib-pull-request: glib: enforce the minimum required version and warn about old APIs glib: bump min required glib library version to 2.40 util: remove redundant include of glib.h and add osdep.h Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure6
1 files changed, 1 insertions, 5 deletions
diff --git a/configure b/configure
index ca7de4f55f..89cdcfc1bf 100755
--- a/configure
+++ b/configure
@@ -3440,11 +3440,7 @@ fi
##########################################
# glib support probe
-if test "$mingw32" = yes; then
- glib_req_ver=2.30
-else
- glib_req_ver=2.22
-fi
+glib_req_ver=2.40
glib_modules=gthread-2.0
if test "$modules" = yes; then
glib_modules="$glib_modules gmodule-export-2.0"