From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:53514)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <marcandre.lureau@gmail.com>) id 1Zlale-0001ll-PZ
	for qemu-devel@nongnu.org; Mon, 12 Oct 2015 06:55:47 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <marcandre.lureau@gmail.com>) id 1Zlald-0006HY-VS
	for qemu-devel@nongnu.org; Mon, 12 Oct 2015 06:55:46 -0400
Received: from mail-pa0-x22a.google.com ([2607:f8b0:400e:c03::22a]:36614)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <marcandre.lureau@gmail.com>) id 1Zlald-0006HU-QH
	for qemu-devel@nongnu.org; Mon, 12 Oct 2015 06:55:45 -0400
Received: by pablk4 with SMTP id lk4so151843697pab.3
	for <qemu-devel@nongnu.org>; Mon, 12 Oct 2015 03:55:45 -0700 (PDT)
Sender: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= <marcandre.lureau@gmail.com>
From: marcandre.lureau@redhat.com
Date: Mon, 12 Oct 2015 12:54:58 +0200
Message-Id: <1444647299-28642-3-git-send-email-marcandre.lureau@redhat.com>
In-Reply-To: <1444647299-28642-1-git-send-email-marcandre.lureau@redhat.com>
References: <1444647299-28642-1-git-send-email-marcandre.lureau@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Qemu-devel] [PATCH 2/3] configure: require glib 2.26
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>

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 --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
-- 
2.4.3