--- deliantra/server/configure.ac	2007/06/10 02:51:45	1.77
+++ deliantra/server/configure.ac	2008/01/13 09:53:53	1.109
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([cfserver], [2.2], [crossfire@schmorp.de])
+AC_INIT([deliantra-server], [2.32], [support@deliantra.net])
 AC_CONFIG_AUX_DIR(utils)
 AC_CONFIG_SRCDIR([server/cfperl.xs])
 AM_INIT_AUTOMAKE
@@ -8,7 +8,7 @@
 
 AM_MAINTAINER_MODE
 
-AC_PREFIX_DEFAULT(/usr/games/crossfire)
+AC_PREFIX_DEFAULT(/usr/games/deliantra)
 
 AC_PATH_PROG(GPERF, gperf)
 if test -z "$GPERF"; then
@@ -52,21 +52,24 @@
 fi
 
 for module_vers in \
-   "AnyEvent 2.52" \
-   "BDB 0.1" \
+   "AnyEvent 2.6" \
+   "BDB 1.43" \
    "Compress::LZF 1.8" \
-   "Coro 3.62" \
-   "Coro::Event 2.1" \
-   "Crossfire 0.99" \
+   "Coro 4.36" \
+   "Coro::EV 2.1" \
+   "Deliantra 1.13" \
    "Digest::MD5 2.0" \
-   "Event 1.08" \
-   "IO::AIO 2.4" \
-   "JSON::XS 1.21" \
+   "EV 2.0" \
+   "IO::AIO 2.51" \
+   "JSON::XS 2.01" \
+   "Net::IRC3 0.5" \
    "Pod::POM 0.17" \
    "Safe::Hole 0.10" \
    "Storable 2.0" \
    "Time::HiRes 1.0" \
+   "URI 1.35" \
    "YAML::Syck 0.71" \
+   "YAML 0.62" \
 ; do
    set -- $module_vers
    module=$1
@@ -74,7 +77,7 @@
    AC_MSG_CHECKING(for $module perl module version $minvers or higher)
    if $PERL -M$module -e0 >/dev/null 2>&1; then
       version=`$PERL -M$module -e "print \\$$module::VERSION"`
-      if $PERL -M$module=$minvers -e0 >/dev/null 2>&1; then
+      if $PERL -M$module -e "VERSION $module $minvers" >/dev/null 2>&1; then
          AC_MSG_RESULT([ok, version $version])
       else
          AC_MSG_ERROR([no, installed version is $version])
@@ -115,7 +118,7 @@
   save_CXXFLAGS="$CXXFLAGS"
   save_LIBS="$LIBS"
   xPERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`"
-  xPERLFLAGS="$xPERLFLAGS `$PERL -MEvent::MakeMaker -e 'print +{&Event::MakeMaker::event_args}->{INC}'`"
+  xPERLFLAGS="$xPERLFLAGS `$PERL -MEV::MakeMaker -e 'print +{&EV::MakeMaker::ev_args}->{INC}'`"
   xPERLFLAGS="$xPERLFLAGS `$PERL -MCoro::MakeMaker -e 'print +{&Coro::MakeMaker::coro_args}->{INC}'`"
   CXXFLAGS="$CXXFLAGS $xPERLFLAGS"
   LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"
@@ -123,7 +126,7 @@
 #include <EXTERN.h>
 #include <perl.h>
 #include <XSUB.h>
-#include "EventAPI.h"
+#include "EVAPI.h"
 ],[
   PerlInterpreter *perl = perl_alloc ();
 ],[perl_link=yes],[perl_link=no])
@@ -148,9 +151,10 @@
 AC_SUBST(PERLPRIVLIBEXP)
 AC_SUBST(PERL)
 
-AC_PROG_LIBTOOL
+dnl AC_PROG_LIBTOOL
+AC_PROG_RANLIB
 
-AC_CHECK_HEADERS(execinfo.h)
+AC_CHECK_HEADERS(execinfo.h malloc.h)
 AC_CHECK_FUNCS(backtrace)
 
 dnl check for some other programs
@@ -178,6 +182,7 @@
   socklen_t len = sizeof (tcpi);
   getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len);
   fd = 0
+     + tcpi.tcpi_snd_mss
      + tcpi.tcpi_rtt
      + tcpi.tcpi_rttvar
      + tcpi.tcpi_last_ack_recv