Fix plumbing of version number from config.h to vg_main.c

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@26

diff --git a/coregrind/vg_include.h b/coregrind/vg_include.h
index 91ca2c03d9a6a8f7ce4af0d6d5590814d01202ab..8b81b6d364b476cc6a5656054368b10b56bf9cc0 100644 (file)
--- a/coregrind/vg_include.h
+++ b/coregrind/vg_include.h
@@ -1452,6 +1452,13 @@ extern Int VGOFF_(helper_request_normal_exit);
 
 #endif /* ndef __VG_INCLUDE_H */
 
+
+/* ---------------------------------------------------------------------
+   Finally - autoconf-generated settings
+   ------------------------------------------------------------------ */
+
+#include "config.h"
+
 /*--------------------------------------------------------------------*/
 /*--- end                                             vg_include.h ---*/
 /*--------------------------------------------------------------------*/

diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index cf2f636acacd64d2cba75acbdc71153bf1ba89ec..99afce78178a050bfc6b1123a0acbd919a637e50 100644 (file)
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -32,7 +32,6 @@
 
 #include "vg_include.h"
 #include "vg_constants.h"
-#include "vg_version.h"
 
 
 /* ---------------------------------------------------------------------
@@ -1011,12 +1010,11 @@ static void process_cmd_line_options ( void )
 
    VG_(clo_logfile_fd) = eventually_logfile_fd;
 
-#  define STRINGIFY(xx)  __STRING(xx)
    if (VG_(clo_verbosity > 0))
       VG_(message)(Vg_UserMsg, 
                    "valgrind-%s, a memory error detector for x86 GNU/Linux.",
-                   STRINGIFY(VG_VERSION));
-#  undef STRINGIFY
+                   VERSION);
+
    if (VG_(clo_verbosity > 0))
       VG_(message)(Vg_UserMsg, 
                    "Copyright (C) 2000-2002, and GNU GPL'd, by Julian Seward.");

diff --git a/vg_include.h b/vg_include.h
index 91ca2c03d9a6a8f7ce4af0d6d5590814d01202ab..8b81b6d364b476cc6a5656054368b10b56bf9cc0 100644 (file)
--- a/vg_include.h
+++ b/vg_include.h
@@ -1452,6 +1452,13 @@ extern Int VGOFF_(helper_request_normal_exit);
 
 #endif /* ndef __VG_INCLUDE_H */
 
+
+/* ---------------------------------------------------------------------
+   Finally - autoconf-generated settings
+   ------------------------------------------------------------------ */
+
+#include "config.h"
+
 /*--------------------------------------------------------------------*/
 /*--- end                                             vg_include.h ---*/
 /*--------------------------------------------------------------------*/

diff --git a/vg_main.c b/vg_main.c
index cf2f636acacd64d2cba75acbdc71153bf1ba89ec..99afce78178a050bfc6b1123a0acbd919a637e50 100644 (file)
--- a/vg_main.c
+++ b/vg_main.c
@@ -32,7 +32,6 @@
 
 #include "vg_include.h"
 #include "vg_constants.h"
-#include "vg_version.h"
 
 
 /* ---------------------------------------------------------------------
@@ -1011,12 +1010,11 @@ static void process_cmd_line_options ( void )
 
    VG_(clo_logfile_fd) = eventually_logfile_fd;
 
-#  define STRINGIFY(xx)  __STRING(xx)
    if (VG_(clo_verbosity > 0))
       VG_(message)(Vg_UserMsg, 
                    "valgrind-%s, a memory error detector for x86 GNU/Linux.",
-                   STRINGIFY(VG_VERSION));
-#  undef STRINGIFY
+                   VERSION);
+
    if (VG_(clo_verbosity > 0))
       VG_(message)(Vg_UserMsg, 
                    "Copyright (C) 2000-2002, and GNU GPL'd, by Julian Seward.");

diff --git a/vg_version.h b/vg_version.h
deleted file mode 100644 (file)
index b58a45b..0000000
--- a/vg_version.h
+++ /dev/null
@@ -1 +0,0 @@
-#define VG_VERSION 20020317