From 32d75b36752a3a5a34fc27d7295a7e62d0b5efa7 Mon Sep 17 00:00:00 2001
From: Bastian Bloessl <bloessl@ccs-labs.org>
Date: Wed, 8 Oct 2014 14:10:03 +0200
Subject: [PATCH] make log4cpp optional

---
 lib/CMakeLists.txt | 2 +-
 lib/utils.h        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 7109d91..0b92e2a 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -130,7 +130,7 @@ list(APPEND gr_ieee802_11_libs
 
 add_library(gnuradio-ieee802_11 SHARED ${gr_ieee802_11_sources})
 add_dependencies(gnuradio-ieee802_11 ieee802_11_generated_includes)
-target_link_libraries(gnuradio-ieee802_11 ${gr_ieee802_11_libs} log4cpp)
+target_link_libraries(gnuradio-ieee802_11 ${gr_ieee802_11_libs})
 set_target_properties(gnuradio-ieee802_11 PROPERTIES DEFINE_SYMBOL "gnuradio_ieee802_11_EXPORTS")
 
 ########################################################################
diff --git a/lib/utils.h b/lib/utils.h
index 47ab7ec..69269ae 100644
--- a/lib/utils.h
+++ b/lib/utils.h
@@ -25,7 +25,7 @@
 
 #define dout d_debug && std::cout
 
-#ifdef HAVE_LOG4CPP
+#if defined(HAVE_LOG4CPP) && defined(ENABLE_GR_LOG)
 #define mylog(msg) do { if(d_log) { *d_logger << log4cpp::Priority::INFO << msg << log4cpp::eol; }} while(0);
 #else
 #define mylog(msg) do { d_log && std::cout << msg << std::endl; } while(0);