From 09d3fa5b46c6a81dff6a52d311db20e0c8df5475 Mon Sep 17 00:00:00 2001
From: Stefan Ring <stefan@complang.tuwien.ac.at>
Date: Sun, 17 Oct 2010 11:48:37 +0200
Subject: [PATCH] * src/mm/boehm-gc/autogen.sh: Adapted for inclusion in CACAO
 repository. * src/mm/boehm-gc/Makefile.am: Don't link object files into a
 shared library. This only changes the build process slightly, the code is
 left as-is.

---
 src/mm/boehm-gc/Makefile.am  | 3 ++-
 src/mm/boehm-gc/autogen.sh   | 4 ++--
 src/mm/boehm-gc/configure.ac | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/mm/boehm-gc/Makefile.am b/src/mm/boehm-gc/Makefile.am
index fb658e27a..3183ae57f 100644
--- a/src/mm/boehm-gc/Makefile.am
+++ b/src/mm/boehm-gc/Makefile.am
@@ -35,6 +35,7 @@ SUBDIRS =
 # Initialize variables so that we can declare files locally.
 EXTRA_DIST = 
 lib_LTLIBRARIES =
+noinst_LTLIBRARIES =
 include_HEADERS =
 pkginclude_HEADERS =
 dist_noinst_HEADERS =
@@ -47,7 +48,7 @@ dist_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 afbfc55c0..f3bee8bbe 100644
--- a/src/mm/boehm-gc/autogen.sh
+++ b/src/mm/boehm-gc/autogen.sh
@@ -5,7 +5,7 @@ set -e
 # These version are ok, pre-1.7 is not.  Post 1.7 may produce a lot of
 # warnings for unrelated projects, so prefer 1.7 for now.
 am_version=
-for v in 1.7 1.9 1.8; do
+for v in 1.10 1.9 1.8; do
     if type -p &>/dev/null automake-$v; then
 	am_version="-$v"
 	break
@@ -21,7 +21,7 @@ if [ -z "$am_version" ]; then
 fi
 
 set -x
-libtoolize --automake --force
+libtoolize --automake --force --copy
 aclocal$am_version
 automake$am_version -ac
 autoconf
diff --git a/src/mm/boehm-gc/configure.ac b/src/mm/boehm-gc/configure.ac
index 8bb800ffc..08fae0616 100644
--- a/src/mm/boehm-gc/configure.ac
+++ b/src/mm/boehm-gc/configure.ac
@@ -45,8 +45,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'`
@@ -60,7 +60,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 ]
 )
-- 
2.25.1