r12542 - in /desktop/unstable/seahorse/debian: ./ patches/

slomo at users.alioth.debian.org slomo at users.alioth.debian.org
Mon Sep 17 21:02:32 UTC 2007


Author: slomo
Date: Mon Sep 17 21:02:32 2007
New Revision: 12542

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12542
Log:
* debian/gconf-defaults: re-enable the notification area icon until
* New upstream release:
  + Fixes help button in seahorse-preferences (Closes: #409692).
  + Fixes missing icon warning (Closes: #403663).
  + Fixes improper handling of gnome-keyring-daemon keys with < in
    name(Closes: #429771).
* debian/control.in:
  + Build depend on libebook1.2-dev.
* debian/patches/3_setuid.dpatch,
  debian/patches/9_fix_ephy_crash.dpatch,
  debian/patches/1_seahorse-agent-manpage.dpatch,
  debian/patches/4_gpg-agent.dpatch:
  + Dropped, merged upstream.
* debian/patches/2_mlock.dpatch,
  debian/patches/10_relibtoolize.dpatch:
  + Updated for the new version.

Removed:
    desktop/unstable/seahorse/debian/patches/1_seahorse-agent-manpage.dpatch
    desktop/unstable/seahorse/debian/patches/3_setuid.dpatch
    desktop/unstable/seahorse/debian/patches/4_gpg-agent.dpatch
    desktop/unstable/seahorse/debian/patches/9_fix_ephy_crash.dpatch
Modified:
    desktop/unstable/seahorse/debian/changelog
    desktop/unstable/seahorse/debian/control
    desktop/unstable/seahorse/debian/control.in
    desktop/unstable/seahorse/debian/patches/00list
    desktop/unstable/seahorse/debian/patches/10_relibtoolize.dpatch
    desktop/unstable/seahorse/debian/patches/2_mlock.dpatch

Modified: desktop/unstable/seahorse/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/changelog?rev=12542&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/changelog (original)
+++ desktop/unstable/seahorse/debian/changelog Mon Sep 17 21:02:32 2007
@@ -1,9 +1,27 @@
-seahorse (1.0.1-7) UNRELEASED; urgency=low
-
-  * debian/gconf-defaults: re-enable the notification area icon until 
+seahorse (2.20-1) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * debian/gconf-defaults: re-enable the notification area icon until
     the "clean cache" feature is exposed somewhere else (closes: #432975).
 
- -- Josselin Mouette <joss at debian.org>  Mon, 16 Jul 2007 19:45:09 +0200
+  [ Sebastian Dröge ]
+  * New upstream release:
+    + Fixes help button in seahorse-preferences (Closes: #409692).
+    + Fixes missing icon warning (Closes: #403663).
+    + Fixes improper handling of gnome-keyring-daemon keys with < in
+      name(Closes: #429771).
+  * debian/control.in:
+    + Build depend on libebook1.2-dev.
+  * debian/patches/3_setuid.dpatch,
+    debian/patches/9_fix_ephy_crash.dpatch,
+    debian/patches/1_seahorse-agent-manpage.dpatch,
+    debian/patches/4_gpg-agent.dpatch:
+    + Dropped, merged upstream.
+  * debian/patches/2_mlock.dpatch,
+    debian/patches/10_relibtoolize.dpatch:
+    + Updated for the new version.
+
+ -- Sebastian Dröge <slomo at debian.org>  Mon, 17 Sep 2007 22:45:56 +0200
 
 seahorse (1.0.1-6) unstable; urgency=low
 

Modified: desktop/unstable/seahorse/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/control?rev=12542&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/control (original)
+++ desktop/unstable/seahorse/debian/control Mon Sep 17 21:02:32 2007
@@ -27,6 +27,7 @@
                epiphany-browser-dev (>= 2.14),
                libxml2-dev (>= 2.6.0),
                libxul-dev (>= 1.8),
+               libebook1.2-dev (>= 1.7.90),
                gnome-pkg-tools
 Build-Conflicts: gnupg2
 Standards-Version: 3.7.2

Modified: desktop/unstable/seahorse/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/control.in?rev=12542&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/control.in (original)
+++ desktop/unstable/seahorse/debian/control.in Mon Sep 17 21:02:32 2007
@@ -27,6 +27,7 @@
                epiphany-browser-dev (>= 2.14),
                libxml2-dev (>= 2.6.0),
                libxul-dev (>= 1.8),
+               libebook1.2-dev (>= 1.7.90),
                gnome-pkg-tools
 Build-Conflicts: gnupg2
 Standards-Version: 3.7.2

Modified: desktop/unstable/seahorse/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/00list?rev=12542&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/patches/00list (original)
+++ desktop/unstable/seahorse/debian/patches/00list Mon Sep 17 21:02:32 2007
@@ -1,7 +1,3 @@
-1_seahorse-agent-manpage.dpatch
 2_mlock.dpatch
-3_setuid.dpatch
-4_gpg-agent.dpatch
 8_force_ssh.dpatch
-9_fix_ephy_crash.dpatch
 10_relibtoolize.dpatch

Modified: desktop/unstable/seahorse/debian/patches/10_relibtoolize.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/10_relibtoolize.dpatch?rev=12542&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/patches/10_relibtoolize.dpatch (original)
+++ desktop/unstable/seahorse/debian/patches/10_relibtoolize.dpatch Mon Sep 17 21:02:32 2007
@@ -2,497 +2,1103 @@
 
 @DPATCH@
 
-diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/aclocal.m4 seahorse-1.0.1/aclocal.m4
---- seahorse-1.0.1-old/aclocal.m4	2007-04-03 18:17:38.000000000 +0200
-+++ seahorse-1.0.1/aclocal.m4	2007-05-01 22:57:19.000000000 +0200
-@@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-+# generated automatically by aclocal 1.10 -*- Autoconf -*-
- 
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005  Free Software Foundation, Inc.
-+# 2005, 2006  Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -11,6 +11,11 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
-+m4_if(m4_PACKAGE_VERSION, [2.61],,
-+[m4_fatal([this file was generated for autoconf 2.61.
-+You have another version of autoconf.  If you want to use that,
-+you should regenerate the build system entirely.], [63])])
+diff -Naur seahorse-2.20.old/aclocal.m4 seahorse-2.20/aclocal.m4
+--- seahorse-2.20.old/aclocal.m4	2007-09-17 19:21:07.000000000 +0200
++++ seahorse-2.20/aclocal.m4	2007-09-17 23:00:40.000000000 +0200
+@@ -266,7 +266,7 @@
+ 	  AC_CHECK_FUNCS(dcgettext)
+ 	  MSGFMT_OPTS=
+ 	  AC_MSG_CHECKING([if msgfmt accepts -c])
+-	  GLIB_RUN_PROG([msgfmt -c -o /dev/null],[
++	  GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
+ msgid ""
+ msgstr ""
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -492,7 +492,7 @@
+ 
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+ 
+-# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
++# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL
+ 
+ 
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+@@ -655,7 +655,7 @@
+ test -z "$ac_objext" && ac_objext=o
+ 
+ # Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+ old_postinstall_cmds='chmod 644 $oldlib'
+ old_postuninstall_cmds=
+ 
+@@ -742,8 +742,9 @@
+ # Check for compiler boilerplate output or warnings with
+ # the simple compiler test code.
+ AC_DEFUN([_LT_COMPILER_BOILERPLATE],
+-[ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -755,8 +756,9 @@
+ # Check for linker boilerplate output or warnings with
+ # the simple link test code.
+ AC_DEFUN([_LT_LINKER_BOILERPLATE],
+-[ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -772,12 +774,20 @@
+ # If we don't find anything, use the default library path according
+ # to the aix ld manual.
+ AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_LINK_IFELSE(AC_LANG_PROGRAM,[
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi],[])
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi],[])
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ ])# _LT_AC_SYS_LIBPATH_AIX
+ 
+@@ -1008,13 +1018,17 @@
+   rm -rf conftest*
+   ;;
+ 
+-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++s390*-*linux*|sparc*-*linux*)
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+   if AC_TRY_EVAL(ac_compile); then
+     case `/usr/bin/file conftest.o` in
+     *32-bit*)
+       case $host in
++        x86_64-*kfreebsd*-gnu)
++          LD="${LD-ld} -m elf_i386_fbsd"
++          ;;
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_i386"
+           ;;
+@@ -1031,6 +1045,9 @@
+       ;;
+     *64-bit*)
+       case $host in
++        x86_64-*kfreebsd*-gnu)
++          LD="${LD-ld} -m elf_x86_64_fbsd"
++          ;;
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_x86_64"
+           ;;
+@@ -1102,7 +1119,7 @@
+ AC_CACHE_CHECK([$1], [$2],
+   [$2=no
+   ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="$3"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+@@ -1143,11 +1160,12 @@
+ # ------------------------------------------------------------
+ # Check whether the given compiler option works
+ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+-[AC_CACHE_CHECK([$1], [$2],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_CACHE_CHECK([$1], [$2],
+   [$2=no
+    save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $3"
+-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+      # The linker can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+@@ -1261,24 +1279,27 @@
+     fi
+     ;;
+   *)
+-    # If test is not a shell built-in, we'll probably end up computing a
+-    # maximum length that is only half of the actual maximum length, but
+-    # we can't tell.
+-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+-    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
++    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
++    if test -n "$lt_cv_sys_max_cmd_len"; then
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++    else
++      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++      while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+ 	       = "XX$teststring") >/dev/null 2>&1 &&
+-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
+-	    lt_cv_sys_max_cmd_len=$new_result &&
+-	    test $i != 17 # 1/2 MB should be enough
+-    do
+-      i=`expr $i + 1`
+-      teststring=$teststring$teststring
+-    done
+-    teststring=
+-    # Add a significant safety factor because C++ compilers can tack on massive
+-    # amounts of additional arguments before passing them to the linker.
+-    # It appears as though 1/2 is a usable value.
+-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
++	      lt_cv_sys_max_cmd_len=$new_result &&
++	      test $i != 17 # 1/2 MB should be enough
++      do
++        i=`expr $i + 1`
++        teststring=$teststring$teststring
++      done
++      teststring=
++      # Add a significant safety factor because C++ compilers can tack on massive
++      # amounts of additional arguments before passing them to the linker.
++      # It appears as though 1/2 is a usable value.
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++    fi
+     ;;
+   esac
+ ])
+@@ -1505,7 +1526,8 @@
+ # ---------------------------------
+ # Check to see if options -c and -o are simultaneously supported by compiler
+ AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+@@ -1513,7 +1535,7 @@
+    mkdir conftest
+    cd conftest
+    mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+@@ -1653,6 +1675,7 @@
+    darwin*)
+        if test -n "$STRIP" ; then
+          striplib="$STRIP -x"
++         old_striplib="$STRIP -S"
+          AC_MSG_RESULT([yes])
+        else
+   AC_MSG_RESULT([no])
+@@ -1670,7 +1693,8 @@
+ # -----------------------------
+ # PORTME Fill in your ld.so characteristics
+ AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+-[AC_MSG_CHECKING([dynamic linker characteristics])
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_MSG_CHECKING([dynamic linker characteristics])
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+@@ -1684,20 +1708,58 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
++m4_if($1,[],[
+ if test "$GCC" = yes; then
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++  case $host_os in
++    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++    *) lt_awk_arg="/^libraries:/" ;;
++  esac
++  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
+     # if the path contains ";" then we assume it to be the separator
+     # otherwise default to the standard path separator (i.e. ":") - it is
+     # assumed that no part of a normal pathname contains ";" but that should
+     # okay in the real world where ";" in dirpaths is itself problematic.
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+   else
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+   fi
++  # Ok, now we have the path, separated by spaces, we can step through it
++  # and add multilib dir if necessary.
++  lt_tmp_lt_search_path_spec=
++  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++  for lt_sys_path in $lt_search_path_spec; do
++    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++    else
++      test -d "$lt_sys_path" && \
++	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
++    fi
++  done
++  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
++BEGIN {RS=" "; FS="/|\n";} {
++  lt_foo="";
++  lt_count=0;
++  for (lt_i = NF; lt_i > 0; lt_i--) {
++    if ($lt_i != "" && $lt_i != ".") {
++      if ($lt_i == "..") {
++        lt_count++;
++      } else {
++        if (lt_count == 0) {
++          lt_foo="/" $lt_i lt_foo;
++        } else {
++          lt_count--;
++        }
++      }
++    }
++  }
++  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
++  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
++}'`
++  sys_lib_search_path_spec=`echo $lt_search_path_spec`
+ else
+   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
++fi])
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -1854,12 +1916,8 @@
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if test "$GCC" = yes; then
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
++  m4_if([$1], [],[
++  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) 
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   ;;
+ 
+@@ -1913,7 +1971,7 @@
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
+-  freebsd*) # from 4.6 on
++  *) # from 4.6 on, and DragonFly
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+@@ -1976,7 +2034,7 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
+-interix3*)
++interix[[3-9]]*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -2047,7 +2105,7 @@
+ 
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+@@ -2153,6 +2211,10 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
++rdos*)
++  dynamic_linker=no
++  ;;
 +
- dnl AM_GCONF_SOURCE_2
- dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
- dnl  (i.e. pass to gconftool-2
-@@ -7012,7 +7017,7 @@
- fi[]dnl
- ])# PKG_CHECK_MODULES
- 
--# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
-+# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -2258,7 +2320,8 @@
+ # _LT_AC_TAGCONFIG
+ # ----------------
+ AC_DEFUN([_LT_AC_TAGCONFIG],
+-[AC_ARG_WITH([tags],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_ARG_WITH([tags],
+     [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+         [include additional configurations @<:@automatic@:>@])],
+     [tagnames="$withval"])
+@@ -2519,7 +2582,7 @@
+ 
+ # AC_PATH_TOOL_PREFIX
+ # -------------------
+-# find a file program which can recognise shared library
++# find a file program which can recognize shared library
+ AC_DEFUN([AC_PATH_TOOL_PREFIX],
+ [AC_REQUIRE([AC_PROG_EGREP])dnl
+ AC_MSG_CHECKING([for $1])
+@@ -2582,7 +2645,7 @@
+ 
+ # AC_PATH_MAGIC
+ # -------------
+-# find a file program which can recognise a shared library
++# find a file program which can recognize a shared library
+ AC_DEFUN([AC_PATH_MAGIC],
+ [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+ if test -z "$lt_cv_path_MAGIC_CMD"; then
+@@ -2729,7 +2792,7 @@
+ # how to check for library dependencies
+ #  -- PORTME fill in with the dynamic library characteristics
+ AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+-[AC_CACHE_CHECK([how to recognise dependent libraries],
++[AC_CACHE_CHECK([how to recognize dependent libraries],
+ lt_cv_deplibs_check_method,
+ [lt_cv_file_magic_cmd='$MAGIC_CMD'
+ lt_cv_file_magic_test_file=
+@@ -2768,9 +2831,15 @@
+ 
+ mingw* | pw32*)
+   # Base MSYS/MinGW do not provide the 'file' command needed by
+-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
+-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+-  lt_cv_file_magic_cmd='$OBJDUMP -f'
++  # func_win32_libid shell function, so use a weaker test based on 'objdump',
++  # unless we find 'file', for example because we are cross-compiling.
++  if ( file / ) >/dev/null 2>&1; then
++    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++    lt_cv_file_magic_cmd='func_win32_libid'
++  else
++    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++    lt_cv_file_magic_cmd='$OBJDUMP -f'
++  fi
+   ;;
+ 
+ darwin* | rhapsody*)
+@@ -2815,7 +2884,7 @@
+   esac
+   ;;
+ 
+-interix3*)
++interix[[3-9]]*)
+   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+   lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+   ;;
+@@ -2865,6 +2934,10 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
++rdos*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
+ solaris*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+@@ -2917,7 +2990,7 @@
+   lt_cv_path_NM="$NM"
+ else
+   lt_nm_to_check="${ac_tool_prefix}nm"
+-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
++  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+     lt_nm_to_check="$lt_nm_to_check nm"
+   fi
+   for lt_tmp_nm in $lt_nm_to_check; do
+@@ -3133,10 +3206,10 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(){return(0);}\n'
++lt_simple_link_test_code='int main(){return(0);}'
+ 
+ _LT_AC_SYS_COMPILER
+ 
+@@ -3238,10 +3311,10 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
++lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+@@ -3387,7 +3460,7 @@
+ 	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+ 	then
+ 	  # We have reworked collect2
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++	  :
+ 	else
+ 	  # We have old collect2
+ 	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -3546,10 +3619,10 @@
+       case $cc_basename in
+         xlc*)
+          output_verbose_link_cmd='echo'
+-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+           _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           ;;
+        *)
+@@ -3632,9 +3705,7 @@
+       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+       case $host_cpu in
+-      hppa*64*|ia64*)
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+-        ;;
++      hppa*64*|ia64*) ;;
+       *)
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+         ;;
+@@ -3702,7 +3773,7 @@
+ 	;;
+     esac
+     ;;
+-  interix3*)
++  interix[[3-9]]*)
+     _LT_AC_TAGVAR(hardcode_direct, $1)=no
+     _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+@@ -3822,6 +3893,29 @@
+ 	# dependencies.
+ 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ 	;;
++      *)
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C++ 5.9
++	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++
++	  # Not sure whether something based on
++	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
++	  # would be better.
++	  output_verbose_link_cmd='echo'
++
++	  # Archives containing C++ object files must be created using
++	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
++	  # necessary to make sure instantiated templates are included
++	  # in the archive.
++	  _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
++	  ;;
++	esac
++	;;
+     esac
+     ;;
+   lynxos*)
+@@ -3860,16 +3954,20 @@
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+   openbsd*)
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    if test -f /usr/libexec/ld.so; then
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      fi
++      output_verbose_link_cmd='echo'
++    else
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     fi
+-    output_verbose_link_cmd='echo'
+     ;;
+   osf3*)
+     case $cc_basename in
+@@ -4031,15 +4129,10 @@
+ 	case $host_os in
+ 	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ 	  *)
+-	    # The C++ compiler is used as linker so we must use $wl
+-	    # flag to pass the commands to the underlying system
+-	    # linker. We must also pass each convience library through
+-	    # to the system linker between allextract/defaultextract.
+-	    # The C++ compiler will combine linker options so we
+-	    # cannot just pass the convience library names through
+-	    # without $wl.
++	    # The compiler driver will combine and reorder linker options,
++	    # but understands `-z linker_flag'.
+ 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
++	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+ 	    ;;
+ 	esac
+ 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+@@ -4086,6 +4179,12 @@
+ 	  fi
+ 
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
++	  case $host_os in
++	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++	  *)
++	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    ;;
++	  esac
+ 	fi
+ 	;;
+     esac
+@@ -4329,7 +4428,7 @@
+ # PORTME: override above test on systems where it is broken
+ ifelse([$1],[CXX],
+ [case $host_os in
+-interix3*)
++interix[[3-9]]*)
+   # Interix 3.5 installs completely hosed .la files for C++, so rather than
+   # hack all around it, let's just trust "g++" to DTRT.
+   _LT_AC_TAGVAR(predep_objects,$1)=
+@@ -4337,13 +4436,46 @@
+   _LT_AC_TAGVAR(postdeps,$1)=
+   ;;
+ 
++linux*)
++  case `$CC -V 2>&1 | sed 5q` in
++  *Sun\ C*)
++    # Sun C++ 5.9
++    #
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
++      ;;
++    esac
++    if test "$solaris_use_stlport4" != yes; then
++      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++    fi
++    ;;
++  esac
++  ;;
++
+ solaris*)
+   case $cc_basename in
+   CC*)
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
++      ;;
++    esac
++
+     # Adding this requires a known-good setup of shared libraries for
+     # Sun compiler versions before 5.6, else PIC objects from an old
+     # archive will be linked into the output, leading to subtle bugs.
+-    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
++    if test "$solaris_use_stlport4" != yes; then
++      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++    fi
+     ;;
+   esac
+   ;;
+@@ -4392,10 +4524,17 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
++lt_simple_compile_test_code="\
++      subroutine t
++      return
++      end
++"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code="      program t\n      end\n"
++lt_simple_link_test_code="\
++      program t
++      end
++"
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+@@ -4474,10 +4613,10 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}\n"
++lt_simple_compile_test_code="class foo {}"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+@@ -4530,7 +4669,7 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+ 
+ # Code to be used in simple link tests
+ lt_simple_link_test_code="$lt_simple_compile_test_code"
+@@ -4619,6 +4758,7 @@
+     _LT_AC_TAGVAR(module_cmds, $1) \
+     _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+     _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
++    _LT_AC_TAGVAR(fix_srcfile_path, $1) \
+     _LT_AC_TAGVAR(exclude_expsyms, $1) \
+     _LT_AC_TAGVAR(include_expsyms, $1); do
+ 
+@@ -4665,7 +4805,7 @@
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -7022,14 +7027,29 @@
- # ----------------------------
- # Automake X.Y traces this macro to ensure aclocal.m4 has been
- # generated from the m4 files accompanying Automake X.Y.
--AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-+# (This private macro should not be called outside this file.)
-+AC_DEFUN([AM_AUTOMAKE_VERSION],
-+[am__api_version='1.10'
-+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-+dnl require some minimum version.  Point them to the right macro.
-+m4_if([$1], [1.10], [],
-+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-+])
-+
-+# _AM_AUTOCONF_VERSION(VERSION)
-+# -----------------------------
-+# aclocal traces this macro to find the Autoconf version.
-+# This is a private macro too.  Using m4_define simplifies
-+# the logic in aclocal, which can simply ignore this definition.
-+m4_define([_AM_AUTOCONF_VERSION], [])
- 
- # AM_SET_CURRENT_AUTOMAKE_VERSION
- # -------------------------------
--# Call AM_AUTOMAKE_VERSION so it can be traced.
-+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--	 [AM_AUTOMAKE_VERSION([1.9.6])])
-+[AM_AUTOMAKE_VERSION([1.10])dnl
-+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
- 
- # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
- 
-@@ -7086,14 +7106,14 @@
- 
- # AM_CONDITIONAL                                            -*- Autoconf -*-
- 
--# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
  # Free Software Foundation, Inc.
  #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
- 
--# serial 7
-+# serial 8
- 
- # AM_CONDITIONAL(NAME, SHELL-CONDITION)
- # -------------------------------------
-@@ -7102,8 +7122,10 @@
- [AC_PREREQ(2.52)dnl
-  ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
- 	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
--AC_SUBST([$1_TRUE])
--AC_SUBST([$1_FALSE])
-+AC_SUBST([$1_TRUE])dnl
-+AC_SUBST([$1_FALSE])dnl
-+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
- if $2; then
-   $1_TRUE=
-   $1_FALSE='#'
-@@ -7117,15 +7139,14 @@
- Usually this means the macro was only invoked conditionally.]])
- fi])])
- 
--
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
- # Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
- 
--# serial 8
-+# serial 9
- 
- # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
- # written in clear, in which case automake, when reading aclocal.m4,
-@@ -7153,6 +7174,7 @@
- ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                    [depcc="$$1"   am_compiler_list=])
- 
-@@ -7218,6 +7240,7 @@
-        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-          >/dev/null 2>conftest.err &&
-+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-@@ -7270,7 +7293,8 @@
-   AMDEPBACKSLASH='\'
- fi
- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
--AC_SUBST([AMDEPBACKSLASH])
-+AC_SUBST([AMDEPBACKSLASH])dnl
-+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+ # This file is part of GNU Libtool:
+@@ -4990,7 +5130,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
++fix_srcfile_path=$lt_fix_srcfile_path
+ 
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
+@@ -5073,6 +5213,7 @@
+ # ---------------------------------
+ AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+ [AC_REQUIRE([AC_CANONICAL_HOST])
++AC_REQUIRE([LT_AC_PROG_SED])
+ AC_REQUIRE([AC_PROG_NM])
+ AC_REQUIRE([AC_OBJEXT])
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+@@ -5299,12 +5440,14 @@
+       # like `-m68040'.
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+       ;;
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+-    mingw* | os2* | pw32*)
++    mingw* | cygwin* | os2* | pw32*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+       ;;
+     darwin* | rhapsody*)
+@@ -5316,7 +5459,7 @@
+       # DJGPP does not support shared libraries at all
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+       ;;
+-    interix3*)
++    interix[[3-9]]*)
+       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+       # Instead, we relocate shared libraries at runtime.
+       ;;
+@@ -5452,6 +5595,14 @@
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ 	    ;;
+ 	  *)
++	    case `$CC -V 2>&1 | sed 5q` in
++	    *Sun\ C*)
++	      # Sun C++ 5.9
++	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++	      ;;
++	    esac
+ 	    ;;
+ 	esac
+ 	;;
+@@ -5572,13 +5723,15 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+       ;;
+ 
+@@ -5588,7 +5741,7 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+       ;;
+ 
+-    interix3*)
++    interix[[3-9]]*)
+       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+       # Instead, we relocate shared libraries at runtime.
+       ;;
+@@ -5646,7 +5799,7 @@
+        esac
+        ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+@@ -5698,6 +5851,22 @@
+         # All Alpha code is PIC.
+         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+         ;;
++      *)
++        case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C 5.9
++	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	  ;;
++	*Sun\ F*)
++	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
++	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
++	  ;;
++	esac
++	;;
+       esac
+       ;;
+ 
+@@ -5707,6 +5876,10 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+       ;;
+ 
++    rdos*)
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++      ;;
++
+     solaris*)
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -5801,7 +5974,8 @@
+ # ------------------------------------
+ # See if the linker supports building shared libraries.
+ AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
+-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ ifelse([$1],[CXX],[
+   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   case $host_os in
+@@ -5818,7 +5992,7 @@
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+   ;;
+   cygwin* | mingw*)
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+   ;;
+   linux* | k*bsd*-gnu)
+     _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+@@ -5960,7 +6134,7 @@
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+       _LT_AC_TAGVAR(always_export_symbols, $1)=no
+       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+ 
+       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+@@ -5978,7 +6152,7 @@
+       fi
+       ;;
+ 
+-    interix3*)
++    interix[[3-9]]*)
+       _LT_AC_TAGVAR(hardcode_direct, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+@@ -5993,7 +6167,7 @@
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+       ;;
+ 
+-    linux* | k*bsd*-gnu)
++    gnu* | linux* | k*bsd*-gnu)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	tmp_addflag=
+ 	case $cc_basename,$host_cpu in
+@@ -6011,13 +6185,22 @@
+ 	ifc* | ifort*)			# Intel Fortran compiler
+ 	  tmp_addflag=' -nofor_main' ;;
+ 	esac
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)			# Sun C 5.9
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_sharedflag='-G' ;;
++	*Sun\ F*)			# Sun Fortran 8.3
++	  tmp_sharedflag='-G' ;;
++	*)
++	  tmp_sharedflag='-shared' ;;
++	esac
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 
+ 	if test $supports_anon_versioning = yes; then
+ 	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
+   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+   $echo "local: *; };" >> $output_objdir/$libname.ver~
+-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ 	fi
+ 	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
+       else
+@@ -6058,7 +6241,7 @@
+ 
+     sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+       case `$LD -v 2>&1` in
+-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
++        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	cat <<_LT_EOF 1>&2
+ 
+@@ -6177,7 +6360,7 @@
+   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+ 	  then
+   	  # We have reworked collect2
+-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++  	  :
+ 	  else
+   	  # We have old collect2
+   	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -6270,7 +6453,7 @@
+       # The linker will automatically build a .lib file if we build a DLL.
+       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+       # FIXME: Should let the user specify the lib program.
+-      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+       _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+       ;;
+@@ -6312,10 +6495,10 @@
+       case $cc_basename in
+         xlc*)
+          output_verbose_link_cmd='echo'
+-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           ;;
+        *)
+@@ -6477,24 +6660,28 @@
+       ;;
+ 
+     openbsd*)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      if test -f /usr/libexec/ld.so; then
++	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
++	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	else
++	  case $host_os in
++	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
++	     _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	     ;;
++	   *)
++	     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	     ;;
++	  esac
++        fi
+       else
+-       case $host_os in
+-	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+-	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-	   ;;
+-	 *)
+-	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	   ;;
+-       esac
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+ 
+@@ -6553,17 +6740,16 @@
+       case $host_os in
+       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+       *)
+- 	# The compiler driver will combine linker options so we
+- 	# cannot just pass the convience library names through
+- 	# without $wl, iff we do not link with $LD.
+- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++	# The compiler driver will combine and reorder linker options,
++	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but is careful enough not to reorder.
+  	# Supported since Solaris 2.6 (maybe 2.5.1?)
+- 	case $wlarc in
+- 	'')
+- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
+- 	*)
+- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+- 	esac ;;
++	if test "$GCC" = yes; then
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	else
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
++	fi
++	;;
+       esac
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+@@ -6620,7 +6806,7 @@
+       fi
+       ;;
+ 
+-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+       _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -6695,7 +6881,7 @@
+       # to ld, don't add -lc before -lgcc.
+       AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+       $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+       if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+         soname=conftest
+@@ -6798,6 +6984,30 @@
+ [AC_CHECK_TOOL(RC, windres, no)
  ])
  
- # Generate code to set up dependency tracking.              -*- Autoconf -*-
-@@ -7295,8 +7319,9 @@
-   # some people rename them; so instead we look at the file content.
-   # Grep'ing the first line is not enough: some people post-process
-   # each Makefile.in and add a new line on top of each file to say so.
--  # So let's grep whole file.
--  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-+  # Grep'ing the whole file is not good either: AIX grep has a line
-+  # limit of 2048, but all sed's we know have understand at least 4000.
-+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-     dirpart=`AS_DIRNAME("$mf")`
-   else
-     continue
-@@ -7355,8 +7380,8 @@
- 
- # Do all the work for Automake.                             -*- Autoconf -*-
- 
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
--# Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005, 2006 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -7379,16 +7404,20 @@
- # arguments mandatory, and then we can depend on a new Autoconf
- # release and drop the old call support.
- AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_PREREQ([2.58])dnl
-+[AC_PREREQ([2.60])dnl
- dnl Autoconf wants to disallow AM_ names.  We explicitly allow
- dnl the ones we care about.
- m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
- AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
- AC_REQUIRE([AC_PROG_INSTALL])dnl
--# test to see if srcdir already configured
--if test "`cd $srcdir && pwd`" != "`pwd`" &&
--   test -f $srcdir/config.status; then
--  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+if test "`cd $srcdir && pwd`" != "`pwd`"; then
-+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-+  # is not polluted with repeated "-I."
-+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-+  # test to see if srcdir already configured
-+  if test -f $srcdir/config.status; then
-+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+  fi
- fi
- 
- # test whether we have cygpath
-@@ -7408,6 +7437,9 @@
-  AC_SUBST([PACKAGE], [$1])dnl
-  AC_SUBST([VERSION], [$2])],
- [_AM_SET_OPTIONS([$1])dnl
-+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
-  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
-  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
- 
-@@ -7443,6 +7475,10 @@
-                   [_AM_DEPENDENCIES(CXX)],
-                   [define([AC_PROG_CXX],
-                           defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-+                  [_AM_DEPENDENCIES(OBJC)],
-+                  [define([AC_PROG_OBJC],
-+                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
++
++# Cheap backport of AS_EXECUTABLE_P and required macros
++# from Autoconf 2.59; we should not use $as_executable_p directly.
++
++# _AS_TEST_PREPARE
++# ----------------
++m4_ifndef([_AS_TEST_PREPARE],
++[m4_defun([_AS_TEST_PREPARE],
++[if test -x / >/dev/null 2>&1; then
++  as_executable_p='test -x'
++else
++  as_executable_p='test -f'
++fi
++])])# _AS_TEST_PREPARE
++
++# AS_EXECUTABLE_P
++# ---------------
++# Check whether a file is executable.
++m4_ifndef([AS_EXECUTABLE_P],
++[m4_defun([AS_EXECUTABLE_P],
++[AS_REQUIRE([_AS_TEST_PREPARE])dnl
++$as_executable_p $1[]dnl
++])])# AS_EXECUTABLE_P
++
+ # NOTE: This macro has been submitted for inclusion into   #
+ #  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+ #  a released version of Autoconf we should remove this    #
+@@ -6818,12 +7028,13 @@
+   test -z "$as_dir" && as_dir=.
+   for lt_ac_prog in sed gsed; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
++      if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
+         lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+       fi
+     done
+   done
+ done
++IFS=$as_save_IFS
+ lt_ac_max=0
+ lt_ac_count=0
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+@@ -6856,6 +7067,7 @@
+ done
  ])
+ SED=$lt_cv_path_SED
++AC_SUBST([SED])
+ AC_MSG_RESULT([$SED])
  ])
  
-@@ -7478,7 +7514,7 @@
- # Define $install_sh.
- AC_DEFUN([AM_PROG_INSTALL_SH],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--install_sh=${install_sh-"$am_aux_dir/install-sh"}
-+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
- AC_SUBST(install_sh)])
- 
- # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-@@ -7585,14 +7621,14 @@
- 
- # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
- 
--# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
- # Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
- 
--# serial 4
-+# serial 5
- 
- # AM_MISSING_PROG(NAME, PROGRAM)
- # ------------------------------
-@@ -7608,6 +7644,7 @@
- # If it does, set am_missing_run to use it, otherwise, to nothing.
- AC_DEFUN([AM_MISSING_HAS_RUN],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+AC_REQUIRE_AUX_FILE([missing])dnl
- test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
- # Use eval to expand $SHELL
- if eval "$MISSING --run true"; then
-@@ -7618,7 +7655,7 @@
- fi
- ])
- 
--# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
-+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -7626,60 +7663,23 @@
- 
- # AM_PROG_MKDIR_P
- # ---------------
--# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
--#
--# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
--# created by `make install' are always world readable, even if the
--# installer happens to have an overly restrictive umask (e.g. 077).
--# This was a mistake.  There are at least two reasons why we must not
--# use `-m 0755':
--#   - it causes special bits like SGID to be ignored,
--#   - it may be too restrictive (some setups expect 775 directories).
--#
--# Do not use -m 0755 and let people choose whatever they expect by
--# setting umask.
--#
--# We cannot accept any implementation of `mkdir' that recognizes `-p'.
--# Some implementations (such as Solaris 8's) are not thread-safe: if a
--# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
--# concurrently, both version can detect that a/ is missing, but only
--# one can create it and the other will error out.  Consequently we
--# restrict ourselves to GNU make (using the --version option ensures
--# this.)
-+# Check for `mkdir -p'.
- AC_DEFUN([AM_PROG_MKDIR_P],
--[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
--  # We used to keeping the `.' as first argument, in order to
--  # allow $(mkdir_p) to be used without argument.  As in
--  #   $(mkdir_p) $(somedir)
--  # where $(somedir) is conditionally defined.  However this is wrong
--  # for two reasons:
--  #  1. if the package is installed by a user who cannot write `.'
--  #     make install will fail,
--  #  2. the above comment should most certainly read
--  #     $(mkdir_p) $(DESTDIR)$(somedir)
--  #     so it does not work when $(somedir) is undefined and
--  #     $(DESTDIR) is not.
--  #  To support the latter case, we have to write
--  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
--  #  so the `.' trick is pointless.
--  mkdir_p='mkdir -p --'
--else
--  # On NextStep and OpenStep, the `mkdir' command does not
--  # recognize any option.  It will interpret all options as
--  # directories to create, and then abort because `.' already
--  # exists.
--  for d in ./-p ./--version;
--  do
--    test -d $d && rmdir $d
--  done
--  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
--  if test -f "$ac_aux_dir/mkinstalldirs"; then
--    mkdir_p='$(mkinstalldirs)'
--  else
--    mkdir_p='$(install_sh) -d'
--  fi
--fi
--AC_SUBST([mkdir_p])])
-+[AC_PREREQ([2.60])dnl
-+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-+dnl while keeping a definition of mkdir_p for backward compatibility.
-+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-+dnl Makefile.ins that do not define MKDIR_P, so we do our own
-+dnl adjustment using top_builddir (which is defined more often than
-+dnl MKDIR_P).
-+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-+case $mkdir_p in
-+  [[\\/$]]* | ?:[[\\/]]*) ;;
-+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-+esac
-+])
- 
- # Helper functions for option handling.                     -*- Autoconf -*-
- 
-@@ -7791,9 +7791,21 @@
- if test "$cross_compiling" != no; then
-   AC_CHECK_TOOL([STRIP], [strip], :)
- fi
--INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
- AC_SUBST([INSTALL_STRIP_PROGRAM])])
- 
-+# Copyright (C) 2006  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# _AM_SUBST_NOTMAKE(VARIABLE)
-+# ---------------------------
-+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
-+# This macro is traced by Automake.
-+AC_DEFUN([_AM_SUBST_NOTMAKE])
-+
- # Check how to create a tarball.                            -*- Autoconf -*-
- 
- # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/agent/Makefile.in seahorse-1.0.1/agent/Makefile.in
---- seahorse-1.0.1-old/agent/Makefile.in	2007-04-03 18:17:43.000000000 +0200
-+++ seahorse-1.0.1/agent/Makefile.in	2007-05-01 22:57:36.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,15 +15,11 @@
- @SET_MAKE@
- 
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -70,17 +66,18 @@
- seahorse_agent_DEPENDENCIES =  \
- 	$(top_builddir)/libseahorse/libseahorse.a \
- 	$(top_builddir)/libcryptui/libcryptui.la $(am__DEPENDENCIES_1)
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(seahorse_agent_SOURCES)
- DIST_SOURCES = $(am__seahorse_agent_SOURCES_DIST)
- man1dir = $(mandir)/man1
-@@ -101,8 +98,6 @@
- AGENT_CFLAGS = @AGENT_CFLAGS@
- AGENT_LIBS = @AGENT_LIBS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -133,8 +128,6 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
- EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
- EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
-@@ -148,8 +141,6 @@
- E_API_VERSION = @E_API_VERSION@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GEDIT_CFLAGS = @GEDIT_CFLAGS@
-@@ -165,23 +156,8 @@
- GNUPG = @GNUPG@
- GPGME_CONFIG = @GPGME_CONFIG@
- GREP = @GREP@
--HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
--HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
--HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
--HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
--HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
--HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
--HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
--HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
--HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
--HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
--HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
--HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
--HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -227,9 +203,8 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MOZILLA = @MOZILLA@
- MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
-@@ -244,8 +219,6 @@
- NAUTILUS_LIBS = @NAUTILUS_LIBS@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
--OS_WIN32_FALSE = @OS_WIN32_FALSE@
--OS_WIN32_TRUE = @OS_WIN32_TRUE@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -254,8 +227,6 @@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
--PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
--PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
- PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
- POFILES = @POFILES@
- POSUB = @POSUB@
-@@ -270,48 +241,17 @@
+@@ -7007,7 +7219,7 @@
+ 
+ _PKG_TEXT
+ 
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+ 		[$4])
+ else
+ 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+diff -Naur seahorse-2.20.old/agent/Makefile.in seahorse-2.20/agent/Makefile.in
+--- seahorse-2.20.old/agent/Makefile.in	2007-09-17 19:21:14.000000000 +0200
++++ seahorse-2.20/agent/Makefile.in	2007-09-17 23:00:55.000000000 +0200
+@@ -239,15 +239,13 @@
+ RANLIB = @RANLIB@
+ SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
+ SEAHORSE_LIBS = @SEAHORSE_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHARING_CFLAGS = @SHARING_CFLAGS@
+ SHARING_LIBS = @SHARING_LIBS@
  SHELL = @SHELL@
  SOUP_CFLAGS = @SOUP_CFLAGS@
  SOUP_LIBS = @SOUP_LIBS@
