--- deliantra/server/configure.ac	2007/03/06 22:07:56	1.58
+++ deliantra/server/configure.ac	2008/05/22 15:37:44	1.134
@@ -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.55], [support@deliantra.net])
 AC_CONFIG_AUX_DIR(utils)
 AC_CONFIG_SRCDIR([server/cfperl.xs])
 AM_INIT_AUTOMAKE
@@ -8,36 +8,75 @@
 
 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
+   AC_MSG_ERROR([gperf, the GNU perfect hash generator, must be in your PATH, check the README])
+fi
+
+AC_PATH_PROG(RSYNC, rsync)
+if test -z "$RSYNC"; then
+   AC_MSG_ERROR([rsync must be in your PATH, check the README])
+fi
 
 AC_PATH_PROG(OPTIPNG, optipng)
 if test -z "$OPTIPNG"; then
-   AC_MSG_ERROR([optipng must be in your PATH, see the README])
+   AC_MSG_ERROR([optipng must be in your PATH, check the README])
 fi
 
+AC_PATH_PROG(PNGNQ, pngnq)
+if test -z "$PNGNQ"; then
+   AC_MSG_ERROR([png neuquant (pngnq) 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
-   AC_MSG_ERROR([ImageMagick 'convert' must be in your PATH, see the README])
+   AC_MSG_ERROR([ImageMagick 'convert' must be in your PATH, check the README])
 fi
 
-AC_PATH_PROG(PERL, perl5.8)
+AC_PATH_PROG(PERL, perl5.10.0)
 if test -z "$PERL"; then
-   AC_PATH_PROG(PERL, perl5)
+   AC_PATH_PROG(PERL, perl5.8.8)
    if test -z "$PERL"; then
       AC_PATH_PROG(PERL, perl)
+      if test -z "$PERL"; then
+         AC_MSG_ERROR([perl 5.8 or higher must be in your PATH, check the README])
+      fi
    fi
 fi
 
-for module_vers in "Crossfire 0.97" "Coro 3.5" "Coro::Event 2.1" "Event 1.08" \
-                   "IO::AIO 2.32" "BDB 0.1" "Storable 2.0" "Time::HiRes 1.0" "YAML::Syck 0.71" \
-                   "Digest::MD5 2.0" "Compress::LZF 1.71" "Safe::Hole 0.10" "Pod::POM 0.17"; do
+for module_vers in \
+   "AnyEvent 3.4" \
+   "BDB 1.5" \
+   "Compress::LZF 1.8" \
+   "Coro 4.7" \
+   "Coro::EV 0" \
+   "Deliantra 1.13" \
+   "Digest::MD5 2.0" \
+   "EV 3.41" \
+   "IO::AIO 3.0" \
+   "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 0.66" \
+; do
    set -- $module_vers
    module=$1
    minvers=$2
    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])
@@ -47,17 +86,14 @@
    fi
 done
 
-AC_PATH_PROG(GPERF, gperf)
-if test -z "$GPERF"; then
-   AC_MSG_ERROR([we need gperf, the GNU perfect hash generator])
-fi
-
 AC_LANG(C++)
 AC_PROG_CXX
 AC_PROG_CPP
 
 AC_CHECK_HEADER(tr1/unordered_map,[],[AC_MSG_ERROR([Your compiler must support the Library Technical Report 1 extensions.])])
 
+AC_CHECK_HEADER(pthread.h,[],[AC_MSG_ERROR([POSIX thread support is required.])])
+
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 
 AC_MSG_CHECKING(glib >= 2.10)
@@ -69,23 +105,30 @@
    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_CHECKING(gthread >= 0.0)
+if $PKG_CONFIG gthread-2.0 --atleast-version 0.0; then
+   CXXFLAGS="$CXXFLAGS `$PKG_CONFIG gthread-2.0 --cflags`"
+   LIBS="$LIBS `$PKG_CONFIG gthread-2.0 --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`"
@@ -93,7 +136,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])
@@ -118,12 +161,19 @@
 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)
 
-AC_CHECK_LIB(nsl, main)
-AC_CHECK_LIB(socket, main)
+AC_CHECK_LIB(nsl, gethostbyname)
+AC_CHECK_LIB(socket, connect)
+AC_CHECK_LIB(pthread, pthread_create)
 
 dnl Checks for libraries.
 AC_CHECK_LIB(m, main)
@@ -131,12 +181,37 @@
 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)
 
 AC_OUTPUT([Makefile
 	include/Makefile lib/Makefile pod/Makefile random_maps/Makefile socket/Makefile
         server/Makefile utils/Makefile ext/Makefile doc/Makefile
-	lib/checkarch.pl lib/collect.pl common/Makefile utils/cfutil
+	common/Makefile utils/cfutil
 ])