mail[Wesnoth-commits] r27541 - in /branches/1.4: configure.ac src/Makefile.am src/network.hpp


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by paniemin on June 28, 2008 - 01:01:
Author: suokko
Date: Sat Jun 28 00:46:37 2008
New Revision: 27541

URL: http://svn.gna.org/viewcvs/wesnoth?rev=27541&view=rev
Log:
Added banwidth statistics configure switch

Modified:
    branches/1.4/configure.ac
    branches/1.4/src/Makefile.am
    branches/1.4/src/network.hpp

Modified: branches/1.4/configure.ac
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/configure.ac?rev=27541&r1=27540&r2=27541&view=diff
==============================================================================
--- branches/1.4/configure.ac (original)
+++ branches/1.4/configure.ac Sat Jun 28 00:46:37 2008
@@ -326,6 +326,11 @@
              [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([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])

Modified: branches/1.4/src/Makefile.am
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/src/Makefile.am?rev=27541&r1=27540&r2=27541&view=diff
==============================================================================
--- branches/1.4/src/Makefile.am (original)
+++ branches/1.4/src/Makefile.am Sat Jun 28 00:46:37 2008
@@ -157,6 +157,10 @@
        network.cpp \
        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

Modified: branches/1.4/src/network.hpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/src/network.hpp?rev=27541&r1=27540&r2=27541&view=diff
==============================================================================
--- branches/1.4/src/network.hpp (original)
+++ branches/1.4/src/network.hpp Sat Jun 28 00:46:37 2008
@@ -17,10 +17,6 @@
 
 #ifndef NETWORK_HPP_INCLUDED
 #define NETWORK_HPP_INCLUDED
-/**
- * Enable bandwidth stats
- **/
-//#define BANDWIDTH_MONITOR
 
 class config;
 




Related Messages


Powered by MHonArc, Updated Sat Jun 28 06:22:41 2008