M mozilla/Makefile.in

M src/Makefile.in

- Force logging to be enabled, regardless of debugging setting.

M src/PlugletEngine.cpp

- Make sure to disable JVM debugging.

java/plugins/mozilla/Makefile.in

@@ -82,6 +82,8 @@ INCLUDES += \
 CXXFLAGS += /Zi /Yd
 endif
 
+CXXFLAGS += -DFORCE_PR_LOG
+
 DEFINES += -DMOZILLA_STRICT_API
 
 ifeq ($(OS_ARCH),Linux)

java/plugins/src/Makefile.in

@@ -85,7 +85,7 @@ XPIDLSRCS 	= \
 	iPlugletManager.idl \
 		$(NULL)
 
-CXXFLAGS := $(MOZ_TOOLKIT_REGISTRY_CFLAGS) -DMOZILLA_INTERNAL_API -D_REENTRANT  -DOJI_DISABLE $(CXXFLAGS) 
+CXXFLAGS := $(MOZ_TOOLKIT_REGISTRY_CFLAGS) -DMOZILLA_INTERNAL_API -D_REENTRANT  -DOJI_DISABLE $(CXXFLAGS) -DFORCE_PR_LOG
 
 ifeq ($(OS_ARCH),Darwin)
  INCLUDES += -I$(MOZ_JDKHOME)/include -I.

java/plugins/src/PlugletEngine.cpp

@@ -202,7 +202,7 @@ void PlugletEngine::StartJVM() {
     options[3].optionString=""; //-Djava.compiler=NONE";
     vm_args.version = JNI_VERSION_1_4;
     vm_args.options = options;
-    vm_args.nOptions = 3; // EDBURNS: Change to 4 for debugging
+    vm_args.nOptions = 1; // EDBURNS: Change to 3 for debugging
     vm_args.ignoreUnrecognized = JNI_FALSE;
     /* Create the Java VM */
     res = JNI_CreateJavaVM(&jvm, (void**)&env, &vm_args);