Added banwidth statistics configure switch

configure.ac

@@ -326,6 +326,11 @@ AC_ARG_ENABLE([raw-sockets],
 	      [raw_sockets=$enableval],
 	      [raw_sockets=no])
 
+AC_ARG_ENABLE([bandwidth-monitor],
+              AS_HELP_STRING([--enable-bandwidth-monitor], [Enable bandwidth monitoring for server]),
+	      [bandwidth_monitor=$enableval],
+	      [bandwidth_monitor=no])
+
 if test "x$raw_sockets" = "xyes"
 then
 	CPPFLAGS="$CPPFLAGS -DNETWORK_USE_RAW_SOCKETS"
@@ -341,6 +346,7 @@ 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([BANDWIDTH_MONITOR], [test x$bandwidth_monitor = xyes])
 AM_CONDITIONAL([INCLUDEDINTL], [test x$nls_cv_use_gnu_gettext = xyes])
 AM_CONDITIONAL([INSTALLDATA], [test x$game = xyes || x$editor = xyes])
 AM_CONDITIONAL([DUMMYLOCALES], [test x$dummylocales = xyes])

src/Makefile.am

@@ -158,6 +158,10 @@ wesnothd_SOURCES = \
 	network_worker.cpp \
 	loadscreen_empty.cpp 
 
+if BANDWIDTH_MONITOR
+wesnothd_CXXFLAGS = $(AM_CXXFLAGS) -DBANDWIDTH_MONITOR
+endif
+
 wesnothd_LDADD = -L. -lwesnoth-core $(BOOST_IOSTREAMS_LIBS) @SDL_NET_LIBS@ @SDL_LIBS@ $(LIBINTL)
 wesnothd_DEPENDENCIES=libwesnoth-core.a
 

src/network.hpp

@@ -17,10 +17,6 @@
 
 #ifndef NETWORK_HPP_INCLUDED
 #define NETWORK_HPP_INCLUDED
-/**
- * Enable bandwidth stats
- **/
-//#define BANDWIDTH_MONITOR
 
 class config;