From: Michael Jeanson <mjeanson@efficios.com>
Date: Thu, 18 Mar 2021 20:25:34 +0000 (-0400)
Subject: fix: use the configured cmake binary
X-Git-Tag: v2.11.4~6
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=d818a4baf26a1f545c7ef9807a00880deaf645c4;p=lttng-ust.git

fix: use the configured cmake binary

Use the configure cmake binary in the examples Makefile instead of a
direct call.

Change-Id: Idb66642345e551b427e359b9cd58f49aad2a8502
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/configure.ac b/configure.ac
index 16cdec74..2264e503 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,8 +72,8 @@ AC_PROG_GREP
 AC_PROG_LN_S
 AC_PROG_MKDIR_P
 AC_PROG_MAKE_SET
-AC_CHECK_PROG([HAVE_CMAKE], [cmake], ["yes"])
-AM_CONDITIONAL([HAVE_CMAKE], [test "x$HAVE_CMAKE" = "xyes"])
+AC_CHECK_PROG([CMAKE], [cmake])
+AM_CONDITIONAL([HAVE_CMAKE], [test "x$CMAKE" != "x"])
 
 # libtool link_all_deplibs fixup. See http://bugs.lttng.org/issues/321.
 AC_ARG_ENABLE([libtool-linkdep-fixup], [
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 9413ff12..e03824d9 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -147,7 +147,7 @@ all-local:
 				cd build && \
 				CC="$(CC)" \
 				CXX="$(CXX)" \
-				cmake \
+				$(CMAKE) \
 				-DCMAKE_INCLUDE_PATH="$(abs_top_srcdir)/include;$(abs_top_builddir)/include" \
 				-DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/liblttng-ust/.libs" \
 				-DCMAKE_C_FLAGS="$(AM_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)" \