--- deliantra/server/configure.ac 2012/10/31 15:09:13 1.182 +++ deliantra/server/configure.ac 2016/11/18 20:20:05 1.192 @@ -1,9 +1,10 @@ dnl Process this file with autoconf to produce a configure script., -AC_INIT([deliantra-server], [3.0], [support@deliantra.net]) +AC_INIT([deliantra-server], [3.1], [support@deliantra.net]) +dnl AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR(utils) AC_CONFIG_SRCDIR([server/cfperl.xs]) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([silent-rules subdir-objects foreign no-dist-gzip dist-xz]) AM_CONFIG_HEADER(include/autoconf.h) AM_MAINTAINER_MODE @@ -55,19 +56,18 @@ "AnyEvent::BDB 0" \ "BDB 1.8" \ "Compress::LZF 3.41" \ - "Coro 5.372" \ + "Coro 6" \ "Coro::EV 0" \ - "Deliantra 1.24" \ + "Deliantra 2.0" \ "Digest::MD5 2.0" \ - "EV 4.00" \ - "Guard 0.5" \ - "IO::AIO 3.3" \ + "EV 4" \ + "Guard 1" \ + "IO::AIO 4" \ "JSON::XS 2.01" \ "AnyEvent::IRC 0.6" \ "Pod::POM 0.27" \ "Safe::Hole 0.10" \ "Storable 2.0" \ - "Time::HiRes 1.0" \ "URI 1.35" \ "YAML::XS 0.32" \ ; do @@ -91,14 +91,19 @@ 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.])]) +AX_CXX_COMPILE_STDCXX_11([noext], [mandatory]) + +AX_CHECK_COMPILE_FLAG(-Wno-unused-result,[CXXFLAGS="$CXXFLAGS -Wno-unused-result"]) +AX_CHECK_COMPILE_FLAG(-Wno-narrowing,[CXXFLAGS="$CXXFLAGS -Wno-narrowing"]) + +AC_CHECK_HEADER(unordered_map,[],[AC_MSG_ERROR([Your compiler must support C++11 headers.])]) AC_CHECK_HEADER(pthread.h,[],[AC_MSG_ERROR([POSIX thread support is required.])]) AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -AC_MSG_CHECKING(blitz++ >= 0.9) -if $PKG_CONFIG blitz --atleast-version 0.9; then +AC_MSG_CHECKING(blitz++ >= 0.10) +if $PKG_CONFIG blitz --atleast-version 0.10; then CXXFLAGS="$CXXFLAGS `$PKG_CONFIG blitz --cflags`" LIBS="$LIBS `$PKG_CONFIG blitz --libs`" AC_MSG_RESULT(ok) @@ -106,7 +111,7 @@ AC_MSG_ERROR(no) fi -AC_MSG_CHECKING(glib >= 2.10) +AC_MSG_CHECKING(glib >= 2.32) 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`" @@ -219,9 +224,5 @@ 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 - common/Makefile utils/cfutil -]) +AC_OUTPUT([Makefile lib/Makefile utils/cfutil])