--- deliantra/server/configure.ac	2007/05/16 12:22:17	1.72
+++ deliantra/server/configure.ac	2007/06/10 04:44:20	1.79
@@ -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([cfserver], [2.2], [crossfire@schmorp.de])
 AC_CONFIG_AUX_DIR(utils)
 AC_CONFIG_SRCDIR([server/cfperl.xs])
 AM_INIT_AUTOMAKE
@@ -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
@@ -55,12 +55,12 @@
    "AnyEvent 2.52" \
    "BDB 0.1" \
    "Compress::LZF 1.8" \
-   "Coro 3.63" \
+   "Coro 3.62" \
    "Coro::Event 2.1" \
-   "Crossfire 0.98" \
+   "Crossfire 0.99" \
    "Digest::MD5 2.0" \
    "Event 1.08" \
-   "IO::AIO 2.32" \
+   "IO::AIO 2.4" \
    "JSON::XS 1.21" \
    "Pod::POM 0.17" \
    "Safe::Hole 0.10" \
@@ -88,9 +88,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,16 +101,14 @@
    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
@@ -153,6 +148,12 @@
 AC_SUBST(PERLPRIVLIBEXP)
 AC_SUBST(PERL)
 
+dnl AC_PROG_LIBTOOL
+AC_PROG_RANLIB
+
+AC_CHECK_HEADERS(execinfo.h)
+AC_CHECK_FUNCS(backtrace)
+
 dnl check for some other programs
 AC_PATH_PROG(TAR, tar)
 AC_PATH_PROG(BASENAME, basename)
@@ -166,12 +167,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
 ])