libblkid: add BLKID_{VERSION,DATE} to blkid.h

The original e2fsprogs has BLKID_{VERSION,DATE} macros in blkid.h.
Although the macros are not updated for many years in e2fsprogs. So I
guess nobody uses it.

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

diff --git a/configure.ac b/configure.ac
index f962b8628821ea7f8694499b0aabbe6c81dc7ad7..c8140285b5d52a7dea3d3d2df9fd2e6225baddd2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -330,6 +330,7 @@ AC_ARG_ENABLE([libblkid],
   AS_HELP_STRING([--disable-libblkid], [do not build libblkid and blkid utilities]),
   [], enable_libblkid=yes
 )
+AC_SUBST([LIBBLKID_DATE])
 AC_SUBST([LIBBLKID_VERSION])
 AC_SUBST([LIBBLKID_VERSION_INFO])
 AM_CONDITIONAL(BUILD_LIBBLKID, test "x$enable_libblkid" = xyes)
@@ -1022,6 +1023,7 @@ shlibs/blkid/Makefile
 shlibs/blkid/docs/Makefile
 shlibs/blkid/docs/version.xml
 shlibs/blkid/src/Makefile
+shlibs/blkid/src/blkid.h
 shlibs/blkid/src/superblocks/Makefile
 shlibs/blkid/src/topology/Makefile
 shlibs/blkid/src/partitions/Makefile

diff --git a/shlibs/blkid/.gitignore b/shlibs/blkid/.gitignore
index d6126deabfa1f095b24b643eecce2b2ff0ef04da..6ffe4a9e5277c27e252ce69da5269e0fab4d13fd 100644 (file)
--- a/shlibs/blkid/.gitignore
+++ b/shlibs/blkid/.gitignore
@@ -2,3 +2,4 @@
 bin/blkid
 bin/findfs
 test_*
+blkid.h

diff --git a/shlibs/blkid/src/Makefile.am b/shlibs/blkid/src/Makefile.am
index 1a6aa0226aa5677b3636581cd1b217b7a9f22e9d..4947000887703d7dc6c1189f138ddf5c1e95cf0a 100644 (file)
--- a/shlibs/blkid/src/Makefile.am
+++ b/shlibs/blkid/src/Makefile.am
@@ -46,7 +46,7 @@ libblkid_la_LDFLAGS = -Wl,--version-script=$(ul_libblkid_srcdir)/blkid.sym \
 tests = test_cache test_config test_dev test_devname test_devno test_getsize \
        test_read test_resolve test_save test_tag test_verify test_evaluate
 
-EXTRA_DIST = blkid.sym tst_types.c
+EXTRA_DIST = blkid.sym tst_types.c blkid.h.in
 CLEANFILES = $(tests)
 
 tests: all $(tests)

diff --git a/shlibs/blkid/src/blkid.h b/shlibs/blkid/src/blkid.h.in
similarity index 99%
rename from shlibs/blkid/src/blkid.h
rename to shlibs/blkid/src/blkid.h.in
index 6b495b69969e9dc34aef38ed78ea119f32a7b1fe..9c0a1d57f7c7c6d35528cc99b69e192ad5990525 100644 (file)
--- a/shlibs/blkid/src/blkid.h
+++ b/shlibs/blkid/src/blkid.h.in
@@ -30,6 +30,9 @@
 extern "C" {
 #endif
 
+#define BLKID_VERSION   "@LIBBLKID_VERSION@"
+#define BLKID_DATE      "@LIBBLKID_DATE@"
+
 /**
  * blkid_dev:
  *

diff --git a/shlibs/blkid/src/version.c b/shlibs/blkid/src/version.c
index 91fd5117fcc35464dc25b98af0deb6a2746a199b..4c7fa06ca65693493b65e3b5a96e47f542c7106f 100644 (file)
--- a/shlibs/blkid/src/version.c
+++ b/shlibs/blkid/src/version.c
@@ -22,6 +22,12 @@
 static const char *lib_version = LIBBLKID_VERSION;     /* release version */
 static const char *lib_date = LIBBLKID_DATE;
 
+/**
+ * blkid_parse_version_string:
+ * @ver_string:  version string (e.g. "2.16.0")
+ *
+ * Returns: release version code.
+ */
 int blkid_parse_version_string(const char *ver_string)
 {
        const char *cp;