compiler: Use API_VERSION instead of stripping PACKAGE_SUFFIX

diff --git a/compiler/valacompiler.vala b/compiler/valacompiler.vala
index 8a87525c9db50eb15ee4a52ddd0023c3c180a978..1260135b83dfc35036234d72e2caaba852e83711 100644 (file)
--- 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 b8525ab338b20b15af447c23407b61bf085df38f..531eef482f0140ef8e58433b465c330289827c28 100644 (file)
--- 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 2c6df9e6bf0daa66e503f7f8198cb85f083754fc..49797b829c840f1813f5ae23c861f951b3f73247 100644 (file)
--- 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;