--- xulrunner-1.8.1.13+nobinonly/debian/changelog	2008-04-23 02:36:20.000000000 +0200
+++ xulrunner-1.8.1.14+nobinonly/debian/changelog	2008-04-23 02:37:00.000000000 +0200
@@ -1,3 +1,26 @@
+xulrunner (1.8.1.14+nobinonly-1ubuntu1) hardy; urgency=low
+
+  * New security upstream release: 1.8.1.14 (LP: #218534)
+    Fixes USN-602-1 / mfsa-2008-20 / CVE-2008-1380
+  * Merge from debian unstable (1.8.1.14-1). Remaining ubuntu changes:
+    - debian/patches/88_force-no-pragma-visibility-for-gcc-4.2_4.3.dpatch
+    - xulrunner alternative in /usr/bin
+  * Update configure for the visibility patch:
+    - update debian/patches/99_configure.dpatch
+
+ -- Fabien Tassin <fta@sofaraway.org>  Tue, 22 Apr 2008 22:06:28 +0200
+
+xulrunner (1.8.1.14-1) unstable; urgency=low
+
+  * New security/stability upstream release (taken from upstream CVS)
+  * Fixes mfsa-2008-20, also known as CVE-2008-1380.
+  * debian/patches/38_armel.dpatch: Force to not use -fshort-wchar where it
+    fails. Closes: #476303.
+  * debian/patches/00list: Updated accordingly.
+  * debian/patches/99_configure.dpatch: Updated.
+
+ -- Mike Hommey <glandium@debian.org>  Thu, 17 Apr 2008 21:08:57 +0200
+
 xulrunner (1.8.1.13+nobinonly-0ubuntu1) hardy; urgency=low
 
   * New security upstream release: 1.8.1.13 (LP: #207171)
--- xulrunner-1.8.1.13+nobinonly/debian/patches/00list	2008-04-23 02:36:20.000000000 +0200
+++ xulrunner-1.8.1.14+nobinonly/debian/patches/00list	2008-04-23 02:37:00.000000000 +0200
@@ -39,6 +39,7 @@
 35_python_2.5
 35_zip_cache
 38_arm_xpcom_optim
+38_armel
 38_hppa_xpcom
 38_ia64_align
 38_kbsd
--- xulrunner-1.8.1.13+nobinonly/debian/patches/38_armel.dpatch	1970-01-01 01:00:00.000000000 +0100
+++ xulrunner-1.8.1.14+nobinonly/debian/patches/38_armel.dpatch	2008-04-23 02:37:00.000000000 +0200
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 38_armel.dpatch by  <glandium@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Force to not use -fshort-wchar where it fails
+
+@DPATCH@
+
+diff --git a/configure.in b/configure.in
+index ef57009..3ee27ca 100644
+--- a/configure.in
++++ b/configure.in
+@@ -2572,7 +2572,7 @@ dnl Note that we assume that mac & win32 have short wchar (see nscore.h)
+ 
+     AC_CACHE_CHECK(for compiler -fshort-wchar option, 
+         ac_cv_have_usable_wchar_option_v2,
+-        [AC_TRY_COMPILE([#include <stddef.h>
++        [AC_TRY_LINK([#include <stddef.h>
+                          $configure_static_assert_macros],
+                         [CONFIGURE_STATIC_ASSERT(sizeof(wchar_t) == 2);
+                          CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0)],
--- xulrunner-1.8.1.13+nobinonly/debian/patches/99_configure.dpatch	2008-04-23 02:36:20.000000000 +0200
+++ xulrunner-1.8.1.14+nobinonly/debian/patches/99_configure.dpatch	2008-04-23 02:37:00.000000000 +0200
@@ -2,12 +2,12 @@
 ## 99_configure.dpatch by Fabien Tassin <fta@sofaraway.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: autoconf
 
 @DPATCH@
-diff -urNad xulrunner-1.8.1.13+nobinonly~/configure xulrunner-1.8.1.13+nobinonly/configure
---- xulrunner-1.8.1.13+nobinonly~/configure	2007-12-18 22:42:55.000000000 +0100
-+++ xulrunner-1.8.1.13+nobinonly/configure	2008-03-26 14:54:03.000000000 +0100
+diff -urNad xulrunner-1.8.1.14+nobinonly~/configure xulrunner-1.8.1.14+nobinonly/configure
+--- xulrunner-1.8.1.14+nobinonly~/configure	2008-04-23 00:47:59.000000000 +0200
++++ xulrunner-1.8.1.14+nobinonly/configure	2008-04-23 01:47:25.000000000 +0200
 @@ -57,9 +57,14 @@
    --with-system-zlib[=PFX]
                            Use system libz [installed at prefix PFX]"
@@ -2501,7 +2501,7 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:7919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:7803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_have_usable_wchar_option_v2="yes"
  else
@@ -2550,17 +2550,7 @@
  if eval "test \"`echo '$''{'ac_cv_have_visibility_builtin_bug'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -8082,8 +7966,7 @@
- echo "$ac_t""$ac_cv_have_visibility_builtin_bug" 1>&6
-         if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \
-                 "$ac_cv_have_visibility_class_bug" = "no"; then
--          VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
--          WRAP_SYSTEM_INCLUDES=1
-+          VISIBILITY_FLAGS='-fvisibility=hidden'
-         else
-           VISIBILITY_FLAGS='-fvisibility=hidden'
-         fi # have visibility pragma bug
-@@ -8100,12 +7983,12 @@
+@@ -8099,12 +7983,12 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
@@ -2575,7 +2565,7 @@
  #include "confdefs.h"
  #include <sys/types.h>
  #include <$ac_hdr>
-@@ -8113,7 +7996,7 @@
+@@ -8112,7 +7996,7 @@
  DIR *dirp = 0;
  ; return 0; }
  EOF
@@ -2584,7 +2574,7 @@
    rm -rf conftest*
    eval "ac_cv_header_dirent_$ac_safe=yes"
  else
-@@ -8138,7 +8021,7 @@
+@@ -8137,7 +8021,7 @@
  # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
  if test $ac_header_dirent = dirent.h; then
  echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
@@ -2593,7 +2583,7 @@
  ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -8146,7 +8029,7 @@
+@@ -8145,7 +8029,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-ldir  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -2602,7 +2592,7 @@
  #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
-@@ -8157,7 +8040,7 @@
+@@ -8156,7 +8040,7 @@
  opendir()
  ; return 0; }
  EOF
@@ -2611,7 +2601,7 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -8179,7 +8062,7 @@
+@@ -8178,7 +8062,7 @@
  
  else
  echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
@@ -2620,7 +2610,7 @@
  ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -8187,7 +8070,7 @@
+@@ -8186,7 +8070,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lx  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -2629,7 +2619,7 @@
  #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
-@@ -8198,7 +8081,7 @@
+@@ -8197,7 +8081,7 @@
  opendir()
  ; return 0; }
  EOF
@@ -2638,7 +2628,7 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -8230,17 +8113,17 @@
+@@ -8229,17 +8113,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -2659,7 +2649,7 @@
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8270,17 +8153,17 @@
+@@ -8269,17 +8153,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -2680,7 +2670,7 @@
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8310,17 +8193,17 @@
+@@ -8309,17 +8193,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -2701,7 +2691,7 @@
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8350,17 +8233,17 @@
+@@ -8349,17 +8233,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -2722,7 +2712,7 @@
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8390,17 +8273,17 @@
+@@ -8389,17 +8273,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -2743,7 +2733,7 @@
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8431,17 +8314,17 @@
+@@ -8430,17 +8314,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -2764,7 +2754,7 @@
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8472,17 +8355,17 @@
+@@ -8471,17 +8355,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -2785,7 +2775,7 @@
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8519,17 +8402,17 @@
+@@ -8518,17 +8402,17 @@
  NEW_H=new.h
  ac_safe=`echo "new" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for new""... $ac_c" 1>&6
@@ -2806,7 +2796,7 @@
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8570,17 +8453,17 @@
+@@ -8569,17 +8453,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -2827,7 +2817,7 @@
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8614,7 +8497,7 @@
+@@ -8613,7 +8497,7 @@
  	;;
  *)
  	echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6
@@ -2836,7 +2826,7 @@
  ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -8622,7 +8505,7 @@
+@@ -8621,7 +8505,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lc_r  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -2845,7 +2835,7 @@
  #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
-@@ -8633,7 +8516,7 @@
+@@ -8632,7 +8516,7 @@
  gethostbyname_r()
  ; return 0; }
  EOF
@@ -2854,7 +2844,7 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -8663,7 +8546,7 @@
+@@ -8662,7 +8546,7 @@
  	;;
  esac
  echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6
@@ -2863,7 +2853,7 @@
  ac_lib_var=`echo m'_'atan | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -8671,7 +8554,7 @@
+@@ -8670,7 +8554,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lm  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -2872,7 +2862,7 @@
  #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
-@@ -8682,7 +8565,7 @@
+@@ -8681,7 +8565,7 @@
  atan()
  ; return 0; }
  EOF
@@ -2881,7 +2871,7 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -8716,7 +8599,7 @@
+@@ -8715,7 +8599,7 @@
  	;;
  *)
  	echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
@@ -2890,7 +2880,7 @@
  ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -8724,7 +8607,7 @@
+@@ -8723,7 +8607,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -2899,7 +2889,7 @@
  #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
-@@ -8735,7 +8618,7 @@
+@@ -8734,7 +8618,7 @@
  dlopen()
  ; return 0; }
  EOF
@@ -2908,7 +2898,7 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -8752,17 +8635,17 @@
+@@ -8751,17 +8635,17 @@
    echo "$ac_t""yes" 1>&6
    ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
@@ -2929,7 +2919,7 @@
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8798,7 +8681,7 @@
+@@ -8797,7 +8681,7 @@
      case $target in
      *-aix*)
  	echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6
@@ -2938,7 +2928,7 @@
  ac_lib_var=`echo C_r'_'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
-@@ -8806,7 +8689,7 @@
+@@ -8805,7 +8689,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lC_r  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -2947,7 +2937,7 @@
  #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
-@@ -8817,7 +8700,7 @@
+@@ -8816,7 +8700,7 @@
  demangle()
  ; return 0; }
  EOF
@@ -2956,7 +2946,7 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -8847,7 +8730,7 @@
+@@ -8846,7 +8730,7 @@
  	;;
       *)
  	echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6
@@ -2965,7 +2955,7 @@
  ac_lib_var=`echo C'_'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
-@@ -8855,7 +8738,7 @@
+@@ -8854,7 +8738,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lC  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -2974,7 +2964,7 @@
  #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
-@@ -8866,7 +8749,7 @@
+@@ -8865,7 +8749,7 @@
  demangle()
  ; return 0; }
  EOF
@@ -2983,7 +2973,7 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -8897,7 +8780,7 @@
+@@ -8896,7 +8780,7 @@
       esac
  fi
  echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
@@ -2992,7 +2982,7 @@
  ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -8905,7 +8788,7 @@
+@@ -8904,7 +8788,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -3001,7 +2991,7 @@
  #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
-@@ -8916,7 +8799,7 @@
+@@ -8915,7 +8799,7 @@
  socket()
  ; return 0; }
  EOF
@@ -3010,7 +3000,7 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -8961,7 +8844,7 @@
+@@ -8960,7 +8844,7 @@
  	_SAVE_LDFLAGS="$LDFLAGS"
  	LDFLAGS="$XLDFLAGS $LDFLAGS"
  	echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6
@@ -3019,7 +3009,7 @@
  ac_lib_var=`echo X11'_'XDrawLines | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -8969,7 +8852,7 @@
+@@ -8968,7 +8852,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lX11 $XLIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -3028,7 +3018,7 @@
  #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
-@@ -8980,7 +8863,7 @@
+@@ -8979,7 +8863,7 @@
  XDrawLines()
  ; return 0; }
  EOF
@@ -3037,7 +3027,7 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -9002,7 +8885,7 @@
+@@ -9001,7 +8885,7 @@
  fi
  
  	echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6
@@ -3046,7 +3036,7 @@
  ac_lib_var=`echo Xext'_'XextAddDisplay | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -9010,7 +8893,7 @@
+@@ -9009,7 +8893,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXext $XLIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -3055,7 +3045,7 @@
  #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
-@@ -9021,7 +8904,7 @@
+@@ -9020,7 +8904,7 @@
  XextAddDisplay()
  ; return 0; }
  EOF
@@ -3064,7 +3054,7 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -9045,7 +8928,7 @@
+@@ -9044,7 +8928,7 @@
     
       
  	echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6
@@ -3073,7 +3063,7 @@
  ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -9053,7 +8936,7 @@
+@@ -9052,7 +8936,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXt  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -3082,7 +3072,7 @@
  #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
-@@ -9064,7 +8947,7 @@
+@@ -9063,7 +8947,7 @@
  XtFree()
  ; return 0; }
  EOF
@@ -3091,7 +3081,7 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -9085,7 +8968,7 @@
+@@ -9084,7 +8968,7 @@
  
          unset ac_cv_lib_Xt_XtFree
  	    echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6
@@ -3100,7 +3090,7 @@
  ac_lib_var=`echo ICE'_'IceFlush | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -9093,7 +8976,7 @@
+@@ -9092,7 +8976,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lICE $XT_LIBS $XLIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -3109,7 +3099,7 @@
  #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
-@@ -9104,7 +8987,7 @@
+@@ -9103,7 +8987,7 @@
  IceFlush()
  ; return 0; }
  EOF
@@ -3118,7 +3108,7 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -9125,7 +9008,7 @@
+@@ -9124,7 +9008,7 @@
  fi
  
  	    echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6
@@ -3127,7 +3117,7 @@
  ac_lib_var=`echo SM'_'SmcCloseConnection | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -9133,7 +9016,7 @@
+@@ -9132,7 +9016,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lSM $XT_LIBS $XLIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -3136,7 +3126,7 @@
  #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
-@@ -9144,7 +9027,7 @@
+@@ -9143,7 +9027,7 @@
  SmcCloseConnection()
  ; return 0; }
  EOF
@@ -3145,7 +3135,7 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -9165,7 +9048,7 @@
+@@ -9164,7 +9048,7 @@
  fi
   
          echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6
@@ -3154,7 +3144,7 @@
  ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -9173,7 +9056,7 @@
+@@ -9172,7 +9056,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXt $X_PRE_LIBS $XT_LIBS $XLIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -3163,7 +3153,7 @@
  #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
-@@ -9184,7 +9067,7 @@
+@@ -9183,7 +9067,7 @@
  XtFree()
  ; return 0; }
  EOF
@@ -3172,7 +3162,7 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -9218,7 +9101,7 @@
+@@ -9217,7 +9101,7 @@
      esac
  
                  echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6
@@ -3181,7 +3171,7 @@
  ac_lib_var=`echo Xinerama'_'XineramaIsActive | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -9226,7 +9109,7 @@
+@@ -9225,7 +9109,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXinerama $XLIBS $XEXT_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -3190,7 +3180,7 @@
  #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
-@@ -9237,7 +9120,7 @@
+@@ -9236,7 +9120,7 @@
  XineramaIsActive()
  ; return 0; }
  EOF
@@ -3199,7 +3189,7 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -9259,17 +9142,17 @@
+@@ -9258,17 +9142,17 @@
  
      ac_safe=`echo "X11/extensions/Xinerama.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for X11/extensions/Xinerama.h""... $ac_c" 1>&6
@@ -3220,7 +3210,7 @@
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -9292,7 +9175,7 @@
+@@ -9291,7 +9175,7 @@
  
  
                  echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6
@@ -3229,7 +3219,7 @@
  ac_lib_var=`echo Xext'_'XShmCreateImage | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -9300,7 +9183,7 @@
+@@ -9299,7 +9183,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXext $XLIBS $XEXT_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -3238,7 +3228,7 @@
  #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
-@@ -9311,7 +9194,7 @@
+@@ -9310,7 +9194,7 @@
  XShmCreateImage()
  ; return 0; }
  EOF
@@ -3247,7 +3237,7 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -9333,17 +9216,17 @@
+@@ -9332,17 +9216,17 @@
  
      ac_safe=`echo "X11/extensions/XShm.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for X11/extensions/XShm.h""... $ac_c" 1>&6
@@ -3268,7 +3258,7 @@
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -9373,7 +9256,7 @@
+@@ -9372,7 +9256,7 @@
      fi
  
                  echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6
@@ -3277,7 +3267,7 @@
  ac_lib_var=`echo XIE'_'XieFloGeometry | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -9381,7 +9264,7 @@
+@@ -9380,7 +9264,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXIE $XLIBS $XEXT_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -3286,7 +3276,7 @@
  #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
-@@ -9392,7 +9275,7 @@
+@@ -9391,7 +9275,7 @@
  XieFloGeometry()
  ; return 0; }
  EOF
@@ -3295,7 +3285,7 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -9414,17 +9297,17 @@
+@@ -9413,17 +9297,17 @@
  
      ac_safe=`echo "X11/extensions/XIElib.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for X11/extensions/XIElib.h""... $ac_c" 1>&6
@@ -3316,7 +3306,7 @@
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -9498,7 +9381,7 @@
+@@ -9497,7 +9381,7 @@
  # Extract the first word of "freetype-config", so it can be a program name with args.
  set dummy freetype-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -3325,7 +3315,7 @@
  if eval "test \"`echo '$''{'ac_cv_path_FT2_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -9534,7 +9417,7 @@
+@@ -9533,7 +9417,7 @@
  
  min_ft_version=6.1.0
  echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6
@@ -3334,7 +3324,7 @@
  no_ft=""
  if test "$FT2_CONFIG" = "no" ; then
    no_ft=yes
-@@ -9582,7 +9465,7 @@
+@@ -9581,7 +9465,7 @@
    echo $ac_n "cross compiling; assumed OK... $ac_c"
  else
    cat > conftest.$ac_ext <<EOF
@@ -3343,7 +3333,7 @@
  #include "confdefs.h"
  
  #include <ft2build.h>
-@@ -9608,7 +9491,7 @@
+@@ -9607,7 +9491,7 @@
  }
  
  EOF
@@ -3352,7 +3342,7 @@
  then
    :
  else
-@@ -9660,7 +9543,7 @@
+@@ -9659,7 +9543,7 @@
  
  
  echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
@@ -3361,7 +3351,7 @@
  echo "
      #include <pthread.h> 
      void *foo(void *v) { int a = 1;  } 
-@@ -9682,7 +9565,7 @@
+@@ -9681,7 +9565,7 @@
          echo "$ac_t""no" 1>&6
          
  echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
@@ -3370,7 +3360,7 @@
  echo "
      #include <pthread.h> 
      void *foo(void *v) { int a = 1;  } 
-@@ -9704,7 +9587,7 @@
+@@ -9703,7 +9587,7 @@
          echo "$ac_t""no" 1>&6
          
  echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
@@ -3379,7 +3369,7 @@
  echo "
      #include <pthread.h> 
      void *foo(void *v) { int a = 1;  } 
-@@ -9726,7 +9609,7 @@
+@@ -9725,7 +9609,7 @@
          echo "$ac_t""no" 1>&6
          
  echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
@@ -3388,7 +3378,7 @@
  echo "
      #include <pthread.h> 
      void *foo(void *v) { int a = 1;  } 
-@@ -9782,7 +9665,7 @@
+@@ -9781,7 +9665,7 @@
  				rm -f conftest*
  	ac_cv_have_dash_pthread=no
  	echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6
@@ -3397,7 +3387,7 @@
  	echo 'int main() { return 0; }' | cat > conftest.c
  	${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1
  	if test $? -eq 0; then
-@@ -9805,7 +9688,7 @@
+@@ -9804,7 +9688,7 @@
  			    ac_cv_have_dash_pthreads=no
      if test "$ac_cv_have_dash_pthread" = "no"; then
  	    echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6
@@ -3406,7 +3396,7 @@
      	echo 'int main() { return 0; }' | cat > conftest.c
  	    ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1
      	if test $? -eq 0; then
-@@ -9851,7 +9734,7 @@
+@@ -9850,7 +9734,7 @@
  			fi
  			;;
  
@@ -3415,7 +3405,7 @@
  			cat >> confdefs.h <<\EOF
  #define _REENTRANT 1
  EOF
-@@ -9900,7 +9783,7 @@
+@@ -9899,7 +9783,7 @@
  fi
  
  echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6
@@ -3424,7 +3414,7 @@
  
  
  mmap_test_prog='
-@@ -9939,11 +9822,11 @@
+@@ -9938,11 +9822,11 @@
    result="yes"
  else
    cat > conftest.$ac_ext <<EOF
@@ -3438,7 +3428,7 @@
  then
    result="yes"
  else
-@@ -9968,13 +9851,13 @@
+@@ -9967,13 +9851,13 @@
  
  if test $ac_cv_prog_gcc = yes; then
      echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
@@ -3454,7 +3444,7 @@
  #include "confdefs.h"
  #include <sgtty.h>
  Autoconf TIOCGETP
-@@ -9992,7 +9875,7 @@
+@@ -9991,7 +9875,7 @@
  
    if test $ac_cv_prog_gcc_traditional = no; then
      cat > conftest.$ac_ext <<EOF
@@ -3463,7 +3453,7 @@
  #include "confdefs.h"
  #include <termio.h>
  Autoconf TCGETA
-@@ -10014,7 +9897,7 @@
+@@ -10013,7 +9897,7 @@
  fi
  
  echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
@@ -3472,7 +3462,7 @@
  if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -10022,7 +9905,7 @@
+@@ -10021,7 +9905,7 @@
    ac_cv_func_memcmp_clean=no
  else
    cat > conftest.$ac_ext <<EOF
@@ -3481,7 +3471,7 @@
  #include "confdefs.h"
  
  main()
-@@ -10032,7 +9915,7 @@
+@@ -10031,7 +9915,7 @@
  }
  
  EOF
@@ -3490,7 +3480,7 @@
  then
    ac_cv_func_memcmp_clean=yes
  else
-@@ -10052,12 +9935,12 @@
+@@ -10051,12 +9935,12 @@
  for ac_func in random strerror lchown fchmod snprintf statvfs memmove rint stat64 lstat64
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -3505,7 +3495,7 @@
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -10080,7 +9963,7 @@
+@@ -10079,7 +9963,7 @@
  
  ; return 0; }
  EOF
@@ -3514,7 +3504,7 @@
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -10107,12 +9990,12 @@
+@@ -10106,12 +9990,12 @@
  for ac_func in flockfile getpagesize
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -3529,7 +3519,7 @@
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -10135,7 +10018,7 @@
+@@ -10134,7 +10018,7 @@
  
  ; return 0; }
  EOF
@@ -3538,7 +3528,7 @@
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -10164,12 +10047,12 @@
+@@ -10163,12 +10047,12 @@
    for ac_func in localtime_r strtok_r
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -3553,7 +3543,7 @@
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -10192,7 +10075,7 @@
+@@ -10191,7 +10075,7 @@
  
  ; return 0; }
  EOF
@@ -3562,7 +3552,7 @@
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -10228,19 +10111,19 @@
+@@ -10227,19 +10111,19 @@
  cross_compiling=$ac_cv_prog_cxx_cross
  
  echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6
@@ -3585,7 +3575,7 @@
    rm -rf conftest*
    ac_cv_have_wcrtomb="yes"
  else
-@@ -10260,19 +10143,19 @@
+@@ -10259,19 +10143,19 @@
  
  fi
  echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6
@@ -3608,7 +3598,7 @@
    rm -rf conftest*
    ac_cv_have_mbrtowc="yes"
  else
-@@ -10301,12 +10184,12 @@
+@@ -10300,12 +10184,12 @@
  fi
  
  echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6
@@ -3623,7 +3613,7 @@
  #include "confdefs.h"
  
          #ifdef linux
-@@ -10318,7 +10201,7 @@
+@@ -10317,7 +10201,7 @@
  int foo = res_ninit(&_res);
  ; return 0; }
  EOF
@@ -3632,7 +3622,7 @@
    rm -rf conftest*
    ac_cv_func_res_ninit=yes
  else
-@@ -10348,12 +10231,12 @@
+@@ -10347,12 +10231,12 @@
  cross_compiling=$ac_cv_prog_cxx_cross
  
  echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6
@@ -3647,7 +3637,7 @@
  #include "confdefs.h"
  
          #ifdef HAVE_GNU_LIBC_VERSION_H
-@@ -10364,7 +10247,7 @@
+@@ -10363,7 +10247,7 @@
  const char *glibc_version = gnu_get_libc_version();
  ; return 0; }
  EOF
@@ -3656,7 +3646,7 @@
    rm -rf conftest*
    ac_cv_func_gnu_get_libc_version=yes
  else
-@@ -10393,7 +10276,7 @@
+@@ -10392,7 +10276,7 @@
      *)
      
  echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6
@@ -3665,7 +3655,7 @@
  ac_lib_var=`echo c'_'iconv | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -10401,7 +10284,7 @@
+@@ -10400,7 +10284,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lc  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -3674,7 +3664,7 @@
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
-@@ -10415,7 +10298,7 @@
+@@ -10414,7 +10298,7 @@
  iconv()
  ; return 0; }
  EOF
@@ -3683,7 +3673,7 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -10434,7 +10317,7 @@
+@@ -10433,7 +10317,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
@@ -3692,7 +3682,7 @@
  ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -10442,7 +10325,7 @@
+@@ -10441,7 +10325,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-liconv  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -3701,7 +3691,7 @@
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
-@@ -10456,7 +10339,7 @@
+@@ -10455,7 +10339,7 @@
  iconv()
  ; return 0; }
  EOF
@@ -3710,7 +3700,7 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -10475,7 +10358,7 @@
+@@ -10474,7 +10358,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
@@ -3719,7 +3709,7 @@
  ac_lib_var=`echo iconv'_'libiconv | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -10483,7 +10366,7 @@
+@@ -10482,7 +10366,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-liconv  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -3728,7 +3718,7 @@
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
-@@ -10497,7 +10380,7 @@
+@@ -10496,7 +10380,7 @@
  libiconv()
  ; return 0; }
  EOF
@@ -3737,7 +3727,7 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -10524,12 +10407,12 @@
+@@ -10523,12 +10407,12 @@
  _SAVE_LIBS=$LIBS
  LIBS="$LIBS $_ICONV_LIBS"
  echo $ac_n "checking for iconv()""... $ac_c" 1>&6
@@ -3752,7 +3742,7 @@
  #include "confdefs.h"
  
          #include <stdlib.h>
-@@ -10543,7 +10426,7 @@
+@@ -10542,7 +10426,7 @@
          
  ; return 0; }
  EOF
@@ -3761,7 +3751,7 @@
    rm -rf conftest*
    ac_cv_func_iconv=yes
  else
-@@ -10567,12 +10450,12 @@
+@@ -10566,12 +10450,12 @@
      LIBXUL_LIBS="$LIBXUL_LIBS $_ICONV_LIBS"
      LIBICONV="$_ICONV_LIBS"
      echo $ac_n "checking for iconv() with const input""... $ac_c" 1>&6
@@ -3776,7 +3766,7 @@
  #include "confdefs.h"
  
              #include <stdlib.h>
-@@ -10587,7 +10470,7 @@
+@@ -10586,7 +10470,7 @@
              
  ; return 0; }
  EOF
@@ -3785,7 +3775,7 @@
    rm -rf conftest*
    ac_cv_func_const_iconv=yes
  else
-@@ -10616,19 +10499,19 @@
+@@ -10615,19 +10499,19 @@
  
  
    echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
@@ -3808,7 +3798,7 @@
    rm -rf conftest*
    am_cv_langinfo_codeset=yes
  else
-@@ -10660,7 +10543,7 @@
+@@ -10659,7 +10543,7 @@
  
  
  echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6
@@ -3817,7 +3807,7 @@
  if eval "test \"`echo '$''{'ac_cv_va_copy'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -10670,7 +10553,7 @@
+@@ -10669,7 +10553,7 @@
      
  else
    cat > conftest.$ac_ext <<EOF
@@ -3826,7 +3816,7 @@
  #include "confdefs.h"
  
          #include <stdarg.h>
-@@ -10684,7 +10567,7 @@
+@@ -10683,7 +10567,7 @@
          }
          int main() { f (0, 42); return 0; }
  EOF
@@ -3835,7 +3825,7 @@
  then
    ac_cv_va_copy=yes
  else
-@@ -10701,7 +10584,7 @@
+@@ -10700,7 +10584,7 @@
  
  echo "$ac_t""$ac_cv_va_copy" 1>&6
  echo $ac_n "checking for an implementation of __va_copy()""... $ac_c" 1>&6
@@ -3844,7 +3834,7 @@
  if eval "test \"`echo '$''{'ac_cv___va_copy'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -10711,7 +10594,7 @@
+@@ -10710,7 +10594,7 @@
      
  else
    cat > conftest.$ac_ext <<EOF
@@ -3853,7 +3843,7 @@
  #include "confdefs.h"
  
          #include <stdarg.h>
-@@ -10725,7 +10608,7 @@
+@@ -10724,7 +10608,7 @@
          }
          int main() { f (0, 42); return 0; }
  EOF
@@ -3862,7 +3852,7 @@
  then
    ac_cv___va_copy=yes
  else
-@@ -10742,7 +10625,7 @@
+@@ -10741,7 +10625,7 @@
  
  echo "$ac_t""$ac_cv___va_copy" 1>&6
  echo $ac_n "checking whether va_lists can be copied by value""... $ac_c" 1>&6
@@ -3871,7 +3861,7 @@
  if eval "test \"`echo '$''{'ac_cv_va_val_copy'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -10752,7 +10635,7 @@
+@@ -10751,7 +10635,7 @@
      
  else
    cat > conftest.$ac_ext <<EOF
@@ -3880,7 +3870,7 @@
  #include "confdefs.h"
  
          #include <stdarg.h>
-@@ -10766,7 +10649,7 @@
+@@ -10765,7 +10649,7 @@
          }
          int main() { f (0, 42); return 0; }
  EOF
@@ -3889,7 +3879,7 @@
  then
    ac_cv_va_val_copy=yes
  else
-@@ -10865,7 +10748,7 @@
+@@ -10864,7 +10748,7 @@
  if test "$GNU_CXX"; then
  
    echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6
@@ -3898,7 +3888,7 @@
  
      if eval "test \"`echo '$''{'ac_cv_cxx_exceptions_flags'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -10900,12 +10783,12 @@
+@@ -10899,12 +10783,12 @@
  HAVE_GCC3_ABI=
  if test "$GNU_CC"; then
    echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6
@@ -3913,7 +3903,7 @@
  #include "confdefs.h"
  
  int main() {
-@@ -10918,7 +10801,7 @@
+@@ -10917,7 +10801,7 @@
                        
  ; return 0; }
  EOF
@@ -3922,7 +3912,7 @@
    rm -rf conftest*
    ac_cv_gcc_three_abi="yes"
  else
-@@ -10942,12 +10825,12 @@
+@@ -10941,12 +10825,12 @@
  
  
  echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6
@@ -3937,16 +3927,16 @@
  #include "confdefs.h"
  class X {
                                 public: explicit X(int i) : i_(i) {}
-@@ -10957,7 +10840,7 @@
+@@ -10956,7 +10840,7 @@
  X x(3);
  ; return 0; }
  EOF
