From: Jürg Billeter <j@bitron.ch>
Date: Mon, 16 Jul 2012 18:55:50 +0000 (+0200)
Subject: Require and target GLib >= 2.18
X-Git-Tag: 0.17.3~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e54cfc3767b4b5641f22f3e1cd1652290922fddf;p=thirdparty%2Fvala.git

Require and target GLib >= 2.18

This allows valac to use gintptr and guintptr. The next stable release
of vala will happen four years after the release of GLib 2.18.0.
---

diff --git a/compiler/valacompiler.vala b/compiler/valacompiler.vala
index df51ad638..b0722eb2e 100644
--- a/compiler/valacompiler.vala
+++ b/compiler/valacompiler.vala
@@ -244,7 +244,7 @@ class Vala.Compiler {
 			}
 		} else if (context.profile == Profile.GOBJECT) {
 			int glib_major = 2;
-			int glib_minor = 16;
+			int glib_minor = 18;
 			if (target_glib != null && target_glib.scanf ("%d.%d", out glib_major, out glib_minor) != 2) {
 				Report.error (null, "Invalid format for --target-glib");
 			}
diff --git a/configure.ac b/configure.ac
index dbb040d2b..553747b17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,7 +81,7 @@ AC_SUBST(vapigen_decl)
 AC_SUBST(gen_introspect_decl)
 AC_SUBST(vala_gen_introspect_decl)
 
-GLIB_REQUIRED=2.16.0
+GLIB_REQUIRED=2.18.0
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED)