r23448 - in /desktop/unstable/pessulus/debian: changelog control control.in patches/01_scp-integration.patch patches/70_mandatory-autoconf.patch

dktrkranz at users.alioth.debian.org dktrkranz at users.alioth.debian.org
Tue Mar 30 19:52:52 UTC 2010


Author: dktrkranz
Date: Tue Mar 30 19:52:50 2010
New Revision: 23448

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23448
Log:
* New upstream release.
* Refresh patches for new upstream release:
  - debian/patches/01_scp-integration.patch
  - debian/patches/70_mandatory-autoconf.patch
* debian/control.in:
  - Bump Standards-Version to 3.8.3, no changes required.

Modified:
    desktop/unstable/pessulus/debian/changelog
    desktop/unstable/pessulus/debian/control
    desktop/unstable/pessulus/debian/control.in
    desktop/unstable/pessulus/debian/patches/01_scp-integration.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=23448&op=diff
==============================================================================
--- desktop/unstable/pessulus/debian/changelog [utf-8] (original)
+++ desktop/unstable/pessulus/debian/changelog [utf-8] Tue Mar 30 19:52:50 2010
@@ -1,3 +1,14 @@
+pessulus (2.30.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Refresh patches for new upstream release:
+    - debian/patches/01_scp-integration.patch
+    - debian/patches/70_mandatory-autoconf.patch
+  * debian/control.in:
+    - Bump Standards-Version to 3.8.3, no changes required.
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Tue, 30 Mar 2010 21:49:19 +0200
+
 pessulus (2.28.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/unstable/pessulus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pessulus/debian/control?rev=23448&op=diff
==============================================================================
--- desktop/unstable/pessulus/debian/control [utf-8] (original)
+++ desktop/unstable/pessulus/debian/control [utf-8] Tue Mar 30 19:52:50 2010
@@ -1,3 +1,8 @@
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
 Source: pessulus
 Section: admin
 Priority: optional
@@ -11,7 +16,7 @@
                      intltool,
                      python-central (>= 0.5.6)
 Homepage: http://live.gnome.org/Pessulus
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 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=23448&op=diff
==============================================================================
--- desktop/unstable/pessulus/debian/control.in [utf-8] (original)
+++ desktop/unstable/pessulus/debian/control.in [utf-8] Tue Mar 30 19:52:50 2010
@@ -11,7 +11,7 @@
                      intltool,
                      python-central (>= 0.5.6)
 Homepage: http://live.gnome.org/Pessulus
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 XS-Python-Version: >= 2.4
 
 Package: pessulus

Modified: desktop/unstable/pessulus/debian/patches/01_scp-integration.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pessulus/debian/patches/01_scp-integration.patch?rev=23448&op=diff
==============================================================================
--- desktop/unstable/pessulus/debian/patches/01_scp-integration.patch [utf-8] (original)
+++ desktop/unstable/pessulus/debian/patches/01_scp-integration.patch [utf-8] Tue Mar 30 19:52:50 2010
@@ -1,8 +1,10 @@
-diff -Nur pessulus-2.16.1/Pessulus/lockdownappliergconf.py pessulus-2.16.1.new/Pessulus/lockdownappliergconf.py
---- pessulus-2.16.1/Pessulus/lockdownappliergconf.py	2005-11-04 19:30:22.000000000 +0100
-+++ pessulus-2.16.1.new/Pessulus/lockdownappliergconf.py	2006-10-12 13:31:34.000000000 +0200
-@@ -52,7 +52,7 @@
-     return False
+Fix SCP integration
+
+diff -Nur -x '*.orig' -x '*~' pessulus-2.30.0//Pessulus/lockdownappliergconf.py pessulus-2.30.0.new//Pessulus/lockdownappliergconf.py
+--- pessulus-2.30.0//Pessulus/lockdownappliergconf.py	2010-01-27 16:12:27.000000000 +0100
++++ pessulus-2.30.0.new//Pessulus/lockdownappliergconf.py	2010-03-30 21:44:22.853511986 +0200
+@@ -119,7 +119,7 @@
+         self.client.remove_dir (dir)
  
  class PessulusLockdownApplierGconf (lockdownapplier.PessulusLockdownApplier):
 -    def __init__ (self):
@@ -10,9 +12,9 @@
          self.can_edit_mandatory = can_edit_mandatory ()
          self.client_mandatory = None
  
-diff -Nur pessulus-2.16.1/Pessulus/lockdownappliergconfscp.py pessulus-2.16.1.new/Pessulus/lockdownappliergconfscp.py
---- pessulus-2.16.1/Pessulus/lockdownappliergconfscp.py	1970-01-01 01:00:00.000000000 +0100
-+++ pessulus-2.16.1.new/Pessulus/lockdownappliergconfscp.py	2006-10-12 13:31:34.000000000 +0200
+diff -Nur -x '*.orig' -x '*~' pessulus-2.30.0//Pessulus/lockdownappliergconfscp.py pessulus-2.30.0.new//Pessulus/lockdownappliergconfscp.py
+--- pessulus-2.30.0//Pessulus/lockdownappliergconfscp.py	1970-01-01 01:00:00.000000000 +0100
++++ pessulus-2.30.0.new//Pessulus/lockdownappliergconfscp.py	2010-03-30 21:44:22.861519069 +0200
 @@ -0,0 +1,182 @@
 +#!/usr/bin/env python
 +
@@ -196,11 +198,11 @@
 +                self.client_mandatory.unset (key)
 +            subprocess.Popen(['sudo', '-u', self.args.gconfuser, 'gconftool-2', '--type', 'list', '--list-type', s_type, '--set', key, str(value), '--config-source', self.args.gconfpath])
 +
-diff -Nur pessulus-2.16.1/Pessulus/main.py pessulus-2.16.1.new/Pessulus/main.py
---- pessulus-2.16.1/Pessulus/main.py	2006-03-13 21:47:30.000000000 +0100
-+++ pessulus-2.16.1.new/Pessulus/main.py	2006-10-12 13:31:34.000000000 +0200
-@@ -32,9 +32,13 @@
-     import gnome
+diff -Nur -x '*.orig' -x '*~' pessulus-2.30.0//Pessulus/main.py pessulus-2.30.0.new//Pessulus/main.py
+--- pessulus-2.30.0//Pessulus/main.py	2010-01-27 16:12:27.000000000 +0100
++++ pessulus-2.30.0.new//Pessulus/main.py	2010-03-30 21:44:22.861519069 +0200
+@@ -30,9 +30,13 @@
+     import gtk
  
      import maindialog
 -    import lockdownappliergconf
@@ -214,19 +216,19 @@
      try:
          locale.setlocale (locale.LC_ALL, "")
      except locale.Error:
-@@ -46,7 +50,7 @@
- 
-     gtk.window_set_default_icon_name ("stock_lock")
+@@ -41,7 +45,7 @@
+ 
+     gtk.window_set_default_icon_name ("pessulus")
  
 -    applier = lockdownappliergconf.PessulusLockdownApplierGconf ()
 +    applier = lockdownappliergconf.PessulusLockdownApplierGconf (args)
  
-     dialog = maindialog.PessulusMainDialog (applier, gnome_program = prog)
- 
-diff -Nur pessulus-2.16.1/Pessulus/Makefile.in pessulus-2.16.1.new/Pessulus/Makefile.in
---- pessulus-2.16.1/Pessulus/Makefile.in	2006-10-02 17:43:00.000000000 +0200
-+++ pessulus-2.16.1.new/Pessulus/Makefile.in	2006-10-12 13:32:27.000000000 +0200
-@@ -179,6 +179,7 @@
+     if not applier.supports_normal_settings () and not applier.supports_mandatory_settings ():
+         dialog = gtk.MessageDialog (type = gtk.MESSAGE_ERROR,
+diff -Nur -x '*.orig' -x '*~' pessulus-2.30.0//Pessulus/Makefile.in pessulus-2.30.0.new//Pessulus/Makefile.in
+--- pessulus-2.30.0//Pessulus/Makefile.in	2010-03-30 01:57:05.000000000 +0200
++++ pessulus-2.30.0.new//Pessulus/Makefile.in	2010-03-30 21:44:22.861519069 +0200
+@@ -206,6 +206,7 @@
  	icons.py		\
  	globalvar.py		\
  	lockdownappliergconf.py	\
@@ -234,10 +236,10 @@
  	lockdownapplier.py	\
  	lockdownbutton.py	\
  	lockdowncheckbutton.py	\
-diff -Nur pessulus-2.16.1/pessulus.in pessulus-2.16.1.new/pessulus.in
---- pessulus-2.16.1/pessulus.in	2006-09-11 11:48:10.000000000 +0200
-+++ pessulus-2.16.1.new/pessulus.in	2006-10-12 13:31:34.000000000 +0200
-@@ -48,4 +48,39 @@
+diff -Nur -x '*.orig' -x '*~' pessulus-2.30.0//pessulus.in pessulus-2.30.0.new//pessulus.in
+--- pessulus-2.30.0//pessulus.in	2010-01-27 16:12:27.000000000 +0100
++++ pessulus-2.30.0.new//pessulus.in	2010-03-30 21:44:22.861519069 +0200
+@@ -29,4 +29,39 @@
  
  
  import Pessulus.main

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=23448&op=diff
==============================================================================
--- desktop/unstable/pessulus/debian/patches/70_mandatory-autoconf.patch [utf-8] (original)
+++ desktop/unstable/pessulus/debian/patches/70_mandatory-autoconf.patch [utf-8] Tue Mar 30 19:52:50 2010
@@ -1,20 +1,22 @@
 Generated with autoconf && rm -rf autom4te.cache
 
-diff -Nur -x '*.orig' -x '*~' pessulus-2.28.0/configure pessulus-2.28.0.new/configure
---- pessulus-2.28.0/configure	2009-09-21 18:29:01.000000000 +0200
-+++ pessulus-2.28.0.new/configure	2009-09-23 22:12:55.448596663 +0200
-@@ -1,20 +1,22 @@
+diff -Nur -x '*.orig' -x '*~' pessulus-2.30.0//configure pessulus-2.30.0.new//configure
+--- pessulus-2.30.0//configure	2010-03-30 01:57:04.000000000 +0200
++++ pessulus-2.30.0.new//configure	2010-03-30 21:47:23.641508337 +0200
+@@ -1,20 +1,24 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for pessulus 2.28.0.
-+# Generated by GNU Autoconf 2.64 for pessulus 2.28.0.
+-# Generated by GNU Autoconf 2.63 for pessulus 2.30.0.
++# Generated by GNU Autoconf 2.65 for pessulus 2.30.0.
  #
  # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=pessulus>.
  #
++#
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-+# Foundation, Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
++#
 +#
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
@@ -32,7 +34,7 @@
    emulate sh
    NULLCMD=:
    # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -22,23 +24,15 @@
+@@ -22,23 +26,15 @@
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
  else
@@ -61,7 +63,7 @@
  as_nl='
  '
  export as_nl
-@@ -46,7 +40,13 @@
+@@ -46,7 +42,13 @@
  as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
  as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
  as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -76,7 +78,7 @@
    as_echo='printf %s\n'
    as_echo_n='printf %s'
  else
-@@ -57,7 +57,7 @@
+@@ -57,7 +59,7 @@
      as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
      as_echo_n_body='eval
        arg=$1;
@@ -85,7 +87,7 @@
        *"$as_nl"*)
  	expr "X$arg" : "X\\(.*\\)$as_nl";
  	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -80,13 +80,6 @@
+@@ -80,13 +82,6 @@
    }
  fi
  
@@ -99,7 +101,7 @@
  
  # IFS
  # We need space, tab and new line, in precisely that order.  Quoting is
-@@ -96,15 +89,15 @@
+@@ -96,15 +91,15 @@
  IFS=" ""	$as_nl"
  
  # Find who we are.  Look in the path if we contain no directory separator.
@@ -118,7 +120,7 @@
  IFS=$as_save_IFS
  
       ;;
-@@ -116,12 +109,16 @@
+@@ -116,12 +111,16 @@
  fi
  if test ! -f "$as_myself"; then
    $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -139,7 +141,7 @@
  done
  PS1='$ '
  PS2='> '
-@@ -133,330 +130,301 @@
+@@ -133,330 +132,301 @@
  LANGUAGE=C
  export LANGUAGE
  
@@ -715,7 +717,7 @@
    sed -n '
      p
      /[$]LINENO/=
-@@ -473,8 +441,7 @@
+@@ -473,8 +443,7 @@
        s/-\n.*//
      ' >$as_me.lineno &&
    chmod +x "$as_me.lineno" ||
@@ -725,7 +727,7 @@
  
    # Don't try to exec as it changes $[0], causing all sort of problems
    # (the dirname of $[0] is not the place where we might find the
-@@ -484,29 +451,18 @@
+@@ -484,29 +453,18 @@
    exit
  }
  
