[Pkg-cli-apps-commits] r3753 - in /packages/tomboy/branches/0.9/debian: changelog control patches/01_external-mono-addins.patch patches/99_autoreconf.patch
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Fri Feb 29 07:09:42 UTC 2008
Author: slomo
Date: Fri Feb 29 07:09:41 2008
New Revision: 3753
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3753
Log:
* New upstream development release:
+ debian/control:
- Updated build dependencies.
+ debian/patches/01_external-mono-addins.patch:
- Dropped, merged upstream.
Removed:
packages/tomboy/branches/0.9/debian/patches/01_external-mono-addins.patch
Modified:
packages/tomboy/branches/0.9/debian/changelog
packages/tomboy/branches/0.9/debian/control
packages/tomboy/branches/0.9/debian/patches/99_autoreconf.patch
Modified: packages/tomboy/branches/0.9/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/tomboy/branches/0.9/debian/changelog?rev=3753&op=diff
==============================================================================
--- packages/tomboy/branches/0.9/debian/changelog (original)
+++ packages/tomboy/branches/0.9/debian/changelog Fri Feb 29 07:09:41 2008
@@ -1,5 +1,10 @@
-tomboy (0.8.2-2) UNRELEASED; urgency=low
-
+tomboy (0.9.7-1) experimental; urgency=low
+
+ * New upstream development release:
+ + debian/control:
+ - Updated build dependencies.
+ + debian/patches/01_external-mono-addins.patch:
+ - Dropped, merged upstream.
* debian/rules,
debian/patches/99_ltmain_as-needed.patch:
+ Link the native libraries with --as-needed to get fewer dependencies.
@@ -8,7 +13,7 @@
* debian/patches/99_autoreconf.patch:
+ Regenerated for the above change.
- -- Sebastian Dröge <slomo at debian.org> Tue, 04 Dec 2007 15:03:16 +0100
+ -- Sebastian Dröge <slomo at debian.org> Fri, 29 Feb 2008 08:02:26 +0100
tomboy (0.8.2-1) unstable; urgency=low
Modified: packages/tomboy/branches/0.9/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/tomboy/branches/0.9/debian/control?rev=3753&op=diff
==============================================================================
--- packages/tomboy/branches/0.9/debian/control (original)
+++ packages/tomboy/branches/0.9/debian/control Fri Feb 29 07:09:41 2008
@@ -2,7 +2,7 @@
Section: gnome
Priority: optional
Maintainer: Sebastian Dröge <slomo at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), mono-gmcs (>= 1.1.13.4), libgtk2.0-cil (>= 2.6.0), libgnome2.0-cil, libgconf2.0-cil, libgtkspell-dev (>= 2.0.9), libmono-dev (>= 1.1.13.4), intltool, libdbus-1-dev (>=0.90), libdbus-glib-1-dev (>= 0.60), libpanel-applet2-dev, cli-common-dev (>= 0.4.4), sharutils, libgnomeprintui2.2-dev, libgtk2.0-dev (>= 2.6.0), libatk1.0-dev (>= 1.2.4), libgmime2.2-cil, gnome-doc-utils (>= 0.3.2), scrollkeeper, libmono-cairo2.0-cil, libndesk-dbus1.0-cil (>= 0.4), libndesk-dbus-glib1.0-cil (>= 0.3), libmono-addins0.2-cil (>= 0.2-4), libmono-addins-gui0.2-cil (>= 0.2-4)
+Build-Depends: cdbs, debhelper (>= 5), mono-gmcs (>= 1.1.13.4), libgtk2.0-cil (>= 2.10.0), libgnome2.0-cil (>= 2.16.1), libgconf2.0-cil, libgtkspell-dev (>= 2.0.9), libmono-dev (>= 1.1.13.4), intltool, libdbus-1-dev (>=0.90), libdbus-glib-1-dev (>= 0.60), libpanel-applet2-dev, cli-common-dev (>= 0.4.4), sharutils, libgnomeprintui2.2-dev, libgtk2.0-dev (>= 2.6.0), libatk1.0-dev (>= 1.2.4), libgmime2.2-cil, gnome-doc-utils (>= 0.3.2), scrollkeeper, libmono-cairo2.0-cil, libndesk-dbus1.0-cil (>= 0.4), libndesk-dbus-glib1.0-cil (>= 0.3), libmono-addins0.2-cil (>= 0.2-4), libmono-addins-gui0.2-cil (>= 0.2-4)
Standards-Version: 3.7.2
Package: tomboy
Modified: packages/tomboy/branches/0.9/debian/patches/99_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/tomboy/branches/0.9/debian/patches/99_autoreconf.patch?rev=3753&op=diff
==============================================================================
--- packages/tomboy/branches/0.9/debian/patches/99_autoreconf.patch (original)
+++ packages/tomboy/branches/0.9/debian/patches/99_autoreconf.patch Fri Feb 29 07:09:41 2008
@@ -1,7 +1,45 @@
-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-12-04 15:24:30.000000000 +0100
-@@ -412,6 +412,18 @@
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/aclocal.m4 tomboy-0.9.7/aclocal.m4
+--- tomboy-0.9.7.old/aclocal.m4 2008-02-22 21:01:02.000000000 +0100
++++ tomboy-0.9.7/aclocal.m4 2008-02-29 08:08:31.000000000 +0100
+@@ -1,7 +1,7 @@
+-# generated automatically by aclocal 1.10 -*- Autoconf -*-
++# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005, 2006 Free Software Foundation, Inc.
++# 2005, 2006, 2007, 2008 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,10 +11,13 @@
+ # 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])])
++m4_ifndef([AC_AUTOCONF_VERSION],
++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
++m4_if(AC_AUTOCONF_VERSION, [2.61],,
++[m4_warning([this file was generated for autoconf 2.61.
++You have another version of autoconf. It may work, but is not guaranteed to.
++If you have problems, you may need to regenerate the build system entirely.
++To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
+ dnl AM_GCONF_SOURCE_2
+ dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
+@@ -159,8 +162,7 @@
+ #-----------------
+ glib_DEFUN([GLIB_WITH_NLS],
+ dnl NLS is obligatory
+- [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+- USE_NLS=yes
++ [USE_NLS=yes
+ AC_SUBST(USE_NLS)
+
+ gt_cv_have_gettext=no
+@@ -412,6 +414,18 @@
fi
fi
@@ -20,7 +58,18 @@
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 @@
+@@ -554,6 +568,10 @@
+ enable_scrollkeeper=yes)
+ AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"])
+
++dnl disable scrollkeeper automatically for distcheck
++DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
++AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
++
+ AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"])
+ ])
+
+@@ -577,7 +595,7 @@
dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
@@ -29,7 +78,7 @@
AC_DEFUN([IT_PROG_INTLTOOL],
[AC_PREREQ([2.50])dnl
-@@ -590,7 +602,7 @@
+@@ -590,7 +608,7 @@
esac
if test -n "$1"; then
@@ -38,7 +87,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`
-@@ -619,6 +631,7 @@
+@@ -619,6 +637,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 $< [$]@'
@@ -46,15 +95,29 @@
AC_SUBST(INTLTOOL_DESKTOP_RULE)
AC_SUBST(INTLTOOL_DIRECTORY_RULE)
-@@ -638,6 +651,7 @@
+@@ -638,6 +657,21 @@
AC_SUBST(INTLTOOL_SCHEMAS_RULE)
AC_SUBST(INTLTOOL_THEME_RULE)
AC_SUBST(INTLTOOL_SERVICE_RULE)
+AC_SUBST(INTLTOOL_POLICY_RULE)
++
++# Check the gettext tools to make sure they are GNU
++AC_PATH_PROG(XGETTEXT, xgettext)
++AC_PATH_PROG(MSGMERGE, msgmerge)
++AC_PATH_PROG(MSGFMT, msgfmt)
++if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
++ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
++fi
++xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
++mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
++mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
++if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
++ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
++fi
# Use the tools built into the package, not the ones that are installed.
AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
-@@ -660,19 +674,16 @@
+@@ -660,19 +694,16 @@
fi
fi
@@ -78,7 +141,7 @@
[DATADIRNAME=share],
[case $host in
*-*-solaris*)
-@@ -713,10 +724,6 @@
+@@ -713,10 +744,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" \
@@ -89,7 +152,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
-@@ -731,9 +738,7 @@
+@@ -731,9 +758,7 @@
],
[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
@@ -100,16 +163,164 @@
])
-@@ -782,7 +787,7 @@
+@@ -782,7 +807,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 51 AC_PROG_LIBTOOL
-+# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL
++# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -2408,6 +2413,18 @@
+@@ -870,7 +895,6 @@
+ AC_REQUIRE([AC_OBJEXT])dnl
+ AC_REQUIRE([AC_EXEEXT])dnl
+ dnl
+-
+ AC_LIBTOOL_SYS_MAX_CMD_LEN
+ AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+ AC_LIBTOOL_OBJDIR
+@@ -972,6 +996,8 @@
+ ;;
+ esac
+
++_LT_REQUIRED_DARWIN_CHECKS
++
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+ enable_win32_dll=yes, enable_win32_dll=no)
+@@ -1051,9 +1077,80 @@
+ 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*
++$rm -r conftest*
+ ])# _LT_LINKER_BOILERPLATE
+
++# _LT_REQUIRED_DARWIN_CHECKS
++# --------------------------
++# Check for some things on darwin
++AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
++ case $host_os in
++ rhapsody* | darwin*)
++ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
++ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
++
++ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
++ [lt_cv_apple_cc_single_mod=no
++ if test -z "${LT_MULTI_MODULE}"; then
++ # By default we will add the -single_module flag. You can override
++ # by either setting the environment variable LT_MULTI_MODULE
++ # non-empty at configure time, or by adding -multi_module to the
++ # link flags.
++ echo "int foo(void){return 1;}" > conftest.c
++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
++ -dynamiclib ${wl}-single_module conftest.c
++ if test -f libconftest.dylib; then
++ lt_cv_apple_cc_single_mod=yes
++ rm -rf libconftest.dylib*
++ fi
++ rm conftest.c
++ fi])
++ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
++ [lt_cv_ld_exported_symbols_list],
++ [lt_cv_ld_exported_symbols_list=no
++ save_LDFLAGS=$LDFLAGS
++ echo "_main" > conftest.sym
++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
++ [lt_cv_ld_exported_symbols_list=yes],
++ [lt_cv_ld_exported_symbols_list=no])
++ LDFLAGS="$save_LDFLAGS"
++ ])
++ case $host_os in
++ rhapsody* | darwin1.[[0123]])
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
++ darwin1.*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ darwin*)
++ # if running on 10.5 or later, the deployment target defaults
++ # to the OS version, if on x86, and 10.4, the deployment
++ # target defaults to 10.4. Don't you love it?
++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
++ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ 10.[[012]]*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ 10.*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ esac
++ ;;
++ esac
++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
++ _lt_dar_single_mod='$single_module'
++ fi
++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
++ else
++ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
++ fi
++ if test "$DSYMUTIL" != ":"; then
++ _lt_dsymutil="~$DSYMUTIL \$lib || :"
++ else
++ _lt_dsymutil=
++ fi
++ ;;
++ esac
++])
+
+ # _LT_AC_SYS_LIBPATH_AIX
+ # ----------------------
+@@ -1378,7 +1475,11 @@
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
+- *) LD="${LD-ld} -64" ;;
++ *)
++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
++ LD="${LD-ld} -64"
++ fi
++ ;;
+ esac
+ ;;
+ esac
+@@ -1471,7 +1572,7 @@
+ $2=yes
+ fi
+ fi
+- $rm conftest*
++ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+ ])
+
+@@ -1742,7 +1843,7 @@
+ AC_CHECK_FUNC([shl_load],
+ [lt_cv_dlopen="shl_load"],
+ [AC_CHECK_LIB([dld], [shl_load],
+- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
++ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+ [AC_CHECK_FUNC([dlopen],
+ [lt_cv_dlopen="dlopen"],
+ [AC_CHECK_LIB([dl], [dlopen],
+@@ -1750,7 +1851,7 @@
+ [AC_CHECK_LIB([svld], [dlopen],
+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+ [AC_CHECK_LIB([dld], [dld_link],
+- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+ ])
+ ])
+ ])
+@@ -2067,7 +2168,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[[4-9]]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -2408,6 +2509,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -128,7 +339,30 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -3182,7 +3199,7 @@
+@@ -2588,6 +2701,13 @@
+ AC_MSG_RESULT([$dynamic_linker])
+ test "$dynamic_linker" = no && can_build_shared=no
+
++AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
++[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
++[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -3087,7 +3207,7 @@
+ # whether `pass_all' will *always* work, you probably want this one.
+
+ case $host_os in
+-aix4* | aix5*)
++aix[[4-9]]*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+@@ -3182,7 +3302,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -137,7 +371,112 @@
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 @@
+@@ -3523,7 +3643,7 @@
+ fi
+ ;;
+
+-aix4* | aix5*)
++aix[[4-9]]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
+@@ -3580,6 +3700,7 @@
+ _LT_AC_TAGVAR(predeps, $1)=
+ _LT_AC_TAGVAR(postdeps, $1)=
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+
+ # Source file extension for C++ test sources.
+ ac_ext=cpp
+@@ -3689,7 +3810,7 @@
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -3702,7 +3823,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+ for ld_flag in $LDFLAGS; do
+ case $ld_flag in
+ *-brtl*)
+@@ -3848,51 +3969,23 @@
+ fi
+ ;;
+ darwin* | rhapsody*)
+- case $host_os in
+- rhapsody* | darwin1.[[012]])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+- else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[[012]])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+- ;;
+- 10.*)
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+- ;;
+- esac
+- fi
+- ;;
+- esac
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-
+- if test "$GXX" = yes ; then
+- lt_int_apple_cc_single_mod=no
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
++ if test "$GXX" = yes ; then
+ output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+ fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- fi
+- _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
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- else
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- fi
+- _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}'
+ else
+ case $cc_basename in
+ xlc*)
+@@ -4143,7 +4236,7 @@
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ ;;
+- pgCC*)
++ pgCC* | pgcpp*)
+ # Portland Group C++ compiler
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+@@ -4216,7 +4309,7 @@
;;
esac
;;
@@ -146,7 +485,111 @@
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 @@
+@@ -4578,7 +4671,8 @@
+ # compiler output when linking a shared library.
+ # Parse the compiler output and extract the necessary
+ # objects, libraries and library flags.
+-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
++AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ dnl we can't use the lt_simple_compile_test_code here,
+ dnl because it contains code intended for an executable,
+ dnl not a library. It's possible we should let each
+@@ -4703,6 +4797,11 @@
+
+ $rm -f confest.$objext
+
++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
++if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
++fi
++
+ # PORTME: override above test on systems where it is broken
+ ifelse([$1],[CXX],
+ [case $host_os in
+@@ -4759,7 +4858,6 @@
+ ;;
+ esac
+ ])
+-
+ case " $_LT_AC_TAGVAR(postdeps, $1) " in
+ *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+ esac
+@@ -4844,7 +4942,7 @@
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+-aix4* | aix5*)
++aix[[4-9]]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
+@@ -5021,6 +5119,7 @@
+ _LT_AC_TAGVAR(predeps, $1) \
+ _LT_AC_TAGVAR(postdeps, $1) \
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
+ _LT_AC_TAGVAR(archive_cmds, $1) \
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
+ _LT_AC_TAGVAR(postinstall_cmds, $1) \
+@@ -5083,7 +5182,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, 2002, 2003, 2004, 2005, 2006, 2007
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ # Free Software Foundation, Inc.
+ #
+ # This file is part of GNU Libtool:
+@@ -5320,6 +5419,10 @@
+ # shared library.
+ postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+@@ -5669,7 +5772,7 @@
+ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+ cat conftest.$ac_ext >&5
+ fi
+- rm -f conftest* conftst*
++ rm -rf conftest* conftst*
+
+ # Do not use the global_symbol_pipe unless it works.
+ if test "$pipe_works" = yes; then
+@@ -5726,7 +5829,8 @@
+ # 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'
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+@@ -5763,7 +5867,7 @@
+ esac
+ else
+ case $host_os in
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ # All AIX code is PIC.
+ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+@@ -5859,7 +5963,7 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
+- pgCC*)
++ pgCC* | pgcpp*)
+ # Portland Group C++ compiler.
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+@@ -5897,7 +6001,7 @@
;;
esac
;;
@@ -155,7 +598,54 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -6272,6 +6289,9 @@
+@@ -6010,7 +6114,8 @@
+ # 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'
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
+
+ darwin* | rhapsody*)
+@@ -6080,7 +6185,8 @@
+ 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'
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
+@@ -6217,7 +6323,7 @@
+ #
+ if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
+ AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
+- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
++ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
+ [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
+ [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+ "" | " "*) ;;
+@@ -6241,7 +6347,7 @@
+ #
+ wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
+ AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
++ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+ $lt_tmp_static_flag,
+ [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+@@ -6257,7 +6363,7 @@
+ ifelse([$1],[CXX],[
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ case $host_os in
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+@@ -6272,10 +6378,14 @@
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'
;;
@@ -165,7 +655,37 @@
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -6477,12 +6497,13 @@
+ esac
++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+ ],[
+ runpath_var=
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+@@ -6306,12 +6416,14 @@
+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+ # as well as any symbol that contains `d'.
+- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+ # the symbol is explicitly referenced. Since portable code cannot
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
++ # Exclude shared library initialization/finalization symbols.
++dnl Note also adjust exclude_expsyms for C++ above.
+ extract_expsyms_cmds=
+ # Just being paranoid about ensuring that cc_basename is set.
+ _LT_CC_BASENAME([$compiler])
+@@ -6361,7 +6473,7 @@
+
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+- aix3* | aix4* | aix5*)
++ aix[[3-9]]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -6477,12 +6589,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -180,7 +700,41 @@
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 @@
+@@ -6580,7 +6693,7 @@
+ fi
+ ;;
+
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -6600,7 +6713,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+@@ -6760,11 +6873,10 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ if test "$GCC" = yes ; then
+ output_verbose_link_cmd='echo'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- _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 -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~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}'
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ else
+ case $cc_basename in
+ xlc*)
+@@ -6914,7 +7026,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -189,7 +743,7 @@
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 @@
+@@ -7493,7 +7605,7 @@
_PKG_TEXT
@@ -198,14 +752,110 @@
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-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-12-04 15:24:33.000000000 +0100
-@@ -856,14 +856,11 @@
+@@ -7503,7 +7615,7 @@
+ fi[]dnl
+ ])# PKG_CHECK_MODULES
+
+-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
++# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -7518,7 +7630,7 @@
+ [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], [],
++m4_if([$1], [1.10.1], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+
+@@ -7534,8 +7646,10 @@
+ # 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.10])dnl
+-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
++[AM_AUTOMAKE_VERSION([1.10.1])dnl
++m4_ifndef([AC_AUTOCONF_VERSION],
++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
++_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
+
+ # AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
+@@ -7807,7 +7921,7 @@
+ # each Makefile.in and add a new line on top of each file to say so.
+ # 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
++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`AS_DIRNAME("$mf")`
+ else
+ continue
+@@ -7867,13 +7981,13 @@
+ # Do all the work for Automake. -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005, 2006 Free Software Foundation, Inc.
++# 2005, 2006, 2008 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 12
++# serial 13
+
+ # This macro actually does too much. Some checks are only needed if
+ # your package does certain things. But this isn't really a big deal.
+@@ -7978,16 +8092,17 @@
+ # our stamp files there.
+ AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+ [# Compute $1's index in $config_headers.
++_am_arg=$1
+ _am_stamp_count=1
+ for _am_header in $config_headers :; do
+ case $_am_header in
+- $1 | $1:* )
++ $_am_arg | $_am_arg:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+ done
+-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
++echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+ # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+ #
+@@ -8305,7 +8420,7 @@
+
+ # _AM_SUBST_NOTMAKE(VARIABLE)
+ # ---------------------------
+-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
++# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+ # This macro is traced by Automake.
+ AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/configure tomboy-0.9.7/configure
+--- tomboy-0.9.7.old/configure 2008-02-22 21:01:08.000000000 +0100
++++ tomboy-0.9.7/configure 2008-02-29 08:08:35.000000000 +0100
+@@ -836,6 +836,7 @@
+ DOC_USER_FORMATS
+ ENABLE_SK_TRUE
+ ENABLE_SK_FALSE
++DISTCHECK_CONFIGURE_FLAGS
+ HAVE_GNOME_DOC_UTILS_TRUE
+ HAVE_GNOME_DOC_UTILS_FALSE
+ INTLTOOL_DESKTOP_RULE
+@@ -856,14 +857,14 @@
INTLTOOL_SCHEMAS_RULE
INTLTOOL_THEME_RULE
INTLTOOL_SERVICE_RULE
+INTLTOOL_POLICY_RULE
++XGETTEXT
++MSGMERGE
++MSGFMT
INTLTOOL_EXTRACT
INTLTOOL_MERGE
INTLTOOL_UPDATE
@@ -217,7 +867,27 @@
ALL_LINGUAS
CC
CFLAGS
-@@ -924,6 +921,7 @@
+@@ -898,6 +899,8 @@
+ ECHO
+ AR
+ RANLIB
++DSYMUTIL
++NMEDIT
+ CXX
+ CXXFLAGS
+ ac_ct_CXX
+@@ -911,10 +914,8 @@
+ LIBTOOL
+ GETTEXT_PACKAGE
+ USE_NLS
+-MSGFMT
+ MSGFMT_OPTS
+ GMSGFMT
+-XGETTEXT
+ CATALOGS
+ CATOBJEXT
+ GMOFILES
+@@ -924,6 +925,7 @@
PO_IN_DATADIR_FALSE
POFILES
POSUB
@@ -225,140 +895,198 @@
GCONFTOOL
GCONF_SCHEMA_CONFIG_SOURCE
GCONF_SCHEMA_FILE_DIR
-@@ -948,6 +946,10 @@
- DBUS_LIBS
- EXTERNAL_DBUS_TRUE
- EXTERNAL_DBUS_FALSE
-+MONO_ADDINS_CFLAGS
-+MONO_ADDINS_LIBS
-+EXTERNAL_MONO_ADDINS_TRUE
-+EXTERNAL_MONO_ADDINS_FALSE
- TOMBOY_CFLAGS
- TOMBOY_LIBS
- EVOLUTION_CFLAGS
-@@ -990,6 +992,8 @@
- GTKSPELL_LIBS
- DBUS_CFLAGS
- DBUS_LIBS
-+MONO_ADDINS_CFLAGS
-+MONO_ADDINS_LIBS
- TOMBOY_CFLAGS
- TOMBOY_LIBS
- EVOLUTION_CFLAGS
-@@ -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.
-+ --with-mono-addins[=internal/system]
-
- Some influential environment variables:
- PKG_CONFIG path to pkg-config utility
-@@ -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
-+ MONO_ADDINS_CFLAGS
-+ C compiler flags for MONO_ADDINS, overriding pkg-config
-+ MONO_ADDINS_LIBS
-+ linker flags for MONO_ADDINS, overriding pkg-config
- TOMBOY_CFLAGS
- C compiler flags for TOMBOY, overriding pkg-config
- TOMBOY_LIBS linker flags for TOMBOY, overriding pkg-config
-@@ -4096,6 +4105,8 @@
+@@ -2888,6 +2890,9 @@
+ fi
+
+
++DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
++
++
+ if test "$gdu_cv_have_gdu" = "yes"; then
+ HAVE_GNOME_DOC_UTILS_TRUE=
+ HAVE_GNOME_DOC_UTILS_FALSE='#'
+@@ -4117,6 +4122,7 @@
INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+
-
-
-
-@@ -4187,171 +4198,6 @@
- fi
+
+
+
+@@ -4137,24 +4143,18 @@
+
+
+
+-# Use the tools built into the package, not the ones that are installed.
+-INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
+
+-INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
+-
+-INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
+-
+-
+-# Extract the first word of "perl", so it can be a program name with args.
+-set dummy perl; ac_word=$2
++# Check the gettext tools to make sure they are GNU
++# Extract the first word of "xgettext", so it can be a program name with args.
++set dummy xgettext; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
++if test "${ac_cv_path_XGETTEXT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- case $INTLTOOL_PERL in
++ case $XGETTEXT in
+ [\\/]* | ?:[\\/]*)
+- ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
++ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -4164,7 +4164,7 @@
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
++ ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+@@ -4175,49 +4175,26 @@
+ ;;
+ esac
fi
-
+-INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
+-if test -n "$INTLTOOL_PERL"; then
+- { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
+-echo "${ECHO_T}$INTLTOOL_PERL" >&6; }
++XGETTEXT=$ac_cv_path_XGETTEXT
++if test -n "$XGETTEXT"; then
++ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
++echo "${ECHO_T}$XGETTEXT" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ fi
+
+
+-if test -z "$INTLTOOL_PERL"; then
+- { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
+-echo "$as_me: error: perl not found; required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
+- { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
+-echo "$as_me: error: perl 5.x required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-if test "x" != "xno-xml"; then
+- { echo "$as_me:$LINENO: checking for XML::Parser" >&5
+-echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; }
+- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+- { echo "$as_me:$LINENO: result: ok" >&5
+-echo "${ECHO_T}ok" >&6; }
+- else
+- { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
+-echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
+- fi
+-fi
+-
-# Extract the first word of "iconv", so it can be a program name with args.
-set dummy iconv; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++# Extract the first word of "msgmerge", so it can be a program name with args.
++set dummy msgmerge; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_INTLTOOL_ICONV+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++if test "${ac_cv_path_MSGMERGE+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
- case $INTLTOOL_ICONV in
-- [\\/]* | ?:[\\/]*)
++ case $MSGMERGE in
+ [\\/]* | ?:[\\/]*)
- ac_cv_path_INTLTOOL_ICONV="$INTLTOOL_ICONV" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -4227,7 +4204,7 @@
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
++ ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+@@ -4235,14 +4212,13 @@
+ done
+ IFS=$as_save_IFS
+
- test -z "$ac_cv_path_INTLTOOL_ICONV" && ac_cv_path_INTLTOOL_ICONV="iconv"
-- ;;
--esac
--fi
+ ;;
+ esac
+ fi
-INTLTOOL_ICONV=$ac_cv_path_INTLTOOL_ICONV
-if test -n "$INTLTOOL_ICONV"; then
- { echo "$as_me:$LINENO: result: $INTLTOOL_ICONV" >&5
-echo "${ECHO_T}$INTLTOOL_ICONV" >&6; }
--else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--
--
--# Extract the first word of "msgfmt", so it can be a program name with args.
--set dummy msgfmt; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++MSGMERGE=$ac_cv_path_MSGMERGE
++if test -n "$MSGMERGE"; then
++ { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
++echo "${ECHO_T}$MSGMERGE" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+@@ -4253,12 +4229,12 @@
+ set dummy msgfmt; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_INTLTOOL_MSGFMT+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++if test "${ac_cv_path_MSGFMT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
- case $INTLTOOL_MSGFMT in
-- [\\/]* | ?:[\\/]*)
++ case $MSGFMT in
+ [\\/]* | ?:[\\/]*)
- ac_cv_path_INTLTOOL_MSGFMT="$INTLTOOL_MSGFMT" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -4268,7 +4244,7 @@
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
++ ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+@@ -4276,71 +4252,51 @@
+ done
+ IFS=$as_save_IFS
+
- test -z "$ac_cv_path_INTLTOOL_MSGFMT" && ac_cv_path_INTLTOOL_MSGFMT="msgfmt"
-- ;;
--esac
--fi
+ ;;
+ esac
+ fi
-INTLTOOL_MSGFMT=$ac_cv_path_INTLTOOL_MSGFMT
-if test -n "$INTLTOOL_MSGFMT"; then
- { echo "$as_me:$LINENO: result: $INTLTOOL_MSGFMT" >&5
-echo "${ECHO_T}$INTLTOOL_MSGFMT" >&6; }
--else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--
--
++MSGFMT=$ac_cv_path_MSGFMT
++if test -n "$MSGFMT"; then
++ { echo "$as_me:$LINENO: result: $MSGFMT" >&5
++echo "${ECHO_T}$MSGFMT" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ fi
+
+
-# Extract the first word of "msgmerge", so it can be a program name with args.
-set dummy msgmerge; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -389,7 +1117,11 @@
- test -z "$ac_cv_path_INTLTOOL_MSGMERGE" && ac_cv_path_INTLTOOL_MSGMERGE="msgmerge"
- ;;
-esac
--fi
++if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
++ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
++echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
++ { (exit 1); exit 1; }; }
+ fi
-INTLTOOL_MSGMERGE=$ac_cv_path_INTLTOOL_MSGMERGE
-if test -n "$INTLTOOL_MSGMERGE"; then
- { echo "$as_me:$LINENO: result: $INTLTOOL_MSGMERGE" >&5
@@ -397,55 +1129,98 @@
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
--fi
--
--
++xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
++mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
++mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
++if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
++ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
++echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
++ { (exit 1); exit 1; }; }
+ fi
+
++# Use the tools built into the package, not the ones that are installed.
++INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
+
-# Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
++
++INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
++
++
++# Extract the first word of "perl", so it can be a program name with args.
++set dummy perl; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_INTLTOOL_XGETTEXT+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
- case $INTLTOOL_XGETTEXT in
-- [\\/]* | ?:[\\/]*)
++ case $INTLTOOL_PERL in
+ [\\/]* | ?:[\\/]*)
- ac_cv_path_INTLTOOL_XGETTEXT="$INTLTOOL_XGETTEXT" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -4350,7 +4306,7 @@
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
++ ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+@@ -4358,20 +4314,41 @@
+ done
+ IFS=$as_save_IFS
+
- test -z "$ac_cv_path_INTLTOOL_XGETTEXT" && ac_cv_path_INTLTOOL_XGETTEXT="xgettext"
-- ;;
--esac
--fi
+ ;;
+ esac
+ fi
-INTLTOOL_XGETTEXT=$ac_cv_path_INTLTOOL_XGETTEXT
-if test -n "$INTLTOOL_XGETTEXT"; then
- { echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5
-echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6; }
--else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--
--
--
++INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
++if test -n "$INTLTOOL_PERL"; then
++ { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
++echo "${ECHO_T}$INTLTOOL_PERL" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ fi
+
+
++if test -z "$INTLTOOL_PERL"; then
++ { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
++echo "$as_me: error: perl not found; required for intltool" >&2;}
++ { (exit 1); exit 1; }; }
++fi
++if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
++ { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
++echo "$as_me: error: perl 5.x required for intltool" >&2;}
++ { (exit 1); exit 1; }; }
++fi
++if test "x" != "xno-xml"; then
++ { echo "$as_me:$LINENO: checking for XML::Parser" >&5
++echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; }
++ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
++ { echo "$as_me:$LINENO: result: ok" >&5
++echo "${ECHO_T}ok" >&6; }
++ else
++ { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
++echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
++ { (exit 1); exit 1; }; }
++ fi
++fi
+
# Substitute ALL_LINGUAS so we can use it in po/Makefile
-
-@@ -4369,7 +4215,7 @@
+@@ -4390,7 +4367,7 @@
main ()
{
extern int _nl_msg_cat_cntr;
@@ -454,7 +1229,16 @@
;
return 0;
}
-@@ -6466,7 +6312,7 @@
+@@ -6392,7 +6369,7 @@
+ # whether `pass_all' will *always* work, you probably want this one.
+
+ case $host_os in
+-aix4* | aix5*)
++aix[4-9]*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+@@ -6487,7 +6464,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -463,58 +1247,513 @@
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 @@
+@@ -6607,7 +6584,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 6589 "configure"' > conftest.$ac_ext
-+ echo '#line 6435 "configure"' > conftest.$ac_ext
+- echo '#line 6610 "configure"' > conftest.$ac_ext
++ echo '#line 6587 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -8918,11 +8764,11 @@
+@@ -6779,7 +6756,11 @@
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
+- *) LD="${LD-ld} -64" ;;
++ *)
++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
++ LD="${LD-ld} -64"
++ fi
++ ;;
+ esac
+ ;;
+ esac
+@@ -7971,7 +7952,6 @@
+
+
+ # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+-
+ # find the maximum length of command line arguments
+ { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+ echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
+@@ -8286,7 +8266,7 @@
+ echo "$progname: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ fi
+- rm -f conftest* conftst*
++ rm -rf conftest* conftst*
+
+ # Do not use the global_symbol_pipe unless it works.
+ if test "$pipe_works" = yes; then
+@@ -8846,6 +8826,318 @@
+ ;;
+ esac
+
++
++ case $host_os in
++ rhapsody* | darwin*)
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
++set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$DSYMUTIL"; then
++ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++DSYMUTIL=$ac_cv_prog_DSYMUTIL
++if test -n "$DSYMUTIL"; then
++ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
++echo "${ECHO_T}$DSYMUTIL" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_prog_DSYMUTIL"; then
++ ac_ct_DSYMUTIL=$DSYMUTIL
++ # Extract the first word of "dsymutil", so it can be a program name with args.
++set dummy dsymutil; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$ac_ct_DSYMUTIL"; then
++ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
++if test -n "$ac_ct_DSYMUTIL"; then
++ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
++echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++ if test "x$ac_ct_DSYMUTIL" = x; then
++ DSYMUTIL=":"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ DSYMUTIL=$ac_ct_DSYMUTIL
++ fi
++else
++ DSYMUTIL="$ac_cv_prog_DSYMUTIL"
++fi
++
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
++set dummy ${ac_tool_prefix}nmedit; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_NMEDIT+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$NMEDIT"; then
++ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++NMEDIT=$ac_cv_prog_NMEDIT
++if test -n "$NMEDIT"; then
++ { echo "$as_me:$LINENO: result: $NMEDIT" >&5
++echo "${ECHO_T}$NMEDIT" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_prog_NMEDIT"; then
++ ac_ct_NMEDIT=$NMEDIT
++ # Extract the first word of "nmedit", so it can be a program name with args.
++set dummy nmedit; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$ac_ct_NMEDIT"; then
++ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_ac_ct_NMEDIT="nmedit"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
++if test -n "$ac_ct_NMEDIT"; then
++ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
++echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++ if test "x$ac_ct_NMEDIT" = x; then
++ NMEDIT=":"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ NMEDIT=$ac_ct_NMEDIT
++ fi
++else
++ NMEDIT="$ac_cv_prog_NMEDIT"
++fi
++
++
++ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
++echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
++if test "${lt_cv_apple_cc_single_mod+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_apple_cc_single_mod=no
++ if test -z "${LT_MULTI_MODULE}"; then
++ # By default we will add the -single_module flag. You can override
++ # by either setting the environment variable LT_MULTI_MODULE
++ # non-empty at configure time, or by adding -multi_module to the
++ # link flags.
++ echo "int foo(void){return 1;}" > conftest.c
++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
++ -dynamiclib ${wl}-single_module conftest.c
++ if test -f libconftest.dylib; then
++ lt_cv_apple_cc_single_mod=yes
++ rm -rf libconftest.dylib*
++ fi
++ rm conftest.c
++ fi
++fi
++{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
++echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
++ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
++echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
++if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_ld_exported_symbols_list=no
++ save_LDFLAGS=$LDFLAGS
++ echo "_main" > conftest.sym
++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ lt_cv_ld_exported_symbols_list=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ lt_cv_ld_exported_symbols_list=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++ LDFLAGS="$save_LDFLAGS"
++
++fi
++{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
++echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
++ case $host_os in
++ rhapsody* | darwin1.[0123])
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
++ darwin1.*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ darwin*)
++ # if running on 10.5 or later, the deployment target defaults
++ # to the OS version, if on x86, and 10.4, the deployment
++ # target defaults to 10.4. Don't you love it?
++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
++ 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ 10.[012]*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ 10.*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ esac
++ ;;
++ esac
++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
++ _lt_dar_single_mod='$single_module'
++ fi
++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
++ else
++ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
++ fi
++ if test "$DSYMUTIL" != ":"; then
++ _lt_dsymutil="~$DSYMUTIL \$lib || :"
++ else
++ _lt_dsymutil=
++ fi
++ ;;
++ esac
++
++
+ enable_dlopen=no
+ enable_win32_dll=no
+
+@@ -8911,7 +9203,7 @@
+ 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*
++$rm -r conftest*
+
+
+
+@@ -8939,11 +9231,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:8921: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8767: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8942: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9234: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:8925: \$? = $ac_status" >&5
-+ echo "$as_me:8771: \$? = $ac_status" >&5
+- echo "$as_me:8946: \$? = $ac_status" >&5
++ echo "$as_me:9238: \$? = $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.
-@@ -9208,11 +9054,11 @@
+@@ -9213,10 +9505,10 @@
+
+ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+ echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_pic_works+set}" = set; then
++if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_pic_works=no
++ lt_cv_prog_compiler_pic_works=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+@@ -9229,27 +9521,27 @@
-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:9211: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9057: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9232: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9524: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9215: \$? = $ac_status" >&5
-+ echo "$as_me:9061: \$? = $ac_status" >&5
+- echo "$as_me:9236: \$? = $ac_status" >&5
++ echo "$as_me:9528: \$? = $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.
-@@ -9312,11 +9158,11 @@
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+- lt_prog_compiler_pic_works=yes
++ lt_cv_prog_compiler_pic_works=yes
+ fi
+ fi
+ $rm conftest*
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
+
+-if test x"$lt_prog_compiler_pic_works" = xyes; then
++if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+ case $lt_prog_compiler_pic in
+ "" | " "*) ;;
+ *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+@@ -9276,10 +9568,10 @@
+ wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+ { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_static_works+set}" = set; then
++if test "${lt_cv_prog_compiler_static_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_static_works=no
++ lt_cv_prog_compiler_static_works=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+@@ -9292,20 +9584,20 @@
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+- lt_prog_compiler_static_works=yes
++ lt_cv_prog_compiler_static_works=yes
+ fi
+ else
+- lt_prog_compiler_static_works=yes
++ lt_cv_prog_compiler_static_works=yes
+ fi
+ fi
+- $rm conftest*
++ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
+
+-if test x"$lt_prog_compiler_static_works" = xyes; then
++if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+ :
+ else
+ lt_prog_compiler_static=
+@@ -9333,11 +9625,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:9315: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9161: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9336: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9628: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9319: \$? = $ac_status" >&5
-+ echo "$as_me:9165: \$? = $ac_status" >&5
+- echo "$as_me:9340: \$? = $ac_status" >&5
++ echo "$as_me:9632: \$? = $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
-@@ -9576,12 +9422,13 @@
+@@ -9417,12 +9709,13 @@
+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+ # as well as any symbol that contains `d'.
+- exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
++ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+ # the symbol is explicitly referenced. Since portable code cannot
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
++ # Exclude shared library initialization/finalization symbols.
+ extract_expsyms_cmds=
+ # Just being paranoid about ensuring that cc_basename is set.
+ for cc_temp in $compiler""; do
+@@ -9481,7 +9774,7 @@
+
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+- aix3* | aix4* | aix5*)
++ aix[3-9]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ ld_shlibs=no
+@@ -9597,12 +9890,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -529,7 +1768,41 @@
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 @@
+@@ -9700,7 +9994,7 @@
+ fi
+ ;;
+
+- aix4* | aix5*)
++ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -9720,7 +10014,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+@@ -9992,11 +10286,10 @@
+ link_all_deplibs=yes
+ if test "$GCC" = yes ; then
+ output_verbose_link_cmd='echo'
+- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- 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 -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~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}'
++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ else
+ case $cc_basename in
+ xlc*)
+@@ -10146,7 +10439,7 @@
link_all_deplibs=yes
;;
@@ -538,7 +1811,16 @@
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 @@
+@@ -10516,7 +10809,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[4-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -10857,6 +11150,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -557,25 +1839,207 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -11661,7 +11520,7 @@
+@@ -11038,6 +11343,21 @@
+ echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
++fi
++
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
++fi
++
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -11357,7 +11677,7 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+ echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
+ if test $ac_cv_lib_dld_shl_load = yes; then
+- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
++ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ else
+ { echo "$as_me:$LINENO: checking for dlopen" >&5
+ echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
+@@ -11633,7 +11953,7 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+ echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
+ if test $ac_cv_lib_dld_dld_link = yes; then
+- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
++ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+ fi
+
+
+@@ -11682,7 +12002,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11664 "configure"
-+#line 11523 "configure"
+-#line 11685 "configure"
++#line 12005 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11761,7 +11620,7 @@
+@@ -11782,7 +12102,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11764 "configure"
-+#line 11623 "configure"
+-#line 11785 "configure"
++#line 12105 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -13371,7 +13230,7 @@
+@@ -11909,7 +12229,7 @@
+ fi
+ ;;
+
+-aix4* | aix5*)
++aix[4-9]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
+@@ -11965,6 +12285,7 @@
+ predeps \
+ postdeps \
+ compiler_lib_search_path \
++ compiler_lib_search_dirs \
+ archive_cmds \
+ archive_expsym_cmds \
+ postinstall_cmds \
+@@ -12025,7 +12346,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, 2002, 2003, 2004, 2005, 2006, 2007
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ # Free Software Foundation, Inc.
+ #
+ # This file is part of GNU Libtool:
+@@ -12261,6 +12582,10 @@
+ # shared library.
+ postdeps=$lt_postdeps
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path
+@@ -12509,6 +12834,7 @@
+ predeps_CXX=
+ postdeps_CXX=
+ compiler_lib_search_path_CXX=
++compiler_lib_search_dirs_CXX=
+
+ # Source file extension for C++ test sources.
+ ac_ext=cpp
+@@ -12546,7 +12872,7 @@
+ 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*
++$rm -r conftest*
+
+
+ # Allow CC to be a program name with arguments.
+@@ -12753,7 +13079,7 @@
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+- aix4* | aix5*)
++ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -12766,7 +13092,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ case $ld_flag in
+ *-brtl*)
+@@ -13024,51 +13350,23 @@
+ fi
+ ;;
+ darwin* | rhapsody*)
+- case $host_os in
+- rhapsody* | darwin1.[012])
+- allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+- else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[012])
+- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+- ;;
+- 10.*)
+- allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
+- ;;
+- esac
+- fi
+- ;;
+- esac
+ archive_cmds_need_lc_CXX=no
+ hardcode_direct_CXX=no
+ hardcode_automatic_CXX=yes
+ hardcode_shlibpath_var_CXX=unsupported
+ whole_archive_flag_spec_CXX=''
+ link_all_deplibs_CXX=yes
+-
+- if test "$GXX" = yes ; then
+- lt_int_apple_cc_single_mod=no
++ allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
++ if test "$GXX" = yes ; then
+ output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
++ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
++ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+ fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- else
+- archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- fi
+- 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
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- else
+- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- fi
+- 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}'
+ else
+ case $cc_basename in
+ xlc*)
+@@ -13319,7 +13617,7 @@
+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+ whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ ;;
+- pgCC*)
++ pgCC* | pgcpp*)
+ # Portland Group C++ compiler
+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+@@ -13392,7 +13690,7 @@
;;
esac
;;
@@ -584,7 +2048,53 @@
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 @@
+@@ -13726,7 +14024,6 @@
+ GCC_CXX="$GXX"
+ LD_CXX="$LD"
+
+-
+ cat > conftest.$ac_ext <<EOF
+ class Foo
+ {
+@@ -13828,6 +14125,11 @@
+
+ $rm -f confest.$objext
+
++compiler_lib_search_dirs_CXX=
++if test -n "$compiler_lib_search_path_CXX"; then
++ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
++fi
++
+ # PORTME: override above test on systems where it is broken
+ case $host_os in
+ interix[3-9]*)
+@@ -13883,7 +14185,6 @@
+ ;;
+ esac
+
+-
+ case " $postdeps_CXX " in
+ *" -lc "*) archive_cmds_need_lc_CXX=no ;;
+ esac
+@@ -13959,7 +14260,7 @@
+ esac
+ else
+ case $host_os in
+- aix4* | aix5*)
++ aix[4-9]*)
+ # All AIX code is PIC.
+ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+@@ -14055,7 +14356,7 @@
+ lt_prog_compiler_pic_CXX='-KPIC'
+ lt_prog_compiler_static_CXX='-static'
+ ;;
+- pgCC*)
++ pgCC* | pgcpp*)
+ # Portland Group C++ compiler.
+ lt_prog_compiler_wl_CXX='-Wl,'
+ lt_prog_compiler_pic_CXX='-fpic'
+@@ -14093,7 +14394,7 @@
;;
esac
;;
@@ -593,35 +2103,117 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -14181,11 +14040,11 @@
+@@ -14186,10 +14487,10 @@
+
+ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+ echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
++if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_pic_works_CXX=no
++ lt_cv_prog_compiler_pic_works_CXX=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+@@ -14202,27 +14503,27 @@
-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:14184: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14043: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14205: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14506: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14188: \$? = $ac_status" >&5
-+ echo "$as_me:14047: \$? = $ac_status" >&5
+- echo "$as_me:14209: \$? = $ac_status" >&5
++ echo "$as_me:14510: \$? = $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.
-@@ -14285,11 +14144,11 @@
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+- lt_prog_compiler_pic_works_CXX=yes
++ lt_cv_prog_compiler_pic_works_CXX=yes
+ fi
+ fi
+ $rm conftest*
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+
+-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
++if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
+ case $lt_prog_compiler_pic_CXX in
+ "" | " "*) ;;
+ *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
+@@ -14249,10 +14550,10 @@
+ wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+ { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
++if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_static_works_CXX=no
++ lt_cv_prog_compiler_static_works_CXX=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+@@ -14265,20 +14566,20 @@
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+- lt_prog_compiler_static_works_CXX=yes
++ lt_cv_prog_compiler_static_works_CXX=yes
+ fi
+ else
+- lt_prog_compiler_static_works_CXX=yes
++ lt_cv_prog_compiler_static_works_CXX=yes
+ fi
+ fi
+- $rm conftest*
++ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
+
+-if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
++if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
+ :
+ else
+ lt_prog_compiler_static_CXX=
+@@ -14306,11 +14607,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:14288: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14147: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14309: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14610: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14292: \$? = $ac_status" >&5
-+ echo "$as_me:14151: \$? = $ac_status" >&5
+- echo "$as_me:14313: \$? = $ac_status" >&5
++ echo "$as_me:14614: \$? = $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
-@@ -14357,6 +14216,9 @@
+@@ -14363,7 +14664,7 @@
+
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ case $host_os in
+- aix4* | aix5*)
++ aix[4-9]*)
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+@@ -14378,10 +14679,14 @@
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'
;;
@@ -631,7 +2223,21 @@
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -14802,6 +14664,18 @@
+ esac
++ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+
+ { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+ echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+@@ -14483,7 +14788,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[4-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -14823,6 +15128,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -650,35 +2256,191 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -15847,11 +15721,11 @@
+@@ -15004,6 +15321,21 @@
+ echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
++fi
++
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
++fi
++
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -15087,6 +15419,7 @@
+ predeps_CXX \
+ postdeps_CXX \
+ compiler_lib_search_path_CXX \
++ compiler_lib_search_dirs_CXX \
+ archive_cmds_CXX \
+ archive_expsym_cmds_CXX \
+ postinstall_cmds_CXX \
+@@ -15335,6 +15668,10 @@
+ # shared library.
+ postdeps=$lt_postdeps_CXX
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+@@ -15549,7 +15886,7 @@
+ 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*
++$rm -r conftest*
+
+
+ # Allow CC to be a program name with arguments.
+@@ -15587,7 +15924,7 @@
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+-aix4* | aix5*)
++aix[4-9]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
+@@ -15852,10 +16189,10 @@
+
+ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+ echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
++if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_pic_works_F77=no
++ lt_cv_prog_compiler_pic_works_F77=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic_F77"
+@@ -15868,27 +16205,27 @@
-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:15850: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15724: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15871: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16208: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:15854: \$? = $ac_status" >&5
-+ echo "$as_me:15728: \$? = $ac_status" >&5
+- echo "$as_me:15875: \$? = $ac_status" >&5
++ echo "$as_me:16212: \$? = $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.
-@@ -15951,11 +15825,11 @@
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+- lt_prog_compiler_pic_works_F77=yes
++ lt_cv_prog_compiler_pic_works_F77=yes
+ fi
+ fi
+ $rm conftest*
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
+
+-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
++if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
+ case $lt_prog_compiler_pic_F77 in
+ "" | " "*) ;;
+ *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
+@@ -15915,10 +16252,10 @@
+ wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
+ { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_static_works_F77+set}" = set; then
++if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_static_works_F77=no
++ lt_cv_prog_compiler_static_works_F77=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+@@ -15931,20 +16268,20 @@
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+- lt_prog_compiler_static_works_F77=yes
++ lt_cv_prog_compiler_static_works_F77=yes
+ fi
+ else
+- lt_prog_compiler_static_works_F77=yes
++ lt_cv_prog_compiler_static_works_F77=yes
+ fi
+ fi
+- $rm conftest*
++ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
+
+-if test x"$lt_prog_compiler_static_works_F77" = xyes; then
++if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
+ :
+ else
+ lt_prog_compiler_static_F77=
+@@ -15972,11 +16309,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:15954: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15828: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15975: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16312: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:15958: \$? = $ac_status" >&5
-+ echo "$as_me:15832: \$? = $ac_status" >&5
+- echo "$as_me:15979: \$? = $ac_status" >&5
++ echo "$as_me:16316: \$? = $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
-@@ -16215,12 +16089,13 @@
+@@ -16056,12 +16393,13 @@
+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+ # as well as any symbol that contains `d'.
+- exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
++ exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+ # the symbol is explicitly referenced. Since portable code cannot
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
++ # Exclude shared library initialization/finalization symbols.
+ extract_expsyms_cmds=
+ # Just being paranoid about ensuring that cc_basename is set.
+ for cc_temp in $compiler""; do
+@@ -16120,7 +16458,7 @@
+
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+- aix3* | aix4* | aix5*)
++ aix[3-9]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ ld_shlibs_F77=no
+@@ -16236,12 +16574,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -693,7 +2455,41 @@
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 @@
+@@ -16339,7 +16678,7 @@
+ fi
+ ;;
+
+- aix4* | aix5*)
++ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -16359,7 +16698,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+@@ -16611,11 +16950,10 @@
+ link_all_deplibs_F77=yes
+ if test "$GCC" = yes ; then
+ output_verbose_link_cmd='echo'
+- archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- 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 -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~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}'
++ archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ else
+ case $cc_basename in
+ xlc*)
+@@ -16765,7 +17103,7 @@
link_all_deplibs_F77=yes
;;
@@ -702,7 +2498,16 @@
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 @@
+@@ -17084,7 +17422,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[4-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -17424,6 +17762,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -721,49 +2526,214 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -18138,11 +18025,11 @@
+@@ -17605,6 +17955,21 @@
+ echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
++fi
++
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
++fi
++
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -17688,6 +18053,7 @@
+ predeps_F77 \
+ postdeps_F77 \
+ compiler_lib_search_path_F77 \
++ compiler_lib_search_dirs_F77 \
+ archive_cmds_F77 \
+ archive_expsym_cmds_F77 \
+ postinstall_cmds_F77 \
+@@ -17936,6 +18302,10 @@
+ # shared library.
+ postdeps=$lt_postdeps_F77
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path_F77
+@@ -18110,7 +18480,7 @@
+ 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*
++$rm -r conftest*
+
+
+ # Allow CC to be a program name with arguments.
+@@ -18159,11 +18529,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:18141: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18028: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18162: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18532: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18145: \$? = $ac_status" >&5
-+ echo "$as_me:18032: \$? = $ac_status" >&5
+- echo "$as_me:18166: \$? = $ac_status" >&5
++ echo "$as_me:18536: \$? = $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.
-@@ -18428,11 +18315,11 @@
+@@ -18223,7 +18593,7 @@
+ # 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'
++
+ ;;
+
+ darwin* | rhapsody*)
+@@ -18293,7 +18663,7 @@
+ 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'
++
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
+@@ -18433,10 +18803,10 @@
+
+ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+ echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
++if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_pic_works_GCJ=no
++ lt_cv_prog_compiler_pic_works_GCJ=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
+@@ -18449,27 +18819,27 @@
-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:18431: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18318: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18452: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18822: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18435: \$? = $ac_status" >&5
-+ echo "$as_me:18322: \$? = $ac_status" >&5
+- echo "$as_me:18456: \$? = $ac_status" >&5
++ echo "$as_me:18826: \$? = $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.
-@@ -18532,11 +18419,11 @@
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+- lt_prog_compiler_pic_works_GCJ=yes
++ lt_cv_prog_compiler_pic_works_GCJ=yes
+ fi
+ fi
+ $rm conftest*
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
+
+-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
++if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
+ case $lt_prog_compiler_pic_GCJ in
+ "" | " "*) ;;
+ *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
+@@ -18496,10 +18866,10 @@
+ wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
+ { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
++if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_static_works_GCJ=no
++ lt_cv_prog_compiler_static_works_GCJ=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+@@ -18512,20 +18882,20 @@
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+- lt_prog_compiler_static_works_GCJ=yes
++ lt_cv_prog_compiler_static_works_GCJ=yes
+ fi
+ else
+- lt_prog_compiler_static_works_GCJ=yes
++ lt_cv_prog_compiler_static_works_GCJ=yes
+ fi
+ fi
+- $rm conftest*
++ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
+
+-if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
++if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
+ :
+ else
+ lt_prog_compiler_static_GCJ=
+@@ -18553,11 +18923,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:18535: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18422: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18556: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18926: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18539: \$? = $ac_status" >&5
-+ echo "$as_me:18426: \$? = $ac_status" >&5
+- echo "$as_me:18560: \$? = $ac_status" >&5
++ echo "$as_me:18930: \$? = $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
-@@ -18796,12 +18683,13 @@
+@@ -18637,12 +19007,13 @@
+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+ # as well as any symbol that contains `d'.
+- exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
++ exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+ # the symbol is explicitly referenced. Since portable code cannot
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
++ # Exclude shared library initialization/finalization symbols.
+ extract_expsyms_cmds=
+ # Just being paranoid about ensuring that cc_basename is set.
+ for cc_temp in $compiler""; do
+@@ -18701,7 +19072,7 @@
+
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+- aix3* | aix4* | aix5*)
++ aix[3-9]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ ld_shlibs_GCJ=no
+@@ -18817,12 +19188,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -778,7 +2748,41 @@
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 @@
+@@ -18920,7 +19292,7 @@
+ fi
+ ;;
+
+- aix4* | aix5*)
++ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -18940,7 +19312,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+@@ -19212,11 +19584,10 @@
+ link_all_deplibs_GCJ=yes
+ if test "$GCC" = yes ; then
+ output_verbose_link_cmd='echo'
+- archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- 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 -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~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}'
++ archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ else
+ case $cc_basename in
+ xlc*)
+@@ -19366,7 +19737,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -787,7 +2791,16 @@
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 @@
+@@ -19685,7 +20056,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[4-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -20025,6 +20396,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -806,7 +2819,85 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -22689,6 +22589,15 @@
+@@ -20206,6 +20589,21 @@
+ echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
++fi
++
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
++fi
++
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -20289,6 +20687,7 @@
+ predeps_GCJ \
+ postdeps_GCJ \
+ compiler_lib_search_path_GCJ \
++ compiler_lib_search_dirs_GCJ \
+ archive_cmds_GCJ \
+ archive_expsym_cmds_GCJ \
+ postinstall_cmds_GCJ \
+@@ -20537,6 +20936,10 @@
+ # shared library.
+ postdeps=$lt_postdeps_GCJ
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
+@@ -20710,7 +21113,7 @@
+ 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*
++$rm -r conftest*
+
+
+ # Allow CC to be a program name with arguments.
+@@ -20770,6 +21173,7 @@
+ predeps_RC \
+ postdeps_RC \
+ compiler_lib_search_path_RC \
++ compiler_lib_search_dirs_RC \
+ archive_cmds_RC \
+ archive_expsym_cmds_RC \
+ postinstall_cmds_RC \
+@@ -21018,6 +21422,10 @@
+ # shared library.
+ postdeps=$lt_postdeps_RC
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path_RC
+@@ -21418,7 +21826,7 @@
+
+ fi
+ fi
+- USE_NLS=yes
++ USE_NLS=yes
+
+
+ gt_cv_have_gettext=no
+@@ -22710,6 +23118,15 @@
fi
fi
@@ -822,7 +2913,7 @@
test -d po || mkdir po
if test "x$srcdir" != "x."; then
if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-@@ -22870,12 +22779,14 @@
+@@ -22891,12 +23308,14 @@
libgnomeprintui-2.2
gdk-2.0 >= \$GDK20_MINIMUM_VERSION
gtk+-2.0 >= \$GTK20_MINIMUM_VERSION
@@ -839,7 +2930,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
-@@ -22883,7 +22794,8 @@
+@@ -22904,7 +23323,8 @@
libgnomeprintui-2.2
gdk-2.0 >= $GDK20_MINIMUM_VERSION
gtk+-2.0 >= $GTK20_MINIMUM_VERSION
@@ -849,7 +2940,7 @@
else
pkg_failed=yes
fi
-@@ -22900,12 +22812,14 @@
+@@ -22921,12 +23341,14 @@
libgnomeprintui-2.2
gdk-2.0 >= \$GDK20_MINIMUM_VERSION
gtk+-2.0 >= \$GTK20_MINIMUM_VERSION
@@ -866,7 +2957,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
-@@ -22913,7 +22827,8 @@
+@@ -22934,7 +23356,8 @@
libgnomeprintui-2.2
gdk-2.0 >= $GDK20_MINIMUM_VERSION
gtk+-2.0 >= $GTK20_MINIMUM_VERSION
@@ -876,7 +2967,7 @@
else
pkg_failed=yes
fi
-@@ -22936,13 +22851,15 @@
+@@ -22957,13 +23380,15 @@
libgnomeprintui-2.2
gdk-2.0 >= $GDK20_MINIMUM_VERSION
gtk+-2.0 >= $GTK20_MINIMUM_VERSION
@@ -894,7 +2985,7 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBTOMBOY_PKG_ERRORS" >&5
-@@ -22951,7 +22868,8 @@
+@@ -22972,7 +23397,8 @@
libgnomeprintui-2.2
gdk-2.0 >= $GDK20_MINIMUM_VERSION
gtk+-2.0 >= $GTK20_MINIMUM_VERSION
@@ -904,7 +2995,7 @@
$LIBTOMBOY_PKG_ERRORS
-@@ -22966,7 +22884,8 @@
+@@ -22987,7 +23413,8 @@
libgnomeprintui-2.2
gdk-2.0 >= $GDK20_MINIMUM_VERSION
gtk+-2.0 >= $GTK20_MINIMUM_VERSION
@@ -914,7 +3005,7 @@
$LIBTOMBOY_PKG_ERRORS
-@@ -22987,7 +22906,7 @@
+@@ -23008,7 +23435,7 @@
and LIBTOMBOY_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -923,7 +3014,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
-@@ -22997,7 +22916,7 @@
+@@ -23018,7 +23445,7 @@
and LIBTOMBOY_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -932,180 +3023,8 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -23275,6 +23194,171 @@
-
-
- #
-+# Check for external Mono.Addins
-+#
-+
-+# Check whether --with-mono-addins was given.
-+if test "${with_mono_addins+set}" = set; then
-+ withval=$with_mono_addins; mono_addins_v="$withval"
-+else
-+ mono_addins_v=internal
-+fi
-+
-+if test "x$mono_addins_v" = "xsystem"; then
-+
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for MONO_ADDINS" >&5
-+echo $ECHO_N "checking for MONO_ADDINS... $ECHO_C" >&6; }
-+
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$MONO_ADDINS_CFLAGS"; then
-+ pkg_cv_MONO_ADDINS_CFLAGS="$MONO_ADDINS_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mono-addins > 0.2 \\
-+ mono-addins-gui > 0.2 \\
-+ mono-addins-setup > 0.2\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "mono-addins > 0.2 \
-+ mono-addins-gui > 0.2 \
-+ mono-addins-setup > 0.2") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_MONO_ADDINS_CFLAGS=`$PKG_CONFIG --cflags "mono-addins > 0.2 \
-+ mono-addins-gui > 0.2 \
-+ mono-addins-setup > 0.2" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$MONO_ADDINS_LIBS"; then
-+ pkg_cv_MONO_ADDINS_LIBS="$MONO_ADDINS_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mono-addins > 0.2 \\
-+ mono-addins-gui > 0.2 \\
-+ mono-addins-setup > 0.2\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "mono-addins > 0.2 \
-+ mono-addins-gui > 0.2 \
-+ mono-addins-setup > 0.2") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_MONO_ADDINS_LIBS=`$PKG_CONFIG --libs "mono-addins > 0.2 \
-+ mono-addins-gui > 0.2 \
-+ mono-addins-setup > 0.2" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ MONO_ADDINS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mono-addins > 0.2 \
-+ mono-addins-gui > 0.2 \
-+ mono-addins-setup > 0.2"`
-+ else
-+ MONO_ADDINS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mono-addins > 0.2 \
-+ mono-addins-gui > 0.2 \
-+ mono-addins-setup > 0.2"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$MONO_ADDINS_PKG_ERRORS" >&5
-+
-+ { { echo "$as_me:$LINENO: error: Package requirements (mono-addins > 0.2 \
-+ mono-addins-gui > 0.2 \
-+ mono-addins-setup > 0.2) were not met:
-+
-+$MONO_ADDINS_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+Alternatively, you may set the environment variables MONO_ADDINS_CFLAGS
-+and MONO_ADDINS_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&5
-+echo "$as_me: error: Package requirements (mono-addins > 0.2 \
-+ mono-addins-gui > 0.2 \
-+ mono-addins-setup > 0.2) were not met:
-+
-+$MONO_ADDINS_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+Alternatively, you may set the environment variables MONO_ADDINS_CFLAGS
-+and MONO_ADDINS_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&2;}
-+ { (exit 1); exit 1; }; }
-+elif test $pkg_failed = untried; then
-+ { { echo "$as_me:$LINENO: 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
-+path to pkg-config.
-+
-+Alternatively, you may set the environment variables MONO_ADDINS_CFLAGS
-+and MONO_ADDINS_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+Alternatively, you may set the environment variables MONO_ADDINS_CFLAGS
-+and MONO_ADDINS_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+else
-+ MONO_ADDINS_CFLAGS=$pkg_cv_MONO_ADDINS_CFLAGS
-+ MONO_ADDINS_LIBS=$pkg_cv_MONO_ADDINS_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+ :
-+fi
-+ if true; then
-+ EXTERNAL_MONO_ADDINS_TRUE=
-+ EXTERNAL_MONO_ADDINS_FALSE='#'
-+else
-+ EXTERNAL_MONO_ADDINS_TRUE='#'
-+ EXTERNAL_MONO_ADDINS_FALSE=
-+fi
-+
-+
-+else
-+ MONO_ADDINS_LIBS=
-+ if false; then
-+ EXTERNAL_MONO_ADDINS_TRUE=
-+ EXTERNAL_MONO_ADDINS_FALSE='#'
-+else
-+ EXTERNAL_MONO_ADDINS_TRUE='#'
-+ EXTERNAL_MONO_ADDINS_FALSE=
-+fi
-+
-+
-+fi
-+
-+#
- # Tomboy.exe needs Gtk# Gnome# GConf#
- #
- GTKSHARP2_MINIMUM_VERSION=$GTK20_MINIMUM_VERSION
-@@ -23369,7 +23453,7 @@
- and TOMBOY_LIBS to avoid the need to call pkg-config.
+@@ -23292,7 +23719,7 @@
+ and DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
@@ -1113,8 +3032,8 @@
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
-@@ -23379,7 +23463,7 @@
- and TOMBOY_LIBS to avoid the need to call pkg-config.
+@@ -23302,7 +23729,7 @@
+ and DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
@@ -1122,28 +3041,61 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -23910,6 +23994,20 @@
- Usually this means the macro was only invoked conditionally." >&2;}
+@@ -23438,7 +23865,7 @@
+ and MONO_ADDINS_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -23448,7 +23875,7 @@
+ and MONO_ADDINS_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
- fi
-+if test -z "${EXTERNAL_MONO_ADDINS_TRUE}" && test -z "${EXTERNAL_MONO_ADDINS_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"EXTERNAL_MONO_ADDINS\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"EXTERNAL_MONO_ADDINS\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${EXTERNAL_MONO_ADDINS_TRUE}" && test -z "${EXTERNAL_MONO_ADDINS_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"EXTERNAL_MONO_ADDINS\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"EXTERNAL_MONO_ADDINS\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
- 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
-@@ -24391,9 +24489,7 @@
+ else
+@@ -23576,7 +24003,7 @@
+ and TOMBOY_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -23586,7 +24013,7 @@
+ and TOMBOY_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+@@ -23688,7 +24115,7 @@
+ and TOMBOY_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -23698,7 +24125,7 @@
+ and TOMBOY_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+@@ -24823,9 +25250,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"
@@ -1154,36 +3106,62 @@
_ACEOF
-@@ -24588,14 +24684,14 @@
+@@ -25003,6 +25428,7 @@
+ DOC_USER_FORMATS!$DOC_USER_FORMATS$ac_delim
+ ENABLE_SK_TRUE!$ENABLE_SK_TRUE$ac_delim
+ ENABLE_SK_FALSE!$ENABLE_SK_FALSE$ac_delim
++DISTCHECK_CONFIGURE_FLAGS!$DISTCHECK_CONFIGURE_FLAGS$ac_delim
+ HAVE_GNOME_DOC_UTILS_TRUE!$HAVE_GNOME_DOC_UTILS_TRUE$ac_delim
+ HAVE_GNOME_DOC_UTILS_FALSE!$HAVE_GNOME_DOC_UTILS_FALSE$ac_delim
+ INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim
+@@ -25023,14 +25449,13 @@
INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
+INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim
++XGETTEXT!$XGETTEXT$ac_delim
++MSGMERGE!$MSGMERGE$ac_delim
++MSGFMT!$MSGFMT$ac_delim
INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
- INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
+-INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
-INTLTOOL_ICONV!$INTLTOOL_ICONV$ac_delim
-INTLTOOL_MSGFMT!$INTLTOOL_MSGFMT$ac_delim
-INTLTOOL_MSGMERGE!$INTLTOOL_MSGMERGE$ac_delim
-INTLTOOL_XGETTEXT!$INTLTOOL_XGETTEXT$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
-@@ -24637,9 +24733,6 @@
+@@ -25072,6 +25497,7 @@
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
-@@ -24697,6 +24790,7 @@
++INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
+ ALL_LINGUAS!$ALL_LINGUAS$ac_delim
+ CC!$CC$ac_delim
+ CFLAGS!$CFLAGS$ac_delim
+@@ -25106,6 +25532,8 @@
+ ECHO!$ECHO$ac_delim
+ AR!$AR$ac_delim
+ RANLIB!$RANLIB$ac_delim
++DSYMUTIL!$DSYMUTIL$ac_delim
++NMEDIT!$NMEDIT$ac_delim
+ CXX!$CXX$ac_delim
+ CXXFLAGS!$CXXFLAGS$ac_delim
+ ac_ct_CXX!$ac_ct_CXX$ac_delim
+@@ -25119,10 +25547,8 @@
+ LIBTOOL!$LIBTOOL$ac_delim
+ GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
+ USE_NLS!$USE_NLS$ac_delim
+-MSGFMT!$MSGFMT$ac_delim
+ MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
+ GMSGFMT!$GMSGFMT$ac_delim
+-XGETTEXT!$XGETTEXT$ac_delim
+ CATALOGS!$CATALOGS$ac_delim
+ CATOBJEXT!$CATOBJEXT$ac_delim
+ GMOFILES!$GMOFILES$ac_delim
+@@ -25132,6 +25558,7 @@
PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
POFILES!$POFILES$ac_delim
POSUB!$POSUB$ac_delim
@@ -1191,45 +3169,73 @@
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 +24815,10 @@
- DBUS_LIBS!$DBUS_LIBS$ac_delim
- EXTERNAL_DBUS_TRUE!$EXTERNAL_DBUS_TRUE$ac_delim
- EXTERNAL_DBUS_FALSE!$EXTERNAL_DBUS_FALSE$ac_delim
-+MONO_ADDINS_CFLAGS!$MONO_ADDINS_CFLAGS$ac_delim
-+MONO_ADDINS_LIBS!$MONO_ADDINS_LIBS$ac_delim
-+EXTERNAL_MONO_ADDINS_TRUE!$EXTERNAL_MONO_ADDINS_TRUE$ac_delim
-+EXTERNAL_MONO_ADDINS_FALSE!$EXTERNAL_MONO_ADDINS_FALSE$ac_delim
- TOMBOY_CFLAGS!$TOMBOY_CFLAGS$ac_delim
- TOMBOY_LIBS!$TOMBOY_LIBS$ac_delim
- EVOLUTION_CFLAGS!$EVOLUTION_CFLAGS$ac_delim
-@@ -24732,8 +24830,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
+@@ -25167,8 +25594,6 @@
+ CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim
+ CAIRO_LIBS!$CAIRO_LIBS$ac_delim
+ ENABLE_SKETCHING_TRUE!$ENABLE_SKETCHING_TRUE$ac_delim
+-ENABLE_SKETCHING_FALSE!$ENABLE_SKETCHING_FALSE$ac_delim
+-SKETCHING_LIBS!$SKETCHING_LIBS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -24775,6 +24871,8 @@
+@@ -25210,6 +25635,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
- NUNIT!$NUNIT$ac_delim
- XGETTEXT_PLUGIN_NAME!$XGETTEXT_PLUGIN_NAME$ac_delim
-@@ -24783,7 +24881,7 @@
++ENABLE_SKETCHING_FALSE!$ENABLE_SKETCHING_FALSE$ac_delim
++SKETCHING_LIBS!$SKETCHING_LIBS$ac_delim
+ GALAGO_CFLAGS!$GALAGO_CFLAGS$ac_delim
+ GALAGO_LIBS!$GALAGO_LIBS$ac_delim
+ ENABLE_GALAGO_TRUE!$ENABLE_GALAGO_TRUE$ac_delim
+@@ -25226,7 +25653,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
-- 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
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 14; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 16; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -25354,10 +25452,6 @@
+@@ -25627,21 +26054,22 @@
+ fi
+ rm -f "$tmp/out12"
+ # Compute $ac_file's index in $config_headers.
++_am_arg=$ac_file
+ _am_stamp_count=1
+ for _am_header in $config_headers :; do
+ case $_am_header in
+- $ac_file | $ac_file:* )
++ $_am_arg | $_am_arg:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+ done
+-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
+-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X$ac_file : 'X\(//\)[^/]' \| \
+- X$ac_file : 'X\(//\)$' \| \
+- X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
+-echo X$ac_file |
++echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
++$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++ X"$_am_arg" : 'X\(//\)[^/]' \| \
++ X"$_am_arg" : 'X\(//\)$' \| \
++ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
++echo X"$_am_arg" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+@@ -25678,7 +26106,7 @@
+ # each Makefile.in and add a new line on top of each file to say so.
+ # 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
++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`$as_dirname -- "$mf" ||
+ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$mf" : 'X\(//\)[^/]' \| \
+@@ -25797,10 +26225,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" \
@@ -1240,10 +3246,31 @@
-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.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-12-04 15:24:37.000000000 +0100
-@@ -115,14 +115,12 @@
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/data/icons/Makefile.in tomboy-0.9.7/data/icons/Makefile.in
+--- tomboy-0.9.7.old/data/icons/Makefile.in 2008-02-22 21:01:07.000000000 +0100
++++ tomboy-0.9.7/data/icons/Makefile.in 2008-02-29 08:08:42.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 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.
+@@ -75,7 +75,9 @@
+ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -110,14 +112,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -1259,7 +3286,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -134,7 +132,6 @@
+@@ -129,7 +129,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -1267,20 +3294,45 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -148,6 +145,9 @@
+@@ -143,10 +142,13 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
-+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
+ MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+ MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
NUNIT = @NUNIT@
-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-12-04 15:24:37.000000000 +0100
-@@ -138,14 +138,12 @@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+ NUNIT_LIBS = @NUNIT_LIBS@
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/data/images/Makefile.in tomboy-0.9.7/data/images/Makefile.in
+--- tomboy-0.9.7.old/data/images/Makefile.in 2008-02-22 21:01:07.000000000 +0100
++++ tomboy-0.9.7/data/images/Makefile.in 2008-02-29 08:08:42.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 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.
+@@ -75,7 +75,9 @@
+ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -110,14 +112,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -1296,7 +3348,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -157,7 +155,6 @@
+@@ -129,7 +129,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -1304,57 +3356,45 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -171,6 +168,9 @@
+@@ -143,10 +142,13 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
-+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
+ MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+ MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
NUNIT = @NUNIT@
-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-12-04 15:24:25.000000000 +0100
-@@ -416,6 +416,11 @@
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
- for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ if ! test -d "$(distdir)/$$docdir"; then \
-+ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
-+ $(mkinstalldirs) "$(distdir)/$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
- $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
- done
-@@ -486,6 +491,12 @@
- done
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
-+ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
-+ if ! test -d "$$docdir"; then \
-+ echo "$(mkinstalldirs) $$docdir"; \
-+ $(mkinstalldirs) "$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
- $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
- done
-@@ -554,7 +565,7 @@
-
- uninstall-doc-omf:
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- if test "x$(_ENABLE_SK)" == "xtrue"; then \
-+ if test "x$(_ENABLE_SK)" = "xtrue"; then \
- 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.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-12-04 15:24:37.000000000 +0100
-@@ -130,14 +130,12 @@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+ NUNIT_LIBS = @NUNIT_LIBS@
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/data/Makefile.in tomboy-0.9.7/data/Makefile.in
+--- tomboy-0.9.7.old/data/Makefile.in 2008-02-22 21:01:07.000000000 +0100
++++ tomboy-0.9.7/data/Makefile.in 2008-02-29 08:08:41.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 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.
+@@ -106,7 +106,9 @@
+ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -141,14 +143,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -1370,7 +3410,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -149,7 +147,6 @@
+@@ -160,7 +160,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -1378,412 +3418,150 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -163,6 +160,9 @@
+@@ -174,10 +173,13 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
-+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
+ MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+ MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
NUNIT = @NUNIT@
-@@ -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; \
-+ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ if ! test -d "$(distdir)/$$docdir"; then \
-+ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \
-+ $(mkinstalldirs) "$(distdir)/$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
- $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
- done
-@@ -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; \
-+ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-+ docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
-+ if ! test -d "$$docdir"; then \
-+ echo "$(mkinstalldirs) $$docdir"; \
-+ $(mkinstalldirs) "$$docdir"; \
-+ fi; \
- echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
- $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
- done
-@@ -873,7 +884,7 @@
-
- uninstall-doc-omf:
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- if test "x$(_ENABLE_SK)" == "xtrue"; then \
-+ if test "x$(_ENABLE_SK)" = "xtrue"; then \
- 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.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-12-04 15:24:25.000000000 +0100
-@@ -32,7 +32,7 @@
- ## Release information
- my $PROGRAM = "intltool-extract";
- my $PACKAGE = "intltool";
--my $VERSION = "0.35.5";
-+my $VERSION = "0.36.2";
-
- ## Loaded modules
- use strict;
-@@ -237,9 +237,9 @@
-
- s/'/'/g; # '
- s/"/"/g; # "
-- s/&/&/g;
- s/</</g;
- s/>/>/g;
-+ s/&/&/g;
-
- return $_;
- }
-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-12-04 15:24:25.000000000 +0100
-@@ -35,7 +35,7 @@
- ## Release information
- my $PROGRAM = "intltool-merge";
- my $PACKAGE = "intltool";
--my $VERSION = "0.35.5";
-+my $VERSION = "0.36.2";
-
- ## Loaded modules
- use strict;
-@@ -93,9 +93,24 @@
-
- my %po_files_by_lang = ();
- my %translations = ();
--my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "@INTLTOOL_ICONV@";
-+my $iconv = $ENV{"ICONV"} || "iconv";
- my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
-
-+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 -l >$devnull") == 0));
-+ return 0;
-+}
-+
-+if (! isProgramInPath ("$iconv"))
-+{
-+ print STDERR " *** iconv is not found on this system!\n".
-+ " *** Without it, intltool-merge can not convert encodings.\n";
-+ exit;
-+}
-+
- # Use this instead of \w for XML files to handle more possible characters.
- my $w = "[-A-Za-z0-9._:]";
-
-@@ -260,8 +275,42 @@
-
- sub gather_po_files
- {
-- for my $po_file (glob "$PO_DIR/*.po") {
-- $po_files_by_lang{po_file2lang($po_file)} = $po_file;
-+ if (my $linguas = $ENV{"LINGUAS"})
-+ {
-+ for my $lang (split / /, $linguas) {
-+ my $po_file = $PO_DIR . "/" . $lang . ".po";
-+ if (-e $po_file) {
-+ $po_files_by_lang{$lang} = $po_file;
-+ }
-+ }
-+ }
-+ else
-+ {
-+ if (open LINGUAS_FILE, "$PO_DIR/LINGUAS")
-+ {
-+ while (<LINGUAS_FILE>)
-+ {
-+ next if /^#/;
-+
-+ if (/([-a-zA-Z_ at .]+)\n/)
-+ {
-+ my $lang = $1;
-+
-+ my $po_file = $PO_DIR . "/" . $lang . ".po";
-+ if (-e $po_file) {
-+ $po_files_by_lang{$lang} = $po_file;
-+ }
-+ }
-+ }
-+
-+ close LINGUAS_FILE;
-+ }
-+ else
-+ {
-+ for my $po_file (glob "$PO_DIR/*.po") {
-+ $po_files_by_lang{po_file2lang($po_file)} = $po_file;
-+ }
-+ }
- }
- }
-
-@@ -494,16 +543,15 @@
- return $string;
- }
-
--## NOTE: deal with < - < but not > - > because it seems its ok to have
--## > in the entity. For further info please look at #84738.
- sub entity_decode
- {
- local ($_) = @_;
-
- s/'/'/g; # '
- s/"/"/g; # "
-- s/&/&/g;
- s/</</g;
-+ s/>/>/g;
-+ s/&/&/g;
-
- return $_;
- }
-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-12-04 15:24:25.000000000 +0100
-@@ -30,7 +30,7 @@
-
- ## Release information
- my $PROGRAM = "intltool-update";
--my $VERSION = "0.35.5";
-+my $VERSION = "0.36.2";
- my $PACKAGE = "intltool";
-
- ## Loaded modules
-@@ -71,7 +71,8 @@
- "sheet(?:\\.in)+|". # ?
- "schemas(?:\\.in)+|". # GConf specific
- "pong(?:\\.in)+|". # DEPRECATED: PONG is not used [by GNOME] any longer.
--"kbd(?:\\.in)+"; # GOK specific.
-+"kbd(?:\\.in)+|". # GOK specific.
-+"policy(?:\\.in)+"; # PolicyKit files
-
- my $ini_support =
- "icon(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec
-@@ -328,7 +329,12 @@
- push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/;
- push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
- }, "..";
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+ NUNIT_LIBS = @NUNIT_LIBS@
+@@ -545,8 +547,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -571,8 +573,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -582,13 +584,12 @@
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/depcomp tomboy-0.9.7/depcomp
+--- tomboy-0.9.7.old/depcomp 2008-02-22 18:30:28.000000000 +0100
++++ tomboy-0.9.7/depcomp 2008-02-29 08:08:42.000000000 +0100
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+ # depcomp - compile a program generating dependencies as side-effects
+
+-scriptversion=2006-10-15.18
++scriptversion=2007-03-29.01
+
+-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
+ # Foundation, Inc.
+
+ # This program is free software; you can redistribute it and/or modify
+@@ -215,34 +215,39 @@
+ # current directory. Also, the AIX compiler puts `$object:' at the
+ # start of each line; $object doesn't have directory information.
+ # Version 6 uses the directory in both cases.
+- stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
+- tmpdepfile="$stripped.u"
++ 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.u
++ tmpdepfile2=$base.u
++ tmpdepfile3=$dir.libs/$base.u
+ "$@" -Wc,-M
+ else
++ tmpdepfile1=$dir$base.u
++ tmpdepfile2=$dir$base.u
++ tmpdepfile3=$dir$base.u
+ "$@" -M
+ fi
+ stat=$?
+
+- if test -f "$tmpdepfile"; then :
+- else
+- stripped=`echo "$stripped" | sed 's,^.*/,,'`
+- tmpdepfile="$stripped.u"
+- fi
-
-+ find sub {
-+ push @buf_i18n_plain, "$File::Find::name" if /\.($buildin_gettext_support)$/;
-+ push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/;
-+ push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/;
-+ push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
-+ }, "$SRCDIR/..";
-
- open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n";
- @buf_potfiles = grep !/^(#|\s*$)/, <POTFILES>;
-@@ -489,11 +495,15 @@
- my %in2;
- foreach (@buf_potfiles_sorted)
- {
-+ s#^$SRCDIR/../##;
-+ s#^$SRCDIR/##;
- $in2{$_} = 1;
- }
-
- foreach (@buf_potfiles_ignore_sorted)
- {
-+ s#^$SRCDIR/../##;
-+ s#^$SRCDIR/##;
- $in2{$_} = 1;
- }
-
-@@ -501,9 +511,16 @@
-
- foreach (@buf_allfiles_sorted)
- {
-- if (!exists($in2{$_}))
-+ my $dummy = $_;
-+ my $srcdir = $SRCDIR;
-+
-+ $srcdir =~ s#^../##;
-+ $dummy =~ s#^$srcdir/../##;
-+ $dummy =~ s#^$srcdir/##;
-+ $dummy =~ s#_build/##;
-+ if (!exists($in2{$dummy}))
- {
-- push @result, $_
-+ push @result, $dummy
- }
- }
-
-@@ -563,13 +580,33 @@
- exit 1;
- }
-
-+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 --version >$devnull") == 0));
-+ return 0;
-+}
-+
-+sub isGNUGettextTool
-+{
-+ my ($file) = @_;
-+ # Check that we are using GNU gettext tools
-+ if (isProgramInPath ($file))
-+ {
-+ my $version = `$file --version`;
-+ return 1 if ($version =~ m/.*\(GNU .*\).*/);
-+ }
-+ return 0;
-+}
-+
- sub GenerateHeaders
- {
- my $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} || "intltool-extract";
-
- ## Generate the .h header files, so we can allow glade and
- ## xml translation support
-- 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";
-@@ -616,13 +653,13 @@
- #
- sub GeneratePOTemplate
- {
-- my $XGETTEXT = $ENV{"XGETTEXT"} || "@INTLTOOL_XGETTEXT@";
-+ my $XGETTEXT = $ENV{"XGETTEXT"} || "xgettext";
- my $XGETTEXT_ARGS = $ENV{"XGETTEXT_ARGS"} || '';
- chomp $XGETTEXT;
-
-- if (! -x $XGETTEXT)
-+ if (! isGNUGettextTool ("$XGETTEXT"))
- {
-- print STDERR " *** xgettext is not found on this system!\n".
-+ print STDERR " *** GNU xgettext is not found on this system!\n".
- " *** Without it, intltool-update can not extract strings.\n";
- exit;
- }
-@@ -718,7 +755,23 @@
- unlink "$MODULE.pot";
- my @xgettext_argument=("$XGETTEXT",
- "--add-comments",
-- "--directory\=\.",
-+ "--directory\=.",
-+ "--default-domain\=$MODULE",
-+ "--flag\=g_strdup_printf:1:c-format",
-+ "--flag\=g_string_printf:2:c-format",
-+ "--flag\=g_string_append_printf:2:c-format",
-+ "--flag\=g_error_new:3:c-format",
-+ "--flag\=g_set_error:4:c-format",
-+ "--flag\=g_markup_printf_escaped:1:c-format",
-+ "--flag\=g_log:3:c-format",
-+ "--flag\=g_print:1:c-format",
-+ "--flag\=g_printerr:1:c-format",
-+ "--flag\=g_printf:1:c-format",
-+ "--flag\=g_fprintf:2:c-format",
-+ "--flag\=g_sprintf:2:c-format",
-+ "--flag\=g_snprintf:3:c-format",
-+ "--flag\=g_scanner_error:2:c-format",
-+ "--flag\=g_scanner_warn:2:c-format",
- "--output\=$MODULE\.pot",
- "--files-from\=\.\/POTFILES\.in\.temp");
- my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
-@@ -785,9 +838,16 @@
- {
- -f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n";
-
-- my $MSGMERGE = $ENV{"MSGMERGE"} || "@INTLTOOL_MSGMERGE@";
-+ my $MSGMERGE = $ENV{"MSGMERGE"} || "msgmerge";
- my ($lang, $outfile) = @_;
-
-+ if (! isGNUGettextTool ("$MSGMERGE"))
-+ {
-+ print STDERR " *** GNU msgmerge is not found on this system!\n".
-+ " *** Without it, intltool-update can not extract strings.\n";
-+ exit;
-+ }
-+
- print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE;
-
- my $infile = "$SRCDIR/$lang.po";
-@@ -828,7 +888,14 @@
- sub Console_Write_TranslationStatus
- {
- my ($lang, $output_file) = @_;
-- my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
-+ my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt";
-+
-+ if (! isGNUGettextTool ("$MSGFMT"))
-+ {
-+ print STDERR " *** GNU msgfmt is not found on this system!\n".
-+ " *** Without it, intltool-update can not extract strings.\n";
-+ exit;
-+ }
-
- $output_file = "$SRCDIR/$lang.po" if ($output_file eq "");
-
-@@ -837,21 +904,28 @@
-
- sub Console_Write_CoverageReport
- {
-- my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
-+ my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt";
-+
-+ if (! isGNUGettextTool ("$MSGFMT"))
-+ {
-+ print STDERR " *** GNU msgfmt is not found on this system!\n".
-+ " *** Without it, intltool-update can not extract strings.\n";
-+ exit;
-+ }
-
- &GatherPOFiles;
-
- foreach my $lang (@languages)
- {
-- print "$lang: ";
-+ print STDERR "$lang: ";
- &POFile_Update ($lang, "");
- }
-
-- print "\n\n * Current translation support in $MODULE \n\n";
-+ print STDERR "\n\n * Current translation support in $MODULE \n\n";
-
- foreach my $lang (@languages)
- {
-- print "$lang: ";
-+ print STDERR "$lang: ";
- system ("$MSGFMT", "-o", "$devnull", "--verbose", "$SRCDIR/$lang.po");
- }
- }
-@@ -925,13 +999,13 @@
-
- $conf_in || die "Cannot find top_builddir in Makevars.";
- }
-- elsif (-f "../configure.ac")
-+ elsif (-f "$SRCDIR/../configure.ac")
- {
-- $conf_in = "../configure.ac";
-+ $conf_in = "$SRCDIR/../configure.ac";
- }
-- elsif (-f "../configure.in")
-+ elsif (-f "$SRCDIR/../configure.in")
- {
-- $conf_in = "../configure.in";
-+ $conf_in = "$SRCDIR/../configure.in";
- }
- else
- {
-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-12-04 15:24:37.000000000 +0100
-@@ -137,14 +137,12 @@
+ if test $stat -eq 0; then :
+ else
+- rm -f "$tmpdepfile"
++ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ exit $stat
+ fi
+
++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
++ do
++ test -f "$tmpdepfile" && break
++ done
+ if test -f "$tmpdepfile"; then
+- outname="$stripped.o"
+ # Each line is of the form `foo.o: dependent.h'.
+ # Do two passes, one to just change these to
+ # `$object: dependent.h' and one to simply `dependent.h:'.
+- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
++ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
++ # That's a tab and a space in the [].
++ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ else
+ # The sourcefile does not contain any dependencies, so just
+ # store a dummy comment line, to avoid errors with the Makefile
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/help/Makefile.in tomboy-0.9.7/help/Makefile.in
+--- tomboy-0.9.7.old/help/Makefile.in 2008-02-22 21:01:07.000000000 +0100
++++ tomboy-0.9.7/help/Makefile.in 2008-02-29 08:08:42.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 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.
+@@ -98,7 +98,9 @@
+ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -133,14 +135,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -1799,7 +3577,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -156,7 +154,6 @@
+@@ -152,7 +152,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -1807,58 +3585,419 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -170,6 +167,9 @@
+@@ -166,10 +165,13 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
-+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
+ MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+ MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
NUNIT = @NUNIT@
-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-11-27 22:23:09.000000000 +0100
-@@ -43,8 +43,8 @@
-
- PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION=1.5.24
--TIMESTAMP=" (1.1220.2.455 2007/06/24 02:13:29)"
-+VERSION="1.5.24 Debian 1.5.24-2"
-+TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
-
- # 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"
-+ ;;
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+ NUNIT_LIBS = @NUNIT_LIBS@
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/install-sh tomboy-0.9.7/install-sh
+--- tomboy-0.9.7.old/install-sh 2008-02-22 18:30:26.000000000 +0100
++++ tomboy-0.9.7/install-sh 2008-02-29 08:08:39.000000000 +0100
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ # install - install a program, script, or datafile
+
+-scriptversion=2006-10-14.15
++scriptversion=2006-12-25.00
+
+ # This originates from X11R5 (mit/util/scripts/install.sh), which was
+ # later released in X11R6 (xc/config/util/install.sh) with the
+@@ -48,7 +48,7 @@
+ # set DOITPROG to echo to test this script
+
+ # Don't use :- since 4.3BSD and earlier shells don't like it.
+-doit="${DOITPROG-}"
++doit=${DOITPROG-}
+ if test -z "$doit"; then
+ doit_exec=exec
+ else
+@@ -58,34 +58,49 @@
+ # Put in absolute file names if you don't have them in your path;
+ # or use environment vars.
+
+-mvprog="${MVPROG-mv}"
+-cpprog="${CPPROG-cp}"
+-chmodprog="${CHMODPROG-chmod}"
+-chownprog="${CHOWNPROG-chown}"
+-chgrpprog="${CHGRPPROG-chgrp}"
+-stripprog="${STRIPPROG-strip}"
+-rmprog="${RMPROG-rm}"
+-mkdirprog="${MKDIRPROG-mkdir}"
++chgrpprog=${CHGRPPROG-chgrp}
++chmodprog=${CHMODPROG-chmod}
++chownprog=${CHOWNPROG-chown}
++cmpprog=${CMPPROG-cmp}
++cpprog=${CPPROG-cp}
++mkdirprog=${MKDIRPROG-mkdir}
++mvprog=${MVPROG-mv}
++rmprog=${RMPROG-rm}
++stripprog=${STRIPPROG-strip}
++
++posix_glob='?'
++initialize_posix_glob='
++ test "$posix_glob" != "?" || {
++ if (set -f) 2>/dev/null; then
++ posix_glob=
++ else
++ posix_glob=:
++ fi
++ }
++'
+
+-posix_glob=
+ posix_mkdir=
+
+ # Desired mode of installed file.
+ mode=0755
+
++chgrpcmd=
+ chmodcmd=$chmodprog
+ chowncmd=
+-chgrpcmd=
+-stripcmd=
++mvcmd=$mvprog
+ rmcmd="$rmprog -f"
+-mvcmd="$mvprog"
++stripcmd=
++
+ src=
+ dst=
+ dir_arg=
+-dstarg=
++dst_arg=
++
++copy_on_change=false
+ no_target_directory=
+
+-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
++usage="\
++Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+ or: $0 [OPTION]... SRCFILES... DIRECTORY
+ or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+ or: $0 [OPTION]... -d DIRECTORIES...
+@@ -95,65 +110,55 @@
+ In the 4th, create DIRECTORIES.
+
+ Options:
+--c (ignored)
+--d create directories instead of installing files.
+--g GROUP $chgrpprog installed files to GROUP.
+--m MODE $chmodprog installed files to MODE.
+--o USER $chownprog installed files to USER.
+--s $stripprog installed files.
+--t DIRECTORY install into DIRECTORY.
+--T report an error if DSTFILE is a directory.
+---help display this help and exit.
+---version display version info and exit.
++ --help display this help and exit.
++ --version display version info and exit.
++
++ -c (ignored)
++ -C install only if different (preserve the last data modification time)
++ -d create directories instead of installing files.
++ -g GROUP $chgrpprog installed files to GROUP.
++ -m MODE $chmodprog installed files to MODE.
++ -o USER $chownprog installed files to USER.
++ -s $stripprog installed files.
++ -t DIRECTORY install into DIRECTORY.
++ -T report an error if DSTFILE is a directory.
+
+ Environment variables override the default commands:
+- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
++ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
++ RMPROG STRIPPROG
+ "
+
+ while test $# -ne 0; do
+ case $1 in
+- -c) shift
+- continue;;
++ -c) ;;
++
++ -C) copy_on_change=true;;
+
+- -d) dir_arg=true
+- shift
+- continue;;
++ -d) dir_arg=true;;
+
+ -g) chgrpcmd="$chgrpprog $2"
+- shift
+- shift
+- continue;;
++ shift;;
+
+ --help) echo "$usage"; exit $?;;
+
+ -m) mode=$2
+- shift
+- shift
+ case $mode in
+ *' '* | *' '* | *'
+ '* | *'*'* | *'?'* | *'['*)
+ echo "$0: invalid mode: $mode" >&2
+ exit 1;;
esac
+- continue;;
++ shift;;
+
+ -o) chowncmd="$chownprog $2"
+- shift
+- shift
+- continue;;
+-
+- -s) stripcmd=$stripprog
+- shift
+- continue;;
+-
+- -t) dstarg=$2
+- shift
+- shift
+- continue;;
+-
+- -T) no_target_directory=true
+- shift
+- continue;;
++ shift;;
++
++ -s) stripcmd=$stripprog;;
++
++ -t) dst_arg=$2
++ shift;;
++
++ -T) no_target_directory=true;;
+
+ --version) echo "$0 $scriptversion"; exit $?;;
+
+@@ -165,21 +170,22 @@
+
+ *) break;;
+ esac
++ shift
+ done
+
+-if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
++if test $# -ne 0 && test -z "$dir_arg$dst_arg"; 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
++ if test -n "$dst_arg"; then
+ # $@ is not empty: it contains at least $arg.
+- set fnord "$@" "$dstarg"
++ set fnord "$@" "$dst_arg"
+ shift # fnord
+ fi
+ shift # arg
+- dstarg=$arg
++ dst_arg=$arg
+ done
+ fi
+
+@@ -224,7 +230,7 @@
+ do
+ # Protect names starting with `-'.
+ case $src in
+- -*) src=./$src ;;
++ -*) src=./$src;;
+ esac
+
+ if test -n "$dir_arg"; then
+@@ -242,22 +248,22 @@
+ exit 1
+ fi
+
+- if test -z "$dstarg"; then
++ if test -z "$dst_arg"; then
+ echo "$0: no destination specified." >&2
+ exit 1
+ fi
+
+- dst=$dstarg
++ dst=$dst_arg
+ # Protect names starting with `-'.
+ case $dst in
+- -*) dst=./$dst ;;
++ -*) dst=./$dst;;
+ esac
+
+ # If destination is a directory, append the input filename; won't work
+ # if double slashes aren't ignored.
+ if test -d "$dst"; then
+ if test -n "$no_target_directory"; then
+- echo "$0: $dstarg: Is a directory" >&2
++ echo "$0: $dst_arg: Is a directory" >&2
+ exit 1
fi
- 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
-+ ;;
- 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-12-04 15:24:37.000000000 +0100
-@@ -133,14 +133,12 @@
+ dstdir=$dst
+@@ -378,26 +384,19 @@
+ # directory the slow way, step by step, checking for races as we go.
+
+ case $dstdir in
+- /*) prefix=/ ;;
+- -*) prefix=./ ;;
+- *) prefix= ;;
++ /*) prefix='/';;
++ -*) prefix='./';;
++ *) prefix='';;
+ esac
+
+- case $posix_glob in
+- '')
+- if (set -f) 2>/dev/null; then
+- posix_glob=true
+- else
+- posix_glob=false
+- fi ;;
+- esac
++ eval "$initialize_posix_glob"
+
+ oIFS=$IFS
+ IFS=/
+- $posix_glob && set -f
++ $posix_glob set -f
+ set fnord $dstdir
+ shift
+- $posix_glob && set +f
++ $posix_glob set +f
+ IFS=$oIFS
+
+ prefixes=
+@@ -459,41 +458,54 @@
+ # ignore errors from any of these, just make sure not to ignore
+ # errors from the above "$doit $cpprog $src $dsttmp" command.
+ #
+- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+- && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+-
+- # Now rename the file to the real destination.
+- { $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
+- # support -f.
+-
+- # Now remove or move aside any old file at destination location.
+- # We try this two ways since rm can't unlink itself on some
+- # systems and the destination file might be busy for other
+- # reasons. In this case, the final cleanup might fail but the new
+- # file should still install successfully.
+- {
+- 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 $dst" >&2
+- (exit 1); exit 1
+- }
+- else
+- :
+- fi
+- } &&
+-
+- # Now rename the file to the real destination.
+- $doit $mvcmd "$dsttmp" "$dst"
+- }
+- } || exit 1
++ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
++ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
++ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
++ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
++
++ # If -C, don't bother to copy if it wouldn't change the file.
++ if $copy_on_change &&
++ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
++ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
++
++ eval "$initialize_posix_glob" &&
++ $posix_glob set -f &&
++ set X $old && old=:$2:$4:$5:$6 &&
++ set X $new && new=:$2:$4:$5:$6 &&
++ $posix_glob set +f &&
++
++ test "$old" = "$new" &&
++ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
++ then
++ rm -f "$dsttmp"
++ else
++ # Rename the file to the real destination.
++ $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
++ # support -f.
++ {
++ # Now remove or move aside any old file at destination location.
++ # We try this two ways since rm can't unlink itself on some
++ # systems and the destination file might be busy for other
++ # reasons. In this case, the final cleanup might fail but the new
++ # file should still install successfully.
++ {
++ test ! -f "$dst" ||
++ $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 $dst" >&2
++ (exit 1); exit 1
++ }
++ } &&
++
++ # Now rename the file to the real destination.
++ $doit $mvcmd "$dsttmp" "$dst"
++ }
++ fi || exit 1
+
+ trap '' 0
+ fi
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/libtomboy/Makefile.in tomboy-0.9.7/libtomboy/Makefile.in
+--- tomboy-0.9.7.old/libtomboy/Makefile.in 2008-02-22 21:01:07.000000000 +0100
++++ tomboy-0.9.7/libtomboy/Makefile.in 2008-02-29 08:08:42.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 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.
+@@ -58,7 +58,7 @@
+ 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@
++DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+@@ -105,7 +105,9 @@
+ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -140,14 +142,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -1874,7 +4013,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -152,7 +150,6 @@
+@@ -159,7 +159,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -1882,20 +4021,301 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -166,6 +163,9 @@
+@@ -173,10 +172,13 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
-+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
+ MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+ MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
NUNIT = @NUNIT@
-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-12-04 15:24:34.000000000 +0100
-@@ -117,14 +117,12 @@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+ NUNIT_LIBS = @NUNIT_LIBS@
+@@ -323,8 +325,8 @@
+ @list='$(tomboylib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(tomboylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(tomboylibdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(tomboylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(tomboylibdir)/$$f"; \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(tomboylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(tomboylibdir)/$$f'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(tomboylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(tomboylibdir)/$$f"; \
+ else :; fi; \
+ done
+
+@@ -332,8 +334,8 @@
+ @$(NORMAL_UNINSTALL)
+ @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"; \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(tomboylibdir)/$$p'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(tomboylibdir)/$$p"; \
+ done
+
+ clean-tomboylibLTLIBRARIES:
+@@ -391,8 +393,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -404,8 +406,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -415,13 +417,12 @@
+ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/ltmain.sh tomboy-0.9.7/ltmain.sh
+--- tomboy-0.9.7.old/ltmain.sh 2007-09-21 20:28:33.000000000 +0200
++++ tomboy-0.9.7/ltmain.sh 2008-02-02 14:28:24.000000000 +0100
+@@ -2,7 +2,7 @@
+ # NOTE: Changing this file will not affect anything until you rerun configure.
+ #
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+-# 2007 Free Software Foundation, Inc.
++# 2007, 2008 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,8 +43,8 @@
+
+ PROGRAM=ltmain.sh
+ PACKAGE=libtool
+-VERSION=1.5.24
+-TIMESTAMP=" (1.1220.2.455 2007/06/24 02:13:29)"
++VERSION="1.5.26 Debian 1.5.26-1"
++TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
+
+ # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+@@ -113,15 +113,21 @@
+ # 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.
+-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++lt_env=
++for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+ do
+ eval "if test \"\${$lt_var+set}\" = set; then
+ save_$lt_var=\$$lt_var
++ lt_env=\"$lt_var=\$$lt_var \$lt_env\"
+ $lt_var=C
+ export $lt_var
+ fi"
+ done
+
++if test -n "$lt_env"; then
++ lt_env="env $lt_env"
++fi
++
+ # Make sure IFS has a sensible default
+ lt_nl='
+ '
+@@ -485,7 +491,7 @@
+ echo "\
+ $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
+
+-Copyright (C) 2007 Free Software Foundation, Inc.
++Copyright (C) 2008 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 $?
+@@ -788,6 +794,7 @@
+ *.for) xform=for ;;
+ *.java) xform=java ;;
+ *.obj) xform=obj ;;
++ *.sx) xform=sx ;;
+ esac
+
+ libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
+@@ -956,7 +963,7 @@
+ $run $rm "$lobj" "$output_obj"
+
+ $show "$command"
+- if $run eval "$command"; then :
++ if $run eval $lt_env "$command"; then :
+ else
+ test -n "$output_obj" && $run $rm $removelist
+ exit $EXIT_FAILURE
+@@ -1028,7 +1035,7 @@
+ command="$command$suppress_output"
+ $run $rm "$obj" "$output_obj"
+ $show "$command"
+- if $run eval "$command"; then :
++ if $run eval $lt_env "$command"; then :
+ else
+ $run $rm $removelist
+ exit $EXIT_FAILURE
+@@ -1161,6 +1168,7 @@
+ thread_safe=no
+ vinfo=
+ vinfo_number=no
++ single_module="${wl}-single_module"
+
+ func_infer_tag $base_compile
+
+@@ -1646,6 +1654,11 @@
+ continue
+ ;;
+
++ -multi_module)
++ single_module="${wl}-multi_module"
++ continue
++ ;;
++
+ -module)
+ module=yes
+ continue
+@@ -2122,7 +2135,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"
++ ;;
+ esac
+ fi
+ if test "$pass" = dlopen; then
+@@ -2149,7 +2165,12 @@
+ continue
+ fi
+ name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
+- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
++ if test "$linkmode" = lib; then
++ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
++ else
++ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
++ fi
++ for searchdir in $searchdirs; do
+ for search_ext in .la $std_shrext .so .a; do
+ # Search the libtool library
+ lib="$searchdir/lib${name}${search_ext}"
+@@ -2945,12 +2966,18 @@
+ # we do not want to link against static libs,
+ # but need to link against shared
+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
++ eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ if test -n "$deplibrary_names" ; then
+ for tmp in $deplibrary_names ; do
+ depdepl=$tmp
+ done
+- if test -f "$path/$depdepl" ; then
++ if test -f "$deplibdir/$depdepl" ; then
++ depdepl="$deplibdir/$depdepl"
++ elif test -f "$path/$depdepl" ; then
+ depdepl="$path/$depdepl"
++ else
++ # Can't find it, oh well...
++ depdepl=
+ fi
+ # do not add paths which are already there
+ case " $newlib_search_path " in
+@@ -3098,9 +3125,10 @@
+
+ case $linkmode in
+ oldlib)
+- if test -n "$deplibs"; then
+- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
+- fi
++ case " $deplibs" in
++ *\ -l* | *\ -L*)
++ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
++ esac
+
+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
+@@ -3244,6 +3272,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
++ ;;
+ esac
+ ;;
+ no)
+@@ -4237,9 +4270,10 @@
+ ;;
+
+ obj)
+- if test -n "$deplibs"; then
+- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
+- fi
++ case " $deplibs" in
++ *\ -l* | *\ -L*)
++ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
++ esac
+
+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
+@@ -6478,7 +6512,7 @@
+ fi
+
+ # Restore saved environment variables
+- for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++ for lt_var in LANG LANGUAGE 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
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Makefile.in tomboy-0.9.7/Makefile.in
+--- tomboy-0.9.7.old/Makefile.in 2008-02-22 21:01:07.000000000 +0100
++++ tomboy-0.9.7/Makefile.in 2008-02-29 08:08:42.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 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.
+@@ -101,7 +101,9 @@
+ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --disable-scrollkeeper
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -136,14 +138,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -1911,7 +4331,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -136,7 +134,6 @@
+@@ -155,7 +155,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -1919,20 +4339,122 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -150,6 +147,9 @@
+@@ -169,10 +168,13 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
-+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
+ MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+ MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
NUNIT = @NUNIT@
-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-12-04 15:24:35.000000000 +0100
-@@ -116,14 +116,12 @@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+ NUNIT_LIBS = @NUNIT_LIBS@
+@@ -278,7 +280,6 @@
+ intltool-update \
+ po/.intltool-merge-cache
+
+-DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --disable-scrollkeeper
+
+ # Ignore scrollkeeper issues for now. @#*$& scrollkeeper (from Evince)
+ distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper | grep -v /share/gnome/help/ | grep -v \.omf
+@@ -425,8 +426,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -451,8 +452,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -462,13 +463,12 @@
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+@@ -539,6 +539,10 @@
+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+ $(am__remove_distdir)
+
++dist-lzma: distdir
++ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
++ $(am__remove_distdir)
++
+ dist-tarZ: distdir
+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+ $(am__remove_distdir)
+@@ -565,6 +569,8 @@
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++ *.tar.lzma*) \
++ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+@@ -717,8 +723,8 @@
+ .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 \
++ dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
++ distclean distclean-generic distclean-hdr distclean-libtool \
+ 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 \
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Mono.Addins/Makefile.in tomboy-0.9.7/Mono.Addins/Makefile.in
+--- tomboy-0.9.7.old/Mono.Addins/Makefile.in 2008-02-22 21:01:04.000000000 +0100
++++ tomboy-0.9.7/Mono.Addins/Makefile.in 2008-02-29 08:08:39.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 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.
+@@ -85,7 +85,9 @@
+ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -120,14 +122,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -1948,7 +4470,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -135,7 +133,6 @@
+@@ -139,7 +139,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -1956,66 +4478,83 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -149,6 +146,9 @@
+@@ -153,10 +152,13 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
-+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
+ MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+ MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
NUNIT = @NUNIT@
-@@ -238,11 +238,12 @@
- LINK_TOMBOY_EXE = \
- -r:$(top_builddir)/Tomboy/Tomboy.exe
-
--LINK_MONO_ADDINS = \
-- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ at EXTERNAL_MONO_ADDINS_FALSE@LINK_MONO_ADDINS = \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
-+ at EXTERNAL_MONO_ADDINS_TRUE@LINK_MONO_ADDINS = $(MONO_ADDINS_LIBS)
- CSC_FLAGS = -debug
- CSC = gmcs $(CSC_FLAGS) -target:exe
- CSC_LIB = $(CSC) -target:library
-@@ -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
--assemblydir = $(pkglibdir)
--assembly_DATA = \
-- $(ASSEMBLY) \
-- $(ASSEMBLY).config
-+ at EXTERNAL_MONO_ADDINS_FALSE@assemblydir = $(pkglibdir)
-+ at EXTERNAL_MONO_ADDINS_FALSE@assembly_DATA = \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ $(ASSEMBLY) \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ $(ASSEMBLY).config
-
- EXTRA_DIST = \
- $(ASSEMBLY_SOURCES) \
-@@ -533,10 +534,10 @@
- uninstall uninstall-am uninstall-assemblyDATA
-
-
--all: $(ASSEMBLY)
-+ at EXTERNAL_MONO_ADDINS_FALSE@all: $(ASSEMBLY)
-
--$(ASSEMBLY): $(ASSEMBLY_SOURCES)
-- $(CSC) $(CSC_EXTRA_FLAGS) -out:$@ $(PKGS) $(REFS) $(ASSEMBLY_SOURCES)
-+ at EXTERNAL_MONO_ADDINS_FALSE@$(ASSEMBLY): $(ASSEMBLY_SOURCES)
-+ at EXTERNAL_MONO_ADDINS_FALSE@ $(CSC) $(CSC_EXTRA_FLAGS) -out:$@ $(PKGS) $(REFS) $(ASSEMBLY_SOURCES)
- # 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.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-12-04 15:24:35.000000000 +0100
-@@ -116,14 +116,12 @@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+ NUNIT_LIBS = @NUNIT_LIBS@
+@@ -358,8 +360,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -384,8 +386,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -395,13 +397,12 @@
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Mono.Addins/Mono.Addins/Makefile.in tomboy-0.9.7/Mono.Addins/Mono.Addins/Makefile.in
+--- tomboy-0.9.7.old/Mono.Addins/Mono.Addins/Makefile.in 2008-02-22 21:01:05.000000000 +0100
++++ tomboy-0.9.7/Mono.Addins/Mono.Addins/Makefile.in 2008-02-29 08:08:39.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 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.
+@@ -84,7 +84,9 @@
+ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -119,14 +121,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -2031,7 +4570,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -135,7 +133,6 @@
+@@ -138,7 +138,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -2039,64 +4578,45 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -149,6 +146,9 @@
+@@ -152,10 +151,13 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
-+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
+ MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+ MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
NUNIT = @NUNIT@
-@@ -238,11 +238,12 @@
- LINK_TOMBOY_EXE = \
- -r:$(top_builddir)/Tomboy/Tomboy.exe
-
--LINK_MONO_ADDINS = \
-- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ at EXTERNAL_MONO_ADDINS_FALSE@LINK_MONO_ADDINS = \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
-+ at EXTERNAL_MONO_ADDINS_TRUE@LINK_MONO_ADDINS = $(MONO_ADDINS_LIBS)
- CSC_FLAGS = -debug
- CSC = gmcs $(CSC_FLAGS) -target:exe
- CSC_LIB = $(CSC) -target:library
-@@ -287,9 +288,9 @@
-
- CSC_EXTRA_FLAGS = -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
- ASSEMBLY = $(ASSEMBLY_NAME).dll
--assemblydir = $(pkglibdir)
--assembly_DATA = \
-- $(ASSEMBLY)
-+ at EXTERNAL_MONO_ADDINS_FALSE@assemblydir = $(pkglibdir)
-+ at EXTERNAL_MONO_ADDINS_FALSE@assembly_DATA = \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ $(ASSEMBLY)
-
- EXTRA_DIST = \
- $(ASSEMBLY_SOURCES) \
-@@ -492,10 +493,10 @@
- uninstall uninstall-am uninstall-assemblyDATA
-
-
--all: $(ASSEMBLY)
-+ at EXTERNAL_MONO_ADDINS_FALSE@all: $(ASSEMBLY)
-
--$(ASSEMBLY): $(ASSEMBLY_SOURCES)
-- $(CSC_LIB) $(CSC_EXTRA_FLAGS) -out:$@ $(PKGS) $(REFS) $(ASSEMBLY_SOURCES) $(RESOURCES)
-+ at EXTERNAL_MONO_ADDINS_FALSE@$(ASSEMBLY): $(ASSEMBLY_SOURCES)
-+ at EXTERNAL_MONO_ADDINS_FALSE@ $(CSC_LIB) $(CSC_EXTRA_FLAGS) -out:$@ $(PKGS) $(REFS) $(ASSEMBLY_SOURCES) $(RESOURCES)
- # 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.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-12-04 15:24:35.000000000 +0100
-@@ -116,14 +116,12 @@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+ NUNIT_LIBS = @NUNIT_LIBS@
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Mono.Addins/Mono.Addins.Gui/Makefile.in tomboy-0.9.7/Mono.Addins/Mono.Addins.Gui/Makefile.in
+--- tomboy-0.9.7.old/Mono.Addins/Mono.Addins.Gui/Makefile.in 2008-02-22 21:01:05.000000000 +0100
++++ tomboy-0.9.7/Mono.Addins/Mono.Addins.Gui/Makefile.in 2008-02-29 08:08:39.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 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.
+@@ -84,7 +84,9 @@
+ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -119,14 +121,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -2112,7 +4632,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -135,7 +133,6 @@
+@@ -138,7 +138,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -2120,76 +4640,45 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -149,6 +146,9 @@
+@@ -152,10 +151,13 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
-+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
+ MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+ MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
NUNIT = @NUNIT@
-@@ -238,11 +238,12 @@
- LINK_TOMBOY_EXE = \
- -r:$(top_builddir)/Tomboy/Tomboy.exe
-
--LINK_MONO_ADDINS = \
-- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ at EXTERNAL_MONO_ADDINS_FALSE@LINK_MONO_ADDINS = \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
-+ at EXTERNAL_MONO_ADDINS_TRUE@LINK_MONO_ADDINS = $(MONO_ADDINS_LIBS)
- CSC_FLAGS = -debug
- CSC = gmcs $(CSC_FLAGS) -target:exe
- CSC_LIB = $(CSC) -target:library
-@@ -288,9 +289,9 @@
- PKGS =
- CSC_EXTRA_FLAGS = -langversion:ISO-1 -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
- ASSEMBLY = $(ASSEMBLY_NAME).dll
--assemblydir = $(pkglibdir)
--assembly_DATA = \
-- $(ASSEMBLY)
-+ at EXTERNAL_MONO_ADDINS_FALSE@assemblydir = $(pkglibdir)
-+ at EXTERNAL_MONO_ADDINS_FALSE@assembly_DATA = \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ $(ASSEMBLY)
-
- EXTRA_DIST = \
- $(ASSEMBLY_SOURCES)
-@@ -488,10 +489,10 @@
- uninstall uninstall-am uninstall-assemblyDATA
-
-
--all: $(ASSEMBLY)
-+ at EXTERNAL_MONO_ADDINS_FALSE@all: $(ASSEMBLY)
-
--$(ASSEMBLY): $(ASSEMBLY_SOURCES)
-- $(CSC_LIB) $(CSC_EXTRA_FLAGS) -out:$@ $(PKGS) $(REFS) $(ASSEMBLY_SOURCES)
-+ at EXTERNAL_MONO_ADDINS_FALSE@$(ASSEMBLY): $(ASSEMBLY_SOURCES)
-+ at EXTERNAL_MONO_ADDINS_FALSE@ $(CSC_LIB) $(CSC_EXTRA_FLAGS) -out:$@ $(PKGS) $(REFS) $(ASSEMBLY_SOURCES)
- # 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.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-12-04 15:24:25.000000000 +0100
-@@ -133,7 +133,7 @@
- dvi info tags TAGS ID:
-
- # Define this as empty until I found a useful application.
--installcheck:
-+install-exec installcheck:
-
- uninstall:
- linguas="$(USE_LINGUAS)"; \
-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-12-04 15:24:37.000000000 +0100
-@@ -105,14 +105,12 @@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+ NUNIT_LIBS = @NUNIT_LIBS@
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Mono.Addins/Mono.Addins.Setup/Makefile.in tomboy-0.9.7/Mono.Addins/Mono.Addins.Setup/Makefile.in
+--- tomboy-0.9.7.old/Mono.Addins/Mono.Addins.Setup/Makefile.in 2008-02-22 21:01:05.000000000 +0100
++++ tomboy-0.9.7/Mono.Addins/Mono.Addins.Setup/Makefile.in 2008-02-29 08:08:39.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 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.
+@@ -84,7 +84,9 @@
+ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -119,14 +121,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -2205,7 +4694,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -124,7 +122,6 @@
+@@ -138,7 +138,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -2213,20 +4702,45 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -138,6 +135,9 @@
+@@ -152,10 +151,13 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
-+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
+ MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+ MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
NUNIT = @NUNIT@
-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-12-04 15:24:35.000000000 +0100
-@@ -116,14 +116,12 @@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+ NUNIT_LIBS = @NUNIT_LIBS@
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/test/Makefile.in tomboy-0.9.7/test/Makefile.in
+--- tomboy-0.9.7.old/test/Makefile.in 2008-02-22 21:01:07.000000000 +0100
++++ tomboy-0.9.7/test/Makefile.in 2008-02-29 08:08:42.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 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.
+@@ -73,7 +73,9 @@
+ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -108,14 +110,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -2242,7 +4756,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -135,7 +133,6 @@
+@@ -127,7 +127,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -2250,37 +4764,45 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -149,6 +146,9 @@
+@@ -141,10 +140,13 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
-+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
+ MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+ MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
NUNIT = @NUNIT@
-@@ -238,11 +238,12 @@
- LINK_TOMBOY_EXE = \
- -r:$(top_builddir)/Tomboy/Tomboy.exe
-
--LINK_MONO_ADDINS = \
-- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ at EXTERNAL_MONO_ADDINS_FALSE@LINK_MONO_ADDINS = \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
-+ at EXTERNAL_MONO_ADDINS_TRUE@LINK_MONO_ADDINS = $(MONO_ADDINS_LIBS)
- CSC_FLAGS = -debug
- CSC = gmcs $(CSC_FLAGS) -target:exe
- CSC_LIB = $(CSC) -target:library
-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-12-04 15:24:35.000000000 +0100
-@@ -116,14 +116,12 @@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+ NUNIT_LIBS = @NUNIT_LIBS@
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/Backlinks/Makefile.in tomboy-0.9.7/Tomboy/Addins/Backlinks/Makefile.in
+--- tomboy-0.9.7.old/Tomboy/Addins/Backlinks/Makefile.in 2008-02-22 21:01:05.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/Backlinks/Makefile.in 2008-02-29 08:08:39.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 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.
+@@ -84,7 +84,9 @@
+ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -119,14 +121,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -2296,7 +4818,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -135,7 +133,6 @@
+@@ -138,7 +138,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -2304,37 +4826,45 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -149,6 +146,9 @@
+@@ -152,10 +151,13 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
-+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
+ MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+ MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
NUNIT = @NUNIT@
-@@ -238,11 +238,12 @@
- LINK_TOMBOY_EXE = \
- -r:$(top_builddir)/Tomboy/Tomboy.exe
-
--LINK_MONO_ADDINS = \
-- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ at EXTERNAL_MONO_ADDINS_FALSE@LINK_MONO_ADDINS = \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
-+ at EXTERNAL_MONO_ADDINS_TRUE@LINK_MONO_ADDINS = $(MONO_ADDINS_LIBS)
- CSC_FLAGS = -debug
- CSC = gmcs $(CSC_FLAGS) -target:exe
- CSC_LIB = $(CSC) -target:library
-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-12-04 15:24:35.000000000 +0100
-@@ -116,14 +116,12 @@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+ NUNIT_LIBS = @NUNIT_LIBS@
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/Bugzilla/Makefile.in tomboy-0.9.7/Tomboy/Addins/Bugzilla/Makefile.in
+--- tomboy-0.9.7.old/Tomboy/Addins/Bugzilla/Makefile.in 2008-02-22 21:01:05.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/Bugzilla/Makefile.in 2008-02-29 08:08:39.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 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.
+@@ -84,7 +84,9 @@
+ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -119,14 +121,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -2350,7 +4880,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -135,7 +133,6 @@
+@@ -138,7 +138,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -2358,37 +4888,45 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -149,6 +146,9 @@
+@@ -152,10 +151,13 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
-+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
+ MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+ MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
NUNIT = @NUNIT@
-@@ -238,11 +238,12 @@
- LINK_TOMBOY_EXE = \
- -r:$(top_builddir)/Tomboy/Tomboy.exe
-
--LINK_MONO_ADDINS = \
-- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ at EXTERNAL_MONO_ADDINS_FALSE@LINK_MONO_ADDINS = \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
-+ at EXTERNAL_MONO_ADDINS_TRUE@LINK_MONO_ADDINS = $(MONO_ADDINS_LIBS)
- CSC_FLAGS = -debug
- CSC = gmcs $(CSC_FLAGS) -target:exe
- CSC_LIB = $(CSC) -target:library
-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-12-04 15:24:35.000000000 +0100
-@@ -116,14 +116,12 @@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+ NUNIT_LIBS = @NUNIT_LIBS@
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/Evolution/Makefile.in tomboy-0.9.7/Tomboy/Addins/Evolution/Makefile.in
+--- tomboy-0.9.7.old/Tomboy/Addins/Evolution/Makefile.in 2008-02-22 21:01:05.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/Evolution/Makefile.in 2008-02-29 08:08:40.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 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.
+@@ -84,7 +84,9 @@
+ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -119,14 +121,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -2404,7 +4942,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -135,7 +133,6 @@
+@@ -138,7 +138,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -2412,37 +4950,45 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -149,6 +146,9 @@
+@@ -152,10 +151,13 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
-+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
+ MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+ MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
NUNIT = @NUNIT@
-@@ -238,11 +238,12 @@
- LINK_TOMBOY_EXE = \
- -r:$(top_builddir)/Tomboy/Tomboy.exe
-
--LINK_MONO_ADDINS = \
-- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ at EXTERNAL_MONO_ADDINS_FALSE@LINK_MONO_ADDINS = \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
-+ at EXTERNAL_MONO_ADDINS_TRUE@LINK_MONO_ADDINS = $(MONO_ADDINS_LIBS)
- CSC_FLAGS = -debug
- CSC = gmcs $(CSC_FLAGS) -target:exe
- CSC_LIB = $(CSC) -target:library
-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-12-04 15:24:36.000000000 +0100
-@@ -116,14 +116,12 @@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+ NUNIT_LIBS = @NUNIT_LIBS@
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/ExportToHtml/Makefile.in tomboy-0.9.7/Tomboy/Addins/ExportToHtml/Makefile.in
+--- tomboy-0.9.7.old/Tomboy/Addins/ExportToHtml/Makefile.in 2008-02-22 21:01:05.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/ExportToHtml/Makefile.in 2008-02-29 08:08:40.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 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.
+@@ -84,7 +84,9 @@
+ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -119,14 +121,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -2458,7 +5004,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -135,7 +133,6 @@
+@@ -138,7 +138,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -2466,37 +5012,45 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -149,6 +146,9 @@
+@@ -152,10 +151,13 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
-+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
+ MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+ MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
NUNIT = @NUNIT@
-@@ -238,11 +238,12 @@
- LINK_TOMBOY_EXE = \
- -r:$(top_builddir)/Tomboy/Tomboy.exe
-
--LINK_MONO_ADDINS = \
-- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ at EXTERNAL_MONO_ADDINS_FALSE@LINK_MONO_ADDINS = \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
-+ at EXTERNAL_MONO_ADDINS_TRUE@LINK_MONO_ADDINS = $(MONO_ADDINS_LIBS)
- CSC_FLAGS = -debug
- CSC = gmcs $(CSC_FLAGS) -target:exe
- CSC_LIB = $(CSC) -target:library
-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-12-04 15:24:36.000000000 +0100
-@@ -116,14 +116,12 @@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+ NUNIT_LIBS = @NUNIT_LIBS@
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/FileSystemSyncService/Makefile.in tomboy-0.9.7/Tomboy/Addins/FileSystemSyncService/Makefile.in
+--- tomboy-0.9.7.old/Tomboy/Addins/FileSystemSyncService/Makefile.in 2008-02-22 21:01:05.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/FileSystemSyncService/Makefile.in 2008-02-29 08:08:40.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 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.
+@@ -84,7 +84,9 @@
+ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -119,14 +121,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -2512,7 +5066,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -135,7 +133,6 @@
+@@ -138,7 +138,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -2520,37 +5074,45 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -149,6 +146,9 @@
+@@ -152,10 +151,13 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
-+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
+ MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+ MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
NUNIT = @NUNIT@
-@@ -238,11 +238,12 @@
- LINK_TOMBOY_EXE = \
- -r:$(top_builddir)/Tomboy/Tomboy.exe
-
--LINK_MONO_ADDINS = \
-- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ at EXTERNAL_MONO_ADDINS_FALSE@LINK_MONO_ADDINS = \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
-+ at EXTERNAL_MONO_ADDINS_TRUE@LINK_MONO_ADDINS = $(MONO_ADDINS_LIBS)
- CSC_FLAGS = -debug
- CSC = gmcs $(CSC_FLAGS) -target:exe
- CSC_LIB = $(CSC) -target:library
-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-12-04 15:24:36.000000000 +0100
-@@ -116,14 +116,12 @@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+ NUNIT_LIBS = @NUNIT_LIBS@
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/FixedWidth/Makefile.in tomboy-0.9.7/Tomboy/Addins/FixedWidth/Makefile.in
+--- tomboy-0.9.7.old/Tomboy/Addins/FixedWidth/Makefile.in 2008-02-22 21:01:05.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/FixedWidth/Makefile.in 2008-02-29 08:08:40.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 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.
+@@ -84,7 +84,9 @@
+ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -119,14 +121,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -2566,7 +5128,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -135,7 +133,6 @@
+@@ -138,7 +138,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -2574,37 +5136,45 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -149,6 +146,9 @@
+@@ -152,10 +151,13 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
-+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
+ MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+ MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
NUNIT = @NUNIT@
-@@ -238,11 +238,12 @@
- LINK_TOMBOY_EXE = \
- -r:$(top_builddir)/Tomboy/Tomboy.exe
-
--LINK_MONO_ADDINS = \
-- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ at EXTERNAL_MONO_ADDINS_FALSE@LINK_MONO_ADDINS = \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
-+ at EXTERNAL_MONO_ADDINS_TRUE@LINK_MONO_ADDINS = $(MONO_ADDINS_LIBS)
- CSC_FLAGS = -debug
- CSC = gmcs $(CSC_FLAGS) -target:exe
- CSC_LIB = $(CSC) -target:library
-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-12-04 15:24:36.000000000 +0100
-@@ -117,14 +117,12 @@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+ NUNIT_LIBS = @NUNIT_LIBS@
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/GalagoPresence/Makefile.in tomboy-0.9.7/Tomboy/Addins/GalagoPresence/Makefile.in
+--- tomboy-0.9.7.old/Tomboy/Addins/GalagoPresence/Makefile.in 2008-02-22 21:01:06.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/GalagoPresence/Makefile.in 2008-02-29 08:08:40.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 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.
+@@ -84,7 +84,9 @@
+ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -119,14 +121,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -2620,7 +5190,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -136,7 +134,6 @@
+@@ -138,7 +138,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -2628,20 +5198,45 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -150,6 +147,9 @@
+@@ -152,10 +151,13 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
-+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
+ MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+ MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
NUNIT = @NUNIT@
-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-12-04 15:24:36.000000000 +0100
-@@ -116,14 +116,12 @@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+ NUNIT_LIBS = @NUNIT_LIBS@
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/InsertTimestamp/Makefile.in tomboy-0.9.7/Tomboy/Addins/InsertTimestamp/Makefile.in
+--- tomboy-0.9.7.old/Tomboy/Addins/InsertTimestamp/Makefile.in 2008-02-22 21:01:06.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/InsertTimestamp/Makefile.in 2008-02-29 08:08:40.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 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.
+@@ -84,7 +84,9 @@
+ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -119,14 +121,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -2657,7 +5252,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -135,7 +133,6 @@
+@@ -138,7 +138,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -2665,37 +5260,45 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -149,6 +146,9 @@
+@@ -152,10 +151,13 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
-+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
+ MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+ MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
NUNIT = @NUNIT@
-@@ -238,11 +238,12 @@
- LINK_TOMBOY_EXE = \
- -r:$(top_builddir)/Tomboy/Tomboy.exe
-
--LINK_MONO_ADDINS = \
-- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ at EXTERNAL_MONO_ADDINS_FALSE@LINK_MONO_ADDINS = \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
-+ at EXTERNAL_MONO_ADDINS_TRUE@LINK_MONO_ADDINS = $(MONO_ADDINS_LIBS)
- CSC_FLAGS = -debug
- CSC = gmcs $(CSC_FLAGS) -target:exe
- CSC_LIB = $(CSC) -target:library
-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-12-04 15:24:36.000000000 +0100
-@@ -141,14 +141,12 @@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+ NUNIT_LIBS = @NUNIT_LIBS@
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/Makefile.in tomboy-0.9.7/Tomboy/Addins/Makefile.in
+--- tomboy-0.9.7.old/Tomboy/Addins/Makefile.in 2008-02-22 21:01:06.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/Makefile.in 2008-02-29 08:08:40.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 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.
+@@ -85,7 +85,9 @@
+ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -120,14 +122,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -2711,7 +5314,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -160,7 +158,6 @@
+@@ -139,7 +139,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -2719,37 +5322,83 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -174,6 +171,9 @@
+@@ -153,10 +152,13 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
-+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
+ MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+ MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
NUNIT = @NUNIT@
-@@ -263,11 +263,12 @@
- LINK_TOMBOY_EXE = \
- -r:$(top_builddir)/Tomboy/Tomboy.exe
-
--LINK_MONO_ADDINS = \
-- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ at EXTERNAL_MONO_ADDINS_FALSE@LINK_MONO_ADDINS = \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
-+ at EXTERNAL_MONO_ADDINS_TRUE@LINK_MONO_ADDINS = $(MONO_ADDINS_LIBS)
- CSC_FLAGS = -debug
- CSC = gmcs $(CSC_FLAGS) -target:exe
- CSC_LIB = $(CSC) -target:library
-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-12-04 15:24:36.000000000 +0100
-@@ -116,14 +116,12 @@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+ NUNIT_LIBS = @NUNIT_LIBS@
+@@ -369,8 +371,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -395,8 +397,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -406,13 +408,12 @@
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/NoteOfTheDay/Makefile.in tomboy-0.9.7/Tomboy/Addins/NoteOfTheDay/Makefile.in
+--- tomboy-0.9.7.old/Tomboy/Addins/NoteOfTheDay/Makefile.in 2008-02-22 21:01:06.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/NoteOfTheDay/Makefile.in 2008-02-29 08:08:40.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 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.
+@@ -84,7 +84,9 @@
+ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -119,14 +121,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -2765,7 +5414,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -135,7 +133,6 @@
+@@ -138,7 +138,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -2773,37 +5422,54 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -149,6 +146,9 @@
+@@ -152,10 +151,13 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
-+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
+ MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+ MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
NUNIT = @NUNIT@
-@@ -238,11 +238,12 @@
- LINK_TOMBOY_EXE = \
- -r:$(top_builddir)/Tomboy/Tomboy.exe
-
--LINK_MONO_ADDINS = \
-- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ at EXTERNAL_MONO_ADDINS_FALSE@LINK_MONO_ADDINS = \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
-+ at EXTERNAL_MONO_ADDINS_TRUE@LINK_MONO_ADDINS = $(MONO_ADDINS_LIBS)
- CSC_FLAGS = -debug
- CSC = gmcs $(CSC_FLAGS) -target:exe
- CSC_LIB = $(CSC) -target:library
-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-12-04 15:24:36.000000000 +0100
-@@ -116,14 +116,12 @@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+ NUNIT_LIBS = @NUNIT_LIBS@
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/PrintNotes/Makefile.in tomboy-0.9.7/Tomboy/Addins/PrintNotes/Makefile.in
+--- tomboy-0.9.7.old/Tomboy/Addins/PrintNotes/Makefile.in 2008-02-22 21:01:06.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/PrintNotes/Makefile.in 2008-02-29 08:08:41.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 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.
+@@ -60,7 +60,7 @@
+ 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@
++DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+@@ -109,7 +109,9 @@
+ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -144,14 +146,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -2819,7 +5485,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -135,7 +133,6 @@
+@@ -163,7 +163,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -2827,37 +5493,105 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -149,6 +146,9 @@
+@@ -177,10 +176,13 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
-+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
+ MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+ MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
NUNIT = @NUNIT@
-@@ -238,11 +238,12 @@
- LINK_TOMBOY_EXE = \
- -r:$(top_builddir)/Tomboy/Tomboy.exe
-
--LINK_MONO_ADDINS = \
-- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ at EXTERNAL_MONO_ADDINS_FALSE@LINK_MONO_ADDINS = \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
-+ at EXTERNAL_MONO_ADDINS_TRUE@LINK_MONO_ADDINS = $(MONO_ADDINS_LIBS)
- CSC_FLAGS = -debug
- CSC = gmcs $(CSC_FLAGS) -target:exe
- CSC_LIB = $(CSC) -target:library
-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-12-04 15:24:36.000000000 +0100
-@@ -116,14 +116,12 @@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+ NUNIT_LIBS = @NUNIT_LIBS@
+@@ -369,8 +371,8 @@
+ @list='$(printnoteslib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(printnoteslibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(printnoteslibdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(printnoteslibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(printnoteslibdir)/$$f"; \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(printnoteslibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(printnoteslibdir)/$$f'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(printnoteslibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(printnoteslibdir)/$$f"; \
+ else :; fi; \
+ done
+
+@@ -378,8 +380,8 @@
+ @$(NORMAL_UNINSTALL)
+ @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"; \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(printnoteslibdir)/$$p'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(printnoteslibdir)/$$p"; \
+ done
+
+ clean-printnoteslibLTLIBRARIES:
+@@ -451,8 +453,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -464,8 +466,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -475,13 +477,12 @@
+ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/Sketching/Makefile.in tomboy-0.9.7/Tomboy/Addins/Sketching/Makefile.in
+--- tomboy-0.9.7.old/Tomboy/Addins/Sketching/Makefile.in 2008-02-22 21:01:06.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/Sketching/Makefile.in 2008-02-29 08:08:41.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 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.
+@@ -84,7 +84,9 @@
+ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -119,14 +121,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -2873,7 +5607,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -135,7 +133,6 @@
+@@ -138,7 +138,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -2881,37 +5615,45 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -149,6 +146,9 @@
+@@ -152,10 +151,13 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
-+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
+ MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+ MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
NUNIT = @NUNIT@
-@@ -238,11 +238,12 @@
- LINK_TOMBOY_EXE = \
- -r:$(top_builddir)/Tomboy/Tomboy.exe
-
--LINK_MONO_ADDINS = \
-- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ at EXTERNAL_MONO_ADDINS_FALSE@LINK_MONO_ADDINS = \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
-+ at EXTERNAL_MONO_ADDINS_TRUE@LINK_MONO_ADDINS = $(MONO_ADDINS_LIBS)
- CSC_FLAGS = -debug
- CSC = gmcs $(CSC_FLAGS) -target:exe
- CSC_LIB = $(CSC) -target:library
-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-12-04 15:24:37.000000000 +0100
-@@ -131,14 +131,12 @@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+ NUNIT_LIBS = @NUNIT_LIBS@
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/SshSyncService/Makefile.in tomboy-0.9.7/Tomboy/Addins/SshSyncService/Makefile.in
+--- tomboy-0.9.7.old/Tomboy/Addins/SshSyncService/Makefile.in 2008-02-22 21:01:06.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/SshSyncService/Makefile.in 2008-02-29 08:08:41.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 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.
+@@ -84,7 +84,9 @@
+ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -119,14 +121,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -2927,7 +5669,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -150,7 +148,6 @@
+@@ -138,7 +138,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -2935,30 +5677,241 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -164,6 +161,9 @@
+@@ -152,10 +151,13 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
-+MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
+ MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+ MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
NUNIT = @NUNIT@
-@@ -253,11 +253,12 @@
- LINK_TOMBOY_EXE = \
- -r:$(top_builddir)/Tomboy/Tomboy.exe
-
--LINK_MONO_ADDINS = \
-- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ at EXTERNAL_MONO_ADDINS_FALSE@LINK_MONO_ADDINS = \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
-+ at EXTERNAL_MONO_ADDINS_FALSE@ -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-
-+ at EXTERNAL_MONO_ADDINS_TRUE@LINK_MONO_ADDINS = $(MONO_ADDINS_LIBS)
- CSC_FLAGS = -debug
- CSC = gmcs $(CSC_FLAGS) -target:exe
- CSC_LIB = $(CSC) -target:library
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+ NUNIT_LIBS = @NUNIT_LIBS@
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/StickyNoteImport/Makefile.in tomboy-0.9.7/Tomboy/Addins/StickyNoteImport/Makefile.in
+--- tomboy-0.9.7.old/Tomboy/Addins/StickyNoteImport/Makefile.in 2008-02-22 21:01:06.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/StickyNoteImport/Makefile.in 2008-02-29 08:08:41.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 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.
+@@ -84,7 +84,9 @@
+ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -119,14 +121,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -138,7 +138,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LDFLAGS = @LDFLAGS@
+@@ -152,10 +151,13 @@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+ MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
+ NUNIT = @NUNIT@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+ NUNIT_LIBS = @NUNIT_LIBS@
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/WebDavSyncService/Makefile.in tomboy-0.9.7/Tomboy/Addins/WebDavSyncService/Makefile.in
+--- tomboy-0.9.7.old/Tomboy/Addins/WebDavSyncService/Makefile.in 2008-02-22 21:01:06.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/WebDavSyncService/Makefile.in 2008-02-29 08:08:41.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 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.
+@@ -84,7 +84,9 @@
+ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -119,14 +121,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -138,7 +138,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LDFLAGS = @LDFLAGS@
+@@ -152,10 +151,13 @@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+ MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
+ NUNIT = @NUNIT@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+ NUNIT_LIBS = @NUNIT_LIBS@
+diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Makefile.in tomboy-0.9.7/Tomboy/Makefile.in
+--- tomboy-0.9.7.old/Tomboy/Makefile.in 2008-02-25 18:17:20.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Makefile.in 2008-02-29 08:08:41.000000000 +0100
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 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.
+@@ -99,7 +99,9 @@
+ DBUS_SERVICE_DIR = @DBUS_SERVICE_DIR@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -134,14 +136,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -153,7 +153,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LDFLAGS = @LDFLAGS@
+@@ -167,10 +166,13 @@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_ADDINS_CFLAGS = @MONO_ADDINS_CFLAGS@
+ MONO_ADDINS_LIBS = @MONO_ADDINS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
+ NUNIT = @NUNIT@
+ NUNIT_CFLAGS = @NUNIT_CFLAGS@
+ NUNIT_LIBS = @NUNIT_LIBS@
+@@ -520,8 +522,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -546,8 +548,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -557,13 +559,12 @@
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
More information about the Pkg-cli-apps-commits
mailing list