--- deliantra/server/configure.ac	2007/08/27 02:43:38	1.86
+++ deliantra/server/configure.ac	2008/07/20 14:37:17	1.138
@@ -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.6], [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
@@ -40,9 +40,9 @@
    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
@@ -52,23 +52,23 @@
 fi
 
 for module_vers in \
-   "AnyEvent 2.52" \
-   "BDB 0.1" \
+   "AnyEvent 4.22" \
+   "BDB 1.6" \
    "Compress::LZF 1.8" \
-   "Coro 3.64" \
-   "Coro::Event 2.1" \
-   "Crossfire 0.99" \
+   "Coro 4.73" \
+   "Coro::EV 0" \
+   "Deliantra 1.13" \
    "Digest::MD5 2.0" \
-   "Event 1.08" \
-   "IO::AIO 2.4" \
-   "JSON::XS 1.5" \
+   "EV 3.41" \
+   "IO::AIO 3.03" \
+   "JSON::XS 2.01" \
    "Net::IRC3 0.5" \
    "Pod::POM 0.17" \
    "Safe::Hole 0.10" \
    "Storable 2.0" \
    "Time::HiRes 1.0" \
-   "YAML::Syck 0.71" \
-   "YAML 0.62" \
+   "URI 1.35" \
+   "YAML 0.66" \
 ; do
    set -- $module_vers
    module=$1
@@ -76,7 +76,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 -e "VERSION $module $minvers" >/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])
@@ -92,6 +92,8 @@
 
 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)
@@ -103,6 +105,15 @@
    AC_MSG_ERROR(no)
 fi
 
+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
+
 dnl AC_MSG_CHECKING(libpng)
 dnl if $PKG_CONFIG libpng --exists; then
 dnl    CXXFLAGS="$CXXFLAGS `$PKG_CONFIG libpng --cflags`"
@@ -117,7 +128,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`"
@@ -125,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])
@@ -153,15 +164,16 @@
 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
 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)