--if { (eval echo configure:10961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:10960: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 +if { (eval echo configure:10844: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_cpp_explicit=yes
  else
-@@ -10978,12 +10861,12 @@
+@@ -10977,12 +10861,12 @@
  fi
  
  echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6
@@ -3961,7 +3951,7 @@
  #include "confdefs.h"
  class param {
                                 public:
-@@ -11002,7 +10885,7 @@
+@@ -11001,7 +10885,7 @@
                                 A.foo(0);
  ; return 0; }
  EOF
@@ -3970,7 +3960,7 @@
    rm -rf conftest*
    ac_cv_cpp_typename=yes
  else
-@@ -11023,12 +10906,12 @@
+@@ -11022,12 +10906,12 @@
  fi
  
  echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6
@@ -3985,7 +3975,7 @@
  #include "confdefs.h"
  template <class T> struct X { int a; };
                                 class Y {};
-@@ -11038,7 +10921,7 @@
+@@ -11037,7 +10921,7 @@
                                 X<Y> y_x;
  ; return 0; }
  EOF
@@ -3994,7 +3984,7 @@
    rm -rf conftest*
    ac_cv_cpp_modern_specialize_template_syntax=yes
  else
-@@ -11060,12 +10943,12 @@
+@@ -11059,12 +10943,12 @@
  
  
  echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6
@@ -4009,7 +3999,7 @@
  #include "confdefs.h"
  template <class T> class Foo {};
                                 template <class T> class Foo<T*> {};
-@@ -11073,7 +10956,7 @@
+@@ -11072,7 +10956,7 @@
  return 0;
  ; return 0; }
  EOF
@@ -4018,7 +4008,7 @@
    rm -rf conftest*
    ac_cv_cpp_partial_specialization=yes
  else
-@@ -11094,12 +10977,12 @@
+@@ -11093,12 +10977,12 @@
  fi
  
  echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6
@@ -4033,7 +4023,7 @@
  #include "confdefs.h"
  template <class T> class Base { };
                                  template <class T>
-@@ -11111,7 +10994,7 @@
+@@ -11110,7 +10994,7 @@
                                  return 0;
  ; return 0; }
  EOF
@@ -4042,7 +4032,7 @@
    rm -rf conftest*
    ac_cv_need_derived_template_operators=no
  else
-@@ -11133,12 +11016,12 @@
+@@ -11132,12 +11016,12 @@
  
  
  echo $ac_n "checking whether we need to cast a derived template to pass as its base class""... $ac_c" 1>&6
@@ -4057,7 +4047,7 @@
  #include "confdefs.h"
  template <class T> class Base { };
                                  template <class T> class Derived : public Base<T> { };
-@@ -11147,7 +11030,7 @@
+@@ -11146,7 +11030,7 @@
  Derived<char> bar; return foo(bar);
  ; return 0; }
  EOF
@@ -4066,7 +4056,7 @@
    rm -rf conftest*
    ac_cv_need_cpp_template_cast_to_base=no
  else
-@@ -11168,12 +11051,12 @@
+@@ -11167,12 +11051,12 @@
  fi
  
  echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6
@@ -4081,7 +4071,7 @@
  #include "confdefs.h"
  
                                  template <class T> class ptrClass {
-@@ -11194,7 +11077,7 @@
+@@ -11193,7 +11077,7 @@
                                   a(&i); 
  ; return 0; }
  EOF
@@ -4090,7 +4080,7 @@
    rm -rf conftest*
    ac_cv_can_resolve_const_ambiguity=yes
  else
-@@ -11216,12 +11099,12 @@
+@@ -11215,12 +11099,12 @@
  
  
  echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6
@@ -4105,7 +4095,7 @@
  #include "confdefs.h"
  class A { protected: int foo() { return 0; } };
                     class B : public A { public: using A::foo; };
-@@ -11229,10 +11112,10 @@
+@@ -11228,10 +11112,10 @@
  B b; return b.foo();
  ; return 0; }
  EOF
@@ -4118,7 +4108,7 @@
  #include "confdefs.h"
  class A { public: int foo() { return 1; } };
                         class B : public A { private: using A::foo; };
-@@ -11240,7 +11123,7 @@
+@@ -11239,7 +11123,7 @@
  B b; return b.foo();
  ; return 0; }
  EOF
@@ -4127,7 +4117,7 @@
    rm -rf conftest*
    ac_cv_cpp_access_changing_using2=no
  else
-@@ -11268,12 +11151,12 @@
+@@ -11267,12 +11151,12 @@
  fi
  
  echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6
@@ -4142,7 +4132,7 @@
  #include "confdefs.h"
  class X { 
                                   public: int go(const X&) {return 3;}
-@@ -11289,7 +11172,7 @@
+@@ -11288,7 +11172,7 @@
  X x; Y y; y.jo(x);
  ; return 0; }
  EOF
@@ -4151,7 +4141,7 @@
    rm -rf conftest*
    ac_cv_cpp_ambiguity_resolving_using=yes
  else
-@@ -11310,19 +11193,19 @@
+@@ -11309,19 +11193,19 @@
  fi
  
  echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6
@@ -4174,7 +4164,7 @@
    rm -rf conftest*
    ac_cv_cpp_namespace_std=yes
  else
-@@ -11343,12 +11226,12 @@
+@@ -11342,12 +11226,12 @@
  fi
  
  echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6
@@ -4189,7 +4179,7 @@
  #include "confdefs.h"
  #include <algorithm>
                                  struct T1 {};
-@@ -11358,7 +11241,7 @@
+@@ -11357,7 +11241,7 @@
  T1 a,b; return a != b;
  ; return 0; }
  EOF
@@ -4198,7 +4188,7 @@
    rm -rf conftest*
    ac_cv_cpp_unambiguous_std_notequal=unambiguous
  else
-@@ -11380,12 +11263,12 @@
+@@ -11379,12 +11263,12 @@
  
  
  echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6
@@ -4213,7 +4203,7 @@
  #include "confdefs.h"
  struct X { int i; };
                                 struct Y { int i; };
-@@ -11393,7 +11276,7 @@
+@@ -11392,7 +11276,7 @@
  X x; X*const z = &x;Y*y = reinterpret_cast<Y*>(z);
  ; return 0; }
  EOF
@@ -4222,7 +4212,7 @@
    rm -rf conftest*
    ac_cv_cpp_reinterpret_cast=yes
  else
-@@ -11414,7 +11297,7 @@
+@@ -11413,7 +11297,7 @@
  fi
  
  echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6
@@ -4231,7 +4221,7 @@
  if eval "test \"`echo '$''{'ac_cv_cpp_dynamic_cast_void_ptr'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -11422,8 +11305,11 @@
+@@ -11421,8 +11305,11 @@
    ac_cv_cpp_dynamic_cast_void_ptr=no
  else
    cat > conftest.$ac_ext <<EOF
@@ -4244,7 +4234,7 @@
  class X { int i; public: virtual ~X() { } };
                              class Y { int j; public: virtual ~Y() { } };
                              class Z : public X, public Y { int k; };
-@@ -11438,7 +11324,7 @@
+@@ -11437,7 +11324,7 @@
                                             ((void*)&mdo == dynamic_cast<void*>(suby))));
                              }
  EOF
@@ -4253,7 +4243,7 @@
  then
    ac_cv_cpp_dynamic_cast_void_ptr=yes
  else
-@@ -11462,19 +11348,19 @@
+@@ -11461,19 +11348,19 @@
  
  
  echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6
@@ -4276,7 +4266,7 @@
    rm -rf conftest*
    ac_cv_cpp_unused_required=no
  else
-@@ -11497,12 +11383,12 @@
+@@ -11496,12 +11383,12 @@
  
  
  echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6
@@ -4291,7 +4281,7 @@
  #include "confdefs.h"
  #include <algorithm>
                                  template <class T> class Foo {};
-@@ -11513,7 +11399,7 @@
+@@ -11512,7 +11399,7 @@
  Foo<int> f; return (0 != f);
  ; return 0; }
  EOF
@@ -4300,7 +4290,7 @@
    rm -rf conftest*
    ac_cv_trouble_comparing_to_zero=no
  else
-@@ -11545,19 +11431,19 @@
+@@ -11544,19 +11431,19 @@
  
  
  echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
@@ -4323,7 +4313,7 @@
    rm -rf conftest*
    ac_cv_i18n_lc_messages=yes
  else
-@@ -11638,7 +11524,7 @@
+@@ -11637,7 +11524,7 @@
  	# Extract the first word of "nspr-config", so it can be a program name with args.
  set dummy nspr-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -4332,7 +4322,7 @@
  if eval "test \"`echo '$''{'ac_cv_path_NSPR_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -11673,7 +11559,7 @@
+@@ -11672,7 +11559,7 @@
  
  	min_nspr_version=4.0.0
  	echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6
@@ -4341,7 +4331,7 @@
  
  	no_nspr=""
  	if test "$NSPR_CONFIG" = "no"; then
-@@ -11775,7 +11661,7 @@
+@@ -11774,7 +11661,7 @@
  	# Extract the first word of "nss-config", so it can be a program name with args.
  set dummy nss-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -4350,7 +4340,7 @@
  if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -11810,7 +11696,7 @@
+@@ -11809,7 +11696,7 @@
  
  	min_nss_version=3.0.0
  	echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6
@@ -4359,7 +4349,7 @@
  
  	no_nss=""
  	if test "$NSS_CONFIG" = "no"; then
-@@ -11842,7 +11728,7 @@
+@@ -11841,7 +11728,7 @@
  fi
  
  if test -n "$MOZ_NATIVE_NSS"; then
@@ -4368,7 +4358,7 @@
  else
     NSS_CFLAGS='-I$(DIST)/public/nss'
     NSS_DEP_LIBS='\\\
-@@ -11883,7 +11769,7 @@
+@@ -11882,7 +11769,7 @@
      SYSTEM_JPEG=
  else
      echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6
@@ -4377,7 +4367,7 @@
  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
-@@ -11891,7 +11777,7 @@
+@@ -11890,7 +11777,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-ljpeg $JPEG_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -4386,7 +4376,7 @@
  #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
-@@ -11902,7 +11788,7 @@
+@@ -11901,7 +11788,7 @@
  jpeg_destroy_compress()
  ; return 0; }
  EOF
@@ -4395,7 +4385,7 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -11925,13 +11811,13 @@
+@@ -11924,13 +11811,13 @@
  
  fi
  
@@ -4411,7 +4401,7 @@
  #include "confdefs.h"
  #include <stdio.h>
  	#include <sys/types.h>
-@@ -11945,7 +11831,7 @@
+@@ -11944,7 +11831,7 @@
  	}
  	
  EOF
@@ -4420,7 +4410,7 @@
  then
    SYSTEM_JPEG=1
  else
-@@ -11986,7 +11872,7 @@
+@@ -11985,7 +11872,7 @@
      SYSTEM_ZLIB=
  else
      echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6
@@ -4429,7 +4419,7 @@
  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
-@@ -11994,7 +11880,7 @@
+@@ -11993,7 +11880,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lz $ZLIB_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -4438,7 +4428,7 @@
  #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
-@@ -12005,7 +11891,7 @@
+@@ -12004,7 +11891,7 @@
  gzread()
  ; return 0; }
  EOF
@@ -4447,7 +4437,7 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -12027,13 +11913,13 @@
+@@ -12026,13 +11913,13 @@
  fi
  
  fi
@@ -4463,7 +4453,7 @@
  #include "confdefs.h"
  
      #include <stdio.h>
-@@ -12054,7 +11940,7 @@
+@@ -12053,7 +11940,7 @@
      }
      
  EOF
@@ -4472,7 +4462,7 @@
  then
    SYSTEM_ZLIB=1
  else
-@@ -12077,6 +11963,74 @@
+@@ -12076,6 +11963,74 @@
      ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
  fi
  
@@ -4547,7 +4537,7 @@
  # Check whether --with-system-png or --without-system-png was given.
  if test "${with_system_png+set}" = set; then
    withval="$with_system_png"
-@@ -12097,7 +12051,7 @@
+@@ -12096,7 +12051,7 @@
      SYSTEM_PNG=
  else
      echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6
@@ -4556,7 +4546,7 @@
  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
-@@ -12105,7 +12059,7 @@
+@@ -12104,7 +12059,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lpng $PNG_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -4565,7 +4555,7 @@
  #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
-@@ -12116,7 +12070,7 @@
+@@ -12115,7 +12070,7 @@
  png_get_valid()
  ; return 0; }
  EOF
@@ -4574,7 +4564,7 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -12138,13 +12092,13 @@
+@@ -12137,13 +12092,13 @@
  fi
  
  fi
@@ -4590,7 +4580,7 @@
  #include "confdefs.h"
  #include <stdio.h>
  	#include <sys/types.h>
-@@ -12158,7 +12112,7 @@
+@@ -12157,7 +12112,7 @@
  	}
  	
  EOF
@@ -4599,7 +4589,7 @@
  then
    SYSTEM_PNG=1
  else
-@@ -12183,6 +12137,116 @@
+@@ -12182,6 +12137,116 @@
  
  fi # SKIP_LIBRARY_CHECKS
  
@@ -4716,7 +4706,7 @@
  JAVA_INCLUDE_PATH=
  # Check whether --with-java-include-path or --without-java-include-path was given.
  if test "${with_java_include_path+set}" = set; then
-@@ -12408,7 +12472,7 @@
+@@ -12407,7 +12472,7 @@
    # Extract the first word of "gtk-config", so it can be a program name with args.
  set dummy gtk-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -4725,7 +4715,7 @@
  if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -12443,7 +12507,7 @@
+@@ -12442,7 +12507,7 @@
  
    min_gtk_version=$GTK_VERSION
    echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
@@ -4734,7 +4724,7 @@
    no_gtk=""
    if test "$GTK_CONFIG" = "no" ; then
      no_gtk=yes
-@@ -12466,7 +12530,7 @@
+@@ -12465,7 +12530,7 @@
    echo $ac_n "cross compiling; assumed OK... $ac_c"
  else
    cat > conftest.$ac_ext <<EOF
@@ -4743,7 +4733,7 @@
  #include "confdefs.h"
  
  #include <gtk/gtk.h>
-@@ -12544,7 +12608,7 @@
+@@ -12543,7 +12608,7 @@
  }
  
  EOF
@@ -4752,7 +4742,7 @@
  then
    :
  else
-@@ -12579,7 +12643,7 @@
+@@ -12578,7 +12643,7 @@
            CFLAGS="$CFLAGS $GTK_CFLAGS"
            LIBS="$LIBS $GTK_LIBS"
            cat > conftest.$ac_ext <<EOF
@@ -4761,7 +4751,7 @@
  #include "confdefs.h"
  
  #include <gtk/gtk.h>
-@@ -12589,7 +12653,7 @@
+@@ -12588,7 +12653,7 @@
   return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
  ; return 0; }
  EOF
@@ -4770,7 +4760,7 @@
    rm -rf conftest*
     echo "*** The test program compiled, but did not run. This usually means"
            echo "*** that the run-time linker is not finding GTK or finding the wrong"
-@@ -12641,7 +12705,7 @@
+@@ -12640,7 +12705,7 @@
      # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -4779,7 +4769,7 @@
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -12685,19 +12749,19 @@
+@@ -12684,19 +12749,19 @@
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
          echo $ac_n "checking for gtk+-2.0 >= 1.3.7""... $ac_c" 1>&6
@@ -4802,7 +4792,7 @@
              ## don't use --libs since that can do evil things like add
              ## -Wl,--export-dynamic
              MOZ_GTK2_LIBS="`$PKG_CONFIG --libs-only-L \"gtk+-2.0 >= 1.3.7\"` `$PKG_CONFIG --libs-only-l \"gtk+-2.0 >= 1.3.7\"`"
-@@ -12762,7 +12826,7 @@
+@@ -12761,7 +12826,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -4811,7 +4801,7 @@
  if eval "test \"`echo '$''{'ac_cv_prog_HOST_MOC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -12814,7 +12878,7 @@
+@@ -12813,7 +12878,7 @@
  cross_compiling=$ac_cv_prog_cxx_cross
  
      echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6
@@ -4820,7 +4810,7 @@
  ac_lib_var=`echo qt'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -12822,14 +12886,14 @@
+@@ -12821,14 +12886,14 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lqt  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -4837,7 +4827,7 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -12848,7 +12912,7 @@
+@@ -12847,7 +12912,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for main in -lqt-mt""... $ac_c" 1>&6
@@ -4846,7 +4836,7 @@
  ac_lib_var=`echo qt-mt'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -12856,14 +12920,14 @@
+@@ -12855,14 +12920,14 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lqt-mt  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -4863,7 +4853,7 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -12899,9 +12963,9 @@
+@@ -12898,9 +12963,9 @@
      LIBS="$LIBS $QT_LIBS"
      
      echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6
@@ -4875,7 +4865,7 @@
  #include "confdefs.h"
  #include <qglobal.h>
  int main() {
-@@ -12912,7 +12976,7 @@
+@@ -12911,7 +12976,7 @@
      
  ; return 0; }
  EOF
@@ -4884,7 +4874,7 @@
    rm -rf conftest*
    result="yes"
  else
-@@ -13508,7 +13572,7 @@
+@@ -13507,7 +13572,7 @@
      # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -4893,7 +4883,7 @@
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -13552,19 +13616,19 @@
+@@ -13551,19 +13616,19 @@
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
          echo $ac_n "checking for xft""... $ac_c" 1>&6
@@ -4916,7 +4906,7 @@
              ## don't use --libs since that can do evil things like add
              ## -Wl,--export-dynamic
              MOZ_XFT_LIBS="`$PKG_CONFIG --libs-only-L \"xft\"` `$PKG_CONFIG --libs-only-l \"xft\"`"
-@@ -13599,7 +13663,7 @@
+@@ -13598,7 +13663,7 @@
      # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -4925,7 +4915,7 @@
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -13643,19 +13707,19 @@
+@@ -13642,19 +13707,19 @@
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
          echo $ac_n "checking for pango >= 1.1.0""... $ac_c" 1>&6
@@ -4948,7 +4938,7 @@
              ## don't use --libs since that can do evil things like add
              ## -Wl,--export-dynamic
              _PANGOCHK_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.1.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.1.0\"`"
-@@ -13715,7 +13779,7 @@
+@@ -13714,7 +13779,7 @@
      # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -4957,7 +4947,7 @@
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -13759,19 +13823,19 @@
+@@ -13758,19 +13823,19 @@
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
          echo $ac_n "checking for pango >= 1.6.0 pangoft2 >= 1.6.0""... $ac_c" 1>&6
@@ -4980,7 +4970,7 @@
              ## don't use --libs since that can do evil things like add
              ## -Wl,--export-dynamic
              MOZ_PANGO_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.6.0 pangoft2 >= 1.6.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.6.0 pangoft2 >= 1.6.0\"`"
-@@ -13839,7 +13903,7 @@
+@@ -13838,7 +13903,7 @@
      _SAVE_LDFLAGS="$LDFLAGS"
      LDFLAGS="$XLDFLAGS $LDFLAGS"
      echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6
@@ -4989,7 +4979,7 @@
  ac_lib_var=`echo Xp'_'XpGetPrinterList | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -13847,7 +13911,7 @@
+@@ -13846,7 +13911,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXp $XEXT_LIBS $XLIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -4998,7 +4988,7 @@
  #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
-@@ -13858,7 +13922,7 @@
+@@ -13857,7 +13922,7 @@
  XpGetPrinterList()
  ; return 0; }
  EOF
@@ -5007,7 +4997,7 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -13931,7 +13995,7 @@
+@@ -13930,7 +13995,7 @@
      # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -5016,7 +5006,7 @@
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -13975,19 +14039,19 @@
+@@ -13974,19 +14039,19 @@
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
          echo $ac_n "checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION""... $ac_c" 1>&6
@@ -5039,7 +5029,7 @@
              ## don't use --libs since that can do evil things like add
              ## -Wl,--export-dynamic
              MOZ_GNOMEVFS_LIBS="`$PKG_CONFIG --libs-only-L \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\"` `$PKG_CONFIG --libs-only-l \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\"`"
-@@ -14038,7 +14102,7 @@
+@@ -14037,7 +14102,7 @@
      # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -5048,7 +5038,7 @@
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -14082,19 +14146,19 @@
+@@ -14081,19 +14146,19 @@
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
          echo $ac_n "checking for gconf-2.0 >= $GCONF_VERSION""... $ac_c" 1>&6
@@ -5071,7 +5061,7 @@
              ## don't use --libs since that can do evil things like add
              ## -Wl,--export-dynamic
              MOZ_GCONF_LIBS="`$PKG_CONFIG --libs-only-L \"gconf-2.0 >= $GCONF_VERSION\"` `$PKG_CONFIG --libs-only-l \"gconf-2.0 >= $GCONF_VERSION\"`"
-@@ -14141,7 +14205,7 @@
+@@ -14140,7 +14205,7 @@
      # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -5080,7 +5070,7 @@
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -14185,19 +14249,19 @@
+@@ -14184,19 +14249,19 @@
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
          echo $ac_n "checking for libgnome-2.0 >= $LIBGNOME_VERSION""... $ac_c" 1>&6
@@ -5103,7 +5093,7 @@
              ## don't use --libs since that can do evil things like add
              ## -Wl,--export-dynamic
              MOZ_LIBGNOME_LIBS="`$PKG_CONFIG --libs-only-L \"libgnome-2.0 >= $LIBGNOME_VERSION\"` `$PKG_CONFIG --libs-only-l \"libgnome-2.0 >= $LIBGNOME_VERSION\"`"
-@@ -14275,7 +14339,7 @@
+@@ -14274,7 +14339,7 @@
      # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -5112,7 +5102,7 @@
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -14319,19 +14383,19 @@
+@@ -14318,19 +14383,19 @@
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
          echo $ac_n "checking for libgnomeui-2.0 >= $GNOMEUI_VERSION""... $ac_c" 1>&6
@@ -5135,7 +5125,7 @@
              ## don't use --libs since that can do evil things like add
              ## -Wl,--export-dynamic
              MOZ_GNOMEUI_LIBS="`$PKG_CONFIG --libs-only-L \"libgnomeui-2.0 >= $GNOMEUI_VERSION\"` `$PKG_CONFIG --libs-only-l \"libgnomeui-2.0 >= $GNOMEUI_VERSION\"`"
-@@ -14817,7 +14881,7 @@
+@@ -14816,7 +14881,7 @@
    # Extract the first word of "javac", so it can be a program name with args.
  set dummy javac; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -5144,7 +5134,7 @@
  if eval "test \"`echo '$''{'ac_cv_path_JAVAC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -14853,7 +14917,7 @@
+@@ -14852,7 +14917,7 @@
    # Extract the first word of "jar", so it can be a program name with args.
  set dummy jar; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -5153,7 +5143,7 @@
  if eval "test \"`echo '$''{'ac_cv_path_JAR'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -15100,7 +15164,7 @@
+@@ -15099,7 +15164,7 @@
    gdiplus)
      MOZ_SVG_RENDERER_GDIPLUS=1
                          echo $ac_n "checking for Gdiplus.h""... $ac_c" 1>&6
@@ -5162,7 +5152,7 @@
      
      ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -15110,7 +15174,7 @@
+@@ -15109,7 +15174,7 @@
  cross_compiling=$ac_cv_prog_cxx_cross
  
      cat > conftest.$ac_ext <<EOF
@@ -5171,7 +5161,7 @@
  #include "confdefs.h"
  #include <windows.h>
                      #include <unknwn.h>
-@@ -15119,7 +15183,7 @@
+@@ -15118,7 +15183,7 @@
  
  ; return 0; }
  EOF
@@ -5180,7 +5170,7 @@
    rm -rf conftest*
    echo "$ac_t""yes" 1>&6
  else
-@@ -15199,7 +15263,7 @@
+@@ -15198,7 +15263,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -5189,7 +5179,7 @@
  if eval "test \"`echo '$''{'ac_cv_path_MAKENSIS'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -15244,7 +15308,7 @@
+@@ -15243,7 +15308,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -5198,7 +5188,7 @@
  if eval "test \"`echo '$''{'ac_cv_path_HOST_ICONV'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -15313,13 +15377,13 @@
+@@ -15312,13 +15377,13 @@
      msvc*|mks*|cygwin*|mingw*|wince*)
          if test -n "$MOZ_UPDATER"; then
              echo $ac_n "checking for iconv""... $ac_c" 1>&6
@@ -5214,7 +5204,7 @@
  if eval "test \"`echo '$''{'ac_cv_prog_HOST_ICONV'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -15462,6 +15526,21 @@
+@@ -15461,6 +15526,21 @@
  fi
  
  
@@ -5236,7 +5226,7 @@
  # Individual module options
  
  # Check whether --enable-xpcom-lea or --disable-xpcom-lea was given.
-@@ -15604,6 +15683,84 @@
+@@ -15603,6 +15683,84 @@
  fi
  
  
@@ -5321,7 +5311,7 @@
  
  # Debugging and Optimizations
  
-@@ -15665,18 +15822,18 @@
+@@ -15664,18 +15822,18 @@
  
  if test -n "$MOZ_DEBUG"; then
      echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6
@@ -5343,7 +5333,7 @@
    rm -rf conftest*
    _results=yes
  else
-@@ -15717,18 +15874,18 @@
+@@ -15716,18 +15874,18 @@
  if test "$COMPILE_ENVIRONMENT"; then
  if test -n "$MOZ_OPTIMIZE"; then
      echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6
@@ -5365,7 +5355,7 @@
    rm -rf conftest*
    _results=yes
  else
-@@ -15945,7 +16102,7 @@
+@@ -15944,7 +16102,7 @@
  
  if test -n "$_ENABLE_EFENCE"; then
      echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6
@@ -5374,7 +5364,7 @@
  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
-@@ -15953,7 +16110,7 @@
+@@ -15952,7 +16110,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lefence  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -5383,7 +5373,7 @@
  #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
-@@ -15964,7 +16121,7 @@
+@@ -15963,7 +16121,7 @@
  malloc()
  ; return 0; }
  EOF
@@ -5392,7 +5382,7 @@
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -16065,12 +16222,12 @@
+@@ -16064,12 +16222,12 @@
      for ac_func in __builtin_vec_new __builtin_vec_delete __builtin_new __builtin_delete __pure_virtual
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -5407,7 +5397,7 @@
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -16096,7 +16253,7 @@
+@@ -16095,7 +16253,7 @@
  
  ; return 0; }
  EOF
@@ -5416,7 +5406,7 @@
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -16339,12 +16496,12 @@
+@@ -16338,12 +16496,12 @@
      for ac_func in __cxa_demangle
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -5431,7 +5421,7 @@
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -16370,7 +16527,7 @@
+@@ -16369,7 +16527,7 @@
  
  ; return 0; }
  EOF
@@ -5440,7 +5430,7 @@
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -16449,6 +16606,53 @@
+@@ -16448,6 +16606,53 @@
      { echo "configure: error: --enable-chrome-format must be set to either jar, flat, both, or symlink" 1>&2; exit 1; }
  fi
  
@@ -5494,7 +5484,7 @@
  # Check whether --with-default-mozilla-five-home or --without-default-mozilla-five-home was given.
  if test "${with_default_mozilla_five_home+set}" = set; then
    withval="$with_default_mozilla_five_home"
-@@ -16508,7 +16712,7 @@
+@@ -16507,7 +16712,7 @@
  # Compiler Options
  
  echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6
@@ -5503,7 +5493,7 @@
  if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then
      echo '#include <stdio.h>' > dummy-hello.c
      echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c
-@@ -16523,14 +16727,14 @@
+@@ -16522,14 +16727,14 @@
          _SAVE_CFLAGS=$CFLAGS
          CFLAGS="$CFLAGS -pipe"
          cat > conftest.$ac_ext <<EOF
@@ -5520,7 +5510,7 @@
    rm -rf conftest*
    _res_gcc_pipe="yes"
  else
-@@ -16572,16 +16776,16 @@
+@@ -16571,16 +16776,16 @@
       _SAVE_CFLAGS="$CFLAGS"
       CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long"
       echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6
@@ -5540,7 +5530,7 @@
    rm -rf conftest*
     _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
  	  _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
-@@ -16602,16 +16806,16 @@
+@@ -16601,16 +16806,16 @@
  CFLAGS="$CFLAGS -fprofile-generate"
  
  echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6
@@ -5560,7 +5550,7 @@
    rm -rf conftest*
     PROFILE_GEN_CFLAGS="-fprofile-generate"
                   result="yes" 
-@@ -16629,16 +16833,16 @@
+@@ -16628,16 +16833,16 @@
  else
    CFLAGS="$_SAVE_CFLAGS -fprofile-arcs"
    echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6
@@ -5580,7 +5570,7 @@
    rm -rf conftest*
     PROFILE_GEN_CFLAGS="-fprofile-arcs"
                     result="yes" 
-@@ -16684,16 +16888,16 @@
+@@ -16683,16 +16888,16 @@
      _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
@@ -5600,7 +5590,7 @@
    rm -rf conftest*
    result="no"
  else
-@@ -16718,13 +16922,16 @@
+@@ -16717,13 +16922,16 @@
  fi
  
  echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6
@@ -5619,7 +5609,7 @@
   class A {
               public:  A(int& x) : mValue(x) {}
                        ~A() { mValue--; }
-@@ -16743,7 +16950,7 @@
+@@ -16742,7 +16950,7 @@
               }
               
  EOF
@@ -5628,7 +5618,7 @@
  then
    result="yes"
  else
-@@ -16764,12 +16971,12 @@
+@@ -16763,12 +16971,12 @@
  _SAVE_CXXFLAGS=$CXXFLAGS
  CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}"
  echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6
@@ -5643,7 +5633,7 @@
  #include "confdefs.h"
  
                        template <class T>
-@@ -16799,7 +17006,7 @@
+@@ -16798,7 +17006,7 @@
                      
  ; return 0; }
  EOF
@@ -5652,7 +5642,7 @@
    rm -rf conftest*
    ac_nscap_nonconst_opeq_bug="no"
  else
-@@ -17091,7 +17298,7 @@
+@@ -17090,7 +17298,7 @@
      # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -5661,7 +5651,7 @@
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -17135,19 +17342,19 @@
+@@ -17134,19 +17342,19 @@
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
          echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6
@@ -5684,7 +5674,7 @@
              ## don't use --libs since that can do evil things like add
              ## -Wl,--export-dynamic
              LIBIDL_LIBS="`$PKG_CONFIG --libs-only-L \"libIDL-2.0 >= 0.8.0\"` `$PKG_CONFIG --libs-only-l \"libIDL-2.0 >= 0.8.0\"`"
-@@ -17270,7 +17477,7 @@
+@@ -17269,7 +17477,7 @@
    # Extract the first word of "glib-config", so it can be a program name with args.
  set dummy glib-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -5693,7 +5683,7 @@
  if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -17305,7 +17512,7 @@
+@@ -17304,7 +17512,7 @@
  
    min_glib_version=1.2.0
    echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
@@ -5702,7 +5692,7 @@
    no_glib=""
    if test "$GLIB_CONFIG" = "no" ; then
      no_glib=yes
-@@ -17328,7 +17535,7 @@
+@@ -17327,7 +17535,7 @@
    echo $ac_n "cross compiling; assumed OK... $ac_c"
  else
    cat > conftest.$ac_ext <<EOF
@@ -5711,7 +5701,7 @@
  #include "confdefs.h"
  
  #include <glib.h>
-@@ -17404,7 +17611,7 @@
+@@ -17403,7 +17611,7 @@
  }
  
  EOF
