r19731 - in /desktop/unstable/pessulus/debian: changelog control control.in copyright patches/00_disable_pkg_check.patch patches/10_desktop_file.patch patches/70_mandatory-autoconf.patch

lethalman-guest at users.alioth.debian.org lethalman-guest at users.alioth.debian.org
Sat Apr 25 10:37:48 UTC 2009


Author: lethalman-guest
Date: Sat Apr 25 10:37:48 2009
New Revision: 19731

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19731
Log:
  [ Luca Falavigna ]
  * New upstream release.
  * 00_disable_pkg_check.patch, 70_mandatory-autoconf.patch:
    - Refresh patches for new upstream release.
  * debian/copyright:
    - Software is released under GPLv2, adjust link to common-licenses.
  * debian/control.in:
    + Adhere to Debian Python policy:
      - Build-depend on cdbs (>= 0.4.49) and debhelper (>= 5.0.38).
      - Remove python2.4 from Build-Depends-Indep.
      - Require python-central to >= 0.5.6.
    + Bump Standards-Version to 3.8.1:
      - Add Homepage field to source stanza.
  * debian/patches/10_desktop_file:
    - Adhere to Freedesktop.org standards.


Added:
    desktop/unstable/pessulus/debian/patches/10_desktop_file.patch
Modified:
    desktop/unstable/pessulus/debian/changelog
    desktop/unstable/pessulus/debian/control
    desktop/unstable/pessulus/debian/control.in
    desktop/unstable/pessulus/debian/copyright
    desktop/unstable/pessulus/debian/patches/00_disable_pkg_check.patch
    desktop/unstable/pessulus/debian/patches/70_mandatory-autoconf.patch

Modified: desktop/unstable/pessulus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pessulus/debian/changelog?rev=19731&op=diff
==============================================================================
--- desktop/unstable/pessulus/debian/changelog (original)
+++ desktop/unstable/pessulus/debian/changelog Sat Apr 25 10:37:48 2009
@@ -1,12 +1,30 @@
-pessulus (2.16.4-1) UNRELEASED; urgency=low
-
+pessulus (2.26.1-1) UNRELEASED; urgency=low
+
+  [ Pedro Fragoso ]
   * New upstream stable release.
     - Update autoconf patch, 70_mandatory-autoconf.
   * debian/patches/01_scp-integration.patch:
-    - patch update by Peter Savage to fix broken SCP integration (Ubuntu: #62434)
+    - patch update by Peter Savage to fix broken SCP integration
+      (Ubuntu: #62434)
   * Bump Standards-Version to 3.7.3 (no changes)
 
- -- Pedro Fragoso <emberez at gmail.com>  Sun, 06 Apr 2008 00:00:49 +0100
+  [ Luca Falavigna ]
+  * New upstream release.
+  * 00_disable_pkg_check.patch, 70_mandatory-autoconf.patch:
+    - Refresh patches for new upstream release.
+  * debian/copyright:
+    - Software is released under GPLv2, adjust link to common-licenses.
+  * debian/control.in:
+    + Adhere to Debian Python policy:
+      - Build-depend on cdbs (>= 0.4.49) and debhelper (>= 5.0.38).
+      - Remove python2.4 from Build-Depends-Indep.
+      - Require python-central to >= 0.5.6.
+    + Bump Standards-Version to 3.8.1:
+      - Add Homepage field to source stanza.
+  * debian/patches/10_desktop_file:
+    - Adhere to Freedesktop.org standards.
+
+ -- Luca Falavigna <dktrkranz at ubuntu.com>  Fri, 24 Apr 2009 23:33:55 +0200
 
 pessulus (2.16.3-1) unstable; urgency=low
 

Modified: desktop/unstable/pessulus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pessulus/debian/control?rev=19731&op=diff
==============================================================================
--- desktop/unstable/pessulus/debian/control (original)
+++ desktop/unstable/pessulus/debian/control Sat Apr 25 10:37:48 2009
@@ -3,15 +3,15 @@
 Priority: optional
 Maintainer: Guilherme de S. Pastore <gpastore at debian.org>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>
-Build-Depends: cdbs (>= 0.4.43),
-               debhelper (>= 5.0.37.2),
+Build-Depends: cdbs (>= 0.4.49),
+               debhelper (>= 5.0.38),
                gnome-pkg-tools (>= 0.10)
 Build-Depends-Indep: python,
-                     python2.4,
                      gconf2,
                      intltool,
-                     python-central (>= 0.5)
-Standards-Version: 3.7.3
+                     python-central (>= 0.5.6)
+Homepage: http://live.gnome.org/Pessulus
+Standards-Version: 3.8.1
 XS-Python-Version: >= 2.4
 
 Package: pessulus

Modified: desktop/unstable/pessulus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pessulus/debian/control.in?rev=19731&op=diff
==============================================================================
--- desktop/unstable/pessulus/debian/control.in (original)
+++ desktop/unstable/pessulus/debian/control.in Sat Apr 25 10:37:48 2009
@@ -3,15 +3,15 @@
 Priority: optional
 Maintainer: Guilherme de S. Pastore <gpastore at debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs (>= 0.4.43),
-               debhelper (>= 5.0.37.2),
+Build-Depends: cdbs (>= 0.4.49),
+               debhelper (>= 5.0.38),
                gnome-pkg-tools (>= 0.10)
 Build-Depends-Indep: python,
-                     python2.4,
                      gconf2,
                      intltool,
-                     python-central (>= 0.5)
-Standards-Version: 3.7.3
+                     python-central (>= 0.5.6)
+Homepage: http://live.gnome.org/Pessulus
+Standards-Version: 3.8.1
 XS-Python-Version: >= 2.4
 
 Package: pessulus

Modified: desktop/unstable/pessulus/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pessulus/debian/copyright?rev=19731&op=diff
==============================================================================
--- desktop/unstable/pessulus/debian/copyright (original)
+++ desktop/unstable/pessulus/debian/copyright Sat Apr 25 10:37:48 2009
@@ -25,4 +25,4 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 
- See /usr/share/common-licenses/GPL on your Debian system.
+ See /usr/share/common-licenses/GPL-2 on your Debian system.

Modified: desktop/unstable/pessulus/debian/patches/00_disable_pkg_check.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pessulus/debian/patches/00_disable_pkg_check.patch?rev=19731&op=diff
==============================================================================
--- desktop/unstable/pessulus/debian/patches/00_disable_pkg_check.patch (original)
+++ desktop/unstable/pessulus/debian/patches/00_disable_pkg_check.patch Sat Apr 25 10:37:48 2009
@@ -1,13 +1,16 @@
-diff -urN pessulus-0.10.4.orig/configure.ac pessulus-0.10.4/configure.ac
---- pessulus-0.10.4.orig/configure.ac	2006-07-11 01:21:25.000000000 +0200
-+++ pessulus-0.10.4/configure.ac	2006-07-29 21:29:08.000000000 +0200
-@@ -8,10 +8,6 @@
+Disable checks on configure as we don't need them at build-time.
+
+diff -Nur -x '*.orig' -x '*~' pessulus-2.26.1/configure.ac pessulus-2.26.1.new/configure.ac
+--- pessulus-2.26.1/configure.ac	2009-04-14 00:00:25.000000000 +0200
++++ pessulus-2.26.1.new/configure.ac	2009-04-24 21:28:48.000000000 +0200
+@@ -8,11 +8,6 @@
  dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
  AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS")
  
 -PKG_CHECK_MODULES(PESSULUS,
 -		  pygtk-2.0 >= 2.6.0		\
--		  gnome-python-2.0 >= 2.6.0)
+-		  gnome-python-2.0 >= 2.6.0	\
+-		  gnome-python-desktop-2.0 >= 2.17.2)
 -
  GETTEXT_PACKAGE=pessulus
  AC_SUBST(GETTEXT_PACKAGE)

Added: desktop/unstable/pessulus/debian/patches/10_desktop_file.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pessulus/debian/patches/10_desktop_file.patch?rev=19731&op=file
==============================================================================
--- desktop/unstable/pessulus/debian/patches/10_desktop_file.patch (added)
+++ desktop/unstable/pessulus/debian/patches/10_desktop_file.patch Sat Apr 25 10:37:48 2009
@@ -1,0 +1,11 @@
+Adhere to Freedesktop.org standards.
+
+diff -Nur -x '*.orig' -x '*~' pessulus-2.26.1/data/pessulus.desktop.in.in pessulus-2.26.1.new/data/pessulus.desktop.in.in
+--- pessulus-2.26.1/data/pessulus.desktop.in.in	2009-04-14 00:00:25.000000000 +0200
++++ pessulus-2.26.1.new/data/pessulus.desktop.in.in	2009-04-24 22:11:56.000000000 +0200
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Application
+ _Name=Lockdown Editor
+ _Comment=Configure the lockdown policy

Modified: desktop/unstable/pessulus/debian/patches/70_mandatory-autoconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pessulus/debian/patches/70_mandatory-autoconf.patch?rev=19731&op=diff
==============================================================================
--- desktop/unstable/pessulus/debian/patches/70_mandatory-autoconf.patch (original)
+++ desktop/unstable/pessulus/debian/patches/70_mandatory-autoconf.patch Sat Apr 25 10:37:48 2009
@@ -1,19 +1,302 @@
 Generated with autoconf && rm -rf autom4te.cache
 
-diff -Nur -x '*.orig' -x '*~' pessulus-2.16.4/configure pessulus-2.16.4.new/configure
---- pessulus-2.16.4/configure	2008-04-05 23:18:46.000000000 +0000
-+++ pessulus-2.16.4.new/configure	2008-04-05 23:21:43.000000000 +0000
-@@ -678,9 +678,6 @@
- MAINTAINER_MODE_FALSE
- MAINT
- ACLOCAL_AMFLAGS
+diff -Nur -x '*.orig' -x '*~' pessulus-2.26.1/configure pessulus-2.26.1.new/configure
+--- pessulus-2.26.1/configure	2009-04-14 00:04:42.000000000 +0200
++++ pessulus-2.26.1.new/configure	2009-04-24 21:29:35.000000000 +0200
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.62 for pessulus 2.26.1.
++# Generated by GNU Autoconf 2.63 for pessulus 2.26.1.
+ #
+ # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=pessulus>.
+ #
+@@ -637,147 +637,144 @@
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL
+-PATH_SEPARATOR
+-PACKAGE_NAME
+-PACKAGE_TARNAME
+-PACKAGE_VERSION
+-PACKAGE_STRING
+-PACKAGE_BUGREPORT
+-exec_prefix
+-prefix
+-program_transform_name
+-bindir
+-sbindir
+-libexecdir
+-datarootdir
+-datadir
+-sysconfdir
+-sharedstatedir
+-localstatedir
+-includedir
+-oldincludedir
+-docdir
+-infodir
+-htmldir
+-dvidir
+-pdfdir
+-psdir
+-libdir
+-localedir
+-mandir
+-DEFS
+-ECHO_C
+-ECHO_N
+-ECHO_T
+-LIBS
+-build_alias
+-host_alias
+-target_alias
+-INSTALL_PROGRAM
+-INSTALL_SCRIPT
+-INSTALL_DATA
+-am__isrc
+-CYGPATH_W
+-PACKAGE
+-VERSION
+-ACLOCAL
+-AUTOCONF
+-AUTOMAKE
+-AUTOHEADER
+-MAKEINFO
+-install_sh
+-STRIP
+-INSTALL_STRIP_PROGRAM
+-MKDIR_P
+-mkdir_p
+-AWK
+-SET_MAKE
+-am__leading_dot
+-AMTAR
+-am__tar
+-am__untar
+-MAINTAINER_MODE_TRUE
+-MAINTAINER_MODE_FALSE
+-MAINT
+-ACLOCAL_AMFLAGS
 -PKG_CONFIG
 -PESSULUS_CFLAGS
 -PESSULUS_LIBS
- GETTEXT_PACKAGE
- CC
- CFLAGS
-@@ -759,9 +756,6 @@
+-GETTEXT_PACKAGE
+-CC
+-CFLAGS
+-LDFLAGS
+-CPPFLAGS
+-ac_ct_CC
+-EXEEXT
+-OBJEXT
+-DEPDIR
+-am__include
+-am__quote
+-AMDEP_TRUE
+-AMDEP_FALSE
+-AMDEPBACKSLASH
+-CCDEPMODE
+-am__fastdepCC_TRUE
+-am__fastdepCC_FALSE
+-CPP
+-GREP
+-EGREP
+-USE_NLS
+-MSGFMT
+-MSGFMT_OPTS
+-GMSGFMT
+-XGETTEXT
+-CATALOGS
+-CATOBJEXT
+-DATADIRNAME
+-GMOFILES
+-INSTOBJEXT
+-INTLLIBS
+-PO_IN_DATADIR_TRUE
+-PO_IN_DATADIR_FALSE
+-POFILES
+-POSUB
+-MKINSTALLDIRS
+-INTLTOOL_UPDATE
+-INTLTOOL_MERGE
+-INTLTOOL_EXTRACT
+-INTLTOOL_DESKTOP_RULE
+-INTLTOOL_DIRECTORY_RULE
+-INTLTOOL_KEYS_RULE
+-INTLTOOL_PROP_RULE
+-INTLTOOL_OAF_RULE
+-INTLTOOL_PONG_RULE
+-INTLTOOL_SERVER_RULE
+-INTLTOOL_SHEET_RULE
+-INTLTOOL_SOUNDLIST_RULE
+-INTLTOOL_UI_RULE
+-INTLTOOL_XAM_RULE
+-INTLTOOL_KBD_RULE
+-INTLTOOL_XML_RULE
+-INTLTOOL_XML_NOMERGE_RULE
+-INTLTOOL_CAVES_RULE
+-INTLTOOL_SCHEMAS_RULE
+-INTLTOOL_THEME_RULE
+-INTLTOOL_SERVICE_RULE
+-INTLTOOL_POLICY_RULE
+-MSGMERGE
+-INTLTOOL_PERL
+-ALL_LINGUAS
+-PYTHON
+-PYTHON_VERSION
+-PYTHON_PREFIX
+-PYTHON_EXEC_PREFIX
+-PYTHON_PLATFORM
+-pythondir
+-pkgpythondir
+-pyexecdir
+-pkgpyexecdir
+-GCONFTOOL
+-GCONF_MANDATORY_SOURCE
++ac_subst_vars='LTLIBOBJS
+ LIBOBJS
+-LTLIBOBJS'
++GCONF_MANDATORY_SOURCE
++GCONFTOOL
++pkgpyexecdir
++pyexecdir
++pkgpythondir
++pythondir
++PYTHON_PLATFORM
++PYTHON_EXEC_PREFIX
++PYTHON_PREFIX
++PYTHON_VERSION
++PYTHON
++ALL_LINGUAS
++INTLTOOL_PERL
++MSGMERGE
++INTLTOOL_POLICY_RULE
++INTLTOOL_SERVICE_RULE
++INTLTOOL_THEME_RULE
++INTLTOOL_SCHEMAS_RULE
++INTLTOOL_CAVES_RULE
++INTLTOOL_XML_NOMERGE_RULE
++INTLTOOL_XML_RULE
++INTLTOOL_KBD_RULE
++INTLTOOL_XAM_RULE
++INTLTOOL_UI_RULE
++INTLTOOL_SOUNDLIST_RULE
++INTLTOOL_SHEET_RULE
++INTLTOOL_SERVER_RULE
++INTLTOOL_PONG_RULE
++INTLTOOL_OAF_RULE
++INTLTOOL_PROP_RULE
++INTLTOOL_KEYS_RULE
++INTLTOOL_DIRECTORY_RULE
++INTLTOOL_DESKTOP_RULE
++INTLTOOL_EXTRACT
++INTLTOOL_MERGE
++INTLTOOL_UPDATE
++MKINSTALLDIRS
++POSUB
++POFILES
++PO_IN_DATADIR_FALSE
++PO_IN_DATADIR_TRUE
++INTLLIBS
++INSTOBJEXT
++GMOFILES
++DATADIRNAME
++CATOBJEXT
++CATALOGS
++XGETTEXT
++GMSGFMT
++MSGFMT_OPTS
++MSGFMT
++USE_NLS
++EGREP
++GREP
++CPP
++am__fastdepCC_FALSE
++am__fastdepCC_TRUE
++CCDEPMODE
++AMDEPBACKSLASH
++AMDEP_FALSE
++AMDEP_TRUE
++am__quote
++am__include
++DEPDIR
++OBJEXT
++EXEEXT
++ac_ct_CC
++CPPFLAGS
++LDFLAGS
++CFLAGS
++CC
++GETTEXT_PACKAGE
++ACLOCAL_AMFLAGS
++MAINT
++MAINTAINER_MODE_FALSE
++MAINTAINER_MODE_TRUE
++am__untar
++am__tar
++AMTAR
++am__leading_dot
++SET_MAKE
++AWK
++mkdir_p
++MKDIR_P
++INSTALL_STRIP_PROGRAM
++STRIP
++install_sh
++MAKEINFO
++AUTOHEADER
++AUTOMAKE
++AUTOCONF
++ACLOCAL
++VERSION
++PACKAGE
++CYGPATH_W
++am__isrc
++INSTALL_DATA
++INSTALL_SCRIPT
++INSTALL_PROGRAM
++target_alias
++host_alias
++build_alias
++LIBS
++ECHO_T
++ECHO_N
++ECHO_C
++DEFS
++mandir
++localedir
++libdir
++psdir
++pdfdir
++dvidir
++htmldir
++infodir
++docdir
++oldincludedir
++includedir
++localstatedir
++sharedstatedir
++sysconfdir
++datadir
++datarootdir
++libexecdir
++sbindir
++bindir
++program_transform_name
++prefix
++exec_prefix
++PACKAGE_BUGREPORT
++PACKAGE_STRING
++PACKAGE_VERSION
++PACKAGE_TARNAME
++PACKAGE_NAME
++PATH_SEPARATOR
++SHELL'
+ ac_subst_files=''
+ ac_user_opts='
+ enable_option_checking
+@@ -789,9 +786,6 @@
        ac_precious_vars='build_alias
  host_alias
  target_alias
@@ -23,7 +306,28 @@
  CC
  CFLAGS
  LDFLAGS
-@@ -1355,11 +1349,6 @@
+@@ -1220,9 +1214,9 @@
+ if test -n "$ac_unrecognized_opts"; then
+   case $enable_option_checking in
+     no) ;;
+-    fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2
++    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+    { (exit 1); exit 1; }; } ;;
+-    *)     $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;
++    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+   esac
+ fi
+ 
+@@ -1275,7 +1269,7 @@
+ ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ ac_ls_di=`ls -di .` &&
+ ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+-  { $as_echo "$as_me: error: Working directory cannot be determined" >&2
++  { $as_echo "$as_me: error: working directory cannot be determined" >&2
+    { (exit 1); exit 1; }; }
+ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+   { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
+@@ -1437,11 +1431,6 @@
                            The GConf source of the mandatory values
  
  Some influential environment variables:
@@ -35,7 +339,60 @@
    CC          C compiler command
    CFLAGS      C compiler flags
    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-@@ -2310,248 +2299,6 @@
+@@ -1518,7 +1507,7 @@
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ pessulus configure 2.26.1
+-generated by GNU Autoconf 2.62
++generated by GNU Autoconf 2.63
+ 
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+ 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+@@ -1532,7 +1521,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by pessulus $as_me 2.26.1, which was
+-generated by GNU Autoconf 2.62.  Invocation command line was
++generated by GNU Autoconf 2.63.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -1655,8 +1644,8 @@
+     case $ac_val in #(
+     *${as_nl}*)
+       case $ac_var in #(
+-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+-$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
++      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+       esac
+       case $ac_var in #(
+       _ | IFS | as_nl) ;; #(
+@@ -1859,6 +1848,8 @@
+   fi
+ done
+ if $ac_cache_corrupted; then
++  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+   { $as_echo "$as_me:$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_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+@@ -2363,12 +2354,8 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf at gnu.org." >&5
+-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+     STRIP=$ac_ct_STRIP
+@@ -2418,254 +2405,6 @@
  ACLOCAL_AMFLAGS="$ACLOCAL_FLAGS"
  
  
@@ -45,10 +402,10 @@
 -	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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
 -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-  $as_echo_n "(cached) " >&6
 -else
 -  case $PKG_CONFIG in
 -  [\\/]* | ?:[\\/]*)
@@ -63,7 +420,7 @@
 -  for ac_exec_ext in '' $ac_executable_extensions; do
 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 -    break 2
 -  fi
 -done
@@ -75,11 +432,11 @@
 -fi
 -PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 -if test -n "$PKG_CONFIG"; then
--  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--echo "${ECHO_T}$PKG_CONFIG" >&6; }
+-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-$as_echo "$PKG_CONFIG" >&6; }
 -else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
 -fi
 -
 -
@@ -88,10 +445,10 @@
 -  ac_pt_PKG_CONFIG=$PKG_CONFIG
 -  # Extract the first word of "pkg-config", so it can be a program name with args.
 -set dummy pkg-config; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-{ $as_echo "$as_me:$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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-  $as_echo_n "(cached) " >&6
 -else
 -  case $ac_pt_PKG_CONFIG in
 -  [\\/]* | ?:[\\/]*)
@@ -106,7 +463,7 @@
 -  for ac_exec_ext in '' $ac_executable_extensions; do
 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 -    break 2
 -  fi
 -done
@@ -118,11 +475,11 @@
 -fi
 -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 -if test -n "$ac_pt_PKG_CONFIG"; then
--  { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
--echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
+-  { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
 -else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
 -fi
 -
 -  if test "x$ac_pt_PKG_CONFIG" = x; then
@@ -130,10 +487,10 @@
 -  else
 -    case $cross_compiling:$ac_tool_warned in
 -yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 -whose name does not start with the host triplet.  If you think this
 -configuration is useful to you, please write to autoconf at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 -whose name does not start with the host triplet.  If you think this
 -configuration is useful to you, please write to autoconf at gnu.org." >&2;}
 -ac_tool_warned=yes ;;
@@ -147,64 +504,66 @@
 -fi
 -if test -n "$PKG_CONFIG"; then
 -	_pkg_min_version=0.9.0
--	{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
--echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
+-	{ $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
 -	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
--		{ echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
+-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
 -	else
--		{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
+-		{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
 -		PKG_CONFIG=""
 -	fi
 -
 -fi
 -
 -pkg_failed=no
--{ echo "$as_me:$LINENO: checking for PESSULUS" >&5
--echo $ECHO_N "checking for PESSULUS... $ECHO_C" >&6; }
--
--if test -n "$PKG_CONFIG"; then
--    if test -n "$PESSULUS_CFLAGS"; then
--        pkg_cv_PESSULUS_CFLAGS="$PESSULUS_CFLAGS"
--    else
--        if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0 >= 2.6.0		\\
--		  gnome-python-2.0 >= 2.6.0\"") >&5
+-{ $as_echo "$as_me:$LINENO: checking for PESSULUS" >&5
+-$as_echo_n "checking for PESSULUS... " >&6; }
+-
+-if test -n "$PESSULUS_CFLAGS"; then
+-    pkg_cv_PESSULUS_CFLAGS="$PESSULUS_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0 >= 2.6.0		\\
+-		  gnome-python-2.0 >= 2.6.0	\\
+-		  gnome-python-desktop-2.0 >= 2.17.2\"") >&5
 -  ($PKG_CONFIG --exists --print-errors "pygtk-2.0 >= 2.6.0		\
--		  gnome-python-2.0 >= 2.6.0") 2>&5
+-		  gnome-python-2.0 >= 2.6.0	\
+-		  gnome-python-desktop-2.0 >= 2.17.2") 2>&5
 -  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; then
 -  pkg_cv_PESSULUS_CFLAGS=`$PKG_CONFIG --cflags "pygtk-2.0 >= 2.6.0		\
--		  gnome-python-2.0 >= 2.6.0" 2>/dev/null`
+-		  gnome-python-2.0 >= 2.6.0	\
+-		  gnome-python-desktop-2.0 >= 2.17.2" 2>/dev/null`
 -else
 -  pkg_failed=yes
 -fi
--    fi
--else
--	pkg_failed=untried
--fi
--if test -n "$PKG_CONFIG"; then
--    if test -n "$PESSULUS_LIBS"; then
--        pkg_cv_PESSULUS_LIBS="$PESSULUS_LIBS"
--    else
--        if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0 >= 2.6.0		\\
--		  gnome-python-2.0 >= 2.6.0\"") >&5
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$PESSULUS_LIBS"; then
+-    pkg_cv_PESSULUS_LIBS="$PESSULUS_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0 >= 2.6.0		\\
+-		  gnome-python-2.0 >= 2.6.0	\\
+-		  gnome-python-desktop-2.0 >= 2.17.2\"") >&5
 -  ($PKG_CONFIG --exists --print-errors "pygtk-2.0 >= 2.6.0		\
--		  gnome-python-2.0 >= 2.6.0") 2>&5
+-		  gnome-python-2.0 >= 2.6.0	\
+-		  gnome-python-desktop-2.0 >= 2.17.2") 2>&5
 -  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; then
 -  pkg_cv_PESSULUS_LIBS=`$PKG_CONFIG --libs "pygtk-2.0 >= 2.6.0		\
--		  gnome-python-2.0 >= 2.6.0" 2>/dev/null`
+-		  gnome-python-2.0 >= 2.6.0	\
+-		  gnome-python-desktop-2.0 >= 2.17.2" 2>/dev/null`
 -else
 -  pkg_failed=yes
 -fi
--    fi
--else
--	pkg_failed=untried
+- else
+-    pkg_failed=untried
 -fi
 -
 -
@@ -217,17 +576,20 @@
 -        _pkg_short_errors_supported=no
 -fi
 -        if test $_pkg_short_errors_supported = yes; then
--	        PESSULUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pygtk-2.0 >= 2.6.0		\
--		  gnome-python-2.0 >= 2.6.0"`
+-	        PESSULUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pygtk-2.0 >= 2.6.0		\
+-		  gnome-python-2.0 >= 2.6.0	\
+-		  gnome-python-desktop-2.0 >= 2.17.2" 2>&1`
 -        else
--	        PESSULUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pygtk-2.0 >= 2.6.0		\
--		  gnome-python-2.0 >= 2.6.0"`
+-	        PESSULUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "pygtk-2.0 >= 2.6.0		\
+-		  gnome-python-2.0 >= 2.6.0	\
+-		  gnome-python-desktop-2.0 >= 2.17.2" 2>&1`
 -        fi
 -	# Put the nasty error message in config.log where it belongs
 -	echo "$PESSULUS_PKG_ERRORS" >&5
 -
--	{ { echo "$as_me:$LINENO: error: Package requirements (pygtk-2.0 >= 2.6.0		\
--		  gnome-python-2.0 >= 2.6.0) were not met:
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (pygtk-2.0 >= 2.6.0		\
+-		  gnome-python-2.0 >= 2.6.0	\
+-		  gnome-python-desktop-2.0 >= 2.17.2) were not met:
 -
 -$PESSULUS_PKG_ERRORS
 -
@@ -238,8 +600,9 @@
 -and PESSULUS_LIBS to avoid the need to call pkg-config.
 -See the pkg-config man page for more details.
 -" >&5
--echo "$as_me: error: Package requirements (pygtk-2.0 >= 2.6.0		\
--		  gnome-python-2.0 >= 2.6.0) were not met:
+-$as_echo "$as_me: error: Package requirements (pygtk-2.0 >= 2.6.0		\
+-		  gnome-python-2.0 >= 2.6.0	\
+-		  gnome-python-desktop-2.0 >= 2.17.2) were not met:
 -
 -$PESSULUS_PKG_ERRORS
 -
@@ -252,7 +615,7 @@
 -" >&2;}
 -   { (exit 1); exit 1; }; }
 -elif test $pkg_failed = untried; then
--	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+-	{ { $as_echo "$as_me:$LINENO: 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.
 -
@@ -260,9 +623,9 @@
 -and PESSULUS_LIBS to avoid the need to call pkg-config.
 -See the pkg-config man page for more details.
 -
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 -See \`config.log' for more details." >&5
--echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+-$as_echo "$as_me: 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.
 -
@@ -270,2757 +633,367 @@
 -and PESSULUS_LIBS to avoid the need to call pkg-config.
 -See the pkg-config man page for more details.
 -
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 -See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
 -else
 -	PESSULUS_CFLAGS=$pkg_cv_PESSULUS_CFLAGS
 -	PESSULUS_LIBS=$pkg_cv_PESSULUS_LIBS
--        { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
 -	:
 -fi
 -
  GETTEXT_PACKAGE=pessulus
  
  
-@@ -7174,9 +6921,6 @@
- MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
- MAINT!$MAINT$ac_delim
- ACLOCAL_AMFLAGS!$ACLOCAL_AMFLAGS$ac_delim
--PKG_CONFIG!$PKG_CONFIG$ac_delim
--PESSULUS_CFLAGS!$PESSULUS_CFLAGS$ac_delim
--PESSULUS_LIBS!$PESSULUS_LIBS$ac_delim
- GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
- CC!$CC$ac_delim
- CFLAGS!$CFLAGS$ac_delim
-@@ -7208,6 +6952,9 @@
- GMOFILES!$GMOFILES$ac_delim
- INSTOBJEXT!$INSTOBJEXT$ac_delim
- INTLLIBS!$INTLLIBS$ac_delim
-+PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim
-+PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
-+POFILES!$POFILES$ac_delim
+@@ -2822,12 +2561,8 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf at gnu.org." >&5
+-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+     CC=$ac_ct_CC
+@@ -3026,12 +2761,8 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf at gnu.org." >&5
+-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+     CC=$ac_ct_CC
+@@ -3041,11 +2772,13 @@
+ fi
+ 
+ 
+-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
++test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+ See \`config.log' for more details." >&5
+ $as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
+ 
+ # Provide some information about the compiler.
+ $as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+@@ -3175,11 +2908,13 @@
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
+ See \`config.log' for more details." >&5
+ $as_echo "$as_me: error: C compiler cannot create executables
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }
++   { (exit 77); exit 77; }; }; }
+ fi
+ 
+ ac_exeext=$ac_cv_exeext
+@@ -3207,13 +2942,15 @@
+     if test "$cross_compiling" = maybe; then
+ 	cross_compiling=yes
+     else
+-	{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
++	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+ See \`config.log' for more details." >&5
+ $as_echo "$as_me: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
+     fi
+   fi
+ fi
+@@ -3256,11 +2993,13 @@
+   esac
+ done
+ else
+-  { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
++  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." >&5
+ $as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
+ fi
+ 
+ rm -f conftest$ac_cv_exeext
+@@ -3314,11 +3053,13 @@
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+ See \`config.log' for more details." >&5
+ $as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
+ fi
+ 
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+@@ -3996,11 +3737,13 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
++  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+ See \`config.log' for more details." >&5
+ $as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
+ fi
+ 
+ ac_ext=c
+@@ -4383,8 +4126,9 @@
+ 		 $as_echo "$as_val"'`
+ 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-if test `eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'` = yes; then
++as_val=`eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'`
++   if test "x$as_val" = x""yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
- 
-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -7249,9 +6996,6 @@
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
-   cat >conf$$subs.sed <<_ACEOF
--PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim
--PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
--POFILES!$POFILES$ac_delim
- POSUB!$POSUB$ac_delim
- MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
- INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim
-@@ -7294,7 +7038,7 @@
- LTLIBOBJS!$LTLIBOBJS$ac_delim
+@@ -4535,8 +4279,9 @@
+ $as_echo "$ac_res" >&6; }
+ 
+ fi
+-if test `eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'` = yes; then
++as_val=`eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'`
++   if test "x$as_val" = x""yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 43; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 40; then
+@@ -4750,7 +4495,7 @@
+ $as_echo "$ac_cv_header_libintl_h" >&6; }
+ 
+ fi
+-if test $ac_cv_header_libintl_h = yes; then
++if test "x$ac_cv_header_libintl_h" = x""yes; then
+   gt_cv_func_dgettext_libintl="no"
+       libintl_extra_libs=""
+ 
+@@ -4969,8 +4714,9 @@
+ 		 $as_echo "$as_val"'`
+ 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-if test `eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'` = yes; then
++as_val=`eval 'as_val=${'$as_ac_var'}
++		 $as_echo "$as_val"'`
++   if test "x$as_val" = x""yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -5052,7 +4798,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
+ $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
+-if test $ac_cv_lib_intl_bindtextdomain = yes; then
++if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then
+   { $as_echo "$as_me:$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
+@@ -5118,7 +4864,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
+ $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+-if test $ac_cv_lib_intl_ngettext = yes; then
++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
+   { $as_echo "$as_me:$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
+@@ -5184,7 +4930,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
+ $as_echo "$ac_cv_lib_intl_dgettext" >&6; }
+-if test $ac_cv_lib_intl_dgettext = yes; then
++if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
+   gt_cv_func_dgettext_libintl=yes
+ fi
+ 
+@@ -5263,7 +5009,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
+ $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+-if test $ac_cv_lib_intl_ngettext = yes; then
++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
+   { $as_echo "$as_me:$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
+@@ -5329,7 +5075,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
+ $as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
+-if test $ac_cv_lib_intl_dcgettext = yes; then
++if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
+   gt_cv_func_dgettext_libintl=yes
+ 			libintl_extra_libs=-liconv
+ else
+@@ -5442,8 +5188,9 @@
+ 		 $as_echo "$as_val"'`
+ 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-if test `eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'` = yes; then
++as_val=`eval 'as_val=${'$as_ac_var'}
++		 $as_echo "$as_val"'`
++   if test "x$as_val" = x""yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -5608,8 +5355,9 @@
+ 		 $as_echo "$as_val"'`
+ 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-if test `eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'` = yes; then
++as_val=`eval 'as_val=${'$as_ac_var'}
++		 $as_echo "$as_val"'`
++   if test "x$as_val" = x""yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -5853,7 +5601,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+ $as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
+-if test $ac_cv_func_bind_textdomain_codeset = yes; then
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
+   CATOBJEXT=.gmo
+                DATADIRNAME=share
+ else
+@@ -6567,7 +6315,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+ $as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
+-if test $ac_cv_func_bind_textdomain_codeset = yes; then
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
+   DATADIRNAME=share
+ else
+   DATADIRNAME=lib
+@@ -6813,8 +6561,8 @@
+     case $ac_val in #(
+     *${as_nl}*)
+       case $ac_var in #(
+-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+-$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
++      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+       esac
+       case $ac_var in #(
+       _ | IFS | as_nl) ;; #(
+@@ -7267,7 +7015,7 @@
+ # values after options handling.
+ ac_log="
+ This file was extended by pessulus $as_me 2.26.1, which was
+-generated by GNU Autoconf 2.62.  Invocation command line was
++generated by GNU Autoconf 2.63.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -7280,6 +7028,12 @@
+ 
+ _ACEOF
+ 
++case $ac_config_files in *"
++"*) set x $ac_config_files; shift; ac_config_files=$*;;
++esac
++
++
++
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ # Files that config.status was made for.
+ config_files="$ac_config_files"
+@@ -7292,14 +7046,15 @@
+ \`$as_me' instantiates files from templates according to the
+ current configuration.
+ 
+-Usage: $0 [OPTIONS] [FILE]...
++Usage: $0 [OPTION]... [FILE]...
+ 
+   -h, --help       print this help, then exit
+   -V, --version    print version number and configuration settings, then exit
+-  -q, --quiet      do not print progress messages
++  -q, --quiet, --silent
++                   do not print progress messages
+   -d, --debug      don't remove temporary files
+       --recheck    update $as_me by reconfiguring in the same conditions
+-  --file=FILE[:TEMPLATE]
++      --file=FILE[:TEMPLATE]
+                    instantiate the configuration file FILE
+ 
+ Configuration files:
+@@ -7314,7 +7069,7 @@
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ ac_cs_version="\\
+ pessulus config.status 2.26.1
+-configured by $0, generated by GNU Autoconf 2.62,
++configured by $0, generated by GNU Autoconf 2.63,
+   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+ 
+ Copyright (C) 2008 Free Software Foundation, Inc.
+@@ -7513,7 +7268,8 @@
+ $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
++  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
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-diff -Nur -x '*.orig' -x '*~' pessulus-2.16.4/configure.rej pessulus-2.16.4.new/configure.rej
---- pessulus-2.16.4/configure.rej	1970-01-01 00:00:00.000000000 +0000
-+++ pessulus-2.16.4.new/configure.rej	2008-04-05 23:21:20.000000000 +0000
-@@ -0,0 +1,2697 @@
-+***************
-+*** 1,6 ****
-+  #! /bin/sh
-+  # Guess values for system-dependent variables and create Makefiles.
-+- # Generated by GNU Autoconf 2.60 for pessulus 2.16.3.
-+  #
-+  # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=pessulus>.
-+  #
-+--- 1,6 ----
-+  #! /bin/sh
-+  # Guess values for system-dependent variables and create Makefiles.
-++ # Generated by GNU Autoconf 2.61 for pessulus 2.16.3.
-+  #
-+  # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=pessulus>.
-+  #
-+***************
-+*** 12,18 ****
-+  ## M4sh Initialization.  ##
-+  ## --------------------- ##
-+  
-+- # Be Bourne compatible
-+  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+    emulate sh
-+    NULLCMD=:
-+--- 12,19 ----
-+  ## M4sh Initialization.  ##
-+  ## --------------------- ##
-+  
-++ # Be more Bourne compatible
-++ DUALCASE=1; export DUALCASE # for MKS sh
-+  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+    emulate sh
-+    NULLCMD=:
-+***************
-+*** 21,30 ****
-+    alias -g '${1+"$@"}'='"$@"'
-+    setopt NO_GLOB_SUBST
-+  else
-+-   case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-+  fi
-+- BIN_SH=xpg4; export BIN_SH # for Tru64
-+- DUALCASE=1; export DUALCASE # for MKS sh
-+  
-+  
-+  # PATH needs CR
-+--- 22,34 ----
-+    alias -g '${1+"$@"}'='"$@"'
-+    setopt NO_GLOB_SUBST
-+  else
-++   case `(set -o) 2>/dev/null` in
-++   *posix*) set -o posix ;;
-++ esac
-++ 
-+  fi
-++ 
-++ 
-+  
-+  
-+  # PATH needs CR
-+***************
-+*** 217,223 ****
-+  else
-+    as_candidate_shells=
-+      as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+- for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+  do
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+--- 221,227 ----
-+  else
-+    as_candidate_shells=
-+      as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-++ for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+  do
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+***************
-+*** 235,241 ****
-+  	 # Try only shells that exist, to save several forks.
-+  	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-+  		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-+- # Be Bourne compatible
-+  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+    emulate sh
-+    NULLCMD=:
-+--- 239,244 ----
-+  	 # Try only shells that exist, to save several forks.
-+  	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-+  		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-+  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+    emulate sh
-+    NULLCMD=:
-+***************
-+*** 244,253 ****
-+    alias -g '${1+"$@"}'='"$@"'
-+    setopt NO_GLOB_SUBST
-+  else
-+-   case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-+  fi
-+- BIN_SH=xpg4; export BIN_SH # for Tru64
-+- DUALCASE=1; export DUALCASE # for MKS sh
-+  
-+  :
-+  _ASEOF
-+--- 247,258 ----
-+    alias -g '${1+"$@"}'='"$@"'
-+    setopt NO_GLOB_SUBST
-+  else
-++   case `(set -o) 2>/dev/null` in
-++   *posix*) set -o posix ;;
-++ esac
-++ 
-+  fi
-++ 
-+  
-+  :
-+  _ASEOF
-+***************
-+*** 255,261 ****
-+    CONFIG_SHELL=$as_shell
-+  	       as_have_required=yes
-+  	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-+- # Be Bourne compatible
-+  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+    emulate sh
-+    NULLCMD=:
-+--- 260,265 ----
-+    CONFIG_SHELL=$as_shell
-+  	       as_have_required=yes
-+  	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-+  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+    emulate sh
-+    NULLCMD=:
-+***************
-+*** 264,273 ****
-+    alias -g '${1+"$@"}'='"$@"'
-+    setopt NO_GLOB_SUBST
-+  else
-+-   case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-+  fi
-+- BIN_SH=xpg4; export BIN_SH # for Tru64
-+- DUALCASE=1; export DUALCASE # for MKS sh
-+  
-+  :
-+  (as_func_return () {
-+--- 268,279 ----
-+    alias -g '${1+"$@"}'='"$@"'
-+    setopt NO_GLOB_SUBST
-+  else
-++   case `(set -o) 2>/dev/null` in
-++   *posix*) set -o posix ;;
-++ esac
-++ 
-+  fi
-++ 
-+  
-+  :
-+  (as_func_return () {
-+***************
-+*** 514,532 ****
-+    as_mkdir_p=false
-+  fi
-+  
-+- # Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-+- # systems may use methods other than mode bits to determine executability.
-+- cat >conf$$.file <<_ASEOF
-+- #! /bin/sh
-+- exit 0
-+- _ASEOF
-+- chmod +x conf$$.file
-+- if test -x conf$$.file >/dev/null 2>&1; then
-+-   as_executable_p="test -x"
-+  else
-+-   as_executable_p=:
-+  fi
-+- rm -f conf$$.file
-+  
-+  # Sed expression to map a string onto a valid CPP name.
-+  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-+--- 520,547 ----
-+    as_mkdir_p=false
-+  fi
-+  
-++ if test -x / >/dev/null 2>&1; then
-++   as_test_x='test -x'
-+  else
-++   if ls -dL / >/dev/null 2>&1; then
-++     as_ls_L_option=L
-++   else
-++     as_ls_L_option=
-++   fi
-++   as_test_x='
-++     eval sh -c '\''
-++       if test -d "$1"; then
-++         test -d "$1/.";
-++       else
-++ 	case $1 in
-++         -*)set "./$1";;
-++ 	esac;
-++ 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-++ 	???[sx]*):;;*)false;;esac;fi
-++     '\'' sh
-++   '
-+  fi
-++ as_executable_p=$as_test_x
-+  
-+  # Sed expression to map a string onto a valid CPP name.
-+  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-+***************
-+*** 567,602 ****
-+  # Factoring default headers for most tests.
-+  ac_includes_default="\
-+  #include <stdio.h>
-+- #if HAVE_SYS_TYPES_H
-+  # include <sys/types.h>
-+  #endif
-+- #if HAVE_SYS_STAT_H
-+  # include <sys/stat.h>
-+  #endif
-+- #if STDC_HEADERS
-+  # include <stdlib.h>
-+  # include <stddef.h>
-+  #else
-+- # if HAVE_STDLIB_H
-+  #  include <stdlib.h>
-+  # endif
-+  #endif
-+- #if HAVE_STRING_H
-+- # if !STDC_HEADERS && HAVE_MEMORY_H
-+  #  include <memory.h>
-+  # endif
-+  # include <string.h>
-+  #endif
-+- #if HAVE_STRINGS_H
-+  # include <strings.h>
-+  #endif
-+- #if HAVE_INTTYPES_H
-+  # include <inttypes.h>
-+  #endif
-+- #if HAVE_STDINT_H
-+  # include <stdint.h>
-+  #endif
-+- #if HAVE_UNISTD_H
-+  # include <unistd.h>
-+  #endif"
-+  
-+--- 582,617 ----
-+  # Factoring default headers for most tests.
-+  ac_includes_default="\
-+  #include <stdio.h>
-++ #ifdef HAVE_SYS_TYPES_H
-+  # include <sys/types.h>
-+  #endif
-++ #ifdef HAVE_SYS_STAT_H
-+  # include <sys/stat.h>
-+  #endif
-++ #ifdef STDC_HEADERS
-+  # include <stdlib.h>
-+  # include <stddef.h>
-+  #else
-++ # ifdef HAVE_STDLIB_H
-+  #  include <stdlib.h>
-+  # endif
-+  #endif
-++ #ifdef HAVE_STRING_H
-++ # if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-+  #  include <memory.h>
-+  # endif
-+  # include <string.h>
-+  #endif
-++ #ifdef HAVE_STRINGS_H
-+  # include <strings.h>
-+  #endif
-++ #ifdef HAVE_INTTYPES_H
-+  # include <inttypes.h>
-+  #endif
-++ #ifdef HAVE_STDINT_H
-+  # include <stdint.h>
-+  #endif
-++ #ifdef HAVE_UNISTD_H
-+  # include <unistd.h>
-+  #endif"
-+  
-+***************
-+*** 769,780 ****
-+        ac_precious_vars='build_alias
-+  host_alias
-+  target_alias
-+- PKG_CONFIG
-+- PESSULUS_CFLAGS
-+- PESSULUS_LIBS
-+  CC
-+  CFLAGS
-+  LDFLAGS
-+  CPPFLAGS
-+  CPP'
-+  
-+--- 781,790 ----
-+        ac_precious_vars='build_alias
-+  host_alias
-+  target_alias
-+  CC
-+  CFLAGS
-+  LDFLAGS
-++ LIBS
-+  CPPFLAGS
-+  CPP'
-+  
-+***************
-+*** 882,891 ****
-+    -disable-* | --disable-*)
-+      ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-+      # Reject names that are not valid shell variable names.
-+-     expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+        { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-+     { (exit 1); exit 1; }; }
-+-     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-+      eval enable_$ac_feature=no ;;
-+  
-+    -docdir | --docdir | --docdi | --doc | --do)
-+--- 892,901 ----
-+    -disable-* | --disable-*)
-+      ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-+      # Reject names that are not valid shell variable names.
-++     expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+        { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-+     { (exit 1); exit 1; }; }
-++     ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+      eval enable_$ac_feature=no ;;
-+  
-+    -docdir | --docdir | --docdi | --doc | --do)
-+***************
-+*** 901,910 ****
-+    -enable-* | --enable-*)
-+      ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-+      # Reject names that are not valid shell variable names.
-+-     expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+        { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-+     { (exit 1); exit 1; }; }
-+-     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-+      eval enable_$ac_feature=\$ac_optarg ;;
-+  
-+    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-+--- 911,920 ----
-+    -enable-* | --enable-*)
-+      ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-+      # Reject names that are not valid shell variable names.
-++     expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+        { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-+     { (exit 1); exit 1; }; }
-++     ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-+      eval enable_$ac_feature=\$ac_optarg ;;
-+  
-+    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-+***************
-+*** 1098,1116 ****
-+    -with-* | --with-*)
-+      ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-+      # Reject names that are not valid shell variable names.
-+-     expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+        { echo "$as_me: error: invalid package name: $ac_package" >&2
-+     { (exit 1); exit 1; }; }
-+-     ac_package=`echo $ac_package| sed 's/-/_/g'`
-+      eval with_$ac_package=\$ac_optarg ;;
-+  
-+    -without-* | --without-*)
-+      ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-+      # Reject names that are not valid shell variable names.
-+-     expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+        { echo "$as_me: error: invalid package name: $ac_package" >&2
-+     { (exit 1); exit 1; }; }
-+-     ac_package=`echo $ac_package | sed 's/-/_/g'`
-+      eval with_$ac_package=no ;;
-+  
-+    --x)
-+--- 1108,1126 ----
-+    -with-* | --with-*)
-+      ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-+      # Reject names that are not valid shell variable names.
-++     expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+        { echo "$as_me: error: invalid package name: $ac_package" >&2
-+     { (exit 1); exit 1; }; }
-++     ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-+      eval with_$ac_package=\$ac_optarg ;;
-+  
-+    -without-* | --without-*)
-+      ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-+      # Reject names that are not valid shell variable names.
-++     expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+        { echo "$as_me: error: invalid package name: $ac_package" >&2
-+     { (exit 1); exit 1; }; }
-++     ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-+      eval with_$ac_package=no ;;
-+  
-+    --x)
-+***************
-+*** 1368,1382 ****
-+                            The GConf source of the mandatory values
-+  
-+  Some influential environment variables:
-+-   PKG_CONFIG  path to pkg-config utility
-+-   PESSULUS_CFLAGS
-+-               C compiler flags for PESSULUS, overriding pkg-config
-+-   PESSULUS_LIBS
-+-               linker flags for PESSULUS, overriding pkg-config
-+    CC          C compiler command
-+    CFLAGS      C compiler flags
-+    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-+                nonstandard directory <lib dir>
-+    CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-+                you have headers in a nonstandard directory <include dir>
-+    CPP         C preprocessor
-+--- 1378,1388 ----
-+                            The GConf source of the mandatory values
-+  
-+  Some influential environment variables:
-+    CC          C compiler command
-+    CFLAGS      C compiler flags
-+    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-+                nonstandard directory <lib dir>
-++   LIBS        libraries to pass to the linker, e.g. -l<library>
-+    CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-+                you have headers in a nonstandard directory <include dir>
-+    CPP         C preprocessor
-+***************
-+*** 1446,1452 ****
-+  if $ac_init_version; then
-+    cat <<\_ACEOF
-+  pessulus configure 2.16.3
-+- generated by GNU Autoconf 2.60
-+  
-+  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+  2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+--- 1452,1458 ----
-+  if $ac_init_version; then
-+    cat <<\_ACEOF
-+  pessulus configure 2.16.3
-++ generated by GNU Autoconf 2.61
-+  
-+  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+  2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+***************
-+*** 1460,1466 ****
-+  running configure, to aid debugging if configure makes a mistake.
-+  
-+  It was created by pessulus $as_me 2.16.3, which was
-+- generated by GNU Autoconf 2.60.  Invocation command line was
-+  
-+    $ $0 $@
-+  
-+--- 1466,1472 ----
-+  running configure, to aid debugging if configure makes a mistake.
-+  
-+  It was created by pessulus $as_me 2.16.3, which was
-++ generated by GNU Autoconf 2.61.  Invocation command line was
-+  
-+    $ $0 $@
-+  
-+***************
-+*** 1881,1887 ****
-+      # by default.
-+      for ac_prog in ginstall scoinst install; do
-+        for ac_exec_ext in '' $ac_executable_extensions; do
-+- 	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
-+  	  if test $ac_prog = install &&
-+  	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+  	    # AIX install.  It has an incompatible calling convention.
-+--- 1887,1893 ----
-+      # by default.
-+      for ac_prog in ginstall scoinst install; do
-+        for ac_exec_ext in '' $ac_executable_extensions; do
-++ 	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-+  	  if test $ac_prog = install &&
-+  	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+  	    # AIX install.  It has an incompatible calling convention.
-+***************
-+*** 2047,2053 ****
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_prog_AWK="$ac_prog"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+--- 2053,2059 ----
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-++   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_prog_AWK="$ac_prog"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+***************
-+*** 2182,2188 ****
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+--- 2188,2194 ----
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-++   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+***************
-+*** 2222,2228 ****
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_prog_ac_ct_STRIP="strip"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+--- 2228,2234 ----
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-++   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_prog_ac_ct_STRIP="strip"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+***************
-+*** 2304,2551 ****
-+  ACLOCAL_AMFLAGS="$ACLOCAL_FLAGS"
-+  
-+  
-+- 
-+- 
-+- 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
-+- { echo "$as_me:$LINENO: checking for $ac_word" >&5
-+- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+- if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-+-   echo $ECHO_N "(cached) $ECHO_C" >&6
-+- else
-+-   case $PKG_CONFIG in
-+-   [\\/]* | ?:[\\/]*)
-+-   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+-   ;;
-+-   *)
-+-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+- for as_dir in $PATH
-+- do
-+-   IFS=$as_save_IFS
-+-   test -z "$as_dir" && as_dir=.
-+-   for ac_exec_ext in '' $ac_executable_extensions; do
-+-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+-     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+-     break 2
-+-   fi
-+- done
-+- done
-+- IFS=$as_save_IFS
-+- 
-+-   ;;
-+- esac
-+- fi
-+- PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+- if test -n "$PKG_CONFIG"; then
-+-   { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+- echo "${ECHO_T}$PKG_CONFIG" >&6; }
-+- else
-+-   { echo "$as_me:$LINENO: result: no" >&5
-+- echo "${ECHO_T}no" >&6; }
-+- fi
-+- 
-+- 
-+- fi
-+- if test -z "$ac_cv_path_PKG_CONFIG"; then
-+-   ac_pt_PKG_CONFIG=$PKG_CONFIG
-+-   # Extract the first word of "pkg-config", so it can be a program name with args.
-+- set dummy pkg-config; ac_word=$2
-+- { echo "$as_me:$LINENO: checking for $ac_word" >&5
-+- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+- if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
-+-   echo $ECHO_N "(cached) $ECHO_C" >&6
-+- else
-+-   case $ac_pt_PKG_CONFIG in
-+-   [\\/]* | ?:[\\/]*)
-+-   ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-+-   ;;
-+-   *)
-+-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+- for as_dir in $PATH
-+- do
-+-   IFS=$as_save_IFS
-+-   test -z "$as_dir" && as_dir=.
-+-   for ac_exec_ext in '' $ac_executable_extensions; do
-+-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+-     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+-     break 2
-+-   fi
-+- done
-+- done
-+- IFS=$as_save_IFS
-+- 
-+-   ;;
-+- esac
-+- fi
-+- ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-+- if test -n "$ac_pt_PKG_CONFIG"; then
-+-   { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-+- echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
-+- else
-+-   { echo "$as_me:$LINENO: result: no" >&5
-+- echo "${ECHO_T}no" >&6; }
-+- fi
-+- 
-+-   if test "x$ac_pt_PKG_CONFIG" = x; then
-+-     PKG_CONFIG=""
-+-   else
-+-     case $cross_compiling:$ac_tool_warned in
-+- yes:)
-+- { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+- whose name does not start with the host triplet.  If you think this
-+- configuration is useful to you, please write to autoconf at gnu.org." >&5
-+- echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+- whose name does not start with the host triplet.  If you think this
-+- configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+- ac_tool_warned=yes ;;
-+- esac
-+-     PKG_CONFIG=$ac_pt_PKG_CONFIG
-+-   fi
-+- else
-+-   PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-+- fi
-+- 
-+- fi
-+- if test -n "$PKG_CONFIG"; then
-+- 	_pkg_min_version=0.9.0
-+- 	{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-+- echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
-+- 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+- 		{ echo "$as_me:$LINENO: result: yes" >&5
-+- echo "${ECHO_T}yes" >&6; }
-+- 	else
-+- 		{ echo "$as_me:$LINENO: result: no" >&5
-+- echo "${ECHO_T}no" >&6; }
-+- 		PKG_CONFIG=""
-+- 	fi
-+- 
-+- fi
-+- 
-+- pkg_failed=no
-+- { echo "$as_me:$LINENO: checking for PESSULUS" >&5
-+- echo $ECHO_N "checking for PESSULUS... $ECHO_C" >&6; }
-+- 
-+- if test -n "$PKG_CONFIG"; then
-+-     if test -n "$PESSULUS_CFLAGS"; then
-+-         pkg_cv_PESSULUS_CFLAGS="$PESSULUS_CFLAGS"
-+-     else
-+-         if test -n "$PKG_CONFIG" && \
-+-     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0 >= 2.6.0		\\
-+- 		  gnome-python-2.0 >= 2.6.0\"") >&5
-+-   ($PKG_CONFIG --exists --print-errors "pygtk-2.0 >= 2.6.0		\
-+- 		  gnome-python-2.0 >= 2.6.0") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; then
-+-   pkg_cv_PESSULUS_CFLAGS=`$PKG_CONFIG --cflags "pygtk-2.0 >= 2.6.0		\
-+- 		  gnome-python-2.0 >= 2.6.0" 2>/dev/null`
-+- else
-+-   pkg_failed=yes
-+- fi
-+-     fi
-+- else
-+- 	pkg_failed=untried
-+- fi
-+- if test -n "$PKG_CONFIG"; then
-+-     if test -n "$PESSULUS_LIBS"; then
-+-         pkg_cv_PESSULUS_LIBS="$PESSULUS_LIBS"
-+-     else
-+-         if test -n "$PKG_CONFIG" && \
-+-     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0 >= 2.6.0		\\
-+- 		  gnome-python-2.0 >= 2.6.0\"") >&5
-+-   ($PKG_CONFIG --exists --print-errors "pygtk-2.0 >= 2.6.0		\
-+- 		  gnome-python-2.0 >= 2.6.0") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; then
-+-   pkg_cv_PESSULUS_LIBS=`$PKG_CONFIG --libs "pygtk-2.0 >= 2.6.0		\
-+- 		  gnome-python-2.0 >= 2.6.0" 2>/dev/null`
-+- else
-+-   pkg_failed=yes
-+- fi
-+-     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
-+- 	        PESSULUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pygtk-2.0 >= 2.6.0		\
-+- 		  gnome-python-2.0 >= 2.6.0"`
-+-         else
-+- 	        PESSULUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pygtk-2.0 >= 2.6.0		\
-+- 		  gnome-python-2.0 >= 2.6.0"`
-+-         fi
-+- 	# Put the nasty error message in config.log where it belongs
-+- 	echo "$PESSULUS_PKG_ERRORS" >&5
-+- 
-+- 	{ { echo "$as_me:$LINENO: error: Package requirements (pygtk-2.0 >= 2.6.0		\
-+- 		  gnome-python-2.0 >= 2.6.0) were not met:
-+- 
-+- $PESSULUS_PKG_ERRORS
-+- 
-+- Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+- installed software in a non-standard prefix.
-+- 
-+- Alternatively, you may set the environment variables PESSULUS_CFLAGS
-+- and PESSULUS_LIBS to avoid the need to call pkg-config.
-+- See the pkg-config man page for more details.
-+- " >&5
-+- echo "$as_me: error: Package requirements (pygtk-2.0 >= 2.6.0		\
-+- 		  gnome-python-2.0 >= 2.6.0) were not met:
-+- 
-+- $PESSULUS_PKG_ERRORS
-+- 
-+- Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+- installed software in a non-standard prefix.
-+- 
-+- Alternatively, you may set the environment variables PESSULUS_CFLAGS
-+- and PESSULUS_LIBS to avoid the need to call pkg-config.
-+- See the pkg-config man page for more details.
-+- " >&2;}
-+-    { (exit 1); exit 1; }; }
-+- elif test $pkg_failed = untried; then
-+- 	{ { echo "$as_me:$LINENO: 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.
-+- 
-+- Alternatively, you may set the environment variables PESSULUS_CFLAGS
-+- and PESSULUS_LIBS to avoid the need to call pkg-config.
-+- See the pkg-config man page for more details.
-+- 
-+- To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+- See \`config.log' for more details." >&5
-+- echo "$as_me: 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.
-+- 
-+- Alternatively, you may set the environment variables PESSULUS_CFLAGS
-+- and PESSULUS_LIBS to avoid the need to call pkg-config.
-+- See the pkg-config man page for more details.
-+- 
-+- To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-+- See \`config.log' for more details." >&2;}
-+-    { (exit 1); exit 1; }; }
-+- else
-+- 	PESSULUS_CFLAGS=$pkg_cv_PESSULUS_CFLAGS
-+- 	PESSULUS_LIBS=$pkg_cv_PESSULUS_LIBS
-+-         { echo "$as_me:$LINENO: result: yes" >&5
-+- echo "${ECHO_T}yes" >&6; }
-+- 	:
-+- fi
-+- 
-+  GETTEXT_PACKAGE=pessulus
-+  
-+  
-+--- 2310,2315 ----
-+  ACLOCAL_AMFLAGS="$ACLOCAL_FLAGS"
-+  
-+  
-+  GETTEXT_PACKAGE=pessulus
-+  
-+  
-+***************
-+*** 2640,2646 ****
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_prog_CC="${ac_tool_prefix}gcc"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+--- 2404,2410 ----
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-++   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_prog_CC="${ac_tool_prefix}gcc"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+***************
-+*** 2680,2686 ****
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_prog_ac_ct_CC="gcc"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+--- 2444,2450 ----
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-++   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_prog_ac_ct_CC="gcc"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+***************
-+*** 2737,2743 ****
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_prog_CC="${ac_tool_prefix}cc"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+--- 2501,2507 ----
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-++   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_prog_CC="${ac_tool_prefix}cc"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+***************
-+*** 2778,2784 ****
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-+         ac_prog_rejected=yes
-+         continue
-+--- 2542,2548 ----
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-++   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-+         ac_prog_rejected=yes
-+         continue
-+***************
-+*** 2836,2842 ****
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+--- 2600,2606 ----
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-++   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+***************
-+*** 2880,2886 ****
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_prog_ac_ct_CC="$ac_prog"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+--- 2644,2650 ----
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-++   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_prog_ac_ct_CC="$ac_prog"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+***************
-+*** 3021,3027 ****
-+  # in a Makefile.  We should not override ac_cv_exeext if it was cached,
-+  # so that the user can short-circuit this test for compilers unknown to
-+  # Autoconf.
-+- for ac_file in $ac_files
-+  do
-+    test -f "$ac_file" || continue
-+    case $ac_file in
-+--- 2785,2791 ----
-+  # in a Makefile.  We should not override ac_cv_exeext if it was cached,
-+  # so that the user can short-circuit this test for compilers unknown to
-+  # Autoconf.
-++ for ac_file in $ac_files ''
-+  do
-+    test -f "$ac_file" || continue
-+    case $ac_file in
-+***************
-+*** 3205,3212 ****
-+  fi
-+  
-+  ac_exeext=$ac_cv_exeext
-+- { echo "$as_me:$LINENO: result: $ac_file" >&5
-+- echo "${ECHO_T}$ac_file" >&6; }
-+  
-+  # Check that the compiler produces executables we can run.  If not, either
-+  # the compiler is broken, or we cross compile.
-+--- 2975,2980 ----
-+  fi
-+  
-+  ac_exeext=$ac_cv_exeext
-+  
-+  # Check that the compiler produces executables we can run.  If not, either
-+  # the compiler is broken, or we cross compile.
-+***************
-+*** 3384,3410 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } &&
-+- 	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; } &&
-+- 	 { ac_try='test -s conftest.$ac_objext'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; }; then
-+    ac_compiler_gnu=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+--- 3152,3161 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } && {
-++ 	 test -z "$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        } && test -s conftest.$ac_objext; then
-+    ac_compiler_gnu=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+***************
-+*** 3459,3485 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } &&
-+- 	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; } &&
-+- 	 { ac_try='test -s conftest.$ac_objext'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; }; then
-+    ac_cv_prog_cc_g=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+--- 3210,3219 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } && {
-++ 	 test -z "$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        } && test -s conftest.$ac_objext; then
-+    ac_cv_prog_cc_g=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+***************
-+*** 3514,3540 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } &&
-+- 	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; } &&
-+- 	 { ac_try='test -s conftest.$ac_objext'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; }; then
-+    :
-+  else
-+    echo "$as_me: failed program was:" >&5
-+--- 3248,3257 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } && {
-++ 	 test -z "$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        } && test -s conftest.$ac_objext; then
-+    :
-+  else
-+    echo "$as_me: failed program was:" >&5
-+***************
-+*** 3570,3596 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } &&
-+- 	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; } &&
-+- 	 { ac_try='test -s conftest.$ac_objext'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; }; then
-+    ac_cv_prog_cc_g=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+--- 3287,3296 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } && {
-++ 	 test -z "$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        } && test -s conftest.$ac_objext; then
-+    ac_cv_prog_cc_g=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+***************
-+*** 3706,3732 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } &&
-+- 	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; } &&
-+- 	 { ac_try='test -s conftest.$ac_objext'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; }; then
-+    ac_cv_prog_cc_c89=$ac_arg
-+  else
-+    echo "$as_me: failed program was:" >&5
-+--- 3406,3415 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } && {
-++ 	 test -z "$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        } && test -s conftest.$ac_objext; then
-+    ac_cv_prog_cc_c89=$ac_arg
-+  else
-+    echo "$as_me: failed program was:" >&5
-+***************
-+*** 3925,3941 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } >/dev/null; then
-+-   if test -s conftest.err; then
-+-     ac_cpp_err=$ac_c_preproc_warn_flag
-+-     ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+-   else
-+-     ac_cpp_err=
-+-   fi
-+- else
-+-   ac_cpp_err=yes
-+- fi
-+- if test -z "$ac_cpp_err"; then
-+    :
-+  else
-+    echo "$as_me: failed program was:" >&5
-+--- 3608,3617 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } >/dev/null && {
-++ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        }; then
-+    :
-+  else
-+    echo "$as_me: failed program was:" >&5
-+***************
-+*** 3969,3985 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } >/dev/null; then
-+-   if test -s conftest.err; then
-+-     ac_cpp_err=$ac_c_preproc_warn_flag
-+-     ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+-   else
-+-     ac_cpp_err=
-+-   fi
-+- else
-+-   ac_cpp_err=yes
-+- fi
-+- if test -z "$ac_cpp_err"; then
-+    # Broken: success on invalid input.
-+  continue
-+  else
-+--- 3645,3654 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } >/dev/null && {
-++ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        }; then
-+    # Broken: success on invalid input.
-+  continue
-+  else
-+***************
-+*** 4044,4060 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } >/dev/null; then
-+-   if test -s conftest.err; then
-+-     ac_cpp_err=$ac_c_preproc_warn_flag
-+-     ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+-   else
-+-     ac_cpp_err=
-+-   fi
-+- else
-+-   ac_cpp_err=yes
-+- fi
-+- if test -z "$ac_cpp_err"; then
-+    :
-+  else
-+    echo "$as_me: failed program was:" >&5
-+--- 3713,3722 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } >/dev/null && {
-++ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        }; then
-+    :
-+  else
-+    echo "$as_me: failed program was:" >&5
-+***************
-+*** 4088,4104 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } >/dev/null; then
-+-   if test -s conftest.err; then
-+-     ac_cpp_err=$ac_c_preproc_warn_flag
-+-     ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+-   else
-+-     ac_cpp_err=
-+-   fi
-+- else
-+-   ac_cpp_err=yes
-+- fi
-+- if test -z "$ac_cpp_err"; then
-+    # Broken: success on invalid input.
-+  continue
-+  else
-+--- 3750,3759 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } >/dev/null && {
-++ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        }; then
-+    # Broken: success on invalid input.
-+  continue
-+  else
-+***************
-+*** 4153,4159 ****
-+    for ac_prog in grep ggrep; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-+-     { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
-+      # Check for GNU ac_path_GREP and select it if it is found.
-+    # Check for GNU $ac_path_GREP
-+  case `"$ac_path_GREP" --version 2>&1` in
-+--- 3808,3814 ----
-+    for ac_prog in grep ggrep; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-++     { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-+      # Check for GNU ac_path_GREP and select it if it is found.
-+    # Check for GNU $ac_path_GREP
-+  case `"$ac_path_GREP" --version 2>&1` in
-+***************
-+*** 4235,4241 ****
-+    for ac_prog in egrep; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-+-     { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
-+      # Check for GNU ac_path_EGREP and select it if it is found.
-+    # Check for GNU $ac_path_EGREP
-+  case `"$ac_path_EGREP" --version 2>&1` in
-+--- 3890,3896 ----
-+    for ac_prog in egrep; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-++     { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-+      # Check for GNU ac_path_EGREP and select it if it is found.
-+    # Check for GNU $ac_path_EGREP
-+  case `"$ac_path_EGREP" --version 2>&1` in
-+***************
-+*** 4331,4357 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } &&
-+- 	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; } &&
-+- 	 { ac_try='test -s conftest.$ac_objext'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; }; then
-+    ac_cv_header_stdc=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+--- 3986,3995 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } && {
-++ 	 test -z "$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        } && test -s conftest.$ac_objext; then
-+    ac_cv_header_stdc=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+***************
-+*** 4527,4553 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } &&
-+- 	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; } &&
-+- 	 { ac_try='test -s conftest.$ac_objext'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; }; then
-+    eval "$as_ac_Header=yes"
-+  else
-+    echo "$as_me: failed program was:" >&5
-+--- 4165,4174 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } && {
-++ 	 test -z "$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        } && test -s conftest.$ac_objext; then
-+    eval "$as_ac_Header=yes"
-+  else
-+    echo "$as_me: failed program was:" >&5
-+***************
-+*** 4694,4720 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } &&
-+- 	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; } &&
-+- 	 { ac_try='test -s conftest.$ac_objext'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; }; then
-+    ac_header_compiler=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+--- 4315,4324 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } && {
-++ 	 test -z "$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        } && test -s conftest.$ac_objext; then
-+    ac_header_compiler=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+***************
-+*** 4750,4766 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } >/dev/null; then
-+-   if test -s conftest.err; then
-+-     ac_cpp_err=$ac_c_preproc_warn_flag
-+-     ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+-   else
-+-     ac_cpp_err=
-+-   fi
-+- else
-+-   ac_cpp_err=yes
-+- fi
-+- if test -z "$ac_cpp_err"; then
-+    ac_header_preproc=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+--- 4354,4363 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } >/dev/null && {
-++ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        }; then
-+    ac_header_preproc=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+***************
-+*** 4858,4884 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } &&
-+- 	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; } &&
-+- 	 { ac_try='test -s conftest$ac_exeext'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; }; then
-+    am_cv_val_LC_MESSAGES=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+--- 4455,4465 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } && {
-++ 	 test -z "$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        } && test -s conftest$ac_exeext &&
-++        $as_test_x conftest$ac_exeext; then
-+    am_cv_val_LC_MESSAGES=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+***************
-+*** 4887,4893 ****
-+  	am_cv_val_LC_MESSAGES=no
-+  fi
-+  
-+- rm -f core conftest.err conftest.$ac_objext \
-+        conftest$ac_exeext conftest.$ac_ext
-+  fi
-+  { echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-+--- 4468,4474 ----
-+  	am_cv_val_LC_MESSAGES=no
-+  fi
-+  
-++ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+        conftest$ac_exeext conftest.$ac_ext
-+  fi
-+  { echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-+***************
-+*** 4943,4969 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } &&
-+- 	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; } &&
-+- 	 { ac_try='test -s conftest.$ac_objext'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; }; then
-+    ac_header_compiler=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+--- 4524,4533 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } && {
-++ 	 test -z "$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        } && test -s conftest.$ac_objext; then
-+    ac_header_compiler=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+***************
-+*** 4999,5015 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } >/dev/null; then
-+-   if test -s conftest.err; then
-+-     ac_cpp_err=$ac_c_preproc_warn_flag
-+-     ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+-   else
-+-     ac_cpp_err=
-+-   fi
-+- else
-+-   ac_cpp_err=yes
-+- fi
-+- if test -z "$ac_cpp_err"; then
-+    ac_header_preproc=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+--- 4563,4572 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } >/dev/null && {
-++ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        }; then
-+    ac_header_preproc=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+***************
-+*** 5105,5131 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } &&
-+- 	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; } &&
-+- 	 { ac_try='test -s conftest$ac_exeext'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; }; then
-+    gt_cv_func_ngettext_libc=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+--- 4662,4672 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } && {
-++ 	 test -z "$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        } && test -s conftest$ac_exeext &&
-++        $as_test_x conftest$ac_exeext; then
-+    gt_cv_func_ngettext_libc=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+***************
-+*** 5134,5140 ****
-+  	gt_cv_func_ngettext_libc=no
-+  fi
-+  
-+- rm -f core conftest.err conftest.$ac_objext \
-+        conftest$ac_exeext conftest.$ac_ext
-+  
-+  fi
-+--- 4675,4681 ----
-+  	gt_cv_func_ngettext_libc=no
-+  fi
-+  
-++ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+        conftest$ac_exeext conftest.$ac_ext
-+  
-+  fi
-+***************
-+*** 5177,5203 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } &&
-+- 	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; } &&
-+- 	 { ac_try='test -s conftest$ac_exeext'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; }; then
-+    gt_cv_func_dgettext_libc=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+--- 4718,4728 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } && {
-++ 	 test -z "$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        } && test -s conftest$ac_exeext &&
-++        $as_test_x conftest$ac_exeext; then
-+    gt_cv_func_dgettext_libc=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+***************
-+*** 5206,5212 ****
-+  	gt_cv_func_dgettext_libc=no
-+  fi
-+  
-+- rm -f core conftest.err conftest.$ac_objext \
-+        conftest$ac_exeext conftest.$ac_ext
-+  
-+  fi
-+--- 4731,4737 ----
-+  	gt_cv_func_dgettext_libc=no
-+  fi
-+  
-++ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+        conftest$ac_exeext conftest.$ac_ext
-+  
-+  fi
-+***************
-+*** 5282,5308 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } &&
-+- 	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; } &&
-+- 	 { ac_try='test -s conftest$ac_exeext'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; }; then
-+    eval "$as_ac_var=yes"
-+  else
-+    echo "$as_me: failed program was:" >&5
-+--- 4807,4817 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } && {
-++ 	 test -z "$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        } && test -s conftest$ac_exeext &&
-++        $as_test_x conftest$ac_exeext; then
-+    eval "$as_ac_var=yes"
-+  else
-+    echo "$as_me: failed program was:" >&5
-+***************
-+*** 5311,5317 ****
-+  	eval "$as_ac_var=no"
-+  fi
-+  
-+- rm -f core conftest.err conftest.$ac_objext \
-+        conftest$ac_exeext conftest.$ac_ext
-+  fi
-+  ac_res=`eval echo '${'$as_ac_var'}'`
-+--- 4820,4826 ----
-+  	eval "$as_ac_var=no"
-+  fi
-+  
-++ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+        conftest$ac_exeext conftest.$ac_ext
-+  fi
-+  ac_res=`eval echo '${'$as_ac_var'}'`
-+***************
-+*** 5376,5402 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } &&
-+- 	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; } &&
-+- 	 { ac_try='test -s conftest$ac_exeext'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; }; then
-+    ac_cv_lib_intl_bindtextdomain=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+--- 4885,4895 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } && {
-++ 	 test -z "$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        } && test -s conftest$ac_exeext &&
-++        $as_test_x conftest$ac_exeext; then
-+    ac_cv_lib_intl_bindtextdomain=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+***************
-+*** 5405,5411 ****
-+  	ac_cv_lib_intl_bindtextdomain=no
-+  fi
-+  
-+- rm -f core conftest.err conftest.$ac_objext \
-+        conftest$ac_exeext conftest.$ac_ext
-+  LIBS=$ac_check_lib_save_LIBS
-+  fi
-+--- 4898,4904 ----
-+  	ac_cv_lib_intl_bindtextdomain=no
-+  fi
-+  
-++ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+        conftest$ac_exeext conftest.$ac_ext
-+  LIBS=$ac_check_lib_save_LIBS
-+  fi
-+***************
-+*** 5454,5480 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } &&
-+- 	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; } &&
-+- 	 { ac_try='test -s conftest$ac_exeext'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; }; then
-+    ac_cv_lib_intl_ngettext=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+--- 4947,4957 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } && {
-++ 	 test -z "$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        } && test -s conftest$ac_exeext &&
-++        $as_test_x conftest$ac_exeext; then
-+    ac_cv_lib_intl_ngettext=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+***************
-+*** 5483,5489 ****
-+  	ac_cv_lib_intl_ngettext=no
-+  fi
-+  
-+- rm -f core conftest.err conftest.$ac_objext \
-+        conftest$ac_exeext conftest.$ac_ext
-+  LIBS=$ac_check_lib_save_LIBS
-+  fi
-+--- 4960,4966 ----
-+  	ac_cv_lib_intl_ngettext=no
-+  fi
-+  
-++ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+        conftest$ac_exeext conftest.$ac_ext
-+  LIBS=$ac_check_lib_save_LIBS
-+  fi
-+***************
-+*** 5532,5558 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } &&
-+- 	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; } &&
-+- 	 { ac_try='test -s conftest$ac_exeext'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; }; then
-+    ac_cv_lib_intl_dgettext=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+--- 5009,5019 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } && {
-++ 	 test -z "$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        } && test -s conftest$ac_exeext &&
-++        $as_test_x conftest$ac_exeext; then
-+    ac_cv_lib_intl_dgettext=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+***************
-+*** 5561,5567 ****
-+  	ac_cv_lib_intl_dgettext=no
-+  fi
-+  
-+- rm -f core conftest.err conftest.$ac_objext \
-+        conftest$ac_exeext conftest.$ac_ext
-+  LIBS=$ac_check_lib_save_LIBS
-+  fi
-+--- 5022,5028 ----
-+  	ac_cv_lib_intl_dgettext=no
-+  fi
-+  
-++ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+        conftest$ac_exeext conftest.$ac_ext
-+  LIBS=$ac_check_lib_save_LIBS
-+  fi
-+***************
-+*** 5623,5649 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } &&
-+- 	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; } &&
-+- 	 { ac_try='test -s conftest$ac_exeext'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; }; then
-+    ac_cv_lib_intl_ngettext=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+--- 5084,5094 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } && {
-++ 	 test -z "$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        } && test -s conftest$ac_exeext &&
-++        $as_test_x conftest$ac_exeext; then
-+    ac_cv_lib_intl_ngettext=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+***************
-+*** 5652,5658 ****
-+  	ac_cv_lib_intl_ngettext=no
-+  fi
-+  
-+- rm -f core conftest.err conftest.$ac_objext \
-+        conftest$ac_exeext conftest.$ac_ext
-+  LIBS=$ac_check_lib_save_LIBS
-+  fi
-+--- 5097,5103 ----
-+  	ac_cv_lib_intl_ngettext=no
-+  fi
-+  
-++ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+        conftest$ac_exeext conftest.$ac_ext
-+  LIBS=$ac_check_lib_save_LIBS
-+  fi
-+***************
-+*** 5701,5727 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } &&
-+- 	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; } &&
-+- 	 { ac_try='test -s conftest$ac_exeext'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; }; then
-+    ac_cv_lib_intl_dcgettext=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+--- 5146,5156 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } && {
-++ 	 test -z "$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        } && test -s conftest$ac_exeext &&
-++        $as_test_x conftest$ac_exeext; then
-+    ac_cv_lib_intl_dcgettext=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+***************
-+*** 5730,5736 ****
-+  	ac_cv_lib_intl_dcgettext=no
-+  fi
-+  
-+- rm -f core conftest.err conftest.$ac_objext \
-+        conftest$ac_exeext conftest.$ac_ext
-+  LIBS=$ac_check_lib_save_LIBS
-+  fi
-+--- 5159,5165 ----
-+  	ac_cv_lib_intl_dcgettext=no
-+  fi
-+  
-++ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+        conftest$ac_exeext conftest.$ac_ext
-+  LIBS=$ac_check_lib_save_LIBS
-+  fi
-+***************
-+*** 5825,5851 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } &&
-+- 	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; } &&
-+- 	 { ac_try='test -s conftest$ac_exeext'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; }; then
-+    eval "$as_ac_var=yes"
-+  else
-+    echo "$as_me: failed program was:" >&5
-+--- 5254,5264 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } && {
-++ 	 test -z "$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        } && test -s conftest$ac_exeext &&
-++        $as_test_x conftest$ac_exeext; then
-+    eval "$as_ac_var=yes"
-+  else
-+    echo "$as_me: failed program was:" >&5
-+***************
-+*** 5854,5860 ****
-+  	eval "$as_ac_var=no"
-+  fi
-+  
-+- rm -f core conftest.err conftest.$ac_objext \
-+        conftest$ac_exeext conftest.$ac_ext
-+  fi
-+  ac_res=`eval echo '${'$as_ac_var'}'`
-+--- 5267,5273 ----
-+  	eval "$as_ac_var=no"
-+  fi
-+  
-++ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+        conftest$ac_exeext conftest.$ac_ext
-+  fi
-+  ac_res=`eval echo '${'$as_ac_var'}'`
-+***************
-+*** 6001,6027 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } &&
-+- 	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; } &&
-+- 	 { ac_try='test -s conftest$ac_exeext'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; }; then
-+    eval "$as_ac_var=yes"
-+  else
-+    echo "$as_me: failed program was:" >&5
-+--- 5414,5424 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } && {
-++ 	 test -z "$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        } && test -s conftest$ac_exeext &&
-++        $as_test_x conftest$ac_exeext; then
-+    eval "$as_ac_var=yes"
-+  else
-+    echo "$as_me: failed program was:" >&5
-+***************
-+*** 6030,6036 ****
-+  	eval "$as_ac_var=no"
-+  fi
-+  
-+- rm -f core conftest.err conftest.$ac_objext \
-+        conftest$ac_exeext conftest.$ac_ext
-+  fi
-+  ac_res=`eval echo '${'$as_ac_var'}'`
-+--- 5427,5433 ----
-+  	eval "$as_ac_var=no"
-+  fi
-+  
-++ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+        conftest$ac_exeext conftest.$ac_ext
-+  fi
-+  ac_res=`eval echo '${'$as_ac_var'}'`
-+***************
-+*** 6091,6097 ****
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+--- 5488,5494 ----
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-++   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+***************
-+*** 6179,6205 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } &&
-+- 	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; } &&
-+- 	 { ac_try='test -s conftest$ac_exeext'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; }; then
-+    CATOBJEXT=.gmo
-+               DATADIRNAME=share
-+  else
-+--- 5576,5586 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } && {
-++ 	 test -z "$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        } && test -s conftest$ac_exeext &&
-++        $as_test_x conftest$ac_exeext; then
-+    CATOBJEXT=.gmo
-+               DATADIRNAME=share
-+  else
-+***************
-+*** 6271,6297 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } &&
-+- 	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; } &&
-+- 	 { ac_try='test -s conftest$ac_exeext'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; }; then
-+    ac_cv_func_bind_textdomain_codeset=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+--- 5652,5662 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } && {
-++ 	 test -z "$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        } && test -s conftest$ac_exeext &&
-++        $as_test_x conftest$ac_exeext; then
-+    ac_cv_func_bind_textdomain_codeset=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+***************
-+*** 6300,6306 ****
-+  	ac_cv_func_bind_textdomain_codeset=no
-+  fi
-+  
-+- rm -f core conftest.err conftest.$ac_objext \
-+        conftest$ac_exeext conftest.$ac_ext
-+  fi
-+  { echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-+--- 5665,5671 ----
-+  	ac_cv_func_bind_textdomain_codeset=no
-+  fi
-+  
-++ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+        conftest$ac_exeext conftest.$ac_ext
-+  fi
-+  { echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-+***************
-+*** 6321,6327 ****
-+  	    esac
-+  fi
-+  
-+- rm -f core conftest.err conftest.$ac_objext \
-+        conftest$ac_exeext conftest.$ac_ext
-+            LIBS="$glib_save_LIBS"
-+  	  INSTOBJEXT=.mo
-+--- 5686,5692 ----
-+  	    esac
-+  fi
-+  
-++ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+        conftest$ac_exeext conftest.$ac_ext
-+            LIBS="$glib_save_LIBS"
-+  	  INSTOBJEXT=.mo
-+***************
-+*** 6527,6533 ****
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+--- 5892,5898 ----
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-++   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+***************
-+*** 6590,6596 ****
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+--- 5955,5961 ----
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-++   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+***************
-+*** 6631,6637 ****
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+--- 5996,6002 ----
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-++   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+***************
-+*** 6672,6678 ****
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_path_INTLTOOL_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+--- 6037,6043 ----
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-++   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_path_INTLTOOL_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+***************
-+*** 6713,6719 ****
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+--- 6078,6084 ----
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-++   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+***************
-+*** 6772,6798 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } &&
-+- 	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; } &&
-+- 	 { ac_try='test -s conftest$ac_exeext'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; }; then
-+    DATADIRNAME=share
-+  else
-+    echo "$as_me: failed program was:" >&5
-+--- 6137,6147 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } && {
-++ 	 test -z "$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        } && test -s conftest$ac_exeext &&
-++        $as_test_x conftest$ac_exeext; then
-+    DATADIRNAME=share
-+  else
-+    echo "$as_me: failed program was:" >&5
-+***************
-+*** 6863,6889 ****
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); } &&
-+- 	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; } &&
-+- 	 { ac_try='test -s conftest$ac_exeext'
-+-   { (case "(($ac_try" in
-+-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+-   *) ac_try_echo=$ac_try;;
-+- esac
-+- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+-   (eval "$ac_try") 2>&5
-+-   ac_status=$?
-+-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+-   (exit $ac_status); }; }; then
-+    ac_cv_func_bind_textdomain_codeset=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+--- 6212,6222 ----
-+    rm -f conftest.er1
-+    cat conftest.err >&5
-+    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-++   (exit $ac_status); } && {
-++ 	 test -z "$ac_c_werror_flag" ||
-++ 	 test ! -s conftest.err
-++        } && test -s conftest$ac_exeext &&
-++        $as_test_x conftest$ac_exeext; then
-+    ac_cv_func_bind_textdomain_codeset=yes
-+  else
-+    echo "$as_me: failed program was:" >&5
-+***************
-+*** 6892,6898 ****
-+  	ac_cv_func_bind_textdomain_codeset=no
-+  fi
-+  
-+- rm -f core conftest.err conftest.$ac_objext \
-+        conftest$ac_exeext conftest.$ac_ext
-+  fi
-+  { echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-+--- 6225,6231 ----
-+  	ac_cv_func_bind_textdomain_codeset=no
-+  fi
-+  
-++ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+        conftest$ac_exeext conftest.$ac_ext
-+  fi
-+  { echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-+***************
-+*** 6910,6916 ****
-+      esac
-+  fi
-+  
-+- rm -f core conftest.err conftest.$ac_objext \
-+        conftest$ac_exeext conftest.$ac_ext
-+  fi
-+  
-+--- 6243,6249 ----
-+      esac
-+  fi
-+  
-++ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+        conftest$ac_exeext conftest.$ac_ext
-+  fi
-+  
-+***************
-+*** 6948,6954 ****
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+--- 6281,6287 ----
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-++   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+***************
-+*** 7074,7080 ****
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+--- 6407,6413 ----
-+    IFS=$as_save_IFS
-+    test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-++   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+      ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
-+      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+      break 2
-+***************
-+*** 7294,7300 ****
-+  ## M4sh Initialization.  ##
-+  ## --------------------- ##
-+  
-+- # Be Bourne compatible
-+  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+    emulate sh
-+    NULLCMD=:
-+--- 6627,6634 ----
-+  ## M4sh Initialization.  ##
-+  ## --------------------- ##
-+  
-++ # Be more Bourne compatible
-++ DUALCASE=1; export DUALCASE # for MKS sh
-+  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+    emulate sh
-+    NULLCMD=:
-+***************
-+*** 7303,7312 ****
-+    alias -g '${1+"$@"}'='"$@"'
-+    setopt NO_GLOB_SUBST
-+  else
-+-   case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-+  fi
-+- BIN_SH=xpg4; export BIN_SH # for Tru64
-+- DUALCASE=1; export DUALCASE # for MKS sh
-+  
-+  
-+  # PATH needs CR
-+--- 6637,6649 ----
-+    alias -g '${1+"$@"}'='"$@"'
-+    setopt NO_GLOB_SUBST
-+  else
-++   case `(set -o) 2>/dev/null` in
-++   *posix*) set -o posix ;;
-++ esac
-++ 
-+  fi
-++ 
-++ 
-+  
-+  
-+  # PATH needs CR
-+***************
-+*** 7530,7548 ****
-+    as_mkdir_p=false
-+  fi
-+  
-+- # Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-+- # systems may use methods other than mode bits to determine executability.
-+- cat >conf$$.file <<_ASEOF
-+- #! /bin/sh
-+- exit 0
-+- _ASEOF
-+- chmod +x conf$$.file
-+- if test -x conf$$.file >/dev/null 2>&1; then
-+-   as_executable_p="test -x"
-+  else
-+-   as_executable_p=:
-+  fi
-+- rm -f conf$$.file
-+  
-+  # Sed expression to map a string onto a valid CPP name.
-+  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-+--- 6867,6894 ----
-+    as_mkdir_p=false
-+  fi
-+  
-++ if test -x / >/dev/null 2>&1; then
-++   as_test_x='test -x'
-+  else
-++   if ls -dL / >/dev/null 2>&1; then
-++     as_ls_L_option=L
-++   else
-++     as_ls_L_option=
-++   fi
-++   as_test_x='
-++     eval sh -c '\''
-++       if test -d "$1"; then
-++         test -d "$1/.";
-++       else
-++ 	case $1 in
-++         -*)set "./$1";;
-++ 	esac;
-++ 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-++ 	???[sx]*):;;*)false;;esac;fi
-++     '\'' sh
-++   '
-+  fi
-++ as_executable_p=$as_test_x
-+  
-+  # Sed expression to map a string onto a valid CPP name.
-+  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-+***************
-+*** 7558,7564 ****
-+  # values after options handling.
-+  ac_log="
-+  This file was extended by pessulus $as_me 2.16.3, which was
-+- generated by GNU Autoconf 2.60.  Invocation command line was
-+  
-+    CONFIG_FILES    = $CONFIG_FILES
-+    CONFIG_HEADERS  = $CONFIG_HEADERS
-+--- 6904,6910 ----
-+  # values after options handling.
-+  ac_log="
-+  This file was extended by pessulus $as_me 2.16.3, which was
-++ generated by GNU Autoconf 2.61.  Invocation command line was
-+  
-+    CONFIG_FILES    = $CONFIG_FILES
-+    CONFIG_HEADERS  = $CONFIG_HEADERS
-+***************
-+*** 7586,7592 ****
-+  Usage: $0 [OPTIONS] [FILE]...
-+  
-+    -h, --help       print this help, then exit
-+-   -V, --version    print version number, then exit
-+    -q, --quiet      do not print progress messages
-+    -d, --debug      don't remove temporary files
-+        --recheck    update $as_me by reconfiguring in the same conditions
-+--- 6932,6938 ----
-+  Usage: $0 [OPTIONS] [FILE]...
-+  
-+    -h, --help       print this help, then exit
-++   -V, --version    print version number and configuration settings, then exit
-+    -q, --quiet      do not print progress messages
-+    -d, --debug      don't remove temporary files
-+        --recheck    update $as_me by reconfiguring in the same conditions
-+***************
-+*** 7605,7611 ****
-+  cat >>$CONFIG_STATUS <<_ACEOF
-+  ac_cs_version="\\
-+  pessulus config.status 2.16.3
-+- configured by $0, generated by GNU Autoconf 2.60,
-+    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+  
-+  Copyright (C) 2006 Free Software Foundation, Inc.
-+--- 6951,6957 ----
-+  cat >>$CONFIG_STATUS <<_ACEOF
-+  ac_cs_version="\\
-+  pessulus config.status 2.16.3
-++ configured by $0, generated by GNU Autoconf 2.61,
-+    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+  
-+  Copyright (C) 2006 Free Software Foundation, Inc.
-+***************
-+*** 7209,7214 ****
-+  MSGFMT!$MSGFMT$ac_delim
-+  MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
-+  GMSGFMT!$GMSGFMT$ac_delim
-+  _ACEOF
-+  
-+    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+--- 6552,6560 ----
-+  MSGFMT!$MSGFMT$ac_delim
-+  MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
-+  GMSGFMT!$GMSGFMT$ac_delim
-++ XGETTEXT!$XGETTEXT$ac_delim
-++ CATALOGS!$CATALOGS$ac_delim
-++ CATOBJEXT!$CATOBJEXT$ac_delim
-+  _ACEOF
-+  
-+    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+***************
-+*** 7250,7258 ****
-+  ac_delim='%!_!# '
-+  for ac_last_try in false false false false false :; do
-+    cat >conf$$subs.sed <<_ACEOF
-+- XGETTEXT!$XGETTEXT$ac_delim
-+- CATALOGS!$CATALOGS$ac_delim
-+- CATOBJEXT!$CATOBJEXT$ac_delim
-+  DATADIRNAME!$DATADIRNAME$ac_delim
-+  GMOFILES!$GMOFILES$ac_delim
-+  INSTOBJEXT!$INSTOBJEXT$ac_delim
-+--- 6596,6601 ----
-+  ac_delim='%!_!# '
-+  for ac_last_try in false false false false false :; do
-+    cat >conf$$subs.sed <<_ACEOF
-+  DATADIRNAME!$DATADIRNAME$ac_delim
-+  GMOFILES!$GMOFILES$ac_delim
-+  INSTOBJEXT!$INSTOBJEXT$ac_delim
-+***************
-+*** 7304,7310 ****
-+  LTLIBOBJS!$LTLIBOBJS$ac_delim
-+  _ACEOF
-+  
-+-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 52; then
-+      break
-+    elif $ac_last_try; then
-+      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+--- 6647,6653 ----
-+  LTLIBOBJS!$LTLIBOBJS$ac_delim
-+  _ACEOF
-+  
-++   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 49; then
-+      break
-+    elif $ac_last_try; then
-+      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+     { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+@@ -7640,8 +7396,8 @@
+   esac
+   case $ac_mode$ac_tag in
+   :[FHL]*:*);;
+-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+-$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
++  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
++$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
+    { (exit 1); exit 1; }; };;
+   :[FH]-) ac_tag=-:-;;
+   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+@@ -8096,7 +7852,7 @@
+   $ac_cs_success || { (exit 1); exit 1; }
+ fi
+ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+-  { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
+-$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
++  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
++$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
+ 




More information about the pkg-gnome-commits mailing list