r14073 - in /desktop/unstable/seahorse/debian: changelog patches/10_relibtoolize.patch
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Mon Jan 7 21:04:09 UTC 2008
Author: slomo
Date: Mon Jan 7 21:04:09 2008
New Revision: 14073
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14073
Log:
* New upstream release, with updated translations:
+ debian/patches/10_relibtoolize.patch:
- Regenerated for the new version.
Modified:
desktop/unstable/seahorse/debian/changelog
desktop/unstable/seahorse/debian/patches/10_relibtoolize.patch
Modified: desktop/unstable/seahorse/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/changelog?rev=14073&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/changelog (original)
+++ desktop/unstable/seahorse/debian/changelog Mon Jan 7 21:04:09 2008
@@ -1,3 +1,11 @@
+seahorse (2.20.3-1) unstable; urgency=low
+
+ * New upstream release, with updated translations:
+ + debian/patches/10_relibtoolize.patch:
+ - Regenerated for the new version.
+
+ -- Sebastian Dröge <slomo at debian.org> Mon, 07 Jan 2008 21:56:46 +0100
+
seahorse (2.20.1-2) unstable; urgency=low
* Switch to cdbs and quilt.
Modified: desktop/unstable/seahorse/debian/patches/10_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/10_relibtoolize.patch?rev=14073&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/patches/10_relibtoolize.patch (original)
+++ desktop/unstable/seahorse/debian/patches/10_relibtoolize.patch Mon Jan 7 21:04:09 2008
@@ -1,8 +1,7 @@
-Index: seahorse-2.20.1/aclocal.m4
-===================================================================
---- seahorse-2.20.1.orig/aclocal.m4 2007-11-15 18:59:44.045839862 +0100
-+++ seahorse-2.20.1/aclocal.m4 2007-11-15 19:04:02.000539863 +0100
-@@ -266,7 +266,7 @@ glib_DEFUN([GLIB_WITH_NLS],
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/aclocal.m4 seahorse-2.20.3/aclocal.m4
+--- seahorse-2.20.3.old/aclocal.m4 2008-01-07 17:46:59.000000000 +0100
++++ seahorse-2.20.3/aclocal.m4 2008-01-07 22:01:48.000000000 +0100
+@@ -266,7 +266,7 @@
AC_CHECK_FUNCS(dcgettext)
MSGFMT_OPTS=
AC_MSG_CHECKING([if msgfmt accepts -c])
@@ -11,16 +10,16 @@
msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
-@@ -492,7 +492,7 @@ fi])
+@@ -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
++# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -655,7 +655,7 @@ test -z "$STRIP" && STRIP=:
+@@ -655,7 +655,7 @@
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
@@ -29,7 +28,7 @@
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
-@@ -742,8 +742,9 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
+@@ -742,8 +742,9 @@
# Check for compiler boilerplate output or warnings with
# the simple compiler test code.
AC_DEFUN([_LT_COMPILER_BOILERPLATE],
@@ -41,7 +40,7 @@
eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_compiler_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -755,8 +756,9 @@ $rm conftest*
+@@ -755,8 +756,9 @@
# Check for linker boilerplate output or warnings with
# the simple link test code.
AC_DEFUN([_LT_LINKER_BOILERPLATE],
@@ -53,7 +52,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -772,12 +774,20 @@ $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],
@@ -79,7 +78,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
])# _LT_AC_SYS_LIBPATH_AIX
-@@ -1008,13 +1018,17 @@ ia64-*-hpux*)
+@@ -1008,13 +1018,17 @@
rm -rf conftest*
;;
@@ -98,7 +97,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
-@@ -1031,6 +1045,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
+@@ -1031,6 +1045,9 @@
;;
*64-bit*)
case $host in
@@ -108,7 +107,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
-@@ -1102,7 +1119,7 @@ AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
+@@ -1102,7 +1119,7 @@
AC_CACHE_CHECK([$1], [$2],
[$2=no
ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
@@ -117,7 +116,7 @@
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 @@ fi
+@@ -1143,11 +1160,12 @@
# ------------------------------------------------------------
# Check whether the given compiler option works
AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
@@ -132,7 +131,7 @@
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 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
+@@ -1261,24 +1279,27 @@
fi
;;
*)
@@ -177,7 +176,7 @@
;;
esac
])
-@@ -1505,7 +1526,8 @@ fi
+@@ -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],
@@ -187,7 +186,7 @@
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 @@ AC_CACHE_CHECK([if $compiler supports -c
+@@ -1513,7 +1535,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -196,7 +195,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -1653,6 +1675,7 @@ else
+@@ -1653,6 +1675,7 @@
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
@@ -204,7 +203,7 @@
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
-@@ -1670,7 +1693,8 @@ fi
+@@ -1670,7 +1693,8 @@
# -----------------------------
# PORTME Fill in your ld.so characteristics
AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
@@ -214,7 +213,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -1684,20 +1708,58 @@ shlibpath_overrides_runpath=unknown
+@@ -1684,20 +1708,58 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -278,7 +277,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -1854,12 +1916,8 @@ darwin* | rhapsody*)
+@@ -1854,12 +1916,8 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -293,7 +292,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -1913,7 +1971,7 @@ freebsd* | dragonfly*)
+@@ -1913,7 +1971,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -302,7 +301,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -1976,7 +2034,7 @@ hpux9* | hpux10* | hpux11*)
+@@ -1976,7 +2034,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -311,7 +310,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -2047,7 +2105,7 @@ linux* | k*bsd*-gnu)
+@@ -2047,7 +2105,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -320,7 +319,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -2153,6 +2211,10 @@ osf3* | osf4* | osf5*)
+@@ -2153,6 +2211,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -331,7 +330,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -2258,7 +2320,8 @@ fi
+@@ -2258,7 +2320,8 @@
# _LT_AC_TAGCONFIG
# ----------------
AC_DEFUN([_LT_AC_TAGCONFIG],
@@ -341,7 +340,7 @@
[AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
[include additional configurations @<:@automatic@:>@])],
[tagnames="$withval"])
-@@ -2519,7 +2582,7 @@ m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC
+@@ -2519,7 +2582,7 @@
# AC_PATH_TOOL_PREFIX
# -------------------
@@ -350,7 +349,7 @@
AC_DEFUN([AC_PATH_TOOL_PREFIX],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_MSG_CHECKING([for $1])
-@@ -2582,7 +2645,7 @@ fi
+@@ -2582,7 +2645,7 @@
# AC_PATH_MAGIC
# -------------
@@ -359,7 +358,7 @@
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 @@ esac
+@@ -2729,7 +2792,7 @@
# how to check for library dependencies
# -- PORTME fill in with the dynamic library characteristics
AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
@@ -368,7 +367,7 @@
lt_cv_deplibs_check_method,
[lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file=
-@@ -2768,9 +2831,15 @@ cygwin*)
+@@ -2768,9 +2831,15 @@
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
@@ -387,7 +386,7 @@
;;
darwin* | rhapsody*)
-@@ -2815,7 +2884,7 @@ hpux10.20* | hpux11*)
+@@ -2815,7 +2884,7 @@
esac
;;
@@ -396,7 +395,7 @@
# 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 @@ osf3* | osf4* | osf5*)
+@@ -2865,6 +2934,10 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -407,7 +406,7 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -2917,7 +2990,7 @@ AC_DEFUN([AC_PROG_NM],
+@@ -2917,7 +2990,7 @@
lt_cv_path_NM="$NM"
else
lt_nm_to_check="${ac_tool_prefix}nm"
@@ -416,7 +415,7 @@
lt_nm_to_check="$lt_nm_to_check nm"
fi
for lt_tmp_nm in $lt_nm_to_check; do
-@@ -3133,10 +3206,10 @@ objext=o
+@@ -3133,10 +3206,10 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -429,7 +428,7 @@
_LT_AC_SYS_COMPILER
-@@ -3238,10 +3311,10 @@ objext=o
+@@ -3238,10 +3311,10 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -442,7 +441,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
-@@ -3387,7 +3460,7 @@ case $host_os in
+@@ -3387,7 +3460,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -451,7 +450,7 @@
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -3546,10 +3619,10 @@ case $host_os in
+@@ -3546,10 +3619,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -464,7 +463,7 @@
_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 @@ case $host_os in
+@@ -3632,9 +3705,7 @@
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
case $host_cpu in
@@ -475,7 +474,7 @@
*)
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
-@@ -3702,7 +3773,7 @@ case $host_os in
+@@ -3702,7 +3773,7 @@
;;
esac
;;
@@ -484,7 +483,7 @@
_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 @@ case $host_os in
+@@ -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'
;;
@@ -514,7 +513,7 @@
esac
;;
lynxos*)
-@@ -3860,16 +3954,20 @@ case $host_os in
+@@ -3860,16 +3954,20 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
openbsd*)
@@ -544,7 +543,7 @@
;;
osf3*)
case $cc_basename in
-@@ -4031,15 +4129,10 @@ case $host_os in
+@@ -4031,15 +4129,10 @@
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
@@ -563,7 +562,7 @@
;;
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -4086,6 +4179,12 @@ case $host_os in
+@@ -4086,6 +4179,12 @@
fi
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -576,7 +575,7 @@
fi
;;
esac
-@@ -4329,7 +4428,7 @@ $rm -f confest.$objext
+@@ -4329,7 +4428,7 @@
# PORTME: override above test on systems where it is broken
ifelse([$1],[CXX],
[case $host_os in
@@ -585,7 +584,7 @@
# 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 @@ interix3*)
+@@ -4337,13 +4436,46 @@
_LT_AC_TAGVAR(postdeps,$1)=
;;
@@ -633,7 +632,7 @@
;;
esac
;;
-@@ -4392,10 +4524,17 @@ objext=o
+@@ -4392,10 +4524,17 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -653,7 +652,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
-@@ -4474,10 +4613,10 @@ objext=o
+@@ -4474,10 +4613,10 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -666,7 +665,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
-@@ -4530,7 +4669,7 @@ objext=o
+@@ -4530,7 +4669,7 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -675,7 +674,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -4619,6 +4758,7 @@ if test -f "$ltmain"; then
+@@ -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) \
@@ -683,7 +682,7 @@
_LT_AC_TAGVAR(exclude_expsyms, $1) \
_LT_AC_TAGVAR(include_expsyms, $1); do
-@@ -4665,7 +4805,7 @@ ifelse([$1], [],
+@@ -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.
#
@@ -692,7 +691,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -4990,7 +5130,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
+@@ -4990,7 +5130,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -701,7 +700,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-@@ -5073,6 +5213,7 @@ fi
+@@ -5073,6 +5213,7 @@
# ---------------------------------
AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
[AC_REQUIRE([AC_CANONICAL_HOST])
@@ -709,7 +708,7 @@
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 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5299,12 +5440,14 @@
# like `-m68040'.
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
@@ -726,7 +725,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
-@@ -5316,7 +5459,7 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5316,7 +5459,7 @@
# DJGPP does not support shared libraries at all
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -735,7 +734,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -5452,6 +5595,14 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5452,6 +5595,14 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
*)
@@ -750,7 +749,7 @@
;;
esac
;;
-@@ -5572,13 +5723,15 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5572,13 +5723,15 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
@@ -768,7 +767,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
;;
-@@ -5588,7 +5741,7 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5588,7 +5741,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
@@ -777,7 +776,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -5646,7 +5799,7 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5646,7 +5799,7 @@
esac
;;
@@ -786,7 +785,7 @@
# 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 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5698,6 +5851,22 @@
# All Alpha code is PIC.
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -809,7 +808,7 @@
esac
;;
-@@ -5707,6 +5876,10 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5707,6 +5876,10 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -820,7 +819,7 @@
solaris*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -5801,7 +5974,8 @@ AC_LIBTOOL_LINKER_OPTION([if $compiler s
+@@ -5801,7 +5974,8 @@
# ------------------------------------
# See if the linker supports building shared libraries.
AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
@@ -830,7 +829,7 @@
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 @@ ifelse([$1],[CXX],[
+@@ -5818,7 +5992,7 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -839,7 +838,7 @@
;;
linux* | k*bsd*-gnu)
_LT_AC_TAGVAR(link_all_deplibs, $1)=no
-@@ -5960,7 +6134,7 @@ EOF
+@@ -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
@@ -848,7 +847,7 @@
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 @@ EOF
+@@ -5978,7 +6152,7 @@
fi
;;
@@ -857,7 +856,7 @@
_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 @@ EOF
+@@ -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'
;;
@@ -866,7 +865,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -6011,13 +6185,22 @@ EOF
+@@ -6011,13 +6185,22 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -891,7 +890,7 @@
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=no
else
-@@ -6058,7 +6241,7 @@ EOF
+@@ -6058,7 +6241,7 @@
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
case `$LD -v 2>&1` in
@@ -900,7 +899,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
-@@ -6177,7 +6360,7 @@ _LT_EOF
+@@ -6177,7 +6360,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -909,7 +908,7 @@
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -6270,7 +6453,7 @@ _LT_EOF
+@@ -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.
@@ -918,7 +917,7 @@
_LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
;;
-@@ -6312,10 +6495,10 @@ _LT_EOF
+@@ -6312,10 +6495,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -931,7 +930,7 @@
_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 @@ _LT_EOF
+@@ -6477,24 +6660,28 @@
;;
openbsd*)
@@ -977,7 +976,7 @@
fi
;;
-@@ -6553,17 +6740,16 @@ _LT_EOF
+@@ -6553,17 +6740,16 @@
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
@@ -1004,7 +1003,7 @@
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -6620,7 +6806,7 @@ _LT_EOF
+@@ -6620,7 +6806,7 @@
fi
;;
@@ -1013,7 +1012,7 @@
_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 @@ x|xyes)
+@@ -6695,7 +6881,7 @@
# to ld, don't add -lc before -lgcc.
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
@@ -1022,7 +1021,7 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
-@@ -6798,6 +6984,30 @@ AC_DEFUN([LT_AC_PROG_RC],
+@@ -6798,6 +6984,30 @@
[AC_CHECK_TOOL(RC, windres, no)
])
@@ -1053,7 +1052,7 @@
# 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 @@ do
+@@ -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
@@ -1068,7 +1067,7 @@
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -6856,6 +7067,7 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xp
+@@ -6856,6 +7067,7 @@
done
])
SED=$lt_cv_path_SED
@@ -1076,7 +1075,7 @@
AC_MSG_RESULT([$SED])
])
-@@ -7007,7 +7219,7 @@ path to pkg-config.
+@@ -7007,7 +7219,7 @@
_PKG_TEXT
@@ -1085,11 +1084,10 @@
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-Index: seahorse-2.20.1/agent/Makefile.in
-===================================================================
---- seahorse-2.20.1.orig/agent/Makefile.in 2007-11-15 18:59:44.001837355 +0100
-+++ seahorse-2.20.1/agent/Makefile.in 2007-11-15 19:06:00.139272205 +0100
-@@ -170,14 +170,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/agent/Makefile.in seahorse-2.20.3/agent/Makefile.in
+--- seahorse-2.20.3.old/agent/Makefile.in 2008-01-07 17:47:07.000000000 +0100
++++ seahorse-2.20.3/agent/Makefile.in 2008-01-07 22:02:07.000000000 +0100
+@@ -170,14 +170,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -1105,7 +1103,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -189,7 +187,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
+@@ -189,7 +187,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -1113,7 +1111,15 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -239,15 +236,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -219,6 +216,7 @@
+ MOZILLA_PREFIX = @MOZILLA_PREFIX@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+@@ -239,15 +237,13 @@
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -1130,15 +1136,17 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-Index: seahorse-2.20.1/configure
-===================================================================
---- seahorse-2.20.1.orig/configure 2007-11-15 18:59:43.985836443 +0100
-+++ seahorse-2.20.1/configure 2007-11-15 19:05:14.920695346 +0100
-@@ -847,14 +847,11 @@ INTLTOOL_CAVES_RULE
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/configure seahorse-2.20.3/configure
+--- seahorse-2.20.3.old/configure 2008-01-07 17:47:05.000000000 +0100
++++ seahorse-2.20.3/configure 2008-01-07 22:02:03.000000000 +0100
+@@ -847,14 +847,14 @@
INTLTOOL_SCHEMAS_RULE
INTLTOOL_THEME_RULE
INTLTOOL_SERVICE_RULE
+INTLTOOL_POLICY_RULE
++XGETTEXT
++MSGMERGE
++MSGFMT
INTLTOOL_EXTRACT
INTLTOOL_MERGE
INTLTOOL_UPDATE
@@ -1150,7 +1158,7 @@
ALL_LINGUAS
CC
CFLAGS
-@@ -881,6 +878,7 @@ host
+@@ -881,6 +881,7 @@
host_cpu
host_vendor
host_os
@@ -1158,7 +1166,7 @@
GREP
EGREP
LN_S
-@@ -996,9 +994,6 @@ WITH_APPLET_TRUE
+@@ -996,9 +997,6 @@
WITH_APPLET_FALSE
LIBNOTIFY_CFLAGS
LIBNOTIFY_LIBS
@@ -1168,101 +1176,199 @@
WITH_SSH_TRUE
WITH_SSH_FALSE
LIBEBOOK_CFLAGS
-@@ -3847,6 +3842,8 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
+@@ -1014,10 +1012,8 @@
+ UPDATE_MIME_DATABASE_FALSE
+ GETTEXT_PACKAGE
+ USE_NLS
+-MSGFMT
+ MSGFMT_OPTS
+ GMSGFMT
+-XGETTEXT
+ CATALOGS
+ CATOBJEXT
+ GMOFILES
+@@ -3847,6 +3843,7 @@
INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+
-
-
-
-@@ -3938,171 +3935,6 @@ echo "$as_me: error: XML::Parser perl mo
- fi
+
+
+
+@@ -3867,24 +3864,18 @@
+
+
+
+-# Use the tools built into the package, not the ones that are installed.
+-INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
+-
+-INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
+
+-INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
+-
+-
+-# Extract the first word of "perl", so it can be a program name with args.
+-set dummy perl; ac_word=$2
++# Check the gettext tools to make sure they are GNU
++# Extract the first word of "xgettext", so it can be a program name with args.
++set dummy xgettext; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
++if test "${ac_cv_path_XGETTEXT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- case $INTLTOOL_PERL in
++ case $XGETTEXT in
+ [\\/]* | ?:[\\/]*)
+- ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
++ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -3894,7 +3885,7 @@
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
++ ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+@@ -3905,49 +3896,26 @@
+ ;;
+ esac
fi
-
+-INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
+-if test -n "$INTLTOOL_PERL"; then
+- { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
+-echo "${ECHO_T}$INTLTOOL_PERL" >&6; }
++XGETTEXT=$ac_cv_path_XGETTEXT
++if test -n "$XGETTEXT"; then
++ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
++echo "${ECHO_T}$XGETTEXT" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ fi
+
+
+-if test -z "$INTLTOOL_PERL"; then
+- { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
+-echo "$as_me: error: perl not found; required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
+- { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
+-echo "$as_me: error: perl 5.x required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-if test "x" != "xno-xml"; then
+- { echo "$as_me:$LINENO: checking for XML::Parser" >&5
+-echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; }
+- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+- { echo "$as_me:$LINENO: result: ok" >&5
+-echo "${ECHO_T}ok" >&6; }
+- else
+- { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
+-echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
+- fi
+-fi
+-
-# Extract the first word of "iconv", so it can be a program name with args.
-set dummy iconv; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++# Extract the first word of "msgmerge", so it can be a program name with args.
++set dummy msgmerge; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_INTLTOOL_ICONV+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++if test "${ac_cv_path_MSGMERGE+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
- case $INTLTOOL_ICONV in
-- [\\/]* | ?:[\\/]*)
++ case $MSGMERGE in
+ [\\/]* | ?:[\\/]*)
- ac_cv_path_INTLTOOL_ICONV="$INTLTOOL_ICONV" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -3957,7 +3925,7 @@
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
++ ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+@@ -3965,14 +3933,13 @@
+ done
+ IFS=$as_save_IFS
+
- test -z "$ac_cv_path_INTLTOOL_ICONV" && ac_cv_path_INTLTOOL_ICONV="iconv"
-- ;;
--esac
--fi
+ ;;
+ esac
+ fi
-INTLTOOL_ICONV=$ac_cv_path_INTLTOOL_ICONV
-if test -n "$INTLTOOL_ICONV"; then
- { echo "$as_me:$LINENO: result: $INTLTOOL_ICONV" >&5
-echo "${ECHO_T}$INTLTOOL_ICONV" >&6; }
--else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--
--
--# Extract the first word of "msgfmt", so it can be a program name with args.
--set dummy msgfmt; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++MSGMERGE=$ac_cv_path_MSGMERGE
++if test -n "$MSGMERGE"; then
++ { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
++echo "${ECHO_T}$MSGMERGE" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+@@ -3983,12 +3950,12 @@
+ set dummy msgfmt; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_INTLTOOL_MSGFMT+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++if test "${ac_cv_path_MSGFMT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
- case $INTLTOOL_MSGFMT in
-- [\\/]* | ?:[\\/]*)
++ case $MSGFMT in
+ [\\/]* | ?:[\\/]*)
- ac_cv_path_INTLTOOL_MSGFMT="$INTLTOOL_MSGFMT" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -3998,7 +3965,7 @@
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
++ ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+@@ -4006,71 +3973,51 @@
+ done
+ IFS=$as_save_IFS
+
- test -z "$ac_cv_path_INTLTOOL_MSGFMT" && ac_cv_path_INTLTOOL_MSGFMT="msgfmt"
-- ;;
--esac
--fi
+ ;;
+ esac
+ fi
-INTLTOOL_MSGFMT=$ac_cv_path_INTLTOOL_MSGFMT
-if test -n "$INTLTOOL_MSGFMT"; then
- { echo "$as_me:$LINENO: result: $INTLTOOL_MSGFMT" >&5
-echo "${ECHO_T}$INTLTOOL_MSGFMT" >&6; }
--else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--
--
++MSGFMT=$ac_cv_path_MSGFMT
++if test -n "$MSGFMT"; then
++ { echo "$as_me:$LINENO: result: $MSGFMT" >&5
++echo "${ECHO_T}$MSGFMT" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ fi
+
+
-# Extract the first word of "msgmerge", so it can be a program name with args.
-set dummy msgmerge; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -1293,7 +1399,11 @@
- test -z "$ac_cv_path_INTLTOOL_MSGMERGE" && ac_cv_path_INTLTOOL_MSGMERGE="msgmerge"
- ;;
-esac
--fi
++if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
++ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
++echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
++ { (exit 1); exit 1; }; }
+ fi
-INTLTOOL_MSGMERGE=$ac_cv_path_INTLTOOL_MSGMERGE
-if test -n "$INTLTOOL_MSGMERGE"; then
- { echo "$as_me:$LINENO: result: $INTLTOOL_MSGMERGE" >&5
@@ -1301,55 +1411,98 @@
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
--fi
--
--
++xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
++mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
++mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
++if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
++ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
++echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
++ { (exit 1); exit 1; }; }
+ fi
+
++# Use the tools built into the package, not the ones that are installed.
++INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
+
-# Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
++
++INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
++
++
++# Extract the first word of "perl", so it can be a program name with args.
++set dummy perl; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_INTLTOOL_XGETTEXT+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
- case $INTLTOOL_XGETTEXT in
-- [\\/]* | ?:[\\/]*)
++ case $INTLTOOL_PERL in
+ [\\/]* | ?:[\\/]*)
- ac_cv_path_INTLTOOL_XGETTEXT="$INTLTOOL_XGETTEXT" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -4080,7 +4027,7 @@
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
++ ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+@@ -4088,20 +4035,41 @@
+ done
+ IFS=$as_save_IFS
+
- test -z "$ac_cv_path_INTLTOOL_XGETTEXT" && ac_cv_path_INTLTOOL_XGETTEXT="xgettext"
-- ;;
--esac
--fi
+ ;;
+ esac
+ fi
-INTLTOOL_XGETTEXT=$ac_cv_path_INTLTOOL_XGETTEXT
-if test -n "$INTLTOOL_XGETTEXT"; then
- { echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5
-echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6; }
--else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--
--
--
++INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
++if test -n "$INTLTOOL_PERL"; then
++ { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
++echo "${ECHO_T}$INTLTOOL_PERL" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ fi
+
+
++if test -z "$INTLTOOL_PERL"; then
++ { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
++echo "$as_me: error: perl not found; required for intltool" >&2;}
++ { (exit 1); exit 1; }; }
++fi
++if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
++ { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
++echo "$as_me: error: perl 5.x required for intltool" >&2;}
++ { (exit 1); exit 1; }; }
++fi
++if test "x" != "xno-xml"; then
++ { echo "$as_me:$LINENO: checking for XML::Parser" >&5
++echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; }
++ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
++ { echo "$as_me:$LINENO: result: ok" >&5
++echo "${ECHO_T}ok" >&6; }
++ else
++ { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
++echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
++ { (exit 1); exit 1; }; }
++ fi
++fi
+
# Substitute ALL_LINGUAS so we can use it in po/Makefile
-
-@@ -4120,7 +3952,7 @@ int
+@@ -4120,7 +4088,7 @@
main ()
{
extern int _nl_msg_cat_cntr;
@@ -1358,7 +1511,7 @@
;
return 0;
}
-@@ -4425,12 +4257,13 @@ do
+@@ -4425,12 +4393,13 @@
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1373,7 +1526,7 @@
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -4465,6 +4298,7 @@ done
+@@ -4465,6 +4434,7 @@
fi
SED=$lt_cv_path_SED
@@ -1381,7 +1534,7 @@
{ echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6; }
-@@ -4826,8 +4660,8 @@ else
+@@ -4826,8 +4796,8 @@
echo "${ECHO_T}no, using $LN_S" >&6; }
fi
@@ -1392,7 +1545,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4868,9 +4702,15 @@ cygwin*)
+@@ -4868,9 +4838,15 @@
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
@@ -1411,7 +1564,7 @@
;;
darwin* | rhapsody*)
-@@ -4915,7 +4755,7 @@ hpux10.20* | hpux11*)
+@@ -4915,7 +4891,7 @@
esac
;;
@@ -1420,7 +1573,7 @@
# 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 +4805,10 @@ osf3* | osf4* | osf5*)
+@@ -4965,6 +4941,10 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -1431,16 +1584,16 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -5051,7 +4895,7 @@ ia64-*-hpux*)
+@@ -5051,7 +5031,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5054 "configure"' > conftest.$ac_ext
-+ echo '#line 4898 "configure"' > conftest.$ac_ext
++ echo '#line 5034 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -5086,7 +4930,8 @@ ia64-*-hpux*)
+@@ -5086,7 +5066,8 @@
rm -rf conftest*
;;
@@ -1450,7 +1603,7 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -5097,6 +4942,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
+@@ -5097,6 +5078,9 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
@@ -1460,7 +1613,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
-@@ -5113,6 +4961,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
+@@ -5113,6 +5097,9 @@
;;
*64-bit*)
case $host in
@@ -1470,7 +1623,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
-@@ -6900,24 +6751,27 @@ else
+@@ -6900,24 +6887,27 @@
fi
;;
*)
@@ -1515,7 +1668,7 @@
;;
esac
-@@ -6934,6 +6788,7 @@ fi
+@@ -6934,6 +6924,7 @@
@@ -1523,7 +1676,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 +7377,7 @@ test -z "$STRIP" && STRIP=:
+@@ -7522,7 +7513,7 @@
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
@@ -1532,7 +1685,7 @@
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
-@@ -7722,10 +7577,10 @@ objext=o
+@@ -7722,10 +7713,10 @@
objext=$objext
# Code to be used in simple compile tests
@@ -1545,7 +1698,7 @@
# If no C compiler was specified, use CC.
-@@ -7740,13 +7595,13 @@ compiler=$CC
+@@ -7740,13 +7731,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -1561,7 +1714,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -7766,7 +7621,7 @@ if test "${lt_cv_prog_compiler_rtti_exce
+@@ -7766,7 +7757,7 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -1570,21 +1723,21 @@
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 +7632,11 @@ else
+@@ -7777,11 +7768,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:7780: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7635: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7771: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7784: \$? = $ac_status" >&5
-+ echo "$as_me:7639: \$? = $ac_status" >&5
++ echo "$as_me:7775: \$? = $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.
-@@ -7832,13 +7687,15 @@ echo $ECHO_N "checking for $compiler opt
+@@ -7832,13 +7823,15 @@
lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
;;
@@ -1602,7 +1755,7 @@
lt_prog_compiler_pic='-DDLL_EXPORT'
;;
-@@ -7848,7 +7705,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -7848,7 +7841,7 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -1611,7 +1764,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -7906,7 +7763,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -7906,7 +7899,7 @@
esac
;;
@@ -1620,7 +1773,7 @@
# 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 +7815,22 @@ echo $ECHO_N "checking for $compiler opt
+@@ -7958,6 +7951,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
@@ -1643,7 +1796,7 @@
esac
;;
-@@ -7967,6 +7840,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -7967,6 +7976,10 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -1654,7 +1807,7 @@
solaris*)
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -8034,7 +7911,7 @@ if test "${lt_prog_compiler_pic_works+se
+@@ -8034,7 +8047,7 @@
else
lt_prog_compiler_pic_works=no
ac_outfile=conftest.$ac_objext
@@ -1663,21 +1816,21 @@
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 +7922,11 @@ else
+@@ -8045,11 +8058,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:8048: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7925: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8061: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8052: \$? = $ac_status" >&5
-+ echo "$as_me:7929: \$? = $ac_status" >&5
++ echo "$as_me:8065: \$? = $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.
-@@ -8098,7 +7975,7 @@ else
+@@ -8098,7 +8111,7 @@
lt_prog_compiler_static_works=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -1686,7 +1839,7 @@
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 +8015,7 @@ else
+@@ -8138,7 +8151,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -1695,21 +1848,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -8149,11 +8026,11 @@ else
+@@ -8149,11 +8162,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:8152: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8029: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8165: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8156: \$? = $ac_status" >&5
-+ echo "$as_me:8033: \$? = $ac_status" >&5
++ echo "$as_me:8169: \$? = $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
-@@ -8345,7 +8222,7 @@ EOF
+@@ -8345,7 +8358,7 @@
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
@@ -1718,7 +1871,7 @@
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 +8240,7 @@ EOF
+@@ -8363,7 +8376,7 @@
fi
;;
@@ -1727,7 +1880,7 @@
hardcode_direct=no
hardcode_shlibpath_var=no
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-@@ -8378,7 +8255,7 @@ EOF
+@@ -8378,7 +8391,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'
;;
@@ -1736,7 +1889,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -8396,13 +8273,22 @@ EOF
+@@ -8396,13 +8409,22 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -1761,7 +1914,7 @@
fi
link_all_deplibs=no
else
-@@ -8562,7 +8448,7 @@ _LT_EOF
+@@ -8562,7 +8584,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -1770,7 +1923,7 @@
else
# We have old collect2
hardcode_direct=unsupported
-@@ -8636,11 +8522,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -8636,11 +8658,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -1793,7 +1946,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -8695,11 +8588,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -8695,11 +8724,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -1816,7 +1969,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -8753,7 +8653,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -8753,7 +8789,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.
@@ -1825,7 +1978,7 @@
fix_srcfile_path='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes=yes
;;
-@@ -8795,10 +8695,10 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -8795,10 +8831,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -1838,7 +1991,7 @@
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 +8860,28 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -8960,24 +8996,28 @@
;;
openbsd*)
@@ -1884,7 +2037,7 @@
fi
;;
-@@ -9036,17 +8940,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9036,17 +9076,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -1911,7 +2064,7 @@
esac
link_all_deplibs=yes
;;
-@@ -9103,7 +9006,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9103,7 +9142,7 @@
fi
;;
@@ -1920,7 +2073,7 @@
no_undefined_flag='${wl}-z,text'
archive_cmds_need_lc=no
hardcode_shlibpath_var=no
-@@ -9180,7 +9083,7 @@ x|xyes)
+@@ -9180,7 +9219,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*
@@ -1929,7 +2082,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -9238,17 +9141,55 @@ shlibpath_overrides_runpath=unknown
+@@ -9238,17 +9277,55 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -1989,7 +2142,7 @@
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
-@@ -9408,12 +9349,8 @@ darwin* | rhapsody*)
+@@ -9408,12 +9485,8 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -2004,7 +2157,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -9467,7 +9404,7 @@ freebsd* | dragonfly*)
+@@ -9467,7 +9540,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -2013,7 +2166,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -9530,7 +9467,7 @@ hpux9* | hpux10* | hpux11*)
+@@ -9530,7 +9603,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -2022,7 +2175,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -9601,7 +9538,7 @@ linux* | k*bsd*-gnu)
+@@ -9601,7 +9674,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -2031,7 +2184,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -9707,6 +9644,10 @@ osf3* | osf4* | osf5*)
+@@ -9707,6 +9780,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -2042,7 +2195,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -9860,6 +9801,7 @@ else
+@@ -9860,6 +9937,7 @@
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
@@ -2050,25 +2203,25 @@
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
else
-@@ -10446,7 +10388,7 @@ else
+@@ -10446,7 +10524,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10449 "configure"
-+#line 10391 "configure"
++#line 10527 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -10546,7 +10488,7 @@ else
+@@ -10546,7 +10624,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10549 "configure"
-+#line 10491 "configure"
++#line 10627 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -10744,6 +10686,7 @@ if test -f "$ltmain"; then
+@@ -10744,6 +10822,7 @@
module_cmds \
module_expsym_cmds \
lt_cv_prog_compiler_c_o \
@@ -2076,7 +2229,7 @@
exclude_expsyms \
include_expsyms; do
-@@ -10788,7 +10731,7 @@ echo "$as_me: creating $ofile" >&6;}
+@@ -10788,7 +10867,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -2085,7 +2238,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -11112,7 +11055,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
+@@ -11112,7 +11191,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -2094,7 +2247,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols
-@@ -11281,10 +11224,10 @@ objext=o
+@@ -11281,10 +11360,10 @@
objext_CXX=$objext
# Code to be used in simple compile tests
@@ -2107,7 +2260,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -11300,13 +11243,13 @@ compiler=$CC
+@@ -11300,13 +11379,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -2123,7 +2276,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -11565,7 +11508,7 @@ case $host_os in
+@@ -11565,7 +11644,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -2132,7 +2285,7 @@
else
# We have old collect2
hardcode_direct_CXX=unsupported
-@@ -11639,11 +11582,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -11639,11 +11718,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -2155,7 +2308,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -11699,11 +11649,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -11699,11 +11785,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -2178,7 +2331,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -11822,10 +11779,10 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -11822,10 +11915,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -2191,7 +2344,7 @@
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 +11865,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -11908,9 +12001,7 @@
hardcode_libdir_separator_CXX=:
case $host_cpu in
@@ -2202,7 +2355,7 @@
*)
export_dynamic_flag_spec_CXX='${wl}-E'
;;
-@@ -11978,7 +11933,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -11978,7 +12069,7 @@
;;
esac
;;
@@ -2211,7 +2364,7 @@
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-@@ -12098,6 +12053,29 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12098,6 +12189,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'
;;
@@ -2241,7 +2394,7 @@
esac
;;
lynxos*)
-@@ -12136,16 +12114,20 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12136,16 +12250,20 @@
ld_shlibs_CXX=no
;;
openbsd*)
@@ -2271,7 +2424,7 @@
;;
osf3*)
case $cc_basename in
-@@ -12307,15 +12289,10 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12307,15 +12425,10 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -2290,7 +2443,7 @@
;;
esac
link_all_deplibs_CXX=yes
-@@ -12362,6 +12339,12 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12362,6 +12475,12 @@
fi
hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
@@ -2303,7 +2456,7 @@
fi
;;
esac
-@@ -12553,7 +12536,7 @@ $rm -f confest.$objext
+@@ -12553,7 +12672,7 @@
# PORTME: override above test on systems where it is broken
case $host_os in
@@ -2312,7 +2465,7 @@
# 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 +12544,46 @@ interix3*)
+@@ -12561,13 +12680,46 @@
postdeps_CXX=
;;
@@ -2360,7 +2513,7 @@
;;
esac
;;
-@@ -12604,12 +12620,14 @@ echo $ECHO_N "checking for $compiler opt
+@@ -12604,12 +12756,14 @@
# like `-m68040'.
lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
;;
@@ -2377,7 +2530,7 @@
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
-@@ -12621,7 +12639,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -12621,7 +12775,7 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -2386,7 +2539,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -12757,6 +12775,14 @@ echo $ECHO_N "checking for $compiler opt
+@@ -12757,6 +12911,14 @@
lt_prog_compiler_static_CXX='-non_shared'
;;
*)
@@ -2401,7 +2554,7 @@
;;
esac
;;
-@@ -12871,7 +12897,7 @@ if test "${lt_prog_compiler_pic_works_CX
+@@ -12871,7 +13033,7 @@
else
lt_prog_compiler_pic_works_CXX=no
ac_outfile=conftest.$ac_objext
@@ -2410,21 +2563,21 @@
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 +12908,11 @@ else
+@@ -12882,11 +13044,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:12885: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:12911: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13047: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12889: \$? = $ac_status" >&5
-+ echo "$as_me:12915: \$? = $ac_status" >&5
++ echo "$as_me:13051: \$? = $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.
-@@ -12935,7 +12961,7 @@ else
+@@ -12935,7 +13097,7 @@
lt_prog_compiler_static_works_CXX=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -2433,7 +2586,7 @@
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 +13001,7 @@ else
+@@ -12975,7 +13137,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -2442,21 +2595,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -12986,11 +13012,11 @@ else
+@@ -12986,11 +13148,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:12989: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13015: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13151: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12993: \$? = $ac_status" >&5
-+ echo "$as_me:13019: \$? = $ac_status" >&5
++ echo "$as_me:13155: \$? = $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
-@@ -13056,7 +13082,7 @@ echo $ECHO_N "checking whether the $comp
+@@ -13056,7 +13218,7 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -2465,7 +2618,7 @@
;;
linux* | k*bsd*-gnu)
link_all_deplibs_CXX=no
-@@ -13090,7 +13116,7 @@ x|xyes)
+@@ -13090,7 +13252,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*
@@ -2474,7 +2627,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -13148,20 +13174,7 @@ shlibpath_overrides_runpath=unknown
+@@ -13148,20 +13310,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -2496,7 +2649,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -13318,12 +13331,7 @@ darwin* | rhapsody*)
+@@ -13318,12 +13467,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -2510,7 +2663,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -13377,7 +13385,7 @@ freebsd* | dragonfly*)
+@@ -13377,7 +13521,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -2519,7 +2672,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -13440,7 +13448,7 @@ hpux9* | hpux10* | hpux11*)
+@@ -13440,7 +13584,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -2528,7 +2681,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -13511,7 +13519,7 @@ linux* | k*bsd*-gnu)
+@@ -13511,7 +13655,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -2537,7 +2690,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -13617,6 +13625,10 @@ osf3* | osf4* | osf5*)
+@@ -13617,6 +13761,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -2548,7 +2701,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -13811,6 +13823,7 @@ if test -f "$ltmain"; then
+@@ -13811,6 +13959,7 @@
module_cmds_CXX \
module_expsym_cmds_CXX \
lt_cv_prog_compiler_c_o_CXX \
@@ -2556,7 +2709,7 @@
exclude_expsyms_CXX \
include_expsyms_CXX; do
-@@ -14131,7 +14144,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
+@@ -14131,7 +14280,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -2565,7 +2718,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_CXX
-@@ -14222,10 +14235,17 @@ objext=o
+@@ -14222,10 +14371,17 @@
objext_F77=$objext
# Code to be used in simple compile tests
@@ -2585,7 +2738,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -14241,13 +14261,13 @@ compiler=$CC
+@@ -14241,13 +14397,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -2601,7 +2754,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -14334,13 +14354,15 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14334,13 +14490,15 @@
lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
;;
@@ -2619,7 +2772,7 @@
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
;;
-@@ -14350,7 +14372,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14350,7 +14508,7 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -2628,7 +2781,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -14408,7 +14430,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14408,7 +14566,7 @@
esac
;;
@@ -2637,7 +2790,7 @@
# 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 +14482,22 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14460,6 +14618,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -2660,7 +2813,7 @@
esac
;;
-@@ -14469,6 +14507,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14469,6 +14643,10 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -2671,7 +2824,7 @@
solaris*)
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -14536,7 +14578,7 @@ if test "${lt_prog_compiler_pic_works_F7
+@@ -14536,7 +14714,7 @@
else
lt_prog_compiler_pic_works_F77=no
ac_outfile=conftest.$ac_objext
@@ -2680,21 +2833,21 @@
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 +14589,11 @@ else
+@@ -14547,11 +14725,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:14550: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14592: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14728: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14554: \$? = $ac_status" >&5
-+ echo "$as_me:14596: \$? = $ac_status" >&5
++ echo "$as_me:14732: \$? = $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.
-@@ -14600,7 +14642,7 @@ else
+@@ -14600,7 +14778,7 @@
lt_prog_compiler_static_works_F77=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -2703,7 +2856,7 @@
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 +14682,7 @@ else
+@@ -14640,7 +14818,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -2712,21 +2865,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -14651,11 +14693,11 @@ else
+@@ -14651,11 +14829,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:14654: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14696: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14832: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14658: \$? = $ac_status" >&5
-+ echo "$as_me:14700: \$? = $ac_status" >&5
++ echo "$as_me:14836: \$? = $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
-@@ -14847,7 +14889,7 @@ EOF
+@@ -14847,7 +15025,7 @@
allow_undefined_flag_F77=unsupported
always_export_symbols_F77=no
enable_shared_with_static_runtimes_F77=yes
@@ -2735,7 +2888,7 @@
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 +14907,7 @@ EOF
+@@ -14865,7 +15043,7 @@
fi
;;
@@ -2744,7 +2897,7 @@
hardcode_direct_F77=no
hardcode_shlibpath_var_F77=no
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-@@ -14880,7 +14922,7 @@ EOF
+@@ -14880,7 +15058,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'
;;
@@ -2753,7 +2906,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -14898,13 +14940,22 @@ EOF
+@@ -14898,13 +15076,22 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -2778,7 +2931,7 @@
fi
link_all_deplibs_F77=no
else
-@@ -15064,7 +15115,7 @@ _LT_EOF
+@@ -15064,7 +15251,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -2787,7 +2940,7 @@
else
# We have old collect2
hardcode_direct_F77=unsupported
-@@ -15128,11 +15179,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -15128,11 +15315,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -2810,7 +2963,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -15177,11 +15235,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -15177,11 +15371,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -2833,7 +2986,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -15235,7 +15300,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15235,7 +15436,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.
@@ -2842,7 +2995,7 @@
fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_F77=yes
;;
-@@ -15277,10 +15342,10 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15277,10 +15478,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -2855,7 +3008,7 @@
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 +15507,28 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15442,24 +15643,28 @@
;;
openbsd*)
@@ -2901,7 +3054,7 @@
fi
;;
-@@ -15518,17 +15587,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15518,17 +15723,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -2928,7 +3081,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -15585,7 +15653,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15585,7 +15789,7 @@
fi
;;
@@ -2937,7 +3090,7 @@
no_undefined_flag_F77='${wl}-z,text'
archive_cmds_need_lc_F77=no
hardcode_shlibpath_var_F77=no
-@@ -15662,7 +15730,7 @@ x|xyes)
+@@ -15662,7 +15866,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*
@@ -2946,7 +3099,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -15720,20 +15788,7 @@ shlibpath_overrides_runpath=unknown
+@@ -15720,20 +15924,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -2968,7 +3121,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -15890,12 +15945,7 @@ darwin* | rhapsody*)
+@@ -15890,12 +16081,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -2982,7 +3135,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -15949,7 +15999,7 @@ freebsd* | dragonfly*)
+@@ -15949,7 +16135,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -2991,7 +3144,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -16012,7 +16062,7 @@ hpux9* | hpux10* | hpux11*)
+@@ -16012,7 +16198,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -3000,7 +3153,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -16083,7 +16133,7 @@ linux* | k*bsd*-gnu)
+@@ -16083,7 +16269,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -3009,7 +3162,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -16189,6 +16239,10 @@ osf3* | osf4* | osf5*)
+@@ -16189,6 +16375,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -3020,7 +3173,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -16383,6 +16437,7 @@ if test -f "$ltmain"; then
+@@ -16383,6 +16573,7 @@
module_cmds_F77 \
module_expsym_cmds_F77 \
lt_cv_prog_compiler_c_o_F77 \
@@ -3028,7 +3181,7 @@
exclude_expsyms_F77 \
include_expsyms_F77; do
-@@ -16703,7 +16758,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
+@@ -16703,7 +16894,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -3037,7 +3190,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_F77
-@@ -16761,10 +16816,10 @@ objext=o
+@@ -16761,10 +16952,10 @@
objext_GCJ=$objext
# Code to be used in simple compile tests
@@ -3050,7 +3203,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -16780,13 +16835,13 @@ compiler=$CC
+@@ -16780,13 +16971,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -3066,7 +3219,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -16827,7 +16882,7 @@ if test "${lt_cv_prog_compiler_rtti_exce
+@@ -16827,7 +17018,7 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -3075,21 +3228,21 @@
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 +16893,11 @@ else
+@@ -16838,11 +17029,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:16841: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16896: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17032: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16845: \$? = $ac_status" >&5
-+ echo "$as_me:16900: \$? = $ac_status" >&5
++ echo "$as_me:17036: \$? = $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.
-@@ -16893,13 +16948,15 @@ echo $ECHO_N "checking for $compiler opt
+@@ -16893,13 +17084,15 @@
lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
;;
@@ -3107,7 +3260,7 @@
lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
;;
-@@ -16909,7 +16966,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -16909,7 +17102,7 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -3116,7 +3269,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -16967,7 +17024,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -16967,7 +17160,7 @@
esac
;;
@@ -3125,7 +3278,7 @@
# 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 +17076,22 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17019,6 +17212,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -3148,7 +3301,7 @@
esac
;;
-@@ -17028,6 +17101,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17028,6 +17237,10 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -3159,7 +3312,7 @@
solaris*)
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -17095,7 +17172,7 @@ if test "${lt_prog_compiler_pic_works_GC
+@@ -17095,7 +17308,7 @@
else
lt_prog_compiler_pic_works_GCJ=no
ac_outfile=conftest.$ac_objext
@@ -3168,21 +3321,21 @@
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 +17183,11 @@ else
+@@ -17106,11 +17319,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:17109: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17186: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17322: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17113: \$? = $ac_status" >&5
-+ echo "$as_me:17190: \$? = $ac_status" >&5
++ echo "$as_me:17326: \$? = $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.
-@@ -17159,7 +17236,7 @@ else
+@@ -17159,7 +17372,7 @@
lt_prog_compiler_static_works_GCJ=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -3191,7 +3344,7 @@
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 +17276,7 @@ else
+@@ -17199,7 +17412,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -3200,21 +3353,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -17210,11 +17287,11 @@ else
+@@ -17210,11 +17423,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:17213: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17290: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17426: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17217: \$? = $ac_status" >&5
-+ echo "$as_me:17294: \$? = $ac_status" >&5
++ echo "$as_me:17430: \$? = $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
-@@ -17406,7 +17483,7 @@ EOF
+@@ -17406,7 +17619,7 @@
allow_undefined_flag_GCJ=unsupported
always_export_symbols_GCJ=no
enable_shared_with_static_runtimes_GCJ=yes
@@ -3223,7 +3376,7 @@
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 +17501,7 @@ EOF
+@@ -17424,7 +17637,7 @@
fi
;;
@@ -3232,7 +3385,7 @@
hardcode_direct_GCJ=no
hardcode_shlibpath_var_GCJ=no
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-@@ -17439,7 +17516,7 @@ EOF
+@@ -17439,7 +17652,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'
;;
@@ -3241,7 +3394,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -17457,13 +17534,22 @@ EOF
+@@ -17457,13 +17670,22 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -3266,7 +3419,7 @@
fi
link_all_deplibs_GCJ=no
else
-@@ -17623,7 +17709,7 @@ _LT_EOF
+@@ -17623,7 +17845,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -3275,7 +3428,7 @@
else
# We have old collect2
hardcode_direct_GCJ=unsupported
-@@ -17697,11 +17783,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -17697,11 +17919,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -3298,7 +3451,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -17756,11 +17849,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -17756,11 +17985,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -3321,7 +3474,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -17814,7 +17914,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -17814,7 +18050,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.
@@ -3330,7 +3483,7 @@
fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_GCJ=yes
;;
-@@ -17856,10 +17956,10 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -17856,10 +18092,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -3343,7 +3496,7 @@
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 +18121,28 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18021,24 +18257,28 @@
;;
openbsd*)
@@ -3389,7 +3542,7 @@
fi
;;
-@@ -18097,17 +18201,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18097,17 +18337,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -3416,7 +3569,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -18164,7 +18267,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18164,7 +18403,7 @@
fi
;;
@@ -3425,7 +3578,7 @@
no_undefined_flag_GCJ='${wl}-z,text'
archive_cmds_need_lc_GCJ=no
hardcode_shlibpath_var_GCJ=no
-@@ -18241,7 +18344,7 @@ x|xyes)
+@@ -18241,7 +18480,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*
@@ -3434,7 +3587,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -18299,20 +18402,7 @@ shlibpath_overrides_runpath=unknown
+@@ -18299,20 +18538,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -3456,7 +3609,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -18469,12 +18559,7 @@ darwin* | rhapsody*)
+@@ -18469,12 +18695,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -3470,7 +3623,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -18528,7 +18613,7 @@ freebsd* | dragonfly*)
+@@ -18528,7 +18749,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -3479,7 +3632,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -18591,7 +18676,7 @@ hpux9* | hpux10* | hpux11*)
+@@ -18591,7 +18812,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -3488,7 +3641,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -18662,7 +18747,7 @@ linux* | k*bsd*-gnu)
+@@ -18662,7 +18883,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -3497,7 +3650,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -18768,6 +18853,10 @@ osf3* | osf4* | osf5*)
+@@ -18768,6 +18989,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -3508,7 +3661,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -18962,6 +19051,7 @@ if test -f "$ltmain"; then
+@@ -18962,6 +19187,7 @@
module_cmds_GCJ \
module_expsym_cmds_GCJ \
lt_cv_prog_compiler_c_o_GCJ \
@@ -3516,7 +3669,7 @@
exclude_expsyms_GCJ \
include_expsyms_GCJ; do
-@@ -19282,7 +19372,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
+@@ -19282,7 +19508,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -3525,7 +3678,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_GCJ
-@@ -19339,7 +19429,7 @@ objext=o
+@@ -19339,7 +19565,7 @@
objext_RC=$objext
# Code to be used in simple compile tests
@@ -3534,7 +3687,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -19358,13 +19448,13 @@ compiler=$CC
+@@ -19358,13 +19584,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -3550,7 +3703,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -19442,6 +19532,7 @@ if test -f "$ltmain"; then
+@@ -19442,6 +19668,7 @@
module_cmds_RC \
module_expsym_cmds_RC \
lt_cv_prog_compiler_c_o_RC \
@@ -3558,7 +3711,7 @@
exclude_expsyms_RC \
include_expsyms_RC; do
-@@ -19762,7 +19853,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
+@@ -19762,7 +19989,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -3567,7 +3720,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_RC
-@@ -21068,10 +21159,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -21068,10 +21295,11 @@
return 2;
}
/* Configure is being run as root? */
@@ -3581,7 +3734,7 @@
return 0;
}
-@@ -21241,7 +21333,7 @@ Alternatively, you may set the environme
+@@ -21241,7 +21469,7 @@
and SEAHORSE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3590,7 +3743,7 @@
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 +21343,7 @@ Alternatively, you may set the environme
+@@ -21251,7 +21479,7 @@
and SEAHORSE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3599,7 +3752,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -22691,7 +22783,7 @@ Alternatively, you may set the environme
+@@ -22691,7 +22919,7 @@
and LIBCRYPTUI_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3608,7 +3761,7 @@
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 +22793,7 @@ Alternatively, you may set the environme
+@@ -22701,7 +22929,7 @@
and LIBCRYPTUI_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3617,7 +3770,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -38548,6 +38640,9 @@ EPIPHANY_EXTENSION_RULE='%.ephy-extensio
+@@ -38548,6 +38776,9 @@
@@ -3627,7 +3780,7 @@
-@@ -47751,133 +47846,13 @@ if test "x$enable_ssh" = "xno"; then
+@@ -47751,133 +47982,13 @@
echo "disabling ssh support"
else
@@ -3768,7 +3921,7 @@
enable_ssh="yes"
cat >>confdefs.h <<\_ACEOF
-@@ -47886,20 +47861,20 @@ _ACEOF
+@@ -47886,20 +47997,20 @@
cat >>confdefs.h <<_ACEOF
@@ -3793,7 +3946,7 @@
fi
-@@ -49297,8 +49272,8 @@ msgstr ""
+@@ -49297,8 +49408,8 @@
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -3804,7 +3957,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
-@@ -50422,9 +50397,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
+@@ -50422,9 +50533,7 @@
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
@@ -3815,11 +3968,14 @@
_ACEOF
-@@ -50610,14 +50583,11 @@ INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE
+@@ -50610,14 +50719,14 @@
INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
+INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim
++XGETTEXT!$XGETTEXT$ac_delim
++MSGMERGE!$MSGMERGE$ac_delim
++MSGFMT!$MSGFMT$ac_delim
INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
@@ -3831,27 +3987,7 @@
ALL_LINGUAS!$ALL_LINGUAS$ac_delim
CC!$CC$ac_delim
CFLAGS!$CFLAGS$ac_delim
-@@ -50627,6 +50597,9 @@ ac_ct_CC!$ac_ct_CC$ac_delim
- EXEEXT!$EXEEXT$ac_delim
- OBJEXT!$OBJEXT$ac_delim
- DEPDIR!$DEPDIR$ac_delim
-+am__include!$am__include$ac_delim
-+am__quote!$am__quote$ac_delim
-+AMDEP_TRUE!$AMDEP_TRUE$ac_delim
- _ACEOF
-
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -50668,9 +50641,6 @@ _ACEOF
- 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
- AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
- CCDEPMODE!$CCDEPMODE$ac_delim
-@@ -50685,6 +50655,7 @@ host!$host$ac_delim
+@@ -50685,6 +50794,7 @@
host_cpu!$host_cpu$ac_delim
host_vendor!$host_vendor$ac_delim
host_os!$host_os$ac_delim
@@ -3859,25 +3995,23 @@
GREP!$GREP$ac_delim
EGREP!$EGREP$ac_delim
LN_S!$LN_S$ac_delim
-@@ -50765,6 +50736,8 @@ HAVE_MOZILLA_TOOLKIT_TRUE!$HAVE_MOZILLA_
+@@ -50764,7 +50874,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
-+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_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
-@@ -50806,8 +50779,6 @@ _ACEOF
+@@ -50806,6 +50915,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_1_7_FALSE!$HAVE_GECKO_1_7_FALSE$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
- HAVE_GECKO_1_8_1_TRUE!$HAVE_GECKO_1_8_1_TRUE$ac_delim
-@@ -50841,9 +50812,6 @@ WITH_APPLET_TRUE!$WITH_APPLET_TRUE$ac_de
+@@ -50841,9 +50951,6 @@
WITH_APPLET_FALSE!$WITH_APPLET_FALSE$ac_delim
LIBNOTIFY_CFLAGS!$LIBNOTIFY_CFLAGS$ac_delim
LIBNOTIFY_LIBS!$LIBNOTIFY_LIBS$ac_delim
@@ -3887,16 +4021,27 @@
WITH_SSH_TRUE!$WITH_SSH_TRUE$ac_delim
WITH_SSH_FALSE!$WITH_SSH_FALSE$ac_delim
LIBEBOOK_CFLAGS!$LIBEBOOK_CFLAGS$ac_delim
-@@ -50877,7 +50845,7 @@ LIBOBJS!$LIBOBJS$ac_delim
+@@ -50859,10 +50966,8 @@
+ UPDATE_MIME_DATABASE_FALSE!$UPDATE_MIME_DATABASE_FALSE$ac_delim
+ GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
+ USE_NLS!$USE_NLS$ac_delim
+-MSGFMT!$MSGFMT$ac_delim
+ MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
+ GMSGFMT!$GMSGFMT$ac_delim
+-XGETTEXT!$XGETTEXT$ac_delim
+ CATALOGS!$CATALOGS$ac_delim
+ CATOBJEXT!$CATOBJEXT$ac_delim
+ GMOFILES!$GMOFILES$ac_delim
+@@ -50877,7 +50982,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- 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` = 64; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 65; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -51448,10 +51416,6 @@ done
+@@ -51448,10 +51553,6 @@
for file in intltool-extract intltool-merge intltool-update; do
sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
-e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
@@ -3907,11 +4052,10 @@
-e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
< ${ac_aux_dir}/${file}.in > ${file}.out
if cmp -s ${file} ${file}.out 2>/dev/null; then
-Index: seahorse-2.20.1/daemon/Makefile.in
-===================================================================
---- seahorse-2.20.1.orig/daemon/Makefile.in 2007-11-15 18:59:43.945834163 +0100
-+++ seahorse-2.20.1/daemon/Makefile.in 2007-11-15 19:06:00.267279500 +0100
-@@ -170,14 +170,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/daemon/Makefile.in seahorse-2.20.3/daemon/Makefile.in
+--- seahorse-2.20.3.old/daemon/Makefile.in 2008-01-07 17:47:07.000000000 +0100
++++ seahorse-2.20.3/daemon/Makefile.in 2008-01-07 22:02:08.000000000 +0100
+@@ -170,14 +170,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -3927,7 +4071,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -189,7 +187,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
+@@ -189,7 +187,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -3935,7 +4079,15 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -239,15 +236,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -219,6 +216,7 @@
+ MOZILLA_PREFIX = @MOZILLA_PREFIX@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+@@ -239,15 +237,13 @@
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -3952,11 +4104,10 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-Index: seahorse-2.20.1/data/Makefile.in
-===================================================================
---- seahorse-2.20.1.orig/data/Makefile.in 2007-11-15 18:59:43.897831428 +0100
-+++ seahorse-2.20.1/data/Makefile.in 2007-11-15 19:06:00.359284743 +0100
-@@ -132,14 +132,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/data/Makefile.in seahorse-2.20.3/data/Makefile.in
+--- seahorse-2.20.3.old/data/Makefile.in 2008-01-07 17:47:07.000000000 +0100
++++ seahorse-2.20.3/data/Makefile.in 2008-01-07 22:02:08.000000000 +0100
+@@ -132,14 +132,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -3972,7 +4123,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -151,7 +149,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
+@@ -151,7 +149,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -3980,7 +4131,15 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -201,15 +198,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -181,6 +178,7 @@
+ MOZILLA_PREFIX = @MOZILLA_PREFIX@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+@@ -201,15 +199,13 @@
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -3997,11 +4156,10 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-Index: seahorse-2.20.1/gnome-doc-utils.make
-===================================================================
---- seahorse-2.20.1.orig/gnome-doc-utils.make 2007-11-15 18:59:43.881830516 +0100
-+++ seahorse-2.20.1/gnome-doc-utils.make 2007-11-15 19:04:02.044542370 +0100
-@@ -416,6 +416,11 @@ dist-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/gnome-doc-utils.make seahorse-2.20.3/gnome-doc-utils.make
+--- seahorse-2.20.3.old/gnome-doc-utils.make 2008-01-07 17:46:53.000000000 +0100
++++ seahorse-2.20.3/gnome-doc-utils.make 2008-01-07 22:01:28.000000000 +0100
+@@ -416,6 +416,11 @@
@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
for doc in $$list; do \
if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
@@ -4013,7 +4171,7 @@
echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
$(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
done
-@@ -486,6 +491,12 @@ install-doc-docs:
+@@ -486,6 +491,12 @@
done
@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
@@ -4026,7 +4184,7 @@
echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
done
-@@ -554,7 +565,7 @@ uninstall-doc-figs:
+@@ -554,7 +565,7 @@
uninstall-doc-omf:
@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
@@ -4035,11 +4193,10 @@
echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
fi; \
-Index: seahorse-2.20.1/help/Makefile.in
-===================================================================
---- seahorse-2.20.1.orig/help/Makefile.in 2007-11-15 18:59:43.813826641 +0100
-+++ seahorse-2.20.1/help/Makefile.in 2007-11-15 19:06:00.527294318 +0100
-@@ -147,14 +147,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/help/Makefile.in seahorse-2.20.3/help/Makefile.in
+--- seahorse-2.20.3.old/help/Makefile.in 2008-01-07 17:47:07.000000000 +0100
++++ seahorse-2.20.3/help/Makefile.in 2008-01-07 22:02:08.000000000 +0100
+@@ -147,14 +147,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -4055,7 +4212,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -166,7 +164,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
+@@ -166,7 +164,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -4063,7 +4220,15 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -216,15 +213,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -196,6 +193,7 @@
+ MOZILLA_PREFIX = @MOZILLA_PREFIX@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+@@ -216,15 +214,13 @@
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -4080,7 +4245,7 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-@@ -785,6 +780,11 @@ dist-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_
+@@ -785,6 +781,11 @@
@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
for doc in $$list; do \
if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
@@ -4092,7 +4257,7 @@
echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
$(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
done
-@@ -853,6 +853,12 @@ install-doc-docs:
+@@ -853,6 +854,12 @@
done
@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
@@ -4105,7 +4270,7 @@
echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
done
-@@ -920,7 +926,7 @@ uninstall-doc-figs:
+@@ -920,7 +927,7 @@
uninstall-doc-omf:
@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
@@ -4114,20 +4279,37 @@
echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
fi; \
-Index: seahorse-2.20.1/intltool-extract.in
-===================================================================
---- seahorse-2.20.1.orig/intltool-extract.in 2007-11-15 18:59:43.797825729 +0100
-+++ seahorse-2.20.1/intltool-extract.in 2007-11-15 19:04:02.044542370 +0100
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/intltool-extract.in seahorse-2.20.3/intltool-extract.in
+--- seahorse-2.20.3.old/intltool-extract.in 2008-01-07 17:46:53.000000000 +0100
++++ seahorse-2.20.3/intltool-extract.in 2008-01-07 22:01:28.000000000 +0100
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
my $PACKAGE = "intltool";
-my $VERSION = "0.35.5";
-+my $VERSION = "0.36.2";
++my $VERSION = "0.37.0";
## Loaded modules
use strict;
-@@ -237,9 +237,9 @@ sub entity_decode
+@@ -161,7 +161,8 @@
+ --type=TYPE Specify the file type of FILENAME. Currently supports:
+ "gettext/glade", "gettext/ini", "gettext/keys"
+ "gettext/rfc822deb", "gettext/schemas",
+- "gettext/scheme", "gettext/xml", "gettext/quoted"
++ "gettext/scheme", "gettext/xml", "gettext/quoted",
++ "gettext/quotedxml"
+ -l, --local Writes output into current working directory
+ (conflicts with --update)
+ --update Writes output into the same directory the source file
+@@ -218,6 +219,7 @@
+ &type_schemas if $gettext_type eq "schemas";
+ &type_rfc822deb if $gettext_type eq "rfc822deb";
+ &type_quoted if $gettext_type eq "quoted";
++ &type_quotedxml if $gettext_type eq "quotedxml";
+ }
+
+ sub entity_decode_minimal
+@@ -237,9 +239,9 @@
s/'/'/g; # '
s/"/"/g; # "
@@ -4138,20 +4320,54 @@
return $_;
}
-Index: seahorse-2.20.1/intltool-merge.in
-===================================================================
---- seahorse-2.20.1.orig/intltool-merge.in 2007-11-15 18:59:43.781824817 +0100
-+++ seahorse-2.20.1/intltool-merge.in 2007-11-15 19:04:02.048542598 +0100
+@@ -731,6 +733,18 @@
+ }
+ }
+
++sub type_quotedxml {
++ while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) {
++ my $message = $1;
++ my $before = $`;
++ $message =~ s/\\\"/\"/g;
++ $message = entity_decode($message);
++ $before =~ s/[^\n]//g;
++ $messages{$message} = [];
++ $loc{$message} = length ($before) + 2;
++ }
++}
++
+ sub type_glade {
+ ### For translatable Glade XML files ###
+
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/intltool-merge.in seahorse-2.20.3/intltool-merge.in
+--- seahorse-2.20.3.old/intltool-merge.in 2008-01-07 17:46:53.000000000 +0100
++++ seahorse-2.20.3/intltool-merge.in 2008-01-07 22:01:28.000000000 +0100
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
my $PACKAGE = "intltool";
-my $VERSION = "0.35.5";
-+my $VERSION = "0.36.2";
++my $VERSION = "0.37.0";
## Loaded modules
use strict;
-@@ -93,9 +93,24 @@ my $OUTFILE;
+@@ -61,6 +61,7 @@
+ my $SCHEMAS_STYLE_ARG = 0;
+ my $RFC822DEB_STYLE_ARG = 0;
+ my $QUOTED_STYLE_ARG = 0;
++my $QUOTEDXML_STYLE_ARG = 0;
+ my $QUIET_ARG = 0;
+ my $PASS_THROUGH_ARG = 0;
+ my $UTF8_ARG = 0;
+@@ -81,6 +82,7 @@
+ "schemas-style|s" => \$SCHEMAS_STYLE_ARG,
+ "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG,
+ "quoted-style" => \$QUOTED_STYLE_ARG,
++ "quotedxml-style" => \$QUOTEDXML_STYLE_ARG,
+ "pass-through|p" => \$PASS_THROUGH_ARG,
+ "utf8|u" => \$UTF8_ARG,
+ "multiple-output|m" => \$MULTIPLE_OUTPUT,
+@@ -93,9 +95,24 @@
my %po_files_by_lang = ();
my %translations = ();
@@ -4177,7 +4393,39 @@
# Use this instead of \w for XML files to handle more possible characters.
my $w = "[-A-Za-z0-9._:]";
-@@ -260,8 +275,42 @@ sub po_file2lang
+@@ -133,7 +150,7 @@
+ &utf8_sanity_check;
+ &preparation;
+ &print_message;
+- &keys_merge_translations;
++ &keys_merge_translations;
+ &finalize;
+ }
+ elsif ($DESKTOP_STYLE_ARG && @ARGV > 2)
+@@ -159,12 +176,12 @@
+ &rfc822deb_merge_translations;
+ &finalize;
+ }
+-elsif ($QUOTED_STYLE_ARG && @ARGV > 2)
++elsif (($QUOTED_STYLE_ARG || $QUOTEDXML_STYLE_ARG) && @ARGV > 2)
+ {
+ &utf8_sanity_check;
+ &preparation;
+ &print_message;
+- "ed_merge_translations;
++ "ed_merge_translations($QUOTEDXML_STYLE_ARG);
+ &finalize;
+ }
+ else
+@@ -204,6 +221,7 @@
+ -s, --schemas-style includes translations in the schemas style
+ -r, --rfc822deb-style includes translations in the RFC822 style
+ --quoted-style includes translations in the quoted string style
++ --quotedxml-style includes translations in the quoted xml string style
+ -x, --xml-style includes translations in the standard xml style
+
+ Other options:
+@@ -260,8 +278,41 @@
sub gather_po_files
{
@@ -4200,10 +4448,9 @@
+ {
+ next if /^#/;
+
-+ if (/([-a-zA-Z_ at .]+)\n/)
++ for my $lang (split)
+ {
-+ my $lang = $1;
-+
++ chomp ($lang);
+ my $po_file = $PO_DIR . "/" . $lang . ".po";
+ if (-e $po_file) {
+ $po_files_by_lang{$lang} = $po_file;
@@ -4222,7 +4469,7 @@
}
}
-@@ -494,16 +543,15 @@ sub unescape_po_string
+@@ -494,16 +545,15 @@
return $string;
}
@@ -4241,20 +4488,183 @@
return $_;
}
-Index: seahorse-2.20.1/intltool-update.in
-===================================================================
---- seahorse-2.20.1.orig/intltool-update.in 2007-11-15 18:59:43.741822537 +0100
-+++ seahorse-2.20.1/intltool-update.in 2007-11-15 19:04:02.048542598 +0100
+@@ -528,6 +578,7 @@
+ return "&" if $_ == 38;
+ return "'" if $_ == 39;
+ return "<" if $_ == 60;
++ return ">" if $_ == 62;
+ return chr $_;
+ }
+
+@@ -1028,43 +1079,74 @@
+ close OUTPUT;
+ print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
+ }
+- }
+- open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
+- binmode (OUTPUT) if $^O eq 'MSWin32';
+- my $tree = readXml($FILE);
+- print_header($FILE, \*OUTPUT);
+- parseTree(\*OUTPUT, $tree);
+- close OUTPUT;
+- print "CREATED $OUTFILE\n" unless $QUIET_ARG;
++ if ( ! -d "C" ) {
++ mkdir "C" or -d "C" or die "Cannot create subdirectory C: $!\n";
++ }
++ open OUTPUT, ">C/$OUTFILE" or die "Cannot open C/$OUTFILE: $!\n";
++ binmode (OUTPUT) if $^O eq 'MSWin32';
++ my $tree = readXml($FILE);
++ print_header($FILE, \*OUTPUT);
++ parseTree(\*OUTPUT, $tree);
++ close OUTPUT;
++ print "CREATED C/$OUTFILE\n" unless $QUIET_ARG;
++ } else {
++ open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
++ binmode (OUTPUT) if $^O eq 'MSWin32';
++ my $tree = readXml($FILE);
++ print_header($FILE, \*OUTPUT);
++ parseTree(\*OUTPUT, $tree);
++ close OUTPUT;
++ print "CREATED $OUTFILE\n" unless $QUIET_ARG;
++ }
+ }
+
+-sub keys_merge_translations
++sub keys_merge_translation
+ {
+- open INPUT, "<${FILE}" or die;
+- open OUTPUT, ">${OUTFILE}" or die;
++ my ($lang) = @_;
++
++ if ( ! -d $lang && $MULTIPLE_OUTPUT)
++ {
++ mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
++ }
++
++ open INPUT, "<${FILE}" or die "Cannot open ${FILE}: $!\n";
++ open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
+ binmode (OUTPUT) if $^O eq 'MSWin32';
+
+- while (<INPUT>)
++ while (<INPUT>)
+ {
+- if (s/^(\s*)_(\w+=(.*))/$1$2/)
++ if (s/^(\s*)_(\w+=(.*))/$1$2/)
+ {
+- my $string = $3;
++ my $string = $3;
+
+- print OUTPUT;
++ if (!$MULTIPLE_OUTPUT)
++ {
++ print OUTPUT;
+
+- my $non_translated_line = $_;
++ my $non_translated_line = $_;
+
+- for my $lang (sort keys %po_files_by_lang)
++ for my $lang (sort keys %po_files_by_lang)
++ {
++ my $translation = $translations{$lang, $string};
++ next if !$translation;
++
++ $_ = $non_translated_line;
++ s/(\w+)=.*/[$lang]$1=$translation/;
++ print OUTPUT;
++ }
++ }
++ else
+ {
+- my $translation = $translations{$lang, $string};
+- next if !$translation;
++ my $non_translated_line = $_;
++ my $translation = $translations{$lang, $string};
++ $translation = $string if !$translation;
+
+ $_ = $non_translated_line;
+- s/(\w+)=.*/[$lang]$1=$translation/;
++ s/(\w+)=.*/$1=$translation/;
+ print OUTPUT;
+ }
+- }
+- else
++ }
++ else
+ {
+ print OUTPUT;
+ }
+@@ -1072,6 +1154,24 @@
+
+ close OUTPUT;
+ close INPUT;
++
++ print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
++}
++
++sub keys_merge_translations
++{
++ if ($MULTIPLE_OUTPUT)
++ {
++ for my $lang (sort keys %po_files_by_lang)
++ {
++ keys_merge_translation ($lang);
++ }
++ keys_merge_translation ("C");
++ }
++ else
++ {
++ keys_merge_translation (".");
++ }
+ }
+
+ sub desktop_merge_translations
+@@ -1367,19 +1467,22 @@
+
+ sub quoted_translation
+ {
+- my ($lang, $string) = @_;
++ my ($xml_mode, $lang, $string) = @_;
+
++ $string = entity_decode($string) if $xml_mode;
+ $string =~ s/\\\"/\"/g;
+
+ my $translation = $translations{$lang, $string};
+ $translation = $string if !$translation;
+-
++ $translation = entity_encode($translation) if $xml_mode;
+ $translation =~ s/\"/\\\"/g;
+ return $translation
+ }
+
+ sub quoted_merge_translations
+ {
++ my ($xml_mode) = @_;
++
+ if (!$MULTIPLE_OUTPUT) {
+ print "Quoted only supports Multiple Output.\n";
+ exit(1);
+@@ -1394,7 +1497,7 @@
+ binmode (OUTPUT) if $^O eq 'MSWin32';
+ while (<INPUT>)
+ {
+- s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($lang, $1) . "\""/ge;
++ s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($xml_mode, $lang, $1) . "\""/ge;
+ print OUTPUT;
+ }
+ close OUTPUT;
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/intltool-update.in seahorse-2.20.3/intltool-update.in
+--- seahorse-2.20.3.old/intltool-update.in 2008-01-07 17:46:53.000000000 +0100
++++ seahorse-2.20.3/intltool-update.in 2008-01-07 22:01:28.000000000 +0100
@@ -30,7 +30,7 @@
## Release information
my $PROGRAM = "intltool-update";
-my $VERSION = "0.35.5";
-+my $VERSION = "0.36.2";
++my $VERSION = "0.37.0";
my $PACKAGE = "intltool";
## Loaded modules
-@@ -71,7 +71,8 @@ my $xml_support =
+@@ -71,7 +71,8 @@
"sheet(?:\\.in)+|". # ?
"schemas(?:\\.in)+|". # GConf specific
"pong(?:\\.in)+|". # DEPRECATED: PONG is not used [by GNOME] any longer.
@@ -4264,7 +4674,7 @@
my $ini_support =
"icon(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec
-@@ -328,7 +329,12 @@ sub FindLeftoutFiles
+@@ -328,7 +329,12 @@
push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/;
push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
}, "..";
@@ -4274,11 +4684,22 @@
+ push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/;
+ push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/;
+ push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
-+ }, "$SRCDIR/..";
++ }, "$SRCDIR/.." if "$SRCDIR" ne ".";
open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n";
@buf_potfiles = grep !/^(#|\s*$)/, <POTFILES>;
-@@ -489,11 +495,15 @@ sub FindLeftoutFiles
+@@ -428,8 +434,8 @@
+ last;
+ }
+
+- ## N_ Q_ and _ are the three macros defined in gi8n.h
+- if (/[NQ]?_ *\(QUOTEDTEXT/)
++ ## C_ N_ Q_ and _ are the macros defined in gi8n.h
++ if (/[CNQ]?_ *\(QUOTEDTEXT/)
+ {
+ if (defined isNotValidMissing (unpack("x3 A*", $file))) {
+ ## Remove the first 3 chars and add newline
+@@ -489,11 +495,15 @@
my %in2;
foreach (@buf_potfiles_sorted)
{
@@ -4294,7 +4715,7 @@
$in2{$_} = 1;
}
-@@ -501,9 +511,16 @@ sub FindLeftoutFiles
+@@ -501,9 +511,16 @@
foreach (@buf_allfiles_sorted)
{
@@ -4313,7 +4734,7 @@
}
}
-@@ -563,11 +580,23 @@ sub Console_WriteError_InvalidOption
+@@ -563,11 +580,23 @@
exit 1;
}
@@ -4339,7 +4760,7 @@
return 0;
}
-@@ -577,7 +606,7 @@ sub GenerateHeaders
+@@ -577,7 +606,7 @@
## Generate the .h header files, so we can allow glade and
## xml translation support
@@ -4348,7 +4769,7 @@
{
print STDERR "\n *** The intltool-extract script wasn't found!"
."\n *** Without it, intltool-update can not generate files.\n";
-@@ -624,13 +653,13 @@ sub GenerateHeaders
+@@ -624,13 +653,13 @@
#
sub GeneratePOTemplate
{
@@ -4365,7 +4786,7 @@
" *** Without it, intltool-update can not extract strings.\n";
exit;
}
-@@ -726,7 +755,23 @@ sub GeneratePOTemplate
+@@ -726,13 +755,29 @@
unlink "$MODULE.pot";
my @xgettext_argument=("$XGETTEXT",
"--add-comments",
@@ -4390,7 +4811,14 @@
"--output\=$MODULE\.pot",
"--files-from\=\.\/POTFILES\.in\.temp");
my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
-@@ -793,9 +838,16 @@ sub POFile_Update
+ push @xgettext_argument, $XGETTEXT_KEYWORDS;
+ my $MSGID_BUGS_ADDRESS = &FindMakevarsBugAddress;
+- push @xgettext_argument, "--msgid-bugs-address\=$MSGID_BUGS_ADDRESS" if $MSGID_BUGS_ADDRESS;
++ push @xgettext_argument, "--msgid-bugs-address\=\"$MSGID_BUGS_ADDRESS\"" if $MSGID_BUGS_ADDRESS;
+ push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii);
+ push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS;
+ my $xgettext_command = join ' ', @xgettext_argument;
+@@ -793,9 +838,16 @@
{
-f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n";
@@ -4408,7 +4836,7 @@
print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE;
my $infile = "$SRCDIR/$lang.po";
-@@ -836,7 +888,14 @@ sub POFile_GetLanguage ($)
+@@ -836,7 +888,14 @@
sub Console_Write_TranslationStatus
{
my ($lang, $output_file) = @_;
@@ -4424,7 +4852,7 @@
$output_file = "$SRCDIR/$lang.po" if ($output_file eq "");
-@@ -845,21 +904,28 @@ sub Console_Write_TranslationStatus
+@@ -845,21 +904,28 @@
sub Console_Write_CoverageReport
{
@@ -4457,7 +4885,7 @@
system ("$MSGFMT", "-o", "$devnull", "--verbose", "$SRCDIR/$lang.po");
}
}
-@@ -933,13 +999,13 @@ sub CONF_Handle_Open
+@@ -933,13 +999,13 @@
$conf_in || die "Cannot find top_builddir in Makevars.";
}
@@ -4475,11 +4903,10 @@
}
else
{
-Index: seahorse-2.20.1/libcryptui/Makefile.in
-===================================================================
---- seahorse-2.20.1.orig/libcryptui/Makefile.in 2007-11-15 18:59:43.721821397 +0100
-+++ seahorse-2.20.1/libcryptui/Makefile.in 2007-11-15 19:06:00.667302296 +0100
-@@ -174,14 +174,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/libcryptui/Makefile.in seahorse-2.20.3/libcryptui/Makefile.in
+--- seahorse-2.20.3.old/libcryptui/Makefile.in 2008-01-07 17:47:07.000000000 +0100
++++ seahorse-2.20.3/libcryptui/Makefile.in 2008-01-07 22:02:09.000000000 +0100
+@@ -174,14 +174,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -4495,7 +4922,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -193,7 +191,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
+@@ -193,7 +191,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -4503,7 +4930,15 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -243,15 +240,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -223,6 +220,7 @@
+ MOZILLA_PREFIX = @MOZILLA_PREFIX@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+@@ -243,15 +241,13 @@
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -4520,11 +4955,10 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-Index: seahorse-2.20.1/libcryptui/tests/Makefile.in
-===================================================================
---- seahorse-2.20.1.orig/libcryptui/tests/Makefile.in 2007-11-15 18:59:43.709820714 +0100
-+++ seahorse-2.20.1/libcryptui/tests/Makefile.in 2007-11-15 19:06:00.779308679 +0100
-@@ -151,14 +151,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/libcryptui/tests/Makefile.in seahorse-2.20.3/libcryptui/tests/Makefile.in
+--- seahorse-2.20.3.old/libcryptui/tests/Makefile.in 2008-01-07 17:47:08.000000000 +0100
++++ seahorse-2.20.3/libcryptui/tests/Makefile.in 2008-01-07 22:02:09.000000000 +0100
+@@ -151,14 +151,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -4540,7 +4974,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -170,7 +168,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
+@@ -170,7 +168,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -4548,7 +4982,15 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -220,15 +217,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -200,6 +197,7 @@
+ MOZILLA_PREFIX = @MOZILLA_PREFIX@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+@@ -220,15 +218,13 @@
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -4565,11 +5007,10 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-Index: seahorse-2.20.1/libseahorse/Makefile.in
-===================================================================
---- seahorse-2.20.1.orig/libseahorse/Makefile.in 2007-11-15 18:59:43.657817750 +0100
-+++ seahorse-2.20.1/libseahorse/Makefile.in 2007-11-15 19:06:00.939317797 +0100
-@@ -238,14 +238,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/libseahorse/Makefile.in seahorse-2.20.3/libseahorse/Makefile.in
+--- seahorse-2.20.3.old/libseahorse/Makefile.in 2008-01-07 17:47:08.000000000 +0100
++++ seahorse-2.20.3/libseahorse/Makefile.in 2008-01-07 22:02:10.000000000 +0100
+@@ -238,14 +238,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -4585,7 +5026,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -257,7 +255,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
+@@ -257,7 +255,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -4593,7 +5034,15 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -307,15 +304,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -287,6 +284,7 @@
+ MOZILLA_PREFIX = @MOZILLA_PREFIX@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+@@ -307,15 +305,13 @@
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -4610,10 +5059,9 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-Index: seahorse-2.20.1/ltmain.sh
-===================================================================
---- seahorse-2.20.1.orig/ltmain.sh 2007-11-15 18:59:43.641816838 +0100
-+++ seahorse-2.20.1/ltmain.sh 2007-11-15 19:04:02.052542826 +0100
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/ltmain.sh seahorse-2.20.3/ltmain.sh
+--- seahorse-2.20.3.old/ltmain.sh 2006-06-19 20:36:49.000000000 +0200
++++ seahorse-2.20.3/ltmain.sh 2007-11-27 22:23:09.000000000 +0100
@@ -1,8 +1,8 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
@@ -4625,13 +5073,13 @@
# 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 @@ EXIT_FAILURE=1
+@@ -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"
++VERSION="1.5.24 Debian 1.5.24-2"
+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
@@ -4653,7 +5101,7 @@
# Check that we have a working $echo.
if test "X$1" = X--no-reexec; then
-@@ -105,12 +113,14 @@ esac
+@@ -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.
@@ -4674,7 +5122,7 @@
# Make sure IFS has a sensible default
lt_nl='
-@@ -136,6 +146,8 @@ duplicate_deps=no
+@@ -136,6 +146,8 @@
preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
@@ -4683,7 +5131,7 @@
#####################################
# Shell function definitions:
-@@ -196,7 +208,13 @@ func_win32_libid ()
+@@ -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 | \
@@ -4698,7 +5146,7 @@
case $win32_nmres in
import*) win32_libid_type="x86 archive import";;
*) win32_libid_type="x86 archive static";;
-@@ -327,7 +345,17 @@ func_extract_archives ()
+@@ -327,7 +345,17 @@
*) my_xabs=`pwd`"/$my_xlib" ;;
esac
my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
@@ -4717,7 +5165,7 @@
$show "${rm}r $my_xdir"
$run ${rm}r "$my_xdir"
-@@ -454,11 +482,12 @@ do
+@@ -454,11 +482,12 @@
;;
--version)
@@ -4735,7 +5183,7 @@
exit $?
;;
-@@ -755,9 +784,10 @@ if test -z "$show_help"; then
+@@ -755,9 +784,10 @@
*.class) xform=class ;;
*.cpp) xform=cpp ;;
*.cxx) xform=cxx ;;
@@ -4747,7 +5195,7 @@
esac
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-@@ -1138,8 +1168,9 @@ EOF
+@@ -1138,8 +1168,9 @@
for arg
do
case $arg in
@@ -4759,7 +5207,7 @@
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 @@ EOF
+@@ -1147,12 +1178,20 @@
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=yes
@@ -4782,7 +5230,7 @@
build_libtool_libs=no
build_old_libs=yes
break
-@@ -1600,7 +1639,7 @@ EOF
+@@ -1600,7 +1639,7 @@
continue
;;
@@ -4791,7 +5239,7 @@
compiler_flags="$compiler_flags $arg"
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
-@@ -1620,10 +1659,11 @@ EOF
+@@ -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
@@ -4806,7 +5254,7 @@
# Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later.
-@@ -1651,9 +1691,9 @@ EOF
+@@ -1651,9 +1691,9 @@
-no-install)
case $host in
@@ -4818,7 +5266,7 @@
$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 @@ EOF
+@@ -1712,7 +1752,7 @@
continue
;;
@@ -4827,7 +5275,7 @@
# 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 @@ EOF
+@@ -2097,7 +2137,7 @@
lib=
found=no
case $deplib in
@@ -4836,7 +5284,7 @@
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
-@@ -2493,7 +2533,9 @@ EOF
+@@ -2493,7 +2533,9 @@
if test "$linkmode,$pass" = "prog,link"; then
if test -n "$library_names" &&
@@ -4847,7 +5295,7 @@
# 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 @@ EOF
+@@ -3189,7 +3231,7 @@
# which has an extra 1 added just for fun
#
case $version_type in
@@ -4856,7 +5304,7 @@
current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_revision"
-@@ -3200,9 +3242,10 @@ EOF
+@@ -3200,9 +3242,10 @@
age="0"
;;
irix|nonstopux)
@@ -4868,7 +5316,7 @@
;;
*)
$echo "$modename: unknown library version type \`$version_type'" 1>&2
-@@ -3266,7 +3309,8 @@ EOF
+@@ -3266,7 +3309,8 @@
versuffix="$major.$age.$revision"
# Darwin ld doesn't like 0 for these options...
minor_current=`expr $current + 1`
@@ -4878,7 +5326,7 @@
;;
freebsd-aout)
-@@ -3280,8 +3324,11 @@ EOF
+@@ -3280,8 +3324,11 @@
;;
irix | nonstopux)
@@ -4892,7 +5340,7 @@
case $version_type in
nonstopux) verstring_prefix=nonstopux ;;
*) verstring_prefix=sgi ;;
-@@ -3418,11 +3465,11 @@ EOF
+@@ -3418,11 +3465,11 @@
fi
# Eliminate all temporary directories.
@@ -4909,7 +5357,7 @@
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
-@@ -3523,13 +3570,12 @@ EOF
+@@ -3523,13 +3570,12 @@
int main() { return 0; }
EOF
$rm conftest
@@ -4925,7 +5373,7 @@
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
-@@ -3568,9 +3614,7 @@ EOF
+@@ -3568,9 +3614,7 @@
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
$rm conftest
@@ -4936,7 +5384,7 @@
ldd_output=`ldd conftest`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
-@@ -3602,7 +3646,7 @@ EOF
+@@ -3602,7 +3646,7 @@
droppeddeps=yes
$echo
$echo "*** Warning! Library $i is needed by this library but I was not able to"
@@ -4945,7 +5393,7 @@
$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 @@ EOF
+@@ -3888,7 +3932,10 @@
test -n "$hardcode_libdirs"; then
libdir="$hardcode_libdirs"
if test -n "$hardcode_libdir_flag_spec_ld"; then
@@ -4957,7 +5405,7 @@
else
eval dep_rpath=\"$hardcode_libdir_flag_spec\"
fi
-@@ -4247,12 +4294,14 @@ EOF
+@@ -4247,12 +4294,14 @@
reload_conv_objs=
gentop=
# reload_cmds runs $LD directly, so let us get rid of
@@ -4974,7 +5422,7 @@
else
gentop="$output_objdir/${obj}x"
generated="$generated $gentop"
-@@ -4700,16 +4749,16 @@ static const void *lt_preloaded_setup()
+@@ -4700,16 +4749,16 @@
case $host in
*cygwin* | *mingw* )
if test -f "$output_objdir/${outputname}.def" ; then
@@ -4997,7 +5445,7 @@
;;
esac
;;
-@@ -4724,13 +4773,13 @@ static const void *lt_preloaded_setup()
+@@ -4724,13 +4773,13 @@
# really was required.
# Nullify the symbol file.
@@ -5014,7 +5462,7 @@
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
-@@ -4817,7 +4866,7 @@ static const void *lt_preloaded_setup()
+@@ -4817,7 +4866,7 @@
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
@@ -5023,7 +5471,7 @@
else
# fast_install is set to needless
relink_command=
-@@ -4854,7 +4903,7 @@ static const void *lt_preloaded_setup()
+@@ -4854,7 +4903,7 @@
fi
done
relink_command="(cd `pwd`; $relink_command)"
@@ -5032,7 +5480,7 @@
fi
# Quote $echo for shipping.
-@@ -5261,6 +5310,20 @@ EOF
+@@ -5261,6 +5310,20 @@
Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
@@ -5053,7 +5501,7 @@
# 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 @@ else
+@@ -5403,7 +5466,7 @@
;;
esac
$echo >> $output "\
@@ -5062,7 +5510,7 @@
exit $EXIT_FAILURE
fi
else
-@@ -5589,7 +5652,7 @@ fi\
+@@ -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@)"
@@ -5071,7 +5519,7 @@
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
-@@ -5934,9 +5997,9 @@ relink_command=\"$relink_command\""
+@@ -5934,9 +5997,9 @@
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
@@ -5083,7 +5531,7 @@
fi
$echo "$modename: warning: relinking \`$file'" 1>&2
-@@ -6145,7 +6208,7 @@ relink_command=\"$relink_command\""
+@@ -6145,7 +6208,7 @@
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
outputname="$tmpdir/$file"
# Replace the output file specification.
@@ -5092,7 +5540,7 @@
$show "$relink_command"
if $run eval "$relink_command"; then :
-@@ -6356,8 +6419,10 @@ relink_command=\"$relink_command\""
+@@ -6356,8 +6419,10 @@
if test -f "$dir/$objdir/$dlname"; then
dir="$dir/$objdir"
else
@@ -5105,7 +5553,7 @@
fi
;;
-@@ -6421,12 +6486,12 @@ relink_command=\"$relink_command\""
+@@ -6421,12 +6486,12 @@
fi
# Restore saved environment variables
@@ -5124,7 +5572,7 @@
# Now prepare to actually exec the command.
exec_cmd="\$cmd$args"
-@@ -6783,9 +6848,9 @@ The following components of LINK-COMMAND
+@@ -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
@@ -5136,7 +5584,7 @@
-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 @@ The following components of LINK-COMMAND
+@@ -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
@@ -5150,10 +5598,9 @@
All other options (arguments beginning with \`-') are ignored.
-Index: seahorse-2.20.1/m4/intltool.m4
-===================================================================
---- seahorse-2.20.1.orig/m4/intltool.m4 2007-11-15 18:59:43.565812507 +0100
-+++ seahorse-2.20.1/m4/intltool.m4 2007-11-15 19:04:02.052542826 +0100
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/m4/intltool.m4 seahorse-2.20.3/m4/intltool.m4
+--- seahorse-2.20.3.old/m4/intltool.m4 2008-01-07 17:46:53.000000000 +0100
++++ seahorse-2.20.3/m4/intltool.m4 2008-01-07 22:01:28.000000000 +0100
@@ -23,7 +23,7 @@
## the same distribution terms that you use for the rest of that program.
@@ -5163,7 +5610,7 @@
AC_DEFUN([IT_PROG_INTLTOOL],
[AC_PREREQ([2.50])dnl
-@@ -36,7 +36,7 @@ case "$am__api_version" in
+@@ -36,7 +36,7 @@
esac
if test -n "$1"; then
@@ -5172,7 +5619,7 @@
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
-@@ -65,6 +65,7 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
+@@ -65,6 +65,7 @@
INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
@@ -5180,15 +5627,29 @@
AC_SUBST(INTLTOOL_DESKTOP_RULE)
AC_SUBST(INTLTOOL_DIRECTORY_RULE)
-@@ -84,6 +85,7 @@ AC_SUBST(INTLTOOL_CAVES_RULE)
+@@ -84,6 +85,21 @@
AC_SUBST(INTLTOOL_SCHEMAS_RULE)
AC_SUBST(INTLTOOL_THEME_RULE)
AC_SUBST(INTLTOOL_SERVICE_RULE)
+AC_SUBST(INTLTOOL_POLICY_RULE)
++
++# Check the gettext tools to make sure they are GNU
++AC_PATH_PROG(XGETTEXT, xgettext)
++AC_PATH_PROG(MSGMERGE, msgmerge)
++AC_PATH_PROG(MSGFMT, msgfmt)
++if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
++ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
++fi
++xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
++mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
++mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
++if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
++ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
++fi
# Use the tools built into the package, not the ones that are installed.
AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
-@@ -106,19 +108,16 @@ if test "x$2" != "xno-xml"; then
+@@ -106,19 +122,16 @@
fi
fi
@@ -5212,7 +5673,7 @@
[DATADIRNAME=share],
[case $host in
*-*-solaris*)
-@@ -159,10 +158,6 @@ AC_CONFIG_COMMANDS([intltool], [
+@@ -159,10 +172,6 @@
for file in intltool-extract intltool-merge intltool-update; do
sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
-e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
@@ -5223,7 +5684,7 @@
-e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
< ${ac_aux_dir}/${file}.in > ${file}.out
if cmp -s ${file} ${file}.out 2>/dev/null; then
-@@ -177,9 +172,7 @@ done
+@@ -177,9 +186,7 @@
],
[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
@@ -5234,11 +5695,10 @@
])
-Index: seahorse-2.20.1/Makefile.in
-===================================================================
---- seahorse-2.20.1.orig/Makefile.in 2007-11-15 18:59:43.545811367 +0100
-+++ seahorse-2.20.1/Makefile.in 2007-11-15 19:06:02.711418784 +0100
-@@ -152,14 +152,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/Makefile.in seahorse-2.20.3/Makefile.in
+--- seahorse-2.20.3.old/Makefile.in 2008-01-07 17:47:10.000000000 +0100
++++ seahorse-2.20.3/Makefile.in 2008-01-07 22:02:14.000000000 +0100
+@@ -151,14 +151,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5254,7 +5714,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -171,7 +169,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
+@@ -170,7 +168,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5262,7 +5722,15 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -221,15 +218,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -200,6 +197,7 @@
+ MOZILLA_PREFIX = @MOZILLA_PREFIX@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+@@ -220,15 +218,13 @@
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -5279,11 +5747,10 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-Index: seahorse-2.20.1/pixmaps/22x22/Makefile.in
-===================================================================
---- seahorse-2.20.1.orig/pixmaps/22x22/Makefile.in 2007-11-15 18:59:43.533810683 +0100
-+++ seahorse-2.20.1/pixmaps/22x22/Makefile.in 2007-11-15 19:06:01.039323496 +0100
-@@ -134,14 +134,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/pixmaps/22x22/Makefile.in seahorse-2.20.3/pixmaps/22x22/Makefile.in
+--- seahorse-2.20.3.old/pixmaps/22x22/Makefile.in 2008-01-07 17:47:08.000000000 +0100
++++ seahorse-2.20.3/pixmaps/22x22/Makefile.in 2008-01-07 22:02:10.000000000 +0100
+@@ -134,14 +134,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5299,7 +5766,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -153,7 +151,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
+@@ -153,7 +151,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5307,7 +5774,15 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -203,15 +200,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -183,6 +180,7 @@
+ MOZILLA_PREFIX = @MOZILLA_PREFIX@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+@@ -203,15 +201,13 @@
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -5324,11 +5799,10 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-Index: seahorse-2.20.1/pixmaps/48x48/Makefile.in
-===================================================================
---- seahorse-2.20.1.orig/pixmaps/48x48/Makefile.in 2007-11-15 18:59:43.457806352 +0100
-+++ seahorse-2.20.1/pixmaps/48x48/Makefile.in 2007-11-15 19:06:01.135328968 +0100
-@@ -135,14 +135,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/pixmaps/48x48/Makefile.in seahorse-2.20.3/pixmaps/48x48/Makefile.in
+--- seahorse-2.20.3.old/pixmaps/48x48/Makefile.in 2008-01-07 17:47:08.000000000 +0100
++++ seahorse-2.20.3/pixmaps/48x48/Makefile.in 2008-01-07 22:02:10.000000000 +0100
+@@ -135,14 +135,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5344,7 +5818,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -154,7 +152,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
+@@ -154,7 +152,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5352,7 +5826,15 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -204,15 +201,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -184,6 +181,7 @@
+ MOZILLA_PREFIX = @MOZILLA_PREFIX@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+@@ -204,15 +202,13 @@
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -5369,11 +5851,10 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-Index: seahorse-2.20.1/pixmaps/Makefile.in
-===================================================================
---- seahorse-2.20.1.orig/pixmaps/Makefile.in 2007-11-15 18:59:43.437805212 +0100
-+++ seahorse-2.20.1/pixmaps/Makefile.in 2007-11-15 19:06:01.231334439 +0100
-@@ -134,14 +134,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/pixmaps/Makefile.in seahorse-2.20.3/pixmaps/Makefile.in
+--- seahorse-2.20.3.old/pixmaps/Makefile.in 2008-01-07 17:47:08.000000000 +0100
++++ seahorse-2.20.3/pixmaps/Makefile.in 2008-01-07 22:02:10.000000000 +0100
+@@ -134,14 +134,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5389,7 +5870,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -153,7 +151,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
+@@ -153,7 +151,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5397,7 +5878,15 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -203,15 +200,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -183,6 +180,7 @@
+ MOZILLA_PREFIX = @MOZILLA_PREFIX@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+@@ -203,15 +201,13 @@
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -5414,11 +5903,10 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-Index: seahorse-2.20.1/pixmaps/scalable/Makefile.in
-===================================================================
---- seahorse-2.20.1.orig/pixmaps/scalable/Makefile.in 2007-11-15 18:59:43.421804300 +0100
-+++ seahorse-2.20.1/pixmaps/scalable/Makefile.in 2007-11-15 19:06:01.331340138 +0100
-@@ -135,14 +135,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/pixmaps/scalable/Makefile.in seahorse-2.20.3/pixmaps/scalable/Makefile.in
+--- seahorse-2.20.3.old/pixmaps/scalable/Makefile.in 2008-01-07 17:47:08.000000000 +0100
++++ seahorse-2.20.3/pixmaps/scalable/Makefile.in 2008-01-07 22:02:11.000000000 +0100
+@@ -135,14 +135,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5434,7 +5922,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -154,7 +152,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
+@@ -154,7 +152,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5442,7 +5930,15 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -204,15 +201,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -184,6 +181,7 @@
+ MOZILLA_PREFIX = @MOZILLA_PREFIX@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+@@ -204,15 +202,13 @@
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -5459,11 +5955,10 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-Index: seahorse-2.20.1/plugins/applet/docs/Makefile.in
-===================================================================
---- seahorse-2.20.1.orig/plugins/applet/docs/Makefile.in 2007-11-15 18:59:43.373801565 +0100
-+++ seahorse-2.20.1/plugins/applet/docs/Makefile.in 2007-11-15 19:06:01.735363162 +0100
-@@ -147,14 +147,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/plugins/applet/docs/Makefile.in seahorse-2.20.3/plugins/applet/docs/Makefile.in
+--- seahorse-2.20.3.old/plugins/applet/docs/Makefile.in 2008-01-07 17:47:09.000000000 +0100
++++ seahorse-2.20.3/plugins/applet/docs/Makefile.in 2008-01-07 22:02:12.000000000 +0100
+@@ -147,14 +147,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5479,7 +5974,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -166,7 +164,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
+@@ -166,7 +164,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5487,7 +5982,15 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -216,15 +213,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -196,6 +193,7 @@
+ MOZILLA_PREFIX = @MOZILLA_PREFIX@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+@@ -216,15 +214,13 @@
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -5504,7 +6007,7 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-@@ -772,6 +767,11 @@ dist-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_
+@@ -772,6 +768,11 @@
@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
for doc in $$list; do \
if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
@@ -5516,7 +6019,7 @@
echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
$(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
done
-@@ -840,6 +840,12 @@ install-doc-docs:
+@@ -840,6 +841,12 @@
done
@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
@@ -5529,7 +6032,7 @@
echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
done
-@@ -907,7 +913,7 @@ uninstall-doc-figs:
+@@ -907,7 +914,7 @@
uninstall-doc-omf:
@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
@@ -5538,11 +6041,10 @@
echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
fi; \
-Index: seahorse-2.20.1/plugins/applet/Makefile.in
-===================================================================
---- seahorse-2.20.1.orig/plugins/applet/Makefile.in 2007-11-15 18:59:43.349800197 +0100
-+++ seahorse-2.20.1/plugins/applet/Makefile.in 2007-11-15 19:06:01.563353359 +0100
-@@ -170,14 +170,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/plugins/applet/Makefile.in seahorse-2.20.3/plugins/applet/Makefile.in
+--- seahorse-2.20.3.old/plugins/applet/Makefile.in 2008-01-07 17:47:08.000000000 +0100
++++ seahorse-2.20.3/plugins/applet/Makefile.in 2008-01-07 22:02:11.000000000 +0100
+@@ -170,14 +170,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5558,7 +6060,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -189,7 +187,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
+@@ -189,7 +187,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5566,7 +6068,15 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -239,15 +236,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -219,6 +216,7 @@
+ MOZILLA_PREFIX = @MOZILLA_PREFIX@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+@@ -239,15 +237,13 @@
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -5583,11 +6093,10 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-Index: seahorse-2.20.1/plugins/epiphany/Makefile.in
-===================================================================
---- seahorse-2.20.1.orig/plugins/epiphany/Makefile.in 2007-11-15 18:59:43.277796094 +0100
-+++ seahorse-2.20.1/plugins/epiphany/Makefile.in 2007-11-15 19:06:01.907372964 +0100
-@@ -172,14 +172,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/plugins/epiphany/Makefile.in seahorse-2.20.3/plugins/epiphany/Makefile.in
+--- seahorse-2.20.3.old/plugins/epiphany/Makefile.in 2008-01-07 17:47:09.000000000 +0100
++++ seahorse-2.20.3/plugins/epiphany/Makefile.in 2008-01-07 22:02:12.000000000 +0100
+@@ -172,14 +172,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5603,7 +6112,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -191,7 +189,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
+@@ -191,7 +189,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5611,7 +6120,15 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -241,15 +238,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -221,6 +218,7 @@
+ MOZILLA_PREFIX = @MOZILLA_PREFIX@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+@@ -241,15 +239,13 @@
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -5628,7 +6145,7 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-@@ -306,7 +301,7 @@ target_alias = @target_alias@
+@@ -306,7 +302,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = mozilla
@@ -5637,11 +6154,10 @@
extension_LTLIBRARIES = libseahorseextension.la
libseahorseextension_la_SOURCES = \
ephy-debug.h \
-Index: seahorse-2.20.1/plugins/epiphany/mozilla/Makefile.in
-===================================================================
---- seahorse-2.20.1.orig/plugins/epiphany/mozilla/Makefile.in 2007-11-15 18:59:43.257794954 +0100
-+++ seahorse-2.20.1/plugins/epiphany/mozilla/Makefile.in 2007-11-15 19:06:02.059381626 +0100
-@@ -154,14 +154,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/plugins/epiphany/mozilla/Makefile.in seahorse-2.20.3/plugins/epiphany/mozilla/Makefile.in
+--- seahorse-2.20.3.old/plugins/epiphany/mozilla/Makefile.in 2008-01-07 17:47:09.000000000 +0100
++++ seahorse-2.20.3/plugins/epiphany/mozilla/Makefile.in 2008-01-07 22:02:12.000000000 +0100
+@@ -154,14 +154,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5657,7 +6173,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -173,7 +171,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
+@@ -173,7 +171,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5665,7 +6181,15 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -223,15 +220,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -203,6 +200,7 @@
+ MOZILLA_PREFIX = @MOZILLA_PREFIX@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+@@ -223,15 +221,13 @@
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -5682,11 +6206,10 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-Index: seahorse-2.20.1/plugins/gedit/Makefile.in
-===================================================================
---- seahorse-2.20.1.orig/plugins/gedit/Makefile.in 2007-11-15 18:59:43.209792219 +0100
-+++ seahorse-2.20.1/plugins/gedit/Makefile.in 2007-11-15 19:06:02.223390973 +0100
-@@ -164,14 +164,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/plugins/gedit/Makefile.in seahorse-2.20.3/plugins/gedit/Makefile.in
+--- seahorse-2.20.3.old/plugins/gedit/Makefile.in 2008-01-07 17:47:09.000000000 +0100
++++ seahorse-2.20.3/plugins/gedit/Makefile.in 2008-01-07 22:02:13.000000000 +0100
+@@ -164,14 +164,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5702,7 +6225,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -183,7 +181,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
+@@ -183,7 +181,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5710,7 +6233,15 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -233,15 +230,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -213,6 +210,7 @@
+ MOZILLA_PREFIX = @MOZILLA_PREFIX@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+@@ -233,15 +231,13 @@
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -5727,11 +6258,10 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-Index: seahorse-2.20.1/plugins/Makefile.in
-===================================================================
---- seahorse-2.20.1.orig/plugins/Makefile.in 2007-11-15 18:59:43.193791307 +0100
-+++ seahorse-2.20.1/plugins/Makefile.in 2007-11-15 19:06:01.435346065 +0100
-@@ -134,14 +134,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/plugins/Makefile.in seahorse-2.20.3/plugins/Makefile.in
+--- seahorse-2.20.3.old/plugins/Makefile.in 2008-01-07 17:47:08.000000000 +0100
++++ seahorse-2.20.3/plugins/Makefile.in 2008-01-07 22:02:11.000000000 +0100
+@@ -134,14 +134,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5747,7 +6277,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -153,7 +151,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
+@@ -153,7 +151,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5755,7 +6285,15 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -203,15 +200,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -183,6 +180,7 @@
+ MOZILLA_PREFIX = @MOZILLA_PREFIX@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+@@ -203,15 +201,13 @@
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -5772,11 +6310,10 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-Index: seahorse-2.20.1/plugins/nautilus/Makefile.in
-===================================================================
---- seahorse-2.20.1.orig/plugins/nautilus/Makefile.in 2007-11-15 18:59:43.177790395 +0100
-+++ seahorse-2.20.1/plugins/nautilus/Makefile.in 2007-11-15 19:06:02.467404878 +0100
-@@ -169,14 +169,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/plugins/nautilus/Makefile.in seahorse-2.20.3/plugins/nautilus/Makefile.in
+--- seahorse-2.20.3.old/plugins/nautilus/Makefile.in 2008-01-07 17:47:09.000000000 +0100
++++ seahorse-2.20.3/plugins/nautilus/Makefile.in 2008-01-07 22:02:13.000000000 +0100
+@@ -169,14 +169,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5792,7 +6329,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -188,7 +186,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
+@@ -188,7 +186,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5800,7 +6337,15 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -238,15 +235,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -218,6 +215,7 @@
+ MOZILLA_PREFIX = @MOZILLA_PREFIX@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+@@ -238,15 +236,13 @@
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -5817,11 +6362,10 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-Index: seahorse-2.20.1/plugins/nautilus-ext/Makefile.in
-===================================================================
---- seahorse-2.20.1.orig/plugins/nautilus-ext/Makefile.in 2007-11-15 18:59:43.097785836 +0100
-+++ seahorse-2.20.1/plugins/nautilus-ext/Makefile.in 2007-11-15 19:06:02.335397356 +0100
-@@ -155,14 +155,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/plugins/nautilus-ext/Makefile.in seahorse-2.20.3/plugins/nautilus-ext/Makefile.in
+--- seahorse-2.20.3.old/plugins/nautilus-ext/Makefile.in 2008-01-07 17:47:09.000000000 +0100
++++ seahorse-2.20.3/plugins/nautilus-ext/Makefile.in 2008-01-07 22:02:13.000000000 +0100
+@@ -155,14 +155,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5837,7 +6381,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -174,7 +172,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
+@@ -174,7 +172,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5845,7 +6389,15 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -224,15 +221,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -204,6 +201,7 @@
+ MOZILLA_PREFIX = @MOZILLA_PREFIX@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+@@ -224,15 +222,13 @@
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -5862,11 +6414,10 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-Index: seahorse-2.20.1/po/Makefile.in.in
-===================================================================
---- seahorse-2.20.1.orig/po/Makefile.in.in 2007-11-15 18:59:43.077784696 +0100
-+++ seahorse-2.20.1/po/Makefile.in.in 2007-11-15 19:04:02.060543282 +0100
-@@ -133,7 +133,7 @@ install-data-yes: all
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/po/Makefile.in.in seahorse-2.20.3/po/Makefile.in.in
+--- seahorse-2.20.3.old/po/Makefile.in.in 2008-01-07 17:46:53.000000000 +0100
++++ seahorse-2.20.3/po/Makefile.in.in 2008-01-07 22:01:28.000000000 +0100
+@@ -133,7 +133,7 @@
dvi info tags TAGS ID:
# Define this as empty until I found a useful application.
@@ -5875,11 +6426,10 @@
uninstall:
linguas="$(USE_LINGUAS)"; \
-Index: seahorse-2.20.1/src/Makefile.in
-===================================================================
---- seahorse-2.20.1.orig/src/Makefile.in 2007-11-15 18:59:43.065784012 +0100
-+++ seahorse-2.20.1/src/Makefile.in 2007-11-15 19:06:02.603412629 +0100
-@@ -202,14 +202,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
+diff -Naur -x'*config.sub' -x'*config.guess' seahorse-2.20.3.old/src/Makefile.in seahorse-2.20.3/src/Makefile.in
+--- seahorse-2.20.3.old/src/Makefile.in 2008-01-07 17:47:10.000000000 +0100
++++ seahorse-2.20.3/src/Makefile.in 2008-01-07 22:02:14.000000000 +0100
+@@ -202,14 +202,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5895,7 +6445,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -221,7 +219,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
+@@ -221,7 +219,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5903,7 +6453,15 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -271,15 +268,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+@@ -251,6 +248,7 @@
+ MOZILLA_PREFIX = @MOZILLA_PREFIX@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+@@ -271,15 +269,13 @@
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
More information about the pkg-gnome-commits
mailing list