Minor changes.

* Makefile.am: Improve ChangeLog rule
* configure.ac: Remove AH_BOTTOM
* gnulib.modules: Add argp-version-etc, progname.
Remove version-etc.
* src/main.c: Use argp-version-etc

1 files changed, 8 insertions, 10 deletions

diff --git a/src/main.c b/src/main.c
index 5ad565a..cbb472e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -20,2 +20,4 @@
 #include <argp.h>
+#include <argp-version-etc.h>
+#include <progname.h>
 #include <stdarg.h>
@@ -24,3 +26,2 @@
 
-const char *argp_program_version = "cflow (" PACKAGE_NAME ") " VERSION;
 const char *argp_program_bug_address = "<" PACKAGE_BUGREPORT ">";
@@ -29,2 +30,6 @@ static char doc[] = N_("generate a program flowgraph")
 N_("* The effect of each option marked with an asterisk is reversed if the option's long name is prefixed with `no-'. For example, --no-cpp cancels --cpp.");
+const char *program_authors[] = {
+     "Sergey Poznyakoff",
+     NULL
+};
 
@@ -734,9 +739,2 @@ const char version_etc_copyright[] =
 
-static void
-cflow_version(FILE *stream, struct argp_state *state)
-{
-     	version_etc(stream, "cflow", PACKAGE_NAME, PACKAGE_VERSION,
-		    "Sergey Poznyakoff", NULL);
-}
-
 int
@@ -746,4 +744,4 @@ main(int argc, char **argv)
 
-     program_name = argv[0]; /* Until gnulib provides a better way */
-     argp_program_version_hook = cflow_version;
+     set_program_name(argv[0]);
+     argp_version_setup("cflow", program_authors);