f1fc0df03d
Readline provides fancy command line editing such as <Arrow Up> for previous commands and CTRL+A to jump to the beginning of the line. This patch does not add any completion on <tab> key, a TODO, if you will. A new command line flag, -H, turns on saving the history to disk. This may have security implications on shared computers, as all commands are saved as-is. Thus "change re 1234" would be logged directly to the file. Signed-off-by: Martin Haukeli <martin.haukeli@gmail.com> Rebase on top of preparatory work, fix a few bugs, and tidy up: * Update the standalone client build, too. * Fix the Windows build. * Keep command line options sorted case-insensitively. * Error out when $HOME is unset and getpwuid() fails, just like we do for $LOGNAME. * Give @input_from_rl, @has_rl_input static linkage. * @has_rl_input is a flag, not a counter, set and test it accordingly. * Save all input in history, not just commands. Martin's attempt to recognize commands works only as long as the server sends prompts faster than the user sends input. Drop that part, and update commit message accordingly. * Fix recv_input() not to truncate value of strlen() to int, and to use memmove() for updating @input_from_rl in place. * Clean up whitespace in a few places. * Tweak commit message. Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
240 lines
7 KiB
Text
240 lines
7 KiB
Text
#
|
|
# Empire - A multi-player, client/server Internet based war game.
|
|
# Copyright (C) 1986-2015, Dave Pare, Jeff Bailey, Thomas Ruschak,
|
|
# Ken Stevens, Steve McClure, Markus Armbruster
|
|
#
|
|
# Empire 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 3 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, see <http://www.gnu.org/licenses/>.
|
|
#
|
|
# ---
|
|
#
|
|
# See files README, COPYING and CREDITS in the root of the source
|
|
# tree for related information and legal notices. It is expected
|
|
# that future projects/authors will amend these files as needed.
|
|
#
|
|
# ---
|
|
#
|
|
# configure.ac: Autoconf input file
|
|
#
|
|
# Known contributors to this file:
|
|
# Markus Armbruster, 2005-2015
|
|
#
|
|
# Process this file with autoconf to produce a configure script.
|
|
|
|
# Autoconf makes checking for and programming around assorted ancient
|
|
# crap relatively painless. But why bother? Just rely on C89 and
|
|
# POSIX, and when something breaks on some oddball machine, see
|
|
# whether it's worth fixing.
|
|
|
|
AC_PREREQ(2.64)
|
|
AC_INIT([Wolfpack Empire], [4.3.34], [wolfpack@wolfpackempire.com], [empire],
|
|
[http://www.wolfpackempire.com/])
|
|
AC_CONFIG_SRCDIR([include/combat.h])
|
|
AC_CONFIG_AUX_DIR([build-aux])
|
|
AC_CONFIG_MACRO_DIR([m4])
|
|
AC_CONFIG_HEADERS([config.h])
|
|
|
|
|
|
### Checks for programs
|
|
AC_PROG_AWK
|
|
AC_PROG_INSTALL
|
|
AC_PROG_RANLIB
|
|
AC_PROG_CC
|
|
AM_PROG_CC_C_O
|
|
# Private automake macro, tsk, tsk, tsk...
|
|
_AM_DEPENDENCIES(CC)
|
|
|
|
AC_ARG_VAR(NROFF, [nroff command])
|
|
AC_CHECK_PROG(NROFF, groff, [GROFF_NO_SGR= groff -Tascii -U], nroff)
|
|
|
|
# not really a check for a program, but close enough
|
|
if test -d $srcdir/.git; then revctrl=git
|
|
else revctrl=
|
|
fi
|
|
AC_SUBST(revctrl,$revctrl)
|
|
|
|
# Not a program, but need to check this early
|
|
MY_WINDOWS_API
|
|
|
|
|
|
### Checks for libraries
|
|
AX_PTHREAD
|
|
LIBS_util="$LIBS"
|
|
LIBS="$LIBS_SOCKETS $LIBS"
|
|
AX_LIB_SOCKET_NSL
|
|
LIBS_server="$LIBS"
|
|
AX_LIB_READLINE
|
|
|
|
|
|
### Checks for header files
|
|
|
|
|
|
### Checks for typedefs, structures, and compiler characteristics
|
|
|
|
# Enable useful warnings
|
|
# Some of them are commented out because the code needs cleanup first
|
|
# Clang needs to be tested with -Werror=unknown-warning-option
|
|
AX_CHECK_COMPILE_FLAG([-Werror=unknown-warning-option],
|
|
[cflags_test="-Werror=unknown-warning-option"],
|
|
[cflags_test=""])
|
|
MY_APPEND_COMPILE_FLAGS([-Wall -Wextra dnl
|
|
dnl -Wcast-align dnl
|
|
dnl -Wconversion dnl
|
|
-Wdeclaration-after-statement dnl
|
|
dnl -Wformat-nonliteral dnl
|
|
-Wformat-security dnl
|
|
-Winit-self dnl
|
|
-Wlogical-op dnl
|
|
-Wmissing-prototypes dnl
|
|
-Wnested-externs dnl
|
|
-Wold-style-definition dnl
|
|
-Wpacked dnl
|
|
-Wpointer-arith dnl
|
|
-Wredundant-decls dnl
|
|
dnl -Wshadow dnl
|
|
-Wstrict-prototypes dnl
|
|
dnl too prone to false positives: -Wsuggest-attribute=format dnl
|
|
dnl -Wswitch-default dnl
|
|
-Wundef dnl
|
|
-Wno-unused-parameter dnl
|
|
], [], [$cflags_test])
|
|
|
|
# Our carg() conflicts with libm's TODO clean that up
|
|
MY_APPEND_COMPILE_FLAGS([-fno-builtin-carg -Wno-incompatible-library-redeclaration])
|
|
|
|
# No multiple definitions of uninitialized global variables
|
|
MY_APPEND_COMPILE_FLAGS([-fno-common])
|
|
|
|
# Reign in overzealous optimizers
|
|
#
|
|
# Contemporary compilers can squeeze out some extra performance by
|
|
# assuming the program never executes code that has undefined behavior
|
|
# according to the C standard. Unfortunately, this can break
|
|
# programs. Pointing out that these programs are non-conforming is as
|
|
# correct as it is unhelpful, at least as long as the compiler is
|
|
# unable to diagnose the non-conformingness.
|
|
#
|
|
# Since keeping our programs working is a lot more important to us
|
|
# than running them as fast as possible, forbid some assumptions that
|
|
# are known to break real-world programs:
|
|
#
|
|
# * Aliasing: perfectly clean programs don't engage in type-punning,
|
|
# and perfectly conforming programs do it only in full accordance
|
|
# with the standard's (subtle!) aliasing rules. Neither kind of
|
|
# perfection is realistic for us, therefore -fno-strict-aliasing.
|
|
#
|
|
# * Signed integer overflow: perfectly clean programs won't ever do
|
|
# signed integer arithmetic that overflows. This is an imperfect
|
|
# program, therefore -fno-strict-overflow.
|
|
#
|
|
MY_APPEND_COMPILE_FLAGS([dnl
|
|
-fno-strict-aliasing dnl
|
|
-fno-strict-overflow])
|
|
|
|
# Emit extra code to check for buffer overflows
|
|
# Could fall back to -fstack-protector when -fstack-protector-strong
|
|
# isnt't supported, for users of older compilers. Doesn't seem worth
|
|
# the trouble, though.
|
|
# Some ports of the GNU toolchain reportedly support it in the
|
|
# compiler, but not libc. Use a test program that makes the compiler
|
|
# emit the extra stack checking code, and test it compiles and links.
|
|
AX_APPEND_LINK_FLAGS([-fstack-protector-strong], [], [],
|
|
[AC_LANG_SOURCE([[
|
|
int
|
|
main(int argc, char *argv[])
|
|
{
|
|
char arr[64], *dst = arr, *src = argv[0];
|
|
while ((*dst++ = *src++)) ;
|
|
}
|
|
]])])
|
|
|
|
|
|
### Checks for library functions
|
|
|
|
AC_CHECK_FUNCS(getaddrinfo getpass)
|
|
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
|
|
|
|
AC_ARG_VAR([EMPIREPORT], [Default port (client and server) [6665]])
|
|
test "$EMPIREPORT" || EMPIREPORT=6665
|
|
|
|
AC_ARG_WITH([pthread],
|
|
AS_HELP_STRING([--with-pthread],
|
|
[use POSIX threads]))
|
|
|
|
# Select thread package
|
|
empthread=
|
|
if test "$with_pthread" != no; then
|
|
if test "$ax_pthread_ok" = yes; then
|
|
empthread=POSIX
|
|
fi
|
|
fi
|
|
if test -z "$with_pthread" || test "$with_pthread" = no; then
|
|
if test "$ac_cv_func_makecontext" = yes; then
|
|
empthread=LWP
|
|
fi
|
|
if test $Windows_API = yes; then
|
|
empthread=Windows
|
|
fi
|
|
fi
|
|
if test -z "$empthread"; then
|
|
AC_MSG_ERROR([No usable thread package found])
|
|
fi
|
|
AC_SUBST(empthread)
|
|
case $empthread in
|
|
LWP) AC_DEFINE([EMPTH_LWP], 1, [Define to use LWP threads]) ;;
|
|
POSIX) AC_DEFINE([EMPTH_POSIX], 1, [Define to use POSIX threads]) ;;
|
|
Windows) AC_DEFINE([EMPTH_W32], 1, [Define to use Windows threads]) ;;
|
|
esac
|
|
|
|
MY_WITH_TERMINFO
|
|
LIBS_client="$LIBS"
|
|
|
|
|
|
### Output
|
|
|
|
LIBS="$LIBS_util"
|
|
AC_SUBST(LIBS_client)
|
|
AC_SUBST(LIBS_server)
|
|
|
|
AC_CONFIG_FILES([GNUmakefile])
|
|
AC_CONFIG_COMMANDS([stamp-h],
|
|
[case $revctrl in
|
|
git)
|
|
mkdir -p `cd $srcdir && git ls-files \
|
|
| sed -n 's,/@<:@^/@:>@*$,,gp' | uniq`
|
|
;;
|
|
*)
|
|
mkdir -p `sed s/.*=// <$srcdir/sources.mk | tr ' ' '\012' \
|
|
| sed -n '/\//s,/@<:@^/@:>@*$,,gp'| uniq`
|
|
esac
|
|
mkdir -p info.html info.nr lib
|
|
touch stamp-h],
|
|
[revctrl=$revctrl])
|
|
AC_OUTPUT
|
|
|
|
AC_MSG_NOTICE([])
|
|
AC_MSG_NOTICE([-= Configuration summary =-])
|
|
AC_MSG_NOTICE([Thread package: $empthread])
|
|
AC_MSG_NOTICE([ terminfo: $with_terminfo])
|
|
AC_MSG_NOTICE([ EMPIREHOST: $EMPIREHOST])
|
|
AC_MSG_NOTICE([ EMPIREPORT: $EMPIREPORT])
|