@@ -760,7 +762,7 @@
  
  rm -f conf$$ conf$$.exe conf$$.file
  if test -d conf$$.dir; then
-@@ -536,7 +492,7 @@
+@@ -536,7 +494,7 @@
  rmdir conf$$.dir 2>/dev/null
  
  if mkdir -p . 2>/dev/null; then
@@ -769,7 +771,7 @@
  else
    test -d ./-p && rmdir ./-p
    as_mkdir_p=false
-@@ -555,10 +511,10 @@
+@@ -555,10 +513,10 @@
        if test -d "$1"; then
  	test -d "$1/.";
        else
@@ -782,15 +784,18 @@
  	???[sx]*):;;*)false;;esac;fi
      '\'' sh
    '
-@@ -572,7 +528,6 @@
+@@ -572,8 +530,8 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
 -
- exec 7<&0 </dev/null 6>&1
+-exec 7<&0 </dev/null 6>&1
++test -n "$DJDIR" || exec 7<&0 </dev/null
++exec 6>&1
  
  # Name of the host.
-@@ -591,7 +546,6 @@
+ # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+@@ -591,7 +549,6 @@
  subdirs=
  MFLAGS=
  MAKEFLAGS=
@@ -798,15 +803,15 @@
  
  # Identity of this package.
  PACKAGE_NAME='pessulus'
-@@ -599,6 +553,7 @@
- PACKAGE_VERSION='2.28.0'
- PACKAGE_STRING='pessulus 2.28.0'
+@@ -599,6 +556,7 @@
+ PACKAGE_VERSION='2.30.0'
+ PACKAGE_STRING='pessulus 2.30.0'
  PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=pessulus'
 +PACKAGE_URL=''
  
  ac_unique_file="pessulus.in"
  # Factoring default headers for most tests.
-@@ -713,9 +668,6 @@
+@@ -713,9 +671,6 @@
  CFLAGS
  CC
  GETTEXT_PACKAGE
@@ -816,7 +821,7 @@
  ACLOCAL_AMFLAGS
  MAINT
  MAINTAINER_MODE_FALSE
-@@ -775,6 +727,7 @@
+@@ -775,6 +730,7 @@
  program_transform_name
  prefix
  exec_prefix
@@ -824,7 +829,7 @@
  PACKAGE_BUGREPORT
  PACKAGE_STRING
  PACKAGE_VERSION
-@@ -794,9 +747,6 @@
+@@ -794,9 +750,6 @@
        ac_precious_vars='build_alias
  host_alias
  target_alias
@@ -834,7 +839,7 @@
  CC
  CFLAGS
  LDFLAGS
-@@ -911,8 +861,7 @@
+@@ -911,8 +864,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -844,7 +849,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -938,8 +887,7 @@
+@@ -938,8 +890,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -854,7 +859,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1143,8 +1091,7 @@
+@@ -1143,8 +1094,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -864,7 +869,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1160,8 +1107,7 @@
+@@ -1160,8 +1110,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -874,7 +879,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1191,17 +1137,17 @@
+@@ -1191,17 +1140,17 @@
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries=$ac_optarg ;;
  
@@ -898,7 +903,7 @@
      eval $ac_envvar=\$ac_optarg
      export $ac_envvar ;;
  
-@@ -1218,15 +1164,13 @@
+@@ -1218,15 +1167,13 @@
  
  if test -n "$ac_prev"; then
    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -916,7 +921,7 @@
      *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    esac
  fi
-@@ -1249,8 +1193,7 @@
+@@ -1249,8 +1196,7 @@
      [\\/$]* | ?:[\\/]* )  continue;;
      NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    esac
@@ -926,7 +931,7 @@
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -1280,11 +1223,9 @@
+@@ -1280,11 +1226,9 @@
  ac_pwd=`pwd` && test -n "$ac_pwd" &&
  ac_ls_di=`ls -di .` &&
  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -940,7 +945,7 @@
  
  
  # Find the source files, if location was not specified.
