--- boost/thread/pthread/condition_variable.hpp.ORIG
+++ boost/thread/pthread/condition_variable.hpp
@@ -52,6 +52,7 @@
         guard.activate(m);
         int const res=pthread_cond_wait(&cond,&internal_mutex);
         BOOST_ASSERT(!res);
+        (void)res;
         this_thread::interruption_point();
     }
 
--- boost/config/stdlib/libstdcpp3.hpp.ORIG
+++ boost/config/stdlib/libstdcpp3.hpp
@@ -33,7 +33,8 @@
 
 #ifdef __GLIBCXX__ // gcc 3.4 and greater:
 #  if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \
-        || defined(_GLIBCXX__PTHREADS)
+        || defined(_GLIBCXX__PTHREADS) \
+        || defined(_GLIBCXX_HAS_GTHREADS)
       //
       // If the std lib has thread support turned on, then turn it on in Boost
       // as well.  We do this because some gcc-3.4 std lib headers define _REENTANT