From b921d3c262d6aff07c0950e5087f7297baee3296 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 28 Dec 2005 13:08:26 +0000 Subject: [PATCH] (MAXNOC): Move to config.h. Remove empty options.h. --- configure.ac | 5 +++++ include/misc.h | 2 -- include/options.h | 44 -------------------------------------------- 3 files changed, 5 insertions(+), 46 deletions(-) delete mode 100644 include/options.h diff --git a/configure.ac b/configure.ac index 7783243b..37013631 100644 --- a/configure.ac +++ b/configure.ac @@ -84,6 +84,10 @@ MY_FUNC_MAKECONTEXT ### Site configuration +# Can't be bothered to make MAXNOC configurable right now. +AC_DEFINE([MAXNOC], [99], + [The maximum number of countries]) + AC_ARG_VAR([EMPIREHOST], [Default host (client only) [127.0.0.1]]) test "$EMPIREHOST" || EMPIREHOST=127.0.0.1 @@ -94,6 +98,7 @@ AC_ARG_WITH([pthread], AS_HELP_STRING([--with-pthread], [use POSIX threads])) +# Select thread package case "$ac_cv_func_makecontext$acx_pthread_ok" in yesyes) if test -z "$with_pthread" || test "$with_pthread" = no; then diff --git a/include/misc.h b/include/misc.h index b5e327da..9cf0da1e 100644 --- a/include/misc.h +++ b/include/misc.h @@ -75,8 +75,6 @@ typedef int pid_t; /*#define _POSIX_ */ #endif -#include "options.h" - /* This is the structure we use to keep track of the global mobility things, such as when the server is supposed to start/stop updating mobility and the timestamp of when the game was last up. These diff --git a/include/options.h b/include/options.h deleted file mode 100644 index 677aedef..00000000 --- a/include/options.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Empire - A multi-player, client/server Internet based war game. - * Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak, - * Ken Stevens, Steve McClure - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * --- - * - * See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the - * related information and legal notices. It is expected that any future - * projects/authors will amend these files as needed. - * - * --- - * - * options.h: Define which "optional" features should be enabled. - * - * Known contributors to this file: - * Dave Pare - * Jeff Bailey - * Chad Zabel - * Thomas Rushack, 1992 - * Ken Stevens, 1995 - * Steve McClure, 1998 - */ - -#ifndef _OPTIONS_H_ -#define _OPTIONS_H_ - -#define MAXNOC 99 - -#endif /* _OPTIONS_H_ */