lttng: Update packaging

Signed-off-by: Adam Crume <[email protected]>

ceph.spec.in

@@ -252,6 +252,7 @@ Requires:	librbd1 = %{version}-%{release}
 Requires:	libcephfs1 = %{version}-%{release}
 %if (0%{?fedora} >= 20 || 0%{?rhel} == 6)
 BuildRequires:	lttng-ust-devel
+BuildRequires:	libbabeltrace-devel
 %endif
 %description -n ceph-test
 This package contains Ceph benchmarks and test tools.

configure.ac

@@ -810,7 +810,10 @@ AM_COND_IF([WITH_LTTNG], [
   AC_DEFINE([WITH_LTTNG], [1], [Define if you want to use LTTng])
 
   AC_CHECK_HEADER([lttng/tracepoint.h], [],
-    AC_MSG_ERROR([lttng/tracepoint.h not found (liblttng-ust-dev)]))
+    AC_MSG_ERROR([lttng/tracepoint.h not found (liblttng-ust-dev, lttng-ust-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

debian/control

@@ -17,6 +17,8 @@ Build-Depends: autoconf,
                junit4,
                libaio-dev,
                libatomic-ops-dev,
+               libbabeltrace-ctf-dev,
+               libbabeltrace-dev,
                libblkid-dev (>= 2.17),
                libboost-dev (>= 1.42),
                libboost-program-options-dev (>= 1.42),

debian/rules

@@ -33,11 +33,8 @@ ifeq ($(DEB_HOST_ARCH), armel)
   extraopts += --without-libatomic-ops
 endif
 
-ifeq ($(shell dpkg-vendor --derives-from ubuntu && echo yes),yes)
-  codename = $(shell lsb_release -a | sed -rn 's/Codename:\s([^\s]*)/\1/p')
-  ifeq ($(codename),trusty)
-    extraopts += --without-lttng
-  endif
+ifeq ($(shell lsb_release -sc | egrep -q '(precise|quantal|raring|saucy|wheezy)' && echo yes),yes)
+  extraopts += --without-lttng
 endif
 
 configure: configure-stamp

src/rbd_replay/Makefile.am

@@ -40,4 +40,6 @@ rbd_replay_prep_LDADD = $(LIBRBD) \
 	-lbabeltrace \
 	-lbabeltrace-ctf \
 	-lboost_date_time
+if WITH_LTTNG
 bin_PROGRAMS += rbd-replay-prep
+endif

src/tracing/Makefile.am

@@ -1,7 +1,9 @@
 EXTRA_DIST = tracing-common.h
 
+if WITH_LTTNG
 %.c %.h: %.tp
 	$(LTTNG_GEN_TP_PROG) $< -o $*.c -o $*.h
+endif
 
 dist_noinst_DATA = \
 	librados.tp \