--- deliantra/server/configure.ac	2006/05/07 12:49:18	1.6
+++ deliantra/server/configure.ac	2006/08/13 17:47:24	1.12
@@ -1,8 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
 
-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])
+AC_CONFIG_SRCDIR([server/main.C])
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(include/autoconf.h)
 
@@ -13,8 +13,9 @@
 dnl we want a config.h file instead of -D options.
 
 dnl Checks for programs.
+AC_PROG_CXX
+AC_LANG(C++)
 AC_PROG_LIBTOOL
-AC_PROG_CC
 
 case "$target" in
   alpha-dec-osf*)
@@ -77,36 +78,7 @@
 AC_CHECK_LIB(socket, main)
 
 dnl Checks for libraries.
-dnl Start of X11 libraries
-AC_PATH_XTRA
-
-dnl Some of these checks are probably excessive.  Unfortunately, on
-dnl some systems, to link in Xaw, Xt you need SM, which needs ICE.
-dnl the order of the checks below is important
-OLD_LD_FLAGS="$LDFLAGS"
-LDFLAGS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
-
-AC_CHECK_LIB(X11, main, AC_DEFINE(HAVE_LIBX11,[],[Define if libX11 is available]) X11LIBS="$X11LIBS -lX11")
-
-AC_CHECK_LIB(ICE, main, AC_DEFINE(HAVE_LIBICE,[],[Define if libICE is available]) X11LIBS="$X11LIBS -lICE")
-
-AC_CHECK_LIB(SM, main, AC_DEFINE(HAVE_LIBSM,[],[Define if libSM is available]) X11LIBS="$X11LIBS -lSM", , $X11LIBS)
-
-AC_CHECK_LIB(Xext, main,  AC_DEFINE(HAVE_LIBXEXT,[],[Define if libEXT is available]) X11LIBS="$X11LIBS -lXext", , -lX11)
-
-AC_CHECK_LIB(Xt, main,  AC_DEFINE(HAVE_LIBXT,[],[Define if libXT is available]) X11LIBS="$X11LIBS -lXt", , $X11LIBS)
-
-AC_CHECK_LIB(Xmu, main,  AC_DEFINE(HAVE_LIBXMU,[],[Define if libXMU is available]) X11LIBS="$X11LIBS -lXmu", ,$X11LIBS)
-
-AC_CHECK_LIB(Xaw, main, AC_DEFINE(HAVE_LIBXAW,[],[Define if libXAW is available]) X11LIBS="-lXaw $X11LIBS", , $X11LIBS)
-
-LDFLAGS="$OLD_LD_FLAGS"
-X11LIBS="$X_LIBS $X11LIBS"
-
-AC_CHECK_LIB(Xpm, main,  AC_DEFINE(HAVE_LIBXPM,[],[Define if libXpm is available]) X11LIBS="$X11LIBS -lXpm", , $X11LIBS )
-
 AC_CHECK_LIB(m, main)
-
 AC_CHECK_LIB(png, main,  AC_DEFINE(HAVE_LIBPNG,[],[Define if libpng is available]) X11LIBS="$X11LIBS -lpng", , $X11LIBS )
 
 dnl png has a dependency in some cases on libz - if we have it, can't really
@@ -223,22 +195,23 @@
 
   save_CFLAGS="$CFLAGS"
   save_LIBS="$LIBS"
-  CFLAGS="$CFLAGS `$PERL -MExtUtils::Embed -e ccopts`"
+  CXXFLAGS="$CXXFLAGS `$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])
-  CXXFLAGS="$save_CFLAGS"
+  CXXFLAGS="$save_CXXFLAGS"
   LIBS="$save_LIBS"
 
   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
@@ -274,15 +247,7 @@
 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
 	doc/Makefile doc/Developers/Makefile doc/spell-docs/Makefile
 	doc/spoiler/Makefile doc/spoiler-html/Makefile
 	doc/playbook/Makefile doc/playbook-html/Makefile
@@ -292,8 +257,7 @@
 	lib/collect.pl utils/add_throw.perl utils/crossloop.tmpl utils/crossloop.pl.tmpl
 	utils/metaserver.pl utils/crossloop.web utils/scores.pl utils/player_dl.pl
 	common/Makefile plugins/Makefile plugins/cfpython/Makefile 
-	plugins/cfpython/include/Makefile plugins/cfanim/Makefile 
-	plugins/cfanim/include/Makefile
+	plugins/cfpython/include/Makefile
 	plugins/common/Makefile plugins/common/include/Makefile
 	devel/Makefile
         plugins/cfperl/Makefile