Fix typo in journaling of output lines

[empserver] / configure.ac

diff --git a/configure.ac b/configure.ac
index 18ddc455562fbfe652ea6f7fa4629d27c8780352..3945a0a98d207de4956af2341cff4c6af99723f1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,35 +1,35 @@
-# 
+#
 #   Empire - A multi-player, client/server Internet based war game.
-#   Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+#   Copyright (C) 1986-2009, 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.
-# 
+#
+#   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
-# 
+#      Markus Armbruster, 2005-2008
+#
 # Process this file with autoconf to produce a configure script.
 
 # Autoconf makes checking for and programming around assorted ancient
@@ -38,7 +38,7 @@
 # whether it's worth fixing.
 
 AC_PREREQ(2.59)
-AC_INIT([Empire], [4.3.0], [wolfpack@wolfpackempire.com])
+AC_INIT([Wolfpack Empire], [4.3.21], [wolfpack@wolfpackempire.com], [empire])
 AC_CONFIG_SRCDIR([include/combat.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
@@ -54,9 +54,14 @@ 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/CVS; then cvs_controlled=yes; else cvs_controlled=no; fi
-AC_SUBST(cvs_controlled,$cvs_controlled)
+if test -d $srcdir/.git; then revctrl=git
+else revctrl=
+fi
+AC_SUBST(revctrl,$revctrl)
 
 
 ### Checks for libraries
@@ -70,7 +75,8 @@ esac
 
 # TODO turn this into a macro?
 save_LIBS=$LIBS
-AC_SEARCH_LIBS([setupterm], [termlib termcap])
+AC_SEARCH_LIBS([setupterm], [termlib termcap curses ncurses])
+# FIXME if not found, complain and switch off highlighting
 termlibs=`echo $LIBS | sed s/\`echo $save_LIBS | sed 's/././g'\`'$//'`
 AC_SUBST(termlibs)
 LIBS=$save_LIBS
@@ -128,8 +134,7 @@ fi
 AC_SUBST(empthread)
 AC_MSG_NOTICE([Using $empthread threads])
 case $empthread in
-LWP)   AC_DEFINE([EMPTH_LWP], 1, [Define to use LWP threads])
-       AC_DEFINE([UCONTEXT], 1, [Define to make LWP use makecontext()]) ;;
+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
@@ -139,13 +144,16 @@ esac
 
 AC_CONFIG_FILES([GNUmakefile])
 AC_CONFIG_COMMANDS([stamp-h],
-       [if test $cvs_controlled = yes; then
-           mkdir -p `cd $srcdir && $AWK -f src/scripts/cvsfiles.awk \
-               | sed -n '/\//s,/@<:@^/@:>@*$,,gp'| uniq`
-       elif test -f $srcdir/sources.mk; then
-           mkdir -p `sed s/.*=// <$srcdir/sources.mk \
+       [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`
-       fi
-       >stamp-h],
-       [cvs_controlled=$cvs_controlled; AWK=$AWK])
+       esac
+       mkdir -p info.html info.nr lib
+       touch stamp-h],
+       [revctrl=$revctrl])
 AC_OUTPUT