From e974e79ea5e74fab7c549b210f9c3af12d0074d6 Mon Sep 17 00:00:00 2001
From: Marius Tolzmann <tolzmann@molgen.mpg.de>
Date: Mon, 21 Sep 2015 10:33:57 +0200
Subject: [PATCH] mxqd: Use mysql defaults from mxq.h

---
 mxqd.c | 37 ++++++++++---------------------------
 1 file changed, 10 insertions(+), 27 deletions(-)

diff --git a/mxqd.c b/mxqd.c
index c2b572d6..6d4c3408 100644
--- a/mxqd.c
+++ b/mxqd.c
@@ -34,18 +34,7 @@
 #include "mxq_job.h"
 #include "mx_mysql.h"
 #include "mxqd.h"
-
-#ifndef MXQ_VERSION
-#define MXQ_VERSION "0.00"
-#endif
-
-#ifndef MXQ_VERSIONFULL
-#define MXQ_VERSIONFULL "MXQ v0.00 super alpha 0"
-#endif
-
-#ifndef MXQ_VERSIONDATE
-#define MXQ_VERSIONDATE "2015"
-#endif
+#include "mxq.h"
 
 #define MYSQL_DEFAULT_FILE     MXQ_MYSQL_DEFAULT_FILE
 #define MYSQL_DEFAULT_GROUP    "mxqd"
@@ -63,22 +52,13 @@ volatile sig_atomic_t global_sigterm_cnt=0;
 
 int mxq_redirect_output(char *stdout_fname, char *stderr_fname);
 
-static void print_version(void)
-{
-    printf(
-    "mxqd - " MXQ_VERSIONFULL "\n"
-    "  by Marius Tolzmann <tolzmann@molgen.mpg.de> " MXQ_VERSIONDATE "\n"
-    "  Max Planck Institute for Molecular Genetics - Berlin Dahlem\n"
-    );
-}
-
 static void print_usage(void)
 {
-    print_version();
+    mxq_print_generic_version();
     printf(
     "\n"
     "Usage:\n"
-    "  mxqd [options]\n"
+    "  %s [options]\n"
     "\n"
     "options:\n"
     "  -j, --slots     <slots>           default: 1\n"
@@ -98,13 +78,16 @@ static void print_usage(void)
     "\n"
     "Change how to connect to the mysql server:\n"
     "\n"
-    "  -M, --mysql-default-file [mysql-file]    default: " MYSQL_DEFAULT_FILE "\n"
-    "  -S, --mysql-default-group [mysql-group]  default: " MYSQL_DEFAULT_GROUP "\n"
+    "  -M, --mysql-default-file [mysql-file]    default: %s\n"
+    "  -S, --mysql-default-group [mysql-group]  default: %s\n"
     "\n"
     "Environment:\n"
     "  MXQ_MYSQL_DEFAULT_FILE   change default for [mysql-file]\n"
     "  MXQ_MYSQL_DEFAULT_GROUP  change default for [mysql-group]\n"
-    "\n"
+    "\n",
+    program_invocation_short_name,
+    MXQ_MYSQL_DEFAULT_FILE_STR,
+    MXQ_MYSQL_DEFAULT_GROUP_STR
     );
 }
 
@@ -280,7 +263,7 @@ int server_init(struct mxq_server *server, int argc, char *argv[])
                 break;
 
             case 'V':
-                print_version();
+                mxq_print_generic_version();
                 exit(EX_USAGE);
 
             case 'h':