ltdl.c: If HAVE_BOEHM_GC defined, includ gc.h.

	* ltdl.c: If HAVE_BOEHM_GC defined, includ gc.h.
	* Makefile.in: Rebuilt.
	* Makefile.am (INCLUDES): New macro.
	* config.h.in, configure: Rebuilt.
	* acconfig.h (HAVE_BOEHM_GC): Define.
	* configure.in: Handle --enable-java-gc.

From-SVN: r31971

libjava/libltdl/ChangeLog

+2000-02-14  Tom Tromey  <tromey@cygnus.com>
+
+	* ltdl.c: If HAVE_BOEHM_GC defined, includ gc.h.
+	* Makefile.in: Rebuilt.
+	* Makefile.am (INCLUDES): New macro.
+	* config.h.in, configure: Rebuilt.
+	* acconfig.h (HAVE_BOEHM_GC): Define.
+	* configure.in: Handle --enable-java-gc.
+

libjava/libltdl/Makefile.am

@@ -2,6 +2,8 @@
 
 AUTOMAKE_OPTIONS = no-dependencies foreign
 
+INCLUDES = $(GCINCS)
+
 if INSTALL_LTDL
 include_HEADERS = ltdl.h
 lib_LTLIBRARIES = libltdl.la

libjava/libltdl/Makefile.in

@@ -62,6 +62,7 @@ host_triplet = @host@
 AS = @AS@
 CC = @CC@
 DLLTOOL = @DLLTOOL@
+GCINCS = @GCINCS@
 LIBADD_DL = @LIBADD_DL@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
@@ -75,6 +76,8 @@ VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = no-dependencies foreign
 
+INCLUDES = $(GCINCS)
+
 @INSTALL_LTDL_TRUE@include_HEADERS = \
 @INSTALL_LTDL_TRUE@ltdl.h
 @INSTALL_LTDL_TRUE@lib_LTLIBRARIES = \
@@ -114,8 +117,9 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 HEADERS =  $(include_HEADERS) $(noinst_HEADERS)
 
-DIST_COMMON =  README ./stamp-h.in COPYING.LIB Makefile.am Makefile.in \
-acconfig.h acinclude.m4 aclocal.m4 config.h.in configure configure.in
+DIST_COMMON =  README ./stamp-h.in COPYING.LIB ChangeLog Makefile.am \
+Makefile.in acconfig.h acinclude.m4 aclocal.m4 config.h.in configure \
+configure.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

libjava/libltdl/acconfig.h

@@ -10,3 +10,6 @@
 
 /* Define if you have the shl_load function.  */
 #undef HAVE_SHL_LOAD
+
+/* Define if you are using the Boehm GC.  */
+#undef HAVE_BOEHM_GC

libjava/libltdl/config.h.in

@@ -18,6 +18,9 @@
 /* Define if you have the shl_load function.  */
 #undef HAVE_SHL_LOAD
 
+/* Define if you are using the Boehm GC.  */
+#undef HAVE_BOEHM_GC
+
 /* Define if you have the dlerror function.  */
 #undef HAVE_DLERROR
 

libjava/libltdl/configure.in

@@ -27,6 +27,22 @@ AC_SUBST(LIBTOOL_DEPS)
 AC_ARG_ENABLE(ltdl-install,
 [  --enable-ltdl-install   install libltdl])
 
+AC_MSG_CHECKING([for garbage collector to use])
+AC_ARG_ENABLE(java-gc,
+changequote(<<,>>)dnl
+<<  --enable-java-gc=TYPE   choose garbage collector [boehm]>>,
+changequote([,])
+  GC=$enableval,
+  GC=boehm)
+
+GCINCS=
+if test "$GC" = "boehm"; then
+   GCINCS='-I$(top_srcdir)/../../boehm-gc -I$(top_builddir)/../../boehm-gc'
+   GCINCS="$GCINCS `cat ../../boehm-gc/boehm-cflags`"
+   AC_DEFINE(HAVE_BOEHM_GC)
+fi
+AC_SUBST(GCINCS)
+
 AM_CONDITIONAL(INSTALL_LTDL, test x"${enable_ltdl_install-no}" != xno)
 AM_CONDITIONAL(CONVENIENCE_LTDL, test x"${enable_ltdl_convenience-no}" != xno)
 

libjava/libltdl/ltdl.c

@@ -58,6 +58,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 #include <stdio.h>
 #endif
 
+#if HAVE_BOEHM_GC
+#include <gc.h>
+#endif
+
 #include "ltdl.h"
 
 /* max. filename length */

libjava/libltdl/stamp-h.in

+timestamp