-@@ -1323,13 +1264,11 @@
+@@ -1323,13 +1267,11 @@
  fi
  if test ! -r "$srcdir/$ac_unique_file"; then
    test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -956,7 +961,7 @@
  	pwd)`
  # When building in place, set srcdir=.
  if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1444,11 +1383,6 @@
+@@ -1444,102 +1386,454 @@
                            The GConf source of the mandatory values
  
  Some influential environment variables:
@@ -968,21 +973,91 @@
    CC          C compiler command
    CFLAGS      C compiler flags
    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-@@ -1525,21 +1459,378 @@
- if $ac_init_version; then
-   cat <<\_ACEOF
- pessulus configure 2.28.0
--generated by GNU Autoconf 2.63
-+generated by GNU Autoconf 2.64
- 
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+               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
++  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+               you have headers in a nonstandard directory <include dir>
+   CPP         C preprocessor
+ 
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+ 
+-Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=pessulus>.
+-_ACEOF
+-ac_status=$?
++Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=pessulus>.
++_ACEOF
++ac_status=$?
++fi
++
++if test "$ac_init_help" = "recursive"; then
++  # If there are subdirs, report their specific --help.
++  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
++    test -d "$ac_dir" ||
++      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
++      continue
++    ac_builddir=.
++
++case "$ac_dir" in
++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
++*)
++  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
++  # A ".." for each directory in $ac_dir_suffix.
++  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
++  case $ac_top_builddir_sub in
++  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
++  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
++  esac ;;
++esac
++ac_abs_top_builddir=$ac_pwd
++ac_abs_builddir=$ac_pwd$ac_dir_suffix
++# for backward compatibility:
++ac_top_builddir=$ac_top_build_prefix
++
++case $srcdir in
++  .)  # We are building in place.
++    ac_srcdir=.
++    ac_top_srcdir=$ac_top_builddir_sub
++    ac_abs_top_srcdir=$ac_pwd ;;
++  [\\/]* | ?:[\\/]* )  # Absolute name.
++    ac_srcdir=$srcdir$ac_dir_suffix;
++    ac_top_srcdir=$srcdir
++    ac_abs_top_srcdir=$srcdir ;;
++  *) # Relative name.
++    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
++    ac_top_srcdir=$ac_top_build_prefix$srcdir
++    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
++esac
++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
++
++    cd "$ac_dir" || { ac_status=$?; continue; }
++    # Check for guested configure.
++    if test -f "$ac_srcdir/configure.gnu"; then
++      echo &&
++      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
++    elif test -f "$ac_srcdir/configure"; then
++      echo &&
++      $SHELL "$ac_srcdir/configure" --help=recursive
++    else
++      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
++    fi || ac_status=$?
++    cd "$ac_pwd" || { ac_status=$?; break; }
++  done
++fi
++
++test -n "$ac_init_help" && exit $ac_status
++if $ac_init_version; then
++  cat <<\_ACEOF
++pessulus configure 2.30.0
++generated by GNU Autoconf 2.65
++
 +Copyright (C) 2009 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-   exit
- fi
++This configure script is free software; the Free Software Foundation
++gives unlimited permission to copy, distribute and modify it.
++_ACEOF
++  exit
++fi
 +
 +## ------------------------ ##
 +## Autoconf initialization. ##
@@ -1022,7 +1097,7 @@
 +	ac_retval=1
 +fi
 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  return $ac_retval
++  as_fn_set_status $ac_retval
 +
 +} # ac_fn_c_try_compile
 +
@@ -1059,7 +1134,7 @@
 +    ac_retval=1
 +fi
 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  return $ac_retval
++  as_fn_set_status $ac_retval
 +
 +} # ac_fn_c_try_cpp
 +
@@ -1101,7 +1176,7 @@
 +fi
 +  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  return $ac_retval
++  as_fn_set_status $ac_retval
 +
 +} # ac_fn_c_try_run
 +
@@ -1264,14 +1339,14 @@
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_retval=1
-+fi
+ fi
 +  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
 +  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
 +  # interfere with the next link command; also delete a directory that is
 +  # left behind by Apple's compiler.  We do this before executing the actions.
 +  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  return $ac_retval
++  as_fn_set_status $ac_retval
 +
 +} # ac_fn_c_try_link
 +
@@ -1291,20 +1366,77 @@
 +/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
 +   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 +#define $2 innocuous_$2
-+
+ 
+-if test "$ac_init_help" = "recursive"; then
+-  # If there are subdirs, report their specific --help.
+-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+-    test -d "$ac_dir" ||
+-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+-      continue
+-    ac_builddir=.
+-
+-case "$ac_dir" in
+-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+-*)
+-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+-  # A ".." for each directory in $ac_dir_suffix.
+-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+-  case $ac_top_builddir_sub in
+-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+-  esac ;;
+-esac
+-ac_abs_top_builddir=$ac_pwd
+-ac_abs_builddir=$ac_pwd$ac_dir_suffix
+-# for backward compatibility:
+-ac_top_builddir=$ac_top_build_prefix
 +/* System header to define __stub macros and hopefully few prototypes,
 +    which can conflict with char $2 (); below.
 +    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 +    <limits.h> exists even on freestanding compilers.  */
-+
+ 
+-case $srcdir in
+-  .)  # We are building in place.
+-    ac_srcdir=.
+-    ac_top_srcdir=$ac_top_builddir_sub
+-    ac_abs_top_srcdir=$ac_pwd ;;
+-  [\\/]* | ?:[\\/]* )  # Absolute name.
+-    ac_srcdir=$srcdir$ac_dir_suffix;
+-    ac_top_srcdir=$srcdir
+-    ac_abs_top_srcdir=$srcdir ;;
+-  *) # Relative name.
+-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+-    ac_top_srcdir=$ac_top_build_prefix$srcdir
+-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+-esac
+-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 +#ifdef __STDC__
 +# include <limits.h>
 +#else
 +# include <assert.h>
 +#endif
-+
+ 
+-    cd "$ac_dir" || { ac_status=$?; continue; }
+-    # Check for guested configure.
+-    if test -f "$ac_srcdir/configure.gnu"; then
+-      echo &&
+-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+-    elif test -f "$ac_srcdir/configure"; then
+-      echo &&
+-      $SHELL "$ac_srcdir/configure" --help=recursive
+-    else
+-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+-    fi || ac_status=$?
+-    cd "$ac_pwd" || { ac_status=$?; break; }
+-  done
+-fi
 +#undef $2
-+
+ 
+-test -n "$ac_init_help" && exit $ac_status
+-if $ac_init_version; then
+-  cat <<\_ACEOF
+-pessulus configure 2.30.0
+-generated by GNU Autoconf 2.63
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
@@ -1318,7 +1450,11 @@
 +#if defined __stub_$2 || defined __stub___$2
 +choke me
 +#endif
-+
+ 
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+-This configure script is free software; the Free Software Foundation
+-gives unlimited permission to copy, distribute and modify it.
 +int
 +main ()
 +{
@@ -1326,12 +1462,13 @@
 +  ;
 +  return 0;
 +}
-+_ACEOF
+ _ACEOF
+-  exit
 +if ac_fn_c_try_link "$LINENO"; then :
 +  eval "$3=yes"
 +else
 +  eval "$3=no"
-+fi
+ fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +fi
@@ -1345,13 +1482,13 @@
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  
- It was created by pessulus $as_me 2.28.0, which was
+ It was created by pessulus $as_me 2.30.0, which was
 -generated by GNU Autoconf 2.63.  Invocation command line was
-+generated by GNU Autoconf 2.64.  Invocation command line was
++generated by GNU Autoconf 2.65.  Invocation command line was
  
    $ $0 $@
  
-@@ -1575,8 +1866,8 @@
+@@ -1575,8 +1869,8 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -1362,7 +1499,7 @@
  IFS=$as_save_IFS
  
  } >&5
-@@ -1613,9 +1904,9 @@
+@@ -1613,9 +1907,9 @@
        ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
@@ -1374,7 +1511,7 @@
        if test $ac_must_keep_next = true; then
  	ac_must_keep_next=false # Got value, back to normal.
        else
-@@ -1631,13 +1922,13 @@
+@@ -1631,13 +1925,13 @@
  	  -* ) ac_must_keep_next=true ;;
  	esac
        fi
@@ -1391,7 +1528,7 @@
  
  # When interrupted or exit'd, cleanup temporary files, and complete
  # config.log.  We remove comments because anyway the quotes in there
-@@ -1662,13 +1953,13 @@
+@@ -1662,13 +1956,13 @@
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
@@ -1407,7 +1544,7 @@
        esac ;;
      esac
    done
-@@ -1740,39 +2031,41 @@
+@@ -1740,39 +2034,41 @@
      exit $exit_status
  ' 0
  for ac_signal in 1 2 13 15; do
@@ -1454,25 +1591,33 @@
  
  # Let the site file select an alternate cache file if it wants to.
  # Prefer an explicitly selected file to automatically selected ones.
-@@ -1791,7 +2084,7 @@
+@@ -1790,8 +2086,8 @@
+ for ac_site_file in "$ac_site_file1" "$ac_site_file2"
  do
    test "x$ac_site_file" = xNONE && continue
-   if test -r "$ac_site_file"; then
+-  if test -r "$ac_site_file"; then
 -    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
++  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
  $as_echo "$as_me: loading site script $ac_site_file" >&6;}
      sed 's/^/| /' "$ac_site_file" >&5
      . "$ac_site_file"
-@@ -1802,7 +2095,7 @@
-   # Some versions of bash will fail to source /dev/null (special
-   # files actually), so we avoid doing that.
-   if test -f "$cache_file"; then
+@@ -1799,10 +2095,10 @@
+ done
+ 
+ if test -r "$cache_file"; then
+-  # Some versions of bash will fail to source /dev/null (special
+-  # files actually), so we avoid doing that.
+-  if test -f "$cache_file"; then
 -    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
++  # Some versions of bash will fail to source /dev/null (special files
++  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
++  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
  $as_echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
        [\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -1810,7 +2103,7 @@
+@@ -1810,7 +2106,7 @@
      esac
    fi
  else
@@ -1481,7 +1626,7 @@
  $as_echo "$as_me: creating cache $cache_file" >&6;}
    >$cache_file
  fi
-@@ -1825,11 +2118,11 @@
+@@ -1825,11 +2121,11 @@
    eval ac_new_val=\$ac_env_${ac_var}_value
    case $ac_old_set,$ac_new_set in
      set,)
@@ -1495,7 +1640,7 @@
  $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
        ac_cache_corrupted=: ;;
      ,);;
-@@ -1839,17 +2132,17 @@
+@@ -1839,17 +2135,17 @@
  	ac_old_val_w=`echo x $ac_old_val`
  	ac_new_val_w=`echo x $ac_new_val`
  	if test "$ac_old_val_w" != "$ac_new_val_w"; then
@@ -1517,7 +1662,7 @@
  $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
        fi;;
    esac
-@@ -1861,43 +2154,20 @@
+@@ -1861,43 +2157,20 @@
      esac
      case " $ac_configure_args " in
        *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
@@ -1568,7 +1713,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -1911,24 +2181,16 @@
+@@ -1911,24 +2184,16 @@
  
  ac_aux_dir=
  for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -1601,7 +1746,7 @@
  fi
  
  # These three variables are undocumented and unsupported,
-@@ -1954,10 +2216,10 @@
+@@ -1954,10 +2219,10 @@
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
  # Reject install programs that cannot install multiple files.
@@ -1614,7 +1759,7 @@
    $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -1965,11 +2227,11 @@
+@@ -1965,11 +2230,11 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -1630,7 +1775,7 @@
    /usr/ucb/* ) ;;
    *)
      # OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2006,7 +2268,7 @@
+@@ -2006,7 +2271,7 @@
      ;;
  esac
  
@@ -1639,7 +1784,7 @@
  IFS=$as_save_IFS
  
  rm -rf conftest.one conftest.two conftest.dir
-@@ -2022,7 +2284,7 @@
+@@ -2022,7 +2287,7 @@
      INSTALL=$ac_install_sh
    fi
  fi
@@ -1648,7 +1793,7 @@
  $as_echo "$INSTALL" >&6; }
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2033,7 +2295,7 @@
+@@ -2033,7 +2298,7 @@
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
@@ -1657,7 +1802,7 @@
  $as_echo_n "checking whether build environment is sane... " >&6; }
  # Just in case
  sleep 1
-@@ -2044,15 +2306,11 @@
+@@ -2044,15 +2309,11 @@
  '
  case `pwd` in
    *[\\\"\#\$\&\'\`$am_lf]*)
@@ -1675,7 +1820,7 @@
  esac
  
  # Do `set' in a subshell so we don't clobber the current shell's
-@@ -2074,11 +2332,8 @@
+@@ -2074,11 +2335,8 @@
        # if, for instance, CONFIG_SHELL is bash and it inherits a
        # broken ls alias from the environment.  This has actually
        # happened.  Such a system could not be considered "sane".
@@ -1689,7 +1834,7 @@
     fi
  
     test "$2" = conftest.file
-@@ -2087,13 +2342,10 @@
+@@ -2087,13 +2345,10 @@
     # Ok.
     :
  else
@@ -1706,7 +1851,7 @@
  $as_echo "yes" >&6; }
  test "$program_prefix" != NONE &&
    program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2121,7 +2373,7 @@
+@@ -2121,7 +2376,7 @@
    am_missing_run="$MISSING --run "
  else
    am_missing_run=
@@ -1715,7 +1860,7 @@
  $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
  fi
  
-@@ -2142,9 +2394,9 @@
+@@ -2142,9 +2397,9 @@
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -1727,7 +1872,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$STRIP"; then
-@@ -2155,24 +2407,24 @@
+@@ -2155,24 +2410,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -1757,7 +1902,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2182,9 +2434,9 @@
+@@ -2182,9 +2437,9 @@
    ac_ct_STRIP=$STRIP
    # Extract the first word of "strip", so it can be a program name with args.
  set dummy strip; ac_word=$2
@@ -1769,7 +1914,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_STRIP"; then
-@@ -2195,24 +2447,24 @@
+@@ -2195,24 +2450,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -1799,7 +1944,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2221,7 +2473,7 @@
+@@ -2221,7 +2476,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -1808,7 +1953,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -2234,10 +2486,10 @@
+@@ -2234,10 +2489,10 @@
  fi
  INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
  
@@ -1821,7 +1966,7 @@
    $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2245,7 +2497,7 @@
+@@ -2245,7 +2500,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -1830,7 +1975,7 @@
  	 for ac_exec_ext in '' $ac_executable_extensions; do
  	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
  	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-@@ -2257,7 +2509,7 @@
+@@ -2257,11 +2512,12 @@
  	   esac
  	 done
         done
@@ -1839,7 +1984,16 @@
  IFS=$as_save_IFS
  
  fi
-@@ -2273,7 +2525,7 @@
+ 
++  test -d ./--version && rmdir ./--version
+   if test "${ac_cv_path_mkdir+set}" = set; then
+     MKDIR_P="$ac_cv_path_mkdir -p"
+   else
+@@ -2269,11 +2525,10 @@
+     # value for MKDIR_P within a source directory, because that will
+     # break other packages using the cache if that directory is
+     # removed, or if the value is a relative name.
+-    test -d ./--version && rmdir ./--version
      MKDIR_P="$ac_install_sh -d"
    fi
  fi
@@ -1848,7 +2002,7 @@
  $as_echo "$MKDIR_P" >&6; }
  
  mkdir_p="$MKDIR_P"
-@@ -2286,9 +2538,9 @@
+@@ -2286,9 +2541,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -1860,7 +2014,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$AWK"; then
-@@ -2299,24 +2551,24 @@
+@@ -2299,24 +2554,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -1890,7 +2044,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2324,11 +2576,11 @@
+@@ -2324,11 +2579,11 @@
    test -n "$AWK" && break
  done
  
@@ -1904,7 +2058,7 @@
    $as_echo_n "(cached) " >&6
  else
    cat >conftest.make <<\_ACEOF
-@@ -2346,11 +2598,11 @@
+@@ -2346,11 +2601,11 @@
  rm -f conftest.make
  fi
  if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -1918,7 +2072,7 @@
  $as_echo "no" >&6; }
    SET_MAKE="MAKE=${MAKE-make}"
  fi
-@@ -2370,9 +2622,7 @@
+@@ -2370,9 +2625,7 @@
    am__isrc=' -I$(srcdir)'
    # test to see if srcdir already configured
    if test -f $srcdir/config.status; then
@@ -1929,7 +2083,7 @@
    fi
  fi
  
-@@ -2429,7 +2679,7 @@
+@@ -2429,281 +2682,45 @@
  
  
  # Check whether --enable-silent-rules was given.
@@ -1938,30 +2092,42 @@
    enableval=$enable_silent_rules;
  fi
  
-@@ -2443,16 +2693,16 @@
- 
- 
- 
+-case $enable_silent_rules in
+-yes) AM_DEFAULT_VERBOSITY=0;;
+-no)  AM_DEFAULT_VERBOSITY=1;;
+-*)   AM_DEFAULT_VERBOSITY=0;;
+-esac
+-AM_BACKSLASH='\'
+-
+-
+-
+-
 -{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
- $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-     # Check whether --enable-maintainer-mode was given.
+-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+-    # Check whether --enable-maintainer-mode was given.
 -if test "${enable_maintainer_mode+set}" = set; then
-+if test "${enable_maintainer_mode+set}" = set; then :
-   enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
- else
-   USE_MAINTAINER_MODE=no
- fi
- 
+-  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+-else
+-  USE_MAINTAINER_MODE=no
+-fi
+-
 -  { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
- $as_echo "$USE_MAINTAINER_MODE" >&6; }
-    if test $USE_MAINTAINER_MODE = yes; then
-   MAINTAINER_MODE_TRUE=
-@@ -2469,242 +2719,6 @@
- ACLOCAL_AMFLAGS="$ACLOCAL_FLAGS"
- 
- 
+-$as_echo "$USE_MAINTAINER_MODE" >&6; }
+-   if test $USE_MAINTAINER_MODE = yes; then
+-  MAINTAINER_MODE_TRUE=
+-  MAINTAINER_MODE_FALSE='#'
+-else
+-  MAINTAINER_MODE_TRUE='#'
+-  MAINTAINER_MODE_FALSE=
+-fi
+-
+-  MAINT=$MAINTAINER_MODE_TRUE
+-
+-
+-
+-ACLOCAL_AMFLAGS="$ACLOCAL_FLAGS"
+-
+-
 -
 -
 -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
@@ -2121,16 +2287,28 @@
 - else
 -    pkg_failed=untried
 -fi
--
--
--
++case $enable_silent_rules in
++yes) AM_DEFAULT_VERBOSITY=0;;
++no)  AM_DEFAULT_VERBOSITY=1;;
++*)   AM_DEFAULT_VERBOSITY=0;;
++esac
++AM_BACKSLASH='\'
+ 
+ 
+ 
 -if test $pkg_failed = yes; then
--
+ 
 -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 -        _pkg_short_errors_supported=yes
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
++$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
++    # Check whether --enable-maintainer-mode was given.
++if test "${enable_maintainer_mode+set}" = set; then :
++  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+ else
 -        _pkg_short_errors_supported=no
--fi
++  USE_MAINTAINER_MODE=no
+ fi
 -        if test $_pkg_short_errors_supported = yes; then
 -	        PESSULUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pygtk-2.0 >= 2.13.0		\
 -		  gnome-python-desktop-2.0 >= 2.17.2" 2>&1`
@@ -2140,12 +2318,26 @@
 -        fi
 -	# Put the nasty error message in config.log where it belongs
 -	echo "$PESSULUS_PKG_ERRORS" >&5
--
+ 
 -	{ { $as_echo "$as_me:$LINENO: error: Package requirements (pygtk-2.0 >= 2.13.0		\
 -		  gnome-python-desktop-2.0 >= 2.17.2) were not met:
--
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
++$as_echo "$USE_MAINTAINER_MODE" >&6; }
++   if test $USE_MAINTAINER_MODE = yes; then
++  MAINTAINER_MODE_TRUE=
++  MAINTAINER_MODE_FALSE='#'
++else
++  MAINTAINER_MODE_TRUE='#'
++  MAINTAINER_MODE_FALSE=
++fi
+ 
 -$PESSULUS_PKG_ERRORS
--
++  MAINT=$MAINTAINER_MODE_TRUE
++
++
++
++ACLOCAL_AMFLAGS="$ACLOCAL_FLAGS"
+ 
 -Consider adjusting the PKG_CONFIG_PATH environment variable if you
 -installed software in a non-standard prefix.
 -
@@ -2197,11 +2389,10 @@
 -$as_echo "yes" >&6; }
 -	:
 -fi
--
+ 
  GETTEXT_PACKAGE=pessulus
  
- 
-@@ -2724,7 +2738,7 @@
+@@ -2724,7 +2741,7 @@
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
@@ -2210,7 +2401,7 @@
  $as_echo_n "checking for style of include used by $am_make... " >&6; }
  am__include="#"
  am__quote=
-@@ -2752,12 +2766,12 @@
+@@ -2752,12 +2769,12 @@
  fi
  
  
@@ -2225,7 +2416,7 @@
    enableval=$enable_dependency_tracking;
  fi
  
-@@ -2782,9 +2796,9 @@
+@@ -2782,9 +2799,9 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -2237,7 +2428,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -2795,24 +2809,24 @@
+@@ -2795,24 +2812,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2267,7 +2458,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2822,9 +2836,9 @@
+@@ -2822,9 +2839,9 @@
    ac_ct_CC=$CC
    # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
@@ -2279,7 +2470,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -2835,24 +2849,24 @@
+@@ -2835,24 +2852,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2309,7 +2500,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2861,7 +2875,7 @@
+@@ -2861,7 +2878,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -2318,7 +2509,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -2875,9 +2889,9 @@
+@@ -2875,9 +2892,9 @@
            if test -n "$ac_tool_prefix"; then
      # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -2330,7 +2521,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -2888,24 +2902,24 @@
+@@ -2888,24 +2905,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2360,7 +2551,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2915,9 +2929,9 @@
+@@ -2915,9 +2932,9 @@
  if test -z "$CC"; then
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
@@ -2372,7 +2563,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -2929,18 +2943,18 @@
+@@ -2929,18 +2946,18 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2394,7 +2585,7 @@
  IFS=$as_save_IFS
  
  if test $ac_prog_rejected = yes; then
-@@ -2959,10 +2973,10 @@
+@@ -2959,10 +2976,10 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -2407,7 +2598,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2974,9 +2988,9 @@
+@@ -2974,9 +2991,9 @@
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -2419,7 +2610,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -2987,24 +3001,24 @@
+@@ -2987,24 +3004,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2449,7 +2640,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3018,9 +3032,9 @@
+@@ -3018,9 +3035,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -2461,7 +2652,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -3031,24 +3045,24 @@
+@@ -3031,24 +3048,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2491,7 +2682,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3061,7 +3075,7 @@
+@@ -3061,7 +3078,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -2500,7 +2691,7 @@
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -3072,73 +3086,55 @@
+@@ -3072,57 +3089,37 @@
  fi
  
  
@@ -2564,8 +2755,8 @@
 +... rest of stderr output deleted ...
 +         10q' conftest.err >conftest.er1
 +    cat conftest.er1 >&5
-+    rm -f conftest.er1 conftest.err
 +  fi
++  rm -f conftest.er1 conftest.err
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }
 +done
@@ -2577,30 +2768,20 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
--
-+#include <stdio.h>
+ 
  int
- main ()
- {
-+FILE *f = fopen ("conftest.out", "w");
-+ return ferror (f) || fclose (f) != 0;
- 
-   ;
-   return 0;
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
+@@ -3138,8 +3135,8 @@
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
 -{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
- $as_echo_n "checking for C compiler default output file name... " >&6; }
+-$as_echo_n "checking for C compiler default output file name... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
++$as_echo_n "checking whether the C compiler works... " >&6; }
  ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
  
-@@ -3155,17 +3151,17 @@
+ # The possible output files:
+@@ -3155,17 +3152,17 @@
  done
  rm -f $ac_rmfiles
  
@@ -2623,7 +2804,7 @@
    # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
  # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
  # in a Makefile.  We should not override ac_cv_exeext if it was cached,
-@@ -3182,7 +3178,7 @@
+@@ -3182,7 +3179,7 @@
  	# certainly right.
  	break;;
      *.* )
@@ -2632,17 +2813,19 @@
  	then :; else
  	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
  	fi
-@@ -3201,84 +3197,75 @@
+@@ -3201,84 +3198,42 @@
  else
    ac_file=''
  fi
 -
 -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
- $as_echo "$ac_file" >&6; }
+-$as_echo "$ac_file" >&6; }
 -if test -z "$ac_file"; then
+-  $as_echo "$as_me: failed program was:" >&5
 +if test -z "$ac_file"; then :
-   $as_echo "$as_me: failed program was:" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++$as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
@@ -2656,70 +2839,64 @@
 +{ as_fn_set_status 77
 +as_fn_error "C compiler cannot create executables
 +See \`config.log' for more details." "$LINENO" 5; }; }
- fi
--
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
+ fi
+-
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
++$as_echo_n "checking for C compiler default output file name... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
++$as_echo "$ac_file" >&6; }
  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.
+-# Check that the compiler produces executables we can run.  If not, either
+-# the compiler is broken, or we cross compile.
 -{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
- $as_echo_n "checking whether the C compiler works... " >&6; }
+-$as_echo_n "checking whether the C compiler works... " >&6; }
 -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
-   if { ac_try='./$ac_file'
+-# If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
+-  if { ac_try='./$ac_file'
 -  { (case "(($ac_try" in
-+  { { case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; }; then
-     cross_compiling=no
-   else
-     if test "$cross_compiling" = maybe; then
- 	cross_compiling=yes
-     else
+-    cross_compiling=no
+-  else
+-    if test "$cross_compiling" = maybe; then
+-	cross_compiling=yes
+-    else
 -	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 -{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
-+as_fn_error "cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
+-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; }; }; }
-+See \`config.log' for more details." "$LINENO" 5; }
-     fi
-   fi
- fi
+-    fi
+-  fi
+-fi
 -{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 
--rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
+-$as_echo "yes" >&6; }
+-
+ rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
  ac_clean_files=$ac_clean_files_save
- # Check that the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
+-# Check that the compiler produces executables we can run.  If not, either
+-# the compiler is broken, or we cross compile.
 -{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
- $as_echo_n "checking whether we are cross compiling... " >&6; }
+-$as_echo_n "checking whether we are cross compiling... " >&6; }
 -{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
- $as_echo "$cross_compiling" >&6; }
- 
+-$as_echo "$cross_compiling" >&6; }
+-
 -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
  $as_echo_n "checking for suffix of executables... " >&6; }
@@ -2742,7 +2919,7 @@
    # If both `conftest.exe' and `conftest' are `present' (well, observable)
  # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
  # work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3293,32 +3280,24 @@
+@@ -3293,32 +3248,83 @@
    esac
  done
  else
@@ -2758,8 +2935,9 @@
 +See \`config.log' for more details." "$LINENO" 5; }
  fi
 -
- rm -f conftest$ac_cv_exeext
+-rm -f conftest$ac_cv_exeext
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
++rm -f conftest conftest$ac_cv_exeext
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
  $as_echo "$ac_cv_exeext" >&6; }
  
@@ -2767,6 +2945,65 @@
  EXEEXT=$ac_cv_exeext
  ac_exeext=$EXEEXT
 -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <stdio.h>
++int
++main ()
++{
++FILE *f = fopen ("conftest.out", "w");
++ return ferror (f) || fclose (f) != 0;
++
++  ;
++  return 0;
++}
++_ACEOF
++ac_clean_files="$ac_clean_files conftest.out"
++# Check that the compiler produces executables we can run.  If not, either
++# the compiler is broken, or we cross compile.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
++$as_echo_n "checking whether we are cross compiling... " >&6; }
++if test "$cross_compiling" != yes; then
++  { { ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_link") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }
++  if { ac_try='./conftest$ac_cv_exeext'
++  { { case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; }; then
++    cross_compiling=no
++  else
++    if test "$cross_compiling" = maybe; then
++	cross_compiling=yes
++    else
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "cannot run C compiled programs.
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." "$LINENO" 5; }
++    fi
++  fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
++$as_echo "$cross_compiling" >&6; }
++
++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
++ac_clean_files=$ac_clean_files_save
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
  $as_echo_n "checking for suffix of object files... " >&6; }
 -if test "${ac_cv_objext+set}" = set; then
@@ -2782,7 +3019,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3330,17 +3309,17 @@
+@@ -3330,17 +3336,17 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -2805,7 +3042,7 @@
    for ac_file in conftest.o conftest.obj conftest.*; do
    test -f "$ac_file" || continue;
    case $ac_file in
-@@ -3353,31 +3332,23 @@
+@@ -3353,31 +3359,23 @@
    $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -2844,7 +3081,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3391,37 +3362,16 @@
+@@ -3391,37 +3389,16 @@
    return 0;
  }
  _ACEOF
@@ -2885,7 +3122,7 @@
  $as_echo "$ac_cv_c_compiler_gnu" >&6; }
  if test $ac_compiler_gnu = yes; then
    GCC=yes
-@@ -3430,20 +3380,16 @@
+@@ -3430,20 +3407,16 @@
  fi
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
@@ -2909,7 +3146,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3454,35 +3400,11 @@
+@@ -3454,35 +3427,11 @@
    return 0;
  }
  _ACEOF
@@ -2948,7 +3185,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3493,36 +3415,12 @@
+@@ -3493,36 +3442,12 @@
    return 0;
  }
  _ACEOF
@@ -2989,7 +3226,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3533,42 +3431,17 @@
+@@ -3533,42 +3458,17 @@
    return 0;
  }
  _ACEOF
@@ -3034,7 +3271,7 @@
  $as_echo "$ac_cv_prog_cc_g" >&6; }
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
-@@ -3585,18 +3458,14 @@
+@@ -3585,18 +3485,14 @@
      CFLAGS=
    fi
  fi
@@ -3056,7 +3293,7 @@
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
-@@ -3653,32 +3522,9 @@
+@@ -3653,32 +3549,9 @@
  	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
  do
    CC="$ac_save_CC $ac_arg"
@@ -3090,7 +3327,7 @@
  rm -f core conftest.err conftest.$ac_objext
    test "x$ac_cv_prog_cc_c89" != "xno" && break
  done
-@@ -3689,17 +3535,19 @@
+@@ -3689,17 +3562,19 @@
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c89" in
    x)
@@ -3113,7 +3350,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -3709,9 +3557,9 @@
+@@ -3709,9 +3584,9 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -3125,7 +3362,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -3819,7 +3667,7 @@
+@@ -3819,7 +3694,7 @@
  fi
  
  fi
@@ -3134,7 +3371,7 @@
  $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
-@@ -3840,14 +3688,14 @@
+@@ -3840,14 +3715,14 @@
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -3151,7 +3388,7 @@
    $as_echo_n "(cached) " >&6
  else
        # Double quotes because CPP needs to be expanded
-@@ -3862,11 +3710,7 @@
+@@ -3862,11 +3737,7 @@
    # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
@@ -3164,7 +3401,7 @@
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-@@ -3875,78 +3719,34 @@
+@@ -3875,78 +3746,34 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -3248,7 +3485,7 @@
    break
  fi
  
-@@ -3958,7 +3758,7 @@
+@@ -3958,7 +3785,7 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -3257,7 +3494,7 @@
  $as_echo "$CPP" >&6; }
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
-@@ -3969,100 +3769,49 @@
+@@ -3969,100 +3796,49 @@
    # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
@@ -3266,7 +3503,8 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
@@ -3295,8 +3533,6 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
 +#ifdef __STDC__
 +# include <limits.h>
 +#else
@@ -3376,7 +3612,7 @@
  fi
  
  ac_ext=c
-@@ -4072,9 +3821,9 @@
+@@ -4072,9 +3848,9 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -3388,7 +3624,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$GREP"; then
-@@ -4085,7 +3834,7 @@
+@@ -4085,7 +3861,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3397,7 +3633,7 @@
      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
-@@ -4105,7 +3854,7 @@
+@@ -4105,7 +3881,7 @@
      $as_echo 'GREP' >> "conftest.nl"
      "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3406,7 +3642,7 @@
      if test $ac_count -gt ${ac_path_GREP_max-0}; then
        # Best one so far, save it but keep looking for a better one
        ac_cv_path_GREP="$ac_path_GREP"
-@@ -4120,26 +3869,24 @@
+@@ -4120,26 +3896,24 @@
        $ac_path_GREP_found && break 3
      done
    done
@@ -3438,7 +3674,7 @@
    $as_echo_n "(cached) " >&6
  else
    if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4153,7 +3900,7 @@
+@@ -4153,7 +3927,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3447,7 +3683,7 @@
      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
-@@ -4173,7 +3920,7 @@
+@@ -4173,7 +3947,7 @@
      $as_echo 'EGREP' >> "conftest.nl"
      "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3456,7 +3692,7 @@
      if test $ac_count -gt ${ac_path_EGREP_max-0}; then
        # Best one so far, save it but keep looking for a better one
        ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -4188,12 +3935,10 @@
+@@ -4188,12 +3962,10 @@
        $ac_path_EGREP_found && break 3
      done
    done
@@ -3471,7 +3707,7 @@
    fi
  else
    ac_cv_path_EGREP=$EGREP
-@@ -4201,21 +3946,17 @@
+@@ -4201,21 +3973,17 @@
  
     fi
  fi
@@ -3497,7 +3733,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -4230,48 +3971,23 @@
+@@ -4230,48 +3998,23 @@
    return 0;
  }
  _ACEOF
@@ -3551,7 +3787,7 @@
  else
    ac_cv_header_stdc=no
  fi
-@@ -4281,18 +3997,14 @@
+@@ -4281,18 +4024,14 @@
  
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -3573,7 +3809,7 @@
  else
    ac_cv_header_stdc=no
  fi
-@@ -4302,14 +4014,10 @@
+@@ -4302,14 +4041,10 @@
  
  if test $ac_cv_header_stdc = yes; then
    # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -3590,7 +3826,7 @@
  /* end confdefs.h.  */
  #include <ctype.h>
  #include <stdlib.h>
-@@ -4336,118 +4044,34 @@
+@@ -4336,118 +4071,34 @@
    return 0;
  }
  _ACEOF
@@ -3722,7 +3958,7 @@
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -4458,151 +4082,12 @@
+@@ -4458,151 +4109,12 @@
  
  
  
@@ -3879,7 +4115,7 @@
  _ACEOF
  
  fi
-@@ -4610,16 +4095,12 @@
+@@ -4610,16 +4122,12 @@
  done
  
      if test $ac_cv_header_locale_h = yes; then
@@ -3899,7 +4135,7 @@
  /* end confdefs.h.  */
  #include <locale.h>
  int
-@@ -4630,207 +4111,45 @@
+@@ -4630,207 +4138,45 @@
    return 0;
  }
  _ACEOF
@@ -4128,7 +4364,7 @@
  /* end confdefs.h.  */
  
  #include <libintl.h>
-@@ -4843,54 +4162,25 @@
+@@ -4843,54 +4189,25 @@
    return 0;
  }
  _ACEOF
@@ -4191,7 +4427,7 @@
  /* end confdefs.h.  */
  
  #include <libintl.h>
-@@ -4903,141 +4193,26 @@
+@@ -4903,141 +4220,26 @@
    return 0;
  }
  _ACEOF
@@ -4343,7 +4579,7 @@
  _ACEOF
  
  fi
-@@ -5052,18 +4227,14 @@
+@@ -5052,18 +4254,14 @@
  	 || test "$gt_cv_func_ngettext_libc" != "yes" \
           || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
  
@@ -4365,7 +4601,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -5081,55 +4252,26 @@
+@@ -5081,55 +4279,26 @@
    return 0;
  }
  _ACEOF
@@ -4430,7 +4666,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -5147,55 +4289,26 @@
+@@ -5147,55 +4316,26 @@
    return 0;
  }
  _ACEOF
@@ -4495,7 +4731,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -5213,43 +4326,18 @@
+@@ -5213,43 +4353,18 @@
    return 0;
  }
  _ACEOF
@@ -4545,7 +4781,7 @@
    gt_cv_func_dgettext_libintl=yes
  fi
  
-@@ -5259,22 +4347,18 @@
+@@ -5259,22 +4374,18 @@
  
  
  	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -4573,7 +4809,7 @@
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -5292,161 +4376,27 @@
+@@ -5292,161 +4403,27 @@
    return 0;
  }
  _ACEOF
@@ -4744,7 +4980,7 @@
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -5454,64 +4404,54 @@
+@@ -5454,64 +4431,54 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -4852,7 +5088,7 @@
  _ACEOF
  
  fi
-@@ -5541,15 +4481,13 @@
+@@ -5541,15 +4508,13 @@
  
        if test "$gt_cv_have_gettext" = "yes"; then
  
@@ -4871,7 +5107,7 @@
    $as_echo_n "(cached) " >&6
  else
    case "$MSGFMT" in
-@@ -5574,118 +4512,28 @@
+@@ -5574,118 +4539,28 @@
  fi
  MSGFMT="$ac_cv_path_MSGFMT"
  if test "$MSGFMT" != "no"; then
@@ -4998,7 +5234,7 @@
  $as_echo_n "checking if msgfmt accepts -c... " >&6; }
  	  cat >conftest.foo <<_ACEOF
  
-@@ -5700,14 +4548,14 @@
+@@ -5700,14 +4575,14 @@
  "Content-Transfer-Encoding: 8bit\n"
  
  _ACEOF
@@ -5018,7 +5254,7 @@
  $as_echo "no" >&6; }
  echo "$as_me: failed input was:" >&5
  sed 's/^/| /' conftest.foo >&5
-@@ -5715,9 +4563,9 @@
+@@ -5715,9 +4590,9 @@
  
  	  # Extract the first word of "gmsgfmt", so it can be a program name with args.
  set dummy gmsgfmt; ac_word=$2
@@ -5030,7 +5266,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GMSGFMT in
-@@ -5730,14 +4578,14 @@
+@@ -5730,14 +4605,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5048,7 +5284,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -5746,19 +4594,19 @@
+@@ -5746,19 +4621,19 @@
  fi
  GMSGFMT=$ac_cv_path_GMSGFMT
  if test -n "$GMSGFMT"; then
@@ -5072,7 +5308,7 @@
    $as_echo_n "(cached) " >&6
  else
    case "$XGETTEXT" in
-@@ -5783,18 +4631,14 @@
+@@ -5783,18 +4658,14 @@
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test "$XGETTEXT" != ":"; then
@@ -5094,7 +5330,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -5806,121 +4650,14 @@
+@@ -5806,121 +4677,14 @@
    return 0;
  }
  _ACEOF
@@ -5220,7 +5456,7 @@
    CATOBJEXT=.gmo
                 DATADIRNAME=share
  else
-@@ -5935,10 +4672,8 @@
+@@ -5935,10 +4699,8 @@
  	    ;;
  	    esac
  fi
@@ -5233,7 +5469,7 @@
            LIBS="$glib_save_LIBS"
  	  INSTOBJEXT=.mo
  	else
-@@ -5952,9 +4687,7 @@
+@@ -5952,9 +4714,7 @@
  
      if test "$gt_cv_have_gettext" = "yes" ; then
  
@@ -5244,7 +5480,7 @@
  
      fi
  
-@@ -5962,7 +4695,7 @@
+@@ -5962,7 +4722,7 @@
                    if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
          : ;
        else
@@ -5253,7 +5489,7 @@
  $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
          XGETTEXT=":"
        fi
-@@ -5995,7 +4728,7 @@
+@@ -5995,7 +4755,7 @@
       if test "x$ALL_LINGUAS" = "x"; then
         LINGUAS=
       else
@@ -5262,7 +5498,7 @@
  $as_echo_n "checking for catalogs to be installed... " >&6; }
         NEW_LINGUAS=
         for presentlang in $ALL_LINGUAS; do
-@@ -6020,7 +4753,7 @@
+@@ -6020,7 +4780,7 @@
           fi
         done
         LINGUAS=$NEW_LINGUAS
@@ -5271,7 +5507,7 @@
  $as_echo "$LINGUAS" >&6; }
       fi
  
-@@ -6053,16 +4786,16 @@
+@@ -6053,16 +4813,16 @@
  	< $srcdir/po/POTFILES.in > po/POTFILES
  
  
@@ -5291,7 +5527,7 @@
  $as_echo "$USE_NLS" >&6; }
  
  
-@@ -6070,35 +4803,31 @@
+@@ -6070,35 +4830,31 @@
  
  case "$am__api_version" in
      1.01234)
@@ -5333,7 +5569,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $INTLTOOL_UPDATE in
-@@ -6111,14 +4840,14 @@
+@@ -6111,14 +4867,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5351,7 +5587,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -6126,19 +4855,19 @@
+@@ -6126,19 +4882,19 @@
  fi
  INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
  if test -n "$INTLTOOL_UPDATE"; then
@@ -5375,7 +5611,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $INTLTOOL_MERGE in
-@@ -6151,14 +4880,14 @@
+@@ -6151,14 +4907,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5393,7 +5629,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -6166,19 +4895,19 @@
+@@ -6166,19 +4922,19 @@
  fi
  INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
  if test -n "$INTLTOOL_MERGE"; then
@@ -5417,7 +5653,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $INTLTOOL_EXTRACT in
-@@ -6191,14 +4920,14 @@
+@@ -6191,14 +4947,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5435,7 +5671,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -6206,18 +4935,16 @@
+@@ -6206,18 +4962,16 @@
  fi
  INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
  if test -n "$INTLTOOL_EXTRACT"; then
@@ -5457,7 +5693,7 @@
  fi
  
    INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -6263,9 +4990,9 @@
+@@ -6339,9 +5093,9 @@
  # Check the gettext tools to make sure they are GNU
  # Extract the first word of "xgettext", so it can be a program name with args.
  set dummy xgettext; ac_word=$2
@@ -5469,7 +5705,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $XGETTEXT in
-@@ -6278,14 +5005,14 @@
+@@ -6354,14 +5108,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5487,7 +5723,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -6293,19 +5020,19 @@
+@@ -6369,19 +5123,19 @@
  fi
  XGETTEXT=$ac_cv_path_XGETTEXT
  if test -n "$XGETTEXT"; then
@@ -5511,7 +5747,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $MSGMERGE in
-@@ -6318,14 +5045,14 @@
+@@ -6394,14 +5148,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5529,7 +5765,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -6333,19 +5060,19 @@
+@@ -6409,19 +5163,19 @@
  fi
  MSGMERGE=$ac_cv_path_MSGMERGE
  if test -n "$MSGMERGE"; then
@@ -5553,7 +5789,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $MSGFMT in
-@@ -6358,14 +5085,14 @@
+@@ -6434,14 +5188,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5571,7 +5807,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -6373,19 +5100,19 @@
+@@ -6449,19 +5203,19 @@
  fi
  MSGFMT=$ac_cv_path_MSGFMT
  if test -n "$MSGFMT"; then
@@ -5595,7 +5831,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GMSGFMT in
-@@ -6398,14 +5125,14 @@
+@@ -6474,14 +5228,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5613,7 +5849,7 @@
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -6414,33 +5141,29 @@
+@@ -6490,33 +5244,29 @@
  fi
  GMSGFMT=$ac_cv_path_GMSGFMT
  if test -n "$GMSGFMT"; then
@@ -5653,7 +5889,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $INTLTOOL_PERL in
-@@ -6453,14 +5176,14 @@
+@@ -6529,14 +5279,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5671,7 +5907,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -6468,173 +5191,56 @@
+@@ -6544,180 +5294,63 @@
  fi
  INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
  if test -n "$INTLTOOL_PERL"; then
@@ -5686,16 +5922,25 @@
  
  
  if test -z "$INTLTOOL_PERL"; then
--   { { $as_echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
--$as_echo "$as_me: error: perl not found; required for intltool" >&2;}
+-   { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
+-$as_echo "$as_me: error: perl not found" >&2;}
 -   { (exit 1); exit 1; }; }
-+   as_fn_error "perl not found; required for intltool" "$LINENO" 5
- fi
- if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
--   { { $as_echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
--$as_echo "$as_me: error: perl 5.x required for intltool" >&2;}
++   as_fn_error "perl not found" "$LINENO" 5
+ fi
+-{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
+ $as_echo_n "checking for perl >= 5.8.1... " >&6; }
+ $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+ if test $? -ne 0; then
+-   { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
+-$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
 -   { (exit 1); exit 1; }; }
-+   as_fn_error "perl 5.x required for intltool" "$LINENO" 5
++   as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
+ else
+    IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+-   { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
++   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
+ $as_echo "$IT_PERL_VERSION" >&6; }
  fi
  if test "x" != "xno-xml"; then
 -   { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
@@ -5873,7 +6118,7 @@
    DATADIRNAME=share
  else
    DATADIRNAME=lib
-@@ -6646,10 +5252,8 @@
+@@ -6729,10 +5362,8 @@
      ;;
      esac
  fi
@@ -5886,7 +6131,7 @@
  fi
  
  
-@@ -6666,9 +5270,9 @@
+@@ -6749,9 +5380,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -5898,7 +6143,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $PYTHON in
-@@ -6681,14 +5285,14 @@
+@@ -6764,14 +5395,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5916,7 +6161,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -6696,10 +5300,10 @@
+@@ -6779,10 +5410,10 @@
  fi
  PYTHON=$ac_cv_path_PYTHON
  if test -n "$PYTHON"; then
@@ -5929,7 +6174,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6713,20 +5317,18 @@
+@@ -6796,20 +5427,18 @@
  
  
    if test "$PYTHON" = :; then
@@ -5954,7 +6199,7 @@
  $as_echo "$am_cv_python_version" >&6; }
    PYTHON_VERSION=$am_cv_python_version
  
-@@ -6738,23 +5340,23 @@
+@@ -6821,23 +5450,23 @@
  
  
  
@@ -5983,7 +6228,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test "x$prefix" = xNONE
-@@ -6773,7 +5375,7 @@
+@@ -6856,7 +5485,7 @@
       esac
  
  fi
@@ -5992,7 +6237,7 @@
  $as_echo "$am_cv_python_pythondir" >&6; }
    pythondir=$am_cv_python_pythondir
  
-@@ -6782,9 +5384,9 @@
+@@ -6865,9 +5494,9 @@
    pkgpythondir=\${pythondir}/$PACKAGE
  
  
@@ -6004,7 +6249,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test "x$exec_prefix" = xNONE
-@@ -6803,7 +5405,7 @@
+@@ -6886,7 +5515,7 @@
       esac
  
  fi
@@ -6013,7 +6258,7 @@
  $as_echo "$am_cv_python_pyexecdir" >&6; }
    pyexecdir=$am_cv_python_pyexecdir
  
-@@ -6818,9 +5420,9 @@
+@@ -6901,9 +5530,9 @@
  
  # Extract the first word of "gconftool-2", so it can be a program name with args.
  set dummy gconftool-2; ac_word=$2
@@ -6025,7 +6270,7 @@
    $as_echo_n "(cached) " >&6
  else
    case $GCONFTOOL in
-@@ -6833,14 +5435,14 @@
+@@ -6916,14 +5545,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -6043,7 +6288,7 @@
  IFS=$as_save_IFS
  
    ;;
-@@ -6848,10 +5450,10 @@
+@@ -6931,10 +5560,10 @@
  fi
  GCONFTOOL=$ac_cv_path_GCONFTOOL
  if test -n "$GCONFTOOL"; then
@@ -6056,7 +6301,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -6861,7 +5463,7 @@
+@@ -6944,7 +5573,7 @@
  GCONF_MANDATORY_SOURCE=`echo $GCONF_DEFAULTS_SOURCE | sed -e s/gconf.xml.defaults/gconf.xml.mandatory/`
  
  # Check whether --with-gconf-mandatory-source was given.
@@ -6065,7 +6310,7 @@
    withval=$with_gconf_mandatory_source; GCONF_MANDATORY_SOURCE="$withval"
  fi
  
-@@ -6870,7 +5472,7 @@
+@@ -6953,7 +5582,7 @@
  #define GCONF_MANDATORY_SOURCE "$GCONF_MANDATORY_SOURCE"
  _ACEOF
  
@@ -6074,7 +6319,7 @@
  $as_echo "Using config source $GCONF_MANDATORY_SOURCE for mandatory values" >&6; }
  
  
-@@ -6906,13 +5508,13 @@
+@@ -6989,13 +5618,13 @@
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
@@ -6090,7 +6335,7 @@
        esac ;;
      esac
    done
-@@ -6920,8 +5522,8 @@
+@@ -7003,8 +5632,8 @@
    (set) 2>&1 |
      case $as_nl`(ac_space=' '; set) 2>&1` in #(
      *${as_nl}ac_space=\ *)
@@ -6101,7 +6346,7 @@
        sed -n \
  	"s/'/'\\\\''/g;
  	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -6944,11 +5546,11 @@
+@@ -7027,11 +5656,11 @@
  if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
    if test -w "$cache_file"; then
      test "x$cache_file" != "x/dev/null" &&
@@ -6115,7 +6360,7 @@
  $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
    fi
  fi
-@@ -7004,8 +5606,8 @@
+@@ -7087,8 +5716,8 @@
    ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
    # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
    #    will be set to the directory where LIBOBJS objects are built.
@@ -6126,7 +6371,7 @@
  done
  LIBOBJS=$ac_libobjs
  
-@@ -7021,25 +5623,16 @@
+@@ -7104,25 +5733,16 @@
  fi
  
  if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -6158,7 +6403,7 @@
  fi
  
    ac_config_commands="$ac_config_commands po/stamp-it"
-@@ -7050,9 +5643,10 @@
+@@ -7133,9 +5753,10 @@
  ac_write_fail=0
  ac_clean_files_save=$ac_clean_files
  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -6171,7 +6416,7 @@
  #! $SHELL
  # Generated by $as_me.
  # Run this file to recreate the current configuration.
-@@ -7062,17 +5656,18 @@
+@@ -7145,17 +5766,18 @@
  debug=false
  ac_cs_recheck=false
  ac_cs_silent=false
@@ -6197,7 +6442,7 @@
    emulate sh
    NULLCMD=:
    # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -7080,23 +5675,15 @@
+@@ -7163,23 +5785,15 @@
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
  else
@@ -6226,7 +6471,7 @@
  as_nl='
  '
  export as_nl
-@@ -7104,7 +5691,13 @@
+@@ -7187,7 +5801,13 @@
  as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
  as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
  as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -6241,7 +6486,7 @@
    as_echo='printf %s\n'
    as_echo_n='printf %s'
  else
-@@ -7115,7 +5708,7 @@
+@@ -7198,7 +5818,7 @@
      as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
      as_echo_n_body='eval
        arg=$1;
@@ -6250,7 +6495,7 @@
        *"$as_nl"*)
  	expr "X$arg" : "X\\(.*\\)$as_nl";
  	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -7138,13 +5731,6 @@
+@@ -7221,13 +5841,6 @@
    }
  fi
  
@@ -6264,7 +6509,7 @@
  
  # IFS
  # We need space, tab and new line, in precisely that order.  Quoting is
-@@ -7154,15 +5740,15 @@
+@@ -7237,15 +5850,15 @@
  IFS=" ""	$as_nl"
  
  # Find who we are.  Look in the path if we contain no directory separator.
@@ -6283,7 +6528,7 @@
  IFS=$as_save_IFS
  
       ;;
-@@ -7174,12 +5760,16 @@
+@@ -7257,12 +5870,16 @@
  fi
  if test ! -f "$as_myself"; then
    $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -6304,7 +6549,7 @@
  done
  PS1='$ '
  PS2='> '
-@@ -7191,7 +5781,89 @@
+@@ -7274,7 +5891,89 @@
  LANGUAGE=C
  export LANGUAGE
  
@@ -6395,7 +6640,7 @@
  if expr a : '\(a\)' >/dev/null 2>&1 &&
     test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
-@@ -7205,8 +5877,12 @@
+@@ -7288,8 +5987,12 @@
    as_basename=false
  fi
  
@@ -6409,7 +6654,7 @@
  as_me=`$as_basename -- "$0" ||
  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
  	 X"$0" : 'X\(//\)$' \| \
-@@ -7226,76 +5902,25 @@
+@@ -7309,76 +6012,25 @@
  	  }
  	  s/.*/./; q'`
  
@@ -6497,7 +6742,7 @@
  
  rm -f conf$$ conf$$.exe conf$$.file
  if test -d conf$$.dir; then
-@@ -7324,8 +5949,56 @@
+@@ -7407,8 +6059,56 @@
  rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
  rmdir conf$$.dir 2>/dev/null
  
@@ -6555,7 +6800,7 @@
  else
    test -d ./-p && rmdir ./-p
    as_mkdir_p=false
-@@ -7344,10 +6017,10 @@
+@@ -7427,10 +6127,10 @@
        if test -d "$1"; then
  	test -d "$1/.";
        else
@@ -6568,7 +6813,7 @@
  	???[sx]*):;;*)false;;esac;fi
      '\'' sh
    '
-@@ -7362,13 +6035,19 @@
+@@ -7445,13 +6145,19 @@
  
  
  exec 6>&1
@@ -6584,13 +6829,13 @@
  # report actual input values of CONFIG_FILES etc. instead of their
  # values after options handling.
  ac_log="
- This file was extended by pessulus $as_me 2.28.0, which was
+ This file was extended by pessulus $as_me 2.30.0, which was
 -generated by GNU Autoconf 2.63.  Invocation command line was
-+generated by GNU Autoconf 2.64.  Invocation command line was
++generated by GNU Autoconf 2.65.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -7396,10 +6075,11 @@
+@@ -7479,13 +6185,15 @@
  
  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  ac_cs_usage="\
@@ -6605,7 +6850,11 @@
  
    -h, --help       print this help, then exit
    -V, --version    print version number and configuration settings, then exit
