--- deliantra/server/configure.ac	2007/05/27 02:26:18	1.73
+++ deliantra/server/configure.ac	2008/01/13 10:52:03	1.111
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([cfserver], [2.1], [crossfire@schmorp.de])
+AC_INIT([deliantra-server], [2.4], [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
@@ -30,10 +30,10 @@
    AC_MSG_ERROR([png neuquant (pngnq) must be in your PATH, check the README])
 fi
 
-AC_PATH_PROG(IDENTIFY, identify)
-if test -z "$IDENTIFY"; then
-   AC_MSG_ERROR([ImageMagick 'identify' must be in your PATH, check the README])
-fi
+dnl AC_PATH_PROG(IDENTIFY, identify)
+dnl if test -z "$IDENTIFY"; then
+dnl    AC_MSG_ERROR([ImageMagick 'identify' must be in your PATH, check the README])
+dnl fi
 
 AC_PATH_PROG(CONVERT, convert)
 if test -z "$CONVERT"; 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.98" \
+   "Coro 4.36" \
+   "Coro::EV 2.1" \
+   "Deliantra 1.13" \
    "Digest::MD5 2.0" \
-   "Event 1.08" \
-   "IO::AIO 2.32" \
-   "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 "\$$module::VERSION >= $minvers or die" >/dev/null 2>&1; then
          AC_MSG_RESULT([ok, version $version])
       else
          AC_MSG_ERROR([no, installed version is $version])
@@ -88,9 +91,6 @@
 AC_PROG_CXX
 AC_PROG_CPP
 
-AC_CHECK_HEADERS(execinfo.h)
-AC_CHECK_FUNCS(backtrace)
-
 AC_CHECK_HEADER(tr1/unordered_map,[],[AC_MSG_ERROR([Your compiler must support the Library Technical Report 1 extensions.])])
 
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
@@ -104,23 +104,21 @@
    AC_MSG_ERROR(no)
 fi
 
-AC_MSG_CHECKING(libpng)
-if $PKG_CONFIG libpng --exists; then
-   CXXFLAGS="$CXXFLAGS `$PKG_CONFIG libpng --cflags`"
-   LIBS="$LIBS `$PKG_CONFIG libpng --libs`"
-   AC_MSG_RESULT(ok)
-else
-   AC_MSG_ERROR(no)
-fi
-
-AC_PROG_LIBTOOL
+dnl AC_MSG_CHECKING(libpng)
+dnl if $PKG_CONFIG libpng --exists; then
+dnl    CXXFLAGS="$CXXFLAGS `$PKG_CONFIG libpng --cflags`"
+dnl    LIBS="$LIBS `$PKG_CONFIG libpng --libs`"
+dnl    AC_MSG_RESULT(ok)
+dnl else
+dnl    AC_MSG_ERROR(no)
+dnl fi
 
 AC_MSG_CHECKING(for $PERL suitability)
 if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>&1; then
   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`"
@@ -128,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])
@@ -153,6 +151,12 @@
 AC_SUBST(PERLPRIVLIBEXP)
 AC_SUBST(PERL)
 
+dnl AC_PROG_LIBTOOL
+AC_PROG_RANLIB
+
+AC_CHECK_HEADERS(execinfo.h malloc.h)
+AC_CHECK_FUNCS(backtrace)
+
 dnl check for some other programs
 AC_PATH_PROG(TAR, tar)
 AC_PATH_PROG(BASENAME, basename)
@@ -166,6 +170,31 @@
 AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(long long)
 
+AC_MSG_CHECKING(for tcp_info support)
+AC_TRY_LINK([
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+],[
+  int fd;
+  struct tcp_info tcpi;
+  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
+     + tcpi.tcpi_last_data_sent
+     + tcpi.tcpi_unacked;
+],[
+  AC_DEFINE(HAVE_TCP_INFO, [1], [TCP_INFO info option supported])
+  AC_MSG_RESULT(yes)
+],[
+  AC_MSG_RESULT(no)
+])
+
 AC_SUBST(pkgstatedir,$localstatedir/$PACKAGE)
 AC_SUBST(pkgconfdir,$sysconfdir/$PACKAGE)