From 3782edcfd3e0fadeb487c83e1ffc528611f8854b Mon Sep 17 00:00:00 2001
From: Doug Torrance <dtorrance@piedmont.edu>
Date: Wed, 11 Jul 2018 22:12:48 -0400
Subject: [PATCH] wmmisc: Use autoconf defines for version number and bugreport
 address.

---
 wmmisc/src/dockapp_main.c | 9 +++------
 wmmisc/src/dockapp_main.h | 4 ----
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/wmmisc/src/dockapp_main.c b/wmmisc/src/dockapp_main.c
index f1f2ca0..fb22631 100644
--- a/wmmisc/src/dockapp_main.c
+++ b/wmmisc/src/dockapp_main.c
@@ -43,16 +43,13 @@ dockapp_show_help( const char* wm_name )
    printf( "the system's fork count and load average.\n\n" );
    printf( "                -h       display this help and exit\n" );
    printf( "                -v       output version information and exit\n\n" );
-   printf( "Report bugs to <" DOCKAPP_AUTHOR_EMAIL ">.\n" );
+   printf( "Report bugs to <" PACKAGE_BUGREPORT ">.\n" );
 }
 
 void
 dockapp_show_version( void )
 {
-   printf( "%s %d.%d\n",
-	   DOCKAPP_NAME,
-	   DOCKAPP_MAJOR_VERSION,
-	   DOCKAPP_MINOR_VERSION );
+   printf( "%s\n", PACKAGE_STRING);
    printf( "Written by %s <%s>\n\n", DOCKAPP_AUTHOR, DOCKAPP_AUTHOR_EMAIL );
    printf( "Copyright (C) 2003-2006 %s\n", DOCKAPP_AUTHOR );
    printf( "This is free software; see the source for copying conditions.  There is NO\n" );
@@ -91,7 +88,7 @@ dockapp_crash( int signal_received )
 	    DOCKAPP_NAME );
    fprintf( stderr,
 	    "such as gdb, and report the output to <%s>.\n",
-	    DOCKAPP_AUTHOR_EMAIL );
+	    PACKAGE_BUGREPORT );
 
    abort();
 }
diff --git a/wmmisc/src/dockapp_main.h b/wmmisc/src/dockapp_main.h
index 8e04aa3..3b303f3 100644
--- a/wmmisc/src/dockapp_main.h
+++ b/wmmisc/src/dockapp_main.h
@@ -26,10 +26,6 @@
 
 #define DOCKAPP_NAME "wmmisc"
 
-#define DOCKAPP_MAJOR_VERSION 1
-#define DOCKAPP_MINOR_VERSION 1
-#define DOCKAPP_VERSION "1.1"
-
 static char wmmisc_mask_bits[64 * 64];
 static int wmmisc_mask_width = 64;
 static int wmmisc_mask_height = 64;