--- deliantra/server/configure.ac 2007/05/28 21:33:50 1.75 +++ deliantra/server/configure.ac 2007/08/18 17:33:53 1.85 @@ -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,18 +55,20 @@ "AnyEvent 2.52" \ "BDB 0.1" \ "Compress::LZF 1.8" \ - "Coro 3.62" \ + "Coro 3.64" \ "Coro::Event 2.1" \ "Crossfire 0.99" \ "Digest::MD5 2.0" \ "Event 1.08" \ - "IO::AIO 2.32" \ - "JSON::XS 1.21" \ + "IO::AIO 2.4" \ + "JSON::XS 1.41" \ + "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" \ ; do set -- $module_vers module=$1 @@ -74,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=$minvers -e0 >/dev/null 2>&1; then + if $PERL -M$module -e "VERSION $module $minvers" >/dev/null 2>&1; then AC_MSG_RESULT([ok, version $version]) else AC_MSG_ERROR([no, installed version is $version]) @@ -88,9 +90,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 +103,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 +150,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,6 +169,31 @@ AC_CHECK_SIZEOF(long) AC_CHECK_SIZEOF(long long) +AC_MSG_CHECKING(for tcp_info support) +AC_TRY_LINK([ +#include +#include +#include +#include +],[ + 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)