diff mbox

[RFC,v3,1/5] Fix configure script for LTTng 2.x

Message ID 1381775755-8421-2-git-send-email-mohamad.gebai@polymtl.ca
State New
Headers show

Commit Message

Mohamad Gebai Oct. 14, 2013, 6:35 p.m. UTC
Signed-off-by: Mohamad Gebai <mohamad.gebai@polymtl.ca>
---
 configure |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

Comments

Alex Bennée Oct. 16, 2013, 12:06 p.m. UTC | #1
mohamad.gebai@gmail.com writes:

> Signed-off-by: Mohamad Gebai <mohamad.gebai@polymtl.ca>
> ---
>  configure |    9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/configure b/configure
> index 23dbaaf..627054c 100755
> --- a/configure
> +++ b/configure
> @@ -3287,15 +3287,14 @@ fi
>  # For 'ust' backend, test if ust headers are present
>  if test "$trace_backend" = "ust"; then
>    cat > $TMPC << EOF
> -#include <ust/tracepoint.h>
> -#include <ust/marker.h>
> +#include <lttng/tracepoint.h>
>  int main(void) { return 0; }
>  EOF
>    if compile_prog "" "" ; then
> -    LIBS="-lust -lurcu-bp $LIBS"
> -    libs_qga="-lust -lurcu-bp $libs_qga"
> +    LIBS="-llttng-ust -lurcu-bp -ldl $LIBS"
> +    libs_qga="-llttng-ust -lurcu-bp -ldl $libs_qga"
>    else
> -    error_exit "Trace backend 'ust' missing libust header files"
> +    error_exit "Trace backend 'ust' missing lttng-ust header files"
>    fi
>  fi

Reviewed-by: Alex Bennée <alex@bennee.com>
diff mbox

Patch

diff --git a/configure b/configure
index 23dbaaf..627054c 100755
--- a/configure
+++ b/configure
@@ -3287,15 +3287,14 @@  fi
 # For 'ust' backend, test if ust headers are present
 if test "$trace_backend" = "ust"; then
   cat > $TMPC << EOF
-#include <ust/tracepoint.h>
-#include <ust/marker.h>
+#include <lttng/tracepoint.h>
 int main(void) { return 0; }
 EOF
   if compile_prog "" "" ; then
-    LIBS="-lust -lurcu-bp $LIBS"
-    libs_qga="-lust -lurcu-bp $libs_qga"
+    LIBS="-llttng-ust -lurcu-bp -ldl $LIBS"
+    libs_qga="-llttng-ust -lurcu-bp -ldl $libs_qga"
   else
-    error_exit "Trace backend 'ust' missing libust header files"
+    error_exit "Trace backend 'ust' missing lttng-ust header files"
   fi
 fi