diff -Nru evolution-mapi-3.2.0/aclocal.m4 evolution-mapi-3.2.1/aclocal.m4 --- evolution-mapi-3.2.0/aclocal.m4 2011-09-20 06:39:41.000000000 +0000 +++ evolution-mapi-3.2.1/aclocal.m4 2011-10-12 07:23:58.000000000 +0000 @@ -19,99 +19,538 @@ 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 -*- mode: autoconf -*- - -# serial 1 - -dnl Usage: -dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) -AC_DEFUN([GTK_DOC_CHECK], -[ - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - - dnl check for tools we added during development - AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check]) - AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) - AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) - - dnl for overriding the documentation installation directory - AC_ARG_WITH([html-dir], - AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, - [with_html_dir='${datadir}/gtk-doc/html']) - HTML_DIR="$with_html_dir" - AC_SUBST([HTML_DIR]) +# Copyright (C) 1995-2002 Free Software Foundation, Inc. +# Copyright (C) 2001-2003,2004 Red Hat, Inc. +# +# This file is free software, distributed under the terms of the GNU +# General Public License. As a special exception to the GNU General +# Public License, this file may be distributed as part of a program +# that contains a configuration script generated by Autoconf, under +# the same distribution terms as the rest of that program. +# +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# +# Macro to add for using GNU gettext. +# Ulrich Drepper , 1995, 1996 +# +# Modified to never use included libintl. +# Owen Taylor , 12/15/1998 +# +# Major rework to remove unused code +# Owen Taylor , 12/11/2002 +# +# Added better handling of ALL_LINGUAS from GNU gettext version +# written by Bruno Haible, Owen Taylor 5/30/3002 +# +# Modified to require ngettext +# Matthias Clasen 08/06/2004 +# +# We need this here as well, since someone might use autoconf-2.5x +# to configure GLib then an older version to configure a package +# using AM_GLIB_GNU_GETTEXT +AC_PREREQ(2.53) - dnl enable/disable documentation building - AC_ARG_ENABLE([gtk-doc], - AS_HELP_STRING([--enable-gtk-doc], - [use gtk-doc to build documentation [[default=no]]]),, - [enable_gtk_doc=no]) +dnl +dnl We go to great lengths to make sure that aclocal won't +dnl try to pull in the installed version of these macros +dnl when running aclocal in the glib directory. +dnl +m4_copy([AC_DEFUN],[glib_DEFUN]) +m4_copy([AC_REQUIRE],[glib_REQUIRE]) +dnl +dnl At the end, if we're not within glib, we'll define the public +dnl definitions in terms of our private definitions. +dnl - if test x$enable_gtk_doc = xyes; then - ifelse([$1],[], - [PKG_CHECK_EXISTS([gtk-doc],, - AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], - [PKG_CHECK_EXISTS([gtk-doc >= $1],, - AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) - fi +# GLIB_LC_MESSAGES +#-------------------- +glib_DEFUN([GLIB_LC_MESSAGES], + [AC_CHECK_HEADERS([locale.h]) + if test $ac_cv_header_locale_h = yes; then + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your file defines LC_MESSAGES.]) + fi + fi]) - AC_MSG_CHECKING([whether to build gtk-doc documentation]) - AC_MSG_RESULT($enable_gtk_doc) +# GLIB_PATH_PROG_WITH_TEST +#---------------------------- +dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], +[# Extract the first word of "$2", so it can be a program name with args. +set dummy $2; ac_word=[$]2 +AC_MSG_CHECKING([for $ac_word]) +AC_CACHE_VAL(ac_cv_path_$1, +[case "[$]$1" in + /*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in ifelse([$5], , $PATH, [$5]); do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" +dnl If no 4th arg is given, leave the cache variable unset, +dnl so AC_PATH_PROGS will keep looking. +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +])dnl + ;; +esac])dnl +$1="$ac_cv_path_$1" +if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then + AC_MSG_RESULT([$]$1) +else + AC_MSG_RESULT(no) +fi +AC_SUBST($1)dnl +]) - dnl enable/disable output formats - AC_ARG_ENABLE([gtk-doc-html], - AS_HELP_STRING([--enable-gtk-doc-html], - [build documentation in html format [[default=yes]]]),, - [enable_gtk_doc_html=yes]) - AC_ARG_ENABLE([gtk-doc-pdf], - AS_HELP_STRING([--enable-gtk-doc-pdf], - [build documentation in pdf format [[default=no]]]),, - [enable_gtk_doc_pdf=no]) +# GLIB_WITH_NLS +#----------------- +glib_DEFUN([GLIB_WITH_NLS], + dnl NLS is obligatory + [USE_NLS=yes + AC_SUBST(USE_NLS) - if test -z "$GTKDOC_MKPDF"; then - enable_gtk_doc_pdf=no - fi + gt_cv_have_gettext=no + CATOBJEXT=NONE + XGETTEXT=: + INTLLIBS= - AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) - AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) - AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) - AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) - AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) -]) + AC_CHECK_HEADER(libintl.h, + [gt_cv_func_dgettext_libintl="no" + libintl_extra_libs="" + # + # First check in libc + # + AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, + [AC_TRY_LINK([ +#include +], + [return !ngettext ("","", 1)], + gt_cv_func_ngettext_libc=yes, + gt_cv_func_ngettext_libc=no) + ]) + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, + [AC_TRY_LINK([ +#include +], + [return !dgettext ("","")], + gt_cv_func_dgettext_libc=yes, + gt_cv_func_dgettext_libc=no) + ]) + fi + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + AC_CHECK_FUNCS(bind_textdomain_codeset) + fi -dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 40 IT_PROG_INTLTOOL -AC_DEFUN([IT_PROG_INTLTOOL], [ -AC_PREREQ([2.50])dnl -AC_REQUIRE([AM_NLS])dnl + # + # If we don't have everything we want, check in libintl + # + if test "$gt_cv_func_dgettext_libc" != "yes" \ + || test "$gt_cv_func_ngettext_libc" != "yes" \ + || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then + + AC_CHECK_LIB(intl, bindtextdomain, + [AC_CHECK_LIB(intl, ngettext, + [AC_CHECK_LIB(intl, dgettext, + gt_cv_func_dgettext_libintl=yes)])]) -case "$am__api_version" in - 1.[01234]) - AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) - ;; - *) - ;; -esac + if test "$gt_cv_func_dgettext_libintl" != "yes" ; then + AC_MSG_CHECKING([if -liconv is needed to use gettext]) + AC_MSG_RESULT([]) + AC_CHECK_LIB(intl, ngettext, + [AC_CHECK_LIB(intl, dcgettext, + [gt_cv_func_dgettext_libintl=yes + libintl_extra_libs=-liconv], + :,-liconv)], + :,-liconv) + fi -if test -n "$1"; then - AC_MSG_CHECKING([for intltool >= $1]) + # + # If we found libintl, then check in it for bind_textdomain_codeset(); + # we'll prefer libc if neither have bind_textdomain_codeset(), + # and both have dgettext and ngettext + # + if test "$gt_cv_func_dgettext_libintl" = "yes" ; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS -lintl $libintl_extra_libs" + unset ac_cv_func_bind_textdomain_codeset + AC_CHECK_FUNCS(bind_textdomain_codeset) + LIBS="$glib_save_LIBS" - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - ] - AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) - test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) -fi + if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then + gt_cv_func_dgettext_libc=no + else + if test "$gt_cv_func_dgettext_libc" = "yes" \ + && test "$gt_cv_func_ngettext_libc" = "yes"; then + gt_cv_func_dgettext_libintl=no + fi + fi + fi + fi -AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) -AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) -AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) -if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then + if test "$gt_cv_func_dgettext_libc" = "yes" \ + || test "$gt_cv_func_dgettext_libintl" = "yes"; then + gt_cv_have_gettext=yes + fi + + if test "$gt_cv_func_dgettext_libintl" = "yes"; then + INTLLIBS="-lintl $libintl_extra_libs" + fi + + if test "$gt_cv_have_gettext" = "yes"; then + AC_DEFINE(HAVE_GETTEXT,1, + [Define if the GNU gettext() function is already present or preinstalled.]) + GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl + if test "$MSGFMT" != "no"; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" + AC_CHECK_FUNCS(dcgettext) + MSGFMT_OPTS= + AC_MSG_CHECKING([if msgfmt accepts -c]) + GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: test 1.0\n" +"PO-Revision-Date: 2007-02-15 12:01+0100\n" +"Last-Translator: test \n" +"Language-Team: C \n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) + AC_SUBST(MSGFMT_OPTS) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr], + [CATOBJEXT=.gmo + DATADIRNAME=share], + [case $host in + *-*-solaris*) + dnl On Solaris, if bind_textdomain_codeset is in libc, + dnl GNU format message catalog is always supported, + dnl since both are added to the libc all together. + dnl Hence, we'd like to go with DATADIRNAME=share and + dnl and CATOBJEXT=.gmo in this case. + AC_CHECK_FUNC(bind_textdomain_codeset, + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo + DATADIRNAME=lib]) + ;; + *) + CATOBJEXT=.mo + DATADIRNAME=lib + ;; + esac]) + LIBS="$glib_save_LIBS" + INSTOBJEXT=.mo + else + gt_cv_have_gettext=no + fi + fi + ]) + + if test "$gt_cv_have_gettext" = "yes" ; then + AC_DEFINE(ENABLE_NLS, 1, + [always defined to indicate that i18n is enabled]) + fi + + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is not GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else + AC_MSG_RESULT( + [found xgettext program is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi + fi + + # We need to process the po/ directory. + POSUB=po + + AC_OUTPUT_COMMANDS( + [case "$CONFIG_FILES" in *po/Makefile.in*) + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile + esac]) + + dnl These rules are solely for the distribution goal. While doing this + dnl we only have to keep exactly one list of the available catalogs + dnl in configure.ac. + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done + + dnl Make all variables we use known to autoconf. + AC_SUBST(CATALOGS) + AC_SUBST(CATOBJEXT) + AC_SUBST(DATADIRNAME) + AC_SUBST(GMOFILES) + AC_SUBST(INSTOBJEXT) + AC_SUBST(INTLLIBS) + AC_SUBST(PO_IN_DATADIR_TRUE) + AC_SUBST(PO_IN_DATADIR_FALSE) + AC_SUBST(POFILES) + AC_SUBST(POSUB) + ]) + +# AM_GLIB_GNU_GETTEXT +# ------------------- +# Do checks necessary for use of gettext. If a suitable implementation +# of gettext is found in either in libintl or in the C library, +# it will set INTLLIBS to the libraries needed for use of gettext +# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable +# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() +# on various variables needed by the Makefile.in.in installed by +# glib-gettextize. +dnl +glib_DEFUN([GLIB_GNU_GETTEXT], + [AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + + GLIB_LC_MESSAGES + GLIB_WITH_NLS + + if test "$gt_cv_have_gettext" = "yes"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + AC_MSG_CHECKING(for catalogs to be installed) + NEW_LINGUAS= + for presentlang in $ALL_LINGUAS; do + useit=no + if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then + desiredlanguages="$LINGUAS" + else + desiredlanguages="$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + NEW_LINGUAS="$NEW_LINGUAS $presentlang" + fi + done + LINGUAS=$NEW_LINGUAS + AC_MSG_RESULT($LINGUAS) + fi + + dnl Construct list of names of catalog files to be constructed. + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi + + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly + dnl find the mkinstalldirs script in another subdir but ($top_srcdir). + dnl Try to locate is. + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + AC_SUBST(MKINSTALLDIRS) + + dnl Generate list of files to be processed by xgettext which will + dnl be included in po/Makefile. + test -d po || mkdir po + if test "x$srcdir" != "x."; then + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then + posrcprefix="$srcdir/" + else + posrcprefix="../$srcdir/" + fi + else + posrcprefix="../" + fi + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES + ]) + +# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) +# ------------------------------- +# Define VARIABLE to the location where catalog files will +# be installed by po/Makefile. +glib_DEFUN([GLIB_DEFINE_LOCALEDIR], +[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl +glib_save_prefix="$prefix" +glib_save_exec_prefix="$exec_prefix" +glib_save_datarootdir="$datarootdir" +test "x$prefix" = xNONE && prefix=$ac_default_prefix +test "x$exec_prefix" = xNONE && exec_prefix=$prefix +datarootdir=`eval echo "${datarootdir}"` +if test "x$CATOBJEXT" = "x.mo" ; then + localedir=`eval echo "${libdir}/locale"` +else + localedir=`eval echo "${datadir}/locale"` +fi +prefix="$glib_save_prefix" +exec_prefix="$glib_save_exec_prefix" +datarootdir="$glib_save_datarootdir" +AC_DEFINE_UNQUOTED($1, "$localedir", + [Define the location where the catalogs will be installed]) +]) + +dnl +dnl Now the definitions that aclocal will find +dnl +ifdef(glib_configure_ac,[],[ +AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) +AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) +])dnl + +# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) +# +# Create a temporary file with TEST-FILE as its contents and pass the +# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with +# 0 and perform ACTION-IF-FAIL for any other exit status. +AC_DEFUN([GLIB_RUN_PROG], +[cat >conftest.foo <<_ACEOF +$2 +_ACEOF +if AC_RUN_LOG([$1 conftest.foo]); then + m4_ifval([$3], [$3], [:]) +m4_ifvaln([$4], [else $4])dnl +echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD +sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD +fi]) + + +dnl -*- mode: autoconf -*- + +# serial 1 + +dnl Usage: +dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) +AC_DEFUN([GTK_DOC_CHECK], +[ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + + dnl check for tools we added during development + AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check]) + AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) + AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) + + dnl for overriding the documentation installation directory + AC_ARG_WITH([html-dir], + AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, + [with_html_dir='${datadir}/gtk-doc/html']) + HTML_DIR="$with_html_dir" + AC_SUBST([HTML_DIR]) + + dnl enable/disable documentation building + AC_ARG_ENABLE([gtk-doc], + AS_HELP_STRING([--enable-gtk-doc], + [use gtk-doc to build documentation [[default=no]]]),, + [enable_gtk_doc=no]) + + if test x$enable_gtk_doc = xyes; then + ifelse([$1],[], + [PKG_CHECK_EXISTS([gtk-doc],, + AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], + [PKG_CHECK_EXISTS([gtk-doc >= $1],, + AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) + dnl don't check for glib if we build glib + if test "x$PACKAGE_NAME" != "xglib"; then + dnl don't fail if someone does not have glib + PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,) + fi + fi + + AC_MSG_CHECKING([whether to build gtk-doc documentation]) + AC_MSG_RESULT($enable_gtk_doc) + + dnl enable/disable output formats + AC_ARG_ENABLE([gtk-doc-html], + AS_HELP_STRING([--enable-gtk-doc-html], + [build documentation in html format [[default=yes]]]),, + [enable_gtk_doc_html=yes]) + AC_ARG_ENABLE([gtk-doc-pdf], + AS_HELP_STRING([--enable-gtk-doc-pdf], + [build documentation in pdf format [[default=no]]]),, + [enable_gtk_doc_pdf=no]) + + if test -z "$GTKDOC_MKPDF"; then + enable_gtk_doc_pdf=no + fi + + + AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) + AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) + AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) + AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) + AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) +]) + + +dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) +# serial 40 IT_PROG_INTLTOOL +AC_DEFUN([IT_PROG_INTLTOOL], [ +AC_PREREQ([2.50])dnl +AC_REQUIRE([AM_NLS])dnl + +case "$am__api_version" in + 1.[01234]) + AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) + ;; + *) + ;; +esac + +if test -n "$1"; then + AC_MSG_CHECKING([for intltool >= $1]) + + INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` + [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + ] + AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) + test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || + AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) +fi + +AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) +AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) +AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) +if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) fi @@ -9596,735 +10035,302 @@ am_missing_run="$MISSING --run " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) - -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005, 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 4 - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - -# Check to make sure that the build environment is sane. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 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 5 - -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[[\\\"\#\$\&\'\`$am_lf]]*) - AC_MSG_ERROR([unsafe absolute working directory name]);; -esac -case $srcdir in - *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; -esac - -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT(yes)]) - -# Copyright (C) 2009 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 1 - -# AM_SILENT_RULES([DEFAULT]) -# -------------------------- -# Enable less verbose build rules; with the default set to DEFAULT -# (`yes' being less verbose, `no' or empty being verbose). -AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], -[ --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0')]) -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; -esac -AC_SUBST([AM_DEFAULT_VERBOSITY])dnl -AM_BACKSLASH='\' -AC_SUBST([AM_BACKSLASH])dnl -_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl -]) - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) + AC_MSG_WARN([`missing' script is too old or missing]) fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) +]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) - -# AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Public sister of _AM_SUBST_NOTMAKE. -AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) +# AM_PROG_MKDIR_P +# --------------- +# Check for `mkdir -p'. +AC_DEFUN([AM_PROG_MKDIR_P], +[AC_PREREQ([2.60])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +dnl while keeping a definition of mkdir_p for backward compatibility. +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +dnl Makefile.ins that do not define MKDIR_P, so we do our own +dnl adjustment using top_builddir (which is defined more often than +dnl MKDIR_P). +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +case $mkdir_p in + [[\\/$]]* | ?:[[\\/]]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac +]) -# Check how to create a tarball. -*- Autoconf -*- +# Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 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 2 - -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break - - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir - -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR - -# Copyright (C) 1995-2002 Free Software Foundation, Inc. -# Copyright (C) 2001-2003,2004 Red Hat, Inc. -# -# This file is free software, distributed under the terms of the GNU -# General Public License. As a special exception to the GNU General -# Public License, this file may be distributed as part of a program -# that contains a configuration script generated by Autoconf, under -# the same distribution terms as the rest of that program. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# -# Macro to add for using GNU gettext. -# Ulrich Drepper , 1995, 1996 -# -# Modified to never use included libintl. -# Owen Taylor , 12/15/1998 -# -# Major rework to remove unused code -# Owen Taylor , 12/11/2002 -# -# Added better handling of ALL_LINGUAS from GNU gettext version -# written by Bruno Haible, Owen Taylor 5/30/3002 -# -# Modified to require ngettext -# Matthias Clasen 08/06/2004 -# -# We need this here as well, since someone might use autoconf-2.5x -# to configure GLib then an older version to configure a package -# using AM_GLIB_GNU_GETTEXT -AC_PREREQ(2.53) - -dnl -dnl We go to great lengths to make sure that aclocal won't -dnl try to pull in the installed version of these macros -dnl when running aclocal in the glib directory. -dnl -m4_copy([AC_DEFUN],[glib_DEFUN]) -m4_copy([AC_REQUIRE],[glib_REQUIRE]) -dnl -dnl At the end, if we're not within glib, we'll define the public -dnl definitions in terms of our private definitions. -dnl - -# GLIB_LC_MESSAGES -#-------------------- -glib_DEFUN([GLIB_LC_MESSAGES], - [AC_CHECK_HEADERS([locale.h]) - if test $ac_cv_header_locale_h = yes; then - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your file defines LC_MESSAGES.]) - fi - fi]) +# serial 4 -# GLIB_PATH_PROG_WITH_TEST -#---------------------------- -dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], -[# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) -else - AC_MSG_RESULT(no) -fi -AC_SUBST($1)dnl -]) +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) -# GLIB_WITH_NLS -#----------------- -glib_DEFUN([GLIB_WITH_NLS], - dnl NLS is obligatory - [USE_NLS=yes - AC_SUBST(USE_NLS) +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - gt_cv_have_gettext=no +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - CATOBJEXT=NONE - XGETTEXT=: - INTLLIBS= +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - AC_CHECK_HEADER(libintl.h, - [gt_cv_func_dgettext_libintl="no" - libintl_extra_libs="" +# Check to make sure that the build environment is sane. -*- Autoconf -*- - # - # First check in libc - # - AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, - [AC_TRY_LINK([ -#include -], - [return !ngettext ("","", 1)], - gt_cv_func_ngettext_libc=yes, - gt_cv_func_ngettext_libc=no) - ]) - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, - [AC_TRY_LINK([ -#include -], - [return !dgettext ("","")], - gt_cv_func_dgettext_libc=yes, - gt_cv_func_dgettext_libc=no) - ]) - fi - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CHECK_FUNCS(bind_textdomain_codeset) - fi +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 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. - # - # If we don't have everything we want, check in libintl - # - if test "$gt_cv_func_dgettext_libc" != "yes" \ - || test "$gt_cv_func_ngettext_libc" != "yes" \ - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - - AC_CHECK_LIB(intl, bindtextdomain, - [AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dgettext, - gt_cv_func_dgettext_libintl=yes)])]) +# serial 5 - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - AC_MSG_CHECKING([if -liconv is needed to use gettext]) - AC_MSG_RESULT([]) - AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dcgettext, - [gt_cv_func_dgettext_libintl=yes - libintl_extra_libs=-liconv], - :,-liconv)], - :,-liconv) - fi +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Just in case +sleep 1 +echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; +esac - # - # If we found libintl, then check in it for bind_textdomain_codeset(); - # we'll prefer libc if neither have bind_textdomain_codeset(), - # and both have dgettext and ngettext - # - if test "$gt_cv_func_dgettext_libintl" = "yes" ; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $libintl_extra_libs" - unset ac_cv_func_bind_textdomain_codeset - AC_CHECK_FUNCS(bind_textdomain_codeset) - LIBS="$glib_save_LIBS" +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then - if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then - gt_cv_func_dgettext_libc=no - else - if test "$gt_cv_func_dgettext_libc" = "yes" \ - && test "$gt_cv_func_ngettext_libc" = "yes"; then - gt_cv_func_dgettext_libintl=no - fi - fi - fi - fi + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +alias in your environment]) + fi - if test "$gt_cv_func_dgettext_libc" = "yes" \ - || test "$gt_cv_func_dgettext_libintl" = "yes"; then - gt_cv_have_gettext=yes - fi - - if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs" - fi - - if test "$gt_cv_have_gettext" = "yes"; then - AC_DEFINE(HAVE_GETTEXT,1, - [Define if the GNU gettext() function is already present or preinstalled.]) - GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - AC_CHECK_FUNCS(dcgettext) - MSGFMT_OPTS= - AC_MSG_CHECKING([if msgfmt accepts -c]) - GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ -msgid "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Project-Id-Version: test 1.0\n" -"PO-Revision-Date: 2007-02-15 12:01+0100\n" -"Last-Translator: test \n" -"Language-Team: C \n" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) - AC_SUBST(MSGFMT_OPTS) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], - [CATOBJEXT=.gmo - DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share and - dnl and CATOBJEXT=.gmo in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo - DATADIRNAME=lib]) - ;; - *) - CATOBJEXT=.mo - DATADIRNAME=lib - ;; - esac]) - LIBS="$glib_save_LIBS" - INSTOBJEXT=.mo - else - gt_cv_have_gettext=no - fi - fi - ]) + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT(yes)]) - if test "$gt_cv_have_gettext" = "yes" ; then - AC_DEFINE(ENABLE_NLS, 1, - [always defined to indicate that i18n is enabled]) - fi +# Copyright (C) 2009 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. - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is not GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - fi +# serial 1 - # We need to process the po/ directory. - POSUB=po +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# (`yes' being less verbose, `no' or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], +[ --enable-silent-rules less verbose build output (undo: `make V=1') + --disable-silent-rules verbose build output (undo: `make V=0')]) +case $enable_silent_rules in +yes) AM_DEFAULT_VERBOSITY=0;; +no) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) - AC_OUTPUT_COMMANDS( - [case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac]) +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor `install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.ac. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done +# Copyright (C) 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. - dnl Make all variables we use known to autoconf. - AC_SUBST(CATALOGS) - AC_SUBST(CATOBJEXT) - AC_SUBST(DATADIRNAME) - AC_SUBST(GMOFILES) - AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLLIBS) - AC_SUBST(PO_IN_DATADIR_TRUE) - AC_SUBST(PO_IN_DATADIR_FALSE) - AC_SUBST(POFILES) - AC_SUBST(POSUB) - ]) +# serial 2 -# AM_GLIB_GNU_GETTEXT -# ------------------- -# Do checks necessary for use of gettext. If a suitable implementation -# of gettext is found in either in libintl or in the C library, -# it will set INTLLIBS to the libraries needed for use of gettext -# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable -# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() -# on various variables needed by the Makefile.in.in installed by -# glib-gettextize. -dnl -glib_DEFUN([GLIB_GNU_GETTEXT], - [AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - - GLIB_LC_MESSAGES - GLIB_WITH_NLS +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) - if test "$gt_cv_have_gettext" = "yes"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi +# AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi +# Check how to create a tarball. -*- Autoconf -*- - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but ($top_srcdir). - dnl Try to locate is. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - dnl Generate list of files to be processed by xgettext which will - dnl be included in po/Makefile. - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - ]) +# serial 2 -# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) -# ------------------------------- -# Define VARIABLE to the location where catalog files will -# be installed by po/Makefile. -glib_DEFUN([GLIB_DEFINE_LOCALEDIR], -[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl -glib_save_prefix="$prefix" -glib_save_exec_prefix="$exec_prefix" -glib_save_datarootdir="$datarootdir" -test "x$prefix" = xNONE && prefix=$ac_default_prefix -test "x$exec_prefix" = xNONE && exec_prefix=$prefix -datarootdir=`eval echo "${datarootdir}"` -if test "x$CATOBJEXT" = "x.mo" ; then - localedir=`eval echo "${libdir}/locale"` -else - localedir=`eval echo "${datadir}/locale"` -fi -prefix="$glib_save_prefix" -exec_prefix="$glib_save_exec_prefix" -datarootdir="$glib_save_datarootdir" -AC_DEFINE_UNQUOTED($1, "$localedir", - [Define the location where the catalogs will be installed]) -]) +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac -dnl -dnl Now the definitions that aclocal will find -dnl -ifdef(glib_configure_ac,[],[ -AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) -AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) -])dnl + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break -# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) -# -# Create a temporary file with TEST-FILE as its contents and pass the -# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with -# 0 and perform ACTION-IF-FAIL for any other exit status. -AC_DEFUN([GLIB_RUN_PROG], -[cat >conftest.foo <<_ACEOF -$2 -_ACEOF -if AC_RUN_LOG([$1 conftest.foo]); then - m4_ifval([$3], [$3], [:]) -m4_ifvaln([$4], [else $4])dnl -echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD -sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD -fi]) + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi +done +rm -rf conftest.dir +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR m4_include([acinclude.m4]) diff -Nru evolution-mapi-3.2.0/configure evolution-mapi-3.2.1/configure --- evolution-mapi-3.2.0/configure 2011-09-20 06:39:42.000000000 +0000 +++ evolution-mapi-3.2.1/configure 2011-10-12 07:23:59.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for evolution-mapi 3.2.0. +# Generated by GNU Autoconf 2.68 for evolution-mapi 3.2.1. # # Report bugs to . # @@ -571,8 +571,8 @@ # Identity of this package. PACKAGE_NAME='evolution-mapi' PACKAGE_TARNAME='evolution-mapi' -PACKAGE_VERSION='3.2.0' -PACKAGE_STRING='evolution-mapi 3.2.0' +PACKAGE_VERSION='3.2.1' +PACKAGE_STRING='evolution-mapi 3.2.1' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/browse.cgi?product=evolution-mapi' PACKAGE_URL='' @@ -627,6 +627,8 @@ GTK_DOC_BUILD_HTML_TRUE ENABLE_GTK_DOC_FALSE ENABLE_GTK_DOC_TRUE +GTKDOC_DEPS_LIBS +GTKDOC_DEPS_CFLAGS HTML_DIR GTKDOC_MKPDF GTKDOC_REBASE @@ -875,7 +877,9 @@ EVOLUTION_PLUGIN_CFLAGS EVOLUTION_PLUGIN_LIBS LIBMAPI_CFLAGS -LIBMAPI_LIBS' +LIBMAPI_LIBS +GTKDOC_DEPS_CFLAGS +GTKDOC_DEPS_LIBS' # Initialize some variables set by options. @@ -1418,7 +1422,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures evolution-mapi 3.2.0 to adapt to many kinds of systems. +\`configure' configures evolution-mapi 3.2.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1488,7 +1492,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of evolution-mapi 3.2.0:";; + short | recursive ) echo "Configuration of evolution-mapi 3.2.1:";; esac cat <<\_ACEOF @@ -1580,6 +1584,10 @@ C compiler flags for LIBMAPI, overriding pkg-config LIBMAPI_LIBS linker flags for LIBMAPI, overriding pkg-config + GTKDOC_DEPS_CFLAGS + C compiler flags for GTKDOC_DEPS, overriding pkg-config + GTKDOC_DEPS_LIBS + linker flags for GTKDOC_DEPS, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1647,7 +1655,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -evolution-mapi configure 3.2.0 +evolution-mapi configure 3.2.1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2016,7 +2024,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by evolution-mapi $as_me 3.2.0, which was +It was created by evolution-mapi $as_me 3.2.1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2831,7 +2839,7 @@ # Define the identity of the package. PACKAGE='evolution-mapi' - VERSION='3.2.0' + VERSION='3.2.1' cat >>confdefs.h <<_ACEOF @@ -13086,12 +13094,12 @@ pkg_cv_EVOLUTION_DATA_SERVER_CFLAGS="$EVOLUTION_DATA_SERVER_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evolution-data-server-\$EDS_PACKAGE >= 3.2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "evolution-data-server-$EDS_PACKAGE >= 3.2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evolution-data-server-\$EDS_PACKAGE >= 3.2.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "evolution-data-server-$EDS_PACKAGE >= 3.2.1") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EVOLUTION_DATA_SERVER_CFLAGS=`$PKG_CONFIG --cflags "evolution-data-server-$EDS_PACKAGE >= 3.2.0" 2>/dev/null` + pkg_cv_EVOLUTION_DATA_SERVER_CFLAGS=`$PKG_CONFIG --cflags "evolution-data-server-$EDS_PACKAGE >= 3.2.1" 2>/dev/null` else pkg_failed=yes fi @@ -13102,12 +13110,12 @@ pkg_cv_EVOLUTION_DATA_SERVER_LIBS="$EVOLUTION_DATA_SERVER_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evolution-data-server-\$EDS_PACKAGE >= 3.2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "evolution-data-server-$EDS_PACKAGE >= 3.2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evolution-data-server-\$EDS_PACKAGE >= 3.2.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "evolution-data-server-$EDS_PACKAGE >= 3.2.1") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EVOLUTION_DATA_SERVER_LIBS=`$PKG_CONFIG --libs "evolution-data-server-$EDS_PACKAGE >= 3.2.0" 2>/dev/null` + pkg_cv_EVOLUTION_DATA_SERVER_LIBS=`$PKG_CONFIG --libs "evolution-data-server-$EDS_PACKAGE >= 3.2.1" 2>/dev/null` else pkg_failed=yes fi @@ -13127,14 +13135,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EVOLUTION_DATA_SERVER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "evolution-data-server-$EDS_PACKAGE >= 3.2.0" 2>&1` + EVOLUTION_DATA_SERVER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "evolution-data-server-$EDS_PACKAGE >= 3.2.1" 2>&1` else - EVOLUTION_DATA_SERVER_PKG_ERRORS=`$PKG_CONFIG --print-errors "evolution-data-server-$EDS_PACKAGE >= 3.2.0" 2>&1` + EVOLUTION_DATA_SERVER_PKG_ERRORS=`$PKG_CONFIG --print-errors "evolution-data-server-$EDS_PACKAGE >= 3.2.1" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EVOLUTION_DATA_SERVER_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (evolution-data-server-$EDS_PACKAGE >= 3.2.0) were not met: + as_fn_error $? "Package requirements (evolution-data-server-$EDS_PACKAGE >= 3.2.1) were not met: $EVOLUTION_DATA_SERVER_PKG_ERRORS @@ -13177,12 +13185,12 @@ pkg_cv_LIBEDATASERVER_CFLAGS="$LIBEDATASERVER_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedataserver-\$EDS_PACKAGE >= 3.2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libedataserver-$EDS_PACKAGE >= 3.2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedataserver-\$EDS_PACKAGE >= 3.2.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libedataserver-$EDS_PACKAGE >= 3.2.1") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBEDATASERVER_CFLAGS=`$PKG_CONFIG --cflags "libedataserver-$EDS_PACKAGE >= 3.2.0" 2>/dev/null` + pkg_cv_LIBEDATASERVER_CFLAGS=`$PKG_CONFIG --cflags "libedataserver-$EDS_PACKAGE >= 3.2.1" 2>/dev/null` else pkg_failed=yes fi @@ -13193,12 +13201,12 @@ pkg_cv_LIBEDATASERVER_LIBS="$LIBEDATASERVER_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedataserver-\$EDS_PACKAGE >= 3.2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libedataserver-$EDS_PACKAGE >= 3.2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedataserver-\$EDS_PACKAGE >= 3.2.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libedataserver-$EDS_PACKAGE >= 3.2.1") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBEDATASERVER_LIBS=`$PKG_CONFIG --libs "libedataserver-$EDS_PACKAGE >= 3.2.0" 2>/dev/null` + pkg_cv_LIBEDATASERVER_LIBS=`$PKG_CONFIG --libs "libedataserver-$EDS_PACKAGE >= 3.2.1" 2>/dev/null` else pkg_failed=yes fi @@ -13218,14 +13226,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBEDATASERVER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libedataserver-$EDS_PACKAGE >= 3.2.0" 2>&1` + LIBEDATASERVER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libedataserver-$EDS_PACKAGE >= 3.2.1" 2>&1` else - LIBEDATASERVER_PKG_ERRORS=`$PKG_CONFIG --print-errors "libedataserver-$EDS_PACKAGE >= 3.2.0" 2>&1` + LIBEDATASERVER_PKG_ERRORS=`$PKG_CONFIG --print-errors "libedataserver-$EDS_PACKAGE >= 3.2.1" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBEDATASERVER_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libedataserver-$EDS_PACKAGE >= 3.2.0) were not met: + as_fn_error $? "Package requirements (libedataserver-$EDS_PACKAGE >= 3.2.1) were not met: $LIBEDATASERVER_PKG_ERRORS @@ -13268,12 +13276,12 @@ pkg_cv_LIBEBACKEND_CFLAGS="$LIBEBACKEND_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libebackend-\$EDS_PACKAGE >= 3.2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libebackend-$EDS_PACKAGE >= 3.2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libebackend-\$EDS_PACKAGE >= 3.2.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libebackend-$EDS_PACKAGE >= 3.2.1") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBEBACKEND_CFLAGS=`$PKG_CONFIG --cflags "libebackend-$EDS_PACKAGE >= 3.2.0" 2>/dev/null` + pkg_cv_LIBEBACKEND_CFLAGS=`$PKG_CONFIG --cflags "libebackend-$EDS_PACKAGE >= 3.2.1" 2>/dev/null` else pkg_failed=yes fi @@ -13284,12 +13292,12 @@ pkg_cv_LIBEBACKEND_LIBS="$LIBEBACKEND_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libebackend-\$EDS_PACKAGE >= 3.2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libebackend-$EDS_PACKAGE >= 3.2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libebackend-\$EDS_PACKAGE >= 3.2.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libebackend-$EDS_PACKAGE >= 3.2.1") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBEBACKEND_LIBS=`$PKG_CONFIG --libs "libebackend-$EDS_PACKAGE >= 3.2.0" 2>/dev/null` + pkg_cv_LIBEBACKEND_LIBS=`$PKG_CONFIG --libs "libebackend-$EDS_PACKAGE >= 3.2.1" 2>/dev/null` else pkg_failed=yes fi @@ -13309,14 +13317,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBEBACKEND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libebackend-$EDS_PACKAGE >= 3.2.0" 2>&1` + LIBEBACKEND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libebackend-$EDS_PACKAGE >= 3.2.1" 2>&1` else - LIBEBACKEND_PKG_ERRORS=`$PKG_CONFIG --print-errors "libebackend-$EDS_PACKAGE >= 3.2.0" 2>&1` + LIBEBACKEND_PKG_ERRORS=`$PKG_CONFIG --print-errors "libebackend-$EDS_PACKAGE >= 3.2.1" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBEBACKEND_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libebackend-$EDS_PACKAGE >= 3.2.0) were not met: + as_fn_error $? "Package requirements (libebackend-$EDS_PACKAGE >= 3.2.1) were not met: $LIBEBACKEND_PKG_ERRORS @@ -13359,12 +13367,12 @@ pkg_cv_LIBECAL_CFLAGS="$LIBECAL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libecal-\$EDS_PACKAGE >= 3.2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libecal-$EDS_PACKAGE >= 3.2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libecal-\$EDS_PACKAGE >= 3.2.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libecal-$EDS_PACKAGE >= 3.2.1") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBECAL_CFLAGS=`$PKG_CONFIG --cflags "libecal-$EDS_PACKAGE >= 3.2.0" 2>/dev/null` + pkg_cv_LIBECAL_CFLAGS=`$PKG_CONFIG --cflags "libecal-$EDS_PACKAGE >= 3.2.1" 2>/dev/null` else pkg_failed=yes fi @@ -13375,12 +13383,12 @@ pkg_cv_LIBECAL_LIBS="$LIBECAL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libecal-\$EDS_PACKAGE >= 3.2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libecal-$EDS_PACKAGE >= 3.2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libecal-\$EDS_PACKAGE >= 3.2.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libecal-$EDS_PACKAGE >= 3.2.1") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBECAL_LIBS=`$PKG_CONFIG --libs "libecal-$EDS_PACKAGE >= 3.2.0" 2>/dev/null` + pkg_cv_LIBECAL_LIBS=`$PKG_CONFIG --libs "libecal-$EDS_PACKAGE >= 3.2.1" 2>/dev/null` else pkg_failed=yes fi @@ -13400,14 +13408,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBECAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libecal-$EDS_PACKAGE >= 3.2.0" 2>&1` + LIBECAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libecal-$EDS_PACKAGE >= 3.2.1" 2>&1` else - LIBECAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "libecal-$EDS_PACKAGE >= 3.2.0" 2>&1` + LIBECAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "libecal-$EDS_PACKAGE >= 3.2.1" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBECAL_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libecal-$EDS_PACKAGE >= 3.2.0) were not met: + as_fn_error $? "Package requirements (libecal-$EDS_PACKAGE >= 3.2.1) were not met: $LIBECAL_PKG_ERRORS @@ -13450,12 +13458,12 @@ pkg_cv_LIBEDATACAL_CFLAGS="$LIBEDATACAL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedata-cal-\$EDS_PACKAGE >= 3.2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libedata-cal-$EDS_PACKAGE >= 3.2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedata-cal-\$EDS_PACKAGE >= 3.2.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libedata-cal-$EDS_PACKAGE >= 3.2.1") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBEDATACAL_CFLAGS=`$PKG_CONFIG --cflags "libedata-cal-$EDS_PACKAGE >= 3.2.0" 2>/dev/null` + pkg_cv_LIBEDATACAL_CFLAGS=`$PKG_CONFIG --cflags "libedata-cal-$EDS_PACKAGE >= 3.2.1" 2>/dev/null` else pkg_failed=yes fi @@ -13466,12 +13474,12 @@ pkg_cv_LIBEDATACAL_LIBS="$LIBEDATACAL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedata-cal-\$EDS_PACKAGE >= 3.2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libedata-cal-$EDS_PACKAGE >= 3.2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedata-cal-\$EDS_PACKAGE >= 3.2.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libedata-cal-$EDS_PACKAGE >= 3.2.1") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBEDATACAL_LIBS=`$PKG_CONFIG --libs "libedata-cal-$EDS_PACKAGE >= 3.2.0" 2>/dev/null` + pkg_cv_LIBEDATACAL_LIBS=`$PKG_CONFIG --libs "libedata-cal-$EDS_PACKAGE >= 3.2.1" 2>/dev/null` else pkg_failed=yes fi @@ -13491,14 +13499,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBEDATACAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libedata-cal-$EDS_PACKAGE >= 3.2.0" 2>&1` + LIBEDATACAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libedata-cal-$EDS_PACKAGE >= 3.2.1" 2>&1` else - LIBEDATACAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "libedata-cal-$EDS_PACKAGE >= 3.2.0" 2>&1` + LIBEDATACAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "libedata-cal-$EDS_PACKAGE >= 3.2.1" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBEDATACAL_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libedata-cal-$EDS_PACKAGE >= 3.2.0) were not met: + as_fn_error $? "Package requirements (libedata-cal-$EDS_PACKAGE >= 3.2.1) were not met: $LIBEDATACAL_PKG_ERRORS @@ -13541,12 +13549,12 @@ pkg_cv_LIBBOOK_CFLAGS="$LIBBOOK_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libebook-\$EDS_PACKAGE >= 3.2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libebook-$EDS_PACKAGE >= 3.2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libebook-\$EDS_PACKAGE >= 3.2.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libebook-$EDS_PACKAGE >= 3.2.1") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBBOOK_CFLAGS=`$PKG_CONFIG --cflags "libebook-$EDS_PACKAGE >= 3.2.0" 2>/dev/null` + pkg_cv_LIBBOOK_CFLAGS=`$PKG_CONFIG --cflags "libebook-$EDS_PACKAGE >= 3.2.1" 2>/dev/null` else pkg_failed=yes fi @@ -13557,12 +13565,12 @@ pkg_cv_LIBBOOK_LIBS="$LIBBOOK_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libebook-\$EDS_PACKAGE >= 3.2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libebook-$EDS_PACKAGE >= 3.2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libebook-\$EDS_PACKAGE >= 3.2.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libebook-$EDS_PACKAGE >= 3.2.1") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBBOOK_LIBS=`$PKG_CONFIG --libs "libebook-$EDS_PACKAGE >= 3.2.0" 2>/dev/null` + pkg_cv_LIBBOOK_LIBS=`$PKG_CONFIG --libs "libebook-$EDS_PACKAGE >= 3.2.1" 2>/dev/null` else pkg_failed=yes fi @@ -13582,14 +13590,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBBOOK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libebook-$EDS_PACKAGE >= 3.2.0" 2>&1` + LIBBOOK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libebook-$EDS_PACKAGE >= 3.2.1" 2>&1` else - LIBBOOK_PKG_ERRORS=`$PKG_CONFIG --print-errors "libebook-$EDS_PACKAGE >= 3.2.0" 2>&1` + LIBBOOK_PKG_ERRORS=`$PKG_CONFIG --print-errors "libebook-$EDS_PACKAGE >= 3.2.1" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBBOOK_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libebook-$EDS_PACKAGE >= 3.2.0) were not met: + as_fn_error $? "Package requirements (libebook-$EDS_PACKAGE >= 3.2.1) were not met: $LIBBOOK_PKG_ERRORS @@ -13632,12 +13640,12 @@ pkg_cv_LIBEDATABOOK_CFLAGS="$LIBEDATABOOK_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedata-book-\$EDS_PACKAGE >= 3.2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libedata-book-$EDS_PACKAGE >= 3.2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedata-book-\$EDS_PACKAGE >= 3.2.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libedata-book-$EDS_PACKAGE >= 3.2.1") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBEDATABOOK_CFLAGS=`$PKG_CONFIG --cflags "libedata-book-$EDS_PACKAGE >= 3.2.0" 2>/dev/null` + pkg_cv_LIBEDATABOOK_CFLAGS=`$PKG_CONFIG --cflags "libedata-book-$EDS_PACKAGE >= 3.2.1" 2>/dev/null` else pkg_failed=yes fi @@ -13648,12 +13656,12 @@ pkg_cv_LIBEDATABOOK_LIBS="$LIBEDATABOOK_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedata-book-\$EDS_PACKAGE >= 3.2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libedata-book-$EDS_PACKAGE >= 3.2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedata-book-\$EDS_PACKAGE >= 3.2.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libedata-book-$EDS_PACKAGE >= 3.2.1") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBEDATABOOK_LIBS=`$PKG_CONFIG --libs "libedata-book-$EDS_PACKAGE >= 3.2.0" 2>/dev/null` + pkg_cv_LIBEDATABOOK_LIBS=`$PKG_CONFIG --libs "libedata-book-$EDS_PACKAGE >= 3.2.1" 2>/dev/null` else pkg_failed=yes fi @@ -13673,14 +13681,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBEDATABOOK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libedata-book-$EDS_PACKAGE >= 3.2.0" 2>&1` + LIBEDATABOOK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libedata-book-$EDS_PACKAGE >= 3.2.1" 2>&1` else - LIBEDATABOOK_PKG_ERRORS=`$PKG_CONFIG --print-errors "libedata-book-$EDS_PACKAGE >= 3.2.0" 2>&1` + LIBEDATABOOK_PKG_ERRORS=`$PKG_CONFIG --print-errors "libedata-book-$EDS_PACKAGE >= 3.2.1" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBEDATABOOK_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libedata-book-$EDS_PACKAGE >= 3.2.0) were not met: + as_fn_error $? "Package requirements (libedata-book-$EDS_PACKAGE >= 3.2.1) were not met: $LIBEDATABOOK_PKG_ERRORS @@ -13723,12 +13731,12 @@ pkg_cv_CAMEL_CFLAGS="$CAMEL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"camel-provider-\$EDS_PACKAGE >= 3.2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "camel-provider-$EDS_PACKAGE >= 3.2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"camel-provider-\$EDS_PACKAGE >= 3.2.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "camel-provider-$EDS_PACKAGE >= 3.2.1") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_CAMEL_CFLAGS=`$PKG_CONFIG --cflags "camel-provider-$EDS_PACKAGE >= 3.2.0" 2>/dev/null` + pkg_cv_CAMEL_CFLAGS=`$PKG_CONFIG --cflags "camel-provider-$EDS_PACKAGE >= 3.2.1" 2>/dev/null` else pkg_failed=yes fi @@ -13739,12 +13747,12 @@ pkg_cv_CAMEL_LIBS="$CAMEL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"camel-provider-\$EDS_PACKAGE >= 3.2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "camel-provider-$EDS_PACKAGE >= 3.2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"camel-provider-\$EDS_PACKAGE >= 3.2.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "camel-provider-$EDS_PACKAGE >= 3.2.1") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_CAMEL_LIBS=`$PKG_CONFIG --libs "camel-provider-$EDS_PACKAGE >= 3.2.0" 2>/dev/null` + pkg_cv_CAMEL_LIBS=`$PKG_CONFIG --libs "camel-provider-$EDS_PACKAGE >= 3.2.1" 2>/dev/null` else pkg_failed=yes fi @@ -13764,14 +13772,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - CAMEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "camel-provider-$EDS_PACKAGE >= 3.2.0" 2>&1` + CAMEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "camel-provider-$EDS_PACKAGE >= 3.2.1" 2>&1` else - CAMEL_PKG_ERRORS=`$PKG_CONFIG --print-errors "camel-provider-$EDS_PACKAGE >= 3.2.0" 2>&1` + CAMEL_PKG_ERRORS=`$PKG_CONFIG --print-errors "camel-provider-$EDS_PACKAGE >= 3.2.1" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$CAMEL_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (camel-provider-$EDS_PACKAGE >= 3.2.0) were not met: + as_fn_error $? "Package requirements (camel-provider-$EDS_PACKAGE >= 3.2.1) were not met: $CAMEL_PKG_ERRORS @@ -13815,12 +13823,12 @@ pkg_cv_EVOLUTION_PLUGIN_CFLAGS="$EVOLUTION_PLUGIN_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evolution-plugin-3.0 >= 3.2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "evolution-plugin-3.0 >= 3.2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evolution-plugin-3.0 >= 3.2.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "evolution-plugin-3.0 >= 3.2.1") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-3.0 >= 3.2.0" 2>/dev/null` + pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-3.0 >= 3.2.1" 2>/dev/null` else pkg_failed=yes fi @@ -13831,12 +13839,12 @@ pkg_cv_EVOLUTION_PLUGIN_LIBS="$EVOLUTION_PLUGIN_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evolution-plugin-3.0 >= 3.2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "evolution-plugin-3.0 >= 3.2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evolution-plugin-3.0 >= 3.2.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "evolution-plugin-3.0 >= 3.2.1") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-3.0 >= 3.2.0" 2>/dev/null` + pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-3.0 >= 3.2.1" 2>/dev/null` else pkg_failed=yes fi @@ -13856,14 +13864,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "evolution-plugin-3.0 >= 3.2.0" 2>&1` + EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "evolution-plugin-3.0 >= 3.2.1" 2>&1` else - EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "evolution-plugin-3.0 >= 3.2.0" 2>&1` + EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "evolution-plugin-3.0 >= 3.2.1" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EVOLUTION_PLUGIN_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (evolution-plugin-3.0 >= 3.2.0) were not met: + as_fn_error $? "Package requirements (evolution-plugin-3.0 >= 3.2.1) were not met: $EVOLUTION_PLUGIN_PKG_ERRORS @@ -14003,10 +14011,10 @@ API_VERSION=$EDS_PACKAGE -EDS_REQUIRED=3.2.0 +EDS_REQUIRED=3.2.1 -EVO_REQUIRED=3.2.0 +EVO_REQUIRED=3.2.1 LIBMAPI_REQUIRED=0.11 @@ -14038,6 +14046,7 @@ + # Extract the first word of "gtkdoc-check", so it can be a program name with args. set dummy gtkdoc-check; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -14195,6 +14204,99 @@ else as_fn_error $? "You need to have gtk-doc >= 1.9 installed to build $PACKAGE_NAME" "$LINENO" 5 fi + if test "x$PACKAGE_NAME" != "xglib"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5 +$as_echo_n "checking for GTKDOC_DEPS... " >&6; } + +if test -n "$GTKDOC_DEPS_CFLAGS"; then + pkg_cv_GTKDOC_DEPS_CFLAGS="$GTKDOC_DEPS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTKDOC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GTKDOC_DEPS_LIBS"; then + pkg_cv_GTKDOC_DEPS_LIBS="$GTKDOC_DEPS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +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 + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + else + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0) were not met: + +$GTKDOC_DEPS_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 GTKDOC_DEPS_CFLAGS +and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 + +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_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 GTKDOC_DEPS_CFLAGS +and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } + +else + GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS + GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 @@ -14828,7 +14930,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by evolution-mapi $as_me 3.2.0, which was +This file was extended by evolution-mapi $as_me 3.2.1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14894,7 +14996,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -evolution-mapi config.status 3.2.0 +evolution-mapi config.status 3.2.1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -Nru evolution-mapi-3.2.0/configure.ac evolution-mapi-3.2.1/configure.ac --- evolution-mapi-3.2.0/configure.ac 2011-09-20 06:18:52.000000000 +0000 +++ evolution-mapi-3.2.1/configure.ac 2011-09-26 05:45:43.000000000 +0000 @@ -2,7 +2,7 @@ dnl Written by Julien Kerihuel dnl Modified for GNOME Evolution MAPI Provider by Johnny Jacob -m4_define([ema_version], [3.2.0]) +m4_define([ema_version], [3.2.1]) AC_PREREQ(2.58) AC_INIT([evolution-mapi], [ema_version], [http://bugzilla.gnome.org/browse.cgi?product=evolution-mapi]) diff -Nru evolution-mapi-3.2.0/debian/changelog evolution-mapi-3.2.1/debian/changelog --- evolution-mapi-3.2.0/debian/changelog 2011-09-27 17:29:10.000000000 +0000 +++ evolution-mapi-3.2.1/debian/changelog 2012-01-11 08:53:55.000000000 +0000 @@ -1,109 +1,45 @@ -evolution-mapi (3.2.0-0ubuntu1) oneiric; urgency=low +evolution-mapi (3.2.1-3) unstable; urgency=low - * New upstream release. - * debian/control: - - bump evo/eds Build-Depends to 3.2.0. - - bump Depends for evolution and eds packages to >= 3.2, << 3.3. - * debian/rules: Update DEB_DH_MAKESHLIBS_ARGS_libexchangemapi-1.0-0 to match - with the new upstream version. - - -- Mathieu Trudel-Lapierre Tue, 27 Sep 2011 13:29:08 -0400 - -evolution-mapi (3.1.91-0ubuntu1) oneiric; urgency=low - - * New upstream release. - * debian/control: bump evo/eds Build-Depends to 3.1.91. - - -- Mathieu Trudel-Lapierre Thu, 08 Sep 2011 13:11:24 -0400 - -evolution-mapi (3.1.5-0ubuntu1) oneiric; urgency=low - - * Update watch file. - * New upstream release. - + Fixes FTBFS with newer versions of evolution and OpenChange. LP: #740642 - + Fixes listing folders with Exchange 2010. LP: #653489 - + No longer discards remote recipients if there are local - recipients in an email message. LP: #744880 - + Handles emails with empty body. LP: #808692 - * Bump standards version to 3.9.2 (no changes). - - -- Jelmer Vernooij Fri, 19 Aug 2011 01:05:08 +0200 - -evolution-mapi (3.0.2-0ubuntu1) oneiric; urgency=low - - * New upstream release 3.0.2. - * debian/control: - - Bump evolution, e-d-s Build-Depends to 3.0.2. - - Now Build-Depends on libgtk-3-dev (>= 3.0.0). - - Have evolution-mapi Depends on evolution 3.0. - - Update Depends for libexchangemapi-1.0-dev to match the evolution and - e-d-s versions. - - Drop using autoreconf.mk. - * debian/patches/01_openchange_compat: dropped, applied upstream. - * debian/patches/02_recurring_events: dropped, applied upstream. - * debian/evolution-mapi.install: drop -1.2 from the evolution-data-server - paths. - * debian/rules: Update DEB_DH_MAKESHLIBS_ARGS_libexchangemapi-1.0-0 to match - with the new version numbering for evolution-mapi. - * debian/watch: update debian watch to match new versioning scheme. - - -- Mathieu Trudel-Lapierre Tue, 31 May 2011 16:59:29 -0400 + * Upload to unstable. -evolution-mapi (0.32.2-0ubuntu1) natty; urgency=low + -- Jelmer Vernooij Wed, 11 Jan 2012 09:53:08 +0100 - * New upstream release. - - Bug #633121 - Fetch also Content-class message header (Milan Crha) - - Bug #634062 - Crash when missing ESource property "public" (Milan Crha) - - Bug #635078 - Do not write unicode markers in UTF16 strings (Milan Crha) - - Bug #636854 - Ensure GAL contacts has filled UID (Milan Crha) +evolution-mapi (3.2.1-2) experimental; urgency=low - -- Mathieu Trudel-Lapierre Thu, 31 Mar 2011 10:00:44 -0400 + * Fix shlibdep args of libexchangemapi. Closes: #649080 -evolution-mapi (0.32.1-0ubuntu2) natty; urgency=low + -- Jelmer Vernooij Wed, 23 Nov 2011 02:34:52 +0100 - * Add patch 02_recurring_events: fix recurring events not showing from - Exchange 2007. LP: #513394 - * Add 'Enhances: evolution' for evolution-mapi. +evolution-mapi (3.2.1-1) experimental; urgency=low - -- Jelmer Vernooij Sat, 12 Feb 2011 00:49:53 +0100 + [ Jelmer Vernooij ] + * Add Enhances: evolution for evolution-mapi. -evolution-mapi (0.32.1-0ubuntu1) natty; urgency=low + [ Yves-Alexis Perez ] + * New upstream release + * debian/watch updated. + * debian/control: + - (build-)dependencies updated for evolution 2.32. + * debian/patches: + - drop new-openchange. + [ Jelmer Vernooij ] * New upstream release. - * Update watch file for 0.32. - * 01_openchange_compat: Add patch to fix compatibility with current - OpenChange. - * Fix library dependencies. LP: #693573 + + Fixes FTBFS against newer versions of Evolution and OpenChange. + Closes: #615018, #639175 + + No longer overrides process-wide encoding. Closes: #607621 + * debian/control: + - (build-)dependencies updated for evolution 3.1.4. + - (build-)dependencies updated for openchange 0.11. + - Bump standards version to 3.9.2 (no other changes required). - -- Jelmer Vernooij Tue, 01 Feb 2011 13:07:04 +0100 + -- Jelmer Vernooij Fri, 11 Nov 2011 17:25:43 +0100 -evolution-mapi (0.32.0-0ubuntu1) natty; urgency=low +evolution-mapi (0.30.3-2) unstable; urgency=low - * New upstream release. - - Evolution forgets password on any error (LP: #245589) (LP: #272414) - * debian/control: update Depends/Build-Depends for evolution packages - * debian/patches/newer-openchange.patch: dropped, included upstream. - * debian/control: add a missing explicit Build-Depends for libgtk2.0-dev. - - -- Mathieu Trudel-Lapierre Wed, 03 Nov 2010 16:33:05 -0400 - -evolution-mapi (0.30.3-1ubuntu1) maverick; urgency=low - - * Merge from debian to get a working evolution-mapi with evolution 2.30 - in maverick, remaining changes: (LP: #616294) - - debian/control: - transitional packages from libexchangemapi1.0-0 to libexchangemap-1.0-0 - and libexchangemapi1.0-dev to libexchangemapi-1.0-dev - * New version fixing: - - crash in mapi_sync_deleted (Milan Crha) (LP: #456651) - - Sending mail fails for cluster setup (Bharath Acharya) (LP: #361993) - - Store sent messages in Sent Items, not Outbox (Milan Crha) (LP: #561794) - - Crashed with SIGSEGV in get_SPropValue (Milan Crha) (LP: #510527) - - To field is not shown in sent item folder (Johnny Jacob) (LP: #574994) - - Evolution Core Dumps when creating a MAPI account (Milan Crha) - (LP: #338982, #340532, #355045) + * Upload to unstable. Closes: #590817 - -- Didier Roche Tue, 14 Sep 2010 20:50:55 +0200 + -- Jelmer Vernooij Tue, 28 Sep 2010 16:38:34 +0200 evolution-mapi (0.30.3-1) experimental; urgency=low diff -Nru evolution-mapi-3.2.0/debian/control evolution-mapi-3.2.1/debian/control --- evolution-mapi-3.2.0/debian/control 2011-09-27 17:28:51.000000000 +0000 +++ evolution-mapi-3.2.1/debian/control 2012-01-11 08:53:55.000000000 +0000 @@ -1,8 +1,7 @@ Source: evolution-mapi Section: gnome Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Evolution Maintainers +Maintainer: Debian Evolution Maintainers Uploaders: Heikki Henriksen , Lawrence Walton , Loic Minier , @@ -19,28 +18,26 @@ cdbs (>= 0.4.37), intltool (>= 0.35.5), pkg-config, - evolution-data-server-dev (>= 3.2.0), - libedataserver1.2-dev (>= 3.2.0), - libedataserverui-3.0-dev (>= 3.2.0), - libebackend1.2-dev (>= 3.2.0), - libecal1.2-dev (>= 3.2.0), - libedata-cal1.2-dev (>= 3.2.0), - libebook1.2-dev (>= 3.2.0), - libedata-book1.2-dev (>= 3.2.0), - libcamel1.2-dev (>= 3.2.0), + evolution-data-server-dev (>= 3.2.1), + libcamel1.2-dev (>= 3.2.1), + libebackend1.2-dev (>= 3.2.1), + libecal1.2-dev (>= 3.2.1), + libedata-book1.2-dev (>= 3.2.1), + libedata-cal1.2-dev (>= 3.2.1), + libedataserverui-3.0-dev (>= 3.2.1), + libgconf2-dev (>= 2.0.0), libglib2.0-dev (>= 2.16.1), libgtk-3-dev (>= 2.99.2), - evolution-dev (>= 3.2.0), + evolution-dev (>= 3.2.1), libmapi-dev (>= 1:0.11), - samba4-dev (>= 4.0.0~alpha17~), - gtk-doc-tools (>= 1.9), - dh-autoreconf + samba4-dev (>= 4.0.0~alpha17.dfsg1), + gtk-doc-tools (>= 1.9) Package: evolution-mapi Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - evolution (>= 3.2), + evolution (>= 3.2.1), evolution (<< 3.3) Enhances: evolution Description: Exchange support for the Evolution groupware suite @@ -57,32 +54,20 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: libexchangemapi1.0-0 (<< 0.30.3-1~) -Conflicts: libexchangemapi1.0-0 (<< 0.30.3-1~) Description: client library for accessing Exchange servers - runtime libexchangemapi helps accessing Microsoft Exchange servers using the proprietary MAPI protocol. It is based on Openchange, and used by the Evolution MAPI provider. -Package: libexchangemapi1.0-0 -Depends: libexchangemapi-1.0-0, ${misc:Depends} -Architecture: all -Section: oldlibs -Description: transitional dummy package for exchangemapi - This package ensures a clean upgrade path, and can be safely removed after - the upgrade. - Package: libexchangemapi-1.0-dev Section: libdevel -Architecture: any +Architecture: any Depends: ${misc:Depends}, libexchangemapi-1.0-0 (= ${binary:Version}), - evolution-data-server-dev (>= 3.2), - evolution-data-server-dev (<< 3.3), - evolution-dev (>= 3.2.0), + evolution-data-server-dev (>= 3.2.1), + evolution-dev (>= 3.2.1), + evolution-dev (<< 3.3), libmapi-dev (>= 1:0.11) -Replaces: libexchangemapi1.0-dev (<< 0.30.3-1~) -Conflicts: libexchangemapi1.0-dev (<< 0.30.3-1~) Description: client library for accessing Exchange servers - development libexchangemapi helps accessing Microsoft Exchange servers using the proprietary MAPI protocol. It is based on Openchange, and used by the @@ -91,14 +76,6 @@ This package contains headers and static library files for using libexchangemapi. -Package: libexchangemapi1.0-dev -Depends: libexchangemapi-1.0-dev, ${misc:Depends} -Architecture: all -Section: oldlibs -Description: transitional dummy package for exchangemapi - dev files - This package ensures a clean upgrade path, and can be safely removed after - the upgrade. - Package: evolution-mapi-dbg Section: debug Priority: extra diff -Nru evolution-mapi-3.2.0/debian/rules evolution-mapi-3.2.1/debian/rules --- evolution-mapi-3.2.0/debian/rules 2011-09-27 17:28:56.000000000 +0000 +++ evolution-mapi-3.2.1/debian/rules 2012-01-11 08:53:55.000000000 +0000 @@ -5,4 +5,4 @@ DEB_DH_INSTALL_ARGS += --list-missing DEB_DH_MAKESHLIBS_ARGS_evolution-mapi += --no-act -DEB_DH_MAKESHLIBS_ARGS_libexchangemapi-1.0-0 += -V 'libexchangemapi-1.0-0 (>= 3.2), libexchangemapi-1.0-0 (<< 3.3)' +DEB_DH_MAKESHLIBS_ARGS_libexchangemapi-1.0-0 += -V 'libexchangemapi-1.0-0 (>= 3.2.1), libexchangemapi-1.0-0 (<< 3.3)' diff -Nru evolution-mapi-3.2.0/debian/watch evolution-mapi-3.2.1/debian/watch --- evolution-mapi-3.2.0/debian/watch 2011-09-27 15:12:41.000000000 +0000 +++ evolution-mapi-3.2.1/debian/watch 2012-01-11 08:53:55.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -http://ftp.gnome.org/pub/GNOME/sources/evolution-mapi/([\d\.]+\d+)/evolution-mapi-([\d\.]+)\.tar\.bz2 +http://ftp.gnome.org/pub/GNOME/sources/evolution-mapi/3.2/evolution-mapi-([\d\.]+)\.tar\.bz2 diff -Nru evolution-mapi-3.2.0/Makefile.in evolution-mapi-3.2.1/Makefile.in --- evolution-mapi-3.2.0/Makefile.in 2011-09-26 05:27:58.000000000 +0000 +++ evolution-mapi-3.2.1/Makefile.in 2011-10-17 06:13:16.000000000 +0000 @@ -154,6 +154,8 @@ GNOME_PLATFORM_LIBS = @GNOME_PLATFORM_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ diff -Nru evolution-mapi-3.2.0/NEWS evolution-mapi-3.2.1/NEWS --- evolution-mapi-3.2.0/NEWS 2011-09-26 05:27:32.000000000 +0000 +++ evolution-mapi-3.2.1/NEWS 2011-10-17 06:12:29.000000000 +0000 @@ -1,3 +1,11 @@ +evolution-mapi 3.2.1 2011-10-17 +------------------------------- + +Translations: + Gabor Kelemen (hu) + Daniel Nylander (sv) + Pavol Klačanský (sk) + evolution-mapi 3.2.0 2011-09-26 ------------------------------- diff -Nru evolution-mapi-3.2.0/po/hu.po evolution-mapi-3.2.1/po/hu.po --- evolution-mapi-3.2.0/po/hu.po 2011-05-30 05:54:45.000000000 +0000 +++ evolution-mapi-3.2.1/po/hu.po 2011-09-26 10:55:52.000000000 +0000 @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: evolution-mapi master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-29 00:25+0200\n" -"PO-Revision-Date: 2011-05-29 00:25+0200\n" +"POT-Creation-Date: 2011-09-26 12:22+0200\n" +"PO-Revision-Date: 2011-09-26 12:25+0200\n" "Last-Translator: Gabor Kelemen \n" -"Language-Team: Hungarian \n" +"Language-Team: Hungarian \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,13 +19,13 @@ "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/account-setup-eplugin/exchange-mapi-account-listener.c:735 -#: ../src/account-setup-eplugin/exchange-mapi-account-listener.c:737 +#: ../src/account-setup-eplugin/exchange-mapi-account-listener.c:791 +#: ../src/account-setup-eplugin/exchange-mapi-account-listener.c:793 msgid "Global Address List" msgstr "Globális címlista" -#: ../src/account-setup-eplugin/exchange-mapi-account-listener.c:1122 -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:235 +#: ../src/account-setup-eplugin/exchange-mapi-account-listener.c:1193 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:257 #, c-format msgid "Enter Password for %s@%s" msgstr "Adja meg %s@%s jelszavát" @@ -34,25 +34,33 @@ #. using GtkEntryCompletion in the username gtkentry. But plugins #. as of now does not have access to it #. TODO : Fix strings -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:134 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:175 msgid "Select username" msgstr "Válasszon felhasználónevet" -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:144 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:185 msgid "Full name" msgstr "Teljes név" -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:149 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:190 msgid "Username" msgstr "Felhasználónév" -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:204 -#: ../src/camel/camel-mapi-store.c:1043 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:222 +msgid "" +"There are more users with similar user name on a server.\n" +"Please select that you would like to use from the below list." +msgstr "" +"Több felhasználó van a kiszolgálón hasonló felhasználónévvel.\n" +"Válassza ki a lenti listából a használni kívántat." + +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:275 +#: ../src/camel/camel-mapi-store.c:1054 #, c-format msgid "Cannot create MAPI folders in offline mode." msgstr "Nem lehet MAPI mappákat létrehozni offline módban." -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:223 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:301 msgid "" "Server, username and domain name cannot be empty. Please fill them with " "correct values." @@ -60,51 +68,67 @@ "A kiszolgáló, felhasználónév és tartomány nem lehet üres. Töltse ki ezeket " "helyes értékekkel." -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:279 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:305 +msgid "" +"Realm name cannot be empty when kerberos is selected. Please fill them with " +"correct values." +msgstr "" +"A tartomány nem lehet üres Kerberos kiválasztásakor. Töltse ki ezeket " +"helyes értékekkel." + +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:350 msgid "Authentication finished successfully." msgstr "A hitelesítés sikeres." -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:285 -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:296 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:356 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:365 msgid "Authentication failed." msgstr "A hitelesítés meghiúsult." -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:374 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:405 msgid "_Domain name:" msgstr "_Tartománynév:" -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:384 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:417 msgid "_Authenticate" msgstr "_Hitelesítés" -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:394 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:426 msgid "_Use secure connection" msgstr "Bi_ztonságos kapcsolat használata" -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:529 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:440 +msgid "_Kerberos authentication" +msgstr "_Kerberos hitelesítés" + +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:451 +msgid "_Realm name:" +msgstr "_Tartománynév:" + +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:605 msgid "Personal Folders" msgstr "Személyes mappák" -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:664 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:742 msgid "_Location:" msgstr "He_ly:" -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:781 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:861 #, c-format msgid "Failed to create address book '%s': %s" msgstr "A(z) „%s” címjegyzék létrehozása meghiúsult: %s" -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:784 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:864 #, c-format msgid "Failed to create address book '%s'" msgstr "A(z) „%s” címjegyzék létrehozása meghiúsult" -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:891 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:977 #, c-format msgid "Failed to create calendar '%s': %s" msgstr "A(z) „%s” naptár létrehozása meghiúsult: %s" -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:894 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:980 #, c-format msgid "Failed to create calendar '%s'" msgstr "A(z) „%s” naptár létrehozása meghiúsult" @@ -122,7 +146,7 @@ msgstr "A mappaméret-információk nem kérhetők le" #: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:168 -#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:371 +#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:374 msgid "Folder Size" msgstr "Mappa mérete" @@ -131,64 +155,63 @@ msgstr "Mappalista letöltése…" #. Miscellaneous settings -#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:356 +#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:359 msgid "Miscellaneous" msgstr "Egyebek" -#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:369 +#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:372 msgid "View the size of all Exchange folders" msgstr "Az összes Exchange mappa méretének megjelenítése" -#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:382 +#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:385 #: ../src/account-setup-eplugin/org-gnome-exchange-mapi.eplug.xml.h:1 msgid "Exchange Settings" msgstr "Exchange beállításai" -#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:391 +#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:394 msgid "Folder size" msgstr "Mappaméret" -#: ../src/addressbook/e-book-backend-mapi.c:565 +#: ../src/addressbook/e-book-backend-mapi.c:431 msgid "Cannot connect" msgstr "Nem lehet csatlakozni" -#: ../src/addressbook/e-book-backend-mapi.c:688 +#: ../src/addressbook/e-book-backend-mapi.c:733 msgid "Searching" msgstr "Keresés" -#: ../src/addressbook/e-book-backend-mapi.c:1923 +#: ../src/addressbook/e-book-backend-mapi.c:1974 #: ../src/calendar/e-cal-backend-mapi.c:129 -#: ../src/camel/camel-mapi-folder.c:1759 ../src/camel/camel-mapi-folder.c:1780 +#: ../src/camel/camel-mapi-folder.c:1764 ../src/camel/camel-mapi-folder.c:1785 msgid "Unknown error" msgstr "Ismeretlen hiba" -#: ../src/addressbook/e-book-backend-mapi-contacts.c:706 +#: ../src/addressbook/e-book-backend-mapi-contacts.c:713 #: ../src/calendar/e-cal-backend-mapi.c:277 msgid "Failed to remove public folder" msgstr "A nyilvános mappa eltávolítása meghiúsult" -#: ../src/addressbook/e-book-backend-mapi-contacts.c:763 -#: ../src/calendar/e-cal-backend-mapi.c:1807 -#: ../src/calendar/e-cal-backend-mapi.c:2341 +#: ../src/addressbook/e-book-backend-mapi-contacts.c:770 +#: ../src/calendar/e-cal-backend-mapi.c:1653 +#: ../src/calendar/e-cal-backend-mapi.c:2191 msgid "Failed to create item on a server" msgstr "Nem sikerült létrehozni az elemet a kiszolgálón" -#: ../src/addressbook/e-book-backend-mapi-contacts.c:889 -#: ../src/calendar/e-cal-backend-mapi.c:2038 +#: ../src/addressbook/e-book-backend-mapi-contacts.c:896 +#: ../src/calendar/e-cal-backend-mapi.c:1884 msgid "Failed to modify item on a server" msgstr "Nem sikerült módosítani az elemet a kiszolgálón" -#: ../src/addressbook/e-book-backend-mapi-contacts.c:1036 -#: ../src/addressbook/e-book-backend-mapi-contacts.c:1102 -#: ../src/addressbook/e-book-backend-mapi-contacts.c:1153 -#: ../src/calendar/e-cal-backend-mapi.c:1290 -#: ../src/calendar/e-cal-backend-mapi.c:1311 +#: ../src/addressbook/e-book-backend-mapi-contacts.c:1043 +#: ../src/addressbook/e-book-backend-mapi-contacts.c:1109 +#: ../src/addressbook/e-book-backend-mapi-contacts.c:1160 +#: ../src/calendar/e-cal-backend-mapi.c:1131 msgid "Failed to fetch items from a server" msgstr "Nem sikerült letölteni az elemeket a kiszolgálóról." #. Translators : This is used to cache the downloaded contacts from a server. #. %d is an index of the contact. -#: ../src/addressbook/e-book-backend-mapi-contacts.c:1054 +#: ../src/addressbook/e-book-backend-mapi-contacts.c:1061 #, c-format msgid "Caching contact %d" msgstr "%d. névjegy gyorsítótárazása" @@ -196,14 +219,14 @@ #. Translators : This is used to cache the downloaded contacts from a server. #. The first %d is an index of the contact, #. the second %d is total count of conacts on the server. -#: ../src/addressbook/e-book-backend-mapi-contacts.c:1058 +#: ../src/addressbook/e-book-backend-mapi-contacts.c:1065 #, c-format msgid "Caching contact %d/%d" msgstr "%d/%d névjegy gyorsítótárazása" #. Translators : This is used to cache the downloaded contacts from GAL. #. %d is an index of the GAL entry. -#: ../src/addressbook/e-book-backend-mapi-gal.c:159 +#: ../src/addressbook/e-book-backend-mapi-gal.c:157 #, c-format msgid "Caching GAL contact %d" msgstr "%d. GAL-névjegy gyorsítótárazása" @@ -211,13 +234,13 @@ #. Translators : This is used to cache the downloaded contacts from GAL. #. The first %d is an index of the GAL entry, #. the second %d is total count of entries in GAL. -#: ../src/addressbook/e-book-backend-mapi-gal.c:163 +#: ../src/addressbook/e-book-backend-mapi-gal.c:161 #, c-format msgid "Caching GAL contact %d/%d" msgstr "%d/%d GAL-névjegy gyorsítótárazása" -#: ../src/addressbook/e-book-backend-mapi-gal.c:213 -#: ../src/addressbook/e-book-backend-mapi-gal.c:261 +#: ../src/addressbook/e-book-backend-mapi-gal.c:211 +#: ../src/addressbook/e-book-backend-mapi-gal.c:259 msgid "Failed to fetch GAL entries" msgstr "A GAL-bejegyzések letöltése meghiúsult" @@ -227,33 +250,29 @@ msgid "Loading items in folder %s" msgstr "Elemek letöltése a(z) %s mappába" -#: ../src/calendar/e-cal-backend-mapi.c:765 -#: ../src/calendar/e-cal-backend-mapi.c:791 -#: ../src/calendar/e-cal-backend-mapi.c:838 -#: ../src/calendar/e-cal-backend-mapi.c:917 -#: ../src/calendar/e-cal-backend-mapi.c:940 +#: ../src/calendar/e-cal-backend-mapi.c:663 +#: ../src/calendar/e-cal-backend-mapi.c:707 +#: ../src/calendar/e-cal-backend-mapi.c:784 #, c-format msgid "Failed to fetch changes from a server: %s" msgstr "Nem sikerült letölteni a változásokat a kiszolgálóról: %s" -#: ../src/calendar/e-cal-backend-mapi.c:770 -#: ../src/calendar/e-cal-backend-mapi.c:796 -#: ../src/calendar/e-cal-backend-mapi.c:843 -#: ../src/calendar/e-cal-backend-mapi.c:922 -#: ../src/calendar/e-cal-backend-mapi.c:945 +#: ../src/calendar/e-cal-backend-mapi.c:668 +#: ../src/calendar/e-cal-backend-mapi.c:712 +#: ../src/calendar/e-cal-backend-mapi.c:789 msgid "Failed to fetch changes from a server" msgstr "Nem sikerült letölteni a változásokat a kiszolgálóról" -#: ../src/calendar/e-cal-backend-mapi.c:1401 +#: ../src/calendar/e-cal-backend-mapi.c:1219 msgid "Could not create thread for populating cache" msgstr "Nem sikerült létrehozni szálat a gyorsítótárfájl megtöltéséhez" -#: ../src/calendar/e-cal-backend-mapi.c:1459 -#: ../src/calendar/e-cal-backend-mapi.c:1460 +#: ../src/calendar/e-cal-backend-mapi.c:1327 +#: ../src/calendar/e-cal-backend-mapi.c:1328 msgid "Could not create cache file" msgstr "Nem lehet létrehozni a gyorsítótár fájlt" -#: ../src/calendar/e-cal-backend-mapi.c:1932 +#: ../src/calendar/e-cal-backend-mapi.c:1778 msgid "" "Support for modifying single instances of a recurring appointment is not yet " "implemented. No change was made to the appointment on the server." @@ -261,7 +280,7 @@ "Ismétlődő értekezlet egyedi példányainak módosítása még nem támogatott. Az " "értekezlet nem módosult a kiszolgálón." -#: ../src/calendar/e-cal-backend-mapi.c:2595 +#: ../src/calendar/e-cal-backend-mapi.c:2445 msgid "Failed to get Free/Busy data" msgstr "Nem sikerült lekérni a szabad/elfoglalt adatokat" @@ -286,60 +305,60 @@ msgid "Fetching summary information for new messages in %s" msgstr "Összefoglaló adatok letöltése az új levelekhez ebben: %s" -#: ../src/camel/camel-mapi-folder.c:858 ../src/camel/camel-mapi-folder.c:1371 -#: ../src/camel/camel-mapi-folder.c:1381 +#: ../src/camel/camel-mapi-folder.c:856 ../src/camel/camel-mapi-folder.c:1370 +#: ../src/camel/camel-mapi-folder.c:1380 #, c-format msgid "This message is not available in offline mode." msgstr "Ez az üzenet nem érhető el kapcsolat nélküli módban." -#: ../src/camel/camel-mapi-folder.c:875 +#: ../src/camel/camel-mapi-folder.c:873 #, c-format msgid "Fetching items failed: %s" msgstr "Az elemek letöltése meghiúsult: %s" -#: ../src/camel/camel-mapi-folder.c:880 +#: ../src/camel/camel-mapi-folder.c:878 msgid "Fetching items failed" msgstr "Az elemek letöltése meghiúsult" -#: ../src/camel/camel-mapi-folder.c:1087 +#: ../src/camel/camel-mapi-folder.c:1085 #, c-format msgid "Cannot append message to folder '%s'" msgstr "Nem fűzhető az üzenet a következő mappához: „%s”" -#: ../src/camel/camel-mapi-folder.c:1095 ../src/camel/camel-mapi-folder.c:1146 +#: ../src/camel/camel-mapi-folder.c:1093 ../src/camel/camel-mapi-folder.c:1144 #, c-format msgid "Offline." msgstr "Kapcsolat nélkül." -#: ../src/camel/camel-mapi-folder.c:1226 +#: ../src/camel/camel-mapi-folder.c:1224 #, c-format msgid "Failed to empty Trash: %s" msgstr "Nem sikerült a Kukát üríteni: %s" -#: ../src/camel/camel-mapi-folder.c:1231 +#: ../src/camel/camel-mapi-folder.c:1229 msgid "Failed to empty Trash" msgstr "Nem sikerült a Kukát üríteni" -#: ../src/camel/camel-mapi-folder.c:1331 +#: ../src/camel/camel-mapi-folder.c:1329 #, c-format msgid "Cannot get message %s: %s" msgstr "Nem sikerült betölteni a levelet: %s: %s" -#: ../src/camel/camel-mapi-folder.c:1332 +#: ../src/camel/camel-mapi-folder.c:1330 msgid "No such message" msgstr "Nincs ilyen üzenet" -#: ../src/camel/camel-mapi-folder.c:1407 +#: ../src/camel/camel-mapi-folder.c:1406 #, c-format msgid "Could not get message: %s" msgstr "Nem sikerült az üzenetet letölteni: %s" -#: ../src/camel/camel-mapi-folder.c:1413 ../src/camel/camel-mapi-folder.c:1426 +#: ../src/camel/camel-mapi-folder.c:1412 ../src/camel/camel-mapi-folder.c:1425 #, c-format msgid "Could not get message" msgstr "Nem sikerült az üzenetet letölteni" -#: ../src/camel/camel-mapi-folder.c:1874 +#: ../src/camel/camel-mapi-folder.c:1891 #, c-format msgid "Could not load summary for %s" msgstr "Nem sikerült betölteni %s összefoglalóját" @@ -376,8 +395,8 @@ msgstr "Levélszemét keresése _csak a Beérkezett üzenetek mappában" #: ../src/camel/camel-mapi-provider.c:70 -msgid "For accessing Microsoft Exchange/OpenChange servers using MAPI" -msgstr "Microsoft Exchange/OpenChange kiszolgálók elérése MAPI használatával" +msgid "For accessing Microsoft Exchange 2007/OpenChange servers via MAPI" +msgstr "Microsoft Exchange 2007/OpenChange kiszolgálók elérése MAPI használatával" #: ../src/camel/camel-mapi-provider.c:85 msgid "Password" @@ -389,73 +408,73 @@ "Ez a lehetőség az OpenChange kiszolgálóhoz egyszerű szöveges jelszóval " "csatlakozik." -#: ../src/camel/camel-mapi-store.c:397 +#: ../src/camel/camel-mapi-store.c:403 #, c-format msgid "Folder list not available in offline mode." msgstr "A mappalista nem érhető el kapcsolat nélküli módban." -#: ../src/camel/camel-mapi-store.c:1050 +#: ../src/camel/camel-mapi-store.c:1061 #, c-format msgid "Cannot create new folder '%s'" msgstr "Nem hozható létre az új „%s” mappa" -#: ../src/camel/camel-mapi-store.c:1064 +#: ../src/camel/camel-mapi-store.c:1075 #, c-format msgid "Authentication failed" msgstr "Hitelesítés sikertelen" -#: ../src/camel/camel-mapi-store.c:1090 +#: ../src/camel/camel-mapi-store.c:1101 #, c-format msgid "Cannot create folder '%s': %s" msgstr "Nem lehet létrehozni a(z) „%s” mappát: %s" -#: ../src/camel/camel-mapi-store.c:1095 +#: ../src/camel/camel-mapi-store.c:1106 #, c-format msgid "Cannot create folder '%s'" msgstr "Nem lehet létrehozni a(z) „%s” mappát" -#: ../src/camel/camel-mapi-store.c:1152 +#: ../src/camel/camel-mapi-store.c:1163 #, c-format msgid "Cannot remove folder '%s': %s" msgstr "Nem távolítható el a(z) „%s” mappa: %s" -#: ../src/camel/camel-mapi-store.c:1159 +#: ../src/camel/camel-mapi-store.c:1170 #, c-format msgid "Cannot remove folder '%s'" msgstr "Nem távolítható el a(z) „%s” mappa" -#: ../src/camel/camel-mapi-store.c:1209 +#: ../src/camel/camel-mapi-store.c:1220 #, c-format msgid "Cannot rename MAPI folder '%s'. Folder does not exist." msgstr "Nem nevezhető át a(z) „%s” MAPI mappa. A mappa nem létezik." -#: ../src/camel/camel-mapi-store.c:1221 +#: ../src/camel/camel-mapi-store.c:1232 #, c-format msgid "Cannot rename MAPI default folder '%s' to '%s'." msgstr "Nem nevezhető át az alapértelmezett „%s” MAPI mappa erre: „%s”." #. Translators: '%s to %s' is current name of the folder and new name of the folder. -#: ../src/camel/camel-mapi-store.c:1248 ../src/camel/camel-mapi-store.c:1273 -#: ../src/camel/camel-mapi-store.c:1335 +#: ../src/camel/camel-mapi-store.c:1259 ../src/camel/camel-mapi-store.c:1284 +#: ../src/camel/camel-mapi-store.c:1346 #, c-format msgid "Cannot rename MAPI folder '%s' to '%s'" msgstr "Nem nevezhető át a(z) „%s” MAPI mappa erre: „%s”" #. Translators: '%s to %s' is current name of the folder and new name of the folder. #. The last '%s' is a detailed error message. -#: ../src/camel/camel-mapi-store.c:1266 ../src/camel/camel-mapi-store.c:1329 +#: ../src/camel/camel-mapi-store.c:1277 ../src/camel/camel-mapi-store.c:1340 #, c-format msgid "Cannot rename MAPI folder '%s' to '%s': %s" msgstr "Nem nevezhető át a(z) „%s” MAPI mappa erre: „%s”: %s" -#: ../src/camel/camel-mapi-store.c:1425 +#: ../src/camel/camel-mapi-store.c:1460 #, c-format msgid "Folder '%s' not found" msgstr "A(z) „%s” mappa nem található" #. Translators: The %s is replaced with a server's host name -#: ../src/camel/camel-mapi-store.c:1630 -#: ../src/camel/camel-mapi-transport.c:150 +#: ../src/camel/camel-mapi-store.c:1685 +#: ../src/camel/camel-mapi-transport.c:154 #, c-format msgid "Exchange MAPI server %s" msgstr "Exchange MAPI kiszolgáló %s" @@ -463,8 +482,8 @@ #. To translators : Example string : Exchange MAPI service for #. _username_ on _server host name__ #. Translators: The first %s is replaced with a user name, the second with a server's host name -#: ../src/camel/camel-mapi-store.c:1634 -#: ../src/camel/camel-mapi-transport.c:153 +#: ../src/camel/camel-mapi-store.c:1689 +#: ../src/camel/camel-mapi-transport.c:157 #, c-format msgid "Exchange MAPI service for %s on %s" msgstr "Exchange MAPI szolgáltatás %s számára ezen: %s" @@ -473,50 +492,50 @@ #. for prompting the user if it is available. #. Second %s is : Username. #. Third %s is : Server host name. -#: ../src/camel/camel-mapi-store.c:1672 +#: ../src/camel/camel-mapi-store.c:1710 #, c-format msgid "%s Please enter the MAPI password for %s@%s" msgstr "%s Adja meg %s@%s MAPI jelszavát" -#: ../src/camel/camel-mapi-store.c:1687 +#: ../src/camel/camel-mapi-store.c:1719 #, c-format msgid "You did not enter a password." msgstr "Nem adott meg jelszót." -#: ../src/camel/camel-mapi-store.c:1695 +#: ../src/camel/camel-mapi-store.c:1779 #, c-format msgid "Unable to authenticate to Exchange MAPI server: %s" msgstr "Nem lehet bejelentkezni az Exchange MAPI kiszolgálóra: %s" -#: ../src/camel/camel-mapi-store.c:1698 +#: ../src/camel/camel-mapi-store.c:1782 msgid "Unable to authenticate to Exchange MAPI server" msgstr "Nem lehet bejelentkezni az Exchange MAPI kiszolgálóra" -#: ../src/camel/camel-mapi-transport.c:112 -#: ../src/camel/camel-mapi-transport.c:133 +#: ../src/camel/camel-mapi-transport.c:116 +#: ../src/camel/camel-mapi-transport.c:137 #, c-format msgid "Could not send message." msgstr "Az üzenet nem küldhető el." -#: ../src/camel/camel-mapi-transport.c:128 +#: ../src/camel/camel-mapi-transport.c:132 #, c-format msgid "Could not send message: %s" msgstr "Nem sikerült elküldeni a levelet: %s" #. Translators: This is a meeting response prefix which will be shown in a message Subject -#: ../src/libexchangemapi/exchange-mapi-cal-utils.c:1838 +#: ../src/libexchangemapi/exchange-mapi-cal-utils.c:1856 msgctxt "MeetingResp" msgid "Accepted:" msgstr "Elfogadva:" #. Translators: This is a meeting response prefix which will be shown in a message Subject -#: ../src/libexchangemapi/exchange-mapi-cal-utils.c:1842 +#: ../src/libexchangemapi/exchange-mapi-cal-utils.c:1860 msgctxt "MeetingResp" msgid "Tentative:" msgstr "Feltételes:" #. Translators: This is a meeting response prefix which will be shown in a message Subject -#: ../src/libexchangemapi/exchange-mapi-cal-utils.c:1846 +#: ../src/libexchangemapi/exchange-mapi-cal-utils.c:1864 msgctxt "MeetingResp" msgid "Declined:" msgstr "Elutasítva:" @@ -583,7 +602,13 @@ msgid "%s: %s" msgstr "%s: %s" -#: ../src/libexchangemapi/exchange-mapi-connection.c:3461 +#. Translators: %s is replaced with an email address which was found ambiguous on a remote server +#: ../src/libexchangemapi/exchange-mapi-connection.c:861 +#, c-format +msgid "Recipient '%s' is ambiguous" +msgstr "A(z) „%s” címzett nem egyértelmű" + +#: ../src/libexchangemapi/exchange-mapi-connection.c:3477 msgid "All Public Folders" msgstr "Minden nyilvános mappa" diff -Nru evolution-mapi-3.2.0/po/sk.po evolution-mapi-3.2.1/po/sk.po --- evolution-mapi-3.2.0/po/sk.po 2011-02-15 14:47:30.000000000 +0000 +++ evolution-mapi-3.2.1/po/sk.po 2011-10-17 06:06:57.000000000 +0000 @@ -1,90 +1,281 @@ -# Slovak translation of evolution-mapi. -# Copyright (C) 2009 Free Software Foundation, Inc. +# Slovak translation for evolution-mapi. +# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc. # This file is distributed under the same license as the evolution-mapi package. -# Marcel Telka , 2009. +# Marcel Telka , 2009, 2010. +# Pavol Klacansky , 2011. # msgid "" msgstr "" "Project-Id-Version: evolution-mapi\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=evolution-mapi\n" -"POT-Creation-Date: 2009-05-27 04:58+0000\n" -"PO-Revision-Date: 2009-05-30 22:12+0200\n" -"Last-Translator: Marcel Telka \n" +"product=evolution-mapi&keywords=I18N+L10N\n" +"POT-Creation-Date: 2011-10-07 12:16+0000\n" +"PO-Revision-Date: 2011-10-16 22:10+0200\n" +"Last-Translator: Pavol Klacansky \n" "Language-Team: Slovak \n" +"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" -#: ../src/account-setup-eplugin/exchange-mapi-account-listener.c:592 -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:119 +#: ../src/account-setup-eplugin/exchange-mapi-account-listener.c:791 +#: ../src/account-setup-eplugin/exchange-mapi-account-listener.c:793 +msgid "Global Address List" +msgstr "Globálny zoznam adries" + +#: ../src/account-setup-eplugin/exchange-mapi-account-listener.c:1193 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:257 #, c-format msgid "Enter Password for %s@%s" msgstr "Zadajte heslo pre %s@%s" -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:109 +#. NOTE: A good way would be display the list of username entries +#. using GtkEntryCompletion in the username gtkentry. But plugins +#. as of now does not have access to it +#. TODO : Fix strings +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:175 +msgid "Select username" +msgstr "Vybrať používateľské meno" + +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:185 +msgid "Full name" +msgstr "Celé meno" + +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:190 +msgid "Username" +msgstr "Používateľské meno" + +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:222 +msgid "" +"There are more users with similar user name on a server.\n" +"Please select that you would like to use from the below list." +msgstr "" +"Na serveri existuje viac používateľov s podobným menom.\n" +"Prosím, vyberte si z nasledujúceho zoznamu to, ktoré chcete použiť." + +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:275 +#: ../src/camel/camel-mapi-store.c:1034 +#, c-format +msgid "Cannot create MAPI folders in offline mode." +msgstr "Nepodarilo sa vytvoriť priečinky MAPI v odpojenom režime." + +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:301 msgid "" "Server, username and domain name cannot be empty. Please fill them with " "correct values." msgstr "" -"Server, meno používateľa a názov domény nemôžu byť prázdne. Prosím, vyplňte " -"ich správnymi hodnotami." +"Server, používateľské meno a názov domény nemôžu byť prázdne. Prosím, " +"vyplňte ich správnymi hodnotami." + +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:305 +msgid "" +"Realm name cannot be empty when kerberos is selected. Please fill them with " +"correct values." +msgstr "" +"Názov domény nemôže byť prázdny, keď je zvolený protokol kerberos. Prosím, " +"vyplňte ho správnymi hodnotami." -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:143 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:350 msgid "Authentication finished successfully." msgstr "Overenie totožnosti skončilo úspešne." -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:149 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:356 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:365 msgid "Authentication failed." msgstr "Overenie totožnosti zlyhalo." -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:211 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:405 msgid "_Domain name:" msgstr "Názov _domény:" -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:221 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:417 msgid "_Authenticate" msgstr "_Overiť totožnosť" -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:323 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:426 +msgid "_Use secure connection" +msgstr "_Použiť zabezpečené spojenie" + +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:440 +msgid "_Kerberos authentication" +msgstr "Overenie totožnosti pomocou _Kerberos" + +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:451 +msgid "_Realm name:" +msgstr "Názov _domény:" + +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:605 msgid "Personal Folders" msgstr "Osobné priečinky" -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:386 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:742 msgid "_Location:" msgstr "_Umiestnenie:" -#: ../src/calendar/e-cal-backend-mapi.c:115 -#: ../src/calendar/e-cal-backend-mapi.c:1053 -#: ../src/camel/camel-mapi-store.c:457 -msgid "Authentication failed" -msgstr "Overenie totožnosti zlyhalo" +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:861 +#, c-format +msgid "Failed to create address book '%s': %s" +msgstr "Zlyhalo vytvorenie adresára kontaktov „%s“: %s" + +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:864 +#, c-format +msgid "Failed to create address book '%s'" +msgstr "Zlyhalo vytvorenie adresára kontaktov „%s“" + +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:977 +#, c-format +msgid "Failed to create calendar '%s': %s" +msgstr "Zlyhalo vytvorenie kalendára „%s“: %s" + +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:980 +#, c-format +msgid "Failed to create calendar '%s'" +msgstr "Zlyhalo vytvorenie kalendára „%s“" + +#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:100 +msgid "Folder" +msgstr "Priečinok" + +#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:105 +msgid "Size" +msgstr "Veľkosť" + +#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:128 +msgid "Unable to retrieve folder size information" +msgstr "Nepodarilo sa získať informácie o veľkosti priečinka" + +#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:168 +#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:374 +msgid "Folder Size" +msgstr "Veľkosť priečinka" + +#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:179 +msgid "Fetching folder list…" +msgstr "Získava sa zoznam priečinkov…" + +#. Miscellaneous settings +#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:359 +msgid "Miscellaneous" +msgstr "Rôzne" + +#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:372 +msgid "View the size of all Exchange folders" +msgstr "Zobraziť veľkosť všetkých priečinkov Exchange" + +#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:385 +#: ../src/account-setup-eplugin/org-gnome-exchange-mapi.eplug.xml.h:1 +msgid "Exchange Settings" +msgstr "Nastavenia Exchange" + +#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:394 +msgid "Folder size" +msgstr "Veľkosť priečinka" + +#: ../src/addressbook/e-book-backend-mapi.c:431 +msgid "Cannot connect" +msgstr "Nedá sa pripojiť" + +#: ../src/addressbook/e-book-backend-mapi.c:733 +msgid "Searching" +msgstr "Hľadá sa" + +#: ../src/addressbook/e-book-backend-mapi.c:1974 +#: ../src/calendar/e-cal-backend-mapi.c:129 +#: ../src/camel/camel-mapi-folder.c:1764 ../src/camel/camel-mapi-folder.c:1785 +msgid "Unknown error" +msgstr "Neznáma chyba" + +#: ../src/addressbook/e-book-backend-mapi-contacts.c:713 +#: ../src/calendar/e-cal-backend-mapi.c:277 +msgid "Failed to remove public folder" +msgstr "Zlyhalo odstránenie verejného priečinka" + +#: ../src/addressbook/e-book-backend-mapi-contacts.c:770 +#: ../src/calendar/e-cal-backend-mapi.c:1653 +#: ../src/calendar/e-cal-backend-mapi.c:2191 +msgid "Failed to create item on a server" +msgstr "Zlyhalo vytvorenie položky na serveri." + +#: ../src/addressbook/e-book-backend-mapi-contacts.c:896 +#: ../src/calendar/e-cal-backend-mapi.c:1884 +msgid "Failed to modify item on a server" +msgstr "Zlyhalo upravenie položky na serveri" + +#: ../src/addressbook/e-book-backend-mapi-contacts.c:1043 +#: ../src/addressbook/e-book-backend-mapi-contacts.c:1109 +#: ../src/addressbook/e-book-backend-mapi-contacts.c:1160 +#: ../src/calendar/e-cal-backend-mapi.c:1131 +msgid "Failed to fetch items from a server" +msgstr "Zlyhalo získavanie položiek zo servera" + +#. Translators : This is used to cache the downloaded contacts from a server. +#. %d is an index of the contact. +#: ../src/addressbook/e-book-backend-mapi-contacts.c:1061 +#, c-format +msgid "Caching contact %d" +msgstr "Kontakt %d sa načítava do vyrovnávacej pamäte" + +#. Translators : This is used to cache the downloaded contacts from a server. +#. The first %d is an index of the contact, +#. the second %d is total count of conacts on the server. +#: ../src/addressbook/e-book-backend-mapi-contacts.c:1065 +#, c-format +msgid "Caching contact %d/%d" +msgstr "Kontakt %d z %d sa načítava do vyrovnávacej pamäte" + +# PK: nevim ci to neni moc dlhe a GAL = global address list takze to tez nevim +# PM: dal by som Kontak zoznamu / kontakt GAL zoznamu - nechám na paľa +# PŠ: nedarí sa mi to uspokojivo zladiť s tým %d :-( +#. Translators : This is used to cache the downloaded contacts from GAL. +#. %d is an index of the GAL entry. +#: ../src/addressbook/e-book-backend-mapi-gal.c:157 +#, c-format +msgid "Caching GAL contact %d" +msgstr "GAL kontakt %d sa načítava do vyrovnávacej pamäte" + +#. Translators : This is used to cache the downloaded contacts from GAL. +#. The first %d is an index of the GAL entry, +#. the second %d is total count of entries in GAL. +#: ../src/addressbook/e-book-backend-mapi-gal.c:161 +#, c-format +msgid "Caching GAL contact %d/%d" +msgstr "GAL kontakt %d z %d sa načítava do vyrovnávacej pamäte" + +#: ../src/addressbook/e-book-backend-mapi-gal.c:211 +#: ../src/addressbook/e-book-backend-mapi-gal.c:259 +msgid "Failed to fetch GAL entries" +msgstr "Zlyhalo získanie GAL položiek" #. To translators: This message is displayed on the status bar when calendar/tasks/memo items are being fetched from the server. -#: ../src/calendar/e-cal-backend-mapi.c:391 +#: ../src/calendar/e-cal-backend-mapi.c:343 #, c-format msgid "Loading items in folder %s" -msgstr "Načítavanie položiek v priečinku %s" +msgstr "Načítavajú sa položky v priečinku %s" -#. FIXME: String : We need to restart evolution-data-server -#: ../src/calendar/e-cal-backend-mapi.c:581 -#: ../src/calendar/e-cal-backend-mapi.c:592 -#: ../src/calendar/e-cal-backend-mapi.c:618 -msgid "Error fetching changes from the server." -msgstr "Chyba pri získavaní zmien zo servera." - -#: ../src/calendar/e-cal-backend-mapi.c:973 -#: ../src/calendar/e-cal-backend-mapi.c:983 -#: ../src/calendar/e-cal-backend-mapi.c:1088 -#: ../src/calendar/e-cal-backend-mapi.c:1170 -msgid "Could not create cache file" -msgstr "Nebolo možné vytvoriť súbor cache" +#: ../src/calendar/e-cal-backend-mapi.c:663 +#: ../src/calendar/e-cal-backend-mapi.c:707 +#: ../src/calendar/e-cal-backend-mapi.c:784 +#, c-format +msgid "Failed to fetch changes from a server: %s" +msgstr "Zlyhalo získanie zmien zo servera: %s" + +#: ../src/calendar/e-cal-backend-mapi.c:668 +#: ../src/calendar/e-cal-backend-mapi.c:712 +#: ../src/calendar/e-cal-backend-mapi.c:789 +msgid "Failed to fetch changes from a server" +msgstr "Zlyhalo získanie zmien zo servera" -#: ../src/calendar/e-cal-backend-mapi.c:1099 +#: ../src/calendar/e-cal-backend-mapi.c:1219 msgid "Could not create thread for populating cache" -msgstr "Nebolo možné vytvoriť vlákno pre naplnenie cache" +msgstr "Nepodarilo sa vytvoriť vlákno pre naplnenie vyrovnávacej pamäte" + +#: ../src/calendar/e-cal-backend-mapi.c:1327 +#: ../src/calendar/e-cal-backend-mapi.c:1328 +msgid "Could not create cache file" +msgstr "Nepodarilo sa vytvoriť súbor vyrovnávacej pamäte" -#: ../src/calendar/e-cal-backend-mapi.c:1513 +#: ../src/calendar/e-cal-backend-mapi.c:1778 msgid "" "Support for modifying single instances of a recurring appointment is not yet " "implemented. No change was made to the appointment on the server." @@ -92,109 +283,211 @@ "Podpora pre úpravu jednotlivých inštancií opakujúceho sa stretnutia nie je " "ešte implementovaná. Na serveri nebola vykonaná žiadna zmena v stretnutí." -#: ../src/camel/camel-mapi-folder.c:349 ../src/camel/camel-mapi-folder.c:745 +#: ../src/calendar/e-cal-backend-mapi.c:2445 +msgid "Failed to get Free/Busy data" +msgstr "Zlyhalo získavanie údajov diára" + +#: ../src/camel/camel-mapi-folder.c:344 +#, c-format +msgid "Updating local summary cache for new messages in %s" +msgstr "" +"Aktualizuje sa miestna vyrovnávacia pamäť súhrnných informácií o nových " +"správach v %s" + +#: ../src/camel/camel-mapi-folder.c:578 +#, c-format +msgid "Retrieving message IDs from server for %s" +msgstr "Získavajú sa identifikátory správ zo servera pre %s" + +#: ../src/camel/camel-mapi-folder.c:609 +#, c-format +msgid "Removing deleted messages from cache in %s" +msgstr "Odstraňujú sa vymazané správy z vyrovnávacej pamäte v %s" + +#. TODO : Check for online state +#: ../src/camel/camel-mapi-folder.c:732 #, c-format msgid "Fetching summary information for new messages in %s" -msgstr "Získavanie súhrnných informácií o nových správach v %s" +msgstr "Získavajú sa súhrnné informácie o nových správach v %s" -#: ../src/camel/camel-mapi-folder.c:738 ../src/camel/camel-mapi-folder.c:1335 -#: ../src/camel/camel-mapi-folder.c:1343 +#: ../src/camel/camel-mapi-folder.c:856 ../src/camel/camel-mapi-folder.c:1370 +#: ../src/camel/camel-mapi-folder.c:1380 +#, c-format msgid "This message is not available in offline mode." -msgstr "Táto správa nie je dostupná v off-line režime." +msgstr "Táto správa nie je dostupná v odpojenom režime." -#: ../src/camel/camel-mapi-folder.c:755 +#: ../src/camel/camel-mapi-folder.c:873 +#, c-format +msgid "Fetching items failed: %s" +msgstr "Získavanie položiek zlyhalo: %s" + +#: ../src/camel/camel-mapi-folder.c:878 msgid "Fetching items failed" msgstr "Získavanie položiek zlyhalo" -#: ../src/camel/camel-mapi-folder.c:1299 +#: ../src/camel/camel-mapi-folder.c:1085 #, c-format -msgid "" -"Cannot get message: %s\n" -" %s" -msgstr "" -"Nie je možné dostať správu: %s\n" -" %s" +msgid "Cannot append message to folder '%s'" +msgstr "Nedá sa pridať správu do priečinka „%s“" -#: ../src/camel/camel-mapi-folder.c:1299 -msgid "No such message" -msgstr "Taká správa neexistuje" +#: ../src/camel/camel-mapi-folder.c:1093 ../src/camel/camel-mapi-folder.c:1144 +#, c-format +msgid "Offline." +msgstr "Odpojený." + +#: ../src/camel/camel-mapi-folder.c:1224 +#, c-format +msgid "Failed to empty Trash: %s" +msgstr "Zlyhalo vyprázdnenie Koša: %s" -#: ../src/camel/camel-mapi-folder.c:1311 -msgid "Message fetching cancelled by user." -msgstr "Získavanie správ zrušené používateľom." +#: ../src/camel/camel-mapi-folder.c:1229 +msgid "Failed to empty Trash" +msgstr "Zlyhalo vyprázdnenie Koša" -#: ../src/camel/camel-mapi-folder.c:1318 +#: ../src/camel/camel-mapi-folder.c:1329 #, c-format msgid "Cannot get message %s: %s" -msgstr "Nie je možné dostať správu %s: %s" +msgstr "Nie je možné získať správu %s: %s" + +#: ../src/camel/camel-mapi-folder.c:1330 +msgid "No such message" +msgstr "Taká správa neexistuje" -#: ../src/camel/camel-mapi-folder.c:1364 ../src/camel/camel-mapi-folder.c:1374 +#: ../src/camel/camel-mapi-folder.c:1406 +#, c-format +msgid "Could not get message: %s" +msgstr "Nepodarilo sa získať správu: %s" + +#: ../src/camel/camel-mapi-folder.c:1412 ../src/camel/camel-mapi-folder.c:1425 +#, c-format msgid "Could not get message" -msgstr "Nebolo možné dostať správu" +msgstr "Nepodarilo sa získať správu" -#: ../src/camel/camel-mapi-folder.c:1735 +#: ../src/camel/camel-mapi-folder.c:1891 #, c-format msgid "Could not load summary for %s" -msgstr "Nebolo možné načítať súhrn pre %s" +msgstr "Nepodarilo sa načítať súhrn pre %s" -#: ../src/camel/camel-mapi-provider.c:51 +#: ../src/camel/camel-mapi-provider.c:44 msgid "Checking for new mail" -msgstr "Kontrola novej pošty" +msgstr "Kontroluje sa nová pošta" -#: ../src/camel/camel-mapi-provider.c:53 +#: ../src/camel/camel-mapi-provider.c:46 msgid "C_heck for new messages in all folders" -msgstr "_Kontrolovať nové správy vo všetkých priečinkoch" +msgstr "S_kontrolovať nové správy vo všetkých priečinkoch" -#: ../src/camel/camel-mapi-provider.c:71 +#: ../src/camel/camel-mapi-provider.c:50 msgid "Options" msgstr "Voľby" -#: ../src/camel/camel-mapi-provider.c:73 +#: ../src/camel/camel-mapi-provider.c:52 msgid "Automatically synchroni_ze account locally" msgstr "Automaticky synchroni_zovať účet lokálne" #. i18n: copy from evolution:camel-imap-provider.c -#: ../src/camel/camel-mapi-provider.c:76 +#: ../src/camel/camel-mapi-provider.c:55 msgid "_Apply filters to new messages in Inbox on this server" msgstr "_Aplikovať filtre na nové správy v Doručenej pošte na tomto serveri" -#: ../src/camel/camel-mapi-provider.c:78 +#: ../src/camel/camel-mapi-provider.c:57 msgid "Check new messages for _Junk contents" -msgstr "Kontrolovať nové správy, či neobsahujú _haraburdie" +msgstr "Skontrolovať nové správy, či neobsahujú _nevyžiadanú poštu" -#: ../src/camel/camel-mapi-provider.c:80 +#: ../src/camel/camel-mapi-provider.c:59 msgid "Only check for Junk messag_es in the Inbox folder" -msgstr "Kontrolovať haraburdi_e v správach len v priečinku Doručená pošta" +msgstr "" +"Kontrolovať nevyžiad_anú poštu v správach iba v priečinku Doručená pošta" -#: ../src/camel/camel-mapi-provider.c:92 -msgid "For accessing Microsoft Exchange / OpenChange servers using MAPI" -msgstr "Pre prístup k Microsoft Exchange / OpenChange servery pomocou MAPI" +#: ../src/camel/camel-mapi-provider.c:70 +msgid "For accessing Microsoft Exchange 2007/OpenChange servers via MAPI" +msgstr "Na prístup k Microsoft Exchange 2007/OpenChange serverom pomocou MAPI" -#: ../src/camel/camel-mapi-provider.c:107 +#: ../src/camel/camel-mapi-provider.c:85 msgid "Password" msgstr "Heslo" -#: ../src/camel/camel-mapi-provider.c:108 +#: ../src/camel/camel-mapi-provider.c:86 msgid "" -"This option will connect to the Openchange server using a plaintext password." -msgstr "Táto voľba pripojí k Openchange serveru pomocou nezašifrovaného hesla." +"This option will connect to the OpenChange server using a plaintext password." +msgstr "" +"Táto voľba vás pripojí k OpenChange serveru pomocou nezašifrovaného hesla." + +#: ../src/camel/camel-mapi-store.c:403 +#, c-format +msgid "Folder list not available in offline mode." +msgstr "Zoznam priečinkov je nedostupný v odpojenom režime." -#: ../src/camel/camel-mapi-store.c:61 -msgid "Favorites" -msgstr "Obľúbené" +#: ../src/camel/camel-mapi-store.c:1041 +#, c-format +msgid "Cannot create new folder '%s'" +msgstr "Nedá sa vytvoriť nový priečinok „%s“" -#: ../src/camel/camel-mapi-store.c:62 -msgid "All Public Folders" -msgstr "Všetky verejné priečinky" +#: ../src/camel/camel-mapi-store.c:1055 +#, c-format +msgid "Authentication failed" +msgstr "Overenie totožnosti zlyhalo" + +#: ../src/camel/camel-mapi-store.c:1081 +#, c-format +msgid "Cannot create folder '%s': %s" +msgstr "Nedá sa vytvoriť nový priečinok „%s“: %s" + +#: ../src/camel/camel-mapi-store.c:1086 +#, c-format +msgid "Cannot create folder '%s'" +msgstr "Nedá sa vytvoriť priečinok „%s“" + +#: ../src/camel/camel-mapi-store.c:1143 +#, c-format +msgid "Cannot remove folder '%s': %s" +msgstr "Nedá sa odstrániť priečinok „%s“: %s" + +#: ../src/camel/camel-mapi-store.c:1150 +#, c-format +msgid "Cannot remove folder '%s'" +msgstr "Nedá sa odstrániť priečinok „%s“" + +#: ../src/camel/camel-mapi-store.c:1200 +#, c-format +msgid "Cannot rename MAPI folder '%s'. Folder does not exist." +msgstr "Nedá sa premenovať MAPI priečinok „%s“. Priečinok neexistuje." + +#: ../src/camel/camel-mapi-store.c:1212 +#, c-format +msgid "Cannot rename MAPI default folder '%s' to '%s'." +msgstr "Nedá sa premenovať predvolený MAPI priečinok „%s“ na „%s“." + +#. Translators: '%s to %s' is current name of the folder and new name of the folder. +#: ../src/camel/camel-mapi-store.c:1239 ../src/camel/camel-mapi-store.c:1264 +#: ../src/camel/camel-mapi-store.c:1326 +#, c-format +msgid "Cannot rename MAPI folder '%s' to '%s'" +msgstr "Nedá sa premenovať MAPI priečinok „%s“ na „%s“." + +#. Translators: '%s to %s' is current name of the folder and new name of the folder. +#. The last '%s' is a detailed error message. +#: ../src/camel/camel-mapi-store.c:1257 ../src/camel/camel-mapi-store.c:1320 +#, c-format +msgid "Cannot rename MAPI folder '%s' to '%s': %s" +msgstr "Nedá sa premenovať MAPI priečinok „%s“ na „%s“: %s" + +#: ../src/camel/camel-mapi-store.c:1440 +#, c-format +msgid "Folder '%s' not found" +msgstr "Priečinok „%s“ nebol nájdený" -#: ../src/camel/camel-mapi-store.c:262 ../src/camel/camel-mapi-transport.c:347 +#. Translators: The %s is replaced with a server's host name +#: ../src/camel/camel-mapi-store.c:1634 +#: ../src/camel/camel-mapi-transport.c:154 #, c-format msgid "Exchange MAPI server %s" msgstr "Server Exchange MAPI %s" #. To translators : Example string : Exchange MAPI service for #. _username_ on _server host name__ -#: ../src/camel/camel-mapi-store.c:266 ../src/camel/camel-mapi-transport.c:349 +#. Translators: The first %s is replaced with a user name, the second with a server's host name +#: ../src/camel/camel-mapi-store.c:1638 +#: ../src/camel/camel-mapi-transport.c:157 #, c-format msgid "Exchange MAPI service for %s on %s" msgstr "Služba Exchange MAPI pre používateľa %s na serveri %s" @@ -203,49 +496,127 @@ #. for prompting the user if it is available. #. Second %s is : Username. #. Third %s is : Server host name. -#: ../src/camel/camel-mapi-store.c:304 +#: ../src/camel/camel-mapi-store.c:1659 #, c-format msgid "%s Please enter the MAPI password for %s@%s" msgstr "%s Prosím, zadajte heslo MAPI pre %s@%s" -#: ../src/camel/camel-mapi-store.c:317 +#: ../src/camel/camel-mapi-store.c:1668 +#, c-format msgid "You did not enter a password." msgstr "Nezadali ste heslo." -#: ../src/camel/camel-mapi-store.c:325 +#: ../src/camel/camel-mapi-store.c:1728 #, c-format -msgid "Unable to authenticate to Exchange MAPI server." -msgstr "Nepodarilo sa overiť totožnosť na serveri Exchange MAPI." +msgid "Unable to authenticate to Exchange MAPI server: %s" +msgstr "Nepodarilo sa overiť totožnosť na serveri Exchange MAPI: %s" -#: ../src/camel/camel-mapi-store.c:441 -msgid "Cannot create MAPI folders in offline mode." -msgstr "Nepodarilo sa vytvoriť priečinky MAPI v off-line režime." +#: ../src/camel/camel-mapi-store.c:1731 +msgid "Unable to authenticate to Exchange MAPI server" +msgstr "Nepodarilo sa overiť totožnosť na serveri Exchange MAPI" -#: ../src/camel/camel-mapi-store.c:446 +#: ../src/camel/camel-mapi-transport.c:116 +#: ../src/camel/camel-mapi-transport.c:137 #, c-format -msgid "Cannot create new folder `%s'" -msgstr "Nepodarilo sa vytvoriť nový priečinok `%s'" +msgid "Could not send message." +msgstr "Nepodarilo sa odoslať správu." -#: ../src/camel/camel-mapi-store.c:657 +#: ../src/camel/camel-mapi-transport.c:132 #, c-format -msgid "Cannot rename MAPI folder `%s'. Folder does not exist." -msgstr "Nepodarilo sa premenovať priečinok MAPI `%s'. Priečinok neexistuje." +msgid "Could not send message: %s" +msgstr "Nepodarilo sa odoslať správu: %s" + +#. Translators: This is a meeting response prefix which will be shown in a message Subject +#: ../src/libexchangemapi/exchange-mapi-cal-utils.c:1843 +msgctxt "MeetingResp" +msgid "Accepted:" +msgstr "Akceptované:" + +#. Translators: This is a meeting response prefix which will be shown in a message Subject +#: ../src/libexchangemapi/exchange-mapi-cal-utils.c:1847 +msgctxt "MeetingResp" +msgid "Tentative:" +msgstr "Predbežné:" + +#. Translators: This is a meeting response prefix which will be shown in a message Subject +#: ../src/libexchangemapi/exchange-mapi-cal-utils.c:1851 +msgctxt "MeetingResp" +msgid "Declined:" +msgstr "Odmietnuté:" + +#: ../src/libexchangemapi/exchange-mapi-connection.c:105 +msgid "Failed to login into the server" +msgstr "Zlyhalo prihlásenie na server" + +#: ../src/libexchangemapi/exchange-mapi-connection.c:106 +msgid "Cannot create more sessions, session limit was reached" +msgstr "Nedá sa vytvoriť viac relácií, bol dosiahnutý limit" + +#: ../src/libexchangemapi/exchange-mapi-connection.c:107 +msgid "User cancelled operation" +msgstr "Používateľ zrušil operáciu" + +#: ../src/libexchangemapi/exchange-mapi-connection.c:108 +msgid "Unable to abort" +msgstr "Nepodarilo sa prerušiť" + +#: ../src/libexchangemapi/exchange-mapi-connection.c:109 +msgid "Network error" +msgstr "Chyba siete" + +#: ../src/libexchangemapi/exchange-mapi-connection.c:110 +msgid "Disk error" +msgstr "Chyba disku" -#: ../src/camel/camel-mapi-store.c:668 +#: ../src/libexchangemapi/exchange-mapi-connection.c:111 +msgid "Password change required" +msgstr "Vyžadovaná zmena hesla" + +#: ../src/libexchangemapi/exchange-mapi-connection.c:112 +msgid "Password expired" +msgstr "Platnosť hesla vypršala" + +#: ../src/libexchangemapi/exchange-mapi-connection.c:113 +msgid "Invalid workstation account" +msgstr "Neplatný účet pracovnej stanice" + +#: ../src/libexchangemapi/exchange-mapi-connection.c:114 +msgid "Invalid access time" +msgstr "Neplatný čas prístupu" + +#: ../src/libexchangemapi/exchange-mapi-connection.c:115 +msgid "Account is disabled" +msgstr "Účet je zakázaný" + +#: ../src/libexchangemapi/exchange-mapi-connection.c:116 +msgid "End of session" +msgstr "Koniec relácie" + +#: ../src/libexchangemapi/exchange-mapi-connection.c:124 #, c-format -msgid "Cannot rename MAPI default folder `%s' to `%s'." -msgstr "Nepodarilo sa premenovať predvolený priečinok MAPI `%s' na `%s'." +msgid "MAPI error %s (0x%x) occurred" +msgstr "Vyskytla sa chyba MAPI %s (0x%x)" -#: ../src/camel/camel-mapi-store.c:686 +#. Translators: The first '%s' is replaced with an error context, +#. aka where the error occurred, the second '%s' is replaced with +#. the error message. +#: ../src/libexchangemapi/exchange-mapi-connection.c:134 #, c-format -msgid "Cannot rename MAPI folder `%s' to `%s'" -msgstr "Nepodarilo sa premenovať priečinok MAPI `%s' na `%s'" +msgctxt "EXCHANGEMAPI_ERROR" +msgid "%s: %s" +msgstr "%s: %s" -#: ../src/camel/camel-mapi-store.c:1109 -msgid "Folder list not available in offline mode." -msgstr "Zoznam priečinkov nedostupný v off-line režime." +#. Translators: %s is replaced with an email address which was found ambiguous on a remote server +#: ../src/libexchangemapi/exchange-mapi-connection.c:861 +#, c-format +msgid "Recipient '%s' is ambiguous" +msgstr "Príjemca „%s“ je nejednoznačný" -#. Fixme : Set a better error message. Would be helful in troubleshooting. -#: ../src/camel/camel-mapi-transport.c:335 -msgid "Could not send message." -msgstr "Nebolo možné odoslať správu." +#: ../src/libexchangemapi/exchange-mapi-connection.c:3477 +msgid "All Public Folders" +msgstr "Všetky verejné priečinky" + +#, fuzzy +#~| msgid "Authentication failed" +#~ msgid "Authentication password not available" +#~ msgstr "Overenie totožnosti zlyhalo" diff -Nru evolution-mapi-3.2.0/po/sv.po evolution-mapi-3.2.1/po/sv.po --- evolution-mapi-3.2.0/po/sv.po 2011-04-11 07:28:40.000000000 +0000 +++ evolution-mapi-3.2.1/po/sv.po 2011-10-07 12:45:13.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: evolution-mapi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-09 10:17+0200\n" -"PO-Revision-Date: 2011-04-09 10:17+0100\n" +"POT-Creation-Date: 2011-10-07 14:10+0200\n" +"PO-Revision-Date: 2011-10-07 14:14+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -17,13 +17,13 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: ../src/account-setup-eplugin/exchange-mapi-account-listener.c:733 -#: ../src/account-setup-eplugin/exchange-mapi-account-listener.c:735 +#: ../src/account-setup-eplugin/exchange-mapi-account-listener.c:791 +#: ../src/account-setup-eplugin/exchange-mapi-account-listener.c:793 msgid "Global Address List" msgstr "Global Address List" -#: ../src/account-setup-eplugin/exchange-mapi-account-listener.c:1119 -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:235 +#: ../src/account-setup-eplugin/exchange-mapi-account-listener.c:1193 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:257 #, c-format msgid "Enter Password for %s@%s" msgstr "Ange lösenordet för %s@%s" @@ -32,73 +32,93 @@ #. using GtkEntryCompletion in the username gtkentry. But plugins #. as of now does not have access to it #. TODO : Fix strings -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:134 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:175 msgid "Select username" msgstr "Välj användarnamn" -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:144 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:185 msgid "Full name" msgstr "Fullständigt namn" -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:149 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:190 msgid "Username" msgstr "Användarnamn" -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:204 -#: ../src/camel/camel-mapi-store.c:1056 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:222 +msgid "" +"There are more users with similar user name on a server.\n" +"Please select that you would like to use from the below list." +msgstr "" +"Det finns flera användare med liknande användarnamn på en server.\n" +"Välj de du vill använda i listan nedanför." + +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:275 +#: ../src/camel/camel-mapi-store.c:1050 #, c-format msgid "Cannot create MAPI folders in offline mode." msgstr "Kan inte skapa MAPI-mappar i frånkopplat läge." -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:223 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:301 msgid "Server, username and domain name cannot be empty. Please fill them with correct values." msgstr "Server, användarnamn och domännamn får inte vara tomma. Fyll i dem med korrekta värden." -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:279 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:305 +msgid "Realm name cannot be empty when kerberos is selected. Please fill them with correct values." +msgstr "Domännamn (Realm) får inte vara tomma när Kerberos har valts. Fyll i dem med korrekta värden." + +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:350 msgid "Authentication finished successfully." msgstr "Autentiseringen lyckades." -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:285 -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:296 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:356 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:365 msgid "Authentication failed." msgstr "Autentiseringen misslyckades." -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:374 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:405 msgid "_Domain name:" msgstr "_Domännamn:" -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:384 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:417 msgid "_Authenticate" msgstr "_Autentisera" -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:394 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:426 msgid "_Use secure connection" msgstr "A_nvänd säker anslutning" -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:529 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:440 +msgid "_Kerberos authentication" +msgstr "_Kerberos-autentisering" + +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:451 +msgid "_Realm name:" +msgstr "_Domännamn:" + +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:605 msgid "Personal Folders" msgstr "Personliga mappar" -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:664 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:742 msgid "_Location:" msgstr "_Plats:" -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:781 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:861 #, c-format msgid "Failed to create address book '%s': %s" msgstr "Misslyckades med att skapa adressboken \"%s\": %s" -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:784 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:864 #, c-format msgid "Failed to create address book '%s'" msgstr "Misslyckades med att skapa adressboken \"%s\"" -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:890 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:977 #, c-format msgid "Failed to create calendar '%s': %s" msgstr "Misslyckades med att skapa kalendern \"%s\": %s" -#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:893 +#: ../src/account-setup-eplugin/exchange-mapi-account-setup.c:980 #, c-format msgid "Failed to create calendar '%s'" msgstr "Misslyckades med att skapa kalendern \"%s\"" @@ -115,75 +135,74 @@ msgid "Unable to retrieve folder size information" msgstr "Kunde inte hämta information om mappstorlek" -#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:169 -#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:371 +#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:168 +#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:374 msgid "Folder Size" msgstr "Mappstorlek" -#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:180 +#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:179 msgid "Fetching folder list…" msgstr "Hämtar mapplista..." #. Miscellaneous settings -#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:356 +#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:359 msgid "Miscellaneous" msgstr "Diverse" -#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:369 +#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:372 msgid "View the size of all Exchange folders" msgstr "Visa storleken för alla Exchange-mappar" -#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:382 +#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:385 #: ../src/account-setup-eplugin/org-gnome-exchange-mapi.eplug.xml.h:1 msgid "Exchange Settings" msgstr "Inställningar för Exchange" -#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:391 +#: ../src/account-setup-eplugin/exchange-mapi-account-settings.c:394 msgid "Folder size" msgstr "Mappstorlek" -#: ../src/addressbook/e-book-backend-mapi.c:577 +#: ../src/addressbook/e-book-backend-mapi.c:431 msgid "Cannot connect" msgstr "Kan inte ansluta" -#: ../src/addressbook/e-book-backend-mapi.c:720 +#: ../src/addressbook/e-book-backend-mapi.c:736 msgid "Searching" msgstr "Söker" -#: ../src/addressbook/e-book-backend-mapi.c:2034 -#: ../src/calendar/e-cal-backend-mapi.c:133 -#: ../src/camel/camel-mapi-folder.c:1763 -#: ../src/camel/camel-mapi-folder.c:1784 +#: ../src/addressbook/e-book-backend-mapi.c:1979 +#: ../src/calendar/e-cal-backend-mapi.c:129 +#: ../src/camel/camel-mapi-folder.c:1776 +#: ../src/camel/camel-mapi-folder.c:1797 msgid "Unknown error" msgstr "Okänt fel" -#: ../src/addressbook/e-book-backend-mapi-contacts.c:703 -#: ../src/calendar/e-cal-backend-mapi.c:331 +#: ../src/addressbook/e-book-backend-mapi-contacts.c:713 +#: ../src/calendar/e-cal-backend-mapi.c:277 msgid "Failed to remove public folder" msgstr "Misslyckades med att ta bort publik mapp" -#: ../src/addressbook/e-book-backend-mapi-contacts.c:760 -#: ../src/calendar/e-cal-backend-mapi.c:1815 -#: ../src/calendar/e-cal-backend-mapi.c:2324 +#: ../src/addressbook/e-book-backend-mapi-contacts.c:770 +#: ../src/calendar/e-cal-backend-mapi.c:1653 +#: ../src/calendar/e-cal-backend-mapi.c:2191 msgid "Failed to create item on a server" msgstr "Misslyckades med att skapa objekt på en server" -#: ../src/addressbook/e-book-backend-mapi-contacts.c:886 -#: ../src/calendar/e-cal-backend-mapi.c:2048 +#: ../src/addressbook/e-book-backend-mapi-contacts.c:896 +#: ../src/calendar/e-cal-backend-mapi.c:1884 msgid "Failed to modify item on a server" msgstr "Misslyckades med att ändra objekt på en server" -#: ../src/addressbook/e-book-backend-mapi-contacts.c:1033 -#: ../src/addressbook/e-book-backend-mapi-contacts.c:1099 -#: ../src/addressbook/e-book-backend-mapi-contacts.c:1150 -#: ../src/calendar/e-cal-backend-mapi.c:1329 -#: ../src/calendar/e-cal-backend-mapi.c:1350 +#: ../src/addressbook/e-book-backend-mapi-contacts.c:1043 +#: ../src/addressbook/e-book-backend-mapi-contacts.c:1109 +#: ../src/addressbook/e-book-backend-mapi-contacts.c:1160 +#: ../src/calendar/e-cal-backend-mapi.c:1131 msgid "Failed to fetch items from a server" msgstr "Misslyckades med att hämta objekt från en server" #. Translators : This is used to cache the downloaded contacts from a server. #. %d is an index of the contact. -#: ../src/addressbook/e-book-backend-mapi-contacts.c:1051 +#: ../src/addressbook/e-book-backend-mapi-contacts.c:1061 #, c-format msgid "Caching contact %d" msgstr "Mellanlagrar kontakt %d" @@ -191,14 +210,14 @@ #. Translators : This is used to cache the downloaded contacts from a server. #. The first %d is an index of the contact, #. the second %d is total count of conacts on the server. -#: ../src/addressbook/e-book-backend-mapi-contacts.c:1055 +#: ../src/addressbook/e-book-backend-mapi-contacts.c:1065 #, c-format msgid "Caching contact %d/%d" msgstr "Mellanlagrar kontakt %d/%d" #. Translators : This is used to cache the downloaded contacts from GAL. #. %d is an index of the GAL entry. -#: ../src/addressbook/e-book-backend-mapi-gal.c:159 +#: ../src/addressbook/e-book-backend-mapi-gal.c:157 #, c-format msgid "Caching GAL contact %d" msgstr "Mellanlagrar GAL-kontakt %d" @@ -206,109 +225,106 @@ #. Translators : This is used to cache the downloaded contacts from GAL. #. The first %d is an index of the GAL entry, #. the second %d is total count of entries in GAL. -#: ../src/addressbook/e-book-backend-mapi-gal.c:163 +#: ../src/addressbook/e-book-backend-mapi-gal.c:161 #, c-format msgid "Caching GAL contact %d/%d" msgstr "Mellanlagrar GAL-kontakt %d/%d" -#: ../src/addressbook/e-book-backend-mapi-gal.c:213 -#: ../src/addressbook/e-book-backend-mapi-gal.c:261 +#: ../src/addressbook/e-book-backend-mapi-gal.c:211 +#: ../src/addressbook/e-book-backend-mapi-gal.c:259 msgid "Failed to fetch GAL entries" msgstr "Misslyckades med att hämta GAL-poster" #. To translators: This message is displayed on the status bar when calendar/tasks/memo items are being fetched from the server. -#: ../src/calendar/e-cal-backend-mapi.c:376 +#: ../src/calendar/e-cal-backend-mapi.c:343 #, c-format msgid "Loading items in folder %s" msgstr "Läser in objekt i mappen %s" -#: ../src/calendar/e-cal-backend-mapi.c:774 -#: ../src/calendar/e-cal-backend-mapi.c:800 -#: ../src/calendar/e-cal-backend-mapi.c:847 -#: ../src/calendar/e-cal-backend-mapi.c:926 -#: ../src/calendar/e-cal-backend-mapi.c:949 +#: ../src/calendar/e-cal-backend-mapi.c:663 +#: ../src/calendar/e-cal-backend-mapi.c:707 +#: ../src/calendar/e-cal-backend-mapi.c:784 #, c-format msgid "Failed to fetch changes from a server: %s" msgstr "Misslyckades med att hämta ändringar från en server: %s" -#: ../src/calendar/e-cal-backend-mapi.c:779 -#: ../src/calendar/e-cal-backend-mapi.c:805 -#: ../src/calendar/e-cal-backend-mapi.c:852 -#: ../src/calendar/e-cal-backend-mapi.c:931 -#: ../src/calendar/e-cal-backend-mapi.c:954 +#: ../src/calendar/e-cal-backend-mapi.c:668 +#: ../src/calendar/e-cal-backend-mapi.c:712 +#: ../src/calendar/e-cal-backend-mapi.c:789 msgid "Failed to fetch changes from a server" msgstr "Misslyckades med hämtning av ändringar från en server" -#: ../src/calendar/e-cal-backend-mapi.c:1463 +#: ../src/calendar/e-cal-backend-mapi.c:1219 msgid "Could not create thread for populating cache" msgstr "Kunde inte skapa tråd för inmatning i mellanlager" -#: ../src/calendar/e-cal-backend-mapi.c:1525 +#: ../src/calendar/e-cal-backend-mapi.c:1327 +#: ../src/calendar/e-cal-backend-mapi.c:1328 msgid "Could not create cache file" msgstr "Kunde inte skapa mellanlagringsfilen" -#: ../src/calendar/e-cal-backend-mapi.c:1941 +#: ../src/calendar/e-cal-backend-mapi.c:1778 msgid "Support for modifying single instances of a recurring appointment is not yet implemented. No change was made to the appointment on the server." msgstr "Stöd för ändring av enstaka instanser för ett återkommande möte har ännu inte implementerats. Ingen ändring gjordes till mötet på servern." -#: ../src/calendar/e-cal-backend-mapi.c:2609 +#: ../src/calendar/e-cal-backend-mapi.c:2445 msgid "Failed to get Free/Busy data" msgstr "Misslyckades med att hämta Ledig/Upptagen-data" -#: ../src/camel/camel-mapi-folder.c:345 +#: ../src/camel/camel-mapi-folder.c:344 #, c-format msgid "Updating local summary cache for new messages in %s" msgstr "Uppdaterar lokal mellanlagring av sammandrag för nya meddelanden i %s" -#: ../src/camel/camel-mapi-folder.c:579 +#: ../src/camel/camel-mapi-folder.c:578 #, c-format msgid "Retrieving message IDs from server for %s" msgstr "Hämtar meddelande-id:n från servern för %s" -#: ../src/camel/camel-mapi-folder.c:609 +#: ../src/camel/camel-mapi-folder.c:608 #, c-format msgid "Removing deleted messages from cache in %s" msgstr "Tar bort borttagna meddelanden från mellanlagring i %s" #. TODO : Check for online state -#: ../src/camel/camel-mapi-folder.c:746 +#: ../src/camel/camel-mapi-folder.c:734 #, c-format msgid "Fetching summary information for new messages in %s" msgstr "Hämtar sammandragsinformation för nya meddelanden i %s" -#: ../src/camel/camel-mapi-folder.c:869 -#: ../src/camel/camel-mapi-folder.c:1380 -#: ../src/camel/camel-mapi-folder.c:1390 +#: ../src/camel/camel-mapi-folder.c:858 +#: ../src/camel/camel-mapi-folder.c:1381 +#: ../src/camel/camel-mapi-folder.c:1391 #, c-format msgid "This message is not available in offline mode." msgstr "Detta meddelande är inte tillgängligt i frånkopplat läge." -#: ../src/camel/camel-mapi-folder.c:886 +#: ../src/camel/camel-mapi-folder.c:875 #, c-format msgid "Fetching items failed: %s" msgstr "Hämtning av objekt misslyckades: %s" -#: ../src/camel/camel-mapi-folder.c:891 +#: ../src/camel/camel-mapi-folder.c:880 msgid "Fetching items failed" msgstr "Hämtning av objekt misslyckades" -#: ../src/camel/camel-mapi-folder.c:1096 +#: ../src/camel/camel-mapi-folder.c:1095 #, c-format msgid "Cannot append message to folder '%s'" msgstr "Kan inte lägga till meddelandet till mappen \"%s\"" -#: ../src/camel/camel-mapi-folder.c:1104 -#: ../src/camel/camel-mapi-folder.c:1155 +#: ../src/camel/camel-mapi-folder.c:1103 +#: ../src/camel/camel-mapi-folder.c:1154 #, c-format msgid "Offline." msgstr "Frånkopplad." -#: ../src/camel/camel-mapi-folder.c:1235 +#: ../src/camel/camel-mapi-folder.c:1233 #, c-format msgid "Failed to empty Trash: %s" msgstr "Misslyckades med att tömma papperskorgen: %s" -#: ../src/camel/camel-mapi-folder.c:1240 +#: ../src/camel/camel-mapi-folder.c:1238 msgid "Failed to empty Trash" msgstr "Misslyckades med att tömma papperskorgen" @@ -321,18 +337,18 @@ msgid "No such message" msgstr "Det finns inget sådant meddelande" -#: ../src/camel/camel-mapi-folder.c:1416 +#: ../src/camel/camel-mapi-folder.c:1417 #, c-format msgid "Could not get message: %s" msgstr "Kunde inte hämta meddelandet: %s" -#: ../src/camel/camel-mapi-folder.c:1422 -#: ../src/camel/camel-mapi-folder.c:1435 +#: ../src/camel/camel-mapi-folder.c:1423 +#: ../src/camel/camel-mapi-folder.c:1436 #, c-format msgid "Could not get message" msgstr "Kunde inte hämta meddelandet" -#: ../src/camel/camel-mapi-folder.c:1878 +#: ../src/camel/camel-mapi-folder.c:1903 #, c-format msgid "Could not load summary for %s" msgstr "Kunde inte läsa in sammandrag för %s" @@ -367,8 +383,8 @@ msgstr "Kontrollera endast meddelanden i _Inbox-mappen efter skräppost" #: ../src/camel/camel-mapi-provider.c:70 -msgid "For accessing Microsoft Exchange/OpenChange servers using MAPI" -msgstr "För åtkomst till Microsoft Exchange/OpenChange-servrar med MAPI" +msgid "For accessing Microsoft Exchange 2007/OpenChange servers via MAPI" +msgstr "För åtkomst till Microsoft Exchange 2007/OpenChange-servrar med MAPI" #: ../src/camel/camel-mapi-provider.c:85 msgid "Password" @@ -378,75 +394,75 @@ msgid "This option will connect to the OpenChange server using a plaintext password." msgstr "Detta alternativ kommer att ansluta till OpenChange-servern med ett klartextlösenord." -#: ../src/camel/camel-mapi-store.c:402 +#: ../src/camel/camel-mapi-store.c:401 #, c-format msgid "Folder list not available in offline mode." msgstr "Mapplistan är inte tillgänglig i frånkopplat läge." -#: ../src/camel/camel-mapi-store.c:1063 +#: ../src/camel/camel-mapi-store.c:1057 #, c-format msgid "Cannot create new folder '%s'" msgstr "Kan inte skapa nya mappen \"%s\"" -#: ../src/camel/camel-mapi-store.c:1077 +#: ../src/camel/camel-mapi-store.c:1071 #, c-format msgid "Authentication failed" msgstr "Autentisering misslyckades" -#: ../src/camel/camel-mapi-store.c:1103 +#: ../src/camel/camel-mapi-store.c:1097 #, c-format msgid "Cannot create folder '%s': %s" msgstr "Kan inte skapa mappen \"%s\": %s" -#: ../src/camel/camel-mapi-store.c:1108 +#: ../src/camel/camel-mapi-store.c:1102 #, c-format msgid "Cannot create folder '%s'" msgstr "Kan inte skapa mappen \"%s\"" -#: ../src/camel/camel-mapi-store.c:1165 +#: ../src/camel/camel-mapi-store.c:1159 #, c-format msgid "Cannot remove folder '%s': %s" msgstr "Kan inte ta bort mappen \"%s\": %s" -#: ../src/camel/camel-mapi-store.c:1172 +#: ../src/camel/camel-mapi-store.c:1166 #, c-format msgid "Cannot remove folder '%s'" msgstr "Kan inte ta bort mappen \"%s\"" -#: ../src/camel/camel-mapi-store.c:1217 +#: ../src/camel/camel-mapi-store.c:1216 #, c-format msgid "Cannot rename MAPI folder '%s'. Folder does not exist." msgstr "Kan inte byta namn på MAPI-mappen \"%s\". Mappen finns inte." -#: ../src/camel/camel-mapi-store.c:1229 +#: ../src/camel/camel-mapi-store.c:1228 #, c-format msgid "Cannot rename MAPI default folder '%s' to '%s'." msgstr "Kan inte byta namn på MAPI-standardmappen \"%s\" till \"%s\"." #. Translators: '%s to %s' is current name of the folder and new name of the folder. -#: ../src/camel/camel-mapi-store.c:1256 -#: ../src/camel/camel-mapi-store.c:1281 -#: ../src/camel/camel-mapi-store.c:1343 +#: ../src/camel/camel-mapi-store.c:1255 +#: ../src/camel/camel-mapi-store.c:1280 +#: ../src/camel/camel-mapi-store.c:1342 #, c-format msgid "Cannot rename MAPI folder '%s' to '%s'" msgstr "Kan inte byta namn på MAPI-mappen \"%s\" till \"%s\"" #. Translators: '%s to %s' is current name of the folder and new name of the folder. #. The last '%s' is a detailed error message. -#: ../src/camel/camel-mapi-store.c:1274 -#: ../src/camel/camel-mapi-store.c:1337 +#: ../src/camel/camel-mapi-store.c:1273 +#: ../src/camel/camel-mapi-store.c:1336 #, c-format msgid "Cannot rename MAPI folder '%s' to '%s': %s" msgstr "Kan inte byta namn på MAPI-mappen \"%s\" till \"%s\": %s" -#: ../src/camel/camel-mapi-store.c:1435 +#: ../src/camel/camel-mapi-store.c:1456 #, c-format msgid "Folder '%s' not found" msgstr "Mappen \"%s\" hittades inte" #. Translators: The %s is replaced with a server's host name -#: ../src/camel/camel-mapi-store.c:1639 -#: ../src/camel/camel-mapi-transport.c:146 +#: ../src/camel/camel-mapi-store.c:1674 +#: ../src/camel/camel-mapi-transport.c:154 #, c-format msgid "Exchange MAPI server %s" msgstr "Exchange MAPI-server %s" @@ -454,8 +470,8 @@ #. To translators : Example string : Exchange MAPI service for #. _username_ on _server host name__ #. Translators: The first %s is replaced with a user name, the second with a server's host name -#: ../src/camel/camel-mapi-store.c:1643 -#: ../src/camel/camel-mapi-transport.c:149 +#: ../src/camel/camel-mapi-store.c:1678 +#: ../src/camel/camel-mapi-transport.c:157 #, c-format msgid "Exchange MAPI service for %s on %s" msgstr "Exchange MAPI-tjänst för %s på %s" @@ -464,36 +480,54 @@ #. for prompting the user if it is available. #. Second %s is : Username. #. Third %s is : Server host name. -#: ../src/camel/camel-mapi-store.c:1677 +#: ../src/camel/camel-mapi-store.c:1701 #, c-format msgid "%s Please enter the MAPI password for %s@%s" msgstr "%s Ange MAPI-lösenordet för %s@%s" -#: ../src/camel/camel-mapi-store.c:1692 +#: ../src/camel/camel-mapi-store.c:1719 #, c-format msgid "You did not enter a password." msgstr "Du angav inte något lösenord." -#: ../src/camel/camel-mapi-store.c:1700 +#: ../src/camel/camel-mapi-store.c:1783 #, c-format msgid "Unable to authenticate to Exchange MAPI server: %s" msgstr "Kunde inte autentisera mot Exchange MAPI-server: %s" -#: ../src/camel/camel-mapi-store.c:1703 +#: ../src/camel/camel-mapi-store.c:1786 msgid "Unable to authenticate to Exchange MAPI server" msgstr "Kunde inte autentisera mot Exchange MAPI-server" -#: ../src/camel/camel-mapi-transport.c:112 -#: ../src/camel/camel-mapi-transport.c:133 +#: ../src/camel/camel-mapi-transport.c:116 +#: ../src/camel/camel-mapi-transport.c:137 #, c-format msgid "Could not send message." msgstr "Kunde inte skicka meddelande." -#: ../src/camel/camel-mapi-transport.c:128 +#: ../src/camel/camel-mapi-transport.c:132 #, c-format msgid "Could not send message: %s" msgstr "Kunde inte skicka meddelandet: %s" +#. Translators: This is a meeting response prefix which will be shown in a message Subject +#: ../src/libexchangemapi/exchange-mapi-cal-utils.c:1856 +msgctxt "MeetingResp" +msgid "Accepted:" +msgstr "Accepterat:" + +#. Translators: This is a meeting response prefix which will be shown in a message Subject +#: ../src/libexchangemapi/exchange-mapi-cal-utils.c:1860 +msgctxt "MeetingResp" +msgid "Tentative:" +msgstr "Preliminärt:" + +#. Translators: This is a meeting response prefix which will be shown in a message Subject +#: ../src/libexchangemapi/exchange-mapi-cal-utils.c:1864 +msgctxt "MeetingResp" +msgid "Declined:" +msgstr "Avböjt:" + #: ../src/libexchangemapi/exchange-mapi-connection.c:105 msgid "Failed to login into the server" msgstr "Misslyckades med att logga in på servern" @@ -556,7 +590,13 @@ msgid "%s: %s" msgstr "%s: %s" -#: ../src/libexchangemapi/exchange-mapi-connection.c:3432 +#. Translators: %s is replaced with an email address which was found ambiguous on a remote server +#: ../src/libexchangemapi/exchange-mapi-connection.c:861 +#, c-format +msgid "Recipient '%s' is ambiguous" +msgstr "Mottagaren \"%s\" är tvetydlig" + +#: ../src/libexchangemapi/exchange-mapi-connection.c:3477 msgid "All Public Folders" msgstr "Alla publika mappar" diff -Nru evolution-mapi-3.2.0/src/account-setup-eplugin/Makefile.in evolution-mapi-3.2.1/src/account-setup-eplugin/Makefile.in --- evolution-mapi-3.2.0/src/account-setup-eplugin/Makefile.in 2011-09-26 05:27:58.000000000 +0000 +++ evolution-mapi-3.2.1/src/account-setup-eplugin/Makefile.in 2011-10-17 06:13:16.000000000 +0000 @@ -165,6 +165,8 @@ GNOME_PLATFORM_LIBS = @GNOME_PLATFORM_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ diff -Nru evolution-mapi-3.2.0/src/addressbook/Makefile.in evolution-mapi-3.2.1/src/addressbook/Makefile.in --- evolution-mapi-3.2.0/src/addressbook/Makefile.in 2011-09-26 05:27:58.000000000 +0000 +++ evolution-mapi-3.2.1/src/addressbook/Makefile.in 2011-10-17 06:13:16.000000000 +0000 @@ -161,6 +161,8 @@ GNOME_PLATFORM_LIBS = @GNOME_PLATFORM_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ diff -Nru evolution-mapi-3.2.0/src/calendar/Makefile.in evolution-mapi-3.2.1/src/calendar/Makefile.in --- evolution-mapi-3.2.0/src/calendar/Makefile.in 2011-09-26 05:27:58.000000000 +0000 +++ evolution-mapi-3.2.1/src/calendar/Makefile.in 2011-10-17 06:13:16.000000000 +0000 @@ -161,6 +161,8 @@ GNOME_PLATFORM_LIBS = @GNOME_PLATFORM_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ diff -Nru evolution-mapi-3.2.0/src/camel/Makefile.in evolution-mapi-3.2.1/src/camel/Makefile.in --- evolution-mapi-3.2.0/src/camel/Makefile.in 2011-09-26 05:27:58.000000000 +0000 +++ evolution-mapi-3.2.1/src/camel/Makefile.in 2011-10-17 06:13:16.000000000 +0000 @@ -168,6 +168,8 @@ GNOME_PLATFORM_LIBS = @GNOME_PLATFORM_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ diff -Nru evolution-mapi-3.2.0/src/libexchangemapi/Makefile.in evolution-mapi-3.2.1/src/libexchangemapi/Makefile.in --- evolution-mapi-3.2.0/src/libexchangemapi/Makefile.in 2011-09-26 05:27:58.000000000 +0000 +++ evolution-mapi-3.2.1/src/libexchangemapi/Makefile.in 2011-10-17 06:13:16.000000000 +0000 @@ -171,6 +171,8 @@ GNOME_PLATFORM_LIBS = @GNOME_PLATFORM_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ diff -Nru evolution-mapi-3.2.0/src/Makefile.in evolution-mapi-3.2.1/src/Makefile.in --- evolution-mapi-3.2.0/src/Makefile.in 2011-09-26 05:27:58.000000000 +0000 +++ evolution-mapi-3.2.1/src/Makefile.in 2011-10-17 06:13:16.000000000 +0000 @@ -138,6 +138,8 @@ GNOME_PLATFORM_LIBS = @GNOME_PLATFORM_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@