boehm-gc: Merged CACAO-specific modifications

diff --git a/src/mm/boehm-gc/Makefile.am b/src/mm/boehm-gc/Makefile.am
index 1dc609fb66a8166d15008c56e205edfd473c8130..f386f14f11190f0b30148eab1b4ba529de16e53b 100644 (file)
--- a/src/mm/boehm-gc/Makefile.am
+++ b/src/mm/boehm-gc/Makefile.am
@@ -42,6 +42,7 @@ endif
 # Initialize variables so that we can declare files locally.
 EXTRA_DIST =
 lib_LTLIBRARIES =
+noinst_LTLIBRARIES =
 include_HEADERS =
 pkginclude_HEADERS =
 dist_noinst_HEADERS =
@@ -54,7 +55,7 @@ pkgconfig_DATA = bdw-gc.pc
 # C Library
 # ---------
 
-lib_LTLIBRARIES += libgc.la
+noinst_LTLIBRARIES += libgc.la
 libgc_la_SOURCES = \
        allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c \
        dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c \

diff --git a/src/mm/boehm-gc/autogen.sh b/src/mm/boehm-gc/autogen.sh
index 3bbdf3a0bd12a475f4c920e92e5aa5755a090a93..eea554f700242d515820641d0842b95e3d7cc477 100644 (file)
--- a/src/mm/boehm-gc/autogen.sh
+++ b/src/mm/boehm-gc/autogen.sh
@@ -25,7 +25,7 @@ aclocal$am_version
 autoconf
 autoheader
 automake$am_version -ac
-libtoolize --automake --force
+libtoolize --automake --force --copy
 set +x
 echo
 echo "Ready to run './configure'."

diff --git a/src/mm/boehm-gc/configure.ac b/src/mm/boehm-gc/configure.ac
index 70406b02e6beac35d642025ec27f6095ea86550b..78ce0c4449632b4a8bc2be65869821dedd12f0b1 100644 (file)
--- a/src/mm/boehm-gc/configure.ac
+++ b/src/mm/boehm-gc/configure.ac
@@ -47,8 +47,8 @@ AC_PROG_INSTALL
 GC_CFLAGS=${gc_cflags}
 AC_SUBST(GC_CFLAGS)
 
-AC_ARG_ENABLE(threads,
-  [AC_HELP_STRING([--enable-threads=TYPE], [choose threading package])],
+AC_ARG_ENABLE(boehm-threads,
+  [AC_HELP_STRING([--enable-boehm-threads=TYPE], [choose threading package])],
   THREADS=$enableval,
   [ AC_MSG_CHECKING([for thread model used by GCC])
     THREADS=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'`
@@ -62,7 +62,7 @@ AC_ARG_ENABLE(parallel-mark,
        [parallelize marking and free list construction])],
    [case "$THREADS" in
       no | none | single)
-       AC_MSG_ERROR([Parallel mark requires --enable-threads=x spec])
+       AC_MSG_ERROR([Parallel mark requires --enable-boehm-threads=x spec])
        ;;
     esac ]
 )