+2003-06-16 Dave Love <fx@gnu.org>
+
+ * Makefile.am, Makefile.dj, Makefile.in, aclocal.m4, alloc.c:
+ * alpha_mach_dep.S, configure, dbg_mlc.c, dyn_load.c, finalize.c:
+ * gc_dlopen.c, mach_dep.c, mark.c, mark_rts.c, misc.c:
+ * mkinstalldirs, os_dep.c, ptr_chck.c, reclaim.c, threadlibs.c:
+ * version.h, win32_threads.c, include/Makefile.am:
+ * include/Makefile.in, include/gc.h, include/gc_config_macros.h:
+ * include/gc_pthread_redirects.h, include/private/gc_locks.h:
+ * include/private/gc_priv.h, include/private/gcconfig.h: Merge
+ changes from 6.2alpha6.
+
+ * configure.in: Merge changes from 6.2alpha6.
+ (AC_REVISION): Removed.
+ (Ac_INIT): Modify version and remove bug address.
+
+ * Makefile.direct: Removed.
+
2003-06-10 Dave Love <fx@gnu.org>
* Makefile: Removed.
# Initialization
# ==============
-AC_INIT(gc,6.2alpha4,Hans.Boehm@hp.com)
+AC_INIT(gc,[6.2alpha6, modified for Emacs])
## version must conform to [0-9]+[.][0-9]+(alpha[0-9]+)?
AC_CONFIG_SRCDIR(gcj_mlc.c)
AC_CANONICAL_TARGET
AC_PREREQ(2.53)
-AC_REVISION($Revision: 1.2 $)
GC_SET_VERSION
AM_INIT_AUTOMAKE
)
AC_ARG_ENABLE(cplusplus,
-[ --enable-cplusplus include C++ support in GC library and include directory],
+[ --enable-cplusplus install C++ support],
)
AC_ARG_ENABLE(cppflags,
AC_DEFINE(GC_LINUX_THREADS)
AC_DEFINE(_REENTRANT)
;;
+ *-*-aix*)
+ AC_DEFINE(GC_AIX_THREADS)
+ AC_DEFINE(_REENTRANT)
+ ;;
*-*-hpux*)
AC_MSG_WARN("Only HP/UX 11 threads are supported.")
AC_DEFINE(GC_HPUX_THREADS)
AC_DEFINE(GC_WIN32_THREADS)
;;
*-*-darwin*)
- AC_DEFINE(GC_MACOSX_THREADS)
+ AC_DEFINE(GC_DARWIN_THREADS)
+ AC_DEFINE(THREAD_LOCAL_ALLOC)
+ if test "${enable_parallel_mark}" = yes; then
+ AC_DEFINE(PARALLEL_MARK)
+ fi
;;
*-*-osf*)
AC_DEFINE(GC_OSF1_THREADS)
esac
AC_SUBST(THREADLIBS)
-# I'm not too familiar with autoconf, is this the best way to do this? -Brian
+case "$host" in
+ powerpc-*-darwin*)
+ powerpc_darwin=true
+ ;;
+esac
+AM_CONDITIONAL(POWERPC_DARWIN,test x$powerpc_darwin = xtrue)
+
+# We never want libdl on darwin. It is a fake libdl that just ends up making
+# dyld calls anyway
case "$host" in
*-*-darwin*) ;;
*)
)
addobjs=
+addlibs=
addincludes=
addtests=
CXXINCLUDES=
esac
if test "${enable_cplusplus}" = yes; then
- addobjs="$addobjs gc_cpp.lo"
addincludes="$addincludes include/gc_cpp.h include/gc_allocator.h"
addtests="$addtests test_cpp"
fi
+AM_CONDITIONAL(CPLUSPLUS, test "${enable_cplusplus}" = yes)
+
AC_SUBST(CXX)
AC_SUBST(INCLUDES)
addobjs="$addobjs $machdep"
AC_SUBST(addobjs)
AC_SUBST(addincludes)
+AC_SUBST(addlibs)
AC_SUBST(addtests)
AM_PROG_LIBTOOL