Merge lp:~gilir/gnome-mplayer/gecko-mediaplayer into lp:~norsetto/gnome-mplayer/gecko-mediaplayer

[Julien Lavergne]

Update to 1.0.0 version

[lp:~gilir/gnome-mplayer/gecko-mediaplayer]

61. By Julien Lavergne on 2011-03-06

* debian/control:
 - Build-depends on xulrunner-1.9.2-dev until bug #724070 is fixed.

62. By Julien Lavergne on 2011-03-06

releasing version 1.0.0-0ubuntu2

63. By Julien Lavergne on 2011-06-19

Merge with uploaded changes

64. By Julien Lavergne on 2011-06-19

* Don't use any Mozilla interfaces at all. The only interfaces used
  previously were nsIPrefBranch and nsIPrefService to change a preference
  which configured the UA string to "QuickTime/7.6.4". This functionality
  is Firefox specific anyway, and so doesn't work in any Webkit based browser
  (Chromium, Epiphany, Midori etc). It also doesn't work in Firefox 4
  and later since the plugin is running in a separate process, where setting
  prefs in the plugin process has no effect on the browser process at all
  - add debian/patches/dont_use_libxul.patch
  - add debian/patches/autotools.patch
  - update debian/patches/series
  - update debian/control to build-depend on firefox-dev
  - see https://blueprints.launchpad.net/ubuntu/+spec/
          desktop-o-mozilla-rapid-release-maintenance and
    https://lists.ubuntu.com/archives/ubuntu-devel/2011-May/033229.html

Unmerged revisions

64. By Julien Lavergne on 2011-06-19

* Don't use any Mozilla interfaces at all. The only interfaces used
  previously were nsIPrefBranch and nsIPrefService to change a preference
  which configured the UA string to "QuickTime/7.6.4". This functionality
  is Firefox specific anyway, and so doesn't work in any Webkit based browser
  (Chromium, Epiphany, Midori etc). It also doesn't work in Firefox 4
  and later since the plugin is running in a separate process, where setting
  prefs in the plugin process has no effect on the browser process at all
  - add debian/patches/dont_use_libxul.patch
  - add debian/patches/autotools.patch
  - update debian/patches/series
  - update debian/control to build-depend on firefox-dev
  - see https://blueprints.launchpad.net/ubuntu/+spec/
          desktop-o-mozilla-rapid-release-maintenance and
    https://lists.ubuntu.com/archives/ubuntu-devel/2011-May/033229.html

63. By Julien Lavergne on 2011-06-19

Merge with uploaded changes

62. By Julien Lavergne on 2011-03-06

releasing version 1.0.0-0ubuntu2

61. By Julien Lavergne on 2011-03-06

* debian/control:
 - Build-depends on xulrunner-1.9.2-dev until bug #724070 is fixed.

60. By Julien Lavergne on 2011-02-14

releasing version 1.0.0-0ubuntu1

59. By Julien Lavergne on 2011-02-14

releasing version 1.0.0-0ubuntu1

58. By Julien Lavergne on 2011-02-14

* debian/control:
 - Drop build-depends on quilt, handle by format 3.0.
* debian/patches/01_xulrunner-20.patch:
 - Drop, replace by upstream patch 91_svn421_disable_npp_initialize.patch.
* Drop unneeded symlinks in /usr/lib/xulrunner, /usr/lib/xulrunner-addons,
  /usr/lib/firefox, /usr/lib/iceweasel and /usr/lib/midbrowser
  - update debian/links
* Drop midbrowser dependency. This disappeared from Ubuntu a while ago
  - update debian/control
* Enable quilt and add patch to enable building with the latest NPAPI
  headers
  - update debian/control
  - update debian/rules
  - add debian/patches/01_xulrunner-20.patch
  - add debian/patches/series
* Don't use the Mozilla allocator by adding -DMOZ_NO_MOZALLOC to CXXFLAGS
  - update debian/rules

57. By Julien Lavergne on 2011-02-14

releasing version 1.0.0-0ubuntu1

56. By Julien Lavergne on 2011-02-14

Re-add .bzr-builddeb directory

55. By Julien Lavergne on 2011-02-14

   chromium (LP: #545209).

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2011-06-19 14:06:01 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+merge = True

=== added directory 'debian'
=== renamed file 'changelog' => 'debian/changelog'
--- changelog	2010-05-17 13:04:23 +0000
+++ debian/changelog	2011-06-19 14:06:01 +0000
@@ -1,5 +1,32 @@
-gecko-mediaplayer (0.9.9.2-2) UNRELEASED; urgency=low
-
+gecko-mediaplayer (1.0.0-0ubuntu3) oneiric; urgency=low
+
+  * Don't use any Mozilla interfaces at all. The only interfaces used
+    previously were nsIPrefBranch and nsIPrefService to change a preference
+    which configured the UA string to "QuickTime/7.6.4". This functionality
+    is Firefox specific anyway, and so doesn't work in any Webkit based browser
+    (Chromium, Epiphany, Midori etc). It also doesn't work in Firefox 4
+    and later since the plugin is running in a separate process, where setting
+    prefs in the plugin process has no effect on the browser process at all
+    - add debian/patches/dont_use_libxul.patch
+    - add debian/patches/autotools.patch
+    - update debian/patches/series
+    - update debian/control to build-depend on firefox-dev
+    - see https://blueprints.launchpad.net/ubuntu/+spec/
+            desktop-o-mozilla-rapid-release-maintenance and
+      https://lists.ubuntu.com/archives/ubuntu-devel/2011-May/033229.html
+
+ -- Chris Coulson <[e-mail]>  Fri, 27 May 2011 15:19:19 +0100
+
+gecko-mediaplayer (1.0.0-0ubuntu2) natty; urgency=low
+
+  * debian/control:
+   - Build-depends on xulrunner-1.9.2-dev until bug #724070 is fixed.
+
+ -- Julien Lavergne <[e-mail]>  Sun, 06 Mar 2011 23:05:08 +0100
+
+gecko-mediaplayer (1.0.0-0ubuntu1) natty; urgency=low
+
+  [ Cesare Tirabassi ]
   * Update dependencies list (xulrunner, midbrowser and firefox-3.5)
   * Add konqueror, opera and chromium in long description
   * Removed all symlinks, lookup is now implemented upstream by all
@@ -8,7 +35,40 @@
   * Updated watch file in line with new google code standard
     (thanks D. Leidert)
 
- -- Cesare Tirabassi <[e-mail]>  Mon, 17 May 2010 15:03:31 +0200
+  [ Julien Lavergne ]
+  * New upstream release (LP: #693867)
+   - Fix crash when loading iTunes store (LP: #569682) 
+  * debian/rules:
+   - Build without gconf support, which should fix the hang with chromium
+    (LP: #545209).
+  * debian/patches/90_svn420_fix_null.patch:
+   - From upstream, fix NULL pointer errors (LP: #709277)
+  * debian/patches/91_svn421_disable_npp_initialize.patch:
+   - From upstream, fix FTBFS with new xulrunner.
+  * debian/control:
+   - Drop build-depends on quilt, handle by format 3.0.
+  * debian/patches/01_xulrunner-20.patch:
+   - Drop, replace by upstream patch 91_svn421_disable_npp_initialize.patch.
+
+ -- Julien Lavergne <[e-mail]>  Mon, 14 Feb 2011 23:17:54 +0100
+
+gecko-mediaplayer (0.9.9.2-1ubuntu1) natty; urgency=low
+
+  * Drop unneeded symlinks in /usr/lib/xulrunner, /usr/lib/xulrunner-addons,
+    /usr/lib/firefox, /usr/lib/iceweasel and /usr/lib/midbrowser
+    - update debian/links
+  * Drop midbrowser dependency. This disappeared from Ubuntu a while ago
+    - update debian/control
+  * Enable quilt and add patch to enable building with the latest NPAPI
+    headers
+    - update debian/control
+    - update debian/rules
+    - add debian/patches/01_xulrunner-20.patch
+    - add debian/patches/series
+  * Don't use the Mozilla allocator by adding -DMOZ_NO_MOZALLOC to CXXFLAGS
+    - update debian/rules
+
+ -- Chris Coulson <[e-mail]>  Mon, 14 Feb 2011 21:31:56 +0000
 
 gecko-mediaplayer (0.9.9.2-1) unstable; urgency=low
 

=== renamed file 'compat' => 'debian/compat'
=== renamed file 'control' => 'debian/control'
--- control	2010-05-17 12:55:11 +0000
+++ debian/control	2011-06-19 14:06:01 +0000
@@ -6,7 +6,7 @@
 	       autotools-dev,
 	       pkg-config (>= 0.20),
 	       libglib2.0-dev (>= 2.14),
-	       xulrunner-dev,
+	       firefox-dev,
 	       libdbus-1-dev (>= 0.95),
 	       libdbus-glib-1-dev (>= 0.70),
 	       libx11-dev,

=== renamed file 'copyright' => 'debian/copyright'
=== renamed file 'docs' => 'debian/docs'
=== renamed file 'install' => 'debian/install'
=== added directory 'debian/patches'
=== added file 'debian/patches/90_svn420_fix_null.patch'
--- debian/patches/90_svn420_fix_null.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/90_svn420_fix_null.patch	2011-06-19 14:06:01 +0000
@@ -0,0 +1,41 @@
+Author: Julien Lavergne <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/709277
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <upstream>, <http://code.google.com/p/gecko-mediaplayer/source/detail?spec=svn420&r=420#>
+Bug: <http://code.google.com/p/gecko-mediaplayer/issues/detail?id=123>
+Bug-Ubuntu: https://launchpad.net/bugs/709277
+Last-Update: <2011-01-28>
+
+--- gecko-mediaplayer-1.0.0.orig/src/plugin.cpp
++++ gecko-mediaplayer-1.0.0/src/plugin.cpp
+@@ -1218,11 +1218,13 @@ void CPlugin::SetFilename(const char *fi
+ 
+ void CPlugin::GetFilename(char **filename)
+ {
+-    ListItem *item;
++    ListItem *item = NULL;
++
+     if (this->lastopened != NULL) {
+         *filename = g_strdup(this->lastopened->src);
+     } else {
+-        item = (ListItem *) playlist->data;
++        if (playlist != NULL)
++            item = (ListItem *) playlist->data;
+         if (item != NULL) {
+             *filename = g_strdup(item->src);
+         } else {
+@@ -1966,7 +1968,8 @@ bool ScriptablePluginObject::GetProperty
+ 
+     if (name == filename_id || name == src_id) {
+         pPlugin->GetFilename(&filename);
+-        STRINGZ_TO_NPVARIANT(filename, *result);
++        if (filename != NULL)
++            STRINGZ_TO_NPVARIANT(filename, *result);
+         return true;
+     }
+ 

=== added file 'debian/patches/91_svn421_disable_npp_initialize.patch'
--- debian/patches/91_svn421_disable_npp_initialize.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/91_svn421_disable_npp_initialize.patch	2011-06-19 14:06:01 +0000
@@ -0,0 +1,22 @@
+Author: Julien Lavergne <[e-mail]>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <upstream>, <http://code.google.com/p/gecko-mediaplayer/source/detail?r=421>
+Bug: <http://code.google.com/p/gecko-mediaplayer/issues/detail?id=124>
+Last-Update: <2011-01-28>
+
+--- gecko-mediaplayer-1.0.0.orig/src/np_entry.cpp
++++ gecko-mediaplayer-1.0.0/src/np_entry.cpp
+@@ -175,7 +175,7 @@ NPError OSCALL NP_Initialize(NPNetscapeF
+     pluginFuncs->javaClass = NPP_GetJavaClass();
+ #endif
+ 
+-    NPP_Initialize();
++    // NPP_Initialize();
+ #endif
+ 
+     return NPERR_NO_ERROR;

=== added file 'debian/patches/autotools.patch'
--- debian/patches/autotools.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/autotools.patch	2011-06-19 14:06:01 +0000
@@ -0,0 +1,3229 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -36,8 +36,8 @@ subdir = .
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ 	$(srcdir)/gecko-mediaplayer.spec.in $(top_srcdir)/configure \
+-	AUTHORS COPYING ChangeLog INSTALL NEWS compile config.guess \
+-	config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
++	AUTHORS COPYING ChangeLog INSTALL NEWS compile depcomp \
++	install-sh ltmain.sh missing mkinstalldirs
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+@@ -197,6 +197,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -13,8 +13,8 @@
+ 
+ m4_ifndef([AC_AUTOCONF_VERSION],
+   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+-[m4_warning([this file was generated for autoconf 2.65.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
++[m4_warning([this file was generated for autoconf 2.68.
+ You have another version of autoconf.  It may work, but is not guaranteed to.
+ If you have problems, you may need to regenerate the build system entirely.
+ To do so, use the procedure documented by the package, typically `autoreconf'.])])
+@@ -346,7 +346,7 @@ msgstr ""
+ 
+     dnl These rules are solely for the distribution goal.  While doing this
+     dnl we only have to keep exactly one list of the available catalogs
+-    dnl in configure.in.
++    dnl in configure.ac.
+     for lang in $ALL_LINGUAS; do
+       GMOFILES="$GMOFILES $lang.gmo"
+       POFILES="$POFILES $lang.po"
+@@ -475,7 +475,7 @@ AC_DEFINE_UNQUOTED($1, "$localedir",
+ dnl
+ dnl Now the definitions that aclocal will find
+ dnl
+-ifdef(glib_configure_in,[],[
++ifdef(glib_configure_ac,[],[
+ AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
+ AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
+ ])dnl
+@@ -498,6 +498,7 @@ fi])
+ 
+ 
+ # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
++# serial 1 (pkg-config-0.24)
+ # 
+ # Copyright © 2004 Scott James Remnant <[e-mail]>.
+ #
+@@ -524,8 +525,12 @@ fi])
+ # ----------------------------------
+ AC_DEFUN([PKG_PROG_PKG_CONFIG],
+ [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
++m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
++m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
++AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
++AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
++
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ 	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+ fi
+@@ -538,7 +543,6 @@ if test -n "$PKG_CONFIG"; then
+ 		AC_MSG_RESULT([no])
+ 		PKG_CONFIG=""
+ 	fi
+-		
+ fi[]dnl
+ ])# PKG_PROG_PKG_CONFIG
+ 
+@@ -547,21 +551,20 @@ fi[]dnl
+ # Check to see whether a particular set of modules exists.  Similar
+ # to PKG_CHECK_MODULES(), but does not set variables or print errors.
+ #
+-#
+-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+-# this or PKG_CHECK_MODULES is called, or make sure to call
+-# PKG_CHECK_EXISTS manually
++# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++# only at the first occurence in configure.ac, so if the first place
++# it's called might be skipped (such as if it is within an "if", you
++# have to call PKG_CHECK_EXISTS manually
+ # --------------------------------------------------------------
+ AC_DEFUN([PKG_CHECK_EXISTS],
+ [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+ if test -n "$PKG_CONFIG" && \
+     AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+-  m4_ifval([$2], [$2], [:])
++  m4_default([$2], [:])
+ m4_ifvaln([$3], [else
+   $3])dnl
+ fi])
+ 
+-
+ # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+ # ---------------------------------------------
+ m4_define([_PKG_CONFIG],
+@@ -569,7 +572,8 @@ m4_define([_PKG_CONFIG],
+     pkg_cv_[]$1="$$1"
+  elif test -n "$PKG_CONFIG"; then
+     PKG_CHECK_EXISTS([$3],
+-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
++                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes ],
+ 		     [pkg_failed=yes])
+  else
+     pkg_failed=untried
+@@ -614,16 +618,17 @@ and $1[]_LIBS to avoid the need to call
+ See the pkg-config man page for more details.])
+ 
+ if test $pkg_failed = yes; then
++   	AC_MSG_RESULT([no])
+         _PKG_SHORT_ERRORS_SUPPORTED
+         if test $_pkg_short_errors_supported = yes; then
+-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
++	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+         else 
+-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
++	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+ 
+-	ifelse([$4], , [AC_MSG_ERROR(dnl
++	m4_default([$4], [AC_MSG_ERROR(
+ [Package requirements ($2) were not met:
+ 
+ $$1_PKG_ERRORS
+@@ -631,25 +636,24 @@ $$1_PKG_ERRORS
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+ 
+-_PKG_TEXT
+-])],
+-		[AC_MSG_RESULT([no])
+-                $4])
++_PKG_TEXT])[]dnl
++        ])
+ elif test $pkg_failed = untried; then
+-	ifelse([$4], , [AC_MSG_FAILURE(dnl
++     	AC_MSG_RESULT([no])
++	m4_default([$4], [AC_MSG_FAILURE(
+ [The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+ _PKG_TEXT
+ 
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+-		[$4])
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
++        ])
+ else
+ 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ 	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+         AC_MSG_RESULT([yes])
+-	ifelse([$3], , :, [$3])
++	$3
+ fi[]dnl
+ ])# PKG_CHECK_MODULES
+ 
+--- a/config.h.in
++++ b/config.h.in
+@@ -33,7 +33,7 @@
+ /* Define to 1 if you have the <memory.h> header file. */
+ #undef HAVE_MEMORY_H
+ 
+-/* Define to 1 if using libxul 1.9.2 or higher */
++/* Define to 1 if using libxul 2.0.0 or higher */
+ #undef HAVE_NEW_XULRUNNER
+ 
+ /* Define to 1 if you have the <stdint.h> header file. */
+--- a/configure
++++ b/configure
+@@ -1,11 +1,11 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.65.
++# Generated by GNU Autoconf 2.68.
+ #
+ #
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
++# Foundation, Inc.
+ #
+ #
+ # This configure script is free software; the Free Software Foundation
+@@ -89,6 +89,7 @@ fi
+ IFS=" ""	$as_nl"
+ 
+ # Find who we are.  Look in the path if we contain no directory separator.
++as_myself=
+ case $0 in #((
+   *[\\/]* ) as_myself=$0 ;;
+   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -214,11 +215,18 @@ IFS=$as_save_IFS
+   # We cannot yet assume a decent shell, so we have to provide a
+ 	# neutralization value for shells without unset; and this also
+ 	# works around shells that cannot unset nonexistent variables.
++	# Preserve -v and -x to the replacement shell.
+ 	BASH_ENV=/dev/null
+ 	ENV=/dev/null
+ 	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+ 	export CONFIG_SHELL
+-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
++	case $- in # ((((
++	  *v*x* | *x*v* ) as_opts=-vx ;;
++	  *v* ) as_opts=-v ;;
++	  *x* ) as_opts=-x ;;
++	  * ) as_opts= ;;
++	esac
++	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ fi
+ 
+     if test x$as_have_required = xno; then :
+@@ -316,7 +324,7 @@ $as_echo X"$as_dir" |
+       test -d "$as_dir" && break
+     done
+     test -z "$as_dirs" || eval "mkdir $as_dirs"
+-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
++  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+ 
+ 
+ } # as_fn_mkdir_p
+@@ -356,19 +364,19 @@ else
+ fi # as_fn_arith
+ 
+ 
+-# as_fn_error ERROR [LINENO LOG_FD]
+-# ---------------------------------
++# as_fn_error STATUS ERROR [LINENO LOG_FD]
++# ----------------------------------------
+ # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+ # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+-# script with status $?, using 1 if that was 0.
++# script with STATUS, using 1 if that was 0.
+ as_fn_error ()
+ {
+-  as_status=$?; test $as_status -eq 0 && as_status=1
+-  if test "$3"; then
+-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
++  as_status=$1; test $as_status -eq 0 && as_status=1
++  if test "$4"; then
++    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+   fi
+-  $as_echo "$as_me: error: $1" >&2
++  $as_echo "$as_me: error: $2" >&2
+   as_fn_exit $as_status
+ } # as_fn_error
+ 
+@@ -530,7 +538,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null
+ exec 6>&1
+ 
+ # Name of the host.
+-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+ # so uname gets run too.
+ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+ 
+@@ -614,6 +622,8 @@ GECKO_LIBS
+ GECKO_CFLAGS
+ GLIB_LIBS
+ GLIB_CFLAGS
++PKG_CONFIG_LIBDIR
++PKG_CONFIG_PATH
+ PKG_CONFIG
+ MKINSTALLDIRS
+ POSUB
+@@ -750,6 +760,8 @@ CXX
+ CXXFLAGS
+ CCC
+ PKG_CONFIG
++PKG_CONFIG_PATH
++PKG_CONFIG_LIBDIR
+ GLIB_CFLAGS
+ GLIB_LIBS
+ GECKO_CFLAGS
+@@ -824,8 +836,9 @@ do
+   fi
+ 
+   case $ac_option in
+-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+-  *)	ac_optarg=yes ;;
++  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++  *=)   ac_optarg= ;;
++  *)    ac_optarg=yes ;;
+   esac
+ 
+   # Accept the important Cygnus configure options, so we can diagnose typos.
+@@ -870,7 +883,7 @@ do
+     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      as_fn_error "invalid feature name: $ac_useropt"
++      as_fn_error $? "invalid feature name: $ac_useropt"
+     ac_useropt_orig=$ac_useropt
+     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     case $ac_user_opts in
+@@ -896,7 +909,7 @@ do
+     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      as_fn_error "invalid feature name: $ac_useropt"
++      as_fn_error $? "invalid feature name: $ac_useropt"
+     ac_useropt_orig=$ac_useropt
+     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     case $ac_user_opts in
+@@ -1100,7 +1113,7 @@ do
+     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      as_fn_error "invalid package name: $ac_useropt"
++      as_fn_error $? "invalid package name: $ac_useropt"
+     ac_useropt_orig=$ac_useropt
+     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     case $ac_user_opts in
+@@ -1116,7 +1129,7 @@ do
+     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      as_fn_error "invalid package name: $ac_useropt"
++      as_fn_error $? "invalid package name: $ac_useropt"
+     ac_useropt_orig=$ac_useropt
+     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     case $ac_user_opts in
+@@ -1146,8 +1159,8 @@ do
+   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+     x_libraries=$ac_optarg ;;
+ 
+-  -*) as_fn_error "unrecognized option: \`$ac_option'
+-Try \`$0 --help' for more information."
++  -*) as_fn_error $? "unrecognized option: \`$ac_option'
++Try \`$0 --help' for more information"
+     ;;
+ 
+   *=*)
+@@ -1155,7 +1168,7 @@ Try \`$0 --help' for more information."
+     # Reject names that are not valid shell variable names.
+     case $ac_envvar in #(
+       '' | [0-9]* | *[!_$as_cr_alnum]* )
+-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
++      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+     esac
+     eval $ac_envvar=\$ac_optarg
+     export $ac_envvar ;;
+@@ -1165,7 +1178,7 @@ Try \`$0 --help' for more information."
+     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
++    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+     ;;
+ 
+   esac
+@@ -1173,13 +1186,13 @@ done
+ 
+ if test -n "$ac_prev"; then
+   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+-  as_fn_error "missing argument to $ac_option"
++  as_fn_error $? "missing argument to $ac_option"
+ fi
+ 
+ if test -n "$ac_unrecognized_opts"; then
+   case $enable_option_checking in
+     no) ;;
+-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
++    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+   esac
+ fi
+@@ -1202,7 +1215,7 @@ do
+     [\\/$]* | ?:[\\/]* )  continue;;
+     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+   esac
+-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
++  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+ done
+ 
+ # There might be people who depend on the old broken behavior: `$host'
+@@ -1216,8 +1229,8 @@ target=$target_alias
+ if test "x$host_alias" != x; then
+   if test "x$build_alias" = x; then
+     cross_compiling=maybe
+-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+-    If a cross compiler is detected then cross compile mode will be used." >&2
++    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
++    If a cross compiler is detected then cross compile mode will be used" >&2
+   elif test "x$build_alias" != "x$host_alias"; then
+     cross_compiling=yes
+   fi
+@@ -1232,9 +1245,9 @@ test "$silent" = yes && exec 6>/dev/null
+ ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ ac_ls_di=`ls -di .` &&
+ ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+-  as_fn_error "working directory cannot be determined"
++  as_fn_error $? "working directory cannot be determined"
+ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+-  as_fn_error "pwd does not report name of working directory"
++  as_fn_error $? "pwd does not report name of working directory"
+ 
+ 
+ # Find the source files, if location was not specified.
+@@ -1273,11 +1286,11 @@ else
+ fi
+ if test ! -r "$srcdir/$ac_unique_file"; then
+   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
++  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+ fi
+ ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ ac_abs_confdir=`(
+-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
++	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+ 	pwd)`
+ # When building in place, set srcdir=.
+ if test "$ac_abs_confdir" = "$ac_pwd"; then
+@@ -1317,7 +1330,7 @@ Configuration:
+       --help=short        display options specific to this package
+       --help=recursive    display the short help of all the included packages
+   -V, --version           display version information and exit
+-  -q, --quiet, --silent   do not print \`checking...' messages
++  -q, --quiet, --silent   do not print \`checking ...' messages
+       --cache-file=FILE   cache test results in FILE [disabled]
+   -C, --config-cache      alias for \`--cache-file=config.cache'
+   -n, --no-create         do not create output files
+@@ -1410,6 +1423,10 @@ Some influential environment variables:
+   CXX         C++ compiler command
+   CXXFLAGS    C++ compiler flags
+   PKG_CONFIG  path to pkg-config utility
++  PKG_CONFIG_PATH
++              directories to add to pkg-config's search path
++  PKG_CONFIG_LIBDIR
++              path overriding pkg-config's built-in search path
+   GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
+   GLIB_LIBS   linker flags for GLIB, overriding pkg-config
+   GECKO_CFLAGS
+@@ -1492,9 +1509,9 @@ test -n "$ac_init_help" && exit $ac_stat
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ configure
+-generated by GNU Autoconf 2.65
++generated by GNU Autoconf 2.68
+ 
+-Copyright (C) 2009 Free Software Foundation, Inc.
++Copyright (C) 2010 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+@@ -1538,7 +1555,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_retval=1
+ fi
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $ac_retval
+ 
+ } # ac_fn_c_try_compile
+@@ -1584,7 +1601,7 @@ fi
+   # interfere with the next link command; also delete a directory that is
+   # left behind by Apple's compiler.  We do this before executing the actions.
+   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $ac_retval
+ 
+ } # ac_fn_c_try_link
+@@ -1610,7 +1627,7 @@ $as_echo "$ac_try_echo"; } >&5
+     mv -f conftest.er1 conftest.err
+   fi
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; } >/dev/null && {
++  test $ac_status = 0; } > conftest.i && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then :
+@@ -1621,7 +1638,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+     ac_retval=1
+ fi
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $ac_retval
+ 
+ } # ac_fn_c_try_cpp
+@@ -1663,7 +1680,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+        ac_retval=$ac_status
+ fi
+   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $ac_retval
+ 
+ } # ac_fn_c_try_run
+@@ -1701,7 +1718,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_retval=1
+ fi
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $ac_retval
+ 
+ } # ac_fn_cxx_try_compile
+@@ -1714,10 +1731,10 @@ fi
+ ac_fn_c_check_header_mongrel ()
+ {
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  if eval \${$3+:} false; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${$3+:} false; then :
+   $as_echo_n "(cached) " >&6
+ fi
+ eval ac_res=\$$3
+@@ -1753,7 +1770,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+ else
+   ac_header_preproc=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+ $as_echo "$ac_header_preproc" >&6; }
+ 
+@@ -1780,7 +1797,7 @@ $as_echo "$as_me: WARNING: $2: proceedin
+ esac
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${$3+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   eval "$3=\$ac_header_compiler"
+@@ -1789,7 +1806,7 @@ eval ac_res=\$$3
+ 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+ fi
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ 
+ } # ac_fn_c_check_header_mongrel
+ 
+@@ -1802,7 +1819,7 @@ ac_fn_c_check_header_compile ()
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${$3+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -1820,7 +1837,7 @@ fi
+ eval ac_res=\$$3
+ 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ 
+ } # ac_fn_c_check_header_compile
+ 
+@@ -1832,7 +1849,7 @@ ac_fn_c_check_func ()
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${$3+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -1887,7 +1904,7 @@ fi
+ eval ac_res=\$$3
+ 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ 
+ } # ac_fn_c_check_func
+ cat >config.log <<_ACEOF
+@@ -1895,7 +1912,7 @@ This file contains any messages produced
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.65.  Invocation command line was
++generated by GNU Autoconf 2.68.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -2005,11 +2022,9 @@ trap 'exit_status=$?
+   {
+     echo
+ 
+-    cat <<\_ASBOX
+-## ---------------- ##
++    $as_echo "## ---------------- ##
+ ## Cache variables. ##
+-## ---------------- ##
+-_ASBOX
++## ---------------- ##"
+     echo
+     # The following way of writing the cache mishandles newlines in values,
+ (
+@@ -2043,11 +2058,9 @@ $as_echo "$as_me: WARNING: cache variabl
+ )
+     echo
+ 
+-    cat <<\_ASBOX
+-## ----------------- ##
++    $as_echo "## ----------------- ##
+ ## Output variables. ##
+-## ----------------- ##
+-_ASBOX
++## ----------------- ##"
+     echo
+     for ac_var in $ac_subst_vars
+     do
+@@ -2060,11 +2073,9 @@ _ASBOX
+     echo
+ 
+     if test -n "$ac_subst_files"; then
+-      cat <<\_ASBOX
+-## ------------------- ##
++      $as_echo "## ------------------- ##
+ ## File substitutions. ##
+-## ------------------- ##
+-_ASBOX
++## ------------------- ##"
+       echo
+       for ac_var in $ac_subst_files
+       do
+@@ -2078,11 +2089,9 @@ _ASBOX
+     fi
+ 
+     if test -s confdefs.h; then
+-      cat <<\_ASBOX
+-## ----------- ##
++      $as_echo "## ----------- ##
+ ## confdefs.h. ##
+-## ----------- ##
+-_ASBOX
++## ----------- ##"
+       echo
+       cat confdefs.h
+       echo
+@@ -2137,7 +2146,12 @@ _ACEOF
+ ac_site_file1=NONE
+ ac_site_file2=NONE
+ if test -n "$CONFIG_SITE"; then
+-  ac_site_file1=$CONFIG_SITE
++  # We do not want a PATH search for config.site.
++  case $CONFIG_SITE in #((
++    -*)  ac_site_file1=./$CONFIG_SITE;;
++    */*) ac_site_file1=$CONFIG_SITE;;
++    *)   ac_site_file1=./$CONFIG_SITE;;
++  esac
+ elif test "x$prefix" != xNONE; then
+   ac_site_file1=$prefix/share/config.site
+   ac_site_file2=$prefix/etc/config.site
+@@ -2152,7 +2166,11 @@ do
+     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
+     sed 's/^/| /' "$ac_site_file" >&5
+-    . "$ac_site_file"
++    . "$ac_site_file" \
++      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "failed to load site script $ac_site_file
++See \`config.log' for more details" "$LINENO" 5; }
+   fi
+ done
+ 
+@@ -2228,7 +2246,7 @@ if $ac_cache_corrupted; then
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+ $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
++  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+ fi
+ ## -------------------- ##
+ ## Main body of script. ##
+@@ -2245,16 +2263,22 @@ am__api_version='1.11'
+ 
+ ac_aux_dir=
+ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+-  for ac_t in install-sh install.sh shtool; do
+-    if test -f "$ac_dir/$ac_t"; then
+-      ac_aux_dir=$ac_dir
+-      ac_install_sh="$ac_aux_dir/$ac_t -c"
+-      break 2
+-    fi
+-  done
++  if test -f "$ac_dir/install-sh"; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/install-sh -c"
++    break
++  elif test -f "$ac_dir/install.sh"; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/install.sh -c"
++    break
++  elif test -f "$ac_dir/shtool"; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/shtool install -c"
++    break
++  fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
++  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+ fi
+ 
+ # These three variables are undocumented and unsupported,
+@@ -2283,7 +2307,7 @@ ac_configure="$SHELL $ac_aux_dir/configu
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+ $as_echo_n "checking for a BSD-compatible install... " >&6; }
+ if test -z "$INSTALL"; then
+-if test "${ac_cv_path_install+set}" = set; then :
++if ${ac_cv_path_install+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -2370,11 +2394,11 @@ am_lf='
+ '
+ case `pwd` in
+   *[\\\"\#\$\&\'\`$am_lf]*)
+-    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
++    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+ esac
+ case $srcdir in
+   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+-    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
++    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ esac
+ 
+ # Do `set' in a subshell so we don't clobber the current shell's
+@@ -2396,7 +2420,7 @@ if (
+       # if, for instance, CONFIG_SHELL is bash and it inherits a
+       # broken ls alias from the environment.  This has actually
+       # happened.  Such a system could not be considered "sane".
+-      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
++      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+ alias in your environment" "$LINENO" 5
+    fi
+ 
+@@ -2406,7 +2430,7 @@ then
+    # Ok.
+    :
+ else
+-   as_fn_error "newly created file is older than distributed files!
++   as_fn_error $? "newly created file is older than distributed files!
+ Check your system clock" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+@@ -2460,7 +2484,7 @@ if test "$cross_compiling" != no; then
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_STRIP+set}" = set; then :
++if ${ac_cv_prog_STRIP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$STRIP"; then
+@@ -2500,7 +2524,7 @@ if test -z "$ac_cv_prog_STRIP"; then
+ set dummy strip; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
++if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_STRIP"; then
+@@ -2553,7 +2577,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+ $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+ if test -z "$MKDIR_P"; then
+-  if test "${ac_cv_path_mkdir+set}" = set; then :
++  if ${ac_cv_path_mkdir+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -2604,7 +2628,7 @@ do
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_AWK+set}" = set; then :
++if ${ac_cv_prog_AWK+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$AWK"; then
+@@ -2644,7 +2668,7 @@ done
+ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+ set x ${MAKE-make}
+ ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.make <<\_ACEOF
+@@ -2652,7 +2676,7 @@ SHELL = /bin/sh
+ all:
+ 	@echo '@@@%%%=$(MAKE)=@@@%%%'
+ _ACEOF
+-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
++# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+ case `${MAKE-make} -f conftest.make 2>/dev/null` in
+   *@@@%%%=?*=@@@%%%*)
+     eval ac_cv_prog_make_${ac_make}_set=yes;;
+@@ -2686,7 +2710,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
+   am__isrc=' -I$(srcdir)'
+   # test to see if srcdir already configured
+   if test -f $srcdir/config.status; then
+-    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
++    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+   fi
+ fi
+ 
+@@ -2840,7 +2864,7 @@ if test -n "$ac_tool_prefix"; then
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -2880,7 +2904,7 @@ if test -z "$ac_cv_prog_CC"; then
+ set dummy gcc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+@@ -2933,7 +2957,7 @@ if test -z "$CC"; then
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -2973,7 +2997,7 @@ if test -z "$CC"; then
+ set dummy cc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -3032,7 +3056,7 @@ if test -z "$CC"; then
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -3076,7 +3100,7 @@ do
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+@@ -3130,8 +3154,8 @@ fi
+ 
+ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "no acceptable C compiler found in \$PATH
++See \`config.log' for more details" "$LINENO" 5; }
+ 
+ # Provide some information about the compiler.
+ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+@@ -3245,9 +3269,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ as_fn_set_status 77
+-as_fn_error "C compiler cannot create executables
+-See \`config.log' for more details." "$LINENO" 5; }; }
++as_fn_error 77 "C compiler cannot create executables
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+@@ -3289,8 +3312,8 @@ done
+ else
+   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ rm -f conftest conftest$ac_cv_exeext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+@@ -3347,9 +3370,9 @@ $as_echo "$ac_try_echo"; } >&5
+     else
+ 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot run C compiled programs.
++as_fn_error $? "cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5; }
+     fi
+   fi
+ fi
+@@ -3360,7 +3383,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_ex
+ ac_clean_files=$ac_clean_files_save
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+ $as_echo_n "checking for suffix of object files... " >&6; }
+-if test "${ac_cv_objext+set}" = set; then :
++if ${ac_cv_objext+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -3400,8 +3423,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "cannot compute suffix of object files: cannot compile
++See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+@@ -3411,7 +3434,7 @@ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
++if ${ac_cv_c_compiler_gnu+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -3448,7 +3471,7 @@ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+ $as_echo_n "checking whether $CC accepts -g... " >&6; }
+-if test "${ac_cv_prog_cc_g+set}" = set; then :
++if ${ac_cv_prog_cc_g+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_save_c_werror_flag=$ac_c_werror_flag
+@@ -3526,7 +3549,7 @@ else
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if test "${ac_cv_prog_cc_c89+set}" = set; then :
++if ${ac_cv_prog_cc_c89+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_prog_cc_c89=no
+@@ -3625,7 +3648,7 @@ depcc="$CC"   am_compiler_list=
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
+-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
++if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+@@ -3751,7 +3774,7 @@ fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
+ $as_echo_n "checking for library containing strerror... " >&6; }
+-if test "${ac_cv_search_strerror+set}" = set; then :
++if ${ac_cv_search_strerror+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+@@ -3785,11 +3808,11 @@ for ac_lib in '' cposix; do
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext
+-  if test "${ac_cv_search_strerror+set}" = set; then :
++  if ${ac_cv_search_strerror+:} false; then :
+   break
+ fi
+ done
+-if test "${ac_cv_search_strerror+set}" = set; then :
++if ${ac_cv_search_strerror+:} false; then :
+ 
+ else
+   ac_cv_search_strerror=no
+@@ -3815,7 +3838,7 @@ if test -n "$ac_tool_prefix"; then
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -3855,7 +3878,7 @@ if test -z "$ac_cv_prog_CC"; then
+ set dummy gcc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+@@ -3908,7 +3931,7 @@ if test -z "$CC"; then
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -3948,7 +3971,7 @@ if test -z "$CC"; then
+ set dummy cc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -4007,7 +4030,7 @@ if test -z "$CC"; then
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -4051,7 +4074,7 @@ do
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+@@ -4105,8 +4128,8 @@ fi
+ 
+ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "no acceptable C compiler found in \$PATH
++See \`config.log' for more details" "$LINENO" 5; }
+ 
+ # Provide some information about the compiler.
+ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+@@ -4135,7 +4158,7 @@ done
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
++if ${ac_cv_c_compiler_gnu+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -4172,7 +4195,7 @@ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+ $as_echo_n "checking whether $CC accepts -g... " >&6; }
+-if test "${ac_cv_prog_cc_g+set}" = set; then :
++if ${ac_cv_prog_cc_g+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_save_c_werror_flag=$ac_c_werror_flag
+@@ -4250,7 +4273,7 @@ else
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if test "${ac_cv_prog_cc_c89+set}" = set; then :
++if ${ac_cv_prog_cc_c89+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_prog_cc_c89=no
+@@ -4349,7 +4372,7 @@ depcc="$CC"   am_compiler_list=
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
+-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
++if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+@@ -4482,7 +4505,7 @@ if test -n "$ac_tool_prefix"; then
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -4522,7 +4545,7 @@ if test -z "$ac_cv_prog_CC"; then
+ set dummy gcc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+@@ -4575,7 +4598,7 @@ if test -z "$CC"; then
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -4615,7 +4638,7 @@ if test -z "$CC"; then
+ set dummy cc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -4674,7 +4697,7 @@ if test -z "$CC"; then
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -4718,7 +4741,7 @@ do
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+@@ -4772,8 +4795,8 @@ fi
+ 
+ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "no acceptable C compiler found in \$PATH
++See \`config.log' for more details" "$LINENO" 5; }
+ 
+ # Provide some information about the compiler.
+ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+@@ -4802,7 +4825,7 @@ done
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
++if ${ac_cv_c_compiler_gnu+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -4839,7 +4862,7 @@ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+ $as_echo_n "checking whether $CC accepts -g... " >&6; }
+-if test "${ac_cv_prog_cc_g+set}" = set; then :
++if ${ac_cv_prog_cc_g+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_save_c_werror_flag=$ac_c_werror_flag
+@@ -4917,7 +4940,7 @@ else
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if test "${ac_cv_prog_cc_c89+set}" = set; then :
++if ${ac_cv_prog_cc_c89+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_prog_cc_c89=no
+@@ -5016,7 +5039,7 @@ depcc="$CC"   am_compiler_list=
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
+-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
++if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+@@ -5154,7 +5177,7 @@ if test -n "$CPP" && test -d "$CPP"; the
+   CPP=
+ fi
+ if test -z "$CPP"; then
+-  if test "${ac_cv_prog_CPP+set}" = set; then :
++  if ${ac_cv_prog_CPP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+       # Double quotes because CPP needs to be expanded
+@@ -5184,7 +5207,7 @@ else
+   # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
+   # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+@@ -5200,11 +5223,11 @@ else
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+   break
+ fi
+@@ -5243,7 +5266,7 @@ else
+   # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
+   # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+@@ -5259,18 +5282,18 @@ else
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+ 
+ else
+   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ 
+ ac_ext=c
+@@ -5282,7 +5305,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+ $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+-if test "${ac_cv_path_GREP+set}" = set; then :
++if ${ac_cv_path_GREP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$GREP"; then
+@@ -5331,7 +5354,7 @@ esac
+   done
+ IFS=$as_save_IFS
+   if test -z "$ac_cv_path_GREP"; then
+-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+   fi
+ else
+   ac_cv_path_GREP=$GREP
+@@ -5345,7 +5368,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+ $as_echo_n "checking for egrep... " >&6; }
+-if test "${ac_cv_path_EGREP+set}" = set; then :
++if ${ac_cv_path_EGREP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+@@ -5397,7 +5420,7 @@ esac
+   done
+ IFS=$as_save_IFS
+   if test -z "$ac_cv_path_EGREP"; then
+-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+   fi
+ else
+   ac_cv_path_EGREP=$EGREP
+@@ -5412,7 +5435,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+ $as_echo_n "checking for ANSI C header files... " >&6; }
+-if test "${ac_cv_header_stdc+set}" = set; then :
++if ${ac_cv_header_stdc+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -5536,7 +5559,7 @@ if test -n "$CPP" && test -d "$CPP"; the
+   CPP=
+ fi
+ if test -z "$CPP"; then
+-  if test "${ac_cv_prog_CPP+set}" = set; then :
++  if ${ac_cv_prog_CPP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+       # Double quotes because CPP needs to be expanded
+@@ -5566,7 +5589,7 @@ else
+   # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
+   # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+@@ -5582,11 +5605,11 @@ else
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+   break
+ fi
+@@ -5625,7 +5648,7 @@ else
+   # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
+   # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+@@ -5641,18 +5664,18 @@ else
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+ 
+ else
+   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ 
+ ac_ext=c
+@@ -5677,7 +5700,7 @@ if test -z "$CXX"; then
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CXX+set}" = set; then :
++if ${ac_cv_prog_CXX+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CXX"; then
+@@ -5721,7 +5744,7 @@ do
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CXX"; then
+@@ -5799,7 +5822,7 @@ done
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
++if ${ac_cv_cxx_compiler_gnu+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -5836,7 +5859,7 @@ ac_test_CXXFLAGS=${CXXFLAGS+set}
+ ac_save_CXXFLAGS=$CXXFLAGS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+ $as_echo_n "checking whether $CXX accepts -g... " >&6; }
+-if test "${ac_cv_prog_cxx_g+set}" = set; then :
++if ${ac_cv_prog_cxx_g+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+@@ -5922,7 +5945,7 @@ depcc="$CXX"  am_compiler_list=
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
+-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
++if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+@@ -6054,7 +6077,7 @@ $as_echo_n "checking whether cc understa
+ fi
+ set dummy $CC; ac_cc=`$as_echo "$2" |
+ 		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -6176,7 +6199,7 @@ if test -n "$ac_tool_prefix"; then
+ set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_RANLIB+set}" = set; then :
++if ${ac_cv_prog_RANLIB+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$RANLIB"; then
+@@ -6216,7 +6239,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
+ set dummy ranlib; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
++if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_RANLIB"; then
+@@ -6280,8 +6303,7 @@ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+ "
+-eval as_val=\$$as_ac_Header
+-   if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -6295,7 +6317,7 @@ done
+    for ac_header in locale.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
+-if test "x$ac_cv_header_locale_h" = x""yes; then :
++if test "x$ac_cv_header_locale_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LOCALE_H 1
+ _ACEOF
+@@ -6307,7 +6329,7 @@ done
+     if test $ac_cv_header_locale_h = yes; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
+ $as_echo_n "checking for LC_MESSAGES... " >&6; }
+-if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
++if ${am_cv_val_LC_MESSAGES+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -6347,7 +6369,7 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>
+     INTLLIBS=
+ 
+     ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
+-if test "x$ac_cv_header_libintl_h" = x""yes; then :
++if test "x$ac_cv_header_libintl_h" = xyes; then :
+   gt_cv_func_dgettext_libintl="no"
+       libintl_extra_libs=""
+ 
+@@ -6356,7 +6378,7 @@ if test "x$ac_cv_header_libintl_h" = x""
+       #
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
+ $as_echo_n "checking for ngettext in libc... " >&6; }
+-if test "${gt_cv_func_ngettext_libc+set}" = set; then :
++if ${gt_cv_func_ngettext_libc+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -6387,7 +6409,7 @@ $as_echo "$gt_cv_func_ngettext_libc" >&6
+       if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+ 	      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
+ $as_echo_n "checking for dgettext in libc... " >&6; }
+-if test "${gt_cv_func_dgettext_libc+set}" = set; then :
++if ${gt_cv_func_dgettext_libc+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -6420,7 +6442,7 @@ $as_echo "$gt_cv_func_dgettext_libc" >&6
+         for ac_func in bind_textdomain_codeset
+ do :
+   ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
++if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_BIND_TEXTDOMAIN_CODESET 1
+ _ACEOF
+@@ -6439,7 +6461,7 @@ done
+ 
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
+ $as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
++if ${ac_cv_lib_intl_bindtextdomain+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -6473,10 +6495,10 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
+ $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
+-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
++if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
+ $as_echo_n "checking for ngettext in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
++if ${ac_cv_lib_intl_ngettext+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -6510,10 +6532,10 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
+ $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
++if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
+ $as_echo_n "checking for dgettext in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
++if ${ac_cv_lib_intl_dgettext+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -6547,7 +6569,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
+ $as_echo "$ac_cv_lib_intl_dgettext" >&6; }
+-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
++if test "x$ac_cv_lib_intl_dgettext" = xyes; then :
+   gt_cv_func_dgettext_libintl=yes
+ fi
+ 
+@@ -6563,7 +6585,7 @@ $as_echo_n "checking if -liconv is neede
+ $as_echo "" >&6; }
+   	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
+ $as_echo_n "checking for ngettext in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
++if ${ac_cv_lib_intl_ngettext+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -6597,10 +6619,10 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
+ $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
++if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
+ $as_echo_n "checking for dcgettext in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
++if ${ac_cv_lib_intl_dcgettext+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -6634,7 +6656,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
+ $as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
+-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
++if test "x$ac_cv_lib_intl_dcgettext" = xyes; then :
+   gt_cv_func_dgettext_libintl=yes
+ 			libintl_extra_libs=-liconv
+ else
+@@ -6659,7 +6681,7 @@ fi
+           for ac_func in bind_textdomain_codeset
+ do :
+   ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
++if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_BIND_TEXTDOMAIN_CODESET 1
+ _ACEOF
+@@ -6697,7 +6719,7 @@ $as_echo "#define HAVE_GETTEXT 1" >>conf
+ set dummy msgfmt; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_MSGFMT+set}" = set; then :
++if ${ac_cv_path_MSGFMT+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case "$MSGFMT" in
+@@ -6734,7 +6756,7 @@ fi
+ 	  for ac_func in dcgettext
+ do :
+   ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
+-if test "x$ac_cv_func_dcgettext" = x""yes; then :
++if test "x$ac_cv_func_dcgettext" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_DCGETTEXT 1
+ _ACEOF
+@@ -6775,7 +6797,7 @@ fi
+ set dummy gmsgfmt; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
++if ${ac_cv_path_GMSGFMT+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $GMSGFMT in
+@@ -6816,7 +6838,7 @@ fi
+ set dummy xgettext; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_XGETTEXT+set}" = set; then :
++if ${ac_cv_path_XGETTEXT+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case "$XGETTEXT" in
+@@ -6867,7 +6889,7 @@ else
+   case $host in
+ 	    *-*-solaris*)
+ 	    	                	    	                ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
++if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
+   CATOBJEXT=.gmo
+                DATADIRNAME=share
+ else
+@@ -6998,13 +7020,18 @@ $as_echo "$LINGUAS" >&6; }
+ 
+ 
+ 
++
++
++
++
++
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ 	if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
++if ${ac_cv_path_PKG_CONFIG+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $PKG_CONFIG in
+@@ -7047,7 +7074,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
+ set dummy pkg-config; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
++if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $ac_pt_PKG_CONFIG in
+@@ -7110,7 +7137,6 @@ $as_echo "yes" >&6; }
+ $as_echo "no" >&6; }
+ 		PKG_CONFIG=""
+ 	fi
+-
+ fi
+ 
+ pkg_failed=no
+@@ -7127,6 +7153,7 @@ if test -n "$GLIB_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 " 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -7143,6 +7170,7 @@ if test -n "$GLIB_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 " 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -7153,6 +7181,8 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+         _pkg_short_errors_supported=yes
+@@ -7160,14 +7190,14 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 " 2>&1`
++	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 " 2>&1`
+         else
+-	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 " 2>&1`
++	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 " 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GLIB_PKG_ERRORS" >&5
+ 
+-	as_fn_error "Package requirements (glib-2.0 ) were not met:
++	as_fn_error $? "Package requirements (glib-2.0 ) were not met:
+ 
+ $GLIB_PKG_ERRORS
+ 
+@@ -7176,12 +7206,13 @@ installed software in a non-standard pre
+ 
+ Alternatively, you may set the environment variables GLIB_CFLAGS
+ and GLIB_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -7190,13 +7221,13 @@ and GLIB_LIBS to avoid the need to call
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+ 	GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
+ 	GLIB_LIBS=$pkg_cv_GLIB_LIBS
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-	:
++
+ fi
+ 
+ 
+@@ -7206,102 +7237,18 @@ fi
+ if test "${with_xulrunner_sdk+set}" = set; then :
+   withval=$with_xulrunner_sdk;
+ 	XULRUNNER_SDK_PREFIX=$with_xulrunner_sdk
+-	GECKO_CFLAGS="-I$XULRUNNER_SDK_PREFIX/include -I$XULRUNNER_SDK_PREFIX/include/plugin -I$XULRUNNER_SDK_PREFIX/include/nspr -I$XULRUNNER_SDK_PREFIX/include/xpcom -I$XULRUNNER_SDK_PREFIX/include/string -I$XULRUNNER_SDK_PREFIX/include/java"
+-	GECKO_LIBS="-L$XULRUNNER_SDK_PREFIX/lib -lxpcomglue_s -lxul -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -ldl"
++	GECKO_CFLAGS="-I$XULRUNNER_SDK_PREFIX/include -I$XULRUNNER_SDK_PREFIX/include/nspr"
++
+ 	# Check whether --enable-new-libxul was given.
+ if test "${enable_new_libxul+set}" = set; then :
+-  enableval=$enable_new_libxul; usenewlibxul=$enableval
+-else
+-  usenewlibxul=no
+-fi
+-
+-
+-	if test $usenewlibxul == yes; then
+-		GECKO_CFLAGS="$GECKO_CFLAGS -DMOZ_NO_MOZALLOC"
+-
++  enableval=$enable_new_libxul;
+ $as_echo "#define HAVE_NEW_XULRUNNER 1" >>confdefs.h
+ 
+-	fi
+-
+-
+ fi
+ 
+ 
+-if test "$GECKO_CFLAGS" = ""; then
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GECKO" >&5
+-$as_echo_n "checking for GECKO... " >&6; }
+-
+-if test -n "$GECKO_CFLAGS"; then
+-    pkg_cv_GECKO_CFLAGS="$GECKO_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxul >= 2.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libxul >= 2.0") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "libxul >= 2.0" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+ fi
+-if test -n "$GECKO_LIBS"; then
+-    pkg_cv_GECKO_LIBS="$GECKO_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxul >= 2.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libxul >= 2.0") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "libxul >= 2.0" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxul >= 2.0" 2>&1`
+-        else
+-	        GECKO_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxul >= 2.0" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$GECKO_PKG_ERRORS" >&5
+ 
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-                { $as_echo "$as_me:${as_lineno-$LINENO}: libxul >= 2.0 beta 5 not found, trying another" >&5
+-$as_echo "$as_me: libxul >= 2.0 beta 5 not found, trying another" >&6;}
+-elif test $pkg_failed = untried; then
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: libxul >= 2.0 beta 5 not found, trying another" >&5
+-$as_echo "$as_me: libxul >= 2.0 beta 5 not found, trying another" >&6;}
+-else
+-	GECKO_CFLAGS=$pkg_cv_GECKO_CFLAGS
+-	GECKO_LIBS=$pkg_cv_GECKO_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	GECKO_CFLAGS="$GECKO_CFLAGS -DMOZ_NO_MOZALLOC"
+-$as_echo "#define HAVE_NEW_XULRUNNER 1" >>confdefs.h
+- { $as_echo "$as_me:${as_lineno-$LINENO}: Using libxul >= 2.0 beta 5" >&5
+-$as_echo "$as_me: Using libxul >= 2.0 beta 5" >&6;}
+-
+-fi
+-fi
+ 
+ if test "$GECKO_CFLAGS" = ""; then
+ 
+@@ -7313,12 +7260,13 @@ if test -n "$GECKO_CFLAGS"; then
+     pkg_cv_GECKO_CFLAGS="$GECKO_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxul < 1.9.2\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libxul < 1.9.2") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mozilla-plugin >= 2.0\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "mozilla-plugin >= 2.0") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "libxul < 1.9.2" 2>/dev/null`
++  pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "mozilla-plugin >= 2.0" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -7329,12 +7277,13 @@ if test -n "$GECKO_LIBS"; then
+     pkg_cv_GECKO_LIBS="$GECKO_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxul < 1.9.2\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libxul < 1.9.2") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mozilla-plugin >= 2.0\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "mozilla-plugin >= 2.0") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "libxul < 1.9.2" 2>/dev/null`
++  pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "mozilla-plugin >= 2.0" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -7345,79 +7294,8 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxul < 1.9.2" 2>&1`
+-        else
+-	        GECKO_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxul < 1.9.2" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$GECKO_PKG_ERRORS" >&5
+-
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+-                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libxul < 1.9.2 not found, trying another" >&5
+-$as_echo "$as_me: WARNING: libxul < 1.9.2 not found, trying another" >&2;}
+-elif test $pkg_failed = untried; then
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libxul < 1.9.2 not found, trying another" >&5
+-$as_echo "$as_me: WARNING: libxul < 1.9.2 not found, trying another" >&2;}
+-else
+-	GECKO_CFLAGS=$pkg_cv_GECKO_CFLAGS
+-	GECKO_LIBS=$pkg_cv_GECKO_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	 { $as_echo "$as_me:${as_lineno-$LINENO}: Using libxul < 1.9.2" >&5
+-$as_echo "$as_me: Using libxul < 1.9.2" >&6;}
+-
+-fi
+-fi
+-if test "$GECKO_CFLAGS" = ""; then
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GECKO" >&5
+-$as_echo_n "checking for GECKO... " >&6; }
+-
+-if test -n "$GECKO_CFLAGS"; then
+-    pkg_cv_GECKO_CFLAGS="$GECKO_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxul >= 1.9.2\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libxul >= 1.9.2") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "libxul >= 1.9.2" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$GECKO_LIBS"; then
+-    pkg_cv_GECKO_LIBS="$GECKO_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxul >= 1.9.2\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libxul >= 1.9.2") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "libxul >= 1.9.2" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+         _pkg_short_errors_supported=yes
+@@ -7425,176 +7303,28 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxul >= 1.9.2" 2>&1`
++	        GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mozilla-plugin >= 2.0" 2>&1`
+         else
+-	        GECKO_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxul >= 1.9.2" 2>&1`
++	        GECKO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mozilla-plugin >= 2.0" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GECKO_PKG_ERRORS" >&5
+ 
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-                { $as_echo "$as_me:${as_lineno-$LINENO}: libxul >= 1.9.2 not found, trying another" >&5
+-$as_echo "$as_me: libxul >= 1.9.2 not found, trying another" >&6;}
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: mozilla-plugin >= 2.0 not found. Trying another" >&5
++$as_echo "$as_me: WARNING: mozilla-plugin >= 2.0 not found. Trying another" >&2;}
+ elif test $pkg_failed = untried; then
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: libxul >= 1.9.2 not found, trying another" >&5
+-$as_echo "$as_me: libxul >= 1.9.2 not found, trying another" >&6;}
+-else
+-	GECKO_CFLAGS=$pkg_cv_GECKO_CFLAGS
+-	GECKO_LIBS=$pkg_cv_GECKO_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-$as_echo "#define HAVE_NEW_XULRUNNER 1" >>confdefs.h
+- { $as_echo "$as_me:${as_lineno-$LINENO}: Using libxul >= 1.9.2" >&5
+-$as_echo "$as_me: Using libxul >= 1.9.2" >&6;}
+-
+-fi
+-fi
+-
+-if test "$GECKO_CFLAGS" = ""; then
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GECKO" >&5
+-$as_echo_n "checking for GECKO... " >&6; }
+-
+-if test -n "$GECKO_CFLAGS"; then
+-    pkg_cv_GECKO_CFLAGS="$GECKO_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxul-unstable\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libxul-unstable") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "libxul-unstable" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$GECKO_LIBS"; then
+-    pkg_cv_GECKO_LIBS="$GECKO_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxul-unstable\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libxul-unstable") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "libxul-unstable" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxul-unstable" 2>&1`
+-        else
+-	        GECKO_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxul-unstable" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$GECKO_PKG_ERRORS" >&5
+-
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+-                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libxul-unstable not found, trying another" >&5
+-$as_echo "$as_me: WARNING: libxul-unstable not found, trying another" >&2;}
+-elif test $pkg_failed = untried; then
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libxul-unstable not found, trying another" >&5
+-$as_echo "$as_me: WARNING: libxul-unstable not found, trying another" >&2;}
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: mozilla-plugin >= 2.0 not found. Trying another" >&5
++$as_echo "$as_me: WARNING: mozilla-plugin >= 2.0 not found. Trying another" >&2;}
+ else
+ 	GECKO_CFLAGS=$pkg_cv_GECKO_CFLAGS
+ 	GECKO_LIBS=$pkg_cv_GECKO_LIBS
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-	 { $as_echo "$as_me:${as_lineno-$LINENO}: Using libxul-unstable" >&5
+-$as_echo "$as_me: Using libxul-unstable" >&6;}
+-
+-fi
+-fi
+-
+-if test "$GECKO_CFLAGS" = ""; then
+ 
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GECKO" >&5
+-$as_echo_n "checking for GECKO... " >&6; }
+-
+-if test -n "$GECKO_CFLAGS"; then
+-    pkg_cv_GECKO_CFLAGS="$GECKO_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mozilla-plugin mozilla-xpcom\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "mozilla-plugin mozilla-xpcom") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "mozilla-plugin mozilla-xpcom" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$GECKO_LIBS"; then
+-    pkg_cv_GECKO_LIBS="$GECKO_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mozilla-plugin mozilla-xpcom\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "mozilla-plugin mozilla-xpcom") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "mozilla-plugin mozilla-xpcom" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "mozilla-plugin mozilla-xpcom" 2>&1`
+-        else
+-	        GECKO_PKG_ERRORS=`$PKG_CONFIG --print-errors "mozilla-plugin mozilla-xpcom" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$GECKO_PKG_ERRORS" >&5
+-
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: mozilla-plugin not found, trying another" >&5
+-$as_echo "$as_me: WARNING: mozilla-plugin not found, trying another" >&2;}
+-elif test $pkg_failed = untried; then
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: mozilla-plugin not found, trying another" >&5
+-$as_echo "$as_me: WARNING: mozilla-plugin not found, trying another" >&2;}
+-else
+-	GECKO_CFLAGS=$pkg_cv_GECKO_CFLAGS
+-	GECKO_LIBS=$pkg_cv_GECKO_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	 { $as_echo "$as_me:${as_lineno-$LINENO}: Using mozilla" >&5
++$as_echo "#define HAVE_NEW_XULRUNNER 1" >>confdefs.h
++ { $as_echo "$as_me:${as_lineno-$LINENO}: Using mozilla" >&5
+ $as_echo "$as_me: Using mozilla" >&6;}
+ 
+ fi
+@@ -7610,86 +7340,13 @@ if test -n "$GECKO_CFLAGS"; then
+     pkg_cv_GECKO_CFLAGS="$GECKO_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"firefox-plugin firefox-xpcom\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "firefox-plugin firefox-xpcom") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "firefox-plugin firefox-xpcom" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$GECKO_LIBS"; then
+-    pkg_cv_GECKO_LIBS="$GECKO_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"firefox-plugin firefox-xpcom\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "firefox-plugin firefox-xpcom") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "firefox-plugin firefox-xpcom" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "firefox-plugin firefox-xpcom" 2>&1`
+-        else
+-	        GECKO_PKG_ERRORS=`$PKG_CONFIG --print-errors "firefox-plugin firefox-xpcom" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$GECKO_PKG_ERRORS" >&5
+-
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: firefox-plugin not found, trying another" >&5
+-$as_echo "$as_me: WARNING: firefox-plugin not found, trying another" >&2;}
+-elif test $pkg_failed = untried; then
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: firefox-plugin not found, trying another" >&5
+-$as_echo "$as_me: WARNING: firefox-plugin not found, trying another" >&2;}
+-else
+-	GECKO_CFLAGS=$pkg_cv_GECKO_CFLAGS
+-	GECKO_LIBS=$pkg_cv_GECKO_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	 { $as_echo "$as_me:${as_lineno-$LINENO}: Using firefox" >&5
+-$as_echo "$as_me: Using firefox" >&6;}
+-
+-fi
+-fi
+-
+-if test "$GECKO_CFLAGS" = ""; then
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GECKO" >&5
+-$as_echo_n "checking for GECKO... " >&6; }
+-
+-if test -n "$GECKO_CFLAGS"; then
+-    pkg_cv_GECKO_CFLAGS="$GECKO_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"seamonkey-plugin seamonkey-xpcom\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "seamonkey-plugin seamonkey-xpcom") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mozilla-plugin\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "mozilla-plugin") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-plugin seamonkey-xpcom" 2>/dev/null`
++  pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "mozilla-plugin" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -7700,12 +7357,13 @@ if test -n "$GECKO_LIBS"; then
+     pkg_cv_GECKO_LIBS="$GECKO_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"seamonkey-plugin seamonkey-xpcom\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "seamonkey-plugin seamonkey-xpcom") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mozilla-plugin\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "mozilla-plugin") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "seamonkey-plugin seamonkey-xpcom" 2>/dev/null`
++  pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "mozilla-plugin" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -7716,80 +7374,8 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-plugin seamonkey-xpcom" 2>&1`
+-        else
+-	        GECKO_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-plugin seamonkey-xpcom" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$GECKO_PKG_ERRORS" >&5
+-
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+-                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: seamokey-plugin not found, trying another" >&5
+-$as_echo "$as_me: WARNING: seamokey-plugin not found, trying another" >&2;}
+-elif test $pkg_failed = untried; then
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: seamokey-plugin not found, trying another" >&5
+-$as_echo "$as_me: WARNING: seamokey-plugin not found, trying another" >&2;}
+-else
+-	GECKO_CFLAGS=$pkg_cv_GECKO_CFLAGS
+-	GECKO_LIBS=$pkg_cv_GECKO_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	 { $as_echo "$as_me:${as_lineno-$LINENO}: Using seamonkey" >&5
+-$as_echo "$as_me: Using seamonkey" >&6;}
+-
+-fi
+-fi
+-
+-if test "$GECKO_CFLAGS" = ""; then
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GECKO" >&5
+-$as_echo_n "checking for GECKO... " >&6; }
+-
+-if test -n "$GECKO_CFLAGS"; then
+-    pkg_cv_GECKO_CFLAGS="$GECKO_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xulrunner-plugin xulrunner-xpcom\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "xulrunner-plugin xulrunner-xpcom") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "xulrunner-plugin xulrunner-xpcom" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$GECKO_LIBS"; then
+-    pkg_cv_GECKO_LIBS="$GECKO_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xulrunner-plugin xulrunner-xpcom\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "xulrunner-plugin xulrunner-xpcom") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "xulrunner-plugin xulrunner-xpcom" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+         _pkg_short_errors_supported=yes
+@@ -7797,101 +7383,25 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xulrunner-plugin xulrunner-xpcom" 2>&1`
++	        GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mozilla-plugin" 2>&1`
+         else
+-	        GECKO_PKG_ERRORS=`$PKG_CONFIG --print-errors "xulrunner-plugin xulrunner-xpcom" 2>&1`
++	        GECKO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mozilla-plugin" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GECKO_PKG_ERRORS" >&5
+ 
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: xulrunner-plugin not found, trying another" >&5
+-$as_echo "$as_me: WARNING: xulrunner-plugin not found, trying another" >&2;}
++	as_fn_error $? "mozilla-plugin not found. Try passing --with-xulrunner-sdk" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: xulrunner-plugin not found, trying another" >&5
+-$as_echo "$as_me: WARNING: xulrunner-plugin not found, trying another" >&2;}
+-else
+-	GECKO_CFLAGS=$pkg_cv_GECKO_CFLAGS
+-	GECKO_LIBS=$pkg_cv_GECKO_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	 { $as_echo "$as_me:${as_lineno-$LINENO}: Using xulrunner" >&5
+-$as_echo "$as_me: Using xulrunner" >&6;}
+-
+-fi
+-fi
+-
+-if test "$GECKO_CFLAGS" = ""; then
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GECKO" >&5
+-$as_echo_n "checking for GECKO... " >&6; }
+-
+-if test -n "$GECKO_CFLAGS"; then
+-    pkg_cv_GECKO_CFLAGS="$GECKO_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"iceape-plugin iceape-xpcom\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "iceape-plugin iceape-xpcom") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "iceape-plugin iceape-xpcom" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$GECKO_LIBS"; then
+-    pkg_cv_GECKO_LIBS="$GECKO_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"iceape-plugin iceape-xpcom\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "iceape-plugin iceape-xpcom") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "iceape-plugin iceape-xpcom" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "iceape-plugin iceape-xpcom" 2>&1`
+-        else
+-	        GECKO_PKG_ERRORS=`$PKG_CONFIG --print-errors "iceape-plugin iceape-xpcom" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$GECKO_PKG_ERRORS" >&5
+-
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+-                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: iceape-plugin not found, trying another" >&5
+-$as_echo "$as_me: WARNING: iceape-plugin not found, trying another" >&2;}
+-elif test $pkg_failed = untried; then
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: iceape-plugin not found, trying another" >&5
+-$as_echo "$as_me: WARNING: iceape-plugin not found, trying another" >&2;}
++	as_fn_error $? "mozilla-plugin not found. Try passing --with-xulrunner-sdk" "$LINENO" 5
+ else
+ 	GECKO_CFLAGS=$pkg_cv_GECKO_CFLAGS
+ 	GECKO_LIBS=$pkg_cv_GECKO_LIBS
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-	 { $as_echo "$as_me:${as_lineno-$LINENO}: Using iceape" >&5
+-$as_echo "$as_me: Using iceape" >&6;}
++	 { $as_echo "$as_me:${as_lineno-$LINENO}: Using mozilla" >&5
++$as_echo "$as_me: Using mozilla" >&6;}
+ 
+ fi
+ fi
+@@ -7911,6 +7421,7 @@ if test -n "$NSPR_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -7927,6 +7438,7 @@ if test -n "$NSPR_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_NSPR_LIBS=`$PKG_CONFIG --libs "nspr" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -7937,6 +7449,8 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+         _pkg_short_errors_supported=yes
+@@ -7944,18 +7458,18 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "nspr" 2>&1`
++	        NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "nspr" 2>&1`
+         else
+-	        NSPR_PKG_ERRORS=`$PKG_CONFIG --print-errors "nspr" 2>&1`
++	        NSPR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "nspr" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$NSPR_PKG_ERRORS" >&5
+ 
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: nspr not found, may not be needed" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: nspr not found, may not be needed" >&5
+ $as_echo "$as_me: WARNING: nspr not found, may not be needed" >&2;}
+ elif test $pkg_failed = untried; then
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: nspr not found, may not be needed" >&5
+ $as_echo "$as_me: WARNING: nspr not found, may not be needed" >&2;}
+ else
+@@ -7988,6 +7502,7 @@ if test -n "$DBUS_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 0.95 dbus-glib-1 >= 0.70" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -8004,6 +7519,7 @@ if test -n "$DBUS_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 0.95 dbus-glib-1 >= 0.70" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -8014,6 +7530,8 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+         _pkg_short_errors_supported=yes
+@@ -8021,14 +7539,14 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1 >= 0.95 dbus-glib-1 >= 0.70" 2>&1`
++	        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1 >= 0.95 dbus-glib-1 >= 0.70" 2>&1`
+         else
+-	        DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 >= 0.95 dbus-glib-1 >= 0.70" 2>&1`
++	        DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1 >= 0.95 dbus-glib-1 >= 0.70" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$DBUS_PKG_ERRORS" >&5
+ 
+-	as_fn_error "Package requirements (dbus-1 >= 0.95 dbus-glib-1 >= 0.70) were not met:
++	as_fn_error $? "Package requirements (dbus-1 >= 0.95 dbus-glib-1 >= 0.70) were not met:
+ 
+ $DBUS_PKG_ERRORS
+ 
+@@ -8037,12 +7555,13 @@ installed software in a non-standard pre
+ 
+ Alternatively, you may set the environment variables DBUS_CFLAGS
+ and DBUS_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -8051,13 +7570,13 @@ and DBUS_LIBS to avoid the need to call
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+ 	DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
+ 	DBUS_LIBS=$pkg_cv_DBUS_LIBS
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-	:
++
+ fi
+ 
+ 
+@@ -8093,6 +7612,7 @@ if test -n "$GCONF_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -8109,6 +7629,7 @@ if test -n "$GCONF_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -8119,6 +7640,8 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+         _pkg_short_errors_supported=yes
+@@ -8126,16 +7649,14 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gconf-2.0" 2>&1`
++	        GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gconf-2.0" 2>&1`
+         else
+-	        GCONF_PKG_ERRORS=`$PKG_CONFIG --print-errors "gconf-2.0" 2>&1`
++	        GCONF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gconf-2.0" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GCONF_PKG_ERRORS" >&5
+ 
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-                 if false; then
++	 if false; then
+   GCONF_SCHEMAS_INSTALL_TRUE=
+   GCONF_SCHEMAS_INSTALL_FALSE='#'
+ else
+@@ -8145,6 +7666,8 @@ fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using keystore for preferences" >&5
+ $as_echo "$as_me: Using keystore for preferences" >&6;}
+ elif test $pkg_failed = untried; then
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 	 if false; then
+   GCONF_SCHEMAS_INSTALL_TRUE=
+   GCONF_SCHEMAS_INSTALL_FALSE='#'
+@@ -8196,7 +7719,7 @@ $as_echo "Using $GCONF_SCHEMA_FILE_DIR a
+ if test "${enable_schemas_install+set}" = set; then :
+   enableval=$enable_schemas_install; case ${enableval} in
+        yes|no) ;;
+-       *) as_fn_error "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
++       *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
+       esac
+ fi
+ 
+@@ -8243,6 +7766,7 @@ if test -n "$GIO_CFLAGS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -8259,6 +7783,7 @@ if test -n "$GIO_LIBS"; then
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+ fi
+@@ -8269,6 +7794,8 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+         _pkg_short_errors_supported=yes
+@@ -8276,18 +7803,18 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-2.0" 2>&1`
++	        GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-2.0" 2>&1`
+         else
+-	        GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-2.0" 2>&1`
++	        GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-2.0" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GIO_PKG_ERRORS" >&5
+ 
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Compiling without gio support" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Compiling without gio support" >&5
+ $as_echo "$as_me: WARNING: Compiling without gio support" >&2;}
+ elif test $pkg_failed = untried; then
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Compiling without gio support" >&5
+ $as_echo "$as_me: WARNING: Compiling without gio support" >&2;}
+ else
+@@ -8395,10 +7922,21 @@ $as_echo "$as_me: WARNING: cache variabl
+      :end' >>confcache
+ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+   if test -w "$cache_file"; then
+-    test "x$cache_file" != "x/dev/null" &&
++    if test "x$cache_file" != "x/dev/null"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+ $as_echo "$as_me: updating cache $cache_file" >&6;}
+-    cat confcache >$cache_file
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
+   else
+     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+ $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+@@ -8414,6 +7952,7 @@ DEFS=-DHAVE_CONFIG_H
+ 
+ ac_libobjs=
+ ac_ltlibobjs=
++U=
+ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+   # 1. Remove the extension, and $U if already installed.
+   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+@@ -8437,47 +7976,47 @@ else
+ fi
+ 
+ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+-  as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
++  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+-  as_fn_error "conditional \"AMDEP\" was never defined.
++  as_fn_error $? "conditional \"AMDEP\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
++  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
++  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
++  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+-  as_fn_error "conditional \"am__fastdepCXX\" was never defined.
++  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
+-  as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
++  as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
+-  as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
++  as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
+-  as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
++  as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
+-  as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
++  as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ 
+-: ${CONFIG_STATUS=./config.status}
++: "${CONFIG_STATUS=./config.status}"
+ ac_write_fail=0
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+@@ -8578,6 +8117,7 @@ fi
+ IFS=" ""	$as_nl"
+ 
+ # Find who we are.  Look in the path if we contain no directory separator.
++as_myself=
+ case $0 in #((
+   *[\\/]* ) as_myself=$0 ;;
+   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -8623,19 +8163,19 @@ export LANGUAGE
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ 
+-# as_fn_error ERROR [LINENO LOG_FD]
+-# ---------------------------------
++# as_fn_error STATUS ERROR [LINENO LOG_FD]
++# ----------------------------------------
+ # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+ # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+-# script with status $?, using 1 if that was 0.
++# script with STATUS, using 1 if that was 0.
+ as_fn_error ()
+ {
+-  as_status=$?; test $as_status -eq 0 && as_status=1
+-  if test "$3"; then
+-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
++  as_status=$1; test $as_status -eq 0 && as_status=1
++  if test "$4"; then
++    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+   fi
+-  $as_echo "$as_me: error: $1" >&2
++  $as_echo "$as_me: error: $2" >&2
+   as_fn_exit $as_status
+ } # as_fn_error
+ 
+@@ -8831,7 +8371,7 @@ $as_echo X"$as_dir" |
+       test -d "$as_dir" && break
+     done
+     test -z "$as_dirs" || eval "mkdir $as_dirs"
+-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
++  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+ 
+ 
+ } # as_fn_mkdir_p
+@@ -8885,7 +8425,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
+ # values after options handling.
+ ac_log="
+ This file was extended by $as_me, which was
+-generated by GNU Autoconf 2.65.  Invocation command line was
++generated by GNU Autoconf 2.68.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -8951,10 +8491,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.65,
++configured by $0, generated by GNU Autoconf 2.68,
+   with options \\"\$ac_cs_config\\"
+ 
+-Copyright (C) 2009 Free Software Foundation, Inc.
++Copyright (C) 2010 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+ 
+@@ -8972,11 +8512,16 @@ ac_need_defaults=:
+ while test $# != 0
+ do
+   case $1 in
+-  --*=*)
++  --*=?*)
+     ac_option=`expr "X$1" : 'X\([^=]*\)='`
+     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+     ac_shift=:
+     ;;
++  --*=)
++    ac_option=`expr "X$1" : 'X\([^=]*\)='`
++    ac_optarg=
++    ac_shift=:
++    ;;
+   *)
+     ac_option=$1
+     ac_optarg=$2
+@@ -8998,6 +8543,7 @@ do
+     $ac_shift
+     case $ac_optarg in
+     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
++    '') as_fn_error $? "missing file argument" ;;
+     esac
+     as_fn_append CONFIG_FILES " '$ac_optarg'"
+     ac_need_defaults=false;;
+@@ -9010,7 +8556,7 @@ do
+     ac_need_defaults=false;;
+   --he | --h)
+     # Conflict between --help and --header
+-    as_fn_error "ambiguous option: \`$1'
++    as_fn_error $? "ambiguous option: \`$1'
+ Try \`$0 --help' for more information.";;
+   --help | --hel | -h )
+     $as_echo "$ac_cs_usage"; exit ;;
+@@ -9019,7 +8565,7 @@ Try \`$0 --help' for more information.";
+     ac_cs_silent=: ;;
+ 
+   # This is an error.
+-  -*) as_fn_error "unrecognized option: \`$1'
++  -*) as_fn_error $? "unrecognized option: \`$1'
+ Try \`$0 --help' for more information." ;;
+ 
+   *) as_fn_append ac_config_targets " $1"
+@@ -9083,7 +8629,7 @@ do
+     "src/libgmlib/Makefile") CONFIG_FILES="$CONFIG_FILES src/libgmlib/Makefile" ;;
+     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+ 
+-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
++  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+   esac
+ done
+ 
+@@ -9106,9 +8652,10 @@ fi
+ # after its creation but before its name has been assigned to `$tmp'.
+ $debug ||
+ {
+-  tmp=
++  tmp= ac_tmp=
+   trap 'exit_status=$?
+-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
++  : "${ac_tmp:=$tmp}"
++  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+ ' 0
+   trap 'as_fn_exit 1' 1 2 13 15
+ }
+@@ -9116,12 +8663,13 @@ $debug ||
+ 
+ {
+   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+-  test -n "$tmp" && test -d "$tmp"
++  test -d "$tmp"
+ }  ||
+ {
+   tmp=./conf$$-$RANDOM
+   (umask 077 && mkdir "$tmp")
+-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
++} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
++ac_tmp=$tmp
+ 
+ # Set up the scripts for CONFIG_FILES section.
+ # No need to generate them if there are no CONFIG_FILES.
+@@ -9138,12 +8686,12 @@ if test "x$ac_cr" = x; then
+ fi
+ ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+ if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+-  ac_cs_awk_cr='\r'
++  ac_cs_awk_cr='\\r'
+ else
+   ac_cs_awk_cr=$ac_cr
+ fi
+ 
+-echo 'BEGIN {' >"$tmp/subs1.awk" &&
++echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+ _ACEOF
+ 
+ 
+@@ -9152,18 +8700,18 @@ _ACEOF
+   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+   echo "_ACEOF"
+ } >conf$$subs.sh ||
+-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
++  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
++ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   . ./conf$$subs.sh ||
+-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
++    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ 
+   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+   if test $ac_delim_n = $ac_delim_num; then
+     break
+   elif $ac_last_try; then
+-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
++    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+   else
+     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+   fi
+@@ -9171,7 +8719,7 @@ done
+ rm -f conf$$subs.sh
+ 
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
++cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+ _ACEOF
+ sed -n '
+ h
+@@ -9219,7 +8767,7 @@ t delim
+ rm -f conf$$subs.awk
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ _ACAWK
+-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
++cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+   for (key in S) S_is_set[key] = 1
+   FS = ""
+ 
+@@ -9251,21 +8799,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
+   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+ else
+   cat
+-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
++fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
++  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+ _ACEOF
+ 
+-# VPATH may cause trouble with some makes, so we remove $(srcdir),
+-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
++# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
++# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+ # trailing colons and then remove the whole line if VPATH becomes empty
+ # (actually we leave an empty line to preserve line numbers).
+ if test "x$srcdir" = x.; then
+-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+-s/:*\$(srcdir):*/:/
+-s/:*\${srcdir}:*/:/
+-s/:*@srcdir@:*/:/
+-s/^\([^=]*=[	 ]*\):*/\1/
++  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
++h
++s///
++s/^/:/
++s/[	 ]*$/:/
++s/:\$(srcdir):/:/g
++s/:\${srcdir}:/:/g
++s/:@srcdir@:/:/g
++s/^:*//
+ s/:*$//
++x
++s/\(=[	 ]*\).*/\1/
++G
++s/\n//
+ s/^[^=]*=[	 ]*$//
+ }'
+ fi
+@@ -9277,7 +8833,7 @@ fi # test -n "$CONFIG_FILES"
+ # No need to generate them if there are no CONFIG_HEADERS.
+ # This happens for instance with `./config.status Makefile'.
+ if test -n "$CONFIG_HEADERS"; then
+-cat >"$tmp/defines.awk" <<\_ACAWK ||
++cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+ BEGIN {
+ _ACEOF
+ 
+@@ -9289,11 +8845,11 @@ _ACEOF
+ # handling of long lines.
+ ac_delim='%!_!# '
+ for ac_last_try in false false :; do
+-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+-  if test -z "$ac_t"; then
++  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
++  if test -z "$ac_tt"; then
+     break
+   elif $ac_last_try; then
+-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
++    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+   else
+     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+   fi
+@@ -9378,7 +8934,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+ _ACAWK
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-  as_fn_error "could not setup config headers machinery" "$LINENO" 5
++  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+ fi # test -n "$CONFIG_HEADERS"
+ 
+ 
+@@ -9391,7 +8947,7 @@ do
+   esac
+   case $ac_mode$ac_tag in
+   :[FHL]*:*);;
+-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
++  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+   :[FH]-) ac_tag=-:-;;
+   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+   esac
+@@ -9410,7 +8966,7 @@ do
+     for ac_f
+     do
+       case $ac_f in
+-      -) ac_f="$tmp/stdin";;
++      -) ac_f="$ac_tmp/stdin";;
+       *) # Look for the file first in the build tree, then in the source tree
+ 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+ 	 # because $ac_f cannot contain `:'.
+@@ -9419,7 +8975,7 @@ do
+ 	   [\\/$]*) false;;
+ 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ 	   esac ||
+-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
++	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+       esac
+       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+       as_fn_append ac_file_inputs " '$ac_f'"
+@@ -9445,8 +9001,8 @@ $as_echo "$as_me: creating $ac_file" >&6
+     esac
+ 
+     case $ac_tag in
+-    *:-:* | *:-) cat >"$tmp/stdin" \
+-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
++    *:-:* | *:-) cat >"$ac_tmp/stdin" \
++      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+     esac
+     ;;
+   esac
+@@ -9582,23 +9138,24 @@ s&@INSTALL@&$ac_INSTALL&;t t
+ s&@MKDIR_P@&$ac_MKDIR_P&;t t
+ $ac_datarootdir_hack
+ "
+-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+-  || as_fn_error "could not create $ac_file" "$LINENO" 5
++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
++  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ 
+ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
++  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
++  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
++      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+-which seems to be undefined.  Please make sure it is defined." >&5
++which seems to be undefined.  Please make sure it is defined" >&5
+ $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+-which seems to be undefined.  Please make sure it is defined." >&2;}
++which seems to be undefined.  Please make sure it is defined" >&2;}
+ 
+-  rm -f "$tmp/stdin"
++  rm -f "$ac_tmp/stdin"
+   case $ac_file in
+-  -) cat "$tmp/out" && rm -f "$tmp/out";;
+-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
++  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
++  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+   esac \
+-  || as_fn_error "could not create $ac_file" "$LINENO" 5
++  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+  ;;
+   :H)
+   #
+@@ -9607,21 +9164,21 @@ which seems to be undefined.  Please mak
+   if test x"$ac_file" != x-; then
+     {
+       $as_echo "/* $configure_input  */" \
+-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+-    } >"$tmp/config.h" \
+-      || as_fn_error "could not create $ac_file" "$LINENO" 5
+-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
++      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
++    } >"$ac_tmp/config.h" \
++      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
++    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+ $as_echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       rm -f "$ac_file"
+-      mv "$tmp/config.h" "$ac_file" \
+-	|| as_fn_error "could not create $ac_file" "$LINENO" 5
++      mv "$ac_tmp/config.h" "$ac_file" \
++	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+     fi
+   else
+     $as_echo "/* $configure_input  */" \
+-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+-      || as_fn_error "could not create -" "$LINENO" 5
++      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
++      || as_fn_error $? "could not create -" "$LINENO" 5
+   fi
+ # Compute "$ac_file"'s index in $config_headers.
+ _am_arg="$ac_file"
+@@ -9774,7 +9331,7 @@ _ACEOF
+ ac_clean_files=$ac_clean_files_save
+ 
+ test $ac_write_fail = 0 ||
+-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
++  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+ 
+ 
+ # configure is writing to config.log, and then calls config.status.
+@@ -9795,7 +9352,7 @@ if test "$no_create" != yes; then
+   exec 5>>config.log
+   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+   # would make configure fail if this is the last instruction.
+-  $ac_cs_success || as_fn_exit $?
++  $ac_cs_success || as_fn_exit 1
+ fi
+ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -234,6 +234,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+@@ -297,6 +299,7 @@ INCLUDES = \
+ 	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
+ 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+ 	$(GECKO_CFLAGS) \
++	$(NSPR_CFLAGS) \
+ 	$(GLIB_CFLAGS) \
+ 	$(DBUS_CFLAGS) \
+ 	$(GCONF_CFLAGS) \
+--- a/src/libgmlib/Makefile.in
++++ b/src/libgmlib/Makefile.in
+@@ -137,6 +137,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@

