diff --git a/config/config.mk b/config/config.mk
index 1d33e0303832..6146ca6fe755 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -163,12 +163,14 @@ OS_CONFIG	:= $(OS_ARCH)$(OS_RELEASE)
 DEBUG_FLAGS :=
 
 ifndef MOZ_DEBUG
-  #global debugging is disabled - check if it was explicitly enabled for this module
+  # global debugging is disabled 
+  # check if it was explicitly enabled for this module
   ifneq (, $(findstring $(MODULE), $(MOZ_DEBUG_MODULES)))
     MOZ_DEBUG:=1
-endif
+  endif
 else
-  #global debugging is enabled - check if it was explicitly disabled for this module
+  # global debugging is enabled
+  # check if it was explicitly disabled for this module
   ifneq (, $(findstring ^$(MODULE), $(MOZ_DEBUG_MODULES)))
     MOZ_DEBUG:=
   endif
@@ -180,45 +182,56 @@ else
   DEBUG_FLAGS += $(MOZ_DEBUG_DISABLE_DEFS)
 endif
 
+# determine if -g should be passed to the compiler, based on
+# the current module, and the value of MOZ_DBGRINFO_MODULES
+
 ifdef MOZ_DEBUG
-  # debugging is enabled - determine if -g should be passed to the compiler, based on
-  # the current module, and the value of MOZ_DBGRINFO_MODULES
+  MOZ_DBGRINFO_MODULES += ALL_MODULES
+  pattern := ALL_MODULES ^ALL_MODULES
+else
+  MOZ_DBGRINFO_MODULES += ^ALL_MODULES
+  pattern := ^ALL_MODULES
+endif
 
-  pattern:=ALL_MODULES ^ALL_MODULES
-  ifdef MODULE
-    # our current Makefile specifies a module name - add it to our pattern
-    pattern += $(MODULE) ^$(MODULE)
-  endif
+ifdef MODULE
+  # our current Makefile specifies a module name - add it to our pattern
+  pattern += $(MODULE) ^$(MODULE)
+endif
 
-  # start by finding the first relevant module name (remember that the order of the
-  # module names in MOZ_DBGRINFO_MODULES is reversed from the order the user
-  # specified to configure - this allows the user to put general names at the beginning
-  # of the list, and to override them with explicit module names later in the list)
-  first_match:=$(firstword $(filter $(pattern), $(MOZ_DBGRINFO_MODULES)))
-  ifeq ($(first_match), $(MODULE))
-    # the user specified explicitly that this module should be compiled with -g
-    DEBUG_FLAGS += $(MOZ_DEBUG_FLAGS)
+# start by finding the first relevant module name 
+# (remember that the order of the module names in MOZ_DBGRINFO_MODULES 
+# is reversed from the order the user specified to configure - 
+# this allows the user to put general names at the beginning
+# of the list, and to override them with explicit module names later 
+# in the list)
+
+first_match:=$(firstword $(filter $(pattern), $(MOZ_DBGRINFO_MODULES)))
+
+ifeq ($(first_match), $(MODULE))
+  # the user specified explicitly that 
+  # this module should be compiled with -g
+  DEBUG_FLAGS += $(MOZ_DEBUG_FLAGS)
+else
+  ifeq ($(first_match), ^$(MODULE))
+    # the user specified explicitly that this module 
+    # should not be compiled with -g (nothing to do)
   else
-    ifeq ($(first_match), ^$(MODULE))
-      # the user specified explicitly that this module should not be compiled with -g
-      # (nothing to do)
+    ifeq ($(first_match), ALL_MODULES)
+      # the user didn't mention this module explicitly, 
+      # but wanted all modules to be compiled with -g
+      DEBUG_FLAGS += $(MOZ_DEBUG_FLAGS)
     else
-      ifeq ($(first_match), ALL_MODULES)
-        # the user didn't mention this module explicitly, but wanted all modules to be
-        # compiled with -g
-        DEBUG_FLAGS += $(MOZ_DEBUG_FLAGS)
-      else
-        ifeq ($(first_match), ^ALL_MODULES)
-          # the user didn't mention this module explicitly, but wanted all modules to be
-          # compiled without -g (nothing to do)
-        endif
+      ifeq ($(first_match), ^ALL_MODULES)
+        # the user didn't mention this module explicitly, 
+        # but wanted all modules to be compiled without -g (nothing to do)
       endif
     endif
   endif
 endif
 
-# append debug flags (these might have been above when processing
-# MOZ_DBGRINFO_MODULES)
+
+# append debug flags 
+# (these might have been above when processing MOZ_DBGRINFO_MODULES)
 OS_CFLAGS += $(DEBUG_FLAGS)
 OS_CXXFLAGS += $(DEBUG_FLAGS)
 
diff --git a/configure b/configure
index efb67d382e9d..0dd8c21dfd94 100755
--- a/configure
+++ b/configure
@@ -97,7 +97,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --disable-async-dns     Disable separate dns thread"
 ac_help="$ac_help
-  --disable-logging       Disable nsLogging facilities"
+  --disable-logging       Disable logging facilities"
 ac_help="$ac_help
   --disable-build-xpfe    Disable building of mozilla/xpfe (BROKEN)"
 ac_help="$ac_help
@@ -10948,10 +10948,15 @@ if test "${enable_logging+set}" = set; then
 fi
 
 if test "$NS_DISABLE_LOGGING"; then
-  cat >> confdefs.h <<\EOF
+    cat >> confdefs.h <<\EOF
 #define NS_DISABLE_LOGGING 1
 EOF
 
+else
+    cat >> confdefs.h <<\EOF
+#define FORCE_PR_LOG 1
+EOF
+
 fi
 
 
@@ -11364,7 +11369,7 @@ fi
 
 
 
-MOZ_DBGRINFO_MODULES="ALL_MODULES"
+MOZ_DBGRINFO_MODULES=""
 
 # Check whether --with-dbgrinfo-modules or --without-dbgrinfo-modules was given.
 if test "${with_dbgrinfo_modules+set}" = set; then
@@ -11374,6 +11379,9 @@ if test "${with_dbgrinfo_modules+set}" = set; then
                         if test "$i" = "no"; then
         i="^ALL_MODULES"
       fi
+      if test "$i" = "yes"; then
+        i="ALL_MODULES"
+      fi
       MOZ_DBGRINFO_MODULES="$i $MOZ_DBGRINFO_MODULES";
     done 
 fi
@@ -11509,12 +11517,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
     _SAVE_CXXFLAGS=$CXXFLAGS
     CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic"
     echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6
-echo "configure:11513: checking whether C++ compiler has -pedantic long long bug" >&5
+echo "configure:11521: checking whether C++ compiler has -pedantic long long bug" >&5
     if test "$cross_compiling" = yes; then
   result="maybe" 
 else
   cat > conftest.$ac_ext <<EOF
-#line 11518 "configure"
+#line 11526 "configure"
 #include "confdefs.h"
 #ifdef __cplusplus
 extern "C" void exit(int);
@@ -11523,7 +11531,7 @@ extern "C" void exit(int);
                 if (sizeof(long long) != 8) { return 1; } 
                     return 0; } 
 EOF
