From ebb9f8ffff8bf3a922073143bd16825140450b98 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Mon, 3 Oct 2016 11:15:21 -0400 Subject: [PATCH] build: check for CXX_WORKS for cmake example Tracepoints and tracepoint provider compilation need a functional c++ compiler (g++ > 4.7). Signed-off-by: Jonathan Rajotte Signed-off-by: Mathieu Desnoyers --- configure.ac | 1 - doc/examples/Makefile.am | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index a59758e8..82ea5dc2 100644 --- a/configure.ac +++ b/configure.ac @@ -80,7 +80,6 @@ AM_CONDITIONAL([NO_SHARED], [test "x$enable_shared" = "xno"]) # Checks for programs. AC_PROG_CC AC_PROG_CXX -AM_CONDITIONAL([HAVE_CXX], [test "x$CXX" != "x"]) AC_CHECK_PROG([HAVE_CMAKE], [cmake], ["yes"]) AM_CONDITIONAL([HAVE_CMAKE], [test "x$HAVE_CMAKE" = "xyes"]) AC_PROG_MAKE_SET diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 5d67e791..424b8440 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -34,7 +34,7 @@ dist_doc_examples_python_DATA = python/hello.py endif if HAVE_CMAKE -if HAVE_CXX +if CXX_WORKS SUBDIRS_CMAKE = cmake-multiple-shared-libraries endif endif -- 2.34.1