--- deliantra/server/configure.ac	2007/01/18 16:19:33	1.40
+++ deliantra/server/configure.ac	2007/01/18 17:54:49	1.41
@@ -10,10 +10,67 @@
 
 AC_PREFIX_DEFAULT(/usr/games/crossfire)
 
+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
+
 AC_PATH_PROG(PERL, perl5.8)
 AC_PATH_PROG(PERL, perl5)
 AC_PATH_PROG(PERL, perl)
 
+AC_MSG_CHECKING(for $PERL suitability)
+if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>&1; then
+  save_CXXFLAGS="$CXXFLAGS"
+  save_LIBS="$LIBS"
+  xPERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`"
+  xPERLFLAGS="$xPERLFLAGS `$PERL -MEvent::MakeMaker -e 'print +{&Event::MakeMaker::event_args}->{INC}'`"
+  xPERLFLAGS="$xPERLFLAGS `$PERL -MCoro::MakeMaker -e 'print +{&Coro::MakeMaker::coro_args}->{INC}'`"
+  CXXFLAGS="$CXXFLAGS $xPERLFLAGS"
+  LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"
+  AC_TRY_LINK([
+#include <EXTERN.h>
+#include <perl.h>
+#include <XSUB.h>
+#include "EventAPI.h"
+],[
+  PerlInterpreter *perl = perl_alloc ();
+],[perl_link=yes],[perl_link=no])
+  CXXFLAGS="$save_CXXFLAGS"
+  LIBS="$save_LIBS"
+
+  if test x$perl_link = xyes; then
+     AC_MSG_RESULT(ok)
+     AC_DEFINE(ENABLE_PERL, 1, Define if you can embed a perl interpreter)
+     PERLFLAGS="$xPERLFLAGS"
+     PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`"
+     PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`"
+     CPPFLAGS="$CPPFLAGS $PERLFLAGS"
+  else
+     AC_MSG_ERROR([no, unable to link])
+  fi
+else
+  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)
+
 for module_vers in "Coro 3.4" "Coro::Event 2.0" "Event 1.08" \
                    "IO::AIO 2.32" "Storable 2.0" "Time::HiRes 1.0" "YAML::Syck 0.71" \
                    "Digest::MD5 2.0" "Compress::LZF 1.7" "Safe::Hole 0.10"; do
@@ -33,27 +90,6 @@
    fi
 done
 
-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
-
-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)
@@ -74,29 +110,17 @@
 	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)
 
 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 )
 
-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 )
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_INLINE
+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)
 
-dnl Checks for library functions.
-AC_PROG_GCC_TRADITIONAL
-AC_TYPE_SIGNAL
-
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 
 AC_MSG_CHECKING(glib >= 2.10)
@@ -108,6 +132,15 @@
    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(x_includes)
 AC_SUBST(x_libraries)
 AC_SUBST(no_x)
@@ -124,44 +157,6 @@
 AC_DEFINE_UNQUOTED(BZIP,"${BZIP}",[Path to the bzip binary])
 AC_DEFINE_UNQUOTED(BUNZIP,"${BUNZIP}",[Path to the bunzip binary])
 
-AC_MSG_CHECKING(for $PERL suitability)
-if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>&1; then
-  save_CXXFLAGS="$CXXFLAGS"
-  save_LIBS="$LIBS"
-  xPERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`"
-  xPERLFLAGS="$xPERLFLAGS `$PERL -MEvent::MakeMaker -e 'print +{&Event::MakeMaker::event_args}->{INC}'`"
-  xPERLFLAGS="$xPERLFLAGS `$PERL -MCoro::MakeMaker -e 'print +{&Coro::MakeMaker::coro_args}->{INC}'`"
-  CXXFLAGS="$CXXFLAGS $xPERLFLAGS"
-  LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"
-  AC_TRY_LINK([
-#include <EXTERN.h>
-#include <perl.h>
-#include <XSUB.h>
-#include "EventAPI.h"
-],[
-  PerlInterpreter *perl = perl_alloc ();
-],[perl_link=yes],[perl_link=no])
-  CXXFLAGS="$save_CXXFLAGS"
-  LIBS="$save_LIBS"
-
-  if test x$perl_link = xyes; then
-     AC_MSG_RESULT(ok)
-     AC_DEFINE(ENABLE_PERL, 1, Define if you can embed a perl interpreter)
-     PERLFLAGS="$xPERLFLAGS"
-     PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`"
-     PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`"
-     CPPFLAGS="$CPPFLAGS $PERLFLAGS"
-  else
-     AC_MSG_ERROR([no, unable to link])
-  fi
-else
-  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)
-
 AC_OUTPUT([Makefile
 	include/Makefile lib/Makefile pod/Makefile random_maps/Makefile socket/Makefile
 	server/Makefile src/Makefile utils/Makefile ext/Makefile