log4cpp is mandatory for GNU Radio

CMakeLists.txt

@@ -94,11 +94,8 @@ if(NOT CPPUNIT_FOUND)
     message(FATAL_ERROR "CppUnit required to compile ieee802-11")
 endif()
 
-if (LOG4CPP_FOUND)
-    message(STATUS "Found LOG4CPP: ${LOG4CPP_LIBRARIES}")
-    add_definitions("-DGR_IEEE80211_LOG4CPP")
-else ()
-    message(STATUS "LOG4CPP not found (not required).")
+if(NOT LOG4CPP_FOUND)
+    message(FATAL_ERROR "LOG4CPP required to compile ieee802-11")
 endif ()
 
 ########################################################################

lib/utils.h

@@ -29,12 +29,7 @@
 #define MAX_ENCODED_BITS ((16 + 8 * MAX_PSDU_SIZE + 6) * 2 + 288)
 
 #define dout d_debug && std::cout
-
-#if defined(HAVE_LOG4CPP) && defined(ENABLE_GR_LOG) && defined(GR_IEEE80211_LOG4CPP)
 #define mylog(msg) do { if(d_log) { GR_LOG_INFO(d_logger, msg) }} while(0);
-#else
-#define mylog(msg) do { d_log && std::cout << msg << std::endl; } while(0);
-#endif
 
 struct mac_header {
 	//protocol version, type, subtype, to_ds, from_ds, ...