Let the compiler not include debug strings in binary when make is not configured...

diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index 35db82a3a0ddc3d1e9a844bf6a0b75489ae4c065..d8bb6d8d62c42d891819464f80e6a42747059ce9 100644 (file)
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -324,23 +324,27 @@ GNUNET_log_from_nocheck (enum GNUNET_ErrorType kind, const char *comp,
 #if !defined(GNUNET_CULL_LOGGING)
 #define GNUNET_log_from(kind,comp,...) do { int log_line = __LINE__;\
   static int log_call_enabled = GNUNET_LOG_CALL_STATUS;\
-  if (GN_UNLIKELY(log_call_enabled == -1))\
-    log_call_enabled = GNUNET_get_log_call_status ((kind) & (~GNUNET_ERROR_TYPE_BULK), comp, __FILE__, __FUNCTION__, log_line);\
-  if (GN_UNLIKELY(skip_log > 0)) {skip_log--;}\
-  else {\
-    if (GN_UNLIKELY(log_call_enabled))\
-      GNUNET_log_from_nocheck (kind, comp, __VA_ARGS__);\
+  if ((GNUNET_EXTRA_LOGGING > 0) || ((GNUNET_ERROR_TYPE_DEBUG & kind) == 0)) {\
+    if (GN_UNLIKELY(log_call_enabled == -1))\
+      log_call_enabled = GNUNET_get_log_call_status ((kind) & (~GNUNET_ERROR_TYPE_BULK), comp, __FILE__, __FUNCTION__, log_line);\
+    if (GN_UNLIKELY(skip_log > 0)) {skip_log--;}\
+    else {\
+      if (GN_UNLIKELY(log_call_enabled))\
+        GNUNET_log_from_nocheck (kind, comp, __VA_ARGS__);\
+    }\
   }\
 } while (0)
 
 #define GNUNET_log(kind,...) do { int log_line = __LINE__;\
   static int log_call_enabled = GNUNET_LOG_CALL_STATUS;\
-  if (GN_UNLIKELY(log_call_enabled == -1))\
-    log_call_enabled = GNUNET_get_log_call_status ((kind) & (~GNUNET_ERROR_TYPE_BULK), NULL, __FILE__, __FUNCTION__, log_line);\
-  if (GN_UNLIKELY(skip_log > 0)) {skip_log--;}\
-  else {\
-    if (GN_UNLIKELY(log_call_enabled))\
-      GNUNET_log_nocheck (kind, __VA_ARGS__);\
+  if ((GNUNET_EXTRA_LOGGING > 0) || ((GNUNET_ERROR_TYPE_DEBUG & kind) == 0)) {\
+    if (GN_UNLIKELY(log_call_enabled == -1))\
+      log_call_enabled = GNUNET_get_log_call_status ((kind) & (~GNUNET_ERROR_TYPE_BULK), NULL, __FILE__, __FUNCTION__, log_line);\
+    if (GN_UNLIKELY(skip_log > 0)) {skip_log--;}\
+    else {\
+      if (GN_UNLIKELY(log_call_enabled))\
+        GNUNET_log_nocheck (kind, __VA_ARGS__);\
+    }\
   }\
 } while (0)
 #else