From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Wed, 21 Jun 2017 12:53:04 +0000 (+0200)
Subject: compiler: Use API_VERSION instead of stripping PACKAGE_SUFFIX
X-Git-Tag: 0.37.1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d41ebcedb603464affcf3a69215538c83b5affc;p=thirdparty%2Fvala.git

compiler: Use API_VERSION instead of stripping PACKAGE_SUFFIX
---

diff --git a/compiler/valacompiler.vala b/compiler/valacompiler.vala
index 8a87525c9..1260135b8 100644
--- a/compiler/valacompiler.vala
+++ b/compiler/valacompiler.vala
@@ -531,7 +531,7 @@ class Vala.Compiler {
 			stdout.printf ("Vala %s\n", Config.BUILD_VERSION);
 			return 0;
 		} else if (api_version) {
-			stdout.printf ("%s\n", Config.PACKAGE_SUFFIX.substring (1));
+			stdout.printf ("%s\n", Config.API_VERSION);
 			return 0;
 		}
 		
@@ -614,7 +614,7 @@ class Vala.Compiler {
 			stdout.printf ("Vala %s\n", Config.BUILD_VERSION);
 			return 0;
 		} else if (api_version) {
-			stdout.printf ("%s\n", Config.PACKAGE_SUFFIX.substring (1));
+			stdout.printf ("%s\n", Config.API_VERSION);
 			return 0;
 		}
 		
diff --git a/configure.ac b/configure.ac
index b8525ab33..531eef482 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,6 +18,7 @@ dnl We don't support separate builddir when building from git
 echo \#buildapi-variable-no-builddir >/dev/null
 
 AC_SUBST(API_VERSION)
+AC_DEFINE_UNQUOTED(API_VERSION, "$API_VERSION", [Define to the api-version of this package])
 AC_SUBST(PACKAGE_SUFFIX)
 AC_DEFINE_UNQUOTED(PACKAGE_SUFFIX, "$PACKAGE_SUFFIX", [Define to the suffix of this package])
 
diff --git a/vapi/config.vapi b/vapi/config.vapi
index 2c6df9e6b..49797b829 100644
--- a/vapi/config.vapi
+++ b/vapi/config.vapi
@@ -22,6 +22,7 @@
 
 [CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")]
 namespace Config {
+	public const string API_VERSION;
 	[CCode (cheader_filename = "version.h")]
 	public const string BUILD_VERSION;
 	public const string PACKAGE_DATADIR;