From c73718c23450ee0c677c006964c57663051e816f Mon Sep 17 00:00:00 2001
From: Nils Kneuper <crazy-ivanovic@gmx.net>
Date: Mon, 2 Feb 2009 17:40:02 +0000
Subject: [PATCH] define the ingame version *only* in src/wesconfig.h...

...for this forcing an undef is needed to get around autotools...

the config.h.dummy seems to not be used at all by autotools, so
removing it now
---
 config.h.dummy  | 21 ---------------------
 src/wesconfig.h |  9 +++++++--
 2 files changed, 7 insertions(+), 23 deletions(-)
 delete mode 100644 config.h.dummy

diff --git a/config.h.dummy b/config.h.dummy
deleted file mode 100644
index ac8b000f988..00000000000
--- a/config.h.dummy
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/* Name of package */
-#define PACKAGE "wesnoth"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "http://bugs.wesnoth.org"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "Battle for Wesnoth"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Battle for Wesnoth 1.5.9+svn"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "wesnoth"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.5.9+svn"
-
-/* Version number of package */
-#define VERSION "1.5.9+svn"
diff --git a/src/wesconfig.h b/src/wesconfig.h
index 56dd161b676..f479c6032b9 100644
--- a/src/wesconfig.h
+++ b/src/wesconfig.h
@@ -24,9 +24,14 @@
 #  define LOCALEDIR "translations"
 # endif
 #endif
-#ifndef VERSION
-#define VERSION "1.5.9+svn"
+
+//always use the version string in here, otherwise autotools can override in
+//a bad way...
+#ifdef VERSION
+  #undef VERSION
 #endif
+#define VERSION "1.5.9+svn"
+
 #ifndef PACKAGE
 #define PACKAGE "wesnoth"
 #endif