boehm-gc: Merged CACAO-specific modifications

diff --cc src/mm/boehm-gc/Makefile.am
index 1dc609fb66a8166d15008c56e205edfd473c8130,3183ae57f69ef8e37336aae14248e18094c87883..f386f14f11190f0b30148eab1b4ba529de16e53b
--- 1/src/mm/boehm-gc/Makefile.am
--- 2/src/mm/boehm-gc/Makefile.am
+++ b/src/mm/boehm-gc/Makefile.am
@@@ -32,16 -32,10 +32,17 @@@
  # endif
  SUBDIRS =
  
 +ACLOCAL_AMFLAGS = -I m4
 +AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
 +if USE_INTERNAL_LIBATOMIC_OPS
 +AM_CPPFLAGS += -I$(top_builddir)/libatomic_ops/src \
 +             -I$(top_srcdir)/libatomic_ops/src
 +endif
 +
  # Initialize variables so that we can declare files locally.
 -EXTRA_DIST = 
 +EXTRA_DIST =
  lib_LTLIBRARIES =
+ noinst_LTLIBRARIES =
  include_HEADERS =
  pkginclude_HEADERS =
  dist_noinst_HEADERS =

diff --cc src/mm/boehm-gc/autogen.sh
index 3bbdf3a0bd12a475f4c920e92e5aa5755a090a93,f3bee8bbe0f91eb1249d6dbf374d4ccc9d98f5d2..eea554f700242d515820641d0842b95e3d7cc477
--- 1/src/mm/boehm-gc/autogen.sh
--- 2/src/mm/boehm-gc/autogen.sh
+++ b/src/mm/boehm-gc/autogen.sh
@@@ -21,11 -21,10 +21,11 @@@ if [ -z "$am_version" ]; the
  fi
  
  set -x
 -libtoolize --automake --force --copy
  aclocal$am_version
 -automake$am_version -ac
  autoconf
- libtoolize --automake --force
 +autoheader
 +automake$am_version -ac
++libtoolize --automake --force --copy
  set +x
  echo
  echo "Ready to run './configure'."

diff --cc src/mm/boehm-gc/configure.ac
Simple merge