@@ -5720,7 +5710,7 @@
  then
    :
  else
-@@ -17438,7 +17645,7 @@
+@@ -17437,7 +17645,7 @@
            CFLAGS="$CFLAGS $GLIB_CFLAGS"
            LIBS="$LIBS $GLIB_LIBS"
            cat > conftest.$ac_ext <<EOF
@@ -5729,7 +5719,7 @@
  #include "confdefs.h"
  
  #include <glib.h>
-@@ -17448,7 +17655,7 @@
+@@ -17447,7 +17655,7 @@
   return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); 
  ; return 0; }
  EOF
@@ -5738,7 +5728,7 @@
    rm -rf conftest*
     echo "*** The test program compiled, but did not run. This usually means"
            echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-@@ -17492,7 +17699,7 @@
+@@ -17491,7 +17699,7 @@
    # Extract the first word of "libIDL-config", so it can be a program name with args.
  set dummy libIDL-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -5747,7 +5737,7 @@
  if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -17527,7 +17734,7 @@
+@@ -17526,7 +17734,7 @@
  
    min_libIDL_version=$LIBIDL_VERSION
    echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
@@ -5756,7 +5746,7 @@
    no_libIDL=""
    if test "$LIBIDL_CONFIG" = "no" ; then
      no_libIDL=yes
-@@ -17554,7 +17761,7 @@
+@@ -17553,7 +17761,7 @@
    echo $ac_n "cross compiling; assumed OK... $ac_c"
  else
    cat > conftest.$ac_ext <<EOF
@@ -5765,7 +5755,7 @@
  #include "confdefs.h"
  
  #include <stdio.h>
-@@ -17640,7 +17847,7 @@
+@@ -17639,7 +17847,7 @@
  }
  
  EOF
@@ -5774,7 +5764,7 @@
  then
    :
  else
-@@ -17674,7 +17881,7 @@
+@@ -17673,7 +17881,7 @@
            CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
            LIBS="$LIBS $LIBIDL_LIBS"
            cat > conftest.$ac_ext <<EOF
@@ -5783,7 +5773,7 @@
  #include "confdefs.h"
  
  #include <stdio.h>
-@@ -17685,7 +17892,7 @@
+@@ -17684,7 +17892,7 @@
   return IDL_get_libver_string ? 1 : 0; 
  ; return 0; }
  EOF
@@ -5792,7 +5782,7 @@
    rm -rf conftest*
     echo "*** The test program compiled, but did not run. This usually means"
            echo "*** that the run-time linker is not finding libIDL or finding the wrong"
-@@ -17813,7 +18020,7 @@
+@@ -17812,7 +18020,7 @@
    # Extract the first word of "glib-config", so it can be a program name with args.
  set dummy glib-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -5801,7 +5791,7 @@
  if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -17848,7 +18055,7 @@
+@@ -17847,7 +18055,7 @@
  
    min_glib_version=1.2.0
    echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
@@ -5810,7 +5800,7 @@
    no_glib=""
    if test "$GLIB_CONFIG" = "no" ; then
      no_glib=yes
-@@ -17871,7 +18078,7 @@
+@@ -17870,7 +18078,7 @@
    echo $ac_n "cross compiling; assumed OK... $ac_c"
  else
    cat > conftest.$ac_ext <<EOF
@@ -5819,7 +5809,7 @@
  #include "confdefs.h"
  
  #include <glib.h>
-@@ -17947,7 +18154,7 @@
+@@ -17946,7 +18154,7 @@
  }
  
  EOF
@@ -5828,7 +5818,7 @@
  then
    :
  else
-@@ -17981,7 +18188,7 @@
+@@ -17980,7 +18188,7 @@
            CFLAGS="$CFLAGS $GLIB_CFLAGS"
            LIBS="$LIBS $GLIB_LIBS"
            cat > conftest.$ac_ext <<EOF
@@ -5837,7 +5827,7 @@
  #include "confdefs.h"
  
  #include <glib.h>
-@@ -17991,7 +18198,7 @@
+@@ -17990,7 +18198,7 @@
   return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); 
  ; return 0; }
  EOF
@@ -5846,7 +5836,7 @@
    rm -rf conftest*
     echo "*** The test program compiled, but did not run. This usually means"
            echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-@@ -18035,7 +18242,7 @@
+@@ -18034,7 +18242,7 @@
    # Extract the first word of "libIDL-config", so it can be a program name with args.
  set dummy libIDL-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -5855,7 +5845,7 @@
  if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18070,7 +18277,7 @@
+@@ -18069,7 +18277,7 @@
  
    min_libIDL_version=$LIBIDL_VERSION
    echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
@@ -5864,7 +5854,7 @@
    no_libIDL=""
    if test "$LIBIDL_CONFIG" = "no" ; then
      no_libIDL=yes
-@@ -18097,7 +18304,7 @@
+@@ -18096,7 +18304,7 @@
    echo $ac_n "cross compiling; assumed OK... $ac_c"
  else
    cat > conftest.$ac_ext <<EOF
@@ -5873,7 +5863,7 @@
  #include "confdefs.h"
  
  #include <stdio.h>
-@@ -18183,7 +18390,7 @@
+@@ -18182,7 +18390,7 @@
  }
  
  EOF
@@ -5882,7 +5872,7 @@
  then
    :
  else
-@@ -18217,7 +18424,7 @@
+@@ -18216,7 +18424,7 @@
            CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
            LIBS="$LIBS $LIBIDL_LIBS"
            cat > conftest.$ac_ext <<EOF
@@ -5891,7 +5881,7 @@
  #include "confdefs.h"
  
  #include <stdio.h>
-@@ -18228,7 +18435,7 @@
+@@ -18227,7 +18435,7 @@
   return IDL_get_libver_string ? 1 : 0; 
  ; return 0; }
  EOF
@@ -5900,7 +5890,7 @@
    rm -rf conftest*
     echo "*** The test program compiled, but did not run. This usually means"
            echo "*** that the run-time linker is not finding libIDL or finding the wrong"
-@@ -18269,7 +18476,7 @@
+@@ -18268,7 +18476,7 @@
      # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -5909,7 +5899,7 @@
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18313,19 +18520,19 @@
+@@ -18312,19 +18520,19 @@
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
          echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6
@@ -5932,7 +5922,7 @@
              ## don't use --libs since that can do evil things like add
              ## -Wl,--export-dynamic
              LIBIDL_LIBS="`$PKG_CONFIG --libs-only-L \"libIDL-2.0 >= 0.8.0\"` `$PKG_CONFIG --libs-only-l \"libIDL-2.0 >= 0.8.0\"`"
-@@ -18361,7 +18568,7 @@
+@@ -18360,7 +18568,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -5941,7 +5931,7 @@
  if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18398,7 +18605,7 @@
+@@ -18397,7 +18605,7 @@
  
          if test -n "$ORBIT_CONFIG"; then
              echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6
@@ -5950,7 +5940,7 @@
          	_ORBIT_CFLAGS=`${ORBIT_CONFIG} client --cflags`
      	    _ORBIT_LIBS=`${ORBIT_CONFIG} client --libs`
              _ORBIT_INC_PATH=`${PERL} -e '{ for $f (@ARGV) { print "$f " if ($f =~ m/^-I/); } }' -- ${_ORBIT_CFLAGS}`
-@@ -18415,7 +18622,7 @@
+@@ -18414,7 +18622,7 @@
                  result="maybe" 
  else
    cat > conftest.$ac_ext <<EOF
@@ -5959,7 +5949,7 @@
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -18430,7 +18637,7 @@
+@@ -18429,7 +18637,7 @@
  }
              
  EOF
@@ -5968,7 +5958,7 @@
  then
    _LIBIDL_FOUND=1
                  result="yes"
-@@ -18487,7 +18694,7 @@
+@@ -18486,7 +18694,7 @@
      # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -5977,7 +5967,7 @@
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18531,19 +18738,19 @@
+@@ -18530,19 +18738,19 @@
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
          echo $ac_n "checking for glib-2.0 >= 1.3.7""... $ac_c" 1>&6
@@ -6000,7 +5990,7 @@
              ## don't use --libs since that can do evil things like add
              ## -Wl,--export-dynamic
              GLIB_LIBS="`$PKG_CONFIG --libs-only-L \"glib-2.0 >= 1.3.7\"` `$PKG_CONFIG --libs-only-l \"glib-2.0 >= 1.3.7\"`"
-@@ -18627,7 +18834,7 @@
+@@ -18626,7 +18834,7 @@
    # Extract the first word of "glib-config", so it can be a program name with args.
  set dummy glib-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -6009,7 +5999,7 @@
  if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18662,7 +18869,7 @@
+@@ -18661,7 +18869,7 @@
  
    min_glib_version=${GLIB_VERSION}
    echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
@@ -6018,7 +6008,7 @@
    no_glib=""
    if test "$GLIB_CONFIG" = "no" ; then
      no_glib=yes
-@@ -18685,7 +18892,7 @@
+@@ -18684,7 +18892,7 @@
    echo $ac_n "cross compiling; assumed OK... $ac_c"
  else
    cat > conftest.$ac_ext <<EOF
@@ -6027,7 +6017,7 @@
  #include "confdefs.h"
  
  #include <glib.h>
-@@ -18761,7 +18968,7 @@
+@@ -18760,7 +18968,7 @@
  }
  
  EOF
@@ -6036,7 +6026,7 @@
  then
    :
  else
-@@ -18795,7 +19002,7 @@
+@@ -18794,7 +19002,7 @@
            CFLAGS="$CFLAGS $GLIB_CFLAGS"
            LIBS="$LIBS $GLIB_LIBS"
            cat > conftest.$ac_ext <<EOF
@@ -6045,7 +6035,7 @@
  #include "confdefs.h"
  
  #include <glib.h>
-@@ -18805,7 +19012,7 @@
+@@ -18804,7 +19012,7 @@
   return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); 
  ; return 0; }
  EOF
@@ -6054,7 +6044,7 @@
    rm -rf conftest*
     echo "*** The test program compiled, but did not run. This usually means"
            echo "*** that the run-time linker is not finding GLIB or finding the wrong"
-@@ -18885,19 +19092,19 @@
+@@ -18884,19 +19092,19 @@
    # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
  # for constant arguments.  Useless!
  echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
@@ -6077,7 +6067,7 @@
    rm -rf conftest*
    ac_cv_header_alloca_h=yes
  else
-@@ -18918,12 +19125,12 @@
+@@ -18917,12 +19125,12 @@
  fi
  
  echo $ac_n "checking for alloca""... $ac_c" 1>&6
