r13624 - in /desktop/unstable/gnome-session/debian: changelog patches/90_autoconf.patch

lool at users.alioth.debian.org lool at users.alioth.debian.org
Tue Nov 27 11:30:56 UTC 2007


Author: lool
Date: Tue Nov 27 11:30:55 2007
New Revision: 13624

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13624
Log:
* New upstream stable release; translation updates.
  - Update patch 90_autoconf.

Modified:
    desktop/unstable/gnome-session/debian/changelog
    desktop/unstable/gnome-session/debian/patches/90_autoconf.patch

Modified: desktop/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=13624&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog (original)
+++ desktop/unstable/gnome-session/debian/changelog Tue Nov 27 11:30:55 2007
@@ -1,4 +1,4 @@
-gnome-session (2.20.1-2) UNRELEASED; urgency=low
+gnome-session (2.20.2-1) UNRELEASED; urgency=low
 
   [ Josselin Mouette ]
   * gnome-wm:
@@ -19,8 +19,10 @@
   * New patch, 02_no_warning_crash, doesn't make critical warnings fatal when
     the version number has 3 dots as in dev releases as this makes the desktop
     too unstable.
-
- -- Loic Minier <lool at dooz.org>  Tue, 27 Nov 2007 12:11:48 +0100
+  * New upstream stable release; translation updates.
+    - Update patch 90_autoconf.
+
+ -- Loic Minier <lool at dooz.org>  Tue, 27 Nov 2007 12:30:31 +0100
 
 gnome-session (2.20.1-1) unstable; urgency=low
 

Modified: desktop/unstable/gnome-session/debian/patches/90_autoconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/90_autoconf.patch?rev=13624&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/90_autoconf.patch (original)
+++ desktop/unstable/gnome-session/debian/patches/90_autoconf.patch Tue Nov 27 11:30:55 2007
@@ -1,26 +1,10 @@
-Index: gnome-session-2.20.1/config.h.in
-===================================================================
---- gnome-session-2.20.1.orig/config.h.in	2007-11-03 02:12:42.547813548 +0100
-+++ gnome-session-2.20.1/config.h.in	2007-11-03 02:13:02.660959731 +0100
-@@ -108,6 +108,9 @@
- /* Define to the version of this package. */
- #undef PACKAGE_VERSION
- 
-+/* Defines the path to the gnome-settings-daemon binary */
-+#undef SETTINGS_DAEMON_PATH
-+
- /* Define to 1 if you have the ANSI C header files. */
- #undef STDC_HEADERS
- 
-Index: gnome-session-2.20.1/configure
-===================================================================
---- gnome-session-2.20.1.orig/configure	2007-11-03 02:12:42.519811952 +0100
-+++ gnome-session-2.20.1/configure	2007-11-03 02:13:10.369399010 +0100
+--- gnome-session-2.20.2.orig/configure	2007-11-27 12:30:09.000000000 +0100
++++ gnome-session-2.20.2/configure	2007-11-27 12:30:13.000000000 +0100
 @@ -1,6 +1,6 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.60 for gnome-session 2.20.1.
-+# Generated by GNU Autoconf 2.61 for gnome-session 2.20.1.
+-# Generated by GNU Autoconf 2.60 for gnome-session 2.20.2.
++# Generated by GNU Autoconf 2.61 for gnome-session 2.20.2.
  #
  # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session>.
  #
@@ -34,7 +18,7 @@
  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
    emulate sh
    NULLCMD=:
