diff options
| author | Søren Holm | 2014-10-01 16:14:02 +0200 |
|---|---|---|
| committer | Karel Zak | 2014-10-14 12:03:54 +0200 |
| commit | 10e1d2e5f7e516344d9ba87e25da4dccee13913d (patch) | |
| tree | 035f5863046ff8471ea39b96281ae12581fd9e5a | |
| parent | dmesg: improve reltime colors (diff) | |
| download | kernel-qcow2-util-linux-10e1d2e5f7e516344d9ba87e25da4dccee13913d.tar.gz kernel-qcow2-util-linux-10e1d2e5f7e516344d9ba87e25da4dccee13913d.tar.xz kernel-qcow2-util-linux-10e1d2e5f7e516344d9ba87e25da4dccee13913d.zip | |
libmount: provide version as int for better compiletime test
Signed-off-by: Søren Holm <sgh@sgh.dk>
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | libmount/src/libmount.h.in | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 08269e248..122344e80 100644 --- a/Makefile.am +++ b/Makefile.am @@ -120,6 +120,9 @@ edit_cmd = sed \ -e 's|@ADJTIME_PATH[@]|$(ADJTIME_PATH)|g' \ -e 's|@LIBUUID_VERSION[@]|$(LIBUUID_VERSION)|g' \ -e 's|@LIBMOUNT_VERSION[@]|$(LIBMOUNT_VERSION)|g' \ + -e 's|@LIBMOUNT_MAJOR_VERSION[@]|$(LIBMOUNT_MAJOR_VERSION)|g' \ + -e 's|@LIBMOUNT_MINOR_VERSION[@]|$(LIBMOUNT_MINOR_VERSION)|g' \ + -e 's|@LIBMOUNT_PATCH_VERSION[@]|$(LIBMOUNT_PATCH_VERSION)|g' \ -e 's|@LIBSMARTCOLS_VERSION[@]|$(LIBSMARTCOLS_VERSION)|g' \ -e 's|@LIBBLKID_VERSION[@]|$(LIBBLKID_VERSION)|g' diff --git a/configure.ac b/configure.ac index 0447d468d..f692d8a56 100644 --- a/configure.ac +++ b/configure.ac @@ -806,6 +806,9 @@ AM_CONDITIONAL([BUILD_LIBMOUNT], [test "x$build_libmount" = xyes]) AM_CONDITIONAL([BUILD_LIBMOUNT_TESTS], [test "x$build_libmount" = xyes -a "x$enable_static" = xyes]) AC_SUBST([LIBMOUNT_VERSION]) +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]) diff --git a/libmount/src/libmount.h.in b/libmount/src/libmount.h.in index d54e87665..91e22874c 100644 --- a/libmount/src/libmount.h.in +++ b/libmount/src/libmount.h.in @@ -30,6 +30,9 @@ extern "C" { #include <sys/types.h> #define LIBMOUNT_VERSION "@LIBMOUNT_VERSION@" +#define LIBMOUNT_MAJOR_VERSION @LIBMOUNT_MAJOR_VERSION@ +#define LIBMOUNT_MINOR_VERSION @LIBMOUNT_MINOR_VERSION@ +#define LIBMOUNT_PATCH_VERSION @LIBMOUNT_PATCH_VERSION@ /** * libmnt_cache: |