@@ -6092,7 +6082,7 @@
  #include "confdefs.h"
  
  #ifdef __GNUC__
-@@ -18951,7 +19158,7 @@
+@@ -18950,7 +19158,7 @@
  char *p = (char *) alloca(1);
  ; return 0; }
  EOF
@@ -6101,7 +6091,7 @@
    rm -rf conftest*
    ac_cv_func_alloca_works=yes
  else
-@@ -18983,12 +19190,12 @@
+@@ -18982,12 +19190,12 @@
  
  
  echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
@@ -6116,7 +6106,7 @@
  #include "confdefs.h"
  #if defined(CRAY) && ! defined(CRAY2)
  webecray
-@@ -19013,12 +19220,12 @@
+@@ -19012,12 +19220,12 @@
  if test $ac_cv_os_cray = yes; then
  for ac_func in _getb67 GETB67 getb67; do
    echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -6131,7 +6121,7 @@
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -19041,7 +19248,7 @@
+@@ -19040,7 +19248,7 @@
  
  ; return 0; }
  EOF
@@ -6140,7 +6130,7 @@
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -19068,7 +19275,7 @@
+@@ -19067,7 +19275,7 @@
  fi
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
@@ -6149,7 +6139,7 @@
  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -19076,7 +19283,7 @@
+@@ -19075,7 +19283,7 @@
    ac_cv_c_stack_direction=0
  else
    cat > conftest.$ac_ext <<EOF
@@ -6158,7 +6148,7 @@
  #include "confdefs.h"
  find_stack_direction ()
  {
-@@ -19095,7 +19302,7 @@
+@@ -19094,7 +19302,7 @@
    exit (find_stack_direction() < 0);
  }
  EOF
@@ -6167,7 +6157,7 @@
  then
    ac_cv_c_stack_direction=1
  else
-@@ -19144,17 +19351,17 @@
+@@ -19143,17 +19351,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -6188,7 +6178,7 @@
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -19245,7 +19452,7 @@
+@@ -19244,7 +19452,7 @@
      # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -6197,7 +6187,7 @@
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -19289,19 +19496,19 @@
+@@ -19288,19 +19496,19 @@
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
          echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6
@@ -6220,7 +6210,7 @@
              ## don't use --libs since that can do evil things like add
              ## -Wl,--export-dynamic
              CAIRO_LIBS="`$PKG_CONFIG --libs-only-L \"cairo >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo >= $CAIRO_VERSION\"`"
-@@ -19331,6 +19538,199 @@
+@@ -19330,6 +19538,199 @@
  
        MOZ_CAIRO_CFLAGS=$CAIRO_CFLAGS
        MOZ_CAIRO_LIBS=$CAIRO_LIBS
@@ -6420,7 +6410,7 @@
     fi
  fi
  
-@@ -19338,6 +19738,10 @@
+@@ -19337,6 +19738,10 @@
  
  
  
@@ -6431,7 +6421,7 @@
  # Check whether --enable-xul or --disable-xul was given.
  if test "${enable_xul+set}" = set; then
    enableval="$enable_xul"
-@@ -19366,7 +19770,7 @@
+@@ -19365,7 +19770,7 @@
          # Extract the first word of "python", so it can be a program name with args.
  set dummy python; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -6440,7 +6430,7 @@
  if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -19642,14 +20046,14 @@
+@@ -19641,14 +20046,14 @@
  cross_compiling=$ac_cv_prog_cc_cross
  
      cat > conftest.$ac_ext <<EOF
@@ -6457,7 +6447,7 @@
    :
  else
    echo "configure: failed program was:" >&5
-@@ -19833,6 +20237,7 @@
+@@ -19832,6 +20237,7 @@
  
  
  
@@ -6465,7 +6455,7 @@
  CFLAGS=`echo \
  	$_WARNINGS_CFLAGS \
  	$CFLAGS`
-@@ -19929,6 +20334,9 @@
+@@ -19928,6 +20334,9 @@
  
  
  
@@ -6475,7 +6465,7 @@
  cat >> confdefs.h <<EOF
  #define MOZ_DLL_SUFFIX "$DLL_SUFFIX"
  EOF
-@@ -19956,7 +20364,7 @@
+@@ -19955,7 +20364,7 @@
                  _SAVE_CFLAGS=$CFLAGS
      CFLAGS="$CFLAGS $XCFLAGS"
      cat > conftest.$ac_ext <<EOF
@@ -6484,7 +6474,7 @@
  #include "confdefs.h"
  
          #include <stdio.h>
-@@ -19972,7 +20380,7 @@
+@@ -19971,7 +20380,7 @@
      
  ; return 0; }
  EOF
@@ -6493,7 +6483,7 @@
    :
  else
    echo "configure: failed program was:" >&5
-@@ -20190,34 +20598,15 @@
+@@ -20189,34 +20598,15 @@
  # Transform confdefs.h into DEFS.
  # Protect against shell expansion while executing Makefile rules.
  # Protect against Makefile macro expansion.
@@ -6537,7 +6527,7 @@
  
  MOZ_DEFINES=$DEFS
  
-@@ -20420,7 +20809,6 @@
+@@ -20419,7 +20809,6 @@
  s%@WHOAMI@%$WHOAMI%g
  s%@AUTOCONF@%$AUTOCONF%g
  s%@UNZIP@%$UNZIP%g
@@ -6545,7 +6535,7 @@
  s%@SYSTEM_MAKEDEPEND@%$SYSTEM_MAKEDEPEND%g
  s%@XARGS@%$XARGS%g
  s%@PBBUILD@%$PBBUILD%g
-@@ -20457,10 +20845,13 @@
+@@ -20456,10 +20845,13 @@
  s%@NSS_CONFIG@%$NSS_CONFIG%g
  s%@NSS_CFLAGS@%$NSS_CFLAGS%g
  s%@NSS_LIBS@%$NSS_LIBS%g
@@ -6560,7 +6550,7 @@
  s%@MOZ_GTK2_CFLAGS@%$MOZ_GTK2_CFLAGS%g
  s%@MOZ_GTK2_LIBS@%$MOZ_GTK2_LIBS%g
  s%@HOST_MOC@%$HOST_MOC%g
-@@ -20534,6 +20925,9 @@
+@@ -20533,6 +20925,9 @@
  s%@MOZ_SAFE_BROWSING@%$MOZ_SAFE_BROWSING%g
  s%@MOZ_URL_CLASSIFIER@%$MOZ_URL_CLASSIFIER%g
  s%@JS_ULTRASPARC_OPTS@%$JS_ULTRASPARC_OPTS%g
@@ -6570,7 +6560,7 @@
  s%@MOZ_OPTIMIZE@%$MOZ_OPTIMIZE%g
  s%@MOZ_OPTIMIZE_FLAGS@%$MOZ_OPTIMIZE_FLAGS%g
  s%@MOZ_OPTIMIZE_LDFLAGS@%$MOZ_OPTIMIZE_LDFLAGS%g
-@@ -20541,6 +20935,7 @@
+@@ -20540,6 +20935,7 @@
  s%@MOZ_REFLOW_PERF@%$MOZ_REFLOW_PERF%g
  s%@NS_TRACE_MALLOC@%$NS_TRACE_MALLOC%g
  s%@MOZ_DEMANGLE_SYMBOLS@%$MOZ_DEMANGLE_SYMBOLS%g
@@ -6578,7 +6568,7 @@
  s%@MOZ_DOC_INPUT_DIRS@%$MOZ_DOC_INPUT_DIRS%g
  s%@MOZ_DOC_INCLUDE_DIRS@%$MOZ_DOC_INCLUDE_DIRS%g
  s%@MOZ_DOC_OUTPUT_DIR@%$MOZ_DOC_OUTPUT_DIR%g
-@@ -20581,9 +20976,17 @@
+@@ -20580,9 +20976,17 @@
  s%@PNG_FUNCTIONS_FEATURE@%$PNG_FUNCTIONS_FEATURE%g
  s%@CAIRO_CFLAGS@%$CAIRO_CFLAGS%g
  s%@CAIRO_LIBS@%$CAIRO_LIBS%g
@@ -6596,7 +6586,7 @@
  s%@MOZ_XUL@%$MOZ_XUL%g
  s%@MOZ_PYTHON@%$MOZ_PYTHON%g
  s%@MOZ_PYTHON_PREFIX@%$MOZ_PYTHON_PREFIX%g
-@@ -20692,6 +21095,7 @@
+@@ -20691,6 +21095,7 @@
  s%@MOZ_STATIC_COMPONENT_LIBS@%$MOZ_STATIC_COMPONENT_LIBS%g
  s%@MOZ_ENABLE_LIBXUL@%$MOZ_ENABLE_LIBXUL%g
  s%@ENABLE_TESTS@%$ENABLE_TESTS%g
@@ -6604,7 +6594,7 @@
  s%@IBMBIDI@%$IBMBIDI%g
  s%@SUNCTL@%$SUNCTL%g
  s%@ACCESSIBILITY@%$ACCESSIBILITY%g
-@@ -20741,6 +21145,7 @@
+@@ -20740,6 +21145,7 @@
  s%@SYSTEM_JPEG@%$SYSTEM_JPEG%g
  s%@SYSTEM_PNG@%$SYSTEM_PNG%g
  s%@SYSTEM_ZLIB@%$SYSTEM_ZLIB%g
@@ -6612,7 +6602,7 @@
  s%@JPEG_CFLAGS@%$JPEG_CFLAGS%g
  s%@JPEG_LIBS@%$JPEG_LIBS%g
  s%@ZLIB_CFLAGS@%$ZLIB_CFLAGS%g
-@@ -20751,6 +21156,8 @@
+@@ -20750,6 +21156,8 @@
  s%@MOZ_JPEG_LIBS@%$MOZ_JPEG_LIBS%g
  s%@MOZ_ZLIB_CFLAGS@%$MOZ_ZLIB_CFLAGS%g
  s%@MOZ_ZLIB_LIBS@%$MOZ_ZLIB_LIBS%g
@@ -6621,7 +6611,7 @@
  s%@MOZ_PNG_CFLAGS@%$MOZ_PNG_CFLAGS%g
  s%@MOZ_PNG_LIBS@%$MOZ_PNG_LIBS%g
  s%@MOZ_NATIVE_NSPR@%$MOZ_NATIVE_NSPR%g
-@@ -21156,7 +21563,7 @@
+@@ -21155,7 +21563,7 @@
        fi
      fi
  
@@ -6630,7 +6620,7 @@
    done
  fi
  
-@@ -21299,7 +21706,7 @@
+@@ -21298,7 +21706,7 @@
        fi
      fi
  
@@ -6639,3 +6629,6410 @@
    done
  fi