From 68cca4dea5fc889b4c66a4605ee852c239178b2d Mon Sep 17 00:00:00 2001 From: Con Kolivas Date: Tue, 22 Mar 2011 09:06:13 +1100 Subject: [PATCH] More streamlining of version number. Fixes problems with osx version displayed. --- configure.ac | 6 +++--- lrzip_private.h | 4 ---- main.c | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index c9d2acde..ca8c34e1 100644 --- a/configure.ac +++ b/configure.ac @@ -29,9 +29,9 @@ AC_PROG_LIBTOOL ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_ifdef([v_rev], , [m4_define([v_rev], [0])]) m4_ifdef([v_rel], , [m4_define([v_rel], [])]) -AC_DEFINE_UNQUOTED(VMAJ, [v_maj], [Major version]) -AC_DEFINE_UNQUOTED(VMIN, [v_min], [Minor version]) -AC_DEFINE_UNQUOTED(VMIC, [v_mic], [Micro version]) +AC_DEFINE_UNQUOTED(LRZIP_MAJOR_VERSION, [v_maj], [Major version]) +AC_DEFINE_UNQUOTED(LRZIP_MINOR_VERSION, [v_min], [Minor version]) +AC_DEFINE_UNQUOTED(LRZIP_MINOR_SUBVERSION, [v_mic], [Micro version]) version_info="lt_rev:lt_cur:lt_age" release_info="v_rel" AC_SUBST(version_info) diff --git a/lrzip_private.h b/lrzip_private.h index 30baa57c..1dc9b252 100644 --- a/lrzip_private.h +++ b/lrzip_private.h @@ -20,10 +20,6 @@ #ifndef LRZIP_PRIV_H #define LRZIP_PRIV_H -#define LRZIP_MAJOR_VERSION VMAJ -#define LRZIP_MINOR_VERSION VMIN -#define LRZIP_MINOR_SUBVERSION VMIC - #define NUM_STREAMS 2 #define STREAM_BUFSIZE (1024 * 1024 * 10) diff --git a/main.c b/main.c index b2259253..fea8be14 100644 --- a/main.c +++ b/main.c @@ -168,7 +168,7 @@ static rzip_control control; static void usage(void) { - print_output("lrzip version %d.%d%d\n", LRZIP_MAJOR_VERSION, LRZIP_MINOR_VERSION, LRZIP_MINOR_SUBVERSION); + print_output("lrzip version %s\n", PACKAGE_VERSION); print_output("Copyright (C) Con Kolivas 2006-2011\n"); print_output("Based on rzip "); print_output("Copyright (C) Andrew Tridgell 1998-2003\n\n");