More streamlining of version number. Fixes problems with osx version displayed.

This commit is contained in:
Con Kolivas 2011-03-22 09:06:13 +11:00
parent 131d4c92c2
commit 68cca4dea5
3 changed files with 4 additions and 8 deletions

View file

@ -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)

View file

@ -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)

2
main.c
View file

@ -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");