[Pkg-mono-svn-commits] rev 3482 - in non-group/tomboy/trunk/debian: . patches
Sebastian Dröge
slomo at alioth.debian.org
Mon Nov 26 16:09:37 UTC 2007
Author: slomo
Date: 2007-11-26 16:09:36 +0000 (Mon, 26 Nov 2007)
New Revision: 3482
Modified:
non-group/tomboy/trunk/debian/changelog
non-group/tomboy/trunk/debian/patches/99_autoreconf.patch
Log:
+ debian/patches/99_autoreconf.patch:
- Updated for the new version.
Modified: non-group/tomboy/trunk/debian/changelog
===================================================================
--- non-group/tomboy/trunk/debian/changelog 2007-11-26 16:06:29 UTC (rev 3481)
+++ non-group/tomboy/trunk/debian/changelog 2007-11-26 16:09:36 UTC (rev 3482)
@@ -3,6 +3,8 @@
* New upstream bugfix release:
+ debian/patches/02_CVE-2005-4790-insecure-search-path.patch:
- Dropped, merged upstream.
+ + debian/patches/99_autoreconf.patch:
+ - Updated for the new version.
-- Sebastian Dröge <slomo at debian.org> Mon, 26 Nov 2007 17:05:20 +0100
Modified: non-group/tomboy/trunk/debian/patches/99_autoreconf.patch
===================================================================
--- non-group/tomboy/trunk/debian/patches/99_autoreconf.patch 2007-11-26 16:06:29 UTC (rev 3481)
+++ non-group/tomboy/trunk/debian/patches/99_autoreconf.patch 2007-11-26 16:09:36 UTC (rev 3482)
@@ -1,38 +1,26 @@
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/aclocal.m4 tomboy-0.8.1/aclocal.m4
---- tomboy-0.8.1.old/aclocal.m4 2007-10-15 04:32:59.000000000 +0200
-+++ tomboy-0.8.1/aclocal.m4 2007-10-16 13:02:09.000000000 +0200
-@@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-+# generated automatically by aclocal 1.10 -*- Autoconf -*-
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/aclocal.m4 tomboy-0.8.2/aclocal.m4
+--- tomboy-0.8.2.old/aclocal.m4 2007-11-26 16:51:17.000000000 +0100
++++ tomboy-0.8.2/aclocal.m4 2007-11-26 17:07:37.000000000 +0100
+@@ -412,6 +412,18 @@
+ fi
+ fi
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005 Free Software Foundation, Inc.
-+# 2005, 2006 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -11,6 +11,11 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
-
-+m4_if(m4_PACKAGE_VERSION, [2.61],,
-+[m4_fatal([this file was generated for autoconf 2.61.
-+You have another version of autoconf. If you want to use that,
-+you should regenerate the build system entirely.], [63])])
++ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
++ dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
++ dnl Try to locate is.
++ MKINSTALLDIRS=
++ if test -n "$ac_aux_dir"; then
++ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
++ fi
++ if test -z "$MKINSTALLDIRS"; then
++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
++ fi
++ AC_SUBST(MKINSTALLDIRS)
+
- dnl AM_GCONF_SOURCE_2
- dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
- dnl (i.e. pass to gconftool-2
-@@ -261,7 +266,7 @@
- AC_CHECK_FUNCS(dcgettext)
- MSGFMT_OPTS=
- AC_MSG_CHECKING([if msgfmt accepts -c])
-- GLIB_RUN_PROG([msgfmt -c -o /dev/null],[
-+ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
- msgid ""
- msgstr ""
- "Content-Type: text/plain; charset=UTF-8\n"
-@@ -584,7 +589,7 @@
+ dnl Generate list of files to be processed by xgettext which will
+ dnl be included in po/Makefile.
+ test -d po || mkdir po
+@@ -577,7 +589,7 @@
dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
@@ -41,7 +29,7 @@
AC_DEFUN([IT_PROG_INTLTOOL],
[AC_PREREQ([2.50])dnl
-@@ -597,7 +602,7 @@
+@@ -590,7 +602,7 @@
esac
if test -n "$1"; then
@@ -50,7 +38,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`
-@@ -626,6 +631,7 @@
+@@ -619,6 +631,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 $< [$]@'
@@ -58,7 +46,7 @@
AC_SUBST(INTLTOOL_DESKTOP_RULE)
AC_SUBST(INTLTOOL_DIRECTORY_RULE)
-@@ -645,6 +651,7 @@
+@@ -638,6 +651,7 @@
AC_SUBST(INTLTOOL_SCHEMAS_RULE)
AC_SUBST(INTLTOOL_THEME_RULE)
AC_SUBST(INTLTOOL_SERVICE_RULE)
@@ -66,7 +54,7 @@
# Use the tools built into the package, not the ones that are installed.
AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
-@@ -667,19 +674,16 @@
+@@ -660,19 +674,16 @@
fi
fi
@@ -90,7 +78,7 @@
[DATADIRNAME=share],
[case $host in
*-*-solaris*)
-@@ -720,10 +724,6 @@
+@@ -713,10 +724,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" \
@@ -101,7 +89,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
-@@ -738,9 +738,7 @@
+@@ -731,9 +738,7 @@
],
[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
@@ -112,1073 +100,97 @@
])
-@@ -789,7 +787,7 @@
+@@ -782,7 +787,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
--# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
+-# serial 51 AC_PROG_LIBTOOL
+# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -952,7 +950,7 @@
- test -z "$ac_objext" && ac_objext=o
-
- # Determine commands to create old-style static archives.
--old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
- old_postinstall_cmds='chmod 644 $oldlib'
- old_postuninstall_cmds=
-
-@@ -1039,8 +1037,9 @@
- # Check for compiler boilerplate output or warnings with
- # the simple compiler test code.
- AC_DEFUN([_LT_COMPILER_BOILERPLATE],
--[ac_outfile=conftest.$ac_objext
--printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+ac_outfile=conftest.$ac_objext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
- eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
-@@ -1052,8 +1051,9 @@
- # Check for linker boilerplate output or warnings with
- # the simple link test code.
- AC_DEFUN([_LT_LINKER_BOILERPLATE],
--[ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+ac_outfile=conftest.$ac_objext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
- $rm conftest*
-@@ -1069,12 +1069,20 @@
- # If we don't find anything, use the default library path according
- # to the aix ld manual.
- AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
--[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi],[])
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi],[])
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- ])# _LT_AC_SYS_LIBPATH_AIX
-
-@@ -1305,13 +1313,17 @@
- rm -rf conftest*
+@@ -2408,6 +2413,18 @@
+ dynamic_linker='GNU/Linux ld.so'
;;
--x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+s390*-*linux*|sparc*-*linux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.o` in
- *32-bit*)
- case $host in
-+ x86_64-*kfreebsd*-gnu)
-+ LD="${LD-ld} -m elf_i386_fbsd"
-+ ;;
- x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
- ;;
-@@ -1328,6 +1340,9 @@
- ;;
- *64-bit*)
- case $host in
-+ x86_64-*kfreebsd*-gnu)
-+ LD="${LD-ld} -m elf_x86_64_fbsd"
-+ ;;
- x86_64-*linux*)
- LD="${LD-ld} -m elf_x86_64"
- ;;
-@@ -1399,7 +1414,7 @@
- AC_CACHE_CHECK([$1], [$2],
- [$2=no
- ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$3"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
-@@ -1440,11 +1455,12 @@
- # ------------------------------------------------------------
- # Check whether the given compiler option works
- AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
--[AC_CACHE_CHECK([$1], [$2],
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_CACHE_CHECK([$1], [$2],
- [$2=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $3"
-- printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The linker can only warn and ignore the option if not recognized
- # So say no if there are warnings
-@@ -1558,24 +1574,27 @@
- fi
- ;;
- *)
-- # If test is not a shell built-in, we'll probably end up computing a
-- # maximum length that is only half of the actual maximum length, but
-- # we can't tell.
-- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-- while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
-+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-+ if test -n "$lt_cv_sys_max_cmd_len"; then
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+ else
-+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
- = "XX$teststring") >/dev/null 2>&1 &&
-- new_result=`expr "X$teststring" : ".*" 2>&1` &&
-- lt_cv_sys_max_cmd_len=$new_result &&
-- test $i != 17 # 1/2 MB should be enough
-- do
-- i=`expr $i + 1`
-- teststring=$teststring$teststring
-- done
-- teststring=
-- # Add a significant safety factor because C++ compilers can tack on massive
-- # amounts of additional arguments before passing them to the linker.
-- # It appears as though 1/2 is a usable value.
-- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
-+ lt_cv_sys_max_cmd_len=$new_result &&
-+ test $i != 17 # 1/2 MB should be enough
-+ do
-+ i=`expr $i + 1`
-+ teststring=$teststring$teststring
-+ done
-+ teststring=
-+ # Add a significant safety factor because C++ compilers can tack on massive
-+ # amounts of additional arguments before passing them to the linker.
-+ # It appears as though 1/2 is a usable value.
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+ fi
- ;;
- esac
- ])
-@@ -1802,7 +1821,8 @@
- # ---------------------------------
- # Check to see if options -c and -o are simultaneously supported by compiler
- AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
--[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
- AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-@@ -1810,7 +1830,7 @@
- mkdir conftest
- cd conftest
- mkdir out
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
-@@ -1950,6 +1970,7 @@
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
-+ old_striplib="$STRIP -S"
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
-@@ -1967,7 +1988,8 @@
- # -----------------------------
- # PORTME Fill in your ld.so characteristics
- AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
--[AC_MSG_CHECKING([dynamic linker characteristics])
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_MSG_CHECKING([dynamic linker characteristics])
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -1981,20 +2003,58 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+m4_if($1,[],[
- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-+ case $host_os in
-+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-+ *) lt_awk_arg="/^libraries:/" ;;
-+ esac
-+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
- # if the path contains ";" then we assume it to be the separator
- # otherwise default to the standard path separator (i.e. ":") - it is
- # assumed that no part of a normal pathname contains ";" but that should
- # okay in the real world where ";" in dirpaths is itself problematic.
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
- else
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
-+ # Ok, now we have the path, separated by spaces, we can step through it
-+ # and add multilib dir if necessary.
-+ lt_tmp_lt_search_path_spec=
-+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-+ for lt_sys_path in $lt_search_path_spec; do
-+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-+ else
-+ test -d "$lt_sys_path" && \
-+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-+ fi
-+ done
-+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
-+BEGIN {RS=" "; FS="/|\n";} {
-+ lt_foo="";
-+ lt_count=0;
-+ for (lt_i = NF; lt_i > 0; lt_i--) {
-+ if ($lt_i != "" && $lt_i != ".") {
-+ if ($lt_i == "..") {
-+ lt_count++;
-+ } else {
-+ if (lt_count == 0) {
-+ lt_foo="/" $lt_i lt_foo;
-+ } else {
-+ lt_count--;
-+ }
-+ }
-+ }
-+ }
-+ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-+}'`
-+ sys_lib_search_path_spec=`echo $lt_search_path_spec`
- else
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
--fi
-+fi])
- need_lib_prefix=unknown
- hardcode_into_libs=no
-
-@@ -2151,12 +2211,8 @@
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-- else
-- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-- fi
-+ m4_if([$1], [],[
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
- ;;
-
-@@ -2210,7 +2266,7 @@
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-- freebsd*) # from 4.6 on
-+ *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-@@ -2273,7 +2329,7 @@
- postinstall_cmds='chmod 555 $lib'
- ;;
-
--interix3*)
-+interix[[3-9]]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -2344,7 +2400,7 @@
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
-- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
-@@ -2450,6 +2506,10 @@
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-+rdos*)
-+ dynamic_linker=no
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
- solaris*)
- version_type=linux
+ netbsd*)
+ version_type=sunos
need_lib_prefix=no
-@@ -2555,7 +2615,8 @@
- # _LT_AC_TAGCONFIG
- # ----------------
- AC_DEFUN([_LT_AC_TAGCONFIG],
--[AC_ARG_WITH([tags],
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_ARG_WITH([tags],
- [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
- [include additional configurations @<:@automatic@:>@])],
- [tagnames="$withval"])
-@@ -2816,7 +2877,7 @@
-
- # AC_PATH_TOOL_PREFIX
- # -------------------
--# find a file program which can recognise shared library
-+# find a file program which can recognize shared library
- AC_DEFUN([AC_PATH_TOOL_PREFIX],
- [AC_REQUIRE([AC_PROG_EGREP])dnl
- AC_MSG_CHECKING([for $1])
-@@ -2879,7 +2940,7 @@
-
- # AC_PATH_MAGIC
- # -------------
--# find a file program which can recognise a shared library
-+# find a file program which can recognize a shared library
- AC_DEFUN([AC_PATH_MAGIC],
- [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
- if test -z "$lt_cv_path_MAGIC_CMD"; then
-@@ -3026,7 +3087,7 @@
- # how to check for library dependencies
- # -- PORTME fill in with the dynamic library characteristics
- AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
--[AC_CACHE_CHECK([how to recognise dependent libraries],
-+[AC_CACHE_CHECK([how to recognize dependent libraries],
- lt_cv_deplibs_check_method,
- [lt_cv_file_magic_cmd='$MAGIC_CMD'
- lt_cv_file_magic_test_file=
-@@ -3065,9 +3126,15 @@
-
- mingw* | pw32*)
- # Base MSYS/MinGW do not provide the 'file' command needed by
-- # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-- lt_cv_file_magic_cmd='$OBJDUMP -f'
-+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
-+ # unless we find 'file', for example because we are cross-compiling.
-+ if ( file / ) >/dev/null 2>&1; then
-+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+ lt_cv_file_magic_cmd='func_win32_libid'
-+ else
-+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+ lt_cv_file_magic_cmd='$OBJDUMP -f'
-+ fi
- ;;
-
- darwin* | rhapsody*)
-@@ -3112,7 +3179,7 @@
- esac
- ;;
-
--interix3*)
-+interix[[3-9]]*)
- # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
- ;;
-@@ -3162,6 +3229,10 @@
+@@ -3182,7 +3199,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-+rdos*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
- solaris*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-@@ -3214,7 +3285,7 @@
- lt_cv_path_NM="$NM"
- else
- lt_nm_to_check="${ac_tool_prefix}nm"
-- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
- lt_nm_to_check="$lt_nm_to_check nm"
- fi
- for lt_tmp_nm in $lt_nm_to_check; do
-@@ -3430,10 +3501,10 @@
- _LT_AC_TAGVAR(objext, $1)=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
-+lt_simple_compile_test_code="int some_variable = 0;"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code='int main(){return(0);}\n'
-+lt_simple_link_test_code='int main(){return(0);}'
-
- _LT_AC_SYS_COMPILER
-
-@@ -3535,10 +3606,10 @@
- _LT_AC_TAGVAR(objext, $1)=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
-+lt_simple_compile_test_code="int some_variable = 0;"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
-+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
-@@ -3684,7 +3755,7 @@
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ :
- else
- # We have old collect2
- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -3843,10 +3914,10 @@
- case $cc_basename in
- xlc*)
- output_verbose_link_cmd='echo'
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
- *)
-@@ -3929,9 +4000,7 @@
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- case $host_cpu in
-- hppa*64*|ia64*)
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-- ;;
-+ hppa*64*|ia64*) ;;
- *)
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- ;;
-@@ -3999,7 +4068,7 @@
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ else
+@@ -4216,7 +4233,7 @@
;;
esac
;;
-- interix3*)
-+ interix[[3-9]]*)
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-@@ -4119,6 +4188,29 @@
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+
-+ # Not sure whether something based on
-+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-+ # would be better.
-+ output_verbose_link_cmd='echo'
-+
-+ # Archives containing C++ object files must be created using
-+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
-+ # necessary to make sure instantiated templates are included
-+ # in the archive.
-+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-+ ;;
-+ esac
-+ ;;
- esac
- ;;
- lynxos*)
-@@ -4157,16 +4249,20 @@
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- openbsd*)
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ if test -f /usr/libexec/ld.so; then
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ fi
-+ output_verbose_link_cmd='echo'
-+ else
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
-- output_verbose_link_cmd='echo'
- ;;
- osf3*)
- case $cc_basename in
-@@ -4328,15 +4424,10 @@
- case $host_os in
- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
- *)
-- # The C++ compiler is used as linker so we must use $wl
-- # flag to pass the commands to the underlying system
-- # linker. We must also pass each convience library through
-- # to the system linker between allextract/defaultextract.
-- # The C++ compiler will combine linker options so we
-- # cannot just pass the convience library names through
-- # without $wl.
-+ # The compiler driver will combine and reorder linker options,
-+ # but understands `-z linker_flag'.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+ wlarc=
+@@ -5897,7 +5914,7 @@
;;
esac
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -4383,6 +4474,12 @@
- fi
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-+ case $host_os in
-+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+ *)
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ ;;
-+ esac
- fi
;;
- esac
-@@ -4626,7 +4723,7 @@
- # PORTME: override above test on systems where it is broken
- ifelse([$1],[CXX],
- [case $host_os in
--interix3*)
-+interix[[3-9]]*)
- # Interix 3.5 installs completely hosed .la files for C++, so rather than
- # hack all around it, let's just trust "g++" to DTRT.
- _LT_AC_TAGVAR(predep_objects,$1)=
-@@ -4634,13 +4731,46 @@
- _LT_AC_TAGVAR(postdeps,$1)=
- ;;
-
-+linux*)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ #
-+ # The more standards-conforming stlport4 library is
-+ # incompatible with the Cstd library. Avoid specifying
-+ # it if it's in CXXFLAGS. Ignore libCrun as
-+ # -library=stlport4 depends on it.
-+ case " $CXX $CXXFLAGS " in
-+ *" -library=stlport4 "*)
-+ solaris_use_stlport4=yes
-+ ;;
-+ esac
-+ if test "$solaris_use_stlport4" != yes; then
-+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-+ fi
-+ ;;
-+ esac
-+ ;;
-+
- solaris*)
- case $cc_basename in
- CC*)
-+ # The more standards-conforming stlport4 library is
-+ # incompatible with the Cstd library. Avoid specifying
-+ # it if it's in CXXFLAGS. Ignore libCrun as
-+ # -library=stlport4 depends on it.
-+ case " $CXX $CXXFLAGS " in
-+ *" -library=stlport4 "*)
-+ solaris_use_stlport4=yes
-+ ;;
-+ esac
-+
- # Adding this requires a known-good setup of shared libraries for
- # Sun compiler versions before 5.6, else PIC objects from an old
- # archive will be linked into the output, leading to subtle bugs.
-- _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
-+ if test "$solaris_use_stlport4" != yes; then
-+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-+ fi
- ;;
- esac
- ;;
-@@ -4689,10 +4819,17 @@
- _LT_AC_TAGVAR(objext, $1)=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code=" subroutine t\n return\n end\n"
-+lt_simple_compile_test_code="\
-+ subroutine t
-+ return
-+ end
-+"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code=" program t\n end\n"
-+lt_simple_link_test_code="\
-+ program t
-+ end
-+"
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
-@@ -4771,10 +4908,10 @@
- _LT_AC_TAGVAR(objext, $1)=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code="class foo {}\n"
-+lt_simple_compile_test_code="class foo {}"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
-+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
-@@ -4827,7 +4964,7 @@
- _LT_AC_TAGVAR(objext, $1)=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
- # Code to be used in simple link tests
- lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -4916,6 +5053,7 @@
- _LT_AC_TAGVAR(module_cmds, $1) \
- _LT_AC_TAGVAR(module_expsym_cmds, $1) \
- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
-+ _LT_AC_TAGVAR(fix_srcfile_path, $1) \
- _LT_AC_TAGVAR(exclude_expsyms, $1) \
- _LT_AC_TAGVAR(include_expsyms, $1); do
-
-@@ -4962,7 +5100,7 @@
- # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
- # Free Software Foundation, Inc.
- #
- # This file is part of GNU Libtool:
-@@ -5287,7 +5425,7 @@
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
- # Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
-+fix_srcfile_path=$lt_fix_srcfile_path
-
- # Set to yes if exported symbols are required.
- always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-@@ -5370,6 +5508,7 @@
- # ---------------------------------
- AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
- [AC_REQUIRE([AC_CANONICAL_HOST])
-+AC_REQUIRE([LT_AC_PROG_SED])
- AC_REQUIRE([AC_PROG_NM])
- AC_REQUIRE([AC_OBJEXT])
- # Check for command to grab the raw symbol name followed by C symbol from nm.
-@@ -5596,12 +5735,14 @@
- # like `-m68040'.
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
- ;;
-- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-- mingw* | os2* | pw32*)
-+ mingw* | cygwin* | os2* | pw32*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
-+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+ # (--disable-auto-import) libraries
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
- ;;
- darwin* | rhapsody*)
-@@ -5613,7 +5754,7 @@
- # DJGPP does not support shared libraries at all
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
- ;;
-- interix3*)
-+ interix[[3-9]]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-@@ -5749,6 +5890,14 @@
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
- *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+ ;;
-+ esac
- ;;
- esac
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
;;
-@@ -5869,13 +6018,15 @@
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
- ;;
-
-- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
-+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+ # (--disable-auto-import) libraries
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
- ;;
-
-@@ -5885,7 +6036,7 @@
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
- ;;
-
-- interix3*)
-+ interix[[3-9]]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-@@ -5943,7 +6094,7 @@
- esac
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-@@ -5995,6 +6146,22 @@
- # All Alpha code is PIC.
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C 5.9
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ ;;
-+ *Sun\ F*)
-+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
-+ ;;
-+ esac
-+ ;;
- esac
- ;;
-
-@@ -6004,6 +6171,10 @@
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
-+ rdos*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ ;;
-+
- solaris*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -6098,7 +6269,8 @@
- # ------------------------------------
- # See if the linker supports building shared libraries.
- AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
--[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
- ifelse([$1],[CXX],[
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- case $host_os in
-@@ -6115,7 +6287,7 @@
- _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
- ;;
+ osf3* | osf4* | osf5*)
+ case $cc_basename in
+@@ -6272,6 +6289,9 @@
cygwin* | mingw*)
-- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
;;
- linux* | k*bsd*-gnu)
- _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-@@ -6257,7 +6429,7 @@
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_AC_TAGVAR(always_export_symbols, $1)=no
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -6275,7 +6447,7 @@
- fi
- ;;
-
-- interix3*)
-+ interix[[3-9]]*)
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-@@ -6290,7 +6462,7 @@
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- linux* | k*bsd*-gnu)
-+ gnu* | linux* | k*bsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_addflag=
- case $cc_basename,$host_cpu in
-@@ -6308,13 +6480,22 @@
- ifc* | ifort*) # Intel Fortran compiler
- tmp_addflag=' -nofor_main' ;;
- esac
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*) # Sun C 5.9
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+ tmp_sharedflag='-G' ;;
-+ *Sun\ F*) # Sun Fortran 8.3
-+ tmp_sharedflag='-G' ;;
-+ *)
-+ tmp_sharedflag='-shared' ;;
-+ esac
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
- if test $supports_anon_versioning = yes; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++ linux* | k*bsd*-gnu)
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
++ ;;
+ *)
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
+@@ -6477,12 +6497,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
-- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
- _LT_AC_TAGVAR(link_all_deplibs, $1)=no
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
else
-@@ -6355,7 +6536,7 @@
-
- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
- case `$LD -v 2>&1` in
-- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
_LT_AC_TAGVAR(ld_shlibs, $1)=no
- cat <<_LT_EOF 1>&2
-
-@@ -6474,7 +6655,7 @@
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ :
- else
- # We have old collect2
- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -6567,7 +6748,7 @@
- # The linker will automatically build a .lib file if we build a DLL.
- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
- # FIXME: Should let the user specify the lib program.
-- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
- _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- ;;
-@@ -6609,10 +6790,10 @@
- case $cc_basename in
- xlc*)
- output_verbose_link_cmd='echo'
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
- *)
-@@ -6774,24 +6955,28 @@
- ;;
-
- openbsd*)
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ if test -f /usr/libexec/ld.so; then
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ else
-+ case $host_os in
-+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ ;;
-+ esac
-+ fi
- else
-- case $host_os in
-- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-- ;;
-- *)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-- ;;
-- esac
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
;;
-@@ -6850,17 +7035,16 @@
- case $host_os in
- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
- *)
-- # The compiler driver will combine linker options so we
-- # cannot just pass the convience library names through
-- # without $wl, iff we do not link with $LD.
-- # Luckily, gcc supports the same syntax we need for Sun Studio.
-+ # The compiler driver will combine and reorder linker options,
-+ # but understands `-z linker_flag'. GCC discards it without `$wl',
-+ # but is careful enough not to reorder.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- case $wlarc in
-- '')
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
-- *)
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-- esac ;;
-+ if test "$GCC" = yes; then
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ else
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-+ fi
-+ ;;
- esac
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -6914,7 +6935,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -6917,7 +7101,7 @@
- fi
- ;;
-- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -6992,7 +7176,7 @@
- # to ld, don't add -lc before -lgcc.
- AC_MSG_CHECKING([whether -lc should be explicitly linked in])
- $rm conftest*
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -7493,7 +7514,7 @@
- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
- soname=conftest
-@@ -7095,6 +7279,30 @@
- [AC_CHECK_TOOL(RC, windres, no)
- ])
-
-+
-+# Cheap backport of AS_EXECUTABLE_P and required macros
-+# from Autoconf 2.59; we should not use $as_executable_p directly.
-+
-+# _AS_TEST_PREPARE
-+# ----------------
-+m4_ifndef([_AS_TEST_PREPARE],
-+[m4_defun([_AS_TEST_PREPARE],
-+[if test -x / >/dev/null 2>&1; then
-+ as_executable_p='test -x'
-+else
-+ as_executable_p='test -f'
-+fi
-+])])# _AS_TEST_PREPARE
-+
-+# AS_EXECUTABLE_P
-+# ---------------
-+# Check whether a file is executable.
-+m4_ifndef([AS_EXECUTABLE_P],
-+[m4_defun([AS_EXECUTABLE_P],
-+[AS_REQUIRE([_AS_TEST_PREPARE])dnl
-+$as_executable_p $1[]dnl
-+])])# AS_EXECUTABLE_P
-+
- # NOTE: This macro has been submitted for inclusion into #
- # GNU Autoconf as AC_PROG_SED. When it is available in #
- # a released version of Autoconf we should remove this #
-@@ -7115,12 +7323,13 @@
- test -z "$as_dir" && as_dir=.
- for lt_ac_prog in sed gsed; do
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-+ if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
- fi
- done
- done
- done
-+IFS=$as_save_IFS
- lt_ac_max=0
- lt_ac_count=0
- # Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -7153,6 +7362,7 @@
- done
- ])
- SED=$lt_cv_path_SED
-+AC_SUBST([SED])
- AC_MSG_RESULT([$SED])
- ])
-
-@@ -7304,7 +7514,7 @@
-
_PKG_TEXT
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
@@ -1186,347 +198,10 @@
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-@@ -7314,7 +7524,7 @@
- fi[]dnl
- ])# PKG_CHECK_MODULES
-
--# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
-+# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -7324,14 +7534,29 @@
- # ----------------------------
- # Automake X.Y traces this macro to ensure aclocal.m4 has been
- # generated from the m4 files accompanying Automake X.Y.
--AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-+# (This private macro should not be called outside this file.)
-+AC_DEFUN([AM_AUTOMAKE_VERSION],
-+[am__api_version='1.10'
-+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-+dnl require some minimum version. Point them to the right macro.
-+m4_if([$1], [1.10], [],
-+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-+])
-+
-+# _AM_AUTOCONF_VERSION(VERSION)
-+# -----------------------------
-+# aclocal traces this macro to find the Autoconf version.
-+# This is a private macro too. Using m4_define simplifies
-+# the logic in aclocal, which can simply ignore this definition.
-+m4_define([_AM_AUTOCONF_VERSION], [])
-
- # AM_SET_CURRENT_AUTOMAKE_VERSION
- # -------------------------------
--# Call AM_AUTOMAKE_VERSION so it can be traced.
-+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-- [AM_AUTOMAKE_VERSION([1.9.6])])
-+[AM_AUTOMAKE_VERSION([1.10])dnl
-+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
-
- # AM_AUX_DIR_EXPAND -*- Autoconf -*-
-
-@@ -7388,14 +7613,14 @@
-
- # AM_CONDITIONAL -*- Autoconf -*-
-
--# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
- # Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--# serial 7
-+# serial 8
-
- # AM_CONDITIONAL(NAME, SHELL-CONDITION)
- # -------------------------------------
-@@ -7404,8 +7629,10 @@
- [AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
--AC_SUBST([$1_TRUE])
--AC_SUBST([$1_FALSE])
-+AC_SUBST([$1_TRUE])dnl
-+AC_SUBST([$1_FALSE])dnl
-+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
- if $2; then
- $1_TRUE=
- $1_FALSE='#'
-@@ -7419,15 +7646,14 @@
- Usually this means the macro was only invoked conditionally.]])
- fi])])
-
--
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
- # Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--# serial 8
-+# serial 9
-
- # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
- # written in clear, in which case automake, when reading aclocal.m4,
-@@ -7455,6 +7681,7 @@
- ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-+ [$1], UPC, [depcc="$UPC" am_compiler_list=],
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
-
-@@ -7520,6 +7747,7 @@
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
- >/dev/null 2>conftest.err &&
-+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-@@ -7572,7 +7800,8 @@
- AMDEPBACKSLASH='\'
- fi
- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
--AC_SUBST([AMDEPBACKSLASH])
-+AC_SUBST([AMDEPBACKSLASH])dnl
-+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
- ])
-
- # Generate code to set up dependency tracking. -*- Autoconf -*-
-@@ -7597,8 +7826,9 @@
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
-- # So let's grep whole file.
-- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-+ # Grep'ing the whole file is not good either: AIX grep has a line
-+ # limit of 2048, but all sed's we know have understand at least 4000.
-+ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
-@@ -7657,8 +7887,8 @@
-
- # Do all the work for Automake. -*- Autoconf -*-
-
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
--# Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005, 2006 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -7681,16 +7911,20 @@
- # arguments mandatory, and then we can depend on a new Autoconf
- # release and drop the old call support.
- AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_PREREQ([2.58])dnl
-+[AC_PREREQ([2.60])dnl
- dnl Autoconf wants to disallow AM_ names. We explicitly allow
- dnl the ones we care about.
- m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
- AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
- AC_REQUIRE([AC_PROG_INSTALL])dnl
--# test to see if srcdir already configured
--if test "`cd $srcdir && pwd`" != "`pwd`" &&
-- test -f $srcdir/config.status; then
-- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+if test "`cd $srcdir && pwd`" != "`pwd`"; then
-+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-+ # is not polluted with repeated "-I."
-+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-+ # test to see if srcdir already configured
-+ if test -f $srcdir/config.status; then
-+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+ fi
- fi
-
- # test whether we have cygpath
-@@ -7710,6 +7944,9 @@
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
- [_AM_SET_OPTIONS([$1])dnl
-+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-@@ -7745,6 +7982,10 @@
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-+ [_AM_DEPENDENCIES(OBJC)],
-+ [define([AC_PROG_OBJC],
-+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
- ])
- ])
-
-@@ -7780,7 +8021,7 @@
- # Define $install_sh.
- AC_DEFUN([AM_PROG_INSTALL_SH],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--install_sh=${install_sh-"$am_aux_dir/install-sh"}
-+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
- AC_SUBST(install_sh)])
-
- # Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-@@ -7887,14 +8128,14 @@
-
- # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-
--# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
- # Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--# serial 4
-+# serial 5
-
- # AM_MISSING_PROG(NAME, PROGRAM)
- # ------------------------------
-@@ -7910,6 +8151,7 @@
- # If it does, set am_missing_run to use it, otherwise, to nothing.
- AC_DEFUN([AM_MISSING_HAS_RUN],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+AC_REQUIRE_AUX_FILE([missing])dnl
- test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
- # Use eval to expand $SHELL
- if eval "$MISSING --run true"; then
-@@ -7920,7 +8162,7 @@
- fi
- ])
-
--# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
-+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -7928,60 +8170,23 @@
-
- # AM_PROG_MKDIR_P
- # ---------------
--# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
--#
--# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
--# created by `make install' are always world readable, even if the
--# installer happens to have an overly restrictive umask (e.g. 077).
--# This was a mistake. There are at least two reasons why we must not
--# use `-m 0755':
--# - it causes special bits like SGID to be ignored,
--# - it may be too restrictive (some setups expect 775 directories).
--#
--# Do not use -m 0755 and let people choose whatever they expect by
--# setting umask.
--#
--# We cannot accept any implementation of `mkdir' that recognizes `-p'.
--# Some implementations (such as Solaris 8's) are not thread-safe: if a
--# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
--# concurrently, both version can detect that a/ is missing, but only
--# one can create it and the other will error out. Consequently we
--# restrict ourselves to GNU make (using the --version option ensures
--# this.)
-+# Check for `mkdir -p'.
- AC_DEFUN([AM_PROG_MKDIR_P],
--[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-- # We used to keeping the `.' as first argument, in order to
-- # allow $(mkdir_p) to be used without argument. As in
-- # $(mkdir_p) $(somedir)
-- # where $(somedir) is conditionally defined. However this is wrong
-- # for two reasons:
-- # 1. if the package is installed by a user who cannot write `.'
-- # make install will fail,
-- # 2. the above comment should most certainly read
-- # $(mkdir_p) $(DESTDIR)$(somedir)
-- # so it does not work when $(somedir) is undefined and
-- # $(DESTDIR) is not.
-- # To support the latter case, we have to write
-- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-- # so the `.' trick is pointless.
-- mkdir_p='mkdir -p --'
--else
-- # On NextStep and OpenStep, the `mkdir' command does not
-- # recognize any option. It will interpret all options as
-- # directories to create, and then abort because `.' already
-- # exists.
-- for d in ./-p ./--version;
-- do
-- test -d $d && rmdir $d
-- done
-- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-- if test -f "$ac_aux_dir/mkinstalldirs"; then
-- mkdir_p='$(mkinstalldirs)'
-- else
-- mkdir_p='$(install_sh) -d'
-- fi
--fi
--AC_SUBST([mkdir_p])])
-+[AC_PREREQ([2.60])dnl
-+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
-+dnl while keeping a definition of mkdir_p for backward compatibility.
-+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-+dnl Makefile.ins that do not define MKDIR_P, so we do our own
-+dnl adjustment using top_builddir (which is defined more often than
-+dnl MKDIR_P).
-+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-+case $mkdir_p in
-+ [[\\/$]]* | ?:[[\\/]]*) ;;
-+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-+esac
-+])
-
- # Helper functions for option handling. -*- Autoconf -*-
-
-@@ -8110,9 +8315,21 @@
- if test "$cross_compiling" != no; then
- AC_CHECK_TOOL([STRIP], [strip], :)
- fi
--INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
- AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-+# Copyright (C) 2006 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# _AM_SUBST_NOTMAKE(VARIABLE)
-+# ---------------------------
-+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
-+# This macro is traced by Automake.
-+AC_DEFUN([_AM_SUBST_NOTMAKE])
-+
- # Check how to create a tarball. -*- Autoconf -*-
-
- # Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/configure tomboy-0.8.1/configure
---- tomboy-0.8.1.old/configure 2007-10-15 04:33:13.000000000 +0200
-+++ tomboy-0.8.1/configure 2007-10-16 13:02:14.000000000 +0200
-@@ -807,6 +807,7 @@
- INSTALL_PROGRAM
- INSTALL_SCRIPT
- INSTALL_DATA
-+am__isrc
- CYGPATH_W
- PACKAGE
- VERSION
-@@ -855,14 +856,11 @@
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/configure tomboy-0.8.2/configure
+--- tomboy-0.8.2.old/configure 2007-11-26 16:51:22.000000000 +0100
++++ tomboy-0.8.2/configure 2007-11-26 17:07:40.000000000 +0100
+@@ -856,14 +856,11 @@
INTLTOOL_SCHEMAS_RULE
INTLTOOL_THEME_RULE
INTLTOOL_SERVICE_RULE
@@ -1542,15 +217,15 @@
ALL_LINGUAS
CC
CFLAGS
-@@ -892,6 +890,7 @@
- host_cpu
- host_vendor
- host_os
-+SED
- LN_S
- ECHO
- AR
-@@ -947,6 +946,10 @@
+@@ -924,6 +921,7 @@
+ PO_IN_DATADIR_FALSE
+ POFILES
+ POSUB
++MKINSTALLDIRS
+ GCONFTOOL
+ GCONF_SCHEMA_CONFIG_SOURCE
+ GCONF_SCHEMA_FILE_DIR
+@@ -948,6 +946,10 @@
DBUS_LIBS
EXTERNAL_DBUS_TRUE
EXTERNAL_DBUS_FALSE
@@ -1561,7 +236,7 @@
TOMBOY_CFLAGS
TOMBOY_LIBS
EVOLUTION_CFLAGS
-@@ -989,6 +992,8 @@
+@@ -990,6 +992,8 @@
GTKSPELL_LIBS
DBUS_CFLAGS
DBUS_LIBS
@@ -1570,7 +245,7 @@
TOMBOY_CFLAGS
TOMBOY_LIBS
EVOLUTION_CFLAGS
-@@ -1606,6 +1611,7 @@
+@@ -1607,6 +1611,7 @@
--with-gconf-source=sourceaddress Config database for installing schema files.
--with-gconf-schema-file-dir=dir Directory for installing schema files.
--with-dbus-service-dir=DIR Where to install Tomboy's DBus service file.
@@ -1578,7 +253,7 @@
Some influential environment variables:
PKG_CONFIG path to pkg-config utility
-@@ -1632,6 +1638,10 @@
+@@ -1633,6 +1638,10 @@
linker flags for GTKSPELL, overriding pkg-config
DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config
DBUS_LIBS linker flags for DBUS, overriding pkg-config
@@ -1589,210 +264,7 @@
TOMBOY_CFLAGS
C compiler flags for TOMBOY, overriding pkg-config
TOMBOY_LIBS linker flags for TOMBOY, overriding pkg-config
-@@ -2077,7 +2087,8 @@
-
-
-
--am__api_version="1.9"
-+am__api_version='1.10'
-+
- ac_aux_dir=
- for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
- if test -f "$ac_dir/install-sh"; then
-@@ -2260,38 +2271,53 @@
- echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
- fi
-
--if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-- # We used to keeping the `.' as first argument, in order to
-- # allow $(mkdir_p) to be used without argument. As in
-- # $(mkdir_p) $(somedir)
-- # where $(somedir) is conditionally defined. However this is wrong
-- # for two reasons:
-- # 1. if the package is installed by a user who cannot write `.'
-- # make install will fail,
-- # 2. the above comment should most certainly read
-- # $(mkdir_p) $(DESTDIR)$(somedir)
-- # so it does not work when $(somedir) is undefined and
-- # $(DESTDIR) is not.
-- # To support the latter case, we have to write
-- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-- # so the `.' trick is pointless.
-- mkdir_p='mkdir -p --'
--else
-- # On NextStep and OpenStep, the `mkdir' command does not
-- # recognize any option. It will interpret all options as
-- # directories to create, and then abort because `.' already
-- # exists.
-- for d in ./-p ./--version;
-- do
-- test -d $d && rmdir $d
-- done
-- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-- if test -f "$ac_aux_dir/mkinstalldirs"; then
-- mkdir_p='$(mkinstalldirs)'
-+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
-+if test -z "$MKDIR_P"; then
-+ if test "${ac_cv_path_mkdir+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_prog in mkdir gmkdir; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-+ 'mkdir (GNU coreutils) '* | \
-+ 'mkdir (coreutils) '* | \
-+ 'mkdir (fileutils) '4.1*)
-+ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-+ break 3;;
-+ esac
-+ done
-+ done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+
-+ if test "${ac_cv_path_mkdir+set}" = set; then
-+ MKDIR_P="$ac_cv_path_mkdir -p"
- else
-- mkdir_p='$(install_sh) -d'
-+ # As a last resort, use the slow shell script. Don't cache a
-+ # value for MKDIR_P within a source directory, because that will
-+ # break other packages using the cache if that directory is
-+ # removed, or if the value is a relative name.
-+ test -d ./--version && rmdir ./--version
-+ MKDIR_P="$ac_install_sh -d"
- fi
- fi
-+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-+echo "${ECHO_T}$MKDIR_P" >&6; }
-+
-+mkdir_p="$MKDIR_P"
-+case $mkdir_p in
-+ [\\/$]* | ?:[\\/]*) ;;
-+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-+esac
-
- for ac_prog in gawk mawk nawk awk
- do
-@@ -2374,12 +2400,16 @@
- fi
- rmdir .tst 2>/dev/null
-
--# test to see if srcdir already configured
--if test "`cd $srcdir && pwd`" != "`pwd`" &&
-- test -f $srcdir/config.status; then
-- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-+if test "`cd $srcdir && pwd`" != "`pwd`"; then
-+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-+ # is not polluted with repeated "-I."
-+ am__isrc=' -I$(srcdir)'
-+ # test to see if srcdir already configured
-+ if test -f $srcdir/config.status; then
-+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
- echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
- { (exit 1); exit 1; }; }
-+ fi
- fi
-
- # test whether we have cygpath
-@@ -2422,7 +2452,7 @@
-
- MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
--install_sh=${install_sh-"$am_aux_dir/install-sh"}
-+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-
- # Installed binaries are usually stripped using `strip' when the user
- # run `make install-strip'. However `strip' might not be the right
-@@ -2526,7 +2556,7 @@
- fi
-
- fi
--INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
- # We need awk for the "check" target. The system "awk" is bad on
- # some platforms.
-@@ -2632,9 +2662,7 @@
-
- { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
- echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
--
--
--if test $USE_MAINTAINER_MODE = yes; then
-+ if test $USE_MAINTAINER_MODE = yes; then
- MAINTAINER_MODE_TRUE=
- MAINTAINER_MODE_FALSE='#'
- else
-@@ -2839,9 +2867,7 @@
- enable_scrollkeeper=yes
- fi
-
--
--
--if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
-+ if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
- ENABLE_SK_TRUE=
- ENABLE_SK_FALSE='#'
- else
-@@ -2850,9 +2876,7 @@
- fi
-
-
--
--
--if test "$gdu_cv_have_gdu" = "yes"; then
-+ if test "$gdu_cv_have_gdu" = "yes"; then
- HAVE_GNOME_DOC_UTILS_TRUE=
- HAVE_GNOME_DOC_UTILS_FALSE='#'
- else
-@@ -2999,9 +3023,7 @@
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
- fi
--
--
--if test "x$enable_dependency_tracking" != xno; then
-+ if test "x$enable_dependency_tracking" != xno; then
- AMDEP_TRUE=
- AMDEP_FALSE='#'
- else
-@@ -3010,7 +3032,6 @@
- fi
-
-
--
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3997,6 +4018,7 @@
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
- >/dev/null 2>conftest.err &&
-+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-@@ -4026,9 +4048,7 @@
- echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
- CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
--
--
--if
-+ if
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
- am__fastdepCC_TRUE=
-@@ -4085,6 +4105,8 @@
+@@ -4096,6 +4105,8 @@
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 $< $@'
@@ -1801,7 +273,7 @@
-@@ -4176,171 +4198,6 @@
+@@ -4187,171 +4198,6 @@
fi
fi
@@ -1973,7 +445,7 @@
# Substitute ALL_LINGUAS so we can use it in po/Makefile
-@@ -4358,7 +4215,7 @@
+@@ -4369,7 +4215,7 @@
main ()
{
extern int _nl_msg_cat_cntr;
@@ -1982,2281 +454,375 @@
;
return 0;
}
-@@ -5237,6 +5094,7 @@
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
- >/dev/null 2>conftest.err &&
-+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-@@ -5266,9 +5124,7 @@
- echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
- CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
--
--
--if
-+ if
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
- am__fastdepCC_TRUE=
-@@ -6100,12 +5956,13 @@
- test -z "$as_dir" && as_dir=.
- for lt_ac_prog in sed gsed; do
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-+ if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
- fi
- done
- done
- done
-+IFS=$as_save_IFS
- lt_ac_max=0
- lt_ac_count=0
- # Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -6140,6 +5997,7 @@
- fi
-
- SED=$lt_cv_path_SED
-+
- { echo "$as_me:$LINENO: result: $SED" >&5
- echo "${ECHO_T}$SED" >&6; }
-
-@@ -6339,8 +6197,8 @@
- echo "${ECHO_T}no, using $LN_S" >&6; }
- fi
-
--{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
--echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
-+echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
- if test "${lt_cv_deplibs_check_method+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6381,9 +6239,15 @@
-
- mingw* | pw32*)
- # Base MSYS/MinGW do not provide the 'file' command needed by
-- # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-- lt_cv_file_magic_cmd='$OBJDUMP -f'
-+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
-+ # unless we find 'file', for example because we are cross-compiling.
-+ if ( file / ) >/dev/null 2>&1; then
-+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+ lt_cv_file_magic_cmd='func_win32_libid'
-+ else
-+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+ lt_cv_file_magic_cmd='$OBJDUMP -f'
-+ fi
- ;;
-
- darwin* | rhapsody*)
-@@ -6428,7 +6292,7 @@
- esac
- ;;
-
--interix3*)
-+interix[3-9]*)
- # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
- ;;
-@@ -6478,6 +6342,10 @@
+@@ -6466,7 +6312,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-+rdos*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
- solaris*)
- lt_cv_deplibs_check_method=pass_all
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+ else
+@@ -6586,7 +6432,7 @@
;;
-@@ -6564,7 +6432,7 @@
- ;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 6567 "configure"' > conftest.$ac_ext
+- echo '#line 6589 "configure"' > conftest.$ac_ext
+ echo '#line 6435 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -6599,7 +6467,8 @@
- rm -rf conftest*
- ;;
-
--x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+s390*-*linux*|sparc*-*linux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -6610,6 +6479,9 @@
- case `/usr/bin/file conftest.o` in
- *32-bit*)
- case $host in
-+ x86_64-*kfreebsd*-gnu)
-+ LD="${LD-ld} -m elf_i386_fbsd"
-+ ;;
- x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
- ;;
-@@ -6626,6 +6498,9 @@
- ;;
- *64-bit*)
- case $host in
-+ x86_64-*kfreebsd*-gnu)
-+ LD="${LD-ld} -m elf_x86_64_fbsd"
-+ ;;
- x86_64-*linux*)
- LD="${LD-ld} -m elf_x86_64"
- ;;
-@@ -7383,6 +7258,7 @@
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
- >/dev/null 2>conftest.err &&
-+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-@@ -7412,9 +7288,7 @@
- echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
- CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
--
--
--if
-+ if
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
- am__fastdepCXX_TRUE=
-@@ -8009,24 +7883,27 @@
- fi
- ;;
- *)
-- # If test is not a shell built-in, we'll probably end up computing a
-- # maximum length that is only half of the actual maximum length, but
-- # we can't tell.
-- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-- while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
-+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-+ if test -n "$lt_cv_sys_max_cmd_len"; then
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+ else
-+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+ while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
- = "XX$teststring") >/dev/null 2>&1 &&
-- new_result=`expr "X$teststring" : ".*" 2>&1` &&
-- lt_cv_sys_max_cmd_len=$new_result &&
-- test $i != 17 # 1/2 MB should be enough
-- do
-- i=`expr $i + 1`
-- teststring=$teststring$teststring
-- done
-- teststring=
-- # Add a significant safety factor because C++ compilers can tack on massive
-- # amounts of additional arguments before passing them to the linker.
-- # It appears as though 1/2 is a usable value.
-- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
-+ lt_cv_sys_max_cmd_len=$new_result &&
-+ test $i != 17 # 1/2 MB should be enough
-+ do
-+ i=`expr $i + 1`
-+ teststring=$teststring$teststring
-+ done
-+ teststring=
-+ # Add a significant safety factor because C++ compilers can tack on massive
-+ # amounts of additional arguments before passing them to the linker.
-+ # It appears as though 1/2 is a usable value.
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+ fi
- ;;
- esac
-
-@@ -8043,6 +7920,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; }
-@@ -8631,7 +8509,7 @@
- test -z "$ac_objext" && ac_objext=o
-
- # Determine commands to create old-style static archives.
--old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
- old_postinstall_cmds='chmod 644 $oldlib'
- old_postuninstall_cmds=
-
-@@ -8831,10 +8709,10 @@
- objext=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
-+lt_simple_compile_test_code="int some_variable = 0;"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code='int main(){return(0);}\n'
-+lt_simple_link_test_code='int main(){return(0);}'
-
-
- # If no C compiler was specified, use CC.
-@@ -8849,13 +8727,13 @@
-
- # save warnings/boilerplate of simple test code
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
- eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
-
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
- $rm conftest*
-@@ -8875,7 +8753,7 @@
- else
- lt_cv_prog_compiler_rtti_exceptions=no
- ac_outfile=conftest.$ac_objext
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="-fno-rtti -fno-exceptions"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
-@@ -8886,11 +8764,11 @@
+@@ -8918,11 +8764,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:8889: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8921: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8767: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:8893: \$? = $ac_status" >&5
+- echo "$as_me:8925: \$? = $ac_status" >&5
+ echo "$as_me:8771: \$? = $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.
-@@ -8941,13 +8819,15 @@
- lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
- ;;
-
-- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
-+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+ # (--disable-auto-import) libraries
- lt_prog_compiler_pic='-DDLL_EXPORT'
- ;;
-
-@@ -8957,7 +8837,7 @@
- lt_prog_compiler_pic='-fno-common'
- ;;
-
-- interix3*)
-+ interix[3-9]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-@@ -9015,7 +8895,7 @@
- esac
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- lt_prog_compiler_pic='-DDLL_EXPORT'
-@@ -9067,6 +8947,22 @@
- # All Alpha code is PIC.
- lt_prog_compiler_static='-non_shared'
- ;;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C 5.9
-+ lt_prog_compiler_pic='-KPIC'
-+ lt_prog_compiler_static='-Bstatic'
-+ lt_prog_compiler_wl='-Wl,'
-+ ;;
-+ *Sun\ F*)
-+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+ lt_prog_compiler_pic='-KPIC'
-+ lt_prog_compiler_static='-Bstatic'
-+ lt_prog_compiler_wl=''
-+ ;;
-+ esac
-+ ;;
- esac
- ;;
-
-@@ -9076,6 +8972,10 @@
- lt_prog_compiler_static='-non_shared'
- ;;
-
-+ rdos*)
-+ lt_prog_compiler_static='-non_shared'
-+ ;;
-+
- solaris*)
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
-@@ -9143,7 +9043,7 @@
- else
- lt_prog_compiler_pic_works=no
- ac_outfile=conftest.$ac_objext
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
-@@ -9154,11 +9054,11 @@
+@@ -9208,11 +9054,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:9157: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9211: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9057: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9161: \$? = $ac_status" >&5
+- echo "$as_me:9215: \$? = $ac_status" >&5
+ echo "$as_me:9061: \$? = $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.
-@@ -9207,7 +9107,7 @@
- lt_prog_compiler_static_works=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-- printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The linker can only warn and ignore the option if not recognized
- # So say no if there are warnings
-@@ -9247,7 +9147,7 @@
- mkdir conftest
- cd conftest
- mkdir out
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
-@@ -9258,11 +9158,11 @@
+@@ -9312,11 +9158,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:9261: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9315: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9161: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9265: \$? = $ac_status" >&5
+- echo "$as_me:9319: \$? = $ac_status" >&5
+ echo "$as_me:9165: \$? = $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
-@@ -9454,7 +9354,7 @@
- allow_undefined_flag=unsupported
- always_export_symbols=no
- enable_shared_with_static_runtimes=yes
-- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -9472,7 +9372,7 @@
- fi
- ;;
-
-- interix3*)
-+ interix[3-9]*)
- hardcode_direct=no
- hardcode_shlibpath_var=no
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-@@ -9487,7 +9387,7 @@
- archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- linux* | k*bsd*-gnu)
-+ gnu* | linux* | k*bsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_addflag=
- case $cc_basename,$host_cpu in
-@@ -9505,13 +9405,22 @@
- ifc* | ifort*) # Intel Fortran compiler
- tmp_addflag=' -nofor_main' ;;
- esac
-- archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*) # Sun C 5.9
-+ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+ tmp_sharedflag='-G' ;;
-+ *Sun\ F*) # Sun Fortran 8.3
-+ tmp_sharedflag='-G' ;;
-+ *)
-+ tmp_sharedflag='-shared' ;;
-+ esac
-+ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+@@ -9576,12 +9422,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
-- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
- link_all_deplibs=no
++ link_all_deplibs=no
else
-@@ -9671,7 +9580,7 @@
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
-- hardcode_direct=yes
-+ :
- else
- # We have old collect2
- hardcode_direct=unsupported
-@@ -9745,11 +9654,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -9804,11 +9720,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -9862,7 +9785,7 @@
- # The linker will automatically build a .lib file if we build a DLL.
- old_archive_From_new_cmds='true'
- # FIXME: Should let the user specify the lib program.
-- old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
- fix_srcfile_path='`cygpath -w "$srcfile"`'
- enable_shared_with_static_runtimes=yes
- ;;
-@@ -9904,10 +9827,10 @@
- case $cc_basename in
- xlc*)
- output_verbose_link_cmd='echo'
-- archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
- *)
-@@ -10069,24 +9992,28 @@
- ;;
-
- openbsd*)
-- hardcode_direct=yes
-- hardcode_shlibpath_var=no
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-- export_dynamic_flag_spec='${wl}-E'
-+ if test -f /usr/libexec/ld.so; then
-+ hardcode_direct=yes
-+ hardcode_shlibpath_var=no
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+ export_dynamic_flag_spec='${wl}-E'
-+ else
-+ case $host_os in
-+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_libdir_flag_spec='-R$libdir'
-+ ;;
-+ *)
-+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+ ;;
-+ esac
-+ fi
- else
-- case $host_os in
-- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_libdir_flag_spec='-R$libdir'
-- ;;
-- *)
-- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-- ;;
-- esac
-+ ld_shlibs=no
+ ld_shlibs=no
fi
;;
-@@ -10145,17 +10072,16 @@
- case $host_os in
- solaris2.[0-5] | solaris2.[0-5].*) ;;
- *)
-- # The compiler driver will combine linker options so we
-- # cannot just pass the convience library names through
-- # without $wl, iff we do not link with $LD.
-- # Luckily, gcc supports the same syntax we need for Sun Studio.
-+ # The compiler driver will combine and reorder linker options,
-+ # but understands `-z linker_flag'. GCC discards it without `$wl',
-+ # but is careful enough not to reorder.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- case $wlarc in
-- '')
-- whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-- *)
-- whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-- esac ;;
-+ if test "$GCC" = yes; then
-+ whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ else
-+ whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
-+ fi
-+ ;;
- esac
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -10125,7 +9972,7 @@
link_all_deplibs=yes
;;
-@@ -10212,7 +10138,7 @@
- fi
- ;;
-- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
- no_undefined_flag='${wl}-z,text'
- archive_cmds_need_lc=no
- hardcode_shlibpath_var=no
-@@ -10289,7 +10215,7 @@
- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
- echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
- $rm conftest*
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
-@@ -10347,17 +10273,55 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+
- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-+ case $host_os in
-+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-+ *) lt_awk_arg="/^libraries:/" ;;
-+ esac
-+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
- # if the path contains ";" then we assume it to be the separator
- # otherwise default to the standard path separator (i.e. ":") - it is
- # assumed that no part of a normal pathname contains ";" but that should
- # okay in the real world where ";" in dirpaths is itself problematic.
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
- else
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
-+ # Ok, now we have the path, separated by spaces, we can step through it
-+ # and add multilib dir if necessary.
-+ lt_tmp_lt_search_path_spec=
-+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-+ for lt_sys_path in $lt_search_path_spec; do
-+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-+ else
-+ test -d "$lt_sys_path" && \
-+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-+ fi
-+ done
-+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
-+BEGIN {RS=" "; FS="/|\n";} {
-+ lt_foo="";
-+ lt_count=0;
-+ for (lt_i = NF; lt_i > 0; lt_i--) {
-+ if ($lt_i != "" && $lt_i != ".") {
-+ if ($lt_i == "..") {
-+ lt_count++;
-+ } else {
-+ if (lt_count == 0) {
-+ lt_foo="/" $lt_i lt_foo;
-+ } else {
-+ lt_count--;
-+ }
-+ }
-+ }
-+ }
-+ if (lt_foo != "") { lt_freq[lt_foo]++; }
-+ if (lt_freq[lt_foo] == 1) { print lt_foo; }
-+}'`
-+ sys_lib_search_path_spec=`echo $lt_search_path_spec`
- else
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
- fi
-@@ -10517,12 +10481,8 @@
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-- else
-- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-- fi
-+
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -10836,6 +10683,18 @@
+ dynamic_linker='GNU/Linux ld.so'
;;
-@@ -10576,7 +10536,7 @@
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-- freebsd*) # from 4.6 on
-+ *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-@@ -10639,7 +10599,7 @@
- postinstall_cmds='chmod 555 $lib'
- ;;
-
--interix3*)
-+interix[3-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -10710,7 +10670,7 @@
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
-- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
-@@ -10816,6 +10776,10 @@
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-+rdos*)
-+ dynamic_linker=no
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
- solaris*)
- version_type=linux
+ netbsd*)
+ version_type=sunos
need_lib_prefix=no
-@@ -10969,6 +10933,7 @@
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
-+ old_striplib="$STRIP -S"
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
- else
-@@ -11555,7 +11520,7 @@
+@@ -11661,7 +11520,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11558 "configure"
+-#line 11664 "configure"
+#line 11523 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11655,7 +11620,7 @@
+@@ -11761,7 +11620,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11658 "configure"
+-#line 11764 "configure"
+#line 11623 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11853,6 +11818,7 @@
- module_cmds \
- module_expsym_cmds \
- lt_cv_prog_compiler_c_o \
-+ fix_srcfile_path \
- exclude_expsyms \
- include_expsyms; do
-
-@@ -11897,7 +11863,7 @@
- # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
- # Free Software Foundation, Inc.
- #
- # This file is part of GNU Libtool:
-@@ -12221,7 +12187,7 @@
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
- # Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path"
-+fix_srcfile_path=$lt_fix_srcfile_path
-
- # Set to yes if exported symbols are required.
- always_export_symbols=$always_export_symbols
-@@ -12390,10 +12356,10 @@
- objext_CXX=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
-+lt_simple_compile_test_code="int some_variable = 0;"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
-+lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-@@ -12409,13 +12375,13 @@
-
- # save warnings/boilerplate of simple test code
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
- eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
-
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
- $rm conftest*
-@@ -12674,7 +12640,7 @@
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
-- hardcode_direct_CXX=yes
-+ :
- else
- # We have old collect2
- hardcode_direct_CXX=unsupported
-@@ -12748,11 +12714,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -12808,11 +12781,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -12931,10 +12911,10 @@
- case $cc_basename in
- xlc*)
- output_verbose_link_cmd='echo'
-- archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
- *)
-@@ -13017,9 +12997,7 @@
- hardcode_libdir_separator_CXX=:
-
- case $host_cpu in
-- hppa*64*|ia64*)
-- hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-- ;;
-+ hppa*64*|ia64*) ;;
- *)
- export_dynamic_flag_spec_CXX='${wl}-E'
- ;;
-@@ -13087,7 +13065,7 @@
+@@ -13371,7 +13230,7 @@
;;
esac
;;
-- interix3*)
-+ interix[3-9]*)
- hardcode_direct_CXX=no
- hardcode_shlibpath_var_CXX=no
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-@@ -13207,6 +13185,29 @@
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ no_undefined_flag_CXX=' -zdefs'
-+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-+ hardcode_libdir_flag_spec_CXX='-R$libdir'
-+ whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+
-+ # Not sure whether something based on
-+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-+ # would be better.
-+ output_verbose_link_cmd='echo'
-+
-+ # Archives containing C++ object files must be created using
-+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
-+ # necessary to make sure instantiated templates are included
-+ # in the archive.
-+ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-+ ;;
-+ esac
-+ ;;
- esac
- ;;
- lynxos*)
-@@ -13245,16 +13246,20 @@
- ld_shlibs_CXX=no
- ;;
- openbsd*)
-- hardcode_direct_CXX=yes
-- hardcode_shlibpath_var_CXX=no
-- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-- export_dynamic_flag_spec_CXX='${wl}-E'
-- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ if test -f /usr/libexec/ld.so; then
-+ hardcode_direct_CXX=yes
-+ hardcode_shlibpath_var_CXX=no
-+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+ export_dynamic_flag_spec_CXX='${wl}-E'
-+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ fi
-+ output_verbose_link_cmd='echo'
-+ else
-+ ld_shlibs_CXX=no
- fi
-- output_verbose_link_cmd='echo'
- ;;
- osf3*)
- case $cc_basename in
-@@ -13416,15 +13421,10 @@
- case $host_os in
- solaris2.[0-5] | solaris2.[0-5].*) ;;
- *)
-- # The C++ compiler is used as linker so we must use $wl
-- # flag to pass the commands to the underlying system
-- # linker. We must also pass each convience library through
-- # to the system linker between allextract/defaultextract.
-- # The C++ compiler will combine linker options so we
-- # cannot just pass the convience library names through
-- # without $wl.
-+ # The compiler driver will combine and reorder linker options,
-+ # but understands `-z linker_flag'.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
-+ whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+ wlarc=
+@@ -14072,7 +13931,7 @@
;;
esac
- link_all_deplibs_CXX=yes
-@@ -13471,6 +13471,12 @@
- fi
-
- hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-+ case $host_os in
-+ solaris2.[0-5] | solaris2.[0-5].*) ;;
-+ *)
-+ whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ ;;
-+ esac
- fi
;;
- esac
-@@ -13662,7 +13668,7 @@
-
- # PORTME: override above test on systems where it is broken
- case $host_os in
--interix3*)
-+interix[3-9]*)
- # Interix 3.5 installs completely hosed .la files for C++, so rather than
- # hack all around it, let's just trust "g++" to DTRT.
- predep_objects_CXX=
-@@ -13670,13 +13676,46 @@
- postdeps_CXX=
- ;;
-
--solaris*)
-- case $cc_basename in
-- CC*)
-- # Adding this requires a known-good setup of shared libraries for
-- # Sun compiler versions before 5.6, else PIC objects from an old
-+linux*)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ #
-+ # The more standards-conforming stlport4 library is
-+ # incompatible with the Cstd library. Avoid specifying
-+ # it if it's in CXXFLAGS. Ignore libCrun as
-+ # -library=stlport4 depends on it.
-+ case " $CXX $CXXFLAGS " in
-+ *" -library=stlport4 "*)
-+ solaris_use_stlport4=yes
-+ ;;
-+ esac
-+ if test "$solaris_use_stlport4" != yes; then
-+ postdeps_CXX='-library=Cstd -library=Crun'
-+ fi
-+ ;;
-+ esac
-+ ;;
-+
-+solaris*)
-+ case $cc_basename in
-+ CC*)
-+ # The more standards-conforming stlport4 library is
-+ # incompatible with the Cstd library. Avoid specifying
-+ # it if it's in CXXFLAGS. Ignore libCrun as
-+ # -library=stlport4 depends on it.
-+ case " $CXX $CXXFLAGS " in
-+ *" -library=stlport4 "*)
-+ solaris_use_stlport4=yes
-+ ;;
-+ esac
-+
-+ # Adding this requires a known-good setup of shared libraries for
-+ # Sun compiler versions before 5.6, else PIC objects from an old
- # archive will be linked into the output, leading to subtle bugs.
-- postdeps_CXX='-lCstd -lCrun'
-+ if test "$solaris_use_stlport4" != yes; then
-+ postdeps_CXX='-library=Cstd -library=Crun'
-+ fi
- ;;
- esac
- ;;
-@@ -13713,12 +13752,14 @@
- # like `-m68040'.
- lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
- ;;
-- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-- mingw* | os2* | pw32*)
-+ mingw* | cygwin* | os2* | pw32*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
-+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+ # (--disable-auto-import) libraries
- lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
- ;;
- darwin* | rhapsody*)
-@@ -13730,7 +13771,7 @@
- # DJGPP does not support shared libraries at all
- lt_prog_compiler_pic_CXX=
- ;;
-- interix3*)
-+ interix[3-9]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-@@ -13866,6 +13907,14 @@
- lt_prog_compiler_static_CXX='-non_shared'
- ;;
- *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ lt_prog_compiler_pic_CXX='-KPIC'
-+ lt_prog_compiler_static_CXX='-Bstatic'
-+ lt_prog_compiler_wl_CXX='-Qoption ld '
-+ ;;
-+ esac
- ;;
- esac
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
;;
-@@ -13980,7 +14029,7 @@
- else
- lt_prog_compiler_pic_works_CXX=no
- ac_outfile=conftest.$ac_objext
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
-@@ -13991,11 +14040,11 @@
+ osf3* | osf4* | osf5*)
+ case $cc_basename in
+@@ -14181,11 +14040,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:13994: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14184: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14043: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13998: \$? = $ac_status" >&5
+- echo "$as_me:14188: \$? = $ac_status" >&5
+ echo "$as_me:14047: \$? = $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.
-@@ -14044,7 +14093,7 @@
- lt_prog_compiler_static_works_CXX=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-- printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The linker can only warn and ignore the option if not recognized
- # So say no if there are warnings
-@@ -14084,7 +14133,7 @@
- mkdir conftest
- cd conftest
- mkdir out
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
-@@ -14095,11 +14144,11 @@
+@@ -14285,11 +14144,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:14098: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14288: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14147: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14102: \$? = $ac_status" >&5
+- echo "$as_me:14292: \$? = $ac_status" >&5
+ echo "$as_me:14151: \$? = $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
-@@ -14165,7 +14214,7 @@
- export_symbols_cmds_CXX="$ltdll_cmds"
- ;;
+@@ -14357,6 +14216,9 @@
cygwin* | mingw*)
-- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
;;
- linux* | k*bsd*-gnu)
- link_all_deplibs_CXX=no
-@@ -14199,7 +14248,7 @@
- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
- echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
- $rm conftest*
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
-@@ -14257,20 +14306,7 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
--if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-- # if the path contains ";" then we assume it to be the separator
-- # otherwise default to the standard path separator (i.e. ":") - it is
-- # assumed that no part of a normal pathname contains ";" but that should
-- # okay in the real world where ";" in dirpaths is itself problematic.
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-- else
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-- fi
--else
-- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
--fi
-+
- need_lib_prefix=unknown
- hardcode_into_libs=no
-
-@@ -14427,12 +14463,7 @@
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-- else
-- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-- fi
-+
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++ linux* | k*bsd*-gnu)
++ link_all_deplibs_CXX=no
++ ;;
+ *)
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-
-@@ -14486,7 +14517,7 @@
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-- freebsd*) # from 4.6 on
-+ *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-@@ -14549,7 +14580,7 @@
- postinstall_cmds='chmod 555 $lib'
+@@ -14802,6 +14664,18 @@
+ dynamic_linker='GNU/Linux ld.so'
;;
--interix3*)
-+interix[3-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -14620,7 +14651,7 @@
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
-- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
-@@ -14726,6 +14757,10 @@
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-+rdos*)
-+ dynamic_linker=no
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
- solaris*)
- version_type=linux
+ netbsd*)
+ version_type=sunos
need_lib_prefix=no
-@@ -14920,6 +14955,7 @@
- module_cmds_CXX \
- module_expsym_cmds_CXX \
- lt_cv_prog_compiler_c_o_CXX \
-+ fix_srcfile_path_CXX \
- exclude_expsyms_CXX \
- include_expsyms_CXX; do
-
-@@ -15240,7 +15276,7 @@
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
- # Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path_CXX"
-+fix_srcfile_path=$lt_fix_srcfile_path
-
- # Set to yes if exported symbols are required.
- always_export_symbols=$always_export_symbols_CXX
-@@ -15331,10 +15367,17 @@
- objext_F77=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code=" subroutine t\n return\n end\n"
-+lt_simple_compile_test_code="\
-+ subroutine t
-+ return
-+ end
-+"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code=" program t\n end\n"
-+lt_simple_link_test_code="\
-+ program t
-+ end
-+"
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-@@ -15350,13 +15393,13 @@
-
- # save warnings/boilerplate of simple test code
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
- eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
-
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
- $rm conftest*
-@@ -15443,13 +15486,15 @@
- lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
- ;;
-
-- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
-+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+ # (--disable-auto-import) libraries
- lt_prog_compiler_pic_F77='-DDLL_EXPORT'
- ;;
-
-@@ -15459,7 +15504,7 @@
- lt_prog_compiler_pic_F77='-fno-common'
- ;;
-
-- interix3*)
-+ interix[3-9]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-@@ -15517,7 +15562,7 @@
- esac
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-@@ -15569,6 +15614,22 @@
- # All Alpha code is PIC.
- lt_prog_compiler_static_F77='-non_shared'
- ;;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C 5.9
-+ lt_prog_compiler_pic_F77='-KPIC'
-+ lt_prog_compiler_static_F77='-Bstatic'
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ ;;
-+ *Sun\ F*)
-+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+ lt_prog_compiler_pic_F77='-KPIC'
-+ lt_prog_compiler_static_F77='-Bstatic'
-+ lt_prog_compiler_wl_F77=''
-+ ;;
-+ esac
-+ ;;
- esac
- ;;
-
-@@ -15578,6 +15639,10 @@
- lt_prog_compiler_static_F77='-non_shared'
- ;;
-
-+ rdos*)
-+ lt_prog_compiler_static_F77='-non_shared'
-+ ;;
-+
- solaris*)
- lt_prog_compiler_pic_F77='-KPIC'
- lt_prog_compiler_static_F77='-Bstatic'
-@@ -15645,7 +15710,7 @@
- else
- lt_prog_compiler_pic_works_F77=no
- ac_outfile=conftest.$ac_objext
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic_F77"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
-@@ -15656,11 +15721,11 @@
+@@ -15847,11 +15721,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:15659: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15850: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15724: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:15663: \$? = $ac_status" >&5
+- echo "$as_me:15854: \$? = $ac_status" >&5
+ echo "$as_me:15728: \$? = $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.
-@@ -15709,7 +15774,7 @@
- lt_prog_compiler_static_works_F77=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-- printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The linker can only warn and ignore the option if not recognized
- # So say no if there are warnings
-@@ -15749,7 +15814,7 @@
- mkdir conftest
- cd conftest
- mkdir out
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
-@@ -15760,11 +15825,11 @@
+@@ -15951,11 +15825,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:15763: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15954: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15828: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:15767: \$? = $ac_status" >&5
+- echo "$as_me:15958: \$? = $ac_status" >&5
+ echo "$as_me:15832: \$? = $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
-@@ -15956,7 +16021,7 @@
- allow_undefined_flag_F77=unsupported
- always_export_symbols_F77=no
- enable_shared_with_static_runtimes_F77=yes
-- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -15974,7 +16039,7 @@
- fi
- ;;
-
-- interix3*)
-+ interix[3-9]*)
- hardcode_direct_F77=no
- hardcode_shlibpath_var_F77=no
- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-@@ -15989,7 +16054,7 @@
- archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- linux* | k*bsd*-gnu)
-+ gnu* | linux* | k*bsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_addflag=
- case $cc_basename,$host_cpu in
-@@ -16007,13 +16072,22 @@
- ifc* | ifort*) # Intel Fortran compiler
- tmp_addflag=' -nofor_main' ;;
- esac
-- archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*) # Sun C 5.9
-+ whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+ tmp_sharedflag='-G' ;;
-+ *Sun\ F*) # Sun Fortran 8.3
-+ tmp_sharedflag='-G' ;;
-+ *)
-+ tmp_sharedflag='-shared' ;;
-+ esac
-+ archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+@@ -16215,12 +16089,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
-- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
- link_all_deplibs_F77=no
++ link_all_deplibs_F77=no
else
-@@ -16173,7 +16247,7 @@
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
-- hardcode_direct_F77=yes
-+ :
- else
- # We have old collect2
- hardcode_direct_F77=unsupported
-@@ -16237,11 +16311,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -16286,11 +16367,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -16344,7 +16432,7 @@
- # The linker will automatically build a .lib file if we build a DLL.
- old_archive_From_new_cmds_F77='true'
- # FIXME: Should let the user specify the lib program.
-- old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+ old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
- fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
- enable_shared_with_static_runtimes_F77=yes
- ;;
-@@ -16386,10 +16474,10 @@
- case $cc_basename in
- xlc*)
- output_verbose_link_cmd='echo'
-- archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
- *)
-@@ -16551,24 +16639,28 @@
- ;;
-
- openbsd*)
-- hardcode_direct_F77=yes
-- hardcode_shlibpath_var_F77=no
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-- export_dynamic_flag_spec_F77='${wl}-E'
-+ if test -f /usr/libexec/ld.so; then
-+ hardcode_direct_F77=yes
-+ hardcode_shlibpath_var_F77=no
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-+ export_dynamic_flag_spec_F77='${wl}-E'
-+ else
-+ case $host_os in
-+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_libdir_flag_spec_F77='-R$libdir'
-+ ;;
-+ *)
-+ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-+ ;;
-+ esac
-+ fi
- else
-- case $host_os in
-- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_libdir_flag_spec_F77='-R$libdir'
-- ;;
-- *)
-- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-- ;;
-- esac
-+ ld_shlibs_F77=no
+ ld_shlibs_F77=no
fi
;;
-@@ -16627,17 +16719,16 @@
- case $host_os in
- solaris2.[0-5] | solaris2.[0-5].*) ;;
- *)
-- # The compiler driver will combine linker options so we
-- # cannot just pass the convience library names through
-- # without $wl, iff we do not link with $LD.
-- # Luckily, gcc supports the same syntax we need for Sun Studio.
-+ # The compiler driver will combine and reorder linker options,
-+ # but understands `-z linker_flag'. GCC discards it without `$wl',
-+ # but is careful enough not to reorder.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- case $wlarc in
-- '')
-- whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
-- *)
-- whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-- esac ;;
-+ if test "$GCC" = yes; then
-+ whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ else
-+ whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
-+ fi
-+ ;;
- esac
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -16744,7 +16619,7 @@
link_all_deplibs_F77=yes
;;
-@@ -16694,7 +16785,7 @@
- fi
- ;;
-- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
- no_undefined_flag_F77='${wl}-z,text'
- archive_cmds_need_lc_F77=no
- hardcode_shlibpath_var_F77=no
-@@ -16771,7 +16862,7 @@
- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
- echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
- $rm conftest*
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
-@@ -16829,20 +16920,7 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
--if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-- # if the path contains ";" then we assume it to be the separator
-- # otherwise default to the standard path separator (i.e. ":") - it is
-- # assumed that no part of a normal pathname contains ";" but that should
-- # okay in the real world where ";" in dirpaths is itself problematic.
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-- else
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-- fi
--else
-- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
--fi
-+
- need_lib_prefix=unknown
- hardcode_into_libs=no
-
-@@ -16999,12 +17077,7 @@
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-- else
-- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-- fi
-+
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -17403,6 +17278,18 @@
+ dynamic_linker='GNU/Linux ld.so'
;;
-@@ -17058,7 +17131,7 @@
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-- freebsd*) # from 4.6 on
-+ *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-@@ -17121,7 +17194,7 @@
- postinstall_cmds='chmod 555 $lib'
- ;;
-
--interix3*)
-+interix[3-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -17192,7 +17265,7 @@
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
-- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
-@@ -17298,6 +17371,10 @@
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-+rdos*)
-+ dynamic_linker=no
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
- solaris*)
- version_type=linux
+ netbsd*)
+ version_type=sunos
need_lib_prefix=no
-@@ -17492,6 +17569,7 @@
- module_cmds_F77 \
- module_expsym_cmds_F77 \
- lt_cv_prog_compiler_c_o_F77 \
-+ fix_srcfile_path_F77 \
- exclude_expsyms_F77 \
- include_expsyms_F77; do
-
-@@ -17812,7 +17890,7 @@
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
- # Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path_F77"
-+fix_srcfile_path=$lt_fix_srcfile_path
-
- # Set to yes if exported symbols are required.
- always_export_symbols=$always_export_symbols_F77
-@@ -17870,10 +17948,10 @@
- objext_GCJ=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code="class foo {}\n"
-+lt_simple_compile_test_code="class foo {}"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
-+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-@@ -17889,13 +17967,13 @@
-
- # save warnings/boilerplate of simple test code
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
- eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
-
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
- $rm conftest*
-@@ -17936,7 +18014,7 @@
- else
- lt_cv_prog_compiler_rtti_exceptions=no
- ac_outfile=conftest.$ac_objext
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="-fno-rtti -fno-exceptions"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
-@@ -17947,11 +18025,11 @@
+@@ -18138,11 +18025,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:17950: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18141: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18028: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:17954: \$? = $ac_status" >&5
+- echo "$as_me:18145: \$? = $ac_status" >&5
+ echo "$as_me:18032: \$? = $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.
-@@ -18002,13 +18080,15 @@
- lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
- ;;
-
-- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
-+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+ # (--disable-auto-import) libraries
- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
- ;;
-
-@@ -18018,7 +18098,7 @@
- lt_prog_compiler_pic_GCJ='-fno-common'
- ;;
-
-- interix3*)
-+ interix[3-9]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-@@ -18076,7 +18156,7 @@
- esac
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-@@ -18128,6 +18208,22 @@
- # All Alpha code is PIC.
- lt_prog_compiler_static_GCJ='-non_shared'
- ;;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C 5.9
-+ lt_prog_compiler_pic_GCJ='-KPIC'
-+ lt_prog_compiler_static_GCJ='-Bstatic'
-+ lt_prog_compiler_wl_GCJ='-Wl,'
-+ ;;
-+ *Sun\ F*)
-+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+ lt_prog_compiler_pic_GCJ='-KPIC'
-+ lt_prog_compiler_static_GCJ='-Bstatic'
-+ lt_prog_compiler_wl_GCJ=''
-+ ;;
-+ esac
-+ ;;
- esac
- ;;
-
-@@ -18137,6 +18233,10 @@
- lt_prog_compiler_static_GCJ='-non_shared'
- ;;
-
-+ rdos*)
-+ lt_prog_compiler_static_GCJ='-non_shared'
-+ ;;
-+
- solaris*)
- lt_prog_compiler_pic_GCJ='-KPIC'
- lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18204,7 +18304,7 @@
- else
- lt_prog_compiler_pic_works_GCJ=no
- ac_outfile=conftest.$ac_objext
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
-@@ -18215,11 +18315,11 @@
+@@ -18428,11 +18315,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:18218: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18431: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18318: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18222: \$? = $ac_status" >&5
+- echo "$as_me:18435: \$? = $ac_status" >&5
+ echo "$as_me:18322: \$? = $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.
-@@ -18268,7 +18368,7 @@
- lt_prog_compiler_static_works_GCJ=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-- printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The linker can only warn and ignore the option if not recognized
- # So say no if there are warnings
-@@ -18308,7 +18408,7 @@
- mkdir conftest
- cd conftest
- mkdir out
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
-@@ -18319,11 +18419,11 @@
+@@ -18532,11 +18419,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:18322: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18535: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18422: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18326: \$? = $ac_status" >&5
+- echo "$as_me:18539: \$? = $ac_status" >&5
+ echo "$as_me:18426: \$? = $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
-@@ -18515,7 +18615,7 @@
- allow_undefined_flag_GCJ=unsupported
- always_export_symbols_GCJ=no
- enable_shared_with_static_runtimes_GCJ=yes
-- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -18533,7 +18633,7 @@
- fi
- ;;
-
-- interix3*)
-+ interix[3-9]*)
- hardcode_direct_GCJ=no
- hardcode_shlibpath_var_GCJ=no
- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-@@ -18548,7 +18648,7 @@
- archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- linux* | k*bsd*-gnu)
-+ gnu* | linux* | k*bsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_addflag=
- case $cc_basename,$host_cpu in
-@@ -18566,13 +18666,22 @@
- ifc* | ifort*) # Intel Fortran compiler
- tmp_addflag=' -nofor_main' ;;
- esac
-- archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*) # Sun C 5.9
-+ whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+ tmp_sharedflag='-G' ;;
-+ *Sun\ F*) # Sun Fortran 8.3
-+ tmp_sharedflag='-G' ;;
-+ *)
-+ tmp_sharedflag='-shared' ;;
-+ esac
-+ archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+@@ -18796,12 +18683,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
-- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
- link_all_deplibs_GCJ=no
++ link_all_deplibs_GCJ=no
else
-@@ -18732,7 +18841,7 @@
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
-- hardcode_direct_GCJ=yes
-+ :
- else
- # We have old collect2
- hardcode_direct_GCJ=unsupported
-@@ -18806,11 +18915,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -18865,11 +18981,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -18923,7 +19046,7 @@
- # The linker will automatically build a .lib file if we build a DLL.
- old_archive_From_new_cmds_GCJ='true'
- # FIXME: Should let the user specify the lib program.
-- old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+ old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
- fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
- enable_shared_with_static_runtimes_GCJ=yes
- ;;
-@@ -18965,10 +19088,10 @@
- case $cc_basename in
- xlc*)
- output_verbose_link_cmd='echo'
-- archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
- *)
-@@ -19130,24 +19253,28 @@
- ;;
-
- openbsd*)
-- hardcode_direct_GCJ=yes
-- hardcode_shlibpath_var_GCJ=no
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-- export_dynamic_flag_spec_GCJ='${wl}-E'
-+ if test -f /usr/libexec/ld.so; then
-+ hardcode_direct_GCJ=yes
-+ hardcode_shlibpath_var_GCJ=no
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-+ export_dynamic_flag_spec_GCJ='${wl}-E'
-+ else
-+ case $host_os in
-+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_libdir_flag_spec_GCJ='-R$libdir'
-+ ;;
-+ *)
-+ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-+ ;;
-+ esac
-+ fi
- else
-- case $host_os in
-- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_libdir_flag_spec_GCJ='-R$libdir'
-- ;;
-- *)
-- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-- ;;
-- esac
-+ ld_shlibs_GCJ=no
+ ld_shlibs_GCJ=no
fi
;;
-@@ -19206,17 +19333,16 @@
- case $host_os in
- solaris2.[0-5] | solaris2.[0-5].*) ;;
- *)
-- # The compiler driver will combine linker options so we
-- # cannot just pass the convience library names through
-- # without $wl, iff we do not link with $LD.
-- # Luckily, gcc supports the same syntax we need for Sun Studio.
-+ # The compiler driver will combine and reorder linker options,
-+ # but understands `-z linker_flag'. GCC discards it without `$wl',
-+ # but is careful enough not to reorder.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- case $wlarc in
-- '')
-- whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
-- *)
-- whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-- esac ;;
-+ if test "$GCC" = yes; then
-+ whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ else
-+ whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
-+ fi
-+ ;;
- esac
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -19345,7 +19233,7 @@
link_all_deplibs_GCJ=yes
;;
-@@ -19273,7 +19399,7 @@
- fi
- ;;
-- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
- no_undefined_flag_GCJ='${wl}-z,text'
- archive_cmds_need_lc_GCJ=no
- hardcode_shlibpath_var_GCJ=no
-@@ -19350,7 +19476,7 @@
- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
- echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
- $rm conftest*
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
-@@ -19408,20 +19534,7 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
--if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-- # if the path contains ";" then we assume it to be the separator
-- # otherwise default to the standard path separator (i.e. ":") - it is
-- # assumed that no part of a normal pathname contains ";" but that should
-- # okay in the real world where ";" in dirpaths is itself problematic.
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-- else
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-- fi
--else
-- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
--fi
-+
- need_lib_prefix=unknown
- hardcode_into_libs=no
-
-@@ -19578,12 +19691,7 @@
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-- else
-- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-- fi
-+
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -20004,6 +19892,18 @@
+ dynamic_linker='GNU/Linux ld.so'
;;
-@@ -19637,7 +19745,7 @@
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-- freebsd*) # from 4.6 on
-+ *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-@@ -19700,7 +19808,7 @@
- postinstall_cmds='chmod 555 $lib'
- ;;
-
--interix3*)
-+interix[3-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -19771,7 +19879,7 @@
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
-- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
-@@ -19877,6 +19985,10 @@
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-+rdos*)
-+ dynamic_linker=no
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
- solaris*)
- version_type=linux
+ netbsd*)
+ version_type=sunos
need_lib_prefix=no
-@@ -20071,6 +20183,7 @@
- module_cmds_GCJ \
- module_expsym_cmds_GCJ \
- lt_cv_prog_compiler_c_o_GCJ \
-+ fix_srcfile_path_GCJ \
- exclude_expsyms_GCJ \
- include_expsyms_GCJ; do
+@@ -22689,6 +22589,15 @@
+ fi
+ fi
-@@ -20391,7 +20504,7 @@
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
- # Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path_GCJ"
-+fix_srcfile_path=$lt_fix_srcfile_path
-
- # Set to yes if exported symbols are required.
- always_export_symbols=$always_export_symbols_GCJ
-@@ -20448,7 +20561,7 @@
- objext_RC=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
- # Code to be used in simple link tests
- lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -20467,13 +20580,13 @@
-
- # save warnings/boilerplate of simple test code
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
- eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
-
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
- $rm conftest*
-@@ -20551,6 +20664,7 @@
- module_cmds_RC \
- module_expsym_cmds_RC \
- lt_cv_prog_compiler_c_o_RC \
-+ fix_srcfile_path_RC \
- exclude_expsyms_RC \
- include_expsyms_RC; do
-
-@@ -20871,7 +20985,7 @@
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
- # Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path_RC"
-+fix_srcfile_path=$lt_fix_srcfile_path
-
- # Set to yes if exported symbols are required.
- always_export_symbols=$always_export_symbols_RC
-@@ -22154,8 +22268,8 @@
- "Content-Transfer-Encoding: 8bit\n"
-
- _ACEOF
--if { (echo "$as_me:$LINENO: msgfmt -c -o /dev/null conftest.foo") >&5
-- (msgfmt -c -o /dev/null conftest.foo) 2>&5
-+if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
-+ ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-@@ -22585,9 +22699,7 @@
- esac
- fi
-
--
--
--if test "$enable_schemas_install" != no; then
-+ if test "$enable_schemas_install" != no; then
- GCONF_SCHEMAS_INSTALL_TRUE=
- GCONF_SCHEMAS_INSTALL_FALSE='#'
- else
-@@ -22784,7 +22896,7 @@
++ MKINSTALLDIRS=
++ if test -n "$ac_aux_dir"; then
++ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
++ fi
++ if test -z "$MKINSTALLDIRS"; then
++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
++ fi
++
++
+ test -d po || mkdir po
+ if test "x$srcdir" != "x."; then
+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+@@ -22987,7 +22896,7 @@
and LIBTOMBOY_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -4265,7 +831,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
-@@ -22794,7 +22906,7 @@
+@@ -22997,7 +22906,7 @@
and LIBTOMBOY_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -4274,64 +840,9 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -22824,9 +22936,7 @@
- ENABLE_PANELAPPLET_SRVDIR_CHECK=yes
- fi
+@@ -23275,6 +23184,171 @@
--
--
--if test "$ENABLE_PANELAPPLET_SRVDIR_CHECK" = "yes"; then
-+ if test "$ENABLE_PANELAPPLET_SRVDIR_CHECK" = "yes"; then
- ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE=
- ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE='#'
- else
-@@ -22927,9 +23037,7 @@
- echo "${ECHO_T}yes" >&6; }
- FIXED_GTKSPELL="yes"
- fi
--
--
--if test "$FIXED_GTKSPELL" = "yes"; then
-+ if test "$FIXED_GTKSPELL" = "yes"; then
- FIXED_GTKSPELL_TRUE=
- FIXED_GTKSPELL_FALSE='#'
- else
-@@ -22946,9 +23054,7 @@
- enableval=$enable_dbus; ENABLE_DBUS="$enableval"
- fi
--
--
--if test "x$ENABLE_DBUS" != "xno"; then
-+ if test "x$ENABLE_DBUS" != "xno"; then
- ENABLE_DBUS_TRUE=
- ENABLE_DBUS_FALSE='#'
- else
-@@ -22963,9 +23069,7 @@
- withval=$with_dbus_service_dir;
- fi
-
--
--
--if test "x$with_dbus_service_dir" != "x"; then
-+ if test "x$with_dbus_service_dir" != "x"; then
- WITH_DBUS_SERVICE_DIR_TRUE=
- WITH_DBUS_SERVICE_DIR_FALSE='#'
- else
-@@ -23069,9 +23173,7 @@
- echo "${ECHO_T}using internal copy" >&6; }
- fi
- fi
--
--
--if test "x$have_external_dbus" = "xyes"; then
-+ if test "x$have_external_dbus" = "xyes"; then
- EXTERNAL_DBUS_TRUE=
- EXTERNAL_DBUS_FALSE='#'
- else
-@@ -23082,6 +23184,171 @@
-
-
#
+# Check for external Mono.Addins
+#
@@ -4501,7 +1012,7 @@
# Tomboy.exe needs Gtk# Gnome# GConf#
#
GTKSHARP2_MINIMUM_VERSION=$GTK20_MINIMUM_VERSION
-@@ -23176,7 +23443,7 @@
+@@ -23369,7 +23443,7 @@
and TOMBOY_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -4510,7 +1021,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
-@@ -23186,7 +23453,7 @@
+@@ -23379,7 +23453,7 @@
and TOMBOY_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -4519,40 +1030,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -23277,9 +23544,7 @@
- enableval=$enable_evolution; ENABLE_EVOLUTION="$enableval"
- fi
-
--
--
--if test "$ENABLE_EVOLUTION" = "yes"; then
-+ if test "$ENABLE_EVOLUTION" = "yes"; then
- ENABLE_EVOLUTION_TRUE=
- ENABLE_EVOLUTION_FALSE='#'
- else
-@@ -23368,9 +23633,7 @@
- enableval=$enable_galago; ENABLE_GALAGO="$enableval"
- fi
-
--
--
--if test "$ENABLE_GALAGO" = "yes"; then
-+ if test "$ENABLE_GALAGO" = "yes"; then
- ENABLE_GALAGO_TRUE=
- ENABLE_GALAGO_FALSE='#'
- else
-@@ -23454,9 +23717,7 @@
- echo "${ECHO_T}yes" >&6; }
- HAVE_NUNIT="yes"
- fi
--
--
--if test "$HAVE_NUNIT" = "yes"; then
-+ if test "$HAVE_NUNIT" = "yes"; then
- HAVE_NUNIT_TRUE=
- HAVE_NUNIT_FALSE='#'
- else
-@@ -23723,6 +23984,20 @@
+@@ -23910,6 +23984,20 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -4573,15 +1051,7 @@
if test -z "${ENABLE_EVOLUTION_TRUE}" && test -z "${ENABLE_EVOLUTION_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"ENABLE_EVOLUTION\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -24108,6 +24383,7 @@
- ac_pwd='$ac_pwd'
- srcdir='$srcdir'
- INSTALL='$INSTALL'
-+MKDIR_P='$MKDIR_P'
- _ACEOF
-
- cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -24203,9 +24479,7 @@
+@@ -24391,9 +24479,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"
@@ -4592,15 +1062,7 @@
_ACEOF
-@@ -24351,6 +24625,7 @@
- INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
- INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
- INSTALL_DATA!$INSTALL_DATA$ac_delim
-+am__isrc!$am__isrc$ac_delim
- CYGPATH_W!$CYGPATH_W$ac_delim
- PACKAGE!$PACKAGE$ac_delim
- VERSION!$VERSION$ac_delim
-@@ -24399,15 +24674,14 @@
+@@ -24588,14 +24674,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
@@ -4613,30 +1075,31 @@
-INTLTOOL_MSGFMT!$INTLTOOL_MSGFMT$ac_delim
-INTLTOOL_MSGMERGE!$INTLTOOL_MSGMERGE$ac_delim
-INTLTOOL_XGETTEXT!$INTLTOOL_XGETTEXT$ac_delim
- ALL_LINGUAS!$ALL_LINGUAS$ac_delim
++ALL_LINGUAS!$ALL_LINGUAS$ac_delim
+CC!$CC$ac_delim
+CFLAGS!$CFLAGS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -24449,8 +24723,6 @@
+@@ -24637,9 +24723,6 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+-ALL_LINGUAS!$ALL_LINGUAS$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
LDFLAGS!$LDFLAGS$ac_delim
CPPFLAGS!$CPPFLAGS$ac_delim
ac_ct_CC!$ac_ct_CC$ac_delim
-@@ -24477,6 +24749,7 @@
- host_cpu!$host_cpu$ac_delim
- host_vendor!$host_vendor$ac_delim
- host_os!$host_os$ac_delim
-+SED!$SED$ac_delim
- LN_S!$LN_S$ac_delim
- ECHO!$ECHO$ac_delim
- AR!$AR$ac_delim
-@@ -24532,6 +24805,10 @@
+@@ -24697,6 +24780,7 @@
+ PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
+ POFILES!$POFILES$ac_delim
+ POSUB!$POSUB$ac_delim
++MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
+ GCONFTOOL!$GCONFTOOL$ac_delim
+ GCONF_SCHEMA_CONFIG_SOURCE!$GCONF_SCHEMA_CONFIG_SOURCE$ac_delim
+ GCONF_SCHEMA_FILE_DIR!$GCONF_SCHEMA_FILE_DIR$ac_delim
+@@ -24721,6 +24805,10 @@
DBUS_LIBS!$DBUS_LIBS$ac_delim
EXTERNAL_DBUS_TRUE!$EXTERNAL_DBUS_TRUE$ac_delim
EXTERNAL_DBUS_FALSE!$EXTERNAL_DBUS_FALSE$ac_delim
@@ -4647,68 +1110,34 @@
TOMBOY_CFLAGS!$TOMBOY_CFLAGS$ac_delim
TOMBOY_LIBS!$TOMBOY_LIBS$ac_delim
EVOLUTION_CFLAGS!$EVOLUTION_CFLAGS$ac_delim
-@@ -24543,9 +24820,6 @@
+@@ -24732,8 +24820,6 @@
ENABLE_GALAGO_TRUE!$ENABLE_GALAGO_TRUE$ac_delim
ENABLE_GALAGO_FALSE!$ENABLE_GALAGO_FALSE$ac_delim
NUNIT_CFLAGS!$NUNIT_CFLAGS$ac_delim
-NUNIT_LIBS!$NUNIT_LIBS$ac_delim
-HAVE_NUNIT_TRUE!$HAVE_NUNIT_TRUE$ac_delim
--HAVE_NUNIT_FALSE!$HAVE_NUNIT_FALSE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -24587,6 +24861,9 @@
+@@ -24775,6 +24861,8 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+NUNIT_LIBS!$NUNIT_LIBS$ac_delim
+HAVE_NUNIT_TRUE!$HAVE_NUNIT_TRUE$ac_delim
-+HAVE_NUNIT_FALSE!$HAVE_NUNIT_FALSE$ac_delim
+ HAVE_NUNIT_FALSE!$HAVE_NUNIT_FALSE$ac_delim
NUNIT!$NUNIT$ac_delim
XGETTEXT_PLUGIN_NAME!$XGETTEXT_PLUGIN_NAME$ac_delim
- XGETTEXT_PLUGIN_DESC!$XGETTEXT_PLUGIN_DESC$ac_delim
-@@ -24594,7 +24871,7 @@
+@@ -24783,7 +24871,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 5; then
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 6; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 8; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -24821,6 +25098,11 @@
- [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
- *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
- esac
-+ ac_MKDIR_P=$MKDIR_P
-+ case $MKDIR_P in
-+ [\\/$]* | ?:[\\/]* ) ;;
-+ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-+ esac
- _ACEOF
-
- cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -24874,6 +25156,7 @@
- s&@abs_builddir@&$ac_abs_builddir&;t t
- s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
- s&@INSTALL@&$ac_INSTALL&;t t
-+s&@MKDIR_P@&$ac_MKDIR_P&;t t
- $ac_datarootdir_hack
- " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
-
-@@ -25038,8 +25321,9 @@
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
-- # So let's grep whole file.
-- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-+ # Grep'ing the whole file is not good either: AIX grep has a line
-+ # limit of 2048, but all sed's we know have understand at least 4000.
-+ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
- $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
-@@ -25158,10 +25442,6 @@
+@@ -25354,10 +25442,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" \
@@ -4719,90 +1148,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
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/data/images/Makefile.in tomboy-0.8.1/data/images/Makefile.in
---- tomboy-0.8.1.old/data/images/Makefile.in 2007-10-15 15:42:37.000000000 +0200
-+++ tomboy-0.8.1/data/images/Makefile.in 2007-10-16 13:02:19.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -60,8 +56,6 @@
- ACLOCAL = @ACLOCAL@
- ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -92,30 +86,14 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
--ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
--ENABLE_EVOLUTION_FALSE = @ENABLE_EVOLUTION_FALSE@
--ENABLE_EVOLUTION_TRUE = @ENABLE_EVOLUTION_TRUE@
--ENABLE_GALAGO_FALSE = @ENABLE_GALAGO_FALSE@
--ENABLE_GALAGO_TRUE = @ENABLE_GALAGO_TRUE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EVOLUTION_CFLAGS = @EVOLUTION_CFLAGS@
- EVOLUTION_LIBS = @EVOLUTION_LIBS@
- EXEEXT = @EXEEXT@
--EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
--EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--FIXED_GTKSPELL_FALSE = @FIXED_GTKSPELL_FALSE@
--FIXED_GTKSPELL_TRUE = @FIXED_GTKSPELL_TRUE@
- GALAGO_CFLAGS = @GALAGO_CFLAGS@
- GALAGO_LIBS = @GALAGO_LIBS@
- GCONFTOOL = @GCONFTOOL@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -125,11 +103,8 @@
- GREP = @GREP@
- GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@
- GTKSPELL_LIBS = @GTKSPELL_LIBS@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_NUNIT_FALSE = @HAVE_NUNIT_FALSE@
--HAVE_NUNIT_TRUE = @HAVE_NUNIT_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -140,14 +115,12 @@
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/data/images/Makefile.in tomboy-0.8.2/data/images/Makefile.in
+--- tomboy-0.8.2.old/data/images/Makefile.in 2007-11-26 16:51:21.000000000 +0100
++++ tomboy-0.8.2/data/images/Makefile.in 2007-11-26 17:07:43.000000000 +0100
+@@ -115,14 +115,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -4818,7 +1167,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -159,7 +132,6 @@
+@@ -134,7 +132,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -4826,299 +1175,20 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -171,10 +143,11 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
+@@ -148,6 +145,9 @@
MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
NUNIT = @NUNIT@
-@@ -196,6 +169,7 @@
- PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -203,18 +177,16 @@
- TOMBOY_LIBS = @TOMBOY_LIBS@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
--WITH_DBUS_SERVICE_DIR_FALSE = @WITH_DBUS_SERVICE_DIR_FALSE@
--WITH_DBUS_SERVICE_DIR_TRUE = @WITH_DBUS_SERVICE_DIR_TRUE@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_PLUGIN_DESC = @XGETTEXT_PLUGIN_DESC@
- XGETTEXT_PLUGIN_NAME = @XGETTEXT_PLUGIN_NAME@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -226,6 +198,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -253,8 +226,11 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- pixmapdir = $(datadir)/pixmaps
- pixmap_DATA = tomboy.png
- hicolordir = $(datadir)/icons/hicolor
-@@ -319,13 +295,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-pixmapDATA: $(pixmap_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(pixmapdir)" || $(mkdir_p) "$(DESTDIR)$(pixmapdir)"
-+ test -z "$(pixmapdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapdir)"
- @list='$(pixmap_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -348,22 +320,21 @@
-
-
- distdir: $(DISTFILES)
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-- esac; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
-+ esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -379,7 +350,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(pixmapdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -411,7 +382,7 @@
-
- distclean: distclean-am
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
-
- dvi: dvi-am
-
-@@ -427,12 +398,20 @@
- @$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-data-hook
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man:
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -451,20 +430,24 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-pixmapDATA
-+uninstall-am: uninstall-pixmapDATA
- @$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
-
-+.MAKE: install-am install-data-am install-strip uninstall-am
-+
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-data-hook \
-- install-data-local install-exec install-exec-am install-info \
-- install-info-am install-man install-pixmapDATA install-strip \
-+ install-data-local install-dvi install-dvi-am install-exec \
-+ install-exec-am install-html install-html-am install-info \
-+ install-info-am install-man install-pdf install-pdf-am \
-+ install-pixmapDATA install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-- uninstall-hook uninstall-info-am uninstall-pixmapDATA
-+ uninstall-hook uninstall-pixmapDATA
-
-
- install-data-local:
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/data/Makefile.in tomboy-0.8.1/data/Makefile.in
---- tomboy-0.8.1.old/data/Makefile.in 2007-10-15 15:42:36.000000000 +0200
-+++ tomboy-0.8.1/data/Makefile.in 2007-10-16 13:02:19.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -50,10 +46,11 @@
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
-- install-exec-recursive install-info-recursive \
-- install-recursive installcheck-recursive installdirs-recursive \
-- pdf-recursive ps-recursive uninstall-info-recursive \
-- uninstall-recursive
-+ install-dvi-recursive install-exec-recursive \
-+ install-html-recursive install-info-recursive \
-+ install-pdf-recursive install-ps-recursive install-recursive \
-+ installcheck-recursive installdirs-recursive pdf-recursive \
-+ ps-recursive uninstall-recursive
- man1dir = $(mandir)/man1
- am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(dbusservicedir)" \
- "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(pkgconfigdir)" \
-@@ -73,6 +70,8 @@
- serverDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(dbusservice_DATA) $(desktop_DATA) $(noinst_DATA) \
- $(pkgconfig_DATA) $(schemas_DATA) $(server_DATA)
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
-+ distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = $(SUBDIRS)
-@@ -80,8 +79,6 @@
- ACLOCAL = @ACLOCAL@
- ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -112,30 +109,14 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
--ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
--ENABLE_EVOLUTION_FALSE = @ENABLE_EVOLUTION_FALSE@
--ENABLE_EVOLUTION_TRUE = @ENABLE_EVOLUTION_TRUE@
--ENABLE_GALAGO_FALSE = @ENABLE_GALAGO_FALSE@
--ENABLE_GALAGO_TRUE = @ENABLE_GALAGO_TRUE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EVOLUTION_CFLAGS = @EVOLUTION_CFLAGS@
- EVOLUTION_LIBS = @EVOLUTION_LIBS@
- EXEEXT = @EXEEXT@
--EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
--EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--FIXED_GTKSPELL_FALSE = @FIXED_GTKSPELL_FALSE@
--FIXED_GTKSPELL_TRUE = @FIXED_GTKSPELL_TRUE@
- GALAGO_CFLAGS = @GALAGO_CFLAGS@
- GALAGO_LIBS = @GALAGO_LIBS@
- GCONFTOOL = @GCONFTOOL@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -145,11 +126,8 @@
- GREP = @GREP@
- GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@
- GTKSPELL_LIBS = @GTKSPELL_LIBS@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_NUNIT_FALSE = @HAVE_NUNIT_FALSE@
--HAVE_NUNIT_TRUE = @HAVE_NUNIT_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -160,14 +138,12 @@
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/data/Makefile.in tomboy-0.8.2/data/Makefile.in
+--- tomboy-0.8.2.old/data/Makefile.in 2007-11-26 16:51:21.000000000 +0100
++++ tomboy-0.8.2/data/Makefile.in 2007-11-26 17:07:43.000000000 +0100
+@@ -138,14 +138,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5134,7 +1204,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -179,7 +155,6 @@
+@@ -157,7 +155,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5142,387 +1212,19 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -191,10 +166,11 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
+@@ -171,6 +168,9 @@
MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
NUNIT = @NUNIT@
-@@ -216,6 +192,7 @@
- PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -223,18 +200,16 @@
- TOMBOY_LIBS = @TOMBOY_LIBS@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
--WITH_DBUS_SERVICE_DIR_FALSE = @WITH_DBUS_SERVICE_DIR_FALSE@
--WITH_DBUS_SERVICE_DIR_TRUE = @WITH_DBUS_SERVICE_DIR_TRUE@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_PLUGIN_DESC = @XGETTEXT_PLUGIN_DESC@
- XGETTEXT_PLUGIN_NAME = @XGETTEXT_PLUGIN_NAME@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -246,6 +221,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -273,8 +249,11 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- SUBDIRS = images
- desktop_in_files = tomboy.desktop.in
- desktop_files = $(desktop_in_files:.desktop.in=.desktop)
-@@ -354,13 +333,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-man1: $(man1_MANS) $(man_MANS)
- @$(NORMAL_INSTALL)
-- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
-+ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- for i in $$l2; do \
-@@ -405,7 +380,7 @@
- done
- install-dbusserviceDATA: $(dbusservice_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(dbusservicedir)" || $(mkdir_p) "$(DESTDIR)$(dbusservicedir)"
-+ test -z "$(dbusservicedir)" || $(MKDIR_P) "$(DESTDIR)$(dbusservicedir)"
- @list='$(dbusservice_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -422,7 +397,7 @@
- done
- install-desktopDATA: $(desktop_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(desktopdir)" || $(mkdir_p) "$(DESTDIR)$(desktopdir)"
-+ test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
- @list='$(desktop_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -439,7 +414,7 @@
- done
- install-pkgconfigDATA: $(pkgconfig_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
-+ test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
- @list='$(pkgconfig_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -456,7 +431,7 @@
- done
- install-schemasDATA: $(schemas_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(schemasdir)" || $(mkdir_p) "$(DESTDIR)$(schemasdir)"
-+ test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)"
- @list='$(schemas_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -473,7 +448,7 @@
- done
- install-serverDATA: $(server_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(serverdir)" || $(mkdir_p) "$(DESTDIR)$(serverdir)"
-+ test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)"
- @list='$(server_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -520,8 +495,7 @@
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
-@@ -622,22 +596,21 @@
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- distdir: $(DISTFILES)
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-- esac; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
-+ esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -651,7 +624,7 @@
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -659,6 +632,8 @@
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
-+ am__remove_distdir=: \
-+ am__skip_length_check=: \
- distdir) \
- || exit 1; \
- fi; \
-@@ -669,7 +644,7 @@
- installdirs: installdirs-recursive
- installdirs-am:
- for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(dbusservicedir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(serverdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-recursive
- install-exec: install-exec-recursive
-@@ -703,8 +678,7 @@
-
- distclean: distclean-recursive
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool \
-- distclean-tags
-+distclean-am: clean-am distclean-generic distclean-tags
-
- dvi: dvi-recursive
-
-@@ -720,12 +694,20 @@
- install-desktopDATA install-man install-pkgconfigDATA \
- install-schemasDATA install-serverDATA
-
-+install-dvi: install-dvi-recursive
-+
- install-exec-am:
-
-+install-html: install-html-recursive
-+
- install-info: install-info-recursive
-
- install-man: install-man1
-
-+install-pdf: install-pdf-recursive
-+
-+install-ps: install-ps-recursive
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-recursive
-@@ -745,30 +727,31 @@
- ps-am:
-
- uninstall-am: uninstall-dbusserviceDATA uninstall-desktopDATA \
-- uninstall-info-am uninstall-man uninstall-pkgconfigDATA \
-- uninstall-schemasDATA uninstall-serverDATA
--
--uninstall-info: uninstall-info-recursive
-+ uninstall-man uninstall-pkgconfigDATA uninstall-schemasDATA \
-+ uninstall-serverDATA
-
- uninstall-man: uninstall-man1
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-- clean clean-generic clean-libtool clean-recursive ctags \
-- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am html \
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-+ install-strip
-+
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+ all all-am check check-am clean clean-generic clean-libtool \
-+ ctags ctags-recursive distclean distclean-generic \
-+ distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-data-local install-dbusserviceDATA \
-- install-desktopDATA install-exec install-exec-am install-info \
-- install-info-am install-man install-man1 install-pkgconfigDATA \
-+ install-desktopDATA install-dvi install-dvi-am install-exec \
-+ install-exec-am install-html install-html-am install-info \
-+ install-info-am install-man install-man1 install-pdf \
-+ install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
- install-schemasDATA install-serverDATA install-strip \
- installcheck installcheck-am installdirs installdirs-am \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-+ maintainer-clean maintainer-clean-generic mostlyclean \
-+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am \
-- uninstall-dbusserviceDATA uninstall-desktopDATA \
-- uninstall-info-am uninstall-man uninstall-man1 \
-- uninstall-pkgconfigDATA uninstall-schemasDATA \
-+ uninstall-dbusserviceDATA uninstall-desktopDATA uninstall-man \
-+ uninstall-man1 uninstall-pkgconfigDATA uninstall-schemasDATA \
- uninstall-serverDATA
-
-
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/depcomp tomboy-0.8.1/depcomp
---- tomboy-0.8.1.old/depcomp 2007-10-15 15:42:38.000000000 +0200
-+++ tomboy-0.8.1/depcomp 2007-10-16 13:02:20.000000000 +0200
-@@ -1,9 +1,10 @@
- #! /bin/sh
- # depcomp - compile a program generating dependencies as side-effects
-
--scriptversion=2005-07-09.11
-+scriptversion=2006-10-15.18
-
--# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
-+# Foundation, Inc.
-
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -91,7 +92,20 @@
- ## gcc 3 implements dependency tracking that does exactly what
- ## we want. Yay! Note: for some reason libtool 1.4 doesn't like
- ## it if -MD -MP comes after the -MF stuff. Hmm.
-- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-+## the command line argument order; so add the flags where they
-+## appear in depend2.am. Note that the slowdown incurred here
-+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-+ for arg
-+ do
-+ case $arg in
-+ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-+ *) set fnord "$@" "$arg" ;;
-+ esac
-+ shift # fnord
-+ shift # $arg
-+ done
-+ "$@"
- stat=$?
- if test $stat -eq 0; then :
- else
-@@ -276,6 +290,46 @@
- rm -f "$tmpdepfile"
- ;;
-
-+hp2)
-+ # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-+ # compilers, which have integrated preprocessors. The correct option
-+ # to use with these is +Maked; it writes dependencies to a file named
-+ # 'foo.d', which lands next to the object file, wherever that
-+ # happens to be.
-+ # Much of this is similar to the tru64 case; see comments there.
-+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+ test "x$dir" = "x$object" && dir=
-+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-+ if test "$libtool" = yes; then
-+ tmpdepfile1=$dir$base.d
-+ tmpdepfile2=$dir.libs/$base.d
-+ "$@" -Wc,+Maked
-+ else
-+ tmpdepfile1=$dir$base.d
-+ tmpdepfile2=$dir$base.d
-+ "$@" +Maked
-+ fi
-+ stat=$?
-+ if test $stat -eq 0; then :
-+ else
-+ rm -f "$tmpdepfile1" "$tmpdepfile2"
-+ exit $stat
-+ fi
-+
-+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-+ do
-+ test -f "$tmpdepfile" && break
-+ done
-+ if test -f "$tmpdepfile"; then
-+ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-+ # Add `dependent.h:' lines.
-+ sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
-+ else
-+ echo "#dummy" > "$depfile"
-+ fi
-+ rm -f "$tmpdepfile" "$tmpdepfile2"
-+ ;;
-+
- tru64)
- # The Tru64 compiler uses -MD to generate dependencies as a side
- # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-@@ -288,13 +342,13 @@
-
- if test "$libtool" = yes; then
- # With Tru64 cc, shared objects can also be used to make a
-- # static library. This mecanism is used in libtool 1.4 series to
-+ # static library. This mechanism is used in libtool 1.4 series to
- # handle both shared and static libraries in a single compilation.
- # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
- #
- # With libtool 1.5 this exception was removed, and libtool now
- # generates 2 separate objects for the 2 libraries. These two
-- # compilations output dependencies in in $dir.libs/$base.o.d and
-+ # compilations output dependencies in $dir.libs/$base.o.d and
- # in $dir$base.o.d. We have to check for both files, because
- # one of the two compilations can be disabled. We should prefer
- # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/gnome-doc-utils.make tomboy-0.8.1/gnome-doc-utils.make
---- tomboy-0.8.1.old/gnome-doc-utils.make 2007-10-15 15:42:29.000000000 +0200
-+++ tomboy-0.8.1/gnome-doc-utils.make 2007-10-16 13:02:04.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/gnome-doc-utils.make tomboy-0.8.2/gnome-doc-utils.make
+--- tomboy-0.8.2.old/gnome-doc-utils.make 2007-10-15 16:22:59.000000000 +0200
++++ tomboy-0.8.2/gnome-doc-utils.make 2007-11-26 17:07:32.000000000 +0100
@@ -416,6 +416,11 @@
@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
for doc in $$list; do \
@@ -5557,90 +1259,10 @@
echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
fi; \
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/help/Makefile.in tomboy-0.8.1/help/Makefile.in
---- tomboy-0.8.1.old/help/Makefile.in 2007-10-15 15:42:38.000000000 +0200
-+++ tomboy-0.8.1/help/Makefile.in 2007-10-16 13:02:20.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -37,15 +37,11 @@
- # the same distribution terms that you use for the rest of that program.
-
- ################################################################################
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -75,8 +71,6 @@
- ACLOCAL = @ACLOCAL@
- ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -107,30 +101,14 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
--ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
--ENABLE_EVOLUTION_FALSE = @ENABLE_EVOLUTION_FALSE@
--ENABLE_EVOLUTION_TRUE = @ENABLE_EVOLUTION_TRUE@
--ENABLE_GALAGO_FALSE = @ENABLE_GALAGO_FALSE@
--ENABLE_GALAGO_TRUE = @ENABLE_GALAGO_TRUE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EVOLUTION_CFLAGS = @EVOLUTION_CFLAGS@
- EVOLUTION_LIBS = @EVOLUTION_LIBS@
- EXEEXT = @EXEEXT@
--EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
--EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--FIXED_GTKSPELL_FALSE = @FIXED_GTKSPELL_FALSE@
--FIXED_GTKSPELL_TRUE = @FIXED_GTKSPELL_TRUE@
- GALAGO_CFLAGS = @GALAGO_CFLAGS@
- GALAGO_LIBS = @GALAGO_LIBS@
- GCONFTOOL = @GCONFTOOL@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -140,11 +118,8 @@
- GREP = @GREP@
- GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@
- GTKSPELL_LIBS = @GTKSPELL_LIBS@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_NUNIT_FALSE = @HAVE_NUNIT_FALSE@
--HAVE_NUNIT_TRUE = @HAVE_NUNIT_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -155,14 +130,12 @@
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/help/Makefile.in tomboy-0.8.2/help/Makefile.in
+--- tomboy-0.8.2.old/help/Makefile.in 2007-11-26 16:51:21.000000000 +0100
++++ tomboy-0.8.2/help/Makefile.in 2007-11-26 17:07:44.000000000 +0100
+@@ -130,14 +130,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5656,7 +1278,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -174,7 +147,6 @@
+@@ -149,7 +147,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5664,182 +1286,17 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -186,10 +158,11 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
+@@ -163,6 +160,9 @@
MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
NUNIT = @NUNIT@
-@@ -211,6 +184,7 @@
- PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -218,18 +192,16 @@
- TOMBOY_LIBS = @TOMBOY_LIBS@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
--WITH_DBUS_SERVICE_DIR_FALSE = @WITH_DBUS_SERVICE_DIR_FALSE@
--WITH_DBUS_SERVICE_DIR_TRUE = @WITH_DBUS_SERVICE_DIR_TRUE@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_PLUGIN_DESC = @XGETTEXT_PLUGIN_DESC@
- XGETTEXT_PLUGIN_NAME = @XGETTEXT_PLUGIN_NAME@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -241,6 +213,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -268,8 +241,11 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
- _DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS))
- _DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)), \
-@@ -414,10 +390,6 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
-
-@@ -426,23 +398,21 @@
-
-
- distdir: $(DISTFILES)
-- $(mkdir_p) $(distdir)/..
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-- esac; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
-+ esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -490,8 +460,7 @@
-
- distclean: distclean-am
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool \
-- distclean-local
-+distclean-am: clean-am distclean-generic distclean-local
-
- dvi: dvi-am
-
-@@ -505,12 +474,20 @@
-
- install-data-am: install-data-local
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man:
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -531,19 +508,22 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-local
-+uninstall-am: uninstall-local
-+
-+.MAKE: install-am install-strip
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- clean-local dist-hook distclean distclean-generic \
- distclean-libtool distclean-local distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
-- install-data-am install-data-local install-exec \
-- install-exec-am install-info install-info-am install-man \
-- install-strip installcheck installcheck-am installdirs \
-- maintainer-clean maintainer-clean-generic \
-- maintainer-clean-local mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am \
-- uninstall uninstall-am uninstall-info-am uninstall-local
-+ install-data-am install-data-local install-dvi install-dvi-am \
-+ install-exec install-exec-am install-html install-html-am \
-+ install-info install-info-am install-man install-pdf \
-+ install-pdf-am install-ps install-ps-am install-strip \
-+ installcheck installcheck-am installdirs maintainer-clean \
-+ maintainer-clean-generic maintainer-clean-local mostlyclean \
-+ mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
-+ pdf-am ps ps-am uninstall uninstall-am uninstall-local
-
-
- DOC_H_FILE ?=
-@@ -758,6 +738,11 @@
+@@ -738,6 +738,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; \
@@ -5851,7 +1308,7 @@
echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
$(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
done
-@@ -826,6 +811,12 @@
+@@ -806,6 +811,12 @@
done
@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
@@ -5864,7 +1321,7 @@
echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
done
-@@ -893,7 +884,7 @@
+@@ -873,7 +884,7 @@
uninstall-doc-omf:
@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
@@ -5873,481 +1330,9 @@
echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
fi; \
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/install-sh tomboy-0.8.1/install-sh
---- tomboy-0.8.1.old/install-sh 2007-10-15 15:42:33.000000000 +0200
-+++ tomboy-0.8.1/install-sh 2007-10-16 13:02:16.000000000 +0200
-@@ -1,7 +1,7 @@
- #!/bin/sh
- # install - install a program, script, or datafile
-
--scriptversion=2005-05-14.22
-+scriptversion=2006-10-14.15
-
- # This originates from X11R5 (mit/util/scripts/install.sh), which was
- # later released in X11R6 (xc/config/util/install.sh) with the
-@@ -39,15 +39,24 @@
- # when there is no Makefile.
- #
- # This script is compatible with the BSD install script, but was written
--# from scratch. It can only install one file at a time, a restriction
--# shared with many OS's install programs.
-+# from scratch.
-+
-+nl='
-+'
-+IFS=" "" $nl"
-
- # set DOITPROG to echo to test this script
-
- # Don't use :- since 4.3BSD and earlier shells don't like it.
- doit="${DOITPROG-}"
-+if test -z "$doit"; then
-+ doit_exec=exec
-+else
-+ doit_exec=$doit
-+fi
-
--# put in absolute paths if you don't have them in your path; or use env. vars.
-+# Put in absolute file names if you don't have them in your path;
-+# or use environment vars.
-
- mvprog="${MVPROG-mv}"
- cpprog="${CPPROG-cp}"
-@@ -58,7 +67,13 @@
- rmprog="${RMPROG-rm}"
- mkdirprog="${MKDIRPROG-mkdir}"
-
--chmodcmd="$chmodprog 0755"
-+posix_glob=
-+posix_mkdir=
-+
-+# Desired mode of installed file.
-+mode=0755
-+
-+chmodcmd=$chmodprog
- chowncmd=
- chgrpcmd=
- stripcmd=
-@@ -95,7 +110,7 @@
- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
- "
-
--while test -n "$1"; do
-+while test $# -ne 0; do
- case $1 in
- -c) shift
- continue;;
-@@ -111,9 +126,15 @@
-
- --help) echo "$usage"; exit $?;;
-
-- -m) chmodcmd="$chmodprog $2"
-+ -m) mode=$2
- shift
- shift
-+ case $mode in
-+ *' '* | *' '* | *'
-+'* | *'*'* | *'?'* | *'['*)
-+ echo "$0: invalid mode: $mode" >&2
-+ exit 1;;
-+ esac
- continue;;
-
- -o) chowncmd="$chownprog $2"
-@@ -136,25 +157,33 @@
-
- --version) echo "$0 $scriptversion"; exit $?;;
-
-- *) # When -d is used, all remaining arguments are directories to create.
-- # When -t is used, the destination is already specified.
-- test -n "$dir_arg$dstarg" && break
-- # Otherwise, the last argument is the destination. Remove it from $@.
-- for arg
-- do
-- if test -n "$dstarg"; then
-- # $@ is not empty: it contains at least $arg.
-- set fnord "$@" "$dstarg"
-- shift # fnord
-- fi
-- shift # arg
-- dstarg=$arg
-- done
-+ --) shift
- break;;
-+
-+ -*) echo "$0: invalid option: $1" >&2
-+ exit 1;;
-+
-+ *) break;;
- esac
- done
-
--if test -z "$1"; then
-+if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
-+ # When -d is used, all remaining arguments are directories to create.
-+ # When -t is used, the destination is already specified.
-+ # Otherwise, the last argument is the destination. Remove it from $@.
-+ for arg
-+ do
-+ if test -n "$dstarg"; then
-+ # $@ is not empty: it contains at least $arg.
-+ set fnord "$@" "$dstarg"
-+ shift # fnord
-+ fi
-+ shift # arg
-+ dstarg=$arg
-+ done
-+fi
-+
-+if test $# -eq 0; then
- if test -z "$dir_arg"; then
- echo "$0: no input file specified." >&2
- exit 1
-@@ -164,6 +193,33 @@
- exit 0
- fi
-
-+if test -z "$dir_arg"; then
-+ trap '(exit $?); exit' 1 2 13 15
-+
-+ # Set umask so as not to create temps with too-generous modes.
-+ # However, 'strip' requires both read and write access to temps.
-+ case $mode in
-+ # Optimize common cases.
-+ *644) cp_umask=133;;
-+ *755) cp_umask=22;;
-+
-+ *[0-7])
-+ if test -z "$stripcmd"; then
-+ u_plus_rw=
-+ else
-+ u_plus_rw='% 200'
-+ fi
-+ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-+ *)
-+ if test -z "$stripcmd"; then
-+ u_plus_rw=
-+ else
-+ u_plus_rw=,u+rw
-+ fi
-+ cp_umask=$mode$u_plus_rw;;
-+ esac
-+fi
-+
- for src
- do
- # Protect names starting with `-'.
-@@ -173,15 +229,11 @@
-
- if test -n "$dir_arg"; then
- dst=$src
-- src=
--
-- if test -d "$dst"; then
-- mkdircmd=:
-- chmodcmd=
-- else
-- mkdircmd=$mkdirprog
-- fi
-+ dstdir=$dst
-+ test -d "$dstdir"
-+ dstdir_status=$?
- else
-+
- # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
- # might cause directories to be created, which would be especially bad
- # if $src (and thus $dsttmp) contains '*'.
-@@ -208,53 +260,188 @@
- echo "$0: $dstarg: Is a directory" >&2
- exit 1
- fi
-- dst=$dst/`basename "$src"`
-+ dstdir=$dst
-+ dst=$dstdir/`basename "$src"`
-+ dstdir_status=0
-+ else
-+ # Prefer dirname, but fall back on a substitute if dirname fails.
-+ dstdir=`
-+ (dirname "$dst") 2>/dev/null ||
-+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$dst" : 'X\(//\)[^/]' \| \
-+ X"$dst" : 'X\(//\)$' \| \
-+ X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-+ echo X"$dst" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'
-+ `
-+
-+ test -d "$dstdir"
-+ dstdir_status=$?
- fi
- fi
-
-- # This sed command emulates the dirname command.
-- dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
--
-- # Make sure that the destination directory exists.
-+ obsolete_mkdir_used=false
-
-- # Skip lots of stat calls in the usual case.
-- if test ! -d "$dstdir"; then
-- defaultIFS='
-- '
-- IFS="${IFS-$defaultIFS}"
--
-- oIFS=$IFS
-- # Some sh's can't handle IFS=/ for some reason.
-- IFS='%'
-- set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-- shift
-- IFS=$oIFS
-+ if test $dstdir_status != 0; then
-+ case $posix_mkdir in
-+ '')
-+ # Create intermediate dirs using mode 755 as modified by the umask.
-+ # This is like FreeBSD 'install' as of 1997-10-28.
-+ umask=`umask`
-+ case $stripcmd.$umask in
-+ # Optimize common cases.
-+ *[2367][2367]) mkdir_umask=$umask;;
-+ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-+
-+ *[0-7])
-+ mkdir_umask=`expr $umask + 22 \
-+ - $umask % 100 % 40 + $umask % 20 \
-+ - $umask % 10 % 4 + $umask % 2
-+ `;;
-+ *) mkdir_umask=$umask,go-w;;
-+ esac
-+
-+ # With -d, create the new directory with the user-specified mode.
-+ # Otherwise, rely on $mkdir_umask.
-+ if test -n "$dir_arg"; then
-+ mkdir_mode=-m$mode
-+ else
-+ mkdir_mode=
-+ fi
-+
-+ posix_mkdir=false
-+ case $umask in
-+ *[123567][0-7][0-7])
-+ # POSIX mkdir -p sets u+wx bits regardless of umask, which
-+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-+ ;;
-+ *)
-+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-+
-+ if (umask $mkdir_umask &&
-+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-+ then
-+ if test -z "$dir_arg" || {
-+ # Check for POSIX incompatibilities with -m.
-+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-+ # other-writeable bit of parent directory when it shouldn't.
-+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-+ ls_ld_tmpdir=`ls -ld "$tmpdir"`
-+ case $ls_ld_tmpdir in
-+ d????-?r-*) different_mode=700;;
-+ d????-?--*) different_mode=755;;
-+ *) false;;
-+ esac &&
-+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-+ }
-+ }
-+ then posix_mkdir=:
-+ fi
-+ rmdir "$tmpdir/d" "$tmpdir"
-+ else
-+ # Remove any dirs left behind by ancient mkdir implementations.
-+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-+ fi
-+ trap '' 0;;
-+ esac;;
-+ esac
-
-- pathcomp=
-+ if
-+ $posix_mkdir && (
-+ umask $mkdir_umask &&
-+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-+ )
-+ then :
-+ else
-
-- while test $# -ne 0 ; do
-- pathcomp=$pathcomp$1
-+ # The umask is ridiculous, or mkdir does not conform to POSIX,
-+ # or it failed possibly due to a race condition. Create the
-+ # directory the slow way, step by step, checking for races as we go.
-+
-+ case $dstdir in
-+ /*) prefix=/ ;;
-+ -*) prefix=./ ;;
-+ *) prefix= ;;
-+ esac
-+
-+ case $posix_glob in
-+ '')
-+ if (set -f) 2>/dev/null; then
-+ posix_glob=true
-+ else
-+ posix_glob=false
-+ fi ;;
-+ esac
-+
-+ oIFS=$IFS
-+ IFS=/
-+ $posix_glob && set -f
-+ set fnord $dstdir
- shift
-- if test ! -d "$pathcomp"; then
-- $mkdirprog "$pathcomp"
-- # mkdir can fail with a `File exist' error in case several
-- # install-sh are creating the directory concurrently. This
-- # is OK.
-- test -d "$pathcomp" || exit
-+ $posix_glob && set +f
-+ IFS=$oIFS
-+
-+ prefixes=
-+
-+ for d
-+ do
-+ test -z "$d" && continue
-+
-+ prefix=$prefix$d
-+ if test -d "$prefix"; then
-+ prefixes=
-+ else
-+ if $posix_mkdir; then
-+ (umask=$mkdir_umask &&
-+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-+ # Don't fail if two instances are running concurrently.
-+ test -d "$prefix" || exit 1
-+ else
-+ case $prefix in
-+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-+ *) qprefix=$prefix;;
-+ esac
-+ prefixes="$prefixes '$qprefix'"
-+ fi
-+ fi
-+ prefix=$prefix/
-+ done
-+
-+ if test -n "$prefixes"; then
-+ # Don't fail if two instances are running concurrently.
-+ (umask $mkdir_umask &&
-+ eval "\$doit_exec \$mkdirprog $prefixes") ||
-+ test -d "$dstdir" || exit 1
-+ obsolete_mkdir_used=true
- fi
-- pathcomp=$pathcomp/
-- done
-+ fi
- fi
-
- if test -n "$dir_arg"; then
-- $doit $mkdircmd "$dst" \
-- && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-- && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-- && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
--
-+ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-+ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-+ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
- else
-- dstfile=`basename "$dst"`
-
- # Make a couple of temp file names in the proper directory.
- dsttmp=$dstdir/_inst.$$_
-@@ -262,10 +449,9 @@
-
- # Trap to clean up those temp files at exit.
- trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-- trap '(exit $?); exit' 1 2 13 15
-
- # Copy the file name to the temp name.
-- $doit $cpprog "$src" "$dsttmp" &&
-+ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
- # and set any options; do chmod last to preserve setuid bits.
- #
-@@ -276,10 +462,10 @@
- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-- && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
-+ && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
- # Now rename the file to the real destination.
-- { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
-+ { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
- || {
- # The rename failed, perhaps because mv can't rename something else
- # to itself, or perhaps because mv is so ancient that it does not
-@@ -291,11 +477,12 @@
- # reasons. In this case, the final cleanup might fail but the new
- # file should still install successfully.
- {
-- if test -f "$dstdir/$dstfile"; then
-- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-- || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-+ if test -f "$dst"; then
-+ $doit $rmcmd -f "$dst" 2>/dev/null \
-+ || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
-+ && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
- || {
-- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-+ echo "$0: cannot unlink or rename $dst" >&2
- (exit 1); exit 1
- }
- else
-@@ -304,16 +491,13 @@
- } &&
-
- # Now rename the file to the real destination.
-- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-+ $doit $mvcmd "$dsttmp" "$dst"
- }
-- }
-- fi || { (exit 1); exit 1; }
--done
-+ } || exit 1
-
--# The final little trick to "correctly" pass the exit status to the exit trap.
--{
-- (exit 0); exit 0
--}
-+ trap '' 0
-+ fi
-+done
-
- # Local variables:
- # eval: (add-hook 'write-file-hooks 'time-stamp)
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/intltool-extract.in tomboy-0.8.1/intltool-extract.in
---- tomboy-0.8.1.old/intltool-extract.in 2007-10-15 15:42:29.000000000 +0200
-+++ tomboy-0.8.1/intltool-extract.in 2007-10-16 13:02:04.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/intltool-extract.in tomboy-0.8.2/intltool-extract.in
+--- tomboy-0.8.2.old/intltool-extract.in 2007-10-15 16:22:59.000000000 +0200
++++ tomboy-0.8.2/intltool-extract.in 2007-11-26 17:07:32.000000000 +0100
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
@@ -6368,9 +1353,9 @@
return $_;
}
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/intltool-merge.in tomboy-0.8.1/intltool-merge.in
---- tomboy-0.8.1.old/intltool-merge.in 2007-10-15 15:42:29.000000000 +0200
-+++ tomboy-0.8.1/intltool-merge.in 2007-10-16 13:02:04.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/intltool-merge.in tomboy-0.8.2/intltool-merge.in
+--- tomboy-0.8.2.old/intltool-merge.in 2007-10-15 16:22:59.000000000 +0200
++++ tomboy-0.8.2/intltool-merge.in 2007-11-26 17:07:32.000000000 +0100
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
@@ -6470,9 +1455,9 @@
return $_;
}
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/intltool-update.in tomboy-0.8.1/intltool-update.in
---- tomboy-0.8.1.old/intltool-update.in 2007-10-15 15:42:29.000000000 +0200
-+++ tomboy-0.8.1/intltool-update.in 2007-10-16 13:02:04.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/intltool-update.in tomboy-0.8.2/intltool-update.in
+--- tomboy-0.8.2.old/intltool-update.in 2007-10-15 16:22:59.000000000 +0200
++++ tomboy-0.8.2/intltool-update.in 2007-11-26 17:07:32.000000000 +0100
@@ -30,7 +30,7 @@
## Release information
@@ -6541,16 +1526,14 @@
}
}
-@@ -563,11 +580,23 @@
+@@ -563,13 +580,33 @@
exit 1;
}
--sub isIntltoolExtractInPath
+sub isProgramInPath
- {
- my ($file) = @_;
- # If either a file exists, or when run it returns 0 exit status
-- return 1 if ((-x $file) or (system("$file >/dev/null") == 0));
++{
++ my ($file) = @_;
++ # If either a file exists, or when run it returns 0 exit status
+ return 1 if ((-x $file) or (system("$file --version >$devnull") == 0));
+ return 0;
+}
@@ -6564,19 +1547,21 @@
+ my $version = `$file --version`;
+ return 1 if ($version =~ m/.*\(GNU .*\).*/);
+ }
- return 0;
- }
++ return 0;
++}
++
+ sub GenerateHeaders
+ {
+ my $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} || "intltool-extract";
-@@ -577,7 +606,7 @@
-
## Generate the .h header files, so we can allow glade and
## xml translation support
-- if (! isIntltoolExtractInPath("$EXTRACT"))
+- if (0)
+ if (! isProgramInPath ("$EXTRACT"))
{
print STDERR "\n *** The intltool-extract script wasn't found!"
."\n *** Without it, intltool-update can not generate files.\n";
-@@ -624,13 +653,13 @@
+@@ -616,13 +653,13 @@
#
sub GeneratePOTemplate
{
@@ -6593,7 +1578,7 @@
" *** Without it, intltool-update can not extract strings.\n";
exit;
}
-@@ -726,7 +755,23 @@
+@@ -718,7 +755,23 @@
unlink "$MODULE.pot";
my @xgettext_argument=("$XGETTEXT",
"--add-comments",
@@ -6618,7 +1603,7 @@
"--output\=$MODULE\.pot",
"--files-from\=\.\/POTFILES\.in\.temp");
my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
-@@ -793,9 +838,16 @@
+@@ -785,9 +838,16 @@
{
-f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n";
@@ -6636,7 +1621,7 @@
print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE;
my $infile = "$SRCDIR/$lang.po";
-@@ -836,7 +888,14 @@
+@@ -828,7 +888,14 @@
sub Console_Write_TranslationStatus
{
my ($lang, $output_file) = @_;
@@ -6652,7 +1637,7 @@
$output_file = "$SRCDIR/$lang.po" if ($output_file eq "");
-@@ -845,21 +904,28 @@
+@@ -837,21 +904,28 @@
sub Console_Write_CoverageReport
{
@@ -6685,7 +1670,7 @@
system ("$MSGFMT", "-o", "$devnull", "--verbose", "$SRCDIR/$lang.po");
}
}
-@@ -933,13 +999,13 @@
+@@ -925,13 +999,13 @@
$conf_in || die "Cannot find top_builddir in Makevars.";
}
@@ -6703,118 +1688,10 @@
}
else
{
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/libtomboy/Makefile.in tomboy-0.8.1/libtomboy/Makefile.in
---- tomboy-0.8.1.old/libtomboy/Makefile.in 2007-10-15 15:42:38.000000000 +0200
-+++ tomboy-0.8.1/libtomboy/Makefile.in 2007-10-16 13:02:20.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -59,17 +55,21 @@
- am_libtomboy_la_OBJECTS = tomboykeybinder.lo tomboyutil.lo \
- eggaccelerators.lo eggtrayicon.lo
- libtomboy_la_OBJECTS = $(am_libtomboy_la_OBJECTS)
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+libtomboy_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+ $(libtomboy_la_LDFLAGS) $(LDFLAGS) -o $@
-+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+ $(LDFLAGS) -o $@
- SOURCES = $(libtomboy_la_SOURCES)
- DIST_SOURCES = $(libtomboy_la_SOURCES)
- ETAGS = etags
-@@ -78,8 +78,6 @@
- ACLOCAL = @ACLOCAL@
- ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -110,30 +108,14 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
--ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
--ENABLE_EVOLUTION_FALSE = @ENABLE_EVOLUTION_FALSE@
--ENABLE_EVOLUTION_TRUE = @ENABLE_EVOLUTION_TRUE@
--ENABLE_GALAGO_FALSE = @ENABLE_GALAGO_FALSE@
--ENABLE_GALAGO_TRUE = @ENABLE_GALAGO_TRUE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EVOLUTION_CFLAGS = @EVOLUTION_CFLAGS@
- EVOLUTION_LIBS = @EVOLUTION_LIBS@
- EXEEXT = @EXEEXT@
--EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
--EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--FIXED_GTKSPELL_FALSE = @FIXED_GTKSPELL_FALSE@
--FIXED_GTKSPELL_TRUE = @FIXED_GTKSPELL_TRUE@
- GALAGO_CFLAGS = @GALAGO_CFLAGS@
- GALAGO_LIBS = @GALAGO_LIBS@
- GCONFTOOL = @GCONFTOOL@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -143,11 +125,8 @@
- GREP = @GREP@
- GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@
- GTKSPELL_LIBS = @GTKSPELL_LIBS@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_NUNIT_FALSE = @HAVE_NUNIT_FALSE@
--HAVE_NUNIT_TRUE = @HAVE_NUNIT_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -158,14 +137,12 @@
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/libtomboy/Makefile.in tomboy-0.8.2/libtomboy/Makefile.in
+--- tomboy-0.8.2.old/libtomboy/Makefile.in 2007-11-26 16:51:21.000000000 +0100
++++ tomboy-0.8.2/libtomboy/Makefile.in 2007-11-26 17:07:44.000000000 +0100
+@@ -137,14 +137,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -6830,7 +1707,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -177,7 +154,6 @@
+@@ -156,7 +154,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -6838,905 +1715,58 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -189,10 +165,11 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
+@@ -170,6 +167,9 @@
MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
NUNIT = @NUNIT@
-@@ -214,6 +191,7 @@
- PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -221,18 +199,16 @@
- TOMBOY_LIBS = @TOMBOY_LIBS@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
--WITH_DBUS_SERVICE_DIR_FALSE = @WITH_DBUS_SERVICE_DIR_FALSE@
--WITH_DBUS_SERVICE_DIR_TRUE = @WITH_DBUS_SERVICE_DIR_TRUE@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_PLUGIN_DESC = @XGETTEXT_PLUGIN_DESC@
- XGETTEXT_PLUGIN_NAME = @XGETTEXT_PLUGIN_NAME@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -244,6 +220,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -271,8 +248,11 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- INCLUDES = \
- -I$(top_srcdir) \
- -DG_LOG_DOMAIN=\"libtomboy\" \
-@@ -331,7 +311,7 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-tomboylibLTLIBRARIES: $(tomboylib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-- test -z "$(tomboylibdir)" || $(mkdir_p) "$(DESTDIR)$(tomboylibdir)"
-+ test -z "$(tomboylibdir)" || $(MKDIR_P) "$(DESTDIR)$(tomboylibdir)"
- @list='$(tomboylib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- f=$(am__strip_dir) \
-@@ -342,7 +322,7 @@
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/ltmain.sh tomboy-0.8.2/ltmain.sh
+--- tomboy-0.8.2.old/ltmain.sh 2007-09-21 20:28:33.000000000 +0200
++++ tomboy-0.8.2/ltmain.sh 2007-08-14 19:43:36.000000000 +0200
+@@ -43,8 +43,8 @@
- uninstall-tomboylibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(tomboylib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(tomboylib_LTLIBRARIES)'; for p in $$list; do \
- p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(tomboylibdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(tomboylibdir)/$$p"; \
-@@ -357,7 +337,7 @@
- rm -f "$${dir}/so_locations"; \
- done
- libtomboy.la: $(libtomboy_la_OBJECTS) $(libtomboy_la_DEPENDENCIES)
-- $(LINK) -rpath $(tomboylibdir) $(libtomboy_la_LDFLAGS) $(libtomboy_la_OBJECTS) $(libtomboy_la_LIBADD) $(LIBS)
-+ $(libtomboy_la_LINK) -rpath $(tomboylibdir) $(libtomboy_la_OBJECTS) $(libtomboy_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-@@ -371,22 +351,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tomboyutil.Plo at am__quote@
-
- .c.o:
-- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
-- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
- .c.lo:
-- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-@@ -397,10 +377,6 @@
- clean-libtool:
- -rm -rf .libs _libs
-
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -450,22 +426,21 @@
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- distdir: $(DISTFILES)
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-- esac; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
-+ esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -481,7 +456,7 @@
- all-am: Makefile $(LTLIBRARIES)
- installdirs:
- for dir in "$(DESTDIR)$(tomboylibdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -516,7 +491,7 @@
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
-- distclean-libtool distclean-tags
-+ distclean-tags
-
- dvi: dvi-am
-
-@@ -530,12 +505,20 @@
-
- install-data-am: install-tomboylibLTLIBRARIES
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man:
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -557,20 +540,24 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-tomboylibLTLIBRARIES
-+uninstall-am: uninstall-tomboylibLTLIBRARIES
-+
-+.MAKE: install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-tomboylibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
-- install install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-info-am install-man \
-+ install install-am install-data install-data-am install-dvi \
-+ install-dvi-am install-exec install-exec-am install-html \
-+ install-html-am install-info install-info-am install-man \
-+ install-pdf install-pdf-am install-ps install-ps-am \
- install-strip install-tomboylibLTLIBRARIES installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic maintainer-clean-local mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am \
-- uninstall-info-am uninstall-tomboylibLTLIBRARIES
-+ uninstall-tomboylibLTLIBRARIES
-
-
- maintainer-clean-local:
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/ltmain.sh tomboy-0.8.1/ltmain.sh
---- tomboy-0.8.1.old/ltmain.sh 2006-06-19 20:36:49.000000000 +0200
-+++ tomboy-0.8.1/ltmain.sh 2007-08-14 19:43:36.000000000 +0200
-@@ -1,8 +1,8 @@
- # ltmain.sh - Provide generalized library-building support services.
- # NOTE: Changing this file will not affect anything until you rerun configure.
- #
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
--# Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-+# 2007 Free Software Foundation, Inc.
- # Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
- #
- # This program is free software; you can redistribute it and/or modify
-@@ -43,14 +43,22 @@
-
PROGRAM=ltmain.sh
PACKAGE=libtool
--VERSION="1.5.22 Debian 1.5.22-4"
--TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
+-VERSION=1.5.24
+-TIMESTAMP=" (1.1220.2.455 2007/06/24 02:13:29)"
+VERSION="1.5.24 Debian 1.5.24-1ubuntu1"
+TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
--# See if we are running on zsh, and set the options which allow our
--# commands through without removal of \ escapes.
--if test -n "${ZSH_VERSION+set}" ; then
-+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+ # is contrary to our usage. Disable this feature.
-+ alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-+else
-+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
- fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
-
- # Check that we have a working $echo.
- if test "X$1" = X--no-reexec; then
-@@ -105,12 +113,14 @@
- # These must not be set unconditionally because not all systems understand
- # e.g. LANG=C (notably SCO).
- # We save the old values to restore during execute mode.
--if test "${LC_ALL+set}" = set; then
-- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
--fi
--if test "${LANG+set}" = set; then
-- save_LANG="$LANG"; LANG=C; export LANG
--fi
-+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-+do
-+ eval "if test \"\${$lt_var+set}\" = set; then
-+ save_$lt_var=\$$lt_var
-+ $lt_var=C
-+ export $lt_var
-+ fi"
-+done
-
- # Make sure IFS has a sensible default
- lt_nl='
-@@ -136,6 +146,8 @@
- preserve_args=
- lo2o="s/\\.lo\$/.${objext}/"
- o2lo="s/\\.${objext}\$/.lo/"
-+extracted_archives=
-+extracted_serial=0
-
- #####################################
- # Shell function definitions:
-@@ -196,7 +208,13 @@
- if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
- $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
- win32_nmres=`eval $NM -f posix -A $1 | \
-- $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
-+ $SED -n -e '1,100{
-+ / I /{
-+ s,.*,import,
-+ p
-+ q
-+ }
-+ }'`
- case $win32_nmres in
- import*) win32_libid_type="x86 archive import";;
- *) win32_libid_type="x86 archive static";;
-@@ -327,7 +345,17 @@
- *) my_xabs=`pwd`"/$my_xlib" ;;
- esac
- my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-- my_xdir="$my_gentop/$my_xlib"
-+ my_xlib_u=$my_xlib
-+ while :; do
-+ case " $extracted_archives " in
-+ *" $my_xlib_u "*)
-+ extracted_serial=`expr $extracted_serial + 1`
-+ my_xlib_u=lt$extracted_serial-$my_xlib ;;
-+ *) break ;;
-+ esac
-+ done
-+ extracted_archives="$extracted_archives $my_xlib_u"
-+ my_xdir="$my_gentop/$my_xlib_u"
-
- $show "${rm}r $my_xdir"
- $run ${rm}r "$my_xdir"
-@@ -454,11 +482,12 @@
- ;;
-
- --version)
-- $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-- $echo
-- $echo "Copyright (C) 2005 Free Software Foundation, Inc."
-- $echo "This is free software; see the source for copying conditions. There is NO"
-- $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+ echo "\
-+$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
-+
-+Copyright (C) 2007 Free Software Foundation, Inc.
-+This is free software; see the source for copying conditions. There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
- exit $?
- ;;
-
-@@ -755,9 +784,10 @@
- *.class) xform=class ;;
- *.cpp) xform=cpp ;;
- *.cxx) xform=cxx ;;
-- *.f90) xform=f90 ;;
-+ *.[fF][09]?) xform=[fF][09]. ;;
- *.for) xform=for ;;
- *.java) xform=java ;;
-+ *.obj) xform=obj ;;
- esac
-
- libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-@@ -1138,8 +1168,9 @@
- for arg
- do
- case $arg in
-- -all-static | -static)
-- if test "X$arg" = "X-all-static"; then
-+ -all-static | -static | -static-libtool-libs)
-+ case $arg in
-+ -all-static)
- if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
- $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
- fi
-@@ -1147,12 +1178,20 @@
- dlopen_self=$dlopen_self_static
- fi
- prefer_static_libs=yes
-- else
+ # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+@@ -2122,7 +2122,10 @@
+ case $pass in
+ dlopen) libs="$dlfiles" ;;
+ dlpreopen) libs="$dlprefiles" ;;
+- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
++ link)
++ libs="$deplibs %DEPLIBS%"
++ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+ ;;
-+ -static)
- if test -z "$pic_flag" && test -n "$link_static_flag"; then
- dlopen_self=$dlopen_self_static
- fi
- prefer_static_libs=built
-- fi
-+ ;;
-+ -static-libtool-libs)
-+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
-+ dlopen_self=$dlopen_self_static
-+ fi
-+ prefer_static_libs=yes
-+ ;;
-+ esac
- build_libtool_libs=no
- build_old_libs=yes
- break
-@@ -1600,7 +1639,7 @@
- continue
- ;;
-
-- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- compiler_flags="$compiler_flags $arg"
- compile_command="$compile_command $arg"
- finalize_command="$finalize_command $arg"
-@@ -1620,10 +1659,11 @@
- # -m* pass through architecture-specific compiler args for GCC
- # -m*, -t[45]*, -txscale* pass through architecture-specific
- # compiler args for GCC
-- # -pg pass through profiling flag for GCC
-+ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-+ # -F/path gives path to uninstalled frameworks, gcc on darwin
- # @file GCC response files
-- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-- -t[45]*|-txscale*|@*)
-+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-
- # Unknown arguments in both finalize_command and compile_command need
- # to be aesthetically quoted because they are evaled later.
-@@ -1651,9 +1691,9 @@
-
- -no-install)
- case $host in
-- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
- # The PATH hackery in wrapper scripts is required on Windows
-- # in order for the loader to find any dlls it needs.
-+ # and Darwin in order for the loader to find any dlls it needs.
- $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
- $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
- fast_install=no
-@@ -1712,7 +1752,7 @@
- continue
- ;;
-
-- -static)
-+ -static | -static-libtool-libs)
- # The effects of -static are defined in a previous loop.
- # We used to do the same as -all-static on platforms that
- # didn't have a PIC flag, but the assumption that the effects
-@@ -2097,7 +2137,7 @@
- lib=
- found=no
- case $deplib in
-- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- if test "$linkmode,$pass" = "prog,link"; then
- compile_deplibs="$deplib $compile_deplibs"
- finalize_deplibs="$deplib $finalize_deplibs"
-@@ -2493,7 +2533,9 @@
-
- if test "$linkmode,$pass" = "prog,link"; then
- if test -n "$library_names" &&
-- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-+ { { test "$prefer_static_libs" = no ||
-+ test "$prefer_static_libs,$installed" = "built,yes"; } ||
-+ test -z "$old_library"; }; then
- # We need to hardcode the library path
- if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
- # Make sure the rpath contains only unique directories.
-@@ -3189,7 +3231,7 @@
- # which has an extra 1 added just for fun
- #
- case $version_type in
-- darwin|linux|osf|windows)
-+ darwin|linux|osf|windows|none)
- current=`expr $number_major + $number_minor`
- age="$number_minor"
- revision="$number_revision"
-@@ -3200,9 +3242,10 @@
- age="0"
- ;;
- irix|nonstopux)
-- current=`expr $number_major + $number_minor - 1`
-+ current=`expr $number_major + $number_minor`
- age="$number_minor"
- revision="$number_minor"
-+ lt_irix_increment=no
- ;;
- *)
- $echo "$modename: unknown library version type \`$version_type'" 1>&2
-@@ -3266,7 +3309,8 @@
- versuffix="$major.$age.$revision"
- # Darwin ld doesn't like 0 for these options...
- minor_current=`expr $current + 1`
-- verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-+ xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
- ;;
-
- freebsd-aout)
-@@ -3280,8 +3324,11 @@
- ;;
-
- irix | nonstopux)
-- major=`expr $current - $age + 1`
--
-+ if test "X$lt_irix_increment" = "Xno"; then
-+ major=`expr $current - $age`
-+ else
-+ major=`expr $current - $age + 1`
-+ fi
- case $version_type in
- nonstopux) verstring_prefix=nonstopux ;;
- *) verstring_prefix=sgi ;;
-@@ -3418,11 +3465,11 @@
- fi
-
- # Eliminate all temporary directories.
-- for path in $notinst_path; do
-- lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-- deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-- dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-- done
-+ #for path in $notinst_path; do
-+ # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-+ # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-+ # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-+ #done
-
- if test -n "$xrpath"; then
- # If the user specified any rpath flags, then add them.
-@@ -3523,13 +3570,12 @@
- int main() { return 0; }
- EOF
- $rm conftest
-- $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
-- if test "$?" -eq 0 ; then
-+ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
- ldd_output=`ldd conftest`
- for i in $deplibs; do
- name=`expr $i : '-l\(.*\)'`
- # If $name is empty we are operating on a -L argument.
-- if test "$name" != "" && test "$name" -ne "0"; then
-+ if test "$name" != "" && test "$name" != "0"; then
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- case " $predeps $postdeps " in
- *" $i "*)
-@@ -3568,9 +3614,7 @@
- # If $name is empty we are operating on a -L argument.
- if test "$name" != "" && test "$name" != "0"; then
- $rm conftest
-- $LTCC $LTCFLAGS -o conftest conftest.c $i
-- # Did it work?
-- if test "$?" -eq 0 ; then
-+ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
- ldd_output=`ldd conftest`
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- case " $predeps $postdeps " in
-@@ -3602,7 +3646,7 @@
- droppeddeps=yes
- $echo
- $echo "*** Warning! Library $i is needed by this library but I was not able to"
-- $echo "*** make it link in! You will probably need to install it or some"
-+ $echo "*** make it link in! You will probably need to install it or some"
- $echo "*** library that it depends on before this library will be fully"
- $echo "*** functional. Installing it before continuing would be even better."
- fi
-@@ -3888,7 +3932,10 @@
- test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
- if test -n "$hardcode_libdir_flag_spec_ld"; then
-- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-+ case $archive_cmds in
-+ *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
-+ *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
-+ esac
- else
- eval dep_rpath=\"$hardcode_libdir_flag_spec\"
- fi
-@@ -4247,12 +4294,14 @@
- reload_conv_objs=
- gentop=
- # reload_cmds runs $LD directly, so let us get rid of
-- # -Wl from whole_archive_flag_spec
-+ # -Wl from whole_archive_flag_spec and hope we can get by with
-+ # turning comma into space..
- wl=
-
- if test -n "$convenience"; then
- if test -n "$whole_archive_flag_spec"; then
-- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
-+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-+ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
- else
- gentop="$output_objdir/${obj}x"
- generated="$generated $gentop"
-@@ -4700,16 +4749,16 @@
- case $host in
- *cygwin* | *mingw* )
- if test -f "$output_objdir/${outputname}.def" ; then
-- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
-+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
- else
-- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
- fi
- ;;
- * )
-- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
- ;;
- esac
- ;;
-@@ -4724,13 +4773,13 @@
- # really was required.
-
- # Nullify the symbol file.
-- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
-+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
- fi
-
- if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
- # Replace the output file specification.
-- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
- link_command="$compile_command$compile_rpath"
-
- # We have no uninstalled library dependencies, so finalize right now.
-@@ -4817,7 +4866,7 @@
- if test "$fast_install" != no; then
- link_command="$finalize_var$compile_command$finalize_rpath"
- if test "$fast_install" = yes; then
-- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
- else
- # fast_install is set to needless
- relink_command=
-@@ -4854,7 +4903,7 @@
- fi
- done
- relink_command="(cd `pwd`; $relink_command)"
-- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
- fi
-
- # Quote $echo for shipping.
-@@ -5261,6 +5310,20 @@
- Xsed='${SED} -e 1s/^X//'
- sed_quote_subst='$sed_quote_subst'
-
-+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-+ # is contrary to our usage. Disable this feature.
-+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
-+ setopt NO_GLOB_SUBST
-+else
-+ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-+fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
-+
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-@@ -5403,7 +5466,7 @@
- ;;
esac
- $echo >> $output "\
-- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-+ \$echo \"\$0: cannot exec \$program \$*\"
- exit $EXIT_FAILURE
- fi
- else
-@@ -5589,7 +5652,7 @@
- done
- # Quote the link command for shipping.
- relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
- if test "$hardcode_automatic" = yes ; then
- relink_command=
fi
-@@ -5934,9 +5997,9 @@
-
- if test -n "$inst_prefix_dir"; then
- # Stick the inst_prefix_dir data into the link command.
-- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
- else
-- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
- fi
-
- $echo "$modename: warning: relinking \`$file'" 1>&2
-@@ -6145,7 +6208,7 @@
- file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
- outputname="$tmpdir/$file"
- # Replace the output file specification.
-- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
-
- $show "$relink_command"
- if $run eval "$relink_command"; then :
-@@ -6356,8 +6419,10 @@
- if test -f "$dir/$objdir/$dlname"; then
- dir="$dir/$objdir"
- else
-- $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-- exit $EXIT_FAILURE
-+ if test ! -f "$dir/$dlname"; then
-+ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+ if test "$pass" = dlopen; then
+@@ -3244,6 +3247,11 @@
+ revision="$number_minor"
+ lt_irix_increment=no
+ ;;
++ *)
++ $echo "$modename: unknown library version type \`$version_type'" 1>&2
++ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+ exit $EXIT_FAILURE
-+ fi
- fi
- ;;
-
-@@ -6421,12 +6486,12 @@
- fi
-
- # Restore saved environment variables
-- if test "${save_LC_ALL+set}" = set; then
-- LC_ALL="$save_LC_ALL"; export LC_ALL
-- fi
-- if test "${save_LANG+set}" = set; then
-- LANG="$save_LANG"; export LANG
-- fi
-+ for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-+ do
-+ eval "if test \"\${save_$lt_var+set}\" = set; then
-+ $lt_var=\$save_$lt_var; export $lt_var
-+ fi"
-+ done
-
- # Now prepare to actually exec the command.
- exec_cmd="\$cmd$args"
-@@ -6783,9 +6848,9 @@
- -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
- -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
- -export-symbols SYMFILE
-- try to export only the symbols listed in SYMFILE
-+ try to export only the symbols listed in SYMFILE
- -export-symbols-regex REGEX
-- try to export only the symbols matching REGEX
-+ try to export only the symbols matching REGEX
- -LLIBDIR search LIBDIR for required installed libraries
- -lNAME OUTPUT-FILE requires the installed library libNAME
- -module build a library that can dlopened
-@@ -6799,9 +6864,11 @@
- -release RELEASE specify package release information
- -rpath LIBDIR the created library will eventually be installed in LIBDIR
- -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
-- -static do not do any dynamic linking of libtool libraries
-+ -static do not do any dynamic linking of uninstalled libtool libraries
-+ -static-libtool-libs
-+ do not do any dynamic linking of libtool libraries
- -version-info CURRENT[:REVISION[:AGE]]
-- specify library version info [each variable defaults to 0]
-+ specify library version info [each variable defaults to 0]
-
- All other options (arguments beginning with \`-') are ignored.
-
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/Makefile.in tomboy-0.8.1/Makefile.in
---- tomboy-0.8.1.old/Makefile.in 2007-10-15 15:42:39.000000000 +0200
-+++ tomboy-0.8.1/Makefile.in 2007-10-16 13:02:20.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +13,11 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = .
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -35,19 +31,19 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
-+subdir = .
- DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(srcdir)/pot-update.in $(srcdir)/tomboy.spec.in \
- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
- config.guess config.sub depcomp install-sh ltmain.sh missing \
- mkinstalldirs
--subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-- configure.lineno configure.status.lineno
-+ configure.lineno config.status.lineno
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
- CONFIG_CLEAN_FILES = pot-update tomboy.spec
-@@ -55,10 +51,13 @@
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
-- install-exec-recursive install-info-recursive \
-- install-recursive installcheck-recursive installdirs-recursive \
-- pdf-recursive ps-recursive uninstall-info-recursive \
-- uninstall-recursive
-+ install-dvi-recursive install-exec-recursive \
-+ install-html-recursive install-info-recursive \
-+ install-pdf-recursive install-ps-recursive install-recursive \
-+ installcheck-recursive installdirs-recursive pdf-recursive \
-+ ps-recursive uninstall-recursive
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
-+ distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = $(SUBDIRS)
-@@ -75,8 +74,6 @@
- ACLOCAL = @ACLOCAL@
- ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -107,30 +104,14 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
--ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
--ENABLE_EVOLUTION_FALSE = @ENABLE_EVOLUTION_FALSE@
--ENABLE_EVOLUTION_TRUE = @ENABLE_EVOLUTION_TRUE@
--ENABLE_GALAGO_FALSE = @ENABLE_GALAGO_FALSE@
--ENABLE_GALAGO_TRUE = @ENABLE_GALAGO_TRUE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EVOLUTION_CFLAGS = @EVOLUTION_CFLAGS@
- EVOLUTION_LIBS = @EVOLUTION_LIBS@
- EXEEXT = @EXEEXT@
--EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
--EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--FIXED_GTKSPELL_FALSE = @FIXED_GTKSPELL_FALSE@
--FIXED_GTKSPELL_TRUE = @FIXED_GTKSPELL_TRUE@
- GALAGO_CFLAGS = @GALAGO_CFLAGS@
- GALAGO_LIBS = @GALAGO_LIBS@
- GCONFTOOL = @GCONFTOOL@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -140,11 +121,8 @@
- GREP = @GREP@
- GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@
- GTKSPELL_LIBS = @GTKSPELL_LIBS@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_NUNIT_FALSE = @HAVE_NUNIT_FALSE@
--HAVE_NUNIT_TRUE = @HAVE_NUNIT_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -155,14 +133,12 @@
++ ;;
+ esac
+ ;;
+ no)
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/Makefile.in tomboy-0.8.2/Makefile.in
+--- tomboy-0.8.2.old/Makefile.in 2007-11-26 16:51:21.000000000 +0100
++++ tomboy-0.8.2/Makefile.in 2007-11-26 17:07:44.000000000 +0100
+@@ -133,14 +133,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -7752,7 +1782,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -174,7 +150,6 @@
+@@ -152,7 +150,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -7760,545 +1790,20 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -186,10 +161,11 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
+@@ -166,6 +163,9 @@
MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
NUNIT = @NUNIT@
-@@ -211,6 +187,7 @@
- PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -218,18 +195,16 @@
- TOMBOY_LIBS = @TOMBOY_LIBS@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
--WITH_DBUS_SERVICE_DIR_FALSE = @WITH_DBUS_SERVICE_DIR_FALSE@
--WITH_DBUS_SERVICE_DIR_TRUE = @WITH_DBUS_SERVICE_DIR_TRUE@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_PLUGIN_DESC = @XGETTEXT_PLUGIN_DESC@
- XGETTEXT_PLUGIN_NAME = @XGETTEXT_PLUGIN_NAME@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -241,6 +216,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -268,8 +244,11 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- SUBDIRS = data libtomboy Mono.Addins Tomboy test po help
- EXTRA_DIST = \
- gnome-doc-utils.make \
-@@ -338,7 +317,7 @@
- config.h: stamp-h1
- @if test ! -f $@; then \
- rm -f stamp-h1; \
-- $(MAKE) stamp-h1; \
-+ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
- else :; fi
-
- stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-@@ -364,7 +343,6 @@
-
- distclean-libtool:
- -rm -f libtool
--uninstall-info-am:
-
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
-@@ -397,8 +375,7 @@
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
-@@ -500,24 +477,22 @@
-
- distdir: $(DISTFILES)
- $(am__remove_distdir)
-- mkdir $(distdir)
-- $(mkdir_p) $(distdir)/. $(distdir)/data $(distdir)/po
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-- esac; \
-+ test -d $(distdir) || mkdir $(distdir)
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
-+ esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -531,7 +506,7 @@
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -539,6 +514,8 @@
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
-+ am__remove_distdir=: \
-+ am__skip_length_check=: \
- distdir) \
- || exit 1; \
- fi; \
-@@ -546,7 +523,7 @@
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r $(distdir)
- dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-@@ -621,7 +598,7 @@
- $(am__remove_distdir)
- @(echo "$(distdir) archives ready for distribution: "; \
- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
- distuninstallcheck:
- @cd $(distuninstallcheck_dir) \
- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-@@ -692,12 +669,20 @@
-
- install-data-am:
-
-+install-dvi: install-dvi-recursive
-+
- install-exec-am:
-
-+install-html: install-html-recursive
-+
- install-info: install-info-recursive
-
- install-man:
-
-+install-pdf: install-pdf-recursive
-+
-+install-ps: install-ps-recursive
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-recursive
-@@ -718,24 +703,26 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am
-+uninstall-am:
-
--uninstall-info: uninstall-info-recursive
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-+ install-strip
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-- check-am clean clean-generic clean-libtool clean-recursive \
-- ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-- dist-shar dist-tarZ dist-zip distcheck distclean \
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+ all all-am am--refresh check check-am clean clean-generic \
-+ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-+ dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-generic distclean-hdr distclean-libtool \
-- distclean-recursive distclean-tags distcleancheck distdir \
-- distuninstallcheck dvi dvi-am html html-am info info-am \
-- install install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-info-am install-man \
-- install-strip installcheck installcheck-am installdirs \
-- installdirs-am maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-- tags tags-recursive uninstall uninstall-am uninstall-info-am
-+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
-+ dvi-am html html-am info info-am install install-am \
-+ install-data install-data-am install-dvi install-dvi-am \
-+ install-exec install-exec-am install-html install-html-am \
-+ install-info install-info-am install-man install-pdf \
-+ install-pdf-am install-ps install-ps-am install-strip \
-+ installcheck installcheck-am installdirs installdirs-am \
-+ maintainer-clean maintainer-clean-generic mostlyclean \
-+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+ tags tags-recursive uninstall uninstall-am
-
-
- run: $(PROGRAM)
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/missing tomboy-0.8.1/missing
---- tomboy-0.8.1.old/missing 2007-10-15 15:42:33.000000000 +0200
-+++ tomboy-0.8.1/missing 2007-10-16 13:02:16.000000000 +0200
-@@ -1,9 +1,9 @@
- #! /bin/sh
- # Common stub for a few missing GNU programs while installing.
-
--scriptversion=2005-06-08.21
-+scriptversion=2006-05-10.23
-
--# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
- # Free Software Foundation, Inc.
- # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
-
-@@ -33,6 +33,8 @@
- fi
-
- run=:
-+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
- # In the cases where this matters, `missing' is being run in the
- # srcdir already.
-@@ -44,7 +46,7 @@
-
- msg="missing on your system"
-
--case "$1" in
-+case $1 in
- --run)
- # Try to run requested program, and just exit if it succeeds.
- run=
-@@ -77,6 +79,7 @@
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
-+ autom4te touch the output file, or create a stub one
- automake touch all \`Makefile.in' files
- bison create \`y.tab.[ch]', if possible, from existing .[ch]
- flex create \`lex.yy.c', if possible, from existing .c
-@@ -106,7 +109,7 @@
- # Now exit if we have it, but it failed. Also exit now if we
- # don't have it and --version was passed (most likely to detect
- # the program).
--case "$1" in
-+case $1 in
- lex|yacc)
- # Not GNU programs, they don't have --version.
- ;;
-@@ -135,7 +138,7 @@
-
- # If it does not exist, or fails to run (possibly an outdated version),
- # try to emulate it.
--case "$1" in
-+case $1 in
- aclocal*)
- echo 1>&2 "\
- WARNING: \`$1' is $msg. You should only need it if
-@@ -164,7 +167,7 @@
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
-- case "$f" in
-+ case $f in
- *:*) touch_files="$touch_files "`echo "$f" |
- sed -e 's/^[^:]*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
-@@ -192,8 +195,8 @@
- You can get \`$1' as part of \`Autoconf' from any GNU
- archive site."
-
-- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-+ file=`echo "$*" | sed -n "$sed_output"`
-+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
-@@ -214,25 +217,25 @@
- in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
- rm -f y.tab.c y.tab.h
-- if [ $# -ne 1 ]; then
-+ if test $# -ne 1; then
- eval LASTARG="\${$#}"
-- case "$LASTARG" in
-+ case $LASTARG in
- *.y)
- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-- if [ -f "$SRCFILE" ]; then
-+ if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.c
- fi
- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-- if [ -f "$SRCFILE" ]; then
-+ if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.h
- fi
- ;;
- esac
- fi
-- if [ ! -f y.tab.h ]; then
-+ if test ! -f y.tab.h; then
- echo >y.tab.h
- fi
-- if [ ! -f y.tab.c ]; then
-+ if test ! -f y.tab.c; then
- echo 'main() { return 0; }' >y.tab.c
- fi
- ;;
-@@ -244,18 +247,18 @@
- in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
- rm -f lex.yy.c
-- if [ $# -ne 1 ]; then
-+ if test $# -ne 1; then
- eval LASTARG="\${$#}"
-- case "$LASTARG" in
-+ case $LASTARG in
- *.l)
- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-- if [ -f "$SRCFILE" ]; then
-+ if test -f "$SRCFILE"; then
- cp "$SRCFILE" lex.yy.c
- fi
- ;;
- esac
- fi
-- if [ ! -f lex.yy.c ]; then
-+ if test ! -f lex.yy.c; then
- echo 'main() { return 0; }' >lex.yy.c
- fi
- ;;
-@@ -267,11 +270,9 @@
- \`Help2man' package in order for those modifications to take
- effect. You can get \`Help2man' from any GNU archive site."
-
-- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-- if test -z "$file"; then
-- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-- fi
-- if [ -f "$file" ]; then
-+ file=`echo "$*" | sed -n "$sed_output"`
-+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-+ if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
-@@ -289,11 +290,17 @@
- DU, IRIX). You might want to install the \`Texinfo' package or
- the \`GNU make' package. Grab either from any GNU archive site."
- # The file to touch is that specified with -o ...
-- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-+ file=`echo "$*" | sed -n "$sed_output"`
-+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -z "$file"; then
- # ... or it is the one specified with @setfilename ...
- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
-+ file=`sed -n '
-+ /^@setfilename/{
-+ s/.* \([^ ]*\) *$/\1/
-+ p
-+ q
-+ }' $infile`
- # ... or it is derived from the source name (dir/f.texi becomes f.info)
- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
- fi
-@@ -317,13 +324,13 @@
- fi
- firstarg="$1"
- if shift; then
-- case "$firstarg" in
-+ case $firstarg in
- *o*)
- firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
-- case "$firstarg" in
-+ case $firstarg in
- *h*)
- firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" "$@" && exit 0
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/mkinstalldirs tomboy-0.8.1/mkinstalldirs
---- tomboy-0.8.1.old/mkinstalldirs 2007-10-15 15:42:39.000000000 +0200
-+++ tomboy-0.8.1/mkinstalldirs 2007-10-16 13:02:20.000000000 +0200
-@@ -1,7 +1,7 @@
- #! /bin/sh
- # mkinstalldirs --- make directory hierarchy
-
--scriptversion=2005-06-29.22
-+scriptversion=2006-05-11.19
-
- # Original author: Noah Friedman <friedman at prep.ai.mit.edu>
- # Created: 1993-05-16
-@@ -11,6 +11,9 @@
- # bugs to <bug-automake at gnu.org> or send patches to
- # <automake-patches at gnu.org>.
-
-+nl='
-+'
-+IFS=" "" $nl"
- errstatus=0
- dirmode=
-
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/Mono.Addins/Makefile.in tomboy-0.8.1/Mono.Addins/Makefile.in
---- tomboy-0.8.1.old/Mono.Addins/Makefile.in 2007-10-15 15:42:33.000000000 +0200
-+++ tomboy-0.8.1/Mono.Addins/Makefile.in 2007-10-16 13:02:16.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +13,11 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -48,10 +44,13 @@
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
-- install-exec-recursive install-info-recursive \
-- install-recursive installcheck-recursive installdirs-recursive \
-- pdf-recursive ps-recursive uninstall-info-recursive \
-- uninstall-recursive
-+ install-dvi-recursive install-exec-recursive \
-+ install-html-recursive install-info-recursive \
-+ install-pdf-recursive install-ps-recursive install-recursive \
-+ installcheck-recursive installdirs-recursive pdf-recursive \
-+ ps-recursive uninstall-recursive
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
-+ distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = $(SUBDIRS)
-@@ -59,8 +58,6 @@
- ACLOCAL = @ACLOCAL@
- ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -91,30 +88,14 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
--ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
--ENABLE_EVOLUTION_FALSE = @ENABLE_EVOLUTION_FALSE@
--ENABLE_EVOLUTION_TRUE = @ENABLE_EVOLUTION_TRUE@
--ENABLE_GALAGO_FALSE = @ENABLE_GALAGO_FALSE@
--ENABLE_GALAGO_TRUE = @ENABLE_GALAGO_TRUE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EVOLUTION_CFLAGS = @EVOLUTION_CFLAGS@
- EVOLUTION_LIBS = @EVOLUTION_LIBS@
- EXEEXT = @EXEEXT@
--EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
--EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--FIXED_GTKSPELL_FALSE = @FIXED_GTKSPELL_FALSE@
--FIXED_GTKSPELL_TRUE = @FIXED_GTKSPELL_TRUE@
- GALAGO_CFLAGS = @GALAGO_CFLAGS@
- GALAGO_LIBS = @GALAGO_LIBS@
- GCONFTOOL = @GCONFTOOL@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -124,11 +105,8 @@
- GREP = @GREP@
- GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@
- GTKSPELL_LIBS = @GTKSPELL_LIBS@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_NUNIT_FALSE = @HAVE_NUNIT_FALSE@
--HAVE_NUNIT_TRUE = @HAVE_NUNIT_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -139,14 +117,12 @@
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/Mono.Addins/Makefile.in tomboy-0.8.2/Mono.Addins/Makefile.in
+--- tomboy-0.8.2.old/Mono.Addins/Makefile.in 2007-11-26 16:51:19.000000000 +0100
++++ tomboy-0.8.2/Mono.Addins/Makefile.in 2007-11-26 17:07:41.000000000 +0100
+@@ -117,14 +117,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -8314,7 +1819,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -158,7 +134,6 @@
+@@ -136,7 +134,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -8322,298 +1827,20 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -170,10 +145,11 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
+@@ -150,6 +147,9 @@
MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
NUNIT = @NUNIT@
-@@ -195,6 +171,7 @@
- PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -202,18 +179,16 @@
- TOMBOY_LIBS = @TOMBOY_LIBS@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
--WITH_DBUS_SERVICE_DIR_FALSE = @WITH_DBUS_SERVICE_DIR_FALSE@
--WITH_DBUS_SERVICE_DIR_TRUE = @WITH_DBUS_SERVICE_DIR_TRUE@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_PLUGIN_DESC = @XGETTEXT_PLUGIN_DESC@
- XGETTEXT_PLUGIN_NAME = @XGETTEXT_PLUGIN_NAME@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -225,6 +200,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -252,8 +228,11 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- SUBDIRS = \
- Mono.Addins \
- Mono.Addins.Setup \
-@@ -298,10 +277,6 @@
- clean-libtool:
- -rm -rf .libs _libs
-
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
--
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
- # To change the values of `make' variables: instead of editing Makefiles,
-@@ -333,8 +308,7 @@
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
-@@ -435,22 +409,21 @@
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- distdir: $(DISTFILES)
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-- esac; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
-+ esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -464,7 +437,7 @@
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -472,6 +445,8 @@
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
-+ am__remove_distdir=: \
-+ am__skip_length_check=: \
- distdir) \
- || exit 1; \
- fi; \
-@@ -511,8 +486,7 @@
-
- distclean: distclean-recursive
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool \
-- distclean-tags
-+distclean-am: clean-am distclean-generic distclean-tags
-
- dvi: dvi-recursive
-
-@@ -526,12 +500,20 @@
-
- install-data-am:
-
-+install-dvi: install-dvi-recursive
-+
- install-exec-am:
-
-+install-html: install-html-recursive
-+
- install-info: install-info-recursive
-
- install-man:
-
-+install-pdf: install-pdf-recursive
-+
-+install-ps: install-ps-recursive
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-recursive
-@@ -550,22 +532,24 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am
-+uninstall-am:
-
--uninstall-info: uninstall-info-recursive
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-+ install-strip
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-- clean clean-generic clean-libtool clean-recursive ctags \
-- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am html \
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+ all all-am check check-am clean clean-generic clean-libtool \
-+ ctags ctags-recursive distclean distclean-generic \
-+ distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-man install-strip installcheck \
-+ install-data-am install-dvi install-dvi-am install-exec \
-+ install-exec-am install-html install-html-am install-info \
-+ install-info-am install-man install-pdf install-pdf-am \
-+ install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs installdirs-am maintainer-clean \
-- maintainer-clean-generic maintainer-clean-recursive \
-- mostlyclean mostlyclean-generic mostlyclean-libtool \
-- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am
-+ maintainer-clean-generic mostlyclean mostlyclean-generic \
-+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/Mono.Addins/Mono.Addins/Makefile.in tomboy-0.8.1/Mono.Addins/Mono.Addins/Makefile.in
---- tomboy-0.8.1.old/Mono.Addins/Mono.Addins/Makefile.in 2007-10-15 15:42:34.000000000 +0200
-+++ tomboy-0.8.1/Mono.Addins/Mono.Addins/Makefile.in 2007-10-16 13:02:17.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -61,8 +57,6 @@
- ACLOCAL = @ACLOCAL@
- ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -93,30 +87,14 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
--ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
--ENABLE_EVOLUTION_FALSE = @ENABLE_EVOLUTION_FALSE@
--ENABLE_EVOLUTION_TRUE = @ENABLE_EVOLUTION_TRUE@
--ENABLE_GALAGO_FALSE = @ENABLE_GALAGO_FALSE@
--ENABLE_GALAGO_TRUE = @ENABLE_GALAGO_TRUE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EVOLUTION_CFLAGS = @EVOLUTION_CFLAGS@
- EVOLUTION_LIBS = @EVOLUTION_LIBS@
- EXEEXT = @EXEEXT@
--EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
--EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--FIXED_GTKSPELL_FALSE = @FIXED_GTKSPELL_FALSE@
--FIXED_GTKSPELL_TRUE = @FIXED_GTKSPELL_TRUE@
- GALAGO_CFLAGS = @GALAGO_CFLAGS@
- GALAGO_LIBS = @GALAGO_LIBS@
- GCONFTOOL = @GCONFTOOL@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -126,11 +104,8 @@
- GREP = @GREP@
- GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@
- GTKSPELL_LIBS = @GTKSPELL_LIBS@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_NUNIT_FALSE = @HAVE_NUNIT_FALSE@
--HAVE_NUNIT_TRUE = @HAVE_NUNIT_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -141,14 +116,12 @@
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/Mono.Addins/Mono.Addins/Makefile.in tomboy-0.8.2/Mono.Addins/Mono.Addins/Makefile.in
+--- tomboy-0.8.2.old/Mono.Addins/Mono.Addins/Makefile.in 2007-11-26 16:51:20.000000000 +0100
++++ tomboy-0.8.2/Mono.Addins/Mono.Addins/Makefile.in 2007-11-26 17:07:42.000000000 +0100
+@@ -116,14 +116,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -8629,7 +1856,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -160,7 +133,6 @@
+@@ -135,7 +133,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -8637,71 +1864,17 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -172,10 +144,11 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
+@@ -149,6 +146,9 @@
MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
NUNIT = @NUNIT@
-@@ -197,6 +170,7 @@
- PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -204,18 +178,16 @@
- TOMBOY_LIBS = @TOMBOY_LIBS@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
--WITH_DBUS_SERVICE_DIR_FALSE = @WITH_DBUS_SERVICE_DIR_FALSE@
--WITH_DBUS_SERVICE_DIR_TRUE = @WITH_DBUS_SERVICE_DIR_TRUE@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_PLUGIN_DESC = @XGETTEXT_PLUGIN_DESC@
- XGETTEXT_PLUGIN_NAME = @XGETTEXT_PLUGIN_NAME@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -227,6 +199,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -254,19 +227,23 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- DIR_ADDINS_ADDINS = $(top_builddir)/Mono.Addins/Mono.Addins
- DIR_ADDINS_GUI = $(top_builddir)/Mono.Addins/Mono.Addins.Gui
- DIR_ADDINS_SETUP = $(top_builddir)/Mono.Addins/Mono.Addins.Setup
+@@ -238,11 +238,12 @@
LINK_TOMBOY_EXE = \
-r:$(top_builddir)/Tomboy/Tomboy.exe
@@ -8718,7 +1891,7 @@
CSC_FLAGS = -debug
CSC = gmcs $(CSC_FLAGS) -target:exe
CSC_LIB = $(CSC) -target:library
-@@ -355,10 +332,10 @@
+@@ -331,10 +332,10 @@
PKGS =
CSC_EXTRA_FLAGS = -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG "-main:Mono.Addins.Database.SetupProcess"
ASSEMBLY = $(ASSEMBLY_NAME).dll
@@ -8733,123 +1906,10 @@
EXTRA_DIST = \
$(ASSEMBLY_SOURCES) \
-@@ -406,13 +383,9 @@
+@@ -533,10 +534,10 @@
+ uninstall uninstall-am uninstall-assemblyDATA
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-assemblyDATA: $(assembly_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(assemblydir)" || $(mkdir_p) "$(DESTDIR)$(assemblydir)"
-+ test -z "$(assemblydir)" || $(MKDIR_P) "$(DESTDIR)$(assemblydir)"
- @list='$(assembly_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -435,23 +408,21 @@
-
- distdir: $(DISTFILES)
-- $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/$(srcdir)/Mono.Addins $(distdir)/$(srcdir)/Mono.Addins.Database $(distdir)/$(srcdir)/Mono.Addins.Description $(distdir)/$(srcdir)/Mono.Addins.Serialization $(distdir)/../..
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-- esac; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
-+ esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -467,7 +438,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(assemblydir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -500,7 +471,7 @@
-
- distclean: distclean-am
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
-
- dvi: dvi-am
-
-@@ -514,12 +485,20 @@
-
- install-data-am: install-assemblyDATA
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man:
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -538,24 +517,27 @@
-
- ps-am:
-
--uninstall-am: uninstall-assemblyDATA uninstall-info-am
-+uninstall-am: uninstall-assemblyDATA
-+
-+.MAKE: install-am install-strip
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
-- install-assemblyDATA install-data install-data-am install-exec \
-- install-exec-am install-info install-info-am install-man \
-+ install-assemblyDATA install-data install-data-am install-dvi \
-+ install-dvi-am install-exec install-exec-am install-html \
-+ install-html-am install-info install-info-am install-man \
-+ install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-- uninstall uninstall-am uninstall-assemblyDATA \
-- uninstall-info-am
-+ uninstall uninstall-am uninstall-assemblyDATA
-
-
-all: $(ASSEMBLY)
+ at EXTERNAL_MONO_ADDINS_FALSE@all: $(ASSEMBLY)
@@ -8860,90 +1920,10 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/Mono.Addins/Mono.Addins.Gui/Makefile.in tomboy-0.8.1/Mono.Addins/Mono.Addins.Gui/Makefile.in
---- tomboy-0.8.1.old/Mono.Addins/Mono.Addins.Gui/Makefile.in 2007-10-15 15:42:33.000000000 +0200
-+++ tomboy-0.8.1/Mono.Addins/Mono.Addins.Gui/Makefile.in 2007-10-16 13:02:16.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -61,8 +57,6 @@
- ACLOCAL = @ACLOCAL@
- ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -93,30 +87,14 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
--ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
--ENABLE_EVOLUTION_FALSE = @ENABLE_EVOLUTION_FALSE@
--ENABLE_EVOLUTION_TRUE = @ENABLE_EVOLUTION_TRUE@
--ENABLE_GALAGO_FALSE = @ENABLE_GALAGO_FALSE@
--ENABLE_GALAGO_TRUE = @ENABLE_GALAGO_TRUE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EVOLUTION_CFLAGS = @EVOLUTION_CFLAGS@
- EVOLUTION_LIBS = @EVOLUTION_LIBS@
- EXEEXT = @EXEEXT@
--EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
--EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--FIXED_GTKSPELL_FALSE = @FIXED_GTKSPELL_FALSE@
--FIXED_GTKSPELL_TRUE = @FIXED_GTKSPELL_TRUE@
- GALAGO_CFLAGS = @GALAGO_CFLAGS@
- GALAGO_LIBS = @GALAGO_LIBS@
- GCONFTOOL = @GCONFTOOL@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -126,11 +104,8 @@
- GREP = @GREP@
- GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@
- GTKSPELL_LIBS = @GTKSPELL_LIBS@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_NUNIT_FALSE = @HAVE_NUNIT_FALSE@
--HAVE_NUNIT_TRUE = @HAVE_NUNIT_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -141,14 +116,12 @@
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/Mono.Addins/Mono.Addins.Gui/Makefile.in tomboy-0.8.2/Mono.Addins/Mono.Addins.Gui/Makefile.in
+--- tomboy-0.8.2.old/Mono.Addins/Mono.Addins.Gui/Makefile.in 2007-11-26 16:51:19.000000000 +0100
++++ tomboy-0.8.2/Mono.Addins/Mono.Addins.Gui/Makefile.in 2007-11-26 17:07:41.000000000 +0100
+@@ -116,14 +116,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -8959,7 +1939,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -160,7 +133,6 @@
+@@ -135,7 +133,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -8967,71 +1947,17 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -172,10 +144,11 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
+@@ -149,6 +146,9 @@
MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
NUNIT = @NUNIT@
-@@ -197,6 +170,7 @@
- PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -204,18 +178,16 @@
- TOMBOY_LIBS = @TOMBOY_LIBS@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
--WITH_DBUS_SERVICE_DIR_FALSE = @WITH_DBUS_SERVICE_DIR_FALSE@
--WITH_DBUS_SERVICE_DIR_TRUE = @WITH_DBUS_SERVICE_DIR_TRUE@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_PLUGIN_DESC = @XGETTEXT_PLUGIN_DESC@
- XGETTEXT_PLUGIN_NAME = @XGETTEXT_PLUGIN_NAME@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -227,6 +199,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -254,19 +227,23 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- DIR_ADDINS_ADDINS = $(top_builddir)/Mono.Addins/Mono.Addins
- DIR_ADDINS_GUI = $(top_builddir)/Mono.Addins/Mono.Addins.Gui
- DIR_ADDINS_SETUP = $(top_builddir)/Mono.Addins/Mono.Addins.Setup
+@@ -238,11 +238,12 @@
LINK_TOMBOY_EXE = \
-r:$(top_builddir)/Tomboy/Tomboy.exe
@@ -9048,7 +1974,7 @@
CSC_FLAGS = -debug
CSC = gmcs $(CSC_FLAGS) -target:exe
CSC_LIB = $(CSC) -target:library
-@@ -311,9 +288,9 @@
+@@ -287,9 +288,9 @@
CSC_EXTRA_FLAGS = -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
ASSEMBLY = $(ASSEMBLY_NAME).dll
@@ -9061,123 +1987,10 @@
EXTRA_DIST = \
$(ASSEMBLY_SOURCES) \
-@@ -365,13 +342,9 @@
+@@ -492,10 +493,10 @@
+ uninstall uninstall-am uninstall-assemblyDATA
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-assemblyDATA: $(assembly_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(assemblydir)" || $(mkdir_p) "$(DESTDIR)$(assemblydir)"
-+ test -z "$(assemblydir)" || $(MKDIR_P) "$(DESTDIR)$(assemblydir)"
- @list='$(assembly_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -394,23 +367,21 @@
-
- distdir: $(DISTFILES)
-- $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/$(srcdir)/Mono.Addins.Gui $(distdir)/$(srcdir)/gtk-gui $(distdir)/$(srcdir)/icons $(distdir)/../..
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-- esac; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
-+ esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -426,7 +397,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(assemblydir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -459,7 +430,7 @@
-
- distclean: distclean-am
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
-
- dvi: dvi-am
-
-@@ -473,12 +444,20 @@
-
- install-data-am: install-assemblyDATA
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man:
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -497,24 +476,27 @@
-
- ps-am:
-
--uninstall-am: uninstall-assemblyDATA uninstall-info-am
-+uninstall-am: uninstall-assemblyDATA
-+
-+.MAKE: install-am install-strip
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
-- install-assemblyDATA install-data install-data-am install-exec \
-- install-exec-am install-info install-info-am install-man \
-+ install-assemblyDATA install-data install-data-am install-dvi \
-+ install-dvi-am install-exec install-exec-am install-html \
-+ install-html-am install-info install-info-am install-man \
-+ install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-- uninstall uninstall-am uninstall-assemblyDATA \
-- uninstall-info-am
-+ uninstall uninstall-am uninstall-assemblyDATA
-
-
-all: $(ASSEMBLY)
+ at EXTERNAL_MONO_ADDINS_FALSE@all: $(ASSEMBLY)
@@ -9188,90 +2001,10 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/Mono.Addins/Mono.Addins.Setup/Makefile.in tomboy-0.8.1/Mono.Addins/Mono.Addins.Setup/Makefile.in
---- tomboy-0.8.1.old/Mono.Addins/Mono.Addins.Setup/Makefile.in 2007-10-15 15:42:33.000000000 +0200
-+++ tomboy-0.8.1/Mono.Addins/Mono.Addins.Setup/Makefile.in 2007-10-16 13:02:16.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -61,8 +57,6 @@
- ACLOCAL = @ACLOCAL@
- ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -93,30 +87,14 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
--ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
--ENABLE_EVOLUTION_FALSE = @ENABLE_EVOLUTION_FALSE@
--ENABLE_EVOLUTION_TRUE = @ENABLE_EVOLUTION_TRUE@
--ENABLE_GALAGO_FALSE = @ENABLE_GALAGO_FALSE@
--ENABLE_GALAGO_TRUE = @ENABLE_GALAGO_TRUE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EVOLUTION_CFLAGS = @EVOLUTION_CFLAGS@
- EVOLUTION_LIBS = @EVOLUTION_LIBS@
- EXEEXT = @EXEEXT@
--EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
--EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--FIXED_GTKSPELL_FALSE = @FIXED_GTKSPELL_FALSE@
--FIXED_GTKSPELL_TRUE = @FIXED_GTKSPELL_TRUE@
- GALAGO_CFLAGS = @GALAGO_CFLAGS@
- GALAGO_LIBS = @GALAGO_LIBS@
- GCONFTOOL = @GCONFTOOL@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -126,11 +104,8 @@
- GREP = @GREP@
- GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@
- GTKSPELL_LIBS = @GTKSPELL_LIBS@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_NUNIT_FALSE = @HAVE_NUNIT_FALSE@
--HAVE_NUNIT_TRUE = @HAVE_NUNIT_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -141,14 +116,12 @@
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/Mono.Addins/Mono.Addins.Setup/Makefile.in tomboy-0.8.2/Mono.Addins/Mono.Addins.Setup/Makefile.in
+--- tomboy-0.8.2.old/Mono.Addins/Mono.Addins.Setup/Makefile.in 2007-11-26 16:51:19.000000000 +0100
++++ tomboy-0.8.2/Mono.Addins/Mono.Addins.Setup/Makefile.in 2007-11-26 17:07:41.000000000 +0100
+@@ -116,14 +116,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -9287,7 +2020,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -160,7 +133,6 @@
+@@ -135,7 +133,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -9295,71 +2028,17 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -172,10 +144,11 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
+@@ -149,6 +146,9 @@
MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
NUNIT = @NUNIT@
-@@ -197,6 +170,7 @@
- PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -204,18 +178,16 @@
- TOMBOY_LIBS = @TOMBOY_LIBS@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
--WITH_DBUS_SERVICE_DIR_FALSE = @WITH_DBUS_SERVICE_DIR_FALSE@
--WITH_DBUS_SERVICE_DIR_TRUE = @WITH_DBUS_SERVICE_DIR_TRUE@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_PLUGIN_DESC = @XGETTEXT_PLUGIN_DESC@
- XGETTEXT_PLUGIN_NAME = @XGETTEXT_PLUGIN_NAME@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -227,6 +199,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -254,19 +227,23 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- DIR_ADDINS_ADDINS = $(top_builddir)/Mono.Addins/Mono.Addins
- DIR_ADDINS_GUI = $(top_builddir)/Mono.Addins/Mono.Addins.Gui
- DIR_ADDINS_SETUP = $(top_builddir)/Mono.Addins/Mono.Addins.Setup
+@@ -238,11 +238,12 @@
LINK_TOMBOY_EXE = \
-r:$(top_builddir)/Tomboy/Tomboy.exe
@@ -9376,7 +2055,7 @@
CSC_FLAGS = -debug
CSC = gmcs $(CSC_FLAGS) -target:exe
CSC_LIB = $(CSC) -target:library
-@@ -312,9 +289,9 @@
+@@ -288,9 +289,9 @@
PKGS =
CSC_EXTRA_FLAGS = -langversion:ISO-1 -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
ASSEMBLY = $(ASSEMBLY_NAME).dll
@@ -9389,123 +2068,10 @@
EXTRA_DIST = \
$(ASSEMBLY_SOURCES)
-@@ -361,13 +338,9 @@
+@@ -488,10 +489,10 @@
+ uninstall uninstall-am uninstall-assemblyDATA
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-assemblyDATA: $(assembly_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(assemblydir)" || $(mkdir_p) "$(DESTDIR)$(assemblydir)"
-+ test -z "$(assemblydir)" || $(MKDIR_P) "$(DESTDIR)$(assemblydir)"
- @list='$(assembly_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -390,23 +363,21 @@
-
- distdir: $(DISTFILES)
-- $(mkdir_p) $(distdir)/$(srcdir)/Mono.Addins.Setup $(distdir)/$(srcdir)/Mono.Addins.Setup.ProgressMonitoring $(distdir)/../..
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-- esac; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
-+ esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -422,7 +393,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(assemblydir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -455,7 +426,7 @@
-
- distclean: distclean-am
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
-
- dvi: dvi-am
-
-@@ -469,12 +440,20 @@
-
- install-data-am: install-assemblyDATA
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man:
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -493,24 +472,27 @@
-
- ps-am:
-
--uninstall-am: uninstall-assemblyDATA uninstall-info-am
-+uninstall-am: uninstall-assemblyDATA
-+
-+.MAKE: install-am install-strip
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
-- install-assemblyDATA install-data install-data-am install-exec \
-- install-exec-am install-info install-info-am install-man \
-+ install-assemblyDATA install-data install-data-am install-dvi \
-+ install-dvi-am install-exec install-exec-am install-html \
-+ install-html-am install-info install-info-am install-man \
-+ install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-- uninstall uninstall-am uninstall-assemblyDATA \
-- uninstall-info-am
-+ uninstall uninstall-am uninstall-assemblyDATA
-
-
-all: $(ASSEMBLY)
+ at EXTERNAL_MONO_ADDINS_FALSE@all: $(ASSEMBLY)
@@ -9516,9 +2082,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/po/Makefile.in.in tomboy-0.8.1/po/Makefile.in.in
---- tomboy-0.8.1.old/po/Makefile.in.in 2007-10-15 15:42:29.000000000 +0200
-+++ tomboy-0.8.1/po/Makefile.in.in 2007-10-16 13:02:04.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/po/Makefile.in.in tomboy-0.8.2/po/Makefile.in.in
+--- tomboy-0.8.2.old/po/Makefile.in.in 2007-10-15 16:22:59.000000000 +0200
++++ tomboy-0.8.2/po/Makefile.in.in 2007-11-26 17:07:32.000000000 +0100
@@ -133,7 +133,7 @@
dvi info tags TAGS ID:
@@ -9528,90 +2094,10 @@
uninstall:
linguas="$(USE_LINGUAS)"; \
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/test/Makefile.in tomboy-0.8.1/test/Makefile.in
---- tomboy-0.8.1.old/test/Makefile.in 2007-10-15 15:42:39.000000000 +0200
-+++ tomboy-0.8.1/test/Makefile.in 2007-10-16 13:02:20.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +13,11 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -50,8 +46,6 @@
- ACLOCAL = @ACLOCAL@
- ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -82,30 +76,14 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
--ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
--ENABLE_EVOLUTION_FALSE = @ENABLE_EVOLUTION_FALSE@
--ENABLE_EVOLUTION_TRUE = @ENABLE_EVOLUTION_TRUE@
--ENABLE_GALAGO_FALSE = @ENABLE_GALAGO_FALSE@
--ENABLE_GALAGO_TRUE = @ENABLE_GALAGO_TRUE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EVOLUTION_CFLAGS = @EVOLUTION_CFLAGS@
- EVOLUTION_LIBS = @EVOLUTION_LIBS@
- EXEEXT = @EXEEXT@
--EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
--EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--FIXED_GTKSPELL_FALSE = @FIXED_GTKSPELL_FALSE@
--FIXED_GTKSPELL_TRUE = @FIXED_GTKSPELL_TRUE@
- GALAGO_CFLAGS = @GALAGO_CFLAGS@
- GALAGO_LIBS = @GALAGO_LIBS@
- GCONFTOOL = @GCONFTOOL@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -115,11 +93,8 @@
- GREP = @GREP@
- GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@
- GTKSPELL_LIBS = @GTKSPELL_LIBS@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_NUNIT_FALSE = @HAVE_NUNIT_FALSE@
--HAVE_NUNIT_TRUE = @HAVE_NUNIT_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -130,14 +105,12 @@
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/test/Makefile.in tomboy-0.8.2/test/Makefile.in
+--- tomboy-0.8.2.old/test/Makefile.in 2007-11-26 16:51:21.000000000 +0100
++++ tomboy-0.8.2/test/Makefile.in 2007-11-26 17:07:44.000000000 +0100
+@@ -105,14 +105,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -9627,7 +2113,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -149,7 +122,6 @@
+@@ -124,7 +122,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -9635,259 +2121,20 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -161,10 +133,11 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
+@@ -138,6 +135,9 @@
MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
NUNIT = @NUNIT@
-@@ -186,6 +159,7 @@
- PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -193,18 +167,16 @@
- TOMBOY_LIBS = @TOMBOY_LIBS@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
--WITH_DBUS_SERVICE_DIR_FALSE = @WITH_DBUS_SERVICE_DIR_FALSE@
--WITH_DBUS_SERVICE_DIR_TRUE = @WITH_DBUS_SERVICE_DIR_TRUE@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_PLUGIN_DESC = @XGETTEXT_PLUGIN_DESC@
- XGETTEXT_PLUGIN_NAME = @XGETTEXT_PLUGIN_NAME@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -216,6 +188,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -243,8 +216,11 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- CSC = gmcs
- TARGET = TomboyTest.dll
- CSFLAGS = \
-@@ -313,10 +289,6 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
-
-@@ -325,23 +297,21 @@
-
-
- distdir: $(DISTFILES)
-- $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/$(srcdir)/Plugins
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-- esac; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
-+ esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -387,7 +357,7 @@
-
- distclean: distclean-am
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
-
- dvi: dvi-am
-
-@@ -401,12 +371,20 @@
-
- install-data-am:
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man:
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -425,17 +403,20 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
-- install-data install-data-am install-exec install-exec-am \
-- install-info install-info-am install-man install-strip \
-+ install-data install-data-am install-dvi install-dvi-am \
-+ install-exec install-exec-am install-html install-html-am \
-+ install-info install-info-am install-man install-pdf \
-+ install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
-- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-- uninstall-info-am
-+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
-
- $(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/Tomboy/Addins/Backlinks/Makefile.in tomboy-0.8.1/Tomboy/Addins/Backlinks/Makefile.in
---- tomboy-0.8.1.old/Tomboy/Addins/Backlinks/Makefile.in 2007-10-15 15:42:34.000000000 +0200
-+++ tomboy-0.8.1/Tomboy/Addins/Backlinks/Makefile.in 2007-10-16 13:02:17.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -61,8 +57,6 @@
- ACLOCAL = @ACLOCAL@
- ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -93,30 +87,14 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
--ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
--ENABLE_EVOLUTION_FALSE = @ENABLE_EVOLUTION_FALSE@
--ENABLE_EVOLUTION_TRUE = @ENABLE_EVOLUTION_TRUE@
--ENABLE_GALAGO_FALSE = @ENABLE_GALAGO_FALSE@
--ENABLE_GALAGO_TRUE = @ENABLE_GALAGO_TRUE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EVOLUTION_CFLAGS = @EVOLUTION_CFLAGS@
- EVOLUTION_LIBS = @EVOLUTION_LIBS@
- EXEEXT = @EXEEXT@
--EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
--EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--FIXED_GTKSPELL_FALSE = @FIXED_GTKSPELL_FALSE@
--FIXED_GTKSPELL_TRUE = @FIXED_GTKSPELL_TRUE@
- GALAGO_CFLAGS = @GALAGO_CFLAGS@
- GALAGO_LIBS = @GALAGO_LIBS@
- GCONFTOOL = @GCONFTOOL@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -126,11 +104,8 @@
- GREP = @GREP@
- GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@
- GTKSPELL_LIBS = @GTKSPELL_LIBS@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_NUNIT_FALSE = @HAVE_NUNIT_FALSE@
--HAVE_NUNIT_TRUE = @HAVE_NUNIT_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -141,14 +116,12 @@
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/Tomboy/Addins/Backlinks/Makefile.in tomboy-0.8.2/Tomboy/Addins/Backlinks/Makefile.in
+--- tomboy-0.8.2.old/Tomboy/Addins/Backlinks/Makefile.in 2007-11-26 16:51:20.000000000 +0100
++++ tomboy-0.8.2/Tomboy/Addins/Backlinks/Makefile.in 2007-11-26 17:07:42.000000000 +0100
+@@ -116,14 +116,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -9903,7 +2150,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -160,7 +133,6 @@
+@@ -135,7 +133,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -9911,71 +2158,17 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -172,10 +144,11 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
+@@ -149,6 +146,9 @@
MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
NUNIT = @NUNIT@
-@@ -197,6 +170,7 @@
- PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -204,18 +178,16 @@
- TOMBOY_LIBS = @TOMBOY_LIBS@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
--WITH_DBUS_SERVICE_DIR_FALSE = @WITH_DBUS_SERVICE_DIR_FALSE@
--WITH_DBUS_SERVICE_DIR_TRUE = @WITH_DBUS_SERVICE_DIR_TRUE@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_PLUGIN_DESC = @XGETTEXT_PLUGIN_DESC@
- XGETTEXT_PLUGIN_NAME = @XGETTEXT_PLUGIN_NAME@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -227,6 +199,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -254,19 +227,23 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- DIR_ADDINS_ADDINS = $(top_builddir)/Mono.Addins/Mono.Addins
- DIR_ADDINS_GUI = $(top_builddir)/Mono.Addins/Mono.Addins.Gui
- DIR_ADDINS_SETUP = $(top_builddir)/Mono.Addins/Mono.Addins.Setup
+@@ -238,11 +238,12 @@
LINK_TOMBOY_EXE = \
-r:$(top_builddir)/Tomboy/Tomboy.exe
@@ -9992,207 +2185,10 @@
CSC_FLAGS = -debug
CSC = gmcs $(CSC_FLAGS) -target:exe
CSC_LIB = $(CSC) -target:library
-@@ -342,13 +319,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-addinsDATA: $(addins_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(addinsdir)" || $(mkdir_p) "$(DESTDIR)$(addinsdir)"
-+ test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
- @list='$(addins_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -371,23 +344,21 @@
-
-
- distdir: $(DISTFILES)
-- $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/../../..
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-- esac; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
-+ esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -403,7 +374,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(addinsdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -436,7 +407,7 @@
-
- distclean: distclean-am
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
-
- dvi: dvi-am
-
-@@ -450,12 +421,20 @@
-
- install-data-am: install-addinsDATA
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man:
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -474,17 +453,21 @@
-
- ps-am:
-
--uninstall-am: uninstall-addinsDATA uninstall-info-am
-+uninstall-am: uninstall-addinsDATA
-+
-+.MAKE: install-am install-strip
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-addinsDATA \
-- install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-info-am install-man \
-+ install-am install-data install-data-am install-dvi \
-+ install-dvi-am install-exec install-exec-am install-html \
-+ install-html-am install-info install-info-am install-man \
-+ install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-- uninstall uninstall-addinsDATA uninstall-am uninstall-info-am
-+ uninstall uninstall-addinsDATA uninstall-am
-
-
- $(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/Tomboy/Addins/Bugzilla/Makefile.in tomboy-0.8.1/Tomboy/Addins/Bugzilla/Makefile.in
---- tomboy-0.8.1.old/Tomboy/Addins/Bugzilla/Makefile.in 2007-10-15 15:42:34.000000000 +0200
-+++ tomboy-0.8.1/Tomboy/Addins/Bugzilla/Makefile.in 2007-10-16 13:02:17.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -61,8 +57,6 @@
- ACLOCAL = @ACLOCAL@
- ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -93,30 +87,14 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
--ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
--ENABLE_EVOLUTION_FALSE = @ENABLE_EVOLUTION_FALSE@
--ENABLE_EVOLUTION_TRUE = @ENABLE_EVOLUTION_TRUE@
--ENABLE_GALAGO_FALSE = @ENABLE_GALAGO_FALSE@
--ENABLE_GALAGO_TRUE = @ENABLE_GALAGO_TRUE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EVOLUTION_CFLAGS = @EVOLUTION_CFLAGS@
- EVOLUTION_LIBS = @EVOLUTION_LIBS@
- EXEEXT = @EXEEXT@
--EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
--EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--FIXED_GTKSPELL_FALSE = @FIXED_GTKSPELL_FALSE@
--FIXED_GTKSPELL_TRUE = @FIXED_GTKSPELL_TRUE@
- GALAGO_CFLAGS = @GALAGO_CFLAGS@
- GALAGO_LIBS = @GALAGO_LIBS@
- GCONFTOOL = @GCONFTOOL@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -126,11 +104,8 @@
- GREP = @GREP@
- GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@
- GTKSPELL_LIBS = @GTKSPELL_LIBS@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_NUNIT_FALSE = @HAVE_NUNIT_FALSE@
--HAVE_NUNIT_TRUE = @HAVE_NUNIT_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -141,14 +116,12 @@
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/Tomboy/Addins/Bugzilla/Makefile.in tomboy-0.8.2/Tomboy/Addins/Bugzilla/Makefile.in
+--- tomboy-0.8.2.old/Tomboy/Addins/Bugzilla/Makefile.in 2007-11-26 16:51:20.000000000 +0100
++++ tomboy-0.8.2/Tomboy/Addins/Bugzilla/Makefile.in 2007-11-26 17:07:42.000000000 +0100
+@@ -116,14 +116,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -10208,7 +2204,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -160,7 +133,6 @@
+@@ -135,7 +133,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -10216,71 +2212,17 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -172,10 +144,11 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
+@@ -149,6 +146,9 @@
MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
NUNIT = @NUNIT@
-@@ -197,6 +170,7 @@
- PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -204,18 +178,16 @@
- TOMBOY_LIBS = @TOMBOY_LIBS@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
--WITH_DBUS_SERVICE_DIR_FALSE = @WITH_DBUS_SERVICE_DIR_FALSE@
--WITH_DBUS_SERVICE_DIR_TRUE = @WITH_DBUS_SERVICE_DIR_TRUE@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_PLUGIN_DESC = @XGETTEXT_PLUGIN_DESC@
- XGETTEXT_PLUGIN_NAME = @XGETTEXT_PLUGIN_NAME@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -227,6 +199,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -254,19 +227,23 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- DIR_ADDINS_ADDINS = $(top_builddir)/Mono.Addins/Mono.Addins
- DIR_ADDINS_GUI = $(top_builddir)/Mono.Addins/Mono.Addins.Gui
- DIR_ADDINS_SETUP = $(top_builddir)/Mono.Addins/Mono.Addins.Setup
+@@ -238,11 +238,12 @@
LINK_TOMBOY_EXE = \
-r:$(top_builddir)/Tomboy/Tomboy.exe
@@ -10297,207 +2239,10 @@
CSC_FLAGS = -debug
CSC = gmcs $(CSC_FLAGS) -target:exe
CSC_LIB = $(CSC) -target:library
-@@ -346,13 +323,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-addinsDATA: $(addins_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(addinsdir)" || $(mkdir_p) "$(DESTDIR)$(addinsdir)"
-+ test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
- @list='$(addins_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -375,23 +348,21 @@
-
-
- distdir: $(DISTFILES)
-- $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/../../..
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-- esac; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
-+ esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -407,7 +378,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(addinsdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -440,7 +411,7 @@
-
- distclean: distclean-am
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
-
- dvi: dvi-am
-
-@@ -454,12 +425,20 @@
-
- install-data-am: install-addinsDATA
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man:
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -478,17 +457,21 @@
-
- ps-am:
-
--uninstall-am: uninstall-addinsDATA uninstall-info-am
-+uninstall-am: uninstall-addinsDATA
-+
-+.MAKE: install-am install-strip
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-addinsDATA \
-- install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-info-am install-man \
-+ install-am install-data install-data-am install-dvi \
-+ install-dvi-am install-exec install-exec-am install-html \
-+ install-html-am install-info install-info-am install-man \
-+ install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-- uninstall uninstall-addinsDATA uninstall-am uninstall-info-am
-+ uninstall uninstall-addinsDATA uninstall-am
-
-
- $(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/Tomboy/Addins/Evolution/Makefile.in tomboy-0.8.1/Tomboy/Addins/Evolution/Makefile.in
---- tomboy-0.8.1.old/Tomboy/Addins/Evolution/Makefile.in 2007-10-15 15:42:34.000000000 +0200
-+++ tomboy-0.8.1/Tomboy/Addins/Evolution/Makefile.in 2007-10-16 13:02:17.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -61,8 +57,6 @@
- ACLOCAL = @ACLOCAL@
- ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -93,30 +87,14 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
--ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
--ENABLE_EVOLUTION_FALSE = @ENABLE_EVOLUTION_FALSE@
--ENABLE_EVOLUTION_TRUE = @ENABLE_EVOLUTION_TRUE@
--ENABLE_GALAGO_FALSE = @ENABLE_GALAGO_FALSE@
--ENABLE_GALAGO_TRUE = @ENABLE_GALAGO_TRUE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EVOLUTION_CFLAGS = @EVOLUTION_CFLAGS@
- EVOLUTION_LIBS = @EVOLUTION_LIBS@
- EXEEXT = @EXEEXT@
--EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
--EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--FIXED_GTKSPELL_FALSE = @FIXED_GTKSPELL_FALSE@
--FIXED_GTKSPELL_TRUE = @FIXED_GTKSPELL_TRUE@
- GALAGO_CFLAGS = @GALAGO_CFLAGS@
- GALAGO_LIBS = @GALAGO_LIBS@
- GCONFTOOL = @GCONFTOOL@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -126,11 +104,8 @@
- GREP = @GREP@
- GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@
- GTKSPELL_LIBS = @GTKSPELL_LIBS@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_NUNIT_FALSE = @HAVE_NUNIT_FALSE@
--HAVE_NUNIT_TRUE = @HAVE_NUNIT_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -141,14 +116,12 @@
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/Tomboy/Addins/Evolution/Makefile.in tomboy-0.8.2/Tomboy/Addins/Evolution/Makefile.in
+--- tomboy-0.8.2.old/Tomboy/Addins/Evolution/Makefile.in 2007-11-26 16:51:20.000000000 +0100
++++ tomboy-0.8.2/Tomboy/Addins/Evolution/Makefile.in 2007-11-26 17:07:42.000000000 +0100
+@@ -116,14 +116,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -10513,7 +2258,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -160,7 +133,6 @@
+@@ -135,7 +133,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -10521,71 +2266,17 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -172,10 +144,11 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
+@@ -149,6 +146,9 @@
MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
NUNIT = @NUNIT@
-@@ -197,6 +170,7 @@
- PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -204,18 +178,16 @@
- TOMBOY_LIBS = @TOMBOY_LIBS@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
--WITH_DBUS_SERVICE_DIR_FALSE = @WITH_DBUS_SERVICE_DIR_FALSE@
--WITH_DBUS_SERVICE_DIR_TRUE = @WITH_DBUS_SERVICE_DIR_TRUE@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_PLUGIN_DESC = @XGETTEXT_PLUGIN_DESC@
- XGETTEXT_PLUGIN_NAME = @XGETTEXT_PLUGIN_NAME@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -227,6 +199,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -254,19 +227,23 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- DIR_ADDINS_ADDINS = $(top_builddir)/Mono.Addins/Mono.Addins
- DIR_ADDINS_GUI = $(top_builddir)/Mono.Addins/Mono.Addins.Gui
- DIR_ADDINS_SETUP = $(top_builddir)/Mono.Addins/Mono.Addins.Setup
+@@ -238,11 +238,12 @@
LINK_TOMBOY_EXE = \
-r:$(top_builddir)/Tomboy/Tomboy.exe
@@ -10602,207 +2293,10 @@
CSC_FLAGS = -debug
CSC = gmcs $(CSC_FLAGS) -target:exe
CSC_LIB = $(CSC) -target:library
-@@ -343,13 +320,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-addinsDATA: $(addins_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(addinsdir)" || $(mkdir_p) "$(DESTDIR)$(addinsdir)"
-+ test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
- @list='$(addins_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -372,23 +345,21 @@
-
-
- distdir: $(DISTFILES)
-- $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/../../..
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-- esac; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
-+ esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -404,7 +375,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(addinsdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -437,7 +408,7 @@
-
- distclean: distclean-am
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
-
- dvi: dvi-am
-
-@@ -451,12 +422,20 @@
-
- install-data-am: install-addinsDATA
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man:
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -475,17 +454,21 @@
-
- ps-am:
-
--uninstall-am: uninstall-addinsDATA uninstall-info-am
-+uninstall-am: uninstall-addinsDATA
-+
-+.MAKE: install-am install-strip
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-addinsDATA \
-- install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-info-am install-man \
-+ install-am install-data install-data-am install-dvi \
-+ install-dvi-am install-exec install-exec-am install-html \
-+ install-html-am install-info install-info-am install-man \
-+ install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-- uninstall uninstall-addinsDATA uninstall-am uninstall-info-am
-+ uninstall uninstall-addinsDATA uninstall-am
-
-
- @ENABLE_EVOLUTION_TRUE@$(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/Tomboy/Addins/ExportToHtml/Makefile.in tomboy-0.8.1/Tomboy/Addins/ExportToHtml/Makefile.in
---- tomboy-0.8.1.old/Tomboy/Addins/ExportToHtml/Makefile.in 2007-10-15 15:42:34.000000000 +0200
-+++ tomboy-0.8.1/Tomboy/Addins/ExportToHtml/Makefile.in 2007-10-16 13:02:18.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -61,8 +57,6 @@
- ACLOCAL = @ACLOCAL@
- ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -93,30 +87,14 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
--ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
--ENABLE_EVOLUTION_FALSE = @ENABLE_EVOLUTION_FALSE@
--ENABLE_EVOLUTION_TRUE = @ENABLE_EVOLUTION_TRUE@
--ENABLE_GALAGO_FALSE = @ENABLE_GALAGO_FALSE@
--ENABLE_GALAGO_TRUE = @ENABLE_GALAGO_TRUE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EVOLUTION_CFLAGS = @EVOLUTION_CFLAGS@
- EVOLUTION_LIBS = @EVOLUTION_LIBS@
- EXEEXT = @EXEEXT@
--EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
--EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--FIXED_GTKSPELL_FALSE = @FIXED_GTKSPELL_FALSE@
--FIXED_GTKSPELL_TRUE = @FIXED_GTKSPELL_TRUE@
- GALAGO_CFLAGS = @GALAGO_CFLAGS@
- GALAGO_LIBS = @GALAGO_LIBS@
- GCONFTOOL = @GCONFTOOL@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -126,11 +104,8 @@
- GREP = @GREP@
- GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@
- GTKSPELL_LIBS = @GTKSPELL_LIBS@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_NUNIT_FALSE = @HAVE_NUNIT_FALSE@
--HAVE_NUNIT_TRUE = @HAVE_NUNIT_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -141,14 +116,12 @@
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/Tomboy/Addins/ExportToHtml/Makefile.in tomboy-0.8.2/Tomboy/Addins/ExportToHtml/Makefile.in
+--- tomboy-0.8.2.old/Tomboy/Addins/ExportToHtml/Makefile.in 2007-11-26 16:51:20.000000000 +0100
++++ tomboy-0.8.2/Tomboy/Addins/ExportToHtml/Makefile.in 2007-11-26 17:07:42.000000000 +0100
+@@ -116,14 +116,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -10818,7 +2312,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -160,7 +133,6 @@
+@@ -135,7 +133,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -10826,71 +2320,17 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -172,10 +144,11 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
+@@ -149,6 +146,9 @@
MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
NUNIT = @NUNIT@
-@@ -197,6 +170,7 @@
- PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -204,18 +178,16 @@
- TOMBOY_LIBS = @TOMBOY_LIBS@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
--WITH_DBUS_SERVICE_DIR_FALSE = @WITH_DBUS_SERVICE_DIR_FALSE@
--WITH_DBUS_SERVICE_DIR_TRUE = @WITH_DBUS_SERVICE_DIR_TRUE@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_PLUGIN_DESC = @XGETTEXT_PLUGIN_DESC@
- XGETTEXT_PLUGIN_NAME = @XGETTEXT_PLUGIN_NAME@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -227,6 +199,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -254,19 +227,23 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- DIR_ADDINS_ADDINS = $(top_builddir)/Mono.Addins/Mono.Addins
- DIR_ADDINS_GUI = $(top_builddir)/Mono.Addins/Mono.Addins.Gui
- DIR_ADDINS_SETUP = $(top_builddir)/Mono.Addins/Mono.Addins.Setup
+@@ -238,11 +238,12 @@
LINK_TOMBOY_EXE = \
-r:$(top_builddir)/Tomboy/Tomboy.exe
@@ -10907,207 +2347,10 @@
CSC_FLAGS = -debug
CSC = gmcs $(CSC_FLAGS) -target:exe
CSC_LIB = $(CSC) -target:library
-@@ -345,13 +322,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-addinsDATA: $(addins_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(addinsdir)" || $(mkdir_p) "$(DESTDIR)$(addinsdir)"
-+ test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
- @list='$(addins_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -374,23 +347,21 @@
-
-
- distdir: $(DISTFILES)
-- $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/../../..
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-- esac; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
-+ esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -406,7 +377,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(addinsdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -439,7 +410,7 @@
-
- distclean: distclean-am
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
-
- dvi: dvi-am
-
-@@ -453,12 +424,20 @@
-
- install-data-am: install-addinsDATA
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man:
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -477,17 +456,21 @@
-
- ps-am:
-
--uninstall-am: uninstall-addinsDATA uninstall-info-am
-+uninstall-am: uninstall-addinsDATA
-+
-+.MAKE: install-am install-strip
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-addinsDATA \
-- install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-info-am install-man \
-+ install-am install-data install-data-am install-dvi \
-+ install-dvi-am install-exec install-exec-am install-html \
-+ install-html-am install-info install-info-am install-man \
-+ install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-- uninstall uninstall-addinsDATA uninstall-am uninstall-info-am
-+ uninstall uninstall-addinsDATA uninstall-am
-
-
- $(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/Tomboy/Addins/FileSystemSyncService/Makefile.in tomboy-0.8.1/Tomboy/Addins/FileSystemSyncService/Makefile.in
---- tomboy-0.8.1.old/Tomboy/Addins/FileSystemSyncService/Makefile.in 2007-10-15 15:42:34.000000000 +0200
-+++ tomboy-0.8.1/Tomboy/Addins/FileSystemSyncService/Makefile.in 2007-10-16 13:02:18.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -61,8 +57,6 @@
- ACLOCAL = @ACLOCAL@
- ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -93,30 +87,14 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
--ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
--ENABLE_EVOLUTION_FALSE = @ENABLE_EVOLUTION_FALSE@
--ENABLE_EVOLUTION_TRUE = @ENABLE_EVOLUTION_TRUE@
--ENABLE_GALAGO_FALSE = @ENABLE_GALAGO_FALSE@
--ENABLE_GALAGO_TRUE = @ENABLE_GALAGO_TRUE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EVOLUTION_CFLAGS = @EVOLUTION_CFLAGS@
- EVOLUTION_LIBS = @EVOLUTION_LIBS@
- EXEEXT = @EXEEXT@
--EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
--EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--FIXED_GTKSPELL_FALSE = @FIXED_GTKSPELL_FALSE@
--FIXED_GTKSPELL_TRUE = @FIXED_GTKSPELL_TRUE@
- GALAGO_CFLAGS = @GALAGO_CFLAGS@
- GALAGO_LIBS = @GALAGO_LIBS@
- GCONFTOOL = @GCONFTOOL@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -126,11 +104,8 @@
- GREP = @GREP@
- GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@
- GTKSPELL_LIBS = @GTKSPELL_LIBS@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_NUNIT_FALSE = @HAVE_NUNIT_FALSE@
--HAVE_NUNIT_TRUE = @HAVE_NUNIT_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -141,14 +116,12 @@
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/Tomboy/Addins/FileSystemSyncService/Makefile.in tomboy-0.8.2/Tomboy/Addins/FileSystemSyncService/Makefile.in
+--- tomboy-0.8.2.old/Tomboy/Addins/FileSystemSyncService/Makefile.in 2007-11-26 16:51:20.000000000 +0100
++++ tomboy-0.8.2/Tomboy/Addins/FileSystemSyncService/Makefile.in 2007-11-26 17:07:42.000000000 +0100
+@@ -116,14 +116,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -11123,7 +2366,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -160,7 +133,6 @@
+@@ -135,7 +133,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -11131,71 +2374,17 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -172,10 +144,11 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
+@@ -149,6 +146,9 @@
MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
NUNIT = @NUNIT@
-@@ -197,6 +170,7 @@
- PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -204,18 +178,16 @@
- TOMBOY_LIBS = @TOMBOY_LIBS@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
--WITH_DBUS_SERVICE_DIR_FALSE = @WITH_DBUS_SERVICE_DIR_FALSE@
--WITH_DBUS_SERVICE_DIR_TRUE = @WITH_DBUS_SERVICE_DIR_TRUE@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_PLUGIN_DESC = @XGETTEXT_PLUGIN_DESC@
- XGETTEXT_PLUGIN_NAME = @XGETTEXT_PLUGIN_NAME@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -227,6 +199,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -254,19 +227,23 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- DIR_ADDINS_ADDINS = $(top_builddir)/Mono.Addins/Mono.Addins
- DIR_ADDINS_GUI = $(top_builddir)/Mono.Addins/Mono.Addins.Gui
- DIR_ADDINS_SETUP = $(top_builddir)/Mono.Addins/Mono.Addins.Setup
+@@ -238,11 +238,12 @@
LINK_TOMBOY_EXE = \
-r:$(top_builddir)/Tomboy/Tomboy.exe
@@ -11212,207 +2401,10 @@
CSC_FLAGS = -debug
CSC = gmcs $(CSC_FLAGS) -target:exe
CSC_LIB = $(CSC) -target:library
-@@ -344,13 +321,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-addinsDATA: $(addins_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(addinsdir)" || $(mkdir_p) "$(DESTDIR)$(addinsdir)"
-+ test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
- @list='$(addins_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -373,23 +346,21 @@
-
-
- distdir: $(DISTFILES)
-- $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/../../..
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-- esac; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
-+ esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -405,7 +376,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(addinsdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -438,7 +409,7 @@
-
- distclean: distclean-am
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
-
- dvi: dvi-am
-
-@@ -452,12 +423,20 @@
-
- install-data-am: install-addinsDATA
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man:
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -476,17 +455,21 @@
-
- ps-am:
-
--uninstall-am: uninstall-addinsDATA uninstall-info-am
-+uninstall-am: uninstall-addinsDATA
-+
-+.MAKE: install-am install-strip
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-addinsDATA \
-- install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-info-am install-man \
-+ install-am install-data install-data-am install-dvi \
-+ install-dvi-am install-exec install-exec-am install-html \
-+ install-html-am install-info install-info-am install-man \
-+ install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-- uninstall uninstall-addinsDATA uninstall-am uninstall-info-am
-+ uninstall uninstall-addinsDATA uninstall-am
-
-
- $(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/Tomboy/Addins/FixedWidth/Makefile.in tomboy-0.8.1/Tomboy/Addins/FixedWidth/Makefile.in
---- tomboy-0.8.1.old/Tomboy/Addins/FixedWidth/Makefile.in 2007-10-15 15:42:35.000000000 +0200
-+++ tomboy-0.8.1/Tomboy/Addins/FixedWidth/Makefile.in 2007-10-16 13:02:18.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -61,8 +57,6 @@
- ACLOCAL = @ACLOCAL@
- ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -93,30 +87,14 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
--ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
--ENABLE_EVOLUTION_FALSE = @ENABLE_EVOLUTION_FALSE@
--ENABLE_EVOLUTION_TRUE = @ENABLE_EVOLUTION_TRUE@
--ENABLE_GALAGO_FALSE = @ENABLE_GALAGO_FALSE@
--ENABLE_GALAGO_TRUE = @ENABLE_GALAGO_TRUE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EVOLUTION_CFLAGS = @EVOLUTION_CFLAGS@
- EVOLUTION_LIBS = @EVOLUTION_LIBS@
- EXEEXT = @EXEEXT@
--EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
--EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--FIXED_GTKSPELL_FALSE = @FIXED_GTKSPELL_FALSE@
--FIXED_GTKSPELL_TRUE = @FIXED_GTKSPELL_TRUE@
- GALAGO_CFLAGS = @GALAGO_CFLAGS@
- GALAGO_LIBS = @GALAGO_LIBS@
- GCONFTOOL = @GCONFTOOL@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -126,11 +104,8 @@
- GREP = @GREP@
- GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@
- GTKSPELL_LIBS = @GTKSPELL_LIBS@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_NUNIT_FALSE = @HAVE_NUNIT_FALSE@
--HAVE_NUNIT_TRUE = @HAVE_NUNIT_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -141,14 +116,12 @@
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/Tomboy/Addins/FixedWidth/Makefile.in tomboy-0.8.2/Tomboy/Addins/FixedWidth/Makefile.in
+--- tomboy-0.8.2.old/Tomboy/Addins/FixedWidth/Makefile.in 2007-11-26 16:51:20.000000000 +0100
++++ tomboy-0.8.2/Tomboy/Addins/FixedWidth/Makefile.in 2007-11-26 17:07:42.000000000 +0100
+@@ -116,14 +116,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -11428,7 +2420,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -160,7 +133,6 @@
+@@ -135,7 +133,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -11436,71 +2428,17 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -172,10 +144,11 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
+@@ -149,6 +146,9 @@
MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
NUNIT = @NUNIT@
-@@ -197,6 +170,7 @@
- PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -204,18 +178,16 @@
- TOMBOY_LIBS = @TOMBOY_LIBS@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
--WITH_DBUS_SERVICE_DIR_FALSE = @WITH_DBUS_SERVICE_DIR_FALSE@
--WITH_DBUS_SERVICE_DIR_TRUE = @WITH_DBUS_SERVICE_DIR_TRUE@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_PLUGIN_DESC = @XGETTEXT_PLUGIN_DESC@
- XGETTEXT_PLUGIN_NAME = @XGETTEXT_PLUGIN_NAME@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -227,6 +199,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -254,19 +227,23 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- DIR_ADDINS_ADDINS = $(top_builddir)/Mono.Addins/Mono.Addins
- DIR_ADDINS_GUI = $(top_builddir)/Mono.Addins/Mono.Addins.Gui
- DIR_ADDINS_SETUP = $(top_builddir)/Mono.Addins/Mono.Addins.Setup
+@@ -238,11 +238,12 @@
LINK_TOMBOY_EXE = \
-r:$(top_builddir)/Tomboy/Tomboy.exe
@@ -11517,207 +2455,10 @@
CSC_FLAGS = -debug
CSC = gmcs $(CSC_FLAGS) -target:exe
CSC_LIB = $(CSC) -target:library
-@@ -343,13 +320,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-addinsDATA: $(addins_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(addinsdir)" || $(mkdir_p) "$(DESTDIR)$(addinsdir)"
-+ test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
- @list='$(addins_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -372,23 +345,21 @@
-
-
- distdir: $(DISTFILES)
-- $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/../../..
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-- esac; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
-+ esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -404,7 +375,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(addinsdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -437,7 +408,7 @@
-
- distclean: distclean-am
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
-
- dvi: dvi-am
-
-@@ -451,12 +422,20 @@
-
- install-data-am: install-addinsDATA
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man:
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -475,17 +454,21 @@
-
- ps-am:
-
--uninstall-am: uninstall-addinsDATA uninstall-info-am
-+uninstall-am: uninstall-addinsDATA
-+
-+.MAKE: install-am install-strip
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-addinsDATA \
-- install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-info-am install-man \
-+ install-am install-data install-data-am install-dvi \
-+ install-dvi-am install-exec install-exec-am install-html \
-+ install-html-am install-info install-info-am install-man \
-+ install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-- uninstall uninstall-addinsDATA uninstall-am uninstall-info-am
-+ uninstall uninstall-addinsDATA uninstall-am
-
-
- $(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/Tomboy/Addins/GalagoPresence/Makefile.in tomboy-0.8.1/Tomboy/Addins/GalagoPresence/Makefile.in
---- tomboy-0.8.1.old/Tomboy/Addins/GalagoPresence/Makefile.in 2007-10-15 15:42:35.000000000 +0200
-+++ tomboy-0.8.1/Tomboy/Addins/GalagoPresence/Makefile.in 2007-10-16 13:02:18.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -61,8 +57,6 @@
- ACLOCAL = @ACLOCAL@
- ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -93,30 +87,14 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
--ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
--ENABLE_EVOLUTION_FALSE = @ENABLE_EVOLUTION_FALSE@
--ENABLE_EVOLUTION_TRUE = @ENABLE_EVOLUTION_TRUE@
--ENABLE_GALAGO_FALSE = @ENABLE_GALAGO_FALSE@
--ENABLE_GALAGO_TRUE = @ENABLE_GALAGO_TRUE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EVOLUTION_CFLAGS = @EVOLUTION_CFLAGS@
- EVOLUTION_LIBS = @EVOLUTION_LIBS@
- EXEEXT = @EXEEXT@
--EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
--EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--FIXED_GTKSPELL_FALSE = @FIXED_GTKSPELL_FALSE@
--FIXED_GTKSPELL_TRUE = @FIXED_GTKSPELL_TRUE@
- GALAGO_CFLAGS = @GALAGO_CFLAGS@
- GALAGO_LIBS = @GALAGO_LIBS@
- GCONFTOOL = @GCONFTOOL@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -126,11 +104,8 @@
- GREP = @GREP@
- GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@
- GTKSPELL_LIBS = @GTKSPELL_LIBS@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_NUNIT_FALSE = @HAVE_NUNIT_FALSE@
--HAVE_NUNIT_TRUE = @HAVE_NUNIT_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -141,14 +116,12 @@
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/Tomboy/Addins/GalagoPresence/Makefile.in tomboy-0.8.2/Tomboy/Addins/GalagoPresence/Makefile.in
+--- tomboy-0.8.2.old/Tomboy/Addins/GalagoPresence/Makefile.in 2007-11-26 16:51:20.000000000 +0100
++++ tomboy-0.8.2/Tomboy/Addins/GalagoPresence/Makefile.in 2007-11-26 17:07:42.000000000 +0100
+@@ -116,14 +116,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -11733,7 +2474,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -160,7 +133,6 @@
+@@ -135,7 +133,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -11741,71 +2482,17 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -172,10 +144,11 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
+@@ -149,6 +146,9 @@
MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
NUNIT = @NUNIT@
-@@ -197,6 +170,7 @@
- PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -204,18 +178,16 @@
- TOMBOY_LIBS = @TOMBOY_LIBS@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
--WITH_DBUS_SERVICE_DIR_FALSE = @WITH_DBUS_SERVICE_DIR_FALSE@
--WITH_DBUS_SERVICE_DIR_TRUE = @WITH_DBUS_SERVICE_DIR_TRUE@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_PLUGIN_DESC = @XGETTEXT_PLUGIN_DESC@
- XGETTEXT_PLUGIN_NAME = @XGETTEXT_PLUGIN_NAME@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -227,6 +199,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -254,19 +227,23 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- DIR_ADDINS_ADDINS = $(top_builddir)/Mono.Addins/Mono.Addins
- DIR_ADDINS_GUI = $(top_builddir)/Mono.Addins/Mono.Addins.Gui
- DIR_ADDINS_SETUP = $(top_builddir)/Mono.Addins/Mono.Addins.Setup
+@@ -238,11 +238,12 @@
LINK_TOMBOY_EXE = \
-r:$(top_builddir)/Tomboy/Tomboy.exe
@@ -11822,225 +2509,10 @@
CSC_FLAGS = -debug
CSC = gmcs $(CSC_FLAGS) -target:exe
CSC_LIB = $(CSC) -target:library
-@@ -342,13 +319,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-addinsDATA: $(addins_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(addinsdir)" || $(mkdir_p) "$(DESTDIR)$(addinsdir)"
-+ test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
- @list='$(addins_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -371,23 +344,21 @@
-
-
- distdir: $(DISTFILES)
-- $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/../../..
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-- esac; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
-+ esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -403,7 +374,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(addinsdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -436,7 +407,7 @@
-
- distclean: distclean-am
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
-
- dvi: dvi-am
-
-@@ -450,12 +421,20 @@
-
- install-data-am: install-addinsDATA
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man:
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -474,17 +453,21 @@
-
- ps-am:
-
--uninstall-am: uninstall-addinsDATA uninstall-info-am
-+uninstall-am: uninstall-addinsDATA
-+
-+.MAKE: install-am install-strip
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-addinsDATA \
-- install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-info-am install-man \
-+ install-am install-data install-data-am install-dvi \
-+ install-dvi-am install-exec install-exec-am install-html \
-+ install-html-am install-info install-info-am install-man \
-+ install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-- uninstall uninstall-addinsDATA uninstall-am uninstall-info-am
-+ uninstall uninstall-addinsDATA uninstall-am
-
-
- @ENABLE_GALAGO_TRUE@$(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/Tomboy/Addins/Makefile.in tomboy-0.8.1/Tomboy/Addins/Makefile.in
---- tomboy-0.8.1.old/Tomboy/Addins/Makefile.in 2007-10-15 15:42:35.000000000 +0200
-+++ tomboy-0.8.1/Tomboy/Addins/Makefile.in 2007-10-16 13:02:18.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +13,11 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -48,10 +44,13 @@
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
-- install-exec-recursive install-info-recursive \
-- install-recursive installcheck-recursive installdirs-recursive \
-- pdf-recursive ps-recursive uninstall-info-recursive \
-- uninstall-recursive
-+ install-dvi-recursive install-exec-recursive \
-+ install-html-recursive install-info-recursive \
-+ install-pdf-recursive install-ps-recursive install-recursive \
-+ installcheck-recursive installdirs-recursive pdf-recursive \
-+ ps-recursive uninstall-recursive
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
-+ distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = $(SUBDIRS)
-@@ -59,8 +58,6 @@
- ACLOCAL = @ACLOCAL@
- ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -91,30 +88,14 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
--ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
--ENABLE_EVOLUTION_FALSE = @ENABLE_EVOLUTION_FALSE@
--ENABLE_EVOLUTION_TRUE = @ENABLE_EVOLUTION_TRUE@
--ENABLE_GALAGO_FALSE = @ENABLE_GALAGO_FALSE@
--ENABLE_GALAGO_TRUE = @ENABLE_GALAGO_TRUE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EVOLUTION_CFLAGS = @EVOLUTION_CFLAGS@
- EVOLUTION_LIBS = @EVOLUTION_LIBS@
- EXEEXT = @EXEEXT@
--EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
--EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--FIXED_GTKSPELL_FALSE = @FIXED_GTKSPELL_FALSE@
--FIXED_GTKSPELL_TRUE = @FIXED_GTKSPELL_TRUE@
- GALAGO_CFLAGS = @GALAGO_CFLAGS@
- GALAGO_LIBS = @GALAGO_LIBS@
- GCONFTOOL = @GCONFTOOL@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -124,11 +105,8 @@
- GREP = @GREP@
- GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@
- GTKSPELL_LIBS = @GTKSPELL_LIBS@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_NUNIT_FALSE = @HAVE_NUNIT_FALSE@
--HAVE_NUNIT_TRUE = @HAVE_NUNIT_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -139,14 +117,12 @@
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/Tomboy/Addins/Makefile.in tomboy-0.8.2/Tomboy/Addins/Makefile.in
+--- tomboy-0.8.2.old/Tomboy/Addins/Makefile.in 2007-11-26 16:51:20.000000000 +0100
++++ tomboy-0.8.2/Tomboy/Addins/Makefile.in 2007-11-26 17:07:42.000000000 +0100
+@@ -117,14 +117,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -12056,7 +2528,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -158,7 +134,6 @@
+@@ -136,7 +134,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -12064,298 +2536,20 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -170,10 +145,11 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
+@@ -150,6 +147,9 @@
MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
NUNIT = @NUNIT@
-@@ -195,6 +171,7 @@
- PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -202,18 +179,16 @@
- TOMBOY_LIBS = @TOMBOY_LIBS@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
--WITH_DBUS_SERVICE_DIR_FALSE = @WITH_DBUS_SERVICE_DIR_FALSE@
--WITH_DBUS_SERVICE_DIR_TRUE = @WITH_DBUS_SERVICE_DIR_TRUE@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_PLUGIN_DESC = @XGETTEXT_PLUGIN_DESC@
- XGETTEXT_PLUGIN_NAME = @XGETTEXT_PLUGIN_NAME@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -225,6 +200,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -252,8 +228,11 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- SUBDIRS = \
- Backlinks \
- Bugzilla \
-@@ -307,10 +286,6 @@
- clean-libtool:
- -rm -rf .libs _libs
-
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
--
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
- # To change the values of `make' variables: instead of editing Makefiles,
-@@ -342,8 +317,7 @@
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
-@@ -444,22 +418,21 @@
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- distdir: $(DISTFILES)
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-- esac; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
-+ esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -473,7 +446,7 @@
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -481,6 +454,8 @@
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
-+ am__remove_distdir=: \
-+ am__skip_length_check=: \
- distdir) \
- || exit 1; \
- fi; \
-@@ -520,8 +495,7 @@
-
- distclean: distclean-recursive
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool \
-- distclean-tags
-+distclean-am: clean-am distclean-generic distclean-tags
-
- dvi: dvi-recursive
-
-@@ -535,12 +509,20 @@
-
- install-data-am:
-
-+install-dvi: install-dvi-recursive
-+
- install-exec-am:
-
-+install-html: install-html-recursive
-+
- install-info: install-info-recursive
-
- install-man:
-
-+install-pdf: install-pdf-recursive
-+
-+install-ps: install-ps-recursive
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-recursive
-@@ -559,22 +541,24 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am
-+uninstall-am:
-
--uninstall-info: uninstall-info-recursive
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-+ install-strip
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-- clean clean-generic clean-libtool clean-recursive ctags \
-- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am html \
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+ all all-am check check-am clean clean-generic clean-libtool \
-+ ctags ctags-recursive distclean distclean-generic \
-+ distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-man install-strip installcheck \
-+ install-data-am install-dvi install-dvi-am install-exec \
-+ install-exec-am install-html install-html-am install-info \
-+ install-info-am install-man install-pdf install-pdf-am \
-+ install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs installdirs-am maintainer-clean \
-- maintainer-clean-generic maintainer-clean-recursive \
-- mostlyclean mostlyclean-generic mostlyclean-libtool \
-- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-- uninstall uninstall-am uninstall-info-am
-+ maintainer-clean-generic mostlyclean mostlyclean-generic \
-+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am
-
-
- # Commenting out tasks from being built right now since it's
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/Tomboy/Addins/NoteOfTheDay/Makefile.in tomboy-0.8.1/Tomboy/Addins/NoteOfTheDay/Makefile.in
---- tomboy-0.8.1.old/Tomboy/Addins/NoteOfTheDay/Makefile.in 2007-10-15 15:42:35.000000000 +0200
-+++ tomboy-0.8.1/Tomboy/Addins/NoteOfTheDay/Makefile.in 2007-10-16 13:02:18.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -61,8 +57,6 @@
- ACLOCAL = @ACLOCAL@
- ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -93,30 +87,14 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
--ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
--ENABLE_EVOLUTION_FALSE = @ENABLE_EVOLUTION_FALSE@
--ENABLE_EVOLUTION_TRUE = @ENABLE_EVOLUTION_TRUE@
--ENABLE_GALAGO_FALSE = @ENABLE_GALAGO_FALSE@
--ENABLE_GALAGO_TRUE = @ENABLE_GALAGO_TRUE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EVOLUTION_CFLAGS = @EVOLUTION_CFLAGS@
- EVOLUTION_LIBS = @EVOLUTION_LIBS@
- EXEEXT = @EXEEXT@
--EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
--EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--FIXED_GTKSPELL_FALSE = @FIXED_GTKSPELL_FALSE@
--FIXED_GTKSPELL_TRUE = @FIXED_GTKSPELL_TRUE@
- GALAGO_CFLAGS = @GALAGO_CFLAGS@
- GALAGO_LIBS = @GALAGO_LIBS@
- GCONFTOOL = @GCONFTOOL@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -126,11 +104,8 @@
- GREP = @GREP@
- GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@
- GTKSPELL_LIBS = @GTKSPELL_LIBS@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_NUNIT_FALSE = @HAVE_NUNIT_FALSE@
--HAVE_NUNIT_TRUE = @HAVE_NUNIT_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -141,14 +116,12 @@
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/Tomboy/Addins/NoteOfTheDay/Makefile.in tomboy-0.8.2/Tomboy/Addins/NoteOfTheDay/Makefile.in
+--- tomboy-0.8.2.old/Tomboy/Addins/NoteOfTheDay/Makefile.in 2007-11-26 16:51:20.000000000 +0100
++++ tomboy-0.8.2/Tomboy/Addins/NoteOfTheDay/Makefile.in 2007-11-26 17:07:43.000000000 +0100
+@@ -116,14 +116,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -12371,7 +2565,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -160,7 +133,6 @@
+@@ -135,7 +133,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -12379,71 +2573,17 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -172,10 +144,11 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
+@@ -149,6 +146,9 @@
MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
NUNIT = @NUNIT@
-@@ -197,6 +170,7 @@
- PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -204,18 +178,16 @@
- TOMBOY_LIBS = @TOMBOY_LIBS@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
--WITH_DBUS_SERVICE_DIR_FALSE = @WITH_DBUS_SERVICE_DIR_FALSE@
--WITH_DBUS_SERVICE_DIR_TRUE = @WITH_DBUS_SERVICE_DIR_TRUE@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_PLUGIN_DESC = @XGETTEXT_PLUGIN_DESC@
- XGETTEXT_PLUGIN_NAME = @XGETTEXT_PLUGIN_NAME@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -227,6 +199,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -254,19 +227,23 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- DIR_ADDINS_ADDINS = $(top_builddir)/Mono.Addins/Mono.Addins
- DIR_ADDINS_GUI = $(top_builddir)/Mono.Addins/Mono.Addins.Gui
- DIR_ADDINS_SETUP = $(top_builddir)/Mono.Addins/Mono.Addins.Setup
+@@ -238,11 +238,12 @@
LINK_TOMBOY_EXE = \
-r:$(top_builddir)/Tomboy/Tomboy.exe
@@ -12460,235 +2600,10 @@
CSC_FLAGS = -debug
CSC = gmcs $(CSC_FLAGS) -target:exe
CSC_LIB = $(CSC) -target:library
-@@ -344,13 +321,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-addinsDATA: $(addins_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(addinsdir)" || $(mkdir_p) "$(DESTDIR)$(addinsdir)"
-+ test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
- @list='$(addins_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -373,23 +346,21 @@
-
-
- distdir: $(DISTFILES)
-- $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/../../..
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-- esac; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
-+ esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -405,7 +376,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(addinsdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -438,7 +409,7 @@
-
- distclean: distclean-am
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
-
- dvi: dvi-am
-
-@@ -452,12 +423,20 @@
-
- install-data-am: install-addinsDATA
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man:
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -476,17 +455,21 @@
-
- ps-am:
-
--uninstall-am: uninstall-addinsDATA uninstall-info-am
-+uninstall-am: uninstall-addinsDATA
-+
-+.MAKE: install-am install-strip
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-addinsDATA \
-- install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-info-am install-man \
-+ install-am install-data install-data-am install-dvi \
-+ install-dvi-am install-exec install-exec-am install-html \
-+ install-html-am install-info install-info-am install-man \
-+ install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-- uninstall uninstall-addinsDATA uninstall-am uninstall-info-am
-+ uninstall uninstall-addinsDATA uninstall-am
-
-
- $(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/Tomboy/Addins/PrintNotes/Makefile.in tomboy-0.8.1/Tomboy/Addins/PrintNotes/Makefile.in
---- tomboy-0.8.1.old/Tomboy/Addins/PrintNotes/Makefile.in 2007-10-15 15:42:35.000000000 +0200
-+++ tomboy-0.8.1/Tomboy/Addins/PrintNotes/Makefile.in 2007-10-16 13:02:19.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,15 +15,11 @@
- @SET_MAKE@
-
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -61,17 +57,21 @@
- libprintnotes_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
- am_libprintnotes_la_OBJECTS = gedit-print.lo gtksourceprintjob.lo
- libprintnotes_la_OBJECTS = $(am_libprintnotes_la_OBJECTS)
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+libprintnotes_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+ $(libprintnotes_la_LDFLAGS) $(LDFLAGS) -o $@
-+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-- $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+ $(LDFLAGS) -o $@
- SOURCES = $(libprintnotes_la_SOURCES)
- DIST_SOURCES = $(libprintnotes_la_SOURCES)
- addinsDATA_INSTALL = $(INSTALL_DATA)
-@@ -82,8 +82,6 @@
- ACLOCAL = @ACLOCAL@
- ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -114,30 +112,14 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
--ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
--ENABLE_EVOLUTION_FALSE = @ENABLE_EVOLUTION_FALSE@
--ENABLE_EVOLUTION_TRUE = @ENABLE_EVOLUTION_TRUE@
--ENABLE_GALAGO_FALSE = @ENABLE_GALAGO_FALSE@
--ENABLE_GALAGO_TRUE = @ENABLE_GALAGO_TRUE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EVOLUTION_CFLAGS = @EVOLUTION_CFLAGS@
- EVOLUTION_LIBS = @EVOLUTION_LIBS@
- EXEEXT = @EXEEXT@
--EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
--EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--FIXED_GTKSPELL_FALSE = @FIXED_GTKSPELL_FALSE@
--FIXED_GTKSPELL_TRUE = @FIXED_GTKSPELL_TRUE@
- GALAGO_CFLAGS = @GALAGO_CFLAGS@
- GALAGO_LIBS = @GALAGO_LIBS@
- GCONFTOOL = @GCONFTOOL@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -147,11 +129,8 @@
- GREP = @GREP@
- GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@
- GTKSPELL_LIBS = @GTKSPELL_LIBS@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_NUNIT_FALSE = @HAVE_NUNIT_FALSE@
--HAVE_NUNIT_TRUE = @HAVE_NUNIT_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -162,14 +141,12 @@
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/Tomboy/Addins/PrintNotes/Makefile.in tomboy-0.8.2/Tomboy/Addins/PrintNotes/Makefile.in
+--- tomboy-0.8.2.old/Tomboy/Addins/PrintNotes/Makefile.in 2007-11-26 16:51:20.000000000 +0100
++++ tomboy-0.8.2/Tomboy/Addins/PrintNotes/Makefile.in 2007-11-26 17:07:43.000000000 +0100
+@@ -141,14 +141,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -12704,7 +2619,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -181,7 +158,6 @@
+@@ -160,7 +158,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -12712,71 +2627,17 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -193,10 +169,11 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
+@@ -174,6 +171,9 @@
MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
NUNIT = @NUNIT@
-@@ -218,6 +195,7 @@
- PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -225,18 +203,16 @@
- TOMBOY_LIBS = @TOMBOY_LIBS@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
--WITH_DBUS_SERVICE_DIR_FALSE = @WITH_DBUS_SERVICE_DIR_FALSE@
--WITH_DBUS_SERVICE_DIR_TRUE = @WITH_DBUS_SERVICE_DIR_TRUE@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_PLUGIN_DESC = @XGETTEXT_PLUGIN_DESC@
- XGETTEXT_PLUGIN_NAME = @XGETTEXT_PLUGIN_NAME@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -248,6 +224,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -275,19 +252,23 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- DIR_ADDINS_ADDINS = $(top_builddir)/Mono.Addins/Mono.Addins
- DIR_ADDINS_GUI = $(top_builddir)/Mono.Addins/Mono.Addins.Gui
- DIR_ADDINS_SETUP = $(top_builddir)/Mono.Addins/Mono.Addins.Setup
+@@ -263,11 +263,12 @@
LINK_TOMBOY_EXE = \
-r:$(top_builddir)/Tomboy/Tomboy.exe
@@ -12793,268 +2654,10 @@
CSC_FLAGS = -debug
CSC = gmcs $(CSC_FLAGS) -target:exe
CSC_LIB = $(CSC) -target:library
-@@ -378,7 +359,7 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-printnoteslibLTLIBRARIES: $(printnoteslib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-- test -z "$(printnoteslibdir)" || $(mkdir_p) "$(DESTDIR)$(printnoteslibdir)"
-+ test -z "$(printnoteslibdir)" || $(MKDIR_P) "$(DESTDIR)$(printnoteslibdir)"
- @list='$(printnoteslib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- f=$(am__strip_dir) \
-@@ -389,7 +370,7 @@
-
- uninstall-printnoteslibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @set -x; list='$(printnoteslib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(printnoteslib_LTLIBRARIES)'; for p in $$list; do \
- p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(printnoteslibdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(printnoteslibdir)/$$p"; \
-@@ -404,7 +385,7 @@
- rm -f "$${dir}/so_locations"; \
- done
- libprintnotes.la: $(libprintnotes_la_OBJECTS) $(libprintnotes_la_DEPENDENCIES)
-- $(LINK) -rpath $(printnoteslibdir) $(libprintnotes_la_LDFLAGS) $(libprintnotes_la_OBJECTS) $(libprintnotes_la_LIBADD) $(LIBS)
-+ $(libprintnotes_la_LINK) -rpath $(printnoteslibdir) $(libprintnotes_la_OBJECTS) $(libprintnotes_la_LIBADD) $(LIBS)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-@@ -416,22 +397,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gtksourceprintjob.Plo at am__quote@
-
- .c.o:
-- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
-- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
- .c.lo:
-- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-@@ -441,13 +422,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-addinsDATA: $(addins_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(addinsdir)" || $(mkdir_p) "$(DESTDIR)$(addinsdir)"
-+ test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
- @list='$(addins_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -512,23 +489,21 @@
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- distdir: $(DISTFILES)
-- $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/../../..
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-- esac; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
-+ esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -544,7 +519,7 @@
- all-am: Makefile $(LTLIBRARIES) $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(printnoteslibdir)" "$(DESTDIR)$(addinsdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -580,7 +555,7 @@
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
-- distclean-libtool distclean-tags
-+ distclean-tags
-
- dvi: dvi-am
-
-@@ -594,12 +569,20 @@
-
- install-data-am: install-addinsDATA install-printnoteslibLTLIBRARIES
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man:
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -621,22 +604,25 @@
-
- ps-am:
-
--uninstall-am: uninstall-addinsDATA uninstall-info-am \
-- uninstall-printnoteslibLTLIBRARIES
-+uninstall-am: uninstall-addinsDATA uninstall-printnoteslibLTLIBRARIES
-+
-+.MAKE: install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-printnoteslibLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-addinsDATA install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-man install-printnoteslibLTLIBRARIES \
-+ install-data-am install-dvi install-dvi-am install-exec \
-+ install-exec-am install-html install-html-am install-info \
-+ install-info-am install-man install-pdf install-pdf-am \
-+ install-printnoteslibLTLIBRARIES install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-local mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-addinsDATA uninstall-am \
-- uninstall-info-am uninstall-printnoteslibLTLIBRARIES
-+ uninstall-printnoteslibLTLIBRARIES
-
-
- $(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/Tomboy/Addins/SshSyncService/Makefile.in tomboy-0.8.1/Tomboy/Addins/SshSyncService/Makefile.in
---- tomboy-0.8.1.old/Tomboy/Addins/SshSyncService/Makefile.in 2007-10-15 15:42:35.000000000 +0200
-+++ tomboy-0.8.1/Tomboy/Addins/SshSyncService/Makefile.in 2007-10-16 13:02:19.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -61,8 +57,6 @@
- ACLOCAL = @ACLOCAL@
- ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -93,30 +87,14 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
--ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
--ENABLE_EVOLUTION_FALSE = @ENABLE_EVOLUTION_FALSE@
--ENABLE_EVOLUTION_TRUE = @ENABLE_EVOLUTION_TRUE@
--ENABLE_GALAGO_FALSE = @ENABLE_GALAGO_FALSE@
--ENABLE_GALAGO_TRUE = @ENABLE_GALAGO_TRUE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EVOLUTION_CFLAGS = @EVOLUTION_CFLAGS@
- EVOLUTION_LIBS = @EVOLUTION_LIBS@
- EXEEXT = @EXEEXT@
--EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
--EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--FIXED_GTKSPELL_FALSE = @FIXED_GTKSPELL_FALSE@
--FIXED_GTKSPELL_TRUE = @FIXED_GTKSPELL_TRUE@
- GALAGO_CFLAGS = @GALAGO_CFLAGS@
- GALAGO_LIBS = @GALAGO_LIBS@
- GCONFTOOL = @GCONFTOOL@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -126,11 +104,8 @@
- GREP = @GREP@
- GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@
- GTKSPELL_LIBS = @GTKSPELL_LIBS@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_NUNIT_FALSE = @HAVE_NUNIT_FALSE@
--HAVE_NUNIT_TRUE = @HAVE_NUNIT_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -141,14 +116,12 @@
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/Tomboy/Addins/SshSyncService/Makefile.in tomboy-0.8.2/Tomboy/Addins/SshSyncService/Makefile.in
+--- tomboy-0.8.2.old/Tomboy/Addins/SshSyncService/Makefile.in 2007-11-26 16:51:20.000000000 +0100
++++ tomboy-0.8.2/Tomboy/Addins/SshSyncService/Makefile.in 2007-11-26 17:07:43.000000000 +0100
+@@ -116,14 +116,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -13070,7 +2673,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -160,7 +133,6 @@
+@@ -135,7 +133,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -13078,71 +2681,17 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -172,10 +144,11 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
+@@ -149,6 +146,9 @@
MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
NUNIT = @NUNIT@
-@@ -197,6 +170,7 @@
- PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -204,18 +178,16 @@
- TOMBOY_LIBS = @TOMBOY_LIBS@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
--WITH_DBUS_SERVICE_DIR_FALSE = @WITH_DBUS_SERVICE_DIR_FALSE@
--WITH_DBUS_SERVICE_DIR_TRUE = @WITH_DBUS_SERVICE_DIR_TRUE@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_PLUGIN_DESC = @XGETTEXT_PLUGIN_DESC@
- XGETTEXT_PLUGIN_NAME = @XGETTEXT_PLUGIN_NAME@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -227,6 +199,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -254,19 +227,23 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- DIR_ADDINS_ADDINS = $(top_builddir)/Mono.Addins/Mono.Addins
- DIR_ADDINS_GUI = $(top_builddir)/Mono.Addins/Mono.Addins.Gui
- DIR_ADDINS_SETUP = $(top_builddir)/Mono.Addins/Mono.Addins.Setup
+@@ -238,11 +238,12 @@
LINK_TOMBOY_EXE = \
-r:$(top_builddir)/Tomboy/Tomboy.exe
@@ -13159,207 +2708,10 @@
CSC_FLAGS = -debug
CSC = gmcs $(CSC_FLAGS) -target:exe
CSC_LIB = $(CSC) -target:library
-@@ -344,13 +321,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-addinsDATA: $(addins_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(addinsdir)" || $(mkdir_p) "$(DESTDIR)$(addinsdir)"
-+ test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
- @list='$(addins_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -373,23 +346,21 @@
-
-
- distdir: $(DISTFILES)
-- $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/../../..
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-- esac; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
-+ esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -405,7 +376,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(addinsdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -438,7 +409,7 @@
-
- distclean: distclean-am
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
-
- dvi: dvi-am
-
-@@ -452,12 +423,20 @@
-
- install-data-am: install-addinsDATA
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man:
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -476,17 +455,21 @@
-
- ps-am:
-
--uninstall-am: uninstall-addinsDATA uninstall-info-am
-+uninstall-am: uninstall-addinsDATA
-+
-+.MAKE: install-am install-strip
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-addinsDATA \
-- install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-info-am install-man \
-+ install-am install-data install-data-am install-dvi \
-+ install-dvi-am install-exec install-exec-am install-html \
-+ install-html-am install-info install-info-am install-man \
-+ install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-- uninstall uninstall-addinsDATA uninstall-am uninstall-info-am
-+ uninstall uninstall-addinsDATA uninstall-am
-
-
- $(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/Tomboy/Addins/StickyNoteImport/Makefile.in tomboy-0.8.1/Tomboy/Addins/StickyNoteImport/Makefile.in
---- tomboy-0.8.1.old/Tomboy/Addins/StickyNoteImport/Makefile.in 2007-10-15 15:42:36.000000000 +0200
-+++ tomboy-0.8.1/Tomboy/Addins/StickyNoteImport/Makefile.in 2007-10-16 13:02:19.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -61,8 +57,6 @@
- ACLOCAL = @ACLOCAL@
- ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -93,30 +87,14 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
--ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
--ENABLE_EVOLUTION_FALSE = @ENABLE_EVOLUTION_FALSE@
--ENABLE_EVOLUTION_TRUE = @ENABLE_EVOLUTION_TRUE@
--ENABLE_GALAGO_FALSE = @ENABLE_GALAGO_FALSE@
--ENABLE_GALAGO_TRUE = @ENABLE_GALAGO_TRUE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EVOLUTION_CFLAGS = @EVOLUTION_CFLAGS@
- EVOLUTION_LIBS = @EVOLUTION_LIBS@
- EXEEXT = @EXEEXT@
--EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
--EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--FIXED_GTKSPELL_FALSE = @FIXED_GTKSPELL_FALSE@
--FIXED_GTKSPELL_TRUE = @FIXED_GTKSPELL_TRUE@
- GALAGO_CFLAGS = @GALAGO_CFLAGS@
- GALAGO_LIBS = @GALAGO_LIBS@
- GCONFTOOL = @GCONFTOOL@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -126,11 +104,8 @@
- GREP = @GREP@
- GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@
- GTKSPELL_LIBS = @GTKSPELL_LIBS@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_NUNIT_FALSE = @HAVE_NUNIT_FALSE@
--HAVE_NUNIT_TRUE = @HAVE_NUNIT_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -141,14 +116,12 @@
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/Tomboy/Addins/StickyNoteImport/Makefile.in tomboy-0.8.2/Tomboy/Addins/StickyNoteImport/Makefile.in
+--- tomboy-0.8.2.old/Tomboy/Addins/StickyNoteImport/Makefile.in 2007-11-26 16:51:20.000000000 +0100
++++ tomboy-0.8.2/Tomboy/Addins/StickyNoteImport/Makefile.in 2007-11-26 17:07:43.000000000 +0100
+@@ -116,14 +116,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -13375,7 +2727,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -160,7 +133,6 @@
+@@ -135,7 +133,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -13383,71 +2735,17 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -172,10 +144,11 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
+@@ -149,6 +146,9 @@
MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
NUNIT = @NUNIT@
-@@ -197,6 +170,7 @@
- PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -204,18 +178,16 @@
- TOMBOY_LIBS = @TOMBOY_LIBS@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
--WITH_DBUS_SERVICE_DIR_FALSE = @WITH_DBUS_SERVICE_DIR_FALSE@
--WITH_DBUS_SERVICE_DIR_TRUE = @WITH_DBUS_SERVICE_DIR_TRUE@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_PLUGIN_DESC = @XGETTEXT_PLUGIN_DESC@
- XGETTEXT_PLUGIN_NAME = @XGETTEXT_PLUGIN_NAME@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -227,6 +199,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -254,19 +227,23 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- DIR_ADDINS_ADDINS = $(top_builddir)/Mono.Addins/Mono.Addins
- DIR_ADDINS_GUI = $(top_builddir)/Mono.Addins/Mono.Addins.Gui
- DIR_ADDINS_SETUP = $(top_builddir)/Mono.Addins/Mono.Addins.Setup
+@@ -238,11 +238,12 @@
LINK_TOMBOY_EXE = \
-r:$(top_builddir)/Tomboy/Tomboy.exe
@@ -13464,207 +2762,10 @@
CSC_FLAGS = -debug
CSC = gmcs $(CSC_FLAGS) -target:exe
CSC_LIB = $(CSC) -target:library
-@@ -341,13 +318,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-addinsDATA: $(addins_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(addinsdir)" || $(mkdir_p) "$(DESTDIR)$(addinsdir)"
-+ test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
- @list='$(addins_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -370,23 +343,21 @@
-
-
- distdir: $(DISTFILES)
-- $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/../../..
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-- esac; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
-+ esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -402,7 +373,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(addinsdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -435,7 +406,7 @@
-
- distclean: distclean-am
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
-
- dvi: dvi-am
-
-@@ -449,12 +420,20 @@
-
- install-data-am: install-addinsDATA
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man:
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -473,17 +452,21 @@
-
- ps-am:
-
--uninstall-am: uninstall-addinsDATA uninstall-info-am
-+uninstall-am: uninstall-addinsDATA
-+
-+.MAKE: install-am install-strip
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-addinsDATA \
-- install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-info-am install-man \
-+ install-am install-data install-data-am install-dvi \
-+ install-dvi-am install-exec install-exec-am install-html \
-+ install-html-am install-info install-info-am install-man \
-+ install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-- uninstall uninstall-addinsDATA uninstall-am uninstall-info-am
-+ uninstall uninstall-addinsDATA uninstall-am
-
-
- $(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/Tomboy/Addins/WebDavSyncService/Makefile.in tomboy-0.8.1/Tomboy/Addins/WebDavSyncService/Makefile.in
---- tomboy-0.8.1.old/Tomboy/Addins/WebDavSyncService/Makefile.in 2007-10-15 15:42:36.000000000 +0200
-+++ tomboy-0.8.1/Tomboy/Addins/WebDavSyncService/Makefile.in 2007-10-16 13:02:19.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @SET_MAKE@
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -61,8 +57,6 @@
- ACLOCAL = @ACLOCAL@
- ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -93,30 +87,14 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
--ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
--ENABLE_EVOLUTION_FALSE = @ENABLE_EVOLUTION_FALSE@
--ENABLE_EVOLUTION_TRUE = @ENABLE_EVOLUTION_TRUE@
--ENABLE_GALAGO_FALSE = @ENABLE_GALAGO_FALSE@
--ENABLE_GALAGO_TRUE = @ENABLE_GALAGO_TRUE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EVOLUTION_CFLAGS = @EVOLUTION_CFLAGS@
- EVOLUTION_LIBS = @EVOLUTION_LIBS@
- EXEEXT = @EXEEXT@
--EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
--EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--FIXED_GTKSPELL_FALSE = @FIXED_GTKSPELL_FALSE@
--FIXED_GTKSPELL_TRUE = @FIXED_GTKSPELL_TRUE@
- GALAGO_CFLAGS = @GALAGO_CFLAGS@
- GALAGO_LIBS = @GALAGO_LIBS@
- GCONFTOOL = @GCONFTOOL@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -126,11 +104,8 @@
- GREP = @GREP@
- GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@
- GTKSPELL_LIBS = @GTKSPELL_LIBS@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_NUNIT_FALSE = @HAVE_NUNIT_FALSE@
--HAVE_NUNIT_TRUE = @HAVE_NUNIT_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -141,14 +116,12 @@
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/Tomboy/Addins/WebDavSyncService/Makefile.in tomboy-0.8.2/Tomboy/Addins/WebDavSyncService/Makefile.in
+--- tomboy-0.8.2.old/Tomboy/Addins/WebDavSyncService/Makefile.in 2007-11-26 16:51:20.000000000 +0100
++++ tomboy-0.8.2/Tomboy/Addins/WebDavSyncService/Makefile.in 2007-11-26 17:07:43.000000000 +0100
+@@ -116,14 +116,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -13680,7 +2781,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -160,7 +133,6 @@
+@@ -135,7 +133,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -13688,71 +2789,17 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -172,10 +144,11 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
+@@ -149,6 +146,9 @@
MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
NUNIT = @NUNIT@
-@@ -197,6 +170,7 @@
- PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -204,18 +178,16 @@
- TOMBOY_LIBS = @TOMBOY_LIBS@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
--WITH_DBUS_SERVICE_DIR_FALSE = @WITH_DBUS_SERVICE_DIR_FALSE@
--WITH_DBUS_SERVICE_DIR_TRUE = @WITH_DBUS_SERVICE_DIR_TRUE@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_PLUGIN_DESC = @XGETTEXT_PLUGIN_DESC@
- XGETTEXT_PLUGIN_NAME = @XGETTEXT_PLUGIN_NAME@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -227,6 +199,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -254,19 +227,23 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- DIR_ADDINS_ADDINS = $(top_builddir)/Mono.Addins/Mono.Addins
- DIR_ADDINS_GUI = $(top_builddir)/Mono.Addins/Mono.Addins.Gui
- DIR_ADDINS_SETUP = $(top_builddir)/Mono.Addins/Mono.Addins.Setup
+@@ -238,11 +238,12 @@
LINK_TOMBOY_EXE = \
-r:$(top_builddir)/Tomboy/Tomboy.exe
@@ -13769,232 +2816,10 @@
CSC_FLAGS = -debug
CSC = gmcs $(CSC_FLAGS) -target:exe
CSC_LIB = $(CSC) -target:library
-@@ -344,13 +321,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-addinsDATA: $(addins_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(addinsdir)" || $(mkdir_p) "$(DESTDIR)$(addinsdir)"
-+ test -z "$(addinsdir)" || $(MKDIR_P) "$(DESTDIR)$(addinsdir)"
- @list='$(addins_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -373,23 +346,21 @@
-
-
- distdir: $(DISTFILES)
-- $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/../../..
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-- esac; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
-+ esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -405,7 +376,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(addinsdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -438,7 +409,7 @@
-
- distclean: distclean-am
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
-
- dvi: dvi-am
-
-@@ -452,12 +423,20 @@
-
- install-data-am: install-addinsDATA
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man:
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -476,17 +455,21 @@
-
- ps-am:
-
--uninstall-am: uninstall-addinsDATA uninstall-info-am
-+uninstall-am: uninstall-addinsDATA
-+
-+.MAKE: install-am install-strip
-
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-addinsDATA \
-- install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-info-am install-man \
-+ install-am install-data install-data-am install-dvi \
-+ install-dvi-am install-exec install-exec-am install-html \
-+ install-html-am install-info install-info-am install-man \
-+ install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-- uninstall uninstall-addinsDATA uninstall-am uninstall-info-am
-+ uninstall uninstall-addinsDATA uninstall-am
-
-
- $(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
-diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.1.old/Tomboy/Makefile.in tomboy-0.8.1/Tomboy/Makefile.in
---- tomboy-0.8.1.old/Tomboy/Makefile.in 2007-10-15 15:42:36.000000000 +0200
-+++ tomboy-0.8.1/Tomboy/Makefile.in 2007-10-16 13:02:19.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,15 +15,11 @@
- @SET_MAKE@
-
-
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -54,10 +50,11 @@
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
-- install-exec-recursive install-info-recursive \
-- install-recursive installcheck-recursive installdirs-recursive \
-- pdf-recursive ps-recursive uninstall-info-recursive \
-- uninstall-recursive
-+ install-dvi-recursive install-exec-recursive \
-+ install-html-recursive install-info-recursive \
-+ install-pdf-recursive install-ps-recursive install-recursive \
-+ installcheck-recursive installdirs-recursive pdf-recursive \
-+ ps-recursive uninstall-recursive
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-@@ -66,6 +63,8 @@
- am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
- tomboylibDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(tomboylib_DATA)
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
-+ distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = $(SUBDIRS)
-@@ -73,8 +72,6 @@
- ACLOCAL = @ACLOCAL@
- ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -105,30 +102,14 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
--ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
--ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
--ENABLE_EVOLUTION_FALSE = @ENABLE_EVOLUTION_FALSE@
--ENABLE_EVOLUTION_TRUE = @ENABLE_EVOLUTION_TRUE@
--ENABLE_GALAGO_FALSE = @ENABLE_GALAGO_FALSE@
--ENABLE_GALAGO_TRUE = @ENABLE_GALAGO_TRUE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_FALSE@
--ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE = @ENABLE_PANELAPPLET_SRVDIR_CHECK_TRUE@
--ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
--ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
- EVOLUTION_CFLAGS = @EVOLUTION_CFLAGS@
- EVOLUTION_LIBS = @EVOLUTION_LIBS@
- EXEEXT = @EXEEXT@
--EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
--EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--FIXED_GTKSPELL_FALSE = @FIXED_GTKSPELL_FALSE@
--FIXED_GTKSPELL_TRUE = @FIXED_GTKSPELL_TRUE@
- GALAGO_CFLAGS = @GALAGO_CFLAGS@
- GALAGO_LIBS = @GALAGO_LIBS@
- GCONFTOOL = @GCONFTOOL@
--GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
--GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -138,11 +119,8 @@
- GREP = @GREP@
- GTKSPELL_CFLAGS = @GTKSPELL_CFLAGS@
- GTKSPELL_LIBS = @GTKSPELL_LIBS@
--HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
--HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
--HAVE_NUNIT_FALSE = @HAVE_NUNIT_FALSE@
--HAVE_NUNIT_TRUE = @HAVE_NUNIT_TRUE@
- HELP_DIR = @HELP_DIR@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -153,14 +131,12 @@
+diff -x'*config.sub' -x'*config.guess' -Naur tomboy-0.8.2.old/Tomboy/Makefile.in tomboy-0.8.2/Tomboy/Makefile.in
+--- tomboy-0.8.2.old/Tomboy/Makefile.in 2007-11-26 16:51:21.000000000 +0100
++++ tomboy-0.8.2/Tomboy/Makefile.in 2007-11-26 17:07:43.000000000 +0100
+@@ -131,14 +131,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -14010,7 +2835,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -172,7 +148,6 @@
+@@ -150,7 +148,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -14018,71 +2843,17 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -184,10 +159,11 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
+@@ -164,6 +161,9 @@
MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
NUNIT = @NUNIT@
-@@ -209,6 +185,7 @@
- PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
- PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -216,18 +193,16 @@
- TOMBOY_LIBS = @TOMBOY_LIBS@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
--WITH_DBUS_SERVICE_DIR_FALSE = @WITH_DBUS_SERVICE_DIR_FALSE@
--WITH_DBUS_SERVICE_DIR_TRUE = @WITH_DBUS_SERVICE_DIR_TRUE@
- XGETTEXT = @XGETTEXT@
- XGETTEXT_PLUGIN_DESC = @XGETTEXT_PLUGIN_DESC@
- XGETTEXT_PLUGIN_NAME = @XGETTEXT_PLUGIN_NAME@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -239,6 +214,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -266,19 +242,23 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- DIR_ADDINS_ADDINS = $(top_builddir)/Mono.Addins/Mono.Addins
- DIR_ADDINS_GUI = $(top_builddir)/Mono.Addins/Mono.Addins.Gui
- DIR_ADDINS_SETUP = $(top_builddir)/Mono.Addins/Mono.Addins.Setup
+@@ -253,11 +253,12 @@
LINK_TOMBOY_EXE = \
-r:$(top_builddir)/Tomboy/Tomboy.exe
@@ -14099,171 +2870,3 @@
CSC_FLAGS = -debug
CSC = gmcs $(CSC_FLAGS) -target:exe
CSC_LIB = $(CSC) -target:library
-@@ -418,7 +398,7 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binSCRIPTS: $(bin_SCRIPTS)
- @$(NORMAL_INSTALL)
-- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
- @list='$(bin_SCRIPTS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- if test -f $$d$$p; then \
-@@ -441,13 +421,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-tomboylibDATA: $(tomboylib_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(tomboylibdir)" || $(mkdir_p) "$(DESTDIR)$(tomboylibdir)"
-+ test -z "$(tomboylibdir)" || $(MKDIR_P) "$(DESTDIR)$(tomboylibdir)"
- @list='$(tomboylib_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -494,8 +470,7 @@
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
-@@ -596,23 +571,21 @@
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- distdir: $(DISTFILES)
-- $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/$(srcdir)/Gnome.Keyring $(distdir)/$(srcdir)/Synchronization $(distdir)/$(srcdir)/dbus-sharp/dbus-sharp-glib/glib $(distdir)/$(srcdir)/dbus-sharp/dbus-sharp/src $(distdir)/$(srcdir)/panelapplet $(distdir)/..
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-- esac; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
-+ esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -626,7 +599,7 @@
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -634,6 +607,8 @@
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
-+ am__remove_distdir=: \
-+ am__skip_length_check=: \
- distdir) \
- || exit 1; \
- fi; \
-@@ -644,7 +619,7 @@
- installdirs: installdirs-recursive
- installdirs-am:
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(tomboylibdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-recursive
- install-exec: install-exec-recursive
-@@ -677,8 +652,7 @@
-
- distclean: distclean-recursive
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool \
-- distclean-tags
-+distclean-am: clean-am distclean-generic distclean-tags
-
- dvi: dvi-recursive
-
-@@ -692,12 +666,20 @@
-
- install-data-am: install-tomboylibDATA
-
-+install-dvi: install-dvi-recursive
-+
- install-exec-am: install-binSCRIPTS
-
-+install-html: install-html-recursive
-+
- install-info: install-info-recursive
-
- install-man:
-
-+install-pdf: install-pdf-recursive
-+
-+install-ps: install-ps-recursive
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-recursive
-@@ -716,24 +698,25 @@
-
- ps-am:
-
--uninstall-am: uninstall-binSCRIPTS uninstall-info-am \
-- uninstall-tomboylibDATA
-+uninstall-am: uninstall-binSCRIPTS uninstall-tomboylibDATA
-
--uninstall-info: uninstall-info-recursive
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-+ install-strip
-
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-- clean clean-generic clean-libtool clean-recursive ctags \
-- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am html \
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+ all all-am check check-am clean clean-generic clean-libtool \
-+ ctags ctags-recursive distclean distclean-generic \
-+ distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-binSCRIPTS \
-- install-data install-data-am install-exec install-exec-am \
-- install-info install-info-am install-man install-strip \
-+ install-data install-data-am install-dvi install-dvi-am \
-+ install-exec install-exec-am install-html install-html-am \
-+ install-info install-info-am install-man install-pdf \
-+ install-pdf-am install-ps install-ps-am install-strip \
- install-tomboylibDATA installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
-- maintainer-clean-recursive mostlyclean mostlyclean-generic \
-- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-- tags tags-recursive uninstall uninstall-am \
-- uninstall-binSCRIPTS uninstall-info-am uninstall-tomboylibDATA
-+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-+ ps ps-am tags tags-recursive uninstall uninstall-am \
-+ uninstall-binSCRIPTS uninstall-tomboylibDATA
-
-
- $(TARGET): $(CSFILES) Defines.cs
More information about the Pkg-mono-svn-commits
mailing list