Merge git://git.code.sf.net/u/xophmeister/fuse

3 files changed, 14 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index a0c2419..5b39f16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 	* libfuse: fix warning mount.c:receive_fd().  Reported by Albert
 	Berger
 
+	* libfuse: added fuse_pkgversion() function to retrieve the full
+	version string, per autoconf.  Patch by Christopher Harrison
+
 2015-06-29  Miklos Szeredi <miklos@szeredi.hu>
 
 	* libfuse: fix possible memory leak.  Reported by Jose R. Guzman
diff --git a/include/fuse_common.h b/include/fuse_common.h
index 28dfc0b..beb44c7 100644
--- a/include/fuse_common.h
+++ b/include/fuse_common.h
@@ -269,6 +269,13 @@ int fuse_daemonize(int foreground);
 int fuse_version(void);
 
 /**
+ * Get the full package version string of the library
+ *
+ * @return the package version
+ */
+const char *fuse_pkgversion(void);
+
+/**
  * Destroy poll handle
  *
  * @param ph the poll handle
diff --git a/lib/helper.c b/lib/helper.c
index e5550c9..bfdc990 100644
--- a/lib/helper.c
+++ b/lib/helper.c
@@ -332,3 +332,7 @@ int fuse_version(void)
 	return FUSE_VERSION;
 }
 
+const char *fuse_pkgversion(void)
+{
+	return PACKAGE_VERSION;
+}