Port: use a separate variable for elfutils libs

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/cli/Makefile.am b/cli/Makefile.am
index 195c878ad0b748a001a8a0e62a352370c49bc8dd..ef5a19aacac0ce2c6d69e6c9034aa7823a07356f 100644 (file)
--- a/cli/Makefile.am
+++ b/cli/Makefile.am
@@ -72,6 +72,7 @@ babeltrace_bin_LDFLAGS += $(call pluginarchive,utils)
 
 if ENABLE_DEBUG_INFO
 babeltrace_bin_LDFLAGS += $(call pluginarchive,lttng-utils)
+babeltrace_bin_LDADD += $(ELFUTILS_LIBS)
 endif
 endif
 

diff --git a/configure.ac b/configure.ac
index 1fba17f4ccd84b21bfa0ad644572c49899c7f294..b9bb6b47423aa58885ac1d699059d886ebcd5233 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -587,11 +587,13 @@ AS_IF([test "x$enable_python_bindings_tests" = xyes],
 AS_IF([test "x$enable_debug_info" = xyes],
   [
     # Check if libelf and libdw are present
-    AC_CHECK_LIB([elf], [elf_version], [], [AC_MSG_ERROR(Missing libelf (from elfutils >= 0.154) which is required by debug info. You can disable this feature using --disable-debug-info.)])
-    AC_CHECK_LIB([dw], [dwarf_begin], [], [AC_MSG_ERROR(Missing libdw (from elfutils >= 0.154) which is required by debug info. You can disable this feature using --disable-debug-info.)])
+    AC_CHECK_LIB([elf], [elf_version], [:], [AC_MSG_ERROR(Missing libelf (from elfutils >= 0.154) which is required by debug info. You can disable this feature using --disable-debug-info.)])
+    AC_CHECK_LIB([dw], [dwarf_begin], [:], [AC_MSG_ERROR(Missing libdw (from elfutils >= 0.154) which is required by debug info. You can disable this feature using --disable-debug-info.)])
     BT_LIB_ELFUTILS([0], [154], [:], [AC_MSG_ERROR(elfutils >= 0.154 is required to use the debug info feature. You can disable this feature using --disable-debug-info.)])
+    ELFUTILS_LIBS="-lelf -ldw"
   ]
 )
+AC_SUBST([ELFUTILS_LIBS])
 
 AS_IF([test "x$enable_api_doc" = "xyes"],
   [

diff --git a/plugins/lttng-utils/Makefile.am b/plugins/lttng-utils/Makefile.am
index 0a01610fd00b905232ea72c438fd10919112000d..72c7331102681187de36228bd9f23737e7bf2fdb 100644 (file)
--- a/plugins/lttng-utils/Makefile.am
+++ b/plugins/lttng-utils/Makefile.am
@@ -27,7 +27,7 @@ babeltrace_plugin_lttng_utils_la_SOURCES = \
 babeltrace_plugin_lttng_utils_la_LDFLAGS = \
        $(LT_NO_UNDEFINED) \
        -avoid-version -module \
-       -lelf -ldw
+       $(ELFUTILS_LIBS)
 
 if !ENABLE_BUILT_IN_PLUGINS
 babeltrace_plugin_lttng_utils_la_LIBADD = \