From mboxrd@z Thu Jan  1 00:00:00 1970
From: mathieu.desnoyers@efficios.com (Mathieu Desnoyers)
Date: Mon, 3 Oct 2016 16:14:00 +0000 (UTC)
Subject: [lttng-dev] [PATCH lttng-ust] build: check for CXX_WORKS for
	cmake example
In-Reply-To: <1475507721-6550-1-git-send-email-jonathan.rajotte-julien@efficios.com>
References: <1475507721-6550-1-git-send-email-jonathan.rajotte-julien@efficios.com>
Message-ID: <2098459617.43790.1475511240110.JavaMail.zimbra@efficios.com>

Merged into master, thanks!

Mathieu

----- On Oct 3, 2016, at 11:15 AM, Jonathan Rajotte jonathan.rajotte-julien at efficios.com wrote:

> Tracepoints and tracepoint provider compilation need a functional
> c++ compiler (g++ > 4.7).
> 
> Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien at efficios.com>
> ---
> configure.ac             | 1 -
> doc/examples/Makefile.am | 2 +-
> 2 files changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 4256f66..415388f 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 c7e5b68..0890c52 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.7.4

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com