-@@ -21,10 +22,13 @@ if test -n "${ZSH_VERSION+set}" && (emul
+@@ -21,10 +22,13 @@
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
  else
@@ -51,7 +35,7 @@
  
  
  # PATH needs CR
-@@ -217,7 +221,7 @@ test \$exitcode = 0) || { (exit 1); exit
+@@ -217,7 +221,7 @@
  else
    as_candidate_shells=
      as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -60,7 +44,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-@@ -235,7 +239,6 @@ IFS=$as_save_IFS
+@@ -235,7 +239,6 @@
  	 # 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
@@ -68,7 +52,7 @@
  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
    emulate sh
    NULLCMD=:
-@@ -244,10 +247,12 @@ if test -n "${ZSH_VERSION+set}" && (emul
+@@ -244,10 +247,12 @@
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
  else
@@ -84,7 +68,7 @@
  
  :
  _ASEOF
-@@ -255,7 +260,6 @@ _ASEOF
+@@ -255,7 +260,6 @@
    CONFIG_SHELL=$as_shell
  	       as_have_required=yes
  	       if { "$as_shell" 2> /dev/null <<\_ASEOF
@@ -92,7 +76,7 @@
  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
    emulate sh
    NULLCMD=:
-@@ -264,10 +268,12 @@ if test -n "${ZSH_VERSION+set}" && (emul
+@@ -264,10 +268,12 @@
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
  else
@@ -108,7 +92,7 @@
  
  :
  (as_func_return () {
-@@ -514,19 +520,28 @@ else
+@@ -514,19 +520,28 @@
    as_mkdir_p=false
  fi
  
@@ -148,7 +132,7 @@
  
  # 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'"
-@@ -721,36 +736,36 @@ ac_unique_file="gnome-session"
+@@ -721,36 +736,36 @@
  # Factoring default headers for most tests.
  ac_includes_default="\
  #include <stdio.h>
@@ -195,7 +179,7 @@
  # include <unistd.h>
  #endif"
  
-@@ -944,6 +959,7 @@ target_alias
+@@ -942,6 +957,7 @@
  CC
  CFLAGS
  LDFLAGS
@@ -203,7 +187,7 @@
  CPPFLAGS
  CPP
  CXX
-@@ -1065,10 +1081,10 @@ do
+@@ -1063,10 +1079,10 @@
    -disable-* | --disable-*)
      ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
@@ -216,7 +200,7 @@
      eval enable_$ac_feature=no ;;
  
    -docdir | --docdir | --docdi | --doc | --do)
-@@ -1084,10 +1100,10 @@ do
+@@ -1082,10 +1098,10 @@
    -enable-* | --enable-*)
      ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
@@ -229,7 +213,7 @@
      eval enable_$ac_feature=\$ac_optarg ;;
  
    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-@@ -1281,19 +1297,19 @@ do
+@@ -1279,19 +1295,19 @@
    -with-* | --with-*)
      ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
@@ -253,7 +237,7 @@
      eval with_$ac_package=no ;;
  
    --x)
-@@ -1582,12 +1598,15 @@ Optional Packages:
+@@ -1580,12 +1596,15 @@
                            Specify default window manager
    --with-rsh-command=COMMAND
                            Specify the command for executing a remote shell
@@ -269,25 +253,25 @@
    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
-@@ -1675,7 +1694,7 @@ test -n "$ac_init_help" && exit $ac_stat
+@@ -1673,7 +1692,7 @@
  if $ac_init_version; then
    cat <<\_ACEOF
- gnome-session configure 2.20.1
+ gnome-session configure 2.20.2
 -generated by GNU Autoconf 2.60
 +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.
-@@ -1689,7 +1708,7 @@ This file contains any messages produced
+@@ -1687,7 +1706,7 @@
  running configure, to aid debugging if configure makes a mistake.
  
- It was created by gnome-session $as_me 2.20.1, which was
+ It was created by gnome-session $as_me 2.20.2, which was
 -generated by GNU Autoconf 2.60.  Invocation command line was
 +generated by GNU Autoconf 2.61.  Invocation command line was
  
    $ $0 $@
  
-@@ -2113,7 +2132,7 @@ case $as_dir/ in
+@@ -2111,7 +2130,7 @@
      # by default.
      for ac_prog in ginstall scoinst install; do
        for ac_exec_ext in '' $ac_executable_extensions; do
@@ -296,7 +280,7 @@
  	  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.
-@@ -2279,7 +2298,7 @@ do
+@@ -2277,7 +2296,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -305,7 +289,7 @@
      ac_cv_prog_AWK="$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -2414,7 +2433,7 @@ do
+@@ -2412,7 +2431,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -314,7 +298,7 @@
      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -2454,7 +2473,7 @@ do
+@@ -2452,7 +2471,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -323,7 +307,7 @@
      ac_cv_prog_ac_ct_STRIP="strip"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -2649,7 +2668,7 @@ do
+@@ -2647,7 +2666,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -332,7 +316,7 @@
      ac_cv_prog_CC="${ac_tool_prefix}gcc"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -2689,7 +2708,7 @@ do
+@@ -2687,7 +2706,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -341,7 +325,7 @@
      ac_cv_prog_ac_ct_CC="gcc"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -2746,7 +2765,7 @@ do
+@@ -2744,7 +2763,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -350,7 +334,7 @@
      ac_cv_prog_CC="${ac_tool_prefix}cc"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -2787,7 +2806,7 @@ do
+@@ -2785,7 +2804,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -359,7 +343,7 @@
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
-@@ -2845,7 +2864,7 @@ do
+@@ -2843,7 +2862,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -368,7 +352,7 @@
      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -2889,7 +2908,7 @@ do
+@@ -2887,7 +2906,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -377,7 +361,7 @@
      ac_cv_prog_ac_ct_CC="$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -3030,7 +3049,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -3028,7 +3047,7 @@
  # 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.
@@ -386,7 +370,7 @@
  do
    test -f "$ac_file" || continue
    case $ac_file in
-@@ -3058,6 +3077,12 @@ done
+@@ -3056,6 +3075,12 @@
  test "$ac_cv_exeext" = no && ac_cv_exeext=
  
  else
@@ -399,7 +383,7 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
-@@ -3069,8 +3094,6 @@ See \`config.log' for more details." >&2
+@@ -3067,8 +3092,6 @@
  fi
  
  ac_exeext=$ac_cv_exeext
@@ -408,7 +392,7 @@
  
  # Check that the compiler produces executables we can run.  If not, either
  # the compiler is broken, or we cross compile.
-@@ -3248,27 +3271,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -3246,27 +3269,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -440,7 +424,7 @@
    ac_compiler_gnu=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -3323,27 +3329,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -3321,27 +3327,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -472,7 +456,7 @@
    ac_cv_prog_cc_g=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -3378,27 +3367,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -3376,27 +3365,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -504,7 +488,7 @@
    :
  else
    echo "$as_me: failed program was:" >&5
-@@ -3434,27 +3406,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -3432,27 +3404,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -536,7 +520,7 @@
    ac_cv_prog_cc_g=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -3570,27 +3525,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -3568,27 +3523,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -568,7 +552,34 @@
    ac_cv_prog_cc_c89=$ac_arg
  else
    echo "$as_me: failed program was:" >&5
-@@ -3828,7 +3766,7 @@ do
+@@ -3821,7 +3759,7 @@
+   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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -3861,7 +3799,7 @@
+   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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -3901,7 +3839,7 @@
+   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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+@@ -3963,7 +3901,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -577,43 +588,7 @@
      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
-@@ -3891,7 +3829,7 @@ 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
-+  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
-@@ -3932,7 +3870,7 @@ 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
-+  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
-@@ -3973,7 +3911,7 @@ 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
-+  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
-@@ -4014,7 +3952,7 @@ 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
-+  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
-@@ -4073,27 +4011,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -4043,27 +3981,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -646,7 +621,7 @@
    DATADIRNAME=share
  else
    echo "$as_me: failed program was:" >&5
-@@ -4164,27 +4086,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -4134,27 +4056,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -679,7 +654,7 @@
    ac_cv_func_bind_textdomain_codeset=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -4193,7 +4099,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -4163,7 +4069,7 @@
  	ac_cv_func_bind_textdomain_codeset=no
  fi
  
@@ -688,7 +663,7 @@
        conftest$ac_exeext conftest.$ac_ext
  fi
  { echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-@@ -4211,7 +4117,7 @@ fi
+@@ -4181,7 +4087,7 @@
      esac
  fi
  
@@ -697,7 +672,7 @@
        conftest$ac_exeext conftest.$ac_ext
  fi
  
-@@ -4272,27 +4178,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -4242,27 +4148,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -730,7 +705,7 @@
    ac_cv_search_strerror=$ac_res
  else
    echo "$as_me: failed program was:" >&5
-@@ -4301,7 +4191,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -4271,7 +4161,7 @@
  
  fi
  
@@ -739,7 +714,7 @@
        conftest$ac_exeext
    if test "${ac_cv_search_strerror+set}" = set; then
    break
-@@ -4345,7 +4235,7 @@ do
+@@ -4315,7 +4205,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -748,7 +723,7 @@
      ac_cv_prog_CC="${ac_tool_prefix}gcc"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -4385,7 +4275,7 @@ do
+@@ -4355,7 +4245,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -757,7 +732,7 @@
      ac_cv_prog_ac_ct_CC="gcc"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -4442,7 +4332,7 @@ do
+@@ -4412,7 +4302,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -766,7 +741,7 @@
      ac_cv_prog_CC="${ac_tool_prefix}cc"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -4483,7 +4373,7 @@ do
+@@ -4453,7 +4343,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -775,7 +750,7 @@
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
-@@ -4541,7 +4431,7 @@ do
+@@ -4511,7 +4401,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -784,7 +759,7 @@
      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -4585,7 +4475,7 @@ do
+@@ -4555,7 +4445,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -793,7 +768,7 @@
      ac_cv_prog_ac_ct_CC="$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -4705,27 +4595,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -4675,27 +4565,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -825,7 +800,7 @@
    ac_compiler_gnu=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -4780,27 +4653,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -4750,27 +4623,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -857,7 +832,7 @@
    ac_cv_prog_cc_g=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -4835,27 +4691,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -4805,27 +4661,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -889,7 +864,7 @@
    :
  else
    echo "$as_me: failed program was:" >&5
-@@ -4891,27 +4730,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -4861,27 +4700,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -921,7 +896,7 @@
    ac_cv_prog_cc_g=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -5027,27 +4849,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -4997,27 +4819,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -953,7 +928,7 @@
    ac_cv_prog_cc_c89=$ac_arg
  else
    echo "$as_me: failed program was:" >&5
-@@ -5245,17 +5050,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -5215,17 +5020,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -975,7 +950,7 @@
    :
  else
    echo "$as_me: failed program was:" >&5
-@@ -5289,17 +5087,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -5259,17 +5057,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -997,7 +972,7 @@
    # Broken: success on invalid input.
  continue
  else
-@@ -5364,17 +5155,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -5334,17 +5125,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1019,7 +994,7 @@
    :
  else
    echo "$as_me: failed program was:" >&5
-@@ -5408,17 +5192,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -5378,17 +5162,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1041,7 +1016,7 @@
    # Broken: success on invalid input.
  continue
  else
-@@ -5473,7 +5250,7 @@ do
+@@ -5443,7 +5220,7 @@
    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"
@@ -1050,7 +1025,7 @@
      # 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
-@@ -5555,7 +5332,7 @@ do
+@@ -5525,7 +5302,7 @@
    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"
@@ -1059,7 +1034,7 @@
      # 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
-@@ -5651,27 +5428,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -5621,27 +5398,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1091,16 +1066,16 @@
    ac_cv_header_stdc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -6438,7 +6198,7 @@ ia64-*-hpux*)
+@@ -6408,7 +6168,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 6441 "configure"' > conftest.$ac_ext
-+  echo '#line 6201 "configure"' > conftest.$ac_ext
+-  echo '#line 6411 "configure"' > conftest.$ac_ext
++  echo '#line 6171 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -6562,27 +6322,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -6532,27 +6292,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1133,7 +1108,7 @@
    lt_cv_cc_needs_belf=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -6591,7 +6335,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -6561,7 +6305,7 @@
  	lt_cv_cc_needs_belf=no
  fi
  
@@ -1142,7 +1117,7 @@
        conftest$ac_exeext conftest.$ac_ext
       ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -6675,27 +6419,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -6645,27 +6389,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1174,7 +1149,7 @@
    eval "$as_ac_Header=yes"
  else
    echo "$as_me: failed program was:" >&5
-@@ -6758,27 +6485,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -6728,27 +6455,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1206,7 +1181,7 @@
    ac_header_compiler=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -6814,17 +6524,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -6784,17 +6494,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1228,7 +1203,7 @@
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -6916,7 +6619,7 @@ do
+@@ -6886,7 +6589,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1237,7 +1212,7 @@
      ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -6960,7 +6663,7 @@ do
+@@ -6930,7 +6633,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1246,7 +1221,7 @@
      ac_cv_prog_ac_ct_CXX="$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -7073,27 +6776,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -7043,27 +6746,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1278,7 +1253,7 @@
    ac_compiler_gnu=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -7148,27 +6834,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -7118,27 +6804,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1310,7 +1285,7 @@
    ac_cv_prog_cxx_g=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -7203,27 +6872,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -7173,27 +6842,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1342,7 +1317,7 @@
    :
  else
    echo "$as_me: failed program was:" >&5
-@@ -7259,27 +6911,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -7229,27 +6881,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1374,7 +1349,7 @@
    ac_cv_prog_cxx_g=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -7482,17 +7117,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -7452,17 +7087,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1396,7 +1371,7 @@
    :
  else
    echo "$as_me: failed program was:" >&5
-@@ -7526,17 +7154,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -7496,17 +7124,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1418,7 +1393,7 @@
    # Broken: success on invalid input.
  continue
  else
-@@ -7601,17 +7222,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -7571,17 +7192,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1440,7 +1415,7 @@
    :
  else
    echo "$as_me: failed program was:" >&5
-@@ -7645,17 +7259,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -7615,17 +7229,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1462,7 +1437,7 @@
    # Broken: success on invalid input.
  continue
  else
-@@ -7696,7 +7303,7 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac
+@@ -7666,7 +7273,7 @@
  ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_f77_compiler_gnu
  if test -n "$ac_tool_prefix"; then
@@ -1471,7 +1446,7 @@
    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
-@@ -7714,7 +7321,7 @@ do
+@@ -7684,7 +7291,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1480,7 +1455,7 @@
      ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -7740,7 +7347,7 @@ fi
+@@ -7710,7 +7317,7 @@
  fi
  if test -z "$F77"; then
    ac_ct_F77=$F77
@@ -1489,7 +1464,7 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
-@@ -7758,7 +7365,7 @@ do
+@@ -7728,7 +7335,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1498,7 +1473,7 @@
      ac_cv_prog_ac_ct_F77="$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -7865,27 +7472,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -7835,27 +7442,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1530,7 +1505,7 @@
    ac_compiler_gnu=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -7928,27 +7518,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -7898,27 +7488,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1562,7 +1537,7 @@
    ac_cv_prog_f77_g=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -8403,7 +7976,7 @@ do
+@@ -8373,7 +7946,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1571,7 +1546,7 @@
      ac_cv_prog_AR="${ac_tool_prefix}ar"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -8443,7 +8016,7 @@ do
+@@ -8413,7 +7986,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1580,7 +1555,7 @@
      ac_cv_prog_ac_ct_AR="ar"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -8499,7 +8072,7 @@ do
+@@ -8469,7 +8042,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1589,7 +1564,7 @@
      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -8539,7 +8112,7 @@ do
+@@ -8509,7 +8082,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1598,7 +1573,7 @@
      ac_cv_prog_ac_ct_RANLIB="ranlib"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -8595,7 +8168,7 @@ do
+@@ -8565,7 +8138,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1607,7 +1582,7 @@
      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -8635,7 +8208,7 @@ do
+@@ -8605,7 +8178,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1616,49 +1591,49 @@
      ac_cv_prog_ac_ct_STRIP="strip"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -8952,11 +8525,11 @@ else
+@@ -8922,11 +8495,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:8955: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8528: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:8925: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8498: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:8959: \$? = $ac_status" >&5
-+   echo "$as_me:8532: \$? = $ac_status" >&5
+-   echo "$as_me:8929: \$? = $ac_status" >&5
++   echo "$as_me:8502: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -9220,11 +8793,11 @@ else
+@@ -9190,11 +8763,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9223: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8796: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9193: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8766: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9227: \$? = $ac_status" >&5
-+   echo "$as_me:8800: \$? = $ac_status" >&5
+-   echo "$as_me:9197: \$? = $ac_status" >&5
++   echo "$as_me:8770: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -9324,11 +8897,11 @@ else
+@@ -9294,11 +8867,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9327: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8900: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9297: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8870: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:9331: \$? = $ac_status" >&5
-+   echo "$as_me:8904: \$? = $ac_status" >&5
+-   echo "$as_me:9301: \$? = $ac_status" >&5
++   echo "$as_me:8874: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -9804,27 +9377,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -9774,27 +9347,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1691,7 +1666,7 @@
  
  aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
  }'`
-@@ -9838,7 +9395,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -9808,7 +9365,7 @@
  
  fi
  
@@ -1700,7 +1675,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -9879,27 +9436,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -9849,27 +9406,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1733,7 +1708,7 @@
  
  aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
  }'`
