--- deliantra/server/configure.ac	2006/12/23 16:29:02	1.31
+++ deliantra/server/configure.ac	2007/03/07 01:23:37	1.59
@@ -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)
 
@@ -10,84 +10,66 @@
 
 AC_PREFIX_DEFAULT(/usr/games/crossfire)
 
-dnl we want a config.h file instead of -D options.
-
-dnl Checks for programs.
-AC_LANG(C++)
-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
-AM_PROG_LEX
-AC_PROG_AWK
-
-dnl AC_ARG_WITH(python, [  --with-python=dir       Directory to look for python headers/library (default=standard system location)	], PYTHON_HOME="$withval")
-
-dnl check for some other programs
-AC_PATH_PROG(LATEX, latex)
-AC_PATH_PROG(GZIP, gzip)
-AC_PATH_PROG(BZIP, bzip2)
-AC_PATH_PROG(TAR, tar)
-AC_PATH_PROG(BASENAME, basename)
-
-AC_PATH_PROG(PERL, perl5.8)
-AC_PATH_PROG(PERL, perl5)
-AC_PATH_PROG(PERL, perl)
-
 AC_PATH_PROG(GPERF, gperf)
 if test -z "$GPERF"; then
-   AC_MSG_ERROR([we need gperf, the GNU perfect hash generator])
+   AC_MSG_ERROR([gperf, the GNU perfect hash generator, must be in your PATH, check the README])
 fi
 
-GUNZIP="$GZIP -c"
-BUNZIP="$BZIP -c"
-
-if test -z "$COMPRESS" -a -z "$GZIP" -a -z "$BZIP" ; then
-	echo "Unable to find either compress, bzip2,  or gzip - hope you don't plan on compressing";
-	echo "any files.";
-fi;
-
-dnl nsl, socket may be needed for the X-windowing system, so check
-dnl for them before before checking for X.
-AC_CHECK_LIB(nsl, main)
-AC_CHECK_LIB(socket, main)
+AC_PATH_PROG(RSYNC, rsync)
+if test -z "$RSYNC"; then
+   AC_MSG_ERROR([rsync must be in your PATH, check the README])
+fi
 
-dnl Checks for libraries.
-AC_CHECK_LIB(m, main)
-AC_CHECK_LIB(png, main,  AC_DEFINE(HAVE_LIBPNG,[],[Define if libpng is available]) X11LIBS="$X11LIBS -lpng", , $X11LIBS )
+AC_PATH_PROG(OPTIPNG, optipng)
+if test -z "$OPTIPNG"; then
+   AC_MSG_ERROR([optipng must be in your PATH, check the README])
+fi
 
-dnl png has a dependency in some cases on libz - if we have it, can't really
-dnl be harmful to link it in.
-AC_CHECK_LIB(z, main,  AC_DEFINE(HAVE_LIBZ,[],[Define if libz is available]) X11LIBS="$X11LIBS -lz", , $X11LIBS )
+AC_PATH_PROG(IDENTIFY, identify)
+if test -z "$IDENTIFY"; then
+   AC_MSG_ERROR([ImageMagick 'identify' must be in your PATH, check the README])
+fi
 
-dnl Misc libraries.
-AC_CHECK_LIB(crypt, main)
-AC_CHECK_LIB(des, des_crypt)
+AC_PATH_PROG(CONVERT, convert)
+if test -z "$CONVERT"; then
+   AC_MSG_ERROR([ImageMagick 'convert' must be in your PATH, check the README])
+fi
 
-dnl Checks for header files.
-AC_CHECK_HEADERS(crypt.h des.h)
+AC_PATH_PROG(PERL, perl5.8)
+if test -z "$PERL"; then
+   AC_PATH_PROG(PERL, perl5)
+   if test -z "$PERL"; then
+      AC_PATH_PROG(PERL, perl)
+      if test -z "$PERL"; then
+         AC_MSG_ERROR([perl 5.8 or higher must be in your PATH, check the README])
+      fi
+   fi
+fi
 
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_INLINE
+for module_vers in "Image::Size 2.992" "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_CHECK_SIZEOF(long)
-AC_CHECK_SIZEOF(long long)
+AC_LANG(C++)
+AC_PROG_CXX
+AC_PROG_CPP
 
-dnl Checks for library functions.
-AC_PROG_GCC_TRADITIONAL
-AC_TYPE_SIGNAL
+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)
 
@@ -100,31 +82,16 @@
    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_DEFINE_UNQUOTED(COMPRESS,"${COMPRESS}",[Path to the compress binary])
-AC_DEFINE_UNQUOTED(UNCOMPRESS,"${UNCOMPRESS}",[Path to the uncompress binary])
-AC_DEFINE_UNQUOTED(GZIP,"${GZIP}",[Path to the gzip binary])
-AC_DEFINE_UNQUOTED(GUNZIP,"${GUNZIP}",[Path to the gunzip binary])
-AC_DEFINE_UNQUOTED(BZIP,"${BZIP}",[Path to the bzip binary])
-AC_DEFINE_UNQUOTED(BUNZIP,"${BUNZIP}",[Path to the bunzip binary])
+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
 
-for module in Coro Event IO::AIO Storable Time::HiRes YAML::Syck; do
-   AC_MSG_CHECKING(for $module perl module)
-   if $PERL -M$module -e0 >/dev/null 2>&1; then
-      version=`$PERL -M$module -e "print \\$$module::VERSION"`
-      AC_MSG_RESULT([ok, version $version])
-   else
-      AC_MSG_ERROR([no, cannot load module $module])
-   fi
-done
+AC_PROG_LIBTOOL
 
 AC_MSG_CHECKING(for $PERL suitability)
 if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>&1; then
@@ -157,18 +124,32 @@
      AC_MSG_ERROR([no, unable to link])
   fi
 else
-  AC_MSG_ERROR([no working perl found, or perl not version >= 5.8)])
+  AC_MSG_ERROR([no working perl found, or perl not version >= 5.8])
 fi
 AC_SUBST(PERLLIB)
 AC_SUBST(PERLFLAGS)
 AC_SUBST(PERLPRIVLIBEXP)
 AC_SUBST(PERL)
 
+dnl check for some other programs
+AC_PATH_PROG(TAR, tar)
+AC_PATH_PROG(BASENAME, basename)
+
+AC_CHECK_LIB(nsl, main)
+AC_CHECK_LIB(socket, main)
+
+dnl Checks for libraries.
+AC_CHECK_LIB(m, main)
+
+AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF(long long)
+
+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 utils/cfutil
 ])