--- deliantra/server/configure.ac	2006/03/15 15:35:45	1.4
+++ deliantra/server/configure.ac	2006/07/11 14:24:15	1.8
@@ -1,7 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_REVISION($Id$)
-AC_INIT([crossfire], [1.9.0], [crossfire-devel@listserv.real-time.com])
+AC_INIT([crossfire], [1.9.1], [crossfire-devel@listserv.real-time.com])
 AC_CONFIG_AUX_DIR(utils)
 AC_CONFIG_SRCDIR([server/main.c])
 AM_INIT_AUTOMAKE
@@ -224,12 +223,13 @@
 
   save_CFLAGS="$CFLAGS"
   save_LIBS="$LIBS"
-  CFLAGS="$CFLAGS `$PERL -MExtUtils::Embed -e ccopts`"
+  CFLAGS="$CFLAGS `$PERL -MExtUtils::Embed -e ccopts` `$PERL -MEvent::MakeMaker -e 'print +{&Event::MakeMaker::event_args}->{INC}'`"
   LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"
   AC_TRY_LINK([
 #include <EXTERN.h>
 #include <perl.h>
 #include <XSUB.h>
+#include "EventAPI.h"
 ],[
   PerlInterpreter *perl = perl_alloc ();
 ],[perl_link=yes],[perl_link=no])
@@ -239,7 +239,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`"
+     PERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts` `$PERL -MEvent::MakeMaker -e 'print +{&Event::MakeMaker::event_args}->{INC}'`"
      PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`"
      PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`"
      PERL_PLUGIN=yes
@@ -275,6 +275,12 @@
 AM_CONDITIONAL(PYTHON_PLUGIN,test "x$PLUGIN_PYTHON" != "x")
 AC_SUBST(PLUGIN_PYTHON)
 
+# crossedit compilability check
+   CF_CHECK_CROSSEDIT(["$X11LIBS"],
+   [cf_will_build_crossedit="yes"]
+   AC_SUBST(CROSSEDIT, 'crossedit'), 
+   [cf_will_build_crossedit="no"] )
+
 AC_OUTPUT([Makefile
 	crossedit/Makefile crossedit/doc/Makefile crossedit/include/Makefile
 	crossedit/Cnv/Makefile crossedit/bitmaps/Makefile