diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | shlibs/blkid/.gitignore | 1 | ||||
| -rw-r--r-- | shlibs/blkid/src/Makefile.am | 2 | ||||
| -rw-r--r-- | shlibs/blkid/src/blkid.h.in (renamed from shlibs/blkid/src/blkid.h) | 3 | ||||
| -rw-r--r-- | shlibs/blkid/src/version.c | 6 |
5 files changed, 13 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index f962b8628..c8140285b 100644 --- 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 d6126deab..6ffe4a9e5 100644 --- 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 1a6aa0226..494700088 100644 --- 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 index 6b495b699..9c0a1d57f 100644 --- 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 91fd5117f..4c7fa06ca 100644 --- 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; |