-@@ -9913,7 +9454,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -9883,7 +9424,7 @@
  
  fi
  
@@ -1742,16 +1717,16 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -10821,7 +10362,7 @@ linux*)
+@@ -10791,7 +10332,7 @@
    libsuff=
    case "$host_cpu" in
    x86_64*|s390x*|powerpc64*)
--    echo '#line 10824 "configure"' > conftest.$ac_ext
-+    echo '#line 10365 "configure"' > conftest.$ac_ext
+-    echo '#line 10794 "configure"' > conftest.$ac_ext
++    echo '#line 10335 "configure"' > conftest.$ac_ext
      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -11182,27 +10723,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -11152,27 +10693,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1784,7 +1759,7 @@
    ac_cv_lib_dl_dlopen=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -11211,7 +10736,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -11181,7 +10706,7 @@
  	ac_cv_lib_dl_dlopen=no
  fi
  
@@ -1793,7 +1768,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
-@@ -11293,27 +10818,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -11263,27 +10788,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1826,7 +1801,7 @@
    ac_cv_func_shl_load=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -11322,7 +10831,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -11292,7 +10801,7 @@
  	ac_cv_func_shl_load=no
  fi
  
@@ -1835,7 +1810,7 @@
        conftest$ac_exeext conftest.$ac_ext
  fi
  { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-@@ -11372,27 +10881,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -11342,27 +10851,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1868,7 +1843,7 @@
    ac_cv_lib_dld_shl_load=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -11401,7 +10894,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -11371,7 +10864,7 @@
  	ac_cv_lib_dld_shl_load=no
  fi
  
@@ -1877,7 +1852,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
-@@ -11473,27 +10966,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -11443,27 +10936,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1910,7 +1885,7 @@
    ac_cv_func_dlopen=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -11502,7 +10979,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -11472,7 +10949,7 @@
  	ac_cv_func_dlopen=no
  fi
  
@@ -1919,7 +1894,7 @@
        conftest$ac_exeext conftest.$ac_ext
  fi
  { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-@@ -11552,27 +11029,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -11522,27 +10999,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1952,7 +1927,7 @@
    ac_cv_lib_dl_dlopen=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -11581,7 +11042,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -11551,7 +11012,7 @@
  	ac_cv_lib_dl_dlopen=no
  fi
  
@@ -1961,7 +1936,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
-@@ -11632,27 +11093,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -11602,27 +11063,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -1994,7 +1969,7 @@
    ac_cv_lib_svld_dlopen=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -11661,7 +11106,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -11631,7 +11076,7 @@
  	ac_cv_lib_svld_dlopen=no
  fi
  
@@ -2003,7 +1978,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
-@@ -11712,27 +11157,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -11682,27 +11127,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2036,7 +2011,7 @@
    ac_cv_lib_dld_dld_link=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -11741,7 +11170,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -11711,7 +11140,7 @@
  	ac_cv_lib_dld_dld_link=no
  fi
  
@@ -2045,25 +2020,25 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
-@@ -11797,7 +11226,7 @@ else
+@@ -11767,7 +11196,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11800 "configure"
-+#line 11229 "configure"
+-#line 11770 "configure"
++#line 11199 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11897,7 +11326,7 @@ else
+@@ -11867,7 +11296,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11900 "configure"
-+#line 11329 "configure"
+-#line 11870 "configure"
++#line 11299 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -12984,27 +12413,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -12954,27 +12383,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2096,7 +2071,7 @@
  
  aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
  }'`
-@@ -13018,7 +12431,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -12988,7 +12401,7 @@
  
  fi
  
@@ -2105,7 +2080,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -13060,27 +12473,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -13030,27 +12443,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2138,7 +2113,7 @@
  
  aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
  }'`
-@@ -13094,7 +12491,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -13064,7 +12461,7 @@
  
  fi
  
@@ -2147,72 +2122,72 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -14265,11 +13662,11 @@ else
+@@ -14235,11 +13632,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14268: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:13665: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:14238: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:13635: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:14272: \$? = $ac_status" >&5
-+   echo "$as_me:13669: \$? = $ac_status" >&5
+-   echo "$as_me:14242: \$? = $ac_status" >&5
++   echo "$as_me:13639: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -14369,11 +13766,11 @@ else
+@@ -14339,11 +13736,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14372: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:13769: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:14342: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:13739: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:14376: \$? = $ac_status" >&5
-+   echo "$as_me:13773: \$? = $ac_status" >&5
+-   echo "$as_me:14346: \$? = $ac_status" >&5
++   echo "$as_me:13743: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -14905,7 +14302,7 @@ linux*)
+@@ -14875,7 +14272,7 @@
    libsuff=
    case "$host_cpu" in
    x86_64*|s390x*|powerpc64*)
--    echo '#line 14908 "configure"' > conftest.$ac_ext
-+    echo '#line 14305 "configure"' > conftest.$ac_ext
+-    echo '#line 14878 "configure"' > conftest.$ac_ext
++    echo '#line 14275 "configure"' > conftest.$ac_ext
      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -15960,11 +15357,11 @@ else
