4 files changed, 26 insertions, 4 deletions

diff --git a/configure.ac b/configure.ac
index 79b9d82d5..7ba1d27a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,8 +23,14 @@ AC_PREREQ([2.69])
 AC_INIT([gnunet],[m4_esyscmd_s(sh contrib/get_version.sh)],[bug-gnunet@gnu.org])
 
 gnunet_version=m4_esyscmd_s(sh contrib/get_version.sh)
+gnunet_major_version=m4_esyscmd_s(sh contrib/get_version.sh --major)
+gnunet_minor_version=m4_esyscmd_s(sh contrib/get_version.sh --minor)
+gnunet_micro_version=m4_esyscmd_s(sh contrib/get_version.sh --micro)
 
 AC_SUBST([gnunet_version])
+AC_SUBST([gnunet_major_version])
+AC_SUBST([gnunet_minor_version])
+AC_SUBST([gnunet_micro_version])
 
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIRS([m4])
diff --git a/contrib/get_version.sh b/contrib/get_version.sh
index 2a41ed4d6..7366c6bf6 100755
--- a/contrib/get_version.sh
+++ b/contrib/get_version.sh
@@ -15,4 +15,19 @@ if test "x$VERSION" = "x"
 then
   VERSION="unknown"
 fi
-echo "$VERSION"
+case $1 in
+"--major")
+  echo "$VERSION" | sed 's/\(^[0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/g'
+  ;;
+"--minor")
+  echo "$VERSION" | sed 's/\(^[0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/g'
+  ;;
+"--micro")
+  echo "$VERSION" | sed 's/\(^[0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/g'
+  ;;
+"--git")
+  echo "$VERSION" | sed 's/\(^[0-9]*\)\.\([0-9]*\)\.\([0-9]*\)\(.*\)/\4/g'
+  ;;
+*)
+  echo "$VERSION"
+esac
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 97e203b0c..95b5c3396 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -516,6 +516,7 @@ src/util/client.c
 src/util/common_allocation.c
 src/util/common_endian.c
 src/util/common_logging.c
+src/util/compress.c
 src/util/configuration.c
 src/util/configuration_helper.c
 src/util/consttime_memcmp.c
diff --git a/src/include/gnunet_config.h.in b/src/include/gnunet_config.h.in
index 63ffd84bd..5dff759ae 100644
--- a/src/include/gnunet_config.h.in
+++ b/src/include/gnunet_config.h.in
@@ -34,13 +34,13 @@
 #define GNUNET_VERSION "@gnunet_version@"
 
 /* Major version */
-#define GNUNET_MAJOR_VERSION 0
+#define GNUNET_MAJOR_VERSION @gnunet_major_version@
 
 /* Micro version */
-#define GNUNET_MINOR_VERSION 18
+#define GNUNET_MINOR_VERSION @gnunet_minor_version@
 
 /* Mico version */
-#define GNUNET_MICRO_VERSION 2
+#define GNUNET_MICRO_VERSION @gnunet_micro_version@
 
 /* Set to 1 is this is an experimental build */
 #define GNUNET_EXPERIMENTAL @enable_experimental@