Eliminate --display-svn-revision. Make Revision reporting a bit more reliable.

INSTALL

@@ -60,11 +60,6 @@ with gcc 4.
 If you want to build wesnoth_editor too add the --enable-editor
 configure option.
 
-The --enable-display-revision option enables code that shows the SVN
-revision number on the main screen -- useful for detecting old builds
-you might happen to have in your path, but probably not what you want
-in a production release.
-
 If you see lots of messages like "Type 'svnversion --help' for usage.",
 you have a Subversion client installed but it is not implementing the 
 -n option of svnversion. Time to update it.

Makefile.am

@@ -1,7 +1,3 @@
-if USESVN
-SVNREV = $(shell svnversion -n .)
-endif
-
 ISUBDIRS = icons
 SUBDIRS = po m4 src doc $(ISUBDIRS)
 pkgdatadir=$(datadir)/@DATADIR@

configure.ac

@@ -288,12 +288,6 @@ AC_ARG_ENABLE([internal-data],
 		[internaldata=$enableval],
 		[internaldata=no])
 
-AC_ARG_ENABLE([display-revision],
-              AS_HELP_STRING([--enable-display-revision], [enable svn revision display]),
-	      [svnrev=$enableval],
-	      [svnrev=no])
-
-
 if test "x$game" = "xno"
 then
 	python=no
@@ -324,7 +318,6 @@ AM_CONDITIONAL([SERVER_MONITOR], [test x$servermonitor = xyes])
 AM_CONDITIONAL([CAMPAIGNSERVER], [test x$campaignserver = xyes])
 AM_CONDITIONAL([TESTS], [test x$tests = xyes])
 AM_CONDITIONAL([EDITOR], [test x$editor = xyes])
-AM_CONDITIONAL([USESVN], [test x$svnrev = xyes])
 AM_CONDITIONAL([TOOLS], [test x$tools = xyes])
 AM_CONDITIONAL([GCC], [test x$GXX = xyes])
 AM_CONDITIONAL([INCLUDEDINTL], [test x$nls_cv_use_gnu_gettext = xyes])

src/Makefile.am

@@ -1,8 +1,6 @@
-if USESVN
-SVNREV = $(shell svnversion -n $(topdir) 2>/dev/null)
+SVNREV = $(shell svnversion -n $(topdir) 2>/dev/null || unknown)
 CFLAGS += "-DSVNREV=\"$(SVNREV)\""
 CXXFLAGS += "-DSVNREV=\"$(SVNREV)\""
-endif
 
 AUTOMAKE_OPTIONS = subdir-objects
 
@@ -436,7 +434,6 @@ libwesnoth_a_SOURCES = \
 	sdl_ttf/SDL_ttf.c \
 	wml_exception.cpp 
 
-if USESVN
 # Until game_config.cpp is removed, this will be needed to ensure that the
 # SVNVER constant gets updated correctly.  If and when that definition is
 # moved elsewhere, this dependency must follow it.
@@ -447,7 +444,6 @@ revision-stamp: FORCE
 	if [ x"$(SVNREV)" != x`cat revision-stamp 2>/dev/null` ]; then echo -n $(SVNREV) >revision-stamp; fi
 
 FORCE:
-endif
 
 AM_CXXFLAGS = -I $(srcdir)/sdl_ttf -I../intl -I$(top_srcdir)/intl @SDL_CFLAGS@  -DWESNOTH_PATH=\"$(pkgdatadir)\" \
 	-DLOCALEDIR=\"$(LOCALEDIR)\" -DHAS_RELATIVE_LOCALEDIR=$(HAS_RELATIVE_LOCALEDIR) -DFIFODIR=\"$(fifodir)\"\

src/game_config.cpp

@@ -43,7 +43,7 @@ namespace game_config
 #ifdef SVNREV
 	const std::string svnrev = SVNREV;
 #else
-	const std::string svnrev = "";
+	const std::string svnrev = "unknown";
 #endif
 	bool debug = false, editor = false, ignore_replay_errors = false, mp_debug = false, exit_at_end = false, no_delay = false, disable_autosave = false;