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 b93d20968e515914fd64344e86ecfa6bce4ff504..a7ec5a511c2c97a9b7cd6950346c98b07891608f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -73,8 +73,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 c63679767d51c2f5d58431f3b08ca300361657d5..dc18d650ada80b802dd0864b678cf2fbee75ec67 100644 (file)
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -175,7 +175,7 @@ all-local:
                                AR="$(AR)" \
                                        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)" \