diff options
| author | Martin Baulig <martin@novell.com> | 2003-06-08 23:54:30 +0400 |
|---|---|---|
| committer | Martin Baulig <martin@novell.com> | 2003-06-08 23:54:30 +0400 |
| commit | 5e2afe9a5f155785617c4f4119f578a8d83331d4 (patch) | |
| tree | 3ac25d1d2bce7f1eb03086f62af8e1682e32a36f /configure.in | |
| parent | 6f98282e4cbd3284ae638a3edc923e2f8a7caee1 (diff) | |
2003-06-08 Martin Baulig <martin@ximian.com>
* libgc/: Integrate the libgc module here.
[Note: A simple `cvs update' won't work this time; you either need
to re-checkout the `mono' module or manually move the `libgc'
module here.]
* configure.in (--with-gc): Added `included' option to use the
included libgc. This is now also the default.
(LIBGC_CFLAGS, LIBGC_LIBS): Put the libgc stuff here and AC_SUBST it.
(INCLUDED_LIBGC): New automake conditional.
(USE_INCLUDED_LIBGC): #define this if appropriate.
* autogen.sh: Run libgc/autogen.sh.
* Makefile.am (SUBDIRS): Added libgc.
svn path=/trunk/mono/; revision=15185
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 37 |
1 files changed, 34 insertions, 3 deletions
diff --git a/configure.in b/configure.in index d4652f72776..55d5a80c98c 100644 --- a/configure.in +++ b/configure.in @@ -157,12 +157,21 @@ AC_SUBST(GLIB_LIBS) AC_SUBST(GMODULE_CFLAGS) AC_SUBST(GMODULE_LIBS) +dnl +dnl libgc checks +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=auto -AC_ARG_WITH(gc, [ --with-gc=boehm,none],[gc=$with_gc]) +gc=included +use_included_gc=no +AC_ARG_WITH(gc, [ --with-gc=boehm,included,none],[gc=$with_gc]) +LIBGC_CFLAGS= +LIBGC_LIBS= case "x$gc" in xboehm|xbohem|xyes) if test "x$found_boehm" != "xyes"; then @@ -174,8 +183,22 @@ case "x$gc" in AC_DEFINE(HAVE_BOEHM_GC) AC_SUBST(HAVE_BOEHM_GC) - LIBS="$LIBS -lgc $libdl" + LIBGC_LIBS="-lgc $libdl" ;; + + xincluded) + found_boehm=yes + gc_headers=yes + use_included_gc=yes + + LIBGC_CFLAGS='-I$(top_srcdir)/libgc/include' + LIBGC_LIBS='$(top_builddir)/libgc/libgc.la' + + AC_DEFINE(HAVE_BOEHM_GC) + AC_DEFINE(USE_INCLUDED_LIBGC) + AC_SUBST(HAVE_BOEHM_GC) + ;; + xnone) AC_MSG_WARN("Compiling mono without GC.") ;; @@ -199,6 +222,14 @@ if test "x$gc" = xboehm; then AC_CHECK_FUNCS(GC_gcj_malloc) fi +AM_CONDITIONAL(INCLUDED_LIBGC, test x$use_included_gc = xyes) +AC_SUBST(LIBGC_CFLAGS) +AC_SUBST(LIBGC_LIBS) + +dnl +dnl End of libgc checks +dnl + if test x$platform_win32 = xno; then dnl ****************************************************************** dnl *** Check for large file support *** |