libmount: provide version as int for better compiletime test

Signed-off-by: Søren Holm <sgh@sgh.dk>

diff --git a/Makefile.am b/Makefile.am
index 08269e2482c4eb7fc054edd6de01496d4212a654..122344e8075531bfca595bc9aabca95e73bb0f35 100644 (file)
--- 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 0447d468d3663480c8735629dd475420c0b2026e..f692d8a56a09b001dad37ebb05f02bb3ab43a9c4 100644 (file)
--- 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 d54e87665260978b14ca246571bad223f80afb4c..91e22874c9e3aaba2d858b728e6753d595e5dff7 100644 (file)
--- 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: