confugure for heapanal: bugfix

[r2834]

diff --git a/configure b/configure
index d9cc073..4260498 100755 (executable)
--- a/configure
+++ b/configure
@@ -1314,16 +1314,10 @@ else
   enable_heapanalysis="no"
 fi;
 if test "$enable_heapanalysis" = "no"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define DO_HEAPANALYSIS 0
-_ACEOF
-
   echo "$as_me:$LINENO: result: heapanalysis disabled" >&5
 echo "${ECHO_T}heapanalysis disabled" >&6
 else
-
-cat >>confdefs.h <<\_ACEOF
+  cat >>confdefs.h <<\_ACEOF
 #define DO_HEAPANALYSIS 1
 _ACEOF
 
@@ -1332,7 +1326,6 @@ echo "${ECHO_T}heapanalysis enabled" >&6
 fi
 
 
-
 # Check whether --enable-libiberty or --disable-libiberty was given.
 if test "${enable_libiberty+set}" = set; then
   enableval="$enable_libiberty"

diff --git a/configure.in b/configure.in
index b2610e4..8b13ad8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -98,16 +98,13 @@ dnl -------------------------
 AC_ARG_ENABLE(heapanalysis, [  --enable-heapanalysis       Compile with heap analysis.],
         [enable_heapanalysis=$enableval], [enable_heapanalysis="no"])
 if test "$enable_heapanalysis" = "no"; then
-  AC_DEFINE(DO_HEAPANALYSIS, 0, [Don't compile with heap analysis])
   AC_MSG_RESULT([heapanalysis disabled])
 else
-  AC_DEFINE(DO_HEAPANALYSIS, 1, [Compile with heap analysis])
+  AC_DEFINE(DO_HEAPANALYSIS)
   AC_MSG_RESULT([heapanalysis enabled])
 fi
 AC_SUBST(enable_heapanalysis)
 
-dnl to be used!! AM_CONDITIONAL(FIRM_HEAPANALYSIS, test "$enable_heapanalysis" != "no")
-
 dnl disable linking of libiberty parts (xmalloc, xprintf, obstack, ...)
 dnl ----------------------
 AC_ARG_ENABLE(libiberty,

diff --git a/ir/ir/irdump.c b/ir/ir/irdump.c
index 4ad1aab..ffd76fe 100644 (file)
--- a/ir/ir/irdump.c
+++ b/ir/ir/irdump.c
@@ -42,7 +42,7 @@
 # include "pmap.h"
 # include "eset.h"
 
-#ifdef DO_HEAPANALYSIS
+#if DO_HEAPANALYSIS
 void dump_chi_term(FILE *FL, ir_node *n);
 void dump_state(FILE *FL, ir_node *n);
 int  get_opt_dump_abstvals(void);
@@ -795,7 +795,7 @@ static void dump_node(ir_node *n)
   dump_node_vcgattr(n, bad);
   fprintf(F, "}\n");
   dump_const_node_local(n);
-#ifdef DO_HEAPANALYSIS
+#if DO_HEAPANALYSIS
   dump_chi_term(F, n);
   dump_state(F, n);
 #endif
@@ -991,7 +991,7 @@ dump_whole_block(ir_node *block) {
   fprintf(F, "\"  label: \"");
   dump_node_opcode(F, block);
   fprintf (F, " %ld", get_irn_node_nr(block));
-#ifdef DO_HEAPANALYSIS
+#if DO_HEAPANALYSIS
   if (get_opt_dump_abstvals())
     fprintf (F, " seqno: %d", (int)get_Block_seqno(block));
 #endif
@@ -1010,7 +1010,7 @@ dump_whole_block(ir_node *block) {
   /* Close the vcg information for the block */
   fprintf(F, "}\n");
   dump_const_node_local(block);
-#ifdef DO_HEAPANALYSIS
+#if DO_HEAPANALYSIS
   dump_chi_term(F, block);
 #endif
   fprintf(F, "\n");