libjava/ChangeLog.merge

2012-12-01  Matthias Klose  <doko@ubuntu.com>

	* configure.ac: Define and substitute GCDEFS.
	Add -DGC_GCJ_SUPPORT when built for boehm-gc.
	* Makefile.am (AM_CXXFLAGS): Add @GCDEFS@.
	* configure, Makefile.in: Regenerate.

Index: configure.ac
===================================================================
--- configure.ac	(Revision 194043)
+++ configure.ac	(Arbeitskopie)
@@ -987,6 +987,7 @@
   [GC=boehm])
 GCLIBS=
 GCINCS=
+GCDEFS=
 GCDEPS=
 GCSPEC=
 JC1GCSPEC=
@@ -994,6 +995,7 @@
 case "$GC" in
  boehm)
     AC_MSG_RESULT(boehm)
+    GCDEFS=-DGC_GCJ_SUPPORT
     GCLIBS=../boehm-gc/libgc_convenience.la
     JC1GCSPEC='-fuse-boehm-gc'
     GCTESTSPEC="-L`${PWDCMD-pwd}`/../boehm-gc/.libs -rpath `${PWDCMD-pwd}`/../boehm-gc/.libs"
@@ -1013,6 +1015,7 @@
 esac
 AC_SUBST(GCLIBS)
 AC_SUBST(GCINCS)
+AC_SUBST(GCDEFS)
 AC_SUBST(GCDEPS)
 AC_SUBST(GCSPEC)
 AC_SUBST(JC1GCSPEC)
Index: Makefile.am
===================================================================
--- Makefile.am	(Revision 194043)
+++ Makefile.am	(Arbeitskopie)
@@ -361,6 +361,7 @@
 	@LIBGCJ_CXXFLAGS@ \
 	$(WARNINGS) \
 	-D_GNU_SOURCE \
+	@GCDEFS@ \
 	-DPREFIX="\"$(prefix)\"" \
 	-DTOOLEXECLIBDIR="\"$(toolexeclibdir)\"" \
         -DJAVA_HOME="\"$(JAVA_HOME_DIR)\"" \