Description: building with boost
 This is the result of the auto-foo changes and re-runing the tools
 (see the other patches for what was changed, this is just the fallout).

--- aptitude-0.6.8.2.orig/config.h.in
+++ aptitude-0.6.8.2/config.h.in
@@ -10,6 +10,12 @@
    fold function. */
 #undef BOOST_FUSION_FOLD_STATE_BEFORE_VALUE
 
+/* Define if boost::make_shared returns shared_pointer directly. */
+#undef BOOST_MAKE_SHARED_SHARED_PTR
+
+/* Define if boost::make_shared returns sp_if_not_array::type. */
+#undef BOOST_MAKE_SHARED_SP_IF_NOT_ARRAY_TYPE
+
 /* Define to disable the use of a .glade file found relative to the current
    working directory. */
 #undef DISABLE_PRIVATE_GLADE_FILE
--- aptitude-0.6.8.2.orig/configure
+++ aptitude-0.6.8.2/configure
@@ -8714,6 +8714,76 @@ fi
 
 ##### End Boost.Test check #####
 
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the return type of boost::make_shared" >&5
+$as_echo_n "checking the return type of boost::make_shared... " >&6; }
+boost_make_shared_return_type=no
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <boost/make_shared.hpp>
+#include <boost/shared_ptr.hpp>
+class Foo
+{
+  template< typename T, typename A >
+  friend boost::shared_ptr< T >
+    boost::make_shared(const A &);
+  private:
+  Foo(int a) {}
+};
+
+int main(int argc, char *argv)
+{
+  boost::shared_ptr< Foo > x = boost::make_shared< Foo >(1);
+}
+
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+$as_echo "#define BOOST_MAKE_SHARED_SHARED_PTR 1" >>confdefs.h
+
+                   boost_make_shared_return_type="boost::shared_ptr< T >"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+if test "$boost_make_shared_return_type" = "no"; then
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <boost/make_shared.hpp>
+#include <boost/shared_ptr.hpp>
+class Foo
+{
+  template< typename T, typename A >
+  friend typename boost::detail::sp_if_not_array< T >::type
+    boost::make_shared(const A &);
+  private:
+  Foo(int a) {}
+};
+
+int main(int argc, char *argv)
+{
+  boost::shared_ptr< Foo > x = boost::make_shared< Foo >(1);
+}
+
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+$as_echo "#define BOOST_MAKE_SHARED_SP_IF_NOT_ARRAY_TYPE 1" >>confdefs.h
+
+                   boost_make_shared_return_type="typename boost::detail::sp_if_not_array< T >::type"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+if test "$boost_make_shared_return_type" = "no"; then
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "unknown
+See \`config.log' for more details" "$LINENO" 5; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_make_shared_return_type" >&5
+$as_echo "$boost_make_shared_return_type" >&6; }
+fi
+
 ##### Check for Google Mock #####
 
 
