From 28de170c3e2ef93d38009da5e6715081e96ca7d0 Mon Sep 17 00:00:00 2001 From: Michal Bukovsky Date: Fri, 10 Oct 2014 10:20:21 +0200 Subject: [PATCH 1/2] add NDEBUG due to assert for non debug builds --- configure.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in index aed0f67..85c097f 100644 --- a/configure.in +++ b/configure.in @@ -106,11 +106,11 @@ AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug], [Enable the debuging log case "${enableval}" in no) AC_MSG_NOTICE([disabling debug log.]) - CPPFLAGS="${CPPFLAGS} -UDEBUG" + CPPFLAGS="${CPPFLAGS} -UDEBUG -DNDEBUG=1" ;; yes) AC_MSG_NOTICE([enabling debug log.]) - CPPFLAGS="${CPPFLAGS} -DDEBUG=1" + CPPFLAGS="${CPPFLAGS} -DDEBUG=1 -UNDEBUG" ;; *) AC_MSG_ERROR([Say yes or no to --enable-debug.]) @@ -118,8 +118,8 @@ AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug], [Enable the debuging log esac ], [AS_IF([test x$enable_optimization == xyes], - [CPPFLAGS="${CPPFLAGS} -UDEBUG"], - [CPPFLAGS="${CPPFLAGS} -DDEBUG=1"]) + [CPPFLAGS="${CPPFLAGS} -UDEBUG -DNDEBUG=1"], + [CPPFLAGS="${CPPFLAGS} -DDEBUG=1 -UNDEBUG"]) ]) # check pkgconfig From cf3f18e26749d8cf6e43ee740dcdb9f82051ccb1 Mon Sep 17 00:00:00 2001 From: Michal Bukovsky Date: Thu, 23 Jul 2015 09:53:19 +0200 Subject: [PATCH 2/2] c++11 is allowed by default and can be disabled by --disable-cxx11 --- Makefile.am | 2 + configure.in => configure.ac | 27 ++++++- m4/ax_cxx_compile_stdcxx_11.m4 | 133 +++++++++++++++++++++++++++++++++ src/Makefile.am | 2 + 4 files changed, 163 insertions(+), 1 deletion(-) rename configure.in => configure.ac (88%) create mode 100644 m4/ax_cxx_compile_stdcxx_11.m4 diff --git a/Makefile.am b/Makefile.am index 8d4dc13..6d2bed3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,6 +14,8 @@ # 2012-09-16 (bukovsky) # First version +ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = src doc \ include/mcache/pool \ include/mcache/hash \ diff --git a/configure.in b/configure.ac similarity index 88% rename from configure.in rename to configure.ac index 85c097f..4cfc9cc 100644 --- a/configure.in +++ b/configure.ac @@ -26,8 +26,11 @@ AM_SILENT_RULES([yes]) # install autotools scripts to build-aux dir AC_CONFIG_AUX_DIR([build-aux]) +# macros from http://www.gnu.org/software/autoconf-archive/The-Macros.html +AC_CONFIG_MACRO_DIR([m4]) + # initialize automake(use AC_INIT's arguments) -AM_INIT_AUTOMAKE(-Wall foreign color-tests) +AM_INIT_AUTOMAKE(-Wall -Wno-portability foreign color-tests) # tell autoconf where to find sources AC_CONFIG_SRCDIR([src/mcache.cc]) @@ -122,6 +125,28 @@ AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug], [Enable the debuging log [CPPFLAGS="${CPPFLAGS} -DDEBUG=1 -UNDEBUG"]) ]) +AC_ARG_ENABLE(cxx11, AS_HELP_STRING([--enable-cxx11], [compile with c++11 standard]), [ + case "${enableval}" in + no) + AC_MSG_NOTICE([disabling c++11.]) + CXX11="optional" + ;; + yes) + AC_MSG_NOTICE([enabling c++11.]) + CXX11="mandatory" + ;; + *) + AC_MSG_ERROR([Say yes or no to --enable-cxx11.]) + ;; + esac +], [ + CXX11="mandatory" +]) + +AS_IF([test x$CXX11 == xmandatory], [ +AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])], [ +AX_CXX_COMPILE_STDCXX_11([noext], [optional])]) + # check pkgconfig PKG_PROG_PKG_CONFIG diff --git a/m4/ax_cxx_compile_stdcxx_11.m4 b/m4/ax_cxx_compile_stdcxx_11.m4 new file mode 100644 index 0000000..af37acd --- /dev/null +++ b/m4/ax_cxx_compile_stdcxx_11.m4 @@ -0,0 +1,133 @@ +# ============================================================================ +# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html +# ============================================================================ +# +# SYNOPSIS +# +# AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional]) +# +# DESCRIPTION +# +# Check for baseline language coverage in the compiler for the C++11 +# standard; if necessary, add switches to CXXFLAGS to enable support. +# +# The first argument, if specified, indicates whether you insist on an +# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. +# -std=c++11). If neither is specified, you get whatever works, with +# preference for an extended mode. +# +# The second argument, if specified 'mandatory' or if left unspecified, +# indicates that baseline C++11 support is required and that the macro +# should error out if no mode with that support is found. If specified +# 'optional', then configuration proceeds regardless, after defining +# HAVE_CXX11 if and only if a supporting mode is found. +# +# LICENSE +# +# Copyright (c) 2008 Benjamin Kosnik +# Copyright (c) 2012 Zack Weinberg +# Copyright (c) 2013 Roy Stogner +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [ + template + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + typedef check> right_angle_brackets; + + int a; + decltype(a) b; + + typedef check check_type; + check_type c; + check_type&& cr = static_cast(c); + + auto d = a; +]) + +AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl + m4_if([$1], [], [], + [$1], [ext], [], + [$1], [noext], [], + [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])dnl + m4_if([$2], [], [ax_cxx_compile_cxx11_required=true], + [$2], [mandatory], [ax_cxx_compile_cxx11_required=true], + [$2], [optional], [ax_cxx_compile_cxx11_required=false], + [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])])dnl + AC_LANG_PUSH([C++])dnl + ac_success=no + AC_CACHE_CHECK(whether $CXX supports C++11 features by default, + ax_cv_cxx_compile_cxx11, + [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], + [ax_cv_cxx_compile_cxx11=yes], + [ax_cv_cxx_compile_cxx11=no])]) + if test x$ax_cv_cxx_compile_cxx11 = xyes; then + ac_success=yes + fi + + m4_if([$1], [noext], [], [dnl + if test x$ac_success = xno; then + for switch in -std=gnu++11 -std=gnu++0x; do + cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch]) + AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch, + $cachevar, + [ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS $switch" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], + [eval $cachevar=yes], + [eval $cachevar=no]) + CXXFLAGS="$ac_save_CXXFLAGS"]) + if eval test x\$$cachevar = xyes; then + CXXFLAGS="$CXXFLAGS $switch" + ac_success=yes + break + fi + done + fi]) + + m4_if([$1], [ext], [], [dnl + if test x$ac_success = xno; then + for switch in -std=c++11 -std=c++0x; do + cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch]) + AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch, + $cachevar, + [ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS $switch" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], + [eval $cachevar=yes], + [eval $cachevar=no]) + CXXFLAGS="$ac_save_CXXFLAGS"]) + if eval test x\$$cachevar = xyes; then + CXXFLAGS="$CXXFLAGS $switch" + ac_success=yes + break + fi + done + fi]) + AC_LANG_POP([C++]) + if test x$ax_cxx_compile_cxx11_required = xtrue; then + if test x$ac_success = xno; then + AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.]) + fi + else + if test x$ac_success = xno; then + HAVE_CXX11=0 + AC_MSG_NOTICE([No compiler with C++11 support was found]) + else + HAVE_CXX11=1 + AC_DEFINE(HAVE_CXX11,1, + [define if the compiler supports basic C++11 syntax]) + fi + + AC_SUBST(HAVE_CXX11) + fi +]) diff --git a/src/Makefile.am b/src/Makefile.am index 4ae0282..4a68a4e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,6 +20,8 @@ gitver = $(shell git describe --all --dirty --long --abbrev=40) AM_CPPFLAGS = -DGIT_REVISION="\"Configure=@GIT_REVISION@,Make=$(gitver)\"" \ -DGIT_REVISION_N="\"$(gitver)\"" \ -I@top_builddir@ -I@top_srcdir@/src -I$(top_srcdir)/include \ + -DBOOST_ASIO_DISABLE_MOVE -DBOOST_ASIO_DISABLE_STD_ARRAY \ + -DBOOST_ASIO_DISABLE_STD_ATOMIC -DBOOST_ASIO_DISABLE_STD_CHRONO \ @LIBTBB_CFLAGS@