Update of /cvsroot/netrek/server/Vanilla In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26631 Modified Files: ChangeLog NEWS PROJECTS configure.in Log Message: merge from jerub darcs 2006-05-12 Index: NEWS =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/NEWS,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- NEWS 6 May 2006 12:28:20 -0000 1.21 +++ NEWS 12 May 2006 03:44:47 -0000 1.22 @@ -1,3 +1,4 @@ +- fix practice robots to cloak when bombing near home planet [Huang] - fix INL confine to knock ships out of orbit [Cameron] - describe a local unnamed server as "server on this computer" [Cameron] - fix cambot regression [Cameron] Index: ChangeLog =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/ChangeLog,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- ChangeLog 8 May 2006 08:22:41 -0000 1.42 +++ ChangeLog 12 May 2006 03:44:47 -0000 1.43 @@ -1,3 +1,9 @@ + +Mon May 8 18:35:57 2006 Bill Balcerski <williamb at its.caltech.edu> + + * PROJECTS, ntserv/redraw.c: fix to bug where observer locks + onto robot and cannot input any other commands + Mon May 8 18:18:38 2006 James Cameron <quozl at us.netrek.org> * pledit: fix compilation warnings under GCC 4.0.3 with -Wall. Index: PROJECTS =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/PROJECTS,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- PROJECTS 6 May 2006 12:17:29 -0000 1.10 +++ PROJECTS 12 May 2006 03:44:47 -0000 1.11 @@ -3,6 +3,11 @@ List of things to do in the future + - factorise message insertion, and maintenance of mc_current, + as it is distributed all over the code. + + - add a "who am i t-mode against?" + - list connection failure scenarios and response by server, so that we can reduce jammed slots. @@ -79,11 +84,6 @@ their viewpoint. Only when twarping is over, you can swap again [Shadow.Hunter at netrek.org] - - You can always lock onto an independent ship (Iggy) - (->planets too?) but after doing that you cannot revert to - observing your own team anymore. Bummer ;-( - [Shadow.Hunter at netrek.org] - - tools/update.c sa_sigaction not present on NetBSD. [Hietbrink] - 'transwarp 0 off' to prevent slot 0 from transwarping. [Swasey] @@ -142,11 +142,10 @@ - need generic shared memory dump tool to assist diagnosis. - - revisit syntax of .metaservers file to aid understanding, + - revisit syntax of metaservers file to aid understanding, - compile with -Wall and fix the problems. - [done ntserv, quozl at us.netrek.org] - [big set of prototypes missing in tools/cambot.c, quozl] + [yet to do: crypt(3), sigsetmask(2), keyman, keycomp, & xsg] - observers, allow them to have a ship of their own that is ineffective and invisible to others. Index: configure.in =================================================================== RCS file: /cvsroot/netrek/server/Vanilla/configure.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- configure.in 22 Feb 2006 09:18:30 -0000 1.5 +++ configure.in 12 May 2006 03:44:47 -0000 1.6 @@ -241,7 +241,7 @@ #-------------------------------------------------------------------- AC_MSG_CHECKING(for mp.h) -AC_ARG_WITH(gmp-incdir,[ --with-gmp-incdir GMP Include Dir], MPINC="-I$withval" search=false, MPINC=nope) +AC_ARG_WITH(gmp,[ --with-gmp GMP Dir], MPINC="-I$withval/include" MPLIB="-L$withval/lib -lgmp" search=false, MPINC=nope MPLIB=nope) if test "$MPINC" = nope; then AC_EGREP_CPP( GNU_MP,[ #include <mp.h> @@ -296,7 +296,6 @@ ],AC_DEFINE(HAVE_GMP2_H)) INCS="$SAVEINCS" -AC_ARG_WITH(gmp-libdir,[ --with-gmp-libdir GMP Library Dir], MPLIB="-L$withval -lgmp" search=false, MPLIB=nope) if test "$MPLIB" = nope; then if test "$search" = true; then MPLIB=nope @@ -378,6 +377,7 @@ # AC _CHECK_LIB(V3, main, [LIBS="$LIBS -lV3"]) # AC _CHECK_LIB(PW, main, [LIBS="$LIBS -lPW"]) AC_CHECK_LIB(socket, main, [LIBS="$LIBS -lsocket"]) +AC_CHECK_LIB(resolv, main, [LIBS="$LIBS -lresolv"]) AC_CHECK_LIB(inet, main, [LIBS="$LIBS -linet"]) AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]) AC_CHECK_LIB(seq, main, [LIBS="$LIBS -lseq"]) @@ -512,6 +512,7 @@ docs/sample_geno_timer_crontab docs/sample_sysdef) if test "x$GUM" = xdo_gum; then +ifdef([AC_OUTPUT_SUBDIRS],[], [AC_DEFUN([AC_OUTPUT_SUBDIRS],[subdirs=$1; _AC_OUTPUT_SUBDIRS])]) AC_OUTPUT_SUBDIRS(gum) fi