--- boost_1_52_0/boost/config/suffix.hpp	2012-09-28 11:34:12.000000000 -0700
+++ boost_1_52_0_fix/boost/config/suffix.hpp	2012-11-09 09:34:34.615036000 -0800
@@ -634,6 +634,16 @@
 #  endif
 #endif
 
+// Propagate deprecated BOOST_NO_DECLTYPE and BOOST_NO_DECLTYPE_N3276 macros
+// to their replacements. We have to do this before reading the values of
+// the new macros below.
+#if defined(BOOST_NO_DECLTYPE_N3276) && !defined(BOOST_NO_CXX11_DECLTYPE_N3276)
+#  define BOOST_NO_CXX11_DECLTYPE_N3276
+#endif
+#if defined(BOOST_NO_DECLTYPE) && !defined(BOOST_NO_CXX11_DECLTYPE)
+#  define BOOST_NO_CXX11_DECLTYPE
+#endif
+
 //
 // Set BOOST_NO_DECLTYPE_N3276 when BOOST_NO_DECLTYPE is defined
 //