From 9977f8cef2437926875985f27aa0571b2adc518f Mon Sep 17 00:00:00 2001
From: Jonathan Dieter <jdieter@gmail.com>
Date: Fri, 22 Jun 2018 19:23:16 +0300
Subject: [PATCH] Switch to native meson versioning

Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
---
 include/meson.build         | 6 +++++-
 include/{zck.h => zck.h.in} | 6 +-----
 meson.build                 | 5 ++---
 src/lib/meson.build         | 2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)
 rename include/{zck.h => zck.h.in} (98%)

diff --git a/include/meson.build b/include/meson.build
index acc57cd..833c86e 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -1 +1,5 @@
-install_headers('zck.h')
+confdata = configuration_data()
+confdata.set('version', meson.project_version())
+install_headers(configure_file(input: 'zck.h.in',
+                               output: 'zck.h',
+                               configuration: confdata))
diff --git a/include/zck.h b/include/zck.h.in
similarity index 98%
rename from include/zck.h
rename to include/zck.h.in
index dd87c47..b1b48af 100644
--- a/include/zck.h
+++ b/include/zck.h.in
@@ -1,11 +1,7 @@
 #ifndef ZCK_H
 #define ZCK_H
 
-#define ZCK_VERSION "0.7.3"
-#define ZCK_VER_MAJOR 0
-#define ZCK_VER_MINOR 7
-#define ZCK_VER_REVISION 3
-#define ZCK_VER_SUBREVISION 0
+#define ZCK_VERSION "@version@"
 
 #define True 1
 #define False 0
diff --git a/meson.build b/meson.build
index a274bc0..0b32879 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,5 @@
-project('zck', 'c')
+project('zck', 'c', version: '0.7.3')
 
-lib_version = '0.0.1'
 so_version = '1'
 
 use_zstd = get_option('with-zstd')
@@ -27,7 +26,7 @@ subdir('test')
 
 pkg_mod = import('pkgconfig')
 pkg_mod.generate(libraries: zcklib,
-                 version: lib_version,
+                 version: meson.project_version(),
                  name: 'libzck',
                  filebase: 'zck',
                  description: 'A library for generating easy-to-delta files.')
diff --git a/src/lib/meson.build b/src/lib/meson.build
index d15ba0a..1acaf8d 100644
--- a/src/lib/meson.build
+++ b/src/lib/meson.build
@@ -10,5 +10,5 @@ zcklib = shared_library('zck',
                         include_directories: inc,
                         dependencies: [zstd_dep],
                         install: true,
-                        version: lib_version,
+                        version: meson.project_version(),
                         soversion: so_version)
-- 
2.30.2