Squashed 'features/frameworks/mbed-trace/' changes from 6ced9711c4..b98f6a9050

b98f6a9050 Merge remote-tracking branch 'origin/master' into release_for_mbed_os
7a60a77390 Enable libservice by default
fc7503c1a6 Make IPv6 tracing conditional to nanostack-libservce

git-subtree-dir: features/frameworks/mbed-trace
git-subtree-split: b98f6a9050afd1d0b9354bc82d5d363fff5a1405

Author: Arto Kinnunen

features/frameworks/mbed-trace/mbed-trace/mbed_trace.h

@@ -69,7 +69,12 @@ extern "C" {
 #define MBED_CONF_MBED_TRACE_ENABLE 0
 #endif
 
-#ifndef MBED_CONF_MBED_TRACE_FEA_IPV6
+#ifndef MBED_CONF_NANOSTACK_LIBSERVICE_PRESENT
+/* if libservice presence is not configured, enable it by default */
+#define MBED_CONF_NANOSTACK_LIBSERVICE_PRESENT 1
+#endif
+
+#if !defined(MBED_CONF_MBED_TRACE_FEA_IPV6) && MBED_CONF_NANOSTACK_LIBSERVICE_PRESENT
 #define MBED_CONF_MBED_TRACE_FEA_IPV6 1
 #endif
 

features/frameworks/mbed-trace/source/mbed_trace.c

@@ -21,7 +21,7 @@
 #undef MBED_CONF_MBED_TRACE_ENABLE
 #endif
 #define MBED_CONF_MBED_TRACE_ENABLE 1
-#ifndef MBED_CONF_MBED_TRACE_FEA_IPV6
+#if !defined(MBED_CONF_MBED_TRACE_FEA_IPV6) && MBED_CONF_NANOSTACK_LIBSERVICE_PRESENT
 #define MBED_CONF_MBED_TRACE_FEA_IPV6 1
 #endif