diff -pruN 1:0.8~b3.dfsg.1-0.1/debian/changelog 1:0.8~b3.dfsg.1-0.1ubuntu3/debian/changelog
--- 1:0.8~b3.dfsg.1-0.1/debian/changelog	2012-10-03 14:36:49.000000000 +0000
+++ 1:0.8~b3.dfsg.1-0.1ubuntu3/debian/changelog	2012-10-03 14:36:52.000000000 +0000
@@ -1,3 +1,24 @@
+kompozer (1:0.8~b3.dfsg.1-0.1ubuntu3) quantal; urgency=low
+
+  * gcc-4.7-fixes.patch: fix ftbs
+
+ -- Julian Taylor <jtaylor@ubuntu.com>  Wed, 03 Oct 2012 14:57:35 +0200
+
+kompozer (1:0.8~b3.dfsg.1-0.1ubuntu2) precise; urgency=low
+
+  * Add -Wa,-mimplicit-it=thumb on ARM to work around lack of IT
+    instructions in inline assembly (LP: #935214).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 24 Apr 2012 14:37:56 +0100
+
+kompozer (1:0.8~b3.dfsg.1-0.1ubuntu1) oneiric; urgency=low
+
+  * Add 25_uninitialized_const.patch to fix FTBFS. (LP: #770836)
+    (Closes: #624923)
+  * Refresh 99_configure.patch to handle new multiarch lib path.
+
+ -- Daniel T Chen <crimsun@ubuntu.com>  Tue, 20 Sep 2011 17:16:43 -0400
+
 kompozer (1:0.8~b3.dfsg.1-0.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -pruN 1:0.8~b3.dfsg.1-0.1/debian/control 1:0.8~b3.dfsg.1-0.1ubuntu3/debian/control
--- 1:0.8~b3.dfsg.1-0.1/debian/control	2012-10-03 14:36:49.000000000 +0000
+++ 1:0.8~b3.dfsg.1-0.1ubuntu3/debian/control	2012-10-03 14:36:52.000000000 +0000
@@ -1,7 +1,8 @@
 Source: kompozer
 Section: web
 Priority: optional
-Maintainer: Giuseppe Iuculano <iuculano@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Giuseppe Iuculano <iuculano@debian.org>
 Build-Depends: debhelper (>= 7.0), zip , libgtk2.0-dev , libidl-dev , libxt-dev , autotools-dev, quilt, libgnomevfs2-dev, libxft-dev, libnspr4-dev, libnss3-dev
 Standards-Version: 3.8.4
 Homepage: http://kompozer.sourceforge.net/
diff -pruN 1:0.8~b3.dfsg.1-0.1/debian/patches/25_uninitialized_const.patch 1:0.8~b3.dfsg.1-0.1ubuntu3/debian/patches/25_uninitialized_const.patch
--- 1:0.8~b3.dfsg.1-0.1/debian/patches/25_uninitialized_const.patch	1970-01-01 00:00:00.000000000 +0000
+++ 1:0.8~b3.dfsg.1-0.1ubuntu3/debian/patches/25_uninitialized_const.patch	2012-10-03 14:36:52.000000000 +0000
@@ -0,0 +1,14 @@
+Index: kompozer-0.8~b3.dfsg.1/mozilla/layout/style/nsCSSStyleSheet.cpp
+===================================================================
+--- kompozer-0.8~b3.dfsg.1.orig/mozilla/layout/style/nsCSSStyleSheet.cpp	2011-09-20 17:36:00.000000000 -0400
++++ kompozer-0.8~b3.dfsg.1/mozilla/layout/style/nsCSSStyleSheet.cpp	2011-09-20 17:50:59.000000000 -0400
+@@ -2894,7 +2894,8 @@
+ {
+   NS_PRECONDITION(aAttrSelector, "Must have an attribute selector");
+   const nsDefaultStringComparator defaultComparator;
+-  const nsCaseInsensitiveStringComparator ciComparator;
++  const nsCaseInsensitiveStringComparator ciComparator =
++    nsCaseInsensitiveStringComparator();
+   const nsStringComparator& comparator = aAttrSelector->mCaseSensitive
+                 ? NS_STATIC_CAST(const nsStringComparator&, defaultComparator)
+                 : NS_STATIC_CAST(const nsStringComparator&, ciComparator);
diff -pruN 1:0.8~b3.dfsg.1-0.1/debian/patches/99_configure.patch 1:0.8~b3.dfsg.1-0.1ubuntu3/debian/patches/99_configure.patch
--- 1:0.8~b3.dfsg.1-0.1/debian/patches/99_configure.patch	2012-10-03 14:36:49.000000000 +0000
+++ 1:0.8~b3.dfsg.1-0.1ubuntu3/debian/patches/99_configure.patch	2012-10-03 14:36:52.000000000 +0000
@@ -1,7 +1,9 @@
 update configure with autoconf2.13
---- a/mozilla/configure
-+++ b/mozilla/configure
-@@ -5035,18 +5035,42 @@ if test -n "$CROSS_COMPILE"; then
+Index: kompozer-0.8~b3.dfsg.1/mozilla/configure
+===================================================================
+--- kompozer-0.8~b3.dfsg.1.orig/mozilla/configure	2011-09-20 18:20:18.000000000 -0400
++++ kompozer-0.8~b3.dfsg.1/mozilla/configure	2011-09-20 18:33:53.000000000 -0400
+@@ -5035,18 +5035,42 @@
      OS_RELEASE=
      OS_TEST="${target_cpu}"
      case "${target_os}" in
@@ -29,7 +31,7 @@ update configure with autoconf2.13
 +        wince*)       OS_ARCH=WINCE ;;
 +        darwin*)      OS_ARCH=Darwin OS_TARGET=Darwin ;;
 +    esac
-+fi
+ fi
 +
 +if test -n "$FORCE_USE_HOST_OS"; then
 +	OS_TARGET="${host_os}"
@@ -43,12 +45,12 @@ update configure with autoconf2.13
 +	    wince*)       OS_ARCH=WINCE ;;
 +	    darwin*)      OS_ARCH=Darwin OS_TARGET=Darwin ;;
 +	esac
- fi
++fi
 +
  _COMPILER_PREFIX=
  
  HOST_OS_ARCH=`echo $host_os | sed -e 's|/|_|g'`
-@@ -5383,7 +5407,7 @@ MKSHLIB_UNFORCE_ALL=
+@@ -5383,7 +5407,7 @@
  if test "$COMPILE_ENVIRONMENT"; then
  if test "$GNU_CC"; then
    echo $ac_n "checking whether ld has archive extraction flags""... $ac_c" 1>&6
@@ -57,7 +59,7 @@ update configure with autoconf2.13
    if eval "test \"`echo '$''{'ac_cv_mkshlib_force_and_unforce'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -5400,14 +5424,14 @@ LOOP_INPUT
+@@ -5400,14 +5424,14 @@
        LDFLAGS=$force
        LIBS=$unforce
        cat > conftest.$ac_ext <<EOF
@@ -74,7 +76,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_mkshlib_force_and_unforce=$line; break
  else
-@@ -5440,7 +5464,7 @@ configure_static_assert_macros='
+@@ -5440,7 +5464,7 @@
  '
  
  echo $ac_n "checking that static assertion macros used in autoconf tests work""... $ac_c" 1>&6
@@ -83,7 +85,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_static_assertion_macros_work'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -5454,14 +5478,14 @@ cross_compiling=$ac_cv_prog_cc_cross
+@@ -5454,14 +5478,14 @@
  
    ac_cv_static_assertion_macros_work="yes"
    cat > conftest.$ac_ext <<EOF
@@ -100,7 +102,7 @@ update configure with autoconf2.13
    :
  else
    echo "configure: failed program was:" >&5
-@@ -5471,14 +5495,14 @@ else
+@@ -5471,14 +5495,14 @@
  fi
  rm -f conftest*
    cat > conftest.$ac_ext <<EOF
@@ -117,7 +119,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_static_assertion_macros_work="no"
  else
-@@ -5494,14 +5518,14 @@ ac_link='${CXX-g++} -o conftest${ac_exee
+@@ -5494,14 +5518,14 @@
  cross_compiling=$ac_cv_prog_cxx_cross
  
    cat > conftest.$ac_ext <<EOF
@@ -134,7 +136,7 @@ update configure with autoconf2.13
    :
  else
    echo "configure: failed program was:" >&5
-@@ -5511,14 +5535,14 @@ else
+@@ -5511,14 +5535,14 @@
  fi
  rm -f conftest*
    cat > conftest.$ac_ext <<EOF
@@ -151,7 +153,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_static_assertion_macros_work="no"
  else
-@@ -5553,16 +5577,16 @@ ac_link='${CC-cc} -o conftest${ac_exeext
+@@ -5553,16 +5577,16 @@
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6
@@ -171,7 +173,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    result="yes"
  else
-@@ -5641,7 +5665,7 @@ case "$host" in
+@@ -5641,7 +5665,7 @@
      LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(DIST)/bin/XUL -lobjc'
      ;;
  
@@ -180,7 +182,7 @@ update configure with autoconf2.13
      HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
      HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
      HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
-@@ -5722,9 +5746,9 @@ ac_link='${CXX-g++} -o conftest${ac_exee
+@@ -5722,9 +5746,9 @@
  cross_compiling=$ac_cv_prog_cxx_cross
  
              echo $ac_n "checking for VisualAge C++ compiler version >= 5.0.2.0""... $ac_c" 1>&6
@@ -192,7 +194,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
  int main() {
-@@ -5733,7 +5757,7 @@ int main() {
+@@ -5733,7 +5757,7 @@
                   #endif
  ; return 0; }
  EOF
@@ -201,7 +203,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    _BAD_COMPILER=
  else
-@@ -5771,17 +5795,17 @@ cross_compiling=$ac_cv_prog_cxx_cross
+@@ -5771,17 +5795,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -222,7 +224,7 @@ update configure with autoconf2.13
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -5823,7 +5847,7 @@ EOF
+@@ -5823,7 +5847,7 @@
      LIBS="$LIBS -lbe"
      if test "$COMPILE_ENVIRONMENT"; then
          echo $ac_n "checking for main in -lbind""... $ac_c" 1>&6
@@ -231,7 +233,7 @@ update configure with autoconf2.13
  ac_lib_var=`echo bind'_'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
-@@ -5831,14 +5855,14 @@ else
+@@ -5831,14 +5855,14 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -248,7 +250,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -5859,7 +5883,7 @@ else
+@@ -5859,7 +5883,7 @@
  fi
  
          echo $ac_n "checking for main in -lzeta""... $ac_c" 1>&6
@@ -257,7 +259,7 @@ update configure with autoconf2.13
  ac_lib_var=`echo zeta'_'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
-@@ -5867,14 +5891,14 @@ else
+@@ -5867,14 +5891,14 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lzeta  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -274,7 +276,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -5942,18 +5966,18 @@ EOF
+@@ -5942,18 +5966,18 @@
      MACOSX=1
  
          echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6
@@ -296,7 +298,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    _HAVE_DEAD_STRIP=1
  else
-@@ -6092,8 +6116,6 @@ EOF
+@@ -6092,8 +6116,6 @@
          MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS=1
      ;;
      mips*)
@@ -305,7 +307,7 @@ update configure with autoconf2.13
      ;;
      esac
      ;;
-@@ -6821,14 +6843,14 @@ EOF
+@@ -6821,14 +6843,14 @@
             _SAVE_LDFLAGS=$LDFLAGS
             LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS" 
             cat > conftest.$ac_ext <<EOF
@@ -322,7 +324,7 @@ update configure with autoconf2.13
    :
  else
    echo "configure: failed program was:" >&5
-@@ -6856,7 +6878,7 @@ rm -f conftest*
+@@ -6856,7 +6878,7 @@
          CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
          CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'`
         echo $ac_n "checking for Forte compiler version >= WS6U2""... $ac_c" 1>&6
@@ -331,7 +333,7 @@ update configure with autoconf2.13
         
         ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -6866,7 +6888,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
+@@ -6866,7 +6888,7 @@
  cross_compiling=$ac_cv_prog_cxx_cross
  
         cat > conftest.$ac_ext <<EOF
@@ -340,7 +342,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
  int main() {
-@@ -6875,7 +6897,7 @@ int main() {
+@@ -6875,7 +6897,7 @@
             #endif
  ; return 0; }
  EOF
@@ -349,7 +351,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    _BAD_COMPILER=
  else
-@@ -6985,7 +7007,7 @@ EOF
+@@ -6985,7 +7007,7 @@
  esac
  
  case "$target" in
@@ -358,7 +360,7 @@ update configure with autoconf2.13
          MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
          ;;
      *-solaris*)
-@@ -7025,12 +7047,12 @@ ac_link='${CC-cc} -o conftest${ac_exeext
+@@ -7025,12 +7047,12 @@
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
@@ -373,7 +375,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -7038,7 +7060,7 @@ else
+@@ -7038,7 +7060,7 @@
  #include <float.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
@@ -382,7 +384,7 @@ update configure with autoconf2.13
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -7055,7 +7077,7 @@ rm -f conftest*
+@@ -7055,7 +7077,7 @@
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
@@ -391,7 +393,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #include <string.h>
  EOF
-@@ -7073,7 +7095,7 @@ fi
+@@ -7073,7 +7095,7 @@
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
@@ -400,7 +402,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
-@@ -7094,7 +7116,7 @@ if test "$cross_compiling" = yes; then
+@@ -7094,7 +7116,7 @@
    :
  else
    cat > conftest.$ac_ext <<EOF
@@ -409,7 +411,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #include <ctype.h>
  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -7105,7 +7127,7 @@ if (XOR (islower (i), ISLOWER (i)) || to
+@@ -7105,7 +7127,7 @@
  exit (0); }
  
  EOF
@@ -418,7 +420,7 @@ update configure with autoconf2.13
  then
    :
  else
-@@ -7129,12 +7151,12 @@ EOF
+@@ -7129,12 +7151,12 @@
  fi
  
  echo $ac_n "checking for working const""... $ac_c" 1>&6
@@ -433,7 +435,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
  int main() {
-@@ -7183,7 +7205,7 @@ ccp = (char const *const *) p;
+@@ -7183,7 +7205,7 @@
  
  ; return 0; }
  EOF
@@ -442,7 +444,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_c_const=yes
  else
-@@ -7204,12 +7226,12 @@ EOF
+@@ -7204,12 +7226,12 @@
  fi
  
  echo $ac_n "checking for mode_t""... $ac_c" 1>&6
@@ -457,7 +459,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
-@@ -7237,12 +7259,12 @@ EOF
+@@ -7237,12 +7259,12 @@
  fi
  
  echo $ac_n "checking for off_t""... $ac_c" 1>&6
@@ -472,7 +474,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
-@@ -7270,12 +7292,12 @@ EOF
+@@ -7270,12 +7292,12 @@
  fi
  
  echo $ac_n "checking for pid_t""... $ac_c" 1>&6
@@ -487,7 +489,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
-@@ -7303,12 +7325,12 @@ EOF
+@@ -7303,12 +7325,12 @@
  fi
  
  echo $ac_n "checking for size_t""... $ac_c" 1>&6
@@ -502,7 +504,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
-@@ -7336,12 +7358,12 @@ EOF
+@@ -7336,12 +7358,12 @@
  fi
  
  echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
@@ -517,7 +519,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/stat.h>
-@@ -7349,7 +7371,7 @@ int main() {
+@@ -7349,7 +7371,7 @@
  struct stat s; s.st_blksize;
  ; return 0; }
  EOF
@@ -526,7 +528,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_struct_st_blksize=yes
  else
-@@ -7370,12 +7392,12 @@ EOF
+@@ -7370,12 +7392,12 @@
  fi
  
  echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6
@@ -541,7 +543,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #define _POSIX_C_SOURCE 199506L
                    #include <signal.h>
-@@ -7383,7 +7405,7 @@ int main() {
+@@ -7383,7 +7405,7 @@
  siginfo_t* info;
  ; return 0; }
  EOF
@@ -550,7 +552,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_siginfo_t=true
  else
-@@ -7417,12 +7439,12 @@ EOF
+@@ -7417,12 +7439,12 @@
  fi
  
  echo $ac_n "checking for int16_t""... $ac_c" 1>&6
@@ -565,7 +567,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #include <stdio.h>
                    #include <sys/types.h>
-@@ -7430,7 +7452,7 @@ int main() {
+@@ -7430,7 +7452,7 @@
  int16_t foo = 0;
  ; return 0; }
  EOF
@@ -574,7 +576,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_int16_t=true
  else
-@@ -7452,12 +7474,12 @@ else
+@@ -7452,12 +7474,12 @@
    echo "$ac_t""no" 1>&6
  fi
  echo $ac_n "checking for int32_t""... $ac_c" 1>&6
@@ -589,7 +591,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #include <stdio.h>
                    #include <sys/types.h>
-@@ -7465,7 +7487,7 @@ int main() {
+@@ -7465,7 +7487,7 @@
  int32_t foo = 0;
  ; return 0; }
  EOF
@@ -598,7 +600,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_int32_t=true
  else
-@@ -7487,12 +7509,12 @@ else
+@@ -7487,12 +7509,12 @@
    echo "$ac_t""no" 1>&6
  fi
  echo $ac_n "checking for int64_t""... $ac_c" 1>&6
@@ -613,7 +615,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #include <stdio.h>
                    #include <sys/types.h>
-@@ -7500,7 +7522,7 @@ int main() {
+@@ -7500,7 +7522,7 @@
  int64_t foo = 0;
  ; return 0; }
  EOF
@@ -622,7 +624,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_int64_t=true
  else
-@@ -7522,12 +7544,12 @@ else
+@@ -7522,12 +7544,12 @@
    echo "$ac_t""no" 1>&6
  fi
  echo $ac_n "checking for int64""... $ac_c" 1>&6
@@ -637,7 +639,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #include <stdio.h>
                    #include <sys/types.h>
-@@ -7535,7 +7557,7 @@ int main() {
+@@ -7535,7 +7557,7 @@
  int64 foo = 0;
  ; return 0; }
  EOF
@@ -646,7 +648,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_int64=true
  else
-@@ -7557,12 +7579,12 @@ else
+@@ -7557,12 +7579,12 @@
    echo "$ac_t""no" 1>&6
  fi
  echo $ac_n "checking for uint""... $ac_c" 1>&6
@@ -661,7 +663,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #include <stdio.h>
                    #include <sys/types.h>
-@@ -7570,7 +7592,7 @@ int main() {
+@@ -7570,7 +7592,7 @@
  uint foo = 0;
  ; return 0; }
  EOF
@@ -670,7 +672,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_uint=true
  else
-@@ -7592,12 +7614,12 @@ else
+@@ -7592,12 +7614,12 @@
    echo "$ac_t""no" 1>&6
  fi
  echo $ac_n "checking for uint_t""... $ac_c" 1>&6
@@ -685,7 +687,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #include <stdio.h>
                    #include <sys/types.h>
-@@ -7605,7 +7627,7 @@ int main() {
+@@ -7605,7 +7627,7 @@
  uint_t foo = 0;
  ; return 0; }
  EOF
@@ -694,7 +696,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_uint_t=true
  else
-@@ -7627,12 +7649,12 @@ else
+@@ -7627,12 +7649,12 @@
    echo "$ac_t""no" 1>&6
  fi
  echo $ac_n "checking for uint16_t""... $ac_c" 1>&6
@@ -709,7 +711,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #include <stdio.h>
                    #include <sys/types.h>
-@@ -7640,7 +7662,7 @@ int main() {
+@@ -7640,7 +7662,7 @@
  uint16_t foo = 0;
  ; return 0; }
  EOF
@@ -718,7 +720,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_uint16_t=true
  else
-@@ -7671,12 +7693,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
+@@ -7671,12 +7693,12 @@
  
  
  echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6
@@ -733,7 +735,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #include <sys/utsname.h>
  int main() {
-@@ -7684,7 +7706,7 @@ int main() {
+@@ -7684,7 +7706,7 @@
              (void)uname(res);  if (res != 0) { domain = res->domainname; } 
  ; return 0; }
  EOF
@@ -742,7 +744,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_have_uname_domainname_field=true
  else
-@@ -7708,12 +7730,12 @@ else
+@@ -7708,12 +7730,12 @@
  fi
  
  echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6
@@ -757,7 +759,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #include <sys/utsname.h>
  int main() {
-@@ -7721,7 +7743,7 @@ int main() {
+@@ -7721,7 +7743,7 @@
              (void)uname(res);  if (res != 0) { domain = res->__domainname; } 
  ; return 0; }
  EOF
@@ -766,7 +768,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_have_uname_us_domainname_field=true
  else
-@@ -7754,12 +7776,12 @@ cross_compiling=$ac_cv_prog_cc_cross
+@@ -7754,12 +7776,12 @@
  
  
  echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6
@@ -781,7 +783,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #include <stddef.h>
                       $configure_static_assert_macros
-@@ -7768,7 +7790,7 @@ CONFIGURE_STATIC_ASSERT(sizeof(wchar_t)
+@@ -7768,7 +7790,7 @@
                       CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0)
  ; return 0; }
  EOF
@@ -790,7 +792,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_have_usable_wchar_v2="yes"
  else
-@@ -7801,12 +7823,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
+@@ -7801,12 +7823,12 @@
      CXXFLAGS="$CXXFLAGS -fshort-wchar"
  
      echo $ac_n "checking for compiler -fshort-wchar option""... $ac_c" 1>&6
@@ -805,7 +807,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #include <stddef.h>
                           $configure_static_assert_macros
-@@ -7815,7 +7837,7 @@ CONFIGURE_STATIC_ASSERT(sizeof(wchar_t)
+@@ -7815,7 +7837,7 @@
                           CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0)
  ; return 0; }
  EOF
@@ -814,7 +816,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_have_usable_wchar_option_v2="yes"
  else
-@@ -7849,7 +7871,7 @@ fi
+@@ -7849,7 +7871,7 @@
  
  if test "$GNU_CC"; then
    echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6
@@ -823,7 +825,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -7874,7 +7896,7 @@ EOF
+@@ -7874,7 +7896,7 @@
  
  
      echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6
@@ -832,7 +834,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_visibility_default'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -7899,7 +7921,7 @@ EOF
+@@ -7899,7 +7921,7 @@
  
  
        echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6
@@ -841,7 +843,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -7924,7 +7946,7 @@ fi
+@@ -7924,7 +7946,7 @@
  echo "$ac_t""$ac_cv_visibility_pragma" 1>&6
        if test "$ac_cv_visibility_pragma" = "yes"; then
          echo $ac_n "checking For gcc visibility bug with class-level attributes (GCC bug 26905)""... $ac_c" 1>&6
@@ -850,7 +852,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_have_visibility_class_bug'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -7952,7 +7974,7 @@ fi
+@@ -7952,7 +7974,7 @@
  echo "$ac_t""$ac_cv_have_visibility_class_bug" 1>&6
  
          echo $ac_n "checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)""... $ac_c" 1>&6
@@ -859,7 +861,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_have_visibility_builtin_bug'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -8000,12 +8022,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/di
+@@ -8000,12 +8022,12 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
@@ -874,7 +876,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #include <sys/types.h>
  #include <$ac_hdr>
-@@ -8013,7 +8035,7 @@ int main() {
+@@ -8013,7 +8035,7 @@
  DIR *dirp = 0;
  ; return 0; }
  EOF
@@ -883,7 +885,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_header_dirent_$ac_safe=yes"
  else
-@@ -8038,7 +8060,7 @@ done
+@@ -8038,7 +8060,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
@@ -892,7 +894,7 @@ update configure with autoconf2.13
  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
-@@ -8046,7 +8068,7 @@ else
+@@ -8046,7 +8068,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-ldir  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -901,7 +903,7 @@ update configure with autoconf2.13
  #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
-@@ -8057,7 +8079,7 @@ int main() {
+@@ -8057,7 +8079,7 @@
  opendir()
  ; return 0; }
  EOF
@@ -910,7 +912,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -8079,7 +8101,7 @@ fi
+@@ -8079,7 +8101,7 @@
  
  else
  echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
@@ -919,7 +921,7 @@ update configure with autoconf2.13
  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
-@@ -8087,7 +8109,7 @@ else
+@@ -8087,7 +8109,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lx  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -928,7 +930,7 @@ update configure with autoconf2.13
  #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
-@@ -8098,7 +8120,7 @@ int main() {
+@@ -8098,7 +8120,7 @@
  opendir()
  ; return 0; }
  EOF
@@ -937,7 +939,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -8130,17 +8152,17 @@ for ac_hdr in sys/byteorder.h compat.h g
+@@ -8130,17 +8152,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -958,7 +960,7 @@ update configure with autoconf2.13
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8170,17 +8192,17 @@ for ac_hdr in sys/bitypes.h memory.h uni
+@@ -8170,17 +8192,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -979,7 +981,7 @@ update configure with autoconf2.13
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8210,17 +8232,17 @@ for ac_hdr in gnu/libc-version.h nl_type
+@@ -8210,17 +8232,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -1000,7 +1002,7 @@ update configure with autoconf2.13
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8250,17 +8272,17 @@ for ac_hdr in malloc.h
+@@ -8250,17 +8272,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -1021,7 +1023,7 @@ update configure with autoconf2.13
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8290,17 +8312,17 @@ for ac_hdr in X11/XKBlib.h
+@@ -8290,17 +8312,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -1042,7 +1044,7 @@ update configure with autoconf2.13
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8331,17 +8353,17 @@ for ac_hdr in sys/statvfs.h sys/statfs.h
+@@ -8331,17 +8353,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -1063,7 +1065,7 @@ update configure with autoconf2.13
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8372,17 +8394,17 @@ for ac_hdr in mmintrin.h
+@@ -8372,17 +8394,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -1084,7 +1086,7 @@ update configure with autoconf2.13
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8419,17 +8441,17 @@ cross_compiling=$ac_cv_prog_cxx_cross
+@@ -8419,17 +8441,17 @@
  NEW_H=new.h
  ac_safe=`echo "new" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for new""... $ac_c" 1>&6
@@ -1105,7 +1107,7 @@ update configure with autoconf2.13
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8470,17 +8492,17 @@ case $target in
+@@ -8470,17 +8492,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -1126,7 +1128,7 @@ update configure with autoconf2.13
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8514,7 +8536,7 @@ case $target in
+@@ -8514,7 +8536,7 @@
  	;;
  *)
  	echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6
@@ -1135,7 +1137,7 @@ update configure with autoconf2.13
  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
-@@ -8522,7 +8544,7 @@ else
+@@ -8522,7 +8544,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lc_r  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -1144,7 +1146,7 @@ update configure with autoconf2.13
  #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
-@@ -8533,7 +8555,7 @@ int main() {
+@@ -8533,7 +8555,7 @@
  gethostbyname_r()
  ; return 0; }
  EOF
@@ -1153,7 +1155,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -8563,7 +8585,7 @@ fi
+@@ -8563,7 +8585,7 @@
  	;;
  esac
  echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6
@@ -1162,7 +1164,7 @@ update configure with autoconf2.13
  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
-@@ -8571,7 +8593,7 @@ else
+@@ -8571,7 +8593,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lm  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -1171,7 +1173,7 @@ update configure with autoconf2.13
  #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
-@@ -8582,7 +8604,7 @@ int main() {
+@@ -8582,7 +8604,7 @@
  atan()
  ; return 0; }
  EOF
@@ -1180,7 +1182,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -8616,7 +8638,7 @@ case $target in
+@@ -8616,7 +8638,7 @@
  	;;
  *)
  	echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
@@ -1189,7 +1191,7 @@ update configure with autoconf2.13
  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
-@@ -8624,7 +8646,7 @@ else
+@@ -8624,7 +8646,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -1198,7 +1200,7 @@ update configure with autoconf2.13
  #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
-@@ -8635,7 +8657,7 @@ int main() {
+@@ -8635,7 +8657,7 @@
  dlopen()
  ; return 0; }
  EOF
@@ -1207,7 +1209,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -8652,17 +8674,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
+@@ -8652,17 +8674,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
@@ -1228,7 +1230,7 @@ update configure with autoconf2.13
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8698,7 +8720,7 @@ if test ! "$GNU_CXX"; then
+@@ -8698,7 +8720,7 @@
      case $target in
      *-aix*)
  	echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6
@@ -1237,7 +1239,7 @@ update configure with autoconf2.13
  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
-@@ -8706,7 +8728,7 @@ else
+@@ -8706,7 +8728,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lC_r  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -1246,7 +1248,7 @@ update configure with autoconf2.13
  #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
-@@ -8717,7 +8739,7 @@ int main() {
+@@ -8717,7 +8739,7 @@
  demangle()
  ; return 0; }
  EOF
@@ -1255,7 +1257,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -8747,7 +8769,7 @@ fi
+@@ -8747,7 +8769,7 @@
  	;;
       *)
  	echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6
@@ -1264,7 +1266,7 @@ update configure with autoconf2.13
  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
-@@ -8755,7 +8777,7 @@ else
+@@ -8755,7 +8777,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lC  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -1273,7 +1275,7 @@ update configure with autoconf2.13
  #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
-@@ -8766,7 +8788,7 @@ int main() {
+@@ -8766,7 +8788,7 @@
  demangle()
  ; return 0; }
  EOF
@@ -1282,7 +1284,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -8797,7 +8819,7 @@ fi
+@@ -8797,7 +8819,7 @@
       esac
  fi
  echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
@@ -1291,7 +1293,7 @@ update configure with autoconf2.13
  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
-@@ -8805,7 +8827,7 @@ else
+@@ -8805,7 +8827,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -1300,7 +1302,7 @@ update configure with autoconf2.13
  #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
-@@ -8816,7 +8838,7 @@ int main() {
+@@ -8816,7 +8838,7 @@
  socket()
  ; return 0; }
  EOF
@@ -1309,7 +1311,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -8861,7 +8883,7 @@ EOF
+@@ -8861,7 +8883,7 @@
  	_SAVE_LDFLAGS="$LDFLAGS"
  	LDFLAGS="$XLDFLAGS $LDFLAGS"
  	echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6
@@ -1318,7 +1320,7 @@ update configure with autoconf2.13
  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
-@@ -8869,7 +8891,7 @@ else
+@@ -8869,7 +8891,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lX11 $XLIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -1327,7 +1329,7 @@ update configure with autoconf2.13
  #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
-@@ -8880,7 +8902,7 @@ int main() {
+@@ -8880,7 +8902,7 @@
  XDrawLines()
  ; return 0; }
  EOF
@@ -1336,7 +1338,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -8902,7 +8924,7 @@ MISSING_X="$MISSING_X -lX11"
+@@ -8902,7 +8924,7 @@
  fi
  
  	echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6
@@ -1345,7 +1347,7 @@ update configure with autoconf2.13
  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
-@@ -8910,7 +8932,7 @@ else
+@@ -8910,7 +8932,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXext $XLIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -1354,7 +1356,7 @@ update configure with autoconf2.13
  #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
-@@ -8921,7 +8943,7 @@ int main() {
+@@ -8921,7 +8943,7 @@
  XextAddDisplay()
  ; return 0; }
  EOF
@@ -1363,7 +1365,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -8945,7 +8967,7 @@ fi
+@@ -8945,7 +8967,7 @@
     
       
  	echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6
@@ -1372,7 +1374,7 @@ update configure with autoconf2.13
  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
-@@ -8953,7 +8975,7 @@ else
+@@ -8953,7 +8975,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXt  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -1381,7 +1383,7 @@ update configure with autoconf2.13
  #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
-@@ -8964,7 +8986,7 @@ int main() {
+@@ -8964,7 +8986,7 @@
  XtFree()
  ; return 0; }
  EOF
@@ -1390,7 +1392,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -8985,7 +9007,7 @@ else
+@@ -8985,7 +9007,7 @@
  
          unset ac_cv_lib_Xt_XtFree
  	    echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6
@@ -1399,7 +1401,7 @@ update configure with autoconf2.13
  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
-@@ -8993,7 +9015,7 @@ else
+@@ -8993,7 +9015,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lICE $XT_LIBS $XLIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -1408,7 +1410,7 @@ update configure with autoconf2.13
  #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
-@@ -9004,7 +9026,7 @@ int main() {
+@@ -9004,7 +9026,7 @@
  IceFlush()
  ; return 0; }
  EOF
@@ -1417,7 +1419,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -9025,7 +9047,7 @@ else
+@@ -9025,7 +9047,7 @@
  fi
  
  	    echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6
@@ -1426,7 +1428,7 @@ update configure with autoconf2.13
  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
-@@ -9033,7 +9055,7 @@ else
+@@ -9033,7 +9055,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lSM $XT_LIBS $XLIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -1435,7 +1437,7 @@ update configure with autoconf2.13
  #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
-@@ -9044,7 +9066,7 @@ int main() {
+@@ -9044,7 +9066,7 @@
  SmcCloseConnection()
  ; return 0; }
  EOF
@@ -1444,7 +1446,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -9065,7 +9087,7 @@ else
+@@ -9065,7 +9087,7 @@
  fi
   
          echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6
@@ -1453,7 +1455,7 @@ update configure with autoconf2.13
  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
-@@ -9073,7 +9095,7 @@ else
+@@ -9073,7 +9095,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXt $X_PRE_LIBS $XT_LIBS $XLIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -1462,7 +1464,7 @@ update configure with autoconf2.13
  #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
-@@ -9084,7 +9106,7 @@ int main() {
+@@ -9084,7 +9106,7 @@
  XtFree()
  ; return 0; }
  EOF
@@ -1471,7 +1473,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -9118,7 +9140,7 @@ fi
+@@ -9118,7 +9140,7 @@
      esac
  
                  echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6
@@ -1480,7 +1482,7 @@ update configure with autoconf2.13
  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
-@@ -9126,7 +9148,7 @@ else
+@@ -9126,7 +9148,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXinerama $XLIBS $XEXT_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -1489,7 +1491,7 @@ update configure with autoconf2.13
  #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
-@@ -9137,7 +9159,7 @@ int main() {
+@@ -9137,7 +9159,7 @@
  XineramaIsActive()
  ; return 0; }
  EOF
@@ -1498,7 +1500,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -9159,17 +9181,17 @@ fi
+@@ -9159,17 +9181,17 @@
  
      ac_safe=`echo "X11/extensions/Xinerama.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for X11/extensions/Xinerama.h""... $ac_c" 1>&6
@@ -1519,7 +1521,7 @@ update configure with autoconf2.13
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -9192,7 +9214,7 @@ fi
+@@ -9192,7 +9214,7 @@
  
  
                  echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6
@@ -1528,7 +1530,7 @@ update configure with autoconf2.13
  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
-@@ -9200,7 +9222,7 @@ else
+@@ -9200,7 +9222,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXext $XLIBS $XEXT_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -1537,7 +1539,7 @@ update configure with autoconf2.13
  #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
-@@ -9211,7 +9233,7 @@ int main() {
+@@ -9211,7 +9233,7 @@
  XShmCreateImage()
  ; return 0; }
  EOF
@@ -1546,7 +1548,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -9233,17 +9255,17 @@ fi
+@@ -9233,17 +9255,17 @@
  
      ac_safe=`echo "X11/extensions/XShm.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for X11/extensions/XShm.h""... $ac_c" 1>&6
@@ -1567,7 +1569,7 @@ update configure with autoconf2.13
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -9273,7 +9295,7 @@ EOF
+@@ -9273,7 +9295,7 @@
      fi
  
                  echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6
@@ -1576,7 +1578,7 @@ update configure with autoconf2.13
  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
-@@ -9281,7 +9303,7 @@ else
+@@ -9281,7 +9303,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXIE $XLIBS $XEXT_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -1585,7 +1587,7 @@ update configure with autoconf2.13
  #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
-@@ -9292,7 +9314,7 @@ int main() {
+@@ -9292,7 +9314,7 @@
  XieFloGeometry()
  ; return 0; }
  EOF
@@ -1594,7 +1596,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -9314,17 +9336,17 @@ fi
+@@ -9314,17 +9336,17 @@
  
      ac_safe=`echo "X11/extensions/XIElib.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for X11/extensions/XIElib.h""... $ac_c" 1>&6
@@ -1615,7 +1617,7 @@ update configure with autoconf2.13
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -9398,7 +9420,7 @@ fi
+@@ -9398,7 +9420,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
@@ -1624,7 +1626,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_path_FT2_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -9434,7 +9456,7 @@ fi
+@@ -9434,7 +9456,7 @@
  
  min_ft_version=6.1.0
  echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6
@@ -1633,7 +1635,7 @@ update configure with autoconf2.13
  no_ft=""
  if test "$FT2_CONFIG" = "no" ; then
    no_ft=yes
-@@ -9482,7 +9504,7 @@ else
+@@ -9482,7 +9504,7 @@
    echo $ac_n "cross compiling; assumed OK... $ac_c"
  else
    cat > conftest.$ac_ext <<EOF
@@ -1642,7 +1644,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
  #include <ft2build.h>
-@@ -9508,7 +9530,7 @@ main()
+@@ -9508,7 +9530,7 @@
  }
  
  EOF
@@ -1651,7 +1653,7 @@ update configure with autoconf2.13
  then
    :
  else
-@@ -9560,7 +9582,7 @@ fi # $no_x
+@@ -9560,7 +9582,7 @@
  
  
  echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
@@ -1660,7 +1662,7 @@ update configure with autoconf2.13
  echo "
      #include <pthread.h> 
      void *foo(void *v) { int a = 1;  } 
-@@ -9582,7 +9604,7 @@ echo "
+@@ -9582,7 +9604,7 @@
          echo "$ac_t""no" 1>&6
          
  echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
@@ -1669,7 +1671,7 @@ update configure with autoconf2.13
  echo "
      #include <pthread.h> 
      void *foo(void *v) { int a = 1;  } 
-@@ -9604,7 +9626,7 @@ echo "
+@@ -9604,7 +9626,7 @@
          echo "$ac_t""no" 1>&6
          
  echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
@@ -1678,7 +1680,7 @@ update configure with autoconf2.13
  echo "
      #include <pthread.h> 
      void *foo(void *v) { int a = 1;  } 
-@@ -9626,7 +9648,7 @@ echo "
+@@ -9626,7 +9648,7 @@
          echo "$ac_t""no" 1>&6
          
  echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
@@ -1687,7 +1689,7 @@ update configure with autoconf2.13
  echo "
      #include <pthread.h> 
      void *foo(void *v) { int a = 1;  } 
