From 449f47e4ef7f816e59750fad7c072493e8886355 Mon Sep 17 00:00:00 2001 From: "Bruce A. Mah" Date: Wed, 9 Apr 2014 13:29:03 -0700 Subject: [PATCH] Use the PACKAGE_BUGREPORT and PACKAGE_STRING macros from automake in --help and --version. Notably this provides the correct URL for the bugtracker. --- src/locale.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/locale.c b/src/locale.c index cb58922..7457f5a 100644 --- a/src/locale.c +++ b/src/locale.c @@ -53,6 +53,8 @@ #include "version.h" +#include "config.h" + #ifdef __cplusplus extern "C" { @@ -124,7 +126,7 @@ const char usage_longstr[] = "Usage: iperf [-s|-c host] [options]\n" "\n" "[KMG] indicates options that support a K/M/G suffix for kilo-, mega-, or giga-\n" - "Report bugs to \n"; + "Report bugs to " PACKAGE_BUGREPORT "\n"; #ifdef OBSOLETE /* from old iperf: no longer supported. Add some of these back someday */ @@ -138,7 +140,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[] = "iperf version " IPERF_VERSION " (" IPERF_VERSION_DATE ")"; +const char version[] = PACKAGE_STRING " (" IPERF_VERSION_DATE ")"; /* ------------------------------------------------------------------- * settings