+@@ -15930,11 +15327,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:15963: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15360: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:15933: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15330: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:15967: \$? = $ac_status" >&5
-+   echo "$as_me:15364: \$? = $ac_status" >&5
+-   echo "$as_me:15937: \$? = $ac_status" >&5
++   echo "$as_me:15334: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -16064,11 +15461,11 @@ else
+@@ -16034,11 +15431,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16067: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15464: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16037: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15434: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:16071: \$? = $ac_status" >&5
-+   echo "$as_me:15468: \$? = $ac_status" >&5
+-   echo "$as_me:16041: \$? = $ac_status" >&5
++   echo "$as_me:15438: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -16534,27 +15931,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -16504,27 +15901,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2245,7 +2220,7 @@
  
  aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
  }'`
-@@ -16568,7 +15949,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -16538,7 +15919,7 @@
  
  fi
  
@@ -2254,7 +2229,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -16599,27 +15980,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -16569,27 +15950,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2287,7 +2262,7 @@
  
  aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
  }'`
-@@ -16633,7 +15998,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -16603,7 +15968,7 @@
  
  fi
  
@@ -2296,58 +2271,58 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -17541,7 +16906,7 @@ linux*)
+@@ -17511,7 +16876,7 @@
    libsuff=
    case "$host_cpu" in
    x86_64*|s390x*|powerpc64*)
--    echo '#line 17544 "configure"' > conftest.$ac_ext
-+    echo '#line 16909 "configure"' > conftest.$ac_ext
+-    echo '#line 17514 "configure"' > conftest.$ac_ext
++    echo '#line 16879 "configure"' > conftest.$ac_ext
      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -18315,11 +17680,11 @@ else
+@@ -18285,11 +17650,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18318: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17683: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18288: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17653: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18322: \$? = $ac_status" >&5
-+   echo "$as_me:17687: \$? = $ac_status" >&5
+-   echo "$as_me:18292: \$? = $ac_status" >&5
++   echo "$as_me:17657: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -18583,11 +17948,11 @@ else
+@@ -18553,11 +17918,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18586: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17951: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18556: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17921: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18590: \$? = $ac_status" >&5
-+   echo "$as_me:17955: \$? = $ac_status" >&5
+-   echo "$as_me:18560: \$? = $ac_status" >&5
++   echo "$as_me:17925: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -18687,11 +18052,11 @@ else
+@@ -18657,11 +18022,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18690: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18055: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18660: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18025: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:18694: \$? = $ac_status" >&5
-+   echo "$as_me:18059: \$? = $ac_status" >&5
+-   echo "$as_me:18664: \$? = $ac_status" >&5
++   echo "$as_me:18029: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -19167,27 +18532,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -19137,27 +18502,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2380,7 +2355,7 @@
  
  aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
  }'`
-@@ -19201,7 +18550,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -19171,7 +18520,7 @@
  
  fi
  
@@ -2389,7 +2364,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -19242,27 +18591,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -19212,27 +18561,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2422,7 +2397,7 @@
  
  aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
  }'`
-@@ -19276,7 +18609,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -19246,7 +18579,7 @@
  
  fi
  
@@ -2431,16 +2406,16 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -20184,7 +19517,7 @@ linux*)
+@@ -20154,7 +19487,7 @@
    libsuff=
    case "$host_cpu" in
    x86_64*|s390x*|powerpc64*)
--    echo '#line 20187 "configure"' > conftest.$ac_ext
-+    echo '#line 19520 "configure"' > conftest.$ac_ext
+-    echo '#line 20157 "configure"' > conftest.$ac_ext
++    echo '#line 19490 "configure"' > conftest.$ac_ext
      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -21420,7 +20753,7 @@ do
+@@ -21390,7 +20723,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2449,7 +2424,7 @@
      ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -21510,27 +20843,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -21480,27 +20813,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2481,7 +2456,7 @@
    has_option=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -21674,7 +20990,7 @@ do
+@@ -21644,7 +20960,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2490,7 +2465,7 @@
      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
-@@ -21717,7 +21033,7 @@ do
+@@ -21687,7 +21003,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2499,7 +2474,7 @@
      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
-@@ -21929,7 +21245,7 @@ do
+@@ -21899,7 +21215,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2508,7 +2483,7 @@
      ac_cv_path_ESD_SERVER="$as_dir/$ac_word$ac_exec_ext"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -22185,7 +21501,7 @@ do
+@@ -22155,7 +21471,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2517,7 +2492,7 @@
      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
-@@ -22295,7 +21611,7 @@ do
+@@ -22265,7 +21581,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2526,7 +2501,7 @@
      ac_cv_path_GCONF_SANITY_CHECK="$as_dir/$ac_word$ac_exec_ext"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -22345,7 +21661,7 @@ do
+@@ -22315,7 +21631,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2535,7 +2510,7 @@
      ac_cv_path_GNOME_KEYRING_DAEMON="$as_dir/$ac_word$ac_exec_ext"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -22518,17 +21834,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22488,17 +21804,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2557,7 +2532,7 @@
    # We can compile using X headers with no special include directory.
  ac_x_includes=
  else
-@@ -22551,7 +21860,7 @@ if test "$ac_x_libraries" = no; then
+@@ -22521,7 +21830,7 @@
    # See if we find them without any special options.
    # Don't add to $LIBS permanently.
    ac_save_LIBS=$LIBS
@@ -2566,7 +2541,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22580,27 +21889,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22550,27 +21859,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2599,7 +2574,7 @@
    LIBS=$ac_save_LIBS
  # We can link X programs with no special library path.
  ac_x_libraries=
-@@ -22613,7 +21906,7 @@ for ac_dir in `echo "$ac_x_includes $ac_
+@@ -22583,7 +21876,7 @@
  do
    # Don't even attempt the hair of trying to link an X program!
    for ac_extension in a so sl; do
@@ -2608,7 +2583,7 @@
        ac_x_libraries=$ac_dir
        break 2
      fi
-@@ -22621,7 +21914,7 @@ do
+@@ -22591,7 +21884,7 @@
  done
  fi
  
@@ -2617,7 +2592,7 @@
        conftest$ac_exeext conftest.$ac_ext
  fi # $ac_x_libraries = no
  
-@@ -22676,12 +21969,12 @@ else
+@@ -22646,12 +21939,12 @@
      X_LIBS="$X_LIBS -L$x_libraries"
      # For Solaris; some versions of Sun CC require a space after -R and
      # others require no space.  Words are not sufficient . . . .
@@ -2635,7 +2610,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -22709,44 +22002,20 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22679,44 +21972,20 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2689,7 +2664,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -22774,48 +22043,30 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22744,48 +22013,30 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2755,7 +2730,7 @@
    fi
  
    # Check for system-dependent libraries X programs must link with.
-@@ -22864,27 +22115,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22834,27 +22085,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2788,7 +2763,7 @@
    :
  else
    echo "$as_me: failed program was:" >&5
-@@ -22932,27 +22167,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22902,27 +22137,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2821,7 +2796,7 @@
    ac_cv_lib_dnet_dnet_ntoa=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -22961,7 +22180,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -22931,7 +22150,7 @@
  	ac_cv_lib_dnet_dnet_ntoa=no
  fi
  
@@ -2830,7 +2805,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
-@@ -23014,27 +22233,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22984,27 +22203,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2863,7 +2838,7 @@
    ac_cv_lib_dnet_stub_dnet_ntoa=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -23043,7 +22246,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -23013,7 +22216,7 @@
  	ac_cv_lib_dnet_stub_dnet_ntoa=no
  fi
  
@@ -2872,7 +2847,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
-@@ -23056,7 +22259,7 @@ fi
+@@ -23026,7 +22229,7 @@
      fi
  fi
  
@@ -2881,7 +2856,7 @@
        conftest$ac_exeext conftest.$ac_ext
      LIBS="$ac_xsave_LIBS"
  
-@@ -23131,27 +22334,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23101,27 +22304,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2914,7 +2889,7 @@
    ac_cv_func_gethostbyname=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -23160,7 +22347,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -23130,7 +22317,7 @@
  	ac_cv_func_gethostbyname=no
  fi
  
@@ -2923,7 +2898,7 @@
        conftest$ac_exeext conftest.$ac_ext
  fi
  { echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-@@ -23209,27 +22396,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23179,27 +22366,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2956,7 +2931,7 @@
    ac_cv_lib_nsl_gethostbyname=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -23238,7 +22409,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -23208,7 +22379,7 @@
  	ac_cv_lib_nsl_gethostbyname=no
  fi
  
@@ -2965,7 +2940,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
-@@ -23291,27 +22462,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23261,27 +22432,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2998,7 +2973,7 @@
    ac_cv_lib_bsd_gethostbyname=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -23320,7 +22475,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -23290,7 +22445,7 @@
  	ac_cv_lib_bsd_gethostbyname=no
  fi
  
@@ -3007,7 +2982,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
-@@ -23403,27 +22558,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23373,27 +22528,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3040,7 +3015,7 @@
    ac_cv_func_connect=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -23432,7 +22571,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -23402,7 +22541,7 @@
  	ac_cv_func_connect=no
  fi
  
@@ -3049,7 +3024,7 @@
        conftest$ac_exeext conftest.$ac_ext
  fi
  { echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-@@ -23481,27 +22620,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23451,27 +22590,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3082,7 +3057,7 @@
    ac_cv_lib_socket_connect=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -23510,7 +22633,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -23480,7 +22603,7 @@
  	ac_cv_lib_socket_connect=no
  fi
  
@@ -3091,7 +3066,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
-@@ -23586,27 +22709,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23556,27 +22679,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3124,7 +3099,7 @@
    ac_cv_func_remove=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -23615,7 +22722,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -23585,7 +22692,7 @@
  	ac_cv_func_remove=no
  fi
  
@@ -3133,7 +3108,7 @@
        conftest$ac_exeext conftest.$ac_ext
  fi
  { echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-@@ -23664,27 +22771,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23634,27 +22741,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3166,7 +3141,7 @@
    ac_cv_lib_posix_remove=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -23693,7 +22784,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -23663,7 +22754,7 @@
  	ac_cv_lib_posix_remove=no
  fi
  
@@ -3175,7 +3150,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
-@@ -23769,27 +22860,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23739,27 +22830,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3208,7 +3183,7 @@
    ac_cv_func_shmat=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -23798,7 +22873,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -23768,7 +22843,7 @@
  	ac_cv_func_shmat=no
  fi
  
@@ -3217,7 +3192,7 @@
        conftest$ac_exeext conftest.$ac_ext
  fi
  { echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-@@ -23847,27 +22922,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23817,27 +22892,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3250,7 +3225,7 @@
    ac_cv_lib_ipc_shmat=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -23876,7 +22935,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -23846,7 +22905,7 @@
  	ac_cv_lib_ipc_shmat=no
  fi
  
@@ -3259,7 +3234,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
-@@ -23940,27 +22999,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23910,27 +22969,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3292,7 +3267,7 @@
    ac_cv_lib_ICE_IceConnectionNumber=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -23969,7 +23012,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -23939,7 +22982,7 @@
  	ac_cv_lib_ICE_IceConnectionNumber=no
  fi
  
@@ -3301,7 +3276,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
-@@ -24035,27 +23078,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -24005,27 +23048,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3334,7 +3309,7 @@
    ac_cv_lib_Xau_XauFileName=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -24064,7 +23091,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -24034,7 +23061,7 @@
  	ac_cv_lib_Xau_XauFileName=no
  fi
  
@@ -3343,7 +3318,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
-@@ -24123,27 +23150,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -24093,27 +23120,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3376,7 +3351,7 @@
    ac_cv_lib_Xrandr_XRRUpdateConfiguration=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -24152,7 +23163,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -24122,7 +23133,7 @@
  	ac_cv_lib_Xrandr_XRRUpdateConfiguration=no
  fi
  
@@ -3385,7 +3360,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
-@@ -24187,27 +23198,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -24157,27 +23168,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3417,7 +3392,7 @@
    ac_cv_header_X11_extensions_Xrandr_h=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -24288,27 +23282,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -24258,27 +23252,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3449,7 +3424,7 @@
    ac_header_compiler=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -24344,17 +23321,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -24314,17 +23291,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3471,7 +3446,7 @@
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -24452,27 +23422,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -24422,27 +23392,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3504,7 +3479,7 @@
    am_cv_val_LC_MESSAGES=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -24481,7 +23435,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -24451,7 +23405,7 @@
  	am_cv_val_LC_MESSAGES=no
  fi
  
@@ -3513,7 +3488,7 @@
        conftest$ac_exeext conftest.$ac_ext
  fi
  { echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-@@ -24537,27 +23491,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -24507,27 +23461,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3545,7 +3520,7 @@
    ac_header_compiler=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -24593,17 +23530,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -24563,17 +23500,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3567,7 +3542,7 @@
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -24699,27 +23629,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -24669,27 +23599,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3600,7 +3575,7 @@
    gt_cv_func_ngettext_libc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -24728,7 +23642,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -24698,7 +23612,7 @@
  	gt_cv_func_ngettext_libc=no
  fi
  
@@ -3609,7 +3584,7 @@
        conftest$ac_exeext conftest.$ac_ext
  
  fi
-@@ -24771,27 +23685,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -24741,27 +23655,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3642,7 +3617,7 @@
    gt_cv_func_dgettext_libc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -24800,7 +23698,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -24770,7 +23668,7 @@
  	gt_cv_func_dgettext_libc=no
  fi
  
@@ -3651,7 +3626,7 @@
        conftest$ac_exeext conftest.$ac_ext
  
  fi
-@@ -24876,27 +23774,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -24846,27 +23744,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3684,7 +3659,7 @@
    eval "$as_ac_var=yes"
  else
    echo "$as_me: failed program was:" >&5
-@@ -24905,7 +23787,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -24875,7 +23757,7 @@
  	eval "$as_ac_var=no"
  fi
  
@@ -3693,7 +3668,7 @@
        conftest$ac_exeext conftest.$ac_ext
  fi
  ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -24970,27 +23852,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -24940,27 +23822,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3726,7 +3701,7 @@
    ac_cv_lib_intl_bindtextdomain=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -24999,7 +23865,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -24969,7 +23835,7 @@
  	ac_cv_lib_intl_bindtextdomain=no
  fi
  
@@ -3735,7 +3710,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
-@@ -25048,27 +23914,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -25018,27 +23884,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3768,7 +3743,7 @@
    ac_cv_lib_intl_ngettext=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -25077,7 +23927,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -25047,7 +23897,7 @@
  	ac_cv_lib_intl_ngettext=no
  fi
  
@@ -3777,7 +3752,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
-@@ -25126,27 +23976,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -25096,27 +23946,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3810,7 +3785,7 @@
    ac_cv_lib_intl_dgettext=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -25155,7 +23989,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -25125,7 +23959,7 @@
  	ac_cv_lib_intl_dgettext=no
  fi
  
@@ -3819,7 +3794,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
-@@ -25203,41 +24037,25 @@ return ngettext ();
+@@ -25173,41 +24007,25 @@
    ;
    return 0;
  }
@@ -3874,7 +3849,7 @@
    ac_cv_lib_intl_ngettext=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -25246,7 +24064,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -25216,7 +24034,7 @@
  	ac_cv_lib_intl_ngettext=no
  fi
  
@@ -3883,7 +3858,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
-@@ -25295,27 +24113,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -25265,27 +24083,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3916,7 +3891,7 @@
    ac_cv_lib_intl_dcgettext=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -25324,7 +24126,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -25294,7 +24096,7 @@
  	ac_cv_lib_intl_dcgettext=no
  fi
  
@@ -3925,7 +3900,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
-@@ -25419,27 +24221,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -25389,27 +24191,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -3958,7 +3933,7 @@
    eval "$as_ac_var=yes"
  else
    echo "$as_me: failed program was:" >&5
-@@ -25448,7 +24234,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -25418,7 +24204,7 @@
  	eval "$as_ac_var=no"
  fi
  
@@ -3967,7 +3942,7 @@
        conftest$ac_exeext conftest.$ac_ext
  fi
  ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -25595,27 +24381,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -25565,27 +24351,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4000,7 +3975,7 @@
    eval "$as_ac_var=yes"
  else
    echo "$as_me: failed program was:" >&5
-@@ -25624,7 +24394,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -25594,7 +24364,7 @@
  	eval "$as_ac_var=no"
  fi
  
@@ -4009,7 +3984,7 @@
        conftest$ac_exeext conftest.$ac_ext
  fi
  ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -25685,7 +24455,7 @@ do
+@@ -25655,7 +24425,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4018,7 +3993,7 @@
      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
-@@ -25773,27 +24543,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -25743,27 +24513,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4051,7 +4026,7 @@
    CATOBJEXT=.gmo
               DATADIRNAME=share
  else
-@@ -25865,27 +24619,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -25835,27 +24589,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4084,7 +4059,7 @@
    ac_cv_func_bind_textdomain_codeset=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -25894,7 +24632,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -25864,7 +24602,7 @@
  	ac_cv_func_bind_textdomain_codeset=no
  fi
  
@@ -4093,7 +4068,7 @@
        conftest$ac_exeext conftest.$ac_ext
  fi
  { echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-@@ -25915,7 +24653,7 @@ fi
+@@ -25885,7 +24623,7 @@
  	    esac
  fi
  
@@ -4102,7 +4077,7 @@
        conftest$ac_exeext conftest.$ac_ext
            LIBS="$glib_save_LIBS"
  	  INSTOBJEXT=.mo
-@@ -26068,27 +24806,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -26038,27 +24776,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4134,7 +4109,7 @@
    ac_cv_header_stdc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -26263,27 +24984,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -26233,27 +24954,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4166,7 +4141,7 @@
    ac_header_compiler=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -26319,17 +25023,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -26289,17 +24993,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4188,7 +4163,7 @@
    ac_header_preproc=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -26522,27 +25219,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -26492,27 +25189,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4221,7 +4196,7 @@
    :
  else
    echo "$as_me: failed program was:" >&5
-@@ -26582,27 +25263,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -26552,27 +25233,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4254,7 +4229,7 @@
    LIBWRAP_NSL="-lnsl"
  else
    echo "$as_me: failed program was:" >&5
-@@ -26611,13 +25276,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -26581,13 +25246,13 @@
  	LIBWRAP_PATH=""
  fi
  
@@ -4270,7 +4245,7 @@
        conftest$ac_exeext conftest.$ac_ext
        LIBS="$ORIG_LIBS"
        if test -n "$LIB_NSL"; then
-@@ -26724,27 +25389,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -26694,27 +25359,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4303,7 +4278,7 @@
    eval "$as_ac_var=yes"
  else
    echo "$as_me: failed program was:" >&5
-@@ -26753,7 +25402,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -26723,7 +25372,7 @@
  	eval "$as_ac_var=no"
  fi
  
@@ -4312,7 +4287,7 @@
        conftest$ac_exeext conftest.$ac_ext
  fi
  ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -26812,27 +25461,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -26782,27 +25431,10 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4344,7 +4319,7 @@
    have_ipv6=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -26911,27 +25543,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -26881,27 +25513,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4377,7 +4352,7 @@
    ac_cv_func_getaddrinfo=yes
  else
    echo "$as_me: failed program was:" >&5
-@@ -26940,7 +25556,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -26910,7 +25526,7 @@
  	ac_cv_func_getaddrinfo=no
  fi
  
@@ -4386,7 +4361,7 @@
        conftest$ac_exeext conftest.$ac_ext
  fi
  { echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5
-@@ -26995,27 +25611,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -26965,27 +25581,11 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4419,7 +4394,7 @@
    eval "$as_ac_Lib=yes"
  else
    echo "$as_me: failed program was:" >&5
-@@ -27024,7 +25624,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -26994,7 +25594,7 @@
  	eval "$as_ac_Lib=no"
  fi
  
@@ -4428,7 +4403,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
-@@ -27067,7 +25667,7 @@ do
+@@ -27037,7 +25637,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4437,7 +4412,7 @@
      ac_cv_path_AWK="$as_dir/$ac_word$ac_exec_ext"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -27112,7 +25712,7 @@ do
+@@ -27082,7 +25682,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4446,7 +4421,7 @@
      ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -27177,7 +25777,7 @@ do
+@@ -27147,7 +25747,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4455,7 +4430,7 @@
      ac_cv_path_RSH_COMMAND="$as_dir/$ac_word$ac_exec_ext"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -27208,6 +25808,30 @@ fi
+@@ -27178,6 +25778,30 @@
  
  
  
@@ -4486,7 +4461,7 @@
  
  GNOME_SESSION_TARBALL=`date +%e`
  
-@@ -27406,7 +26030,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF
+@@ -27376,7 +26000,8 @@
  ## M4sh Initialization.  ##
  ## --------------------- ##
  
@@ -4496,7 +4471,7 @@
  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
    emulate sh
    NULLCMD=:
-@@ -27415,10 +26040,13 @@ if test -n "${ZSH_VERSION+set}" && (emul
+@@ -27385,10 +26010,13 @@
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
  else
@@ -4513,7 +4488,7 @@
  
  
  # PATH needs CR
-@@ -27642,19 +26270,28 @@ else
+@@ -27612,19 +26240,28 @@
    as_mkdir_p=false
  fi
  
@@ -4553,16 +4528,16 @@
  
  # 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'"
-@@ -27670,7 +26307,7 @@ exec 6>&1
+@@ -27640,7 +26277,7 @@
  # values after options handling.
  ac_log="
- This file was extended by gnome-session $as_me 2.20.1, which was
+ This file was extended by gnome-session $as_me 2.20.2, which was
 -generated by GNU Autoconf 2.60.  Invocation command line was
 +generated by GNU Autoconf 2.61.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -27699,7 +26336,7 @@ current configuration.
+@@ -27669,7 +26306,7 @@
  Usage: $0 [OPTIONS] [FILE]...
  
    -h, --help       print this help, then exit
@@ -4571,10 +4546,10 @@
    -q, --quiet      do not print progress messages
    -d, --debug      don't remove temporary files
        --recheck    update $as_me by reconfiguring in the same conditions
-@@ -27723,7 +26360,7 @@ _ACEOF
+@@ -27693,7 +26330,7 @@
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
- gnome-session config.status 2.20.1
+ gnome-session config.status 2.20.2
 -configured by $0, generated by GNU Autoconf 2.60,
 +configured by $0, generated by GNU Autoconf 2.61,
    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"




More information about the pkg-gnome-commits mailing list