-@@ -9682,7 +9704,7 @@ then
+@@ -9682,7 +9704,7 @@
  				rm -f conftest*
  	ac_cv_have_dash_pthread=no
  	echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6
@@ -1696,7 +1698,7 @@ update configure with autoconf2.13
  	echo 'int main() { return 0; }' | cat > conftest.c
  	${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1
  	if test $? -eq 0; then
-@@ -9705,7 +9727,7 @@ echo "configure:9686: checking whether $
+@@ -9705,7 +9727,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
@@ -1705,7 +1707,7 @@ update configure with autoconf2.13
      	echo 'int main() { return 0; }' | cat > conftest.c
  	    ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1
      	if test $? -eq 0; then
-@@ -9751,7 +9773,7 @@ EOF
+@@ -9751,7 +9773,7 @@
  			fi
  			;;
  
@@ -1714,7 +1716,7 @@ update configure with autoconf2.13
  			cat >> confdefs.h <<\EOF
  #define _REENTRANT 1
  EOF
-@@ -9800,7 +9822,7 @@ EOF
+@@ -9800,7 +9822,7 @@
  fi
  
  echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6
@@ -1723,7 +1725,7 @@ update configure with autoconf2.13
  
  
  mmap_test_prog='
-@@ -9839,11 +9861,11 @@ if test "$cross_compiling" = yes; then
+@@ -9839,11 +9861,11 @@
    result="yes"
  else
    cat > conftest.$ac_ext <<EOF
@@ -1737,7 +1739,7 @@ update configure with autoconf2.13
  then
    result="yes"
  else
-@@ -9868,13 +9890,13 @@ fi
+@@ -9868,13 +9890,13 @@
  
  if test $ac_cv_prog_gcc = yes; then
      echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
@@ -1753,7 +1755,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #include <sgtty.h>
  Autoconf TIOCGETP
-@@ -9892,7 +9914,7 @@ rm -f conftest*
+@@ -9892,7 +9914,7 @@
  
    if test $ac_cv_prog_gcc_traditional = no; then
      cat > conftest.$ac_ext <<EOF
@@ -1762,7 +1764,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #include <termio.h>
  Autoconf TCGETA
-@@ -9914,7 +9936,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional
+@@ -9914,7 +9936,7 @@
  fi
  
  echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
@@ -1771,7 +1773,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -9922,7 +9944,7 @@ else
+@@ -9922,7 +9944,7 @@
    ac_cv_func_memcmp_clean=no
  else
    cat > conftest.$ac_ext <<EOF
@@ -1780,7 +1782,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
  main()
-@@ -9932,7 +9954,7 @@ main()
+@@ -9932,7 +9954,7 @@
  }
  
  EOF
@@ -1789,7 +1791,7 @@ update configure with autoconf2.13
  then
    ac_cv_func_memcmp_clean=yes
  else
-@@ -9952,12 +9974,12 @@ test $ac_cv_func_memcmp_clean = no && LI
+@@ -9952,12 +9974,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
@@ -1804,7 +1806,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -9980,7 +10002,7 @@ $ac_func();
+@@ -9980,7 +10002,7 @@
  
  ; return 0; }
  EOF
@@ -1813,7 +1815,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -10007,12 +10029,12 @@ done
+@@ -10007,12 +10029,12 @@
  for ac_func in flockfile getpagesize
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -1828,7 +1830,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -10035,7 +10057,7 @@ $ac_func();
+@@ -10035,7 +10057,7 @@
  
  ; return 0; }
  EOF
@@ -1837,7 +1839,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -10064,12 +10086,12 @@ if test -z "$MACOS_DEPLOYMENT_TARGET" ||
+@@ -10064,12 +10086,12 @@
    for ac_func in localtime_r strtok_r
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -1852,7 +1854,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -10092,7 +10114,7 @@ $ac_func();
+@@ -10092,7 +10114,7 @@
  
  ; return 0; }
  EOF
@@ -1861,7 +1863,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -10128,19 +10150,19 @@ ac_link='${CXX-g++} -o conftest${ac_exee
+@@ -10128,19 +10150,19 @@
  cross_compiling=$ac_cv_prog_cxx_cross
  
  echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6
@@ -1884,7 +1886,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_have_wcrtomb="yes"
  else
-@@ -10160,19 +10182,19 @@ EOF
+@@ -10160,19 +10182,19 @@
  
  fi
  echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6
@@ -1907,7 +1909,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_have_mbrtowc="yes"
  else
-@@ -10201,12 +10223,12 @@ cross_compiling=$ac_cv_prog_cc_cross
+@@ -10201,12 +10223,12 @@
  fi
  
  echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6
@@ -1922,7 +1924,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
          #ifdef linux
-@@ -10218,7 +10240,7 @@ int main() {
+@@ -10218,7 +10240,7 @@
  int foo = res_ninit(&_res);
  ; return 0; }
  EOF
@@ -1931,7 +1933,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_func_res_ninit=yes
  else
-@@ -10248,12 +10270,12 @@ ac_link='${CXX-g++} -o conftest${ac_exee
+@@ -10248,12 +10270,12 @@
  cross_compiling=$ac_cv_prog_cxx_cross
  
  echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6
@@ -1946,7 +1948,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
          #ifdef HAVE_GNU_LIBC_VERSION_H
-@@ -10264,7 +10286,7 @@ int main() {
+@@ -10264,7 +10286,7 @@
  const char *glibc_version = gnu_get_libc_version();
  ; return 0; }
  EOF
@@ -1955,7 +1957,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_func_gnu_get_libc_version=yes
  else
-@@ -10293,7 +10315,7 @@ case $target_os in
+@@ -10293,7 +10315,7 @@
      *)
      
  echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6
@@ -1964,7 +1966,7 @@ update configure with autoconf2.13
  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
-@@ -10301,7 +10323,7 @@ else
+@@ -10301,7 +10323,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lc  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -1973,7 +1975,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
-@@ -10315,7 +10337,7 @@ int main() {
+@@ -10315,7 +10337,7 @@
  iconv()
  ; return 0; }
  EOF
@@ -1982,7 +1984,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -10334,7 +10356,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
+@@ -10334,7 +10356,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
@@ -1991,7 +1993,7 @@ update configure with autoconf2.13
  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
-@@ -10342,7 +10364,7 @@ else
+@@ -10342,7 +10364,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-liconv  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -2000,7 +2002,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
-@@ -10356,7 +10378,7 @@ int main() {
+@@ -10356,7 +10378,7 @@
  iconv()
  ; return 0; }
  EOF
@@ -2009,7 +2011,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -10375,7 +10397,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
+@@ -10375,7 +10397,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
@@ -2018,7 +2020,7 @@ update configure with autoconf2.13
  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
-@@ -10383,7 +10405,7 @@ else
+@@ -10383,7 +10405,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-liconv  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -2027,7 +2029,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
-@@ -10397,7 +10419,7 @@ int main() {
+@@ -10397,7 +10419,7 @@
  libiconv()
  ; return 0; }
  EOF
@@ -2036,7 +2038,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -10424,12 +10446,12 @@ fi
+@@ -10424,12 +10446,12 @@
  _SAVE_LIBS=$LIBS
  LIBS="$LIBS $_ICONV_LIBS"
  echo $ac_n "checking for iconv()""... $ac_c" 1>&6
@@ -2051,7 +2053,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
          #include <stdlib.h>
-@@ -10443,7 +10465,7 @@ int main() {
+@@ -10443,7 +10465,7 @@
          
  ; return 0; }
  EOF
@@ -2060,7 +2062,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_func_iconv=yes
  else
-@@ -10467,12 +10489,12 @@ EOF
+@@ -10467,12 +10489,12 @@
      LIBXUL_LIBS="$LIBXUL_LIBS $_ICONV_LIBS"
      LIBICONV="$_ICONV_LIBS"
      echo $ac_n "checking for iconv() with const input""... $ac_c" 1>&6
@@ -2075,7 +2077,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
              #include <stdlib.h>
-@@ -10487,7 +10509,7 @@ int main() {
+@@ -10487,7 +10509,7 @@
              
  ; return 0; }
  EOF
@@ -2084,7 +2086,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_func_const_iconv=yes
  else
-@@ -10516,19 +10538,19 @@ esac
+@@ -10516,19 +10538,19 @@
  
  
    echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
@@ -2107,7 +2109,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    am_cv_langinfo_codeset=yes
  else
-@@ -10560,7 +10582,7 @@ cross_compiling=$ac_cv_prog_cc_cross
+@@ -10560,7 +10582,7 @@
  
  
  echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6
@@ -2116,7 +2118,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_va_copy'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -10570,7 +10592,7 @@ else
+@@ -10570,7 +10592,7 @@
      
  else
    cat > conftest.$ac_ext <<EOF
@@ -2125,7 +2127,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
          #include <stdarg.h>
-@@ -10584,7 +10606,7 @@ else
+@@ -10584,7 +10606,7 @@
          }
          int main() { f (0, 42); return 0; }
  EOF
@@ -2134,7 +2136,7 @@ update configure with autoconf2.13
  then
    ac_cv_va_copy=yes
  else
-@@ -10601,7 +10623,7 @@ fi
+@@ -10601,7 +10623,7 @@
  
  echo "$ac_t""$ac_cv_va_copy" 1>&6
  echo $ac_n "checking for an implementation of __va_copy()""... $ac_c" 1>&6
@@ -2143,7 +2145,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv___va_copy'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -10611,7 +10633,7 @@ else
+@@ -10611,7 +10633,7 @@
      
  else
    cat > conftest.$ac_ext <<EOF
@@ -2152,7 +2154,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
          #include <stdarg.h>
-@@ -10625,7 +10647,7 @@ else
+@@ -10625,7 +10647,7 @@
          }
          int main() { f (0, 42); return 0; }
  EOF
@@ -2161,7 +2163,7 @@ update configure with autoconf2.13
  then
    ac_cv___va_copy=yes
  else
-@@ -10642,7 +10664,7 @@ fi
+@@ -10642,7 +10664,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
@@ -2170,7 +2172,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_va_val_copy'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -10652,7 +10674,7 @@ else
+@@ -10652,7 +10674,7 @@
      
  else
    cat > conftest.$ac_ext <<EOF
@@ -2179,7 +2181,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
          #include <stdarg.h>
-@@ -10666,7 +10688,7 @@ else
+@@ -10666,7 +10688,7 @@
          }
          int main() { f (0, 42); return 0; }
  EOF
@@ -2188,7 +2190,7 @@ update configure with autoconf2.13
  then
    ac_cv_va_val_copy=yes
  else
-@@ -10765,7 +10787,7 @@ esac
+@@ -10765,7 +10787,7 @@
  if test "$GNU_CXX"; then
  
    echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6
@@ -2197,7 +2199,7 @@ update configure with autoconf2.13
  
      if eval "test \"`echo '$''{'ac_cv_cxx_exceptions_flags'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -10800,12 +10822,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
+@@ -10800,12 +10822,12 @@
  HAVE_GCC3_ABI=
  if test "$GNU_CC"; then
    echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6
@@ -2212,7 +2214,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
  int main() {
-@@ -10818,7 +10840,7 @@ int main() {
+@@ -10818,7 +10840,7 @@
                        
  ; return 0; }
  EOF
@@ -2221,7 +2223,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_gcc_three_abi="yes"
  else
-@@ -10842,12 +10864,12 @@ fi
+@@ -10842,12 +10864,12 @@
  
  
  echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6
@@ -2236,7 +2238,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  class X {
                                 public: explicit X(int i) : i_(i) {}
-@@ -10857,7 +10879,7 @@ int main() {
+@@ -10857,7 +10879,7 @@
  X x(3);
  ; return 0; }
  EOF
@@ -2245,7 +2247,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_cpp_explicit=yes
  else
-@@ -10878,12 +10900,12 @@ EOF
+@@ -10878,12 +10900,12 @@
  fi
  
  echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6
@@ -2260,7 +2262,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  class param {
                                 public:
-@@ -10902,7 +10924,7 @@ tplt<param> A;
+@@ -10902,7 +10924,7 @@
                                 A.foo(0);
  ; return 0; }
  EOF
@@ -2269,7 +2271,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_cpp_typename=yes
  else
-@@ -10923,12 +10945,12 @@ EOF
+@@ -10923,12 +10945,12 @@
  fi
  
  echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6
@@ -2284,7 +2286,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  template <class T> struct X { int a; };
                                 class Y {};
-@@ -10938,7 +10960,7 @@ X<int> int_x;
+@@ -10938,7 +10960,7 @@
                                 X<Y> y_x;
  ; return 0; }
  EOF
@@ -2293,7 +2295,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_cpp_modern_specialize_template_syntax=yes
  else
-@@ -10960,12 +10982,12 @@ fi
+@@ -10960,12 +10982,12 @@
  
  
  echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6
@@ -2308,7 +2310,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  template <class T> class Foo {};
                                 template <class T> class Foo<T*> {};
-@@ -10973,7 +10995,7 @@ int main() {
+@@ -10973,7 +10995,7 @@
  return 0;
  ; return 0; }
  EOF
@@ -2317,7 +2319,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_cpp_partial_specialization=yes
  else
-@@ -10994,12 +11016,12 @@ EOF
+@@ -10994,12 +11016,12 @@
  fi
  
  echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6
@@ -2332,7 +2334,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  template <class T> class Base { };
                                  template <class T>
-@@ -11011,7 +11033,7 @@ Derived<char> a, b;
+@@ -11011,7 +11033,7 @@
                                  return 0;
  ; return 0; }
  EOF
@@ -2341,7 +2343,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_need_derived_template_operators=no
  else
-@@ -11033,12 +11055,12 @@ fi
+@@ -11033,12 +11055,12 @@
  
  
  echo $ac_n "checking whether we need to cast a derived template to pass as its base class""... $ac_c" 1>&6
@@ -2356,7 +2358,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  template <class T> class Base { };
                                  template <class T> class Derived : public Base<T> { };
-@@ -11047,7 +11069,7 @@ int main() {
+@@ -11047,7 +11069,7 @@
  Derived<char> bar; return foo(bar);
  ; return 0; }
  EOF
@@ -2365,7 +2367,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_need_cpp_template_cast_to_base=no
  else
-@@ -11068,12 +11090,12 @@ EOF
+@@ -11068,12 +11090,12 @@
  fi
  
  echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6
@@ -2380,7 +2382,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
                                  template <class T> class ptrClass {
-@@ -11094,7 +11116,7 @@ int main() {
+@@ -11094,7 +11116,7 @@
                                   a(&i); 
  ; return 0; }
  EOF
@@ -2389,7 +2391,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_can_resolve_const_ambiguity=yes
  else
-@@ -11116,12 +11138,12 @@ fi
+@@ -11116,12 +11138,12 @@
  
  
  echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6
@@ -2404,7 +2406,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  class A { protected: int foo() { return 0; } };
                     class B : public A { public: using A::foo; };
-@@ -11129,10 +11151,10 @@ int main() {
+@@ -11129,10 +11151,10 @@
  B b; return b.foo();
  ; return 0; }
  EOF
@@ -2417,7 +2419,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  class A { public: int foo() { return 1; } };
                         class B : public A { private: using A::foo; };
-@@ -11140,7 +11162,7 @@ int main() {
+@@ -11140,7 +11162,7 @@
  B b; return b.foo();
  ; return 0; }
  EOF
@@ -2426,7 +2428,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_cpp_access_changing_using2=no
  else
-@@ -11168,12 +11190,12 @@ EOF
+@@ -11168,12 +11190,12 @@
  fi
  
  echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6
@@ -2441,7 +2443,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  class X { 
                                   public: int go(const X&) {return 3;}
-@@ -11189,7 +11211,7 @@ int main() {
+@@ -11189,7 +11211,7 @@
  X x; Y y; y.jo(x);
  ; return 0; }
  EOF
@@ -2450,7 +2452,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_cpp_ambiguity_resolving_using=yes
  else
-@@ -11210,19 +11232,19 @@ EOF
+@@ -11210,19 +11232,19 @@
  fi
  
  echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6
@@ -2473,7 +2475,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_cpp_namespace_std=yes
  else
-@@ -11243,12 +11265,12 @@ EOF
+@@ -11243,12 +11265,12 @@
  fi
  
  echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6
@@ -2488,7 +2490,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #include <algorithm>
                                  struct T1 {};
-@@ -11258,7 +11280,7 @@ int main() {
+@@ -11258,7 +11280,7 @@
  T1 a,b; return a != b;
  ; return 0; }
  EOF
@@ -2497,7 +2499,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_cpp_unambiguous_std_notequal=unambiguous
  else
-@@ -11280,12 +11302,12 @@ fi
+@@ -11280,12 +11302,12 @@
  
  
  echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6
@@ -2512,7 +2514,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  struct X { int i; };
                                 struct Y { int i; };
-@@ -11293,7 +11315,7 @@ int main() {
+@@ -11293,7 +11315,7 @@
  X x; X*const z = &x;Y*y = reinterpret_cast<Y*>(z);
  ; return 0; }
  EOF
@@ -2521,7 +2523,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_cpp_reinterpret_cast=yes
  else
-@@ -11314,7 +11336,7 @@ EOF
+@@ -11314,7 +11336,7 @@
  fi
  
  echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6
@@ -2530,7 +2532,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_cpp_dynamic_cast_void_ptr'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -11322,7 +11344,7 @@ else
+@@ -11322,7 +11344,7 @@
    ac_cv_cpp_dynamic_cast_void_ptr=no
  else
    cat > conftest.$ac_ext <<EOF
@@ -2539,7 +2541,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #ifdef __cplusplus
  extern "C" void exit(int);
-@@ -11341,7 +11363,7 @@ class X { int i; public: virtual ~X() {
+@@ -11341,7 +11363,7 @@
                                             ((void*)&mdo == dynamic_cast<void*>(suby))));
                              }
  EOF
@@ -2548,7 +2550,7 @@ update configure with autoconf2.13
  then
    ac_cv_cpp_dynamic_cast_void_ptr=yes
  else
-@@ -11365,19 +11387,19 @@ fi
+@@ -11365,19 +11387,19 @@
  
  
  echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6
@@ -2571,7 +2573,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_cpp_unused_required=no
  else
-@@ -11400,12 +11422,12 @@ fi
+@@ -11400,12 +11422,12 @@
  
  
  echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6
@@ -2586,7 +2588,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #include <algorithm>
                                  template <class T> class Foo {};
-@@ -11416,7 +11438,7 @@ int main() {
+@@ -11416,7 +11438,7 @@
  Foo<int> f; return (0 != f);
  ; return 0; }
  EOF
@@ -2595,7 +2597,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_trouble_comparing_to_zero=no
  else
-@@ -11448,19 +11470,19 @@ cross_compiling=$ac_cv_prog_cc_cross
+@@ -11448,19 +11470,19 @@
  
  
  echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
@@ -2618,7 +2620,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_i18n_lc_messages=yes
  else
-@@ -11541,7 +11563,7 @@ fi
+@@ -11541,7 +11563,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
@@ -2627,7 +2629,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_path_NSPR_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -11576,7 +11598,7 @@ fi
+@@ -11576,7 +11598,7 @@
  
  	min_nspr_version=4.0.0
  	echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6
@@ -2636,7 +2638,7 @@ update configure with autoconf2.13
  
  	no_nspr=""
  	if test "$NSPR_CONFIG" = "no"; then
-@@ -11678,7 +11700,7 @@ fi
+@@ -11678,7 +11700,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
@@ -2645,7 +2647,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -11713,7 +11735,7 @@ fi
+@@ -11713,7 +11735,7 @@
  
  	min_nss_version=3.0.0
  	echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6
@@ -2654,16 +2656,16 @@ update configure with autoconf2.13
  
  	no_nss=""
  	if test "$NSS_CONFIG" = "no"; then
-@@ -11745,7 +11767,7 @@ echo "configure:11717: checking for NSS
+@@ -11745,7 +11767,7 @@
  fi
  
  if test -n "$MOZ_NATIVE_NSS"; then
 -   NSS_LIBS="$NSS_LIBS -lcrmf"
-+   NSS_LIBS=`echo $NSS_LIBS | sed 's/-l/-lcrmf &/'`
++   NSS_LIBS="-lcrmf $NSS_LIBS"
  else
     NSS_CFLAGS='-I$(DIST)/public/nss'
     NSS_DEP_LIBS='\\\
-@@ -11786,7 +11808,7 @@ if test -z "$JPEG_DIR" -o "$JPEG_DIR" =
+@@ -11786,7 +11808,7 @@
      SYSTEM_JPEG=
  else
      echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6
@@ -2672,7 +2674,7 @@ update configure with autoconf2.13
  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
-@@ -11794,7 +11816,7 @@ else
+@@ -11794,7 +11816,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-ljpeg $JPEG_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -2681,7 +2683,7 @@ update configure with autoconf2.13
  #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
-@@ -11805,7 +11827,7 @@ int main() {
+@@ -11805,7 +11827,7 @@
  jpeg_destroy_compress()
  ; return 0; }
  EOF
@@ -2690,7 +2692,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -11828,13 +11850,13 @@ fi
+@@ -11828,13 +11850,13 @@
  
  fi
  
@@ -2706,7 +2708,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #include <stdio.h>
  	#include <sys/types.h>
-@@ -11848,7 +11870,7 @@ else
+@@ -11848,7 +11870,7 @@
  	}
  	
  EOF
@@ -2715,7 +2717,7 @@ update configure with autoconf2.13
  then
    SYSTEM_JPEG=1
  else
-@@ -11889,7 +11911,7 @@ if test -z "$ZLIB_DIR" -o "$ZLIB_DIR" =
+@@ -11889,7 +11911,7 @@
      SYSTEM_ZLIB=
  else
      echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6
@@ -2724,7 +2726,7 @@ update configure with autoconf2.13
  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
-@@ -11897,7 +11919,7 @@ else
+@@ -11897,7 +11919,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lz $ZLIB_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -2733,7 +2735,7 @@ update configure with autoconf2.13
  #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
-@@ -11908,7 +11930,7 @@ int main() {
+@@ -11908,7 +11930,7 @@
  gzread()
  ; return 0; }
  EOF
@@ -2742,7 +2744,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -11930,13 +11952,13 @@ SYSTEM_ZLIB= ZLIB_CFLAGS= ZLIB_LIBS=
+@@ -11930,13 +11952,13 @@
  fi
  
  fi
@@ -2758,7 +2760,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
      #include <stdio.h>
-@@ -11957,7 +11979,7 @@ else
+@@ -11957,7 +11979,7 @@
      }
      
  EOF
@@ -2767,7 +2769,7 @@ update configure with autoconf2.13
  then
    SYSTEM_ZLIB=1
  else
-@@ -12000,7 +12022,7 @@ if test -z "$PNG_DIR" -o "$PNG_DIR" = no
+@@ -12000,7 +12022,7 @@
      SYSTEM_PNG=
  else
      echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6
@@ -2776,7 +2778,7 @@ update configure with autoconf2.13
  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
