[Wesnoth-cvs-commits] wesnoth ./config.h.dummy ./configure.ac src/wes...

[Isaac Clerencia]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Isaac Clerencia <address@hidden>        05/06/13 19:40:17

Modified files:
        .              : config.h.dummy configure.ac 
        src            : wesconfig.h 

Log message:
        Use devsrv.wesnoth.org:14999 as CVS server

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/config.h.dummy.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.ac.diff?tr1=1.151&tr2=1.152&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/wesconfig.h.diff?tr1=1.29&tr2=1.30&r1=text&r2=text

Patches:
Index: wesnoth/config.h.dummy
diff -u wesnoth/config.h.dummy:1.25 wesnoth/config.h.dummy:1.26
--- wesnoth/config.h.dummy:1.25 Mon Jun  6 00:16:21 2005
+++ wesnoth/config.h.dummy      Mon Jun 13 19:40:16 2005
@@ -21,5 +21,5 @@
 #define VERSION "0.9.2+cvs"
 
 /* The default server for this version */
-#define WESNOTH_DEFAULT_SERVER "devsrv.wesnoth.org"
+#define WESNOTH_DEFAULT_SERVER "devsrv.wesnoth.org:14999"
 
Index: wesnoth/configure.ac
diff -u wesnoth/configure.ac:1.151 wesnoth/configure.ac:1.152
--- wesnoth/configure.ac:1.151  Mon Jun  6 00:16:21 2005
+++ wesnoth/configure.ac        Mon Jun 13 19:40:16 2005
@@ -9,7 +9,8 @@
 define([WESNOTH_VERSION],[0.9.2+cvs])
 
 dnl define([DEFAULT_SERVER],[server.wesnoth.org])
-define([DEFAULT_SERVER],[devsrv.wesnoth.org])
+dnl define([DEFAULT_SERVER],[devsrv.wesnoth.org])
+define([DEFAULT_SERVER],[devsrv.wesnoth.org:14999])
 
 AC_INIT([Battle for Wesnoth], WESNOTH_VERSION, address@hidden, [wesnoth])
 AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["]DEFAULT_SERVER["], [The default server 
for this version])
@@ -37,7 +38,86 @@
 EOF
 ])
 
-AC_REVISION([$Revision: 1.151 $])
+AC_REVISION([$Revision: 1.152 $])
+
+AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_SRCDIR([src/actions.cpp])
+AC_CONFIG_HEADER([config.h])
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
+AM_INIT_AUTOMAKE([foreign 1.5])
+AM_MAINTAINER_MODE
+AM_GNU_GETTEXT([external])
+
+#######################################################################
+# Configuration options                                               #
+#######################################################################
+
+AC_ARG_ENABLE([debug],
+             AS_HELP_STRING([--enable-debug], [enable debug in wesnoth]),
+             [if test "x${enableval}" = "xyes" ; then
+                   CXXFLAGS="$CXXFLAGS -DDEBUG -O0 -ggdb3"
+              fi])
+
+AC_ARG_ENABLE([static],
+              AS_HELP_STRING([--enable-static], [enable static building of 
wesnoth]),
+             [static=$enableval],
+             [static=no])
+
+AC_ARG_ENABLE([lite],
+              AS_HELP_STRING([--enable-lite], [enable lite version of wesnoth 
(without music or large images)]),
+             [lite=$enableval],
+             [lite=no])
+
+AC_ARG_ENABLE([tinygui],
+              AS_HELP_STRING([--enable-tinygui], [enable GUI reductions for 
resolutions down to 320x240 (PDAs)]),
+             [tinygui=$enableval],
+             [tinygui=no])
+
+if test "x$tinygui" = "xyes"
+then
+       CPPFLAGS="$CPPFLAGS -DUSE_TINY_GUI"
+fi
+AM_CONDITIONAL([TINYGUI], [test "x$tinygui" = "xyes"])
+
+DATADIR=$PACKAGE
+AC_ARG_WITH([datadir-name],
+            AS_HELP_STRING([--with-datadir-name@<:@=DIR@:>@], [change name of 
data directory @<:@wesnoth@:>@]),
+             [case "${withval}" in
+              yes)
+                       DATADIR="wesnoth"
+                       ;;
+               no)
+                       ;;
+
+AC_INIT([Battle for Wesnoth], WESNOTH_VERSION, address@hidden, [wesnoth])
+AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["]DEFAULT_SERVER["], [The default server 
for this version])
+
+dnl
+dnl Generate wesconfig.h from the information above
+dnl
+AC_CONFIG_COMMANDS([src/wesconfig.h],
+                  [cat > src/wesconfig.h <<EOF
+#ifndef WESCONFIG_H_INCLUDED
+#define WESCONFIG_H_INCLUDED
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# define VERSION "]WESNOTH_VERSION["
+# define WESNOTH_DEFAULT_SERVER "]DEFAULT_SERVER["
+# define PACKAGE "wesnoth"
+# ifndef LOCALEDIR
+#  define LOCALEDIR "translations"
+# endif
+#endif
+
+#endif
+EOF
+])
+
+AC_REVISION([$Revision: 1.152 $])
 
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_SRCDIR([src/actions.cpp])
Index: wesnoth/src/wesconfig.h
diff -u wesnoth/src/wesconfig.h:1.29 wesnoth/src/wesconfig.h:1.30
--- wesnoth/src/wesconfig.h:1.29        Mon Jun  6 00:16:21 2005
+++ wesnoth/src/wesconfig.h     Mon Jun 13 19:40:17 2005
@@ -5,7 +5,7 @@
 # include "config.h"
 #else
 # define VERSION "0.9.2+cvs"
-# define WESNOTH_DEFAULT_SERVER "devsrv.wesnoth.org"
+# define WESNOTH_DEFAULT_SERVER "devsrv.wesnoth.org:14999"
 # define PACKAGE "wesnoth"
 # ifndef LOCALEDIR
 #  define LOCALEDIR "translations"