From: Jürg Billeter <j@bitron.ch>
Date: Wed, 24 Mar 2010 09:56:50 +0000 (+0100)
Subject: Require and target GLib >= 2.14
X-Git-Tag: 0.8.0~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccf253008c13af8e2002ccc42606192b3eaf6bce;p=thirdparty%2Fvala.git

Require and target GLib >= 2.14

Regular expression literals will require GLib 2.14. Thread-safe
get_type functions also require GLib 2.14. Generating code for
GLib 2.12 is still possible by using --target-glib=2.12.
---

diff --git a/compiler/valacompiler.vala b/compiler/valacompiler.vala
index b6360372f..a006dae73 100644
--- a/compiler/valacompiler.vala
+++ b/compiler/valacompiler.vala
@@ -271,7 +271,7 @@ class Vala.Compiler {
 			}
 		} else if (context.profile == Profile.GOBJECT) {
 			int glib_major = 2;
-			int glib_minor = 12;
+			int glib_minor = 14;
 			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 b97ed1eae..bdd9878dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,7 +62,7 @@ AC_SUBST(vapigen_decl)
 AC_SUBST(gen_introspect_decl)
 AC_SUBST(vala_gen_introspect_decl)
 
-GLIB_REQUIRED=2.12.0
+GLIB_REQUIRED=2.14.0
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED)