diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index cd51848..54cfa3c 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Nov 27 18:25:25 CET 2007 - maw@suse.de
+
+- Security update to version 2.0.0.10 (#341905, #341591):
+  + MFSA 2007-39  Referer-spoofing via window.location race condition
+  + MFSA 2007-38 Memory corruption vulnerabilities (rv:1.8.1.10)
+  + MFSA 2007-37 jar: URI scheme XSS hazard
+  + Fixes for regressions introduced in 2.0.0.8
+  + Updated dbus.patch, startup.patch, misc.dif, and configure.patch
+- Add mozilla-gcc4.3-fixes.patch
+- Add mozilla-canvas-1.8.1.10.patch (#341591#c10).
+
 -------------------------------------------------------------------
 Mon Nov 26 18:27:25 CET 2007 - maw@suse.de
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index 77ce843..1cd5c2b 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package MozillaFirefox (Version 2.0.0.8)
+# spec file for package MozillaFirefox (Version 2.0.0.10)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -28,8 +28,8 @@ Obsoletes:      MozillaFirebird <= 1.0.7
 %if %sles_version == 10
 Obsoletes:      mozilla
 %endif
-Version:        2.0.0.8
-Release:        22
+Version:        2.0.0.10
+Release:        1
 Summary:        Mozilla Firefox Web Browser
 Url:            http://www.mozilla.org/
 Group:          Productivity/Networking/Web/Browsers
@@ -59,6 +59,7 @@ Source18:       firefox.schemas
 Patch1:         visibility.patch
 Patch2:         rpath.patch
 Patch3:         gcc-undefined-ops.patch
+Patch4:         mozilla-gcc4.3-fixes.patch
 Patch5:         abuild.patch
 # NSPR bmo #270502
 Patch6:         nspr-prdtoa.patch
@@ -91,9 +92,9 @@ Patch33:        proxy-dev.patch
 # integration
 Patch34:        skin-selection.patch
 Patch36:        greasemonkey.patch
+Patch37:        mozilla-canvas-1.8.1.10.patch
 Patch38:        tango-maxversion.patch
 Patch39:        x11-session.patch
-Patch40:        firefox-gcc4.3-fixes.patch
 # gconf.patch dbus.patch startup.patch
 Patch100:       configure.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -188,6 +189,7 @@ cd $RPM_BUILD_DIR/mozilla
 %patch1
 %patch2
 %patch3
+%patch4
 %patch5
 %patch6
 %patch7
@@ -216,11 +218,11 @@ cd $RPM_BUILD_DIR/mozilla
 %patch33
 %patch34
 %patch36
+%patch37
 pushd $RPM_BUILD_DIR
 %patch38
 popd
 %patch39 -p1
-%patch40 -p1
 %patch100
 %if %has_system_nss
 #%patch101
@@ -557,6 +559,15 @@ exit 0
 %endif
 
 %changelog
+* Tue Nov 27 2007 - maw@suse.de
+- Security update to version 2.0.0.10 (#341905, #341591):
+  + MFSA 2007-39  Referer-spoofing via window.location race condition
+  + MFSA 2007-38 Memory corruption vulnerabilities (rv:1.8.1.10)
+  + MFSA 2007-37 jar: URI scheme XSS hazard
+  + Fixes for regressions introduced in 2.0.0.8
+  + Updated dbus.patch, startup.patch, misc.dif, and configure.patch
+- Add mozilla-gcc4.3-fixes.patch
+- Add mozilla-canvas-1.8.1.10.patch (#341591#c10).
 * Mon Nov 26 2007 - maw@suse.de
 - Build with -ftree-vrp -fwrapv, per advice in #342603#c17.
 * Tue Nov 13 2007 - maw@suse.de
diff --git a/configure.patch b/configure.patch
index 43e1ab7..cafd534 100644
--- a/configure.patch
+++ b/configure.patch
@@ -1,10 +1,10 @@
 Index: configure
 ===================================================================
 RCS file: /cvsroot/mozilla/configure,v
-retrieving revision 1.1492.2.124
-diff -u -r1.1492.2.124 configure
---- configure	13 Sep 2007 03:52:47 -0000	1.1492.2.124
-+++ configure	15 Oct 2007 09:13:46 -0000
+retrieving revision 1.1492.2.127
+diff -u -r1.1492.2.127 configure
+--- configure	8 Nov 2007 19:22:51 -0000	1.1492.2.127
++++ configure	27 Nov 2007 11:57:04 -0000
 @@ -83,6 +83,8 @@
  ac_help="$ac_help
    --with-qtdir=\$dir       Specify Qt directory "
@@ -1116,2876 +1116,2876 @@ diff -u -r1.1492.2.124 configure
  if eval "test \"`echo '$''{'ac_cv_path_SDP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4021,7 +3924,7 @@
+@@ -4029,7 +3932,7 @@
    fi
  
    echo $ac_n "checking for valid compiler/Mac OS X SDK combination""... $ac_c" 1>&6
--echo "configure:4025: checking for valid compiler/Mac OS X SDK combination" >&5
-+echo "configure:3928: checking for valid compiler/Mac OS X SDK combination" >&5
+-echo "configure:4033: checking for valid compiler/Mac OS X SDK combination" >&5
++echo "configure:3936: checking for valid compiler/Mac OS X SDK combination" >&5
    ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -4030,7 +3933,7 @@
+@@ -4038,7 +3941,7 @@
  cross_compiling=$ac_cv_prog_cxx_cross
  
    cat > conftest.$ac_ext <<EOF
--#line 4034 "configure"
-+#line 3937 "configure"
+-#line 4042 "configure"
++#line 3945 "configure"
  #include "confdefs.h"
  #include <new>
                   int main() { return 0; }
-@@ -4038,7 +3941,7 @@
+@@ -4046,7 +3949,7 @@
  result=yes
  ; return 0; }
  EOF
--if { (eval echo configure:4042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:4050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3953: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    result=no
  else
-@@ -4063,7 +3966,7 @@
+@@ -4071,7 +3974,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
--echo "configure:4067: checking for $ac_word" >&5
-+echo "configure:3970: checking for $ac_word" >&5
+-echo "configure:4075: checking for $ac_word" >&5
++echo "configure:3978: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4106,7 +4009,7 @@
+@@ -4114,7 +4017,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
--echo "configure:4110: checking for $ac_word" >&5
-+echo "configure:4013: checking for $ac_word" >&5
+-echo "configure:4118: checking for $ac_word" >&5
++echo "configure:4021: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4174,7 +4077,7 @@
+@@ -4182,7 +4085,7 @@
  # Uses ac_ vars as temps to allow command line to override cache and checks.
  # --without-x overrides everything else, but does not touch the cache.
  echo $ac_n "checking for X""... $ac_c" 1>&6
--echo "configure:4178: checking for X" >&5
-+echo "configure:4081: checking for X" >&5
+-echo "configure:4186: checking for X" >&5
++echo "configure:4089: checking for X" >&5
  
  # Check whether --with-x or --without-x was given.
  if test "${with_x+set}" = set; then
-@@ -4236,12 +4139,12 @@
+@@ -4244,12 +4147,12 @@
  
    # First, try using that file with no special directory specified.
  cat > conftest.$ac_ext <<EOF
--#line 4240 "configure"
-+#line 4143 "configure"
+-#line 4248 "configure"
++#line 4151 "configure"
  #include "confdefs.h"
  #include <$x_direct_test_include>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:4245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:4148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:4253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4156: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -4310,14 +4213,14 @@
+@@ -4318,14 +4221,14 @@
    ac_save_LIBS="$LIBS"
    LIBS="-l$x_direct_test_library $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 4314 "configure"
-+#line 4217 "configure"
+-#line 4322 "configure"
++#line 4225 "configure"
  #include "confdefs.h"
  
  int main() {
  ${x_direct_test_function}()
  ; return 0; }
  EOF
--if { (eval echo configure:4321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    LIBS="$ac_save_LIBS"
  # We can link X programs with no special library path.
-@@ -4423,17 +4326,17 @@
+@@ -4431,17 +4334,17 @@
      case "`(uname -sr) 2>/dev/null`" in
      "SunOS 5"*)
        echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
--echo "configure:4427: checking whether -R must be followed by a space" >&5
-+echo "configure:4330: checking whether -R must be followed by a space" >&5
+-echo "configure:4435: checking whether -R must be followed by a space" >&5
++echo "configure:4338: checking whether -R must be followed by a space" >&5
        ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
        cat > conftest.$ac_ext <<EOF
--#line 4430 "configure"
-+#line 4333 "configure"
+-#line 4438 "configure"
++#line 4341 "configure"
  #include "confdefs.h"
  
  int main() {
  
  ; return 0; }
  EOF
--if { (eval echo configure:4437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_R_nospace=yes
  else
-@@ -4449,14 +4352,14 @@
+@@ -4457,14 +4360,14 @@
        else
  	LIBS="$ac_xsave_LIBS -R $x_libraries"
  	cat > conftest.$ac_ext <<EOF
--#line 4453 "configure"
-+#line 4356 "configure"
+-#line 4461 "configure"
++#line 4364 "configure"
  #include "confdefs.h"
  
  int main() {
  
  ; return 0; }
  EOF
--if { (eval echo configure:4460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_R_space=yes
  else
-@@ -4488,7 +4391,7 @@
+@@ -4496,7 +4399,7 @@
      # libraries were built with DECnet support.  And karl@cs.umb.edu says
      # the Alpha needs dnet_stub (dnet does not exist).
      echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
--echo "configure:4492: checking for dnet_ntoa in -ldnet" >&5
-+echo "configure:4395: checking for dnet_ntoa in -ldnet" >&5
+-echo "configure:4500: checking for dnet_ntoa in -ldnet" >&5
++echo "configure:4403: checking for dnet_ntoa in -ldnet" >&5
  ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4496,7 +4399,7 @@
+@@ -4504,7 +4407,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-ldnet  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 4500 "configure"
-+#line 4403 "configure"
+-#line 4508 "configure"
++#line 4411 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
-@@ -4510,7 +4413,7 @@
+@@ -4518,7 +4421,7 @@
  dnet_ntoa()
  ; return 0; }
  EOF
--if { (eval echo configure:4514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -4532,7 +4435,7 @@
+@@ -4540,7 +4443,7 @@
  
      if test $ac_cv_lib_dnet_dnet_ntoa = no; then
        echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
--echo "configure:4536: checking for dnet_ntoa in -ldnet_stub" >&5
-+echo "configure:4439: checking for dnet_ntoa in -ldnet_stub" >&5
+-echo "configure:4544: checking for dnet_ntoa in -ldnet_stub" >&5
++echo "configure:4447: checking for dnet_ntoa in -ldnet_stub" >&5
  ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4540,7 +4443,7 @@
+@@ -4548,7 +4451,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-ldnet_stub  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 4544 "configure"
-+#line 4447 "configure"
+-#line 4552 "configure"
++#line 4455 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
-@@ -4554,7 +4457,7 @@
+@@ -4562,7 +4465,7 @@
  dnet_ntoa()
  ; return 0; }
  EOF
--if { (eval echo configure:4558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -4583,12 +4486,12 @@
+@@ -4591,12 +4494,12 @@
      # The nsl library prevents programs from opening the X display
      # on Irix 5.2, according to dickey@clark.net.
      echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
--echo "configure:4587: checking for gethostbyname" >&5
-+echo "configure:4490: checking for gethostbyname" >&5
+-echo "configure:4595: checking for gethostbyname" >&5
++echo "configure:4498: checking for gethostbyname" >&5
  if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 4592 "configure"
-+#line 4495 "configure"
+-#line 4600 "configure"
++#line 4503 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char gethostbyname(); below.  */
-@@ -4614,7 +4517,7 @@
+@@ -4622,7 +4525,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:4618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_gethostbyname=yes"
  else
-@@ -4635,7 +4538,7 @@
+@@ -4643,7 +4546,7 @@
  
      if test $ac_cv_func_gethostbyname = no; then
        echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
--echo "configure:4639: checking for gethostbyname in -lnsl" >&5
-+echo "configure:4542: checking for gethostbyname in -lnsl" >&5
+-echo "configure:4647: checking for gethostbyname in -lnsl" >&5
++echo "configure:4550: checking for gethostbyname in -lnsl" >&5
  ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4643,7 +4546,7 @@
+@@ -4651,7 +4554,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 4647 "configure"
-+#line 4550 "configure"
+-#line 4655 "configure"
++#line 4558 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
-@@ -4657,7 +4560,7 @@
+@@ -4665,7 +4568,7 @@
  gethostbyname()
  ; return 0; }
  EOF
--if { (eval echo configure:4661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -4687,12 +4590,12 @@
+@@ -4695,12 +4598,12 @@
      # -lsocket must be given before -lnsl if both are needed.
      # We assume that if connect needs -lnsl, so does gethostbyname.
      echo $ac_n "checking for connect""... $ac_c" 1>&6
--echo "configure:4691: checking for connect" >&5
-+echo "configure:4594: checking for connect" >&5
+-echo "configure:4699: checking for connect" >&5
++echo "configure:4602: checking for connect" >&5
  if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 4696 "configure"
-+#line 4599 "configure"
+-#line 4704 "configure"
++#line 4607 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char connect(); below.  */
-@@ -4718,7 +4621,7 @@
+@@ -4726,7 +4629,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:4722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_connect=yes"
  else
-@@ -4739,7 +4642,7 @@
+@@ -4747,7 +4650,7 @@
  
      if test $ac_cv_func_connect = no; then
        echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
--echo "configure:4743: checking for connect in -lsocket" >&5
-+echo "configure:4646: checking for connect in -lsocket" >&5
+-echo "configure:4751: checking for connect in -lsocket" >&5
++echo "configure:4654: checking for connect in -lsocket" >&5
  ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4747,7 +4650,7 @@
+@@ -4755,7 +4658,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 4751 "configure"
-+#line 4654 "configure"
+-#line 4759 "configure"
++#line 4662 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
-@@ -4761,7 +4664,7 @@
+@@ -4769,7 +4672,7 @@
  connect()
  ; return 0; }
  EOF
--if { (eval echo configure:4765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -4785,12 +4688,12 @@
+@@ -4793,12 +4696,12 @@
  
      # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
      echo $ac_n "checking for remove""... $ac_c" 1>&6
--echo "configure:4789: checking for remove" >&5
-+echo "configure:4692: checking for remove" >&5
+-echo "configure:4797: checking for remove" >&5
++echo "configure:4700: checking for remove" >&5
  if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 4794 "configure"
-+#line 4697 "configure"
+-#line 4802 "configure"
++#line 4705 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char remove(); below.  */
-@@ -4816,7 +4719,7 @@
+@@ -4824,7 +4727,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:4820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_remove=yes"
  else
-@@ -4837,7 +4740,7 @@
+@@ -4845,7 +4748,7 @@
  
      if test $ac_cv_func_remove = no; then
        echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
--echo "configure:4841: checking for remove in -lposix" >&5
-+echo "configure:4744: checking for remove in -lposix" >&5
+-echo "configure:4849: checking for remove in -lposix" >&5
++echo "configure:4752: checking for remove in -lposix" >&5
  ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4845,7 +4748,7 @@
+@@ -4853,7 +4756,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lposix  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 4849 "configure"
-+#line 4752 "configure"
+-#line 4857 "configure"
++#line 4760 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
-@@ -4859,7 +4762,7 @@
+@@ -4867,7 +4770,7 @@
  remove()
  ; return 0; }
  EOF
--if { (eval echo configure:4863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -4883,12 +4786,12 @@
+@@ -4891,12 +4794,12 @@
  
      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
      echo $ac_n "checking for shmat""... $ac_c" 1>&6
--echo "configure:4887: checking for shmat" >&5
-+echo "configure:4790: checking for shmat" >&5
+-echo "configure:4895: checking for shmat" >&5
++echo "configure:4798: checking for shmat" >&5
  if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 4892 "configure"
-+#line 4795 "configure"
+-#line 4900 "configure"
++#line 4803 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char shmat(); below.  */
-@@ -4914,7 +4817,7 @@
+@@ -4922,7 +4825,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:4918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_shmat=yes"
  else
-@@ -4935,7 +4838,7 @@
+@@ -4943,7 +4846,7 @@
  
      if test $ac_cv_func_shmat = no; then
        echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
--echo "configure:4939: checking for shmat in -lipc" >&5
-+echo "configure:4842: checking for shmat in -lipc" >&5
+-echo "configure:4947: checking for shmat in -lipc" >&5
++echo "configure:4850: checking for shmat in -lipc" >&5
  ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4943,7 +4846,7 @@
+@@ -4951,7 +4854,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lipc  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 4947 "configure"
-+#line 4850 "configure"
+-#line 4955 "configure"
++#line 4858 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
-@@ -4957,7 +4860,7 @@
+@@ -4965,7 +4868,7 @@
  shmat()
  ; return 0; }
  EOF
--if { (eval echo configure:4961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:4969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -4990,7 +4893,7 @@
+@@ -4998,7 +4901,7 @@
    # libraries we check for below, so use a different variable.
    #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
    echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
--echo "configure:4994: checking for IceConnectionNumber in -lICE" >&5
-+echo "configure:4897: checking for IceConnectionNumber in -lICE" >&5
+-echo "configure:5002: checking for IceConnectionNumber in -lICE" >&5
++echo "configure:4905: checking for IceConnectionNumber in -lICE" >&5
  ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4998,7 +4901,7 @@
+@@ -5006,7 +4909,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lICE $X_EXTRA_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 5002 "configure"
-+#line 4905 "configure"
+-#line 5010 "configure"
++#line 4913 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
-@@ -5012,7 +4915,7 @@
+@@ -5020,7 +4923,7 @@
  IceConnectionNumber()
  ; return 0; }
  EOF
--if { (eval echo configure:5016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:5024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -5450,7 +5353,7 @@
+@@ -5458,7 +5361,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
--echo "configure:5454: checking whether ld has archive extraction flags" >&5
-+echo "configure:5357: checking whether ld has archive extraction flags" >&5
+-echo "configure:5462: checking whether ld has archive extraction flags" >&5
++echo "configure:5365: checking whether ld has archive extraction flags" >&5
    if eval "test \"`echo '$''{'ac_cv_mkshlib_force_and_unforce'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -5467,14 +5370,14 @@
+@@ -5475,14 +5378,14 @@
        LDFLAGS=$force
        LIBS=$unforce
        cat > conftest.$ac_ext <<EOF
--#line 5471 "configure"
-+#line 5374 "configure"
+-#line 5479 "configure"
++#line 5382 "configure"
  #include "confdefs.h"
  
  int main() {
  
  ; return 0; }
  EOF
--if { (eval echo configure:5478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:5486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_mkshlib_force_and_unforce=$line; break
  else
-@@ -5507,7 +5410,7 @@
+@@ -5515,7 +5418,7 @@
  '
  
  echo $ac_n "checking that static assertion macros used in autoconf tests work""... $ac_c" 1>&6
--echo "configure:5511: checking that static assertion macros used in autoconf tests work" >&5
-+echo "configure:5414: checking that static assertion macros used in autoconf tests work" >&5
+-echo "configure:5519: checking that static assertion macros used in autoconf tests work" >&5
++echo "configure:5422: checking that static assertion macros used in autoconf tests work" >&5
  if eval "test \"`echo '$''{'ac_cv_static_assertion_macros_work'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -5521,14 +5424,14 @@
+@@ -5529,14 +5432,14 @@
  
    ac_cv_static_assertion_macros_work="yes"
    cat > conftest.$ac_ext <<EOF
--#line 5525 "configure"
-+#line 5428 "configure"
+-#line 5533 "configure"
++#line 5436 "configure"
  #include "confdefs.h"
  $configure_static_assert_macros
  int main() {
  CONFIGURE_STATIC_ASSERT(1)
  ; return 0; }
  EOF
--if { (eval echo configure:5532: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5435: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:5540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5443: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    :
  else
    echo "configure: failed program was:" >&5
-@@ -5538,14 +5441,14 @@
+@@ -5546,14 +5449,14 @@
  fi
  rm -f conftest*
    cat > conftest.$ac_ext <<EOF
--#line 5542 "configure"
-+#line 5445 "configure"
+-#line 5550 "configure"
++#line 5453 "configure"
  #include "confdefs.h"
  $configure_static_assert_macros
  int main() {
  CONFIGURE_STATIC_ASSERT(0)
  ; return 0; }
  EOF
--if { (eval echo configure:5549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:5557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_static_assertion_macros_work="no"
  else
-@@ -5561,14 +5464,14 @@
+@@ -5569,14 +5472,14 @@
  cross_compiling=$ac_cv_prog_cxx_cross
  
    cat > conftest.$ac_ext <<EOF
--#line 5565 "configure"
-+#line 5468 "configure"
+-#line 5573 "configure"
++#line 5476 "configure"
  #include "confdefs.h"
  $configure_static_assert_macros
  int main() {
  CONFIGURE_STATIC_ASSERT(1)
  ; return 0; }
  EOF
--if { (eval echo configure:5572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5475: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:5580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    :
  else
    echo "configure: failed program was:" >&5
-@@ -5578,14 +5481,14 @@
+@@ -5586,14 +5489,14 @@
  fi
  rm -f conftest*
    cat > conftest.$ac_ext <<EOF
--#line 5582 "configure"
-+#line 5485 "configure"
+-#line 5590 "configure"
++#line 5493 "configure"
  #include "confdefs.h"
  $configure_static_assert_macros
  int main() {
  CONFIGURE_STATIC_ASSERT(0)
  ; return 0; }
  EOF
--if { (eval echo configure:5589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:5597: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_static_assertion_macros_work="no"
  else
-@@ -5620,16 +5523,16 @@
+@@ -5628,16 +5531,16 @@
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6
--echo "configure:5624: checking for 64-bit OS" >&5
-+echo "configure:5527: checking for 64-bit OS" >&5
+-echo "configure:5632: checking for 64-bit OS" >&5
++echo "configure:5535: checking for 64-bit OS" >&5
  cat > conftest.$ac_ext <<EOF
--#line 5626 "configure"
-+#line 5529 "configure"
+-#line 5634 "configure"
++#line 5537 "configure"
  #include "confdefs.h"
  $configure_static_assert_macros
  int main() {
  CONFIGURE_STATIC_ASSERT(sizeof(long) == 8)
  ; return 0; }
  EOF
--if { (eval echo configure:5633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:5641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    result="yes"
  else
-@@ -5787,9 +5690,9 @@
+@@ -5795,9 +5698,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
--echo "configure:5791: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5
-+echo "configure:5694: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5
+-echo "configure:5799: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5
++echo "configure:5702: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5
              cat > conftest.$ac_ext <<EOF
--#line 5793 "configure"
-+#line 5696 "configure"
+-#line 5801 "configure"
++#line 5704 "configure"
  #include "confdefs.h"
  
  int main() {
-@@ -5798,7 +5701,7 @@
+@@ -5806,7 +5709,7 @@
                   #endif
  ; return 0; }
  EOF
--if { (eval echo configure:5802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:5810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    _BAD_COMPILER=
  else
-@@ -5836,17 +5739,17 @@
+@@ -5844,17 +5747,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:5840: checking for $ac_hdr" >&5
-+echo "configure:5743: checking for $ac_hdr" >&5
+-echo "configure:5848: checking for $ac_hdr" >&5
++echo "configure:5751: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 5845 "configure"
-+#line 5748 "configure"
+-#line 5853 "configure"
++#line 5756 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:5753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:5858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -5888,7 +5791,7 @@
+@@ -5896,7 +5799,7 @@
      LIBS="$LIBS -lbe"
      if test "$COMPILE_ENVIRONMENT"; then
          echo $ac_n "checking for main in -lbind""... $ac_c" 1>&6
--echo "configure:5892: checking for main in -lbind" >&5
-+echo "configure:5795: checking for main in -lbind" >&5
+-echo "configure:5900: checking for main in -lbind" >&5
++echo "configure:5803: checking for main in -lbind" >&5
  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
-@@ -5896,14 +5799,14 @@
+@@ -5904,14 +5807,14 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 5900 "configure"
-+#line 5803 "configure"
+-#line 5908 "configure"
++#line 5811 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
--if { (eval echo configure:5907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:5915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -5924,7 +5827,7 @@
+@@ -5932,7 +5835,7 @@
  fi
  
          echo $ac_n "checking for main in -lzeta""... $ac_c" 1>&6
--echo "configure:5928: checking for main in -lzeta" >&5
-+echo "configure:5831: checking for main in -lzeta" >&5
+-echo "configure:5936: checking for main in -lzeta" >&5
++echo "configure:5839: checking for main in -lzeta" >&5
  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
-@@ -5932,14 +5835,14 @@
+@@ -5940,14 +5843,14 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lzeta  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 5936 "configure"
-+#line 5839 "configure"
+-#line 5944 "configure"
++#line 5847 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
--if { (eval echo configure:5943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:5951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -6003,18 +5906,18 @@
+@@ -6015,18 +5918,18 @@
      MACOSX=1
  
          echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6
--echo "configure:6007: checking for -dead_strip option to ld" >&5
-+echo "configure:5910: checking for -dead_strip option to ld" >&5
+-echo "configure:6019: checking for -dead_strip option to ld" >&5
++echo "configure:5922: checking for -dead_strip option to ld" >&5
      _SAVE_LDFLAGS=$LDFLAGS
      LDFLAGS="$LDFLAGS -Wl,-dead_strip"
      cat > conftest.$ac_ext <<EOF
--#line 6011 "configure"
-+#line 5914 "configure"
+-#line 6023 "configure"
++#line 5926 "configure"
  #include "confdefs.h"
  
  int main() {
  return 0;
  ; return 0; }
  EOF
--if { (eval echo configure:6018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:6030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    _HAVE_DEAD_STRIP=1
  else
-@@ -6882,14 +6785,14 @@
+@@ -6894,14 +6797,14 @@
             _SAVE_LDFLAGS=$LDFLAGS
             LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS" 
             cat > conftest.$ac_ext <<EOF
--#line 6886 "configure"
-+#line 6789 "configure"
+-#line 6898 "configure"
++#line 6801 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int main() {
  printf("Hello World\n");
  ; return 0; }
  EOF
--if { (eval echo configure:6893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:6905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    :
  else
    echo "configure: failed program was:" >&5
-@@ -6917,7 +6820,7 @@
+@@ -6929,7 +6832,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
--echo "configure:6921: checking for Forte compiler version >= WS6U2" >&5
-+echo "configure:6824: checking for Forte compiler version >= WS6U2" >&5
+-echo "configure:6933: checking for Forte compiler version >= WS6U2" >&5
++echo "configure:6836: checking for Forte compiler version >= WS6U2" >&5
         
         ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -6927,7 +6830,7 @@
+@@ -6939,7 +6842,7 @@
  cross_compiling=$ac_cv_prog_cxx_cross
  
         cat > conftest.$ac_ext <<EOF
--#line 6931 "configure"
-+#line 6834 "configure"
+-#line 6943 "configure"
++#line 6846 "configure"
  #include "confdefs.h"
  
  int main() {
-@@ -6936,7 +6839,7 @@
+@@ -6948,7 +6851,7 @@
             #endif
  ; return 0; }
  EOF
--if { (eval echo configure:6940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:6843: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:6952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6855: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    _BAD_COMPILER=
  else
-@@ -7065,7 +6968,7 @@
+@@ -7077,7 +6980,7 @@
          ;;
      *-darwin*)
          echo $ac_n "checking for -exported_symbols_list option to ld""... $ac_c" 1>&6
--echo "configure:7069: checking for -exported_symbols_list option to ld" >&5
-+echo "configure:6972: checking for -exported_symbols_list option to ld" >&5
+-echo "configure:7081: checking for -exported_symbols_list option to ld" >&5
++echo "configure:6984: checking for -exported_symbols_list option to ld" >&5
          if eval "test \"`echo '$''{'ac_cv_exported_symbols_list'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -7105,12 +7008,12 @@
+@@ -7117,12 +7020,12 @@
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
--echo "configure:7109: checking for ANSI C header files" >&5
-+echo "configure:7012: checking for ANSI C header files" >&5
+-echo "configure:7121: checking for ANSI C header files" >&5
++echo "configure:7024: checking for ANSI C header files" >&5
  if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 7114 "configure"
-+#line 7017 "configure"
+-#line 7126 "configure"
++#line 7029 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -7118,7 +7021,7 @@
+@@ -7130,7 +7033,7 @@
  #include <float.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:7122: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:7025: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:7134: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:7037: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -7135,7 +7038,7 @@
+@@ -7147,7 +7050,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
--#line 7139 "configure"
-+#line 7042 "configure"
+-#line 7151 "configure"
++#line 7054 "configure"
  #include "confdefs.h"
  #include <string.h>
  EOF
-@@ -7153,7 +7056,7 @@
+@@ -7165,7 +7068,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
--#line 7157 "configure"
-+#line 7060 "configure"
+-#line 7169 "configure"
++#line 7072 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
-@@ -7174,7 +7077,7 @@
+@@ -7186,7 +7089,7 @@
    :
  else
    cat > conftest.$ac_ext <<EOF
--#line 7178 "configure"
-+#line 7081 "configure"
+-#line 7190 "configure"
++#line 7093 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -7185,7 +7088,7 @@
+@@ -7197,7 +7100,7 @@
  exit (0); }
  
  EOF
--if { (eval echo configure:7189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:7092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:7201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:7104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    :
  else
-@@ -7209,12 +7112,12 @@
+@@ -7221,12 +7124,12 @@
  fi
  
  echo $ac_n "checking for working const""... $ac_c" 1>&6
--echo "configure:7213: checking for working const" >&5
-+echo "configure:7116: checking for working const" >&5
+-echo "configure:7225: checking for working const" >&5
++echo "configure:7128: checking for working const" >&5
  if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 7218 "configure"
-+#line 7121 "configure"
+-#line 7230 "configure"
++#line 7133 "configure"
  #include "confdefs.h"
  
  int main() {
-@@ -7263,7 +7166,7 @@
+@@ -7275,7 +7178,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:7267: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:7170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:7279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7182: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_c_const=yes
  else
-@@ -7284,12 +7187,12 @@
+@@ -7296,12 +7199,12 @@
  fi
  
  echo $ac_n "checking for mode_t""... $ac_c" 1>&6
--echo "configure:7288: checking for mode_t" >&5
-+echo "configure:7191: checking for mode_t" >&5
+-echo "configure:7300: checking for mode_t" >&5
++echo "configure:7203: checking for mode_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 7293 "configure"
-+#line 7196 "configure"
+-#line 7305 "configure"
++#line 7208 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
-@@ -7317,12 +7220,12 @@
+@@ -7329,12 +7232,12 @@
  fi
  
  echo $ac_n "checking for off_t""... $ac_c" 1>&6
--echo "configure:7321: checking for off_t" >&5
-+echo "configure:7224: checking for off_t" >&5
+-echo "configure:7333: checking for off_t" >&5
++echo "configure:7236: checking for off_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 7326 "configure"
-+#line 7229 "configure"
+-#line 7338 "configure"
++#line 7241 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
-@@ -7350,12 +7253,12 @@
+@@ -7362,12 +7265,12 @@
  fi
  
  echo $ac_n "checking for pid_t""... $ac_c" 1>&6
--echo "configure:7354: checking for pid_t" >&5
-+echo "configure:7257: checking for pid_t" >&5
+-echo "configure:7366: checking for pid_t" >&5
++echo "configure:7269: checking for pid_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 7359 "configure"
-+#line 7262 "configure"
+-#line 7371 "configure"
++#line 7274 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
-@@ -7383,12 +7286,12 @@
+@@ -7395,12 +7298,12 @@
  fi
  
  echo $ac_n "checking for size_t""... $ac_c" 1>&6
--echo "configure:7387: checking for size_t" >&5
-+echo "configure:7290: checking for size_t" >&5
+-echo "configure:7399: checking for size_t" >&5
++echo "configure:7302: checking for size_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 7392 "configure"
-+#line 7295 "configure"
+-#line 7404 "configure"
++#line 7307 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
-@@ -7416,12 +7319,12 @@
+@@ -7428,12 +7331,12 @@
  fi
  
  echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
--echo "configure:7420: checking for st_blksize in struct stat" >&5
-+echo "configure:7323: checking for st_blksize in struct stat" >&5
+-echo "configure:7432: checking for st_blksize in struct stat" >&5
++echo "configure:7335: checking for st_blksize in struct stat" >&5
  if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 7425 "configure"
-+#line 7328 "configure"
+-#line 7437 "configure"
++#line 7340 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/stat.h>
-@@ -7429,7 +7332,7 @@
+@@ -7441,7 +7344,7 @@
  struct stat s; s.st_blksize;
  ; return 0; }
  EOF
--if { (eval echo configure:7433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:7336: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:7445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_struct_st_blksize=yes
  else
-@@ -7450,12 +7353,12 @@
+@@ -7462,12 +7365,12 @@
  fi
  
  echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6
--echo "configure:7454: checking for siginfo_t" >&5
-+echo "configure:7357: checking for siginfo_t" >&5
+-echo "configure:7466: checking for siginfo_t" >&5
++echo "configure:7369: checking for siginfo_t" >&5
  if eval "test \"`echo '$''{'ac_cv_siginfo_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 7459 "configure"
-+#line 7362 "configure"
+-#line 7471 "configure"
++#line 7374 "configure"
  #include "confdefs.h"
  #define _POSIX_C_SOURCE 199506L
                    #include <signal.h>
-@@ -7463,7 +7366,7 @@
+@@ -7475,7 +7378,7 @@
  siginfo_t* info;
  ; return 0; }
  EOF
--if { (eval echo configure:7467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:7370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:7479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_siginfo_t=true
  else
-@@ -7497,12 +7400,12 @@
+@@ -7509,12 +7412,12 @@
  fi
  
  echo $ac_n "checking for int16_t""... $ac_c" 1>&6
--echo "configure:7501: checking for int16_t" >&5
-+echo "configure:7404: checking for int16_t" >&5
+-echo "configure:7513: checking for int16_t" >&5
++echo "configure:7416: checking for int16_t" >&5
  if eval "test \"`echo '$''{'ac_cv_int16_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 7506 "configure"
-+#line 7409 "configure"
+-#line 7518 "configure"
++#line 7421 "configure"
  #include "confdefs.h"
  #include <stdio.h>
                    #include <sys/types.h>
-@@ -7510,7 +7413,7 @@
+@@ -7522,7 +7425,7 @@
  int16_t foo = 0;
  ; return 0; }
  EOF
--if { (eval echo configure:7514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:7417: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:7526: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_int16_t=true
  else
-@@ -7532,12 +7435,12 @@
+@@ -7544,12 +7447,12 @@
    echo "$ac_t""no" 1>&6
  fi
  echo $ac_n "checking for int32_t""... $ac_c" 1>&6
--echo "configure:7536: checking for int32_t" >&5
-+echo "configure:7439: checking for int32_t" >&5
+-echo "configure:7548: checking for int32_t" >&5
++echo "configure:7451: checking for int32_t" >&5
  if eval "test \"`echo '$''{'ac_cv_int32_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 7541 "configure"
-+#line 7444 "configure"
+-#line 7553 "configure"
++#line 7456 "configure"
  #include "confdefs.h"
  #include <stdio.h>
                    #include <sys/types.h>
-@@ -7545,7 +7448,7 @@
+@@ -7557,7 +7460,7 @@
  int32_t foo = 0;
  ; return 0; }
  EOF
--if { (eval echo configure:7549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:7452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:7561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_int32_t=true
  else
-@@ -7567,12 +7470,12 @@
+@@ -7579,12 +7482,12 @@
    echo "$ac_t""no" 1>&6
  fi
  echo $ac_n "checking for int64_t""... $ac_c" 1>&6
--echo "configure:7571: checking for int64_t" >&5
-+echo "configure:7474: checking for int64_t" >&5
+-echo "configure:7583: checking for int64_t" >&5
++echo "configure:7486: checking for int64_t" >&5
  if eval "test \"`echo '$''{'ac_cv_int64_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 7576 "configure"
-+#line 7479 "configure"
+-#line 7588 "configure"
++#line 7491 "configure"
  #include "confdefs.h"
  #include <stdio.h>
                    #include <sys/types.h>
-@@ -7580,7 +7483,7 @@
+@@ -7592,7 +7495,7 @@
  int64_t foo = 0;
  ; return 0; }
  EOF
--if { (eval echo configure:7584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:7487: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:7596: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_int64_t=true
  else
-@@ -7602,12 +7505,12 @@
+@@ -7614,12 +7517,12 @@
    echo "$ac_t""no" 1>&6
  fi
  echo $ac_n "checking for int64""... $ac_c" 1>&6
--echo "configure:7606: checking for int64" >&5
-+echo "configure:7509: checking for int64" >&5
+-echo "configure:7618: checking for int64" >&5
++echo "configure:7521: checking for int64" >&5
  if eval "test \"`echo '$''{'ac_cv_int64'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 7611 "configure"
-+#line 7514 "configure"
+-#line 7623 "configure"
++#line 7526 "configure"
  #include "confdefs.h"
  #include <stdio.h>
                    #include <sys/types.h>
-@@ -7615,7 +7518,7 @@
+@@ -7627,7 +7530,7 @@
  int64 foo = 0;
  ; return 0; }
  EOF
--if { (eval echo configure:7619: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:7522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:7631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_int64=true
  else
-@@ -7637,12 +7540,12 @@
+@@ -7649,12 +7552,12 @@
    echo "$ac_t""no" 1>&6
  fi
  echo $ac_n "checking for uint""... $ac_c" 1>&6
--echo "configure:7641: checking for uint" >&5
-+echo "configure:7544: checking for uint" >&5
+-echo "configure:7653: checking for uint" >&5
++echo "configure:7556: checking for uint" >&5
  if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 7646 "configure"
-+#line 7549 "configure"
+-#line 7658 "configure"
++#line 7561 "configure"
  #include "confdefs.h"
  #include <stdio.h>
                    #include <sys/types.h>
-@@ -7650,7 +7553,7 @@
+@@ -7662,7 +7565,7 @@
  uint foo = 0;
  ; return 0; }
  EOF
--if { (eval echo configure:7654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:7557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:7666: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_uint=true
  else
-@@ -7672,12 +7575,12 @@
+@@ -7684,12 +7587,12 @@
    echo "$ac_t""no" 1>&6
  fi
  echo $ac_n "checking for uint_t""... $ac_c" 1>&6
--echo "configure:7676: checking for uint_t" >&5
-+echo "configure:7579: checking for uint_t" >&5
+-echo "configure:7688: checking for uint_t" >&5
++echo "configure:7591: checking for uint_t" >&5
  if eval "test \"`echo '$''{'ac_cv_uint_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 7681 "configure"
-+#line 7584 "configure"
+-#line 7693 "configure"
++#line 7596 "configure"
  #include "confdefs.h"
  #include <stdio.h>
                    #include <sys/types.h>
-@@ -7685,7 +7588,7 @@
+@@ -7697,7 +7600,7 @@
  uint_t foo = 0;
  ; return 0; }
  EOF
--if { (eval echo configure:7689: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:7592: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:7701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_uint_t=true
  else
-@@ -7707,12 +7610,12 @@
+@@ -7719,12 +7622,12 @@
    echo "$ac_t""no" 1>&6
  fi
  echo $ac_n "checking for uint16_t""... $ac_c" 1>&6
--echo "configure:7711: checking for uint16_t" >&5
-+echo "configure:7614: checking for uint16_t" >&5
+-echo "configure:7723: checking for uint16_t" >&5
++echo "configure:7626: checking for uint16_t" >&5
  if eval "test \"`echo '$''{'ac_cv_uint16_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 7716 "configure"
-+#line 7619 "configure"
+-#line 7728 "configure"
++#line 7631 "configure"
  #include "confdefs.h"
  #include <stdio.h>
                    #include <sys/types.h>
-@@ -7720,7 +7623,7 @@
+@@ -7732,7 +7635,7 @@
  uint16_t foo = 0;
  ; return 0; }
  EOF
--if { (eval echo configure:7724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:7627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:7736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_uint16_t=true
  else
-@@ -7751,12 +7654,12 @@
+@@ -7763,12 +7666,12 @@
  
  
  echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6
--echo "configure:7755: checking for uname.domainname" >&5
-+echo "configure:7658: checking for uname.domainname" >&5
+-echo "configure:7767: checking for uname.domainname" >&5
++echo "configure:7670: checking for uname.domainname" >&5
  if eval "test \"`echo '$''{'ac_cv_have_uname_domainname_field'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 7760 "configure"
-+#line 7663 "configure"
+-#line 7772 "configure"
++#line 7675 "configure"
  #include "confdefs.h"
  #include <sys/utsname.h>
  int main() {
-@@ -7764,7 +7667,7 @@
+@@ -7776,7 +7679,7 @@
              (void)uname(res);  if (res != 0) { domain = res->domainname; } 
  ; return 0; }
  EOF
--if { (eval echo configure:7768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:7671: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:7780: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_have_uname_domainname_field=true
  else
-@@ -7788,12 +7691,12 @@
+@@ -7800,12 +7703,12 @@
  fi
  
  echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6
--echo "configure:7792: checking for uname.__domainname" >&5
-+echo "configure:7695: checking for uname.__domainname" >&5
+-echo "configure:7804: checking for uname.__domainname" >&5
++echo "configure:7707: checking for uname.__domainname" >&5
  if eval "test \"`echo '$''{'ac_cv_have_uname_us_domainname_field'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 7797 "configure"
-+#line 7700 "configure"
+-#line 7809 "configure"
++#line 7712 "configure"
  #include "confdefs.h"
  #include <sys/utsname.h>
  int main() {
-@@ -7801,7 +7704,7 @@
+@@ -7813,7 +7716,7 @@
              (void)uname(res);  if (res != 0) { domain = res->__domainname; } 
  ; return 0; }
  EOF
--if { (eval echo configure:7805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:7708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:7817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7720: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_have_uname_us_domainname_field=true
  else
-@@ -7834,12 +7737,12 @@
+@@ -7846,12 +7749,12 @@
  
  
  echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6
--echo "configure:7838: checking for usable wchar_t (2 bytes, unsigned)" >&5
-+echo "configure:7741: checking for usable wchar_t (2 bytes, unsigned)" >&5
+-echo "configure:7850: checking for usable wchar_t (2 bytes, unsigned)" >&5
++echo "configure:7753: checking for usable wchar_t (2 bytes, unsigned)" >&5
  if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_v2'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 7843 "configure"
-+#line 7746 "configure"
+-#line 7855 "configure"
++#line 7758 "configure"
  #include "confdefs.h"
  #include <stddef.h>
                       $configure_static_assert_macros
-@@ -7848,7 +7751,7 @@
+@@ -7860,7 +7763,7 @@
                       CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0)
  ; return 0; }
  EOF
--if { (eval echo configure:7852: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:7755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:7864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7767: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_have_usable_wchar_v2="yes"
  else
-@@ -7881,12 +7784,12 @@
+@@ -7893,12 +7796,12 @@
      CXXFLAGS="$CXXFLAGS -fshort-wchar"
  
      echo $ac_n "checking for compiler -fshort-wchar option""... $ac_c" 1>&6
--echo "configure:7885: checking for compiler -fshort-wchar option" >&5
-+echo "configure:7788: checking for compiler -fshort-wchar option" >&5
+-echo "configure:7897: checking for compiler -fshort-wchar option" >&5
++echo "configure:7800: checking for compiler -fshort-wchar option" >&5
  if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_option_v2'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 7890 "configure"
-+#line 7793 "configure"
+-#line 7902 "configure"
++#line 7805 "configure"
  #include "confdefs.h"
  #include <stddef.h>
                           $configure_static_assert_macros
-@@ -7895,7 +7798,7 @@
+@@ -7907,7 +7810,7 @@
                           CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0)
  ; return 0; }
  EOF
--if { (eval echo configure:7899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:7802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:7911: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7814: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_have_usable_wchar_option_v2="yes"
  else
-@@ -7929,7 +7832,7 @@
+@@ -7941,7 +7844,7 @@
  
  if test "$GNU_CC"; then
    echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6
--echo "configure:7933: checking for visibility(hidden) attribute" >&5
-+echo "configure:7836: checking for visibility(hidden) attribute" >&5
+-echo "configure:7945: checking for visibility(hidden) attribute" >&5
++echo "configure:7848: checking for visibility(hidden) attribute" >&5
  if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -7954,7 +7857,7 @@
+@@ -7966,7 +7869,7 @@
  
  
      echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6
--echo "configure:7958: checking for visibility(default) attribute" >&5
-+echo "configure:7861: checking for visibility(default) attribute" >&5
+-echo "configure:7970: checking for visibility(default) attribute" >&5
++echo "configure:7873: checking for visibility(default) attribute" >&5
  if eval "test \"`echo '$''{'ac_cv_visibility_default'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -7979,7 +7882,7 @@
+@@ -7991,7 +7894,7 @@
  
  
        echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6
--echo "configure:7983: checking for visibility pragma support" >&5
-+echo "configure:7886: checking for visibility pragma support" >&5
+-echo "configure:7995: checking for visibility pragma support" >&5
++echo "configure:7898: checking for visibility pragma support" >&5
  if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -8004,7 +7907,7 @@
+@@ -8016,7 +7919,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
--echo "configure:8008: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5
-+echo "configure:7911: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5
+-echo "configure:8020: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5
++echo "configure:7923: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5
  if eval "test \"`echo '$''{'ac_cv_have_visibility_class_bug'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -8032,7 +7935,7 @@
+@@ -8044,7 +7947,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
--echo "configure:8036: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5
-+echo "configure:7939: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5
+-echo "configure:8048: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5
++echo "configure:7951: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5
  if eval "test \"`echo '$''{'ac_cv_have_visibility_builtin_bug'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -8080,12 +7983,12 @@
+@@ -8092,12 +7995,12 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
--echo "configure:8084: checking for $ac_hdr that defines DIR" >&5
-+echo "configure:7987: checking for $ac_hdr that defines DIR" >&5
+-echo "configure:8096: checking for $ac_hdr that defines DIR" >&5
++echo "configure:7999: checking for $ac_hdr that defines DIR" >&5
  if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 8089 "configure"
-+#line 7992 "configure"
+-#line 8101 "configure"
++#line 8004 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <$ac_hdr>
-@@ -8093,7 +7996,7 @@
+@@ -8105,7 +8008,7 @@
  DIR *dirp = 0;
  ; return 0; }
  EOF
--if { (eval echo configure:8097: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:8000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:8109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    eval "ac_cv_header_dirent_$ac_safe=yes"
  else
-@@ -8118,7 +8021,7 @@
+@@ -8130,7 +8033,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
--echo "configure:8122: checking for opendir in -ldir" >&5
-+echo "configure:8025: checking for opendir in -ldir" >&5
+-echo "configure:8134: checking for opendir in -ldir" >&5
++echo "configure:8037: checking for opendir in -ldir" >&5
  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
-@@ -8126,7 +8029,7 @@
+@@ -8138,7 +8041,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-ldir  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 8130 "configure"
-+#line 8033 "configure"
+-#line 8142 "configure"
++#line 8045 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -8137,7 +8040,7 @@
+@@ -8149,7 +8052,7 @@
  opendir()
  ; return 0; }
  EOF
--if { (eval echo configure:8141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:8153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -8159,7 +8062,7 @@
+@@ -8171,7 +8074,7 @@
  
  else
  echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
--echo "configure:8163: checking for opendir in -lx" >&5
-+echo "configure:8066: checking for opendir in -lx" >&5
+-echo "configure:8175: checking for opendir in -lx" >&5
++echo "configure:8078: checking for opendir in -lx" >&5
  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
-@@ -8167,7 +8070,7 @@
+@@ -8179,7 +8082,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lx  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 8171 "configure"
-+#line 8074 "configure"
+-#line 8183 "configure"
++#line 8086 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -8178,7 +8081,7 @@
+@@ -8190,7 +8093,7 @@
  opendir()
  ; return 0; }
  EOF
--if { (eval echo configure:8182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:8194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -8210,17 +8113,17 @@
+@@ -8222,17 +8125,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:8214: checking for $ac_hdr" >&5
-+echo "configure:8117: checking for $ac_hdr" >&5
+-echo "configure:8226: checking for $ac_hdr" >&5
++echo "configure:8129: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 8219 "configure"
-+#line 8122 "configure"
+-#line 8231 "configure"
++#line 8134 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:8224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:8127: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:8236: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8250,17 +8153,17 @@
+@@ -8262,17 +8165,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:8254: checking for $ac_hdr" >&5
-+echo "configure:8157: checking for $ac_hdr" >&5
+-echo "configure:8266: checking for $ac_hdr" >&5
++echo "configure:8169: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 8259 "configure"
-+#line 8162 "configure"
+-#line 8271 "configure"
++#line 8174 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:8264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:8167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:8276: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8290,17 +8193,17 @@
+@@ -8302,17 +8205,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:8294: checking for $ac_hdr" >&5
-+echo "configure:8197: checking for $ac_hdr" >&5
+-echo "configure:8306: checking for $ac_hdr" >&5
++echo "configure:8209: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 8299 "configure"
-+#line 8202 "configure"
+-#line 8311 "configure"
++#line 8214 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:8304: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:8207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:8316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8330,17 +8233,17 @@
+@@ -8342,17 +8245,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:8334: checking for $ac_hdr" >&5
-+echo "configure:8237: checking for $ac_hdr" >&5
+-echo "configure:8346: checking for $ac_hdr" >&5
++echo "configure:8249: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 8339 "configure"
-+#line 8242 "configure"
+-#line 8351 "configure"
++#line 8254 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:8344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:8247: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:8356: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8370,17 +8273,17 @@
+@@ -8382,17 +8285,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:8374: checking for $ac_hdr" >&5
-+echo "configure:8277: checking for $ac_hdr" >&5
+-echo "configure:8386: checking for $ac_hdr" >&5
++echo "configure:8289: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 8379 "configure"
-+#line 8282 "configure"
+-#line 8391 "configure"
++#line 8294 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:8384: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:8287: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:8396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8299: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8411,17 +8314,17 @@
+@@ -8423,17 +8326,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:8415: checking for $ac_hdr" >&5
-+echo "configure:8318: checking for $ac_hdr" >&5
+-echo "configure:8427: checking for $ac_hdr" >&5
++echo "configure:8330: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 8420 "configure"
-+#line 8323 "configure"
+-#line 8432 "configure"
++#line 8335 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:8425: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:8328: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:8437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8452,17 +8355,17 @@
+@@ -8464,17 +8367,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:8456: checking for $ac_hdr" >&5
-+echo "configure:8359: checking for $ac_hdr" >&5
+-echo "configure:8468: checking for $ac_hdr" >&5
++echo "configure:8371: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 8461 "configure"
-+#line 8364 "configure"
+-#line 8473 "configure"
++#line 8376 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:8466: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:8369: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:8478: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8499,17 +8402,17 @@
+@@ -8511,17 +8414,17 @@
  NEW_H=new.h
  ac_safe=`echo "new" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for new""... $ac_c" 1>&6
--echo "configure:8503: checking for new" >&5
-+echo "configure:8406: checking for new" >&5
+-echo "configure:8515: checking for new" >&5
++echo "configure:8418: checking for new" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 8508 "configure"
-+#line 8411 "configure"
+-#line 8520 "configure"
++#line 8423 "configure"
  #include "confdefs.h"
  #include <new>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:8513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:8416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:8525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8550,17 +8453,17 @@
+@@ -8562,17 +8465,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:8554: checking for $ac_hdr" >&5
-+echo "configure:8457: checking for $ac_hdr" >&5
+-echo "configure:8566: checking for $ac_hdr" >&5
++echo "configure:8469: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 8559 "configure"
-+#line 8462 "configure"
+-#line 8571 "configure"
++#line 8474 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:8564: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:8467: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:8576: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8479: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8594,7 +8497,7 @@
+@@ -8606,7 +8509,7 @@
  	;;
  *)
  	echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6
--echo "configure:8598: checking for gethostbyname_r in -lc_r" >&5
-+echo "configure:8501: checking for gethostbyname_r in -lc_r" >&5
+-echo "configure:8610: checking for gethostbyname_r in -lc_r" >&5
++echo "configure:8513: checking for gethostbyname_r in -lc_r" >&5
  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
-@@ -8602,7 +8505,7 @@
+@@ -8614,7 +8517,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lc_r  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 8606 "configure"
-+#line 8509 "configure"
+-#line 8618 "configure"
++#line 8521 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -8613,7 +8516,7 @@
+@@ -8625,7 +8528,7 @@
  gethostbyname_r()
  ; return 0; }
  EOF
--if { (eval echo configure:8617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:8629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -8643,7 +8546,7 @@
+@@ -8655,7 +8558,7 @@
  	;;
  esac
  echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6
--echo "configure:8647: checking for atan in -lm" >&5
-+echo "configure:8550: checking for atan in -lm" >&5
+-echo "configure:8659: checking for atan in -lm" >&5
++echo "configure:8562: checking for atan in -lm" >&5
  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
-@@ -8651,7 +8554,7 @@
+@@ -8663,7 +8566,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lm  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 8655 "configure"
-+#line 8558 "configure"
+-#line 8667 "configure"
++#line 8570 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -8662,7 +8565,7 @@
+@@ -8674,7 +8577,7 @@
  atan()
  ; return 0; }
  EOF
--if { (eval echo configure:8666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:8678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -8696,7 +8599,7 @@
+@@ -8708,7 +8611,7 @@
  	;;
  *)
  	echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
--echo "configure:8700: checking for dlopen in -ldl" >&5
-+echo "configure:8603: checking for dlopen in -ldl" >&5
+-echo "configure:8712: checking for dlopen in -ldl" >&5
++echo "configure:8615: checking for dlopen in -ldl" >&5
  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
-@@ -8704,7 +8607,7 @@
+@@ -8716,7 +8619,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 8708 "configure"
-+#line 8611 "configure"
+-#line 8720 "configure"
++#line 8623 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -8715,7 +8618,7 @@
+@@ -8727,7 +8630,7 @@
  dlopen()
  ; return 0; }
  EOF
--if { (eval echo configure:8719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:8731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -8732,17 +8635,17 @@
+@@ -8744,17 +8647,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
--echo "configure:8736: checking for dlfcn.h" >&5
-+echo "configure:8639: checking for dlfcn.h" >&5
+-echo "configure:8748: checking for dlfcn.h" >&5
++echo "configure:8651: checking for dlfcn.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 8741 "configure"
-+#line 8644 "configure"
+-#line 8753 "configure"
++#line 8656 "configure"
  #include "confdefs.h"
  #include <dlfcn.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:8746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:8649: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:8758: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -8778,7 +8681,7 @@
+@@ -8790,7 +8693,7 @@
      case $target in
      *-aix*)
  	echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6
--echo "configure:8782: checking for demangle in -lC_r" >&5
-+echo "configure:8685: checking for demangle in -lC_r" >&5
+-echo "configure:8794: checking for demangle in -lC_r" >&5
++echo "configure:8697: checking for demangle in -lC_r" >&5
  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
-@@ -8786,7 +8689,7 @@
+@@ -8798,7 +8701,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lC_r  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 8790 "configure"
-+#line 8693 "configure"
+-#line 8802 "configure"
++#line 8705 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -8797,7 +8700,7 @@
+@@ -8809,7 +8712,7 @@
  demangle()
  ; return 0; }
  EOF
--if { (eval echo configure:8801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:8813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -8827,7 +8730,7 @@
+@@ -8839,7 +8742,7 @@
  	;;
       *)
  	echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6
--echo "configure:8831: checking for demangle in -lC" >&5
-+echo "configure:8734: checking for demangle in -lC" >&5
+-echo "configure:8843: checking for demangle in -lC" >&5
++echo "configure:8746: checking for demangle in -lC" >&5
  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
-@@ -8835,7 +8738,7 @@
+@@ -8847,7 +8750,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lC  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 8839 "configure"
-+#line 8742 "configure"
+-#line 8851 "configure"
++#line 8754 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -8846,7 +8749,7 @@
+@@ -8858,7 +8761,7 @@
  demangle()
  ; return 0; }
  EOF
--if { (eval echo configure:8850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:8862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -8877,7 +8780,7 @@
+@@ -8889,7 +8792,7 @@
       esac
  fi
  echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
--echo "configure:8881: checking for socket in -lsocket" >&5
-+echo "configure:8784: checking for socket in -lsocket" >&5
+-echo "configure:8893: checking for socket in -lsocket" >&5
++echo "configure:8796: checking for socket in -lsocket" >&5
  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
-@@ -8885,7 +8788,7 @@
+@@ -8897,7 +8800,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 8889 "configure"
-+#line 8792 "configure"
+-#line 8901 "configure"
++#line 8804 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -8896,7 +8799,7 @@
+@@ -8908,7 +8811,7 @@
  socket()
  ; return 0; }
  EOF
--if { (eval echo configure:8900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:8912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -8941,7 +8844,7 @@
+@@ -8953,7 +8856,7 @@
  	_SAVE_LDFLAGS="$LDFLAGS"
  	LDFLAGS="$XLDFLAGS $LDFLAGS"
  	echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6
--echo "configure:8945: checking for XDrawLines in -lX11" >&5
-+echo "configure:8848: checking for XDrawLines in -lX11" >&5
+-echo "configure:8957: checking for XDrawLines in -lX11" >&5
++echo "configure:8860: checking for XDrawLines in -lX11" >&5
  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
-@@ -8949,7 +8852,7 @@
+@@ -8961,7 +8864,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lX11 $XLIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 8953 "configure"
-+#line 8856 "configure"
+-#line 8965 "configure"
++#line 8868 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -8960,7 +8863,7 @@
+@@ -8972,7 +8875,7 @@
  XDrawLines()
  ; return 0; }
  EOF
--if { (eval echo configure:8964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:8976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -8982,7 +8885,7 @@
+@@ -8994,7 +8897,7 @@
  fi
  
  	echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6
--echo "configure:8986: checking for XextAddDisplay in -lXext" >&5
-+echo "configure:8889: checking for XextAddDisplay in -lXext" >&5
+-echo "configure:8998: checking for XextAddDisplay in -lXext" >&5
++echo "configure:8901: checking for XextAddDisplay in -lXext" >&5
  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
-@@ -8990,7 +8893,7 @@
+@@ -9002,7 +8905,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXext $XLIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 8994 "configure"
-+#line 8897 "configure"
+-#line 9006 "configure"
++#line 8909 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -9001,7 +8904,7 @@
+@@ -9013,7 +8916,7 @@
  XextAddDisplay()
  ; return 0; }
  EOF
--if { (eval echo configure:9005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:9017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -9025,7 +8928,7 @@
+@@ -9037,7 +8940,7 @@
     
       
  	echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6
--echo "configure:9029: checking for XtFree in -lXt" >&5
-+echo "configure:8932: checking for XtFree in -lXt" >&5
+-echo "configure:9041: checking for XtFree in -lXt" >&5
++echo "configure:8944: checking for XtFree in -lXt" >&5
  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
-@@ -9033,7 +8936,7 @@
+@@ -9045,7 +8948,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXt  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 9037 "configure"
-+#line 8940 "configure"
+-#line 9049 "configure"
++#line 8952 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -9044,7 +8947,7 @@
+@@ -9056,7 +8959,7 @@
  XtFree()
  ; return 0; }
  EOF
--if { (eval echo configure:9048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:9060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -9065,7 +8968,7 @@
+@@ -9077,7 +8980,7 @@
  
          unset ac_cv_lib_Xt_XtFree
  	    echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6
--echo "configure:9069: checking for IceFlush in -lICE" >&5
-+echo "configure:8972: checking for IceFlush in -lICE" >&5
+-echo "configure:9081: checking for IceFlush in -lICE" >&5
++echo "configure:8984: checking for IceFlush in -lICE" >&5
  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
-@@ -9073,7 +8976,7 @@
+@@ -9085,7 +8988,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lICE $XT_LIBS $XLIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 9077 "configure"
-+#line 8980 "configure"
+-#line 9089 "configure"
++#line 8992 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -9084,7 +8987,7 @@
+@@ -9096,7 +8999,7 @@
  IceFlush()
  ; return 0; }
  EOF
--if { (eval echo configure:9088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:9100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -9105,7 +9008,7 @@
+@@ -9117,7 +9020,7 @@
  fi
  
  	    echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6
--echo "configure:9109: checking for SmcCloseConnection in -lSM" >&5
-+echo "configure:9012: checking for SmcCloseConnection in -lSM" >&5
+-echo "configure:9121: checking for SmcCloseConnection in -lSM" >&5
++echo "configure:9024: checking for SmcCloseConnection in -lSM" >&5
  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
-@@ -9113,7 +9016,7 @@
+@@ -9125,7 +9028,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lSM $XT_LIBS $XLIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 9117 "configure"
-+#line 9020 "configure"
+-#line 9129 "configure"
++#line 9032 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -9124,7 +9027,7 @@
+@@ -9136,7 +9039,7 @@
  SmcCloseConnection()
  ; return 0; }
  EOF
--if { (eval echo configure:9128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:9140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -9145,7 +9048,7 @@
+@@ -9157,7 +9060,7 @@
  fi
   
          echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6
--echo "configure:9149: checking for XtFree in -lXt" >&5
-+echo "configure:9052: checking for XtFree in -lXt" >&5
+-echo "configure:9161: checking for XtFree in -lXt" >&5
++echo "configure:9064: checking for XtFree in -lXt" >&5
  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
-@@ -9153,7 +9056,7 @@
+@@ -9165,7 +9068,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXt $X_PRE_LIBS $XT_LIBS $XLIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 9157 "configure"
-+#line 9060 "configure"
+-#line 9169 "configure"
++#line 9072 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -9164,7 +9067,7 @@
+@@ -9176,7 +9079,7 @@
  XtFree()
  ; return 0; }
  EOF
--if { (eval echo configure:9168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:9180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -9198,7 +9101,7 @@
+@@ -9210,7 +9113,7 @@
      esac
  
                  echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6
--echo "configure:9202: checking for XineramaIsActive in -lXinerama" >&5
-+echo "configure:9105: checking for XineramaIsActive in -lXinerama" >&5
+-echo "configure:9214: checking for XineramaIsActive in -lXinerama" >&5
++echo "configure:9117: checking for XineramaIsActive in -lXinerama" >&5
  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
-@@ -9206,7 +9109,7 @@
+@@ -9218,7 +9121,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXinerama $XLIBS $XEXT_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 9210 "configure"
-+#line 9113 "configure"
+-#line 9222 "configure"
++#line 9125 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -9217,7 +9120,7 @@
+@@ -9229,7 +9132,7 @@
  XineramaIsActive()
  ; return 0; }
  EOF
--if { (eval echo configure:9221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:9233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -9239,17 +9142,17 @@
+@@ -9251,17 +9154,17 @@
  
      ac_safe=`echo "X11/extensions/Xinerama.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for X11/extensions/Xinerama.h""... $ac_c" 1>&6
--echo "configure:9243: checking for X11/extensions/Xinerama.h" >&5
-+echo "configure:9146: checking for X11/extensions/Xinerama.h" >&5
+-echo "configure:9255: checking for X11/extensions/Xinerama.h" >&5
++echo "configure:9158: checking for X11/extensions/Xinerama.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 9248 "configure"
-+#line 9151 "configure"
+-#line 9260 "configure"
++#line 9163 "configure"
  #include "confdefs.h"
  #include <X11/extensions/Xinerama.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:9253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:9156: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:9265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:9168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -9272,7 +9175,7 @@
+@@ -9284,7 +9187,7 @@
  
  
                  echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6
--echo "configure:9276: checking for XShmCreateImage in -lXext" >&5
-+echo "configure:9179: checking for XShmCreateImage in -lXext" >&5
+-echo "configure:9288: checking for XShmCreateImage in -lXext" >&5
++echo "configure:9191: checking for XShmCreateImage in -lXext" >&5
  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
-@@ -9280,7 +9183,7 @@
+@@ -9292,7 +9195,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXext $XLIBS $XEXT_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 9284 "configure"
-+#line 9187 "configure"
+-#line 9296 "configure"
++#line 9199 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -9291,7 +9194,7 @@
+@@ -9303,7 +9206,7 @@
  XShmCreateImage()
  ; return 0; }
  EOF
--if { (eval echo configure:9295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:9307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -9313,17 +9216,17 @@
+@@ -9325,17 +9228,17 @@
  
      ac_safe=`echo "X11/extensions/XShm.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for X11/extensions/XShm.h""... $ac_c" 1>&6
--echo "configure:9317: checking for X11/extensions/XShm.h" >&5
-+echo "configure:9220: checking for X11/extensions/XShm.h" >&5
+-echo "configure:9329: checking for X11/extensions/XShm.h" >&5
++echo "configure:9232: checking for X11/extensions/XShm.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 9322 "configure"
-+#line 9225 "configure"
+-#line 9334 "configure"
++#line 9237 "configure"
  #include "confdefs.h"
  #include <X11/extensions/XShm.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:9327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:9230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:9339: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:9242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -9353,7 +9256,7 @@
+@@ -9365,7 +9268,7 @@
      fi
  
                  echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6
--echo "configure:9357: checking for XieFloGeometry in -lXIE" >&5
-+echo "configure:9260: checking for XieFloGeometry in -lXIE" >&5
+-echo "configure:9369: checking for XieFloGeometry in -lXIE" >&5
++echo "configure:9272: checking for XieFloGeometry in -lXIE" >&5
  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
-@@ -9361,7 +9264,7 @@
+@@ -9373,7 +9276,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXIE $XLIBS $XEXT_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 9365 "configure"
-+#line 9268 "configure"
+-#line 9377 "configure"
++#line 9280 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -9372,7 +9275,7 @@
+@@ -9384,7 +9287,7 @@
  XieFloGeometry()
  ; return 0; }
  EOF
--if { (eval echo configure:9376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:9388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -9394,17 +9297,17 @@
+@@ -9406,17 +9309,17 @@
  
      ac_safe=`echo "X11/extensions/XIElib.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for X11/extensions/XIElib.h""... $ac_c" 1>&6
--echo "configure:9398: checking for X11/extensions/XIElib.h" >&5
-+echo "configure:9301: checking for X11/extensions/XIElib.h" >&5
+-echo "configure:9410: checking for X11/extensions/XIElib.h" >&5
++echo "configure:9313: checking for X11/extensions/XIElib.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 9403 "configure"
-+#line 9306 "configure"
+-#line 9415 "configure"
++#line 9318 "configure"
  #include "confdefs.h"
  #include <X11/extensions/XIElib.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:9408: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:9311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:9420: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:9323: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -9478,7 +9381,7 @@
+@@ -9490,7 +9393,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
--echo "configure:9482: checking for $ac_word" >&5
-+echo "configure:9385: checking for $ac_word" >&5
+-echo "configure:9494: checking for $ac_word" >&5
++echo "configure:9397: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_FT2_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -9514,7 +9417,7 @@
+@@ -9526,7 +9429,7 @@
  
  min_ft_version=6.1.0
  echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6
--echo "configure:9518: checking for FreeType - version >= $min_ft_version" >&5
-+echo "configure:9421: checking for FreeType - version >= $min_ft_version" >&5
+-echo "configure:9530: checking for FreeType - version >= $min_ft_version" >&5
++echo "configure:9433: checking for FreeType - version >= $min_ft_version" >&5
  no_ft=""
  if test "$FT2_CONFIG" = "no" ; then
    no_ft=yes
-@@ -9562,7 +9465,7 @@
+@@ -9574,7 +9477,7 @@
    echo $ac_n "cross compiling; assumed OK... $ac_c"
  else
    cat > conftest.$ac_ext <<EOF
--#line 9566 "configure"
-+#line 9469 "configure"
+-#line 9578 "configure"
++#line 9481 "configure"
  #include "confdefs.h"
  
  #include <ft2build.h>
-@@ -9588,7 +9491,7 @@
+@@ -9600,7 +9503,7 @@
  }
  
  EOF
--if { (eval echo configure:9592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:9495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:9604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:9507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    :
  else
-@@ -9640,7 +9543,7 @@
+@@ -9652,7 +9555,7 @@
  
  
  echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
--echo "configure:9644: checking for pthread_create in -lpthreads" >&5
-+echo "configure:9547: checking for pthread_create in -lpthreads" >&5
+-echo "configure:9656: checking for pthread_create in -lpthreads" >&5
++echo "configure:9559: checking for pthread_create in -lpthreads" >&5
  echo "
      #include <pthread.h> 
      void *foo(void *v) { int a = 1;  } 
-@@ -9662,7 +9565,7 @@
+@@ -9674,7 +9577,7 @@
          echo "$ac_t""no" 1>&6
          
  echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
--echo "configure:9666: checking for pthread_create in -lpthread" >&5
-+echo "configure:9569: checking for pthread_create in -lpthread" >&5
+-echo "configure:9678: checking for pthread_create in -lpthread" >&5
++echo "configure:9581: checking for pthread_create in -lpthread" >&5
  echo "
      #include <pthread.h> 
      void *foo(void *v) { int a = 1;  } 
-@@ -9684,7 +9587,7 @@
+@@ -9696,7 +9599,7 @@
          echo "$ac_t""no" 1>&6
          
  echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
--echo "configure:9688: checking for pthread_create in -lc_r" >&5
-+echo "configure:9591: checking for pthread_create in -lc_r" >&5
+-echo "configure:9700: checking for pthread_create in -lc_r" >&5
++echo "configure:9603: checking for pthread_create in -lc_r" >&5
  echo "
      #include <pthread.h> 
      void *foo(void *v) { int a = 1;  } 
-@@ -9706,7 +9609,7 @@
+@@ -9718,7 +9621,7 @@
          echo "$ac_t""no" 1>&6
          
  echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
--echo "configure:9710: checking for pthread_create in -lc" >&5
-+echo "configure:9613: checking for pthread_create in -lc" >&5
+-echo "configure:9722: checking for pthread_create in -lc" >&5
++echo "configure:9625: checking for pthread_create in -lc" >&5
  echo "
      #include <pthread.h> 
      void *foo(void *v) { int a = 1;  } 
-@@ -9762,7 +9665,7 @@
+@@ -9774,7 +9677,7 @@
  				rm -f conftest*
  	ac_cv_have_dash_pthread=no
  	echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6
--echo "configure:9766: checking whether ${CC-cc} accepts -pthread" >&5
-+echo "configure:9669: checking whether ${CC-cc} accepts -pthread" >&5
+-echo "configure:9778: checking whether ${CC-cc} accepts -pthread" >&5
++echo "configure:9681: checking whether ${CC-cc} accepts -pthread" >&5
  	echo 'int main() { return 0; }' | cat > conftest.c
  	${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1
  	if test $? -eq 0; then
-@@ -9785,7 +9688,7 @@
+@@ -9797,7 +9700,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
--echo "configure:9789: checking whether ${CC-cc} accepts -pthreads" >&5
-+echo "configure:9692: checking whether ${CC-cc} accepts -pthreads" >&5
+-echo "configure:9801: checking whether ${CC-cc} accepts -pthreads" >&5
++echo "configure:9704: checking whether ${CC-cc} accepts -pthreads" >&5
      	echo 'int main() { return 0; }' | cat > conftest.c
  	    ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1
      	if test $? -eq 0; then
-@@ -9907,7 +9810,7 @@
+@@ -9919,7 +9822,7 @@
  
  
  echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6
--echo "configure:9911: checking whether mmap() sees write()s" >&5
-+echo "configure:9814: checking whether mmap() sees write()s" >&5
+-echo "configure:9923: checking whether mmap() sees write()s" >&5
++echo "configure:9826: checking whether mmap() sees write()s" >&5
  
  
  mmap_test_prog='
-@@ -9946,11 +9849,11 @@
+@@ -9958,11 +9861,11 @@
    result="yes"
  else
    cat > conftest.$ac_ext <<EOF
--#line 9950 "configure"
-+#line 9853 "configure"
+-#line 9962 "configure"
++#line 9865 "configure"
  #include "confdefs.h"
  $mmap_test_prog 
  EOF
--if { (eval echo configure:9954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:9857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:9966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:9869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    result="yes"
  else
-@@ -9975,13 +9878,13 @@
+@@ -9987,13 +9890,13 @@
  
  if test $ac_cv_prog_gcc = yes; then
      echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
--echo "configure:9979: checking whether ${CC-cc} needs -traditional" >&5
-+echo "configure:9882: checking whether ${CC-cc} needs -traditional" >&5
+-echo "configure:9991: checking whether ${CC-cc} needs -traditional" >&5
++echo "configure:9894: checking whether ${CC-cc} needs -traditional" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
      ac_pattern="Autoconf.*'x'"
    cat > conftest.$ac_ext <<EOF
--#line 9985 "configure"
-+#line 9888 "configure"
+-#line 9997 "configure"
++#line 9900 "configure"
  #include "confdefs.h"
  #include <sgtty.h>
  Autoconf TIOCGETP
-@@ -9999,7 +9902,7 @@
+@@ -10011,7 +9914,7 @@
  
    if test $ac_cv_prog_gcc_traditional = no; then
      cat > conftest.$ac_ext <<EOF
--#line 10003 "configure"
-+#line 9906 "configure"
+-#line 10015 "configure"
++#line 9918 "configure"
  #include "confdefs.h"
  #include <termio.h>
  Autoconf TCGETA
-@@ -10021,7 +9924,7 @@
+@@ -10033,7 +9936,7 @@
  fi
  
  echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
--echo "configure:10025: checking for 8-bit clean memcmp" >&5
-+echo "configure:9928: checking for 8-bit clean memcmp" >&5
+-echo "configure:10037: checking for 8-bit clean memcmp" >&5
++echo "configure:9940: checking for 8-bit clean memcmp" >&5
  if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -10029,7 +9932,7 @@
+@@ -10041,7 +9944,7 @@
    ac_cv_func_memcmp_clean=no
  else
    cat > conftest.$ac_ext <<EOF
--#line 10033 "configure"
-+#line 9936 "configure"
+-#line 10045 "configure"
++#line 9948 "configure"
  #include "confdefs.h"
  
  main()
-@@ -10039,7 +9942,7 @@
+@@ -10051,7 +9954,7 @@
  }
  
  EOF
--if { (eval echo configure:10043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:9946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:10055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:9958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_memcmp_clean=yes
  else
-@@ -10059,12 +9962,12 @@
+@@ -10071,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
--echo "configure:10063: checking for $ac_func" >&5
-+echo "configure:9966: checking for $ac_func" >&5
+-echo "configure:10075: checking for $ac_func" >&5
++echo "configure:9978: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 10068 "configure"
-+#line 9971 "configure"
+-#line 10080 "configure"
++#line 9983 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -10087,7 +9990,7 @@
+@@ -10099,7 +10002,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:10091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:10103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -10114,12 +10017,12 @@
+@@ -10126,12 +10029,12 @@
  for ac_func in flockfile getpagesize
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:10118: checking for $ac_func" >&5
-+echo "configure:10021: checking for $ac_func" >&5
+-echo "configure:10130: checking for $ac_func" >&5
++echo "configure:10033: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 10123 "configure"
-+#line 10026 "configure"
+-#line 10135 "configure"
++#line 10038 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -10142,7 +10045,7 @@
+@@ -10154,7 +10057,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:10146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:10158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -10171,12 +10074,12 @@
+@@ -10183,12 +10086,12 @@
    for ac_func in localtime_r strtok_r
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:10175: checking for $ac_func" >&5
-+echo "configure:10078: checking for $ac_func" >&5
+-echo "configure:10187: checking for $ac_func" >&5
++echo "configure:10090: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 10180 "configure"
-+#line 10083 "configure"
+-#line 10192 "configure"
++#line 10095 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -10199,7 +10102,7 @@
+@@ -10211,7 +10114,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:10203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:10215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -10235,19 +10138,19 @@
+@@ -10247,19 +10150,19 @@
  cross_compiling=$ac_cv_prog_cxx_cross
  
  echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6
--echo "configure:10239: checking for wcrtomb" >&5
-+echo "configure:10142: checking for wcrtomb" >&5
+-echo "configure:10251: checking for wcrtomb" >&5
++echo "configure:10154: checking for wcrtomb" >&5
  if eval "test \"`echo '$''{'ac_cv_have_wcrtomb'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 10244 "configure"
-+#line 10147 "configure"
+-#line 10256 "configure"
++#line 10159 "configure"
  #include "confdefs.h"
  #include <wchar.h>
  int main() {
  mbstate_t ps={0};wcrtomb(0,'f',&ps);
  ; return 0; }
  EOF
--if { (eval echo configure:10251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:10263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_have_wcrtomb="yes"
  else
-@@ -10267,19 +10170,19 @@
+@@ -10279,19 +10182,19 @@
  
  fi
  echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6
--echo "configure:10271: checking for mbrtowc" >&5
-+echo "configure:10174: checking for mbrtowc" >&5
+-echo "configure:10283: checking for mbrtowc" >&5
++echo "configure:10186: checking for mbrtowc" >&5
  if eval "test \"`echo '$''{'ac_cv_have_mbrtowc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 10276 "configure"
-+#line 10179 "configure"
+-#line 10288 "configure"
++#line 10191 "configure"
  #include "confdefs.h"
  #include <wchar.h>
  int main() {
  mbstate_t ps={0};mbrtowc(0,0,0,&ps);
  ; return 0; }
  EOF
--if { (eval echo configure:10283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:10295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_have_mbrtowc="yes"
  else
-@@ -10308,12 +10211,12 @@
+@@ -10320,12 +10223,12 @@
  fi
  
  echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6
--echo "configure:10312: checking for res_ninit()" >&5
-+echo "configure:10215: checking for res_ninit()" >&5
+-echo "configure:10324: checking for res_ninit()" >&5
++echo "configure:10227: checking for res_ninit()" >&5
  if eval "test \"`echo '$''{'ac_cv_func_res_ninit'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 10317 "configure"
-+#line 10220 "configure"
+-#line 10329 "configure"
++#line 10232 "configure"
  #include "confdefs.h"
  
          #ifdef linux
-@@ -10325,7 +10228,7 @@
+@@ -10337,7 +10240,7 @@
  int foo = res_ninit(&_res);
  ; return 0; }
  EOF
--if { (eval echo configure:10329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:10341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_func_res_ninit=yes
  else
-@@ -10355,12 +10258,12 @@
+@@ -10367,12 +10270,12 @@
  cross_compiling=$ac_cv_prog_cxx_cross
  
  echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6
--echo "configure:10359: checking for gnu_get_libc_version()" >&5
-+echo "configure:10262: checking for gnu_get_libc_version()" >&5
+-echo "configure:10371: checking for gnu_get_libc_version()" >&5
++echo "configure:10274: checking for gnu_get_libc_version()" >&5
  if eval "test \"`echo '$''{'ac_cv_func_gnu_get_libc_version'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 10364 "configure"
-+#line 10267 "configure"
+-#line 10376 "configure"
++#line 10279 "configure"
  #include "confdefs.h"
  
          #ifdef HAVE_GNU_LIBC_VERSION_H
-@@ -10371,7 +10274,7 @@
+@@ -10383,7 +10286,7 @@
  const char *glibc_version = gnu_get_libc_version();
  ; return 0; }
  EOF
--if { (eval echo configure:10375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:10387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_func_gnu_get_libc_version=yes
  else
-@@ -10400,7 +10303,7 @@
+@@ -10412,7 +10315,7 @@
      *)
      
  echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6
--echo "configure:10404: checking for iconv in -lc" >&5
-+echo "configure:10307: checking for iconv in -lc" >&5
+-echo "configure:10416: checking for iconv in -lc" >&5
++echo "configure:10319: checking for iconv in -lc" >&5
  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
-@@ -10408,7 +10311,7 @@
+@@ -10420,7 +10323,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lc  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 10412 "configure"
-+#line 10315 "configure"
+-#line 10424 "configure"
++#line 10327 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
-@@ -10422,7 +10325,7 @@
+@@ -10434,7 +10337,7 @@
  iconv()
  ; return 0; }
  EOF
--if { (eval echo configure:10426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:10438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -10441,7 +10344,7 @@
+@@ -10453,7 +10356,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
--echo "configure:10445: checking for iconv in -liconv" >&5
-+echo "configure:10348: checking for iconv in -liconv" >&5
+-echo "configure:10457: checking for iconv in -liconv" >&5
++echo "configure:10360: checking for iconv in -liconv" >&5
  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
-@@ -10449,7 +10352,7 @@
+@@ -10461,7 +10364,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-liconv  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 10453 "configure"
-+#line 10356 "configure"
+-#line 10465 "configure"
++#line 10368 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
-@@ -10463,7 +10366,7 @@
+@@ -10475,7 +10378,7 @@
  iconv()
  ; return 0; }
  EOF
--if { (eval echo configure:10467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:10479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -10482,7 +10385,7 @@
+@@ -10494,7 +10397,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
--echo "configure:10486: checking for libiconv in -liconv" >&5
-+echo "configure:10389: checking for libiconv in -liconv" >&5
+-echo "configure:10498: checking for libiconv in -liconv" >&5
++echo "configure:10401: checking for libiconv in -liconv" >&5
  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
-@@ -10490,7 +10393,7 @@
+@@ -10502,7 +10405,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-liconv  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 10494 "configure"
-+#line 10397 "configure"
+-#line 10506 "configure"
++#line 10409 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
-@@ -10504,7 +10407,7 @@
+@@ -10516,7 +10419,7 @@
  libiconv()
  ; return 0; }
  EOF
--if { (eval echo configure:10508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:10520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -10531,12 +10434,12 @@
+@@ -10543,12 +10446,12 @@
  _SAVE_LIBS=$LIBS
  LIBS="$LIBS $_ICONV_LIBS"
  echo $ac_n "checking for iconv()""... $ac_c" 1>&6
--echo "configure:10535: checking for iconv()" >&5
-+echo "configure:10438: checking for iconv()" >&5
+-echo "configure:10547: checking for iconv()" >&5
++echo "configure:10450: checking for iconv()" >&5
  if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 10540 "configure"
-+#line 10443 "configure"
+-#line 10552 "configure"
++#line 10455 "configure"
  #include "confdefs.h"
  
          #include <stdlib.h>
-@@ -10550,7 +10453,7 @@
+@@ -10562,7 +10465,7 @@
          
  ; return 0; }
  EOF
--if { (eval echo configure:10554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:10566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_func_iconv=yes
  else
-@@ -10574,12 +10477,12 @@
+@@ -10586,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
--echo "configure:10578: checking for iconv() with const input" >&5
-+echo "configure:10481: checking for iconv() with const input" >&5
+-echo "configure:10590: checking for iconv() with const input" >&5
++echo "configure:10493: checking for iconv() with const input" >&5
  if eval "test \"`echo '$''{'ac_cv_func_const_iconv'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 10583 "configure"
-+#line 10486 "configure"
+-#line 10595 "configure"
++#line 10498 "configure"
  #include "confdefs.h"
  
              #include <stdlib.h>
-@@ -10594,7 +10497,7 @@
+@@ -10606,7 +10509,7 @@
              
  ; return 0; }
  EOF
--if { (eval echo configure:10598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:10501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:10610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10513: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_func_const_iconv=yes
  else
-@@ -10623,19 +10526,19 @@
+@@ -10635,19 +10538,19 @@
  
  
    echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
--echo "configure:10627: checking for nl_langinfo and CODESET" >&5
-+echo "configure:10530: checking for nl_langinfo and CODESET" >&5
+-echo "configure:10639: checking for nl_langinfo and CODESET" >&5
++echo "configure:10542: checking for nl_langinfo and CODESET" >&5
  if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 10632 "configure"
-+#line 10535 "configure"
+-#line 10644 "configure"
++#line 10547 "configure"
  #include "confdefs.h"
  #include <langinfo.h>
  int main() {
  char* cs = nl_langinfo(CODESET);
  ; return 0; }
  EOF
--if { (eval echo configure:10639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:10651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    am_cv_langinfo_codeset=yes
  else
-@@ -10667,7 +10570,7 @@
+@@ -10679,7 +10582,7 @@
  
  
  echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6
--echo "configure:10671: checking for an implementation of va_copy()" >&5
-+echo "configure:10574: checking for an implementation of va_copy()" >&5
+-echo "configure:10683: checking for an implementation of va_copy()" >&5
++echo "configure:10586: checking for an implementation of va_copy()" >&5
  if eval "test \"`echo '$''{'ac_cv_va_copy'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -10677,7 +10580,7 @@
+@@ -10689,7 +10592,7 @@
      
  else
    cat > conftest.$ac_ext <<EOF
--#line 10681 "configure"
-+#line 10584 "configure"
+-#line 10693 "configure"
++#line 10596 "configure"
  #include "confdefs.h"
  
          #include <stdarg.h>
-@@ -10691,7 +10594,7 @@
+@@ -10703,7 +10606,7 @@
          }
          int main() { f (0, 42); return 0; }
  EOF
--if { (eval echo configure:10695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:10598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:10707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_va_copy=yes
  else
-@@ -10708,7 +10611,7 @@
+@@ -10720,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
--echo "configure:10712: checking for an implementation of __va_copy()" >&5
-+echo "configure:10615: checking for an implementation of __va_copy()" >&5
+-echo "configure:10724: checking for an implementation of __va_copy()" >&5
++echo "configure:10627: checking for an implementation of __va_copy()" >&5
  if eval "test \"`echo '$''{'ac_cv___va_copy'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -10718,7 +10621,7 @@
+@@ -10730,7 +10633,7 @@
      
  else
    cat > conftest.$ac_ext <<EOF
--#line 10722 "configure"
-+#line 10625 "configure"
+-#line 10734 "configure"
++#line 10637 "configure"
  #include "confdefs.h"
  
          #include <stdarg.h>
-@@ -10732,7 +10635,7 @@
+@@ -10744,7 +10647,7 @@
          }
          int main() { f (0, 42); return 0; }
  EOF
--if { (eval echo configure:10736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:10639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:10748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv___va_copy=yes
  else
-@@ -10749,7 +10652,7 @@
+@@ -10761,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
--echo "configure:10753: checking whether va_lists can be copied by value" >&5
-+echo "configure:10656: checking whether va_lists can be copied by value" >&5
+-echo "configure:10765: checking whether va_lists can be copied by value" >&5
++echo "configure:10668: checking whether va_lists can be copied by value" >&5
  if eval "test \"`echo '$''{'ac_cv_va_val_copy'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -10759,7 +10662,7 @@
+@@ -10771,7 +10674,7 @@
      
  else
    cat > conftest.$ac_ext <<EOF
--#line 10763 "configure"
-+#line 10666 "configure"
+-#line 10775 "configure"
++#line 10678 "configure"
  #include "confdefs.h"
  
          #include <stdarg.h>
-@@ -10773,7 +10676,7 @@
+@@ -10785,7 +10688,7 @@
          }
          int main() { f (0, 42); return 0; }
  EOF
--if { (eval echo configure:10777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:10680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:10789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_va_val_copy=yes
  else
-@@ -10872,7 +10775,7 @@
+@@ -10884,7 +10787,7 @@
  if test "$GNU_CXX"; then
  
    echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6
--echo "configure:10876: checking for C++ exceptions flag" >&5
-+echo "configure:10779: checking for C++ exceptions flag" >&5
+-echo "configure:10888: checking for C++ exceptions flag" >&5
++echo "configure:10791: checking for C++ exceptions flag" >&5
  
      if eval "test \"`echo '$''{'ac_cv_cxx_exceptions_flags'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -10907,12 +10810,12 @@
+@@ -10919,12 +10822,12 @@
  HAVE_GCC3_ABI=
  if test "$GNU_CC"; then
    echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6
--echo "configure:10911: checking for gcc 3.0 ABI" >&5
-+echo "configure:10814: checking for gcc 3.0 ABI" >&5
+-echo "configure:10923: checking for gcc 3.0 ABI" >&5
++echo "configure:10826: checking for gcc 3.0 ABI" >&5
  if eval "test \"`echo '$''{'ac_cv_gcc_three_abi'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 10916 "configure"
-+#line 10819 "configure"
+-#line 10928 "configure"
++#line 10831 "configure"
  #include "confdefs.h"
  
  int main() {
-@@ -10925,7 +10828,7 @@
+@@ -10937,7 +10840,7 @@
                        
  ; return 0; }
  EOF
--if { (eval echo configure:10929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:10832: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:10941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10844: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_gcc_three_abi="yes"
  else
-@@ -10949,12 +10852,12 @@
+@@ -10961,12 +10864,12 @@
  
  
  echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6
--echo "configure:10953: checking for C++ \"explicit\" keyword" >&5
-+echo "configure:10856: checking for C++ \"explicit\" keyword" >&5
+-echo "configure:10965: checking for C++ \"explicit\" keyword" >&5
++echo "configure:10868: checking for C++ \"explicit\" keyword" >&5
  if eval "test \"`echo '$''{'ac_cv_cpp_explicit'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 10958 "configure"
-+#line 10861 "configure"
+-#line 10970 "configure"
++#line 10873 "configure"
  #include "confdefs.h"
  class X {
                                 public: explicit X(int i) : i_(i) {}
-@@ -10964,7 +10867,7 @@
+@@ -10976,7 +10879,7 @@
  X x(3);
  ; return 0; }
  EOF
--if { (eval echo configure:10968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:10871: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:10980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_cpp_explicit=yes
  else
-@@ -10985,12 +10888,12 @@
+@@ -10997,12 +10900,12 @@
  fi
  
  echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6
--echo "configure:10989: checking for C++ \"typename\" keyword" >&5
-+echo "configure:10892: checking for C++ \"typename\" keyword" >&5
+-echo "configure:11001: checking for C++ \"typename\" keyword" >&5
++echo "configure:10904: checking for C++ \"typename\" keyword" >&5
  if eval "test \"`echo '$''{'ac_cv_cpp_typename'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 10994 "configure"
-+#line 10897 "configure"
+-#line 11006 "configure"
++#line 10909 "configure"
  #include "confdefs.h"
  class param {
                                 public:
-@@ -11009,7 +10912,7 @@
+@@ -11021,7 +10924,7 @@
                                 A.foo(0);
  ; return 0; }
  EOF
--if { (eval echo configure:11013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:10916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:11025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_cpp_typename=yes
  else
-@@ -11030,12 +10933,12 @@
+@@ -11042,12 +10945,12 @@
  fi
  
  echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6
--echo "configure:11034: checking for modern C++ template specialization syntax support" >&5
-+echo "configure:10937: checking for modern C++ template specialization syntax support" >&5
+-echo "configure:11046: checking for modern C++ template specialization syntax support" >&5
++echo "configure:10949: checking for modern C++ template specialization syntax support" >&5
  if eval "test \"`echo '$''{'ac_cv_cpp_modern_specialize_template_syntax'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 11039 "configure"
-+#line 10942 "configure"
+-#line 11051 "configure"
++#line 10954 "configure"
  #include "confdefs.h"
  template <class T> struct X { int a; };
                                 class Y {};
-@@ -11045,7 +10948,7 @@
+@@ -11057,7 +10960,7 @@
                                 X<Y> y_x;
  ; return 0; }
  EOF
--if { (eval echo configure:11049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:10952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:11061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_cpp_modern_specialize_template_syntax=yes
  else
-@@ -11067,12 +10970,12 @@
+@@ -11079,12 +10982,12 @@
  
  
  echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6
--echo "configure:11071: checking whether partial template specialization works" >&5
-+echo "configure:10974: checking whether partial template specialization works" >&5
+-echo "configure:11083: checking whether partial template specialization works" >&5
++echo "configure:10986: checking whether partial template specialization works" >&5
  if eval "test \"`echo '$''{'ac_cv_cpp_partial_specialization'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 11076 "configure"
-+#line 10979 "configure"
+-#line 11088 "configure"
++#line 10991 "configure"
  #include "confdefs.h"
  template <class T> class Foo {};
                                 template <class T> class Foo<T*> {};
-@@ -11080,7 +10983,7 @@
+@@ -11092,7 +10995,7 @@
  return 0;
  ; return 0; }
  EOF
--if { (eval echo configure:11084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:10987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:11096: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_cpp_partial_specialization=yes
  else
-@@ -11101,12 +11004,12 @@
+@@ -11113,12 +11016,12 @@
  fi
  
  echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6
--echo "configure:11105: checking whether operators must be re-defined for templates derived from templates" >&5
-+echo "configure:11008: checking whether operators must be re-defined for templates derived from templates" >&5
+-echo "configure:11117: checking whether operators must be re-defined for templates derived from templates" >&5
++echo "configure:11020: checking whether operators must be re-defined for templates derived from templates" >&5
  if eval "test \"`echo '$''{'ac_cv_need_derived_template_operators'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 11110 "configure"
-+#line 11013 "configure"
+-#line 11122 "configure"
++#line 11025 "configure"
  #include "confdefs.h"
  template <class T> class Base { };
                                  template <class T>
-@@ -11118,7 +11021,7 @@
+@@ -11130,7 +11033,7 @@
                                  return 0;
  ; return 0; }
  EOF
--if { (eval echo configure:11122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:11025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:11134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_need_derived_template_operators=no
  else
-@@ -11140,12 +11043,12 @@
+@@ -11152,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
--echo "configure:11144: checking whether we need to cast a derived template to pass as its base class" >&5
-+echo "configure:11047: checking whether we need to cast a derived template to pass as its base class" >&5
+-echo "configure:11156: checking whether we need to cast a derived template to pass as its base class" >&5
++echo "configure:11059: checking whether we need to cast a derived template to pass as its base class" >&5
  if eval "test \"`echo '$''{'ac_cv_need_cpp_template_cast_to_base'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 11149 "configure"
-+#line 11052 "configure"
+-#line 11161 "configure"
++#line 11064 "configure"
  #include "confdefs.h"
  template <class T> class Base { };
                                  template <class T> class Derived : public Base<T> { };
-@@ -11154,7 +11057,7 @@
+@@ -11166,7 +11069,7 @@
  Derived<char> bar; return foo(bar);
  ; return 0; }
  EOF
--if { (eval echo configure:11158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:11061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:11170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_need_cpp_template_cast_to_base=no
  else
-@@ -11175,12 +11078,12 @@
+@@ -11187,12 +11090,12 @@
  fi
  
  echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6
--echo "configure:11179: checking whether the compiler can resolve const ambiguities for templates" >&5
-+echo "configure:11082: checking whether the compiler can resolve const ambiguities for templates" >&5
+-echo "configure:11191: checking whether the compiler can resolve const ambiguities for templates" >&5
++echo "configure:11094: checking whether the compiler can resolve const ambiguities for templates" >&5
  if eval "test \"`echo '$''{'ac_cv_can_resolve_const_ambiguity'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 11184 "configure"
-+#line 11087 "configure"
+-#line 11196 "configure"
++#line 11099 "configure"
  #include "confdefs.h"
  
                                  template <class T> class ptrClass {
-@@ -11201,7 +11104,7 @@
+@@ -11213,7 +11116,7 @@
                                   a(&i); 
  ; return 0; }
  EOF
--if { (eval echo configure:11205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:11108: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:11217: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_can_resolve_const_ambiguity=yes
  else
-@@ -11223,12 +11126,12 @@
+@@ -11235,12 +11138,12 @@
  
  
  echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6
--echo "configure:11227: checking whether the C++ \"using\" keyword can change access" >&5
-+echo "configure:11130: checking whether the C++ \"using\" keyword can change access" >&5
+-echo "configure:11239: checking whether the C++ \"using\" keyword can change access" >&5
++echo "configure:11142: checking whether the C++ \"using\" keyword can change access" >&5
  if eval "test \"`echo '$''{'ac_cv_cpp_access_changing_using2'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 11232 "configure"
-+#line 11135 "configure"
+-#line 11244 "configure"
++#line 11147 "configure"
  #include "confdefs.h"
  class A { protected: int foo() { return 0; } };
                     class B : public A { public: using A::foo; };
-@@ -11236,10 +11139,10 @@
+@@ -11248,10 +11151,10 @@
  B b; return b.foo();
  ; return 0; }
  EOF
--if { (eval echo configure:11240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:11143: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:11252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat > conftest.$ac_ext <<EOF
--#line 11243 "configure"
-+#line 11146 "configure"
+-#line 11255 "configure"
++#line 11158 "configure"
  #include "confdefs.h"
  class A { public: int foo() { return 1; } };
                         class B : public A { private: using A::foo; };
-@@ -11247,7 +11150,7 @@
+@@ -11259,7 +11162,7 @@
  B b; return b.foo();
  ; return 0; }
  EOF
--if { (eval echo configure:11251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:11154: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:11263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11166: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_cpp_access_changing_using2=no
  else
-@@ -11275,12 +11178,12 @@
+@@ -11287,12 +11190,12 @@
  fi
  
  echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6
--echo "configure:11279: checking whether the C++ \"using\" keyword resolves ambiguity" >&5
-+echo "configure:11182: checking whether the C++ \"using\" keyword resolves ambiguity" >&5
+-echo "configure:11291: checking whether the C++ \"using\" keyword resolves ambiguity" >&5
++echo "configure:11194: checking whether the C++ \"using\" keyword resolves ambiguity" >&5
  if eval "test \"`echo '$''{'ac_cv_cpp_ambiguity_resolving_using'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 11284 "configure"
-+#line 11187 "configure"
+-#line 11296 "configure"
++#line 11199 "configure"
  #include "confdefs.h"
  class X { 
                                   public: int go(const X&) {return 3;}
-@@ -11296,7 +11199,7 @@
+@@ -11308,7 +11211,7 @@
  X x; Y y; y.jo(x);
  ; return 0; }
  EOF
--if { (eval echo configure:11300: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:11203: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:11312: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_cpp_ambiguity_resolving_using=yes
  else
-@@ -11317,19 +11220,19 @@
+@@ -11329,19 +11232,19 @@
  fi
  
  echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6
--echo "configure:11321: checking for \"std::\" namespace" >&5
-+echo "configure:11224: checking for \"std::\" namespace" >&5
+-echo "configure:11333: checking for \"std::\" namespace" >&5
++echo "configure:11236: checking for \"std::\" namespace" >&5
  if eval "test \"`echo '$''{'ac_cv_cpp_namespace_std'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 11326 "configure"
-+#line 11229 "configure"
+-#line 11338 "configure"
++#line 11241 "configure"
  #include "confdefs.h"
  #include <algorithm>
  int main() {
  return std::min(0, 1);
  ; return 0; }
  EOF
--if { (eval echo configure:11333: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:11236: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:11345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11248: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_cpp_namespace_std=yes
  else
-@@ -11350,12 +11253,12 @@
+@@ -11362,12 +11265,12 @@
  fi
  
  echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6
--echo "configure:11354: checking whether standard template operator!=() is ambiguous" >&5
-+echo "configure:11257: checking whether standard template operator!=() is ambiguous" >&5
+-echo "configure:11366: checking whether standard template operator!=() is ambiguous" >&5
++echo "configure:11269: checking whether standard template operator!=() is ambiguous" >&5
  if eval "test \"`echo '$''{'ac_cv_cpp_unambiguous_std_notequal'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 11359 "configure"
-+#line 11262 "configure"
+-#line 11371 "configure"
++#line 11274 "configure"
  #include "confdefs.h"
  #include <algorithm>
                                  struct T1 {};
-@@ -11365,7 +11268,7 @@
+@@ -11377,7 +11280,7 @@
  T1 a,b; return a != b;
  ; return 0; }
  EOF
--if { (eval echo configure:11369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:11272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:11381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_cpp_unambiguous_std_notequal=unambiguous
  else
-@@ -11387,12 +11290,12 @@
+@@ -11399,12 +11302,12 @@
  
  
  echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6
--echo "configure:11391: checking for C++ reinterpret_cast" >&5
-+echo "configure:11294: checking for C++ reinterpret_cast" >&5
+-echo "configure:11403: checking for C++ reinterpret_cast" >&5
++echo "configure:11306: checking for C++ reinterpret_cast" >&5
  if eval "test \"`echo '$''{'ac_cv_cpp_reinterpret_cast'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 11396 "configure"
-+#line 11299 "configure"
+-#line 11408 "configure"
++#line 11311 "configure"
  #include "confdefs.h"
  struct X { int i; };
                                 struct Y { int i; };
-@@ -11400,7 +11303,7 @@
+@@ -11412,7 +11315,7 @@
  X x; X*const z = &x;Y*y = reinterpret_cast<Y*>(z);
  ; return 0; }
  EOF
--if { (eval echo configure:11404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:11307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:11416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_cpp_reinterpret_cast=yes
  else
-@@ -11421,7 +11324,7 @@
+@@ -11433,7 +11336,7 @@
  fi
  
  echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6
--echo "configure:11425: checking for C++ dynamic_cast to void*" >&5
-+echo "configure:11328: checking for C++ dynamic_cast to void*" >&5
+-echo "configure:11437: checking for C++ dynamic_cast to void*" >&5
++echo "configure:11340: checking for C++ dynamic_cast to void*" >&5
  if eval "test \"`echo '$''{'ac_cv_cpp_dynamic_cast_void_ptr'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -11429,8 +11332,11 @@
+@@ -11441,8 +11344,11 @@
    ac_cv_cpp_dynamic_cast_void_ptr=no
  else
    cat > conftest.$ac_ext <<EOF
--#line 11433 "configure"
-+#line 11336 "configure"
+-#line 11445 "configure"
++#line 11348 "configure"
  #include "confdefs.h"
 +#ifdef __cplusplus
 +extern "C" void exit(int);
@@ -3993,425 +3993,425 @@ diff -u -r1.1492.2.124 configure
  class X { int i; public: virtual ~X() { } };
                              class Y { int j; public: virtual ~Y() { } };
                              class Z : public X, public Y { int k; };
-@@ -11445,7 +11351,7 @@
+@@ -11457,7 +11363,7 @@
                                             ((void*)&mdo == dynamic_cast<void*>(suby))));
                              }
  EOF
--if { (eval echo configure:11449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:11355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:11461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:11367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_cpp_dynamic_cast_void_ptr=yes
  else
-@@ -11469,19 +11375,19 @@
+@@ -11481,19 +11387,19 @@
  
  
  echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6
--echo "configure:11473: checking whether C++ requires implementation of unused virtual methods" >&5
-+echo "configure:11379: checking whether C++ requires implementation of unused virtual methods" >&5
+-echo "configure:11485: checking whether C++ requires implementation of unused virtual methods" >&5
++echo "configure:11391: checking whether C++ requires implementation of unused virtual methods" >&5
  if eval "test \"`echo '$''{'ac_cv_cpp_unused_required'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 11478 "configure"
-+#line 11384 "configure"
+-#line 11490 "configure"
++#line 11396 "configure"
  #include "confdefs.h"
  class X {private: virtual void never_called();};
  int main() {
  X x;
  ; return 0; }
  EOF
--if { (eval echo configure:11485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:11391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:11497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_cpp_unused_required=no
  else
-@@ -11504,12 +11410,12 @@
+@@ -11516,12 +11422,12 @@
  
  
  echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6
--echo "configure:11508: checking for trouble comparing to zero near std::operator!=()" >&5
-+echo "configure:11414: checking for trouble comparing to zero near std::operator!=()" >&5
+-echo "configure:11520: checking for trouble comparing to zero near std::operator!=()" >&5
++echo "configure:11426: checking for trouble comparing to zero near std::operator!=()" >&5
  if eval "test \"`echo '$''{'ac_cv_trouble_comparing_to_zero'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 11513 "configure"
-+#line 11419 "configure"
+-#line 11525 "configure"
++#line 11431 "configure"
  #include "confdefs.h"
  #include <algorithm>
                                  template <class T> class Foo {};
-@@ -11520,7 +11426,7 @@
+@@ -11532,7 +11438,7 @@
  Foo<int> f; return (0 != f);
  ; return 0; }
  EOF
--if { (eval echo configure:11524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:11430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:11536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_trouble_comparing_to_zero=no
  else
-@@ -11552,19 +11458,19 @@
+@@ -11564,19 +11470,19 @@
  
  
  echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
--echo "configure:11556: checking for LC_MESSAGES" >&5
-+echo "configure:11462: checking for LC_MESSAGES" >&5
+-echo "configure:11568: checking for LC_MESSAGES" >&5
++echo "configure:11474: checking for LC_MESSAGES" >&5
  if eval "test \"`echo '$''{'ac_cv_i18n_lc_messages'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 11561 "configure"
-+#line 11467 "configure"
+-#line 11573 "configure"
++#line 11479 "configure"
  #include "confdefs.h"
  #include <locale.h>
  int main() {
  int category = LC_MESSAGES;
  ; return 0; }
  EOF
--if { (eval echo configure:11568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:11474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:11580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_i18n_lc_messages=yes
  else
-@@ -11645,7 +11551,7 @@
+@@ -11657,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
--echo "configure:11649: checking for $ac_word" >&5
-+echo "configure:11555: checking for $ac_word" >&5
+-echo "configure:11661: checking for $ac_word" >&5
++echo "configure:11567: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_NSPR_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -11680,7 +11586,7 @@
+@@ -11692,7 +11598,7 @@
  
  	min_nspr_version=4.0.0
  	echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6
--echo "configure:11684: checking for NSPR - version >= $min_nspr_version (skipping)" >&5
-+echo "configure:11590: checking for NSPR - version >= $min_nspr_version (skipping)" >&5
+-echo "configure:11696: checking for NSPR - version >= $min_nspr_version (skipping)" >&5
++echo "configure:11602: checking for NSPR - version >= $min_nspr_version (skipping)" >&5
  
  	no_nspr=""
  	if test "$NSPR_CONFIG" = "no"; then
-@@ -11782,7 +11688,7 @@
+@@ -11794,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
--echo "configure:11786: checking for $ac_word" >&5
-+echo "configure:11692: checking for $ac_word" >&5
+-echo "configure:11798: checking for $ac_word" >&5
++echo "configure:11704: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -11817,7 +11723,7 @@
+@@ -11829,7 +11735,7 @@
  
  	min_nss_version=3.0.0
  	echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6
--echo "configure:11821: checking for NSS - version >= $min_nss_version (skipping)" >&5
-+echo "configure:11727: checking for NSS - version >= $min_nss_version (skipping)" >&5
+-echo "configure:11833: checking for NSS - version >= $min_nss_version (skipping)" >&5
++echo "configure:11739: checking for NSS - version >= $min_nss_version (skipping)" >&5
  
  	no_nss=""
  	if test "$NSS_CONFIG" = "no"; then
-@@ -11890,7 +11796,7 @@
+@@ -11902,7 +11808,7 @@
      SYSTEM_JPEG=
  else
      echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6
--echo "configure:11894: checking for jpeg_destroy_compress in -ljpeg" >&5
-+echo "configure:11800: checking for jpeg_destroy_compress in -ljpeg" >&5
+-echo "configure:11906: checking for jpeg_destroy_compress in -ljpeg" >&5
++echo "configure:11812: checking for jpeg_destroy_compress in -ljpeg" >&5
  ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -11898,7 +11804,7 @@
+@@ -11910,7 +11816,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-ljpeg $JPEG_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 11902 "configure"
-+#line 11808 "configure"
+-#line 11914 "configure"
++#line 11820 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -11909,7 +11815,7 @@
+@@ -11921,7 +11827,7 @@
  jpeg_destroy_compress()
  ; return 0; }
  EOF
--if { (eval echo configure:11913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:11819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:11925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -11938,7 +11844,7 @@
+@@ -11950,7 +11856,7 @@
    SYSTEM_JPEG= 
  else
    cat > conftest.$ac_ext <<EOF
--#line 11942 "configure"
-+#line 11848 "configure"
+-#line 11954 "configure"
++#line 11860 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  	#include <sys/types.h>
-@@ -11952,7 +11858,7 @@
+@@ -11964,7 +11870,7 @@
  	}
  	
  EOF
--if { (eval echo configure:11956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:11862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:11968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:11874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    SYSTEM_JPEG=1
  else
-@@ -11993,7 +11899,7 @@
+@@ -12005,7 +11911,7 @@
      SYSTEM_ZLIB=
  else
      echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6
--echo "configure:11997: checking for gzread in -lz" >&5
-+echo "configure:11903: checking for gzread in -lz" >&5
+-echo "configure:12009: checking for gzread in -lz" >&5
++echo "configure:11915: checking for gzread in -lz" >&5
  ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -12001,7 +11907,7 @@
+@@ -12013,7 +11919,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lz $ZLIB_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 12005 "configure"
-+#line 11911 "configure"
+-#line 12017 "configure"
++#line 11923 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -12012,7 +11918,7 @@
+@@ -12024,7 +11930,7 @@
  gzread()
  ; return 0; }
  EOF
--if { (eval echo configure:12016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:11922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:12028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -12040,7 +11946,7 @@
+@@ -12052,7 +11958,7 @@
    SYSTEM_ZLIB= 
  else
    cat > conftest.$ac_ext <<EOF
--#line 12044 "configure"
-+#line 11950 "configure"
+-#line 12056 "configure"
++#line 11962 "configure"
  #include "confdefs.h"
  
      #include <stdio.h>
-@@ -12061,7 +11967,7 @@
+@@ -12073,7 +11979,7 @@
      }
      
  EOF
--if { (eval echo configure:12065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:11971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:12077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:11983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    SYSTEM_ZLIB=1
  else
-@@ -12104,7 +12010,7 @@
+@@ -12116,7 +12022,7 @@
      SYSTEM_PNG=
  else
      echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6
--echo "configure:12108: checking for png_get_valid in -lpng" >&5
-+echo "configure:12014: checking for png_get_valid in -lpng" >&5
+-echo "configure:12120: checking for png_get_valid in -lpng" >&5
++echo "configure:12026: checking for png_get_valid in -lpng" >&5
  ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -12112,7 +12018,7 @@
+@@ -12124,7 +12030,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lpng $PNG_LIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 12116 "configure"
-+#line 12022 "configure"
+-#line 12128 "configure"
++#line 12034 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -12123,7 +12029,7 @@
+@@ -12135,7 +12041,7 @@
  png_get_valid()
  ; return 0; }
  EOF
--if { (eval echo configure:12127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:12033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:12139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -12151,7 +12057,7 @@
+@@ -12163,7 +12069,7 @@
    SYSTEM_PNG= 
  else
    cat > conftest.$ac_ext <<EOF
--#line 12155 "configure"
-+#line 12061 "configure"
+-#line 12167 "configure"
++#line 12073 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  	#include <sys/types.h>
-@@ -12165,7 +12071,7 @@
+@@ -12177,7 +12083,7 @@
  	}
  	
  EOF
--if { (eval echo configure:12169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:12075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:12181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:12087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    SYSTEM_PNG=1
  else
-@@ -12415,7 +12321,7 @@
+@@ -12427,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
--echo "configure:12419: checking for $ac_word" >&5
-+echo "configure:12325: checking for $ac_word" >&5
+-echo "configure:12431: checking for $ac_word" >&5
++echo "configure:12337: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -12450,7 +12356,7 @@
+@@ -12462,7 +12368,7 @@
  
    min_gtk_version=$GTK_VERSION
    echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
--echo "configure:12454: checking for GTK - version >= $min_gtk_version" >&5
-+echo "configure:12360: checking for GTK - version >= $min_gtk_version" >&5
+-echo "configure:12466: checking for GTK - version >= $min_gtk_version" >&5
++echo "configure:12372: checking for GTK - version >= $min_gtk_version" >&5
    no_gtk=""
    if test "$GTK_CONFIG" = "no" ; then
      no_gtk=yes
-@@ -12473,7 +12379,7 @@
+@@ -12485,7 +12391,7 @@
    echo $ac_n "cross compiling; assumed OK... $ac_c"
  else
    cat > conftest.$ac_ext <<EOF
--#line 12477 "configure"
-+#line 12383 "configure"
+-#line 12489 "configure"
++#line 12395 "configure"
  #include "confdefs.h"
  
  #include <gtk/gtk.h>
-@@ -12551,7 +12457,7 @@
+@@ -12563,7 +12469,7 @@
  }
  
  EOF
--if { (eval echo configure:12555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:12461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:12567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:12473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    :
  else
-@@ -12586,7 +12492,7 @@
+@@ -12598,7 +12504,7 @@
            CFLAGS="$CFLAGS $GTK_CFLAGS"
            LIBS="$LIBS $GTK_LIBS"
            cat > conftest.$ac_ext <<EOF
--#line 12590 "configure"
-+#line 12496 "configure"
+-#line 12602 "configure"
++#line 12508 "configure"
  #include "confdefs.h"
  
  #include <gtk/gtk.h>
-@@ -12596,7 +12502,7 @@
+@@ -12608,7 +12514,7 @@
   return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
  ; return 0; }
  EOF
--if { (eval echo configure:12600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:12506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:12612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    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"
-@@ -12648,7 +12554,7 @@
+@@ -12660,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
--echo "configure:12652: checking for $ac_word" >&5
-+echo "configure:12558: checking for $ac_word" >&5
+-echo "configure:12664: checking for $ac_word" >&5
++echo "configure:12570: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -12692,19 +12598,19 @@
+@@ -12704,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
--echo "configure:12696: checking for gtk+-2.0 >= 1.3.7" >&5
-+echo "configure:12602: checking for gtk+-2.0 >= 1.3.7" >&5
+-echo "configure:12708: checking for gtk+-2.0 >= 1.3.7" >&5
++echo "configure:12614: checking for gtk+-2.0 >= 1.3.7" >&5
  
          if $PKG_CONFIG --exists "gtk+-2.0 >= 1.3.7" ; then
              echo "$ac_t""yes" 1>&6
              succeeded=yes
  
              echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6
--echo "configure:12703: checking MOZ_GTK2_CFLAGS" >&5
-+echo "configure:12609: checking MOZ_GTK2_CFLAGS" >&5
+-echo "configure:12715: checking MOZ_GTK2_CFLAGS" >&5
++echo "configure:12621: checking MOZ_GTK2_CFLAGS" >&5
              MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7"`
              echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6
  
              echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6
--echo "configure:12708: checking MOZ_GTK2_LIBS" >&5
-+echo "configure:12614: checking MOZ_GTK2_LIBS" >&5
+-echo "configure:12720: checking MOZ_GTK2_LIBS" >&5
++echo "configure:12626: checking MOZ_GTK2_LIBS" >&5
              ## 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\"`"
-@@ -12769,7 +12675,7 @@
+@@ -12781,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
--echo "configure:12773: checking for $ac_word" >&5
-+echo "configure:12679: checking for $ac_word" >&5
+-echo "configure:12785: checking for $ac_word" >&5
++echo "configure:12691: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_HOST_MOC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -12821,7 +12727,7 @@
+@@ -12833,7 +12739,7 @@
  cross_compiling=$ac_cv_prog_cxx_cross
  
      echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6
--echo "configure:12825: checking for main in -lqt" >&5
-+echo "configure:12731: checking for main in -lqt" >&5
+-echo "configure:12837: checking for main in -lqt" >&5
++echo "configure:12743: checking for main in -lqt" >&5
  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
-@@ -12829,14 +12735,14 @@
+@@ -12841,14 +12747,14 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lqt  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 12833 "configure"
-+#line 12739 "configure"
+-#line 12845 "configure"
++#line 12751 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
--if { (eval echo configure:12840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:12746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:12852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -12855,7 +12761,7 @@
+@@ -12867,7 +12773,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for main in -lqt-mt""... $ac_c" 1>&6
--echo "configure:12859: checking for main in -lqt-mt" >&5
-+echo "configure:12765: checking for main in -lqt-mt" >&5
+-echo "configure:12871: checking for main in -lqt-mt" >&5
++echo "configure:12777: checking for main in -lqt-mt" >&5
  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
-@@ -12863,14 +12769,14 @@
+@@ -12875,14 +12781,14 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lqt-mt  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 12867 "configure"
-+#line 12773 "configure"
+-#line 12879 "configure"
++#line 12785 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
--if { (eval echo configure:12874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:12780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:12886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -12906,9 +12812,9 @@
+@@ -12918,9 +12824,9 @@
      LIBS="$LIBS $QT_LIBS"
      
      echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6
--echo "configure:12910: checking Qt - version >= $QT_VERSION" >&5
-+echo "configure:12816: checking Qt - version >= $QT_VERSION" >&5
+-echo "configure:12922: checking Qt - version >= $QT_VERSION" >&5
++echo "configure:12828: checking Qt - version >= $QT_VERSION" >&5
      cat > conftest.$ac_ext <<EOF
--#line 12912 "configure"
-+#line 12818 "configure"
+-#line 12924 "configure"
++#line 12830 "configure"
  #include "confdefs.h"
  #include <qglobal.h>
  int main() {
-@@ -12919,7 +12825,7 @@
+@@ -12931,7 +12837,7 @@
      
  ; return 0; }
  EOF
--if { (eval echo configure:12923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:12829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:12935: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:12841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    result="yes"
  else
-@@ -12950,6 +12856,138 @@
+@@ -12962,6 +12868,138 @@
  
  
  
@@ -4441,7 +4441,7 @@ diff -u -r1.1492.2.124 configure
 +    # 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
-+echo "configure:12886: checking for $ac_word" >&5
++echo "configure:12898: checking for $ac_word" >&5
 +if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
 +  echo $ac_n "(cached) $ac_c" 1>&6
 +else
@@ -4485,19 +4485,19 @@ diff -u -r1.1492.2.124 configure
 +     PKG_CONFIG_MIN_VERSION=0.9.0
 +     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
 +        echo $ac_n "checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION""... $ac_c" 1>&6
-+echo "configure:12930: checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" >&5
++echo "configure:12942: checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" >&5
 +
 +        if $PKG_CONFIG --exists "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" ; then
 +            echo "$ac_t""yes" 1>&6
 +            succeeded=yes
 +
 +            echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_CFLAGS""... $ac_c" 1>&6
-+echo "configure:12937: checking MOZ_STARTUP_NOTIFICATION_CFLAGS" >&5
++echo "configure:12949: checking MOZ_STARTUP_NOTIFICATION_CFLAGS" >&5
 +            MOZ_STARTUP_NOTIFICATION_CFLAGS=`$PKG_CONFIG --cflags "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"`
 +            echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_CFLAGS" 1>&6
 +
 +            echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_LIBS""... $ac_c" 1>&6
-+echo "configure:12942: checking MOZ_STARTUP_NOTIFICATION_LIBS" >&5
++echo "configure:12954: checking MOZ_STARTUP_NOTIFICATION_LIBS" >&5
 +            ## don't use --libs since that can do evil things like add
 +            ## -Wl,--export-dynamic
 +            MOZ_STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG --libs-only-L \"libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION\"` `$PKG_CONFIG --libs-only-l \"libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION\"`"
@@ -4550,194 +4550,194 @@ diff -u -r1.1492.2.124 configure
  
  
  
-@@ -13515,7 +13553,7 @@
+@@ -13527,7 +13565,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
--echo "configure:13519: checking for $ac_word" >&5
-+echo "configure:13557: checking for $ac_word" >&5
+-echo "configure:13531: checking for $ac_word" >&5
++echo "configure:13569: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -13559,19 +13597,19 @@
+@@ -13571,19 +13609,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
--echo "configure:13563: checking for xft" >&5
-+echo "configure:13601: checking for xft" >&5
+-echo "configure:13575: checking for xft" >&5
++echo "configure:13613: checking for xft" >&5
  
          if $PKG_CONFIG --exists "xft" ; then
              echo "$ac_t""yes" 1>&6
              succeeded=yes
  
              echo $ac_n "checking MOZ_XFT_CFLAGS""... $ac_c" 1>&6
--echo "configure:13570: checking MOZ_XFT_CFLAGS" >&5
-+echo "configure:13608: checking MOZ_XFT_CFLAGS" >&5
+-echo "configure:13582: checking MOZ_XFT_CFLAGS" >&5
++echo "configure:13620: checking MOZ_XFT_CFLAGS" >&5
              MOZ_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft"`
              echo "$ac_t""$MOZ_XFT_CFLAGS" 1>&6
  
              echo $ac_n "checking MOZ_XFT_LIBS""... $ac_c" 1>&6
--echo "configure:13575: checking MOZ_XFT_LIBS" >&5
-+echo "configure:13613: checking MOZ_XFT_LIBS" >&5
+-echo "configure:13587: checking MOZ_XFT_LIBS" >&5
++echo "configure:13625: checking MOZ_XFT_LIBS" >&5
              ## 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\"`"
-@@ -13606,7 +13644,7 @@
+@@ -13618,7 +13656,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
--echo "configure:13610: checking for $ac_word" >&5
-+echo "configure:13648: checking for $ac_word" >&5
+-echo "configure:13622: checking for $ac_word" >&5
++echo "configure:13660: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -13650,19 +13688,19 @@
+@@ -13662,19 +13700,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
--echo "configure:13654: checking for pango >= 1.1.0" >&5
-+echo "configure:13692: checking for pango >= 1.1.0" >&5
+-echo "configure:13666: checking for pango >= 1.1.0" >&5
++echo "configure:13704: checking for pango >= 1.1.0" >&5
  
          if $PKG_CONFIG --exists "pango >= 1.1.0" ; then
              echo "$ac_t""yes" 1>&6
              succeeded=yes
  
              echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6
--echo "configure:13661: checking _PANGOCHK_CFLAGS" >&5
-+echo "configure:13699: checking _PANGOCHK_CFLAGS" >&5
+-echo "configure:13673: checking _PANGOCHK_CFLAGS" >&5
++echo "configure:13711: checking _PANGOCHK_CFLAGS" >&5
              _PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.1.0"`
              echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6
  
              echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6
--echo "configure:13666: checking _PANGOCHK_LIBS" >&5
-+echo "configure:13704: checking _PANGOCHK_LIBS" >&5
+-echo "configure:13678: checking _PANGOCHK_LIBS" >&5
++echo "configure:13716: checking _PANGOCHK_LIBS" >&5
              ## 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\"`"
-@@ -13722,7 +13760,7 @@
+@@ -13734,7 +13772,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
--echo "configure:13726: checking for $ac_word" >&5
-+echo "configure:13764: checking for $ac_word" >&5
+-echo "configure:13738: checking for $ac_word" >&5
++echo "configure:13776: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -13766,19 +13804,19 @@
+@@ -13778,19 +13816,19 @@
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-         echo $ac_n "checking for pangoxft >= 1.6.0""... $ac_c" 1>&6
--echo "configure:13770: checking for pangoxft >= 1.6.0" >&5
-+echo "configure:13808: checking for pangoxft >= 1.6.0" >&5
+         echo $ac_n "checking for pango >= 1.6.0 pangoft2 >= 1.6.0""... $ac_c" 1>&6
+-echo "configure:13782: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5
++echo "configure:13820: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5
  
-         if $PKG_CONFIG --exists "pangoxft >= 1.6.0" ; then
+         if $PKG_CONFIG --exists "pango >= 1.6.0 pangoft2 >= 1.6.0" ; then
              echo "$ac_t""yes" 1>&6
              succeeded=yes
  
              echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6
--echo "configure:13777: checking MOZ_PANGO_CFLAGS" >&5
-+echo "configure:13815: checking MOZ_PANGO_CFLAGS" >&5
-             MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pangoxft >= 1.6.0"`
+-echo "configure:13789: checking MOZ_PANGO_CFLAGS" >&5
++echo "configure:13827: checking MOZ_PANGO_CFLAGS" >&5
+             MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.6.0 pangoft2 >= 1.6.0"`
              echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6
  
              echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6
--echo "configure:13782: checking MOZ_PANGO_LIBS" >&5
-+echo "configure:13820: checking MOZ_PANGO_LIBS" >&5
+-echo "configure:13794: checking MOZ_PANGO_LIBS" >&5
++echo "configure:13832: checking MOZ_PANGO_LIBS" >&5
              ## don't use --libs since that can do evil things like add
              ## -Wl,--export-dynamic
-             MOZ_PANGO_LIBS="`$PKG_CONFIG --libs-only-L \"pangoxft >= 1.6.0\"` `$PKG_CONFIG --libs-only-l \"pangoxft >= 1.6.0\"`"
-@@ -13846,7 +13884,7 @@
+             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\"`"
+@@ -13858,7 +13896,7 @@
      _SAVE_LDFLAGS="$LDFLAGS"
      LDFLAGS="$XLDFLAGS $LDFLAGS"
      echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6
--echo "configure:13850: checking for XpGetPrinterList in -lXp" >&5
-+echo "configure:13888: checking for XpGetPrinterList in -lXp" >&5
+-echo "configure:13862: checking for XpGetPrinterList in -lXp" >&5
++echo "configure:13900: checking for XpGetPrinterList in -lXp" >&5
  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
-@@ -13854,7 +13892,7 @@
+@@ -13866,7 +13904,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXp $XEXT_LIBS $XLIBS $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 13858 "configure"
-+#line 13896 "configure"
+-#line 13870 "configure"
++#line 13908 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -13865,7 +13903,7 @@
+@@ -13877,7 +13915,7 @@
  XpGetPrinterList()
  ; return 0; }
  EOF
--if { (eval echo configure:13869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:13907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:13881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:13919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -13938,7 +13976,7 @@
+@@ -13950,7 +13988,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
--echo "configure:13942: checking for $ac_word" >&5
-+echo "configure:13980: checking for $ac_word" >&5
+-echo "configure:13954: checking for $ac_word" >&5
++echo "configure:13992: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -13982,19 +14020,19 @@
+@@ -13994,19 +14032,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
--echo "configure:13986: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5
-+echo "configure:14024: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5
+-echo "configure:13998: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5
++echo "configure:14036: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5
  
          if $PKG_CONFIG --exists "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" ; then
              echo "$ac_t""yes" 1>&6
              succeeded=yes
  
              echo $ac_n "checking MOZ_GNOMEVFS_CFLAGS""... $ac_c" 1>&6
--echo "configure:13993: checking MOZ_GNOMEVFS_CFLAGS" >&5
-+echo "configure:14031: checking MOZ_GNOMEVFS_CFLAGS" >&5
+-echo "configure:14005: checking MOZ_GNOMEVFS_CFLAGS" >&5
++echo "configure:14043: checking MOZ_GNOMEVFS_CFLAGS" >&5
              MOZ_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION"`
              echo "$ac_t""$MOZ_GNOMEVFS_CFLAGS" 1>&6
  
              echo $ac_n "checking MOZ_GNOMEVFS_LIBS""... $ac_c" 1>&6
--echo "configure:13998: checking MOZ_GNOMEVFS_LIBS" >&5
-+echo "configure:14036: checking MOZ_GNOMEVFS_LIBS" >&5
+-echo "configure:14010: checking MOZ_GNOMEVFS_LIBS" >&5
++echo "configure:14048: checking MOZ_GNOMEVFS_LIBS" >&5
              ## 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\"`"
-@@ -14045,7 +14083,7 @@
+@@ -14057,7 +14095,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
--echo "configure:14049: checking for $ac_word" >&5
-+echo "configure:14087: checking for $ac_word" >&5
+-echo "configure:14061: checking for $ac_word" >&5
++echo "configure:14099: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -14089,19 +14127,19 @@
+@@ -14101,19 +14139,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
--echo "configure:14093: checking for gconf-2.0 >= $GCONF_VERSION" >&5
-+echo "configure:14131: checking for gconf-2.0 >= $GCONF_VERSION" >&5
+-echo "configure:14105: checking for gconf-2.0 >= $GCONF_VERSION" >&5
++echo "configure:14143: checking for gconf-2.0 >= $GCONF_VERSION" >&5
  
          if $PKG_CONFIG --exists "gconf-2.0 >= $GCONF_VERSION" ; then
              echo "$ac_t""yes" 1>&6
              succeeded=yes
  
              echo $ac_n "checking MOZ_GCONF_CFLAGS""... $ac_c" 1>&6
--echo "configure:14100: checking MOZ_GCONF_CFLAGS" >&5
-+echo "configure:14138: checking MOZ_GCONF_CFLAGS" >&5
+-echo "configure:14112: checking MOZ_GCONF_CFLAGS" >&5
++echo "configure:14150: checking MOZ_GCONF_CFLAGS" >&5
              MOZ_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_VERSION"`
              echo "$ac_t""$MOZ_GCONF_CFLAGS" 1>&6
  
              echo $ac_n "checking MOZ_GCONF_LIBS""... $ac_c" 1>&6
--echo "configure:14105: checking MOZ_GCONF_LIBS" >&5
-+echo "configure:14143: checking MOZ_GCONF_LIBS" >&5
+-echo "configure:14117: checking MOZ_GCONF_LIBS" >&5
++echo "configure:14155: checking MOZ_GCONF_LIBS" >&5
              ## 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\"`"
-@@ -14138,6 +14176,7 @@
+@@ -14150,6 +14188,7 @@
  
      
      
@@ -4745,71 +4745,71 @@ diff -u -r1.1492.2.124 configure
  
      if test "$MOZ_ENABLE_LIBGNOME"
      then
-@@ -14148,7 +14187,7 @@
+@@ -14160,7 +14199,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
--echo "configure:14152: checking for $ac_word" >&5
-+echo "configure:14191: checking for $ac_word" >&5
+-echo "configure:14164: checking for $ac_word" >&5
++echo "configure:14203: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -14192,19 +14231,19 @@
+@@ -14204,19 +14243,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
--echo "configure:14196: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5
-+echo "configure:14235: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5
+-echo "configure:14208: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5
++echo "configure:14247: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5
  
          if $PKG_CONFIG --exists "libgnome-2.0 >= $LIBGNOME_VERSION" ; then
              echo "$ac_t""yes" 1>&6
              succeeded=yes
  
              echo $ac_n "checking MOZ_LIBGNOME_CFLAGS""... $ac_c" 1>&6
--echo "configure:14203: checking MOZ_LIBGNOME_CFLAGS" >&5
-+echo "configure:14242: checking MOZ_LIBGNOME_CFLAGS" >&5
+-echo "configure:14215: checking MOZ_LIBGNOME_CFLAGS" >&5
++echo "configure:14254: checking MOZ_LIBGNOME_CFLAGS" >&5
              MOZ_LIBGNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0 >= $LIBGNOME_VERSION"`
              echo "$ac_t""$MOZ_LIBGNOME_CFLAGS" 1>&6
  
              echo $ac_n "checking MOZ_LIBGNOME_LIBS""... $ac_c" 1>&6
--echo "configure:14208: checking MOZ_LIBGNOME_LIBS" >&5
-+echo "configure:14247: checking MOZ_LIBGNOME_LIBS" >&5
+-echo "configure:14220: checking MOZ_LIBGNOME_LIBS" >&5
++echo "configure:14259: checking MOZ_LIBGNOME_LIBS" >&5
              ## 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\"`"
-@@ -14282,7 +14321,7 @@
+@@ -14294,7 +14333,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
--echo "configure:14286: checking for $ac_word" >&5
-+echo "configure:14325: checking for $ac_word" >&5
+-echo "configure:14298: checking for $ac_word" >&5
++echo "configure:14337: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -14326,19 +14365,19 @@
+@@ -14338,19 +14377,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
--echo "configure:14330: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5
-+echo "configure:14369: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5
+-echo "configure:14342: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5
++echo "configure:14381: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5
  
          if $PKG_CONFIG --exists "libgnomeui-2.0 >= $GNOMEUI_VERSION" ; then
              echo "$ac_t""yes" 1>&6
              succeeded=yes
  
              echo $ac_n "checking MOZ_GNOMEUI_CFLAGS""... $ac_c" 1>&6
--echo "configure:14337: checking MOZ_GNOMEUI_CFLAGS" >&5
-+echo "configure:14376: checking MOZ_GNOMEUI_CFLAGS" >&5
+-echo "configure:14349: checking MOZ_GNOMEUI_CFLAGS" >&5
++echo "configure:14388: checking MOZ_GNOMEUI_CFLAGS" >&5
              MOZ_GNOMEUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= $GNOMEUI_VERSION"`
              echo "$ac_t""$MOZ_GNOMEUI_CFLAGS" 1>&6
  
              echo $ac_n "checking MOZ_GNOMEUI_LIBS""... $ac_c" 1>&6
--echo "configure:14342: checking MOZ_GNOMEUI_LIBS" >&5
-+echo "configure:14381: checking MOZ_GNOMEUI_LIBS" >&5
+-echo "configure:14354: checking MOZ_GNOMEUI_LIBS" >&5
++echo "configure:14393: checking MOZ_GNOMEUI_LIBS" >&5
              ## 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\"`"
-@@ -14389,6 +14428,221 @@
+@@ -14401,6 +14440,221 @@
  
  
  
@@ -4837,7 +4837,7 @@ diff -u -r1.1492.2.124 configure
 +    # 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
-+echo "configure:14456: checking for $ac_word" >&5
++echo "configure:14468: checking for $ac_word" >&5
 +if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
 +  echo $ac_n "(cached) $ac_c" 1>&6
 +else
@@ -4881,19 +4881,19 @@ diff -u -r1.1492.2.124 configure
 +     PKG_CONFIG_MIN_VERSION=0.9.0
 +     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
 +        echo $ac_n "checking for dbus-glib-1""... $ac_c" 1>&6
-+echo "configure:14500: checking for dbus-glib-1" >&5
++echo "configure:14512: checking for dbus-glib-1" >&5
 +
 +        if $PKG_CONFIG --exists "dbus-glib-1" ; then
 +            echo "$ac_t""yes" 1>&6
 +            succeeded=yes
 +
 +            echo $ac_n "checking MOZ_DBUS_GLIB_CFLAGS""... $ac_c" 1>&6
-+echo "configure:14507: checking MOZ_DBUS_GLIB_CFLAGS" >&5
++echo "configure:14519: checking MOZ_DBUS_GLIB_CFLAGS" >&5
 +            MOZ_DBUS_GLIB_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1"`
 +            echo "$ac_t""$MOZ_DBUS_GLIB_CFLAGS" 1>&6
 +
 +            echo $ac_n "checking MOZ_DBUS_GLIB_LIBS""... $ac_c" 1>&6
-+echo "configure:14512: checking MOZ_DBUS_GLIB_LIBS" >&5
++echo "configure:14524: checking MOZ_DBUS_GLIB_LIBS" >&5
 +            ## don't use --libs since that can do evil things like add
 +            ## -Wl,--export-dynamic
 +            MOZ_DBUS_GLIB_LIBS="`$PKG_CONFIG --libs-only-L \"dbus-glib-1\"` `$PKG_CONFIG --libs-only-l \"dbus-glib-1\"`"
@@ -4928,7 +4928,7 @@ diff -u -r1.1492.2.124 configure
 +    # 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
-+echo "configure:14547: checking for $ac_word" >&5
++echo "configure:14559: checking for $ac_word" >&5
 +if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
 +  echo $ac_n "(cached) $ac_c" 1>&6
 +else
@@ -4972,19 +4972,19 @@ diff -u -r1.1492.2.124 configure
 +     PKG_CONFIG_MIN_VERSION=0.9.0
 +     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
 +        echo $ac_n "checking for gthread-2.0""... $ac_c" 1>&6
-+echo "configure:14591: checking for gthread-2.0" >&5
++echo "configure:14603: checking for gthread-2.0" >&5
 +
 +        if $PKG_CONFIG --exists "gthread-2.0" ; then
 +            echo "$ac_t""yes" 1>&6
 +            succeeded=yes
 +
 +            echo $ac_n "checking MOZ_GTHREAD_CFLAGS""... $ac_c" 1>&6
-+echo "configure:14598: checking MOZ_GTHREAD_CFLAGS" >&5
++echo "configure:14610: checking MOZ_GTHREAD_CFLAGS" >&5
 +            MOZ_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0"`
 +            echo "$ac_t""$MOZ_GTHREAD_CFLAGS" 1>&6
 +
 +            echo $ac_n "checking MOZ_GTHREAD_LIBS""... $ac_c" 1>&6
-+echo "configure:14603: checking MOZ_GTHREAD_LIBS" >&5
++echo "configure:14615: checking MOZ_GTHREAD_LIBS" >&5
 +            ## don't use --libs since that can do evil things like add
 +            ## -Wl,--export-dynamic
 +            MOZ_GTHREAD_LIBS="`$PKG_CONFIG --libs-only-L \"gthread-2.0\"` `$PKG_CONFIG --libs-only-l \"gthread-2.0\"`"
@@ -5031,25 +5031,25 @@ diff -u -r1.1492.2.124 configure
  if (test "$MOZ_ENABLE_GTK"  || test "$MOZ_ENABLE_GTK2") \
  && test "$MOZ_ENABLE_COREXFONTS" \
  || test "$MOZ_ENABLE_XLIB" \
-@@ -14824,7 +15078,7 @@
+@@ -14836,7 +15090,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
--echo "configure:14828: checking for $ac_word" >&5
-+echo "configure:15082: checking for $ac_word" >&5
+-echo "configure:14840: checking for $ac_word" >&5
++echo "configure:15094: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_JAVAC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -14860,7 +15114,7 @@
+@@ -14872,7 +15126,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
--echo "configure:14864: checking for $ac_word" >&5
-+echo "configure:15118: checking for $ac_word" >&5
+-echo "configure:14876: checking for $ac_word" >&5
++echo "configure:15130: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_JAR'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -14935,6 +15189,13 @@
+@@ -14947,6 +15201,13 @@
      MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'`
  fi
  
@@ -5063,304 +5063,304 @@ diff -u -r1.1492.2.124 configure
  if test -z "$MOZ_JSDEBUGGER" && test `echo "$MOZ_EXTENSIONS" | grep -c venkman` -ne 0; then
      echo "configure: warning: Cannot build venkman without JavaScript debug library. Removing venkman from MOZ_EXTENSIONS." 1>&2
      MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'`
-@@ -15107,7 +15368,7 @@
+@@ -15119,7 +15380,7 @@
    gdiplus)
      MOZ_SVG_RENDERER_GDIPLUS=1
                          echo $ac_n "checking for Gdiplus.h""... $ac_c" 1>&6
--echo "configure:15111: checking for Gdiplus.h" >&5
-+echo "configure:15372: checking for Gdiplus.h" >&5
+-echo "configure:15123: checking for Gdiplus.h" >&5
++echo "configure:15384: checking for Gdiplus.h" >&5
      
      ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -15117,7 +15378,7 @@
+@@ -15129,7 +15390,7 @@
  cross_compiling=$ac_cv_prog_cxx_cross
  
      cat > conftest.$ac_ext <<EOF
--#line 15121 "configure"
-+#line 15382 "configure"
+-#line 15133 "configure"
++#line 15394 "configure"
  #include "confdefs.h"
  #include <windows.h>
                      #include <unknwn.h>
-@@ -15126,7 +15387,7 @@
+@@ -15138,7 +15399,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:15130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:15391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:15142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:15403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    echo "$ac_t""yes" 1>&6
  else
-@@ -15206,7 +15467,7 @@
+@@ -15218,7 +15479,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
--echo "configure:15210: checking for $ac_word" >&5
-+echo "configure:15471: checking for $ac_word" >&5
+-echo "configure:15222: checking for $ac_word" >&5
++echo "configure:15483: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_MAKENSIS'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -15251,7 +15512,7 @@
+@@ -15263,7 +15524,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
--echo "configure:15255: checking for $ac_word" >&5
-+echo "configure:15516: checking for $ac_word" >&5
+-echo "configure:15267: checking for $ac_word" >&5
++echo "configure:15528: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_HOST_ICONV'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -15320,13 +15581,13 @@
+@@ -15332,13 +15593,13 @@
      msvc*|mks*|cygwin*|mingw*|wince*)
          if test -n "$MOZ_UPDATER"; then
              echo $ac_n "checking for iconv""... $ac_c" 1>&6
--echo "configure:15324: checking for iconv" >&5
-+echo "configure:15585: checking for iconv" >&5
+-echo "configure:15336: checking for iconv" >&5
++echo "configure:15597: checking for iconv" >&5
              for ac_prog in $HOST_ICONV "iconv"
  do
  # 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
--echo "configure:15330: checking for $ac_word" >&5
-+echo "configure:15591: checking for $ac_word" >&5
+-echo "configure:15342: checking for $ac_word" >&5
++echo "configure:15603: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_HOST_ICONV'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -15672,18 +15933,18 @@
+@@ -15684,18 +15945,18 @@
  
  if test -n "$MOZ_DEBUG"; then
      echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6
--echo "configure:15676: checking for valid debug flags" >&5
-+echo "configure:15937: checking for valid debug flags" >&5
+-echo "configure:15688: checking for valid debug flags" >&5
++echo "configure:15949: checking for valid debug flags" >&5
      _SAVE_CFLAGS=$CFLAGS
      CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS"
      cat > conftest.$ac_ext <<EOF
--#line 15680 "configure"
-+#line 15941 "configure"
+-#line 15692 "configure"
++#line 15953 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int main() {
  printf("Hello World\n");
  ; return 0; }
  EOF
--if { (eval echo configure:15687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:15948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:15699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:15960: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    _results=yes
  else
-@@ -15724,18 +15985,18 @@
+@@ -15736,18 +15997,18 @@
  if test "$COMPILE_ENVIRONMENT"; then
  if test -n "$MOZ_OPTIMIZE"; then
      echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6
--echo "configure:15728: checking for valid optimization flags" >&5
-+echo "configure:15989: checking for valid optimization flags" >&5
+-echo "configure:15740: checking for valid optimization flags" >&5
++echo "configure:16001: checking for valid optimization flags" >&5
      _SAVE_CFLAGS=$CFLAGS
      CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS"
      cat > conftest.$ac_ext <<EOF
--#line 15732 "configure"
-+#line 15993 "configure"
+-#line 15744 "configure"
++#line 16005 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int main() {
  printf("Hello World\n");
  ; return 0; }
  EOF
--if { (eval echo configure:15739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:16000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:15751: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:16012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    _results=yes
  else
-@@ -15952,7 +16213,7 @@
+@@ -15964,7 +16225,7 @@
  
  if test -n "$_ENABLE_EFENCE"; then
      echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6
--echo "configure:15956: checking for malloc in -lefence" >&5
-+echo "configure:16217: checking for malloc in -lefence" >&5
+-echo "configure:15968: checking for malloc in -lefence" >&5
++echo "configure:16229: checking for malloc in -lefence" >&5
  ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -15960,7 +16221,7 @@
+@@ -15972,7 +16233,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lefence  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 15964 "configure"
-+#line 16225 "configure"
+-#line 15976 "configure"
++#line 16237 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -15971,7 +16232,7 @@
+@@ -15983,7 +16244,7 @@
  malloc()
  ; return 0; }
  EOF
--if { (eval echo configure:15975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:16236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:15987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:16248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -16072,12 +16333,12 @@
+@@ -16084,12 +16345,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
--echo "configure:16076: checking for $ac_func" >&5
-+echo "configure:16337: checking for $ac_func" >&5
+-echo "configure:16088: checking for $ac_func" >&5
++echo "configure:16349: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 16081 "configure"
-+#line 16342 "configure"
+-#line 16093 "configure"
++#line 16354 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -16103,7 +16364,7 @@
+@@ -16115,7 +16376,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:16107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:16368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:16119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:16380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -16346,12 +16607,12 @@
+@@ -16358,12 +16619,12 @@
      for ac_func in __cxa_demangle
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:16350: checking for $ac_func" >&5
-+echo "configure:16611: checking for $ac_func" >&5
+-echo "configure:16362: checking for $ac_func" >&5
++echo "configure:16623: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 16355 "configure"
-+#line 16616 "configure"
+-#line 16367 "configure"
++#line 16628 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -16377,7 +16638,7 @@
+@@ -16389,7 +16650,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:16381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:16642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:16393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:16654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -16515,7 +16776,7 @@
+@@ -16527,7 +16788,7 @@
  # Compiler Options
  
  echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6
--echo "configure:16519: checking for gcc -pipe support" >&5
-+echo "configure:16780: checking for gcc -pipe support" >&5
+-echo "configure:16531: checking for gcc -pipe support" >&5
++echo "configure:16792: checking for gcc -pipe support" >&5
  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
-@@ -16530,14 +16791,14 @@
+@@ -16542,14 +16803,14 @@
          _SAVE_CFLAGS=$CFLAGS
          CFLAGS="$CFLAGS -pipe"
          cat > conftest.$ac_ext <<EOF
--#line 16534 "configure"
-+#line 16795 "configure"
+-#line 16546 "configure"
++#line 16807 "configure"
  #include "confdefs.h"
   #include <stdio.h> 
  int main() {
  printf("Hello World\n");
  ; return 0; }
  EOF
--if { (eval echo configure:16541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:16802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:16553: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:16814: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    _res_gcc_pipe="yes"
  else
-@@ -16579,16 +16840,16 @@
+@@ -16591,16 +16852,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
--echo "configure:16583: checking whether compiler supports -Wno-long-long" >&5
-+echo "configure:16844: checking whether compiler supports -Wno-long-long" >&5
+-echo "configure:16595: checking whether compiler supports -Wno-long-long" >&5
++echo "configure:16856: checking whether compiler supports -Wno-long-long" >&5
       cat > conftest.$ac_ext <<EOF
--#line 16585 "configure"
-+#line 16846 "configure"
+-#line 16597 "configure"
++#line 16858 "configure"
  #include "confdefs.h"
  
  int main() {
  return(0);
  ; return 0; }
  EOF
--if { (eval echo configure:16592: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:16853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:16604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:16865: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
     _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
  	  _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
-@@ -16609,16 +16870,16 @@
+@@ -16621,16 +16882,16 @@
  CFLAGS="$CFLAGS -fprofile-generate"
  
  echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6
--echo "configure:16613: checking whether C compiler supports -fprofile-generate" >&5
-+echo "configure:16874: checking whether C compiler supports -fprofile-generate" >&5
+-echo "configure:16625: checking whether C compiler supports -fprofile-generate" >&5
++echo "configure:16886: checking whether C compiler supports -fprofile-generate" >&5
  cat > conftest.$ac_ext <<EOF
--#line 16615 "configure"
-+#line 16876 "configure"
+-#line 16627 "configure"
++#line 16888 "configure"
  #include "confdefs.h"
  
  int main() {
  return 0;
  ; return 0; }
  EOF
--if { (eval echo configure:16622: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:16883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:16634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:16895: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
     PROFILE_GEN_CFLAGS="-fprofile-generate"
                   result="yes" 
-@@ -16636,16 +16897,16 @@
+@@ -16648,16 +16909,16 @@
  else
    CFLAGS="$_SAVE_CFLAGS -fprofile-arcs"
    echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6
--echo "configure:16640: checking whether C compiler supports -fprofile-arcs" >&5
-+echo "configure:16901: checking whether C compiler supports -fprofile-arcs" >&5
+-echo "configure:16652: checking whether C compiler supports -fprofile-arcs" >&5
++echo "configure:16913: checking whether C compiler supports -fprofile-arcs" >&5
    cat > conftest.$ac_ext <<EOF
--#line 16642 "configure"
-+#line 16903 "configure"
+-#line 16654 "configure"
++#line 16915 "configure"
  #include "confdefs.h"
  
  int main() {
  return 0;
  ; return 0; }
  EOF
--if { (eval echo configure:16649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:16910: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:16661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:16922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
     PROFILE_GEN_CFLAGS="-fprofile-arcs"
                     result="yes" 
-@@ -16691,16 +16952,16 @@
+@@ -16703,16 +16964,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
--echo "configure:16695: checking whether C++ compiler has -pedantic long long bug" >&5
-+echo "configure:16956: checking whether C++ compiler has -pedantic long long bug" >&5
+-echo "configure:16707: checking whether C++ compiler has -pedantic long long bug" >&5
++echo "configure:16968: checking whether C++ compiler has -pedantic long long bug" >&5
      cat > conftest.$ac_ext <<EOF
--#line 16697 "configure"
-+#line 16958 "configure"
+-#line 16709 "configure"
++#line 16970 "configure"
  #include "confdefs.h"
  $configure_static_assert_macros
  int main() {
  CONFIGURE_STATIC_ASSERT(sizeof(long long) == 8)
  ; return 0; }
  EOF
--if { (eval echo configure:16704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:16965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:16716: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:16977: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    result="no"
  else
-@@ -16725,13 +16986,16 @@
+@@ -16737,13 +16998,16 @@
  fi
  
  echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6
--echo "configure:16729: checking for correct temporary object destruction order" >&5
-+echo "configure:16990: checking for correct temporary object destruction order" >&5
+-echo "configure:16741: checking for correct temporary object destruction order" >&5
++echo "configure:17002: checking for correct temporary object destruction order" >&5
  if test "$cross_compiling" = yes; then
    result="maybe"
  else
    cat > conftest.$ac_ext <<EOF
--#line 16734 "configure"
-+#line 16995 "configure"
+-#line 16746 "configure"
++#line 17007 "configure"
  #include "confdefs.h"
 +#ifdef __cplusplus
 +extern "C" void exit(int);
@@ -5368,652 +5368,652 @@ diff -u -r1.1492.2.124 configure
   class A {
               public:  A(int& x) : mValue(x) {}
                        ~A() { mValue--; }
-@@ -16750,7 +17014,7 @@
+@@ -16762,7 +17026,7 @@
               }
               
  EOF
--if { (eval echo configure:16754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:17018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:16766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:17030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    result="yes"
  else
-@@ -16771,12 +17035,12 @@
+@@ -16783,12 +17047,12 @@
  _SAVE_CXXFLAGS=$CXXFLAGS
  CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}"
  echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6
--echo "configure:16775: checking for correct overload resolution with const and templates" >&5
-+echo "configure:17039: checking for correct overload resolution with const and templates" >&5
+-echo "configure:16787: checking for correct overload resolution with const and templates" >&5
++echo "configure:17051: checking for correct overload resolution with const and templates" >&5
  if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 16780 "configure"
-+#line 17044 "configure"
+-#line 16792 "configure"
++#line 17056 "configure"
  #include "confdefs.h"
  
                        template <class T>
-@@ -16806,7 +17070,7 @@
+@@ -16818,7 +17082,7 @@
                      
  ; return 0; }
  EOF
--if { (eval echo configure:16810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17074: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:16822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:17086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_nscap_nonconst_opeq_bug="no"
  else
-@@ -17098,7 +17362,7 @@
+@@ -17110,7 +17374,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
--echo "configure:17102: checking for $ac_word" >&5
-+echo "configure:17366: checking for $ac_word" >&5
+-echo "configure:17114: checking for $ac_word" >&5
++echo "configure:17378: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -17142,19 +17406,19 @@
+@@ -17154,19 +17418,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
--echo "configure:17146: checking for libIDL-2.0 >= 0.8.0" >&5
-+echo "configure:17410: checking for libIDL-2.0 >= 0.8.0" >&5
+-echo "configure:17158: checking for libIDL-2.0 >= 0.8.0" >&5
++echo "configure:17422: checking for libIDL-2.0 >= 0.8.0" >&5
  
          if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then
              echo "$ac_t""yes" 1>&6
              succeeded=yes
  
              echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6
--echo "configure:17153: checking LIBIDL_CFLAGS" >&5
-+echo "configure:17417: checking LIBIDL_CFLAGS" >&5
+-echo "configure:17165: checking LIBIDL_CFLAGS" >&5
++echo "configure:17429: checking LIBIDL_CFLAGS" >&5
              LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"`
              echo "$ac_t""$LIBIDL_CFLAGS" 1>&6
  
              echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6
--echo "configure:17158: checking LIBIDL_LIBS" >&5
-+echo "configure:17422: checking LIBIDL_LIBS" >&5
+-echo "configure:17170: checking LIBIDL_LIBS" >&5
++echo "configure:17434: checking LIBIDL_LIBS" >&5
              ## 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\"`"
-@@ -17277,7 +17541,7 @@
+@@ -17289,7 +17553,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
--echo "configure:17281: checking for $ac_word" >&5
-+echo "configure:17545: checking for $ac_word" >&5
+-echo "configure:17293: checking for $ac_word" >&5
++echo "configure:17557: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -17312,7 +17576,7 @@
+@@ -17324,7 +17588,7 @@
  
    min_glib_version=1.2.0
    echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
--echo "configure:17316: checking for GLIB - version >= $min_glib_version" >&5
-+echo "configure:17580: checking for GLIB - version >= $min_glib_version" >&5
+-echo "configure:17328: checking for GLIB - version >= $min_glib_version" >&5
++echo "configure:17592: checking for GLIB - version >= $min_glib_version" >&5
    no_glib=""
    if test "$GLIB_CONFIG" = "no" ; then
      no_glib=yes
-@@ -17335,7 +17599,7 @@
+@@ -17347,7 +17611,7 @@
    echo $ac_n "cross compiling; assumed OK... $ac_c"
  else
    cat > conftest.$ac_ext <<EOF
--#line 17339 "configure"
-+#line 17603 "configure"
+-#line 17351 "configure"
++#line 17615 "configure"
  #include "confdefs.h"
  
  #include <glib.h>
-@@ -17411,7 +17675,7 @@
+@@ -17423,7 +17687,7 @@
  }
  
  EOF
--if { (eval echo configure:17415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:17679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:17427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:17691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    :
  else
-@@ -17445,7 +17709,7 @@
+@@ -17457,7 +17721,7 @@
            CFLAGS="$CFLAGS $GLIB_CFLAGS"
            LIBS="$LIBS $GLIB_LIBS"
            cat > conftest.$ac_ext <<EOF
--#line 17449 "configure"
-+#line 17713 "configure"
+-#line 17461 "configure"
++#line 17725 "configure"
  #include "confdefs.h"
  
  #include <glib.h>
-@@ -17455,7 +17719,7 @@
+@@ -17467,7 +17731,7 @@
   return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); 
  ; return 0; }
  EOF
--if { (eval echo configure:17459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:17723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:17471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:17735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    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"
-@@ -17499,7 +17763,7 @@
+@@ -17511,7 +17775,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
--echo "configure:17503: checking for $ac_word" >&5
-+echo "configure:17767: checking for $ac_word" >&5
+-echo "configure:17515: checking for $ac_word" >&5
++echo "configure:17779: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -17534,7 +17798,7 @@
+@@ -17546,7 +17810,7 @@
  
    min_libIDL_version=$LIBIDL_VERSION
    echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
--echo "configure:17538: checking for libIDL - version >= $min_libIDL_version" >&5
-+echo "configure:17802: checking for libIDL - version >= $min_libIDL_version" >&5
+-echo "configure:17550: checking for libIDL - version >= $min_libIDL_version" >&5
++echo "configure:17814: checking for libIDL - version >= $min_libIDL_version" >&5
    no_libIDL=""
    if test "$LIBIDL_CONFIG" = "no" ; then
      no_libIDL=yes
-@@ -17561,7 +17825,7 @@
+@@ -17573,7 +17837,7 @@
    echo $ac_n "cross compiling; assumed OK... $ac_c"
  else
    cat > conftest.$ac_ext <<EOF
--#line 17565 "configure"
-+#line 17829 "configure"
+-#line 17577 "configure"
++#line 17841 "configure"
  #include "confdefs.h"
  
  #include <stdio.h>
-@@ -17647,7 +17911,7 @@
+@@ -17659,7 +17923,7 @@
  }
  
  EOF
--if { (eval echo configure:17651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:17915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:17663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:17927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    :
  else
-@@ -17681,7 +17945,7 @@
+@@ -17693,7 +17957,7 @@
            CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
            LIBS="$LIBS $LIBIDL_LIBS"
            cat > conftest.$ac_ext <<EOF
--#line 17685 "configure"
-+#line 17949 "configure"
+-#line 17697 "configure"
++#line 17961 "configure"
  #include "confdefs.h"
  
  #include <stdio.h>
-@@ -17692,7 +17956,7 @@
+@@ -17704,7 +17968,7 @@
   return IDL_get_libver_string ? 1 : 0; 
  ; return 0; }
  EOF
--if { (eval echo configure:17696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:17960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:17708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:17972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    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"
-@@ -17820,7 +18084,7 @@
+@@ -17832,7 +18096,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
--echo "configure:17824: checking for $ac_word" >&5
-+echo "configure:18088: checking for $ac_word" >&5
+-echo "configure:17836: checking for $ac_word" >&5
++echo "configure:18100: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -17855,7 +18119,7 @@
+@@ -17867,7 +18131,7 @@
  
    min_glib_version=1.2.0
    echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
--echo "configure:17859: checking for GLIB - version >= $min_glib_version" >&5
-+echo "configure:18123: checking for GLIB - version >= $min_glib_version" >&5
+-echo "configure:17871: checking for GLIB - version >= $min_glib_version" >&5
++echo "configure:18135: checking for GLIB - version >= $min_glib_version" >&5
    no_glib=""
    if test "$GLIB_CONFIG" = "no" ; then
      no_glib=yes
-@@ -17878,7 +18142,7 @@
+@@ -17890,7 +18154,7 @@
    echo $ac_n "cross compiling; assumed OK... $ac_c"
  else
    cat > conftest.$ac_ext <<EOF
--#line 17882 "configure"
-+#line 18146 "configure"
+-#line 17894 "configure"
++#line 18158 "configure"
  #include "confdefs.h"
  
  #include <glib.h>
-@@ -17954,7 +18218,7 @@
+@@ -17966,7 +18230,7 @@
  }
  
  EOF
--if { (eval echo configure:17958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:18222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:17970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:18234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    :
  else
-@@ -17988,7 +18252,7 @@
+@@ -18000,7 +18264,7 @@
            CFLAGS="$CFLAGS $GLIB_CFLAGS"
            LIBS="$LIBS $GLIB_LIBS"
            cat > conftest.$ac_ext <<EOF
--#line 17992 "configure"
-+#line 18256 "configure"
+-#line 18004 "configure"
++#line 18268 "configure"
  #include "confdefs.h"
  
  #include <glib.h>
-@@ -17998,7 +18262,7 @@
+@@ -18010,7 +18274,7 @@
   return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); 
  ; return 0; }
  EOF
--if { (eval echo configure:18002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:18014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    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"
-@@ -18042,7 +18306,7 @@
+@@ -18054,7 +18318,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
--echo "configure:18046: checking for $ac_word" >&5
-+echo "configure:18310: checking for $ac_word" >&5
+-echo "configure:18058: checking for $ac_word" >&5
++echo "configure:18322: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18077,7 +18341,7 @@
+@@ -18089,7 +18353,7 @@
  
    min_libIDL_version=$LIBIDL_VERSION
    echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
--echo "configure:18081: checking for libIDL - version >= $min_libIDL_version" >&5
-+echo "configure:18345: checking for libIDL - version >= $min_libIDL_version" >&5
+-echo "configure:18093: checking for libIDL - version >= $min_libIDL_version" >&5
++echo "configure:18357: checking for libIDL - version >= $min_libIDL_version" >&5
    no_libIDL=""
    if test "$LIBIDL_CONFIG" = "no" ; then
      no_libIDL=yes
-@@ -18104,7 +18368,7 @@
+@@ -18116,7 +18380,7 @@
    echo $ac_n "cross compiling; assumed OK... $ac_c"
  else
    cat > conftest.$ac_ext <<EOF
--#line 18108 "configure"
-+#line 18372 "configure"
+-#line 18120 "configure"
++#line 18384 "configure"
  #include "confdefs.h"
  
  #include <stdio.h>
-@@ -18190,7 +18454,7 @@
+@@ -18202,7 +18466,7 @@
  }
  
  EOF
--if { (eval echo configure:18194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:18458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:18206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:18470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    :
  else
-@@ -18224,7 +18488,7 @@
+@@ -18236,7 +18500,7 @@
            CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
            LIBS="$LIBS $LIBIDL_LIBS"
            cat > conftest.$ac_ext <<EOF
--#line 18228 "configure"
-+#line 18492 "configure"
+-#line 18240 "configure"
++#line 18504 "configure"
  #include "confdefs.h"
  
  #include <stdio.h>
-@@ -18235,7 +18499,7 @@
+@@ -18247,7 +18511,7 @@
   return IDL_get_libver_string ? 1 : 0; 
  ; return 0; }
  EOF
--if { (eval echo configure:18239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:18251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    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"
-@@ -18276,7 +18540,7 @@
+@@ -18288,7 +18552,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
--echo "configure:18280: checking for $ac_word" >&5
-+echo "configure:18544: checking for $ac_word" >&5
+-echo "configure:18292: checking for $ac_word" >&5
++echo "configure:18556: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18320,19 +18584,19 @@
+@@ -18332,19 +18596,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
--echo "configure:18324: checking for libIDL-2.0 >= 0.8.0" >&5
-+echo "configure:18588: checking for libIDL-2.0 >= 0.8.0" >&5
+-echo "configure:18336: checking for libIDL-2.0 >= 0.8.0" >&5
++echo "configure:18600: checking for libIDL-2.0 >= 0.8.0" >&5
  
          if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then
              echo "$ac_t""yes" 1>&6
              succeeded=yes
  
              echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6
--echo "configure:18331: checking LIBIDL_CFLAGS" >&5
-+echo "configure:18595: checking LIBIDL_CFLAGS" >&5
+-echo "configure:18343: checking LIBIDL_CFLAGS" >&5
++echo "configure:18607: checking LIBIDL_CFLAGS" >&5
              LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"`
              echo "$ac_t""$LIBIDL_CFLAGS" 1>&6
  
              echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6
--echo "configure:18336: checking LIBIDL_LIBS" >&5
-+echo "configure:18600: checking LIBIDL_LIBS" >&5
+-echo "configure:18348: checking LIBIDL_LIBS" >&5
++echo "configure:18612: checking LIBIDL_LIBS" >&5
              ## 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\"`"
-@@ -18368,7 +18632,7 @@
+@@ -18380,7 +18644,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
--echo "configure:18372: checking for $ac_word" >&5
-+echo "configure:18636: checking for $ac_word" >&5
+-echo "configure:18384: checking for $ac_word" >&5
++echo "configure:18648: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18405,7 +18669,7 @@
+@@ -18417,7 +18681,7 @@
  
          if test -n "$ORBIT_CONFIG"; then
              echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6
--echo "configure:18409: checking for ORBit libIDL usability" >&5
-+echo "configure:18673: checking for ORBit libIDL usability" >&5
+-echo "configure:18421: checking for ORBit libIDL usability" >&5
++echo "configure:18685: checking for ORBit libIDL usability" >&5
          	_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}`
-@@ -18422,7 +18686,7 @@
+@@ -18434,7 +18698,7 @@
                  result="maybe" 
  else
    cat > conftest.$ac_ext <<EOF
--#line 18426 "configure"
-+#line 18690 "configure"
+-#line 18438 "configure"
++#line 18702 "configure"
  #include "confdefs.h"
  
  #include <stdlib.h>
-@@ -18437,7 +18701,7 @@
+@@ -18449,7 +18713,7 @@
  }
              
  EOF
--if { (eval echo configure:18441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:18705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:18453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:18717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    _LIBIDL_FOUND=1
                  result="yes"
-@@ -18494,7 +18758,7 @@
+@@ -18506,7 +18770,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
--echo "configure:18498: checking for $ac_word" >&5
-+echo "configure:18762: checking for $ac_word" >&5
+-echo "configure:18510: checking for $ac_word" >&5
++echo "configure:18774: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18538,19 +18802,19 @@
+@@ -18550,19 +18814,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
--echo "configure:18542: checking for glib-2.0 >= 1.3.7" >&5
-+echo "configure:18806: checking for glib-2.0 >= 1.3.7" >&5
+-echo "configure:18554: checking for glib-2.0 >= 1.3.7" >&5
++echo "configure:18818: checking for glib-2.0 >= 1.3.7" >&5
  
          if $PKG_CONFIG --exists "glib-2.0 >= 1.3.7" ; then
              echo "$ac_t""yes" 1>&6
              succeeded=yes
  
              echo $ac_n "checking GLIB_CFLAGS""... $ac_c" 1>&6
--echo "configure:18549: checking GLIB_CFLAGS" >&5
-+echo "configure:18813: checking GLIB_CFLAGS" >&5
+-echo "configure:18561: checking GLIB_CFLAGS" >&5
++echo "configure:18825: checking GLIB_CFLAGS" >&5
              GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 1.3.7"`
              echo "$ac_t""$GLIB_CFLAGS" 1>&6
  
              echo $ac_n "checking GLIB_LIBS""... $ac_c" 1>&6
--echo "configure:18554: checking GLIB_LIBS" >&5
-+echo "configure:18818: checking GLIB_LIBS" >&5
+-echo "configure:18566: checking GLIB_LIBS" >&5
++echo "configure:18830: checking GLIB_LIBS" >&5
              ## 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\"`"
-@@ -18634,7 +18898,7 @@
+@@ -18646,7 +18910,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
--echo "configure:18638: checking for $ac_word" >&5
-+echo "configure:18902: checking for $ac_word" >&5
+-echo "configure:18650: checking for $ac_word" >&5
++echo "configure:18914: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18669,7 +18933,7 @@
+@@ -18681,7 +18945,7 @@
  
    min_glib_version=${GLIB_VERSION}
    echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
--echo "configure:18673: checking for GLIB - version >= $min_glib_version" >&5
-+echo "configure:18937: checking for GLIB - version >= $min_glib_version" >&5
+-echo "configure:18685: checking for GLIB - version >= $min_glib_version" >&5
++echo "configure:18949: checking for GLIB - version >= $min_glib_version" >&5
    no_glib=""
    if test "$GLIB_CONFIG" = "no" ; then
      no_glib=yes
-@@ -18692,7 +18956,7 @@
+@@ -18704,7 +18968,7 @@
    echo $ac_n "cross compiling; assumed OK... $ac_c"
  else
    cat > conftest.$ac_ext <<EOF
--#line 18696 "configure"
-+#line 18960 "configure"
+-#line 18708 "configure"
++#line 18972 "configure"
  #include "confdefs.h"
  
  #include <glib.h>
-@@ -18768,7 +19032,7 @@
+@@ -18780,7 +19044,7 @@
  }
  
  EOF
--if { (eval echo configure:18772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:19036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:18784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:19048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    :
  else
-@@ -18802,7 +19066,7 @@
+@@ -18814,7 +19078,7 @@
            CFLAGS="$CFLAGS $GLIB_CFLAGS"
            LIBS="$LIBS $GLIB_LIBS"
            cat > conftest.$ac_ext <<EOF
--#line 18806 "configure"
-+#line 19070 "configure"
+-#line 18818 "configure"
++#line 19082 "configure"
  #include "confdefs.h"
  
  #include <glib.h>
-@@ -18812,7 +19076,7 @@
+@@ -18824,7 +19088,7 @@
   return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); 
  ; return 0; }
  EOF
--if { (eval echo configure:18816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:19080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:18828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:19092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    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"
-@@ -18892,19 +19156,19 @@
+@@ -18904,19 +19168,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
--echo "configure:18896: checking for working alloca.h" >&5
-+echo "configure:19160: checking for working alloca.h" >&5
+-echo "configure:18908: checking for working alloca.h" >&5
++echo "configure:19172: checking for working alloca.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 18901 "configure"
-+#line 19165 "configure"
+-#line 18913 "configure"
++#line 19177 "configure"
  #include "confdefs.h"
  #include <alloca.h>
  int main() {
  char *p = alloca(2 * sizeof(int));
  ; return 0; }
  EOF
--if { (eval echo configure:18908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:19172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:18920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:19184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_header_alloca_h=yes
  else
-@@ -18925,12 +19189,12 @@
+@@ -18937,12 +19201,12 @@
  fi
  
  echo $ac_n "checking for alloca""... $ac_c" 1>&6
--echo "configure:18929: checking for alloca" >&5
-+echo "configure:19193: checking for alloca" >&5
+-echo "configure:18941: checking for alloca" >&5
++echo "configure:19205: checking for alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 18934 "configure"
-+#line 19198 "configure"
+-#line 18946 "configure"
++#line 19210 "configure"
  #include "confdefs.h"
  
  #ifdef __GNUC__
-@@ -18958,7 +19222,7 @@
+@@ -18970,7 +19234,7 @@
  char *p = (char *) alloca(1);
  ; return 0; }
  EOF
--if { (eval echo configure:18962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:19226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:18974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:19238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_func_alloca_works=yes
  else
-@@ -18990,12 +19254,12 @@
+@@ -19002,12 +19266,12 @@
  
  
  echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
--echo "configure:18994: checking whether alloca needs Cray hooks" >&5
-+echo "configure:19258: checking whether alloca needs Cray hooks" >&5
+-echo "configure:19006: checking whether alloca needs Cray hooks" >&5
++echo "configure:19270: checking whether alloca needs Cray hooks" >&5
  if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 18999 "configure"
-+#line 19263 "configure"
+-#line 19011 "configure"
++#line 19275 "configure"
  #include "confdefs.h"
  #if defined(CRAY) && ! defined(CRAY2)
  webecray
-@@ -19020,12 +19284,12 @@
+@@ -19032,12 +19296,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
--echo "configure:19024: checking for $ac_func" >&5
-+echo "configure:19288: checking for $ac_func" >&5
+-echo "configure:19036: checking for $ac_func" >&5
++echo "configure:19300: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 19029 "configure"
-+#line 19293 "configure"
+-#line 19041 "configure"
++#line 19305 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -19048,7 +19312,7 @@
+@@ -19060,7 +19324,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:19052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:19316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:19064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:19328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -19075,7 +19339,7 @@
+@@ -19087,7 +19351,7 @@
  fi
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
--echo "configure:19079: checking stack direction for C alloca" >&5
-+echo "configure:19343: checking stack direction for C alloca" >&5
+-echo "configure:19091: checking stack direction for C alloca" >&5
++echo "configure:19355: checking stack direction for C alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -19083,7 +19347,7 @@
+@@ -19095,7 +19359,7 @@
    ac_cv_c_stack_direction=0
  else
    cat > conftest.$ac_ext <<EOF
--#line 19087 "configure"
-+#line 19351 "configure"
+-#line 19099 "configure"
++#line 19363 "configure"
  #include "confdefs.h"
  find_stack_direction ()
  {
-@@ -19102,7 +19366,7 @@
+@@ -19114,7 +19378,7 @@
    exit (find_stack_direction() < 0);
  }
  EOF
--if { (eval echo configure:19106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:19370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:19118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:19382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_c_stack_direction=1
  else
-@@ -19151,17 +19415,17 @@
+@@ -19163,17 +19427,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:19155: checking for $ac_hdr" >&5
-+echo "configure:19419: checking for $ac_hdr" >&5
+-echo "configure:19167: checking for $ac_hdr" >&5
++echo "configure:19431: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 19160 "configure"
-+#line 19424 "configure"
+-#line 19172 "configure"
++#line 19436 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:19165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:19429: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:19177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:19441: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -19252,7 +19516,7 @@
+@@ -19264,7 +19528,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
--echo "configure:19256: checking for $ac_word" >&5
-+echo "configure:19520: checking for $ac_word" >&5
+-echo "configure:19268: checking for $ac_word" >&5
++echo "configure:19532: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -19296,19 +19560,19 @@
+@@ -19308,19 +19572,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
--echo "configure:19300: checking for cairo >= $CAIRO_VERSION" >&5
-+echo "configure:19564: checking for cairo >= $CAIRO_VERSION" >&5
+-echo "configure:19312: checking for cairo >= $CAIRO_VERSION" >&5
++echo "configure:19576: checking for cairo >= $CAIRO_VERSION" >&5
  
          if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then
              echo "$ac_t""yes" 1>&6
              succeeded=yes
  
              echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6
--echo "configure:19307: checking CAIRO_CFLAGS" >&5
-+echo "configure:19571: checking CAIRO_CFLAGS" >&5
+-echo "configure:19319: checking CAIRO_CFLAGS" >&5
++echo "configure:19583: checking CAIRO_CFLAGS" >&5
              CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"`
              echo "$ac_t""$CAIRO_CFLAGS" 1>&6
  
              echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6
--echo "configure:19312: checking CAIRO_LIBS" >&5
-+echo "configure:19576: checking CAIRO_LIBS" >&5
+-echo "configure:19324: checking CAIRO_LIBS" >&5
++echo "configure:19588: checking CAIRO_LIBS" >&5
              ## 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\"`"
-@@ -19373,7 +19637,7 @@
+@@ -19385,7 +19649,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
--echo "configure:19377: checking for $ac_word" >&5
-+echo "configure:19641: checking for $ac_word" >&5
+-echo "configure:19389: checking for $ac_word" >&5
++echo "configure:19653: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -19649,14 +19913,14 @@
+@@ -19661,14 +19925,14 @@
  cross_compiling=$ac_cv_prog_cc_cross
  
      cat > conftest.$ac_ext <<EOF
--#line 19653 "configure"
-+#line 19917 "configure"
+-#line 19665 "configure"
++#line 19929 "configure"
  #include "confdefs.h"
  #include <gmodule.h>
  int main() {
   int x = 1; x++; 
  ; return 0; }
  EOF
--if { (eval echo configure:19660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:19672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:19936: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    :
  else
    echo "configure: failed program was:" >&5
-@@ -19963,7 +20227,7 @@
+@@ -19975,7 +20239,7 @@
                  _SAVE_CFLAGS=$CFLAGS
      CFLAGS="$CFLAGS $XCFLAGS"
      cat > conftest.$ac_ext <<EOF
--#line 19967 "configure"
-+#line 20231 "configure"
+-#line 19979 "configure"
++#line 20243 "configure"
  #include "confdefs.h"
  
          #include <stdio.h>
-@@ -19979,7 +20243,7 @@
+@@ -19991,7 +20255,7 @@
      
  ; return 0; }
  EOF
--if { (eval echo configure:19983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:20247: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:19995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:20259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    :
  else
    echo "configure: failed program was:" >&5
-@@ -20197,34 +20461,15 @@
+@@ -20209,34 +20473,15 @@
  # Transform confdefs.h into DEFS.
  # Protect against shell expansion while executing Makefile rules.
  # Protect against Makefile macro expansion.
@@ -6057,7 +6057,7 @@ diff -u -r1.1492.2.124 configure
  
  MOZ_DEFINES=$DEFS
  
-@@ -20472,6 +20717,9 @@
+@@ -20484,6 +20729,9 @@
  s%@MOZ_GTK2_LIBS@%$MOZ_GTK2_LIBS%g
  s%@HOST_MOC@%$HOST_MOC%g
  s%@MOZ_DEFAULT_TOOLKIT@%$MOZ_DEFAULT_TOOLKIT%g
@@ -6067,7 +6067,7 @@ diff -u -r1.1492.2.124 configure
  s%@TK_CFLAGS@%$TK_CFLAGS%g
  s%@TK_LIBS@%$TK_LIBS%g
  s%@MOZ_ENABLE_GTK@%$MOZ_ENABLE_GTK%g
-@@ -20519,12 +20767,18 @@
+@@ -20531,12 +20779,18 @@
  s%@MOZ_GNOMEVFS_LIBS@%$MOZ_GNOMEVFS_LIBS%g
  s%@MOZ_GCONF_CFLAGS@%$MOZ_GCONF_CFLAGS%g
  s%@MOZ_GCONF_LIBS@%$MOZ_GCONF_LIBS%g
diff --git a/dbus.patch b/dbus.patch
index 2f4f98a..d9019a3 100644
--- a/dbus.patch
+++ b/dbus.patch
@@ -77,7 +77,7 @@ Index: configure.in
      MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'`
 --- extensions/dbus/Makefile.in
 +++ extensions/dbus/Makefile.in
-@@ -0,0 +1,68 @@
+@@ -0,0 +1,70 @@
 +# ###### BEGIN LICENSE BLOCK ######
 +# Version: NPL 1.1/GPL 2.0/LGPL 2.1
 +#
@@ -134,9 +134,11 @@ Index: configure.in
 +                      embedcomponents \
 +            $(NULL)
 +
-+EXTRA_DSO_LDOPTS = $(MOZ_DBUS_GLIB_LIBS) \
-+                   $(MOZ_GTHREAD_LIBS) \
-+                   $(MOZ_COMPONENT_LIBS)
++EXTRA_DSO_LDOPTS = $(XPCOM_GLUE_LDOPTS) \
++                   $(NSPR_LIBS) \
++                   $(MOZ_DBUS_GLIB_LIBS) \
++	            $(MOZ_GTHREAD_LIBS) \
++		    $(NULL)
 +                
 +CPPSRCS =   \
 +  nsDBusModule.cpp         \
@@ -563,3 +565,20 @@ Index: configure.in
 +};
 +
 +NS_IMPL_NSGETMODULE(nsDBusModule, components)
+Index: config/system-headers
+===================================================================
+RCS file: /cvsroot/mozilla/config/system-headers,v
+retrieving revision 3.4.4.3
+diff -u -r3.4.4.3 system-headers
+--- config/system-headers	18 Dec 2006 23:48:58 -0000	3.4.4.3
++++ config/system-headers	13 Nov 2007 23:04:10 -0000
+@@ -141,6 +141,9 @@
+ curses.h
+ cxxabi.h
+ DateTimeUtils.h
++dbus/dbus.h
++dbus/dbus-glib.h
++dbus/dbus-glib-lowlevel.h
+ ddeml.h
+ Debug.h
+ dem.h
diff --git a/firefox-2.0.0.10-source.tar.bz2 b/firefox-2.0.0.10-source.tar.bz2
new file mode 100644
index 0000000..d96fb3a
--- /dev/null
+++ b/firefox-2.0.0.10-source.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c68728943863b7c7f7363c9446ec1e087198f67897cca58a3373e761a2f595ca
+size 37474489
diff --git a/firefox-2.0.0.8-source.tar.bz2 b/firefox-2.0.0.8-source.tar.bz2
deleted file mode 100644
index acfe97b..0000000
--- a/firefox-2.0.0.8-source.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1c75b8dc9fcec51a3d5d7a6af9e199cc532813ae93262840ec8402a34e64d785
-size 37685739
diff --git a/firefox-gcc4.3-fixes.patch b/firefox-gcc4.3-fixes.patch
deleted file mode 100644
index 58a4bab..0000000
--- a/firefox-gcc4.3-fixes.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h b/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h
-index 8a63354..655c8da 100644
---- a/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h
-+++ b/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h
-@@ -39,8 +39,10 @@
- #include "imgIEncoder.h"
- #ifdef MOZILLA_1_8_BRANCH
- #define imgIEncoder imgIEncoder_MOZILLA_1_8_BRANCH
-+#ifndef NS_DECL_IMGIENCODER
- #define NS_DECL_IMGIENCODER NS_DECL_IMGIENCODER_MOZILLA_1_8_BRANCH
- #endif
-+#endif
- 
- // needed for JPEG library
- #include <stdio.h>
-@@ -69,6 +71,13 @@ public:
- 
-   nsJPEGEncoder();
- 
-+  NS_IMETHOD InitFromData(const PRUint8* aData,
-+                          PRUint32 aLength, // (unused, req'd by JS)
-+                          PRUint32 aWidth,
-+                          PRUint32 aHeight,
-+                          PRUint32 aStride,
-+                          PRUint32 aInputFormat,
-+                          const nsAString& aOutputOptions);
- private:
-   ~nsJPEGEncoder();
- 
-diff --git a/modules/libpr0n/encoders/png/nsPNGEncoder.h b/modules/libpr0n/encoders/png/nsPNGEncoder.h
-index ff85949..83766f1 100644
---- a/modules/libpr0n/encoders/png/nsPNGEncoder.h
-+++ b/modules/libpr0n/encoders/png/nsPNGEncoder.h
-@@ -38,8 +38,10 @@
- #include "imgIEncoder.h"
- #ifdef MOZILLA_1_8_BRANCH
- #define imgIEncoder imgIEncoder_MOZILLA_1_8_BRANCH
-+#ifndef NS_DECL_IMGIENCODER
- #define NS_DECL_IMGIENCODER NS_DECL_IMGIENCODER_MOZILLA_1_8_BRANCH
- #endif
-+#endif
- 
- #include <png.h>
- 
-@@ -63,6 +65,14 @@ public:
- 
-   nsPNGEncoder();
- 
-+  NS_IMETHOD InitFromData(const PRUint8* aData,
-+                          PRUint32 aLength, // (unused, req'd by JS)
-+                          PRUint32 aWidth,
-+                          PRUint32 aHeight,
-+                          PRUint32 aStride,
-+                          PRUint32 aInputFormat,
-+                          const nsAString& aOutputOptions);
-+
- private:
-   ~nsPNGEncoder();
- 
-diff --git a/modules/libpr0n/public/imgIContainer.idl b/modules/libpr0n/public/imgIContainer.idl
-index f975b16..4819158 100644
---- a/modules/libpr0n/public/imgIContainer.idl
-+++ b/modules/libpr0n/public/imgIContainer.idl
-@@ -38,7 +38,7 @@
-  * ***** END LICENSE BLOCK ***** */
- 
- #include "nsISupports.idl"
--#include "gfxtypes.idl"
-+#include <gfxtypes.idl>
- #include "gfxIFormats.idl"
- 
- interface gfxIImageFrame;
-diff --git a/modules/libpr0n/public/imgIEncoder.idl b/modules/libpr0n/public/imgIEncoder.idl
-index 120b3bf..562bf42 100755
---- a/modules/libpr0n/public/imgIEncoder.idl
-+++ b/modules/libpr0n/public/imgIEncoder.idl
-@@ -96,6 +96,6 @@ interface nsIFile;
- [scriptable, uuid(CCC5B3AD-3E67-4e3d-97E1-B06B2E96FEF8)]
- interface imgIEncoder : nsISupports
- {
--  void encodeClipboardImage(in nsIClipboardImage aClipboardImage, out nsIFile aImageFile);
-+  /* void encodeClipboardImage(in nsIClipboardImage aClipboardImage, out nsIFile aImageFile); */
- };
- 
diff --git a/l10n-2.0.0.10.tar.bz2 b/l10n-2.0.0.10.tar.bz2
new file mode 100644
index 0000000..3687d11
--- /dev/null
+++ b/l10n-2.0.0.10.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9d3322932cf719c1f58a1651fb99a4e0b627a51856193f0ddf35434b4df8dc84
+size 12358182
diff --git a/l10n-2.0.0.8.tar.bz2 b/l10n-2.0.0.8.tar.bz2
deleted file mode 100644
index ae79513..0000000
--- a/l10n-2.0.0.8.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a09d1e74961a06afe93d34c59f239060fc2b96e8c4d704b7a774084244204b1d
-size 10104949
diff --git a/mozilla-canvas-1.8.1.10.patch b/mozilla-canvas-1.8.1.10.patch
new file mode 100644
index 0000000..438e048
--- /dev/null
+++ b/mozilla-canvas-1.8.1.10.patch
@@ -0,0 +1,26 @@
+Index: content/canvas/src/nsCanvasRenderingContext2D.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/content/canvas/src/nsCanvasRenderingContext2D.cpp,v
+retrieving revision 1.102
+diff -u -8 -p -r1.102 nsCanvasRenderingContext2D.cpp
+--- content/canvas/src/nsCanvasRenderingContext2D.cpp	10 Oct 2007 20:31:45 -0000	1.102
++++ content/canvas/src/nsCanvasRenderingContext2D.cpp	11 Oct 2007 23:31:32 -0000
+@@ -2140,17 +2140,17 @@ nsCanvasRenderingContext2D::CairoSurface
+                                      getter_AddRefs(imgRequest));
+         NS_ENSURE_SUCCESS(rv, rv);
+         if (!imgRequest)
+             // XXX ERRMSG we need to report an error to developers here! (bug 329026)
+             return NS_ERROR_NOT_AVAILABLE;
+ 
+         PRUint32 status;
+         imgRequest->GetImageStatus(&status);
+-        if (status != imgIRequest::STATUS_LOAD_COMPLETE)
++        if ((status & imgIRequest::STATUS_LOAD_COMPLETE) == 0)
+             return NS_ERROR_NOT_AVAILABLE;
+ 
+         nsCOMPtr<nsIURI> uri;
+         rv = imageLoader->GetCurrentURI(uriOut);
+         NS_ENSURE_SUCCESS(rv, rv);
+ 
+         *forceWriteOnlyOut = PR_FALSE;
+ 
diff --git a/mozilla-gcc4.3-fixes.patch b/mozilla-gcc4.3-fixes.patch
new file mode 100644
index 0000000..0f39dc3
--- /dev/null
+++ b/mozilla-gcc4.3-fixes.patch
@@ -0,0 +1,146 @@
+References:
+https://bugzilla.mozilla.org/show_bug.cgi?id=403675
+https://bugzilla.mozilla.org/show_bug.cgi?id=386362
+
+Index: modules/libpr0n/encoders/png/nsPNGEncoder.h
+===================================================================
+RCS file: /cvsroot/mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.h,v
+retrieving revision 1.1.18.1
+diff -u -p -6 -r1.1.18.1 nsPNGEncoder.h
+--- modules/libpr0n/encoders/png/nsPNGEncoder.h	20 May 2006 17:20:49 -0000	1.1.18.1
++++ modules/libpr0n/encoders/png/nsPNGEncoder.h	13 Nov 2007 22:07:36 -0000
+@@ -35,14 +35,16 @@
+  *
+  * ***** END LICENSE BLOCK ***** */
+ 
+ #include "imgIEncoder.h"
+ #ifdef MOZILLA_1_8_BRANCH
+ #define imgIEncoder imgIEncoder_MOZILLA_1_8_BRANCH
++#ifndef NS_DECL_IMGIENCODER
+ #define NS_DECL_IMGIENCODER NS_DECL_IMGIENCODER_MOZILLA_1_8_BRANCH
+ #endif
++#endif
+ 
+ #include <png.h>
+ 
+ #define NS_PNGENCODER_CID \
+ { /* 38d1592e-b81e-432b-86f8-471878bbfe07 */         \
+      0x38d1592e,                                     \
+@@ -60,12 +62,20 @@ public:
+   NS_DECL_ISUPPORTS
+   NS_DECL_IMGIENCODER
+   NS_DECL_NSIINPUTSTREAM
+ 
+   nsPNGEncoder();
+ 
++  NS_IMETHOD InitFromData(const PRUint8* aData,
++                          PRUint32 aLength, // (unused, req'd by JS)
++                          PRUint32 aWidth,
++                          PRUint32 aHeight,
++                          PRUint32 aStride,
++                          PRUint32 aInputFormat,
++                          const nsAString& aOutputOptions);
++
+ private:
+   ~nsPNGEncoder();
+ 
+ protected:
+   void ConvertHostARGBRow(const PRUint8* aSrc, PRUint8* aDest,
+                           PRUint32 aPixelWidth, PRBool aUseTransparency);
+Index: modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h
+===================================================================
+RCS file: /cvsroot/mozilla/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h,v
+retrieving revision 1.1.14.1
+diff -u -p -6 -r1.1.14.1 nsJPEGEncoder.h
+--- modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h	20 May 2006 17:20:48 -0000	1.1.14.1
++++ modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h	13 Nov 2007 22:07:57 -0000
+@@ -36,14 +36,16 @@
+  *
+  * ***** END LICENSE BLOCK ***** */
+ 
+ #include "imgIEncoder.h"
+ #ifdef MOZILLA_1_8_BRANCH
+ #define imgIEncoder imgIEncoder_MOZILLA_1_8_BRANCH
++#ifndef NS_DECL_IMGIENCODER
+ #define NS_DECL_IMGIENCODER NS_DECL_IMGIENCODER_MOZILLA_1_8_BRANCH
+ #endif
++#endif
+ 
+ // needed for JPEG library
+ #include <stdio.h>
+ 
+ extern "C" {
+ #include "jpeglib.h"
+@@ -66,12 +68,20 @@ public:
+   NS_DECL_ISUPPORTS
+   NS_DECL_IMGIENCODER
+   NS_DECL_NSIINPUTSTREAM
+ 
+   nsJPEGEncoder();
+ 
++  NS_IMETHOD InitFromData(const PRUint8* aData,
++                          PRUint32 aLength, // (unused, req'd by JS)
++                          PRUint32 aWidth,
++                          PRUint32 aHeight,
++                          PRUint32 aStride,
++                          PRUint32 aInputFormat,
++                          const nsAString& aOutputOptions);
++
+ private:
+   ~nsJPEGEncoder();
+ 
+ protected:
+ 
+   void ConvertHostARGBRow(const PRUint8* aSrc, PRUint8* aDest,
+Index: modules/libpr0n/public/imgIEncoder.idl
+===================================================================
+RCS file: /cvsroot/mozilla/modules/libpr0n/public/imgIEncoder.idl,v
+retrieving revision 1.1.10.3
+diff -u -p -r1.1.10.3 imgIEncoder.idl
+--- modules/libpr0n/public/imgIEncoder.idl	20 May 2006 17:20:49 -0000	1.1.10.3
++++ modules/libpr0n/public/imgIEncoder.idl	14 Nov 2007 10:41:40 -0000
+@@ -96,6 +96,6 @@ interface nsIFile;
+ [scriptable, uuid(CCC5B3AD-3E67-4e3d-97E1-B06B2E96FEF8)]
+ interface imgIEncoder : nsISupports
+ {
+-  void encodeClipboardImage(in nsIClipboardImage aClipboardImage, out nsIFile aImageFile);
++  /* void encodeClipboardImage(in nsIClipboardImage aClipboardImage, out nsIFile aImageFile); */
+ };
+ 
+Index: xpcom/obsolete/component/nsFileSpecImpl.h
+===================================================================
+RCS file: /cvsroot/mozilla/xpcom/obsolete/component/nsFileSpecImpl.h,v
+retrieving revision 1.3
+diff -u -p -6 -r1.3 nsFileSpecImpl.h
+--- xpcom/obsolete/component/nsFileSpecImpl.h	18 Apr 2004 14:18:15 -0000	1.3
++++ xpcom/obsolete/component/nsFileSpecImpl.h	14 Nov 2007 12:11:12 -0000
+@@ -40,13 +40,13 @@
+ 
+ #include "nscore.h"
+ #include "nsIFileSpec.h" 
+ #include "nsFileSpec.h"
+ 
+ //========================================================================================
+-class nsFileSpecImpl
++class NS_COM nsFileSpecImpl
+ //========================================================================================
+ 	: public nsIFileSpec
+ {
+ 
+  public: 
+ 
+@@ -78,13 +78,13 @@ class nsFileSpecImpl
+ 
+ private:
+ 	~nsFileSpecImpl();
+ }; // class nsFileSpecImpl
+ 
+ //========================================================================================
+-class nsDirectoryIteratorImpl
++class NS_COM nsDirectoryIteratorImpl
+ //========================================================================================
+ 	: public nsIDirectoryIterator
+ {
+ 
+ public:
+ 
diff --git a/startup.patch b/startup.patch
index f42fee0..2b0adf0 100644
--- a/startup.patch
+++ b/startup.patch
@@ -1193,3 +1193,22 @@ diff -u -p -6 -r1.113.2.23 nsAppRunner.cpp
 +
    return NS_FAILED(rv) ? 1 : 0;
  }
+Index: config/system-headers
+===================================================================
+RCS file: /cvsroot/mozilla/config/system-headers,v
+retrieving revision 3.4.4.3
+diff -u -r3.4.4.3 system-headers
+--- config/system-headers	18 Dec 2006 23:48:58 -0000	3.4.4.3
++++ config/system-headers	14 Nov 2007 09:20:50 -0000
+@@ -931,3 +934,11 @@
+ #if MOZ_NATIVE_ZLIB==1
+ zlib.h
+ #endif
++#ifdef MOZ_ENABLE_STARTUP_NOTIFICATION
++libsn/sn.h
++libsn/sn-common.h
++libsn/sn-launchee.h
++libsn/sn-launcher.h
++libsn/sn-monitor.h
++libsn/sn-util.h
++#endif