Mirror of the lttng-dev mailing list
 help / color / mirror / Atom feed
* [lttng-dev] [PATCH lttng-ust] build: check for CXX_WORKS for cmake example
@ 2016-10-03 15:15 Jonathan Rajotte
  2016-10-03 16:14 ` Mathieu Desnoyers
  0 siblings, 1 reply; 2+ messages in thread
From: Jonathan Rajotte @ 2016-10-03 15:15 UTC (permalink / raw)


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



^ permalink raw reply	[flat|nested] 2+ messages in thread

* [lttng-dev] [PATCH lttng-ust] build: check for CXX_WORKS for cmake example
  2016-10-03 15:15 [lttng-dev] [PATCH lttng-ust] build: check for CXX_WORKS for cmake example Jonathan Rajotte
@ 2016-10-03 16:14 ` Mathieu Desnoyers
  0 siblings, 0 replies; 2+ messages in thread
From: Mathieu Desnoyers @ 2016-10-03 16:14 UTC (permalink / raw)


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


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-10-03 16:14 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-03 15:15 [lttng-dev] [PATCH lttng-ust] build: check for CXX_WORKS for cmake example Jonathan Rajotte
2016-10-03 16:14 ` Mathieu Desnoyers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox