From 4a7c2f0d6f74a93ec37672bd232875cde1b3dfc9 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Sat, 8 Jul 2017 11:36:55 +1200 Subject: [PATCH] Probe for options required to enable C++11 support At this point it seems reasonable to assume the C++ compiler can support C++11 (Debian wheezy and Ubuntu trusty both have a recent enough GCC), so we just need to probe for any options required to enable this. Fixes building 1.2.31 with GCC < 6, reported by Wookey. --- INSTALL | 5 +++-- Makefile.am | 2 ++ configure.ac | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/INSTALL b/INSTALL index 69cdf89e..f4486c5a 100644 --- a/INSTALL +++ b/INSTALL @@ -18,8 +18,9 @@ follow their build instructions. IMPORTANT: You must enable OpenGL support by adding --with-opengl to the configure command line, and you probably want to use --enable-unicode too. -You'll also need a working C and C++ compiler, and also the OpenGL development -libraries if these aren't pulled in by installing wxWidgets. +You'll also need a working C and C++ compiler (with support for C++11), and +also the OpenGL development libraries if these aren't pulled in by installing +wxWidgets. Then at a shell prompt, enter the following commands: diff --git a/Makefile.am b/Makefile.am index e3adc443..4e07ccae 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = . lib src doc tests # We never want to implicitly recurse into the vim subdirectory, but we still diff --git a/configure.ac b/configure.ac index 68e4b34c..3ef30c62 100644 --- a/configure.ac +++ b/configure.ac @@ -69,6 +69,9 @@ AC_PROG_CPP AC_PROG_CXX AC_PROG_CXXCPP +dnl Probe for any options needed to enable C++11 support. +AX_CXX_COMPILE_STDCXX_11 + AM_PROG_CC_C_O AC_LANG_C -- 2.11.4.GIT