log4cpp now mandatory

CMakeLists.txt

@@ -92,11 +92,6 @@ if(NOT CPPUNIT_FOUND)
     message(FATAL_ERROR "CppUnit required to compile gr-ieee802-11")
 endif()
 
-find_package(Log4cpp)
-if(NOT LOG4CPP_FOUND)
-    message(FATAL_ERROR "LOG4CPP required to compile ieee802-11")
-endif ()
-
 find_package(SWIG)
 if(NOT SWIG_FOUND)
     message(FATAL_ERROR "SWIG required to compile gr-ieee802-11")

README.md

@@ -22,15 +22,6 @@ Swig is required to create the python bindings.
     sudo apt-get install swig
     sudo port install swig
 
-
-### log4cpp
-
-I use the new [logging feature](http://gnuradio.org/doc/doxygen/page_logger.html) of GNU Radio which relies on log4cpp. This should be an optional dependency some day, but currently it is required. You can install it with
-
-    sudo apt-get install liblog4cpp5-dev
-    sudo port install log4cpp
-
-
 ### GNU Radio v3.7
 
 You need at least version 3.7.3.

cmake/Modules/FindLog4cpp.cmake

@@ -1,53 +0,0 @@
-# - Find Log4cpp
-# Find the native LOG4CPP includes and library
-#
-#  LOG4CPP_INCLUDE_DIR - where to find LOG4CPP.h, etc.
-#  LOG4CPP_LIBRARIES   - List of libraries when using LOG4CPP.
-#  LOG4CPP_FOUND       - True if LOG4CPP found.
-
-
-if (LOG4CPP_INCLUDE_DIR)
-  # Already in cache, be silent
-  set(LOG4CPP_FIND_QUIETLY TRUE)
-endif ()
-
-find_path(LOG4CPP_INCLUDE_DIR log4cpp/Category.hh
-  /opt/local/include
-  /usr/local/include
-  /usr/include
-)
-
-set(LOG4CPP_NAMES log4cpp)
-find_library(LOG4CPP_LIBRARY
-  NAMES ${LOG4CPP_NAMES}
-  PATHS /usr/lib /usr/local/lib /opt/local/lib
-)
-
-
-if (LOG4CPP_INCLUDE_DIR AND LOG4CPP_LIBRARY)
-  set(LOG4CPP_FOUND TRUE)
-  set(LOG4CPP_LIBRARIES ${LOG4CPP_LIBRARY} CACHE INTERNAL "" FORCE)
-  set(LOG4CPP_INCLUDE_DIRS ${LOG4CPP_INCLUDE_DIR} CACHE INTERNAL "" FORCE)
-else ()
-  set(LOG4CPP_FOUND FALSE CACHE INTERNAL "" FORCE)
-  set(LOG4CPP_LIBRARY "" CACHE INTERNAL "" FORCE)
-  set(LOG4CPP_LIBRARIES "" CACHE INTERNAL "" FORCE)
-  set(LOG4CPP_INCLUDE_DIR "" CACHE INTERNAL "" FORCE)
-  set(LOG4CPP_INCLUDE_DIRS "" CACHE INTERNAL "" FORCE)
-endif ()
-
-if (LOG4CPP_FOUND)
-  if (NOT LOG4CPP_FIND_QUIETLY)
-    message(STATUS "Found LOG4CPP: ${LOG4CPP_LIBRARIES}")
-  endif ()
-else ()
-  if (LOG4CPP_FIND_REQUIRED)
-    message(STATUS "Looked for LOG4CPP libraries named ${LOG4CPPS_NAMES}.")
-    message(FATAL_ERROR "Could NOT find LOG4CPP library")
-  endif ()
-endif ()
-
-mark_as_advanced(
-  LOG4CPP_LIBRARIES
-  LOG4CPP_INCLUDE_DIRS
-)

lib/CMakeLists.txt

@@ -137,7 +137,6 @@ endif(SSE2_SUPPORTED)
 list(APPEND gr_ieee802_11_libs
     ${Boost_LIBRARIES}
     ${GNURADIO_ALL_LIBRARIES}
-    ${LOG4CPP_LIBRARIES}
 )
 
 add_library(gnuradio-ieee802_11 SHARED ${gr_ieee802_11_sources})