From 6577f5e91e9432a9fc7a695e4ac7e250720a9461 Mon Sep 17 00:00:00 2001
From: Mikhail Fludkov <misha@pexip.com>
Date: Fri, 10 Nov 2017 16:26:50 +0100
Subject: [PATCH] gsttraceutils: actually disable tracing system hooks if
 configured

`./configure --disable-gst-tracer-hooks` didn't do anything, hooks were
always enabled regardless of the option. It works correctly in the
Meson build though.
---
 configure.ac         |  4 ++++
 gst/gsttracerutils.c |  8 ++++++++
 gst/gsttracerutils.h | 11 +++++++++++
 plugins/Makefile.am  |  7 +++++--
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5f7c83f..c0412ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,6 +89,10 @@ AG_GST_CHECK_SUBSYSTEM_DISABLE(GST_DEBUG,[debugging subsystem])
 AM_CONDITIONAL(GST_DISABLE_GST_DEBUG, test "x$GST_DISABLE_GST_DEBUG" = "xyes")
 AG_GST_CHECK_SUBSYSTEM_DISABLE(GST_TRACER_HOOKS,[tracing subsystem hooks])
 AM_CONDITIONAL(GST_DISABLE_GST_TRACER_HOOKS, test "x$GST_DISABLE_GST_TRACER_HOOKS" = "xyes")
+if test "x$GST_DISABLE_GST_TRACER_HOOKS" = xyes; then
+  AC_DEFINE(GST_DISABLE_GST_TRACER_HOOKS, 1,
+    [Define if tracing subsystem hooks is disabled])
+fi
 AG_GST_CHECK_SUBSYSTEM_DISABLE(PARSE,[command-line parser])
 AM_CONDITIONAL(GST_DISABLE_PARSE, test "x$GST_DISABLE_PARSE" = "xyes")
 if test "x$GST_DISABLE_PARSE" = xyes; then
diff --git a/gst/gsttracerutils.c b/gst/gsttracerutils.c
index 0539869..3aecd48 100644
--- a/gst/gsttracerutils.c
+++ b/gst/gsttracerutils.c
@@ -196,4 +196,12 @@ gst_tracing_register_hook (GstTracer * tracer, const gchar * detail,
   gst_tracing_register_hook_id (tracer, g_quark_try_string (detail), func);
 }
 
+#else /* !GST_DISABLE_GST_TRACER_HOOKS */
+
+void
+gst_tracing_register_hook (GstTracer * tracer, const gchar * detail,
+    GCallback func)
+{
+}
+
 #endif /* GST_DISABLE_GST_TRACER_HOOKS */
diff --git a/gst/gsttracerutils.h b/gst/gsttracerutils.h
index d16ab63..426bc53 100644
--- a/gst/gsttracerutils.h
+++ b/gst/gsttracerutils.h
@@ -697,6 +697,17 @@ typedef void (*GstTracerHookObjectDestroyed) (GObject *self, GstClockTime ts,
 
 #else /* !GST_DISABLE_GST_TRACER_HOOKS */
 
+static inline void
+_priv_gst_tracing_init (void)
+{
+  GST_DEBUG ("Tracing hooks are disabled");
+}
+
+static inline void
+_priv_gst_tracing_deinit (void)
+{
+}
+
 #define GST_TRACER_PAD_PUSH_PRE(pad, buffer)
 #define GST_TRACER_PAD_PUSH_POST(pad, res)
 #define GST_TRACER_PAD_PUSH_LIST_PRE(pad, list)
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index cee04aa..48a31fc 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,4 +1,7 @@
-SUBDIRS = elements tracers
+SUBDIRS = elements
 
-DIST_SUBDIRS = elements tracers
+if !GST_DISABLE_GST_TRACER_HOOKS
+SUBDIRS += tracers
+endif
 
+DIST_SUBDIRS = elements tracers
-- 
2.7.4