--- deliantra/server/configure.ac 2007/12/05 11:08:34 1.100 +++ deliantra/server/configure.ac 2008/07/29 03:46:26 1.140 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([deliantra-server], [2.32], [support@deliantra.net]) +AC_INIT([deliantra-server], [2.6], [support@deliantra.net]) AC_CONFIG_AUX_DIR(utils) AC_CONFIG_SRCDIR([server/cfperl.xs]) AM_INIT_AUTOMAKE @@ -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,15 +52,17 @@ fi for module_vers in \ - "AnyEvent 2.6" \ - "BDB 1.1" \ + "AnyEvent 4.22" \ + "AnyEvent::AIO 0" \ + "AnyEvent::BDB 0" \ + "BDB 1.71" \ "Compress::LZF 1.8" \ - "Coro 4.13" \ - "Coro::EV 2.1" \ - "Crossfire 0.99" \ + "Coro 4.73" \ + "Coro::EV 0" \ + "Deliantra 1.13" \ "Digest::MD5 2.0" \ - "EV 0.9" \ - "IO::AIO 2.51" \ + "EV 3.41" \ + "IO::AIO 3.03" \ "JSON::XS 2.01" \ "Net::IRC3 0.5" \ "Pod::POM 0.17" \ @@ -68,8 +70,7 @@ "Storable 2.0" \ "Time::HiRes 1.0" \ "URI 1.35" \ - "YAML::Syck 0.71" \ - "YAML 0.62" \ + "YAML 0.66" \ ; do set -- $module_vers module=$1 @@ -77,7 +78,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]) @@ -93,6 +94,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) @@ -104,6 +107,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`" @@ -161,8 +173,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)