@@ -500,276 +1106,22 @@
 -SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
 -SSH_PATH = @SSH_PATH@
  STRIP = @STRIP@
--UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
--UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
--WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
--WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
--WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
--WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
--WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
--WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
--WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
--WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
--WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
--WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
--WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
--WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
--WITH_HKP_FALSE = @WITH_HKP_FALSE@
--WITH_HKP_TRUE = @WITH_HKP_TRUE@
--WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
--WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
--WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
--WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
--WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
--WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
--WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
--WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
--WITH_SSH_FALSE = @WITH_SSH_FALSE@
--WITH_SSH_TRUE = @WITH_SSH_TRUE@
--WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
--WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
- XGETTEXT = @XGETTEXT@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -323,6 +263,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -350,8 +291,11 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- gladedir = $(datadir)/seahorse/glade/
- pixmapsdir = $(datadir)/pixmaps/
- INCLUDES = -I$(top_builddir) \
-@@ -423,7 +367,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
- 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
- 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- 	  if test -f $$p \
-@@ -451,7 +395,7 @@
- 	done
- seahorse-agent$(EXEEXT): $(seahorse_agent_OBJECTS) $(seahorse_agent_DEPENDENCIES) 
- 	@rm -f seahorse-agent$(EXEEXT)
--	$(LINK) $(seahorse_agent_LDFLAGS) $(seahorse_agent_OBJECTS) $(seahorse_agent_LDADD) $(LIBS)
-+	$(LINK) $(seahorse_agent_OBJECTS) $(seahorse_agent_LDADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -469,22 +413,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-agent.Po at am__quote@
- 
- .c.o:
-- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
-- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
-- at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -494,13 +438,9 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- install-man1: $(man1_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
-+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
- 	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -545,7 +485,7 @@
- 	done
- install-gladeDATA: $(glade_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)"
-+	test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
- 	@list='$(glade_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -610,22 +550,21 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
- 	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -641,7 +580,7 @@
- all-am: Makefile $(PROGRAMS) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(gladedir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -677,7 +616,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-libtool distclean-tags
-+	distclean-tags
- 
- dvi: dvi-am
- 
-@@ -691,14 +630,22 @@
- 
- install-data-am: install-gladeDATA install-man
- 
-+install-dvi: install-dvi-am
-+
- install-exec-am: install-binPROGRAMS
- 	@$(NORMAL_INSTALL)
- 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
- 
-+install-html: install-html-am
-+
- install-info: install-info-am
- 
- install-man: install-man1
- 
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -719,30 +666,32 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-binPROGRAMS uninstall-gladeDATA \
--	uninstall-info-am uninstall-man
-+uninstall-am: uninstall-binPROGRAMS uninstall-gladeDATA uninstall-man
- 
- uninstall-man: uninstall-man1
- 
-+.MAKE: install-am install-exec-am install-strip
-+
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
- 	clean-generic clean-libtool ctags distclean distclean-compile \
- 	distclean-generic distclean-libtool distclean-tags distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-binPROGRAMS install-data install-data-am install-exec \
--	install-exec-am install-exec-hook install-gladeDATA \
--	install-info install-info-am install-man install-man1 \
--	install-strip installcheck installcheck-am installdirs \
--	maintainer-clean maintainer-clean-generic mostlyclean \
--	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
--	pdf pdf-am ps ps-am tags uninstall uninstall-am \
--	uninstall-binPROGRAMS uninstall-gladeDATA uninstall-info-am \
--	uninstall-man uninstall-man1
-+	install-binPROGRAMS install-data install-data-am install-dvi \
-+	install-dvi-am install-exec install-exec-am install-exec-hook \
-+	install-gladeDATA install-html install-html-am install-info \
-+	install-info-am install-man install-man1 install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	tags uninstall uninstall-am uninstall-binPROGRAMS \
-+	uninstall-gladeDATA uninstall-man uninstall-man1
- 
- 
- # Don't make the daemon setuid
- # Make the daemon setuid
- @HAVE_USER_MLOCK_FALSE at install-exec-hook:
-- at HAVE_USER_MLOCK_FALSE@	chmod u+s $(DESTDIR)$(bindir)/seahorse-daemon
-+ at HAVE_USER_MLOCK_FALSE@	chmod u+s $(DESTDIR)$(bindir)/seahorse-agent
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/configure seahorse-1.0.1/configure
---- seahorse-1.0.1-old/configure	2007-04-03 18:17:51.000000000 +0200
-+++ seahorse-1.0.1/configure	2007-05-01 22:57:28.000000000 +0200
-@@ -807,6 +807,7 @@
- INSTALL_PROGRAM
- INSTALL_SCRIPT
- INSTALL_DATA
-+am__isrc
- CYGPATH_W
- PACKAGE
- VERSION
-@@ -995,9 +996,6 @@
+diff -Naur seahorse-2.20.old/config.guess seahorse-2.20/config.guess
+diff -Naur seahorse-2.20.old/config.sub seahorse-2.20/config.sub
+diff -Naur seahorse-2.20.old/configure seahorse-2.20/configure
+--- seahorse-2.20.old/configure	2007-09-17 19:21:13.000000000 +0200
++++ seahorse-2.20/configure	2007-09-17 23:00:47.000000000 +0200
+@@ -881,6 +881,7 @@
+ host_cpu
+ host_vendor
+ host_os
++SED
+ GREP
+ EGREP
+ LN_S
+@@ -996,9 +997,6 @@
  WITH_APPLET_FALSE
  LIBNOTIFY_CFLAGS
  LIBNOTIFY_LIBS
@@ -778,416 +1130,2217 @@
 -SSH_PATH
  WITH_SSH_TRUE
  WITH_SSH_FALSE
- WITH_TESTS_TRUE
-@@ -2190,7 +2188,8 @@
- 
- 
- 
--am__api_version="1.9"
-+am__api_version='1.10'
+ LIBEBOOK_CFLAGS
+@@ -4425,12 +4423,13 @@
+   test -z "$as_dir" && as_dir=.
+   for lt_ac_prog in sed gsed; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
++      if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
+         lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+       fi
+     done
+   done
+ done
++IFS=$as_save_IFS
+ lt_ac_max=0
+ lt_ac_count=0
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+@@ -4465,6 +4464,7 @@
+ fi
+ 
+ SED=$lt_cv_path_SED
 +
- ac_aux_dir=
- for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-   if test -f "$ac_dir/install-sh"; then
-@@ -2373,38 +2372,53 @@
- echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ { echo "$as_me:$LINENO: result: $SED" >&5
+ echo "${ECHO_T}$SED" >&6; }
+ 
+@@ -4826,8 +4826,8 @@
+ echo "${ECHO_T}no, using $LN_S" >&6; }
  fi
  
--if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
--  # We used to keeping the `.' as first argument, in order to
--  # allow $(mkdir_p) to be used without argument.  As in
--  #   $(mkdir_p) $(somedir)
--  # where $(somedir) is conditionally defined.  However this is wrong
--  # for two reasons:
--  #  1. if the package is installed by a user who cannot write `.'
--  #     make install will fail,
--  #  2. the above comment should most certainly read
--  #     $(mkdir_p) $(DESTDIR)$(somedir)
--  #     so it does not work when $(somedir) is undefined and
--  #     $(DESTDIR) is not.
--  #  To support the latter case, we have to write
--  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
--  #  so the `.' trick is pointless.
--  mkdir_p='mkdir -p --'
--else
--  # On NextStep and OpenStep, the `mkdir' command does not
--  # recognize any option.  It will interpret all options as
--  # directories to create, and then abort because `.' already
--  # exists.
--  for d in ./-p ./--version;
--  do
--    test -d $d && rmdir $d
--  done
--  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
--  if test -f "$ac_aux_dir/mkinstalldirs"; then
--    mkdir_p='$(mkinstalldirs)'
-+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
-+if test -z "$MKDIR_P"; then
-+  if test "${ac_cv_path_mkdir+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_prog in mkdir gmkdir; do
-+	 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 #(
-+	     'mkdir (GNU coreutils) '* | \
-+	     'mkdir (coreutils) '* | \
-+	     'mkdir (fileutils) '4.1*)
-+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-+	       break 3;;
-+	   esac
-+	 done
-+       done
-+done
-+IFS=$as_save_IFS
+-{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
+-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
++echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
+ if test "${lt_cv_deplibs_check_method+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -4868,9 +4868,15 @@
+ 
+ mingw* | pw32*)
+   # Base MSYS/MinGW do not provide the 'file' command needed by
+-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
+-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+-  lt_cv_file_magic_cmd='$OBJDUMP -f'
++  # func_win32_libid shell function, so use a weaker test based on 'objdump',
++  # unless we find 'file', for example because we are cross-compiling.
++  if ( file / ) >/dev/null 2>&1; then
++    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++    lt_cv_file_magic_cmd='func_win32_libid'
++  else
++    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++    lt_cv_file_magic_cmd='$OBJDUMP -f'
++  fi
+   ;;
+ 
+ darwin* | rhapsody*)
+@@ -4915,7 +4921,7 @@
+   esac
+   ;;
+ 
+-interix3*)
++interix[3-9]*)
+   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+   lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+   ;;
+@@ -4965,6 +4971,10 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
++rdos*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
 +
-+fi
-+
-+  if test "${ac_cv_path_mkdir+set}" = set; then
-+    MKDIR_P="$ac_cv_path_mkdir -p"
-   else
--    mkdir_p='$(install_sh) -d'
-+    # As a last resort, use the slow shell script.  Don't cache a
-+    # 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
-+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-+echo "${ECHO_T}$MKDIR_P" >&6; }
-+
-+mkdir_p="$MKDIR_P"
-+case $mkdir_p in
-+  [\\/$]* | ?:[\\/]*) ;;
-+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-+esac
- 
- for ac_prog in gawk mawk nawk awk
- do
-@@ -2487,12 +2501,16 @@
- fi
- rmdir .tst 2>/dev/null
- 
--# test to see if srcdir already configured
--if test "`cd $srcdir && pwd`" != "`pwd`" &&
--   test -f $srcdir/config.status; then
--  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-+if test "`cd $srcdir && pwd`" != "`pwd`"; then
-+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-+  # is not polluted with repeated "-I."
-+  am__isrc=' -I$(srcdir)'
-+  # test to see if srcdir already configured
-+  if test -f $srcdir/config.status; then
-+    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
- echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-    { (exit 1); exit 1; }; }
-+  fi
- fi
- 
- # test whether we have cygpath
-@@ -2535,7 +2553,7 @@
- 
- MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
- 
--install_sh=${install_sh-"$am_aux_dir/install-sh"}
-+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
- 
- # Installed binaries are usually stripped using `strip' when the user
- # run `make install-strip'.  However `strip' might not be the right
-@@ -2639,7 +2657,7 @@
- fi
- 
- fi
--INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
- 
- # We need awk for the "check" target.  The system "awk" is bad on
- # some platforms.
-@@ -2666,9 +2684,7 @@
- 
-   { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
- echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
--
--
--if test $USE_MAINTAINER_MODE = yes; then
-+   if test $USE_MAINTAINER_MODE = yes; then
-   MAINTAINER_MODE_TRUE=
-   MAINTAINER_MODE_FALSE='#'
- else
-@@ -2734,9 +2750,7 @@
-   am_depcomp="$ac_aux_dir/depcomp"
-   AMDEPBACKSLASH='\'
- fi
--
--
--if test "x$enable_dependency_tracking" != xno; then
-+ if test "x$enable_dependency_tracking" != xno; then
-   AMDEP_TRUE=
-   AMDEP_FALSE='#'
- else
-@@ -2745,7 +2759,6 @@
- fi
- 
- 
--
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3732,6 +3745,7 @@
-        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-          >/dev/null 2>conftest.err &&
-+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-@@ -3761,9 +3775,7 @@
- echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
- CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
- 
--
--
--if
-+ if
-   test "x$enable_dependency_tracking" != xno \
-   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-   am__fastdepCC_TRUE=
-@@ -5024,7 +5036,7 @@
+ solaris*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+@@ -5051,7 +5061,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 5027 "configure"' > conftest.$ac_ext
-+  echo '#line 5039 "configure"' > conftest.$ac_ext
+-  echo '#line 5054 "configure"' > conftest.$ac_ext
++  echo '#line 5064 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -6248,6 +6260,7 @@
-        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-          >/dev/null 2>conftest.err &&
-+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-@@ -6277,9 +6290,7 @@
- echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
- CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
- 
--
--
--if
-+ if
-   test "x$enable_dependency_tracking" != xno \
-   && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-   am__fastdepCXX_TRUE=
-@@ -7751,11 +7762,11 @@
+@@ -5086,7 +5096,8 @@
+   rm -rf conftest*
+   ;;
+ 
+-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++s390*-*linux*|sparc*-*linux*)
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+@@ -5097,6 +5108,9 @@
+     case `/usr/bin/file conftest.o` in
+     *32-bit*)
+       case $host in
++        x86_64-*kfreebsd*-gnu)
++          LD="${LD-ld} -m elf_i386_fbsd"
++          ;;
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_i386"
+           ;;
+@@ -5113,6 +5127,9 @@
+       ;;
+     *64-bit*)
+       case $host in
++        x86_64-*kfreebsd*-gnu)
++          LD="${LD-ld} -m elf_x86_64_fbsd"
++          ;;
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_x86_64"
+           ;;
+@@ -6900,24 +6917,27 @@
+     fi
+     ;;
+   *)
+-    # If test is not a shell built-in, we'll probably end up computing a
+-    # maximum length that is only half of the actual maximum length, but
+-    # we can't tell.
+-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+-    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
++    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
++    if test -n "$lt_cv_sys_max_cmd_len"; then
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++    else
++      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++      while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
+ 	       = "XX$teststring") >/dev/null 2>&1 &&
+-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
+-	    lt_cv_sys_max_cmd_len=$new_result &&
+-	    test $i != 17 # 1/2 MB should be enough
+-    do
+-      i=`expr $i + 1`
+-      teststring=$teststring$teststring
+-    done
+-    teststring=
+-    # Add a significant safety factor because C++ compilers can tack on massive
+-    # amounts of additional arguments before passing them to the linker.
+-    # It appears as though 1/2 is a usable value.
+-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
++	      lt_cv_sys_max_cmd_len=$new_result &&
++	      test $i != 17 # 1/2 MB should be enough
++      do
++        i=`expr $i + 1`
++        teststring=$teststring$teststring
++      done
++      teststring=
++      # Add a significant safety factor because C++ compilers can tack on massive
++      # amounts of additional arguments before passing them to the linker.
++      # It appears as though 1/2 is a usable value.
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++    fi
+     ;;
+   esac
+ 
+@@ -6934,6 +6954,7 @@
+ 
+ 
+ 
++
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+ { echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+ echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
+@@ -7522,7 +7543,7 @@
+ test -z "$ac_objext" && ac_objext=o
+ 
+ # Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+ old_postinstall_cmds='chmod 644 $oldlib'
+ old_postuninstall_cmds=
+ 
+@@ -7722,10 +7743,10 @@
+ objext=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(){return(0);}\n'
++lt_simple_link_test_code='int main(){return(0);}'
+ 
+ 
+ # If no C compiler was specified, use CC.
+@@ -7740,13 +7761,13 @@
+ 
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+ 
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -7766,7 +7787,7 @@
+ else
+   lt_cv_prog_compiler_rtti_exceptions=no
+   ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="-fno-rtti -fno-exceptions"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+@@ -7777,11 +7798,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:7754: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7765: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:7780: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7801: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:7758: \$? = $ac_status" >&5
-+   echo "$as_me:7769: \$? = $ac_status" >&5
+-   echo "$as_me:7784: \$? = $ac_status" >&5
++   echo "$as_me:7805: \$? = $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.
-@@ -8019,11 +8030,11 @@
+@@ -7832,13 +7853,15 @@
+       lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
+       lt_prog_compiler_pic='-DDLL_EXPORT'
+       ;;
+ 
+@@ -7848,7 +7871,7 @@
+       lt_prog_compiler_pic='-fno-common'
+       ;;
+ 
+-    interix3*)
++    interix[3-9]*)
+       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+       # Instead, we relocate shared libraries at runtime.
+       ;;
+@@ -7906,7 +7929,7 @@
+        esac
+        ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       lt_prog_compiler_pic='-DDLL_EXPORT'
+@@ -7958,6 +7981,22 @@
+         # All Alpha code is PIC.
+         lt_prog_compiler_static='-non_shared'
+         ;;
++      *)
++        case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C 5.9
++	  lt_prog_compiler_pic='-KPIC'
++	  lt_prog_compiler_static='-Bstatic'
++	  lt_prog_compiler_wl='-Wl,'
++	  ;;
++	*Sun\ F*)
++	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
++	  lt_prog_compiler_pic='-KPIC'
++	  lt_prog_compiler_static='-Bstatic'
++	  lt_prog_compiler_wl=''
++	  ;;
++	esac
++	;;
+       esac
+       ;;
+ 
+@@ -7967,6 +8006,10 @@
+       lt_prog_compiler_static='-non_shared'
+       ;;
+ 
++    rdos*)
++      lt_prog_compiler_static='-non_shared'
++      ;;
++
+     solaris*)
+       lt_prog_compiler_pic='-KPIC'
+       lt_prog_compiler_static='-Bstatic'
+@@ -8034,7 +8077,7 @@
+ else
+   lt_prog_compiler_pic_works=no
+   ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+@@ -8045,11 +8088,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:8022: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8033: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:8048: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8091: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:8026: \$? = $ac_status" >&5
-+   echo "$as_me:8037: \$? = $ac_status" >&5
+-   echo "$as_me:8052: \$? = $ac_status" >&5
++   echo "$as_me:8095: \$? = $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.
-@@ -8123,11 +8134,11 @@
+@@ -8098,7 +8141,7 @@
+   lt_prog_compiler_static_works=no
+    save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+      # The linker can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+@@ -8138,7 +8181,7 @@
+    mkdir conftest
+    cd conftest
+    mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+@@ -8149,11 +8192,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:8126: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8137: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:8152: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8195: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:8130: \$? = $ac_status" >&5
-+   echo "$as_me:8141: \$? = $ac_status" >&5
+-   echo "$as_me:8156: \$? = $ac_status" >&5
++   echo "$as_me:8199: \$? = $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
-@@ -10420,7 +10431,7 @@
+@@ -8345,7 +8388,7 @@
+       allow_undefined_flag=unsupported
+       always_export_symbols=no
+       enable_shared_with_static_runtimes=yes
+-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ 
+       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+@@ -8363,7 +8406,7 @@
+       fi
+       ;;
+ 
+-    interix3*)
++    interix[3-9]*)
+       hardcode_direct=no
+       hardcode_shlibpath_var=no
+       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+@@ -8378,7 +8421,7 @@
+       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+       ;;
+ 
+-    linux* | k*bsd*-gnu)
++    gnu* | linux* | k*bsd*-gnu)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	tmp_addflag=
+ 	case $cc_basename,$host_cpu in
+@@ -8396,13 +8439,22 @@
+ 	ifc* | ifort*)			# Intel Fortran compiler
+ 	  tmp_addflag=' -nofor_main' ;;
+ 	esac
+-	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)			# Sun C 5.9
++	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_sharedflag='-G' ;;
++	*Sun\ F*)			# Sun Fortran 8.3
++	  tmp_sharedflag='-G' ;;
++	*)
++	  tmp_sharedflag='-shared' ;;
++	esac
++	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 
+ 	if test $supports_anon_versioning = yes; then
+ 	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
+   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+   $echo "local: *; };" >> $output_objdir/$libname.ver~
+-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ 	fi
+ 	link_all_deplibs=no
+       else
+@@ -8562,7 +8614,7 @@
+   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+ 	  then
+   	  # We have reworked collect2
+-  	  hardcode_direct=yes
++  	  :
+ 	  else
+   	  # We have old collect2
+   	  hardcode_direct=unsupported
+@@ -8636,11 +8688,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -8695,11 +8754,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -8753,7 +8819,7 @@
+       # The linker will automatically build a .lib file if we build a DLL.
+       old_archive_From_new_cmds='true'
+       # FIXME: Should let the user specify the lib program.
+-      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+       fix_srcfile_path='`cygpath -w "$srcfile"`'
+       enable_shared_with_static_runtimes=yes
+       ;;
+@@ -8795,10 +8861,10 @@
+       case $cc_basename in
+         xlc*)
+          output_verbose_link_cmd='echo'
+-         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+          module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           ;;
+        *)
+@@ -8960,24 +9026,28 @@
+       ;;
+ 
+     openbsd*)
+-      hardcode_direct=yes
+-      hardcode_shlibpath_var=no
+-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+-	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+-	export_dynamic_flag_spec='${wl}-E'
++      if test -f /usr/libexec/ld.so; then
++	hardcode_direct=yes
++	hardcode_shlibpath_var=no
++	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	  export_dynamic_flag_spec='${wl}-E'
++	else
++	  case $host_os in
++	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	     hardcode_libdir_flag_spec='-R$libdir'
++	     ;;
++	   *)
++	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	     ;;
++	  esac
++        fi
+       else
+-       case $host_os in
+-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+-	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	   hardcode_libdir_flag_spec='-R$libdir'
+-	   ;;
+-	 *)
+-	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+-	   ;;
+-       esac
++	ld_shlibs=no
+       fi
+       ;;
+ 
+@@ -9036,17 +9106,16 @@
+       case $host_os in
+       solaris2.[0-5] | solaris2.[0-5].*) ;;
+       *)
+- 	# The compiler driver will combine linker options so we
+- 	# cannot just pass the convience library names through
+- 	# without $wl, iff we do not link with $LD.
+- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++	# The compiler driver will combine and reorder linker options,
++	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but is careful enough not to reorder.
+  	# Supported since Solaris 2.6 (maybe 2.5.1?)
+- 	case $wlarc in
+- 	'')
+- 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+- 	*)
+- 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+- 	esac ;;
++	if test "$GCC" = yes; then
++	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	else
++	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
++	fi
++	;;
+       esac
+       link_all_deplibs=yes
+       ;;
+@@ -9103,7 +9172,7 @@
+       fi
+       ;;
+ 
+-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+       no_undefined_flag='${wl}-z,text'
+       archive_cmds_need_lc=no
+       hardcode_shlibpath_var=no
+@@ -9180,7 +9249,7 @@
+       { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+       $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+@@ -9238,17 +9307,55 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
++
+ if test "$GCC" = yes; then
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++  case $host_os in
++    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++    *) lt_awk_arg="/^libraries:/" ;;
++  esac
++  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
+     # if the path contains ";" then we assume it to be the separator
+     # otherwise default to the standard path separator (i.e. ":") - it is
+     # assumed that no part of a normal pathname contains ";" but that should
+     # okay in the real world where ";" in dirpaths is itself problematic.
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+   else
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+   fi
++  # Ok, now we have the path, separated by spaces, we can step through it
++  # and add multilib dir if necessary.
++  lt_tmp_lt_search_path_spec=
++  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++  for lt_sys_path in $lt_search_path_spec; do
++    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++    else
++      test -d "$lt_sys_path" && \
++	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
++    fi
++  done
++  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
++BEGIN {RS=" "; FS="/|\n";} {
++  lt_foo="";
++  lt_count=0;
++  for (lt_i = NF; lt_i > 0; lt_i--) {
++    if ($lt_i != "" && $lt_i != ".") {
++      if ($lt_i == "..") {
++        lt_count++;
++      } else {
++        if (lt_count == 0) {
++          lt_foo="/" $lt_i lt_foo;
++        } else {
++          lt_count--;
++        }
++      }
++    }
++  }
++  if (lt_foo != "") { lt_freq[lt_foo]++; }
++  if (lt_freq[lt_foo] == 1) { print lt_foo; }
++}'`
++  sys_lib_search_path_spec=`echo $lt_search_path_spec`
+ else
+   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ fi
+@@ -9408,12 +9515,8 @@
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if test "$GCC" = yes; then
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
++
++  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   ;;
+ 
+@@ -9467,7 +9570,7 @@
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
+-  freebsd*) # from 4.6 on
++  *) # from 4.6 on, and DragonFly
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+@@ -9530,7 +9633,7 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
+-interix3*)
++interix[3-9]*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -9601,7 +9704,7 @@
+ 
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+@@ -9707,6 +9810,10 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
++rdos*)
++  dynamic_linker=no
++  ;;
++
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -9860,6 +9967,7 @@
+    darwin*)
+        if test -n "$STRIP" ; then
+          striplib="$STRIP -x"
++         old_striplib="$STRIP -S"
+          { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+        else
+@@ -10446,7 +10554,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 10423 "configure"
-+#line 10434 "configure"
+-#line 10449 "configure"
++#line 10557 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -10520,7 +10531,7 @@
+@@ -10546,7 +10654,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 10523 "configure"
-+#line 10534 "configure"
+-#line 10549 "configure"
++#line 10657 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -12856,11 +12867,11 @@
+@@ -10744,6 +10852,7 @@
+     module_cmds \
+     module_expsym_cmds \
+     lt_cv_prog_compiler_c_o \
++    fix_srcfile_path \
+     exclude_expsyms \
+     include_expsyms; do
+ 
+@@ -10788,7 +10897,7 @@
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+ # Free Software Foundation, Inc.
+ #
+ # This file is part of GNU Libtool:
+@@ -11112,7 +11221,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path"
++fix_srcfile_path=$lt_fix_srcfile_path
+ 
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols
+@@ -11281,10 +11390,10 @@
+ objext_CXX=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
++lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ 
+@@ -11300,13 +11409,13 @@
+ 
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+ 
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -11565,7 +11674,7 @@
+ 	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+ 	then
+ 	  # We have reworked collect2
+-	  hardcode_direct_CXX=yes
++	  :
+ 	else
+ 	  # We have old collect2
+ 	  hardcode_direct_CXX=unsupported
+@@ -11639,11 +11748,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -11699,11 +11815,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -11822,10 +11945,10 @@
+       case $cc_basename in
+         xlc*)
+          output_verbose_link_cmd='echo'
+-          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+           module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           ;;
+        *)
+@@ -11908,9 +12031,7 @@
+       hardcode_libdir_separator_CXX=:
+ 
+       case $host_cpu in
+-      hppa*64*|ia64*)
+-	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
+-        ;;
++      hppa*64*|ia64*) ;;
+       *)
+ 	export_dynamic_flag_spec_CXX='${wl}-E'
+         ;;
+@@ -11978,7 +12099,7 @@
+ 	;;
+     esac
+     ;;
+-  interix3*)
++  interix[3-9]*)
+     hardcode_direct_CXX=no
+     hardcode_shlibpath_var_CXX=no
+     hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+@@ -12098,6 +12219,29 @@
+ 	# dependencies.
+ 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ 	;;
++      *)
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C++ 5.9
++	  no_undefined_flag_CXX=' -zdefs'
++	  archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
++	  hardcode_libdir_flag_spec_CXX='-R$libdir'
++	  whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++
++	  # Not sure whether something based on
++	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
++	  # would be better.
++	  output_verbose_link_cmd='echo'
++
++	  # Archives containing C++ object files must be created using
++	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
++	  # necessary to make sure instantiated templates are included
++	  # in the archive.
++	  old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
++	  ;;
++	esac
++	;;
+     esac
+     ;;
+   lynxos*)
+@@ -12136,16 +12280,20 @@
+     ld_shlibs_CXX=no
+     ;;
+   openbsd*)
+-    hardcode_direct_CXX=yes
+-    hardcode_shlibpath_var_CXX=no
+-    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+-    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+-      export_dynamic_flag_spec_CXX='${wl}-E'
+-      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    if test -f /usr/libexec/ld.so; then
++      hardcode_direct_CXX=yes
++      hardcode_shlibpath_var_CXX=no
++      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++      hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++	export_dynamic_flag_spec_CXX='${wl}-E'
++	whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      fi
++      output_verbose_link_cmd='echo'
++    else
++      ld_shlibs_CXX=no
+     fi
+-    output_verbose_link_cmd='echo'
+     ;;
+   osf3*)
+     case $cc_basename in
+@@ -12307,15 +12455,10 @@
+ 	case $host_os in
+ 	  solaris2.[0-5] | solaris2.[0-5].*) ;;
+ 	  *)
+-	    # The C++ compiler is used as linker so we must use $wl
+-	    # flag to pass the commands to the underlying system
+-	    # linker. We must also pass each convience library through
+-	    # to the system linker between allextract/defaultextract.
+-	    # The C++ compiler will combine linker options so we
+-	    # cannot just pass the convience library names through
+-	    # without $wl.
++	    # The compiler driver will combine and reorder linker options,
++	    # but understands `-z linker_flag'.
+ 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
++	    whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
+ 	    ;;
+ 	esac
+ 	link_all_deplibs_CXX=yes
+@@ -12362,6 +12505,12 @@
+ 	  fi
+ 
+ 	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
++	  case $host_os in
++	  solaris2.[0-5] | solaris2.[0-5].*) ;;
++	  *)
++	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    ;;
++	  esac
+ 	fi
+ 	;;
+     esac
+@@ -12553,7 +12702,7 @@
+ 
+ # PORTME: override above test on systems where it is broken
+ case $host_os in
+-interix3*)
++interix[3-9]*)
+   # Interix 3.5 installs completely hosed .la files for C++, so rather than
+   # hack all around it, let's just trust "g++" to DTRT.
+   predep_objects_CXX=
+@@ -12561,13 +12710,46 @@
+   postdeps_CXX=
+   ;;
+ 
++linux*)
++  case `$CC -V 2>&1 | sed 5q` in
++  *Sun\ C*)
++    # Sun C++ 5.9
++    #
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
++      ;;
++    esac
++    if test "$solaris_use_stlport4" != yes; then
++      postdeps_CXX='-library=Cstd -library=Crun'
++    fi
++    ;;
++  esac
++  ;;
++
+ solaris*)
+   case $cc_basename in
+   CC*)
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
++      ;;
++    esac
++
+     # Adding this requires a known-good setup of shared libraries for
+     # Sun compiler versions before 5.6, else PIC objects from an old
+     # archive will be linked into the output, leading to subtle bugs.
+-    postdeps_CXX='-lCstd -lCrun'
++    if test "$solaris_use_stlport4" != yes; then
++      postdeps_CXX='-library=Cstd -library=Crun'
++    fi
+     ;;
+   esac
+   ;;
+@@ -12604,12 +12786,14 @@
+       # like `-m68040'.
+       lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+       ;;
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+-    mingw* | os2* | pw32*)
++    mingw* | cygwin* | os2* | pw32*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
+       lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+       ;;
+     darwin* | rhapsody*)
+@@ -12621,7 +12805,7 @@
+       # DJGPP does not support shared libraries at all
+       lt_prog_compiler_pic_CXX=
+       ;;
+-    interix3*)
++    interix[3-9]*)
+       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+       # Instead, we relocate shared libraries at runtime.
+       ;;
+@@ -12757,6 +12941,14 @@
+ 	    lt_prog_compiler_static_CXX='-non_shared'
+ 	    ;;
+ 	  *)
++	    case `$CC -V 2>&1 | sed 5q` in
++	    *Sun\ C*)
++	      # Sun C++ 5.9
++	      lt_prog_compiler_pic_CXX='-KPIC'
++	      lt_prog_compiler_static_CXX='-Bstatic'
++	      lt_prog_compiler_wl_CXX='-Qoption ld '
++	      ;;
++	    esac
+ 	    ;;
+ 	esac
+ 	;;
+@@ -12871,7 +13063,7 @@
+ else
+   lt_prog_compiler_pic_works_CXX=no
+   ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+@@ -12882,11 +13074,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:12859: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:12870: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:12885: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:13077: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:12863: \$? = $ac_status" >&5
-+   echo "$as_me:12874: \$? = $ac_status" >&5
+-   echo "$as_me:12889: \$? = $ac_status" >&5
++   echo "$as_me:13081: \$? = $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.
-@@ -12960,11 +12971,11 @@
+@@ -12935,7 +13127,7 @@
+   lt_prog_compiler_static_works_CXX=no
+    save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+      # The linker can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+@@ -12975,7 +13167,7 @@
+    mkdir conftest
+    cd conftest
+    mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+@@ -12986,11 +13178,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:12963: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:12974: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:12989: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:13181: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:12967: \$? = $ac_status" >&5
-+   echo "$as_me:12978: \$? = $ac_status" >&5
+-   echo "$as_me:12993: \$? = $ac_status" >&5
++   echo "$as_me:13185: \$? = $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
-@@ -14521,11 +14532,11 @@
+@@ -13056,7 +13248,7 @@
+     export_symbols_cmds_CXX="$ltdll_cmds"
+   ;;
+   cygwin* | mingw*)
+-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+   ;;
+   linux* | k*bsd*-gnu)
+     link_all_deplibs_CXX=no
+@@ -13090,7 +13282,7 @@
+       { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+       $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+@@ -13148,20 +13340,7 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-if test "$GCC" = yes; then
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+-    # if the path contains ";" then we assume it to be the separator
+-    # otherwise default to the standard path separator (i.e. ":") - it is
+-    # assumed that no part of a normal pathname contains ";" but that should
+-    # okay in the real world where ";" in dirpaths is itself problematic.
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+-  else
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+-  fi
+-else
+-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
++
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -13318,12 +13497,7 @@
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if test "$GCC" = yes; then
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
++
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   ;;
+ 
+@@ -13377,7 +13551,7 @@
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
+-  freebsd*) # from 4.6 on
++  *) # from 4.6 on, and DragonFly
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+@@ -13440,7 +13614,7 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
+-interix3*)
++interix[3-9]*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -13511,7 +13685,7 @@
+ 
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+@@ -13617,6 +13791,10 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
++rdos*)
++  dynamic_linker=no
++  ;;
++
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -13811,6 +13989,7 @@
+     module_cmds_CXX \
+     module_expsym_cmds_CXX \
+     lt_cv_prog_compiler_c_o_CXX \
++    fix_srcfile_path_CXX \
+     exclude_expsyms_CXX \
+     include_expsyms_CXX; do
+ 
+@@ -14131,7 +14310,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_CXX"
++fix_srcfile_path=$lt_fix_srcfile_path
+ 
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols_CXX
+@@ -14222,10 +14401,17 @@
+ objext_F77=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
++lt_simple_compile_test_code="\
++      subroutine t
++      return
++      end
++"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code="      program t\n      end\n"
++lt_simple_link_test_code="\
++      program t
++      end
++"
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ 
+@@ -14241,13 +14427,13 @@
+ 
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+ 
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -14334,13 +14520,15 @@
+       lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
+       lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+       ;;
+ 
+@@ -14350,7 +14538,7 @@
+       lt_prog_compiler_pic_F77='-fno-common'
+       ;;
+ 
+-    interix3*)
++    interix[3-9]*)
+       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+       # Instead, we relocate shared libraries at runtime.
+       ;;
+@@ -14408,7 +14596,7 @@
+        esac
+        ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+@@ -14460,6 +14648,22 @@
+         # All Alpha code is PIC.
+         lt_prog_compiler_static_F77='-non_shared'
+         ;;
++      *)
++        case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C 5.9
++	  lt_prog_compiler_pic_F77='-KPIC'
++	  lt_prog_compiler_static_F77='-Bstatic'
++	  lt_prog_compiler_wl_F77='-Wl,'
++	  ;;
++	*Sun\ F*)
++	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
++	  lt_prog_compiler_pic_F77='-KPIC'
++	  lt_prog_compiler_static_F77='-Bstatic'
++	  lt_prog_compiler_wl_F77=''
++	  ;;
++	esac
++	;;
+       esac
+       ;;
+ 
+@@ -14469,6 +14673,10 @@
+       lt_prog_compiler_static_F77='-non_shared'
+       ;;
+ 
++    rdos*)
++      lt_prog_compiler_static_F77='-non_shared'
++      ;;
++
+     solaris*)
+       lt_prog_compiler_pic_F77='-KPIC'
+       lt_prog_compiler_static_F77='-Bstatic'
+@@ -14536,7 +14744,7 @@
+ else
+   lt_prog_compiler_pic_works_F77=no
+   ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="$lt_prog_compiler_pic_F77"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+@@ -14547,11 +14755,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:14524: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14535: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:14550: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14758: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:14528: \$? = $ac_status" >&5
-+   echo "$as_me:14539: \$? = $ac_status" >&5
+-   echo "$as_me:14554: \$? = $ac_status" >&5
++   echo "$as_me:14762: \$? = $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.
-@@ -14625,11 +14636,11 @@
+@@ -14600,7 +14808,7 @@
+   lt_prog_compiler_static_works_F77=no
+    save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+      # The linker can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+@@ -14640,7 +14848,7 @@
+    mkdir conftest
+    cd conftest
+    mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+@@ -14651,11 +14859,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:14628: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14639: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:14654: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14862: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:14632: \$? = $ac_status" >&5
-+   echo "$as_me:14643: \$? = $ac_status" >&5
+-   echo "$as_me:14658: \$? = $ac_status" >&5
++   echo "$as_me:14866: \$? = $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
-@@ -16812,11 +16823,11 @@
+@@ -14847,7 +15055,7 @@
+       allow_undefined_flag_F77=unsupported
+       always_export_symbols_F77=no
+       enable_shared_with_static_runtimes_F77=yes
+-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ 
+       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+         archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+@@ -14865,7 +15073,7 @@
+       fi
+       ;;
+ 
+-    interix3*)
++    interix[3-9]*)
+       hardcode_direct_F77=no
+       hardcode_shlibpath_var_F77=no
+       hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+@@ -14880,7 +15088,7 @@
+       archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+       ;;
+ 
+-    linux* | k*bsd*-gnu)
++    gnu* | linux* | k*bsd*-gnu)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	tmp_addflag=
+ 	case $cc_basename,$host_cpu in
+@@ -14898,13 +15106,22 @@
+ 	ifc* | ifort*)			# Intel Fortran compiler
+ 	  tmp_addflag=' -nofor_main' ;;
+ 	esac
+-	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)			# Sun C 5.9
++	  whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_sharedflag='-G' ;;
++	*Sun\ F*)			# Sun Fortran 8.3
++	  tmp_sharedflag='-G' ;;
++	*)
++	  tmp_sharedflag='-shared' ;;
++	esac
++	archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 
+ 	if test $supports_anon_versioning = yes; then
+ 	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
+   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+   $echo "local: *; };" >> $output_objdir/$libname.ver~
+-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ 	fi
+ 	link_all_deplibs_F77=no
+       else
+@@ -15064,7 +15281,7 @@
+   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+ 	  then
+   	  # We have reworked collect2
+-  	  hardcode_direct_F77=yes
++  	  :
+ 	  else
+   	  # We have old collect2
+   	  hardcode_direct_F77=unsupported
+@@ -15128,11 +15345,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -15177,11 +15401,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -15235,7 +15466,7 @@
+       # The linker will automatically build a .lib file if we build a DLL.
+       old_archive_From_new_cmds_F77='true'
+       # FIXME: Should let the user specify the lib program.
+-      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
+       fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
+       enable_shared_with_static_runtimes_F77=yes
+       ;;
+@@ -15277,10 +15508,10 @@
+       case $cc_basename in
+         xlc*)
+          output_verbose_link_cmd='echo'
+-         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+          module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           ;;
+        *)
+@@ -15442,24 +15673,28 @@
+       ;;
+ 
+     openbsd*)
+-      hardcode_direct_F77=yes
+-      hardcode_shlibpath_var_F77=no
+-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+-	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+-	export_dynamic_flag_spec_F77='${wl}-E'
++      if test -f /usr/libexec/ld.so; then
++	hardcode_direct_F77=yes
++	hardcode_shlibpath_var_F77=no
++	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	  archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	  hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++	  export_dynamic_flag_spec_F77='${wl}-E'
++	else
++	  case $host_os in
++	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	     archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	     hardcode_libdir_flag_spec_F77='-R$libdir'
++	     ;;
++	   *)
++	     archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	     hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++	     ;;
++	  esac
++        fi
+       else
+-       case $host_os in
+-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+-	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	   hardcode_libdir_flag_spec_F77='-R$libdir'
+-	   ;;
+-	 *)
+-	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+-	   ;;
+-       esac
++	ld_shlibs_F77=no
+       fi
+       ;;
+ 
+@@ -15518,17 +15753,16 @@
+       case $host_os in
+       solaris2.[0-5] | solaris2.[0-5].*) ;;
+       *)
+- 	# The compiler driver will combine linker options so we
+- 	# cannot just pass the convience library names through
+- 	# without $wl, iff we do not link with $LD.
+- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++	# The compiler driver will combine and reorder linker options,
++	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but is careful enough not to reorder.
+  	# Supported since Solaris 2.6 (maybe 2.5.1?)
+- 	case $wlarc in
+- 	'')
+- 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
+- 	*)
+- 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+- 	esac ;;
++	if test "$GCC" = yes; then
++	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	else
++	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
++	fi
++	;;
+       esac
+       link_all_deplibs_F77=yes
+       ;;
+@@ -15585,7 +15819,7 @@
+       fi
+       ;;
+ 
+-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+       no_undefined_flag_F77='${wl}-z,text'
+       archive_cmds_need_lc_F77=no
+       hardcode_shlibpath_var_F77=no
+@@ -15662,7 +15896,7 @@
+       { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+       $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+@@ -15720,20 +15954,7 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-if test "$GCC" = yes; then
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+-    # if the path contains ";" then we assume it to be the separator
+-    # otherwise default to the standard path separator (i.e. ":") - it is
+-    # assumed that no part of a normal pathname contains ";" but that should
+-    # okay in the real world where ";" in dirpaths is itself problematic.
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+-  else
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+-  fi
+-else
+-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
++
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -15890,12 +16111,7 @@
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if test "$GCC" = yes; then
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
++
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   ;;
+ 
+@@ -15949,7 +16165,7 @@
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
+-  freebsd*) # from 4.6 on
++  *) # from 4.6 on, and DragonFly
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+@@ -16012,7 +16228,7 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
+-interix3*)
++interix[3-9]*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -16083,7 +16299,7 @@
+ 
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+@@ -16189,6 +16405,10 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
++rdos*)
++  dynamic_linker=no
++  ;;
++
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -16383,6 +16603,7 @@
+     module_cmds_F77 \
+     module_expsym_cmds_F77 \
+     lt_cv_prog_compiler_c_o_F77 \
++    fix_srcfile_path_F77 \
+     exclude_expsyms_F77 \
+     include_expsyms_F77; do
+ 
+@@ -16703,7 +16924,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_F77"
++fix_srcfile_path=$lt_fix_srcfile_path
+ 
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols_F77
+@@ -16761,10 +16982,10 @@
+ objext_GCJ=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}\n"
++lt_simple_compile_test_code="class foo {}"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ 
+@@ -16780,13 +17001,13 @@
+ 
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+ 
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -16827,7 +17048,7 @@
+ else
+   lt_cv_prog_compiler_rtti_exceptions=no
+   ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="-fno-rtti -fno-exceptions"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+@@ -16838,11 +17059,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:16815: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16826: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16841: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17062: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:16819: \$? = $ac_status" >&5
-+   echo "$as_me:16830: \$? = $ac_status" >&5
+-   echo "$as_me:16845: \$? = $ac_status" >&5
++   echo "$as_me:17066: \$? = $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.
-@@ -17080,11 +17091,11 @@
+@@ -16893,13 +17114,15 @@
+       lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
+       lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+       ;;
+ 
+@@ -16909,7 +17132,7 @@
+       lt_prog_compiler_pic_GCJ='-fno-common'
+       ;;
+ 
+-    interix3*)
++    interix[3-9]*)
+       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+       # Instead, we relocate shared libraries at runtime.
+       ;;
+@@ -16967,7 +17190,7 @@
+        esac
+        ;;
+ 
+-    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+@@ -17019,6 +17242,22 @@
+         # All Alpha code is PIC.
+         lt_prog_compiler_static_GCJ='-non_shared'
+         ;;
++      *)
++        case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C 5.9
++	  lt_prog_compiler_pic_GCJ='-KPIC'
++	  lt_prog_compiler_static_GCJ='-Bstatic'
++	  lt_prog_compiler_wl_GCJ='-Wl,'
++	  ;;
++	*Sun\ F*)
++	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
++	  lt_prog_compiler_pic_GCJ='-KPIC'
++	  lt_prog_compiler_static_GCJ='-Bstatic'
++	  lt_prog_compiler_wl_GCJ=''
++	  ;;
++	esac
++	;;
+       esac
+       ;;
+ 
+@@ -17028,6 +17267,10 @@
+       lt_prog_compiler_static_GCJ='-non_shared'
+       ;;
+ 
++    rdos*)
++      lt_prog_compiler_static_GCJ='-non_shared'
++      ;;
++
+     solaris*)
+       lt_prog_compiler_pic_GCJ='-KPIC'
+       lt_prog_compiler_static_GCJ='-Bstatic'
+@@ -17095,7 +17338,7 @@
+ else
+   lt_prog_compiler_pic_works_GCJ=no
+   ac_outfile=conftest.$ac_objext
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+@@ -17106,11 +17349,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:17083: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17094: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:17109: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17352: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:17087: \$? = $ac_status" >&5
-+   echo "$as_me:17098: \$? = $ac_status" >&5
+-   echo "$as_me:17113: \$? = $ac_status" >&5
++   echo "$as_me:17356: \$? = $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.
-@@ -17184,11 +17195,11 @@
+@@ -17159,7 +17402,7 @@
+   lt_prog_compiler_static_works_GCJ=no
+    save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+      # The linker can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+@@ -17199,7 +17442,7 @@
+    mkdir conftest
+    cd conftest
+    mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+@@ -17210,11 +17453,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:17187: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17198: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:17213: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17456: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:17191: \$? = $ac_status" >&5
-+   echo "$as_me:17202: \$? = $ac_status" >&5
+-   echo "$as_me:17217: \$? = $ac_status" >&5
++   echo "$as_me:17460: \$? = $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
-@@ -19878,9 +19889,7 @@
+@@ -17406,7 +17649,7 @@
+       allow_undefined_flag_GCJ=unsupported
+       always_export_symbols_GCJ=no
+       enable_shared_with_static_runtimes_GCJ=yes
+-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ 
+       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+         archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+@@ -17424,7 +17667,7 @@
+       fi
+       ;;
+ 
+-    interix3*)
++    interix[3-9]*)
+       hardcode_direct_GCJ=no
+       hardcode_shlibpath_var_GCJ=no
+       hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+@@ -17439,7 +17682,7 @@
+       archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+       ;;
+ 
+-    linux* | k*bsd*-gnu)
++    gnu* | linux* | k*bsd*-gnu)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	tmp_addflag=
+ 	case $cc_basename,$host_cpu in
+@@ -17457,13 +17700,22 @@
+ 	ifc* | ifort*)			# Intel Fortran compiler
+ 	  tmp_addflag=' -nofor_main' ;;
+ 	esac
+-	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)			# Sun C 5.9
++	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_sharedflag='-G' ;;
++	*Sun\ F*)			# Sun Fortran 8.3
++	  tmp_sharedflag='-G' ;;
++	*)
++	  tmp_sharedflag='-shared' ;;
++	esac
++	archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 
+ 	if test $supports_anon_versioning = yes; then
+ 	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
+   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+   $echo "local: *; };" >> $output_objdir/$libname.ver~
+-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ 	fi
+ 	link_all_deplibs_GCJ=no
+       else
+@@ -17623,7 +17875,7 @@
+   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+ 	  then
+   	  # We have reworked collect2
+-  	  hardcode_direct_GCJ=yes
++  	  :
+ 	  else
+   	  # We have old collect2
+   	  hardcode_direct_GCJ=unsupported
+@@ -17697,11 +17949,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -17756,11 +18015,18 @@
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+ 
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -17814,7 +18080,7 @@
+       # The linker will automatically build a .lib file if we build a DLL.
+       old_archive_From_new_cmds_GCJ='true'
+       # FIXME: Should let the user specify the lib program.
+-      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
+       fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
+       enable_shared_with_static_runtimes_GCJ=yes
+       ;;
+@@ -17856,10 +18122,10 @@
+       case $cc_basename in
+         xlc*)
+          output_verbose_link_cmd='echo'
+-         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+          module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           ;;
+        *)
+@@ -18021,24 +18287,28 @@
+       ;;
+ 
+     openbsd*)
+-      hardcode_direct_GCJ=yes
+-      hardcode_shlibpath_var_GCJ=no
+-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+-	export_dynamic_flag_spec_GCJ='${wl}-E'
++      if test -f /usr/libexec/ld.so; then
++	hardcode_direct_GCJ=yes
++	hardcode_shlibpath_var_GCJ=no
++	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	  archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	  hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++	  export_dynamic_flag_spec_GCJ='${wl}-E'
++	else
++	  case $host_os in
++	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	     archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	     hardcode_libdir_flag_spec_GCJ='-R$libdir'
++	     ;;
++	   *)
++	     archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	     hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++	     ;;
++	  esac
++        fi
+       else
+-       case $host_os in
+-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+-	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
+-	   ;;
+-	 *)
+-	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+-	   ;;
+-       esac
++	ld_shlibs_GCJ=no
+       fi
+       ;;
+ 
+@@ -18097,17 +18367,16 @@
+       case $host_os in
+       solaris2.[0-5] | solaris2.[0-5].*) ;;
+       *)
+- 	# The compiler driver will combine linker options so we
+- 	# cannot just pass the convience library names through
+- 	# without $wl, iff we do not link with $LD.
+- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++	# The compiler driver will combine and reorder linker options,
++	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but is careful enough not to reorder.
+  	# Supported since Solaris 2.6 (maybe 2.5.1?)
+- 	case $wlarc in
+- 	'')
+- 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
+- 	*)
+- 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+- 	esac ;;
++	if test "$GCC" = yes; then
++	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	else
++	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
++	fi
++	;;
        esac
- fi
- 
--
--
--if test "$enable_schemas_install" != no; then
-+   if test "$enable_schemas_install" != no; then
-   GCONF_SCHEMAS_INSTALL_TRUE=
-   GCONF_SCHEMAS_INSTALL_FALSE='#'
- else
-@@ -20072,9 +20081,7 @@
-   enable_scrollkeeper=yes
- fi
- 
--
--
--if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
-+ if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
-   ENABLE_SK_TRUE=
-   ENABLE_SK_FALSE='#'
- else
-@@ -20083,9 +20090,7 @@
- fi
- 
- 
--
--
--if test "$gdu_cv_have_gdu" = "yes"; then
-+ if test "$gdu_cv_have_gdu" = "yes"; then
-   HAVE_GNOME_DOC_UTILS_TRUE=
-   HAVE_GNOME_DOC_UTILS_FALSE='#'
- else
-@@ -21034,6 +21039,7 @@
-                 #include <sys/mman.h>
-                 #include <sys/types.h>
-                 #include <fcntl.h>
-+                #include <stdio.h>
- 
-                 int main () {
-                     long int pgsize = getpagesize ();
-@@ -21047,10 +21053,11 @@
+       link_all_deplibs_GCJ=yes
+       ;;
+@@ -18164,7 +18433,7 @@
+       fi
+       ;;
+ 
+-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+       no_undefined_flag_GCJ='${wl}-z,text'
+       archive_cmds_need_lc_GCJ=no
+       hardcode_shlibpath_var_GCJ=no
+@@ -18241,7 +18510,7 @@
+       { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+       $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+@@ -18299,20 +18568,7 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-if test "$GCC" = yes; then
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+-    # if the path contains ";" then we assume it to be the separator
+-    # otherwise default to the standard path separator (i.e. ":") - it is
+-    # assumed that no part of a normal pathname contains ";" but that should
+-    # okay in the real world where ";" in dirpaths is itself problematic.
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+-  else
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+-  fi
+-else
+-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
++
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -18469,12 +18725,7 @@
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if test "$GCC" = yes; then
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
++
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   ;;
+ 
+@@ -18528,7 +18779,7 @@
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
+-  freebsd*) # from 4.6 on
++  *) # from 4.6 on, and DragonFly
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+@@ -18591,7 +18842,7 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
+-interix3*)
++interix[3-9]*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -18662,7 +18913,7 @@
+ 
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+@@ -18768,6 +19019,10 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
++rdos*)
++  dynamic_linker=no
++  ;;
++
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -18962,6 +19217,7 @@
+     module_cmds_GCJ \
+     module_expsym_cmds_GCJ \
+     lt_cv_prog_compiler_c_o_GCJ \
++    fix_srcfile_path_GCJ \
+     exclude_expsyms_GCJ \
+     include_expsyms_GCJ; do
+ 
+@@ -19282,7 +19538,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_GCJ"
++fix_srcfile_path=$lt_fix_srcfile_path
+ 
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols_GCJ
+@@ -19339,7 +19595,7 @@
+ objext_RC=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+ 
+ # Code to be used in simple link tests
+ lt_simple_link_test_code="$lt_simple_compile_test_code"
+@@ -19358,13 +19614,13 @@
+ 
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+ 
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -19442,6 +19698,7 @@
+     module_cmds_RC \
+     module_expsym_cmds_RC \
+     lt_cv_prog_compiler_c_o_RC \
++    fix_srcfile_path_RC \
+     exclude_expsyms_RC \
+     include_expsyms_RC; do
+ 
+@@ -19762,7 +20019,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_RC"
++fix_srcfile_path=$lt_fix_srcfile_path
+ 
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols_RC
+@@ -21068,10 +21325,11 @@
                          return 2;
                      }
                      /* Configure is being run as root? */
@@ -1201,227 +3354,43 @@
                      return 0;
                  }
  
-@@ -21091,9 +21098,7 @@
- 
- fi
- 
--
--
--if test "$seahorse_cv_have_user_mlock" = "yes"; then
-+          if test "$seahorse_cv_have_user_mlock" = "yes"; then
-   HAVE_USER_MLOCK_TRUE=
-   HAVE_USER_MLOCK_FALSE='#'
+@@ -21241,7 +21499,7 @@
+ and SEAHORSE_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ 
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -21251,7 +21509,7 @@
+ and SEAHORSE_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ 
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
  else
-@@ -21255,9 +21260,7 @@
- esac
- { echo "$as_me:$LINENO: result: $platform_win32" >&5
- echo "${ECHO_T}$platform_win32" >&6; }
--
--
--if test "$platform_win32" = "yes"; then
-+ if test "$platform_win32" = "yes"; then
-   PLATFORM_WIN32_TRUE=
-   PLATFORM_WIN32_FALSE='#'
+@@ -22691,7 +22949,7 @@
+ and LIBCRYPTUI_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ 
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -22701,7 +22959,7 @@
+ and LIBCRYPTUI_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ 
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
  else
-@@ -21278,9 +21281,7 @@
- esac
- { echo "$as_me:$LINENO: result: $os_win32" >&5
- echo "${ECHO_T}$os_win32" >&6; }
--
--
--if test "$os_win32" = "yes"; then
-+ if test "$os_win32" = "yes"; then
-   OS_WIN32_TRUE=
-   OS_WIN32_FALSE='#'
- else
-@@ -21926,9 +21927,7 @@
-   done
- fi
- 
--
--
--if test "$with_ldap" = "yes"; then
-+ if test "$with_ldap" = "yes"; then
-   WITH_LDAP_TRUE=
-   WITH_LDAP_FALSE='#'
- else
-@@ -22046,9 +22045,7 @@
-     fi
- fi
- 
--
--
--if test "$enable_hkp" = "yes"; then
-+ if test "$enable_hkp" = "yes"; then
-   WITH_HKP_TRUE=
-   WITH_HKP_FALSE='#'
- else
-@@ -22059,9 +22056,7 @@
- 
- 
- 
--
--
--if test "$with_keyserver" = "yes"; then
-+ if test "$with_keyserver" = "yes"; then
-   WITH_KEYSERVER_TRUE=
-   WITH_KEYSERVER_FALSE='#'
- else
-@@ -22180,9 +22175,7 @@
-     fi
- fi
- 
--
--
--if test "$with_nautilus_ext" = "yes"; then
-+ if test "$with_nautilus_ext" = "yes"; then
-   WITH_NAUTILUS_EXT_TRUE=
-   WITH_NAUTILUS_EXT_FALSE='#'
- else
-@@ -22218,9 +22211,7 @@
- 
- fi
- 
--
--
--if test "$enable_agent" != "no"; then
-+ if test "$enable_agent" != "no"; then
-   WITH_AGENT_TRUE=
-   WITH_AGENT_FALSE='#'
- else
-@@ -22327,9 +22318,7 @@
-     fi
- fi
- 
--
--
--if test "$enable_gnome_keyring" = "yes"; then
-+ if test "$enable_gnome_keyring" = "yes"; then
-   WITH_GNOME_KEYRING_TRUE=
-   WITH_GNOME_KEYRING_FALSE='#'
- else
-@@ -22443,9 +22432,7 @@
-     fi
- fi
- 
--
--
--if test "$enable_sharing" = "yes"; then
-+ if test "$enable_sharing" = "yes"; then
-   WITH_SHARING_TRUE=
-   WITH_SHARING_FALSE='#'
- else
-@@ -22872,9 +22859,7 @@
- 
- fi
- 
--
--
--if test "$gecko_cv_gecko_flavour" = "toolkit"; then
-+ if test "$gecko_cv_gecko_flavour" = "toolkit"; then
-   HAVE_MOZILLA_TOOLKIT_TRUE=
-   HAVE_MOZILLA_TOOLKIT_FALSE='#'
- else
-@@ -23152,9 +23137,7 @@
- 
- fi # if gecko_cv_have_gecko
- 
--
--
--if test "$gecko_cv_have_debug" = "yes"; then
-+ if test "$gecko_cv_have_debug" = "yes"; then
-   HAVE_GECKO_DEBUG_TRUE=
-   HAVE_GECKO_DEBUG_FALSE='#'
- else
-@@ -23326,9 +23309,7 @@
- 
- fi # if gecko_cv_have_gecko
- 
--
--
--if test "$gecko_cv_gecko_version_int" -ge "1007000"; then
-+ if test "$gecko_cv_gecko_version_int" -ge "1007000"; then
-   HAVE_GECKO_1_7_TRUE=
-   HAVE_GECKO_1_7_FALSE='#'
- else
-@@ -23336,9 +23317,7 @@
-   HAVE_GECKO_1_7_FALSE=
- fi
- 
--
--
--if test "$gecko_cv_gecko_version_int" -ge "1008000"; then
-+ if test "$gecko_cv_gecko_version_int" -ge "1008000"; then
-   HAVE_GECKO_1_8_TRUE=
-   HAVE_GECKO_1_8_FALSE='#'
- else
-@@ -23346,9 +23325,7 @@
-   HAVE_GECKO_1_8_FALSE=
- fi
- 
--
--
--if test "$gecko_cv_gecko_version_int" -ge "1008001"; then
-+ if test "$gecko_cv_gecko_version_int" -ge "1008001"; then
-   HAVE_GECKO_1_8_1_TRUE=
-   HAVE_GECKO_1_8_1_FALSE='#'
- else
-@@ -23356,9 +23333,7 @@
-   HAVE_GECKO_1_8_1_FALSE=
- fi
- 
--
--
--if test "$gecko_cv_gecko_version_int" -ge "1009000"; then
-+ if test "$gecko_cv_gecko_version_int" -ge "1009000"; then
-   HAVE_GECKO_1_9_TRUE=
-   HAVE_GECKO_1_9_FALSE='#'
- else
-@@ -27239,9 +27214,7 @@
-     fi
- fi
- 
--
--
--if test "$with_epiphany_plugin" = "yes"; then
-+ if test "$with_epiphany_plugin" = "yes"; then
-   WITH_EPIPHANY_TRUE=
-   WITH_EPIPHANY_FALSE='#'
- else
-@@ -31711,9 +31684,7 @@
-     fi
- fi
- 
--
--
--if test "$enable_gedit" = "yes"; then
-+ if test "$enable_gedit" = "yes"; then
-   WITH_GEDIT_TRUE=
-   WITH_GEDIT_FALSE='#'
- else
-@@ -31721,9 +31692,7 @@
-   WITH_GEDIT_FALSE=
- fi
- 
--
--
--if test "$with_gedit_bonobo" = "yes"; then
-+ if test "$with_gedit_bonobo" = "yes"; then
-   WITH_GEDIT_BONOBO_TRUE=
-   WITH_GEDIT_BONOBO_FALSE='#'
- else
-@@ -31842,9 +31811,7 @@
-     fi
- fi
- 
--
--
--if test "$enable_applet" = "yes"; then
-+ if test "$enable_applet" = "yes"; then
-   WITH_APPLET_TRUE=
-   WITH_APPLET_FALSE='#'
- else
-@@ -31962,133 +31929,13 @@
+@@ -43271,133 +43529,13 @@
      echo "disabling ssh support"
  else
  
@@ -1562,7 +3531,7 @@
          enable_ssh="yes"
  
  cat >>confdefs.h <<\_ACEOF
-@@ -32097,26 +31944,24 @@
+@@ -43406,20 +43544,20 @@
  
  
  cat >>confdefs.h <<_ACEOF
@@ -1587,84 +3556,42 @@
  
  fi
  
--
--
--if test "$enable_ssh" == "yes"; then
-+ if test "$enable_ssh" == "yes"; then
-   WITH_SSH_TRUE=
-   WITH_SSH_FALSE='#'
- else
-@@ -32174,9 +32019,7 @@
-     enable_tests="no"
- fi
- 
--
--
--if test "$enable_tests" == "yes"; then
-+ if test "$enable_tests" == "yes"; then
-   WITH_TESTS_TRUE=
-   WITH_TESTS_FALSE='#'
- else
-@@ -32235,9 +32078,7 @@
-   enableval=$enable_update_mime_database;
- fi
- 
--
--
--if test "$enable_update_mime_database" != "no"; then
-+ if test "$enable_update_mime_database" != "no"; then
-   UPDATE_MIME_DATABASE_TRUE=
-   UPDATE_MIME_DATABASE_FALSE='#'
- else
-@@ -34449,6 +34290,7 @@
- ac_pwd='$ac_pwd'
- srcdir='$srcdir'
- INSTALL='$INSTALL'
-+MKDIR_P='$MKDIR_P'
+@@ -44817,8 +44955,8 @@
+ "Content-Transfer-Encoding: 8bit\n"
+ 
  _ACEOF
