From: Andy Wingo <wingo@pobox.com>
Date: Sun, 11 Mar 2012 10:06:14 +0000 (+0100)
Subject: Merge remote-tracking branch 'local-2.0/stable-2.0'
X-Git-Url: http://git.hcoop.net/bpt/guile.git/commitdiff_plain/8b49b6b1f5522dfbb78c9249cf219a29264df490

Merge remote-tracking branch 'local-2.0/stable-2.0'

Conflicts:
	configure.ac
---

8b49b6b1f5522dfbb78c9249cf219a29264df490
diff --cc configure.ac
index f79c671df,c506b392e..e2ccb8c67
--- a/configure.ac
+++ b/configure.ac
@@@ -1232,7 -1232,7 +1232,7 @@@ save_LIBS="$LIBS
  LIBS="$BDW_GC_LIBS $LIBS"
  CFLAGS="$BDW_GC_CFLAGS $CFLAGS"
  
- AC_CHECK_FUNCS([GC_do_blocking GC_call_with_gc_active GC_pthread_exit GC_pthread_cancel GC_allow_register_threads GC_pthread_sigmask GC_set_start_callback GC_get_suspend_signal GC_move_disappearing_link GC_get_heap_usage_safe GC_get_free_space_divisor GC_gcollect_and_unmap GC_get_unmapped_bytes GC_set_finalizer_notifier])
 -AC_CHECK_FUNCS([GC_do_blocking GC_call_with_gc_active GC_pthread_exit GC_pthread_cancel GC_allow_register_threads GC_pthread_sigmask GC_set_start_callback GC_get_heap_usage_safe GC_get_free_space_divisor GC_gcollect_and_unmap GC_get_unmapped_bytes GC_set_finalizer_notifier GC_set_finalize_on_demand])
++AC_CHECK_FUNCS([GC_do_blocking GC_call_with_gc_active GC_pthread_exit GC_pthread_cancel GC_allow_register_threads GC_pthread_sigmask GC_set_start_callback GC_get_suspend_signal GC_move_disappearing_link GC_get_heap_usage_safe GC_get_free_space_divisor GC_gcollect_and_unmap GC_get_unmapped_bytes GC_set_finalizer_notifier GC_set_finalize_on_demand])
  
  # Though the `GC_do_blocking ()' symbol is present in GC 7.1, it is not
  # declared, and has a different type (returning void instead of