Startup: Print version number better

Version number is now inferred by git during the autogen.sh step.

It's a more automated version of the previous commit.

diff --git a/configure.ac b/configure.ac
index 3850f5467b28c3257ba5229f81a93552a25dbf37..a19747f77768717ac99299d3688fdb94c72ac2a6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,8 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([fort], [1.5.1], [fort-validator@nic.mx])
+AC_INIT([fort], [m4_esyscmd_s([git describe --dirty --always --tags])],
+       [fort-validator@nic.mx])
 AC_CONFIG_SRCDIR([src/main.c])
 AM_INIT_AUTOMAKE([subdir-objects])
 

diff --git a/src/config.c b/src/config.c
index 19d9998472a8c9e52248126f8664034d840cd184..15a54e32b9539bb53877ff218e4a5332485772f1 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -928,7 +928,7 @@ print_config(void)
 {
        struct option_field const *opt;
 
-       pr_op_info("Fort 1.5.1.2");
+       pr_op_info(PACKAGE_STRING);
        pr_op_info("Configuration {");
 
        FOREACH_OPTION(options, opt, 0xFFFF)