[Genabel-commits] r1894 - pkg/OmicABELnoMM/src

[noreply at r-forge.r-project.org]

Author: lckarssen
Date: 2014-12-01 14:23:01 +0100 (Mon, 01 Dec 2014)
New Revision: 1894

Modified:
   pkg/OmicABELnoMM/src/main.cpp
Log:
Changed hard-coded version number and program name to the variables defined in config.h. The values in config.h are set when ./configure is run and are based on what is in configure.ac (the AC_INIT line).


Modified: pkg/OmicABELnoMM/src/main.cpp
===================================================================
--- pkg/OmicABELnoMM/src/main.cpp	2014-12-01 13:17:02 UTC (rev 1893)
+++ pkg/OmicABELnoMM/src/main.cpp	2014-12-01 13:23:01 UTC (rev 1894)
@@ -6,6 +6,10 @@
 #include <unistd.h>
 #include <getopt.h>
 
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "Definitions.h"
 #include "Algorithm.h"
 
@@ -17,7 +21,7 @@
     "-e <-10.0~1.0> -i -f";
 
 string helpcmd_expl =
-"omicabelnomm Version 0.96b \n\t"
+    PACKAGE_NAME " v" PACKAGE_VERSION " \n\t"
 "Required: \n\t"
 "-p --phe    \t <path/filename> to the inputs containing phenotypes. \n\t"
 "-g --geno   \t <path/filename> to the inputs containing genotypes. \n\t"
@@ -433,7 +437,7 @@
     blas_set_num_threads(params.threads);
     if (params.mpi_id == 0)
     {
-        cout << "Omicabelnomm Version 0.96b \n";
+        cout << PACKAGE_NAME " v" PACKAGE_VERSION "\n";
     }