-@@ -12008,7 +12030,7 @@ else
+@@ -12008,7 +12030,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lpng $PNG_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -2785,7 +2787,7 @@ update configure with autoconf2.13
  #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
-@@ -12019,7 +12041,7 @@ int main() {
+@@ -12019,7 +12041,7 @@
  png_get_valid()
  ; return 0; }
  EOF
@@ -2794,7 +2796,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -12041,13 +12063,13 @@ SYSTEM_PNG=
+@@ -12041,13 +12063,13 @@
  fi
  
  fi
@@ -2810,7 +2812,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #include <stdio.h>
  	#include <sys/types.h>
-@@ -12061,7 +12083,7 @@ else
+@@ -12061,7 +12083,7 @@
  	}
  	
  EOF
@@ -2819,7 +2821,7 @@ update configure with autoconf2.13
  then
    SYSTEM_PNG=1
  else
-@@ -12311,7 +12333,7 @@ fi
+@@ -12311,7 +12333,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
@@ -2828,7 +2830,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -12346,7 +12368,7 @@ fi
+@@ -12346,7 +12368,7 @@
  
    min_gtk_version=$GTK_VERSION
    echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
@@ -2837,7 +2839,7 @@ update configure with autoconf2.13
    no_gtk=""
    if test "$GTK_CONFIG" = "no" ; then
      no_gtk=yes
-@@ -12369,7 +12391,7 @@ echo "configure:12350: checking for GTK
+@@ -12369,7 +12391,7 @@
    echo $ac_n "cross compiling; assumed OK... $ac_c"
  else
    cat > conftest.$ac_ext <<EOF
@@ -2846,7 +2848,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
  #include <gtk/gtk.h>
-@@ -12447,7 +12469,7 @@ main ()
+@@ -12447,7 +12469,7 @@
  }
  
  EOF
@@ -2855,7 +2857,7 @@ update configure with autoconf2.13
  then
    :
  else
-@@ -12482,7 +12504,7 @@ fi
+@@ -12482,7 +12504,7 @@
            CFLAGS="$CFLAGS $GTK_CFLAGS"
            LIBS="$LIBS $GTK_LIBS"
            cat > conftest.$ac_ext <<EOF
@@ -2864,7 +2866,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
  #include <gtk/gtk.h>
-@@ -12492,7 +12514,7 @@ int main() {
+@@ -12492,7 +12514,7 @@
   return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
  ; return 0; }
  EOF
@@ -2873,7 +2875,7 @@ update configure with autoconf2.13
    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"
-@@ -12544,7 +12566,7 @@ then
+@@ -12544,7 +12566,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
@@ -2882,7 +2884,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -12588,19 +12610,19 @@ fi
+@@ -12588,19 +12610,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
@@ -2905,7 +2907,7 @@ update configure with autoconf2.13
              ## 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\"`"
-@@ -12665,7 +12687,7 @@ do
+@@ -12665,7 +12687,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
@@ -2914,7 +2916,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_prog_HOST_MOC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -12717,7 +12739,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
+@@ -12717,7 +12739,7 @@
  cross_compiling=$ac_cv_prog_cxx_cross
  
      echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6
@@ -2923,7 +2925,7 @@ update configure with autoconf2.13
  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
-@@ -12725,14 +12747,14 @@ else
+@@ -12725,14 +12747,14 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lqt  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -2940,7 +2942,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -12751,7 +12773,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
+@@ -12751,7 +12773,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for main in -lqt-mt""... $ac_c" 1>&6
@@ -2949,7 +2951,7 @@ update configure with autoconf2.13
  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
-@@ -12759,14 +12781,14 @@ else
+@@ -12759,14 +12781,14 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lqt-mt  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -2966,7 +2968,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -12802,9 +12824,9 @@ fi
+@@ -12802,9 +12824,9 @@
      LIBS="$LIBS $QT_LIBS"
      
      echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6
@@ -2978,7 +2980,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #include <qglobal.h>
  int main() {
-@@ -12815,7 +12837,7 @@ int main() {
+@@ -12815,7 +12837,7 @@
      
  ; return 0; }
  EOF
@@ -2987,7 +2989,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    result="yes"
  else
-@@ -13091,7 +13113,7 @@ composer)
+@@ -13091,7 +13113,7 @@
    MOZ_XUL_APP=1
    MOZ_STANDALONE_COMPOSER=1
    MOZ_COMPOSER=1
@@ -2996,7 +2998,7 @@ update configure with autoconf2.13
    NECKO_PROTOCOLS="http,ftp,file,jar,viewsource,res,data"
    cat >> confdefs.h <<\EOF
  #define MOZ_STANDALONE_COMPOSER 1
-@@ -13412,7 +13434,7 @@ EOF
+@@ -13412,7 +13434,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
@@ -3005,7 +3007,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -13456,19 +13478,19 @@ fi
+@@ -13456,19 +13478,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
@@ -3028,7 +3030,7 @@ update configure with autoconf2.13
              ## 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\"`"
-@@ -13503,7 +13525,7 @@ echo "configure:13472: checking MOZ_XFT_
+@@ -13503,7 +13525,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
@@ -3037,7 +3039,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -13547,19 +13569,19 @@ fi
+@@ -13547,19 +13569,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
@@ -3060,7 +3062,7 @@ update configure with autoconf2.13
              ## 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\"`"
-@@ -13619,7 +13641,7 @@ EOF
+@@ -13619,7 +13641,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
@@ -3069,7 +3071,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -13663,19 +13685,19 @@ fi
+@@ -13663,19 +13685,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
@@ -3092,7 +3094,7 @@ update configure with autoconf2.13
              ## 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\"`"
-@@ -13743,7 +13765,7 @@ then
+@@ -13743,7 +13765,7 @@
      _SAVE_LDFLAGS="$LDFLAGS"
      LDFLAGS="$XLDFLAGS $LDFLAGS"
      echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6
@@ -3101,7 +3103,7 @@ update configure with autoconf2.13
  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
-@@ -13751,7 +13773,7 @@ else
+@@ -13751,7 +13773,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXp $XEXT_LIBS $XLIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -3110,7 +3112,7 @@ update configure with autoconf2.13
  #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
-@@ -13762,7 +13784,7 @@ int main() {
+@@ -13762,7 +13784,7 @@
  XpGetPrinterList()
  ; return 0; }
  EOF
@@ -3119,7 +3121,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -13835,7 +13857,7 @@ fi
+@@ -13835,7 +13857,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
@@ -3128,7 +3130,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -13879,19 +13901,19 @@ fi
+@@ -13879,19 +13901,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
@@ -3151,7 +3153,7 @@ update configure with autoconf2.13
              ## 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\"`"
-@@ -13942,7 +13964,7 @@ echo "configure:13895: checking MOZ_GNOM
+@@ -13942,7 +13964,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
@@ -3160,7 +3162,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -13986,19 +14008,19 @@ fi
+@@ -13986,19 +14008,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
@@ -3183,7 +3185,7 @@ update configure with autoconf2.13
              ## 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\"`"
-@@ -14045,7 +14067,7 @@ echo "configure:14002: checking MOZ_GCON
+@@ -14045,7 +14067,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
@@ -3192,7 +3194,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -14089,19 +14111,19 @@ fi
+@@ -14089,19 +14111,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
@@ -3215,7 +3217,7 @@ update configure with autoconf2.13
              ## 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\"`"
-@@ -14179,7 +14201,7 @@ fi
+@@ -14179,7 +14201,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
@@ -3224,7 +3226,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -14223,19 +14245,19 @@ fi
+@@ -14223,19 +14245,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
@@ -3247,7 +3249,7 @@ update configure with autoconf2.13
              ## 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\"`"
-@@ -14721,7 +14743,7 @@ if test -n "${MOZ_JAVAXPCOM}"; then
+@@ -14721,7 +14743,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
@@ -3256,7 +3258,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_path_JAVAC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -14757,7 +14779,7 @@ fi
+@@ -14757,7 +14779,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
@@ -3265,7 +3267,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_path_JAR'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -15004,7 +15026,7 @@ fi
+@@ -15004,7 +15026,7 @@
    gdiplus)
      MOZ_SVG_RENDERER_GDIPLUS=1
                          echo $ac_n "checking for Gdiplus.h""... $ac_c" 1>&6
@@ -3274,7 +3276,7 @@ update configure with autoconf2.13
      
      ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -15014,7 +15036,7 @@ ac_link='${CXX-g++} -o conftest${ac_exee
+@@ -15014,7 +15036,7 @@
  cross_compiling=$ac_cv_prog_cxx_cross
  
      cat > conftest.$ac_ext <<EOF
@@ -3283,7 +3285,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #include <windows.h>
                      #include <unknwn.h>
-@@ -15023,7 +15045,7 @@ int main() {
+@@ -15023,7 +15045,7 @@
  
  ; return 0; }
  EOF
@@ -3292,7 +3294,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    echo "$ac_t""yes" 1>&6
  else
-@@ -15103,7 +15125,7 @@ do
+@@ -15103,7 +15125,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
@@ -3301,7 +3303,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_path_MAKENSIS'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -15148,7 +15170,7 @@ do
+@@ -15148,7 +15170,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
@@ -3310,7 +3312,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_path_HOST_ICONV'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -15217,13 +15239,13 @@ case "$target_os" in
+@@ -15217,13 +15239,13 @@
      msvc*|mks*|cygwin*|mingw*|wince*)
          if test -n "$MOZ_UPDATER"; then
              echo $ac_n "checking for iconv""... $ac_c" 1>&6
@@ -3326,7 +3328,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_prog_HOST_ICONV'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -15569,18 +15591,18 @@ MOZ_DEBUG_DISABLE_DEFS="-DNDEBUG -DTRIMM
+@@ -15569,18 +15591,18 @@
  
  if test -n "$MOZ_DEBUG"; then
      echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6
@@ -3348,7 +3350,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    _results=yes
  else
-@@ -15621,18 +15643,18 @@ fi
+@@ -15621,18 +15643,18 @@
  if test "$COMPILE_ENVIRONMENT"; then
  if test -n "$MOZ_OPTIMIZE"; then
      echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6
@@ -3370,7 +3372,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    _results=yes
  else
-@@ -15849,7 +15871,7 @@ fi
+@@ -15849,7 +15871,7 @@
  
  if test -n "$_ENABLE_EFENCE"; then
      echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6
@@ -3379,7 +3381,7 @@ update configure with autoconf2.13
  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
-@@ -15857,7 +15879,7 @@ else
+@@ -15857,7 +15879,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lefence  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -3388,7 +3390,7 @@ update configure with autoconf2.13
  #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
-@@ -15868,7 +15890,7 @@ int main() {
+@@ -15868,7 +15890,7 @@
  malloc()
  ; return 0; }
  EOF
@@ -3397,7 +3399,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -15969,12 +15991,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
+@@ -15969,12 +15991,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
@@ -3412,7 +3414,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -16000,7 +16022,7 @@ $ac_func();
+@@ -16000,7 +16022,7 @@
  
  ; return 0; }
  EOF
@@ -3421,7 +3423,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -16243,12 +16265,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
+@@ -16243,12 +16265,12 @@
      for ac_func in __cxa_demangle
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -3436,7 +3438,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -16274,7 +16296,7 @@ $ac_func();
+@@ -16274,7 +16296,7 @@
  
  ; return 0; }
  EOF
@@ -3445,7 +3447,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -16412,7 +16434,7 @@ if test -z "$SKIP_COMPILER_CHECKS"; then
+@@ -16412,7 +16434,7 @@
  # Compiler Options
  
  echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6
@@ -3454,7 +3456,7 @@ update configure with autoconf2.13
  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
-@@ -16427,14 +16449,14 @@ if test -n "$GNU_CC" && test -n "$GNU_CX
+@@ -16427,14 +16449,14 @@
          _SAVE_CFLAGS=$CFLAGS
          CFLAGS="$CFLAGS -pipe"
          cat > conftest.$ac_ext <<EOF
@@ -3471,7 +3473,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    _res_gcc_pipe="yes"
  else
-@@ -16476,16 +16498,16 @@ if test "$_IGNORE_LONG_LONG_WARNINGS"; t
+@@ -16476,16 +16498,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
@@ -3491,7 +3493,7 @@ update configure with autoconf2.13
    rm -rf conftest*
     _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
  	  _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
-@@ -16506,16 +16528,16 @@ _SAVE_CFLAGS="$CFLAGS"
+@@ -16506,16 +16528,16 @@
  CFLAGS="$CFLAGS -fprofile-generate"
  
  echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6
@@ -3511,7 +3513,7 @@ update configure with autoconf2.13
    rm -rf conftest*
     PROFILE_GEN_CFLAGS="-fprofile-generate"
                   result="yes" 
-@@ -16533,16 +16555,16 @@ if test $result = "yes"; then
+@@ -16533,16 +16555,16 @@
  else
    CFLAGS="$_SAVE_CFLAGS -fprofile-arcs"
    echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6
@@ -3531,7 +3533,7 @@ update configure with autoconf2.13
    rm -rf conftest*
     PROFILE_GEN_CFLAGS="-fprofile-arcs"
                     result="yes" 
-@@ -16588,16 +16610,16 @@ if test "$_PEDANTIC"; then
+@@ -16588,16 +16610,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
@@ -3551,7 +3553,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    result="no"
  else
-@@ -16622,12 +16644,12 @@ rm -f conftest*
+@@ -16622,12 +16644,12 @@
  fi
  
  echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6
@@ -3566,7 +3568,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #ifdef __cplusplus
  extern "C" void exit(int);
-@@ -16650,7 +16672,7 @@ extern "C" void exit(int);
+@@ -16650,7 +16672,7 @@
               }
               
  EOF
@@ -3575,7 +3577,7 @@ update configure with autoconf2.13
  then
    result="yes"
  else
-@@ -16671,12 +16693,12 @@ fi
+@@ -16671,12 +16693,12 @@
  _SAVE_CXXFLAGS=$CXXFLAGS
  CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}"
  echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6
@@ -3590,7 +3592,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
                        template <class T>
-@@ -16706,7 +16728,7 @@ int main() {
+@@ -16706,7 +16728,7 @@
                      
  ; return 0; }
  EOF
@@ -3599,7 +3601,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_nscap_nonconst_opeq_bug="no"
  else
-@@ -16998,7 +17020,7 @@ then
+@@ -16998,7 +17020,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
@@ -3608,7 +3610,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -17042,19 +17064,19 @@ fi
+@@ -17042,19 +17064,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
@@ -3631,7 +3633,7 @@ update configure with autoconf2.13
              ## 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\"`"
-@@ -17177,7 +17199,7 @@ fi
+@@ -17177,7 +17199,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
@@ -3640,7 +3642,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -17212,7 +17234,7 @@ fi
+@@ -17212,7 +17234,7 @@
  
    min_glib_version=1.2.0
    echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
@@ -3649,7 +3651,7 @@ update configure with autoconf2.13
    no_glib=""
    if test "$GLIB_CONFIG" = "no" ; then
      no_glib=yes
-@@ -17235,7 +17257,7 @@ echo "configure:17216: checking for GLIB
+@@ -17235,7 +17257,7 @@
    echo $ac_n "cross compiling; assumed OK... $ac_c"
  else
    cat > conftest.$ac_ext <<EOF
@@ -3658,7 +3660,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
  #include <glib.h>
-@@ -17311,7 +17333,7 @@ main ()
+@@ -17311,7 +17333,7 @@
  }
  
  EOF
@@ -3667,7 +3669,7 @@ update configure with autoconf2.13
  then
    :
  else
-@@ -17345,7 +17367,7 @@ fi
+@@ -17345,7 +17367,7 @@
            CFLAGS="$CFLAGS $GLIB_CFLAGS"
            LIBS="$LIBS $GLIB_LIBS"
            cat > conftest.$ac_ext <<EOF
@@ -3676,7 +3678,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
  #include <glib.h>
-@@ -17355,7 +17377,7 @@ int main() {
+@@ -17355,7 +17377,7 @@
   return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); 
  ; return 0; }
  EOF
@@ -3685,7 +3687,7 @@ update configure with autoconf2.13
    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"
-@@ -17399,7 +17421,7 @@ rm -f conftest*
+@@ -17399,7 +17421,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
@@ -3694,7 +3696,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -17434,7 +17456,7 @@ fi
+@@ -17434,7 +17456,7 @@
  
    min_libIDL_version=$LIBIDL_VERSION
    echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
@@ -3703,7 +3705,7 @@ update configure with autoconf2.13
    no_libIDL=""
    if test "$LIBIDL_CONFIG" = "no" ; then
      no_libIDL=yes
-@@ -17461,7 +17483,7 @@ echo "configure:17438: checking for libI
+@@ -17461,7 +17483,7 @@
    echo $ac_n "cross compiling; assumed OK... $ac_c"
  else
    cat > conftest.$ac_ext <<EOF
@@ -3712,7 +3714,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
  #include <stdio.h>
-@@ -17547,7 +17569,7 @@ main ()
+@@ -17547,7 +17569,7 @@
  }
  
  EOF
@@ -3721,7 +3723,7 @@ update configure with autoconf2.13
  then
    :
  else
-@@ -17581,7 +17603,7 @@ fi
+@@ -17581,7 +17603,7 @@
            CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
            LIBS="$LIBS $LIBIDL_LIBS"
            cat > conftest.$ac_ext <<EOF
@@ -3730,7 +3732,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
  #include <stdio.h>
-@@ -17592,7 +17614,7 @@ int main() {
+@@ -17592,7 +17614,7 @@
   return IDL_get_libver_string ? 1 : 0; 
  ; return 0; }
  EOF
@@ -3739,7 +3741,7 @@ update configure with autoconf2.13
    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"
-@@ -17720,7 +17742,7 @@ fi
+@@ -17720,7 +17742,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
@@ -3748,7 +3750,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -17755,7 +17777,7 @@ fi
+@@ -17755,7 +17777,7 @@
  
    min_glib_version=1.2.0
    echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
@@ -3757,7 +3759,7 @@ update configure with autoconf2.13
    no_glib=""
    if test "$GLIB_CONFIG" = "no" ; then
      no_glib=yes
-@@ -17778,7 +17800,7 @@ echo "configure:17759: checking for GLIB
+@@ -17778,7 +17800,7 @@
    echo $ac_n "cross compiling; assumed OK... $ac_c"
  else
    cat > conftest.$ac_ext <<EOF
@@ -3766,7 +3768,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
  #include <glib.h>
-@@ -17854,7 +17876,7 @@ main ()
+@@ -17854,7 +17876,7 @@
  }
  
  EOF
@@ -3775,7 +3777,7 @@ update configure with autoconf2.13
  then
    :
  else
-@@ -17888,7 +17910,7 @@ fi
+@@ -17888,7 +17910,7 @@
            CFLAGS="$CFLAGS $GLIB_CFLAGS"
            LIBS="$LIBS $GLIB_LIBS"
            cat > conftest.$ac_ext <<EOF
@@ -3784,7 +3786,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
  #include <glib.h>
-@@ -17898,7 +17920,7 @@ int main() {
+@@ -17898,7 +17920,7 @@
   return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); 
  ; return 0; }
  EOF
@@ -3793,7 +3795,7 @@ update configure with autoconf2.13
    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"
-@@ -17942,7 +17964,7 @@ rm -f conftest*
+@@ -17942,7 +17964,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
@@ -3802,7 +3804,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -17977,7 +17999,7 @@ fi
+@@ -17977,7 +17999,7 @@
  
    min_libIDL_version=$LIBIDL_VERSION
    echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
@@ -3811,7 +3813,7 @@ update configure with autoconf2.13
    no_libIDL=""
    if test "$LIBIDL_CONFIG" = "no" ; then
      no_libIDL=yes
-@@ -18004,7 +18026,7 @@ echo "configure:17981: checking for libI
+@@ -18004,7 +18026,7 @@
    echo $ac_n "cross compiling; assumed OK... $ac_c"
  else
    cat > conftest.$ac_ext <<EOF
@@ -3820,7 +3822,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
  #include <stdio.h>
-@@ -18090,7 +18112,7 @@ main ()
+@@ -18090,7 +18112,7 @@
  }
  
  EOF
@@ -3829,7 +3831,7 @@ update configure with autoconf2.13
  then
    :
  else
-@@ -18124,7 +18146,7 @@ fi
+@@ -18124,7 +18146,7 @@
            CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
            LIBS="$LIBS $LIBIDL_LIBS"
            cat > conftest.$ac_ext <<EOF
@@ -3838,7 +3840,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
  #include <stdio.h>
-@@ -18135,7 +18157,7 @@ int main() {
+@@ -18135,7 +18157,7 @@
   return IDL_get_libver_string ? 1 : 0; 
  ; return 0; }
  EOF
@@ -3847,7 +3849,7 @@ update configure with autoconf2.13
    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"
-@@ -18176,7 +18198,7 @@ rm -f conftest*
+@@ -18176,7 +18198,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
@@ -3856,7 +3858,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18220,19 +18242,19 @@ fi
+@@ -18220,19 +18242,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
@@ -3879,7 +3881,7 @@ update configure with autoconf2.13
              ## 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\"`"
-@@ -18268,7 +18290,7 @@ do
+@@ -18268,7 +18290,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
@@ -3888,7 +3890,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18305,7 +18327,7 @@ done
+@@ -18305,7 +18327,7 @@
  
          if test -n "$ORBIT_CONFIG"; then
              echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6
@@ -3897,7 +3899,7 @@ update configure with autoconf2.13
          	_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}`
-@@ -18322,7 +18344,7 @@ echo "configure:18309: checking for ORBi
+@@ -18322,7 +18344,7 @@
                  result="maybe" 
  else
    cat > conftest.$ac_ext <<EOF
@@ -3906,7 +3908,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -18337,7 +18359,7 @@ int main() {
+@@ -18337,7 +18359,7 @@
  }
              
  EOF
@@ -3915,7 +3917,7 @@ update configure with autoconf2.13
  then
    _LIBIDL_FOUND=1
                  result="yes"
-@@ -18394,7 +18416,7 @@ if test -z "${GLIB_CFLAGS}" || test -z "
+@@ -18394,7 +18416,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
@@ -3924,7 +3926,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18438,19 +18460,19 @@ fi
+@@ -18438,19 +18460,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
@@ -3947,7 +3949,7 @@ update configure with autoconf2.13
              ## 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\"`"
-@@ -18534,7 +18556,7 @@ fi
+@@ -18534,7 +18556,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
@@ -3956,7 +3958,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18569,7 +18591,7 @@ fi
+@@ -18569,7 +18591,7 @@
  
    min_glib_version=${GLIB_VERSION}
    echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
@@ -3965,7 +3967,7 @@ update configure with autoconf2.13
    no_glib=""
    if test "$GLIB_CONFIG" = "no" ; then
      no_glib=yes
-@@ -18592,7 +18614,7 @@ echo "configure:18573: checking for GLIB
+@@ -18592,7 +18614,7 @@
    echo $ac_n "cross compiling; assumed OK... $ac_c"
  else
    cat > conftest.$ac_ext <<EOF
@@ -3974,7 +3976,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
  #include <glib.h>
-@@ -18668,7 +18690,7 @@ main ()
+@@ -18668,7 +18690,7 @@
  }
  
  EOF
@@ -3983,7 +3985,7 @@ update configure with autoconf2.13
  then
    :
  else
-@@ -18702,7 +18724,7 @@ fi
+@@ -18702,7 +18724,7 @@
            CFLAGS="$CFLAGS $GLIB_CFLAGS"
            LIBS="$LIBS $GLIB_LIBS"
            cat > conftest.$ac_ext <<EOF
@@ -3992,7 +3994,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
  #include <glib.h>
-@@ -18712,7 +18734,7 @@ int main() {
+@@ -18712,7 +18734,7 @@
   return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); 
  ; return 0; }
  EOF
@@ -4001,7 +4003,7 @@ update configure with autoconf2.13
    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"
-@@ -18792,19 +18814,19 @@ mk_add_options MOZ_CO_MODULE=mozilla/oth
+@@ -18792,19 +18814,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
@@ -4024,7 +4026,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_header_alloca_h=yes
  else
-@@ -18825,12 +18847,12 @@ EOF
+@@ -18825,12 +18847,12 @@
  fi
  
  echo $ac_n "checking for alloca""... $ac_c" 1>&6
@@ -4039,7 +4041,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
  #ifdef __GNUC__
-@@ -18858,7 +18880,7 @@ int main() {
+@@ -18858,7 +18880,7 @@
  char *p = (char *) alloca(1);
  ; return 0; }
  EOF
@@ -4048,7 +4050,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    ac_cv_func_alloca_works=yes
  else
-@@ -18890,12 +18912,12 @@ EOF
+@@ -18890,12 +18912,12 @@
  
  
  echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
@@ -4063,7 +4065,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  #if defined(CRAY) && ! defined(CRAY2)
  webecray
-@@ -18920,12 +18942,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
+@@ -18920,12 +18942,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
@@ -4078,7 +4080,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -18948,7 +18970,7 @@ $ac_func();
+@@ -18948,7 +18970,7 @@
  
  ; return 0; }
  EOF
@@ -4087,7 +4089,7 @@ update configure with autoconf2.13
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -18975,7 +18997,7 @@ done
+@@ -18975,7 +18997,7 @@
  fi
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
@@ -4096,7 +4098,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18983,7 +19005,7 @@ else
+@@ -18983,7 +19005,7 @@
    ac_cv_c_stack_direction=0
  else
    cat > conftest.$ac_ext <<EOF
@@ -4105,7 +4107,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  find_stack_direction ()
  {
-@@ -19002,7 +19024,7 @@ main ()
+@@ -19002,7 +19024,7 @@
    exit (find_stack_direction() < 0);
  }
  EOF
@@ -4114,7 +4116,7 @@ update configure with autoconf2.13
  then
    ac_cv_c_stack_direction=1
  else
-@@ -19051,17 +19073,17 @@ fi
+@@ -19051,17 +19073,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -4135,7 +4137,7 @@ update configure with autoconf2.13
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -19152,7 +19174,7 @@ EOF
+@@ -19152,7 +19174,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
@@ -4144,7 +4146,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -19196,19 +19218,19 @@ fi
+@@ -19196,19 +19218,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
@@ -4167,15 +4169,7 @@ update configure with autoconf2.13
              ## 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\"`"
-@@ -19241,14 +19263,14 @@ echo "configure:19212: checking CAIRO_LI
- 
-       if test "$MOZ_X11"; then
-           if test "$MOZ_SVG_RENDERER_CAIRO"; then
--
-+
-   succeeded=no
- 
-   if test -z "$PKG_CONFIG"; then
+@@ -19248,7 +19270,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
@@ -4184,23 +4178,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -19256,13 +19278,13 @@ else
-   /*)
-   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-   ;;
--  ?:/*)
-+  ?:/*)
-   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
-   ;;
-   *)
-   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-   ac_dummy="$PATH"
--  for ac_dir in $ac_dummy; do
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-       ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-@@ -19292,19 +19314,19 @@ fi
+@@ -19292,19 +19314,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-xlib >= $CAIRO_VERSION""... $ac_c" 1>&6
@@ -4223,34 +4201,7 @@ update configure with autoconf2.13
              ## don't use --libs since that can do evil things like add
              ## -Wl,--export-dynamic
              CAIRO_XLIB_LIBS="`$PKG_CONFIG --libs-only-L \"cairo-xlib >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo-xlib >= $CAIRO_VERSION\"`"
-@@ -19312,14 +19334,14 @@ echo "configure:19308: checking CAIRO_XL
-         else
-             CAIRO_XLIB_CFLAGS=""
-             CAIRO_XLIB_LIBS=""
--            ## If we have a custom action on failure, don't print errors, but
-+            ## If we have a custom action on failure, don't print errors, but
-             ## do set a variable so people can do so.
-             CAIRO_XLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo-xlib >= $CAIRO_VERSION"`
--
-+
-         fi
- 
--
--
-+
-+
-      else
-         echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-         echo "*** See http://www.freedesktop.org/software/pkgconfig"
-@@ -19336,14 +19358,14 @@ echo "configure:19308: checking CAIRO_XL
-               MOZ_CAIRO_XLIB_LIBS="$XLDFLAGS $CAIRO_XLIB_LIBS"
-           fi
-           if test "$MOZ_ENABLE_CANVAS"; then
--
-+
-   succeeded=no
- 
-   if test -z "$PKG_CONFIG"; then
+@@ -19343,7 +19365,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
@@ -4259,23 +4210,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -19351,13 +19373,13 @@ else
-   /*)
-   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-   ;;
--  ?:/*)
-+  ?:/*)
-   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
-   ;;
-   *)
-   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-   ac_dummy="$PATH"
--  for ac_dir in $ac_dummy; do
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-       ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-@@ -19387,19 +19409,19 @@ fi
+@@ -19387,19 +19409,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-xlib-xrender >= $CAIRO_VERSION""... $ac_c" 1>&6
@@ -4298,26 +4233,7 @@ update configure with autoconf2.13
              ## don't use --libs since that can do evil things like add
              ## -Wl,--export-dynamic
              CAIRO_XRENDER_LIBS="`$PKG_CONFIG --libs-only-L \"cairo-xlib-xrender >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo-xlib-xrender >= $CAIRO_VERSION\"`"
-@@ -19407,14 +19429,14 @@ echo "configure:19403: checking CAIRO_XR
-         else
-             CAIRO_XRENDER_CFLAGS=""
-             CAIRO_XRENDER_LIBS=""
--            ## If we have a custom action on failure, don't print errors, but
-+            ## If we have a custom action on failure, don't print errors, but
-             ## do set a variable so people can do so.
-             CAIRO_XRENDER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo-xlib-xrender >= $CAIRO_VERSION"`
--
-+
-         fi
- 
--
--
-+
-+
-      else
-         echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-         echo "*** See http://www.freedesktop.org/software/pkgconfig"
-@@ -19470,7 +19492,7 @@ if test `echo "$MOZ_EXTENSIONS" | grep -
+@@ -19470,7 +19492,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
@@ -4326,7 +4242,7 @@ update configure with autoconf2.13
  if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -19746,14 +19768,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext
+@@ -19746,14 +19768,14 @@
  cross_compiling=$ac_cv_prog_cc_cross
  
      cat > conftest.$ac_ext <<EOF
@@ -4343,7 +4259,7 @@ update configure with autoconf2.13
    :
  else
    echo "configure: failed program was:" >&5
-@@ -20060,7 +20082,7 @@ if test "$MOZ_X11"; then
+@@ -20060,7 +20082,7 @@
                  _SAVE_CFLAGS=$CFLAGS
      CFLAGS="$CFLAGS $XCFLAGS"
      cat > conftest.$ac_ext <<EOF
@@ -4352,7 +4268,7 @@ update configure with autoconf2.13
  #include "confdefs.h"
  
          #include <stdio.h>
-@@ -20076,7 +20098,7 @@ int main() {
+@@ -20076,7 +20098,7 @@
      
  ; return 0; }
  EOF
diff -pruN 1:0.8~b3.dfsg.1-0.1/debian/patches/gcc-4.7-fixes.patch 1:0.8~b3.dfsg.1-0.1ubuntu3/debian/patches/gcc-4.7-fixes.patch
--- 1:0.8~b3.dfsg.1-0.1/debian/patches/gcc-4.7-fixes.patch	1970-01-01 00:00:00.000000000 +0000
+++ 1:0.8~b3.dfsg.1-0.1ubuntu3/debian/patches/gcc-4.7-fixes.patch	2012-10-03 14:36:52.000000000 +0000
@@ -0,0 +1,85 @@
+Description: fix build with gcc-4.7
+Author: Julian Taylor <jtaylor@ubuntu.com>
+
+--- a/mozilla/xpcom/glue/nsBaseHashtable.h
++++ b/mozilla/xpcom/glue/nsBaseHashtable.h
+@@ -123,7 +123,7 @@
+    */
+   PRBool Get(KeyType aKey, UserDataType* pData) const
+   {
+-    EntryType* ent = GetEntry(aKey);
++    EntryType* ent = this->GetEntry(aKey);
+ 
+     if (!ent)
+       return PR_FALSE;
+@@ -142,7 +142,7 @@
+    */
+   PRBool Put(KeyType aKey, UserDataType aData)
+   {
+-    EntryType* ent = PutEntry(aKey);
++    EntryType* ent = this->PutEntry(aKey);
+ 
+     if (!ent)
+       return PR_FALSE;
+@@ -156,7 +156,7 @@
+    * remove the data for the associated key
+    * @param aKey the key to remove from the hashtable
+    */
+-  void Remove(KeyType aKey) { RemoveEntry(aKey); }
++  void Remove(KeyType aKey) { this->RemoveEntry(aKey); }
+ 
+   /**
+    * function type provided by the application for enumeration.
+--- a/mozilla/xpcom/glue/nsClassHashtable.h
++++ b/mozilla/xpcom/glue/nsClassHashtable.h
+@@ -98,7 +98,7 @@
+ nsClassHashtable<KeyClass,T>::Get(KeyType aKey, T** retVal) const
+ {
+   typename nsBaseHashtable<KeyClass,nsAutoPtr<T>,T*>::EntryType* ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {
+--- a/mozilla/xpcom/glue/nsINIParser.cpp
++++ b/mozilla/xpcom/glue/nsINIParser.cpp
+@@ -238,7 +238,7 @@
+         }
+ 
+         // We've never encountered this section before, add it to the head
+-        mSections.Put(currSection, val);
++        this->mSections.Put(currSection, val);
+     }
+ 
+     return NS_OK;
+--- a/mozilla/xpcom/glue/nsInterfaceHashtable.h
++++ b/mozilla/xpcom/glue/nsInterfaceHashtable.h
+@@ -111,7 +111,7 @@
+   (KeyType aKey, UserDataType* pInterface) const
+ {
+   typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {
+@@ -139,7 +139,7 @@
+   (KeyType aKey, PRBool* aFound) const
+ {
+   typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {
+--- a/mozilla/xpcom/glue/nsRefPtrHashtable.h
++++ b/mozilla/xpcom/glue/nsRefPtrHashtable.h
+@@ -140,7 +140,7 @@
+   (KeyType aKey, PRBool* aFound) const
+ {
+   typename nsBaseHashtable<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType* ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {
diff -pruN 1:0.8~b3.dfsg.1-0.1/debian/patches/series 1:0.8~b3.dfsg.1-0.1ubuntu3/debian/patches/series
--- 1:0.8~b3.dfsg.1-0.1/debian/patches/series	2012-10-03 14:36:49.000000000 +0000
+++ 1:0.8~b3.dfsg.1-0.1ubuntu3/debian/patches/series	2012-10-03 14:36:52.000000000 +0000
@@ -12,3 +12,5 @@
 22_mips_performance.patch
 23_x11-session.patch
 99_configure.patch
+25_uninitialized_const.patch
+gcc-4.7-fixes.patch
diff -pruN 1:0.8~b3.dfsg.1-0.1/debian/rules 1:0.8~b3.dfsg.1-0.1ubuntu3/debian/rules
--- 1:0.8~b3.dfsg.1-0.1/debian/rules	2012-10-03 14:36:49.000000000 +0000
+++ 1:0.8~b3.dfsg.1-0.1ubuntu3/debian/rules	2012-10-03 14:36:52.000000000 +0000
@@ -13,6 +13,7 @@ TARBALL = $(PACKAGE)_$(SRC_VERSION).orig
 
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 DEBIAN_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\(.*\)$$/\1/ p')
@@ -38,6 +39,11 @@ else
 	CONFIGURE_OPTIONS += --disable-debug
 endif
 
+ifneq (,$(filter armel armhf,$(DEB_HOST_ARCH)))
+	CFLAGS += -Wa,-mimplicit-it=thumb
+	CXXFLAGS += -Wa,-mimplicit-it=thumb
+endif
+
 
 
 get-orig-source:
diff -pruN 1:0.8~b3.dfsg.1-0.1/mozilla/toolkit/xre/nsAppRunner.cpp 1:0.8~b3.dfsg.1-0.1ubuntu3/mozilla/toolkit/xre/nsAppRunner.cpp
--- 1:0.8~b3.dfsg.1-0.1/mozilla/toolkit/xre/nsAppRunner.cpp	2009-05-12 02:20:56.000000000 +0000
+++ 1:0.8~b3.dfsg.1-0.1ubuntu3/mozilla/toolkit/xre/nsAppRunner.cpp	2012-10-03 14:36:52.000000000 +0000
@@ -703,7 +703,7 @@ nsXULAppInfo::PostUpdate(nsILocalFile *a
 }
 #endif
 
-static const nsXULAppInfo kAppInfo;
+static const nsXULAppInfo kAppInfo = nsXULAppInfo();
 static NS_METHOD AppInfoConstructor(nsISupports* aOuter,
                                     REFNSIID aIID, void **aResult)
 {