--- deliantra/server/configure.ac 2008/04/06 18:40:52 1.120 +++ deliantra/server/configure.ac 2012/11/11 02:38:10 1.183 @@ -1,6 +1,6 @@ -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.43], [support@deliantra.net]) +AC_INIT([deliantra-server], [3.0], [support@deliantra.net]) AC_CONFIG_AUX_DIR(utils) AC_CONFIG_SRCDIR([server/cfperl.xs]) AM_INIT_AUTOMAKE @@ -30,45 +30,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.10.0) +AC_PATH_PROG(PERL, perl5.10.1) if test -z "$PERL"; then - AC_PATH_PROG(PERL, perl5.8.8) + 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.9" \ - "BDB 1.43" \ - "Compress::LZF 1.8" \ - "Coro 4.48" \ - "Coro::EV 2.1" \ - "Deliantra 1.13" \ + "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 1.24" \ "Digest::MD5 2.0" \ - "EV 3.2" \ - "IO::AIO 2.51" \ + "EV 4" \ + "Guard 1" \ + "IO::AIO 4" \ "JSON::XS 2.01" \ - "Net::IRC3 0.5" \ - "Pod::POM 0.17" \ + "AnyEvent::IRC 0.6" \ + "Pod::POM 0.27" \ "Safe::Hole 0.10" \ "Storable 2.0" \ - "Time::HiRes 1.0" \ "URI 1.35" \ - "YAML 0.66" \ + "YAML::XS 0.32" \ ; do set -- $module_vers module=$1 @@ -96,6 +96,15 @@ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +AC_MSG_CHECKING(blitz++ >= 0.9) +if $PKG_CONFIG blitz --atleast-version 0.9; 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.10) if $PKG_CONFIG glib-2.0 --atleast-version 2.10; then CXXFLAGS="$CXXFLAGS `$PKG_CONFIG glib-2.0 --cflags`" @@ -105,6 +114,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`" @@ -115,7 +133,7 @@ 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`" @@ -128,6 +146,7 @@ #include #include #include "EVAPI.h" +#include "CoroAPI.h" ],[ PerlInterpreter *perl = perl_alloc (); ],[perl_link=yes],[perl_link=no]) @@ -136,16 +155,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)