- 
- cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -34692,6 +34534,7 @@
- INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
- INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
- INSTALL_DATA!$INSTALL_DATA$ac_delim
-+am__isrc!$am__isrc$ac_delim
- CYGPATH_W!$CYGPATH_W$ac_delim
- PACKAGE!$PACKAGE$ac_delim
- VERSION!$VERSION$ac_delim
-@@ -34748,7 +34591,6 @@
- EXEEXT!$EXEEXT$ac_delim
- OBJEXT!$OBJEXT$ac_delim
- DEPDIR!$DEPDIR$ac_delim
--am__include!$am__include$ac_delim
+-if { (echo "$as_me:$LINENO: msgfmt -c -o /dev/null conftest.foo") >&5
+-  (msgfmt -c -o /dev/null conftest.foo) 2>&5
++if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
++  ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+@@ -46205,6 +46343,7 @@
+ host_cpu!$host_cpu$ac_delim
+ host_vendor!$host_vendor$ac_delim
+ host_os!$host_os$ac_delim
++SED!$SED$ac_delim
+ GREP!$GREP$ac_delim
+ EGREP!$EGREP$ac_delim
+ LN_S!$LN_S$ac_delim
+@@ -46284,7 +46423,6 @@
+ HAVE_MOZILLA_TOOLKIT_TRUE!$HAVE_MOZILLA_TOOLKIT_TRUE$ac_delim
+ HAVE_MOZILLA_TOOLKIT_FALSE!$HAVE_MOZILLA_TOOLKIT_FALSE$ac_delim
+ HAVE_GECKO_DEBUG_TRUE!$HAVE_GECKO_DEBUG_TRUE$ac_delim
+-HAVE_GECKO_DEBUG_FALSE!$HAVE_GECKO_DEBUG_FALSE$ac_delim
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -34790,6 +34632,7 @@
+@@ -46326,6 +46464,7 @@
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
-+am__include!$am__include$ac_delim
- am__quote!$am__quote$ac_delim
- AMDEP_TRUE!$AMDEP_TRUE$ac_delim
- AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-@@ -34886,7 +34729,6 @@
- HAVE_MOZILLA_TOOLKIT_FALSE!$HAVE_MOZILLA_TOOLKIT_FALSE$ac_delim
- HAVE_GECKO_DEBUG_TRUE!$HAVE_GECKO_DEBUG_TRUE$ac_delim
- HAVE_GECKO_DEBUG_FALSE!$HAVE_GECKO_DEBUG_FALSE$ac_delim
--HAVE_GECKO_1_7_TRUE!$HAVE_GECKO_1_7_TRUE$ac_delim
- _ACEOF
- 
-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -34928,6 +34770,7 @@
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
-   cat >conf$$subs.sed <<_ACEOF
-+HAVE_GECKO_1_7_TRUE!$HAVE_GECKO_1_7_TRUE$ac_delim
++HAVE_GECKO_DEBUG_FALSE!$HAVE_GECKO_DEBUG_FALSE$ac_delim
+ HAVE_GECKO_1_7_TRUE!$HAVE_GECKO_1_7_TRUE$ac_delim
  HAVE_GECKO_1_7_FALSE!$HAVE_GECKO_1_7_FALSE$ac_delim
  HAVE_GECKO_1_8_TRUE!$HAVE_GECKO_1_8_TRUE$ac_delim
- HAVE_GECKO_1_8_FALSE!$HAVE_GECKO_1_8_FALSE$ac_delim
-@@ -34962,9 +34805,6 @@
+@@ -46361,9 +46500,6 @@
  WITH_APPLET_FALSE!$WITH_APPLET_FALSE$ac_delim
  LIBNOTIFY_CFLAGS!$LIBNOTIFY_CFLAGS$ac_delim
  LIBNOTIFY_LIBS!$LIBNOTIFY_LIBS$ac_delim
@@ -1673,185 +3600,27 @@
 -SSH_PATH!$SSH_PATH$ac_delim
  WITH_SSH_TRUE!$WITH_SSH_TRUE$ac_delim
  WITH_SSH_FALSE!$WITH_SSH_FALSE$ac_delim
- WITH_TESTS_TRUE!$WITH_TESTS_TRUE$ac_delim
-@@ -34992,7 +34832,7 @@
+ LIBEBOOK_CFLAGS!$LIBEBOOK_CFLAGS$ac_delim
+@@ -46397,7 +46533,7 @@
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 62; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 69; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 67; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -35219,6 +35059,11 @@
-   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-   *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-   esac
-+  ac_MKDIR_P=$MKDIR_P
-+  case $MKDIR_P in
-+  [\\/$]* | ?:[\\/]* ) ;;
-+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-+  esac
- _ACEOF
- 
- cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -35272,6 +35117,7 @@
- s&@abs_builddir@&$ac_abs_builddir&;t t
- s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
- s&@INSTALL@&$ac_INSTALL&;t t
-+s&@MKDIR_P@&$ac_MKDIR_P&;t t
- $ac_datarootdir_hack
- " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
- 
-@@ -35436,8 +35282,9 @@
-   # some people rename them; so instead we look at the file content.
-   # Grep'ing the first line is not enough: some people post-process
-   # each Makefile.in and add a new line on top of each file to say so.
--  # So let's grep whole file.
--  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-+  # Grep'ing the whole file is not good either: AIX grep has a line
-+  # limit of 2048, but all sed's we know have understand at least 4000.
-+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-     dirpart=`$as_dirname -- "$mf" ||
- $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$mf" : 'X\(//\)[^/]' \| \
-diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/daemon/Makefile.in seahorse-1.0.1/daemon/Makefile.in
---- seahorse-1.0.1-old/daemon/Makefile.in	2007-04-03 18:17:44.000000000 +0200
-+++ seahorse-1.0.1/daemon/Makefile.in	2007-05-01 22:57:36.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,15 +15,11 @@
- @SET_MAKE@
- 
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -69,17 +65,18 @@
- seahorse_daemon_DEPENDENCIES =  \
- 	$(top_builddir)/libseahorse/libseahorse.a \
- 	$(top_builddir)/libcryptui/libcryptui.la $(am__DEPENDENCIES_1)
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(seahorse_daemon_SOURCES)
- DIST_SOURCES = $(am__seahorse_daemon_SOURCES_DIST)
- man1dir = $(mandir)/man1
-@@ -101,8 +98,6 @@
- AGENT_CFLAGS = @AGENT_CFLAGS@
- AGENT_LIBS = @AGENT_LIBS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -133,8 +128,6 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
- EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
- EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
-@@ -148,8 +141,6 @@
- E_API_VERSION = @E_API_VERSION@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GEDIT_CFLAGS = @GEDIT_CFLAGS@
-@@ -165,23 +156,8 @@
- GNUPG = @GNUPG@
- GPGME_CONFIG = @GPGME_CONFIG@
- GREP = @GREP@
--HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
--HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
--HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
--HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
--HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
--HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
--HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
--HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
--HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
--HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
--HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
--HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
--HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -227,9 +203,8 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MOZILLA = @MOZILLA@
- MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
-@@ -244,8 +219,6 @@
- NAUTILUS_LIBS = @NAUTILUS_LIBS@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
--OS_WIN32_FALSE = @OS_WIN32_FALSE@
--OS_WIN32_TRUE = @OS_WIN32_TRUE@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -254,8 +227,6 @@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
--PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
--PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
- PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
- POFILES = @POFILES@
- POSUB = @POSUB@
-@@ -270,48 +241,17 @@
+diff -Naur seahorse-2.20.old/daemon/Makefile.in seahorse-2.20/daemon/Makefile.in
+--- seahorse-2.20.old/daemon/Makefile.in	2007-09-17 19:21:14.000000000 +0200
++++ seahorse-2.20/daemon/Makefile.in	2007-09-17 23:00:55.000000000 +0200
+@@ -239,15 +239,13 @@
+ RANLIB = @RANLIB@
+ SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
+ SEAHORSE_LIBS = @SEAHORSE_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHARING_CFLAGS = @SHARING_CFLAGS@
+ SHARING_LIBS = @SHARING_LIBS@
  SHELL = @SHELL@
  SOUP_CFLAGS = @SOUP_CFLAGS@
  SOUP_LIBS = @SOUP_LIBS@
@@ -1859,381 +3628,19 @@
 -SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
 -SSH_PATH = @SSH_PATH@
  STRIP = @STRIP@
--UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
--UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
--WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
--WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
--WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
--WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
--WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
--WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
--WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
--WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
--WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
--WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
--WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
--WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
--WITH_HKP_FALSE = @WITH_HKP_FALSE@
--WITH_HKP_TRUE = @WITH_HKP_TRUE@
--WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
--WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
--WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
--WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
--WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
--WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
--WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
--WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
--WITH_SSH_FALSE = @WITH_SSH_FALSE@
--WITH_SSH_TRUE = @WITH_SSH_TRUE@
--WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
--WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
- XGETTEXT = @XGETTEXT@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -323,6 +263,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -350,8 +291,11 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- gladedir = $(datadir)/seahorse/glade/
- pixmapsdir = $(datadir)/pixmaps/
- INCLUDES = -I$(top_builddir) \
-@@ -440,7 +384,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
- 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
- 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- 	  if test -f $$p \
-@@ -468,7 +412,7 @@
- 	done
- seahorse-daemon$(EXEEXT): $(seahorse_daemon_OBJECTS) $(seahorse_daemon_DEPENDENCIES) 
- 	@rm -f seahorse-daemon$(EXEEXT)
--	$(LINK) $(seahorse_daemon_LDFLAGS) $(seahorse_daemon_OBJECTS) $(seahorse_daemon_LDADD) $(LIBS)
-+	$(LINK) $(seahorse_daemon_OBJECTS) $(seahorse_daemon_LDADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -485,22 +429,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-sharing.Po at am__quote@
- 
- .c.o:
-- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
-- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
-- at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -510,13 +454,9 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- install-man1: $(man1_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
-+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
- 	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -561,7 +501,7 @@
- 	done
- install-gladeDATA: $(glade_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)"
-+	test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
- 	@list='$(glade_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -578,7 +518,7 @@
- 	done
- install-serviceDATA: $(service_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
-+	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
- 	@list='$(service_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -643,22 +583,21 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
- 	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -675,7 +614,7 @@
- all-am: Makefile $(PROGRAMS) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(servicedir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) install-am
-@@ -713,7 +652,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-libtool distclean-tags
-+	distclean-tags
- 
- dvi: dvi-am
- 
-@@ -727,14 +666,22 @@
- 
- install-data-am: install-gladeDATA install-man install-serviceDATA
- 
-+install-dvi: install-dvi-am
-+
- install-exec-am: install-binPROGRAMS
- 	@$(NORMAL_INSTALL)
- 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
- 
-+install-html: install-html-am
-+
- install-info: install-info-am
- 
- install-man: install-man1
- 
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -755,25 +702,28 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-binPROGRAMS uninstall-gladeDATA \
--	uninstall-info-am uninstall-man uninstall-serviceDATA
-+uninstall-am: uninstall-binPROGRAMS uninstall-gladeDATA uninstall-man \
-+	uninstall-serviceDATA
- 
- uninstall-man: uninstall-man1
- 
-+.MAKE: install-am install-exec-am install-strip
-+
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
- 	clean-generic clean-libtool ctags distclean distclean-compile \
- 	distclean-generic distclean-libtool distclean-tags distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-binPROGRAMS install-data install-data-am install-exec \
--	install-exec-am install-exec-hook install-gladeDATA \
--	install-info install-info-am install-man install-man1 \
--	install-serviceDATA install-strip installcheck installcheck-am \
--	installdirs maintainer-clean maintainer-clean-generic \
--	mostlyclean mostlyclean-compile mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
--	uninstall-am uninstall-binPROGRAMS uninstall-gladeDATA \
--	uninstall-info-am uninstall-man uninstall-man1 \
--	uninstall-serviceDATA
-+	install-binPROGRAMS install-data install-data-am install-dvi \
-+	install-dvi-am install-exec install-exec-am install-exec-hook \
-+	install-gladeDATA install-html install-html-am install-info \
-+	install-info-am install-man install-man1 install-pdf \
-+	install-pdf-am install-ps install-ps-am install-serviceDATA \
-+	install-strip installcheck installcheck-am installdirs \
-+	maintainer-clean maintainer-clean-generic mostlyclean \
-+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-+	uninstall-binPROGRAMS uninstall-gladeDATA uninstall-man \
-+	uninstall-man1 uninstall-serviceDATA
- 
- 
- # DBUS binding files
-diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/data/Makefile.in seahorse-1.0.1/data/Makefile.in
---- seahorse-1.0.1-old/data/Makefile.in	2007-04-03 18:17:44.000000000 +0200
-+++ seahorse-1.0.1/data/Makefile.in	2007-05-01 22:57:36.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
- 
- @SET_MAKE@
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -64,8 +60,6 @@
- AGENT_CFLAGS = @AGENT_CFLAGS@
- AGENT_LIBS = @AGENT_LIBS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -96,8 +90,6 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
- EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
- EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
-@@ -111,8 +103,6 @@
- E_API_VERSION = @E_API_VERSION@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GEDIT_CFLAGS = @GEDIT_CFLAGS@
-@@ -128,23 +118,8 @@
- GNUPG = @GNUPG@
- GPGME_CONFIG = @GPGME_CONFIG@
- GREP = @GREP@
--HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
--HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
--HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
--HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
--HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
--HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
--HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
--HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
--HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
--HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
--HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
--HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
--HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -190,9 +165,8 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MOZILLA = @MOZILLA@
- MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
-@@ -207,8 +181,6 @@
- NAUTILUS_LIBS = @NAUTILUS_LIBS@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
--OS_WIN32_FALSE = @OS_WIN32_FALSE@
--OS_WIN32_TRUE = @OS_WIN32_TRUE@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -217,8 +189,6 @@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
--PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
--PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
- PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
- POFILES = @POFILES@
- POSUB = @POSUB@
-@@ -233,48 +203,17 @@
+diff -Naur seahorse-2.20.old/data/Makefile.in seahorse-2.20/data/Makefile.in
+--- seahorse-2.20.old/data/Makefile.in	2007-09-17 19:21:15.000000000 +0200
++++ seahorse-2.20/data/Makefile.in	2007-09-17 23:00:55.000000000 +0200
+@@ -201,15 +201,13 @@
+ RANLIB = @RANLIB@
+ SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
+ SEAHORSE_LIBS = @SEAHORSE_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHARING_CFLAGS = @SHARING_CFLAGS@
+ SHARING_LIBS = @SHARING_LIBS@
  SHELL = @SHELL@
  SOUP_CFLAGS = @SOUP_CFLAGS@
  SOUP_LIBS = @SOUP_LIBS@
@@ -2241,401 +3648,19 @@
 -SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
 -SSH_PATH = @SSH_PATH@
  STRIP = @STRIP@
--UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
--UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
--WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
--WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
--WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
--WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
--WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
--WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
--WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
--WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
--WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
--WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
--WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
--WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
--WITH_HKP_FALSE = @WITH_HKP_FALSE@
--WITH_HKP_TRUE = @WITH_HKP_TRUE@
--WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
--WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
--WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
--WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
--WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
--WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
--WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
--WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
--WITH_SSH_FALSE = @WITH_SSH_FALSE@
--WITH_SSH_TRUE = @WITH_SSH_TRUE@
--WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
--WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
- XGETTEXT = @XGETTEXT@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -286,6 +225,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -313,8 +253,11 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- schemasdir = $(GCONF_SCHEMA_FILE_DIR)
- schemas_in_files = seahorse.schemas.in
- schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
-@@ -358,13 +301,9 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- install-schemasDATA: $(schemas_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(schemasdir)" || $(mkdir_p) "$(DESTDIR)$(schemasdir)"
-+	test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)"
- 	@list='$(schemas_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -387,22 +326,21 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
- 	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -418,7 +356,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(schemasdir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -451,7 +389,7 @@
- 
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -465,12 +403,20 @@
- 
- install-data-am: install-data-local install-schemasDATA
- 
-+install-dvi: install-dvi-am
-+
- install-exec-am:
- 
-+install-html: install-html-am
-+
- install-info: install-info-am
- 
- install-man:
- 
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -489,18 +435,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am uninstall-schemasDATA
-+uninstall-am: uninstall-schemasDATA
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-data-local install-exec \
--	install-exec-am install-info install-info-am install-man \
-+	install-data install-data-am install-data-local install-dvi \
-+	install-dvi-am install-exec install-exec-am install-html \
-+	install-html-am install-info install-info-am install-man \
-+	install-pdf install-pdf-am install-ps install-ps-am \
- 	install-schemasDATA install-strip installcheck installcheck-am \
- 	installdirs maintainer-clean maintainer-clean-generic \
- 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
--	ps ps-am uninstall uninstall-am uninstall-info-am \
--	uninstall-schemasDATA
-+	ps ps-am uninstall uninstall-am uninstall-schemasDATA
- 
- 
- @INTLTOOL_SCHEMAS_RULE@
-diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/depcomp seahorse-1.0.1/depcomp
---- seahorse-1.0.1-old/depcomp	2007-03-17 21:34:35.000000000 +0100
-+++ seahorse-1.0.1/depcomp	2007-05-01 22:57:42.000000000 +0200
-@@ -1,9 +1,10 @@
- #! /bin/sh
- # depcomp - compile a program generating dependencies as side-effects
- 
--scriptversion=2005-07-09.11
-+scriptversion=2006-10-15.18
- 
--# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
-+# Foundation, Inc.
- 
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -91,7 +92,20 @@
- ## gcc 3 implements dependency tracking that does exactly what
- ## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
- ## it if -MD -MP comes after the -MF stuff.  Hmm.
--  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-+## the command line argument order; so add the flags where they
-+## appear in depend2.am.  Note that the slowdown incurred here
-+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-+  for arg
-+  do
-+    case $arg in
-+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-+    *)  set fnord "$@" "$arg" ;;
-+    esac
-+    shift # fnord
-+    shift # $arg
-+  done
-+  "$@"
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-@@ -276,6 +290,46 @@
-   rm -f "$tmpdepfile"
-   ;;
- 
-+hp2)
-+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-+  # compilers, which have integrated preprocessors.  The correct option
-+  # to use with these is +Maked; it writes dependencies to a file named
-+  # 'foo.d', which lands next to the object file, wherever that
-+  # happens to be.
-+  # Much of this is similar to the tru64 case; see comments there.
-+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+  test "x$dir" = "x$object" && dir=
-+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-+  if test "$libtool" = yes; then
-+    tmpdepfile1=$dir$base.d
-+    tmpdepfile2=$dir.libs/$base.d
-+    "$@" -Wc,+Maked
-+  else
-+    tmpdepfile1=$dir$base.d
-+    tmpdepfile2=$dir$base.d
-+    "$@" +Maked
-+  fi
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+     rm -f "$tmpdepfile1" "$tmpdepfile2"
-+     exit $stat
-+  fi
-+
-+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-+  do
-+    test -f "$tmpdepfile" && break
-+  done
-+  if test -f "$tmpdepfile"; then
-+    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-+    # Add `dependent.h:' lines.
-+    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
-+  else
-+    echo "#dummy" > "$depfile"
-+  fi
-+  rm -f "$tmpdepfile" "$tmpdepfile2"
-+  ;;
-+
- tru64)
-    # The Tru64 compiler uses -MD to generate dependencies as a side
-    # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-@@ -288,13 +342,13 @@
- 
-    if test "$libtool" = yes; then
-       # With Tru64 cc, shared objects can also be used to make a
--      # static library.  This mecanism is used in libtool 1.4 series to
-+      # static library.  This mechanism is used in libtool 1.4 series to
-       # handle both shared and static libraries in a single compilation.
-       # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-       #
-       # With libtool 1.5 this exception was removed, and libtool now
-       # generates 2 separate objects for the 2 libraries.  These two
--      # compilations output dependencies in in $dir.libs/$base.o.d and
-+      # compilations output dependencies in $dir.libs/$base.o.d and
-       # in $dir$base.o.d.  We have to check for both files, because
-       # one of the two compilations can be disabled.  We should prefer
-       # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/help/Makefile.in seahorse-1.0.1/help/Makefile.in
---- seahorse-1.0.1-old/help/Makefile.in	2007-04-03 18:17:44.000000000 +0200
-+++ seahorse-1.0.1/help/Makefile.in	2007-05-01 22:57:37.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -37,15 +37,11 @@
- # the same distribution terms that you use for the rest of that program.
- 
- ################################################################################
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -79,8 +75,6 @@
- AGENT_CFLAGS = @AGENT_CFLAGS@
- AGENT_LIBS = @AGENT_LIBS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -111,8 +105,6 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
- EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
- EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
-@@ -126,8 +118,6 @@
- E_API_VERSION = @E_API_VERSION@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GEDIT_CFLAGS = @GEDIT_CFLAGS@
-@@ -143,23 +133,8 @@
- GNUPG = @GNUPG@
- GPGME_CONFIG = @GPGME_CONFIG@
- GREP = @GREP@
--HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
--HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
--HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
--HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
--HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
--HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
--HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
--HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
--HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
--HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
--HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
--HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
--HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -205,9 +180,8 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MOZILLA = @MOZILLA@
- MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
-@@ -222,8 +196,6 @@
- NAUTILUS_LIBS = @NAUTILUS_LIBS@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
--OS_WIN32_FALSE = @OS_WIN32_FALSE@
--OS_WIN32_TRUE = @OS_WIN32_TRUE@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -232,8 +204,6 @@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
--PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
--PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
- PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
- POFILES = @POFILES@
- POSUB = @POSUB@
-@@ -248,48 +218,17 @@
+diff -Naur seahorse-2.20.old/help/Makefile.in seahorse-2.20/help/Makefile.in
+--- seahorse-2.20.old/help/Makefile.in	2007-09-17 19:21:15.000000000 +0200
++++ seahorse-2.20/help/Makefile.in	2007-09-17 23:00:56.000000000 +0200
+@@ -216,15 +216,13 @@
+ RANLIB = @RANLIB@
+ SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
+ SEAHORSE_LIBS = @SEAHORSE_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHARING_CFLAGS = @SHARING_CFLAGS@
+ SHARING_LIBS = @SHARING_LIBS@
  SHELL = @SHELL@
  SOUP_CFLAGS = @SOUP_CFLAGS@
  SOUP_LIBS = @SOUP_LIBS@
@@ -2643,812 +3668,20 @@
 -SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
 -SSH_PATH = @SSH_PATH@
  STRIP = @STRIP@
--UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
--UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
--WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
--WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
--WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
--WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
--WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
--WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
--WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
--WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
--WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
--WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
--WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
--WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
--WITH_HKP_FALSE = @WITH_HKP_FALSE@
--WITH_HKP_TRUE = @WITH_HKP_TRUE@
--WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
--WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
--WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
--WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
--WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
--WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
--WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
--WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
--WITH_SSH_FALSE = @WITH_SSH_FALSE@
--WITH_SSH_TRUE = @WITH_SSH_TRUE@
--WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
--WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
- XGETTEXT = @XGETTEXT@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -301,6 +240,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -328,8 +268,11 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
- _DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS))
- _DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)),		\
-@@ -489,10 +432,6 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -501,23 +440,21 @@
- 
- 
- distdir: $(DISTFILES)
--	$(mkdir_p) $(distdir)/..
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
- 	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -565,8 +502,7 @@
- 
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool \
--	distclean-local
-+distclean-am: clean-am distclean-generic distclean-local
- 
- dvi: dvi-am
- 
-@@ -580,12 +516,20 @@
- 
- install-data-am: install-data-local
- 
-+install-dvi: install-dvi-am
-+
- install-exec-am:
- 
-+install-html: install-html-am
-+
- install-info: install-info-am
- 
- install-man:
- 
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -606,19 +550,22 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am uninstall-local
-+uninstall-am: uninstall-local
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	clean-local dist-hook distclean distclean-generic \
- 	distclean-libtool distclean-local distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-data-local install-exec \
--	install-exec-am install-info install-info-am install-man \
--	install-strip installcheck installcheck-am installdirs \
--	maintainer-clean maintainer-clean-generic \
--	maintainer-clean-local mostlyclean mostlyclean-generic \
--	mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am \
--	uninstall uninstall-am uninstall-info-am uninstall-local
-+	install-data-am install-data-local install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic maintainer-clean-local mostlyclean \
-+	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
-+	pdf-am ps ps-am uninstall uninstall-am uninstall-local
- 
- 
- DOC_H_FILE ?=
-diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/install-sh seahorse-1.0.1/install-sh
---- seahorse-1.0.1-old/install-sh	2007-03-17 21:34:31.000000000 +0100
-+++ seahorse-1.0.1/install-sh	2007-05-01 22:57:35.000000000 +0200
-@@ -1,7 +1,7 @@
- #!/bin/sh
- # install - install a program, script, or datafile
- 
--scriptversion=2005-05-14.22
-+scriptversion=2006-10-14.15
- 
- # This originates from X11R5 (mit/util/scripts/install.sh), which was
- # later released in X11R6 (xc/config/util/install.sh) with the
-@@ -39,15 +39,24 @@
- # when there is no Makefile.
- #
- # This script is compatible with the BSD install script, but was written
--# from scratch.  It can only install one file at a time, a restriction
--# shared with many OS's install programs.
-+# from scratch.
-+
-+nl='
-+'
-+IFS=" ""	$nl"
- 
- # set DOITPROG to echo to test this script
- 
- # Don't use :- since 4.3BSD and earlier shells don't like it.
- doit="${DOITPROG-}"
-+if test -z "$doit"; then
-+  doit_exec=exec
-+else
-+  doit_exec=$doit
-+fi
- 
--# put in absolute paths if you don't have them in your path; or use env. vars.
-+# Put in absolute file names if you don't have them in your path;
-+# or use environment vars.
- 
- mvprog="${MVPROG-mv}"
- cpprog="${CPPROG-cp}"
-@@ -58,7 +67,13 @@
- rmprog="${RMPROG-rm}"
- mkdirprog="${MKDIRPROG-mkdir}"
- 
--chmodcmd="$chmodprog 0755"
-+posix_glob=
-+posix_mkdir=
-+
-+# Desired mode of installed file.
-+mode=0755
-+
-+chmodcmd=$chmodprog
- chowncmd=
- chgrpcmd=
- stripcmd=
-@@ -95,7 +110,7 @@
-   CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
- "
- 
--while test -n "$1"; do
-+while test $# -ne 0; do
-   case $1 in
-     -c) shift
-         continue;;
-@@ -111,9 +126,15 @@
- 
-     --help) echo "$usage"; exit $?;;
- 
--    -m) chmodcmd="$chmodprog $2"
-+    -m) mode=$2
-         shift
-         shift
-+	case $mode in
-+	  *' '* | *'	'* | *'
-+'*	  | *'*'* | *'?'* | *'['*)
-+	    echo "$0: invalid mode: $mode" >&2
-+	    exit 1;;
-+	esac
-         continue;;
- 
-     -o) chowncmd="$chownprog $2"
-@@ -136,25 +157,33 @@
- 
-     --version) echo "$0 $scriptversion"; exit $?;;
- 
--    *)  # When -d is used, all remaining arguments are directories to create.
--	# When -t is used, the destination is already specified.
--	test -n "$dir_arg$dstarg" && break
--        # Otherwise, the last argument is the destination.  Remove it from $@.
--	for arg
--	do
--          if test -n "$dstarg"; then
--	    # $@ is not empty: it contains at least $arg.
--	    set fnord "$@" "$dstarg"
--	    shift # fnord
--	  fi
--	  shift # arg
--	  dstarg=$arg
--	done
-+    --)	shift
- 	break;;
-+
-+    -*)	echo "$0: invalid option: $1" >&2
-+	exit 1;;
-+
-+    *)  break;;
-   esac
- done
- 
--if test -z "$1"; then
-+if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
-+  # When -d is used, all remaining arguments are directories to create.
-+  # When -t is used, the destination is already specified.
-+  # Otherwise, the last argument is the destination.  Remove it from $@.
-+  for arg
-+  do
-+    if test -n "$dstarg"; then
-+      # $@ is not empty: it contains at least $arg.
-+      set fnord "$@" "$dstarg"
-+      shift # fnord
-+    fi
-+    shift # arg
-+    dstarg=$arg
-+  done
-+fi
-+
-+if test $# -eq 0; then
-   if test -z "$dir_arg"; then
-     echo "$0: no input file specified." >&2
-     exit 1
-@@ -164,6 +193,33 @@
-   exit 0
- fi
- 
-+if test -z "$dir_arg"; then
-+  trap '(exit $?); exit' 1 2 13 15
-+
-+  # Set umask so as not to create temps with too-generous modes.
-+  # However, 'strip' requires both read and write access to temps.
-+  case $mode in
-+    # Optimize common cases.
-+    *644) cp_umask=133;;
-+    *755) cp_umask=22;;
-+
-+    *[0-7])
-+      if test -z "$stripcmd"; then
-+	u_plus_rw=
-+      else
-+	u_plus_rw='% 200'
-+      fi
-+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-+    *)
-+      if test -z "$stripcmd"; then
-+	u_plus_rw=
-+      else
-+	u_plus_rw=,u+rw
-+      fi
-+      cp_umask=$mode$u_plus_rw;;
-+  esac
-+fi
-+
- for src
- do
-   # Protect names starting with `-'.
-@@ -173,15 +229,11 @@
- 
-   if test -n "$dir_arg"; then
-     dst=$src
--    src=
--
--    if test -d "$dst"; then
--      mkdircmd=:
--      chmodcmd=
--    else
--      mkdircmd=$mkdirprog
--    fi
-+    dstdir=$dst
-+    test -d "$dstdir"
-+    dstdir_status=$?
-   else
-+
-     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-     # might cause directories to be created, which would be especially bad
-     # if $src (and thus $dsttmp) contains '*'.
-@@ -208,53 +260,188 @@
- 	echo "$0: $dstarg: Is a directory" >&2
- 	exit 1
-       fi
--      dst=$dst/`basename "$src"`
-+      dstdir=$dst
-+      dst=$dstdir/`basename "$src"`
-+      dstdir_status=0
-+    else
-+      # Prefer dirname, but fall back on a substitute if dirname fails.
-+      dstdir=`
-+	(dirname "$dst") 2>/dev/null ||
-+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	     X"$dst" : 'X\(//\)[^/]' \| \
-+	     X"$dst" : 'X\(//\)$' \| \
-+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-+	echo X"$dst" |
-+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+		   s//\1/
-+		   q
-+		 }
-+		 /^X\(\/\/\)[^/].*/{
-+		   s//\1/
-+		   q
-+		 }
-+		 /^X\(\/\/\)$/{
-+		   s//\1/
-+		   q
-+		 }
-+		 /^X\(\/\).*/{
-+		   s//\1/
-+		   q
-+		 }
-+		 s/.*/./; q'
-+      `
-+
-+      test -d "$dstdir"
-+      dstdir_status=$?
-     fi
-   fi
- 
--  # This sed command emulates the dirname command.
--  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
--
--  # Make sure that the destination directory exists.
-+  obsolete_mkdir_used=false
- 
--  # Skip lots of stat calls in the usual case.
--  if test ! -d "$dstdir"; then
--    defaultIFS='
--	 '
--    IFS="${IFS-$defaultIFS}"
--
--    oIFS=$IFS
--    # Some sh's can't handle IFS=/ for some reason.
--    IFS='%'
--    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
--    shift
--    IFS=$oIFS
-+  if test $dstdir_status != 0; then
-+    case $posix_mkdir in
-+      '')
-+	# Create intermediate dirs using mode 755 as modified by the umask.
-+	# This is like FreeBSD 'install' as of 1997-10-28.
-+	umask=`umask`
-+	case $stripcmd.$umask in
-+	  # Optimize common cases.
-+	  *[2367][2367]) mkdir_umask=$umask;;
-+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-+
-+	  *[0-7])
-+	    mkdir_umask=`expr $umask + 22 \
-+	      - $umask % 100 % 40 + $umask % 20 \
-+	      - $umask % 10 % 4 + $umask % 2
-+	    `;;
-+	  *) mkdir_umask=$umask,go-w;;
-+	esac
-+
-+	# With -d, create the new directory with the user-specified mode.
-+	# Otherwise, rely on $mkdir_umask.
-+	if test -n "$dir_arg"; then
-+	  mkdir_mode=-m$mode
-+	else
-+	  mkdir_mode=
-+	fi
-+
-+	posix_mkdir=false
-+	case $umask in
-+	  *[123567][0-7][0-7])
-+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-+	    ;;
-+	  *)
-+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-+
-+	    if (umask $mkdir_umask &&
-+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-+	    then
-+	      if test -z "$dir_arg" || {
-+		   # Check for POSIX incompatibilities with -m.
-+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-+		   # other-writeable bit of parent directory when it shouldn't.
-+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-+		   case $ls_ld_tmpdir in
-+		     d????-?r-*) different_mode=700;;
-+		     d????-?--*) different_mode=755;;
-+		     *) false;;
-+		   esac &&
-+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-+		   }
-+		 }
-+	      then posix_mkdir=:
-+	      fi
-+	      rmdir "$tmpdir/d" "$tmpdir"
-+	    else
-+	      # Remove any dirs left behind by ancient mkdir implementations.
-+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-+	    fi
-+	    trap '' 0;;
-+	esac;;
-+    esac
- 
--    pathcomp=
-+    if
-+      $posix_mkdir && (
-+	umask $mkdir_umask &&
-+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-+      )
-+    then :
-+    else
- 
--    while test $# -ne 0 ; do
--      pathcomp=$pathcomp$1
-+      # The umask is ridiculous, or mkdir does not conform to POSIX,
-+      # or it failed possibly due to a race condition.  Create the
-+      # directory the slow way, step by step, checking for races as we go.
-+
-+      case $dstdir in
-+	/*) prefix=/ ;;
-+	-*) prefix=./ ;;
-+	*)  prefix= ;;
-+      esac
-+
-+      case $posix_glob in
-+        '')
-+	  if (set -f) 2>/dev/null; then
-+	    posix_glob=true
-+	  else
-+	    posix_glob=false
-+	  fi ;;
-+      esac
-+
-+      oIFS=$IFS
-+      IFS=/
-+      $posix_glob && set -f
-+      set fnord $dstdir
-       shift
--      if test ! -d "$pathcomp"; then
--        $mkdirprog "$pathcomp"
--	# mkdir can fail with a `File exist' error in case several
--	# install-sh are creating the directory concurrently.  This
--	# is OK.
--	test -d "$pathcomp" || exit
-+      $posix_glob && set +f
-+      IFS=$oIFS
-+
-+      prefixes=
-+
-+      for d
-+      do
-+	test -z "$d" && continue
-+
-+	prefix=$prefix$d
-+	if test -d "$prefix"; then
-+	  prefixes=
-+	else
-+	  if $posix_mkdir; then
-+	    (umask=$mkdir_umask &&
-+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-+	    # Don't fail if two instances are running concurrently.
-+	    test -d "$prefix" || exit 1
-+	  else
-+	    case $prefix in
-+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-+	      *) qprefix=$prefix;;
-+	    esac
-+	    prefixes="$prefixes '$qprefix'"
-+	  fi
-+	fi
-+	prefix=$prefix/
-+      done
-+
-+      if test -n "$prefixes"; then
-+	# Don't fail if two instances are running concurrently.
-+	(umask $mkdir_umask &&
-+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-+	  test -d "$dstdir" || exit 1
-+	obsolete_mkdir_used=true
-       fi
--      pathcomp=$pathcomp/
--    done
-+    fi
-   fi
- 
-   if test -n "$dir_arg"; then
--    $doit $mkdircmd "$dst" \
--      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
--      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
--      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
--      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
--
-+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-   else
--    dstfile=`basename "$dst"`
- 
-     # Make a couple of temp file names in the proper directory.
-     dsttmp=$dstdir/_inst.$$_
-@@ -262,10 +449,9 @@
- 
-     # Trap to clean up those temp files at exit.
-     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
--    trap '(exit $?); exit' 1 2 13 15
- 
-     # Copy the file name to the temp name.
--    $doit $cpprog "$src" "$dsttmp" &&
-+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
- 
-     # and set any options; do chmod last to preserve setuid bits.
-     #
-@@ -276,10 +462,10 @@
-     { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-       && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-       && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
--      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
-+      && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
- 
-     # Now rename the file to the real destination.
--    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
-+    { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
-       || {
- 	   # The rename failed, perhaps because mv can't rename something else
- 	   # to itself, or perhaps because mv is so ancient that it does not
-@@ -291,11 +477,12 @@
- 	   # reasons.  In this case, the final cleanup might fail but the new
- 	   # file should still install successfully.
- 	   {
--	     if test -f "$dstdir/$dstfile"; then
--	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
--	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-+	     if test -f "$dst"; then
-+	       $doit $rmcmd -f "$dst" 2>/dev/null \
-+	       || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
-+		     && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
- 	       || {
--		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-+		 echo "$0: cannot unlink or rename $dst" >&2
- 		 (exit 1); exit 1
- 	       }
- 	     else
-@@ -304,16 +491,13 @@
- 	   } &&
- 
- 	   # Now rename the file to the real destination.
--	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-+	   $doit $mvcmd "$dsttmp" "$dst"
- 	 }
--    }
--  fi || { (exit 1); exit 1; }
--done
-+    } || exit 1
- 
--# The final little trick to "correctly" pass the exit status to the exit trap.
--{
--  (exit 0); exit 0
--}
-+    trap '' 0
-+  fi
-+done
- 
- # Local variables:
- # eval: (add-hook 'write-file-hooks 'time-stamp)
-diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/libcryptui/Makefile.in seahorse-1.0.1/libcryptui/Makefile.in
---- seahorse-1.0.1-old/libcryptui/Makefile.in	2007-04-03 18:17:45.000000000 +0200
-+++ seahorse-1.0.1/libcryptui/Makefile.in	2007-05-01 22:57:37.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,15 +16,11 @@
- 
- 
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -68,29 +64,36 @@
- 	cryptui-key-store.lo cryptui-key-combo.lo cryptui-key-list.lo \
- 	cryptui-key-chooser.lo $(am__objects_1)
- libcryptui_la_OBJECTS = $(am_libcryptui_la_OBJECTS)
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+libcryptui_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(libcryptui_la_LDFLAGS) $(LDFLAGS) -o $@
-+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(libcryptui_la_SOURCES)
- DIST_SOURCES = $(libcryptui_la_SOURCES)
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
--	install-exec-recursive install-info-recursive \
--	install-recursive installcheck-recursive installdirs-recursive \
--	pdf-recursive ps-recursive uninstall-info-recursive \
--	uninstall-recursive
-+	install-dvi-recursive install-exec-recursive \
-+	install-html-recursive install-info-recursive \
-+	install-pdf-recursive install-ps-recursive install-recursive \
-+	installcheck-recursive installdirs-recursive pdf-recursive \
-+	ps-recursive uninstall-recursive
- pkgconfigDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(pkgconfig_DATA)
- incHEADERS_INSTALL = $(INSTALL_HEADER)
- HEADERS = $(inc_HEADERS)
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-+  distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = . tests
-@@ -99,8 +102,6 @@
- AGENT_CFLAGS = @AGENT_CFLAGS@
- AGENT_LIBS = @AGENT_LIBS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -131,8 +132,6 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
- EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
- EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
-@@ -146,8 +145,6 @@
- E_API_VERSION = @E_API_VERSION@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GEDIT_CFLAGS = @GEDIT_CFLAGS@
-@@ -163,23 +160,8 @@
- GNUPG = @GNUPG@
- GPGME_CONFIG = @GPGME_CONFIG@
- GREP = @GREP@
--HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
--HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
--HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
--HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
--HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
--HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
--HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
--HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
--HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
--HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
--HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
--HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
--HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -225,9 +207,8 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MOZILLA = @MOZILLA@
- MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
-@@ -242,8 +223,6 @@
- NAUTILUS_LIBS = @NAUTILUS_LIBS@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
--OS_WIN32_FALSE = @OS_WIN32_FALSE@
--OS_WIN32_TRUE = @OS_WIN32_TRUE@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -252,8 +231,6 @@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
--PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
--PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
- PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
- POFILES = @POFILES@
- POSUB = @POSUB@
-@@ -268,48 +245,17 @@
+diff -Naur seahorse-2.20.old/INSTALL seahorse-2.20/INSTALL
+diff -Naur seahorse-2.20.old/libcryptui/Makefile.in seahorse-2.20/libcryptui/Makefile.in
+--- seahorse-2.20.old/libcryptui/Makefile.in	2007-09-17 19:21:15.000000000 +0200
++++ seahorse-2.20/libcryptui/Makefile.in	2007-09-17 23:00:56.000000000 +0200
+@@ -243,15 +243,13 @@
+ RANLIB = @RANLIB@
+ SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
+ SEAHORSE_LIBS = @SEAHORSE_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHARING_CFLAGS = @SHARING_CFLAGS@
+ SHARING_LIBS = @SHARING_LIBS@
  SHELL = @SHELL@
  SOUP_CFLAGS = @SOUP_CFLAGS@
  SOUP_LIBS = @SOUP_LIBS@
@@ -3456,437 +3689,19 @@
 -SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
 -SSH_PATH = @SSH_PATH@
  STRIP = @STRIP@
--UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
--UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
--WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
--WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
--WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
--WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
--WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
--WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
--WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
--WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
--WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
--WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
--WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
--WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
--WITH_HKP_FALSE = @WITH_HKP_FALSE@
--WITH_HKP_TRUE = @WITH_HKP_TRUE@
--WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
--WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
--WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
--WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
--WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
--WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
--WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
--WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
--WITH_SSH_FALSE = @WITH_SSH_FALSE@
--WITH_SSH_TRUE = @WITH_SSH_TRUE@
--WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
--WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
- XGETTEXT = @XGETTEXT@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -321,6 +267,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -348,8 +295,11 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- @WITH_TESTS_FALSE at TESTS_DIR = 
- @WITH_TESTS_TRUE at TESTS_DIR = tests
- SUBDIRS = . $(TESTS_DIR)
-@@ -434,7 +384,7 @@
- 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -445,7 +395,7 @@
- 
- uninstall-libLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-@@ -460,7 +410,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- libcryptui.la: $(libcryptui_la_OBJECTS) $(libcryptui_la_DEPENDENCIES) 
--	$(LINK) -rpath $(libdir) $(libcryptui_la_LDFLAGS) $(libcryptui_la_OBJECTS) $(libcryptui_la_LIBADD) $(LIBS)
-+	$(libcryptui_la_LINK) -rpath $(libdir) $(libcryptui_la_OBJECTS) $(libcryptui_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -477,22 +427,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cryptui.Plo at am__quote@
- 
- .c.o:
-- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
-- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
-- at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -502,13 +452,9 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- install-pkgconfigDATA: $(pkgconfig_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
-+	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
- 	@list='$(pkgconfig_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -525,7 +471,7 @@
- 	done
- install-incHEADERS: $(inc_HEADERS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(incdir)" || $(mkdir_p) "$(DESTDIR)$(incdir)"
-+	test -z "$(incdir)" || $(MKDIR_P) "$(DESTDIR)$(incdir)"
- 	@list='$(inc_HEADERS)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -572,8 +518,7 @@
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- 	fi; test -z "$$fail"
- 
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- 	@failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
-@@ -674,22 +619,21 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
- 	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -703,7 +647,7 @@
- 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
- 	    test -d "$(distdir)/$$subdir" \
--	    || $(mkdir_p) "$(distdir)/$$subdir" \
-+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
- 	    || exit 1; \
- 	    distdir=`$(am__cd) $(distdir) && pwd`; \
- 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -711,6 +655,8 @@
- 	      $(MAKE) $(AM_MAKEFLAGS) \
- 	        top_distdir="$$top_distdir" \
- 	        distdir="$$distdir/$$subdir" \
-+		am__remove_distdir=: \
-+		am__skip_length_check=: \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -722,7 +668,7 @@
- installdirs: installdirs-recursive
- installdirs-am:
- 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(incdir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) install-recursive
-@@ -760,7 +706,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-libtool distclean-tags
-+	distclean-tags
- 
- dvi: dvi-recursive
- 
-@@ -774,12 +720,20 @@
- 
- install-data-am: install-incHEADERS install-pkgconfigDATA
- 
-+install-dvi: install-dvi-recursive
-+
- install-exec-am: install-libLTLIBRARIES
- 
-+install-html: install-html-recursive
-+
- install-info: install-info-recursive
- 
- install-man:
- 
-+install-pdf: install-pdf-recursive
-+
-+install-ps: install-ps-recursive
-+
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-recursive
-@@ -800,27 +754,29 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-incHEADERS uninstall-info-am \
--	uninstall-libLTLIBRARIES uninstall-pkgconfigDATA
-+uninstall-am: uninstall-incHEADERS uninstall-libLTLIBRARIES \
-+	uninstall-pkgconfigDATA
- 
--uninstall-info: uninstall-info-recursive
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-+	install-strip
- 
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
--	clean clean-generic clean-libLTLIBRARIES clean-libtool \
--	clean-recursive ctags ctags-recursive distclean \
--	distclean-compile distclean-generic distclean-libtool \
--	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+	all all-am check check-am clean clean-generic \
-+	clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \
-+	distclean distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-exec install-exec-am \
-+	install-data-am install-dvi install-dvi-am install-exec \
-+	install-exec-am install-html install-html-am \
- 	install-incHEADERS install-info install-info-am \
--	install-libLTLIBRARIES install-man install-pkgconfigDATA \
--	install-strip installcheck installcheck-am installdirs \
--	installdirs-am maintainer-clean maintainer-clean-generic \
--	maintainer-clean-recursive mostlyclean mostlyclean-compile \
--	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-+	install-pkgconfigDATA install-ps install-ps-am install-strip \
-+	installcheck installcheck-am installdirs installdirs-am \
-+	maintainer-clean maintainer-clean-generic mostlyclean \
-+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- 	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
--	uninstall-incHEADERS uninstall-info-am \
--	uninstall-libLTLIBRARIES uninstall-pkgconfigDATA
-+	uninstall-incHEADERS uninstall-libLTLIBRARIES \
-+	uninstall-pkgconfigDATA
- 
- 
- cryptui-marshal.h: cryptui-marshal.list $(GLIB_GENMARSHAL)
-diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/libcryptui/tests/Makefile.in seahorse-1.0.1/libcryptui/tests/Makefile.in
---- seahorse-1.0.1-old/libcryptui/tests/Makefile.in	2007-04-03 18:17:45.000000000 +0200
-+++ seahorse-1.0.1/libcryptui/tests/Makefile.in	2007-05-01 22:57:38.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
- 
- @SET_MAKE@
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -61,17 +57,18 @@
- cryptui_test_ui_OBJECTS = $(am_cryptui_test_ui_OBJECTS)
- cryptui_test_ui_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- 	$(top_builddir)/libcryptui/libcryptui.la
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(cryptui_test_keyset_SOURCES) $(cryptui_test_ui_SOURCES)
- DIST_SOURCES = $(cryptui_test_keyset_SOURCES) \
- 	$(cryptui_test_ui_SOURCES)
-@@ -82,8 +79,6 @@
- AGENT_CFLAGS = @AGENT_CFLAGS@
- AGENT_LIBS = @AGENT_LIBS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -114,8 +109,6 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
- EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
- EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
-@@ -129,8 +122,6 @@
- E_API_VERSION = @E_API_VERSION@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GEDIT_CFLAGS = @GEDIT_CFLAGS@
-@@ -146,23 +137,8 @@
- GNUPG = @GNUPG@
- GPGME_CONFIG = @GPGME_CONFIG@
- GREP = @GREP@
--HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
--HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
--HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
--HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
--HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
--HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
--HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
--HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
--HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
--HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
--HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
--HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
--HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -208,9 +184,8 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MOZILLA = @MOZILLA@
- MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
-@@ -225,8 +200,6 @@
- NAUTILUS_LIBS = @NAUTILUS_LIBS@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
--OS_WIN32_FALSE = @OS_WIN32_FALSE@
--OS_WIN32_TRUE = @OS_WIN32_TRUE@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -235,8 +208,6 @@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
--PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
--PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
- PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
- POFILES = @POFILES@
- POSUB = @POSUB@
-@@ -251,48 +222,17 @@
+diff -Naur seahorse-2.20.old/libcryptui/tests/Makefile.in seahorse-2.20/libcryptui/tests/Makefile.in
+--- seahorse-2.20.old/libcryptui/tests/Makefile.in	2007-09-17 19:21:15.000000000 +0200
++++ seahorse-2.20/libcryptui/tests/Makefile.in	2007-09-17 23:00:56.000000000 +0200
+@@ -220,15 +220,13 @@
+ RANLIB = @RANLIB@
+ SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
+ SEAHORSE_LIBS = @SEAHORSE_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHARING_CFLAGS = @SHARING_CFLAGS@
+ SHARING_LIBS = @SHARING_LIBS@
  SHELL = @SHELL@
  SOUP_CFLAGS = @SOUP_CFLAGS@
  SOUP_LIBS = @SOUP_LIBS@
@@ -3894,373 +3709,19 @@
 -SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
 -SSH_PATH = @SSH_PATH@
  STRIP = @STRIP@
--UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
--UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
--WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
--WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
--WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
--WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
--WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
--WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
--WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
--WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
--WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
--WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
--WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
--WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
--WITH_HKP_FALSE = @WITH_HKP_FALSE@
--WITH_HKP_TRUE = @WITH_HKP_TRUE@
--WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
--WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
--WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
--WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
--WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
--WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
--WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
--WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
--WITH_SSH_FALSE = @WITH_SSH_FALSE@
--WITH_SSH_TRUE = @WITH_SSH_TRUE@
--WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
--WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
- XGETTEXT = @XGETTEXT@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -304,6 +244,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -331,8 +272,11 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- INCLUDES = -I$(top_builddir) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/libcryptui \
-@@ -382,7 +326,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
- 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
- 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- 	  if test -f $$p \
-@@ -410,10 +354,10 @@
- 	done
- cryptui-test-keyset$(EXEEXT): $(cryptui_test_keyset_OBJECTS) $(cryptui_test_keyset_DEPENDENCIES) 
- 	@rm -f cryptui-test-keyset$(EXEEXT)
--	$(LINK) $(cryptui_test_keyset_LDFLAGS) $(cryptui_test_keyset_OBJECTS) $(cryptui_test_keyset_LDADD) $(LIBS)
-+	$(LINK) $(cryptui_test_keyset_OBJECTS) $(cryptui_test_keyset_LDADD) $(LIBS)
- cryptui-test-ui$(EXEEXT): $(cryptui_test_ui_OBJECTS) $(cryptui_test_ui_DEPENDENCIES) 
- 	@rm -f cryptui-test-ui$(EXEEXT)
--	$(LINK) $(cryptui_test_ui_LDFLAGS) $(cryptui_test_ui_OBJECTS) $(cryptui_test_ui_LDADD) $(LIBS)
-+	$(LINK) $(cryptui_test_ui_OBJECTS) $(cryptui_test_ui_LDADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -425,22 +369,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cryptui-test-ui.Po at am__quote@
- 
- .c.o:
-- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
-- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
-- at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -451,10 +395,6 @@
- clean-libtool:
- 	-rm -rf .libs _libs
- 
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-@@ -504,22 +444,21 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
- 	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -535,7 +474,7 @@
- all-am: Makefile $(PROGRAMS)
- installdirs:
- 	for dir in "$(DESTDIR)$(bindir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -569,7 +508,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-libtool distclean-tags
-+	distclean-tags
- 
- dvi: dvi-am
- 
-@@ -583,12 +522,20 @@
- 
- install-data-am:
- 
-+install-dvi: install-dvi-am
-+
- install-exec-am: install-binPROGRAMS
- 
-+install-html: install-html-am
-+
- install-info: install-info-am
- 
- install-man:
- 
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -609,19 +556,23 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-binPROGRAMS uninstall-info-am
-+uninstall-am: uninstall-binPROGRAMS
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
- 	clean-generic clean-libtool ctags distclean distclean-compile \
- 	distclean-generic distclean-libtool distclean-tags distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-binPROGRAMS install-data install-data-am install-exec \
--	install-exec-am install-info install-info-am install-man \
-+	install-binPROGRAMS install-data install-data-am install-dvi \
-+	install-dvi-am install-exec install-exec-am install-html \
-+	install-html-am install-info install-info-am install-man \
-+	install-pdf install-pdf-am install-ps install-ps-am \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
- 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
--	uninstall-binPROGRAMS uninstall-info-am
-+	uninstall-binPROGRAMS
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/libseahorse/Makefile.in seahorse-1.0.1/libseahorse/Makefile.in
---- seahorse-1.0.1-old/libseahorse/Makefile.in	2007-04-03 18:17:45.000000000 +0200
-+++ seahorse-1.0.1/libseahorse/Makefile.in	2007-05-01 22:57:38.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,15 +16,11 @@
- 
- 
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -139,17 +135,18 @@
- am_xloadimage_OBJECTS = seahorse-xloadimage.$(OBJEXT)
- xloadimage_OBJECTS = $(am_xloadimage_OBJECTS)
- xloadimage_LDADD = $(LDADD)
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(libseahorse_a_SOURCES) $(seahorse_ssh_askpass_SOURCES) \
- 	$(xloadimage_SOURCES)
- DIST_SOURCES = $(am__libseahorse_a_SOURCES_DIST) \
-@@ -169,8 +166,6 @@
- AGENT_CFLAGS = @AGENT_CFLAGS@
- AGENT_LIBS = @AGENT_LIBS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -201,8 +196,6 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
- EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
- EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
-@@ -216,8 +209,6 @@
- E_API_VERSION = @E_API_VERSION@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GEDIT_CFLAGS = @GEDIT_CFLAGS@
-@@ -233,23 +224,8 @@
- GNUPG = @GNUPG@
- GPGME_CONFIG = @GPGME_CONFIG@
- GREP = @GREP@
--HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
--HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
--HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
--HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
--HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
--HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
--HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
--HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
--HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
--HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
--HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
--HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
--HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -295,9 +271,8 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MOZILLA = @MOZILLA@
- MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
-@@ -312,8 +287,6 @@
- NAUTILUS_LIBS = @NAUTILUS_LIBS@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
--OS_WIN32_FALSE = @OS_WIN32_FALSE@
--OS_WIN32_TRUE = @OS_WIN32_TRUE@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -322,8 +295,6 @@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
--PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
--PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
- PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
- POFILES = @POFILES@
- POSUB = @POSUB@
-@@ -338,48 +309,17 @@
+diff -Naur seahorse-2.20.old/libseahorse/Makefile.in seahorse-2.20/libseahorse/Makefile.in
+--- seahorse-2.20.old/libseahorse/Makefile.in	2007-09-17 19:21:15.000000000 +0200
++++ seahorse-2.20/libseahorse/Makefile.in	2007-09-17 23:00:56.000000000 +0200
+@@ -307,15 +307,13 @@
+ RANLIB = @RANLIB@
+ SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
+ SEAHORSE_LIBS = @SEAHORSE_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHARING_CFLAGS = @SHARING_CFLAGS@
+ SHARING_LIBS = @SHARING_LIBS@
  SHELL = @SHELL@
  SOUP_CFLAGS = @SOUP_CFLAGS@
  SOUP_LIBS = @SOUP_LIBS@
@@ -4268,416 +3729,558 @@
 -SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
 -SSH_PATH = @SSH_PATH@
  STRIP = @STRIP@
--UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
--UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
--WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
--WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
--WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
--WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
--WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
--WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
--WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
--WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
--WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
--WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
--WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
--WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
--WITH_HKP_FALSE = @WITH_HKP_FALSE@
--WITH_HKP_TRUE = @WITH_HKP_TRUE@
--WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
--WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
--WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
--WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
--WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
--WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
--WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
--WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
--WITH_SSH_FALSE = @WITH_SSH_FALSE@
--WITH_SSH_TRUE = @WITH_SSH_TRUE@
--WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
--WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
- XGETTEXT = @XGETTEXT@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -391,6 +331,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -418,8 +359,11 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- gladedir = $(datadir)/seahorse/glade/
- pixmapsdir = $(datadir)/pixmaps/seahorse/
- seahorselibexecbindir = $(libdir)/seahorse/
-@@ -557,7 +501,7 @@
- 	$(RANLIB) libseahorse.a
- install-seahorselibexecbinPROGRAMS: $(seahorselibexecbin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(seahorselibexecbindir)" || $(mkdir_p) "$(DESTDIR)$(seahorselibexecbindir)"
-+	test -z "$(seahorselibexecbindir)" || $(MKDIR_P) "$(DESTDIR)$(seahorselibexecbindir)"
- 	@list='$(seahorselibexecbin_PROGRAMS)'; for p in $$list; do \
- 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- 	  if test -f $$p \
-@@ -585,10 +529,10 @@
+diff -Naur seahorse-2.20.old/ltmain.sh seahorse-2.20/ltmain.sh
+--- seahorse-2.20.old/ltmain.sh	2006-06-19 20:36:49.000000000 +0200
++++ seahorse-2.20/ltmain.sh	2007-08-14 19:43:36.000000000 +0200
+@@ -1,8 +1,8 @@
+ # ltmain.sh - Provide generalized library-building support services.
+ # NOTE: Changing this file will not affect anything until you rerun configure.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+-# Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
++# 2007  Free Software Foundation, Inc.
+ # Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ #
+ # This program is free software; you can redistribute it and/or modify
+@@ -43,14 +43,22 @@
+ 
+ PROGRAM=ltmain.sh
+ PACKAGE=libtool
+-VERSION="1.5.22 Debian 1.5.22-4"
+-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
++VERSION="1.5.24 Debian 1.5.24-1ubuntu1"
++TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
+ 
+-# See if we are running on zsh, and set the options which allow our
+-# commands through without removal of \ escapes.
+-if test -n "${ZSH_VERSION+set}" ; then
++# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
++else
++  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
+ 
+ # Check that we have a working $echo.
+ if test "X$1" = X--no-reexec; then
+@@ -105,12 +113,14 @@
+ # These must not be set unconditionally because not all systems understand
+ # e.g. LANG=C (notably SCO).
+ # We save the old values to restore during execute mode.
+-if test "${LC_ALL+set}" = set; then
+-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
+-fi
+-if test "${LANG+set}" = set; then
+-  save_LANG="$LANG"; LANG=C; export LANG
+-fi
++for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++do
++  eval "if test \"\${$lt_var+set}\" = set; then
++	  save_$lt_var=\$$lt_var
++	  $lt_var=C
++	  export $lt_var
++	fi"
++done
+ 
+ # Make sure IFS has a sensible default
+ lt_nl='
+@@ -136,6 +146,8 @@
+ preserve_args=
+ lo2o="s/\\.lo\$/.${objext}/"
+ o2lo="s/\\.${objext}\$/.lo/"
++extracted_archives=
++extracted_serial=0
+ 
+ #####################################
+ # Shell function definitions:
+@@ -196,7 +208,13 @@
+     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
+       $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+       win32_nmres=`eval $NM -f posix -A $1 | \
+-	$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
++	$SED -n -e '1,100{
++		/ I /{
++			s,.*,import,
++			p
++			q
++			}
++		}'`
+       case $win32_nmres in
+       import*)  win32_libid_type="x86 archive import";;
+       *)        win32_libid_type="x86 archive static";;
+@@ -327,7 +345,17 @@
+ 	*) my_xabs=`pwd`"/$my_xlib" ;;
+       esac
+       my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
+-      my_xdir="$my_gentop/$my_xlib"
++      my_xlib_u=$my_xlib
++      while :; do
++        case " $extracted_archives " in
++	*" $my_xlib_u "*)
++	  extracted_serial=`expr $extracted_serial + 1`
++	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
++	*) break ;;
++	esac
++      done
++      extracted_archives="$extracted_archives $my_xlib_u"
++      my_xdir="$my_gentop/$my_xlib_u"
+ 
+       $show "${rm}r $my_xdir"
+       $run ${rm}r "$my_xdir"
+@@ -454,11 +482,12 @@
+     ;;
+ 
+   --version)
+-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+-    $echo
+-    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
+-    $echo "This is free software; see the source for copying conditions.  There is NO"
+-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++    echo "\
++$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
++
++Copyright (C) 2007  Free Software Foundation, Inc.
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+     exit $?
+     ;;
+ 
+@@ -755,9 +784,10 @@
+     *.class) xform=class ;;
+     *.cpp) xform=cpp ;;
+     *.cxx) xform=cxx ;;
+-    *.f90) xform=f90 ;;
++    *.[fF][09]?) xform=[fF][09]. ;;
+     *.for) xform=for ;;
+     *.java) xform=java ;;
++    *.obj) xform=obj ;;
+     esac
+ 
+     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
+@@ -1138,8 +1168,9 @@
+     for arg
+     do
+       case $arg in
+-      -all-static | -static)
+-	if test "X$arg" = "X-all-static"; then
++      -all-static | -static | -static-libtool-libs)
++	case $arg in
++	-all-static)
+ 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+ 	  fi
+@@ -1147,12 +1178,20 @@
+ 	    dlopen_self=$dlopen_self_static
+ 	  fi
+ 	  prefer_static_libs=yes
+-	else
++	  ;;
++	-static)
+ 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ 	    dlopen_self=$dlopen_self_static
+ 	  fi
+ 	  prefer_static_libs=built
+-	fi
++	  ;;
++	-static-libtool-libs)
++	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
++	    dlopen_self=$dlopen_self_static
++	  fi
++	  prefer_static_libs=yes
++	  ;;
++	esac
+ 	build_libtool_libs=no
+ 	build_old_libs=yes
+ 	break
+@@ -1600,7 +1639,7 @@
+ 	continue
+ 	;;
+ 
+-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
++     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ 	compiler_flags="$compiler_flags $arg"
+ 	compile_command="$compile_command $arg"
+ 	finalize_command="$finalize_command $arg"
+@@ -1620,10 +1659,11 @@
+       # -m* pass through architecture-specific compiler args for GCC
+       # -m*, -t[45]*, -txscale* pass through architecture-specific
+       # compiler args for GCC
+-      # -pg pass through profiling flag for GCC
++      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
++      # -F/path gives path to uninstalled frameworks, gcc on darwin
+       # @file GCC response files
+-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
+-      -t[45]*|-txscale*|@*)
++      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+ 
+ 	# Unknown arguments in both finalize_command and compile_command need
+ 	# to be aesthetically quoted because they are evaled later.
+@@ -1651,9 +1691,9 @@
+ 
+       -no-install)
+ 	case $host in
+-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
+ 	  # The PATH hackery in wrapper scripts is required on Windows
+-	  # in order for the loader to find any dlls it needs.
++	  # and Darwin in order for the loader to find any dlls it needs.
+ 	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
+ 	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
+ 	  fast_install=no
+@@ -1712,7 +1752,7 @@
+ 	continue
+ 	;;
+ 
+-      -static)
++      -static | -static-libtool-libs)
+ 	# The effects of -static are defined in a previous loop.
+ 	# We used to do the same as -all-static on platforms that
+ 	# didn't have a PIC flag, but the assumption that the effects
+@@ -2097,7 +2137,7 @@
+ 	lib=
+ 	found=no
+ 	case $deplib in
+-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
++	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ 	  if test "$linkmode,$pass" = "prog,link"; then
+ 	    compile_deplibs="$deplib $compile_deplibs"
+ 	    finalize_deplibs="$deplib $finalize_deplibs"
+@@ -2493,7 +2533,9 @@
+ 
+ 	if test "$linkmode,$pass" = "prog,link"; then
+ 	  if test -n "$library_names" &&
+-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
++	     { { test "$prefer_static_libs" = no ||
++		 test "$prefer_static_libs,$installed" = "built,yes"; } ||
++	       test -z "$old_library"; }; then
+ 	    # We need to hardcode the library path
+ 	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+ 	      # Make sure the rpath contains only unique directories.
+@@ -3189,7 +3231,7 @@
+ 	  # which has an extra 1 added just for fun
+ 	  #
+ 	  case $version_type in
+-	  darwin|linux|osf|windows)
++	  darwin|linux|osf|windows|none)
+ 	    current=`expr $number_major + $number_minor`
+ 	    age="$number_minor"
+ 	    revision="$number_revision"
+@@ -3200,9 +3242,10 @@
+ 	    age="0"
+ 	    ;;
+ 	  irix|nonstopux)
+-	    current=`expr $number_major + $number_minor - 1`
++	    current=`expr $number_major + $number_minor`
+ 	    age="$number_minor"
+ 	    revision="$number_minor"
++	    lt_irix_increment=no
+ 	    ;;
+ 	  *)
+ 	    $echo "$modename: unknown library version type \`$version_type'" 1>&2
+@@ -3266,7 +3309,8 @@
+ 	  versuffix="$major.$age.$revision"
+ 	  # Darwin ld doesn't like 0 for these options...
+ 	  minor_current=`expr $current + 1`
+-	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
++	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
++	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ 	  ;;
+ 
+ 	freebsd-aout)
+@@ -3280,8 +3324,11 @@
+ 	  ;;
+ 
+ 	irix | nonstopux)
+-	  major=`expr $current - $age + 1`
+-
++	  if test "X$lt_irix_increment" = "Xno"; then
++	    major=`expr $current - $age`
++	  else
++	    major=`expr $current - $age + 1`
++	  fi
+ 	  case $version_type in
+ 	    nonstopux) verstring_prefix=nonstopux ;;
+ 	    *)         verstring_prefix=sgi ;;
+@@ -3418,11 +3465,11 @@
+       fi
+ 
+       # Eliminate all temporary directories.
+-      for path in $notinst_path; do
+-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+-	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+-      done
++      #for path in $notinst_path; do
++      #	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
++      #	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
++      #	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
++      #done
+ 
+       if test -n "$xrpath"; then
+ 	# If the user specified any rpath flags, then add them.
+@@ -3523,13 +3570,12 @@
+ 	  int main() { return 0; }
+ EOF
+ 	  $rm conftest
+-	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
+-	  if test "$?" -eq 0 ; then
++	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+ 	    ldd_output=`ldd conftest`
+ 	    for i in $deplibs; do
+ 	      name=`expr $i : '-l\(.*\)'`
+ 	      # If $name is empty we are operating on a -L argument.
+-              if test "$name" != "" && test "$name" -ne "0"; then
++              if test "$name" != "" && test "$name" != "0"; then
+ 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ 		  case " $predeps $postdeps " in
+ 		  *" $i "*)
+@@ -3568,9 +3614,7 @@
+ 	      # If $name is empty we are operating on a -L argument.
+               if test "$name" != "" && test "$name" != "0"; then
+ 		$rm conftest
+-		$LTCC $LTCFLAGS -o conftest conftest.c $i
+-		# Did it work?
+-		if test "$?" -eq 0 ; then
++		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+ 		  ldd_output=`ldd conftest`
+ 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ 		    case " $predeps $postdeps " in
+@@ -3602,7 +3646,7 @@
+ 		  droppeddeps=yes
+ 		  $echo
+ 		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
+-		  $echo "***  make it link in!  You will probably need to install it or some"
++		  $echo "*** make it link in!  You will probably need to install it or some"
+ 		  $echo "*** library that it depends on before this library will be fully"
+ 		  $echo "*** functional.  Installing it before continuing would be even better."
+ 		fi
+@@ -3888,7 +3932,10 @@
+ 	     test -n "$hardcode_libdirs"; then
+ 	    libdir="$hardcode_libdirs"
+ 	    if test -n "$hardcode_libdir_flag_spec_ld"; then
+-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
++	      case $archive_cmds in
++	      *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
++	      *)      eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
++	      esac
+ 	    else
+ 	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+ 	    fi
+@@ -4247,12 +4294,14 @@
+       reload_conv_objs=
+       gentop=
+       # reload_cmds runs $LD directly, so let us get rid of
+-      # -Wl from whole_archive_flag_spec
++      # -Wl from whole_archive_flag_spec and hope we can get by with
++      # turning comma into space..
+       wl=
+ 
+       if test -n "$convenience"; then
+ 	if test -n "$whole_archive_flag_spec"; then
+-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
++	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
++	  reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+ 	else
+ 	  gentop="$output_objdir/${obj}x"
+ 	  generated="$generated $gentop"
+@@ -4700,16 +4749,16 @@
+           case $host in
+           *cygwin* | *mingw* )
+             if test -f "$output_objdir/${outputname}.def" ; then
+-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
++              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
++              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+             else
+-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              fi
+             ;;
+           * )
+-            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+-            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+             ;;
+           esac
+ 	  ;;
+@@ -4724,13 +4773,13 @@
+ 	# really was required.
+ 
+ 	# Nullify the symbol file.
+-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
++	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
++	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+       fi
+ 
+       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+ 	# Replace the output file specification.
+-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
++	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
+ 	link_command="$compile_command$compile_rpath"
+ 
+ 	# We have no uninstalled library dependencies, so finalize right now.
+@@ -4817,7 +4866,7 @@
+ 	if test "$fast_install" != no; then
+ 	  link_command="$finalize_var$compile_command$finalize_rpath"
+ 	  if test "$fast_install" = yes; then
+-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
++	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
+ 	  else
+ 	    # fast_install is set to needless
+ 	    relink_command=
+@@ -4854,7 +4903,7 @@
+ 	  fi
  	done
- seahorse-ssh-askpass$(EXEEXT): $(seahorse_ssh_askpass_OBJECTS) $(seahorse_ssh_askpass_DEPENDENCIES) 
- 	@rm -f seahorse-ssh-askpass$(EXEEXT)
--	$(LINK) $(seahorse_ssh_askpass_LDFLAGS) $(seahorse_ssh_askpass_OBJECTS) $(seahorse_ssh_askpass_LDADD) $(LIBS)
-+	$(LINK) $(seahorse_ssh_askpass_OBJECTS) $(seahorse_ssh_askpass_LDADD) $(LIBS)
- xloadimage$(EXEEXT): $(xloadimage_OBJECTS) $(xloadimage_DEPENDENCIES) 
- 	@rm -f xloadimage$(EXEEXT)
--	$(LINK) $(xloadimage_LDFLAGS) $(xloadimage_OBJECTS) $(xloadimage_LDADD) $(LIBS)
-+	$(LINK) $(xloadimage_OBJECTS) $(xloadimage_LDADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -644,36 +588,36 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-xloadimage.Po at am__quote@
- 
- .c.o:
-- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
-- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
-- at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- seahorse-xloadimage.o: ../src/seahorse-xloadimage.c
-- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT seahorse-xloadimage.o -MD -MP -MF "$(DEPDIR)/seahorse-xloadimage.Tpo" -c -o seahorse-xloadimage.o `test -f '../src/seahorse-xloadimage.c' || echo '$(srcdir)/'`../src/seahorse-xloadimage.c; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/seahorse-xloadimage.Tpo" "$(DEPDIR)/seahorse-xloadimage.Po"; else rm -f "$(DEPDIR)/seahorse-xloadimage.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT seahorse-xloadimage.o -MD -MP -MF $(DEPDIR)/seahorse-xloadimage.Tpo -c -o seahorse-xloadimage.o `test -f '../src/seahorse-xloadimage.c' || echo '$(srcdir)/'`../src/seahorse-xloadimage.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/seahorse-xloadimage.Tpo $(DEPDIR)/seahorse-xloadimage.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/seahorse-xloadimage.c' object='seahorse-xloadimage.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o seahorse-xloadimage.o `test -f '../src/seahorse-xloadimage.c' || echo '$(srcdir)/'`../src/seahorse-xloadimage.c
- 
- seahorse-xloadimage.obj: ../src/seahorse-xloadimage.c
-- at am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT seahorse-xloadimage.obj -MD -MP -MF "$(DEPDIR)/seahorse-xloadimage.Tpo" -c -o seahorse-xloadimage.obj `if test -f '../src/seahorse-xloadimage.c'; then $(CYGPATH_W) '../src/seahorse-xloadimage.c'; else $(CYGPATH_W) '$(srcdir)/../src/seahorse-xloadimage.c'; fi`; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/seahorse-xloadimage.Tpo" "$(DEPDIR)/seahorse-xloadimage.Po"; else rm -f "$(DEPDIR)/seahorse-xloadimage.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT seahorse-xloadimage.obj -MD -MP -MF $(DEPDIR)/seahorse-xloadimage.Tpo -c -o seahorse-xloadimage.obj `if test -f '../src/seahorse-xloadimage.c'; then $(CYGPATH_W) '../src/seahorse-xloadimage.c'; else $(CYGPATH_W) '$(srcdir)/../src/seahorse-xloadimage.c'; fi`
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/seahorse-xloadimage.Tpo $(DEPDIR)/seahorse-xloadimage.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/seahorse-xloadimage.c' object='seahorse-xloadimage.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o seahorse-xloadimage.obj `if test -f '../src/seahorse-xloadimage.c'; then $(CYGPATH_W) '../src/seahorse-xloadimage.c'; else $(CYGPATH_W) '$(srcdir)/../src/seahorse-xloadimage.c'; fi`
-@@ -683,13 +627,9 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- install-gladeDATA: $(glade_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)"
-+	test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
- 	@list='$(glade_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -754,22 +694,21 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
- 	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -786,7 +725,7 @@
- all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(seahorselibexecbindir)" "$(DESTDIR)$(gladedir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) install-am
-@@ -823,7 +762,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-libtool distclean-tags
-+	distclean-tags
- 
- dvi: dvi-am
- 
-@@ -837,12 +776,20 @@
- 
- install-data-am: install-gladeDATA
- 
-+install-dvi: install-dvi-am
+ 	relink_command="(cd `pwd`; $relink_command)"
+-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+       fi
+ 
+       # Quote $echo for shipping.
+@@ -5261,6 +5310,20 @@
+ Xsed='${SED} -e 1s/^X//'
+ sed_quote_subst='$sed_quote_subst'
+ 
++# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
++if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '\${1+\"\$@\"}'='\"\$@\"'
++  setopt NO_GLOB_SUBST
++else
++  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
++fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
 +
- install-exec-am: install-seahorselibexecbinPROGRAMS
- 
-+install-html: install-html-am
-+
- install-info: install-info-am
- 
- install-man:
- 
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -863,22 +810,25 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-gladeDATA uninstall-info-am \
--	uninstall-seahorselibexecbinPROGRAMS
-+uninstall-am: uninstall-gladeDATA uninstall-seahorselibexecbinPROGRAMS
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- 	clean-libtool clean-noinstLIBRARIES \
- 	clean-seahorselibexecbinPROGRAMS ctags distclean \
- 	distclean-compile distclean-generic distclean-libtool \
- 	distclean-tags distdir dvi dvi-am html html-am info info-am \
--	install install-am install-data install-data-am install-exec \
--	install-exec-am install-gladeDATA install-info install-info-am \
--	install-man install-seahorselibexecbinPROGRAMS install-strip \
-+	install install-am install-data install-data-am install-dvi \
-+	install-dvi-am install-exec install-exec-am install-gladeDATA \
-+	install-html install-html-am install-info install-info-am \
-+	install-man install-pdf install-pdf-am install-ps \
-+	install-ps-am install-seahorselibexecbinPROGRAMS install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- 	tags uninstall uninstall-am uninstall-gladeDATA \
--	uninstall-info-am uninstall-seahorselibexecbinPROGRAMS
-+	uninstall-seahorselibexecbinPROGRAMS
- 
- 
- seahorse-marshal.h: seahorse-marshal.list $(GLIB_GENMARSHAL)
-diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/Makefile.in seahorse-1.0.1/Makefile.in
---- seahorse-1.0.1-old/Makefile.in	2007-04-03 18:17:49.000000000 +0200
-+++ seahorse-1.0.1/Makefile.in	2007-05-01 22:57:43.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +13,11 @@
- # PARTICULAR PURPOSE.
- 
- @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = .
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -35,13 +31,13 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
-+subdir = .
- DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
- 	$(srcdir)/seahorse.spec.in $(top_srcdir)/configure AUTHORS \
- 	COPYING ChangeLog INSTALL NEWS THANKS TODO compile \
- 	config.guess config.sub depcomp install-sh ltmain.sh missing \
- 	mkinstalldirs
--subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/epiphany.m4 \
- 	$(top_srcdir)/m4/gecko.m4 $(top_srcdir)/m4/gnome-doc-utils.m4 \
-@@ -50,7 +46,7 @@
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-- configure.lineno configure.status.lineno
-+ configure.lineno config.status.lineno
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
- CONFIG_CLEAN_FILES = seahorse.spec
-@@ -58,10 +54,13 @@
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
--	install-exec-recursive install-info-recursive \
--	install-recursive installcheck-recursive installdirs-recursive \
--	pdf-recursive ps-recursive uninstall-info-recursive \
--	uninstall-recursive
-+	install-dvi-recursive install-exec-recursive \
-+	install-html-recursive install-info-recursive \
-+	install-pdf-recursive install-ps-recursive install-recursive \
-+	installcheck-recursive installdirs-recursive pdf-recursive \
-+	ps-recursive uninstall-recursive
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-+  distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = libcryptui libseahorse src po data help pixmaps plugins \
-@@ -81,8 +80,6 @@
- AGENT_CFLAGS = @AGENT_CFLAGS@
- AGENT_LIBS = @AGENT_LIBS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -113,8 +110,6 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
- EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
- EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
-@@ -128,8 +123,6 @@
- E_API_VERSION = @E_API_VERSION@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GEDIT_CFLAGS = @GEDIT_CFLAGS@
-@@ -145,23 +138,8 @@
- GNUPG = @GNUPG@
- GPGME_CONFIG = @GPGME_CONFIG@
- GREP = @GREP@
--HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
--HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
--HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
--HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
--HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
--HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
--HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
--HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
--HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
--HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
--HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
--HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
--HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -207,9 +185,8 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MOZILLA = @MOZILLA@
- MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
-@@ -224,8 +201,6 @@
- NAUTILUS_LIBS = @NAUTILUS_LIBS@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
--OS_WIN32_FALSE = @OS_WIN32_FALSE@
--OS_WIN32_TRUE = @OS_WIN32_TRUE@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -234,8 +209,6 @@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
--PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
--PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
- PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
- POFILES = @POFILES@
- POSUB = @POSUB@
-@@ -250,48 +223,17 @@
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+@@ -5403,7 +5466,7 @@
+ 	  ;;
+ 	esac
+ 	$echo >> $output "\
+-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
++      \$echo \"\$0: cannot exec \$program \$*\"
+       exit $EXIT_FAILURE
+     fi
+   else
+@@ -5589,7 +5652,7 @@
+       done
+       # Quote the link command for shipping.
+       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+       if test "$hardcode_automatic" = yes ; then
+ 	relink_command=
+       fi
+@@ -5934,9 +5997,9 @@
+ 
+ 	  if test -n "$inst_prefix_dir"; then
+ 	    # Stick the inst_prefix_dir data into the link command.
+-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
++	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
+ 	  else
+-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
++	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
+ 	  fi
+ 
+ 	  $echo "$modename: warning: relinking \`$file'" 1>&2
+@@ -6145,7 +6208,7 @@
+ 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
+ 	      outputname="$tmpdir/$file"
+ 	      # Replace the output file specification.
+-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
++	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
+ 
+ 	      $show "$relink_command"
+ 	      if $run eval "$relink_command"; then :
+@@ -6356,8 +6419,10 @@
+ 	if test -f "$dir/$objdir/$dlname"; then
+ 	  dir="$dir/$objdir"
+ 	else
+-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+-	  exit $EXIT_FAILURE
++	  if test ! -f "$dir/$dlname"; then
++	    $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
++	    exit $EXIT_FAILURE
++	  fi
+ 	fi
+ 	;;
+ 
+@@ -6421,12 +6486,12 @@
+       fi
+ 
+       # Restore saved environment variables
+-      if test "${save_LC_ALL+set}" = set; then
+-	LC_ALL="$save_LC_ALL"; export LC_ALL
+-      fi
+-      if test "${save_LANG+set}" = set; then
+-	LANG="$save_LANG"; export LANG
+-      fi
++      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++      do
++	eval "if test \"\${save_$lt_var+set}\" = set; then
++		$lt_var=\$save_$lt_var; export $lt_var
++	      fi"
++      done
+ 
+       # Now prepare to actually exec the command.
+       exec_cmd="\$cmd$args"
+@@ -6783,9 +6848,9 @@
+   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+   -export-symbols SYMFILE
+-		    try to export only the symbols listed in SYMFILE
++                    try to export only the symbols listed in SYMFILE
+   -export-symbols-regex REGEX
+-		    try to export only the symbols matching REGEX
++                    try to export only the symbols matching REGEX
+   -LLIBDIR          search LIBDIR for required installed libraries
+   -lNAME            OUTPUT-FILE requires the installed library libNAME
+   -module           build a library that can dlopened
+@@ -6799,9 +6864,11 @@
+   -release RELEASE  specify package release information
+   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+-  -static           do not do any dynamic linking of libtool libraries
++  -static           do not do any dynamic linking of uninstalled libtool libraries
++  -static-libtool-libs
++                    do not do any dynamic linking of libtool libraries
+   -version-info CURRENT[:REVISION[:AGE]]
+-		    specify library version info [each variable defaults to 0]
++                    specify library version info [each variable defaults to 0]
+ 
+ All other options (arguments beginning with \`-') are ignored.
+ 
+diff -Naur seahorse-2.20.old/Makefile.in seahorse-2.20/Makefile.in
+--- seahorse-2.20.old/Makefile.in	2007-09-17 19:21:17.000000000 +0200
++++ seahorse-2.20/Makefile.in	2007-09-17 23:01:01.000000000 +0200
+@@ -221,15 +221,13 @@
+ RANLIB = @RANLIB@
+ SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
+ SEAHORSE_LIBS = @SEAHORSE_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHARING_CFLAGS = @SHARING_CFLAGS@
+ SHARING_LIBS = @SHARING_LIBS@
  SHELL = @SHELL@
  SOUP_CFLAGS = @SOUP_CFLAGS@
  SOUP_LIBS = @SOUP_LIBS@
@@ -4685,555 +4288,19 @@
 -SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
 -SSH_PATH = @SSH_PATH@
  STRIP = @STRIP@
--UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
--UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
--WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
--WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
--WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
--WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
--WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
--WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
--WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
--WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
--WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
--WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
--WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
--WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
--WITH_HKP_FALSE = @WITH_HKP_FALSE@
--WITH_HKP_TRUE = @WITH_HKP_TRUE@
--WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
--WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
--WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
--WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
--WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
--WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
--WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
--WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
--WITH_SSH_FALSE = @WITH_SSH_FALSE@
--WITH_SSH_TRUE = @WITH_SSH_TRUE@
--WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
--WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
- XGETTEXT = @XGETTEXT@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -303,6 +245,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -330,8 +273,11 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- ACLOCAL_AMFLAGS = -I m4
- @WITH_AGENT_FALSE at AGENT_DIR = 
- @WITH_AGENT_TRUE at AGENT_DIR = agent
-@@ -418,7 +364,7 @@
- config.h: stamp-h1
- 	@if test ! -f $@; then \
- 	  rm -f stamp-h1; \
--	  $(MAKE) stamp-h1; \
-+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
- 	else :; fi
- 
- stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-@@ -442,7 +388,6 @@
- 
- distclean-libtool:
- 	-rm -f libtool
--uninstall-info-am:
- 
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
-@@ -475,8 +420,7 @@
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- 	fi; test -z "$$fail"
- 
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- 	@failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
-@@ -578,24 +522,22 @@
- 
- distdir: $(DISTFILES)
- 	$(am__remove_distdir)
--	mkdir $(distdir)
--	$(mkdir_p) $(distdir)/. $(distdir)/libcryptui $(distdir)/m4 $(distdir)/po $(distdir)/src
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	test -d $(distdir) || mkdir $(distdir)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
- 	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -609,7 +551,7 @@
- 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
- 	    test -d "$(distdir)/$$subdir" \
--	    || $(mkdir_p) "$(distdir)/$$subdir" \
-+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
- 	    || exit 1; \
- 	    distdir=`$(am__cd) $(distdir) && pwd`; \
- 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -617,6 +559,8 @@
- 	      $(MAKE) $(AM_MAKEFLAGS) \
- 	        top_distdir="$$top_distdir" \
- 	        distdir="$$distdir/$$subdir" \
-+		am__remove_distdir=: \
-+		am__skip_length_check=: \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -624,7 +568,7 @@
- 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
- 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
--	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
- 	|| chmod -R a+r $(distdir)
- dist-gzip: distdir
- 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-@@ -699,7 +643,7 @@
- 	$(am__remove_distdir)
- 	@(echo "$(distdir) archives ready for distribution: "; \
- 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
--	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
- distcleancheck: distclean
- 	@if test '$(srcdir)' = . ; then \
- 	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-@@ -761,12 +705,20 @@
- 
- install-data-am:
- 
-+install-dvi: install-dvi-recursive
-+
- install-exec-am:
- 
-+install-html: install-html-recursive
-+
- install-info: install-info-recursive
- 
- install-man:
- 
-+install-pdf: install-pdf-recursive
-+
-+install-ps: install-ps-recursive
-+
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-recursive
-@@ -787,24 +739,26 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
- 
--uninstall-info: uninstall-info-recursive
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-+	install-strip
- 
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
--	check-am clean clean-generic clean-libtool clean-recursive \
--	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
--	dist-shar dist-tarZ dist-zip distcheck distclean \
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+	all all-am am--refresh check check-am clean clean-generic \
-+	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-+	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
- 	distclean-generic distclean-hdr distclean-libtool \
--	distclean-recursive distclean-tags distcleancheck distdir \
--	distuninstallcheck dvi dvi-am html html-am info info-am \
--	install install-am install-data install-data-am install-exec \
--	install-exec-am install-info install-info-am install-man \
--	install-strip installcheck installcheck-am installdirs \
--	installdirs-am maintainer-clean maintainer-clean-generic \
--	maintainer-clean-recursive mostlyclean mostlyclean-generic \
--	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
--	tags tags-recursive uninstall uninstall-am uninstall-info-am
-+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
-+	installcheck installcheck-am installdirs installdirs-am \
-+	maintainer-clean maintainer-clean-generic mostlyclean \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	tags tags-recursive uninstall uninstall-am
- 
- 
- distuninstallcheck:
-diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/missing seahorse-1.0.1/missing
---- seahorse-1.0.1-old/missing	2007-03-17 21:34:31.000000000 +0100
-+++ seahorse-1.0.1/missing	2007-05-01 22:57:35.000000000 +0200
-@@ -1,9 +1,9 @@
- #! /bin/sh
- # Common stub for a few missing GNU programs while installing.
- 
--scriptversion=2005-06-08.21
-+scriptversion=2006-05-10.23
- 
--# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
- #   Free Software Foundation, Inc.
- # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
- 
-@@ -33,6 +33,8 @@
- fi
- 
- run=:
-+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
- 
- # In the cases where this matters, `missing' is being run in the
- # srcdir already.
-@@ -44,7 +46,7 @@
- 
- msg="missing on your system"
- 
--case "$1" in
-+case $1 in
- --run)
-   # Try to run requested program, and just exit if it succeeds.
-   run=
-@@ -77,6 +79,7 @@
-   aclocal      touch file \`aclocal.m4'
-   autoconf     touch file \`configure'
-   autoheader   touch file \`config.h.in'
-+  autom4te     touch the output file, or create a stub one
-   automake     touch all \`Makefile.in' files
-   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-   flex         create \`lex.yy.c', if possible, from existing .c
-@@ -106,7 +109,7 @@
- # Now exit if we have it, but it failed.  Also exit now if we
- # don't have it and --version was passed (most likely to detect
- # the program).
--case "$1" in
-+case $1 in
-   lex|yacc)
-     # Not GNU programs, they don't have --version.
-     ;;
-@@ -135,7 +138,7 @@
- 
- # If it does not exist, or fails to run (possibly an outdated version),
- # try to emulate it.
--case "$1" in
-+case $1 in
-   aclocal*)
-     echo 1>&2 "\
- WARNING: \`$1' is $msg.  You should only need it if
-@@ -164,7 +167,7 @@
-     test -z "$files" && files="config.h"
-     touch_files=
-     for f in $files; do
--      case "$f" in
-+      case $f in
-       *:*) touch_files="$touch_files "`echo "$f" |
- 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-       *) touch_files="$touch_files $f.in";;
-@@ -192,8 +195,8 @@
-          You can get \`$1' as part of \`Autoconf' from any GNU
-          archive site."
- 
--    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
--    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-+    file=`echo "$*" | sed -n "$sed_output"`
-+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-     if test -f "$file"; then
- 	touch $file
-     else
-@@ -214,25 +217,25 @@
-          in order for those modifications to take effect.  You can get
-          \`Bison' from any GNU archive site."
-     rm -f y.tab.c y.tab.h
--    if [ $# -ne 1 ]; then
-+    if test $# -ne 1; then
-         eval LASTARG="\${$#}"
--	case "$LASTARG" in
-+	case $LASTARG in
- 	*.y)
- 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
--	    if [ -f "$SRCFILE" ]; then
-+	    if test -f "$SRCFILE"; then
- 	         cp "$SRCFILE" y.tab.c
- 	    fi
- 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
--	    if [ -f "$SRCFILE" ]; then
-+	    if test -f "$SRCFILE"; then
- 	         cp "$SRCFILE" y.tab.h
- 	    fi
- 	  ;;
- 	esac
-     fi
--    if [ ! -f y.tab.h ]; then
-+    if test ! -f y.tab.h; then
- 	echo >y.tab.h
-     fi
--    if [ ! -f y.tab.c ]; then
-+    if test ! -f y.tab.c; then
- 	echo 'main() { return 0; }' >y.tab.c
-     fi
-     ;;
-@@ -244,18 +247,18 @@
-          in order for those modifications to take effect.  You can get
-          \`Flex' from any GNU archive site."
-     rm -f lex.yy.c
--    if [ $# -ne 1 ]; then
-+    if test $# -ne 1; then
-         eval LASTARG="\${$#}"
--	case "$LASTARG" in
-+	case $LASTARG in
- 	*.l)
- 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
--	    if [ -f "$SRCFILE" ]; then
-+	    if test -f "$SRCFILE"; then
- 	         cp "$SRCFILE" lex.yy.c
- 	    fi
- 	  ;;
- 	esac
-     fi
--    if [ ! -f lex.yy.c ]; then
-+    if test ! -f lex.yy.c; then
- 	echo 'main() { return 0; }' >lex.yy.c
-     fi
-     ;;
-@@ -267,11 +270,9 @@
- 	 \`Help2man' package in order for those modifications to take
- 	 effect.  You can get \`Help2man' from any GNU archive site."
- 
--    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
--    if test -z "$file"; then
--	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
--    fi
--    if [ -f "$file" ]; then
-+    file=`echo "$*" | sed -n "$sed_output"`
-+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-+    if test -f "$file"; then
- 	touch $file
-     else
- 	test -z "$file" || exec >$file
-@@ -289,11 +290,17 @@
-          DU, IRIX).  You might want to install the \`Texinfo' package or
-          the \`GNU make' package.  Grab either from any GNU archive site."
-     # The file to touch is that specified with -o ...
--    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-+    file=`echo "$*" | sed -n "$sed_output"`
-+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-     if test -z "$file"; then
-       # ... or it is the one specified with @setfilename ...
-       infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
--      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
-+      file=`sed -n '
-+	/^@setfilename/{
-+	  s/.* \([^ ]*\) *$/\1/
-+	  p
-+	  q
-+	}' $infile`
-       # ... or it is derived from the source name (dir/f.texi becomes f.info)
-       test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-     fi
-@@ -317,13 +324,13 @@
-     fi
-     firstarg="$1"
-     if shift; then
--	case "$firstarg" in
-+	case $firstarg in
- 	*o*)
- 	    firstarg=`echo "$firstarg" | sed s/o//`
- 	    tar "$firstarg" "$@" && exit 0
- 	    ;;
- 	esac
--	case "$firstarg" in
-+	case $firstarg in
- 	*h*)
- 	    firstarg=`echo "$firstarg" | sed s/h//`
- 	    tar "$firstarg" "$@" && exit 0
-diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/mkinstalldirs seahorse-1.0.1/mkinstalldirs
---- seahorse-1.0.1-old/mkinstalldirs	2007-03-17 21:34:35.000000000 +0100
-+++ seahorse-1.0.1/mkinstalldirs	2007-05-01 22:57:43.000000000 +0200
-@@ -1,7 +1,7 @@
- #! /bin/sh
- # mkinstalldirs --- make directory hierarchy
- 
--scriptversion=2005-06-29.22
-+scriptversion=2006-05-11.19
- 
- # Original author: Noah Friedman <friedman at prep.ai.mit.edu>
- # Created: 1993-05-16
-@@ -11,6 +11,9 @@
- # bugs to <bug-automake at gnu.org> or send patches to
- # <automake-patches at gnu.org>.
- 
-+nl='
-+'
-+IFS=" ""	$nl"
- errstatus=0
- dirmode=
- 
-diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/pixmaps/22x22/Makefile.in seahorse-1.0.1/pixmaps/22x22/Makefile.in
---- seahorse-1.0.1-old/pixmaps/22x22/Makefile.in	2007-04-03 18:17:46.000000000 +0200
-+++ seahorse-1.0.1/pixmaps/22x22/Makefile.in	2007-05-01 22:57:39.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
- 
- @SET_MAKE@
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -66,8 +62,6 @@
- AGENT_CFLAGS = @AGENT_CFLAGS@
- AGENT_LIBS = @AGENT_LIBS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -98,8 +92,6 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
- EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
- EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
-@@ -113,8 +105,6 @@
- E_API_VERSION = @E_API_VERSION@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GEDIT_CFLAGS = @GEDIT_CFLAGS@
-@@ -130,23 +120,8 @@
- GNUPG = @GNUPG@
- GPGME_CONFIG = @GPGME_CONFIG@
- GREP = @GREP@
--HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
--HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
--HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
--HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
--HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
--HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
--HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
--HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
--HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
--HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
--HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
--HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
--HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -192,9 +167,8 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MOZILLA = @MOZILLA@
- MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
-@@ -209,8 +183,6 @@
- NAUTILUS_LIBS = @NAUTILUS_LIBS@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
--OS_WIN32_FALSE = @OS_WIN32_FALSE@
--OS_WIN32_TRUE = @OS_WIN32_TRUE@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -219,8 +191,6 @@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
--PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
--PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
- PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
- POFILES = @POFILES@
- POSUB = @POSUB@
-@@ -235,48 +205,17 @@
+diff -Naur seahorse-2.20.old/pixmaps/22x22/Makefile.in seahorse-2.20/pixmaps/22x22/Makefile.in
+--- seahorse-2.20.old/pixmaps/22x22/Makefile.in	2007-09-17 19:21:15.000000000 +0200
++++ seahorse-2.20/pixmaps/22x22/Makefile.in	2007-09-17 23:00:56.000000000 +0200
+@@ -203,15 +203,13 @@
+ RANLIB = @RANLIB@
+ SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
+ SEAHORSE_LIBS = @SEAHORSE_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHARING_CFLAGS = @SHARING_CFLAGS@
+ SHARING_LIBS = @SHARING_LIBS@
  SHELL = @SHELL@
  SOUP_CFLAGS = @SOUP_CFLAGS@
  SOUP_LIBS = @SOUP_LIBS@
@@ -5241,311 +4308,19 @@
 -SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
 -SSH_PATH = @SSH_PATH@
  STRIP = @STRIP@
--UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
--UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
--WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
--WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
--WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
--WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
--WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
--WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
--WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
--WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
--WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
--WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
--WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
--WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
--WITH_HKP_FALSE = @WITH_HKP_FALSE@
--WITH_HKP_TRUE = @WITH_HKP_TRUE@
--WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
--WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
--WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
--WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
--WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
--WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
--WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
--WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
--WITH_SSH_FALSE = @WITH_SSH_FALSE@
--WITH_SSH_TRUE = @WITH_SSH_TRUE@
--WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
--WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
- XGETTEXT = @XGETTEXT@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -288,6 +227,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -315,8 +255,11 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- icon22dir = $(datadir)/pixmaps/seahorse/22x22/
- icon22_DATA = seahorse.png \
-                 seahorse-preferences.png \
-@@ -389,13 +332,9 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- install-desktop_iconsDATA: $(desktop_icons_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(desktop_iconsdir)" || $(mkdir_p) "$(DESTDIR)$(desktop_iconsdir)"
-+	test -z "$(desktop_iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(desktop_iconsdir)"
- 	@list='$(desktop_icons_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -412,7 +351,7 @@
- 	done
- install-icon22DATA: $(icon22_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(icon22dir)" || $(mkdir_p) "$(DESTDIR)$(icon22dir)"
-+	test -z "$(icon22dir)" || $(MKDIR_P) "$(DESTDIR)$(icon22dir)"
- 	@list='$(icon22_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -435,22 +374,21 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
- 	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -466,7 +404,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(desktop_iconsdir)" "$(DESTDIR)$(icon22dir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -498,7 +436,7 @@
- 
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -512,12 +450,20 @@
- 
- install-data-am: install-desktop_iconsDATA install-icon22DATA
- 
-+install-dvi: install-dvi-am
-+
- install-exec-am:
- 
-+install-html: install-html-am
-+
- install-info: install-info-am
- 
- install-man:
- 
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -536,20 +482,22 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-desktop_iconsDATA uninstall-icon22DATA \
--	uninstall-info-am
-+uninstall-am: uninstall-desktop_iconsDATA uninstall-icon22DATA
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
- 	install-data install-data-am install-desktop_iconsDATA \
--	install-exec install-exec-am install-icon22DATA install-info \
--	install-info-am install-man install-strip installcheck \
-+	install-dvi install-dvi-am install-exec install-exec-am \
-+	install-html install-html-am install-icon22DATA install-info \
-+	install-info-am install-man install-pdf install-pdf-am \
-+	install-ps install-ps-am install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-generic \
- 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-desktop_iconsDATA uninstall-icon22DATA \
--	uninstall-info-am
-+	uninstall-desktop_iconsDATA uninstall-icon22DATA
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/pixmaps/48x48/Makefile.in seahorse-1.0.1/pixmaps/48x48/Makefile.in
---- seahorse-1.0.1-old/pixmaps/48x48/Makefile.in	2007-04-03 18:17:46.000000000 +0200
-+++ seahorse-1.0.1/pixmaps/48x48/Makefile.in	2007-05-01 22:57:39.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
- 
- @SET_MAKE@
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -67,8 +63,6 @@
- AGENT_CFLAGS = @AGENT_CFLAGS@
- AGENT_LIBS = @AGENT_LIBS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -99,8 +93,6 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
- EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
- EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
-@@ -114,8 +106,6 @@
- E_API_VERSION = @E_API_VERSION@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GEDIT_CFLAGS = @GEDIT_CFLAGS@
-@@ -131,23 +121,8 @@
- GNUPG = @GNUPG@
- GPGME_CONFIG = @GPGME_CONFIG@
- GREP = @GREP@
--HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
--HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
--HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
--HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
--HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
--HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
--HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
--HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
--HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
--HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
--HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
--HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
--HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -193,9 +168,8 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MOZILLA = @MOZILLA@
- MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
-@@ -210,8 +184,6 @@
- NAUTILUS_LIBS = @NAUTILUS_LIBS@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
--OS_WIN32_FALSE = @OS_WIN32_FALSE@
--OS_WIN32_TRUE = @OS_WIN32_TRUE@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -220,8 +192,6 @@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
--PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
--PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
- PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
- POFILES = @POFILES@
- POSUB = @POSUB@
-@@ -236,48 +206,17 @@
+diff -Naur seahorse-2.20.old/pixmaps/48x48/Makefile.in seahorse-2.20/pixmaps/48x48/Makefile.in
+--- seahorse-2.20.old/pixmaps/48x48/Makefile.in	2007-09-17 19:21:16.000000000 +0200
++++ seahorse-2.20/pixmaps/48x48/Makefile.in	2007-09-17 23:00:56.000000000 +0200
+@@ -204,15 +204,13 @@
+ RANLIB = @RANLIB@
+ SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
+ SEAHORSE_LIBS = @SEAHORSE_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHARING_CFLAGS = @SHARING_CFLAGS@
+ SHARING_LIBS = @SHARING_LIBS@
  SHELL = @SHELL@
  SOUP_CFLAGS = @SOUP_CFLAGS@
  SOUP_LIBS = @SOUP_LIBS@
@@ -5553,337 +4328,19 @@
 -SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
 -SSH_PATH = @SSH_PATH@
  STRIP = @STRIP@
--UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
--UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
--WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
--WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
--WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
--WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
--WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
--WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
--WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
--WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
--WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
--WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
--WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
--WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
--WITH_HKP_FALSE = @WITH_HKP_FALSE@
--WITH_HKP_TRUE = @WITH_HKP_TRUE@
--WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
--WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
--WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
--WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
--WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
--WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
--WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
--WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
--WITH_SSH_FALSE = @WITH_SSH_FALSE@
--WITH_SSH_TRUE = @WITH_SSH_TRUE@
--WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
--WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
- XGETTEXT = @XGETTEXT@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -289,6 +228,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -316,8 +256,11 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- icon48dir = $(datadir)/pixmaps/seahorse/48x48/
- icon48_DATA = seahorse.png \
-                 seahorse-preferences.png \
-@@ -385,13 +328,9 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- install-desktop_iconsDATA: $(desktop_icons_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(desktop_iconsdir)" || $(mkdir_p) "$(DESTDIR)$(desktop_iconsdir)"
-+	test -z "$(desktop_iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(desktop_iconsdir)"
- 	@list='$(desktop_icons_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -408,7 +347,7 @@
- 	done
- install-icon48DATA: $(icon48_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(icon48dir)" || $(mkdir_p) "$(DESTDIR)$(icon48dir)"
-+	test -z "$(icon48dir)" || $(MKDIR_P) "$(DESTDIR)$(icon48dir)"
- 	@list='$(icon48_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -425,7 +364,7 @@
- 	done
- install-pixmapDATA: $(pixmap_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(pixmapdir)" || $(mkdir_p) "$(DESTDIR)$(pixmapdir)"
-+	test -z "$(pixmapdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapdir)"
- 	@list='$(pixmap_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -448,22 +387,21 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
- 	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -479,7 +417,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(desktop_iconsdir)" "$(DESTDIR)$(icon48dir)" "$(DESTDIR)$(pixmapdir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -511,7 +449,7 @@
- 
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -526,12 +464,20 @@
- install-data-am: install-desktop_iconsDATA install-icon48DATA \
- 	install-pixmapDATA
- 
-+install-dvi: install-dvi-am
-+
- install-exec-am:
- 
-+install-html: install-html-am
-+
- install-info: install-info-am
- 
- install-man:
- 
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -551,19 +497,23 @@
- ps-am:
- 
- uninstall-am: uninstall-desktop_iconsDATA uninstall-icon48DATA \
--	uninstall-info-am uninstall-pixmapDATA
-+	uninstall-pixmapDATA
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
- 	install-data install-data-am install-desktop_iconsDATA \
--	install-exec install-exec-am install-icon48DATA install-info \
--	install-info-am install-man install-pixmapDATA install-strip \
-+	install-dvi install-dvi-am install-exec install-exec-am \
-+	install-html install-html-am install-icon48DATA install-info \
-+	install-info-am install-man install-pdf install-pdf-am \
-+	install-pixmapDATA install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-generic \
- 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- 	uninstall-desktop_iconsDATA uninstall-icon48DATA \
--	uninstall-info-am uninstall-pixmapDATA
-+	uninstall-pixmapDATA
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/pixmaps/Makefile.in seahorse-1.0.1/pixmaps/Makefile.in
---- seahorse-1.0.1-old/pixmaps/Makefile.in	2007-04-03 18:17:46.000000000 +0200
-+++ seahorse-1.0.1/pixmaps/Makefile.in	2007-05-01 22:57:40.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +13,11 @@
- # PARTICULAR PURPOSE.
- 
- @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -51,10 +47,13 @@
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
--	install-exec-recursive install-info-recursive \
--	install-recursive installcheck-recursive installdirs-recursive \
--	pdf-recursive ps-recursive uninstall-info-recursive \
--	uninstall-recursive
-+	install-dvi-recursive install-exec-recursive \
-+	install-html-recursive install-info-recursive \
-+	install-pdf-recursive install-ps-recursive install-recursive \
-+	installcheck-recursive installdirs-recursive pdf-recursive \
-+	ps-recursive uninstall-recursive
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-+  distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = $(SUBDIRS)
-@@ -63,8 +62,6 @@
- AGENT_CFLAGS = @AGENT_CFLAGS@
- AGENT_LIBS = @AGENT_LIBS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -95,8 +92,6 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
- EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
- EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
-@@ -110,8 +105,6 @@
- E_API_VERSION = @E_API_VERSION@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GEDIT_CFLAGS = @GEDIT_CFLAGS@
-@@ -127,23 +120,8 @@
- GNUPG = @GNUPG@
- GPGME_CONFIG = @GPGME_CONFIG@
- GREP = @GREP@
--HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
--HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
--HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
--HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
--HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
--HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
--HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
--HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
--HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
--HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
--HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
--HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
--HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -189,9 +167,8 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MOZILLA = @MOZILLA@
- MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
-@@ -206,8 +183,6 @@
- NAUTILUS_LIBS = @NAUTILUS_LIBS@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
--OS_WIN32_FALSE = @OS_WIN32_FALSE@
--OS_WIN32_TRUE = @OS_WIN32_TRUE@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -216,8 +191,6 @@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
--PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
--PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
- PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
- POFILES = @POFILES@
- POSUB = @POSUB@
-@@ -232,48 +205,17 @@
+diff -Naur seahorse-2.20.old/pixmaps/Makefile.in seahorse-2.20/pixmaps/Makefile.in
+--- seahorse-2.20.old/pixmaps/Makefile.in	2007-09-17 19:21:16.000000000 +0200
++++ seahorse-2.20/pixmaps/Makefile.in	2007-09-17 23:00:57.000000000 +0200
+@@ -203,15 +203,13 @@
+ RANLIB = @RANLIB@
+ SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
+ SEAHORSE_LIBS = @SEAHORSE_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHARING_CFLAGS = @SHARING_CFLAGS@
+ SHARING_LIBS = @SHARING_LIBS@
  SHELL = @SHELL@
  SOUP_CFLAGS = @SOUP_CFLAGS@
  SOUP_LIBS = @SOUP_LIBS@
@@ -5891,326 +4348,19 @@
 -SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
 -SSH_PATH = @SSH_PATH@
  STRIP = @STRIP@
--UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
--UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
--WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
--WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
--WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
--WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
--WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
--WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
--WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
--WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
--WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
--WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
--WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
--WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
--WITH_HKP_FALSE = @WITH_HKP_FALSE@
--WITH_HKP_TRUE = @WITH_HKP_TRUE@
--WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
--WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
--WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
--WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
--WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
--WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
--WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
--WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
--WITH_SSH_FALSE = @WITH_SSH_FALSE@
--WITH_SSH_TRUE = @WITH_SSH_TRUE@
--WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
--WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
- XGETTEXT = @XGETTEXT@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -285,6 +227,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -312,8 +255,11 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- SUBDIRS = 22x22 48x48 scalable
- gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
- all: all-recursive
-@@ -355,10 +301,6 @@
- clean-libtool:
- 	-rm -rf .libs _libs
- 
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
--
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
- # To change the values of `make' variables: instead of editing Makefiles,
-@@ -390,8 +332,7 @@
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- 	fi; test -z "$$fail"
- 
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- 	@failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
-@@ -492,22 +433,21 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
- 	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -521,7 +461,7 @@
- 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
- 	    test -d "$(distdir)/$$subdir" \
--	    || $(mkdir_p) "$(distdir)/$$subdir" \
-+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
- 	    || exit 1; \
- 	    distdir=`$(am__cd) $(distdir) && pwd`; \
- 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -529,6 +469,8 @@
- 	      $(MAKE) $(AM_MAKEFLAGS) \
- 	        top_distdir="$$top_distdir" \
- 	        distdir="$$distdir/$$subdir" \
-+		am__remove_distdir=: \
-+		am__skip_length_check=: \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -568,8 +510,7 @@
- 
- distclean: distclean-recursive
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool \
--	distclean-tags
-+distclean-am: clean-am distclean-generic distclean-tags
- 
- dvi: dvi-recursive
- 
-@@ -585,12 +526,20 @@
- 	@$(NORMAL_INSTALL)
- 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- 
-+install-dvi: install-dvi-recursive
-+
- install-exec-am:
- 
-+install-html: install-html-recursive
-+
- install-info: install-info-recursive
- 
- install-man:
- 
-+install-pdf: install-pdf-recursive
-+
-+install-ps: install-ps-recursive
-+
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-recursive
-@@ -609,22 +558,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
- 
--uninstall-info: uninstall-info-recursive
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-+	install-data-am install-strip
- 
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
--	clean clean-generic clean-libtool clean-recursive ctags \
--	ctags-recursive distclean distclean-generic distclean-libtool \
--	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+	all all-am check check-am clean clean-generic clean-libtool \
-+	ctags ctags-recursive distclean distclean-generic \
-+	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-data-hook install-exec install-exec-am \
--	install-info install-info-am install-man install-strip \
-+	install-data-am install-data-hook install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs installdirs-am \
--	maintainer-clean maintainer-clean-generic \
--	maintainer-clean-recursive mostlyclean mostlyclean-generic \
--	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
--	tags tags-recursive uninstall uninstall-am uninstall-info-am
-+	maintainer-clean maintainer-clean-generic mostlyclean \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	tags tags-recursive uninstall uninstall-am
- 
- 
- install-data-hook:
-diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/pixmaps/scalable/Makefile.in seahorse-1.0.1/pixmaps/scalable/Makefile.in
---- seahorse-1.0.1-old/pixmaps/scalable/Makefile.in	2007-04-03 18:17:46.000000000 +0200
-+++ seahorse-1.0.1/pixmaps/scalable/Makefile.in	2007-05-01 22:57:40.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
- 
- @SET_MAKE@
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -67,8 +63,6 @@
- AGENT_CFLAGS = @AGENT_CFLAGS@
- AGENT_LIBS = @AGENT_LIBS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -99,8 +93,6 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
- EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
- EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
-@@ -114,8 +106,6 @@
- E_API_VERSION = @E_API_VERSION@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GEDIT_CFLAGS = @GEDIT_CFLAGS@
-@@ -131,23 +121,8 @@
- GNUPG = @GNUPG@
- GPGME_CONFIG = @GPGME_CONFIG@
- GREP = @GREP@
--HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
--HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
--HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
--HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
--HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
--HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
--HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
--HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
--HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
--HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
--HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
--HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
--HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -193,9 +168,8 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MOZILLA = @MOZILLA@
- MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
-@@ -210,8 +184,6 @@
- NAUTILUS_LIBS = @NAUTILUS_LIBS@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
--OS_WIN32_FALSE = @OS_WIN32_FALSE@
--OS_WIN32_TRUE = @OS_WIN32_TRUE@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -220,8 +192,6 @@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
--PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
--PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
- PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
- POFILES = @POFILES@
- POSUB = @POSUB@
-@@ -236,48 +206,17 @@
+diff -Naur seahorse-2.20.old/pixmaps/scalable/Makefile.in seahorse-2.20/pixmaps/scalable/Makefile.in
+--- seahorse-2.20.old/pixmaps/scalable/Makefile.in	2007-09-17 19:21:16.000000000 +0200
++++ seahorse-2.20/pixmaps/scalable/Makefile.in	2007-09-17 23:00:57.000000000 +0200
+@@ -204,15 +204,13 @@
+ RANLIB = @RANLIB@
+ SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
+ SEAHORSE_LIBS = @SEAHORSE_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHARING_CFLAGS = @SHARING_CFLAGS@
+ SHARING_LIBS = @SHARING_LIBS@
  SHELL = @SHELL@
  SOUP_CFLAGS = @SOUP_CFLAGS@
  SOUP_LIBS = @SOUP_LIBS@
@@ -6218,319 +4368,19 @@
 -SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
 -SSH_PATH = @SSH_PATH@
  STRIP = @STRIP@
--UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
--UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
--WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
--WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
--WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
--WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
--WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
--WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
--WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
--WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
--WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
--WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
--WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
--WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
--WITH_HKP_FALSE = @WITH_HKP_FALSE@
--WITH_HKP_TRUE = @WITH_HKP_TRUE@
--WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
--WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
--WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
--WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
--WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
--WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
--WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
--WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
--WITH_SSH_FALSE = @WITH_SSH_FALSE@
--WITH_SSH_TRUE = @WITH_SSH_TRUE@
--WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
--WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
- XGETTEXT = @XGETTEXT@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -289,6 +228,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -316,8 +256,11 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- pixmapdir = $(datadir)/pixmaps/
- pixmap_DATA = seahorse-applet.svg
- iconsvgdir = $(datadir)/pixmaps/seahorse/scalable/
-@@ -383,13 +326,9 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- install-desktop_iconsDATA: $(desktop_icons_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(desktop_iconsdir)" || $(mkdir_p) "$(DESTDIR)$(desktop_iconsdir)"
-+	test -z "$(desktop_iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(desktop_iconsdir)"
- 	@list='$(desktop_icons_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -406,7 +345,7 @@
- 	done
- install-iconsvgDATA: $(iconsvg_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(iconsvgdir)" || $(mkdir_p) "$(DESTDIR)$(iconsvgdir)"
-+	test -z "$(iconsvgdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsvgdir)"
- 	@list='$(iconsvg_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -423,7 +362,7 @@
- 	done
- install-pixmapDATA: $(pixmap_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(pixmapdir)" || $(mkdir_p) "$(DESTDIR)$(pixmapdir)"
-+	test -z "$(pixmapdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapdir)"
- 	@list='$(pixmap_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -446,22 +385,21 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
- 	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -477,7 +415,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(desktop_iconsdir)" "$(DESTDIR)$(iconsvgdir)" "$(DESTDIR)$(pixmapdir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -509,7 +447,7 @@
- 
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -524,12 +462,20 @@
- install-data-am: install-desktop_iconsDATA install-iconsvgDATA \
- 	install-pixmapDATA
- 
-+install-dvi: install-dvi-am
-+
- install-exec-am:
- 
-+install-html: install-html-am
-+
- install-info: install-info-am
- 
- install-man:
- 
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -549,19 +495,23 @@
- ps-am:
- 
- uninstall-am: uninstall-desktop_iconsDATA uninstall-iconsvgDATA \
--	uninstall-info-am uninstall-pixmapDATA
-+	uninstall-pixmapDATA
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
- 	install-data install-data-am install-desktop_iconsDATA \
--	install-exec install-exec-am install-iconsvgDATA install-info \
--	install-info-am install-man install-pixmapDATA install-strip \
-+	install-dvi install-dvi-am install-exec install-exec-am \
-+	install-html install-html-am install-iconsvgDATA install-info \
-+	install-info-am install-man install-pdf install-pdf-am \
-+	install-pixmapDATA install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-generic \
- 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- 	uninstall-desktop_iconsDATA uninstall-iconsvgDATA \
--	uninstall-info-am uninstall-pixmapDATA
-+	uninstall-pixmapDATA
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/plugins/applet/docs/Makefile.in seahorse-1.0.1/plugins/applet/docs/Makefile.in
---- seahorse-1.0.1-old/plugins/applet/docs/Makefile.in	2007-04-03 18:17:47.000000000 +0200
-+++ seahorse-1.0.1/plugins/applet/docs/Makefile.in	2007-05-01 22:57:41.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -37,15 +37,11 @@
- # the same distribution terms that you use for the rest of that program.
- 
- ################################################################################
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -79,8 +75,6 @@
- AGENT_CFLAGS = @AGENT_CFLAGS@
- AGENT_LIBS = @AGENT_LIBS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -111,8 +105,6 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
- EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
- EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
-@@ -126,8 +118,6 @@
- E_API_VERSION = @E_API_VERSION@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GEDIT_CFLAGS = @GEDIT_CFLAGS@
-@@ -143,23 +133,8 @@
- GNUPG = @GNUPG@
- GPGME_CONFIG = @GPGME_CONFIG@
- GREP = @GREP@
--HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
--HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
--HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
--HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
--HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
--HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
--HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
--HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
--HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
--HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
--HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
--HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
--HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -205,9 +180,8 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MOZILLA = @MOZILLA@
- MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
-@@ -222,8 +196,6 @@
- NAUTILUS_LIBS = @NAUTILUS_LIBS@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
--OS_WIN32_FALSE = @OS_WIN32_FALSE@
--OS_WIN32_TRUE = @OS_WIN32_TRUE@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -232,8 +204,6 @@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
--PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
--PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
- PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
- POFILES = @POFILES@
- POSUB = @POSUB@
-@@ -248,48 +218,17 @@
+diff -Naur seahorse-2.20.old/plugins/applet/docs/Makefile.in seahorse-2.20/plugins/applet/docs/Makefile.in
+--- seahorse-2.20.old/plugins/applet/docs/Makefile.in	2007-09-17 19:21:16.000000000 +0200
++++ seahorse-2.20/plugins/applet/docs/Makefile.in	2007-09-17 23:00:58.000000000 +0200
+@@ -216,15 +216,13 @@
+ RANLIB = @RANLIB@
+ SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
+ SEAHORSE_LIBS = @SEAHORSE_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHARING_CFLAGS = @SHARING_CFLAGS@
+ SHARING_LIBS = @SHARING_LIBS@
  SHELL = @SHELL@
  SOUP_CFLAGS = @SOUP_CFLAGS@
  SOUP_LIBS = @SOUP_LIBS@
@@ -6538,340 +4388,19 @@
 -SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
 -SSH_PATH = @SSH_PATH@
  STRIP = @STRIP@
--UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
--UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
--WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
--WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
--WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
--WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
--WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
--WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
--WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
--WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
--WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
--WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
--WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
--WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
--WITH_HKP_FALSE = @WITH_HKP_FALSE@
--WITH_HKP_TRUE = @WITH_HKP_TRUE@
--WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
--WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
--WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
--WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
--WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
--WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
--WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
--WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
--WITH_SSH_FALSE = @WITH_SSH_FALSE@
--WITH_SSH_TRUE = @WITH_SSH_TRUE@
--WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
--WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
- XGETTEXT = @XGETTEXT@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -301,6 +240,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -328,8 +268,11 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
- _DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS))
- _DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)),		\
-@@ -476,10 +419,6 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -488,23 +427,21 @@
- 
- 
- distdir: $(DISTFILES)
--	$(mkdir_p) $(distdir)/../../..
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
- 	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -552,8 +489,7 @@
- 
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool \
--	distclean-local
-+distclean-am: clean-am distclean-generic distclean-local
- 
- dvi: dvi-am
- 
-@@ -567,12 +503,20 @@
- 
- install-data-am: install-data-local
- 
-+install-dvi: install-dvi-am
-+
- install-exec-am:
- 
-+install-html: install-html-am
-+
- install-info: install-info-am
- 
- install-man:
- 
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -593,19 +537,22 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am uninstall-local
-+uninstall-am: uninstall-local
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	clean-local dist-hook distclean distclean-generic \
- 	distclean-libtool distclean-local distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-data-local install-exec \
--	install-exec-am install-info install-info-am install-man \
--	install-strip installcheck installcheck-am installdirs \
--	maintainer-clean maintainer-clean-generic \
--	maintainer-clean-local mostlyclean mostlyclean-generic \
--	mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am \
--	uninstall uninstall-am uninstall-info-am uninstall-local
-+	install-data-am install-data-local install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic maintainer-clean-local mostlyclean \
-+	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
-+	pdf-am ps ps-am uninstall uninstall-am uninstall-local
- 
- 
- DOC_H_FILE ?=
-diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/plugins/applet/Makefile.in seahorse-1.0.1/plugins/applet/Makefile.in
---- seahorse-1.0.1-old/plugins/applet/Makefile.in	2007-04-03 18:17:47.000000000 +0200
-+++ seahorse-1.0.1/plugins/applet/Makefile.in	2007-05-01 22:57:41.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,15 +15,11 @@
- @SET_MAKE@
- 
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -62,25 +58,27 @@
- 	$(top_builddir)/libseahorse/libseahorse.a \
- 	$(top_builddir)/libcryptui/libcryptui.la $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1)
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(seahorse_applet_SOURCES)
- DIST_SOURCES = $(seahorse_applet_SOURCES)
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
--	install-exec-recursive install-info-recursive \
--	install-recursive installcheck-recursive installdirs-recursive \
--	pdf-recursive ps-recursive uninstall-info-recursive \
--	uninstall-recursive
-+	install-dvi-recursive install-exec-recursive \
-+	install-html-recursive install-info-recursive \
-+	install-pdf-recursive install-ps-recursive install-recursive \
-+	installcheck-recursive installdirs-recursive pdf-recursive \
-+	ps-recursive uninstall-recursive
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
-     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-@@ -91,6 +89,8 @@
- serverDATA_INSTALL = $(INSTALL_DATA)
- uiDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(glade_DATA) $(server_DATA) $(ui_DATA)
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-+  distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -98,8 +98,6 @@
- AGENT_CFLAGS = @AGENT_CFLAGS@
- AGENT_LIBS = @AGENT_LIBS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -130,8 +128,6 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
- EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
- EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
-@@ -145,8 +141,6 @@
- E_API_VERSION = @E_API_VERSION@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GEDIT_CFLAGS = @GEDIT_CFLAGS@
-@@ -162,23 +156,8 @@
- GNUPG = @GNUPG@
- GPGME_CONFIG = @GPGME_CONFIG@
- GREP = @GREP@
--HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
--HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
--HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
--HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
--HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
--HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
--HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
--HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
--HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
--HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
--HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
--HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
--HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -224,9 +203,8 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MOZILLA = @MOZILLA@
- MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
-@@ -241,8 +219,6 @@
- NAUTILUS_LIBS = @NAUTILUS_LIBS@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
--OS_WIN32_FALSE = @OS_WIN32_FALSE@
--OS_WIN32_TRUE = @OS_WIN32_TRUE@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -251,8 +227,6 @@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
--PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
--PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
- PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
- POFILES = @POFILES@
- POSUB = @POSUB@
-@@ -267,48 +241,17 @@
+diff -Naur seahorse-2.20.old/plugins/applet/Makefile.in seahorse-2.20/plugins/applet/Makefile.in
+--- seahorse-2.20.old/plugins/applet/Makefile.in	2007-09-17 19:21:16.000000000 +0200
++++ seahorse-2.20/plugins/applet/Makefile.in	2007-09-17 23:00:58.000000000 +0200
+@@ -239,15 +239,13 @@
+ RANLIB = @RANLIB@
+ SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
+ SEAHORSE_LIBS = @SEAHORSE_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHARING_CFLAGS = @SHARING_CFLAGS@
+ SHARING_LIBS = @SHARING_LIBS@
  SHELL = @SHELL@
  SOUP_CFLAGS = @SOUP_CFLAGS@
  SOUP_LIBS = @SOUP_LIBS@
@@ -6879,460 +4408,19 @@
 -SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
 -SSH_PATH = @SSH_PATH@
  STRIP = @STRIP@
--UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
--UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
--WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
--WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
--WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
--WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
--WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
--WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
--WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
--WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
--WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
--WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
--WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
--WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
--WITH_HKP_FALSE = @WITH_HKP_FALSE@
--WITH_HKP_TRUE = @WITH_HKP_TRUE@
--WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
--WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
--WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
--WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
--WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
--WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
--WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
--WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
--WITH_SSH_FALSE = @WITH_SSH_FALSE@
--WITH_SSH_TRUE = @WITH_SSH_TRUE@
--WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
--WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
- XGETTEXT = @XGETTEXT@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -320,6 +263,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -347,8 +291,11 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- uidir = $(datadir)/gnome-2.0/ui
- gladedir = $(datadir)/seahorse/glade/
- SUBDIRS = docs
-@@ -432,7 +379,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-seahorse_appletPROGRAMS: $(seahorse_applet_PROGRAMS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(seahorse_appletdir)" || $(mkdir_p) "$(DESTDIR)$(seahorse_appletdir)"
-+	test -z "$(seahorse_appletdir)" || $(MKDIR_P) "$(DESTDIR)$(seahorse_appletdir)"
- 	@list='$(seahorse_applet_PROGRAMS)'; for p in $$list; do \
- 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- 	  if test -f $$p \
-@@ -460,7 +407,7 @@
- 	done
- seahorse-applet$(EXEEXT): $(seahorse_applet_OBJECTS) $(seahorse_applet_DEPENDENCIES) 
- 	@rm -f seahorse-applet$(EXEEXT)
--	$(LINK) $(seahorse_applet_LDFLAGS) $(seahorse_applet_OBJECTS) $(seahorse_applet_LDADD) $(LIBS)
-+	$(LINK) $(seahorse_applet_OBJECTS) $(seahorse_applet_LDADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -471,22 +418,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-applet.Po at am__quote@
- 
- .c.o:
-- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
-- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
-- at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -496,13 +443,9 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- install-gladeDATA: $(glade_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)"
-+	test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
- 	@list='$(glade_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -519,7 +462,7 @@
- 	done
- install-serverDATA: $(server_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(serverdir)" || $(mkdir_p) "$(DESTDIR)$(serverdir)"
-+	test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)"
- 	@list='$(server_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -536,7 +479,7 @@
- 	done
- install-uiDATA: $(ui_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(uidir)" || $(mkdir_p) "$(DESTDIR)$(uidir)"
-+	test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
- 	@list='$(ui_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -583,8 +526,7 @@
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- 	fi; test -z "$$fail"
- 
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- 	@failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
-@@ -685,22 +627,21 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
- 	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -714,7 +655,7 @@
- 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
- 	    test -d "$(distdir)/$$subdir" \
--	    || $(mkdir_p) "$(distdir)/$$subdir" \
-+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
- 	    || exit 1; \
- 	    distdir=`$(am__cd) $(distdir) && pwd`; \
- 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -722,6 +663,8 @@
- 	      $(MAKE) $(AM_MAKEFLAGS) \
- 	        top_distdir="$$top_distdir" \
- 	        distdir="$$distdir/$$subdir" \
-+		am__remove_distdir=: \
-+		am__skip_length_check=: \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -732,7 +675,7 @@
- installdirs: installdirs-recursive
- installdirs-am:
- 	for dir in "$(DESTDIR)$(seahorse_appletdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(uidir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: install-recursive
- install-exec: install-exec-recursive
-@@ -768,7 +711,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-libtool distclean-tags
-+	distclean-tags
- 
- dvi: dvi-recursive
- 
-@@ -783,12 +726,20 @@
- install-data-am: install-gladeDATA install-seahorse_appletPROGRAMS \
- 	install-serverDATA install-uiDATA
- 
-+install-dvi: install-dvi-recursive
-+
- install-exec-am:
- 
-+install-html: install-html-recursive
-+
- install-info: install-info-recursive
- 
- install-man:
- 
-+install-pdf: install-pdf-recursive
-+
-+install-ps: install-ps-recursive
-+
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-recursive
-@@ -809,29 +760,29 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-gladeDATA uninstall-info-am \
--	uninstall-seahorse_appletPROGRAMS uninstall-serverDATA \
--	uninstall-uiDATA
-+uninstall-am: uninstall-gladeDATA uninstall-seahorse_appletPROGRAMS \
-+	uninstall-serverDATA uninstall-uiDATA
- 
--uninstall-info: uninstall-info-recursive
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-+	install-strip
- 
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
--	clean clean-generic clean-libtool clean-recursive \
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+	all all-am check check-am clean clean-generic clean-libtool \
- 	clean-seahorse_appletPROGRAMS ctags ctags-recursive distclean \
- 	distclean-compile distclean-generic distclean-libtool \
--	distclean-recursive distclean-tags distdir dvi dvi-am html \
--	html-am info info-am install install-am install-data \
--	install-data-am install-exec install-exec-am install-gladeDATA \
--	install-info install-info-am install-man \
--	install-seahorse_appletPROGRAMS install-serverDATA \
--	install-strip install-uiDATA installcheck installcheck-am \
--	installdirs installdirs-am maintainer-clean \
--	maintainer-clean-generic maintainer-clean-recursive \
--	mostlyclean mostlyclean-compile mostlyclean-generic \
--	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-+	distclean-tags distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-dvi \
-+	install-dvi-am install-exec install-exec-am install-gladeDATA \
-+	install-html install-html-am install-info install-info-am \
-+	install-man install-pdf install-pdf-am install-ps \
-+	install-ps-am install-seahorse_appletPROGRAMS \
-+	install-serverDATA install-strip install-uiDATA installcheck \
-+	installcheck-am installdirs installdirs-am maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- 	tags tags-recursive uninstall uninstall-am uninstall-gladeDATA \
--	uninstall-info-am uninstall-seahorse_appletPROGRAMS \
--	uninstall-serverDATA uninstall-uiDATA
-+	uninstall-seahorse_appletPROGRAMS uninstall-serverDATA \
-+	uninstall-uiDATA
- 
- 
- $(server_in_files): $(server_in_files:.server.in=.server.in.in)
-diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/plugins/epiphany/Makefile.in seahorse-1.0.1/plugins/epiphany/Makefile.in
---- seahorse-1.0.1-old/plugins/epiphany/Makefile.in	2007-04-03 18:17:48.000000000 +0200
-+++ seahorse-1.0.1/plugins/epiphany/Makefile.in	2007-05-01 22:57:41.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,15 +15,11 @@
- @SET_MAKE@
- 
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -67,27 +63,35 @@
- 	libseahorseextension_la-seahorse.lo
- libseahorseextension_la_OBJECTS =  \
- 	$(am_libseahorseextension_la_OBJECTS)
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+libseahorseextension_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
-+	$(libseahorseextension_la_CFLAGS) $(CFLAGS) \
-+	$(libseahorseextension_la_LDFLAGS) $(LDFLAGS) -o $@
-+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(libseahorseextension_la_SOURCES)
- DIST_SOURCES = $(libseahorseextension_la_SOURCES)
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
--	install-exec-recursive install-info-recursive \
--	install-recursive installcheck-recursive installdirs-recursive \
--	pdf-recursive ps-recursive uninstall-info-recursive \
--	uninstall-recursive
-+	install-dvi-recursive install-exec-recursive \
-+	install-html-recursive install-info-recursive \
-+	install-pdf-recursive install-ps-recursive install-recursive \
-+	installcheck-recursive installdirs-recursive pdf-recursive \
-+	ps-recursive uninstall-recursive
- extensioniniDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(extensionini_DATA)
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-+  distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = $(SUBDIRS)
-@@ -96,8 +100,6 @@
- AGENT_CFLAGS = @AGENT_CFLAGS@
- AGENT_LIBS = @AGENT_LIBS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -128,8 +130,6 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
- EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
- EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
-@@ -143,8 +143,6 @@
- E_API_VERSION = @E_API_VERSION@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GEDIT_CFLAGS = @GEDIT_CFLAGS@
-@@ -160,23 +158,8 @@
- GNUPG = @GNUPG@
- GPGME_CONFIG = @GPGME_CONFIG@
- GREP = @GREP@
--HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
--HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
--HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
--HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
--HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
--HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
--HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
--HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
--HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
--HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
--HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
--HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
--HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -222,9 +205,8 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MOZILLA = @MOZILLA@
- MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
-@@ -239,8 +221,6 @@
- NAUTILUS_LIBS = @NAUTILUS_LIBS@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
--OS_WIN32_FALSE = @OS_WIN32_FALSE@
--OS_WIN32_TRUE = @OS_WIN32_TRUE@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -249,8 +229,6 @@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
--PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
--PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
- PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
- POFILES = @POFILES@
- POSUB = @POSUB@
-@@ -265,48 +243,17 @@
+diff -Naur seahorse-2.20.old/plugins/epiphany/Makefile.in seahorse-2.20/plugins/epiphany/Makefile.in
+--- seahorse-2.20.old/plugins/epiphany/Makefile.in	2007-09-17 19:21:16.000000000 +0200
++++ seahorse-2.20/plugins/epiphany/Makefile.in	2007-09-17 23:00:58.000000000 +0200
+@@ -241,15 +241,13 @@
+ RANLIB = @RANLIB@
+ SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
+ SEAHORSE_LIBS = @SEAHORSE_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHARING_CFLAGS = @SHARING_CFLAGS@
+ SHARING_LIBS = @SHARING_LIBS@
  SHELL = @SHELL@
  SOUP_CFLAGS = @SOUP_CFLAGS@
  SOUP_LIBS = @SOUP_LIBS@
@@ -7340,466 +4428,19 @@
 -SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
 -SSH_PATH = @SSH_PATH@
  STRIP = @STRIP@
--UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
--UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
--WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
--WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
--WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
--WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
--WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
--WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
--WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
--WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
--WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
--WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
--WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
--WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
--WITH_HKP_FALSE = @WITH_HKP_FALSE@
--WITH_HKP_TRUE = @WITH_HKP_TRUE@
--WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
--WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
--WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
--WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
--WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
--WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
--WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
--WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
--WITH_SSH_FALSE = @WITH_SSH_FALSE@
--WITH_SSH_TRUE = @WITH_SSH_TRUE@
--WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
--WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
- XGETTEXT = @XGETTEXT@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -318,6 +265,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -345,8 +293,11 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- SUBDIRS = mozilla
- extensiondir = $(libdir)/epiphany/$(E_API_VERSION)/extensions
- extension_LTLIBRARIES = libseahorseextension.la
-@@ -421,7 +372,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-extensionLTLIBRARIES: $(extension_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(extensiondir)" || $(mkdir_p) "$(DESTDIR)$(extensiondir)"
-+	test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)"
- 	@list='$(extension_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -432,7 +383,7 @@
- 
- uninstall-extensionLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@set -x; list='$(extension_LTLIBRARIES)'; for p in $$list; do \
-+	@list='$(extension_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(extensiondir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(extensiondir)/$$p"; \
-@@ -447,7 +398,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- libseahorseextension.la: $(libseahorseextension_la_OBJECTS) $(libseahorseextension_la_DEPENDENCIES) 
--	$(LINK) -rpath $(extensiondir) $(libseahorseextension_la_LDFLAGS) $(libseahorseextension_la_OBJECTS) $(libseahorseextension_la_LIBADD) $(LIBS)
-+	$(libseahorseextension_la_LINK) -rpath $(extensiondir) $(libseahorseextension_la_OBJECTS) $(libseahorseextension_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -459,52 +410,48 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libseahorseextension_la-seahorse.Plo at am__quote@
- 
- .c.o:
-- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
-- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
-- at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- libseahorseextension_la-seahorse-extension.lo: seahorse-extension.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libseahorseextension_la_CPPFLAGS) $(CPPFLAGS) $(libseahorseextension_la_CFLAGS) $(CFLAGS) -MT libseahorseextension_la-seahorse-extension.lo -MD -MP -MF "$(DEPDIR)/libseahorseextension_la-seahorse-extension.Tpo" -c -o libseahorseextension_la-seahorse-extension.lo `test -f 'seahorse-extension.c' || echo '$(srcdir)/'`seahorse-extension.c; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libseahorseextension_la-seahorse-extension.Tpo" "$(DEPDIR)/libseahorseextension_la-seahorse-extension.Plo"; else rm -f "$(DEPDIR)/libseahorseextension_la-seahorse-extension.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libseahorseextension_la_CPPFLAGS) $(CPPFLAGS) $(libseahorseextension_la_CFLAGS) $(CFLAGS) -MT libseahorseextension_la-seahorse-extension.lo -MD -MP -MF $(DEPDIR)/libseahorseextension_la-seahorse-extension.Tpo -c -o libseahorseextension_la-seahorse-extension.lo `test -f 'seahorse-extension.c' || echo '$(srcdir)/'`seahorse-extension.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libseahorseextension_la-seahorse-extension.Tpo $(DEPDIR)/libseahorseextension_la-seahorse-extension.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='seahorse-extension.c' object='libseahorseextension_la-seahorse-extension.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libseahorseextension_la_CPPFLAGS) $(CPPFLAGS) $(libseahorseextension_la_CFLAGS) $(CFLAGS) -c -o libseahorseextension_la-seahorse-extension.lo `test -f 'seahorse-extension.c' || echo '$(srcdir)/'`seahorse-extension.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libseahorseextension_la_CPPFLAGS) $(CPPFLAGS) $(libseahorseextension_la_CFLAGS) $(CFLAGS) -c -o libseahorseextension_la-seahorse-extension.lo `test -f 'seahorse-extension.c' || echo '$(srcdir)/'`seahorse-extension.c
- 
- libseahorseextension_la-seahorse.lo: seahorse.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libseahorseextension_la_CPPFLAGS) $(CPPFLAGS) $(libseahorseextension_la_CFLAGS) $(CFLAGS) -MT libseahorseextension_la-seahorse.lo -MD -MP -MF "$(DEPDIR)/libseahorseextension_la-seahorse.Tpo" -c -o libseahorseextension_la-seahorse.lo `test -f 'seahorse.c' || echo '$(srcdir)/'`seahorse.c; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libseahorseextension_la-seahorse.Tpo" "$(DEPDIR)/libseahorseextension_la-seahorse.Plo"; else rm -f "$(DEPDIR)/libseahorseextension_la-seahorse.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libseahorseextension_la_CPPFLAGS) $(CPPFLAGS) $(libseahorseextension_la_CFLAGS) $(CFLAGS) -MT libseahorseextension_la-seahorse.lo -MD -MP -MF $(DEPDIR)/libseahorseextension_la-seahorse.Tpo -c -o libseahorseextension_la-seahorse.lo `test -f 'seahorse.c' || echo '$(srcdir)/'`seahorse.c
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libseahorseextension_la-seahorse.Tpo $(DEPDIR)/libseahorseextension_la-seahorse.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='seahorse.c' object='libseahorseextension_la-seahorse.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libseahorseextension_la_CPPFLAGS) $(CPPFLAGS) $(libseahorseextension_la_CFLAGS) $(CFLAGS) -c -o libseahorseextension_la-seahorse.lo `test -f 'seahorse.c' || echo '$(srcdir)/'`seahorse.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libseahorseextension_la_CPPFLAGS) $(CPPFLAGS) $(libseahorseextension_la_CFLAGS) $(CFLAGS) -c -o libseahorseextension_la-seahorse.lo `test -f 'seahorse.c' || echo '$(srcdir)/'`seahorse.c
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- install-extensioniniDATA: $(extensionini_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(extensioninidir)" || $(mkdir_p) "$(DESTDIR)$(extensioninidir)"
-+	test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)"
- 	@list='$(extensionini_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -551,8 +498,7 @@
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- 	fi; test -z "$$fail"
- 
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- 	@failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
-@@ -653,22 +599,21 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
- 	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -682,7 +627,7 @@
- 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
- 	    test -d "$(distdir)/$$subdir" \
--	    || $(mkdir_p) "$(distdir)/$$subdir" \
-+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
- 	    || exit 1; \
- 	    distdir=`$(am__cd) $(distdir) && pwd`; \
- 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -690,6 +635,8 @@
- 	      $(MAKE) $(AM_MAKEFLAGS) \
- 	        top_distdir="$$top_distdir" \
- 	        distdir="$$distdir/$$subdir" \
-+		am__remove_distdir=: \
-+		am__skip_length_check=: \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -700,7 +647,7 @@
- installdirs: installdirs-recursive
- installdirs-am:
- 	for dir in "$(DESTDIR)$(extensiondir)" "$(DESTDIR)$(extensioninidir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: install-recursive
- install-exec: install-exec-recursive
-@@ -737,7 +684,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-libtool distclean-tags
-+	distclean-tags
- 
- dvi: dvi-recursive
- 
-@@ -751,12 +698,20 @@
- 
- install-data-am: install-extensionLTLIBRARIES install-extensioniniDATA
- 
-+install-dvi: install-dvi-recursive
-+
- install-exec-am:
- 
-+install-html: install-html-recursive
-+
- install-info: install-info-recursive
- 
- install-man:
- 
-+install-pdf: install-pdf-recursive
-+
-+install-ps: install-ps-recursive
-+
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-recursive
-@@ -778,26 +733,27 @@
- ps-am:
- 
- uninstall-am: uninstall-extensionLTLIBRARIES \
--	uninstall-extensioniniDATA uninstall-info-am
-+	uninstall-extensioniniDATA
- 
--uninstall-info: uninstall-info-recursive
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-+	install-strip
- 
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
--	clean clean-extensionLTLIBRARIES clean-generic clean-libtool \
--	clean-recursive ctags ctags-recursive distclean \
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+	all all-am check check-am clean clean-extensionLTLIBRARIES \
-+	clean-generic clean-libtool ctags ctags-recursive distclean \
- 	distclean-compile distclean-generic distclean-libtool \
--	distclean-recursive distclean-tags distdir dvi dvi-am html \
--	html-am info info-am install install-am install-data \
--	install-data-am install-exec install-exec-am \
-+	distclean-tags distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-dvi \
-+	install-dvi-am install-exec install-exec-am \
- 	install-extensionLTLIBRARIES install-extensioniniDATA \
--	install-info install-info-am install-man install-strip \
--	installcheck installcheck-am installdirs installdirs-am \
--	maintainer-clean maintainer-clean-generic \
--	maintainer-clean-recursive mostlyclean mostlyclean-compile \
--	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
--	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
--	uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA \
--	uninstall-info-am
-+	install-html install-html-am install-info install-info-am \
-+	install-man install-pdf install-pdf-am install-ps \
-+	install-ps-am install-strip installcheck installcheck-am \
-+	installdirs installdirs-am maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	tags tags-recursive uninstall uninstall-am \
-+	uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA
- 
- 
- %.ephy-extension.in: %.ephy-extension.in.in $(extension_LTLIBRARIES)
-diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/plugins/epiphany/mozilla/Makefile.in seahorse-1.0.1/plugins/epiphany/mozilla/Makefile.in
---- seahorse-1.0.1-old/plugins/epiphany/mozilla/Makefile.in	2007-04-03 18:17:48.000000000 +0200
-+++ seahorse-1.0.1/plugins/epiphany/mozilla/Makefile.in	2007-05-01 22:57:42.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
- 
- @SET_MAKE@
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -52,25 +48,31 @@
- libsbmozilla_la_LIBADD =
- am_libsbmozilla_la_OBJECTS = libsbmozilla_la-mozilla-helper.lo
- libsbmozilla_la_OBJECTS = $(am_libsbmozilla_la_OBJECTS)
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+libsbmozilla_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(libsbmozilla_la_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
-+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CXXFLAGS) $(CXXFLAGS)
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(libsbmozilla_la_SOURCES)
- DIST_SOURCES = $(libsbmozilla_la_SOURCES)
- ETAGS = etags
-@@ -80,8 +82,6 @@
- AGENT_CFLAGS = @AGENT_CFLAGS@
- AGENT_LIBS = @AGENT_LIBS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -112,8 +112,6 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
- EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
- EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
-@@ -127,8 +125,6 @@
- E_API_VERSION = @E_API_VERSION@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GEDIT_CFLAGS = @GEDIT_CFLAGS@
-@@ -144,23 +140,8 @@
- GNUPG = @GNUPG@
- GPGME_CONFIG = @GPGME_CONFIG@
- GREP = @GREP@
--HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
--HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
--HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
--HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
--HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
--HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
--HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
--HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
--HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
--HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
--HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
--HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
--HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -206,9 +187,8 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MOZILLA = @MOZILLA@
- MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
-@@ -223,8 +203,6 @@
- NAUTILUS_LIBS = @NAUTILUS_LIBS@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
--OS_WIN32_FALSE = @OS_WIN32_FALSE@
--OS_WIN32_TRUE = @OS_WIN32_TRUE@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -233,8 +211,6 @@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
--PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
--PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
- PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
- POFILES = @POFILES@
- POSUB = @POSUB@
-@@ -249,48 +225,17 @@
+diff -Naur seahorse-2.20.old/plugins/epiphany/mozilla/Makefile.in seahorse-2.20/plugins/epiphany/mozilla/Makefile.in
+--- seahorse-2.20.old/plugins/epiphany/mozilla/Makefile.in	2007-09-17 19:21:17.000000000 +0200
++++ seahorse-2.20/plugins/epiphany/mozilla/Makefile.in	2007-09-17 23:00:59.000000000 +0200
+@@ -223,15 +223,13 @@
+ RANLIB = @RANLIB@
+ SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
+ SEAHORSE_LIBS = @SEAHORSE_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHARING_CFLAGS = @SHARING_CFLAGS@
+ SHARING_LIBS = @SHARING_LIBS@
  SHELL = @SHELL@
  SOUP_CFLAGS = @SOUP_CFLAGS@
  SOUP_LIBS = @SOUP_LIBS@
@@ -7807,367 +4448,19 @@
 -SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
 -SSH_PATH = @SSH_PATH@
  STRIP = @STRIP@
--UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
--UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
--WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
--WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
--WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
--WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
--WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
--WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
--WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
--WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
--WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
--WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
--WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
--WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
--WITH_HKP_FALSE = @WITH_HKP_FALSE@
--WITH_HKP_TRUE = @WITH_HKP_TRUE@
--WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
--WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
--WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
--WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
--WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
--WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
--WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
--WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
--WITH_SSH_FALSE = @WITH_SSH_FALSE@
--WITH_SSH_TRUE = @WITH_SSH_TRUE@
--WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
--WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
- XGETTEXT = @XGETTEXT@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -302,6 +247,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -329,8 +275,11 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- noinst_LTLIBRARIES = libsbmozilla.la
- libsbmozilla_la_SOURCES = \
- 	mozilla-helper.cpp	\
-@@ -402,7 +351,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- libsbmozilla.la: $(libsbmozilla_la_OBJECTS) $(libsbmozilla_la_DEPENDENCIES) 
--	$(CXXLINK)  $(libsbmozilla_la_LDFLAGS) $(libsbmozilla_la_OBJECTS) $(libsbmozilla_la_LIBADD) $(LIBS)
-+	$(libsbmozilla_la_LINK)  $(libsbmozilla_la_OBJECTS) $(libsbmozilla_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -413,32 +362,32 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsbmozilla_la-mozilla-helper.Plo at am__quote@
- 
- .cpp.o:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
- 
- .cpp.obj:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
- 
- .cpp.lo:
-- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
- 
- libsbmozilla_la-mozilla-helper.lo: mozilla-helper.cpp
-- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsbmozilla_la_CPPFLAGS) $(CPPFLAGS) $(libsbmozilla_la_CXXFLAGS) $(CXXFLAGS) -MT libsbmozilla_la-mozilla-helper.lo -MD -MP -MF "$(DEPDIR)/libsbmozilla_la-mozilla-helper.Tpo" -c -o libsbmozilla_la-mozilla-helper.lo `test -f 'mozilla-helper.cpp' || echo '$(srcdir)/'`mozilla-helper.cpp; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libsbmozilla_la-mozilla-helper.Tpo" "$(DEPDIR)/libsbmozilla_la-mozilla-helper.Plo"; else rm -f "$(DEPDIR)/libsbmozilla_la-mozilla-helper.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsbmozilla_la_CPPFLAGS) $(CPPFLAGS) $(libsbmozilla_la_CXXFLAGS) $(CXXFLAGS) -MT libsbmozilla_la-mozilla-helper.lo -MD -MP -MF $(DEPDIR)/libsbmozilla_la-mozilla-helper.Tpo -c -o libsbmozilla_la-mozilla-helper.lo `test -f 'mozilla-helper.cpp' || echo '$(srcdir)/'`mozilla-helper.cpp
-+ at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libsbmozilla_la-mozilla-helper.Tpo $(DEPDIR)/libsbmozilla_la-mozilla-helper.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='mozilla-helper.cpp' object='libsbmozilla_la-mozilla-helper.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsbmozilla_la_CPPFLAGS) $(CPPFLAGS) $(libsbmozilla_la_CXXFLAGS) $(CXXFLAGS) -c -o libsbmozilla_la-mozilla-helper.lo `test -f 'mozilla-helper.cpp' || echo '$(srcdir)/'`mozilla-helper.cpp
-+ at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsbmozilla_la_CPPFLAGS) $(CPPFLAGS) $(libsbmozilla_la_CXXFLAGS) $(CXXFLAGS) -c -o libsbmozilla_la-mozilla-helper.lo `test -f 'mozilla-helper.cpp' || echo '$(srcdir)/'`mozilla-helper.cpp
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -446,10 +395,6 @@
- clean-libtool:
- 	-rm -rf .libs _libs
- 
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-@@ -499,22 +444,21 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
- 	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -562,7 +506,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-libtool distclean-tags
-+	distclean-tags
- 
- dvi: dvi-am
- 
-@@ -576,12 +520,20 @@
- 
- install-data-am:
- 
-+install-dvi: install-dvi-am
-+
- install-exec-am:
- 
-+install-html: install-html-am
-+
- install-info: install-info-am
- 
- install-man:
- 
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -602,19 +554,22 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
- 	distclean-compile distclean-generic distclean-libtool \
- 	distclean-tags distdir dvi dvi-am html html-am info info-am \
--	install install-am install-data install-data-am install-exec \
--	install-exec-am install-info install-info-am install-man \
-+	install install-am install-data install-data-am install-dvi \
-+	install-dvi-am install-exec install-exec-am install-html \
-+	install-html-am install-info install-info-am install-man \
-+	install-pdf install-pdf-am install-ps install-ps-am \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
- 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
--	pdf pdf-am ps ps-am tags uninstall uninstall-am \
--	uninstall-info-am
-+	pdf pdf-am ps ps-am tags uninstall uninstall-am
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/plugins/gedit/Makefile.in seahorse-1.0.1/plugins/gedit/Makefile.in
---- seahorse-1.0.1-old/plugins/gedit/Makefile.in	2007-04-03 18:17:48.000000000 +0200
-+++ seahorse-1.0.1/plugins/gedit/Makefile.in	2007-05-01 22:57:42.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,15 +15,11 @@
- @SET_MAKE@
- 
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -69,17 +65,21 @@
- @WITH_GEDIT_BONOBO_TRUE at am__objects_1 = seahorse-gedit-bonobo.lo
- am_libseahorse_pgp_la_OBJECTS = seahorse-gedit.lo $(am__objects_1)
- libseahorse_pgp_la_OBJECTS = $(am_libseahorse_pgp_la_OBJECTS)
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+libseahorse_pgp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(libseahorse_pgp_la_LDFLAGS) $(LDFLAGS) -o $@
-+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(libseahorse_pgp_la_SOURCES)
- DIST_SOURCES = $(am__libseahorse_pgp_la_SOURCES_DIST)
- pluginDATA_INSTALL = $(INSTALL_DATA)
-@@ -92,8 +92,6 @@
- AGENT_CFLAGS = @AGENT_CFLAGS@
- AGENT_LIBS = @AGENT_LIBS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -124,8 +122,6 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
- EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
- EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
-@@ -139,8 +135,6 @@
- E_API_VERSION = @E_API_VERSION@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GEDIT_CFLAGS = @GEDIT_CFLAGS@
-@@ -156,23 +150,8 @@
- GNUPG = @GNUPG@
- GPGME_CONFIG = @GPGME_CONFIG@
- GREP = @GREP@
--HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
--HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
--HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
--HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
--HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
--HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
--HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
--HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
--HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
--HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
--HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
--HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
--HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -218,9 +197,8 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MOZILLA = @MOZILLA@
- MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
-@@ -235,8 +213,6 @@
- NAUTILUS_LIBS = @NAUTILUS_LIBS@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
--OS_WIN32_FALSE = @OS_WIN32_FALSE@
--OS_WIN32_TRUE = @OS_WIN32_TRUE@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -245,8 +221,6 @@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
--PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
--PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
- PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
- POFILES = @POFILES@
- POSUB = @POSUB@
-@@ -261,48 +235,17 @@
+diff -Naur seahorse-2.20.old/plugins/gedit/Makefile.in seahorse-2.20/plugins/gedit/Makefile.in
+--- seahorse-2.20.old/plugins/gedit/Makefile.in	2007-09-17 19:21:17.000000000 +0200
++++ seahorse-2.20/plugins/gedit/Makefile.in	2007-09-17 23:01:00.000000000 +0200
+@@ -233,15 +233,13 @@
+ RANLIB = @RANLIB@
+ SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
+ SEAHORSE_LIBS = @SEAHORSE_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHARING_CFLAGS = @SHARING_CFLAGS@
+ SHARING_LIBS = @SHARING_LIBS@
  SHELL = @SHELL@
  SOUP_CFLAGS = @SOUP_CFLAGS@
  SOUP_LIBS = @SOUP_LIBS@
@@ -8175,392 +4468,19 @@
 -SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
 -SSH_PATH = @SSH_PATH@
  STRIP = @STRIP@
--UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
--UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
--WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
--WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
--WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
--WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
--WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
--WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
--WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
--WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
--WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
--WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
--WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
--WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
--WITH_HKP_FALSE = @WITH_HKP_FALSE@
--WITH_HKP_TRUE = @WITH_HKP_TRUE@
--WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
--WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
--WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
--WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
--WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
--WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
--WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
--WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
--WITH_SSH_FALSE = @WITH_SSH_FALSE@
--WITH_SSH_TRUE = @WITH_SSH_TRUE@
--WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
--WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
- XGETTEXT = @XGETTEXT@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -314,6 +257,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -341,8 +285,11 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- 
- # PLUGIN ----------------------------------------------------------------
- plugindir = $(libdir)/gedit-2/plugins
-@@ -406,7 +353,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
-+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
- 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -417,7 +364,7 @@
- 
- uninstall-pluginLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@set -x; list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-+	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
-@@ -432,7 +379,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- libseahorse-pgp.la: $(libseahorse_pgp_la_OBJECTS) $(libseahorse_pgp_la_DEPENDENCIES) 
--	$(LINK) -rpath $(plugindir) $(libseahorse_pgp_la_LDFLAGS) $(libseahorse_pgp_la_OBJECTS) $(libseahorse_pgp_la_LIBADD) $(LIBS)
-+	$(libseahorse_pgp_la_LINK) -rpath $(plugindir) $(libseahorse_pgp_la_OBJECTS) $(libseahorse_pgp_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -445,22 +392,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-gedit.Plo at am__quote@
- 
- .c.o:
-- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
-- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
-- at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -470,13 +417,9 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- install-pluginDATA: $(plugin_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
-+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
- 	@list='$(plugin_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -493,7 +436,7 @@
- 	done
- install-schemasDATA: $(schemas_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(schemasdir)" || $(mkdir_p) "$(DESTDIR)$(schemasdir)"
-+	test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)"
- 	@list='$(schemas_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -558,22 +501,21 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
- 	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -589,7 +531,7 @@
- all-am: Makefile $(LTLIBRARIES) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(schemasdir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -625,7 +567,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-libtool distclean-tags
-+	distclean-tags
- 
- dvi: dvi-am
- 
-@@ -640,12 +582,20 @@
- install-data-am: install-data-local install-pluginDATA \
- 	install-pluginLTLIBRARIES install-schemasDATA
- 
-+install-dvi: install-dvi-am
-+
- install-exec-am:
- 
-+install-html: install-html-am
-+
- install-info: install-info-am
- 
- install-man:
- 
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -666,23 +616,26 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am uninstall-pluginDATA \
--	uninstall-pluginLTLIBRARIES uninstall-schemasDATA
-+uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES \
-+	uninstall-schemasDATA
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- 	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
- 	distclean-compile distclean-generic distclean-libtool \
- 	distclean-tags distdir dvi dvi-am html html-am info info-am \
- 	install install-am install-data install-data-am \
--	install-data-local install-exec install-exec-am install-info \
--	install-info-am install-man install-pluginDATA \
--	install-pluginLTLIBRARIES install-schemasDATA install-strip \
--	installcheck installcheck-am installdirs maintainer-clean \
-+	install-data-local install-dvi install-dvi-am install-exec \
-+	install-exec-am install-html install-html-am install-info \
-+	install-info-am install-man install-pdf install-pdf-am \
-+	install-pluginDATA install-pluginLTLIBRARIES install-ps \
-+	install-ps-am install-schemasDATA install-strip installcheck \
-+	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-info-am \
--	uninstall-pluginDATA uninstall-pluginLTLIBRARIES \
--	uninstall-schemasDATA
-+	tags uninstall uninstall-am uninstall-pluginDATA \
-+	uninstall-pluginLTLIBRARIES uninstall-schemasDATA
- 
- @INTLTOOL_SCHEMAS_RULE@
- 
-diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/plugins/Makefile.in seahorse-1.0.1/plugins/Makefile.in
---- seahorse-1.0.1-old/plugins/Makefile.in	2007-04-03 18:17:47.000000000 +0200
-+++ seahorse-1.0.1/plugins/Makefile.in	2007-05-01 22:57:40.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +13,11 @@
- # PARTICULAR PURPOSE.
- 
- @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -51,10 +47,13 @@
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
--	install-exec-recursive install-info-recursive \
--	install-recursive installcheck-recursive installdirs-recursive \
--	pdf-recursive ps-recursive uninstall-info-recursive \
--	uninstall-recursive
-+	install-dvi-recursive install-exec-recursive \
-+	install-html-recursive install-info-recursive \
-+	install-pdf-recursive install-ps-recursive install-recursive \
-+	installcheck-recursive installdirs-recursive pdf-recursive \
-+	ps-recursive uninstall-recursive
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-+  distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = nautilus applet epiphany gedit nautilus-ext
-@@ -63,8 +62,6 @@
- AGENT_CFLAGS = @AGENT_CFLAGS@
- AGENT_LIBS = @AGENT_LIBS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -95,8 +92,6 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
- EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
- EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
-@@ -110,8 +105,6 @@
- E_API_VERSION = @E_API_VERSION@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GEDIT_CFLAGS = @GEDIT_CFLAGS@
-@@ -127,23 +120,8 @@
- GNUPG = @GNUPG@
- GPGME_CONFIG = @GPGME_CONFIG@
- GREP = @GREP@
--HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
--HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
--HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
--HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
--HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
--HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
--HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
--HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
--HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
--HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
--HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
--HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
--HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -189,9 +167,8 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MOZILLA = @MOZILLA@
- MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
-@@ -206,8 +183,6 @@
- NAUTILUS_LIBS = @NAUTILUS_LIBS@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
--OS_WIN32_FALSE = @OS_WIN32_FALSE@
--OS_WIN32_TRUE = @OS_WIN32_TRUE@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -216,8 +191,6 @@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
--PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
--PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
- PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
- POFILES = @POFILES@
- POSUB = @POSUB@
-@@ -232,48 +205,17 @@
+diff -Naur seahorse-2.20.old/plugins/Makefile.in seahorse-2.20/plugins/Makefile.in
+--- seahorse-2.20.old/plugins/Makefile.in	2007-09-17 19:21:16.000000000 +0200
++++ seahorse-2.20/plugins/Makefile.in	2007-09-17 23:00:58.000000000 +0200
+@@ -203,15 +203,13 @@
+ RANLIB = @RANLIB@
+ SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
+ SEAHORSE_LIBS = @SEAHORSE_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHARING_CFLAGS = @SHARING_CFLAGS@
+ SHARING_LIBS = @SHARING_LIBS@
  SHELL = @SHELL@
  SOUP_CFLAGS = @SOUP_CFLAGS@
  SOUP_LIBS = @SOUP_LIBS@
@@ -8568,351 +4488,19 @@
 -SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
 -SSH_PATH = @SSH_PATH@
  STRIP = @STRIP@
--UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
--UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
--WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
--WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
--WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
--WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
--WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
--WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
--WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
--WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
--WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
--WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
--WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
--WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
--WITH_HKP_FALSE = @WITH_HKP_FALSE@
--WITH_HKP_TRUE = @WITH_HKP_TRUE@
--WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
--WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
--WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
--WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
--WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
--WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
--WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
--WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
--WITH_SSH_FALSE = @WITH_SSH_FALSE@
--WITH_SSH_TRUE = @WITH_SSH_TRUE@
--WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
--WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
- XGETTEXT = @XGETTEXT@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -285,6 +227,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -312,8 +255,11 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- @WITH_EPIPHANY_FALSE at EPIPHANY_DIR = 
- @WITH_EPIPHANY_TRUE at EPIPHANY_DIR = epiphany
- @WITH_GEDIT_FALSE at GEDIT_DIR = 
-@@ -362,10 +308,6 @@
- clean-libtool:
- 	-rm -rf .libs _libs
- 
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
--
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
- # To change the values of `make' variables: instead of editing Makefiles,
-@@ -397,8 +339,7 @@
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- 	fi; test -z "$$fail"
- 
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- 	@failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
-@@ -499,22 +440,21 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
- 	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -528,7 +468,7 @@
- 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
- 	    test -d "$(distdir)/$$subdir" \
--	    || $(mkdir_p) "$(distdir)/$$subdir" \
-+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
- 	    || exit 1; \
- 	    distdir=`$(am__cd) $(distdir) && pwd`; \
- 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -536,6 +476,8 @@
- 	      $(MAKE) $(AM_MAKEFLAGS) \
- 	        top_distdir="$$top_distdir" \
- 	        distdir="$$distdir/$$subdir" \
-+		am__remove_distdir=: \
-+		am__skip_length_check=: \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -575,8 +517,7 @@
- 
- distclean: distclean-recursive
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool \
--	distclean-tags
-+distclean-am: clean-am distclean-generic distclean-tags
- 
- dvi: dvi-recursive
- 
-@@ -590,12 +531,20 @@
- 
- install-data-am:
- 
-+install-dvi: install-dvi-recursive
-+
- install-exec-am:
- 
-+install-html: install-html-recursive
-+
- install-info: install-info-recursive
- 
- install-man:
- 
-+install-pdf: install-pdf-recursive
-+
-+install-ps: install-ps-recursive
-+
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-recursive
-@@ -614,22 +563,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
- 
--uninstall-info: uninstall-info-recursive
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-+	install-strip
- 
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
--	clean clean-generic clean-libtool clean-recursive ctags \
--	ctags-recursive distclean distclean-generic distclean-libtool \
--	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+	all all-am check check-am clean clean-generic clean-libtool \
-+	ctags ctags-recursive distclean distclean-generic \
-+	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-exec install-exec-am install-info \
--	install-info-am install-man install-strip installcheck \
-+	install-data-am install-dvi install-dvi-am install-exec \
-+	install-exec-am install-html install-html-am install-info \
-+	install-info-am install-man install-pdf install-pdf-am \
-+	install-ps install-ps-am install-strip installcheck \
- 	installcheck-am installdirs installdirs-am maintainer-clean \
--	maintainer-clean-generic maintainer-clean-recursive \
--	mostlyclean mostlyclean-generic mostlyclean-libtool \
--	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
--	uninstall uninstall-am uninstall-info-am
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/plugins/nautilus/Makefile.in seahorse-1.0.1/plugins/nautilus/Makefile.in
---- seahorse-1.0.1-old/plugins/nautilus/Makefile.in	2007-04-03 18:17:49.000000000 +0200
-+++ seahorse-1.0.1/plugins/nautilus/Makefile.in	2007-05-01 22:57:42.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,15 +15,11 @@
- @SET_MAKE@
- 
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -68,17 +64,18 @@
- 	$(top_builddir)/libseahorse/libseahorse.a \
- 	$(top_builddir)/libcryptui/libcryptui.la $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1)
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(seahorse_preferences_SOURCES) $(seahorse_tool_SOURCES)
- DIST_SOURCES = $(seahorse_preferences_SOURCES) \
- 	$(seahorse_tool_SOURCES)
-@@ -102,8 +99,6 @@
- AGENT_CFLAGS = @AGENT_CFLAGS@
- AGENT_LIBS = @AGENT_LIBS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -134,8 +129,6 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
- EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
- EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
-@@ -149,8 +142,6 @@
- E_API_VERSION = @E_API_VERSION@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GEDIT_CFLAGS = @GEDIT_CFLAGS@
-@@ -166,23 +157,8 @@
- GNUPG = @GNUPG@
- GPGME_CONFIG = @GPGME_CONFIG@
- GREP = @GREP@
--HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
--HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
--HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
--HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
--HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
--HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
--HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
--HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
--HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
--HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
--HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
--HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
--HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -228,9 +204,8 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MOZILLA = @MOZILLA@
- MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
-@@ -245,8 +220,6 @@
- NAUTILUS_LIBS = @NAUTILUS_LIBS@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
--OS_WIN32_FALSE = @OS_WIN32_FALSE@
--OS_WIN32_TRUE = @OS_WIN32_TRUE@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -255,8 +228,6 @@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
--PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
--PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
- PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
- POFILES = @POFILES@
- POSUB = @POSUB@
-@@ -271,48 +242,17 @@
+diff -Naur seahorse-2.20.old/plugins/nautilus/Makefile.in seahorse-2.20/plugins/nautilus/Makefile.in
+--- seahorse-2.20.old/plugins/nautilus/Makefile.in	2007-09-17 19:21:17.000000000 +0200
++++ seahorse-2.20/plugins/nautilus/Makefile.in	2007-09-17 23:01:00.000000000 +0200
+@@ -238,15 +238,13 @@
+ RANLIB = @RANLIB@
+ SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
+ SEAHORSE_LIBS = @SEAHORSE_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHARING_CFLAGS = @SHARING_CFLAGS@
+ SHARING_LIBS = @SHARING_LIBS@
  SHELL = @SHELL@
  SOUP_CFLAGS = @SOUP_CFLAGS@
  SOUP_LIBS = @SOUP_LIBS@
@@ -8920,417 +4508,19 @@
 -SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
 -SSH_PATH = @SSH_PATH@
  STRIP = @STRIP@
--UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
--UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
--WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
--WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
--WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
--WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
--WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
--WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
--WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
--WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
--WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
--WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
--WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
--WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
--WITH_HKP_FALSE = @WITH_HKP_FALSE@
--WITH_HKP_TRUE = @WITH_HKP_TRUE@
--WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
--WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
--WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
--WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
--WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
--WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
--WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
--WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
--WITH_SSH_FALSE = @WITH_SSH_FALSE@
--WITH_SSH_TRUE = @WITH_SSH_TRUE@
--WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
--WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
- XGETTEXT = @XGETTEXT@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -324,6 +264,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -351,8 +292,11 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- gladedir = $(datadir)/seahorse/glade/
- INCLUDES = -I$(top_builddir) \
- 	-I$(top_srcdir) \
-@@ -436,7 +380,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
- 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
- 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- 	  if test -f $$p \
-@@ -464,10 +408,10 @@
- 	done
- seahorse-preferences$(EXEEXT): $(seahorse_preferences_OBJECTS) $(seahorse_preferences_DEPENDENCIES) 
- 	@rm -f seahorse-preferences$(EXEEXT)
--	$(LINK) $(seahorse_preferences_LDFLAGS) $(seahorse_preferences_OBJECTS) $(seahorse_preferences_LDADD) $(LIBS)
-+	$(LINK) $(seahorse_preferences_OBJECTS) $(seahorse_preferences_LDADD) $(LIBS)
- seahorse-tool$(EXEEXT): $(seahorse_tool_OBJECTS) $(seahorse_tool_DEPENDENCIES) 
- 	@rm -f seahorse-tool$(EXEEXT)
--	$(LINK) $(seahorse_tool_LDFLAGS) $(seahorse_tool_OBJECTS) $(seahorse_tool_LDADD) $(LIBS)
-+	$(LINK) $(seahorse_tool_OBJECTS) $(seahorse_tool_LDADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -481,22 +425,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-tool.Po at am__quote@
- 
- .c.o:
-- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
-- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
-- at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -506,13 +450,9 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- install-man1: $(man1_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
-+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
- 	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -557,7 +497,7 @@
- 	done
- install-desktopDATA: $(desktop_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(desktopdir)" || $(mkdir_p) "$(DESTDIR)$(desktopdir)"
-+	test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
- 	@list='$(desktop_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -574,7 +514,7 @@
- 	done
- install-mimeDATA: $(mime_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(mimedir)" || $(mkdir_p) "$(DESTDIR)$(mimedir)"
-+	test -z "$(mimedir)" || $(MKDIR_P) "$(DESTDIR)$(mimedir)"
- 	@list='$(mime_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -591,7 +531,7 @@
- 	done
- install-olddesktopDATA: $(olddesktop_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(olddesktopdir)" || $(mkdir_p) "$(DESTDIR)$(olddesktopdir)"
-+	test -z "$(olddesktopdir)" || $(MKDIR_P) "$(DESTDIR)$(olddesktopdir)"
- 	@list='$(olddesktop_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -656,22 +596,21 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
- 	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -687,7 +626,7 @@
- all-am: Makefile $(PROGRAMS) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(mimedir)" "$(DESTDIR)$(olddesktopdir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -722,7 +661,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-libtool distclean-tags
-+	distclean-tags
- 
- dvi: dvi-am
- 
-@@ -737,12 +676,20 @@
- install-data-am: install-data-local install-desktopDATA install-man \
- 	install-mimeDATA install-olddesktopDATA
- 
-+install-dvi: install-dvi-am
-+
- install-exec-am: install-binPROGRAMS
- 
-+install-html: install-html-am
-+
- install-info: install-info-am
- 
- install-man: install-man1
- 
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -764,26 +711,30 @@
- ps-am:
- 
- uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \
--	uninstall-info-am uninstall-local uninstall-man \
--	uninstall-mimeDATA uninstall-olddesktopDATA
-+	uninstall-local uninstall-man uninstall-mimeDATA \
-+	uninstall-olddesktopDATA
- 
- uninstall-man: uninstall-man1
- 
-+.MAKE: install-am install-strip
-+
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
- 	clean-generic clean-libtool ctags distclean distclean-compile \
- 	distclean-generic distclean-libtool distclean-tags distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
- 	install-binPROGRAMS install-data install-data-am \
--	install-data-local install-desktopDATA install-exec \
--	install-exec-am install-info install-info-am install-man \
-+	install-data-local install-desktopDATA install-dvi \
-+	install-dvi-am install-exec install-exec-am install-html \
-+	install-html-am install-info install-info-am install-man \
- 	install-man1 install-mimeDATA install-olddesktopDATA \
-+	install-pdf install-pdf-am install-ps install-ps-am \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
- 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
--	uninstall-binPROGRAMS uninstall-desktopDATA uninstall-info-am \
--	uninstall-local uninstall-man uninstall-man1 \
--	uninstall-mimeDATA uninstall-olddesktopDATA
-+	uninstall-binPROGRAMS uninstall-desktopDATA uninstall-local \
-+	uninstall-man uninstall-man1 uninstall-mimeDATA \
-+	uninstall-olddesktopDATA
- 
- 
- @UPDATE_MIME_DATABASE_TRUE at install-data-local:
-diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/plugins/nautilus-ext/Makefile.in seahorse-1.0.1/plugins/nautilus-ext/Makefile.in
---- seahorse-1.0.1-old/plugins/nautilus-ext/Makefile.in	2007-04-03 18:17:48.000000000 +0200
-+++ seahorse-1.0.1/plugins/nautilus-ext/Makefile.in	2007-05-01 22:57:42.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
- 
- @SET_MAKE@
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -63,17 +59,21 @@
- 	seahorse-nautilus-module.lo
- libnautilus_seahorse_la_OBJECTS =  \
- 	$(am_libnautilus_seahorse_la_OBJECTS)
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+libnautilus_seahorse_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(libnautilus_seahorse_la_LDFLAGS) $(LDFLAGS) -o $@
-+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(libnautilus_seahorse_la_SOURCES)
- DIST_SOURCES = $(libnautilus_seahorse_la_SOURCES)
- ETAGS = etags
-@@ -83,8 +83,6 @@
- AGENT_CFLAGS = @AGENT_CFLAGS@
- AGENT_LIBS = @AGENT_LIBS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -115,8 +113,6 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
- EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
- EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
-@@ -130,8 +126,6 @@
- E_API_VERSION = @E_API_VERSION@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GEDIT_CFLAGS = @GEDIT_CFLAGS@
-@@ -147,23 +141,8 @@
- GNUPG = @GNUPG@
- GPGME_CONFIG = @GPGME_CONFIG@
- GREP = @GREP@
--HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
--HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
--HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
--HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
--HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
--HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
--HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
--HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
--HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
--HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
--HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
--HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
--HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -209,9 +188,8 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MOZILLA = @MOZILLA@
- MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
-@@ -226,8 +204,6 @@
- NAUTILUS_LIBS = @NAUTILUS_LIBS@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
--OS_WIN32_FALSE = @OS_WIN32_FALSE@
--OS_WIN32_TRUE = @OS_WIN32_TRUE@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -236,8 +212,6 @@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
--PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
--PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
- PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
- POFILES = @POFILES@
- POSUB = @POSUB@
-@@ -252,48 +226,17 @@
+diff -Naur seahorse-2.20.old/plugins/nautilus-ext/Makefile.in seahorse-2.20/plugins/nautilus-ext/Makefile.in
+--- seahorse-2.20.old/plugins/nautilus-ext/Makefile.in	2007-09-17 19:21:17.000000000 +0200
++++ seahorse-2.20/plugins/nautilus-ext/Makefile.in	2007-09-17 23:01:00.000000000 +0200
+@@ -224,15 +224,13 @@
+ RANLIB = @RANLIB@
+ SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
+ SEAHORSE_LIBS = @SEAHORSE_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHARING_CFLAGS = @SHARING_CFLAGS@
+ SHARING_LIBS = @SHARING_LIBS@
  SHELL = @SHELL@
  SOUP_CFLAGS = @SOUP_CFLAGS@
  SOUP_LIBS = @SOUP_LIBS@
@@ -9338,380 +4528,19 @@
 -SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
 -SSH_PATH = @SSH_PATH@
  STRIP = @STRIP@
--UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
--UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
--WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
--WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
--WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
--WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
--WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
--WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
--WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
--WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
--WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
--WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
--WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
--WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
--WITH_HKP_FALSE = @WITH_HKP_FALSE@
--WITH_HKP_TRUE = @WITH_HKP_TRUE@
--WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
--WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
--WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
--WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
--WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
--WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
--WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
--WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
--WITH_SSH_FALSE = @WITH_SSH_FALSE@
--WITH_SSH_TRUE = @WITH_SSH_TRUE@
--WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
--WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
- XGETTEXT = @XGETTEXT@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -305,6 +248,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -332,8 +276,11 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- INCLUDES = -I$(top_builddir) 	\
- 	-I$(top_srcdir) 			\
- 	$(NAUTILUS_CFLAGS) 			\
-@@ -385,7 +332,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-nautilus_extensionLTLIBRARIES: $(nautilus_extension_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(nautilus_extensiondir)" || $(mkdir_p) "$(DESTDIR)$(nautilus_extensiondir)"
-+	test -z "$(nautilus_extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(nautilus_extensiondir)"
- 	@list='$(nautilus_extension_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -396,7 +343,7 @@
- 
- uninstall-nautilus_extensionLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@set -x; list='$(nautilus_extension_LTLIBRARIES)'; for p in $$list; do \
-+	@list='$(nautilus_extension_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(nautilus_extensiondir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(nautilus_extensiondir)/$$p"; \
-@@ -411,7 +358,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- libnautilus-seahorse.la: $(libnautilus_seahorse_la_OBJECTS) $(libnautilus_seahorse_la_DEPENDENCIES) 
--	$(LINK) -rpath $(nautilus_extensiondir) $(libnautilus_seahorse_la_LDFLAGS) $(libnautilus_seahorse_la_OBJECTS) $(libnautilus_seahorse_la_LIBADD) $(LIBS)
-+	$(libnautilus_seahorse_la_LINK) -rpath $(nautilus_extensiondir) $(libnautilus_seahorse_la_OBJECTS) $(libnautilus_seahorse_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -423,22 +370,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-nautilus.Plo at am__quote@
- 
- .c.o:
-- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
-- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
-- at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -449,10 +396,6 @@
- clean-libtool:
- 	-rm -rf .libs _libs
- 
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-@@ -502,22 +445,21 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
- 	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -533,7 +475,7 @@
- all-am: Makefile $(LTLIBRARIES)
- installdirs:
- 	for dir in "$(DESTDIR)$(nautilus_extensiondir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -568,7 +510,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-libtool distclean-tags
-+	distclean-tags
- 
- dvi: dvi-am
- 
-@@ -582,12 +524,20 @@
- 
- install-data-am: install-nautilus_extensionLTLIBRARIES
- 
-+install-dvi: install-dvi-am
-+
- install-exec-am:
- 
-+install-html: install-html-am
-+
- install-info: install-info-am
- 
- install-man:
- 
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -608,21 +558,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am \
--	uninstall-nautilus_extensionLTLIBRARIES
-+uninstall-am: uninstall-nautilus_extensionLTLIBRARIES
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- 	clean-libtool clean-nautilus_extensionLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-exec install-exec-am install-info \
-+	install-data-am install-dvi install-dvi-am install-exec \
-+	install-exec-am install-html install-html-am install-info \
- 	install-info-am install-man \
--	install-nautilus_extensionLTLIBRARIES install-strip \
-+	install-nautilus_extensionLTLIBRARIES install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-info-am \
-+	tags uninstall uninstall-am \
- 	uninstall-nautilus_extensionLTLIBRARIES
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
-diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/src/Makefile.in seahorse-1.0.1/src/Makefile.in
---- seahorse-1.0.1-old/src/Makefile.in	2007-04-03 18:17:49.000000000 +0200
-+++ seahorse-1.0.1/src/Makefile.in	2007-05-01 22:57:43.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,15 +15,11 @@
- @SET_MAKE@
- 
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -104,17 +100,18 @@
- am__DEPENDENCIES_1 =
- seahorse_DEPENDENCIES = $(top_builddir)/libseahorse/libseahorse.a \
- 	$(top_builddir)/libcryptui/libcryptui.la $(am__DEPENDENCIES_1)
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(seahorse_SOURCES)
- DIST_SOURCES = $(am__seahorse_SOURCES_DIST)
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-@@ -133,8 +130,6 @@
- AGENT_CFLAGS = @AGENT_CFLAGS@
- AGENT_LIBS = @AGENT_LIBS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -165,8 +160,6 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
- EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
- EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
-@@ -180,8 +173,6 @@
- E_API_VERSION = @E_API_VERSION@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GEDIT_CFLAGS = @GEDIT_CFLAGS@
-@@ -197,23 +188,8 @@
- GNUPG = @GNUPG@
- GPGME_CONFIG = @GPGME_CONFIG@
- GREP = @GREP@
--HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
--HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
--HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
--HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
--HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
--HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
--HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
--HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
--HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
--HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
--HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
--HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
--HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -259,9 +235,8 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MOZILLA = @MOZILLA@
- MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
-@@ -276,8 +251,6 @@
- NAUTILUS_LIBS = @NAUTILUS_LIBS@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
--OS_WIN32_FALSE = @OS_WIN32_FALSE@
--OS_WIN32_TRUE = @OS_WIN32_TRUE@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -286,8 +259,6 @@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
--PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
--PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
- PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
- POFILES = @POFILES@
- POSUB = @POSUB@
-@@ -302,48 +273,17 @@
+diff -Naur seahorse-2.20.old/src/Makefile.in seahorse-2.20/src/Makefile.in
+--- seahorse-2.20.old/src/Makefile.in	2007-09-17 19:21:17.000000000 +0200
++++ seahorse-2.20/src/Makefile.in	2007-09-17 23:01:01.000000000 +0200
+@@ -271,15 +271,13 @@
+ RANLIB = @RANLIB@
+ SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
+ SEAHORSE_LIBS = @SEAHORSE_LIBS@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHARING_CFLAGS = @SHARING_CFLAGS@
+ SHARING_LIBS = @SHARING_LIBS@
  SHELL = @SHELL@
  SOUP_CFLAGS = @SOUP_CFLAGS@
  SOUP_LIBS = @SOUP_LIBS@
@@ -9719,248 +4548,5 @@
 -SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
 -SSH_PATH = @SSH_PATH@
  STRIP = @STRIP@
--UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
--UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
--WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
--WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
--WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
--WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
--WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
--WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
--WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
--WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
--WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
--WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
--WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
--WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
--WITH_HKP_FALSE = @WITH_HKP_FALSE@
--WITH_HKP_TRUE = @WITH_HKP_TRUE@
--WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
--WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
--WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
--WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
--WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
--WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
--WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
--WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
--WITH_SSH_FALSE = @WITH_SSH_FALSE@
--WITH_SSH_TRUE = @WITH_SSH_TRUE@
--WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
--WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
- XGETTEXT = @XGETTEXT@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -355,6 +295,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -382,8 +323,11 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- gladedir = $(datadir)/seahorse/glade/
- pixmapsdir = $(datadir)/pixmaps/
- INCLUDES = -I$(top_builddir) \
-@@ -522,7 +466,7 @@
- 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
- 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
- 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- 	  if test -f $$p \
-@@ -550,7 +494,7 @@
- 	done
- seahorse$(EXEEXT): $(seahorse_OBJECTS) $(seahorse_DEPENDENCIES) 
- 	@rm -f seahorse$(EXEEXT)
--	$(LINK) $(seahorse_LDFLAGS) $(seahorse_OBJECTS) $(seahorse_LDADD) $(LIBS)
-+	$(LINK) $(seahorse_OBJECTS) $(seahorse_LDADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -586,22 +530,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-ssh-upload.Po at am__quote@
- 
- .c.o:
-- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
-- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
-- at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -611,13 +555,9 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- install-desktopDATA: $(desktop_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(desktopdir)" || $(mkdir_p) "$(DESTDIR)$(desktopdir)"
-+	test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
- 	@list='$(desktop_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -634,7 +574,7 @@
- 	done
- install-gladeDATA: $(glade_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)"
-+	test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
- 	@list='$(glade_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -699,22 +639,21 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
- 	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -730,7 +669,7 @@
- all-am: Makefile $(PROGRAMS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(gladedir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -765,7 +704,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-libtool distclean-tags
-+	distclean-tags
- 
- dvi: dvi-am
- 
-@@ -779,12 +718,20 @@
- 
- install-data-am: install-desktopDATA install-gladeDATA
- 
-+install-dvi: install-dvi-am
-+
- install-exec-am: install-binPROGRAMS
- 
-+install-html: install-html-am
-+
- install-info: install-info-am
- 
- install-man:
- 
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -806,21 +753,24 @@
- ps-am:
- 
- uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \
--	uninstall-gladeDATA uninstall-info-am
-+	uninstall-gladeDATA
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
- 	clean-generic clean-libtool ctags distclean distclean-compile \
- 	distclean-generic distclean-libtool distclean-tags distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
- 	install-binPROGRAMS install-data install-data-am \
--	install-desktopDATA install-exec install-exec-am \
--	install-gladeDATA install-info install-info-am install-man \
--	install-strip installcheck installcheck-am installdirs \
--	maintainer-clean maintainer-clean-generic mostlyclean \
--	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
--	pdf pdf-am ps ps-am tags uninstall uninstall-am \
--	uninstall-binPROGRAMS uninstall-desktopDATA \
--	uninstall-gladeDATA uninstall-info-am
-+	install-desktopDATA install-dvi install-dvi-am install-exec \
-+	install-exec-am install-gladeDATA install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	tags uninstall uninstall-am uninstall-binPROGRAMS \
-+	uninstall-desktopDATA uninstall-gladeDATA
- 
- @INTLTOOL_DESKTOP_RULE@
- # Tell versions [3.59,3.63) of GNU make to not export all variables.

Modified: desktop/unstable/seahorse/debian/patches/2_mlock.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/2_mlock.dpatch?rev=12542&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/patches/2_mlock.dpatch (original)
+++ desktop/unstable/seahorse/debian/patches/2_mlock.dpatch Mon Sep 17 21:02:32 2007
@@ -4,15 +4,7 @@
 
 --- seahorse-1.0.1/acinclude.m4.old	2007-05-01 22:50:34.000000000 +0200
 +++ seahorse-1.0.1/acinclude.m4	2007-05-01 22:52:38.000000000 +0200
-@@ -53,6 +53,7 @@
-                 #include <sys/mman.h>
-                 #include <sys/types.h>
-                 #include <fcntl.h>
-+                #include <stdio.h>
- 
-                 int main () {
-                     long int pgsize = getpagesize ();
-@@ -66,10 +67,11 @@
+@@ -67,10 +67,11 @@
                          return 2;
                      }
                      /* Configure is being run as root? */




More information about the pkg-gnome-commits mailing list