From 4593c0dc0124a5f1ddbb593d53d84be9c7b77c78 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Thu, 1 Mar 2012 08:04:55 +0100 Subject: [PATCH] configure: automatically compute version from git Also, output this version in usage(). --- configure.ac | 9 ++++++++- src/lldpctl.c | 3 ++- src/lldpd.c | 3 ++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 51e54a52..32ca90b4 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,14 @@ # Configure autoconf AC_PREREQ([2.64]) -AC_INIT([lldpd], [0.6], [bernat@luffy.cx]) + +dnl Use something like this if you need to patch autoconf files and +dnl regenerate configure outside upstream git tree: +dnl AC_INIT([lldpd], [0.5.7], [bernat@luffy.cx]) +AC_INIT([lldpd], + [m4_esyscmd_s([git describe --tags --always 2> /dev/null || date +%F])], + [bernat@luffy.cx]) + AC_CONFIG_SRCDIR([src/lldpd.c]) AC_CONFIG_HEADER([config.h]) AC_CONFIG_FILES([Makefile src/Makefile man/Makefile tests/Makefile]) diff --git a/src/lldpctl.c b/src/lldpctl.c index 2c35c5a9..045e8bfc 100644 --- a/src/lldpctl.c +++ b/src/lldpctl.c @@ -38,7 +38,8 @@ extern const char *__progname; static void usage(void) { - fprintf(stderr, "Usage: %s [OPTIONS ...] [INTERFACES ...]\n", __progname); + fprintf(stderr, "Usage: %s [OPTIONS ...] [INTERFACES ...]\n", __progname); + fprintf(stderr, "Version: %s\n", PACKAGE_STRING); fprintf(stderr, "\n"); diff --git a/src/lldpd.c b/src/lldpd.c index ceb93994..5f4b1cdf 100644 --- a/src/lldpd.c +++ b/src/lldpd.c @@ -83,7 +83,8 @@ extern const char *__progname; static void usage(void) { - fprintf(stderr, "Usage: %s [OPTIONS ...]\n", __progname); + fprintf(stderr, "Usage: %s [OPTIONS ...]\n", __progname); + fprintf(stderr, "Version: %s\n", PACKAGE_STRING); fprintf(stderr, "\n"); -- 2.39.5