From c8028ff36b7ae5ac7b498b9929cb36a66bcc65cf Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Wed, 11 Sep 2019 10:52:43 +0900 Subject: [PATCH] Imported Upstream version 0.9.8 --- Makefile.am | 3 +- NEWS | 8 ++ README | 7 ++ configure.ac | 2 +- macros/mm-ax_cxx_compile_stdcxx_11.m4 | 171 ++++++++++++++++++++++++++++++++++ skeletonmm/configure.ac | 2 + 6 files changed, 191 insertions(+), 2 deletions(-) create mode 100644 macros/mm-ax_cxx_compile_stdcxx_11.m4 diff --git a/Makefile.am b/Makefile.am index 8db5e8b..caf0cb2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,10 +29,11 @@ dist_build_support_DATA = \ build/doc-reference.am \ build/generate-binding.am -# These are installed so that mm-common-prepare can copy them into projects at autogen.sh time: +# These are installed so that aclocal can copy them into aclocal.m4 at autogen.sh time: aclocal_macrodir = $(datadir)/aclocal aclocal_macro_DATA = macros/mm-common.m4 dist_aclocal_macro_DATA = \ + macros/mm-ax_cxx_compile_stdcxx_11.m4 \ macros/mm-dietlib.m4 \ macros/mm-doc.m4 \ macros/mm-module.m4 \ diff --git a/NEWS b/NEWS index e6a97c1..7cf2546 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,11 @@ +mm-common 0.9.8 (2015-07-15) + + * Add the MM_AX_CXX_COMPILE_STDCXX_11() m4 macro, + to help other *mm projects build with C++11 compiler support. + This is based on AX_CXX_COMPILE_STDCXX_11() but doesn't need to + be copied into projects manually. + (Kjell Ahlstedt) Bug #751432 + mm-common 0.9.7 (2014-09-15) * Add doxygen-extra.css, deprecate doxygen.css. diff --git a/README b/README index aa5db10..a50fc0e 100644 --- a/README +++ b/README @@ -113,6 +113,13 @@ macros/mm-dietlib.m4: binary size of the generated binding library, typically for embedded use. The MM_PROG_GCC_VISIBILITY macro is defined in this file as well. +macros/mm-ax_cxx_compile_stdcxx_11.m4: + Implements the MM_AX_CXX_COMPILE_STDCXX_11() macro to test and set flags + for C++11 compatibility of the C++ compiler. This is identical to the + AX_CXX_COMPILE_STDCXX_11() macro described at + http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html, + except for the MM_ prefix. + Automake include files ---------------------- diff --git a/configure.ac b/configure.ac index 62e881e..498ae52 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ ## You should have received a copy of the GNU General Public License ## along with mm-common. If not, see . -AC_INIT([mm-common], [0.9.7], [https://bugzilla.gnome.org/enter_bug.cgi?product=mm-common], +AC_INIT([mm-common], [0.9.8], [https://bugzilla.gnome.org/enter_bug.cgi?product=mm-common], [mm-common], [http://www.gtkmm.org/]) AC_PREREQ([2.59]) AC_CONFIG_SRCDIR([util/mm-common-prepare.in]) diff --git a/macros/mm-ax_cxx_compile_stdcxx_11.m4 b/macros/mm-ax_cxx_compile_stdcxx_11.m4 new file mode 100644 index 0000000..47aa97a --- /dev/null +++ b/macros/mm-ax_cxx_compile_stdcxx_11.m4 @@ -0,0 +1,171 @@ +# ============================================================================ +# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html +# ============================================================================ +# +# SYNOPSIS +# +# MM_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 +# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov +# +# 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. + +# Copied from ax_cxx_compile_stdcxx_11.m4 and added MM_ prefix to avoid +# possible conflict with AX_CXX_COMPILE_STDCXX_11 in other modules. + +#serial 11 + +m4_define([_MM_AX_CXX_COMPILE_STDCXX_11_testbody], [[ + template + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + struct Base { + virtual void f() {} + }; + struct Child : public Base { + virtual void f() override {} + }; + + 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; + auto l = [](){}; + // Prevent Clang error: unused variable 'l' [-Werror,-Wunused-variable] + struct use_l { use_l() { l(); } }; + + // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae + // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function because of this + namespace test_template_alias_sfinae { + struct foo {}; + + template + using member = typename T::member_type; + + template + void func(...) {} + + template + void func(member*) {} + + void test(); + + void test() { + func(0); + } + } +]]) + +AC_DEFUN([MM_AX_CXX_COMPILE_STDCXX_11], [dnl + m4_if([$1], [], [], + [$1], [ext], [], + [$1], [noext], [], + [m4_fatal([invalid argument `$1' to MM_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 MM_AX_CXX_COMPILE_STDCXX_11])]) + 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([_MM_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([_MM_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 + dnl HP's aCC needs +std=c++11 according to: + dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf + for switch in -std=c++11 -std=c++0x +std=c++11; 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([_MM_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/skeletonmm/configure.ac b/skeletonmm/configure.ac index d6fb6b8..9eaafe8 100644 --- a/skeletonmm/configure.ac +++ b/skeletonmm/configure.ac @@ -40,6 +40,8 @@ MM_CONFIG_DOCTOOL_DIR([doc]) AC_SUBST([SKELETONMM_SO_VERSION], [0:0:0]) AC_PROG_CXX +MM_AX_CXX_COMPILE_STDCXX_11([noext],[mandatory]) + AC_DISABLE_STATIC AC_LIBTOOL_WIN32_DLL AC_PROG_LIBTOOL -- 2.7.4