--- deliantra/server/configure.ac	2007/03/05 19:11:12	1.51
+++ deliantra/server/configure.ac	2007/03/05 22:06:50	1.55
@@ -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.0], [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)
 
@@ -15,20 +15,14 @@
 AC_PROG_CXX
 AC_PROG_LIBTOOL
 
-case "$target" in
-  alpha-dec-osf*)
-    # If we are not using gcc, we want the ansi version of cc.
-    if test -z "$GCC"; then
-#      CFLAGS="$CFLAGS -std1 -warnprotos" # Not yet ready for warnprotos...
-      CFLAGS="$CFLAGS -std1"
-    fi
-    ;;
-  *)
-    ;;
-esac
-
 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)
@@ -130,18 +124,12 @@
    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)
 
 AC_OUTPUT([Makefile
 	include/Makefile lib/Makefile pod/Makefile random_maps/Makefile socket/Makefile
-	server/Makefile utils/Makefile ext/Makefile
+        server/Makefile utils/Makefile ext/Makefile doc/Makefile
 	lib/checkarch.pl lib/collect.pl common/Makefile
 ])