=== added file 'debian/patches/dont_use_libxul.patch'
--- debian/patches/dont_use_libxul.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/dont_use_libxul.patch	2011-06-19 14:06:01 +0000
@@ -0,0 +1,236 @@
+--- a/configure.in
++++ b/configure.in
+@@ -33,64 +33,24 @@ AC_SUBST(GLIB_LIBS)
+ AC_ARG_WITH([xulrunner-sdk],
+     [AS_HELP_STRING([--with-xulrunner-sdk=path_to_sdk],
+         [Path to xulrunner SDK for build --with-xulrunner-sdk=/path/to/sdk])],
+-        [
++    [
+ 	XULRUNNER_SDK_PREFIX=$with_xulrunner_sdk
+-	GECKO_CFLAGS="-I$XULRUNNER_SDK_PREFIX/include -I$XULRUNNER_SDK_PREFIX/include/plugin -I$XULRUNNER_SDK_PREFIX/include/nspr -I$XULRUNNER_SDK_PREFIX/include/xpcom -I$XULRUNNER_SDK_PREFIX/include/string -I$XULRUNNER_SDK_PREFIX/include/java"
+-	GECKO_LIBS="-L$XULRUNNER_SDK_PREFIX/lib -lxpcomglue_s -lxul -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -ldl"
+-	AC_ARG_ENABLE(new-libxul,
+-		AC_HELP_STRING([--enable-new-libxul],[libxul/xulrunner-sdk is 1.9.2 or higher]),
+-		[usenewlibxul=$enableval],[usenewlibxul=no])
+-
+-	if test $usenewlibxul == yes; then
+-		GECKO_CFLAGS="$GECKO_CFLAGS -DMOZ_NO_MOZALLOC"
+-		AC_DEFINE([HAVE_NEW_XULRUNNER],[1],[Define to 1 if using libxul 1.9.2 or higher])
+-	fi
++	GECKO_CFLAGS="-I$XULRUNNER_SDK_PREFIX/include -I$XULRUNNER_SDK_PREFIX/include/nspr"
+ 	
+-	],
+-        [])
+-
+-if test "$GECKO_CFLAGS" = ""; then
+-PKG_CHECK_MODULES(GECKO, [libxul >= 2.0],[GECKO_CFLAGS="$GECKO_CFLAGS -DMOZ_NO_MOZALLOC" AC_DEFINE([HAVE_NEW_XULRUNNER],[1],[Define to 1 if using libxul 2.0.0 or higher]) AC_MSG_NOTICE([Using libxul >= 2.0 beta 5])
+-    ],[AC_MSG_NOTICE([libxul >= 2.0 beta 5 not found, trying another])])
+-fi
+-
+-if test "$GECKO_CFLAGS" = ""; then
+-PKG_CHECK_MODULES(GECKO, [libxul < 1.9.2],[ AC_MSG_NOTICE([Using libxul < 1.9.2])
+-    ],[AC_MSG_WARN([libxul < 1.9.2 not found, trying another])])
+-fi
+-if test "$GECKO_CFLAGS" = ""; then
+-PKG_CHECK_MODULES(GECKO, [libxul >= 1.9.2],[ AC_DEFINE([HAVE_NEW_XULRUNNER],[1],[Define to 1 if using libxul 1.9.2 or higher]) AC_MSG_NOTICE([Using libxul >= 1.9.2])
+-    ],[AC_MSG_NOTICE([libxul >= 1.9.2 not found, trying another])])
+-fi
+-
+-if test "$GECKO_CFLAGS" = ""; then
+-PKG_CHECK_MODULES(GECKO, [libxul-unstable],[ AC_MSG_NOTICE([Using libxul-unstable])
+-    ],[AC_MSG_WARN([libxul-unstable not found, trying another])])
+-fi
+-
+-if test "$GECKO_CFLAGS" = ""; then
+-PKG_CHECK_MODULES(GECKO, [mozilla-plugin mozilla-xpcom],[ AC_MSG_NOTICE([Using mozilla])
+-    ],[AC_MSG_WARN([mozilla-plugin not found, trying another])])
+-fi
+-
+-if test "$GECKO_CFLAGS" = ""; then
+-PKG_CHECK_MODULES(GECKO, [firefox-plugin firefox-xpcom],[ AC_MSG_NOTICE([Using firefox])
+-    ],[AC_MSG_WARN([firefox-plugin not found, trying another])])
+-fi
+-
+-if test "$GECKO_CFLAGS" = ""; then
+-PKG_CHECK_MODULES(GECKO, [seamonkey-plugin seamonkey-xpcom],[ AC_MSG_NOTICE([Using seamonkey])
+-    ],[AC_MSG_WARN([seamokey-plugin not found, trying another])])
+-fi
++	AC_ARG_ENABLE(new-libxul,
++		[AC_HELP_STRING([--enable-new-libxul],[libxul/xulrunner-sdk is 1.9.2 or higher])],
++		[AC_DEFINE([HAVE_NEW_XULRUNNER],[1],[Define to 1 if using libxul 1.9.2 or higher])])
++    ],
++    [])
+ 
+ if test "$GECKO_CFLAGS" = ""; then
+-PKG_CHECK_MODULES(GECKO, [xulrunner-plugin xulrunner-xpcom],[ AC_MSG_NOTICE([Using xulrunner])
+-    ],[AC_MSG_WARN([xulrunner-plugin not found, trying another])])
++PKG_CHECK_MODULES(GECKO, [mozilla-plugin >= 2.0],[AC_DEFINE([HAVE_NEW_XULRUNNER],[1],[Define to 1 if using libxul 2.0.0 or higher]) AC_MSG_NOTICE([Using mozilla])
++    ],[AC_MSG_WARN([mozilla-plugin >= 2.0 not found. Trying another])])
+ fi
+ 
+ if test "$GECKO_CFLAGS" = ""; then
+-PKG_CHECK_MODULES(GECKO, [iceape-plugin iceape-xpcom],[ AC_MSG_NOTICE([Using iceape])
+-    ],[AC_MSG_WARN([iceape-plugin not found, trying another])])
++PKG_CHECK_MODULES(GECKO, [mozilla-plugin],[ AC_MSG_NOTICE([Using mozilla])
++    ],[AC_MSG_ERROR([mozilla-plugin not found. Try passing --with-xulrunner-sdk])])
+ fi
+ 
+ PKG_CHECK_MODULES(NSPR, [nspr],[
+@@ -99,8 +59,8 @@ PKG_CHECK_MODULES(NSPR, [nspr],[
+     ],[AC_MSG_WARN([nspr not found, may not be needed])])
+ 
+ 
++AC_SUBST(NSPR_CFLAGS)
+ AC_SUBST(GECKO_CFLAGS)
+-AC_SUBST(GECKO_LIBS)
+ 
+ PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.95 dbus-glib-1 >= 0.70])
+ AC_SUBST(DBUS_CFLAGS)
+--- a/src/plugin.cpp
++++ b/src/plugin.cpp
+@@ -42,18 +42,10 @@
+ #include "plugin_setup.h"
+ #include "plugin_types.h"
+ #include "plugin_dbus.h"
+-#include <nsIPrefBranch.h>
+-#include <nsIPrefService.h>
+-#include <nsIServiceManager.h>
+ #include <dlfcn.h>
+ 
+-nsIPrefBranch *prefBranch = NULL;
+-nsIPrefService *prefService = NULL;
+ static NPObject *sWindowObj;
+ 
+-//#include "nsIServiceManager.h"
+-//#include "nsISupportsUtils.h"   // some usefule macros are defined here
+-
+ #define MIME_TYPES_HANDLED  "application/scriptable-plugin"
+ #define PLUGIN_NAME         "Scriptable Example Plugin for Mozilla"
+ #define MIME_TYPES_DESCRIPTION  MIME_TYPES_HANDLED":scr:"PLUGIN_NAME
+@@ -179,83 +171,6 @@ void postDOMEvent(NPP mInstance, const g
+     g_free(jscript);
+ }
+ 
+-void setPreference(CPlugin * instance, const gchar * name, const gchar * value)
+-{
+-    nsIServiceManager *sm = NULL;
+-    nsIServiceManager *ServiceManager = NULL;
+-    PRBool v;
+-    void (*get_sm)(nsIServiceManager**);
+-
+-    get_sm = (void (*)(nsIServiceManager**))dlsym(RTLD_DEFAULT,"NS_GetServiceManager");
+-    if (get_sm) {
+-        (*get_sm)(&sm);
+-    } else {
+-        NPN_GetValue(NULL, NPNVserviceManager, &sm);
+-    }
+-
+-    if (sm) {
+-        sm->QueryInterface(NS_GET_IID(nsIServiceManager), (void **) (&ServiceManager));
+-        NS_RELEASE(sm);
+-    }
+-
+-    if (ServiceManager) {
+-        ServiceManager->GetServiceByContractID(NS_PREFSERVICE_CONTRACTID, NS_GET_IID(nsIPrefBranch),
+-                                               (void **) &prefBranch);
+-        if (prefBranch) {
+-            instance->user_agent = g_new0(gchar, 1024);
+-            prefBranch->PrefHasUserValue(name, &v);
+-            if (v) {
+-                prefBranch->GetCharPref(name, &(instance->user_agent));
+-                prefBranch->ClearUserPref(name);
+-            }
+-            prefBranch->SetCharPref(name, value);
+-            printf("Set preference %s to %s, old value was '%s'\n", name, value,
+-                   instance->user_agent);
+-        }
+-        NS_RELEASE(ServiceManager);
+-    }
+-
+-}
+-
+-void clearPreference(CPlugin * instance, const gchar * name)
+-{
+-    nsIServiceManager *sm = NULL;
+-    nsIServiceManager *ServiceManager = NULL;
+-    PRBool v;
+-    void (*get_sm)(nsIServiceManager**);
+-
+-    get_sm = (void (*)(nsIServiceManager**))dlsym(RTLD_DEFAULT,"NS_GetServiceManager");
+-    if (get_sm) {
+-        (*get_sm)(&sm);
+-    } else {
+-        NPN_GetValue(NULL, NPNVserviceManager, &sm);
+-    }
+-
+-    if (sm) {
+-        sm->QueryInterface(NS_GET_IID(nsIServiceManager), (void **) (&ServiceManager));
+-        NS_RELEASE(sm);
+-    }
+-
+-    if (ServiceManager) {
+-        ServiceManager->GetServiceByContractID(NS_PREFSERVICE_CONTRACTID, NS_GET_IID(nsIPrefBranch),
+-                                               (void **) &prefBranch);
+-        if (prefBranch) {
+-            if (instance->user_agent == NULL || strlen(instance->user_agent) == 0) {
+-                prefBranch->ClearUserPref(name);
+-            } else {
+-                if (g_strrstr(instance->user_agent, "QuickTime/7.6.4")) {
+-                    prefBranch->ClearUserPref(name);
+-                } else {
+-                    prefBranch->ClearUserPref(name);
+-                    prefBranch->SetCharPref(name, instance->user_agent);
+-                }
+-            }
+-            g_free(instance->user_agent);
+-        }
+-        NS_RELEASE(ServiceManager);
+-    }
+-}
+-
+ ////////////////////////////////////////
+ //
+ // CPlugin class implementation
+@@ -441,7 +356,6 @@ CPlugin::~CPlugin()
+         NS_IF_RELEASE(mControlsScriptablePeer);
+     }
+ */
+-    clearPreference(this, "general.useragent.override");
+ 
+     if (m_pScriptableObjectControls) {
+         NPN_ReleaseObject(m_pScriptableObjectControls);
+--- a/src/plugin.h
++++ b/src/plugin.h
+@@ -37,6 +37,7 @@
+ 
+ #ifndef __PLUGIN_H__
+ #define __PLUGIN_H__
++#include <prtypes.h>
+ #include <npapi.h>
+ #include <npruntime.h>
+ #include <npfunctions.h>
+@@ -217,6 +218,5 @@ class CPlugin {
+ };
+ 
+ void pluginSpecific(CPlugin * instance);
+-void setPreference(CPlugin * instance, const gchar * name, const gchar * value);
+ 
+ #endif                          // __PLUGIN_H__
+--- a/src/plugin_types_qt.cpp
++++ b/src/plugin_types_qt.cpp
+@@ -101,5 +101,4 @@ NPError PluginGetValue(NPPVariable varia
+ void pluginSpecific(CPlugin * instance)
+ {
+     //printf("calling pluginSpecific for qt plugin\n");
+-    setPreference(instance, "general.useragent.override", "QuickTime/7.6.4");
+ }
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -10,6 +10,7 @@ INCLUDES = \
+ 	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
+ 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+ 	$(GECKO_CFLAGS) \
++	$(NSPR_CFLAGS) \
+ 	$(GLIB_CFLAGS) \
+ 	$(DBUS_CFLAGS) \
+ 	$(GCONF_CFLAGS) \

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2011-06-19 14:06:01 +0000
@@ -0,0 +1,4 @@
+90_svn420_fix_null.patch
+91_svn421_disable_npp_initialize.patch
+dont_use_libxul.patch
+autotools.patch

=== renamed file 'rules' => 'debian/rules'
--- rules	2010-05-17 13:02:04 +0000
+++ debian/rules	2011-06-19 14:06:01 +0000
@@ -15,6 +15,8 @@
 	CXXFLAGS += -O2
 endif
 
+CXXFLAGS += -DMOZ_NO_MOZALLOC
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -26,7 +28,7 @@
 	./configure \
 		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr --sysconfdir=\$${prefix}/share \
-		--with-gconf --with-gio --disable-schemas-install \
+		--without-gconf --with-gio --disable-schemas-install \
 		CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)"
 
 	touch configure-stamp

=== renamed directory 'source' => 'debian/source'
=== renamed file 'watch' => 'debian/watch'