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.
diff --git a/tests/test-encode-decode-data.cpp b/tests/test-encode-decode-data.cpp
index 189397f..f5e46f6 100644
--- a/tests/test-encode-decode-data.cpp
+++ b/tests/test-encode-decode-data.cpp
@@ -20,7 +20,7 @@
using namespace ndn;
using namespace ptr_lib;
using namespace func_lib;
-#if HAVE_STD_FUNCTION
+#if NDN_CPP_HAVE_STD_FUNCTION
// In the std library, the placeholders are in a different namespace than boost.
using namespace func_lib::placeholders;
#endif
diff --git a/tests/test-get-async.cpp b/tests/test-get-async.cpp
index 931b1af..536e164 100644
--- a/tests/test-get-async.cpp
+++ b/tests/test-get-async.cpp
@@ -13,7 +13,7 @@
using namespace ndn;
using namespace ptr_lib;
using namespace func_lib;
-#if HAVE_STD_FUNCTION
+#if NDN_CPP_HAVE_STD_FUNCTION
// In the std library, the placeholders are in a different namespace than boost.
using namespace func_lib::placeholders;
#endif