--- deliantra/server/configure.ac	2007/11/10 22:30:57	1.95
+++ deliantra/server/configure.ac	2016/11/18 04:11:03	1.190
@@ -1,9 +1,10 @@
-dnl Process this file with autoconf to produce a configure script.
+dnl Process this file with autoconf to produce a configure script.,
 
-AC_INIT([deliantra-server], [2.3], [support@deliantra.net])
+AC_INIT([deliantra-server], [3.1], [support@deliantra.net])
+dnl AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR(utils)
 AC_CONFIG_SRCDIR([server/cfperl.xs])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([silent-rules subdir-objects foreign no-dist-gzip dist-xz])
 AM_CONFIG_HEADER(include/autoconf.h)
 
 AM_MAINTAINER_MODE
@@ -30,46 +31,45 @@
    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(IDENTIFY, identify)
+if test -z "$IDENTIFY"; then
+   AC_MSG_ERROR([ImageMagick 'identify' must be in your PATH, check the README])
+fi
 
 AC_PATH_PROG(CONVERT, convert)
 if test -z "$CONVERT"; then
    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.1)
 if test -z "$PERL"; then
-   AC_PATH_PROG(PERL, perl5)
+   AC_PATH_PROG(PERL, perl)
    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
+      AC_MSG_ERROR([perl 5.10.1 or higher must be in your PATH, check the README])
    fi
 fi
 
 for module_vers in \
-   "AnyEvent 2.52" \
-   "BDB 1.1" \
-   "Compress::LZF 1.8" \
-   "Coro 4.13" \
-   "Coro::Event 2.1" \
-   "Crossfire 0.99" \
+   "common::sense 3.3" \
+   "AnyEvent 7.0" \
+   "AnyEvent::AIO 0" \
+   "AnyEvent::BDB 0" \
+   "BDB 1.8" \
+   "Compress::LZF 3.41" \
+   "Coro 6" \
+   "Coro::EV 0" \
+   "Deliantra 2.0" \
    "Digest::MD5 2.0" \
-   "Event 1.08" \
-   "IO::AIO 2.4" \
-   "JSON::XS 1.5" \
-   "Net::IRC3 0.5" \
-   "Pod::POM 0.17" \
+   "EV 4" \
+   "Guard 1" \
+   "IO::AIO 4" \
+   "JSON::XS 2.01" \
+   "AnyEvent::IRC 0.6" \
+   "Pod::POM 0.27" \
    "Safe::Hole 0.10" \
    "Storable 2.0" \
-   "Time::HiRes 1.0" \
    "URI 1.35" \
-   "YAML::Syck 0.71" \
-   "YAML 0.62" \
+   "YAML::XS 0.32" \
 ; do
    set -- $module_vers
    module=$1
@@ -77,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 -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])
@@ -91,11 +91,27 @@
 AC_PROG_CXX
 AC_PROG_CPP
 
+AX_CHECK_COMPILE_FLAG(-Wno-unused-result,[CXXFLAGS="$CXXFLAGS -Wno-unused-result"])
+AX_CHECK_COMPILE_FLAG(-Wno-narrowing,[CXXFLAGS="$CXXFLAGS -Wno-narrowing"])
+
+AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])
+
 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)
+AC_MSG_CHECKING(blitz++ >= 0.10)
+if $PKG_CONFIG blitz --atleast-version 0.10; then
+   CXXFLAGS="$CXXFLAGS `$PKG_CONFIG blitz --cflags`"
+   LIBS="$LIBS `$PKG_CONFIG blitz --libs`"
+   AC_MSG_RESULT(ok)
+else
+   AC_MSG_ERROR(no)
+fi
+
+AC_MSG_CHECKING(glib >= 2.32)
 if $PKG_CONFIG glib-2.0 --atleast-version 2.10; then
    CXXFLAGS="$CXXFLAGS `$PKG_CONFIG glib-2.0 --cflags`"
    LIBS="$LIBS `$PKG_CONFIG glib-2.0 --libs`"
@@ -104,6 +120,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`"
@@ -114,11 +139,11 @@
 dnl fi
 
 AC_MSG_CHECKING(for $PERL suitability)
-if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>&1; then
+if $PERL -MExtUtils::Embed -e "use 5.10.1" >/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`"
@@ -126,7 +151,8 @@
 #include <EXTERN.h>
 #include <perl.h>
 #include <XSUB.h>
-#include "EventAPI.h"
+#include "EVAPI.h"
+#include "CoroAPI.h"
 ],[
   PerlInterpreter *perl = perl_alloc ();
 ],[perl_link=yes],[perl_link=no])
@@ -135,16 +161,15 @@
 
   if test x$perl_link = xyes; then
      AC_MSG_RESULT(ok)
-     AC_DEFINE(ENABLE_PERL, 1, Define if you can embed a perl interpreter)
      PERLFLAGS="$xPERLFLAGS"
      PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`"
      PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`"
      CPPFLAGS="$CPPFLAGS $PERLFLAGS"
   else
-     AC_MSG_ERROR([no, unable to link])
+     AC_MSG_ERROR([no, unable to link test program])
   fi
 else
-  AC_MSG_ERROR([no working perl found, or perl not version >= 5.8])
+  AC_MSG_ERROR([no working perl found, or perl not version >= 5.10.1])
 fi
 AC_SUBST(PERLLIB)
 AC_SUBST(PERLFLAGS)
@@ -161,8 +186,9 @@
 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)
@@ -199,8 +225,7 @@
 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
-	common/Makefile utils/cfutil
+	include/Makefile lib/Makefile
+	utils/cfutil
 ])