(sect_ca): New selector elev. It's set by fairland, but has no effect

[empserver] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1bc1a4e760de4caa079f496b41e3c5cfa115dfd7..eee3731f089ac126a12f3aa37b4a0494914717e1 100644 (file)
--- 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-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
 #                            Ken Stevens, Steve McClure
 # 
 #   This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
 # 
 #   ---
 # 
-#   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.
 # 
 #   ---
 # 
@@ -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.11], [wolfpack@wolfpackempire.com], [empire])
 AC_CONFIG_SRCDIR([include/combat.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
@@ -54,6 +54,9 @@ 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)
@@ -62,10 +65,16 @@ AC_SUBST(cvs_controlled,$cvs_controlled)
 ### Checks for libraries
 ACX_PTHREAD
 LIB_SOCKET_NSL
+# TODO merge this into LIB_SOCKET_NSL?
+case "$host_os" in
+*mingw32)
+    LIBS="-lws2_32 $LIBS" ;;
+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
@@ -102,41 +111,32 @@ AC_ARG_WITH([pthread],
                           [use POSIX threads]))
 
 # Select thread package
-# TODO Windows
-case "$ac_cv_func_makecontext$acx_pthread_ok" in
-yesyes)
-    if test -z "$with_pthread" || test "$with_pthread" = no; then
-        empthread=LWP
-    else
-        empthread=POSIX
+empthread=
+if test "$with_pthread" != no; then
+    if test "$acx_pthread_ok" = yes; then
+       empthread=POSIX
     fi
-    ;;
-yes*)
-    empthread=LWP ;;
-*yes)
-    empthread=POSIX ;;
-*)
+fi
+if test -z "$with_pthread" || test "$with_pthread" = no; then
+    if test "$ac_cv_func_makecontext" = yes; then
+       empthread=LWP
+    fi
+    case "$host_os" in
+    *mingw32)
+       empthread=Windows ;;
+    esac
+fi
+if test -z "$empthread"; then
     AC_MSG_ERROR([No usable thread package found])
-esac
+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
 
-op=
-if test "$with_pthread" = no; then
-    op='=='
-elif test "$with_pthread"; then
-    op='!='
-fi
-if test "$op" && test "$empthread" $op POSIX; then
-    AC_MSG_WARN([Ignoring --with-pthread=$with_pthread])
-fi
-
 
 ### Output
 
@@ -145,10 +145,11 @@ 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 \
+       else
+           mkdir -p `sed s/.*=// <$srcdir/sources.mk | tr ' ' '\012' \
                | sed -n '/\//s,/@<:@^/@:>@*$,,gp'| uniq`
        fi
-       >stamp-h],
+       mkdir -p info.html info.nr lib
+       touch stamp-h],
        [cvs_controlled=$cvs_controlled; AWK=$AWK])
 AC_OUTPUT