--- deliantra/server/configure.ac	2007/03/05 19:19:35	1.52
+++ deliantra/server/configure.ac	2007/03/06 19:05:14	1.57
@@ -1,8 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([crossfire], [2.0+], [crossfire@schmorp.de])
+AC_INIT([cfserver], [2.1], [crossfire@schmorp.de])
 AC_CONFIG_AUX_DIR(utils)
-AC_CONFIG_SRCDIR([server/main.C])
+AC_CONFIG_SRCDIR([server/cfperl.xs])
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(include/autoconf.h)
 
@@ -17,9 +17,19 @@
 
 AC_PROG_CPP
 
+AC_PATH_PROG(CONVERT, convert)
+
+if test -z "$CONVERT"; then
+   AC_MSG_ERROR([ImageMagick 'convert' must be in your PATH, see the README])
+fi
+
 AC_PATH_PROG(PERL, perl5.8)
-AC_PATH_PROG(PERL, perl5)
-AC_PATH_PROG(PERL, perl)
+if test -z "$PERL"; then
+   AC_PATH_PROG(PERL, perl5)
+   if test -z "$PERL"; then
+      AC_PATH_PROG(PERL, perl)
+   fi
+fi
 
 for module_vers in "Crossfire 0.97" "Coro 3.5" "Coro::Event 2.1" "Event 1.08" \
                    "IO::AIO 2.32" "BDB 0.1" "Storable 2.0" "Time::HiRes 1.0" "YAML::Syck 0.71" \
@@ -118,12 +128,6 @@
    AC_MSG_ERROR(no)
 fi
 
-AC_SUBST(x_includes)
-AC_SUBST(x_libraries)
-AC_SUBST(no_x)
-AM_CONDITIONAL(HAVE_X,test "x$no_x" = "x")
-AC_SUBST(X11LIBS)
-
 AC_SUBST(pkgstatedir,$localstatedir/$PACKAGE)
 AC_SUBST(pkgconfdir,$sysconfdir/$PACKAGE)