libblkid: add LIBBLKID_VERSION to blkid.h, remove redundant config.h versions

Add LIBBLKID_VERSION, LIBBLKID_MAJOR_VERSION, LIBBLKID_MINOR_VERSION,
and LIBBLKID_PATCH_VERSION to blkid.h.in to follow the same pattern as
libmount, libfdisk, and libsmartcols. Keep BLKID_VERSION and BLKID_DATE
as backward-compatible aliases.

Remove redundant AC_DEFINE for library version strings from configure.ac
(LIBMOUNT_VERSION, LIBSMARTCOLS_VERSION, LIBFDISK_VERSION,
LIBLASTLOG2_VERSION). These were duplicated in config.h when the library
public headers already define them via .h.in templates.

Remove LIBBLKID_VERSION and LIBBLKID_DATE from meson config.h for the
same reason.

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/configure.ac b/configure.ac
index 0ef8e106bf30112fa10d6ede6a0b8f5d52a5706e..499c382ff6392df5f9b0f5e2a65ed040880381bb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1323,7 +1323,6 @@ AC_SUBST([SQLITE3_LIBS])
 
 AC_SUBST([LIBLASTLOG2_VERSION])
 AC_SUBST([LIBLASTLOG2_VERSION_INFO])
-AC_DEFINE_UNQUOTED([LIBLASTLOG2_VERSION], ["$LIBLASTLOG2_VERSION"], [liblastlog2 version string])
 AM_CONDITIONAL([BUILD_LIBLASTLOG2], [test "x$build_liblastlog2" = xyes])
 AM_CONDITIONAL([BUILD_LIBLASTLOG2_TESTS], [test "x$build_liblastlog2" = xyes && test "x$enable_static" = xyes])
 AS_IF([test "x$build_liblastlog2" = xyes], [
@@ -1353,9 +1352,10 @@ UL_REQUIRES_HAVE([libblkid], [openat], [openat functions])
 UL_REQUIRES_HAVE([libblkid], [dirfd,ddfd], [dirfd or ddfd function])
 AC_SUBST([LIBBLKID_DATE])
 AC_SUBST([LIBBLKID_VERSION])
+AC_SUBST([LIBBLKID_MAJOR_VERSION], $PACKAGE_VERSION_MAJOR)
+AC_SUBST([LIBBLKID_MINOR_VERSION], $PACKAGE_VERSION_MINOR)
+AC_SUBST([LIBBLKID_PATCH_VERSION], $PACKAGE_VERSION_RELEASE)
 AC_SUBST([LIBBLKID_VERSION_INFO])
-AC_DEFINE_UNQUOTED([LIBBLKID_VERSION], ["$LIBBLKID_VERSION"], [libblkid version string])
-AC_DEFINE_UNQUOTED([LIBBLKID_DATE], ["$LIBBLKID_DATE"], [libblkid date string])
 AS_IF([test "x$build_libblkid" = xyes], [
   AC_DEFINE([HAVE_LIBBLKID], [1], [Define to 1 if you have the -lblkid.])
 ])
@@ -1390,7 +1390,6 @@ AC_SUBST([LIBMOUNT_MAJOR_VERSION], $PACKAGE_VERSION_MAJOR)
 AC_SUBST([LIBMOUNT_MINOR_VERSION], $PACKAGE_VERSION_MINOR)
 AC_SUBST([LIBMOUNT_PATCH_VERSION], $PACKAGE_VERSION_RELEASE)
 AC_SUBST([LIBMOUNT_VERSION_INFO])
-AC_DEFINE_UNQUOTED([LIBMOUNT_VERSION], ["$LIBMOUNT_VERSION"], [libmount version string])
 
 AC_ARG_ENABLE([libmount-mountfd-support],
   AS_HELP_STRING([--disable-libmount-mountfd-support], [do not use new mount API based on FDs]),
@@ -1422,7 +1421,6 @@ AM_CONDITIONAL([BUILD_LIBSMARTCOLS], [test "x$build_libsmartcols" = xyes])
 
 AC_SUBST([LIBSMARTCOLS_VERSION])
 AC_SUBST([LIBSMARTCOLS_VERSION_INFO])
-AC_DEFINE_UNQUOTED([LIBSMARTCOLS_VERSION], ["$LIBSMARTCOLS_VERSION"], [libsmartcols version string])
 
 
 dnl
@@ -1446,7 +1444,6 @@ AC_SUBST([LIBFDISK_MAJOR_VERSION], $PACKAGE_VERSION_MAJOR)
 AC_SUBST([LIBFDISK_MINOR_VERSION], $PACKAGE_VERSION_MINOR)
 AC_SUBST([LIBFDISK_PATCH_VERSION], $PACKAGE_VERSION_RELEASE)
 AC_SUBST([LIBFDISK_VERSION_INFO])
-AC_DEFINE_UNQUOTED([LIBFDISK_VERSION], ["$LIBFDISK_VERSION"], [libfdisk version string])
 
 
 AC_ARG_ENABLE([fdisks],

diff --git a/libblkid/meson.build b/libblkid/meson.build
index 2435692cd2d117cbe266e3227ca13c43b0a96abe..72d8f2b1040f65a88603cddaac819e7f5f5d6937 100644 (file)
--- a/libblkid/meson.build
+++ b/libblkid/meson.build
@@ -8,6 +8,9 @@ endif
 defs = configuration_data()
 defs.set('LIBBLKID_DATE', libblkid_date)
 defs.set('LIBBLKID_VERSION', pc_version)
+defs.set('LIBBLKID_MAJOR_VERSION', pc_version.split('.')[0])
+defs.set('LIBBLKID_MINOR_VERSION', pc_version.split('.')[1])
+defs.set('LIBBLKID_PATCH_VERSION', pc_version.split('.')[2])
 
 configure_file(
   input : 'src/blkid.h.in',

diff --git a/libblkid/src/blkid.h.in b/libblkid/src/blkid.h.in
index a0b381ccbafd9121f3bd5bda8f74addbd4531796..637d970f2a9ddbe4255eb86c346cd3ec472fb59c 100644 (file)
--- a/libblkid/src/blkid.h.in
+++ b/libblkid/src/blkid.h.in
@@ -29,8 +29,15 @@
 extern "C" {
 #endif
 
-#define BLKID_VERSION   "@LIBBLKID_VERSION@"
-#define BLKID_DATE      "@LIBBLKID_DATE@"
+#define LIBBLKID_VERSION   "@LIBBLKID_VERSION@"
+#define LIBBLKID_MAJOR_VERSION   @LIBBLKID_MAJOR_VERSION@
+#define LIBBLKID_MINOR_VERSION   @LIBBLKID_MINOR_VERSION@
+#define LIBBLKID_PATCH_VERSION   @LIBBLKID_PATCH_VERSION@
+#define LIBBLKID_DATE      "@LIBBLKID_DATE@"
+
+/* backward compatibility */
+#define BLKID_VERSION   LIBBLKID_VERSION
+#define BLKID_DATE      LIBBLKID_DATE
 
 /**
  * blkid_dev:

diff --git a/meson.build b/meson.build
index 2e12cef614c5c04f779b36b60a1a1f41774674a6..eb2ec53aa5d6c9dbade26a848f870b455c9bd039 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -62,9 +62,6 @@ endif
 
 pc_version = '.'.join(pc_version)
 
-conf.set_quoted('LIBBLKID_VERSION', pc_version)
-conf.set_quoted('LIBBLKID_DATE', libblkid_date)
-
 conf.set('bindir', bindir)
 conf.set('sbindir', sbindir)
 conf.set('runstatedir', runstatedir)