[vmkit-commits] [vmkit] r83205 - in /vmkit/trunk: autoconf/configure.ac configure include/mvm/Config/config.h.in lib/Mvm/GCMmap2/MvmGC.h

[Gael Thomas]

Author: gthomas
Date: Thu Oct  1 12:35:09 2009
New Revision: 83205

URL: http://llvm.org/viewvc/llvm-project?rev=83205&view=rev
Log:
Hi llvm :) (for my second commit)
Define WITHOUT_FINALIZER through a gcc option and not through config.h to avoid collision between vmkit's and llvm's config.h


Modified:
    vmkit/trunk/autoconf/configure.ac
    vmkit/trunk/configure
    vmkit/trunk/include/mvm/Config/config.h.in
    vmkit/trunk/lib/Mvm/GCMmap2/MvmGC.h

Modified: vmkit/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/autoconf/configure.ac?rev=83205&r1=83204&r2=83205&view=diff

==============================================================================
--- vmkit/trunk/autoconf/configure.ac (original)
+++ vmkit/trunk/autoconf/configure.ac Thu Oct  1 12:35:09 2009
@@ -190,7 +190,7 @@
 )
 
 if test ! "x$withfinalizer" = "xyes";  then
-  AC_DEFINE(WITHOUT_FINALIZER, [1], [Not using finalizer])
+  VM_FLAGS="$VM_FLAGS -DWITHOUT_FINALIZER"
 fi
 
 dnl **************************************************************************

Modified: vmkit/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/configure?rev=83205&r1=83204&r2=83205&view=diff

==============================================================================
--- vmkit/trunk/configure (original)
+++ vmkit/trunk/configure Thu Oct  1 12:35:09 2009
@@ -4021,11 +4021,7 @@
 
 
 if test ! "x$withfinalizer" = "xyes";  then
-
-cat >>confdefs.h <<\_ACEOF
-#define WITHOUT_FINALIZER 1
-_ACEOF
-
+  VM_FLAGS="$VM_FLAGS -DWITHOUT_FINALIZER"
 fi
 
 

Modified: vmkit/trunk/include/mvm/Config/config.h.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/Config/config.h.in?rev=83205&r1=83204&r2=83205&view=diff

==============================================================================
--- vmkit/trunk/include/mvm/Config/config.h.in (original)
+++ vmkit/trunk/include/mvm/Config/config.h.in Thu Oct  1 12:35:09 2009
@@ -9,9 +9,6 @@
 /* Define to 1 if you have the `gc' library (-lgc). */
 #undef HAVE_LIBGC
 
-/* Define to 1 if you are not using finalizers */
-#undef WITHOUT_FINALIZER
-
 /* Define to 1 if you have the `pthread' library (-lpthread). */
 #undef HAVE_LIBPTHREAD
 

Modified: vmkit/trunk/lib/Mvm/GCMmap2/MvmGC.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/GCMmap2/MvmGC.h?rev=83205&r1=83204&r2=83205&view=diff

==============================================================================
--- vmkit/trunk/lib/Mvm/GCMmap2/MvmGC.h (original)
+++ vmkit/trunk/lib/Mvm/GCMmap2/MvmGC.h Thu Oct  1 12:35:09 2009
@@ -12,7 +12,6 @@
 #define MVM_MMAP_GC_H
 
 #include <sys/types.h>
-#include "mvm/Config/config.h"
 #include "mvm/GC/GC.h"
 #include "types.h"
 #include "gcalloc.h"