[kaffe] CVS kaffe (dalibor): Fixed --enable-feedback

[Kaffe CVS]

PatchSet 4836 
Date: 2004/06/10 18:19:24
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Fixed --enable-feedback

2004-06-10  Dalibor Topic  <robilad at kaffe.org>,
            Julian Scheid <julian at sektor37.de>

        * configure.ac:
        Fixed --enable-feedback.

        * configure:
        Regenerated.

        * kaffe/kaffe/main.c,
        kaffe/kaffevm/baseClasses.c,
        kaffe/kaffevm/external.c,
        kaffe/kaffevm/jni.c,
        kaffe/kaffevm/jit3/machine.c:
        Only include feedback.h if KAFFE_FEEDBACK is defined.

        Reported by: Julian Scheid <julian at sektor37.de>

Members: 
	ChangeLog:1.2403->1.2404 
	configure:1.329->1.330 
	configure.ac:1.28->1.29 
	kaffe/kaffe/main.c:1.54->1.55 
	kaffe/kaffevm/baseClasses.c:1.50->1.51 
	kaffe/kaffevm/external.c:1.57->1.58 
	kaffe/kaffevm/jni.c:1.112->1.113 
	kaffe/kaffevm/jit3/machine.c:1.51->1.52 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2403 kaffe/ChangeLog:1.2404
--- kaffe/ChangeLog:1.2403	Thu Jun 10 16:25:09 2004
+++ kaffe/ChangeLog	Thu Jun 10 18:19:24 2004
@@ -1,3 +1,21 @@
+2004-06-10  Dalibor Topic  <robilad at kaffe.org>,
+	    Julian Scheid <julian at sektor37.de>
+
+        * configure.ac:
+	Fixed --enable-feedback.
+
+        * configure:
+	Regenerated.
+
+        * kaffe/kaffe/main.c,
+        kaffe/kaffevm/baseClasses.c,
+        kaffe/kaffevm/external.c,
+        kaffe/kaffevm/jni.c,
+        kaffe/kaffevm/jit3/machine.c:
+	Only include feedback.h if KAFFE_FEEDBACK is defined.
+
+	Reported by: Julian Scheid <julian at sektor37.de>
+
 2004-06-10  Dalibor Topic  <robilad at kaffe.org>
 
 	* libraries/javalib/Makefile.am.in
Index: kaffe/configure
diff -u kaffe/configure:1.329 kaffe/configure:1.330
--- kaffe/configure:1.329	Mon Jun  7 19:14:08 2004
+++ kaffe/configure	Thu Jun 10 18:19:27 2004
@@ -26448,12 +26448,16 @@
 if test "${enable_feedback+set}" = set; then
   enableval="$enable_feedback"
 
-fi;
-
 case "$enable_feedback" in
 no) ;;
 *) need_libxprof=yes; CPPFLAGS="$CPPFLAGS -DKAFFE_FEEDBACK";;
 esac
+
+else
+  enable_feedback=no
+need_libxprof=no
+
+fi;
 
 
 
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.28 kaffe/configure.ac:1.29
--- kaffe/configure.ac:1.28	Mon Jun  7 19:14:11 2004
+++ kaffe/configure.ac	Thu Jun 10 18:19:35 2004
@@ -570,12 +570,16 @@
 
 AC_ARG_ENABLE([feedback],
               AS_HELP_STRING([--enable-feedback],
-                             [Enable generation of feedback data]))
-
+                             [Enable generation of feedback data]),
+[
 case "$enable_feedback" in
 no) ;;
 *) need_libxprof=yes; CPPFLAGS="$CPPFLAGS -DKAFFE_FEEDBACK";;
 esac
+],
+[enable_feedback=no
+need_libxprof=no
+])
 
 AM_CONDITIONAL(NEED_LIBXPROF, test x"$need_libxprof" = x"yes")
 
Index: kaffe/kaffe/kaffe/main.c
diff -u kaffe/kaffe/kaffe/main.c:1.54 kaffe/kaffe/kaffe/main.c:1.55
--- kaffe/kaffe/kaffe/main.c:1.54	Fri Jun  4 19:32:37 2004
+++ kaffe/kaffe/kaffe/main.c	Thu Jun 10 18:19:37 2004
@@ -31,7 +31,9 @@
 #include "debugFile.h"
 #include "xprofiler.h"
 #include "fileSections.h"
+#if defined(KAFFE_FEEDBACK)
 #include "feedback.h"
+#endif
 #include "methodCache.h"
 #include "external.h"
 
Index: kaffe/kaffe/kaffevm/baseClasses.c
diff -u kaffe/kaffe/kaffevm/baseClasses.c:1.50 kaffe/kaffe/kaffevm/baseClasses.c:1.51
--- kaffe/kaffe/kaffevm/baseClasses.c:1.50	Mon Mar 29 21:13:33 2004
+++ kaffe/kaffe/kaffevm/baseClasses.c	Thu Jun 10 18:19:40 2004
@@ -35,7 +35,9 @@
 #include "java_lang_Cloneable.h"
 #include "gcj/gcj.h"
 #include "xprofiler.h"
+#if defined(KAFFE_FEEDBACK)
 #include "feedback.h"
+#endif
 #include "debugFile.h"
 #include "fileSections.h"
 #include "verify-type.h"
Index: kaffe/kaffe/kaffevm/external.c
diff -u kaffe/kaffe/kaffevm/external.c:1.57 kaffe/kaffe/kaffevm/external.c:1.58
--- kaffe/kaffe/kaffevm/external.c:1.57	Sun Apr 18 13:57:26 2004
+++ kaffe/kaffe/kaffevm/external.c	Thu Jun 10 18:19:40 2004
@@ -42,7 +42,9 @@
 #include "stats.h"
 #define LT_NON_POSIX_NAMESPACE
 #include "ltdl.h"
+#if defined(KAFFE_FEEDBACK)
 #include "feedback.h"
+#endif
 #include "jni_i.h"
 
 #ifdef __riscos__
Index: kaffe/kaffe/kaffevm/jni.c
diff -u kaffe/kaffe/kaffevm/jni.c:1.112 kaffe/kaffe/kaffevm/jni.c:1.113
--- kaffe/kaffe/kaffevm/jni.c:1.112	Sun Apr 25 19:57:48 2004
+++ kaffe/kaffe/kaffevm/jni.c	Thu Jun 10 18:19:41 2004
@@ -43,7 +43,9 @@
 #include "basecode.h"
 #include "icode.h"
 #include "machine.h"
+#if defined(KAFFE_FEEDBACK)
 #include "feedback.h"
+#endif
 #endif
 #include "jvmpi_kaffe.h"
 #include "jni_i.h"
Index: kaffe/kaffe/kaffevm/jit3/machine.c
diff -u kaffe/kaffe/kaffevm/jit3/machine.c:1.51 kaffe/kaffe/kaffevm/jit3/machine.c:1.52
--- kaffe/kaffe/kaffevm/jit3/machine.c:1.51	Mon May 24 13:18:54 2004
+++ kaffe/kaffe/kaffevm/jit3/machine.c	Thu Jun 10 18:19:41 2004
@@ -51,7 +51,9 @@
 #include "methodCache.h"
 #include "support.h"
 #include "xprofiler.h"
+#if defined(KAFFE_FEEDBACK)
 #include "feedback.h"
+#endif
 #include "debugFile.h"
 #include "fileSections.h"
 #include "mangle.h"