--- deliantra/server/configure.ac	2007/02/06 02:36:48	1.46
+++ deliantra/server/configure.ac	2007/03/05 19:54:10	1.53
@@ -15,24 +15,31 @@
 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(PERL, perl5.8)
 AC_PATH_PROG(PERL, perl5)
 AC_PATH_PROG(PERL, perl)
 
+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" \
+                   "Digest::MD5 2.0" "Compress::LZF 1.71" "Safe::Hole 0.10" "Pod::POM 0.17"; do
+   set -- $module_vers
+   module=$1
+   minvers=$2
+   AC_MSG_CHECKING(for $module perl module version $minvers or higher)
+   if $PERL -M$module -e0 >/dev/null 2>&1; then
+      version=`$PERL -M$module -e "print \\$$module::VERSION"`
+      if $PERL -M$module=$minvers -e0 >/dev/null 2>&1; then
+         AC_MSG_RESULT([ok, version $version])
+      else
+         AC_MSG_ERROR([no, installed version is $version])
+      fi
+   else
+      AC_MSG_ERROR([no, cannot load module $module])
+   fi
+done
+
 AC_MSG_CHECKING(for $PERL suitability)
 if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>&1; then
   save_CXXFLAGS="$CXXFLAGS"
@@ -71,25 +78,6 @@
 AC_SUBST(PERLPRIVLIBEXP)
 AC_SUBST(PERL)
 
-for module_vers in "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" \
-                   "Digest::MD5 2.0" "Compress::LZF 1.7" "Safe::Hole 0.10" "Pod::POM 0.17"; do
-   set -- $module_vers
-   module=$1
-   minvers=$2
-   AC_MSG_CHECKING(for $module perl module version $minvers or higher)
-   if $PERL -M$module -e0 >/dev/null 2>&1; then
-      version=`$PERL -M$module -e "print \\$$module::VERSION"`
-      if $PERL -M$module=$minvers -e0 >/dev/null 2>&1; then
-         AC_MSG_RESULT([ok, version $version])
-      else
-         AC_MSG_ERROR([no, installed version is $version])
-      fi
-   else
-      AC_MSG_ERROR([no, cannot load module $module])
-   fi
-done
-
 dnl check for some other programs
 AC_PATH_PROG(TAR, tar)
 AC_PATH_PROG(BASENAME, basename)
@@ -130,20 +118,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 src/Makefile utils/Makefile ext/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
+        server/Makefile utils/Makefile ext/Makefile doc/Makefile
+	lib/checkarch.pl lib/collect.pl common/Makefile
 ])