Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog9
-rw-r--r--acconfig.h1
-rw-r--r--configure.in34
-rw-r--r--mono/dis/Makefile.am1
-rw-r--r--mono/handles/Makefile.am9
-rw-r--r--mono/interpreter/Makefile.am5
-rw-r--r--mono/metadata/Makefile.am6
-rw-r--r--mono/mini/ChangeLog3
-rw-r--r--mono/mini/Makefile.am3
-rw-r--r--mono/monograph/Makefile.am1
-rw-r--r--mono/utils/ChangeLog4
-rw-r--r--mono/utils/Makefile.am4
12 files changed, 42 insertions, 38 deletions
diff --git a/ChangeLog b/ChangeLog
index 9f2a1b11876..64aee02e46b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-06-10 Martin Baulig <martin@ximian.com>
+
+ * configure.in: Make the libgc stuff actually work; we now create
+ a shared libmonogc.so when using the included libgc.
+
+2003-06-09 Martin Baulig <martin@ximian.com>
+
+ * configure.in: Only check for gc if --with-gc=boehm.
+
2003-06-08 Martin Baulig <martin@ximian.com>
* configure.in: Tell libgc's configure about our threads library.
diff --git a/acconfig.h b/acconfig.h
index fd6e2895686..1f5235e6a30 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -20,3 +20,4 @@
#undef MONO_SIZEOF_SUNPATH
#undef NEED_LINK_UNLINK
#undef PTHREAD_POINTER_ID
+#undef HAVE_GC_H
diff --git a/configure.in b/configure.in
index 9844eded3bd..0a9567d0d53 100644
--- a/configure.in
+++ b/configure.in
@@ -171,16 +171,17 @@ dnl
dnl AC_CONFIG_SUBDIRS(libgc)
gc_headers=no
-AC_CHECK_HEADERS(gc.h gc/gc.h, gc_headers=yes)
-AC_CHECK_LIB(gc, GC_malloc, found_boehm="yes",,$libdl)
-gc=boehm
+gc=included
use_included_gc=no
-AC_ARG_WITH(gc, [ --with-gc=boehm,included,none],[gc=$with_gc])
+AC_ARG_WITH(gc, [ --with-gc=boehm,included,none],[gc=$with_gc],[gc=included])
LIBGC_CFLAGS=
LIBGC_LIBS=
case "x$gc" in
xboehm|xbohem|xyes)
+ AC_CHECK_HEADERS(gc.h gc/gc.h, gc_headers=yes)
+ AC_CHECK_LIB(gc, GC_malloc, found_boehm="yes",,$libdl)
+
if test "x$found_boehm" != "xyes"; then
AC_MSG_ERROR("GC requested but libgc not found!")
fi
@@ -191,6 +192,8 @@ case "x$gc" in
AC_DEFINE(HAVE_BOEHM_GC)
AC_SUBST(HAVE_BOEHM_GC)
LIBGC_LIBS="-lgc $libdl"
+
+ AC_CHECK_FUNCS(GC_gcj_malloc)
;;
xincluded)
@@ -199,36 +202,23 @@ case "x$gc" in
use_included_gc=yes
LIBGC_CFLAGS='-I$(top_srcdir)/libgc/include'
- LIBGC_LIBS='$(top_builddir)/libgc/libgc.la'
+ LIBGC_LIBS='$(top_builddir)/libgc/libmonogc.la'
AC_DEFINE(HAVE_BOEHM_GC)
- AC_DEFINE(USE_INCLUDED_LIBGC)
AC_SUBST(HAVE_BOEHM_GC)
+
+ AC_DEFINE(HAVE_GC_H)
+ AC_DEFINE(USE_INCLUDED_LIBGC)
;;
xnone)
AC_MSG_WARN("Compiling mono without GC.")
;;
*)
- # If libgc was found, use it. Otherwise just warn.
- if test "x$found_boehm" != "xyes"; then
- AC_MSG_WARN("Compiling mono without GC.")
- else
- if test "x$gc_headers" != "xyes"; then
- AC_MSG_ERROR("Found libgc but not its header files! You may need to install them by hand.")
- fi
- AC_DEFINE(HAVE_BOEHM_GC)
- AC_SUBST(HAVE_BOEHM_GC)
- LIBS="$LIBS -lgc $libdl"
- gc="boehm"
- fi
+ AC_MSG_ERROR([Invalid argument to --with-gc.])
;;
esac
-if test "x$gc" = xboehm; then
- AC_CHECK_FUNCS(GC_gcj_malloc)
-fi
-
we_are_embedded_in_mono=yes
export we_are_embedded_in_mono
export libgc_threads
diff --git a/mono/dis/Makefile.am b/mono/dis/Makefile.am
index e6c82e84f1b..2bf93f06d41 100644
--- a/mono/dis/Makefile.am
+++ b/mono/dis/Makefile.am
@@ -27,6 +27,7 @@ monodis_LDADD = \
../metadata/libmetadata.la \
../io-layer/libwapi.la \
../utils/libmonoutils.la \
+ $(LIBGC_LIBS) \
$(GMODULE_LIBS) \
$(GLIB_LIBS)
diff --git a/mono/handles/Makefile.am b/mono/handles/Makefile.am
index 4c57428ebdd..f496a5300c2 100644
--- a/mono/handles/Makefile.am
+++ b/mono/handles/Makefile.am
@@ -8,21 +8,24 @@ INCLUDES = \
hps_LDADD = \
../io-layer/libwapi.la \
- ../utils/libmonoutils.la \
+ ../utils/libmonoutils.la \
+ $(LIBGC_LIBS) \
$(GLIB_LIBS) \
$(GMODULE_LIBS) \
-lm
scratch_LDADD = \
../io-layer/libwapi.la \
- ../utils/libmonoutils.la \
+ ../utils/libmonoutils.la \
+ $(LIBGC_LIBS) \
$(GLIB_LIBS) \
$(GMODULE_LIBS) \
-lm
shmdel_LDADD = \
../io-layer/libwapi.la \
- ../utils/libmonoutils.la \
+ ../utils/libmonoutils.la \
+ $(LIBGC_LIBS) \
$(GLIB_LIBS) \
$(GMODULE_LIBS) \
-lm
diff --git a/mono/interpreter/Makefile.am b/mono/interpreter/Makefile.am
index 967b7aa7328..a0b67be9a67 100644
--- a/mono/interpreter/Makefile.am
+++ b/mono/interpreter/Makefile.am
@@ -1,8 +1,8 @@
INCLUDES = \
-I$(top_srcdir) \
+ $(LIBGC_CFLAGS) \
$(GMODULE_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(LIBGC_CFLAGS)
+ $(GLIB_CFLAGS)
if PLATFORM_WIN32
export HOST_CC
@@ -25,6 +25,7 @@ mint_LDADD = \
../io-layer/libwapi.la \
../utils/libmonoutils.la \
../os/libmonoos.la \
+ $(LIBGC_LIBS) \
$(GLIB_LIBS) \
$(GMODULE_LIBS) \
-lm
diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am
index d4ab23814a4..67a20b9d767 100644
--- a/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@ -18,7 +18,7 @@ bin_PROGRAMS = monosn pedump
noinst_LTLIBRARIES = libmetadata.la libmonoruntime.la
-INCLUDES = $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(LIBGC_CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/mono \
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) \
-DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
libmonoruntime_la_SOURCES = \
@@ -122,15 +122,15 @@ pedump_SOURCES = \
pedump.c
pedump_LDADD = libmetadata.la ../io-layer/libwapi.la ../utils/libmonoutils.la \
- $(GLIB_LIBS) $(GMODULE_LIBS) $(LIBGC_LIBS) -lm
+ $(LIBGC_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) -lm
monosn_LDADD = \
../metadata/libmetadata.la \
../io-layer/libwapi.la \
../utils/libmonoutils.la \
+ $(LIBGC_LIBS) \
$(GLIB_LIBS) \
$(GMODULE_LIBS) \
- $(LIBGC_LIBS) \
-lm
diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index d1981e1f9ca..893d93fdc8e 100644
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,6 @@
+2003-06-09 Martin Baulig <martin@ximian.com>
+
+ * Makefile.am (libs): Added $(LIBGC_LIBS).
Mon Jun 9 20:21:47 CEST 2003 Paolo Molaro <lupus@ximian.com>
diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am
index f7cb0a77c80..9fbe6ea0e74 100644
--- a/mono/mini/Makefile.am
+++ b/mono/mini/Makefile.am
@@ -5,7 +5,8 @@ libs= \
$(monodir)/mono/metadata/libmonoruntime.la \
$(monodir)/mono/metadata/libmetadata.la \
$(monodir)/mono/io-layer/libwapi.la \
- $(monodir)/mono/utils/libmonoutils.la
+ $(monodir)/mono/utils/libmonoutils.la \
+ $(LIBGC_LIBS)
MCS=mcs
RUNTIME=mono
diff --git a/mono/monograph/Makefile.am b/mono/monograph/Makefile.am
index dffe4156c11..b66749cbef0 100644
--- a/mono/monograph/Makefile.am
+++ b/mono/monograph/Makefile.am
@@ -14,6 +14,7 @@ monograph_LDADD = \
../metadata/libmetadata.la \
../io-layer/libwapi.la \
../utils/libmonoutils.la \
+ $(LIBGC_LIBS) \
$(GLIB_LIBS) \
$(GMODULE_LIBS) \
-lm
diff --git a/mono/utils/ChangeLog b/mono/utils/ChangeLog
index ebd2e6374cf..16a0d6b19f4 100644
--- a/mono/utils/ChangeLog
+++ b/mono/utils/ChangeLog
@@ -1,7 +1,3 @@
-2003-06-08 Martin Baulig <martin@ximian.com>
-
- * Makefile.am (libmonoutils_la_LIBADD): Added LIBGC_LIBS.
-
Fri Jun 6 19:09:51 CEST 2003 Paolo Molaro <lupus@ximian.com>
* mono-logger.h, mono-logger.c, Makefile.am: added
diff --git a/mono/utils/Makefile.am b/mono/utils/Makefile.am
index c08affadb6b..5bdc1ae9c75 100644
--- a/mono/utils/Makefile.am
+++ b/mono/utils/Makefile.am
@@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libmonoutils.la
-INCLUDES = $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(LIBGC_CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/mono
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS)
libmonoutils_la_SOURCES = \
mono-hash.c \
@@ -13,8 +13,6 @@ libmonoutils_la_SOURCES = \
libmonoutilsincludedir = $(includedir)/mono/utils
-libmonoutils_la_LIBADD = $(LIBGC_LIBS)
-
libmonoutilsinclude_HEADERS = \
monobitset.h \
mono-digest.h \
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-06 18:21:19 +0300