allow building without jvmdi

ef/Debugger/Debugger.cpp

@@ -19,7 +19,9 @@
 #include <stdio.h>
 #include "CatchAssert.h"
 #include "Debugger.h"
+#ifdef USE_JVMDI
 #include "jvmdi.h"
+#endif
 #include "LogModule.h"
 #include "NativeCodeCache.h"
 #include "DebuggerChannel.h"
@@ -158,7 +160,9 @@ serverLoop()
 		switch(request) 
 		{
 		case 'b':
+#ifdef USE_JVMDI
 			JVMDI_SetBreakpoint(NULL, 0, 0, 0);
+#endif
 			break;
 		case 'g':
 			// Not implemented

ef/Debugger/Makefile

@@ -26,14 +26,16 @@ MODULE_NAME = EF
 DIRS = Communication
 
 CPPSRCS =		Debugger.cpp			\
-			jvmdi.cpp			\
 			$(NULL)
 
-
 LOCAL_EXPORTS = 	Debugger.h			\
-			jvmdi.h				\
 			$(NULL)
 
+ifdef USE_JVMDI
+CPPSRCS +=		jvmdi.cpp
+LOCAL_EXPORTS +=	jvmdi.h
+endif
+
 NO_PROGRAM_IN_SUBDIRS = 1
 NO_INSTALL_IN_SUBDIRS = 1
 

ef/Runtime/System/JavaVM.cpp

@@ -20,7 +20,9 @@
 #include "plstr.h"
 #include "LogModule.h"
 #include "Debugger.h"
+#ifdef USE_JVMDI
 #include "jvmdi.h"
+#endif
 #include "Thread.h"
 #include "JniRuntime.h"
 
@@ -126,8 +128,10 @@ void VM::execute(const char *className,
 		void *code;
 		code = method->compile();
 
+#ifdef USE_JVMDI
 		if (debugger.getEnabled())
 			JVMDI_SetBreakpoint((JNIEnv *) code, 0, 0, 0);
+#endif
 
 		if (!noInvoke) {
 			/* You can only jump to a static method */