--- deliantra/server/configure.ac	2006/12/15 20:07:02	1.28
+++ deliantra/server/configure.ac	2007/01/01 15:32:40	1.36
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([crossfire], [2.0+], [crossfire.de])
+AC_INIT([crossfire], [2.0+], [crossfire@schmorp.de])
 AC_CONFIG_AUX_DIR(utils)
 AC_CONFIG_SRCDIR([server/main.C])
 AM_INIT_AUTOMAKE
@@ -10,7 +10,28 @@
 
 AC_PREFIX_DEFAULT(/usr/games/crossfire)
 
-dnl we want a config.h file instead of -D options.
+AC_PATH_PROG(PERL, perl5.8)
+AC_PATH_PROG(PERL, perl5)
+AC_PATH_PROG(PERL, perl)
+
+for module_vers in "Coro 3.3" "Coro::Event 2.0" "Event 1.08" \
+                   "IO::AIO 2.31" "Storable 2.0" "Time::HiRes 1.0" "YAML::Syck 0.71" \
+                   "Digest::MD5 2.0" "Compress::LZF 1.7"; do
+   set -- $module_vers
+   module=$1
+   minvers=$2
+   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
+         AC_MSG_RESULT([ok, version $version])
+      else
+         AC_MSG_ERROR([no, installed version is $version])
+      fi
+   else
+      AC_MSG_ERROR([no, cannot load module $module])
+   fi
+done
 
 dnl Checks for programs.
 AC_LANG(C++)
@@ -30,8 +51,6 @@
 esac
 
 AC_PROG_CPP
-AM_PROG_LEX
-AC_PROG_AWK
 
 dnl AC_ARG_WITH(python, [  --with-python=dir       Directory to look for python headers/library (default=standard system location)	], PYTHON_HOME="$withval")
 
@@ -42,10 +61,6 @@
 AC_PATH_PROG(TAR, tar)
 AC_PATH_PROG(BASENAME, basename)
 
-AC_PATH_PROG(PERL, perl5.8)
-AC_PATH_PROG(PERL, perl5)
-AC_PATH_PROG(PERL, perl)
-
 AC_PATH_PROG(GPERF, gperf)
 if test -z "$GPERF"; then
    AC_MSG_ERROR([we need gperf, the GNU perfect hash generator])
@@ -89,50 +104,6 @@
 AC_PROG_GCC_TRADITIONAL
 AC_TYPE_SIGNAL
 
-dnl alphasort can not be added to AC_CHECK_FUNCS because 
-AC_MSG_CHECKING(checking if alphasort is defined)
-  AC_TRY_COMPILE([#include <dirent.h>], [alphasort;],
-    ac_cv_func_alphasort=yes, ac_cv_func_alphasort=no)
-  if test "$ac_cv_func_alphasort" = yes; then
-    AC_DEFINE(HAVE_ALPHASORT, 1, [Define if you have the alphasort() function declaration.])
-    AC_MSG_RESULT(yes)
-  else
-    AC_MSG_RESULT(no)
-  fi
-
-
-
-AC_MSG_CHECKING(how many args gettimeofday uses)
-AC_CACHE_VAL(ac_cv_gettimeofday_args,
- [AC_TRY_COMPILE([#include <sys/time.h>
-	#include <unistd.h>],
-	[struct timeval tv; struct timezone tzp;
-	gettimeofday(&tv, &tzp);],
-	[ac_gettimeofday_args=2],
-		[AC_TRY_COMPILE([#include <sys/time.h>
-		#include <unistd.h>],
-		[struct timeval tv; 
-		gettimeofday(&tv, NULL);],
-		[ac_gettimeofday_args=2],
-		[AC_TRY_COMPILE([#include <sys/time.h>
-			#include <unistd.h>],
-			[struct timeval tv; gettimeofday(&tv);],
-			[ac_gettimeofday_args=1],
-			[ac_gettimeofday_args=0])])])
-  ac_cv_gettimeofday_args=$ac_gettimeofday_args])
-
-ac_gettimeofday_args=$ac_cv_gettimeofday_args
-if test $ac_gettimeofday_args = 1 ; then
-  AC_DEFINE(HAVE_GETTIMEOFDAY,[],[Define if gettimeofday is available])
-  AC_MSG_RESULT(one argument)
-elif test $ac_gettimeofday_args = 2 ; then
-  AC_DEFINE(HAVE_GETTIMEOFDAY,[],[Define if gettimeofday is available])
-  AC_DEFINE(GETTIMEOFDAY_TWO_ARGS,[],[Define if gettimeofday takes two arguments])
-  AC_MSG_RESULT(two arguments)
-else
-  AC_MSG_RESULT(unknown)
-fi
-
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 
 AC_MSG_CHECKING(glib >= 2.10)
@@ -161,11 +132,13 @@
 AC_DEFINE_UNQUOTED(BUNZIP,"${BUNZIP}",[Path to the bunzip binary])
 
 AC_MSG_CHECKING(for $PERL suitability)
-if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then
-
+if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>&1; then
   save_CXXFLAGS="$CXXFLAGS"
   save_LIBS="$LIBS"
-  CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts` `$PERL -MEvent::MakeMaker -e 'print +{&Event::MakeMaker::event_args}->{INC}'`"
+  xPERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`"
+  xPERLFLAGS="$xPERLFLAGS `$PERL -MEvent::MakeMaker -e 'print +{&Event::MakeMaker::event_args}->{INC}'`"
+  xPERLFLAGS="$xPERLFLAGS `$PERL -MCoro::MakeMaker -e 'print +{&Coro::MakeMaker::coro_args}->{INC}'`"
+  CXXFLAGS="$CXXFLAGS $xPERLFLAGS"
   LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"
   AC_TRY_LINK([
 #include <EXTERN.h>
@@ -181,7 +154,7 @@
   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="`$PERL -MExtUtils::Embed -e ccopts` `$PERL -MEvent::MakeMaker -e 'print +{&Event::MakeMaker::event_args}->{INC}'`"
+     PERLFLAGS="$xPERLFLAGS"
      PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`"
      PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`"
      CPPFLAGS="$CPPFLAGS $PERLFLAGS"
@@ -203,3 +176,4 @@
 	utils/crossloop.tmpl utils/crossloop.pl.tmpl utils/metaserver.pl
 	utils/crossloop.web utils/scores.pl utils/player_dl.pl common/Makefile
 ])
+