-if { (eval echo configure:11527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   result="no"
 else
@@ -11571,12 +11579,12 @@ _SAVE_CXXFLAGS=$CXXFLAGS
 CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}"
 
 echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6
-echo "configure:11575: checking for correct overload resolution with const and templates" >&5
+echo "configure:11583: checking for correct overload resolution with const and templates" >&5
 if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11580 "configure"
+#line 11588 "configure"
 #include "confdefs.h"
 
                       template <class T>
@@ -11606,7 +11614,7 @@ int main() {
                     
 ; return 0; }
 EOF
-if { (eval echo configure:11610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_nscap_nonconst_opeq_bug="no"
 else
@@ -11652,16 +11660,16 @@ if test "$_IGNORE_LONG_LONG_WARNINGS"; then
      _SAVE_CFLAGS="$CFLAGS"
      CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long"
      echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6
-echo "configure:11656: checking whether compiler supports -Wno-long-long" >&5
+echo "configure:11664: checking whether compiler supports -Wno-long-long" >&5
      cat > conftest.$ac_ext <<EOF
-#line 11658 "configure"
+#line 11666 "configure"
 #include "confdefs.h"
 
 int main() {
 return(0);
 ; return 0; }
 EOF
-if { (eval echo configure:11665: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11673: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
    _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
 	  _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
@@ -11910,7 +11918,7 @@ fi
 
 
 echo $ac_n "checking webshell leaks option""... $ac_c" 1>&6
-echo "configure:11914: checking webshell leaks option" >&5
+echo "configure:11922: checking webshell leaks option" >&5
 # Check whether --enable-detect-webshell-leaks or --disable-detect-webshell-leaks was given.
 if test "${enable_detect_webshell_leaks+set}" = set; then
   enableval="$enable_detect_webshell_leaks"
@@ -11984,7 +11992,7 @@ if test "${enable_efence+set}" = set; then
   enableval="$enable_efence"
   if test "$enableval" = "yes"; then
     echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6
-echo "configure:11988: checking for malloc in -lefence" >&5
+echo "configure:11996: checking for malloc in -lefence" >&5
 ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -11992,7 +12000,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lefence  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11996 "configure"
+#line 12004 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12003,7 +12011,7 @@ int main() {
 malloc()
 ; return 0; }
 EOF
-if { (eval echo configure:12007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12039,7 +12047,7 @@ fi
 
 
 echo $ac_n "checking for cplus_demangle in -liberty""... $ac_c" 1>&6
-echo "configure:12043: checking for cplus_demangle in -liberty" >&5
+echo "configure:12051: checking for cplus_demangle in -liberty" >&5
 ac_lib_var=`echo iberty'_'cplus_demangle | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -12047,7 +12055,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-liberty "-liberty" $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12051 "configure"
+#line 12059 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12058,7 +12066,7 @@ int main() {
 cplus_demangle()
 ; return 0; }
 EOF
-if { (eval echo configure:12062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12404,7 +12412,7 @@ case "$target" in
 	    # Extract the first word of "makeC++SharedLib_r", so it can be a program name with args.
 set dummy makeC++SharedLib_r; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:12408: checking for $ac_word" >&5
+echo "configure:12416: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_AIX_SHLIB_BIN'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -12549,7 +12557,7 @@ if test "$JPEG_DIR" = no; then
     SYSTEM_JPEG=
 else
     echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6
-echo "configure:12553: checking for jpeg_destroy_compress in -ljpeg" >&5
+echo "configure:12561: checking for jpeg_destroy_compress in -ljpeg" >&5
 ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -12557,7 +12565,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ljpeg $JPEG_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12561 "configure"
+#line 12569 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12568,7 +12576,7 @@ int main() {
 jpeg_destroy_compress()
 ; return 0; }
 EOF
-if { (eval echo configure:12572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12597,7 +12605,7 @@ if test "$SYSTEM_JPEG" = 1; then
   SYSTEM_JPEG= 
 else
   cat > conftest.$ac_ext <<EOF
-#line 12601 "configure"
+#line 12609 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 	#include <sys/types.h>
@@ -12611,7 +12619,7 @@ else
 	}
 	
 EOF
-if { (eval echo configure:12615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   SYSTEM_JPEG=1
 else
@@ -12649,16 +12657,16 @@ if test "$ZLIB_DIR" = no; then
     SYSTEM_ZLIB=
 else
     echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6
-echo "configure:12653: checking "for zlib.h"" >&5
+echo "configure:12661: checking "for zlib.h"" >&5
     cat > conftest.$ac_ext <<EOF
-#line 12655 "configure"
+#line 12663 "configure"
 #include "confdefs.h"
 #include "zlib.h"
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:12662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12670: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   result="yes" SYSTEM_ZLIB=1
 else
@@ -12672,7 +12680,7 @@ rm -f conftest*
 fi
 if test "$SYSTEM_ZLIB" = 1; then
     echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6
-echo "configure:12676: checking for gzread in -lz" >&5
+echo "configure:12684: checking for gzread in -lz" >&5
 ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -12680,7 +12688,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lz $ZLIB_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12684 "configure"
+#line 12692 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12691,7 +12699,7 @@ int main() {
 gzread()
 ; return 0; }
 EOF
-if { (eval echo configure:12695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12737,7 +12745,7 @@ if test "$PNG_DIR" = no; then
     SYSTEM_PNG=
 else
     echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6
-echo "configure:12741: checking for png_get_valid in -lpng" >&5
+echo "configure:12749: checking for png_get_valid in -lpng" >&5
 ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -12745,7 +12753,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpng $PNG_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12749 "configure"
+#line 12757 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12756,7 +12764,7 @@ int main() {
 png_get_valid()
 ; return 0; }
 EOF
-if { (eval echo configure:12760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12784,7 +12792,7 @@ if test "$SYSTEM_PNG" = 1; then
   SYSTEM_PNG= 
 else
   cat > conftest.$ac_ext <<EOF
-#line 12788 "configure"
+#line 12796 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 	#include <sys/types.h>
@@ -12798,7 +12806,7 @@ else
 	}
 	
 EOF
-if { (eval echo configure:12802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   SYSTEM_PNG=1
 else
@@ -12837,7 +12845,7 @@ if test "$MNG_DIR" = no; then
     SYSTEM_MNG=
 else
     echo $ac_n "checking for mng_initialize in -lmng""... $ac_c" 1>&6
-echo "configure:12841: checking for mng_initialize in -lmng" >&5
+echo "configure:12849: checking for mng_initialize in -lmng" >&5
 ac_lib_var=`echo mng'_'mng_initialize | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -12845,7 +12853,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmng $MNG_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12849 "configure"
+#line 12857 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12856,7 +12864,7 @@ int main() {
 mng_initialize()
 ; return 0; }
 EOF
-if { (eval echo configure:12860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12884,7 +12892,7 @@ if test "$SYSTEM_MNG" = 1; then
   SYSTEM_MNG= 
 else
   cat > conftest.$ac_ext <<EOF
-#line 12888 "configure"
+#line 12896 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 	#include <sys/types.h>
@@ -12898,7 +12906,7 @@ else
 	}
 	
 EOF
-if { (eval echo configure:12902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   SYSTEM_MNG=1
 else
@@ -12964,9 +12972,9 @@ CFLAGS="$CFLAGS -I${FULLCIRCLE_DIR}"
 LDFLAGS="$LDFLAGS -L${FULLCIRCLE_DIR}"
 LIBS="-lfullsoft $LIBS"
 echo $ac_n "checking "for FCInitialize in -lfullsoft"""... $ac_c" 1>&6
-echo "configure:12968: checking "for FCInitialize in -lfullsoft"" >&5;
+echo "configure:12976: checking "for FCInitialize in -lfullsoft"" >&5;
 cat > conftest.$ac_ext <<EOF
-#line 12970 "configure"
+#line 12978 "configure"
 #include "confdefs.h"
  #include <stdio.h>
 	      #include "fullsoft.h" 
@@ -12974,7 +12982,7 @@ int main() {
  FCInitialize(); exit(0); 
 ; return 0; }
 EOF
-if { (eval echo configure:12978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   FULLCIRCLE_LIBS="-I${FULLCIRCLE_DIR} -L${FULLCIRCLE_DIR} -lfullsoft" result="yes"
 else
diff --git a/configure.in b/configure.in
index eced8ad37358..d50c8cca19d6 100644
--- a/configure.in
+++ b/configure.in
@@ -2968,10 +2968,12 @@ MOZ_ARG_DISABLE_BOOL(async-dns,
   NO_UNIX_ASYNC_DNS=1)
 
 MOZ_ARG_DISABLE_BOOL(logging,
-[  --disable-logging       Disable nsLogging facilities],
+[  --disable-logging       Disable logging facilities],
   NS_DISABLE_LOGGING=1)
 if test "$NS_DISABLE_LOGGING"; then
-  AC_DEFINE(NS_DISABLE_LOGGING)
+    AC_DEFINE(NS_DISABLE_LOGGING)
+else
+    AC_DEFINE(FORCE_PR_LOG)
 fi
 AC_SUBST(NS_DISABLE_LOGGING)
 
@@ -3373,18 +3375,21 @@ dnl =    module names beginning with ^ will be disabled
 dnl = 
 dnl ========================================================
 
-MOZ_DBGRINFO_MODULES="ALL_MODULES"
+MOZ_DBGRINFO_MODULES=""
 
 MOZ_ARG_WITH_STRING(dbgrinfo-modules,
 [  --with-dbgrinfo-modules Enable/disable debugger info for specific modules],
   [ for i in `echo $withval | sed 's/,/ /g'`; do
 
-      dnl note that the list of module names is reversed as it is copied - this is
-      dnl important, as it will allow config.mk to interpret stuff like
+      dnl note that the list of module names is reversed as it is copied
+      dnl this is important, as it will allow config.mk to interpret stuff like
       dnl "^ALL_MODULES xpcom" properly
       if test "$i" = "no"; then
         i="^ALL_MODULES"
       fi
+      if test "$i" = "yes"; then
+        i="ALL_MODULES"
+      fi
       MOZ_DBGRINFO_MODULES="$i $MOZ_DBGRINFO_MODULES";
     done ])
 dnl ========================================================