From d141c52dabd4b484b2339c2c20725c1eecd0dff4 Mon Sep 17 00:00:00 2001 From: "Bruce A. Mah" Date: Thu, 24 Apr 2014 10:23:31 -0700 Subject: [PATCH] Get the iperf version number from autoconf, don't track the tagging date. These simplify the release process because they eliminate a manual file-editing step. --- configure.ac | 2 +- src/locale.c | 2 +- src/{version.h => version.h.in} | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) rename src/{version.h => version.h.in} (81%) diff --git a/configure.ac b/configure.ac index f997117..4e762e4 100644 --- a/configure.ac +++ b/configure.ac @@ -89,4 +89,4 @@ AC_CHECK_FUNCS([cpuset_setaffinity sched_setaffinity], # it needs and what arguments it expects. AC_CHECK_FUNCS([sendfile]) -AC_OUTPUT([Makefile src/Makefile examples/Makefile]) +AC_OUTPUT([Makefile src/Makefile src/version.h examples/Makefile]) diff --git a/src/locale.c b/src/locale.c index 164400d..3f3ff56 100644 --- a/src/locale.c +++ b/src/locale.c @@ -139,7 +139,7 @@ const char usage_longstr[] = "Usage: iperf [-s|-c host] [options]\n" "-y, --reportstyle C report as a Comma-Separated Values\n" #endif -const char version[] = PACKAGE_STRING " (" IPERF_VERSION_DATE ")"; +const char version[] = PACKAGE_STRING; /* ------------------------------------------------------------------- * settings diff --git a/src/version.h b/src/version.h.in similarity index 81% rename from src/version.h rename to src/version.h.in index a8c422e..5491a27 100644 --- a/src/version.h +++ b/src/version.h.in @@ -7,5 +7,4 @@ * for complete information. */ -#define IPERF_VERSION "3.0.1" -#define IPERF_VERSION_DATE "10 January 2014" +#define IPERF_VERSION "@PACKAGE_VERSION@"