--- deliantra/server/configure.ac 2006/05/07 12:49:18 1.6 +++ deliantra/server/configure.ac 2006/08/13 17:20:42 1.10 @@ -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) @@ -223,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 #include #include +#include "EventAPI.h" ],[ PerlInterpreter *perl = perl_alloc (); ],[perl_link=yes],[perl_link=no]) @@ -238,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 @@ -274,15 +275,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 @@ -293,7 +286,6 @@ 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/common/Makefile plugins/common/include/Makefile devel/Makefile plugins/cfperl/Makefile