X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=configure.ac;h=5ecd569dc02789b7984a1b51cb6504fb119fa55f;hp=1f0d59a43ac1ee533230fd9403813b4bbed69130;hb=refs%2Fheads%2Fempdump-v4.3.11;hpb=99afa2adced5660e826034e2a60a1f48864f1d08

diff --git a/configure.ac b/configure.ac
index 1f0d59a43..5ecd569dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # 
 #   Empire - A multi-player, client/server Internet based war game.
-#   Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+#   Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
 #                            Ken Stevens, Steve McClure
 # 
 #   This program is free software; you can redistribute it and/or modify
@@ -38,7 +38,7 @@
 # whether it's worth fixing.
 
 AC_PREREQ(2.59)
-AC_INIT([Wolfpack Empire], [4.3.0], [wolfpack@wolfpackempire.com], [empire])
+AC_INIT([Wolfpack Empire], [4.3.11], [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 curses])
+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,14 +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`
-	else
+	[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
+	esac
 	mkdir -p info.html info.nr lib
-	>stamp-h],
-	[cvs_controlled=$cvs_controlled; AWK=$AWK])
+	touch stamp-h],
+	[revctrl=$revctrl])
 AC_OUTPUT