* configure.ac (ac_configure_args): Removed --disable-shared, add

--disable-static.
* src/mm/boehm-gc/Makefile.am (lib_LTLIBRARIES): Renamed to
noinst_LTLIBRARIES.
* src/mm/boehm-gc/cord/cord.am: Likewise.

--HG--
branch : gc7-branch

diff --git a/configure.ac b/configure.ac
index 7755b008928d3390a57496101493cd31f38e8115..8984d943eaad0b940f2544d579163170267ce643 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -934,7 +934,9 @@ AC_CONFIG_FILES([Makefile]
 dnl now configure subpackages with OPT_CFLAGS and ARCH_CFLAGS
 export OPT_CFLAGS
 export ARCH_CFLAGS
-ac_configure_args="$ac_configure_args --disable-shared"
+dnl We only build the shared library objects but we use it as
+dnl noinst_LTLIBRARIES
+ac_configure_args="$ac_configure_args --disable-static"
 AC_CONFIG_SUBDIRS(src/mm/boehm-gc)
 
 

diff --git a/src/mm/boehm-gc/Makefile.am b/src/mm/boehm-gc/Makefile.am
index 94fa27f8948fa9757bd659b2cbb6c6c6f6463c57..6ef2a774deba5d9d0502dbff9cf1e61e69099e6c 100644 (file)
--- a/src/mm/boehm-gc/Makefile.am
+++ b/src/mm/boehm-gc/Makefile.am
@@ -34,7 +34,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 +47,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 \
@@ -95,7 +95,7 @@ EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \
 # -------------
 
 if CPLUSPLUS
-lib_LTLIBRARIES += libgccpp.la
+noinst_LTLIBRARIES += libgccpp.la
 pkginclude_HEADERS += include/gc_cpp.h include/gc_allocator.h
 libgccpp_la_SOURCES = gc_cpp.cc
 libgccpp_la_LIBADD = $(top_builddir)/libgc.la

diff --git a/src/mm/boehm-gc/cord/cord.am b/src/mm/boehm-gc/cord/cord.am
index fc5e8cc20346a347c2b1d82c0fe95b879935e1aa..4170378ed782ff39ecee8dd463828f912cec4691 100644 (file)
--- a/src/mm/boehm-gc/cord/cord.am
+++ b/src/mm/boehm-gc/cord/cord.am
@@ -1,5 +1,5 @@
 
-lib_LTLIBRARIES += libcord.la
+noinst_LTLIBRARIES += libcord.la
 
 libcord_la_LIBADD = $(top_builddir)/libgc.la
 libcord_la_LDFLAGS = -version-info 1:3:0 -no-undefined