[vmkit-commits] [vmkit] r54739 - in /vmkit/trunk: autoconf/configure.ac configure include/mvm/Config/config.h.in tools/vmkit/Launcher.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Wed Aug 13 09:56:28 2008
New Revision: 54739

URL: http://llvm.org/viewvc/llvm-project?rev=54739&view=rev
Log:
Configure WITH_N3 and WITH_JNJVM to be in config.h.


Modified:
    vmkit/trunk/autoconf/configure.ac
    vmkit/trunk/configure
    vmkit/trunk/include/mvm/Config/config.h.in
    vmkit/trunk/tools/vmkit/Launcher.cpp

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

==============================================================================
--- vmkit/trunk/autoconf/configure.ac (original)
+++ vmkit/trunk/autoconf/configure.ac Wed Aug 13 09:56:28 2008
@@ -266,6 +266,7 @@
 
 if test "x${WITH_JNJVM}" = "xyes"; then
   WITH_JNJVM=1;
+  AC_DEFINE([WITH_JNJVM], [1], [With JNJVM])
 else
   WITH_JNJVM=0;
 fi 
@@ -301,6 +302,7 @@
   echo Using ${pnetlocalprefix} as PNET local prefix;
   WITH_N3_PNETLIB=1;
   WITH_N3=1;
+  AC_DEFINE([WITH_N3], [1], [With N3])
 else
   WITH_N3_PNETLIB=0;
 fi

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

==============================================================================
--- vmkit/trunk/configure (original)
+++ vmkit/trunk/configure Wed Aug 13 09:56:28 2008
@@ -3993,6 +3993,11 @@
 
 if test "x${WITH_JNJVM}" = "xyes"; then
   WITH_JNJVM=1;
+
+cat >>confdefs.h <<\_ACEOF
+#define WITH_JNJVM 1
+_ACEOF
+
 else
   WITH_JNJVM=0;
 fi
@@ -4031,6 +4036,11 @@
   echo Using ${pnetlocalprefix} as PNET local prefix;
   WITH_N3_PNETLIB=1;
   WITH_N3=1;
+
+cat >>confdefs.h <<\_ACEOF
+#define WITH_N3 1
+_ACEOF
+
 else
   WITH_N3_PNETLIB=0;
 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=54739&r1=54738&r2=54739&view=diff

==============================================================================
--- vmkit/trunk/include/mvm/Config/config.h.in (original)
+++ vmkit/trunk/include/mvm/Config/config.h.in Wed Aug 13 09:56:28 2008
@@ -87,6 +87,9 @@
 /* Compiling N3 */
 #undef WITH_N3
 
+/* Compiling JNJVM */
+#undef WITH_JNJVM
+
 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t
 

Modified: vmkit/trunk/tools/vmkit/Launcher.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmkit/Launcher.cpp?rev=54739&r1=54738&r2=54739&view=diff

==============================================================================
--- vmkit/trunk/tools/vmkit/Launcher.cpp (original)
+++ vmkit/trunk/tools/vmkit/Launcher.cpp Wed Aug 13 09:56:28 2008
@@ -13,6 +13,7 @@
 #include "llvm/Support/ManagedStatic.h"
 
 #include "MvmGC.h"
+#include "mvm/Config/config.h"
 #include "mvm/JIT.h"
 #include "mvm/Object.h"
 #include "mvm/VirtualMachine.h"
@@ -61,16 +62,24 @@
   }
   
   if (VMToRun == RunJava) {
+#if WITH_JNJVM
     mvm::VirtualMachine::initialiseJVM();
     mvm::VirtualMachine* vm = mvm::VirtualMachine::createJVM();
     vm->runApplication(argc, argv);
+#endif
   } else if (VMToRun == RunNet) {
+#if WITH_N3
     mvm::VirtualMachine::initialiseCLIVM();
     mvm::VirtualMachine* vm = mvm::VirtualMachine::createCLIVM();
     vm->runApplication(argc, argv);
+#endif
   } else {
+#if WITH_JNJVM
     mvm::VirtualMachine::initialiseJVM();
+#endif
+#if WITH_N3
     mvm::VirtualMachine::initialiseCLIVM();
+#endif
     mvm::CommandLine MyCl;
     MyCl.vmlets["java"] = (mvm::VirtualMachine::createJVM);
     MyCl.vmlets["net"] = (mvm::VirtualMachine::createCLIVM);