From 306049bcfe82391780b13d570fb990da86aae63b Mon Sep 17 00:00:00 2001 From: Bart van Strien Date: Wed, 19 Aug 2015 16:12:14 +0200 Subject: [PATCH] Move and manually include c++11 m4 file to work around old aclocal versions --- platform/unix/configure.ac | 5 ++++- platform/unix/{m4 => }/cpp11.m4 | 0 2 files changed, 4 insertions(+), 1 deletion(-) rename platform/unix/{m4 => }/cpp11.m4 (100%) diff --git a/platform/unix/configure.ac b/platform/unix/configure.ac index 836091eb8..2ea733377 100644 --- a/platform/unix/configure.ac +++ b/platform/unix/configure.ac @@ -17,12 +17,15 @@ PKG_PROG_PKG_CONFIG AC_C_BIGENDIAN AC_LANG([C++]) +dnl Workaround for old aclocal versions +m4_include([platform/unix/cpp11.m4]) + includes= AC_DEFUN([LOVE_MSG_ERROR], [AC_MSG_ERROR([LÖVE needs "$1"[,] please install "$1" with development files and try again])]) -# C++11 support in m4/cpp11.m4 +# C++11 support in cpp11.m4 ACLOVE_CPP11_TEST # Allow people on OSX to use autotools, they need their platform files diff --git a/platform/unix/m4/cpp11.m4 b/platform/unix/cpp11.m4 similarity index 100% rename from platform/unix/m4/cpp11.m4 rename to platform/unix/cpp11.m4