-@@ -7416,16 +6096,16 @@
++      --config     print configuration, then exit
+   -q, --quiet, --silent
+                    do not print progress messages
+   -d, --debug      don't remove temporary files
+@@ -7499,16 +6207,17 @@
  Configuration commands:
  $config_commands
  
@@ -6614,18 +6863,29 @@
  
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  ac_cs_version="\\
- pessulus config.status 2.28.0
+ pessulus config.status 2.30.0
 -configured by $0, generated by GNU Autoconf 2.63,
-+configured by $0, generated by GNU Autoconf 2.64,
-   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
++configured by $0, generated by GNU Autoconf 2.65,
++  with options \\"\$ac_cs_config\\"
  
 -Copyright (C) 2008 Free Software Foundation, Inc.
 +Copyright (C) 2009 Free Software Foundation, Inc.
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."
  
-@@ -7468,7 +6148,7 @@
+@@ -7544,6 +6253,8 @@
+     ac_cs_recheck=: ;;
+   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+     $as_echo "$ac_cs_version"; exit ;;
++  --config | --confi | --conf | --con | --co | --c )
++    $as_echo "$ac_cs_config"; exit ;;
+   --debug | --debu | --deb | --de | --d | -d )
+     debug=: ;;
+   --file | --fil | --fi | --f )
+@@ -7551,7 +6262,7 @@
      case $ac_optarg in
      *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
@@ -6634,7 +6894,7 @@
      ac_need_defaults=false;;
    --he | --h |  --help | --hel | -h )
      $as_echo "$ac_cs_usage"; exit ;;
-@@ -7477,11 +6157,10 @@
+@@ -7560,11 +6271,10 @@
      ac_cs_silent=: ;;
  
    # This is an error.
@@ -6649,7 +6909,7 @@
       ac_need_defaults=false ;;
  
    esac
-@@ -7542,9 +6221,7 @@
+@@ -7625,9 +6335,7 @@
      "data/pessulus.desktop.in") CONFIG_FILES="$CONFIG_FILES data/pessulus.desktop.in" ;;
      "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
  
@@ -6660,7 +6920,7 @@
    esac
  done
  
-@@ -7570,7 +6247,7 @@
+@@ -7653,7 +6361,7 @@
    trap 'exit_status=$?
    { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
  ' 0
@@ -6669,7 +6929,7 @@
  }
  # Create a (secure) tmp directory for tmp files.
  
-@@ -7581,11 +6258,7 @@
+@@ -7664,11 +6372,7 @@
  {
    tmp=./conf$$-$RANDOM
    (umask 077 && mkdir "$tmp")
@@ -6682,7 +6942,7 @@
  
  # Set up the scripts for CONFIG_FILES section.
  # No need to generate them if there are no CONFIG_FILES.
-@@ -7593,10 +6266,16 @@
+@@ -7676,10 +6380,16 @@
  if test -n "$CONFIG_FILES"; then
  
  
@@ -6701,7 +6961,7 @@
  else
    ac_cs_awk_cr=$ac_cr
  fi
-@@ -7610,24 +6289,18 @@
+@@ -7693,24 +6403,18 @@
    echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
    echo "_ACEOF"
  } >conf$$subs.sh ||
@@ -6729,7 +6989,25 @@
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
-@@ -7716,9 +6389,7 @@
+@@ -7732,7 +6436,7 @@
+ t delim
+ :nl
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more1
+ s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+ p
+@@ -7746,7 +6450,7 @@
+ t nl
+ :delim
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more2
+ s/["\\]/\\&/g; s/^/"/; s/$/"/
+ p
+@@ -7799,9 +6503,7 @@
  else
    cat
  fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -6740,7 +7018,7 @@
  _ACEOF
  
  # VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -7749,9 +6420,7 @@
+@@ -7832,9 +6534,7 @@
    esac
    case $ac_mode$ac_tag in
    :[FHL]*:*);;
@@ -6751,7 +7029,7 @@
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    esac
-@@ -7779,12 +6448,10 @@
+@@ -7862,12 +6562,10 @@
  	   [\\/$]*) false;;
  	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
  	   esac ||
@@ -6766,7 +7044,7 @@
      done
  
      # Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -7795,7 +6462,7 @@
+@@ -7878,7 +6576,7 @@
  	`' by configure.'
      if test x"$ac_file" != x-; then
        configure_input="$ac_file.  $configure_input"
@@ -6775,7 +7053,7 @@
  $as_echo "$as_me: creating $ac_file" >&6;}
      fi
      # Neutralize special characters interpreted by sed in replacement strings.
-@@ -7808,9 +6475,7 @@
+@@ -7891,9 +6589,7 @@
  
      case $ac_tag in
      *:-:* | *:-) cat >"$tmp/stdin" \
@@ -6786,7 +7064,7 @@
      esac
      ;;
    esac
-@@ -7838,47 +6503,7 @@
+@@ -7921,47 +6617,7 @@
  	    q
  	  }
  	  s/.*/./; q'`
@@ -6835,7 +7113,7 @@
    ac_builddir=.
  
  case "$ac_dir" in
-@@ -7935,7 +6560,6 @@
+@@ -8018,7 +6674,6 @@
  # If the template does not know about datarootdir, expand it.
  # FIXME: This hack should be removed a few years after 2.60.
  ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -6843,7 +7121,7 @@
  ac_sed_dataroot='
  /datarootdir/ {
    p
-@@ -7945,12 +6569,11 @@
+@@ -8028,12 +6683,11 @@
  /@docdir@/p
  /@infodir@/p
  /@localedir@/p
@@ -6858,7 +7136,7 @@
  $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -7960,7 +6583,7 @@
+@@ -8043,7 +6697,7 @@
    s&@infodir@&$infodir&g
    s&@localedir@&$localedir&g
    s&@mandir@&$mandir&g
@@ -6867,7 +7145,7 @@
  esac
  _ACEOF
  
-@@ -7989,14 +6612,12 @@
+@@ -8072,14 +6726,12 @@
  $ac_datarootdir_hack
  "
  eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -6884,7 +7162,7 @@
  which seems to be undefined.  Please make sure it is defined." >&5
  $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  which seems to be undefined.  Please make sure it is defined." >&2;}
-@@ -8006,13 +6627,11 @@
+@@ -8089,13 +6741,11 @@
    -) cat "$tmp/out" && rm -f "$tmp/out";;
    *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
    esac \
@@ -6900,7 +7178,7 @@
  $as_echo "$as_me: executing $ac_file commands" >&6;}
   ;;
    esac
-@@ -8107,47 +6726,7 @@
+@@ -8190,47 +6840,7 @@
  	    q
  	  }
  	  s/.*/./; q'`
@@ -6949,10 +7227,10 @@
        # echo "creating $dirpart/$file"
        echo '# dummy' > "$dirpart/$file"
      done
-@@ -8159,9 +6738,7 @@
+@@ -8242,9 +6852,7 @@
        esac ;;
      "po/stamp-it":C)
-     if  ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" ; then
+     if  ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
 -       { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
 -$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
 -   { (exit 1); exit 1; }; }
@@ -6960,7 +7238,7 @@
      fi
      rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
      >"po/stamp-it.tmp"
-@@ -8184,15 +6761,12 @@
+@@ -8267,15 +6875,12 @@
  done # for ac_tag
  
  
@@ -6978,7 +7256,7 @@
  
  
  # configure is writing to config.log, and then calls config.status.
-@@ -8213,10 +6787,10 @@
+@@ -8296,10 +6901,10 @@
    exec 5>>config.log
    # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    # would make configure fail if this is the last instruction.




More information about the pkg-gnome-commits mailing list