commit b752300f8ea17def7ebe8b95362319fe4f32b5a3
author Jeff Thompson <jefft0@gmail.com> Wed Oct 09 10:25:00 2013 -0700
committer Jeff Thompson <jefft0@gmail.com> Wed Oct 09 10:25:00 2013 -0700
tree 1f805c8800868cc602cb3ca5635eef3d29d0d695
parent 649e95fe53ed73b610b6b57124618feb21b52f2f

make: In ndn-cpp-config.h, to avoid polluting the global name space, generate NDN_CPP_HAVE_BOOST_FUNCTION etc. instead of HAVE_BOOST_FUNCTION, etc.

ndn-cpp/util/logging.hpp

diff --git a/ndn-cpp/util/logging.hpp b/ndn-cpp/util/logging.hpp
index e6a402f..87d9ad5 100644
--- a/ndn-cpp/util/logging.hpp
+++ b/ndn-cpp/util/logging.hpp
@@ -11,7 +11,7 @@
 
 #include "../common.hpp"
 
-#ifdef HAVE_LOG4CXX
+#ifdef NDN_CPP_HAVE_LOG4CXX
 
 #include <log4cxx/logger.h>
 
@@ -48,7 +48,7 @@
 void
 INIT_LOGGERS ();
 
-#else // else HAVE_LOG4CXX
+#else // else NDN_CPP_HAVE_LOG4CXX
 
 #define INIT_LOGGER(name)
 #define _LOG_FUNCTION(x)
@@ -74,6 +74,6 @@
 #define _LOG_DEBUG(x)
 #endif
 
-#endif // HAVE_LOG4CXX
+#endif // NDN_CPP_HAVE_LOG4CXX
 
 #endif