--- deliantra/server/configure.ac	2007/03/05 22:06:50	1.55
+++ deliantra/server/configure.ac	2007/03/06 22:07:56	1.58
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([cfserver], [2.0], [crossfire@schmorp.de])
+AC_INIT([cfserver], [2.1], [crossfire@schmorp.de])
 AC_CONFIG_AUX_DIR(utils)
 AC_CONFIG_SRCDIR([server/cfperl.xs])
 AM_INIT_AUTOMAKE
@@ -10,22 +10,23 @@
 
 AC_PREFIX_DEFAULT(/usr/games/crossfire)
 
-dnl Checks for programs.
-AC_LANG(C++)
-AC_PROG_CXX
-AC_PROG_LIBTOOL
-
-AC_PROG_CPP
+AC_PATH_PROG(OPTIPNG, optipng)
+if test -z "$OPTIPNG"; then
+   AC_MSG_ERROR([optipng must be in your PATH, see the README])
+fi
 
 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" \
@@ -46,6 +47,39 @@
    fi
 done
 
+AC_PATH_PROG(GPERF, gperf)
+if test -z "$GPERF"; then
+   AC_MSG_ERROR([we need gperf, the GNU perfect hash generator])
+fi
+
+AC_LANG(C++)
+AC_PROG_CXX
+AC_PROG_CPP
+
+AC_CHECK_HEADER(tr1/unordered_map,[],[AC_MSG_ERROR([Your compiler must support the Library Technical Report 1 extensions.])])
+
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+AC_MSG_CHECKING(glib >= 2.10)
+if $PKG_CONFIG glib-2.0 --atleast-version 2.10; then
+   CXXFLAGS="$CXXFLAGS `$PKG_CONFIG glib-2.0 --cflags`"
+   LIBS="$LIBS `$PKG_CONFIG glib-2.0 --libs`"
+   AC_MSG_RESULT(ok)
+else
+   AC_MSG_ERROR(no)
+fi
+
+AC_MSG_CHECKING(libpng)
+if $PKG_CONFIG libpng --exists; then
+   CXXFLAGS="$CXXFLAGS `$PKG_CONFIG libpng --cflags`"
+   LIBS="$LIBS `$PKG_CONFIG libpng --libs`"
+   AC_MSG_RESULT(ok)
+else
+   AC_MSG_ERROR(no)
+fi
+
+AC_PROG_LIBTOOL
+
 AC_MSG_CHECKING(for $PERL suitability)
 if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>&1; then
   save_CXXFLAGS="$CXXFLAGS"
@@ -88,48 +122,21 @@
 AC_PATH_PROG(TAR, tar)
 AC_PATH_PROG(BASENAME, basename)
 
-AC_PATH_PROG(GPERF, gperf)
-if test -z "$GPERF"; then
-   AC_MSG_ERROR([we need gperf, the GNU perfect hash generator])
-fi
-
 AC_CHECK_LIB(nsl, main)
 AC_CHECK_LIB(socket, main)
 
 dnl Checks for libraries.
 AC_CHECK_LIB(m, main)
 
-AC_CHECK_HEADER(tr1/unordered_map,[],[AC_MSG_ERROR([Your compiler must support the Library Technical Report 1 extensions.])])
-
 AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(long long)
 
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-
-AC_MSG_CHECKING(glib >= 2.10)
-if $PKG_CONFIG glib-2.0 --atleast-version 2.10; then
-   CXXFLAGS="$CXXFLAGS `$PKG_CONFIG glib-2.0 --cflags`"
-   LIBS="$LIBS `$PKG_CONFIG glib-2.0 --libs`"
-   AC_MSG_RESULT(ok)
-else
-   AC_MSG_ERROR(no)
-fi
-
-AC_MSG_CHECKING(libpng)
-if $PKG_CONFIG libpng --exists; then
-   CXXFLAGS="$CXXFLAGS `$PKG_CONFIG libpng --cflags`"
-   LIBS="$LIBS `$PKG_CONFIG libpng --libs`"
-   AC_MSG_RESULT(ok)
-else
-   AC_MSG_ERROR(no)
-fi
-
 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 doc/Makefile
-	lib/checkarch.pl lib/collect.pl common/Makefile
+	lib/checkarch.pl lib/collect.pl common/Makefile utils/cfutil
 ])