Module: check_mk
Branch: master
Commit: c10f29cdacdcf5cd5e51582c6426ae142ad47a05
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c10f29cdacdcf5…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Thu May 19 10:02:10 2016 +0200
Check for GCC 6, too.
As a nice side effect, this tests our CI environment, too. :-)
---
livestatus/configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/livestatus/configure.ac b/livestatus/configure.ac
index 296efa5..e7b2151 100644
--- a/livestatus/configure.ac
+++ b/livestatus/configure.ac
@@ -35,12 +35,12 @@ AC_CONFIG_SRCDIR([config.h.in])
AC_CONFIG_HEADER([config.h])
# Checks for programs.
-AC_PROG_CC([gcc-5 clang-3.9 clang-3.8 clang-3.7 clang-3.6 clang-3.5 gcc-4.9 gcc clang])
+AC_PROG_CC([gcc-6 gcc-5 clang-3.9 clang-3.8 clang-3.7 clang-3.6 clang-3.5 gcc-4.9 gcc
clang])
AC_PROG_CC_C99([], [])
if test "x$ac_cv_prog_cc_c99" = xno; then
AC_MSG_ERROR([Need a C99-compliant C compiler])
fi
-AC_PROG_CXX([g++-5 clang++-3.9 clang++-3.8 clang++-3.7 clang++-3.6 clang++-3.5 g++-4.9
g++ clang++])
+AC_PROG_CXX([g++-6 g++-5 clang++-3.9 clang++-3.8 clang++-3.7 clang++-3.6 clang++-3.5
g++-4.9 g++ clang++])
AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory])
AC_PROG_RANLIB
AM_CONDITIONAL([HAVE_DIET], [which diet >/dev/null 2>&1])