diff mbox

[2/3] configure: require glib 2.26

Message ID 1444647299-28642-3-git-send-email-marcandre.lureau@redhat.com
State New
Headers show

Commit Message

Marc-André Lureau Oct. 12, 2015, 10:54 a.m. UTC 
From: Marc-André Lureau <marcandre.lureau@redhat.com>

This allows to use the GLIB_VERSION macros that will help to ensure the
newer symbols are not being used (or with compatibility code).

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 configure | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/configure b/configure
index f08327e..1bc832f 100755
--- a/configure
+++ b/configure
@@ -2843,7 +2843,8 @@  fi
 ##########################################
 # glib support probe
 
-glib_req_ver=2.22
+glib_req_ver=2.26
+glib_ver=GLIB_VERSION_2_26
 glib_modules=gthread-2.0
 if test "$modules" = yes; then
     glib_modules="$glib_modules gmodule-2.0"
@@ -2853,7 +2854,7 @@  for i in $glib_modules; do
     if $pkg_config --atleast-version=$glib_req_ver $i; then
         glib_cflags=`$pkg_config --cflags $i`
         glib_libs=`$pkg_config --libs $i`
-        CFLAGS="$glib_cflags $CFLAGS"
+        CFLAGS="$glib_cflags $CFLAGS -DGLIB_VERSION_MIN_REQUIRED=$glib_ver -DGLIB_VERSION_MAX_ALLOWED=$glib_ver"
         LIBS="$glib_libs $LIBS"
         libs_qga="$glib_libs $libs_qga"
     else