meson: headers: use util-linux version of version defines

This matches what autotools is doing.

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>

diff --git a/libblkid/meson.build b/libblkid/meson.build
index a38462c2ea7cd6ea39f57c2f21c8fbd27402f520..ff1a78dfc420d721f8de9580473bf83a3fed39e8 100644 (file)
--- a/libblkid/meson.build
+++ b/libblkid/meson.build
@@ -1,9 +1,13 @@
 dir_libblkid = include_directories('.', 'src')
 
+defs = configuration_data()
+defs.set('LIBBLKID_DATE', libblkid_date)
+defs.set('LIBBLKID_VERSION', pc_version)
+
 blkid_h = configure_file(
   input : 'src/blkid.h.in',
   output : 'blkid.h',
-  configuration : conf)
+  configuration : defs)
 
 lib_blkid_sources = '''
   src/blkidP.h

diff --git a/libfdisk/meson.build b/libfdisk/meson.build
index 7e174858116325b0b910fc3de4ddb89171aa83ed..b5989bd970074407cf8f255845f5d6c3d4badd7d 100644 (file)
--- a/libfdisk/meson.build
+++ b/libfdisk/meson.build
@@ -1,10 +1,10 @@
 dir_libfdisk = include_directories('.', 'src')
 
 defs = configuration_data()
-defs.set('LIBFDISK_VERSION', libfdisk_version)
-defs.set('LIBFDISK_MAJOR_VERSION', libfdisk_version.split('.')[0])
-defs.set('LIBFDISK_MINOR_VERSION', libfdisk_version.split('.')[1])
-defs.set('LIBFDISK_PATCH_VERSION', libfdisk_version.split('.')[2])
+defs.set('LIBFDISK_VERSION', pc_version)
+defs.set('LIBFDISK_MAJOR_VERSION', pc_version.split('.')[0])
+defs.set('LIBFDISK_MINOR_VERSION', pc_version.split('.')[1])
+defs.set('LIBFDISK_PATCH_VERSION', pc_version.split('.')[2])
 
 libfdisk_h = configure_file(
   input : 'src/libfdisk.h.in',

diff --git a/libmount/meson.build b/libmount/meson.build
index d25ec8d08c3a2eb4044fcec44c8632a10b8467d4..0a7a972dfc7bb590b2886ed12ea7e039846e6711 100644 (file)
--- a/libmount/meson.build
+++ b/libmount/meson.build
@@ -1,10 +1,10 @@
 dir_libmount = include_directories('.', 'src')
 
 defs = configuration_data()
-defs.set('LIBMOUNT_VERSION', libmount_version)
-defs.set('LIBMOUNT_MAJOR_VERSION', libmount_version.split('.')[0])
-defs.set('LIBMOUNT_MINOR_VERSION', libmount_version.split('.')[1])
-defs.set('LIBMOUNT_PATCH_VERSION', libmount_version.split('.')[2])
+defs.set('LIBMOUNT_VERSION', pc_version)
+defs.set('LIBMOUNT_MAJOR_VERSION', pc_version.split('.')[0])
+defs.set('LIBMOUNT_MINOR_VERSION', pc_version.split('.')[1])
+defs.set('LIBMOUNT_PATCH_VERSION', pc_version.split('.')[2])
 
 libmount_h = configure_file(
   input : 'src/libmount.h.in',

diff --git a/libsmartcols/meson.build b/libsmartcols/meson.build
index 47113092b957c0fd7f8e43d094887ff6248bca67..b59f41bf90fcb5b6f861d3ad586a5c505e6c9c1e 100644 (file)
--- a/libsmartcols/meson.build
+++ b/libsmartcols/meson.build
@@ -1,7 +1,7 @@
 dir_libsmartcols = include_directories('.', 'src')
 
 defs = configuration_data()
-defs.set('LIBSMARTCOLS_VERSION', libsmartcols_version)
+defs.set('LIBSMARTCOLS_VERSION', pc_version)
 
 libsmartcols_h = configure_file(
   input : 'src/libsmartcols.h.in',