mirror of
https://github.com/alexkay/spek.git
synced 2025-06-20 00:34:16 +03:00
Simplify the C++11 check
This commit is contained in:
parent
967c7aaeb8
commit
69d400e34c
@ -6,9 +6,8 @@ AM_SILENT_RULES([yes])
|
|||||||
|
|
||||||
AC_LANG([C++])
|
AC_LANG([C++])
|
||||||
AC_PROG_CXX([clang++ g++])
|
AC_PROG_CXX([clang++ g++])
|
||||||
|
CXXFLAGS="$CXXFLAGS -std=gnu++11"
|
||||||
AC_PROG_CXXCPP
|
AC_PROG_CXXCPP
|
||||||
m4_include([m4/ax_cxx_compile_stdcxx_11.m4])
|
|
||||||
AX_CXX_COMPILE_STDCXX_11()
|
|
||||||
AC_PROG_RANLIB
|
AC_PROG_RANLIB
|
||||||
AC_PROG_INSTALL
|
AC_PROG_INSTALL
|
||||||
IT_PROG_INTLTOOL([0.40.0])
|
IT_PROG_INTLTOOL([0.40.0])
|
||||||
|
4
dist/debian/copyright
vendored
4
dist/debian/copyright
vendored
@ -15,10 +15,6 @@ Copyright:
|
|||||||
For everything not noted below:
|
For everything not noted below:
|
||||||
Copyright (C) 2010-2013 Alexander Kojevnikov
|
Copyright (C) 2010-2013 Alexander Kojevnikov
|
||||||
|
|
||||||
For m4/ax_cxx_compile_stdcxx_11.m4:
|
|
||||||
Copyright (C) 2008 Benjamin Kosnik
|
|
||||||
Copyright (C) 2012 Zack Weinberg
|
|
||||||
|
|
||||||
For src/spek-pipeline.c:
|
For src/spek-pipeline.c:
|
||||||
Copyright (C) 2010-2012 Alexander Kojevnikov
|
Copyright (C) 2010-2012 Alexander Kojevnikov
|
||||||
Copyright (C) 2007-2009 Sebastian Dröge
|
Copyright (C) 2007-2009 Sebastian Dröge
|
||||||
|
2
dist/osx/README.md
vendored
2
dist/osx/README.md
vendored
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Using [MacPorts](http://www.macports.org/) install build dependencies:
|
Using [MacPorts](http://www.macports.org/) install build dependencies:
|
||||||
|
|
||||||
port install git-core autoconf automake intltool upx yasm.
|
port install autoconf automake clang-3.2 git-core intltool upx yasm.
|
||||||
|
|
||||||
Download and build wxWidgets 2.9+, example configure flags:
|
Download and build wxWidgets 2.9+, example configure flags:
|
||||||
|
|
||||||
|
@ -1,107 +0,0 @@
|
|||||||
# ============================================================================
|
|
||||||
# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
|
|
||||||
# ============================================================================
|
|
||||||
#
|
|
||||||
# SYNOPSIS
|
|
||||||
#
|
|
||||||
# AX_CXX_COMPILE_STDCXX_11([ext|noext])
|
|
||||||
#
|
|
||||||
# DESCRIPTION
|
|
||||||
#
|
|
||||||
# Check for baseline language coverage in the compiler for the C++11
|
|
||||||
# standard; if necessary, add switches to CXXFLAGS to enable support.
|
|
||||||
# Errors out if no mode that supports C++11 baseline syntax can be found.
|
|
||||||
# The 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.
|
|
||||||
#
|
|
||||||
# LICENSE
|
|
||||||
#
|
|
||||||
# Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
|
|
||||||
# Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
|
|
||||||
#
|
|
||||||
# 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 1
|
|
||||||
|
|
||||||
m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [
|
|
||||||
template <typename T>
|
|
||||||
struct check
|
|
||||||
{
|
|
||||||
static_assert(sizeof(int) <= sizeof(T), "not big enough");
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef check<check<bool>> right_angle_brackets;
|
|
||||||
|
|
||||||
int a;
|
|
||||||
decltype(a) b;
|
|
||||||
|
|
||||||
typedef check<int> check_type;
|
|
||||||
check_type c;
|
|
||||||
check_type&& cr = static_cast<check_type&&>(c);
|
|
||||||
])
|
|
||||||
|
|
||||||
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
|
|
||||||
AC_LANG_ASSERT([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])
|
|
||||||
|
|
||||||
if test x$ac_success = xno; then
|
|
||||||
AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.])
|
|
||||||
fi
|
|
||||||
])
|
|
Loading…
x
Reference in New Issue
Block a user