[lttng-dev] [PATCH lttng-tools] Fix: Conditionally disable overlap app test requiring shared libs support

Christian Babeux christian.babeux at efficios.com
Thu Feb 7 22:47:04 EST 2013


When building lttng-tools with shared library support explicitly
disabled (e.g.: ./configure --disable-shared), libtool fail with
a fatal error:

Making all in demo
  CC       tp.lo
  CC       tp2.lo
  CC       tp3.lo
  CC       demo.o
  CCLD     demo
  CCLD     liblttng-ust-provider-ust-tests-demo.la
  CCLD     liblttng-ust-provider-ust-tests-demo3.la
libtool: link: can not build a shared library
libtool: link: See the libtool documentation for more information.
libtool: link: Fatal configuration error.

The build should not fail because some tests require explicit shared
library support, instead they should be skipped. This can be accomplished
by detecting builds with no shared libs support with the NO_SHARED
Automake variable.

Signed-off-by: Christian Babeux <christian.babeux at efficios.com>
---
 tests/ust/overlap/demo/Makefile.am | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/ust/overlap/demo/Makefile.am b/tests/ust/overlap/demo/Makefile.am
index e354636..68b6e08 100644
--- a/tests/ust/overlap/demo/Makefile.am
+++ b/tests/ust/overlap/demo/Makefile.am
@@ -1,5 +1,10 @@
 AM_CFLAGS=-I$(srcdir)
-
+if NO_SHARED
+# Do not build this test if shared libraries support was
+# explicitly disabled.
+else
+# Force the shared flag on the noinst libraries since they are
+# only built static by default
 FORCE_SHARED_LIB_OPTIONS = -module -shared -avoid-version \
 						   -rpath $(abs_builddir)
 
@@ -30,3 +35,4 @@ endif
 
 noinst_SCRIPTS = demo-trace
 EXTRA_DIST = demo-trace
+endif
-- 
1.8.1.2




More information about the lttng-dev mailing list