--- deliantra/server/configure.ac	2006/09/08 00:19:55	1.21
+++ deliantra/server/configure.ac	2006/12/11 19:10:58	1.24
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([crossfire], [1.9.1], [crossfire-devel@listserv.real-time.com])
+AC_INIT([crossfire], [2.0+], [crossfire-devel@listserv.real-time.com])
 AC_CONFIG_AUX_DIR(utils)
 AC_CONFIG_SRCDIR([server/main.C])
 AM_INIT_AUTOMAKE
@@ -47,6 +47,7 @@
 AC_PATH_PROG(TAR, tar)
 AC_PATH_PROG(PERL, perl)
 AC_PATH_PROG(BASENAME, basename)
+AC_PATH_PROG(GPERF, gperf)
 
 if test -n "$GZIP" -a -z "$GUNZIP" ; then
     echo "Found gzip, but not gunzip - setting GUNZIP to gzip -c";
@@ -184,8 +185,6 @@
 AC_SUBST(no_x)
 AM_CONDITIONAL(HAVE_X,test "x$no_x" = "x")
 AC_SUBST(X11LIBS)
-AC_SUBST(PERL)
-AC_SUBST(BASENAME)
 
 AC_SUBST(pkgstatedir,$localstatedir/$PACKAGE)
 AC_SUBST(pkgconfdir,$sysconfdir/$PACKAGE)
@@ -197,6 +196,7 @@
 AC_DEFINE_UNQUOTED(BZIP,"${BZIP}",[Path to the bzip binary])
 AC_DEFINE_UNQUOTED(BUNZIP,"${BUNZIP}",[Path to the bunzip binary])
 
+AC_PATH_PROG(PERL, perl5.8)
 AC_PATH_PROG(PERL, perl5)
 AC_PATH_PROG(PERL, perl)
 
@@ -236,20 +236,10 @@
 AC_SUBST(PERLPRIVLIBEXP)
 AC_SUBST(PERL)
 
-#AC_OUTPUT([Makefile
-#	doc/Makefile doc/Developers/Makefile doc/spell-docs/Makefile
-#	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 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 common/Makefile
-#	 ])
 AC_OUTPUT([Makefile
-	lib/Makefile pod/Makefile random_maps/Makefile socket/Makefile
-	server/Makefile src/Makefile include/Makefile utils/Makefile
+	include/Makefile lib/Makefile pod/Makefile random_maps/Makefile socket/Makefile
+	server/Makefile src/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 common/Makefile
-	 ])
+])