Merged r5489 from trunk:

* configure.ac (INTRP_CFLAGS): Moved a bit.
* src/vm/jit/intrp/Makefile.am (CFLAGS): Don't define.
(AM_CFLAGS): Define as INTRP_CFLAGS, that seems to be the correct way.

--HG--
branch : unified_variables

diff --git a/configure.ac b/configure.ac
index 721b6128d7d9569056684f5a35af1ff231b41443..9dc89a385e232a4aa7ce917c9e36e9cc687ae718 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -114,6 +114,8 @@ 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"
 
+dnl set interpreter flags
+AC_SUBST(INTRP_CFLAGS)
 
 dnl define some stuff required for --fullversion
 AC_DEFINE_UNQUOTED(VERSION_CONFIGURE_ARGS, "$ac_configure_args", [configure arguments])
@@ -125,7 +127,6 @@ dnl define and substitute some architecture specific variables
 AC_DEFINE_UNQUOTED([ARCH_DIR], "${ARCH_DIR}", [architecture directory])
 AC_SUBST(ARCH_DIR)
 AC_SUBST(OS_DIR)
-AC_SUBST(INTRP_CFLAGS)
 AC_SUBST(USE_SCHEDULER)
 
 

diff --git a/src/vm/jit/intrp/Makefile.am b/src/vm/jit/intrp/Makefile.am
index f608e81b1902cd776fab286b89d463dcbb9f4d1a..87320353997f6a584a80a76d622e6914796c0948 100644 (file)
--- a/src/vm/jit/intrp/Makefile.am
+++ b/src/vm/jit/intrp/Makefile.am
@@ -28,11 +28,11 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4947 2006-05-24 14:08:56Z twisti $
+## $Id: Makefile.am 5553 2006-09-28 18:45:10Z edwin $
 
 ## Process this file with automake to produce Makefile.in
 
-CFLAGS = $(INTRP_CFLAGS)
+AM_CFLAGS = $(INTRP_CFLAGS)
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR) -I$(top_srcdir)/src/vm/jit/$(ARCH_DIR)/$(OS_DIR) -I$(top_builddir) -I$(top_builddir)/src
 
 LIBS =