Skip to contentSkip to conversation

Add --with-lttng-ust-prefix config option.

PATCH David Goulet 1 participant 1 message May 10, 2013 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

Hi Stefan,

This patch and "Add --version command-line option to lttng." where probably wrapped to 80 character by your mail client or something else making them "corrupted" for merging.

See below.

Stefan Seefeld:

Quoted 19 lines

This patch adds a configure option to the lttng-tools build system to support lttng-ust being installed in a non-default location. While configure.ac indicated to use "LDFLAGS=-L<prefix>/lib" for this, in reality this doesn't work since the include search path needs to be adjusted as well. The patch sets both of these by means of a single new config option.

---
 configure.ac | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
configure.ac +0 -0
index 4f85fc1..5b37780 100644
@@ -163,6 +163,15 @@ AC_CHECK_DECL([caa_likely], [],
     [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])],
Quoted 1 line

[[#include <urcu.h>]]

For instance, here the include should be on the first line. More below.

Can you resend one without wrapping the lines?

Thanks!
David

Quoted 29 lines

)

configure.ac +9 -0
+AC_ARG_WITH(lttng-ust-prefix,
+  AS_HELP_STRING([--with-lttng-ust-prefix=PATH],
+                 [Specify the installation prefix of the lttng-ust library.
+              Headers must be in PATH/include; libraries in PATH/lib.]),
+          [
+            CPPFLAGS="$CPPFLAGS -I${withval}/include"
+            LDFLAGS="$LDFLAGS -L${withval}/lib64 -L${withval}/lib"
+          ])
+
 # Check liblttng-ust-ctl library
 AC_ARG_ENABLE(lttng-ust,
     AS_HELP_STRING([--disable-lttng-ust],[build without LTTng-UST

(Userspace Tracing) support]),

configure.ac +0 -1
@@ -174,7 +183,7 @@ AS_IF([test "x$lttng_ust_support" = "xyes"], [
             AC_DEFINE([HAVE_LIBLTTNG_UST_CTL], [1], [has LTTng-UST
 control support])
             lttng_ust_ctl_found=yes
         ],
-        [AC_MSG_ERROR([Cannot find LTTng-UST 2.1.x. Use [LDFLAGS]=-Ldir

to specify its location, or specify --disable-lttng-ust to build lttng-tools without LTTng-UST support.])],
+ [AC_MSG_ERROR([Cannot find LTTng-UST >= 2.1.x. Use
--with-lttng-ust-prefix=PREFIX to specify its location, or specify --disable-lttng-ust to build lttng-tools without LTTng-UST support.])],
[-lurcu-common -lurcu-bp -lurcu-cds -lrt]
)
])