--- deliantra/server/configure.ac	2006/08/28 16:52:50	1.14
+++ deliantra/server/configure.ac	2006/09/01 13:58:06	1.17
@@ -13,8 +13,8 @@
 dnl we want a config.h file instead of -D options.
 
 dnl Checks for programs.
-AC_PROG_CXX
 AC_LANG(C++)
+AC_PROG_CXX
 AC_PROG_LIBTOOL
 
 case "$target" in
@@ -213,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
@@ -224,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
@@ -240,6 +238,7 @@
 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
@@ -251,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