--- deliantra/server/configure.ac 2006/08/15 17:12:47 1.13 +++ deliantra/server/configure.ac 2006/08/31 06:23:17 1.16 @@ -37,8 +37,7 @@ AC_ARG_ENABLE(dmalloc, [ --enable-dmalloc Use the dmalloc library if available, may prevent plugins from working], use_dmalloc=yes, use_dmalloc=no) -AC_ARG_WITH(python, [ --with-python=dir Directory to look for python headers/library (default=standard system location) ], - PYTHON_HOME="$withval") +dnl AC_ARG_WITH(python, [ --with-python=dir Directory to look for python headers/library (default=standard system location) ], PYTHON_HOME="$withval") dnl check for some other programs @@ -214,7 +213,7 @@ 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 + CPPFLAGS="$CPPFLAGS $PERLFLAGS" else AC_MSG_ERROR([no, unable to link]) fi @@ -225,8 +224,6 @@ AC_SUBST(PERLFLAGS) AC_SUBST(PERLPRIVLIBEXP) AC_SUBST(PERL) -AM_CONDITIONAL(PERL_PLUGIN,test "x$PERL_PLUGIN" != "x") -AC_SUBST(PERL_PLUGIN) ############################################# # Plugin configuration @@ -236,11 +233,12 @@ if test "x$cf_have_libdl" = "xyes" ; then ############### # Python plugin - CF_CHECK_PYTHON( - [PLUGIN_PYTHON="cfpython.la"], - [AC_MSG_NOTICE([No Python found. Python plugin will not be built.])] - ) +dnl CF_CHECK_PYTHON( +dnl [PLUGIN_PYTHON="cfpython.la"], +dnl [AC_MSG_NOTICE([No Python found. Python plugin will not be built.])] +dnl ) dnl *** Put other plugins configuration code here *** + : else AC_MSG_NOTICE([No dl library found. Plugins will not be supported.]) fi @@ -252,7 +250,7 @@ doc/spoiler/Makefile doc/spoiler-html/Makefile doc/playbook/Makefile doc/playbook-html/Makefile doc/scripts/Makefile - lib/Makefile random_maps/Makefile socket/Makefile server/Makefile + lib/Makefile random_maps/Makefile socket/Makefile server/Makefile src/Makefile include/Makefile utils/Makefile lib/checkarch.pl 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