--- deliantra/server/configure.ac	2006/12/16 04:31:24	1.30
+++ deliantra/server/configure.ac	2007/01/18 16:19:33	1.40
@@ -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.4" "Coro::Event 2.0" "Event 1.08" \
+                   "IO::AIO 2.32" "Storable 2.0" "Time::HiRes 1.0" "YAML::Syck 0.71" \
+                   "Digest::MD5 2.0" "Compress::LZF 1.7" "Safe::Hole 0.10"; 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])
@@ -72,13 +87,6 @@
 dnl be harmful to link it in.
 AC_CHECK_LIB(z, main,  AC_DEFINE(HAVE_LIBZ,[],[Define if libz is available]) X11LIBS="$X11LIBS -lz", , $X11LIBS )
 
-dnl Misc libraries.
-AC_CHECK_LIB(crypt, main)
-AC_CHECK_LIB(des, des_crypt)
-
-dnl Checks for header files.
-AC_CHECK_HEADERS(crypt.h des.h)
-
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE
 
@@ -117,11 +125,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>
@@ -137,7 +147,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"