* configure.ac (AC_CONFIG_SUBDIRS): Moved to the end of the file and

export OPT_CFLAGS/ARCH_CFLAGS instead of CFLAGS.

* src/boehm-gc/configure.in: Pass CFLAGS to Makefile's as for CACAO.
* src/boehm-gc/Makefile.am (AM_CXXFLAGS, AM_CFLAGS): Commented.
(AM_CPPFLAGS): Added.

diff --git a/configure.ac b/configure.ac
index cc63d1c6c49685facbebf638345a60080c8d8690..9d1b56af85aa07e4ff0f75d59e1a736b64f42c6d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -110,7 +110,7 @@ case "$host_os" in
 esac
 
 
-dnl temporary set the CFLAGS for configure tests
+dnl temporary set the CFLAGS for configure tests (e.g. inline keyword)
 dnl we set it properly at the end of this file
 CFLAGS="$ARCH_CFLAGS $OPT_CFLAGS"
 
@@ -496,7 +496,7 @@ native | posix | pthreads)
 
     dnl we changed ARCH_CFLAGS, set CFLAGS again
     CFLAGS="$ARCH_CFLAGS $OPT_CFLAGS"
-    
+
     dnl tell boehm to support threads as well
     ac_configure_args="$ac_configure_args --enable-boehm-threads=posix"
     ;;
@@ -812,12 +812,6 @@ AC_PROG_JAVAC
 AC_PROG_JAR
 
 
-dnl now configure subpackages
-dnl the export is not my favorite (is there another way?)
-export CFLAGS
-AC_CONFIG_SUBDIRS(src/boehm-gc)
-
-
 dnl finally pass CFLAGS to Makefiles via AM_CFLAGS
 CFLAGS=$OPT_CFLAGS
 AM_CFLAGS=$ARCH_CFLAGS
@@ -886,6 +880,13 @@ AC_CONFIG_FILES([Makefile]
                [tests/regression/codepatching/Makefile]
                [tests/regression/native/Makefile])
 
+
+dnl now configure subpackages with OPT_CFLAGS and ARCH_CFLAGS
+export OPT_CFLAGS
+export ARCH_CFLAGS
+AC_CONFIG_SUBDIRS(src/boehm-gc)
+
+
 AC_OUTPUT
 
 

diff --git a/src/boehm-gc/Makefile.am b/src/boehm-gc/Makefile.am
index 1f8dbc293075816d2645d3a43ac569e1b5cffdb9..a0ff840d476ed676ce916e80eef729d801555e40 100644 (file)
--- a/src/boehm-gc/Makefile.am
+++ b/src/boehm-gc/Makefile.am
@@ -70,8 +70,9 @@ libgccpp_la_LDFLAGS = -version-info 1:2:0
 
 EXTRA_DIST += alpha_mach_dep.S mips_sgi_mach_dep.s sparc_mach_dep.S
 
-AM_CXXFLAGS = @GC_CFLAGS@
-AM_CFLAGS = @GC_CFLAGS@ -I$(top_builddir)/include
+#AM_CXXFLAGS = @GC_CFLAGS@
+#AM_CFLAGS = @GC_CFLAGS@ -I$(top_builddir)/include
+AM_CPPFLAGS = -I$(top_builddir)/include
 
 if CPLUSPLUS
 extra_checks = test_cpp

diff --git a/src/boehm-gc/configure.in b/src/boehm-gc/configure.in
index d54649d0cf2bca723f91a6d1af8849a4718819b8..45e7ec672ccb30baee6391307787731394d740b5 100644 (file)
--- a/src/boehm-gc/configure.in
+++ b/src/boehm-gc/configure.in
@@ -22,7 +22,7 @@ AC_INIT(gc,6.8,Hans.Boehm@hp.com)
 AC_CONFIG_SRCDIR(gcj_mlc.c)
 AC_CANONICAL_TARGET 
 AC_PREREQ(2.53)
-AC_REVISION($Revision: 5229 $)
+AC_REVISION($Revision: 5267 $)
 GC_SET_VERSION
 AM_INIT_AUTOMAKE
 
@@ -420,6 +420,11 @@ dnl We need to override the top-level CFLAGS.  This is how we do it.
 dnl MY_CFLAGS="$CFLAGS"
 dnl AC_SUBST(MY_CFLAGS)
 
+dnl pass CFLAGS to Makefiles via AM_CFLAGS
+CFLAGS=$OPT_CFLAGS
+AM_CFLAGS=$ARCH_CFLAGS
+AC_SUBST(AM_CFLAGS)
+
 dnl Include defines that have become de facto standard.
 dnl ALL_INTERIOR_POINTERS can be overridden in startup code.
 AC_DEFINE([SILENT], 1, [silent])