lttng: Split --with-lttng and --with-babeltrace options

Signed-off-by: Adam Crume <adamcrume@gmail.com>

diff --git a/configure.ac b/configure.ac
index d9f6bd26dc99f3f6028515638006543b75c8b14d..0440a664125a2da607c3b07313bb64fd6a645be2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -812,12 +812,11 @@ fi
 rm -rf "$lttng_gen_tp_dir"
 AC_MSG_RESULT([$have_good_lttng_gen_tp])
 
-AC_CHECK_HEADERS([babeltrace/ctf/events.h babeltrace/babeltrace.h])
 AC_ARG_WITH([lttng],
        [AS_HELP_STRING([--with-lttng], [Trace with LTTng])])
 AS_IF([test "x$with_lttng" = "xno"], [use_lttng=no],
       [test "x$with_lttng" = "xyes"], [use_lttng=yes],
-      [test "x$ac_cv_header_babeltrace_ctf_events_h$ac_cv_header_babeltrace_babeltrace_h$have_good_lttng_gen_tp" = "xyesyesyes"], [use_lttng=yes; AC_MSG_NOTICE([lttng auto-enabled])],
+      [test "x$have_good_lttng_gen_tp" = "xyes"], [use_lttng=yes; AC_MSG_NOTICE([lttng auto-enabled])],
       [use_lttng=no; AC_MSG_NOTICE([lttng auto-disabled])])
 AM_CONDITIONAL([WITH_LTTNG], test x"$use_lttng" = x"yes")
 AM_COND_IF([WITH_LTTNG], [
@@ -826,12 +825,6 @@ AM_COND_IF([WITH_LTTNG], [
   AC_CHECK_HEADER([lttng/tracepoint.h], [],
     AC_MSG_ERROR([lttng/tracepoint.h not found (liblttng-ust-dev, lttng-ust-devel)]))
 
-  AC_CHECK_HEADER([babeltrace/babeltrace.h], [],
-    AC_MSG_ERROR([babeltrace/babeltrac.h not found (libbabeltrace-dev, libbabeltrace-devel)]))
-
-  AC_CHECK_HEADER([babeltrace/ctf/events.h], [],
-    AC_MSG_ERROR([babeltrace/ctf/events.h not found (libbabeltrace-ctf-dev, libbabeltrace-devel)]))
-
   AC_CHECK_PROG([LTTNG_GEN_TP_CHECK], [lttng-gen-tp], [yes])
   if test x"$LTTNG_GEN_TP_CHECK" != "xyes"; then
       AC_MSG_FAILURE([lttng-gen-tp not found])
@@ -873,6 +866,30 @@ AM_COND_IF([WITH_LTTNG], [
 ])
 
 
+AC_CHECK_HEADERS([babeltrace/ctf/events.h babeltrace/babeltrace.h])
+AC_CHECK_DECL([BT_CLOCK_REAL],
+              [have_good_babeltrace=yes],
+              [have_good_babeltrace=no],
+              [[#include <babeltrace/babeltrace.h>]])
+AC_ARG_WITH([babeltrace],
+       [AS_HELP_STRING([--with-babeltrace], [Enable Babeltrace])])
+AS_IF([test "x$with_babeltrace" = "xno"], [use_babeltrace=no],
+      [test "x$with_babeltrace" = "xyes"], [use_babeltrace=yes],
+      [test "x$ac_cv_header_babeltrace_ctf_events_h$ac_cv_header_babeltrace_babeltrace_h$have_good_babeltrace" = "xyesyesyes"], [use_babeltrace=yes; AC_MSG_NOTICE([babeltrace auto-enabled])],
+      [use_babeltrace=no; AC_MSG_NOTICE([babeltrace auto-disabled])])
+AM_CONDITIONAL([WITH_BABELTRACE], test x"$use_babeltrace" = x"yes")
+AM_COND_IF([WITH_BABELTRACE], [
+  AC_DEFINE([WITH_BABELTRACE], [1], [Define if you want to use Babeltrace])
+
+  AC_CHECK_HEADER([babeltrace/babeltrace.h], [],
+    AC_MSG_ERROR([babeltrace/babeltrac.h not found (libbabeltrace-dev, libbabeltrace-devel)]))
+
+  AC_CHECK_HEADER([babeltrace/ctf/events.h], [],
+    AC_MSG_ERROR([babeltrace/ctf/events.h not found (libbabeltrace-ctf-dev, libbabeltrace-devel)]))
+])
+
+
+
 # Checks for typedefs, structures, and compiler characteristics.
 #AC_HEADER_STDBOOL
 #AC_C_CONST

diff --git a/debian/rules b/debian/rules
index 06ae8d729224c14d855db583215c1b76132e48f1..835789e794a2a15a4eb5c54a6e91b0db50a24478 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,9 @@ ifeq ($(DEB_HOST_ARCH), armel)
 endif
 
 ifeq ($(shell lsb_release -sc | egrep -q '(precise|quantal|raring|saucy|wheezy)' && echo yes),yes)
-  extraopts += --without-lttng
+  extraopts += --without-lttng --without-babeltrace
+else
+  extraopts += --with-lttng --with-babeltrace
 endif
 
 configure: configure-stamp

diff --git a/src/rbd_replay/Makefile.am b/src/rbd_replay/Makefile.am
index 03e73c71ee841cfabddc00e08f8aadd5e649b836..9420afdbab4a2b5711eb2d38c7ebc6049d30ecd8 100644 (file)
--- a/src/rbd_replay/Makefile.am
+++ b/src/rbd_replay/Makefile.am
@@ -40,6 +40,6 @@ rbd_replay_prep_LDADD = $(LIBRBD) \
        -lbabeltrace \
        -lbabeltrace-ctf \
        -lboost_date_time
-if WITH_LTTNG
+if WITH_BABELTRACE
 bin_PROGRAMS += rbd-replay-prep
 endif