diff -Nru almanah-0.11.1/aclocal.m4 almanah-0.12.0/aclocal.m4 --- almanah-0.11.1/aclocal.m4 2014-09-24 18:32:45.000000000 +0000 +++ almanah-0.12.0/aclocal.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,10302 +0,0 @@ -# generated automatically by aclocal 1.13.4 -*- Autoconf -*- - -# Copyright (C) 1996-2013 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. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, -[m4_warning([this file was generated for autoconf 2.69. -You have another version of autoconf. It may work, but is not guaranteed to. -If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically 'autoreconf'.])]) - -# appdata-xml.m4 -# -# serial 4 - -dnl APPDATA_XML -dnl Installs and validates AppData XML files. -dnl -dnl Call APPDATA_XML in configure.ac to check for the appdata-validate tool. -dnl Add @APPDATA_XML_RULES@ to a Makefile.am to substitute the make rules. Add -dnl .appdata.xml files to appdata_XML in Makefile.am and they will be validated -dnl at make check time, if appdata-validate is installed, as well as installed -dnl to the correct location automatically. Add --enable-appdata-validate to -dnl DISTCHECK_CONFIGURE_FLAGS in Makefile.am to require valid AppData XML when -dnl doing a distcheck. -dnl -dnl Adding files to appdata_XML does not distribute them automatically. - -AC_DEFUN([APPDATA_XML], -[ - m4_pattern_allow([AM_V_GEN]) - AC_ARG_ENABLE([appdata-validate], - [AS_HELP_STRING([--disable-appdata-validate], - [Disable validating AppData XML files during check phase])]) - - AS_IF([test "x$enable_appdata_validate" != "xno"], - [AC_PATH_PROG([APPDATA_VALIDATE], [appdata-validate]) - AS_IF([test "x$APPDATA_VALIDATE" = "x"], - [have_appdata_validate=no], - [have_appdata_validate=yes - AC_SUBST([APPDATA_VALIDATE])])], - [have_appdata_validate=no]) - - AS_IF([test "x$have_appdata_validate" != "xno"], - [appdata_validate=yes], - [appdata_validate=no - AS_IF([test "x$enable_appdata_validate" = "xyes"], - [AC_MSG_ERROR([AppData validation was requested but appdata-validate was not found])])]) - - AC_SUBST([appdataxmldir], [${datadir}/appdata]) - - APPDATA_XML_RULES=' -.PHONY : uninstall-appdata-xml install-appdata-xml clean-appdata-xml - -mostlyclean-am: clean-appdata-xml - -%.appdata.valid: %.appdata.xml - $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; \ - if test -n "$(APPDATA_VALIDATE)"; \ - then $(APPDATA_VALIDATE) --nonet $${d}$<; fi \ - && touch [$]@ - -check-am: $(appdata_XML:.appdata.xml=.appdata.valid) -uninstall-am: uninstall-appdata-xml -install-data-am: install-appdata-xml - -.SECONDARY: $(appdata_XML) - -install-appdata-xml: $(appdata_XML) - @$(NORMAL_INSTALL) - if test -n "$^"; then \ - test -z "$(appdataxmldir)" || $(MKDIR_P) "$(DESTDIR)$(appdataxmldir)"; \ - $(INSTALL_DATA) $^ "$(DESTDIR)$(appdataxmldir)"; \ - fi - -uninstall-appdata-xml: - @$(NORMAL_UNINSTALL) - @list='\''$(appdata_XML)'\''; test -n "$(appdataxmldir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '\''$(DESTDIR)$(appdataxmldir)'\'' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(appdataxmldir)" && rm -f $$files - -clean-appdata-xml: - rm -f $(appdata_XML:.appdata.xml=.appdata.valid) -' - _APPDATA_XML_SUBST(APPDATA_XML_RULES) -]) - -dnl _APPDATA_XML_SUBST(VARIABLE) -dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST -AC_DEFUN([_APPDATA_XML_SUBST], -[ -AC_SUBST([$1]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) -] -) - -dnl GLIB_GSETTINGS -dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether -dnl the schema should be compiled -dnl - -AC_DEFUN([GLIB_GSETTINGS], -[ - m4_pattern_allow([AM_V_GEN]) - AC_ARG_ENABLE(schemas-compile, - AS_HELP_STRING([--disable-schemas-compile], - [Disable regeneration of gschemas.compiled on install]), - [case ${enableval} in - yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; - no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; - esac]) - AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) - PKG_PROG_PKG_CONFIG([0.16]) - AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) - if test x$cross_compiling != xyes; then - GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` - else - AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) - fi - AC_SUBST(GLIB_COMPILE_SCHEMAS) - if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then - ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) - else - ifelse([$1],,[:],[$1]) - fi - - GSETTINGS_RULES=' -.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas - -mostlyclean-am: clean-gsettings-schemas - -gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) - -%.gschema.valid: %.gschema.xml $(gsettings__enum_file) - $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p [$](@D) && touch [$]@ - -all-am: $(gsettings_SCHEMAS:.xml=.valid) -uninstall-am: uninstall-gsettings-schemas -install-data-am: install-gsettings-schemas - -.SECONDARY: $(gsettings_SCHEMAS) - -install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) - @$(NORMAL_INSTALL) - if test -n "$^"; then \ - test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ - $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ - fi - -uninstall-gsettings-schemas: - @$(NORMAL_UNINSTALL) - @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) - -clean-gsettings-schemas: - rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) - -ifdef gsettings_ENUM_NAMESPACE -$(gsettings__enum_file): $(gsettings_ENUM_FILES) - $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ -endif -' - _GSETTINGS_SUBST(GSETTINGS_RULES) -]) - -dnl _GSETTINGS_SUBST(VARIABLE) -dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST -AC_DEFUN([_GSETTINGS_SUBST], -[ -AC_SUBST([$1]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) -] -) - - -dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 42 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 - -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; }'` -if test -n "$1"; then - AC_MSG_CHECKING([for intltool >= $1]) - 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 - -if test -z "$AM_DEFAULT_VERBOSITY"; then - AM_DEFAULT_VERBOSITY=1 -fi -AC_SUBST([AM_DEFAULT_VERBOSITY]) - -INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' -INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' -INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' -AC_SUBST(INTLTOOL_V_MERGE) -AC_SUBST(INTLTOOL__v_MERGE_) -AC_SUBST(INTLTOOL__v_MERGE_0) - -INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' -intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' -intltool__v_merge_options_0='-q' -AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) -AC_SUBST(intltool__v_merge_options_) -AC_SUBST(intltool__v_merge_options_0) - - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' -else - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir' -fi - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - -_IT_SUBST(INTLTOOL_DESKTOP_RULE) -_IT_SUBST(INTLTOOL_DIRECTORY_RULE) -_IT_SUBST(INTLTOOL_KEYS_RULE) -_IT_SUBST(INTLTOOL_PROP_RULE) -_IT_SUBST(INTLTOOL_OAF_RULE) -_IT_SUBST(INTLTOOL_PONG_RULE) -_IT_SUBST(INTLTOOL_SERVER_RULE) -_IT_SUBST(INTLTOOL_SHEET_RULE) -_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) -_IT_SUBST(INTLTOOL_UI_RULE) -_IT_SUBST(INTLTOOL_XAM_RULE) -_IT_SUBST(INTLTOOL_KBD_RULE) -_IT_SUBST(INTLTOOL_XML_RULE) -_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) -_IT_SUBST(INTLTOOL_CAVES_RULE) -_IT_SUBST(INTLTOOL_SCHEMAS_RULE) -_IT_SUBST(INTLTOOL_THEME_RULE) -_IT_SUBST(INTLTOOL_SERVICE_RULE) -_IT_SUBST(INTLTOOL_POLICY_RULE) - -# Check the gettext tools to make sure they are GNU -AC_PATH_PROG(XGETTEXT, xgettext) -AC_PATH_PROG(MSGMERGE, msgmerge) -AC_PATH_PROG(MSGFMT, msgfmt) -AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) -if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -fi -xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" -mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" -mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" -if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -fi - -AC_PATH_PROG(INTLTOOL_PERL, perl) -if test -z "$INTLTOOL_PERL"; then - AC_MSG_ERROR([perl not found]) -fi -AC_MSG_CHECKING([for perl >= 5.8.1]) -$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 -if test $? -ne 0; then - AC_MSG_ERROR([perl 5.8.1 is required for intltool]) -else - IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` - AC_MSG_RESULT([$IT_PERL_VERSION]) -fi -if test "x$2" != "xno-xml"; then - AC_MSG_CHECKING([for XML::Parser]) - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - AC_MSG_RESULT([ok]) - else - AC_MSG_ERROR([XML::Parser perl module is required for intltool]) - fi -fi - -# Substitute ALL_LINGUAS so we can use it in po/Makefile -AC_SUBST(ALL_LINGUAS) - -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[]], - [[extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr]])], - [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 - dnl in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [DATADIRNAME=share], [DATADIRNAME=lib]) - ;; - *) - [DATADIRNAME=lib] - ;; - esac]) -fi -AC_SUBST(DATADIRNAME) - -IT_PO_SUBDIR([po]) - -]) - - -# IT_PO_SUBDIR(DIRNAME) -# --------------------- -# All po subdirs have to be declared with this macro; the subdir "po" is -# declared by IT_PROG_INTLTOOL. -# -AC_DEFUN([IT_PO_SUBDIR], -[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. -dnl -dnl The following CONFIG_COMMANDS should be executed at the very end -dnl of config.status. -AC_CONFIG_COMMANDS_PRE([ - AC_CONFIG_COMMANDS([$1/stamp-it], [ - if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then - AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) - fi - rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" - >"$1/stamp-it.tmp" - [sed '/^#/d - s/^[[].*] *// - /^[ ]*$/d - '"s|^| $ac_top_srcdir/|" \ - "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" - ] - [sed '/^POTFILES =/,/[^\\]$/ { - /^POTFILES =/!d - r $1/POTFILES - } - ' "$1/Makefile.in" >"$1/Makefile"] - rm -f "$1/Makefile.tmp" - mv "$1/stamp-it.tmp" "$1/stamp-it" - ]) -])dnl -]) - -# _IT_SUBST(VARIABLE) -# ------------------- -# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST -# -AC_DEFUN([_IT_SUBST], -[ -AC_SUBST([$1]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) -] -) - -# deprecated macros -AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) -# A hint is needed for aclocal from Automake <= 1.9.4: -# AC_DEFUN([AC_PROG_INTLTOOL], ...) - - -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# 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. - -m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -]) - -# serial 57 LT_INIT - - -# LT_PREREQ(VERSION) -# ------------------ -# Complain and exit if this libtool version is less that VERSION. -m4_defun([LT_PREREQ], -[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, - [m4_default([$3], - [m4_fatal([Libtool version $1 or higher is required], - 63)])], - [$2])]) - - -# _LT_CHECK_BUILDDIR -# ------------------ -# Complain if the absolute build directory name contains unusual characters -m4_defun([_LT_CHECK_BUILDDIR], -[case `pwd` in - *\ * | *\ *) - AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; -esac -]) - - -# LT_INIT([OPTIONS]) -# ------------------ -AC_DEFUN([LT_INIT], -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT -AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl -AC_BEFORE([$0], [LT_LANG])dnl -AC_BEFORE([$0], [LT_OUTPUT])dnl -AC_BEFORE([$0], [LTDL_INIT])dnl -m4_require([_LT_CHECK_BUILDDIR])dnl - -dnl Autoconf doesn't catch unexpanded LT_ macros by default: -m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl -m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl -dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 -dnl unless we require an AC_DEFUNed macro: -AC_REQUIRE([LTOPTIONS_VERSION])dnl -AC_REQUIRE([LTSUGAR_VERSION])dnl -AC_REQUIRE([LTVERSION_VERSION])dnl -AC_REQUIRE([LTOBSOLETE_VERSION])dnl -m4_require([_LT_PROG_LTMAIN])dnl - -_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) - -dnl Parse OPTIONS -_LT_SET_OPTIONS([$0], [$1]) - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl - -_LT_SETUP - -# Only expand once: -m4_define([LT_INIT]) -])# LT_INIT - -# Old names: -AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) -AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_PROG_LIBTOOL], []) -dnl AC_DEFUN([AM_PROG_LIBTOOL], []) - - -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` -]) - - -# _LT_FILEUTILS_DEFAULTS -# ---------------------- -# It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. -m4_defun([_LT_FILEUTILS_DEFAULTS], -[: ${CP="cp -f"} -: ${MV="mv -f"} -: ${RM="rm -f"} -])# _LT_FILEUTILS_DEFAULTS - - -# _LT_SETUP -# --------- -m4_defun([_LT_SETUP], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl -AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl - -_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl -dnl -_LT_DECL([], [host_alias], [0], [The host system])dnl -_LT_DECL([], [host], [0])dnl -_LT_DECL([], [host_os], [0])dnl -dnl -_LT_DECL([], [build_alias], [0], [The build system])dnl -_LT_DECL([], [build], [0])dnl -_LT_DECL([], [build_os], [0])dnl -dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([LT_PATH_LD])dnl -AC_REQUIRE([LT_PATH_NM])dnl -dnl -AC_REQUIRE([AC_PROG_LN_S])dnl -test -z "$LN_S" && LN_S="ln -s" -_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl -dnl -AC_REQUIRE([LT_CMD_MAX_LEN])dnl -_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl -_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl -dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_CHECK_SHELL_FEATURES])dnl -m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl -m4_require([_LT_CMD_RELOAD])dnl -m4_require([_LT_CHECK_MAGIC_METHOD])dnl -m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl -m4_require([_LT_CMD_OLD_ARCHIVE])dnl -m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -m4_require([_LT_WITH_SYSROOT])dnl - -_LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi -]) -if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi - -_LT_CHECK_OBJDIR - -m4_require([_LT_TAG_COMPILER])dnl - -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Global variables: -ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a - -with_gnu_ld="$lt_cv_prog_gnu_ld" - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$LD" && LD=ld -test -z "$ac_objext" && ac_objext=o - -_LT_CC_BASENAME([$compiler]) - -# Only perform the check for file, if the check method requires it -test -z "$MAGIC_CMD" && MAGIC_CMD=file -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - _LT_PATH_MAGIC - fi - ;; -esac - -# Use C for the default configuration in the libtool script -LT_SUPPORTED_TAG([CC]) -_LT_LANG_C_CONFIG -_LT_LANG_DEFAULT_CONFIG -_LT_CONFIG_COMMANDS -])# _LT_SETUP - - -# _LT_PREPARE_SED_QUOTE_VARS -# -------------------------- -# Define a few sed substitution that help us do robust quoting. -m4_defun([_LT_PREPARE_SED_QUOTE_VARS], -[# Backslashify metacharacters that are still active within -# double-quoted strings. -sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\([["`\\]]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' -]) - -# _LT_PROG_LTMAIN -# --------------- -# Note that this code is called both from `configure', and `config.status' -# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# `config.status' has no value for ac_aux_dir unless we are using Automake, -# so we pass a copy along to make sure it has a sensible value anyway. -m4_defun([_LT_PROG_LTMAIN], -[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl -_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain="$ac_aux_dir/ltmain.sh" -])# _LT_PROG_LTMAIN - - - -# So that we can recreate a full libtool script including additional -# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -# in macros and then make a single call at the end using the `libtool' -# label. - - -# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) -# ---------------------------------------- -# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL_INIT], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_INIT], - [$1 -])])]) - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_INIT]) - - -# _LT_CONFIG_LIBTOOL([COMMANDS]) -# ------------------------------ -# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], - [$1 -])])]) - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) - - -# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) -# ----------------------------------------------------- -m4_defun([_LT_CONFIG_SAVE_COMMANDS], -[_LT_CONFIG_LIBTOOL([$1]) -_LT_CONFIG_LIBTOOL_INIT([$2]) -]) - - -# _LT_FORMAT_COMMENT([COMMENT]) -# ----------------------------- -# Add leading comment marks to the start of each line, and a trailing -# full-stop to the whole comment if one is not present already. -m4_define([_LT_FORMAT_COMMENT], -[m4_ifval([$1], [ -m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], - [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) -)]) - - - - - -# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) -# ------------------------------------------------------------------- -# CONFIGNAME is the name given to the value in the libtool script. -# VARNAME is the (base) name used in the configure script. -# VALUE may be 0, 1 or 2 for a computed quote escaped value based on -# VARNAME. Any other value will be used directly. -m4_define([_LT_DECL], -[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], - [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], - [m4_ifval([$1], [$1], [$2])]) - lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) - m4_ifval([$4], - [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) - lt_dict_add_subkey([lt_decl_dict], [$2], - [tagged?], [m4_ifval([$5], [yes], [no])])]) -]) - - -# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) -# -------------------------------------------------------- -m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) - - -# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_tag_varnames], -[_lt_decl_filter([tagged?], [yes], $@)]) - - -# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) -# --------------------------------------------------------- -m4_define([_lt_decl_filter], -[m4_case([$#], - [0], [m4_fatal([$0: too few arguments: $#])], - [1], [m4_fatal([$0: too few arguments: $#: $1])], - [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], - [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], - [lt_dict_filter([lt_decl_dict], $@)])[]dnl -]) - - -# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) -# -------------------------------------------------- -m4_define([lt_decl_quote_varnames], -[_lt_decl_filter([value], [1], $@)]) - - -# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_dquote_varnames], -[_lt_decl_filter([value], [2], $@)]) - - -# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_varnames_tagged], -[m4_assert([$# <= 2])dnl -_$0(m4_quote(m4_default([$1], [[, ]])), - m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), - m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) -m4_define([_lt_decl_varnames_tagged], -[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) - - -# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_all_varnames], -[_$0(m4_quote(m4_default([$1], [[, ]])), - m4_if([$2], [], - m4_quote(lt_decl_varnames), - m4_quote(m4_shift($@))))[]dnl -]) -m4_define([_lt_decl_all_varnames], -[lt_join($@, lt_decl_varnames_tagged([$1], - lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl -]) - - -# _LT_CONFIG_STATUS_DECLARE([VARNAME]) -# ------------------------------------ -# Quote a variable value, and forward it to `config.status' so that its -# declaration there will have the same value as in `configure'. VARNAME -# must have a single quote delimited value for this to work. -m4_define([_LT_CONFIG_STATUS_DECLARE], -[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) - - -# _LT_CONFIG_STATUS_DECLARATIONS -# ------------------------------ -# We delimit libtool config variables with single quotes, so when -# we write them to config.status, we have to be sure to quote all -# embedded single quotes properly. In configure, this macro expands -# each variable declared with _LT_DECL (and _LT_TAGDECL) into: -# -# ='`$ECHO "$" | $SED "$delay_single_quote_subst"`' -m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], -[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), - [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) - - -# _LT_LIBTOOL_TAGS -# ---------------- -# Output comment and list of tags supported by the script -m4_defun([_LT_LIBTOOL_TAGS], -[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -available_tags="_LT_TAGS"dnl -]) - - -# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) -# ----------------------------------- -# Extract the dictionary values for VARNAME (optionally with TAG) and -# expand to a commented shell variable setting: -# -# # Some comment about what VAR is for. -# visible_name=$lt_internal_name -m4_define([_LT_LIBTOOL_DECLARE], -[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], - [description])))[]dnl -m4_pushdef([_libtool_name], - m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl -m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), - [0], [_libtool_name=[$]$1], - [1], [_libtool_name=$lt_[]$1], - [2], [_libtool_name=$lt_[]$1], - [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl -m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl -]) - - -# _LT_LIBTOOL_CONFIG_VARS -# ----------------------- -# Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' -# script. Tagged libtool config variables (even for the LIBTOOL CONFIG -# section) are produced by _LT_LIBTOOL_TAG_VARS. -m4_defun([_LT_LIBTOOL_CONFIG_VARS], -[m4_foreach([_lt_var], - m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) - - -# _LT_LIBTOOL_TAG_VARS(TAG) -# ------------------------- -m4_define([_LT_LIBTOOL_TAG_VARS], -[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) - - -# _LT_TAGVAR(VARNAME, [TAGNAME]) -# ------------------------------ -m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) - - -# _LT_CONFIG_COMMANDS -# ------------------- -# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of -# variables for single and double quote escaping we saved from calls -# to _LT_DECL, we can put quote escaped variables declarations -# into `config.status', and then the shell code to quote escape them in -# for loops in `config.status'. Finally, any additional code accumulated -# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. -m4_defun([_LT_CONFIG_COMMANDS], -[AC_PROVIDE_IFELSE([LT_OUTPUT], - dnl If the libtool generation code has been placed in $CONFIG_LT, - dnl instead of duplicating it all over again into config.status, - dnl then we will have config.status run $CONFIG_LT later, so it - dnl needs to know what name is stored there: - [AC_CONFIG_COMMANDS([libtool], - [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], - dnl If the libtool generation code is destined for config.status, - dnl expand the accumulated commands and init code now: - [AC_CONFIG_COMMANDS([libtool], - [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) -])#_LT_CONFIG_COMMANDS - - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], -[ - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -sed_quote_subst='$sed_quote_subst' -double_quote_subst='$double_quote_subst' -delay_variable_subst='$delay_variable_subst' -_LT_CONFIG_STATUS_DECLARATIONS -LTCC='$LTCC' -LTCFLAGS='$LTCFLAGS' -compiler='$compiler_DEFAULT' - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$[]1 -_LTECHO_EOF' -} - -# Quote evaled strings. -for var in lt_decl_all_varnames([[ \ -]], lt_decl_quote_varnames); do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -# Double-quote double-evaled strings. -for var in lt_decl_all_varnames([[ \ -]], lt_decl_dquote_varnames); do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -_LT_OUTPUT_LIBTOOL_INIT -]) - -# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) -# ------------------------------------ -# Generate a child script FILE with all initialization necessary to -# reuse the environment learned by the parent script, and make the -# file executable. If COMMENT is supplied, it is inserted after the -# `#!' sequence but before initialization text begins. After this -# macro, additional text can be appended to FILE to form the body of -# the child script. The macro ends with non-zero status if the -# file could not be fully written (such as if the disk is full). -m4_ifdef([AS_INIT_GENERATED], -[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], -[m4_defun([_LT_GENERATED_FILE_INIT], -[m4_require([AS_PREPARE])]dnl -[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl -[lt_write_fail=0 -cat >$1 <<_ASEOF || lt_write_fail=1 -#! $SHELL -# Generated by $as_me. -$2 -SHELL=\${CONFIG_SHELL-$SHELL} -export SHELL -_ASEOF -cat >>$1 <<\_ASEOF || lt_write_fail=1 -AS_SHELL_SANITIZE -_AS_PREPARE -exec AS_MESSAGE_FD>&1 -_ASEOF -test $lt_write_fail = 0 && chmod +x $1[]dnl -m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT - -# LT_OUTPUT -# --------- -# This macro allows early generation of the libtool script (before -# AC_OUTPUT is called), incase it is used in configure for compilation -# tests. -AC_DEFUN([LT_OUTPUT], -[: ${CONFIG_LT=./config.lt} -AC_MSG_NOTICE([creating $CONFIG_LT]) -_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], -[# Run this file to recreate a libtool stub with the current configuration.]) - -cat >>"$CONFIG_LT" <<\_LTEOF -lt_cl_silent=false -exec AS_MESSAGE_LOG_FD>>config.log -{ - echo - AS_BOX([Running $as_me.]) -} >&AS_MESSAGE_LOG_FD - -lt_cl_help="\ -\`$as_me' creates a local libtool stub from the current configuration, -for use in further configure time tests before the real libtool is -generated. - -Usage: $[0] [[OPTIONS]] - - -h, --help print this help, then exit - -V, --version print version number, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - -Report bugs to ." - -lt_cl_version="\ -m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl -m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) -configured by $[0], generated by m4_PACKAGE_STRING. - -Copyright (C) 2011 Free Software Foundation, Inc. -This config.lt script is free software; the Free Software Foundation -gives unlimited permision to copy, distribute and modify it." - -while test $[#] != 0 -do - case $[1] in - --version | --v* | -V ) - echo "$lt_cl_version"; exit 0 ;; - --help | --h* | -h ) - echo "$lt_cl_help"; exit 0 ;; - --debug | --d* | -d ) - debug=: ;; - --quiet | --q* | --silent | --s* | -q ) - lt_cl_silent=: ;; - - -*) AC_MSG_ERROR([unrecognized option: $[1] -Try \`$[0] --help' for more information.]) ;; - - *) AC_MSG_ERROR([unrecognized argument: $[1] -Try \`$[0] --help' for more information.]) ;; - esac - shift -done - -if $lt_cl_silent; then - exec AS_MESSAGE_FD>/dev/null -fi -_LTEOF - -cat >>"$CONFIG_LT" <<_LTEOF -_LT_OUTPUT_LIBTOOL_COMMANDS_INIT -_LTEOF - -cat >>"$CONFIG_LT" <<\_LTEOF -AC_MSG_NOTICE([creating $ofile]) -_LT_OUTPUT_LIBTOOL_COMMANDS -AS_EXIT(0) -_LTEOF -chmod +x "$CONFIG_LT" - -# configure is writing to config.log, but config.lt does its own redirection, -# appending to config.log, which fails on DOS, as config.log is still kept -# open by configure. Here we exec the FD to /dev/null, effectively closing -# config.log, so it can be properly (re)opened and appended to by config.lt. -lt_cl_success=: -test "$silent" = yes && - lt_config_lt_args="$lt_config_lt_args --quiet" -exec AS_MESSAGE_LOG_FD>/dev/null -$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false -exec AS_MESSAGE_LOG_FD>>config.log -$lt_cl_success || AS_EXIT(1) -])# LT_OUTPUT - - -# _LT_CONFIG(TAG) -# --------------- -# If TAG is the built-in tag, create an initial libtool script with a -# default configuration from the untagged config vars. Otherwise add code -# to config.status for appending the configuration named by TAG from the -# matching tagged config vars. -m4_defun([_LT_CONFIG], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -_LT_CONFIG_SAVE_COMMANDS([ - m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl - m4_if(_LT_TAG, [C], [ - # See if we are running on zsh, and set the options which allow our - # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - - cfgfile="${ofile}T" - trap "$RM \"$cfgfile\"; exit 1" 1 2 15 - $RM "$cfgfile" - - cat <<_LT_EOF >> "$cfgfile" -#! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -_LT_COPYING -_LT_LIBTOOL_TAGS - -# ### BEGIN LIBTOOL CONFIG -_LT_LIBTOOL_CONFIG_VARS -_LT_LIBTOOL_TAG_VARS -# ### END LIBTOOL CONFIG - -_LT_EOF - - case $host_os in - aix3*) - cat <<\_LT_EOF >> "$cfgfile" -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -_LT_EOF - ;; - esac - - _LT_PROG_LTMAIN - - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - _LT_PROG_REPLACE_SHELLFNS - - mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" -], -[cat <<_LT_EOF >> "$ofile" - -dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded -dnl in a comment (ie after a #). -# ### BEGIN LIBTOOL TAG CONFIG: $1 -_LT_LIBTOOL_TAG_VARS(_LT_TAG) -# ### END LIBTOOL TAG CONFIG: $1 -_LT_EOF -])dnl /m4_if -], -[m4_if([$1], [], [ - PACKAGE='$PACKAGE' - VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' - RM='$RM' - ofile='$ofile'], []) -])dnl /_LT_CONFIG_SAVE_COMMANDS -])# _LT_CONFIG - - -# LT_SUPPORTED_TAG(TAG) -# --------------------- -# Trace this macro to discover what tags are supported by the libtool -# --tag option, using: -# autoconf --trace 'LT_SUPPORTED_TAG:$1' -AC_DEFUN([LT_SUPPORTED_TAG], []) - - -# C support is built-in for now -m4_define([_LT_LANG_C_enabled], []) -m4_define([_LT_TAGS], []) - - -# LT_LANG(LANG) -# ------------- -# Enable libtool support for the given language if not already enabled. -AC_DEFUN([LT_LANG], -[AC_BEFORE([$0], [LT_OUTPUT])dnl -m4_case([$1], - [C], [_LT_LANG(C)], - [C++], [_LT_LANG(CXX)], - [Go], [_LT_LANG(GO)], - [Java], [_LT_LANG(GCJ)], - [Fortran 77], [_LT_LANG(F77)], - [Fortran], [_LT_LANG(FC)], - [Windows Resource], [_LT_LANG(RC)], - [m4_ifdef([_LT_LANG_]$1[_CONFIG], - [_LT_LANG($1)], - [m4_fatal([$0: unsupported language: "$1"])])])dnl -])# LT_LANG - - -# _LT_LANG(LANGNAME) -# ------------------ -m4_defun([_LT_LANG], -[m4_ifdef([_LT_LANG_]$1[_enabled], [], - [LT_SUPPORTED_TAG([$1])dnl - m4_append([_LT_TAGS], [$1 ])dnl - m4_define([_LT_LANG_]$1[_enabled], [])dnl - _LT_LANG_$1_CONFIG($1)])dnl -])# _LT_LANG - - -m4_ifndef([AC_PROG_GO], [ -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_GO. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # -m4_defun([AC_PROG_GO], -[AC_LANG_PUSH(Go)dnl -AC_ARG_VAR([GOC], [Go compiler command])dnl -AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl -_AC_ARG_VAR_LDFLAGS()dnl -AC_CHECK_TOOL(GOC, gccgo) -if test -z "$GOC"; then - if test -n "$ac_tool_prefix"; then - AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) - fi -fi -if test -z "$GOC"; then - AC_CHECK_PROG(GOC, gccgo, gccgo, false) -fi -])#m4_defun -])#m4_ifndef - - -# _LT_LANG_DEFAULT_CONFIG -# ----------------------- -m4_defun([_LT_LANG_DEFAULT_CONFIG], -[AC_PROVIDE_IFELSE([AC_PROG_CXX], - [LT_LANG(CXX)], - [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) - -AC_PROVIDE_IFELSE([AC_PROG_F77], - [LT_LANG(F77)], - [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) - -AC_PROVIDE_IFELSE([AC_PROG_FC], - [LT_LANG(FC)], - [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) - -dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal -dnl pulling things in needlessly. -AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [LT_LANG(GCJ)], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [LT_LANG(GCJ)], - [AC_PROVIDE_IFELSE([LT_PROG_GCJ], - [LT_LANG(GCJ)], - [m4_ifdef([AC_PROG_GCJ], - [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) - m4_ifdef([A][M_PROG_GCJ], - [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) - m4_ifdef([LT_PROG_GCJ], - [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) - -AC_PROVIDE_IFELSE([AC_PROG_GO], - [LT_LANG(GO)], - [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) - -AC_PROVIDE_IFELSE([LT_PROG_RC], - [LT_LANG(RC)], - [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) -])# _LT_LANG_DEFAULT_CONFIG - -# Obsolete macros: -AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) -AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) -AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) -AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) -AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_CXX], []) -dnl AC_DEFUN([AC_LIBTOOL_F77], []) -dnl AC_DEFUN([AC_LIBTOOL_FC], []) -dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) -dnl AC_DEFUN([AC_LIBTOOL_RC], []) - - -# _LT_TAG_COMPILER -# ---------------- -m4_defun([_LT_TAG_COMPILER], -[AC_REQUIRE([AC_PROG_CC])dnl - -_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl -_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl -_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl -_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC -])# _LT_TAG_COMPILER - - -# _LT_COMPILER_BOILERPLATE -# ------------------------ -# Check for compiler boilerplate output or warnings with -# the simple compiler test code. -m4_defun([_LT_COMPILER_BOILERPLATE], -[m4_require([_LT_DECL_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* -])# _LT_COMPILER_BOILERPLATE - - -# _LT_LINKER_BOILERPLATE -# ---------------------- -# Check for linker boilerplate output or warnings with -# the simple link test code. -m4_defun([_LT_LINKER_BOILERPLATE], -[m4_require([_LT_DECL_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* -])# _LT_LINKER_BOILERPLATE - -# _LT_REQUIRED_DARWIN_CHECKS -# ------------------------- -m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ - case $host_os in - rhapsody* | darwin*) - AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) - AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) - AC_CHECK_TOOL([LIPO], [lipo], [:]) - AC_CHECK_TOOL([OTOOL], [otool], [:]) - AC_CHECK_TOOL([OTOOL64], [otool64], [:]) - _LT_DECL([], [DSYMUTIL], [1], - [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) - _LT_DECL([], [NMEDIT], [1], - [Tool to change global to local symbols on Mac OS X]) - _LT_DECL([], [LIPO], [1], - [Tool to manipulate fat objects and archives on Mac OS X]) - _LT_DECL([], [OTOOL], [1], - [ldd/readelf like tool for Mach-O binaries on Mac OS X]) - _LT_DECL([], [OTOOL64], [1], - [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) - - AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], - [lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the - # link flags. - rm -rf libconftest.dylib* - echo "int foo(void){return 1;}" > conftest.c - echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ --dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib -Wl,-single_module conftest.c 2>conftest.err - _lt_result=$? - # If there is a non-empty error log, and "single_module" - # appears in it, assume the flag caused a linker warning - if test -s conftest.err && $GREP single_module conftest.err; then - cat conftest.err >&AS_MESSAGE_LOG_FD - # Otherwise, if the output was created with a 0 exit code from - # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&AS_MESSAGE_LOG_FD - fi - rm -rf libconftest.dylib* - rm -f conftest.* - fi]) - - AC_CACHE_CHECK([for -exported_symbols_list linker flag], - [lt_cv_ld_exported_symbols_list], - [lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [lt_cv_ld_exported_symbols_list=yes], - [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" - ]) - - AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], - [lt_cv_ld_force_load=no - cat > conftest.c << _LT_EOF -int forced_loaded() { return 2;} -_LT_EOF - echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD - echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD - $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD - cat > conftest.c << _LT_EOF -int main() { return 0;} -_LT_EOF - echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err - _lt_result=$? - if test -s conftest.err && $GREP force_load conftest.err; then - cat conftest.err >&AS_MESSAGE_LOG_FD - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then - lt_cv_ld_force_load=yes - else - cat conftest.err >&AS_MESSAGE_LOG_FD - fi - rm -f conftest.err libconftest.a conftest conftest.c - rm -rf conftest.dSYM - ]) - case $host_os in - rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; - darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[[012]]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - esac - ;; - esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then - _lt_dar_single_mod='$single_module' - fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' - else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= - fi - ;; - esac -]) - - -# _LT_DARWIN_LINKER_FEATURES([TAG]) -# --------------------------------- -# Checks for linker and compiler features on darwin -m4_defun([_LT_DARWIN_LINKER_FEATURES], -[ - m4_require([_LT_REQUIRED_DARWIN_CHECKS]) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_automatic, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], - [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) - else - _LT_TAGVAR(whole_archive_flag_spec, $1)='' - fi - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" - case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=func_echo_all - _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - m4_if([$1], [CXX], -[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi -],[]) - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -]) - -# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) -# ---------------------------------- -# Links a minimal program and checks the executable -# for the system default hardcoded library path. In most cases, -# this is /usr/lib:/lib, but when the MPI compilers are used -# the location of the communication and MPI libs are included too. -# If we don't find anything, use the default library path according -# to the aix ld manual. -# Store the results from the different compilers for each TAGNAME. -# Allow to override them for all tags through lt_cv_aix_libpath. -m4_defun([_LT_SYS_MODULE_PATH_AIX], -[m4_require([_LT_DECL_SED])dnl -if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], - [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ - lt_aix_libpath_sed='[ - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }]' - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi],[]) - if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" - fi - ]) - aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) -fi -])# _LT_SYS_MODULE_PATH_AIX - - -# _LT_SHELL_INIT(ARG) -# ------------------- -m4_define([_LT_SHELL_INIT], -[m4_divert_text([M4SH-INIT], [$1 -])])# _LT_SHELL_INIT - - - -# _LT_PROG_ECHO_BACKSLASH -# ----------------------- -# Find how we can fake an echo command that does not interpret backslash. -# In particular, with Autoconf 2.60 or later we add some code to the start -# of the generated configure script which will find a shell with a builtin -# printf (which we can use as an echo command). -m4_defun([_LT_PROG_ECHO_BACKSLASH], -[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - -AC_MSG_CHECKING([how to print strings]) -# Test print first, because it will be a builtin if present. -if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' -elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='printf %s\n' -else - # Use this function as a fallback that always works. - func_fallback_echo () - { - eval 'cat <<_LTECHO_EOF -$[]1 -_LTECHO_EOF' - } - ECHO='func_fallback_echo' -fi - -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} - -case "$ECHO" in - printf*) AC_MSG_RESULT([printf]) ;; - print*) AC_MSG_RESULT([print -r]) ;; - *) AC_MSG_RESULT([cat]) ;; -esac - -m4_ifdef([_AS_DETECT_SUGGESTED], -[_AS_DETECT_SUGGESTED([ - test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( - ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' - ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO - ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - PATH=/empty FPATH=/empty; export PATH FPATH - test "X`printf %s $ECHO`" = "X$ECHO" \ - || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) - -_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) -_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) -])# _LT_PROG_ECHO_BACKSLASH - - -# _LT_WITH_SYSROOT -# ---------------- -AC_DEFUN([_LT_WITH_SYSROOT], -[AC_MSG_CHECKING([for sysroot]) -AC_ARG_WITH([sysroot], -[ --with-sysroot[=DIR] Search for dependent libraries within DIR - (or the compiler's sysroot if not specified).], -[], [with_sysroot=no]) - -dnl lt_sysroot will always be passed unquoted. We quote it here -dnl in case the user passed a directory name. -lt_sysroot= -case ${with_sysroot} in #( - yes) - if test "$GCC" = yes; then - lt_sysroot=`$CC --print-sysroot 2>/dev/null` - fi - ;; #( - /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` - ;; #( - no|'') - ;; #( - *) - AC_MSG_RESULT([${with_sysroot}]) - AC_MSG_ERROR([The sysroot must be an absolute path.]) - ;; -esac - - AC_MSG_RESULT([${lt_sysroot:-no}]) -_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -[dependent libraries, and in which our libraries should be installed.])]) - -# _LT_ENABLE_LOCK -# --------------- -m4_defun([_LT_ENABLE_LOCK], -[AC_ARG_ENABLE([libtool-lock], - [AS_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* - ;; - -x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ -s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - powerpc64le-*linux*) - LD="${LD-ld} -m elf32lppclinux" - ;; - powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - powerpcle-*linux*) - LD="${LD-ld} -m elf64lppc" - ;; - powerpc-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*|s390*-*tpf*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_PUSH(C) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; -*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) - case $host in - i?86-*-solaris*) - LD="${LD-ld} -m elf_x86_64" - ;; - sparc*-*-solaris*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - # GNU ld 2.21 introduced _sol2 emulations. Use them if available. - if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" - fi - ;; - *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" - fi - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; -esac - -need_locks="$enable_libtool_lock" -])# _LT_ENABLE_LOCK - - -# _LT_PROG_AR -# ----------- -m4_defun([_LT_PROG_AR], -[AC_CHECK_TOOLS(AR, [ar], false) -: ${AR=ar} -: ${AR_FLAGS=cru} -_LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) - -AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], - [lt_cv_ar_at_file=no - AC_COMPILE_IFELSE([AC_LANG_PROGRAM], - [echo conftest.$ac_objext > conftest.lst - lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' - AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -eq 0; then - # Ensure the archiver fails upon bogus file names. - rm -f conftest.$ac_objext libconftest.a - AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -ne 0; then - lt_cv_ar_at_file=@ - fi - fi - rm -f conftest.* libconftest.a - ]) - ]) - -if test "x$lt_cv_ar_at_file" = xno; then - archiver_list_spec= -else - archiver_list_spec=$lt_cv_ar_at_file -fi -_LT_DECL([], [archiver_list_spec], [1], - [How to feed a file listing to the archiver]) -])# _LT_PROG_AR - - -# _LT_CMD_OLD_ARCHIVE -# ------------------- -m4_defun([_LT_CMD_OLD_ARCHIVE], -[_LT_PROG_AR - -AC_CHECK_TOOL(STRIP, strip, :) -test -z "$STRIP" && STRIP=: -_LT_DECL([], [STRIP], [1], [A symbol stripping program]) - -AC_CHECK_TOOL(RANLIB, ranlib, :) -test -z "$RANLIB" && RANLIB=: -_LT_DECL([], [RANLIB], [1], - [Commands used to install an old-style archive]) - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" -fi - -case $host_os in - darwin*) - lock_old_archive_extraction=yes ;; - *) - lock_old_archive_extraction=no ;; -esac -_LT_DECL([], [old_postinstall_cmds], [2]) -_LT_DECL([], [old_postuninstall_cmds], [2]) -_LT_TAGDECL([], [old_archive_cmds], [2], - [Commands used to build an old-style archive]) -_LT_DECL([], [lock_old_archive_extraction], [0], - [Whether to use a lock for old archive extraction]) -])# _LT_CMD_OLD_ARCHIVE - - -# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------------------- -# Check whether the given compiler option works -AC_DEFUN([_LT_COMPILER_OPTION], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_SED])dnl -AC_CACHE_CHECK([$1], [$2], - [$2=no - m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - fi - $RM conftest* -]) - -if test x"[$]$2" = xyes; then - m4_if([$5], , :, [$5]) -else - m4_if([$6], , :, [$6]) -fi -])# _LT_COMPILER_OPTION - -# Old name: -AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) - - -# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------- -# Check whether the given linker option works -AC_DEFUN([_LT_LINKER_OPTION], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_SED])dnl -AC_CACHE_CHECK([$1], [$2], - [$2=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $3" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&AS_MESSAGE_LOG_FD - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - else - $2=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" -]) - -if test x"[$]$2" = xyes; then - m4_if([$4], , :, [$4]) -else - m4_if([$5], , :, [$5]) -fi -])# _LT_LINKER_OPTION - -# Old name: -AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) - - -# LT_CMD_MAX_LEN -#--------------- -AC_DEFUN([LT_CMD_MAX_LEN], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -# find the maximum length of command line arguments -AC_MSG_CHECKING([the maximum length of command line arguments]) -AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl - i=0 - teststring="ABCD" - - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; - - cygwin* | mingw* | cegcc*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; - - mint*) - # On MiNT this can take a long time and run out of memory. - lt_cv_sys_max_cmd_len=8192; - ;; - - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; - - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - - os2*) - # The test takes a long time on OS/2. - lt_cv_sys_max_cmd_len=8192 - ;; - - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else - # Make teststring a little bigger before we do anything with it. - # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do - teststring=$teststring$teststring - done - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ - = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - # Only check the string length outside the loop. - lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` - teststring= - # Add a significant safety factor because C++ compilers can tack on - # massive amounts of additional arguments before passing them to the - # linker. It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - fi - ;; - esac -]) -if test -n $lt_cv_sys_max_cmd_len ; then - AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -else - AC_MSG_RESULT(none) -fi -max_cmd_len=$lt_cv_sys_max_cmd_len -_LT_DECL([], [max_cmd_len], [0], - [What is the maximum length of a command?]) -])# LT_CMD_MAX_LEN - -# Old name: -AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) - - -# _LT_HEADER_DLFCN -# ---------------- -m4_defun([_LT_HEADER_DLFCN], -[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl -])# _LT_HEADER_DLFCN - - -# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -# ---------------------------------------------------------------- -m4_defun([_LT_TRY_DLOPEN_SELF], -[m4_require([_LT_HEADER_DLFCN])dnl -if test "$cross_compiling" = yes; then : - [$4] -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -[#line $LINENO "configure" -#include "confdefs.h" - -#if HAVE_DLFCN_H -#include -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -/* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -int fnord () __attribute__((visibility("default"))); -#endif - -int fnord () { return 42; } -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else - { - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - else puts (dlerror ()); - } - /* dlclose (self); */ - } - else - puts (dlerror ()); - - return status; -}] -_LT_EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) $1 ;; - x$lt_dlneed_uscore) $2 ;; - x$lt_dlunknown|x*) $3 ;; - esac - else : - # compilation failed - $3 - fi -fi -rm -fr conftest* -])# _LT_TRY_DLOPEN_SELF - - -# LT_SYS_DLOPEN_SELF -# ------------------ -AC_DEFUN([LT_SYS_DLOPEN_SELF], -[m4_require([_LT_HEADER_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ]) - ;; - - *) - AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], - [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], - [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], - [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], - [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], - [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) - ]) - ]) - ]) - ]) - ]) - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - AC_CACHE_CHECK([whether a program can dlopen itself], - lt_cv_dlopen_self, [dnl - _LT_TRY_DLOPEN_SELF( - lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, - lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) - ]) - - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - AC_CACHE_CHECK([whether a statically linked program can dlopen itself], - lt_cv_dlopen_self_static, [dnl - _LT_TRY_DLOPEN_SELF( - lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, - lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) - ]) - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi -_LT_DECL([dlopen_support], [enable_dlopen], [0], - [Whether dlopen is supported]) -_LT_DECL([dlopen_self], [enable_dlopen_self], [0], - [Whether dlopen of programs is supported]) -_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], - [Whether dlopen of statically linked programs is supported]) -])# LT_SYS_DLOPEN_SELF - -# Old name: -AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) - - -# _LT_COMPILER_C_O([TAGNAME]) -# --------------------------- -# Check to see if options -c and -o are simultaneously supported by compiler. -# This macro does not hard code the compiler like AC_PROG_CC_C_O. -m4_defun([_LT_COMPILER_C_O], -[m4_require([_LT_DECL_SED])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_TAG_COMPILER])dnl -AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], - [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], - [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - fi - fi - chmod u+w . 2>&AS_MESSAGE_LOG_FD - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* -]) -_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], - [Does compiler simultaneously support -c and -o options?]) -])# _LT_COMPILER_C_O - - -# _LT_COMPILER_FILE_LOCKS([TAGNAME]) -# ---------------------------------- -# Check to see if we can do hard links to lock some files if needed -m4_defun([_LT_COMPILER_FILE_LOCKS], -[m4_require([_LT_ENABLE_LOCK])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -_LT_COMPILER_C_O([$1]) - -hard_links="nottested" -if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - AC_MSG_CHECKING([if we can lock with hard links]) - hard_links=yes - $RM conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) - need_locks=warn - fi -else - need_locks=no -fi -_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) -])# _LT_COMPILER_FILE_LOCKS - - -# _LT_CHECK_OBJDIR -# ---------------- -m4_defun([_LT_CHECK_OBJDIR], -[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], -[rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null]) -objdir=$lt_cv_objdir -_LT_DECL([], [objdir], [0], - [The name of the directory that contains temporary libtool files])dnl -m4_pattern_allow([LT_OBJDIR])dnl -AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", - [Define to the sub-directory in which libtool stores uninstalled libraries.]) -])# _LT_CHECK_OBJDIR - - -# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) -# -------------------------------------- -# Check hardcoding attributes. -m4_defun([_LT_LINKER_HARDCODE_LIBPATH], -[AC_MSG_CHECKING([how to hardcode library paths into programs]) -_LT_TAGVAR(hardcode_action, $1)= -if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || - test -n "$_LT_TAGVAR(runpath_var, $1)" || - test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then - - # We can hardcode non-existent directories. - if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then - # Linking always hardcodes the temporary library directory. - _LT_TAGVAR(hardcode_action, $1)=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - _LT_TAGVAR(hardcode_action, $1)=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - _LT_TAGVAR(hardcode_action, $1)=unsupported -fi -AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) - -if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || - test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi -_LT_TAGDECL([], [hardcode_action], [0], - [How to hardcode a shared library path into an executable]) -])# _LT_LINKER_HARDCODE_LIBPATH - - -# _LT_CMD_STRIPLIB -# ---------------- -m4_defun([_LT_CMD_STRIPLIB], -[m4_require([_LT_DECL_EGREP]) -striplib= -old_striplib= -AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac -fi -_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) -_LT_DECL([], [striplib], [1]) -])# _LT_CMD_STRIPLIB - - -# _LT_SYS_DYNAMIC_LINKER([TAG]) -# ----------------------------- -# PORTME Fill in your ld.so characteristics -m4_defun([_LT_SYS_DYNAMIC_LINKER], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_OBJDUMP])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_CHECK_SHELL_FEATURES])dnl -AC_MSG_CHECKING([dynamic linker characteristics]) -m4_if([$1], - [], [ -if test "$GCC" = yes; then - case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac - case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` - case $lt_search_path_spec in - *\;*) - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` - ;; - *) - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` - ;; - esac - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else - test -d "$lt_sys_path" && \ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done - lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; - } else { - lt_count--; - } - } - } - } - if (lt_foo != "") { lt_freq[[lt_foo]]++; } - if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -}'` - # AWK program above erroneously prepends '/' to C:/dos/paths - # for these hosts. - case $host_os in - mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; - esac - sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi]) -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix[[4-9]]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[[01]] | aix4.[[01]].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - case $host_cpu in - powerpc) - # Since July 2007 AmigaOS4 officially supports .so libraries. - # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - ;; - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[[45]]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32* | cegcc*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$cc_basename in - yes,*) - # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) - ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - esac - dynamic_linker='Win32 ld.exe' - ;; - - *,cl*) - # Native MSVC - libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' - - case $build_os in - mingw*) - sys_lib_search_path_spec= - lt_save_ifs=$IFS - IFS=';' - for lt_path in $LIB - do - IFS=$lt_save_ifs - # Let DOS variable expansion print the short 8.3 style file name. - lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` - sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" - done - IFS=$lt_save_ifs - # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` - ;; - cygwin*) - # Convert to unix form, then to dos form, then back to unix form - # but this time dos style (no spaces!) so that the unix form looks - # like /cygdrive/c/PROGRA~1:/cygdr... - sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` - sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` - sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - ;; - *) - sys_lib_search_path_spec="$LIB" - if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then - # It is most probably a Windows format PATH. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - # FIXME: find the short name or the path components, as spaces are - # common. (e.g. "Program Files" -> "PROGRA~1") - ;; - esac - - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - dynamic_linker='Win32 link.exe' - ;; - - *) - # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' - dynamic_linker='Win32 ld.exe' - ;; - esac - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[[23]].*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2.*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[[01]]* | freebsdelf3.[[01]]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ - freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -haiku*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555, ... - postinstall_cmds='chmod 555 $lib' - # or fails outright, so override atomically: - install_override_mode=555 - ;; - -interix[[3-9]]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux # correct to gnu/linux during the next big refactor - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - - # Some binutils ld are patched to set DT_RUNPATH - AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], - [lt_cv_shlibpath_overrides_runpath=no - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ - LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], - [lt_cv_shlibpath_overrides_runpath=yes])]) - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - ]) - shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -*nto* | *qnx*) - version_type=qnx - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='ldqnx.so' - ;; - -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -rdos*) - dynamic_linker=no - ;; - -solaris*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -uts4*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -fi - -_LT_DECL([], [variables_saved_for_relink], [1], - [Variables whose values should be saved in libtool wrapper scripts and - restored at link time]) -_LT_DECL([], [need_lib_prefix], [0], - [Do we need the "lib" prefix for modules?]) -_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) -_LT_DECL([], [version_type], [0], [Library versioning type]) -_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) -_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) -_LT_DECL([], [shlibpath_overrides_runpath], [0], - [Is shlibpath searched before the hard-coded library search path?]) -_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) -_LT_DECL([], [library_names_spec], [1], - [[List of archive names. First name is the real one, the rest are links. - The last name is the one that the linker finds with -lNAME]]) -_LT_DECL([], [soname_spec], [1], - [[The coded name of the library, if different from the real name]]) -_LT_DECL([], [install_override_mode], [1], - [Permission mode override for installation of shared libraries]) -_LT_DECL([], [postinstall_cmds], [2], - [Command to use after installation of a shared archive]) -_LT_DECL([], [postuninstall_cmds], [2], - [Command to use after uninstallation of a shared archive]) -_LT_DECL([], [finish_cmds], [2], - [Commands used to finish a libtool library installation in a directory]) -_LT_DECL([], [finish_eval], [1], - [[As "finish_cmds", except a single script fragment to be evaled but - not shown]]) -_LT_DECL([], [hardcode_into_libs], [0], - [Whether we should hardcode library paths into libraries]) -_LT_DECL([], [sys_lib_search_path_spec], [2], - [Compile-time system search path for libraries]) -_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], - [Run-time system search path for libraries]) -])# _LT_SYS_DYNAMIC_LINKER - - -# _LT_PATH_TOOL_PREFIX(TOOL) -# -------------------------- -# find a file program which can recognize shared library -AC_DEFUN([_LT_PATH_TOOL_PREFIX], -[m4_require([_LT_DECL_EGREP])dnl -AC_MSG_CHECKING([for $1]) -AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -[case $MAGIC_CMD in -[[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -dnl $ac_dummy forces splitting on constant user-supplied paths. -dnl POSIX.2 word splitting is done only on the output of word expansions, -dnl not every word. This closes a longstanding sh security hole. - ac_dummy="m4_if([$2], , $PATH, [$2])" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<_LT_EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -_LT_EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - AC_MSG_RESULT($MAGIC_CMD) -else - AC_MSG_RESULT(no) -fi -_LT_DECL([], [MAGIC_CMD], [0], - [Used to examine libraries when file_magic_cmd begins with "file"])dnl -])# _LT_PATH_TOOL_PREFIX - -# Old name: -AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) - - -# _LT_PATH_MAGIC -# -------------- -# find a file program which can recognize a shared library -m4_defun([_LT_PATH_MAGIC], -[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) - else - MAGIC_CMD=: - fi -fi -])# _LT_PATH_MAGIC - - -# LT_PATH_LD -# ---------- -# find the pathname to the GNU or non-GNU linker -AC_DEFUN([LT_PATH_LD], -[AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_PROG_ECHO_BACKSLASH])dnl - -AC_ARG_WITH([gnu-ld], - [AS_HELP_STRING([--with-gnu-ld], - [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], - [with_gnu_ld=no])dnl - -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by $CC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]]* | ?:[[\\/]]*) - re_direlt='/[[^/]][[^/]]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(lt_cv_path_LD, -[if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else - # Keep this pattern in sync with the one in func_win32_libid. - lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; - -cegcc*) - # use the weaker test based on 'objdump'. See mingw*. - lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - ;; - -darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; - -freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; - -interix[[3-9]]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' - ;; - -irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - -netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' - fi - ;; - -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -*nto* | *qnx*) - lt_cv_deplibs_check_method=pass_all - ;; - -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - fi - ;; - -osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; - -rdos*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv4 | sysv4.3*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; - esac - ;; - -tpf*) - lt_cv_deplibs_check_method=pass_all - ;; -esac -]) - -file_magic_glob= -want_nocaseglob=no -if test "$build" = "$host"; then - case $host_os in - mingw* | pw32*) - if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then - want_nocaseglob=yes - else - file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` - fi - ;; - esac -fi - -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -test -z "$deplibs_check_method" && deplibs_check_method=unknown - -_LT_DECL([], [deplibs_check_method], [1], - [Method to check whether dependent libraries are shared objects]) -_LT_DECL([], [file_magic_cmd], [1], - [Command to use when deplibs_check_method = "file_magic"]) -_LT_DECL([], [file_magic_glob], [1], - [How to find potential files when deplibs_check_method = "file_magic"]) -_LT_DECL([], [want_nocaseglob], [1], - [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) -])# _LT_CHECK_MAGIC_METHOD - - -# LT_PATH_NM -# ---------- -# find the pathname to a BSD- or MS-compatible name lister -AC_DEFUN([LT_PATH_NM], -[AC_REQUIRE([AC_PROG_CC])dnl -AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, -[if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -else - lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac - ;; - esac - fi - done - IFS="$lt_save_ifs" - done - : ${lt_cv_path_NM=no} -fi]) -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" -else - # Didn't find any BSD compatible name lister, look for dumpbin. - if test -n "$DUMPBIN"; then : - # Let the user override the test. - else - AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in - *COFF*) - DUMPBIN="$DUMPBIN -symbols" - ;; - *) - DUMPBIN=: - ;; - esac - fi - AC_SUBST([DUMPBIN]) - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" - fi -fi -test -z "$NM" && NM=nm -AC_SUBST([NM]) -_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl - -AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], - [lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) - cat conftest.out >&AS_MESSAGE_LOG_FD - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" - fi - rm -f conftest*]) -])# LT_PATH_NM - -# Old names: -AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) -AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_PROG_NM], []) -dnl AC_DEFUN([AC_PROG_NM], []) - -# _LT_CHECK_SHAREDLIB_FROM_LINKLIB -# -------------------------------- -# how to determine the name of the shared library -# associated with a specific link library. -# -- PORTME fill in with the dynamic library characteristics -m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], -[m4_require([_LT_DECL_EGREP]) -m4_require([_LT_DECL_OBJDUMP]) -m4_require([_LT_DECL_DLLTOOL]) -AC_CACHE_CHECK([how to associate runtime and link libraries], -lt_cv_sharedlib_from_linklib_cmd, -[lt_cv_sharedlib_from_linklib_cmd='unknown' - -case $host_os in -cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL - case `$DLLTOOL --help 2>&1` in - *--identify-strict*) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib - ;; - *) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback - ;; - esac - ;; -*) - # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" - ;; -esac -]) -sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO - -_LT_DECL([], [sharedlib_from_linklib_cmd], [1], - [Command to associate shared and link libraries]) -])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB - - -# _LT_PATH_MANIFEST_TOOL -# ---------------------- -# locate the manifest tool -m4_defun([_LT_PATH_MANIFEST_TOOL], -[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) -test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], - [lt_cv_path_mainfest_tool=no - echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD - $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out - cat conftest.err >&AS_MESSAGE_LOG_FD - if $GREP 'Manifest Tool' conftest.out > /dev/null; then - lt_cv_path_mainfest_tool=yes - fi - rm -f conftest*]) -if test "x$lt_cv_path_mainfest_tool" != xyes; then - MANIFEST_TOOL=: -fi -_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl -])# _LT_PATH_MANIFEST_TOOL - - -# LT_LIB_M -# -------- -# check for math library -AC_DEFUN([LT_LIB_M], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -LIBM= -case $host in -*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; -*-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") - AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") - ;; -*) - AC_CHECK_LIB(m, cos, LIBM="-lm") - ;; -esac -AC_SUBST([LIBM]) -])# LT_LIB_M - -# Old name: -AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_CHECK_LIBM], []) - - -# _LT_COMPILER_NO_RTTI([TAGNAME]) -# ------------------------------- -m4_defun([_LT_COMPILER_NO_RTTI], -[m4_require([_LT_TAG_COMPILER])dnl - -_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - -if test "$GCC" = yes; then - case $cc_basename in - nvcc*) - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; - *) - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; - esac - - _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], - lt_cv_prog_compiler_rtti_exceptions, - [-fno-rtti -fno-exceptions], [], - [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) -fi -_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], - [Compiler flag to turn off builtin functions]) -])# _LT_COMPILER_NO_RTTI - - -# _LT_CMD_GLOBAL_SYMBOLS -# ---------------------- -m4_defun([_LT_CMD_GLOBAL_SYMBOLS], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([LT_PATH_NM])dnl -AC_REQUIRE([LT_PATH_LD])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_TAG_COMPILER])dnl - -# Check for command to grab the raw symbol name followed by C symbol from nm. -AC_MSG_CHECKING([command to parse $NM output from $compiler object]) -AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], -[ -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -# Character class describing NM global symbol codes. -symcode='[[BCDEGRST]]' - -# Regexp to match symbols that can be accessed directly from C. -sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' - -# Define system-specific variables. -case $host_os in -aix*) - symcode='[[BCDT]]' - ;; -cygwin* | mingw* | pw32* | cegcc*) - symcode='[[ABCDGISTW]]' - ;; -hpux*) - if test "$host_cpu" = ia64; then - symcode='[[ABCDEGRST]]' - fi - ;; -irix* | nonstopux*) - symcode='[[BCDEGRST]]' - ;; -osf*) - symcode='[[BCDEGQRST]]' - ;; -solaris*) - symcode='[[BDRT]]' - ;; -sco3.2v5*) - symcode='[[DT]]' - ;; -sysv4.2uw2*) - symcode='[[DT]]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[[ABDT]]' - ;; -sysv4) - symcode='[[DFNSTU]]' - ;; -esac - -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[[ABCDGIRSTW]]' ;; -esac - -# Transform an extracted symbol line into a proper C declaration. -# Some systems (esp. on ia64) link data and code symbols differently, -# so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac - -# Try without a prefix underscore, then with it. -for ac_symprfx in "" "_"; do - - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" - - # Write the raw and C identifiers. - if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. - # Also find C++ and __fastcall symbols from MSVC++, - # which start with @ or ?. - lt_cv_sys_global_symbol_pipe="$AWK ['"\ -" {last_section=section; section=\$ 3};"\ -" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ -" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ -" \$ 0!~/External *\|/{next};"\ -" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ -" {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ -" ' prfx=^$ac_symprfx]" - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no - - rm -f conftest* - cat > conftest.$ac_ext <<_LT_EOF -#ifdef __cplusplus -extern "C" { -#endif -char nm_test_var; -void nm_test_func(void); -void nm_test_func(void){} -#ifdef __cplusplus -} -#endif -int main(){nm_test_var='a';nm_test_func();return(0);} -_LT_EOF - - if AC_TRY_EVAL(ac_compile); then - # Now try to grab the symbols. - nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi - - # Make sure that we snagged all the symbols we need. - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ -# define LT@&t@_DLSYM_CONST -#elif defined(__osf__) -/* This system does not cope well with relocations in const data. */ -# define LT@&t@_DLSYM_CONST -#else -# define LT@&t@_DLSYM_CONST const -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -_LT_EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' - - cat <<_LT_EOF >> conftest.$ac_ext - -/* The mapping between symbol names and symbols. */ -LT@&t@_DLSYM_CONST struct { - const char *name; - void *address; -} -lt__PROGRAM__LTX_preloaded_symbols[[]] = -{ - { "@PROGRAM@", (void *) 0 }, -_LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext - cat <<\_LT_EOF >> conftest.$ac_ext - {0, (void *) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt__PROGRAM__LTX_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif -_LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_globsym_save_LIBS=$LIBS - lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then - pipe_works=yes - fi - LIBS=$lt_globsym_save_LIBS - CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD - fi - else - echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD - cat conftest.$ac_ext >&5 - fi - rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done -]) -if test -z "$lt_cv_sys_global_symbol_pipe"; then - lt_cv_sys_global_symbol_to_cdecl= -fi -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - AC_MSG_RESULT(failed) -else - AC_MSG_RESULT(ok) -fi - -# Response file support. -if test "$lt_cv_nm_interface" = "MS dumpbin"; then - nm_file_list_spec='@' -elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then - nm_file_list_spec='@' -fi - -_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], - [Take the output of nm and produce a listing of raw symbols and C names]) -_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], - [Transform the output of nm in a proper C declaration]) -_LT_DECL([global_symbol_to_c_name_address], - [lt_cv_sys_global_symbol_to_c_name_address], [1], - [Transform the output of nm in a C name address pair]) -_LT_DECL([global_symbol_to_c_name_address_lib_prefix], - [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], - [Transform the output of nm in a C name address pair when lib prefix is needed]) -_LT_DECL([], [nm_file_list_spec], [1], - [Specify filename containing input files for $NM]) -]) # _LT_CMD_GLOBAL_SYMBOLS - - -# _LT_COMPILER_PIC([TAGNAME]) -# --------------------------- -m4_defun([_LT_COMPILER_PIC], -[m4_require([_LT_TAG_COMPILER])dnl -_LT_TAGVAR(lt_prog_compiler_wl, $1)= -_LT_TAGVAR(lt_prog_compiler_pic, $1)= -_LT_TAGVAR(lt_prog_compiler_static, $1)= - -m4_if([$1], [CXX], [ - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - _LT_TAGVAR(lt_prog_compiler_static, $1)= - ;; - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - case $host_os in - aix[[4-9]]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - dgux*) - case $cc_basename in - ec++*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - fi - ;; - aCC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - KCC*) - # KAI C++ Compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - icpc* ) - # Intel C++, used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) - # IBM XL 8.0, 9.0 on PPC and BlueGene - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd*) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - cxx*) - # Digital/Compaq C++ - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - lcc*) - # Lucid - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - *) - ;; - esac - ;; - vxworks*) - ;; - *) - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -], -[ - if test "$GCC" = yes; then - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - _LT_TAGVAR(lt_prog_compiler_static, $1)= - ;; - - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - - interix[[3-9]]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - enable_shared=no - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - - case $cc_basename in - nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" - fi - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; - - hpux9* | hpux10* | hpux11*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC (with -KPIC) is the default. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. - ecc*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - # icc used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - icc* | ifort*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - # Lahey Fortran 8.1. - lf95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' - _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' - ;; - nagfor*) - # NAG Fortran compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - ccc*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All Alpha code is PIC. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - xl* | bgxl* | bgf* | mpixl*) - # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='' - ;; - *Sun\ F* | *Sun*Fortran*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - *Sun\ C*) - # Sun C 5.9 - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - ;; - *Intel*\ [[CF]]*Compiler*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - *Portland\ Group*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - esac - ;; - esac - ;; - - newsos6) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' - ;; - - osf3* | osf4* | osf5*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All OSF/1 code is PIC. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - rdos*) - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - solaris*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - case $cc_basename in - f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; - *) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; - esac - ;; - - sunos4*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - unicos*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - - uts4*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - *) - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -]) -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - *) - _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" - ;; -esac - -AC_CACHE_CHECK([for $compiler option to produce PIC], - [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], - [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then - _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], - [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], - [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], - [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in - "" | " "*) ;; - *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; - esac], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) -fi -_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], - [Additional compiler flags for building library objects]) - -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], - [How to pass a linker flag through the compiler]) -# -# Check to make sure the static flag actually works. -# -wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" -_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], - _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), - $lt_tmp_static_flag, - [], - [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) -_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], - [Compiler flag to prevent dynamic linking]) -])# _LT_COMPILER_PIC - - -# _LT_LINKER_SHLIBS([TAGNAME]) -# ---------------------------- -# See if the linker supports building shared libraries. -m4_defun([_LT_LINKER_SHLIBS], -[AC_REQUIRE([LT_PATH_LD])dnl -AC_REQUIRE([LT_PATH_NM])dnl -m4_require([_LT_PATH_MANIFEST_TOOL])dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_DECL_SED])dnl -m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -m4_require([_LT_TAG_COMPILER])dnl -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -m4_if([$1], [CXX], [ - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - case $host_os in - aix[[4-9]]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; - cygwin* | mingw* | cegcc*) - case $cc_basename in - cl*) - _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] - ;; - esac - ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac -], [ - runpath_var= - _LT_TAGVAR(allow_undefined_flag, $1)= - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(archive_cmds, $1)= - _LT_TAGVAR(archive_expsym_cmds, $1)= - _LT_TAGVAR(compiler_needs_object, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(hardcode_automatic, $1)=no - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_separator, $1)= - _LT_TAGVAR(hardcode_minus_L, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_TAGVAR(inherit_rpath, $1)=no - _LT_TAGVAR(link_all_deplibs, $1)=unknown - _LT_TAGVAR(module_cmds, $1)= - _LT_TAGVAR(module_expsym_cmds, $1)= - _LT_TAGVAR(old_archive_from_new_cmds, $1)= - _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= - _LT_TAGVAR(thread_safe_flag_spec, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - _LT_TAGVAR(include_expsyms, $1)= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. -dnl Note also adjust exclude_expsyms for C++ above. - extract_expsyms_cmds= - - case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; - esac - - _LT_TAGVAR(ld_shlibs, $1)=yes - - # On some targets, GNU ld is compatible enough with the native linker - # that we're better off using the native interface for both. - lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then - case $host_os in - aix*) - # The AIX port of GNU ld has always aspired to compatibility - # with the native linker. However, as the warning in the GNU ld - # block says, versions before 2.19.5* couldn't really create working - # shared libraries, regardless of the interface used. - case `$LD -v 2>&1` in - *\ \(GNU\ Binutils\)\ 2.19.5*) ;; - *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; - *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - fi - - if test "$lt_use_gnu_ld_interface" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - supports_anon_versioning=no - case `$LD -v 2>&1` in - *GNU\ gold*) supports_anon_versioning=yes ;; - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - - # See if GNU ld supports shared libraries. - case $host_os in - aix[[3-9]]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: the GNU linker, at least up to release 2.19, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to install binutils -*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. -*** You will then need to restart the configuration process. - -_LT_EOF - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='' - ;; - m68k) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - interix[[3-9]]*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - - gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) - tmp_diet=no - if test "$host_os" = linux-dietlibc; then - case $cc_basename in - diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) - esac - fi - if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no - then - tmp_addflag=' $pic_flag' - tmp_sharedflag='-shared' - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - lf95*) # Lahey Fortran 8.1 - _LT_TAGVAR(whole_archive_flag_spec, $1)= - tmp_sharedflag='--shared' ;; - xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) - tmp_sharedflag='-qmkshrobj' - tmp_addflag= ;; - nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - esac - _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - - case $cc_basename in - xlf* | bgf* | bgxlf* | mpixlf*) - # IBM XL Fortran 10.1 on PPC cannot create shared libs itself - _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris*) - if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - ;; - *) - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - sunos4*) - _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - - if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then - runpath_var= - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - _LT_TAGVAR(hardcode_direct, $1)=unsupported - fi - ;; - - aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_TAGVAR(archive_cmds, $1)='' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' - - if test "$GCC" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='' - ;; - m68k) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - ;; - - bsdi[[45]]*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - case $cc_basename in - cl*) - # Native MSVC - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' - # Don't use ranlib - _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' - _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # Assume MSVC wrapper - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - esac - ;; - - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; - - dgux*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2.*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - hpux9*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_direct, $1)=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - m4_if($1, [], [ - # Older versions of the 11.00 compiler do not understand -b yet - # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) - _LT_LINKER_OPTION([if $CC understands -b], - _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], - [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) - ;; - esac - fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. - # This should be the same for all languages, so no per-tag cache variable. - AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], - [lt_cv_irix_exported_symbol], - [save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - AC_LINK_IFELSE( - [AC_LANG_SOURCE( - [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], - [C++], [[int foo (void) { return 0; }]], - [Fortran 77], [[ - subroutine foo - end]], - [Fortran], [[ - subroutine foo - end]])])], - [lt_cv_irix_exported_symbol=yes], - [lt_cv_irix_exported_symbol=no]) - LDFLAGS="$save_LDFLAGS"]) - if test "$lt_cv_irix_exported_symbol" = yes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - fi - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(inherit_rpath, $1)=yes - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - newsos6) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *nto* | *qnx*) - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac - fi - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - os2*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' - - # Both c and cxx compiler support -rpath directly - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - solaris*) - _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) - wlarc='' - _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' - ;; - *) - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - ;; - esac - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - fi - ;; - esac - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4) - case $host_vendor in - sni) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' - _LT_TAGVAR(hardcode_direct, $1)=no - ;; - motorola) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4.3*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - _LT_TAGVAR(ld_shlibs, $1)=yes - fi - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - uts4*) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - - if test x$host_vendor = xsni; then - case $host in - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' - ;; - esac - fi - fi -]) -AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld - -_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl -_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl -_LT_DECL([], [extract_expsyms_cmds], [2], - [The commands to extract the exported symbol list from a shared archive]) - -# -# Do we need to explicitly link libc? -# -case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in -x|xyes) - # Assume -lc should be added - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $_LT_TAGVAR(archive_cmds, $1) in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - AC_CACHE_CHECK([whether -lc should be explicitly linked in], - [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), - [$RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) - pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) - _LT_TAGVAR(allow_undefined_flag, $1)= - if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) - then - lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no - else - lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes - fi - _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - ]) - _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) - ;; - esac - fi - ;; -esac - -_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], - [Whether or not to add -lc for building shared libraries]) -_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], - [enable_shared_with_static_runtimes], [0], - [Whether or not to disallow shared libs when runtime libs are static]) -_LT_TAGDECL([], [export_dynamic_flag_spec], [1], - [Compiler flag to allow reflexive dlopens]) -_LT_TAGDECL([], [whole_archive_flag_spec], [1], - [Compiler flag to generate shared objects directly from archives]) -_LT_TAGDECL([], [compiler_needs_object], [1], - [Whether the compiler copes with passing no objects directly]) -_LT_TAGDECL([], [old_archive_from_new_cmds], [2], - [Create an old-style archive from a shared archive]) -_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], - [Create a temporary old-style archive to link instead of a shared archive]) -_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) -_LT_TAGDECL([], [archive_expsym_cmds], [2]) -_LT_TAGDECL([], [module_cmds], [2], - [Commands used to build a loadable module if different from building - a shared archive.]) -_LT_TAGDECL([], [module_expsym_cmds], [2]) -_LT_TAGDECL([], [with_gnu_ld], [1], - [Whether we are building with GNU ld or not]) -_LT_TAGDECL([], [allow_undefined_flag], [1], - [Flag that allows shared libraries with undefined symbols to be built]) -_LT_TAGDECL([], [no_undefined_flag], [1], - [Flag that enforces no undefined symbols]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], - [Flag to hardcode $libdir into a binary during linking. - This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_separator], [1], - [Whether we need a single "-rpath" flag with a separated argument]) -_LT_TAGDECL([], [hardcode_direct], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes - DIR into the resulting binary]) -_LT_TAGDECL([], [hardcode_direct_absolute], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes - DIR into the resulting binary and the resulting library dependency is - "absolute", i.e impossible to change by setting ${shlibpath_var} if the - library is relocated]) -_LT_TAGDECL([], [hardcode_minus_L], [0], - [Set to "yes" if using the -LDIR flag during linking hardcodes DIR - into the resulting binary]) -_LT_TAGDECL([], [hardcode_shlibpath_var], [0], - [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR - into the resulting binary]) -_LT_TAGDECL([], [hardcode_automatic], [0], - [Set to "yes" if building a shared library automatically hardcodes DIR - into the library and all subsequent libraries and executables linked - against it]) -_LT_TAGDECL([], [inherit_rpath], [0], - [Set to yes if linker adds runtime paths of dependent libraries - to runtime path list]) -_LT_TAGDECL([], [link_all_deplibs], [0], - [Whether libtool must link a program against all its dependency libraries]) -_LT_TAGDECL([], [always_export_symbols], [0], - [Set to "yes" if exported symbols are required]) -_LT_TAGDECL([], [export_symbols_cmds], [2], - [The commands to list exported symbols]) -_LT_TAGDECL([], [exclude_expsyms], [1], - [Symbols that should not be listed in the preloaded symbols]) -_LT_TAGDECL([], [include_expsyms], [1], - [Symbols that must always be exported]) -_LT_TAGDECL([], [prelink_cmds], [2], - [Commands necessary for linking programs (against libraries) with templates]) -_LT_TAGDECL([], [postlink_cmds], [2], - [Commands necessary for finishing linking programs]) -_LT_TAGDECL([], [file_list_spec], [1], - [Specify filename containing input files]) -dnl FIXME: Not yet implemented -dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], -dnl [Compiler flag to generate thread safe objects]) -])# _LT_LINKER_SHLIBS - - -# _LT_LANG_C_CONFIG([TAG]) -# ------------------------ -# Ensure that the configuration variables for a C compiler are suitably -# defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. -m4_defun([_LT_LANG_C_CONFIG], -[m4_require([_LT_DECL_EGREP])dnl -lt_save_CC="$CC" -AC_LANG_PUSH(C) - -# Source file extension for C test sources. -ac_ext=c - -# Object file extension for compiled C test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' - -_LT_TAG_COMPILER -# Save the default compiler, since it gets overwritten when the other -# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. -compiler_DEFAULT=$CC - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - LT_SYS_DLOPEN_SELF - _LT_CMD_STRIPLIB - - # Report which library types will actually be built - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_CONFIG($1) -fi -AC_LANG_POP -CC="$lt_save_CC" -])# _LT_LANG_C_CONFIG - - -# _LT_LANG_CXX_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for a C++ compiler are suitably -# defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. -m4_defun([_LT_LANG_CXX_CONFIG], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_PATH_MANIFEST_TOOL])dnl -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - AC_PROG_CXXCPP -else - _lt_caught_CXX_error=yes -fi - -AC_LANG_PUSH(C++) -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(compiler_needs_object, $1)=no -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for C++ test sources. -ac_ext=cpp - -# Object file extension for compiled C++ test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the CXX compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="int some_variable = 0;" - - # Code to be used in simple link tests - lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC - lt_save_CFLAGS=$CFLAGS - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX - lt_save_with_gnu_ld=$with_gnu_ld - lt_save_path_LD=$lt_cv_path_LD - if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx - else - $as_unset lt_cv_prog_gnu_ld - fi - if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX - else - $as_unset lt_cv_path_LD - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} - CFLAGS=$CXXFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - - if test -n "$compiler"; then - # We don't want -fno-exception when compiling C++ code, so set the - # no_builtin_flag separately - if test "$GXX" = yes; then - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' - else - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - fi - - if test "$GXX" = yes; then - # Set up default GNU C++ configuration - - LT_PATH_LD - - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' - - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | - $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - with_gnu_ld=no - wlarc= - - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on - # the platform it is being used on. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - - else - GXX=no - with_gnu_ld=no - wlarc= - fi - - # PORTME: fill in a description of your system's C++ link characteristics - AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) - _LT_TAGVAR(ld_shlibs, $1)=yes - case $host_os in - aix3*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aix[[4-9]]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_TAGVAR(archive_cmds, $1)='' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' - - if test "$GXX" = yes; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - _LT_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)= - fi - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to - # export. - _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. - _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' - _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - cygwin* | mingw* | pw32* | cegcc*) - case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - # Don't use ranlib - _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' - _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # g++ - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - darwin* | rhapsody*) - _LT_DARWIN_LINKER_FEATURES($1) - ;; - - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - freebsd2.*) - # C++ shared libraries reported to be fairly broken before - # switch to ELF - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - freebsd-elf*) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - ;; - - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - _LT_TAGVAR(ld_shlibs, $1)=yes - ;; - - gnu*) - ;; - - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - hpux9*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - esac - fi - case $host_cpu in - hppa*64*|ia64*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - *) - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - esac - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case $host_cpu in - hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - interix[[3-9]]*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - irix5* | irix6*) - case $cc_basename in - CC*) - # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' - fi - fi - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(inherit_rpath, $1)=yes - ;; - - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc* | ecpc* ) - # Intel C++ - with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - case `$CC -V` in - *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) - _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' - _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' - _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) - # Compaq C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' - ;; - xl* | mpixl* | bgxl*) - # IBM XL 8.0 on PPC, with GNU ld - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. - output_verbose_link_cmd='func_echo_all' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - esac - ;; - esac - ;; - - lynxos*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - m88k*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - - *nto* | *qnx*) - _LT_TAGVAR(ld_shlibs, $1)=yes - ;; - - openbsd2*) - # C++ shared libraries are fairly broken - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd=func_echo_all - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - case $host in - osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; - *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; - esac - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - cxx*) - case $host in - osf3*) - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - ;; - *) - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - case $host in - osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - - psos*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - solaris*) - case $cc_basename in - CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(archive_cmds_need_lc,$1)=yes - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - ;; - esac - _LT_TAGVAR(link_all_deplibs, $1)=yes - - output_verbose_link_cmd='func_echo_all' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - gcx*) - # Green Hills C++ Compiler - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - fi - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - ;; - esac - fi - ;; - esac - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ - '"$_LT_TAGVAR(old_archive_cmds, $1)" - _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ - '"$_LT_TAGVAR(reload_cmds, $1)" - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - vxworks*) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - *) - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac - - AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) - test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - - _LT_TAGVAR(GCC, $1)="$GXX" - _LT_TAGVAR(LD, $1)="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_SYS_HIDDEN_LIBDEPS($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC - with_gnu_ld=$lt_save_with_gnu_ld - lt_cv_path_LDCXX=$lt_cv_path_LD - lt_cv_path_LD=$lt_save_path_LD - lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld - lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes - -AC_LANG_POP -])# _LT_LANG_CXX_CONFIG - - -# _LT_FUNC_STRIPNAME_CNF -# ---------------------- -# func_stripname_cnf prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# -# This function is identical to the (non-XSI) version of func_stripname, -# except this one can be used by m4 code that may be executed by configure, -# rather than the libtool script. -m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl -AC_REQUIRE([_LT_DECL_SED]) -AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) -func_stripname_cnf () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname_cnf -])# _LT_FUNC_STRIPNAME_CNF - -# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) -# --------------------------------- -# Figure out "hidden" library dependencies from verbose -# compiler output when linking a shared library. -# Parse the compiler output and extract the necessary -# objects, libraries and library flags. -m4_defun([_LT_SYS_HIDDEN_LIBDEPS], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl -# Dependencies to place before and after the object being linked: -_LT_TAGVAR(predep_objects, $1)= -_LT_TAGVAR(postdep_objects, $1)= -_LT_TAGVAR(predeps, $1)= -_LT_TAGVAR(postdeps, $1)= -_LT_TAGVAR(compiler_lib_search_path, $1)= - -dnl we can't use the lt_simple_compile_test_code here, -dnl because it contains code intended for an executable, -dnl not a library. It's possible we should let each -dnl tag define a new lt_????_link_test_code variable, -dnl but it's only used here... -m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF -int a; -void foo (void) { a = 0; } -_LT_EOF -], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF -class Foo -{ -public: - Foo (void) { a = 0; } -private: - int a; -}; -_LT_EOF -], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF - subroutine foo - implicit none - integer*4 a - a=0 - return - end -_LT_EOF -], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF - subroutine foo - implicit none - integer a - a=0 - return - end -_LT_EOF -], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF -public class foo { - private int a; - public void bar (void) { - a = 0; - } -}; -_LT_EOF -], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF -package foo -func foo() { -} -_LT_EOF -]) - -_lt_libdeps_save_CFLAGS=$CFLAGS -case "$CC $CFLAGS " in #( -*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; -esac - -dnl Parse the compiler output and extract the necessary -dnl objects, libraries and library flags. -if AC_TRY_EVAL(ac_compile); then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. - - # Sentinel used to keep track of whether or not we are before - # the conftest object file. - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. - # Remove the space. - if test $p = "-L" || - test $p = "-R"; then - prev=$p - continue - fi - - # Expand the sysroot to ease extracting the directories later. - if test -z "$prev"; then - case $p in - -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; - -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; - -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; - esac - fi - case $p in - =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; - esac - if test "$pre_test_object_deps_done" = no; then - case ${prev} in - -L | -R) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. - if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" - else - _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" - fi - ;; - # The "-l" case would never come before the object being - # linked, so don't bother handling this case. - esac - else - if test -z "$_LT_TAGVAR(postdeps, $1)"; then - _LT_TAGVAR(postdeps, $1)="${prev}${p}" - else - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" - fi - fi - prev= - ;; - - *.lto.$objext) ;; # Ignore GCC LTO objects - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. - if test "$p" = "conftest.$objext"; then - pre_test_object_deps_done=yes - continue - fi - - if test "$pre_test_object_deps_done" = no; then - if test -z "$_LT_TAGVAR(predep_objects, $1)"; then - _LT_TAGVAR(predep_objects, $1)="$p" - else - _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" - fi - else - if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then - _LT_TAGVAR(postdep_objects, $1)="$p" - else - _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" - fi - fi - ;; - - *) ;; # Ignore the rest. - - esac - done - - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling $1 test program" -fi - -$RM -f confest.$objext -CFLAGS=$_lt_libdeps_save_CFLAGS - -# PORTME: override above test on systems where it is broken -m4_if([$1], [CXX], -[case $host_os in -interix[[3-9]]*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - _LT_TAGVAR(predep_objects,$1)= - _LT_TAGVAR(postdep_objects,$1)= - _LT_TAGVAR(postdeps,$1)= - ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -esac -]) - -case " $_LT_TAGVAR(postdeps, $1) " in -*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; -esac - _LT_TAGVAR(compiler_lib_search_dirs, $1)= -if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then - _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -fi -_LT_TAGDECL([], [compiler_lib_search_dirs], [1], - [The directories searched by this compiler when creating a shared library]) -_LT_TAGDECL([], [predep_objects], [1], - [Dependencies to place before and after the objects being linked to - create a shared library]) -_LT_TAGDECL([], [postdep_objects], [1]) -_LT_TAGDECL([], [predeps], [1]) -_LT_TAGDECL([], [postdeps], [1]) -_LT_TAGDECL([], [compiler_lib_search_path], [1], - [The library search path used internally by the compiler when linking - a shared library]) -])# _LT_SYS_HIDDEN_LIBDEPS - - -# _LT_LANG_F77_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for a Fortran 77 compiler are -# suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_F77_CONFIG], -[AC_LANG_PUSH(Fortran 77) -if test -z "$F77" || test "X$F77" = "Xno"; then - _lt_disable_F77=yes -fi - -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for f77 test sources. -ac_ext=f - -# Object file extension for compiled f77 test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the F77 compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_F77" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t - return - end -" - - # Code to be used in simple link tests - lt_simple_link_test_code="\ - program t - end -" - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC - lt_save_CFLAGS=$CFLAGS - CC=${F77-"f77"} - CFLAGS=$FFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - GCC=$G77 - if test -n "$compiler"; then - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_TAGVAR(GCC, $1)="$G77" - _LT_TAGVAR(LD, $1)="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - GCC=$lt_save_GCC - CC="$lt_save_CC" - CFLAGS="$lt_save_CFLAGS" -fi # test "$_lt_disable_F77" != yes - -AC_LANG_POP -])# _LT_LANG_F77_CONFIG - - -# _LT_LANG_FC_CONFIG([TAG]) -# ------------------------- -# Ensure that the configuration variables for a Fortran compiler are -# suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_FC_CONFIG], -[AC_LANG_PUSH(Fortran) - -if test -z "$FC" || test "X$FC" = "Xno"; then - _lt_disable_FC=yes -fi - -_LT_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_TAGVAR(allow_undefined_flag, $1)= -_LT_TAGVAR(always_export_symbols, $1)=no -_LT_TAGVAR(archive_expsym_cmds, $1)= -_LT_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_absolute, $1)=no -_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_separator, $1)= -_LT_TAGVAR(hardcode_minus_L, $1)=no -_LT_TAGVAR(hardcode_automatic, $1)=no -_LT_TAGVAR(inherit_rpath, $1)=no -_LT_TAGVAR(module_cmds, $1)= -_LT_TAGVAR(module_expsym_cmds, $1)= -_LT_TAGVAR(link_all_deplibs, $1)=unknown -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds -_LT_TAGVAR(no_undefined_flag, $1)= -_LT_TAGVAR(whole_archive_flag_spec, $1)= -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Source file extension for fc test sources. -ac_ext=${ac_fc_srcext-f} - -# Object file extension for compiled fc test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# No sense in running all these tests if we already determined that -# the FC compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_FC" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t - return - end -" - - # Code to be used in simple link tests - lt_simple_link_test_code="\ - program t - end -" - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER - - # save warnings/boilerplate of simple test code - _LT_COMPILER_BOILERPLATE - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - lt_save_GCC=$GCC - lt_save_CFLAGS=$CFLAGS - CC=${FC-"f95"} - CFLAGS=$FCFLAGS - compiler=$CC - GCC=$ac_cv_fc_compiler_gnu - - _LT_TAGVAR(compiler, $1)=$CC - _LT_CC_BASENAME([$compiler]) - - if test -n "$compiler"; then - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" - _LT_TAGVAR(LD, $1)="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - _LT_SYS_HIDDEN_LIBDEPS($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_SYS_DYNAMIC_LINKER($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) - fi # test -n "$compiler" - - GCC=$lt_save_GCC - CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS -fi # test "$_lt_disable_FC" != yes - -AC_LANG_POP -])# _LT_LANG_FC_CONFIG - - -# _LT_LANG_GCJ_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for the GNU Java Compiler compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_GCJ_CONFIG], -[AC_REQUIRE([LT_PROG_GCJ])dnl -AC_LANG_SAVE - -# Source file extension for Java test sources. -ac_ext=java - -# Object file extension for compiled Java test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}" - -# Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC=yes -CC=${GCJ-"gcj"} -CFLAGS=$GCJFLAGS -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" -_LT_CC_BASENAME([$compiler]) - -# GCJ did not exist at the time GCC didn't implicitly link libc in. -_LT_TAGVAR(archive_cmds_need_lc, $1)=no - -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds - -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) -fi - -AC_LANG_RESTORE - -GCC=$lt_save_GCC -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_GCJ_CONFIG - - -# _LT_LANG_GO_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for the GNU Go compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_GO_CONFIG], -[AC_REQUIRE([LT_PROG_GO])dnl -AC_LANG_SAVE - -# Source file extension for Go test sources. -ac_ext=go - -# Object file extension for compiled Go test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="package main; func main() { }" - -# Code to be used in simple link tests -lt_simple_link_test_code='package main; func main() { }' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC=yes -CC=${GOC-"gccgo"} -CFLAGS=$GOFLAGS -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" -_LT_CC_BASENAME([$compiler]) - -# Go did not exist at the time GCC didn't implicitly link libc in. -_LT_TAGVAR(archive_cmds_need_lc, $1)=no - -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds - -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) -fi - -AC_LANG_RESTORE - -GCC=$lt_save_GCC -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_GO_CONFIG - - -# _LT_LANG_RC_CONFIG([TAG]) -# ------------------------- -# Ensure that the configuration variables for the Windows resource compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_RC_CONFIG], -[AC_REQUIRE([LT_PROG_RC])dnl -AC_LANG_SAVE - -# Source file extension for RC test sources. -ac_ext=rc - -# Object file extension for compiled RC test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' - -# Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC= -CC=${RC-"windres"} -CFLAGS= -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_CC_BASENAME([$compiler]) -_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - -if test -n "$compiler"; then - : - _LT_CONFIG($1) -fi - -GCC=$lt_save_GCC -AC_LANG_RESTORE -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_RC_CONFIG - - -# LT_PROG_GCJ -# ----------- -AC_DEFUN([LT_PROG_GCJ], -[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], - [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], - [AC_CHECK_TOOL(GCJ, gcj,) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" - AC_SUBST(GCJFLAGS)])])[]dnl -]) - -# Old name: -AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_GCJ], []) - - -# LT_PROG_GO -# ---------- -AC_DEFUN([LT_PROG_GO], -[AC_CHECK_TOOL(GOC, gccgo,) -]) - - -# LT_PROG_RC -# ---------- -AC_DEFUN([LT_PROG_RC], -[AC_CHECK_TOOL(RC, windres,) -]) - -# Old name: -AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_RC], []) - - -# _LT_DECL_EGREP -# -------------- -# If we don't have a new enough Autoconf to choose the best grep -# available, choose the one first in the user's PATH. -m4_defun([_LT_DECL_EGREP], -[AC_REQUIRE([AC_PROG_EGREP])dnl -AC_REQUIRE([AC_PROG_FGREP])dnl -test -z "$GREP" && GREP=grep -_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) -_LT_DECL([], [EGREP], [1], [An ERE matcher]) -_LT_DECL([], [FGREP], [1], [A literal string matcher]) -dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too -AC_SUBST([GREP]) -]) - - -# _LT_DECL_OBJDUMP -# -------------- -# If we don't have a new enough Autoconf to choose the best objdump -# available, choose the one first in the user's PATH. -m4_defun([_LT_DECL_OBJDUMP], -[AC_CHECK_TOOL(OBJDUMP, objdump, false) -test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) -AC_SUBST([OBJDUMP]) -]) - -# _LT_DECL_DLLTOOL -# ---------------- -# Ensure DLLTOOL variable is set. -m4_defun([_LT_DECL_DLLTOOL], -[AC_CHECK_TOOL(DLLTOOL, dlltool, false) -test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) -AC_SUBST([DLLTOOL]) -]) - -# _LT_DECL_SED -# ------------ -# Check for a fully-functional sed program, that truncates -# as few characters as possible. Prefer GNU sed if found. -m4_defun([_LT_DECL_SED], -[AC_PROG_SED -test -z "$SED" && SED=sed -Xsed="$SED -e 1s/^X//" -_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) -_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], - [Sed that helps us avoid accidentally triggering echo(1) options like -n]) -])# _LT_DECL_SED - -m4_ifndef([AC_PROG_SED], [ -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_SED. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # - -m4_defun([AC_PROG_SED], -[AC_MSG_CHECKING([for a sed that does not truncate output]) -AC_CACHE_VAL(lt_cv_path_SED, -[# Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done -done -IFS=$as_save_IFS -lt_ac_max=0 -lt_ac_count=0 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris -# along with /bin/sed that truncates output. -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break - fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break - lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi - done -done -]) -SED=$lt_cv_path_SED -AC_SUBST([SED]) -AC_MSG_RESULT([$SED]) -])#AC_PROG_SED -])#m4_ifndef - -# Old name: -AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([LT_AC_PROG_SED], []) - - -# _LT_CHECK_SHELL_FEATURES -# ------------------------ -# Find out whether the shell is Bourne or XSI compatible, -# or has some other useful features. -m4_defun([_LT_CHECK_SHELL_FEATURES], -[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -AC_MSG_RESULT([$xsi_shell]) -_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) - -AC_MSG_CHECKING([whether the shell understands "+="]) -lt_shell_append=no -( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -AC_MSG_RESULT([$lt_shell_append]) -_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - lt_unset=unset -else - lt_unset=false -fi -_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl - -# test EBCDIC or ASCII -case `echo X|tr X '\101'` in - A) # ASCII based system - # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr - lt_SP2NL='tr \040 \012' - lt_NL2SP='tr \015\012 \040\040' - ;; - *) # EBCDIC based system - lt_SP2NL='tr \100 \n' - lt_NL2SP='tr \r\n \100\100' - ;; -esac -_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl -_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl -])# _LT_CHECK_SHELL_FEATURES - - -# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) -# ------------------------------------------------------ -# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and -# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. -m4_defun([_LT_PROG_FUNCTION_REPLACE], -[dnl { -sed -e '/^$1 ()$/,/^} # $1 /c\ -$1 ()\ -{\ -m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) -} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: -]) - - -# _LT_PROG_REPLACE_SHELLFNS -# ------------------------- -# Replace existing portable implementations of several shell functions with -# equivalent extended shell implementations where those features are available.. -m4_defun([_LT_PROG_REPLACE_SHELLFNS], -[if test x"$xsi_shell" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl - func_split_long_opt_name=${1%%=*} - func_split_long_opt_arg=${1#*=}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl - func_split_short_opt_arg=${1#??} - func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) - - _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) - - _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) - - _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -fi - -if test x"$lt_shell_append" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) - - _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl - func_quote_for_eval "${2}" -dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ - eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -fi -]) - -# _LT_PATH_CONVERSION_FUNCTIONS -# ----------------------------- -# Determine which file name conversion functions should be used by -# func_to_host_file (and, implicitly, by func_to_host_path). These are needed -# for certain cross-compile configurations and native mingw. -m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_MSG_CHECKING([how to convert $build file names to $host format]) -AC_CACHE_VAL(lt_cv_to_host_file_cmd, -[case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 - ;; - esac - ;; - *-*-cygwin* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin - ;; - esac - ;; - * ) # unhandled hosts (and "normal" native builds) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; -esac -]) -to_host_file_cmd=$lt_cv_to_host_file_cmd -AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) -_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], - [0], [convert $build file names to $host format])dnl - -AC_MSG_CHECKING([how to convert $build file names to toolchain format]) -AC_CACHE_VAL(lt_cv_to_tool_file_cmd, -[#assume ordinary cross tools, or native build. -lt_cv_to_tool_file_cmd=func_convert_file_noop -case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 - ;; - esac - ;; -esac -]) -to_tool_file_cmd=$lt_cv_to_tool_file_cmd -AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) -_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], - [0], [convert $build files to toolchain format])dnl -])# _LT_PATH_CONVERSION_FUNCTIONS - -# Helper functions for option handling. -*- Autoconf -*- -# -# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, -# Inc. -# Written by Gary V. Vaughan, 2004 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 7 ltoptions.m4 - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) - - -# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) -# ------------------------------------------ -m4_define([_LT_MANGLE_OPTION], -[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) - - -# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) -# --------------------------------------- -# Set option OPTION-NAME for macro MACRO-NAME, and if there is a -# matching handler defined, dispatch to it. Other OPTION-NAMEs are -# saved as a flag. -m4_define([_LT_SET_OPTION], -[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl -m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), - _LT_MANGLE_DEFUN([$1], [$2]), - [m4_warning([Unknown $1 option `$2'])])[]dnl -]) - - -# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) -# ------------------------------------------------------------ -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -m4_define([_LT_IF_OPTION], -[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) - - -# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) -# ------------------------------------------------------- -# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME -# are set. -m4_define([_LT_UNLESS_OPTIONS], -[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), - [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), - [m4_define([$0_found])])])[]dnl -m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 -])[]dnl -]) - - -# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) -# ---------------------------------------- -# OPTION-LIST is a space-separated list of Libtool options associated -# with MACRO-NAME. If any OPTION has a matching handler declared with -# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about -# the unknown option and exit. -m4_defun([_LT_SET_OPTIONS], -[# Set options -m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), - [_LT_SET_OPTION([$1], _LT_Option)]) - -m4_if([$1],[LT_INIT],[ - dnl - dnl Simply set some default values (i.e off) if boolean options were not - dnl specified: - _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no - ]) - _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no - ]) - dnl - dnl If no reference was made to various pairs of opposing options, then - dnl we run the default mode handler for the pair. For example, if neither - dnl `shared' nor `disable-shared' was passed, we enable building of shared - dnl archives by default: - _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) - _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) - _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) - _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], - [_LT_ENABLE_FAST_INSTALL]) - ]) -])# _LT_SET_OPTIONS - - - -# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) -# ----------------------------------------- -m4_define([_LT_MANGLE_DEFUN], -[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) - - -# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) -# ----------------------------------------------- -m4_define([LT_OPTION_DEFINE], -[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl -])# LT_OPTION_DEFINE - - -# dlopen -# ------ -LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes -]) - -AU_DEFUN([AC_LIBTOOL_DLOPEN], -[_LT_SET_OPTION([LT_INIT], [dlopen]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `dlopen' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) - - -# win32-dll -# --------- -# Declare package support for building win32 dll's. -LT_OPTION_DEFINE([LT_INIT], [win32-dll], -[enable_win32_dll=yes - -case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) - ;; -esac - -test -z "$AS" && AS=as -_LT_DECL([], [AS], [1], [Assembler program])dnl - -test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl - -test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl -])# win32-dll - -AU_DEFUN([AC_LIBTOOL_WIN32_DLL], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -_LT_SET_OPTION([LT_INIT], [win32-dll]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `win32-dll' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) - - -# _LT_ENABLE_SHARED([DEFAULT]) -# ---------------------------- -# implement the --enable-shared flag, and supports the `shared' and -# `disable-shared' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_SHARED], -[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([shared], - [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], - [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) - - _LT_DECL([build_libtool_libs], [enable_shared], [0], - [Whether or not to build shared libraries]) -])# _LT_ENABLE_SHARED - -LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) - -# Old names: -AC_DEFUN([AC_ENABLE_SHARED], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) -]) - -AC_DEFUN([AC_DISABLE_SHARED], -[_LT_SET_OPTION([LT_INIT], [disable-shared]) -]) - -AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_ENABLE_SHARED], []) -dnl AC_DEFUN([AM_DISABLE_SHARED], []) - - - -# _LT_ENABLE_STATIC([DEFAULT]) -# ---------------------------- -# implement the --enable-static flag, and support the `static' and -# `disable-static' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_STATIC], -[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([static], - [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], - [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_static=]_LT_ENABLE_STATIC_DEFAULT) - - _LT_DECL([build_old_libs], [enable_static], [0], - [Whether or not to build static libraries]) -])# _LT_ENABLE_STATIC - -LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) - -# Old names: -AC_DEFUN([AC_ENABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) -]) - -AC_DEFUN([AC_DISABLE_STATIC], -[_LT_SET_OPTION([LT_INIT], [disable-static]) -]) - -AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AM_ENABLE_STATIC], []) -dnl AC_DEFUN([AM_DISABLE_STATIC], []) - - - -# _LT_ENABLE_FAST_INSTALL([DEFAULT]) -# ---------------------------------- -# implement the --enable-fast-install flag, and support the `fast-install' -# and `disable-fast-install' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -m4_define([_LT_ENABLE_FAST_INSTALL], -[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl -AC_ARG_ENABLE([fast-install], - [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], - [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) - -_LT_DECL([fast_install], [enable_fast_install], [0], - [Whether or not to optimize for fast installation])dnl -])# _LT_ENABLE_FAST_INSTALL - -LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) -LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) - -# Old names: -AU_DEFUN([AC_ENABLE_FAST_INSTALL], -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `fast-install' option into LT_INIT's first parameter.]) -]) - -AU_DEFUN([AC_DISABLE_FAST_INSTALL], -[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `disable-fast-install' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) -dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) - - -# _LT_WITH_PIC([MODE]) -# -------------------- -# implement the --with-pic flag, and support the `pic-only' and `no-pic' -# LT_INIT options. -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. -m4_define([_LT_WITH_PIC], -[AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [lt_p=${PACKAGE-default} - case $withval in - yes|no) pic_mode=$withval ;; - *) - pic_mode=default - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for lt_pkg in $withval; do - IFS="$lt_save_ifs" - if test "X$lt_pkg" = "X$lt_p"; then - pic_mode=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [pic_mode=default]) - -test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) - -_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl -])# _LT_WITH_PIC - -LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) -LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) - -# Old name: -AU_DEFUN([AC_LIBTOOL_PICMODE], -[_LT_SET_OPTION([LT_INIT], [pic-only]) -AC_DIAGNOSE([obsolete], -[$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `pic-only' option into LT_INIT's first parameter.]) -]) - -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) - - -m4_define([_LTDL_MODE], []) -LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], - [m4_define([_LTDL_MODE], [nonrecursive])]) -LT_OPTION_DEFINE([LTDL_INIT], [recursive], - [m4_define([_LTDL_MODE], [recursive])]) -LT_OPTION_DEFINE([LTDL_INIT], [subproject], - [m4_define([_LTDL_MODE], [subproject])]) - -m4_define([_LTDL_TYPE], []) -LT_OPTION_DEFINE([LTDL_INIT], [installable], - [m4_define([_LTDL_TYPE], [installable])]) -LT_OPTION_DEFINE([LTDL_INIT], [convenience], - [m4_define([_LTDL_TYPE], [convenience])]) - -# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- -# -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. -# Written by Gary V. Vaughan, 2004 -# -# 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 6 ltsugar.m4 - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) - - -# lt_join(SEP, ARG1, [ARG2...]) -# ----------------------------- -# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their -# associated separator. -# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier -# versions in m4sugar had bugs. -m4_define([lt_join], -[m4_if([$#], [1], [], - [$#], [2], [[$2]], - [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) -m4_define([_lt_join], -[m4_if([$#$2], [2], [], - [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) - - -# lt_car(LIST) -# lt_cdr(LIST) -# ------------ -# Manipulate m4 lists. -# These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. -m4_define([lt_car], [[$1]]) -m4_define([lt_cdr], -[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], - [$#], 1, [], - [m4_dquote(m4_shift($@))])]) -m4_define([lt_unquote], $1) - - -# lt_append(MACRO-NAME, STRING, [SEPARATOR]) -# ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. -# Note that neither SEPARATOR nor STRING are expanded; they are appended -# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). -# No SEPARATOR is output if MACRO-NAME was previously undefined (different -# than defined and empty). -# -# This macro is needed until we can rely on Autoconf 2.62, since earlier -# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. -m4_define([lt_append], -[m4_define([$1], - m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) - - - -# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) -# ---------------------------------------------------------- -# Produce a SEP delimited list of all paired combinations of elements of -# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list -# has the form PREFIXmINFIXSUFFIXn. -# Needed until we can rely on m4_combine added in Autoconf 2.62. -m4_define([lt_combine], -[m4_if(m4_eval([$# > 3]), [1], - [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl -[[m4_foreach([_Lt_prefix], [$2], - [m4_foreach([_Lt_suffix], - ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, - [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) - - -# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) -# ----------------------------------------------------------------------- -# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited -# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. -m4_define([lt_if_append_uniq], -[m4_ifdef([$1], - [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], - [lt_append([$1], [$2], [$3])$4], - [$5])], - [lt_append([$1], [$2], [$3])$4])]) - - -# lt_dict_add(DICT, KEY, VALUE) -# ----------------------------- -m4_define([lt_dict_add], -[m4_define([$1($2)], [$3])]) - - -# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) -# -------------------------------------------- -m4_define([lt_dict_add_subkey], -[m4_define([$1($2:$3)], [$4])]) - - -# lt_dict_fetch(DICT, KEY, [SUBKEY]) -# ---------------------------------- -m4_define([lt_dict_fetch], -[m4_ifval([$3], - m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), - m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) - - -# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) -# ----------------------------------------------------------------- -m4_define([lt_if_dict_fetch], -[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], - [$5], - [$6])]) - - -# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) -# -------------------------------------------------------------- -m4_define([lt_dict_filter], -[m4_if([$5], [], [], - [lt_join(m4_quote(m4_default([$4], [[, ]])), - lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), - [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl -]) - -# ltversion.m4 -- version numbers -*- Autoconf -*- -# -# Copyright (C) 2004 Free Software Foundation, Inc. -# Written by Scott James Remnant, 2004 -# -# 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. - -# @configure_input@ - -# serial 3337 ltversion.m4 -# This file is part of GNU Libtool - -m4_define([LT_PACKAGE_VERSION], [2.4.2]) -m4_define([LT_PACKAGE_REVISION], [1.3337]) - -AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.2' -macro_revision='1.3337' -_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) -_LT_DECL(, macro_revision, 0) -]) - -# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- -# -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. -# Written by Scott James Remnant, 2004. -# -# 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 lt~obsolete.m4 - -# These exist entirely to fool aclocal when bootstrapping libtool. -# -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) -# which have later been changed to m4_define as they aren't part of the -# exported API, or moved to Autoconf or Automake where they belong. -# -# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN -# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us -# using a macro with the same name in our local m4/libtool.m4 it'll -# pull the old libtool.m4 in (it doesn't see our shiny new m4_define -# and doesn't know about Autoconf macros at all.) -# -# So we provide this file, which has a silly filename so it's always -# included after everything else. This provides aclocal with the -# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything -# because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. -# -# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. -# Yes, that means every name once taken will need to remain here until -# we give up compatibility with versions before 1.7, at which point -# we need to keep only those names which we still refer to. - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) - -m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) -m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) -m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) -m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) -m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) -m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) -m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) -m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) -m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) -m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) -m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) -m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) -m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) -m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) -m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) -m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) -m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) -m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) -m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) -m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) -m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) -m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) -m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) -m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) -m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) -m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) -m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) -m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) -m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) -m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) -m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) -m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) -m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) -m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) -m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) -m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) -m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) -m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) -m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) -m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) -m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) -m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) -m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) -m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) -m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) -m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) -m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) -m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) -m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) -m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) -m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) -m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) -m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) - -# nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation, -dnl Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. - -AC_PREREQ([2.50]) - -AC_DEFUN([AM_NLS], -[ - AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE([nls], - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT([$USE_NLS]) - AC_SUBST([USE_NLS]) -]) - -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) -m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi -fi[]dnl -])# PKG_PROG_PKG_CONFIG - -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) - -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes ], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG - -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED - - -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - -pkg_failed=no -AC_MSG_CHECKING([for $1]) - -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) - -if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: - -$$1_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -_PKG_TEXT])[]dnl - ]) -elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( -[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. - -_PKG_TEXT - -To get pkg-config, see .])[]dnl - ]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])# PKG_CHECK_MODULES - - -# PKG_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable pkgconfigdir as the location where a module -# should install pkg-config .pc files. By default the directory is -# $libdir/pkgconfig, but the default can be changed by passing -# DIRECTORY. The user can override through the --with-pkgconfigdir -# parameter. -AC_DEFUN([PKG_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([pkgconfigdir], - [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, - [with_pkgconfigdir=]pkg_default) -AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -]) dnl PKG_INSTALLDIR - - -# PKG_NOARCH_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable noarch_pkgconfigdir as the location where a -# module should install arch-independent pkg-config .pc files. By -# default the directory is $datadir/pkgconfig, but the default can be -# changed by passing DIRECTORY. The user can override through the -# --with-noarch-pkgconfigdir parameter. -AC_DEFUN([PKG_NOARCH_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([noarch-pkgconfigdir], - [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, - [with_noarch_pkgconfigdir=]pkg_default) -AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -]) dnl PKG_NOARCH_INSTALLDIR - - -# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ------------------------------------------- -# Retrieves the value of the pkg-config variable for the given module. -AC_DEFUN([PKG_CHECK_VAR], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl - -_PKG_CONFIG([$1], [variable="][$3]["], [$2]) -AS_VAR_COPY([$1], [pkg_cv_][$1]) - -AS_VAR_IF([$1], [""], [$5], [$4])dnl -])# PKG_CHECK_VAR - -# Copyright (C) 2002-2013 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_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -# (This private macro should not be called outside this file.) -AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.13' -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.4], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -]) - -# _AM_AUTOCONF_VERSION(VERSION) -# ----------------------------- -# aclocal traces this macro to find the Autoconf version. -# This is a private macro too. Using m4_define simplifies -# the logic in aclocal, which can simply ignore this definition. -m4_define([_AM_AUTOCONF_VERSION], []) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.13.4])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) - -# AM_AUX_DIR_EXPAND -*- Autoconf -*- - -# Copyright (C) 2001-2013 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. - -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to -# '$srcdir', '$srcdir/..', or '$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is '.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. - -AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) - -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997-2013 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_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ([2.52])dnl - m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE])dnl -AC_SUBST([$1_FALSE])dnl -_AM_SUBST_NOTMAKE([$1_TRUE])dnl -_AM_SUBST_NOTMAKE([$1_FALSE])dnl -m4_define([_AM_COND_VALUE_$1], [$2])dnl -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) - -# Copyright (C) 1999-2013 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. - - -# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - - -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". -# We try a few techniques and use that to set a single cache variable. -# -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl - -m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], - [$1], [CXX], [depcc="$CXX" am_compiler_list=], - [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], - [$1], [UPC], [depcc="$UPC" am_compiler_list=], - [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) - -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named 'D' -- because '-MD' means "put the output - # in D". - rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - am__universal=false - m4_case([$1], [CC], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac], - [CXX], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac]) - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with - # Solaris 10 /bin/sh. - echo '/* dummy */' > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with '-c' and '-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle '-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs. - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # After this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested. - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok '-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) - - -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES. -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) - - -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE([dependency-tracking], [dnl -AS_HELP_STRING( - [--enable-dependency-tracking], - [do not reject slow dependency extractors]) -AS_HELP_STRING( - [--disable-dependency-tracking], - [speeds up one-time build])]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - am__nodep='_no' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -AC_SUBST([am__nodep])dnl -_AM_SUBST_NOTMAKE([am__nodep])dnl -]) - -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999-2013 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_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[{ - # Older Autoconf quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval - # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac - shift - for mf - do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done -} -])# _AM_OUTPUT_DEPENDENCY_COMMANDS - - -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each '.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) - -# Do all the work for Automake. -*- Autoconf -*- - -# Copyright (C) 1996-2013 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. - -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.65])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) - -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[AC_DIAGNOSE([obsolete], - [$0: two- and three-arguments forms are deprecated.]) -m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if( - m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), - [ok:ok],, - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) - AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl - -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) -AM_MISSING_PROG([AUTOCONF], [autoconf]) -AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) -AM_MISSING_PROG([AUTOHEADER], [autoheader]) -AM_MISSING_PROG([MAKEINFO], [makeinfo]) -AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -# For better backward compatibility. To be removed once Automake 1.9.x -# dies out for good. For more background, see: -# -# -AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES([CC])], - [m4_define([AC_PROG_CC], - m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES([CXX])], - [m4_define([AC_PROG_CXX], - m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES([OBJC])], - [m4_define([AC_PROG_OBJC], - m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], - [_AM_DEPENDENCIES([OBJCXX])], - [m4_define([AC_PROG_OBJCXX], - m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl -]) -AC_REQUIRE([AM_SILENT_RULES])dnl -dnl The testsuite driver may need to know about EXEEXT, so add the -dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This -dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. -AC_CONFIG_COMMANDS_PRE(dnl -[m4_provide_if([_AM_COMPILER_EXEEXT], - [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) - -dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not -dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further -dnl mangled by Autoconf and run in a shell conditional statement. -m4_define([_AC_COMPILER_EXEEXT], -m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - - -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. - -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_arg=$1 -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) - -# Copyright (C) 2001-2013 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_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi -AC_SUBST([install_sh])]) - -# Copyright (C) 2003-2013 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. - -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) - -# Check to see how 'make' treats includes. -*- Autoconf -*- - -# Copyright (C) 2001-2013 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_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) - -# Copyright (C) 1999-2013 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_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) - -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- - -# Copyright (C) 1997-2013 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_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) - -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it is modern enough. -# If it is, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([missing])dnl -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi -# Use eval to expand $SHELL -if eval "$MISSING --is-lightweight"; then - am_missing_run="$MISSING " -else - am_missing_run= - AC_MSG_WARN(['missing' script is too old or missing]) -fi -]) - -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001-2013 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_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-2013 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_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# 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 ( - am_has_slept=no - for am_try in 1 2; do - echo "timestamp, slept: $am_has_slept" > conftest.file - 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 - 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 - if test "$[2]" = conftest.file || test $am_try -eq 2; then - break - fi - # Just in case. - sleep 1 - am_has_slept=yes - done - 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 we didn't sleep, we still need to ensure time stamps of config.status and -# generated files are strictly newer. -am_sleep_pid= -if grep 'slept: no' conftest.file >/dev/null 2>&1; then - ( sleep 1 ) & - am_sleep_pid=$! -fi -AC_CONFIG_COMMANDS_PRE( - [AC_MSG_CHECKING([that generated files are newer than configure]) - if test -n "$am_sleep_pid"; then - # Hide warnings about reused PIDs. - wait $am_sleep_pid 2>/dev/null - fi - AC_MSG_RESULT([done])]) -rm -f conftest.file -]) - -# Copyright (C) 2009-2013 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_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], [dnl -AS_HELP_STRING( - [--enable-silent-rules], - [less verbose build output (undo: "make V=1")]) -AS_HELP_STRING( - [--disable-silent-rules], - [verbose build output (undo: "make V=0")])dnl -]) -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 -dnl -dnl A few 'make' implementations (e.g., NonStop OS and NextStep) -dnl do not support nested variable expansions. -dnl See automake bug#9928 and bug#10237. -am_make=${MAKE-make} -AC_CACHE_CHECK([whether $am_make supports nested variables], - [am_cv_make_support_nested_variables], - [if AS_ECHO([['TRUE=$(BAR$(V)) -BAR0=false -BAR1=true -V=1 -am__doit: - @$(TRUE) -.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then - am_cv_make_support_nested_variables=yes -else - am_cv_make_support_nested_variables=no -fi]) -if test $am_cv_make_support_nested_variables = yes; then - dnl Using '$V' instead of '$(V)' breaks IRIX make. - AM_V='$(V)' - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' -else - AM_V=$AM_DEFAULT_VERBOSITY - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY -fi -AC_SUBST([AM_V])dnl -AM_SUBST_NOTMAKE([AM_V])dnl -AC_SUBST([AM_DEFAULT_V])dnl -AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl -AC_SUBST([AM_DEFAULT_VERBOSITY])dnl -AM_BACKSLASH='\' -AC_SUBST([AM_BACKSLASH])dnl -_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl -]) - -# Copyright (C) 2001-2013 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])]) - -# Copyright (C) 2006-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from 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($@)]) - -# Check how to create a tarball. -*- Autoconf -*- - -# Copyright (C) 2004-2013 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_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. Yes, it's still used -# in the wild :-( We should find a proper way to deprecate it ... -AC_SUBST([AMTAR], ['$${TAR-tar}']) - -# We'll loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' - -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - - [m4_case([$1], - [ustar], - [# The POSIX 1988 'ustar' format is defined with fixed-size fields. - # There is notably a 21 bits limit for the UID and the GID. In fact, - # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 - # and bug#13588). - am_max_uid=2097151 # 2^21 - 1 - am_max_gid=$am_max_uid - # The $UID and $GID variables are not portable, so we need to resort - # to the POSIX-mandated id(1) utility. Errors in the 'id' calls - # below are definitely unexpected, so allow the users to see them - # (that is, avoid stderr redirection). - am_uid=`id -u || echo unknown` - am_gid=`id -g || echo unknown` - AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) - if test $am_uid -le $am_max_uid; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - _am_tools=none - fi - AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) - if test $am_gid -le $am_max_gid; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - _am_tools=none - fi], - - [pax], - [], - - [m4_fatal([Unknown tar format])]) - - AC_MSG_CHECKING([how to create a $1 tar archive]) - - # Go ahead even if we have the value already cached. We do so because we - # need to set the values for the 'am__tar' and 'am__untar' variables. - _am_tools=${am_cv_prog_tar_$1-$_am_tools} - - 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 - diff -Nru almanah-0.11.1/almanah.doap almanah-0.12.0/almanah.doap --- almanah-0.11.1/almanah.doap 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/almanah.doap 2019-10-07 13:45:09.000000000 +0000 @@ -9,8 +9,8 @@ and past Evolution tasks. - - + + Philip Withnall diff -Nru almanah-0.11.1/autogen.sh almanah-0.12.0/autogen.sh --- almanah-0.11.1/autogen.sh 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/autogen.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -PKG_NAME="almanah" - -(test -f $srcdir/configure.ac) || { - echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level $PKG_NAME directory" - exit 1 -} - -which gnome-autogen.sh || { - echo "You need to install gnome-common from GNOME git" - exit 1 -} - -REQUIRED_PKG_CONFIG_VERSION=0.17.1 REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh "$@" diff -Nru almanah-0.11.1/build-aux/gpg_check_version.py almanah-0.12.0/build-aux/gpg_check_version.py --- almanah-0.11.1/build-aux/gpg_check_version.py 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.12.0/build-aux/gpg_check_version.py 2019-10-07 13:45:09.000000000 +0000 @@ -0,0 +1,42 @@ +# © 2017 Niels De Graef +# SPDX-License-Identifier: GPL-3.0-or-later +import sys +import subprocess + +# Parses the GPG version from the output of the --version flag. +# Should work on the output for `gpg`, `gpg2` and `gpgme-config`. +def parse_version(gpg_output): + version_line = gpg_output.splitlines()[0] + return version_line.strip().split(' ')[-1] + +# Checks whether the GPG version is compatible with the given version. +# For GPG, this means that the major and minor version should be equal; +# for GPGME, this means only the major version should be equal. +def check_version(gpg_version, accepted_version, is_gpgme = False): + gpg_major, gpg_minor, gpg_micro = gpg_version.split('.', 2) + acc_major, acc_minor, acc_micro = accepted_version.split('.', 2) + if is_gpgme: + return int(gpg_major) == int(acc_major) and int(gpg_minor) >= int(acc_minor) and int(gpg_micro) >= int(acc_micro) + else: + return int(gpg_major) == int(acc_major) and int(gpg_minor) == int(acc_minor) and int(gpg_micro) >= int(acc_micro) + +if len(sys.argv) <= 3: + sys.exit(1) + +gpg_path = sys.argv[1] +is_gpgme = True if sys.argv[2].lower() == 'true' else False +accepted_versions = sys.argv[3:] + +# Parse and print the version +proc = subprocess.Popen([gpg_path, '--version'], + stdout=subprocess.PIPE, + universal_newlines=True) +gpg_version = parse_version(proc.stdout.read()) +print(gpg_version, end='') + +# Then return whether we're compatible with that version +for accepted_version in accepted_versions: + if check_version(gpg_version, accepted_version, is_gpgme): + sys.exit(0) + +sys.exit(1) diff -Nru almanah-0.11.1/build-aux/post_install.py almanah-0.12.0/build-aux/post_install.py --- almanah-0.11.1/build-aux/post_install.py 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.12.0/build-aux/post_install.py 2019-10-07 13:45:09.000000000 +0000 @@ -0,0 +1,16 @@ +import os +import subprocess +import sys + +if len(sys.argv) < 3: + sys.exit("usage: post_install.py ") + +icondir = sys.argv[1] +schemadir = sys.argv[2] + +if not os.environ.get('DESTDIR'): + print('Update icon cache…') + subprocess.call(['gtk-update-icon-cache', '-f', '-t', icondir]) + + print('Compiling gsettings schemas…') + subprocess.call(['glib-compile-schemas', schemadir]) diff -Nru almanah-0.11.1/ChangeLog almanah-0.12.0/ChangeLog --- almanah-0.11.1/ChangeLog 2014-09-24 18:32:53.000000000 +0000 +++ almanah-0.12.0/ChangeLog 1970-01-01 00:00:00.000000000 +0000 @@ -1,4908 +0,0 @@ -commit ffcd2d98a1fe48decfcbcc9e11aa146586c54ebf -Author: Álvaro Peña -Date: Wed Sep 24 19:36:33 2014 +0200 - - build: Release version 0.11.1 - - NEWS | 17 +++++++++++++++++ - configure.ac | 2 +- - 2 files changed, 18 insertions(+), 1 deletion(-) - -commit 2eb8116e0379a12dc8627d28e76b127322ffe19e -Author: Philip Withnall -Date: Sun May 4 11:54:24 2014 +0200 - - data: Update licencing information in AppData file - - See: - http://blogs.gnome.org/hughsie/2014/05/02/appdata-meet-spdx-spdx-meet-appdata/. - - https://bugzilla.gnome.org/show_bug.cgi?id=729499 - - data/almanah.appdata.xml.in | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -commit 724765d9fc40aa1cfe52e5908ca77355cf1a712c -Author: Muhammet Kara -Date: Thu Jun 19 12:49:04 2014 +0000 - - Updated Turkish translation - - po/tr.po | 634 - +++++++++++++++++++++++++++++++++++++-------------------------- - 1 file changed, 377 insertions(+), 257 deletions(-) - -commit 421e86691b012461b3530a1b33faabf7287a33a4 -Author: Álvaro Peña -Date: Mon Apr 21 12:24:08 2014 +0200 - - Fixed the return in a void function - - Thanks to Arthur Marble - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=745257 - - src/widgets/tag.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit f332bcd0b3373f4d61df27f5f18e0fda0b4549fd -Author: Piotr Drąg -Date: Sun Mar 30 18:16:08 2014 +0200 - - doap: update URLs - - README | 6 +++--- - almanah.doap | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit a0cb5ac770d65b9f8da78491b7b67f9617aec2d6 -Author: Andika Triwidada -Date: Fri Mar 28 11:38:43 2014 +0000 - - Updated Indonesian translation - - po/id.po | 83 - +++++++++++++++++++++++++++++++++++++++++++++------------------- - 1 file changed, 58 insertions(+), 25 deletions(-) - -commit dc2c992d6d7708f68d88a92428f16be55726656a -Author: Michael Scherer -Date: Sun Mar 16 18:35:52 2014 +0000 - - Updated French translation - - po/fr.po | 210 - +++++++++++++++++++++++++++++++++++++++++++-------------------- - 1 file changed, 144 insertions(+), 66 deletions(-) - -commit 6af7d723ee7943ed468e8ed7089d9620e7afe8eb -Author: Benjamin St -Date: Fri Mar 7 23:02:37 2014 +0000 - - Updated German translation - - po/de.po | 571 - +++++++++++++++++++++++++++++++++++++++------------------------ - 1 file changed, 351 insertions(+), 220 deletions(-) - -commit d5e160fa24902df664ad4f75b34ee36a6b58d561 -Author: Balázs Úr -Date: Sun Feb 23 15:35:27 2014 +0100 - - Updated Hungarian translation - - po/hu.po | 87 - ++++++++++++++++++++++++++++++++++++++++++++++------------------ - 1 file changed, 63 insertions(+), 24 deletions(-) - -commit f49ea6dd832e677f336eb0cba4dd786e69d4d268 -Author: Мирослав Николић -Date: Wed Jan 29 10:28:23 2014 +0100 - - Updated Serbian translation - - po/sr.po | 86 - ++++++++++++++++++++++++++++++++++++++++++---------------- - po/sr@latin.po | 86 - ++++++++++++++++++++++++++++++++++++++++++---------------- - 2 files changed, 124 insertions(+), 48 deletions(-) - -commit 05a50d5654b6bb955ba42c042f3f3f207a0ef30a -Author: Álvaro Peña -Date: Sun Jan 26 18:44:50 2014 +0100 - - app-data: Updated screenshot dimensions to a 16:9 - - data/almanah.appdata.xml.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 724ba847848c7cadf5005d958ab11dce8c46c11e -Author: Philip Withnall -Date: Fri Dec 20 23:19:49 2013 +0000 - - build: Enable validation of the AppData file - - Add a build-time dependency on appdata-tools to enable validation - of the - AppData file during `make check`. See: - https://github.com/hughsie/appdata-tools. - - https://bugzilla.gnome.org/show_bug.cgi?id=720853 - - Signed-off-by: Álvaro Peña - - configure.ac | 2 ++ - data/Makefile.am | 14 ++++++++++---- - 2 files changed, 12 insertions(+), 4 deletions(-) - -commit e3794e2a7b0495b2016d228c2dfecd872a76ffdb -Author: Philip Withnall -Date: Fri Dec 20 23:17:14 2013 +0000 - - build: Split EXTRA_DIST and CLEANFILES up in data/Makefile.am - - Make each section of the Makefile self-contained. - - https://bugzilla.gnome.org/show_bug.cgi?id=720853 - - Signed-off-by: Álvaro Peña - - data/Makefile.am | 29 ++++++++++++++++++----------- - 1 file changed, 18 insertions(+), 11 deletions(-) - -commit f169afb1166ccb0652bda7d62c5b24353c438b20 -Author: Philip Withnall -Date: Fri Dec 20 23:14:06 2013 +0000 - - build: Update git.mk from upstream - - https://bugzilla.gnome.org/show_bug.cgi?id=720853 - - Signed-off-by: Álvaro Peña - - Makefile.am | 12 +--- - git.mk | 192 - ++++++++++++++++++++++++++++++++++++++++++++++++------------ - 2 files changed, 156 insertions(+), 48 deletions(-) - -commit 90ce58f24f900baefddec78fe5f7c9850a370c0b -Author: Philip Withnall -Date: Fri Jan 10 21:21:20 2014 +0000 - - core: Update FSF licence address - - Instead of hard-coding the postal address for the FSF, reference - the GNU - website. - - https://bugzilla.gnome.org/show_bug.cgi?id=721540 - - src/event-factories/calendar-client.c | 4 +--- - src/event-factories/calendar-client.h | 4 +--- - src/event-factories/calendar-debug.h | 4 +--- - src/event-factories/calendar-sources.c | 4 +--- - src/event-factories/calendar-sources.h | 4 +--- - src/event-factories/e-cell-renderer-color.c | 4 +--- - src/event-factories/e-cell-renderer-color.h | 4 +--- - src/widgets/eggwrapbox.c | 4 +--- - src/widgets/eggwrapbox.h | 4 +--- - 9 files changed, 9 insertions(+), 27 deletions(-) - -commit 7f75d7435d5ec52a1ad0e736e25418b103f29af0 -Author: Dimitris Spingos -Date: Tue Jan 7 10:18:32 2014 +0200 - - Updated Greek translation - - po/el.po | 341 - +++++++++++++++++++++++++++++++++++++-------------------------- - 1 file changed, 202 insertions(+), 139 deletions(-) - -commit 0023d96f90b9aa19d1698982b5b7891e85bad822 -Author: Matej Urbančič -Date: Sun Dec 22 19:22:29 2013 +0100 - - Updated Slovenian translation - - po/sl.po | 30 ++++++++++++++++++++++-------- - 1 file changed, 22 insertions(+), 8 deletions(-) - -commit 17ff6bc70a8f28bcbaaa8adcb0ba883ca7d0a6be -Author: Marek Černocký -Date: Tue Dec 3 21:59:07 2013 +0100 - - Updated Czech translation - - po/cs.po | 77 - +++++++++++++++++++++++++++++++++++++++++++++------------------- - 1 file changed, 55 insertions(+), 22 deletions(-) - -commit a40abe7a6f783d3a0d84ac0f2dbae2ce010d7335 -Author: Álvaro Peña -Date: Sat Nov 30 13:55:41 2013 +0100 - - build: Post-release version bump - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 7ffa8bede3b244a10bb4bc8fac60acb49e8a1b22 -Author: Álvaro Peña -Date: Sat Nov 30 13:51:36 2013 +0100 - - build: Release version 0.11.0 - - NEWS | 25 +++++++++++++++++++++++++ - 1 file changed, 25 insertions(+) - -commit 27dec53600137f1fc86e02f4ff70af26f4abb460 -Author: Álvaro Peña -Date: Sat Nov 30 13:46:42 2013 +0100 - - appdata: fixed the screenshot URL. - - data/almanah.appdata.xml.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 7ad171e8602a0f779a8d660e13034241313a902d -Author: Álvaro Peña -Date: Sat Nov 30 13:14:32 2013 +0100 - - trivial: Updated the URL of the project - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit a7eadede6fcfcdf0e3a7fddb776ee8f7e69ed509 -Author: Álvaro Peña -Date: Sat Nov 30 13:13:51 2013 +0100 - - Bug 719447 - Updated website and screenshot links in the AppData file - - data/almanah.appdata.xml.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit f9c3a521f1c05b14bc004b9213efae42fe286f00 -Author: Enrico Nicoletto -Date: Tue Nov 26 01:03:42 2013 -0200 - - Updated Brazilian Portuguese translation - - po/pt_BR.po | 32 ++++++++++++++++++++++---------- - 1 file changed, 22 insertions(+), 10 deletions(-) - -commit 4172fa4d0f06aa0e5857f9eecfce88a876a0cbfb -Author: Daniel Mustieles -Date: Wed Nov 20 17:28:27 2013 +0100 - - Updated Spanish translation - - po/es.po | 85 - ++++++++++++++++++++++++++++++++++++++++++++++------------------ - 1 file changed, 62 insertions(+), 23 deletions(-) - -commit ead6e5357d8af3a05b1770caa52c3db9caad128e -Author: Piotr Drąg -Date: Sun Nov 17 19:01:11 2013 +0100 - - Updated Polish translation - - po/pl.po | 22 +++++++++++++++++----- - 1 file changed, 17 insertions(+), 5 deletions(-) - -commit cbde56f6b357579e0884989e7651890b45e33d30 -Author: Piotr Drąg -Date: Sun Nov 17 18:58:25 2013 +0100 - - Updated POTFILES.in - - po/POTFILES.in | 1 + - 1 file changed, 1 insertion(+) - -commit cc5c3e34e98f070eeb8503eff205db305c996bd0 -Author: Álvaro Peña -Date: Sun Nov 17 17:36:06 2013 +0100 - - accessibility: Improve the accessibility around the application. - - Now the AlmanahTag accept the focus and export the action "remove" - with the - implementation of the AtkAction interface. - - The main window now have access to the UI manager accellerators. - - src/Makefile.am | 2 + - src/main-window.c | 6 +- - src/widgets/entry-tags-area.c | 1 + - src/widgets/tag-accessible.c | 168 - ++++++++++++++++++++++++++++++++++++++++++ - src/widgets/tag-accessible.h | 51 +++++++++++++ - src/widgets/tag-entry.c | 144 ++++++++++++++++++------------------ - src/widgets/tag.c | 29 +++++++- - src/widgets/tag.h | 7 +- - 8 files changed, 331 insertions(+), 77 deletions(-) - -commit 467b4f75b0944b90ccd67b8e2c0fc45256792668 -Author: Álvaro Peña -Date: Sun Nov 17 17:28:54 2013 +0100 - - icons: Added a 256x256 icon (png and svg) which looks better in - gnome-shell than 48x48 - - configure.ac | 1 + - data/icons/256x256/Makefile.am | 6 + - data/icons/256x256/almanah.png | Bin 0 -> 18991 bytes - data/icons/256x256/almanah.svg | 482 - +++++++++++++++++++++++++++++++++++++++++ - data/icons/Makefile.am | 2 +- - 5 files changed, 490 insertions(+), 1 deletion(-) - -commit d86652d76591bc98e686c9f9ba63a1f871401e00 -Author: Álvaro Peña -Date: Sat Nov 16 13:19:03 2013 +0100 - - style: fixed some issues with the GNOME 3.10 theme - - data/almanah.css | 3 +++ - data/almanah.ui | 10 ++++++---- - 2 files changed, 9 insertions(+), 4 deletions(-) - -commit 6354fa55e938308d6e4dfd7ff4fa44209a11ef0d -Author: Matej Urbančič -Date: Sat Nov 2 11:53:05 2013 +0100 - - Updated Slovenian translation - - po/sl.po | 65 - +++++++++++++++++++++++++++++++++++++++++----------------------- - 1 file changed, 42 insertions(+), 23 deletions(-) - -commit 9d6b621959ad9b2f1582b9f98620354a64b876a5 -Author: Antonio Fernandes C. Neto -Date: Wed Oct 30 23:19:28 2013 -0200 - - Updated Brazilian Portuguese translation - - po/pt_BR.po | 157 - ++++-------------------------------------------------------- - 1 file changed, 8 insertions(+), 149 deletions(-) - -commit 90d9341f3e0bcdfbd05560de4e06e358e51a08dd -Author: Enrico Nicoletto -Date: Wed Oct 30 23:05:50 2013 -0200 - - Updated Brazilian Portuguese translation - - po/pt_BR.po | 65 - ++++++++++++++++++++++++++++++++++++++++--------------------- - 1 file changed, 43 insertions(+), 22 deletions(-) - -commit 5d2eea1352b5bbc6e9c6317ee55fa1dd2eeef9d8 -Author: Piotr Drąg -Date: Wed Oct 30 18:56:19 2013 +0100 - - Updated Polish translation - - po/pl.po | 60 - +++++++++++++++++++++++++++++++++++++++++------------------- - 1 file changed, 41 insertions(+), 19 deletions(-) - -commit 0e00b6cb7265c0642d05566fb24a93c614145e9d -Author: Daniel Mustieles -Date: Tue Oct 8 12:44:49 2013 +0200 - - core: Change permissions of diary.db to 0600 - - Add chmod() calls at various places in the StorageManager and - import and - export code to change the permissions of files containing diary - entries - (including the database, the encrypted database, database backups and - different formats of exported files) to be 0600. - - src/export-operation.c | 36 +++++++++++++++++++++++++++++++---- - src/storage-manager.c | 51 - +++++++++++++++++++++++++++++++++++++++++++------- - 2 files changed, 76 insertions(+), 11 deletions(-) - -commit fcb70f637527d48392c13cd7bf52de7b312820ec -Author: Andika Triwidada -Date: Fri Oct 4 22:26:02 2013 +0700 - - Updated Indonesian translation - - po/id.po | 280 - ++++++++++++++++++++++++++++++++++++--------------------------- - 1 file changed, 160 insertions(+), 120 deletions(-) - -commit 61ee111f27579671657f3c2e87838bae095c4052 -Author: Rūdolfs Mazurs -Date: Sat Sep 21 23:32:16 2013 +0300 - - Updated Latvian translatio - - po/lv.po | 489 - +++++++++++++++++++++++++++++++++++---------------------------- - 1 file changed, 271 insertions(+), 218 deletions(-) - -commit 87bfbe1ccfa97ba52d0b1ab5e735a44f7163b6c0 -Author: Fran Diéguez -Date: Fri Sep 13 00:48:45 2013 +0200 - - Updated Galician translations - - po/gl.po | 89 - +++++++++++++++++++++++++++++++++++++++++++--------------------- - 1 file changed, 60 insertions(+), 29 deletions(-) - -commit 3aaff4d928858d86b2053114c32af6fd6748358f -Author: Joe Hansen -Date: Tue Sep 10 23:27:06 2013 +0200 - - Updated Danish translation - - po/da.po | 127 - ++++++++++++++++++++++++++++++++++++++++----------------------- - 1 file changed, 81 insertions(+), 46 deletions(-) - -commit 7823722fc45f8ea385ed1014e33e03abe30f693e -Author: Matej Urbančič -Date: Tue Sep 10 21:30:05 2013 +0200 - - Updated Slovenian translation - - po/sl.po | 90 - ++++++++++++++++++++++++++++++++++++++++++---------------------- - 1 file changed, 60 insertions(+), 30 deletions(-) - -commit 64f21bef5e092ee04db74f4d7d6a95c3fb644e59 -Author: Balázs Úr -Date: Tue Sep 10 00:01:14 2013 +0200 - - Updated Hungarian translation - - po/hu.po | 90 - +++++++++++++++++++++++++++++++++++++++++++--------------------- - 1 file changed, 61 insertions(+), 29 deletions(-) - -commit c0a322cb9097f74bfdd51f427f2159e2f5d35204 -Author: Мирослав Николић -Date: Sun Sep 8 07:45:15 2013 +0200 - - Updated Serbian translation - - po/sr.po | 88 - +++++++++++++++++++++++++++++++++++++++------------------- - po/sr@latin.po | 88 - +++++++++++++++++++++++++++++++++++++++------------------- - 2 files changed, 118 insertions(+), 58 deletions(-) - -commit 406c8e286dfedfcb0df589f6efc5b079efb1e25b -Author: Marek Černocký -Date: Fri Sep 6 21:03:43 2013 +0200 - - Updated Czech translation - - po/cs.po | 22 ++++++++++++++++++++-- - 1 file changed, 20 insertions(+), 2 deletions(-) - -commit 2133e7eee01f4a36a8050fd4523e0489a3fe4832 -Author: Ramon Brandão -Date: Thu Sep 5 21:37:52 2013 -0300 - - Updated Brazilian Portuguese translation proofread by Enrico Nicoletto - - po/pt_BR.po | 100 - +++++++++++++++++++++++++++++++++++++++--------------------- - 1 file changed, 66 insertions(+), 34 deletions(-) - -commit f10e138941584112fc81c320e49879f8a6f92f15 -Author: Álvaro Peña -Date: Thu Sep 5 19:42:37 2013 +0200 - - Added a shortcut to select a concrete date. - - data/almanah.ui | 1 + - 1 file changed, 1 insertion(+) - -commit 527063ff309ee04f4aa0ccb28879be37b82c86f5 -Author: Piotr Drąg -Date: Thu Sep 5 14:47:55 2013 +0200 - - Updated Polish translation - - po/pl.po | 22 ++++++++++++++++++++-- - 1 file changed, 20 insertions(+), 2 deletions(-) - -commit 82b78b92318c1e7fc3f26b7afe2c59d582e9df75 -Author: Daniel Mustieles -Date: Thu Sep 5 11:44:16 2013 +0200 - - Updated Spanish translation - - po/es.po | 90 - +++++++++++++++++++++++++++++++++++++++++++--------------------- - 1 file changed, 61 insertions(+), 29 deletions(-) - -commit eb543f421cff98e7f5552940f1275c47df494674 -Author: Álvaro Peña -Date: Thu Sep 5 01:23:40 2013 +0200 - - Bug 707517 - Added an AppData file - - Allowing the publication in the GNOME Software Center. - - data/Makefile.am | 9 +++++++++ - data/almanah.appdata.xml.in | 21 +++++++++++++++++++++ - po/POTFILES.in | 1 + - 3 files changed, 31 insertions(+) - -commit f380ba72d3fc9e379b4c1a7ef2601ba548ceee19 -Author: Marek Černocký -Date: Wed Sep 4 22:33:25 2013 +0200 - - Updated Czech translation - - po/cs.po | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -commit cb3e088f069906ab3ac5100a02c1d952a2e020bf -Author: Marek Černocký -Date: Wed Sep 4 22:32:08 2013 +0200 - - Updated Czech translation - - po/cs.po | 68 - ++++++++++++++++++++++++++++++++++++---------------------------- - 1 file changed, 38 insertions(+), 30 deletions(-) - -commit 5cf3c22c131980dfa27b71589f653fba5380d283 -Author: Piotr Drąg -Date: Wed Sep 4 22:12:50 2013 +0200 - - Updated Polish translation - - po/pl.po | 70 - +++++++++++++++++++++++++++++++++++++--------------------------- - 1 file changed, 41 insertions(+), 29 deletions(-) - -commit c3f8e26c03ab3d28cbd619f63ec72d4210bb8f1b -Author: Piotr Drąg -Date: Wed Sep 4 22:10:42 2013 +0200 - - Updated POTFILES.in - - po/POTFILES.in | 2 ++ - 1 file changed, 2 insertions(+) - -commit ecdff3cf9c94eae44eff145b0abe88f4e1880f85 -Author: Álvaro Peña -Date: Wed Sep 4 18:26:10 2013 +0200 - - Bug 684412 Simplified the tags area widget. - - Removed all the custom container stuff about style and added a button - in the toolbar - to show/hide the tags zone. - - configure.ac | 1 + - data/almanah.css | 20 ------- - data/almanah.ui | 19 ++++++- - data/icons/Makefile.am | 2 +- - data/icons/scalable/Makefile.am | 6 ++ - data/icons/scalable/almanah-tags-symbolic.svg | 81 - +++++++++++++++++++++++++++ - src/main-window.c | 18 ++++++ - src/widgets/entry-tags-area.c | 22 +++----- - 8 files changed, 130 insertions(+), 39 deletions(-) - -commit 63209c10286a1e62fa002a79ef22b486eb459e70 -Author: Álvaro Peña -Date: Wed Sep 4 18:18:40 2013 +0200 - - Localized the tags feature - - src/widgets/entry-tags-area.c | 4 +++- - src/widgets/tag-entry.c | 5 ++--- - 2 files changed, 5 insertions(+), 4 deletions(-) - -commit a393571d25a8a3a1bdf027b5280fdf3cc23ee2f6 -Author: Álvaro Peña -Date: Mon Sep 2 21:16:55 2013 +0200 - - Makes the tag entry a little wider - - src/widgets/tag-entry.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 7aa988baef20591ef0c1af309b09bc869d30d67a -Author: Álvaro Peña -Date: Mon Sep 2 21:15:36 2013 +0200 - - Some top margin for entry text. - - data/almanah.ui | 1 + - 1 file changed, 1 insertion(+) - -commit d3bf01e6874d2607054876ac48e52152bd691a00 -Author: Fran Diéguez -Date: Wed Aug 28 01:06:01 2013 +0200 - - Updated Galician translations - - po/gl.po | 216 - +++++++++++++++++++++++++++++++++------------------------------ - 1 file changed, 113 insertions(+), 103 deletions(-) - -commit 4cc562a4377ab10dead553632b9651f1f9432939 -Author: Piotr Drąg -Date: Tue Aug 20 23:02:33 2013 +0200 - - Updated Polish translation - - po/pl.po | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit 145d2f4b6d9412c1e9dccdf8f435e635eab254f1 -Author: Philip Withnall -Date: Fri Aug 2 11:18:33 2013 +0200 - - core: Add missing unit to CSS file - - This fixes a GTK+ warning. - - data/almanah.css | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 121925efd91dcac72944d07eebd215f974d7d8ca -Author: Adorilson Bezerra -Date: Sun Jun 30 08:24:58 2013 -0300 - - Updated Brazilian Portuguese translation - - po/pt_BR.po | 54 ++++++++++++++++++++++++++++++------------------------ - 1 file changed, 30 insertions(+), 24 deletions(-) - -commit 5491816d57ab3d555cf79e2adc1d893a4115665e -Author: Balázs Úr -Date: Sun Jun 16 20:23:23 2013 +0200 - - Updated Hungarian translation - - po/hu.po | 163 - ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 84 insertions(+), 79 deletions(-) - -commit ccac08b0fb077280be559eeae32208082753e140 -Author: Matej Urbančič -Date: Mon Jun 3 21:57:14 2013 +0200 - - Updated Slovenian translation - - po/sl.po | 44 +++++++++++++++++++++++++------------------- - 1 file changed, 25 insertions(+), 19 deletions(-) - -commit 9d02aac53858cdd16259f48abf1f8aadcd5109c8 -Author: Marek Černocký -Date: Wed May 15 14:49:40 2013 +0200 - - Updated Czech translation - - po/cs.po | 166 - ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 85 insertions(+), 81 deletions(-) - -commit b7f7c720b8253dfdbbd56d84486405f0493783ad -Author: Álvaro Peña -Date: Tue May 14 12:41:47 2013 +0200 - - Bug 700274 - Fix spell checking errors - - src/storage-manager.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit 92ee614ce120fe03d0289b050d381595b6449286 -Author: Piotr Drąg -Date: Tue May 14 18:54:27 2013 +0200 - - Updated Polish translation - - po/pl.po | 43 ++++++++++++++++++++++++------------------- - 1 file changed, 24 insertions(+), 19 deletions(-) - -commit 9e3da0d3d24af0f00ba64c2e0035f74ed7def1a0 -Author: Daniel Mustieles -Date: Tue May 14 16:01:20 2013 +0200 - - Updated Spanish translation - - po/es.po | 167 - ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 86 insertions(+), 81 deletions(-) - -commit 33fc88ba4eb67321153a34f397d6200148d89cec -Author: Мирослав Николић -Date: Tue May 14 12:24:24 2013 +0200 - - Updated Serbian translation - - po/sr.po | 163 - +++++++++++++++++++++++++++++---------------------------- - po/sr@latin.po | 163 - +++++++++++++++++++++++++++++---------------------------- - 2 files changed, 168 insertions(+), 158 deletions(-) - -commit 9cbb0c00931714ece2b55a518630ef94d9771727 -Author: Álvaro Peña -Date: Tue May 14 10:56:12 2013 +0200 - - Bug 700273 - Add Keywords to .desktop file - - data/almanah.desktop.in | 2 ++ - 1 file changed, 2 insertions(+) - -commit 7503b5865457370fae92e1a421e9d4b62e4c5d90 -Author: Dominique Leuenberger -Date: Thu Apr 18 09:08:31 2013 +0200 - - main: include interface.h - - We make use of prototypes in this header (almanah_get_css_path). - - https://bugzilla.gnome.org/show_bug.cgi?id=698259 - - src/application.c | 1 + - 1 file changed, 1 insertion(+) - -commit e39e376bb1e8256e4e2569edd469c6c305ff47c5 -Author: Dimitris Spingos -Date: Wed Apr 10 18:02:30 2013 +0300 - - Updated Greek translation - - po/el.po | 946 - ++++++++++++++++++++++++++++++++++++--------------------------- - 1 file changed, 536 insertions(+), 410 deletions(-) - -commit a00b3bf413c90989a7fff0679f55a3d4263e9058 -Author: Balázs Úr -Date: Sat Mar 16 19:56:36 2013 +0100 - - Updated Hungarian translation - - po/hu.po | 66 - +++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 34 insertions(+), 32 deletions(-) - -commit 9736ec244620fb16015a69d3c0dbfcb2c4e6e027 -Author: Enrico Nicoletto -Date: Tue Mar 12 19:17:42 2013 -0300 - - Updated Brazilian Portuguese translation - - po/pt_BR.po | 220 - +++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 113 insertions(+), 107 deletions(-) - -commit b8f0177bc5b25cb5e82356c32f77629c57fa61ec -Author: Joe Hansen -Date: Tue Mar 12 21:09:12 2013 +0100 - - Updated Danish translation - - po/da.po | 637 - +++++++++++++++++++++++++-------------------------------------- - 1 file changed, 253 insertions(+), 384 deletions(-) - -commit f532dcad9ff4e04cffc1263d07ae71e1cd496985 -Merge: dd6190a 91eae05 -Author: Álvaro Peña -Date: Mon Mar 11 12:20:49 2013 +0100 - - Merge branch 'Version_0_10_1' - - Conflicts: - NEWS - configure.ac - -commit 91eae05ad9076d14eccbe7cc918421a69ecebe7b -Author: Álvaro Peña -Date: Mon Mar 11 12:14:31 2013 +0100 - - Release 0.10.1 with a critical bug fixed (see - https://bugzilla.gnome.org/show_bug.cgi?id=695117) - - NEWS | 11 ++++++----- - configure.ac | 2 +- - 2 files changed, 7 insertions(+), 6 deletions(-) - -commit 58749595ba914e60ebe81d9ee2cd582c5412fcaf -Merge: 5ae30e1 87c67ae -Author: Álvaro Peña -Date: Mon Mar 11 12:08:29 2013 +0100 - - Merge branch 'V_0_9_1' into Version_0_10_1 - - Conflicts: - NEWS - configure.ac - -commit 87c67aebfbb9e9d88ee14ae6928589cbbea69383 -Author: Álvaro Peña -Date: Mon Mar 11 11:23:19 2013 +0100 - - Release 0.9.1 - - NEWS | 6 ++++++ - configure.ac | 2 +- - 2 files changed, 7 insertions(+), 1 deletion(-) - -commit dd6190a0c5397ca972688c61ebbbb58ed40d8515 -Author: Alexandre Franke -Date: Sun Mar 10 19:10:20 2013 +0100 - - Update French translation - - po/fr.po | 206 - ++++++++++++++++++++++++++------------------------------------- - 1 file changed, 85 insertions(+), 121 deletions(-) - -commit 41ef1173ea2bcf14409c789aab0294ddec1d6472 -Author: Alexandre Franke -Date: Sun Mar 10 19:08:32 2013 +0100 - - Update French translation - - po/fr.po | 432 - ++++++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 233 insertions(+), 199 deletions(-) - -commit 93328b0dbc63d9de3b31f22ef74748377eb3bfd3 -Author: Matej Urbančič -Date: Thu Mar 7 21:39:51 2013 +0100 - - Updated Slovenian translation - - po/sl.po | 282 - ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 142 insertions(+), 140 deletions(-) - -commit 0e4fb167c6eb478e0bcdb1cce5dd18f36f3f2656 -Author: Álvaro Peña -Date: Tue Mar 5 17:30:41 2013 +0100 - - Bug 695117 - Almanah doesn't encrypt the database when the application - close - - The "quit_mainloop" event in GApplication isn't used anymore from - GLib 2.32, so moved - the database desconnection stuff, including database encryption if - necessary, to the - "window_removed" event. - - src/application.c | 35 ++++++++++++++++++++++------------- - 1 file changed, 22 insertions(+), 13 deletions(-) - -commit 2a59d692dcdf8789fbb71756c4366099e1066efb -Author: Álvaro Peña -Date: Tue Feb 26 22:52:42 2013 +0100 - - build: Post-release version bump - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit b4c7124958af01deed2839ce10d696dd30a42458 -Author: Álvaro Peña -Date: Tue Feb 26 22:38:01 2013 +0100 - - Development release 0.10.8, road to 0.11 - - NEWS | 31 +++++++++++++++++++++++++++++++ - configure.ac | 2 +- - 2 files changed, 32 insertions(+), 1 deletion(-) - -commit b0510858ed7744259f4908d12d312e962ddc61a4 -Author: Álvaro Peña -Date: Tue Feb 26 13:18:44 2013 +0100 - - Better margin in the TextView widget instead the text margin - - data/almanah.ui | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit d03b8175bb955ae6442804e21b2c8222909b136f -Author: Álvaro Peña -Date: Mon Feb 25 17:41:39 2013 +0100 - - Include the entry tags in the search - - src/storage-manager.c | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -commit 717a5d3e83ccb5d7a15fe9e392531c0a6dce218d -Author: Álvaro Peña -Date: Mon Feb 25 17:34:58 2013 +0100 - - Some tag entry area aesthetic changes - - data/almanah.css | 41 +++++++++++++++++++++-------------------- - data/almanah.ui | 1 - - 2 files changed, 21 insertions(+), 21 deletions(-) - -commit ba7ebebf0148d8492786d42c80c358a12bd97d82 -Author: Yuri Myasoedov -Date: Wed Feb 20 00:24:51 2013 +0400 - - Updated Russian translation - - po/ru.po | 183 - ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 94 insertions(+), 89 deletions(-) - -commit 94ba52aab663f94141be8031f2c28df842d9e335 -Author: Мирослав Николић -Date: Tue Feb 19 20:41:05 2013 +0100 - - Updated Serbian translation - - po/sr.po | 89 - ++++++++++++++++++++-------------------------------------- - po/sr@latin.po | 89 - ++++++++++++++++++++-------------------------------------- - 2 files changed, 62 insertions(+), 116 deletions(-) - -commit befdb9f8d4014c29e3cda8c7bad170e9f4f43585 -Author: Daniel Mustieles -Date: Tue Feb 19 12:40:04 2013 +0100 - - Updated Spanish translation - - po/es.po | 64 - ++++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 32 insertions(+), 32 deletions(-) - -commit 60f8f5d5613ad691e8f84a65a43ca0b10e2687f0 -Author: Piotr Drąg -Date: Sat Feb 16 20:37:53 2013 +0100 - - Updated Polish translation - - po/pl.po | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -commit 6046c0b707e29cc3898f489bd3ab17494bd92520 -Author: Marek Černocký -Date: Fri Feb 15 21:15:06 2013 +0100 - - Updated Czech translation - - po/cs.po | 151 - ++++++++++++++++++++++++++++++--------------------------------- - 1 file changed, 72 insertions(+), 79 deletions(-) - -commit 40793869556f0b0ae1731af7c267a497b086409a -Author: Piotr Drąg -Date: Fri Feb 15 13:53:15 2013 +0100 - - Updated Polish translation - - po/pl.po | 277 - +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 135 insertions(+), 142 deletions(-) - -commit 370cac00a0fedcf9c7aefdb2115bef72ec34b658 -Author: Piotr Drąg -Date: Fri Feb 15 13:50:12 2013 +0100 - - Updated POTFILES.in - - po/POTFILES.in | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -commit d43c6959b381b4e6f998ec531a7c2dc64f58534f -Merge: 114c4f7 6b66eb3 -Author: Álvaro Peña -Date: Fri Feb 15 11:02:47 2013 +0100 - - Merge branch 'tagsupport' - -commit 6b66eb309edcb5474076bcc328a347b7a9e61e8f -Author: Álvaro Peña -Date: Fri Feb 15 10:58:10 2013 +0100 - - Updated PO files - - po/POTFILES.in | 1 + - 1 file changed, 1 insertion(+) - -commit 5ebee0904832c7fbe492ecfa1ef1488eb5e1161c -Author: Álvaro Peña -Date: Wed Feb 13 13:15:22 2013 +0100 - - Better unfocused window colors for the tags area - - data/almanah.css | 15 ++++++++++++++- - src/widgets/entry-tags-area.c | 15 +++++++-------- - 2 files changed, 21 insertions(+), 9 deletions(-) - -commit 72577d9e523fed7826e5381b4a9206db0a4171d8 -Author: Álvaro Peña -Date: Tue Feb 12 13:26:08 2013 +0100 - - Free memory and some whitespace fixes - - src/widgets/tag.c | 91 - +++++++++++++++++++++++++++++++------------------------ - 1 file changed, 52 insertions(+), 39 deletions(-) - -commit e0297a13ebc251692f386a19073acafe14342ee1 -Author: Álvaro Peña -Date: Tue Feb 12 13:22:27 2013 +0100 - - Allow the user to add a tag to a non-saved entry - - src/storage-manager.c | 17 +++++++------- - src/widgets/entry-tags-area.c | 54 - ++++++++++++++++++++----------------------- - 2 files changed, 33 insertions(+), 38 deletions(-) - -commit c1ef6e0523ac6bdac46481ec8c5da2ab288a94db -Author: Álvaro Peña -Date: Fri Feb 8 13:11:01 2013 +0100 - - EntryTagsArea is an EggWrapBox children, so now the tags are placed - dynamically - along the widget - - data/almanah.ui | 4 +- - src/Makefile.am | 4 + - src/main-window.c | 2 +- - src/widgets/eggwrapbox-enums.c | 70 ++ - src/widgets/eggwrapbox-enums.h | 23 + - src/widgets/eggwrapbox.c | 2641 - ++++++++++++++++++++++++++++++++++++++++ - src/widgets/eggwrapbox.h | 157 +++ - src/widgets/entry-tags-area.c | 2 +- - src/widgets/entry-tags-area.h | 7 +- - 9 files changed, 2903 insertions(+), 7 deletions(-) - -commit 4aceb406305ed6dd7edd939a9776eb02c0d86fdc -Author: Álvaro Peña -Date: Thu Feb 7 18:12:23 2013 +0100 - - Add the tag selected from the tags completion list to the entry. - - src/widgets/tag-entry.c | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -commit 2466d33361340b8a64f577ee17a6e3d339dcff13 -Author: Álvaro Peña -Date: Thu Feb 7 18:11:20 2013 +0100 - - Show a tooltip when the user moves the pointer over the close tag - "button". - - src/widgets/tag.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -commit eba6e082df69ba1f6d8e988cb5ff51b137b5ca3e -Author: Álvaro Peña -Date: Wed Feb 6 13:28:35 2013 +0100 - - Return to the entry GtkTextView when the user add a tag - - src/main-window.c | 2 + - src/widgets/entry-tags-area.c | 187 - +++++++++++++++++++++++++----------------- - src/widgets/entry-tags-area.h | 1 + - 3 files changed, 113 insertions(+), 77 deletions(-) - -commit 114c4f78ac9882be51c4154751760bd4fea48403 -Author: Álvaro Peña -Date: Wed Feb 6 11:12:54 2013 +0100 - - Update GtkSpell 3 support - - configure.ac | 2 +- - src/main-window.c | 20 +++++++++++--------- - 2 files changed, 12 insertions(+), 10 deletions(-) - -commit 5b4e37f6689bff6467bbdf8006ddf8496e76caa7 -Author: Yuri Myasoedov -Date: Wed Jan 30 09:27:38 2013 +0400 - - Updated Russian translation - - po/ru.po | 454 - +++++++++++++++++++++++++++++++++++++-------------------------- - 1 file changed, 267 insertions(+), 187 deletions(-) - -commit f58538ddcc37fb8b7e624892d743098ace8dc7e7 -Author: Álvaro Peña -Date: Fri Jan 25 14:25:57 2013 +0100 - - Bug 684412 - Add support for tagging diary entries - - The "remove" button in the tag turns highlighted when the user moves - the pointer on. - - The "remove" button now removes the tag from the entry, in the tags - area and in the storage. - - The user can't append a tag in an Entry if already has been added. - - src/storage-manager.c | 58 +++++++++++++++- - src/storage-manager.h | 1 + - src/widgets/entry-tags-area.c | 42 +++++++++--- - src/widgets/tag.c | 149 - +++++++++++++++++++++++++++++++++++++++--- - src/widgets/tag.h | 5 +- - 5 files changed, 232 insertions(+), 23 deletions(-) - -commit 96b90bf60766d65f7e6c4735633a76722db4d55b -Author: Álvaro Peña -Date: Thu Jan 24 16:58:40 2013 +0100 - - Bug 684412 - Add support for tagging diary entries - - The main window now have an entry header, with the tag widget - container - (AlmanahEntryTagsArea, base on a GtkGrid). This container is supposed - to distribute the - tags (AlmanahTag) and the tag entry (AlmanahTagEntry) using the - horizontal and vertical - space in a efficent way. It's responsible to load the tags for the - selected entry. - - The AlmanahTagEntry it's a GtkEntry with autocompletion capabilities - with the tags available - in the diary storage. - - AlmanahTag is a from scratch widget to draw the tag with some style - using cairo. - - The CSS has been updated to unify the visualization in the entry area. - - data/almanah.css | 33 ++++- - data/almanah.ui | 211 +++++++++++++++++++------------- - src/Makefile.am | 8 +- - src/almanah-marshal.list | 1 + - src/main-window.c | 12 ++ - src/storage-manager.c | 198 ++++++++++++++++++++++++++++++ - src/storage-manager.h | 5 + - src/widgets/entry-tags-area.c | 256 - ++++++++++++++++++++++++++++++++++++++ - src/widgets/entry-tags-area.h | 53 ++++++++ - src/widgets/tag-entry.c | 186 ++++++++++++++++++++++++++++ - src/widgets/tag-entry.h | 52 ++++++++ - src/widgets/tag.c | 278 - ++++++++++++++++++++++++++++++++++++++++++ - src/widgets/tag.h | 50 ++++++++ - 13 files changed, 1253 insertions(+), 90 deletions(-) - -commit 03d15de124a9d01b3769ec5fa894520ea10e0108 -Author: Rafael Ferreira -Date: Tue Jan 8 23:30:55 2013 -0200 - - Updated Brazilian Portuguese Translation - - po/pt_BR.po | 491 - +++++++++++++++++++++++++++++++++--------------------------- - 1 file changed, 269 insertions(+), 222 deletions(-) - -commit 5c6951bc7ce0c044eed8100f14092daa4c224766 -Author: Мирослав Николић -Date: Fri Jan 4 21:52:01 2013 +0100 - - Updated Serbian translation - - po/sr.po | 351 - +++++++++++++++++++++++++++++---------------------------- - po/sr@latin.po | 351 - +++++++++++++++++++++++++++++---------------------------- - 2 files changed, 362 insertions(+), 340 deletions(-) - -commit d31823dc566592da9793a9fcdbc8cea7a6df8cc5 -Author: Fran Diéguez -Date: Thu Dec 27 01:08:37 2012 +0100 - - Updated Galician translations - - po/gl.po | 358 - ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 182 insertions(+), 176 deletions(-) - -commit 51c28850ed065ded6f943eea06aabae5f9ca3066 -Author: Balázs Úr -Date: Wed Dec 26 16:50:20 2012 +0100 - - Updated Hungarian translation - - po/hu.po | 500 - ++++++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 273 insertions(+), 227 deletions(-) - -commit df5950d7365185ba9622fc1af68e885094f8cdff -Author: Álvaro Peña -Date: Fri Dec 14 17:52:37 2012 +0100 - - Hide the titlebar when main window is maximized. - - data/almanah.ui | 1 + - 1 file changed, 1 insertion(+) - -commit e481f5abdb46d41ac00ee3393332e92f605b55e7 -Author: Matthew Barnes -Date: Thu Dec 13 09:16:58 2012 -0500 - - Bug 687229 - Embed ESourceSelector widget from libedataserverui - - Evolution developers are merging libedataserverui back into Evolution. - Drop the libedataserverui dependency and embed the ECellRendererColor - and ESourceSelector widgets from libedataserverui in event-factories. - - See also: - https://mail.gnome.org/archives/distributor-list/2012-December/msg00000.html - - configure.ac | 2 +- - src/Makefile.am | 4 + - src/event-factories/calendar-sources.c | 3 +- - src/event-factories/e-cell-renderer-color.c | 237 +++ - src/event-factories/e-cell-renderer-color.h | 75 + - src/event-factories/e-source-selector.c | 2080 - +++++++++++++++++++++++++++ - src/event-factories/e-source-selector.h | 137 ++ - 7 files changed, 2536 insertions(+), 2 deletions(-) - -commit fea78824cbf68cfea0f218cc31ebc95ef536a53b -Author: Daniel Mustieles -Date: Tue Nov 27 17:49:37 2012 +0100 - - Updated Spanish translation - - po/es.po | 363 - ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 187 insertions(+), 176 deletions(-) - -commit 1a8416b3a101eb10c18086e60257b9f51680dfe9 -Author: Andika Triwidada -Date: Tue Nov 27 18:32:28 2012 +0700 - - Updated Indonesian translation - - po/id.po | 322 - ++++++++++++++++++++++++++++++--------------------------------- - 1 file changed, 151 insertions(+), 171 deletions(-) - -commit 2041caae063a7f445ca844722a3dc515a22a39f6 -Author: Philip Withnall -Date: Mon Nov 26 23:37:20 2012 +0000 - - core: Remove an implicit dependency on libm - - We don’t need to use floor() here, since C always truncates anyway, - and that’s equivalent to flooring if the dividend and divisor are - positive. - - src/main-window.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit fec6ff0932c79d6e142cd1dfb263ce38f425f70a -Author: Álvaro Peña -Date: Mon Nov 26 23:17:26 2012 +0100 - - Finished main window re-design. - - Removed the main toolbar from the UI file and created in execution - time. Moved all the CSS - style to just one file. Now the code is more clean and the main - window looks more like the - proposed design[1] - - [1] https://live.gnome.org/Almanah_Diary/Design#New_Design - - data/Makefile.am | 3 +- - data/almanah.css | 29 +++++ - data/almanah.ui | 44 ++----- - data/calendar-button.css | 17 --- - data/calendar-window.css | 4 - - src/Makefile.am | 2 - - src/application.c | 14 +++ - src/main-window.c | 214 - ++++++++++++----------------------- - src/widgets/calendar-button.c | 18 --- - src/widgets/calendar-window.c | 20 ---- - src/widgets/font-style-menu-action.c | 58 ---------- - src/widgets/font-style-menu-action.h | 47 -------- - 12 files changed, 127 insertions(+), 343 deletions(-) - -commit 6e7e1eb2ec8af25d6386c078d77c98f2a89972c3 -Author: Marek Černocký -Date: Sat Nov 24 13:39:02 2012 +0100 - - Updated Czech translation - - po/cs.po | 311 - +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 151 insertions(+), 160 deletions(-) - -commit 7d2845567dd1ee51391854805a2c4238c5ff29aa -Author: Álvaro Peña -Date: Thu Nov 22 17:46:28 2012 +0100 - - just a syntax error - - src/widgets/calendar-button.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit b807b71708ce59974a0d8c289cb492b00da29007 -Author: Matej Urbančič -Date: Thu Nov 22 14:51:10 2012 +0100 - - Updated Slovenian translation - - po/sl.po | 1638 - ++++++++++++++++++++++++++++++++------------------------------ - 1 file changed, 851 insertions(+), 787 deletions(-) - -commit c4e64a0d0c5b8e04520b948464182e5d7f234240 -Author: Piotr Drąg -Date: Thu Nov 22 01:32:03 2012 +0100 - - Updated Polish translation - - po/pl.po | 30 ++++++++++++++---------------- - 1 file changed, 14 insertions(+), 16 deletions(-) - -commit 3b17da47bf3ded0cd00438396a75d6555a293758 -Author: Álvaro Peña -Date: Wed Nov 21 23:30:36 2012 +0100 - - Bug 677209 - The CalendarWindow dropdown doesn't displayed in the - correct place - - The "menubar" and "menuitem" class changed the CalendarButton width, - so the "x" coordinate - for the CalendarWindow was wrong. Removed all the "add_class" and - added a css to manage - the CalendarButton style, so now the "x" coordinate for the - CalendarWindow is calculated - with the correct button position. - - data/Makefile.am | 1 + - data/calendar-button.css | 17 +++++++++++++ - src/main-window.c | 1 - - src/widgets/calendar-button.c | 59 - +++++++++++++++++++++++-------------------- - src/widgets/calendar-window.c | 2 +- - 5 files changed, 50 insertions(+), 30 deletions(-) - -commit d4adee61a2307e50f9a33240052e7fcbbd04a43e -Author: Piotr Drąg -Date: Wed Nov 21 20:55:37 2012 +0100 - - Updated Polish translation - - po/pl.po | 302 - +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 147 insertions(+), 155 deletions(-) - -commit 256b03d095fa534ea46317e1180cd3b300d7a617 -Author: Álvaro Peña -Date: Sun Nov 18 18:58:54 2012 +0100 - - core: Port to GMenu - - This patch remove the main menubar from the main window replaced by - a menu button in the - toolbar following the new GNOME style. Rearranged the menu items, - removing some of them, - e.g. the print items (just "Print diary" in the GMenu). - - Moved the code about the GMenu actions from the main window to the - application object. - - Added a new .ui file for the GMenu because the Bug 667970 - https://bugzilla.gnome.org/show_bug.cgi?id=667970. - - You can read about the menu reorganization discussion in Bug 676600 - https://bugzilla.gnome.org/show_bug.cgi?id=676600. - - configure.ac | 2 +- - data/Makefile.am | 1 + - data/almanah-app-menu.ui | 39 ++++++ - data/almanah.ui | 141 +++------------------ - po/POTFILES.in | 1 + - src/application.c | 251 ++++++++++++++++++++++++++++++++++++- - src/interface.c | 9 ++ - src/interface.h | 1 + - src/main-window.c | 283 - ++++++++---------------------------------- - src/main-window.h | 5 +- - src/widgets/calendar-button.c | 34 +++++ - src/widgets/calendar-button.h | 2 + - 12 files changed, 408 insertions(+), 361 deletions(-) - -commit d7caeb443fcedeb1aa7b61e738ba914ff4178393 -Author: Rūdolfs Mazurs -Date: Sat Oct 13 00:07:39 2012 +0300 - - Updated Latvian translation - - po/lv.po | 70 - ++++++++++++++++++++++++++++++++++++++-------------------------- - 1 file changed, 42 insertions(+), 28 deletions(-) - -commit ccaac250ccdb4e22543fd7dded5fafe98c98a171 -Author: Fran Diéguez -Date: Fri Oct 12 01:00:54 2012 +0200 - - Updated Galician translations - - po/gl.po | 62 - +++++++++++++++++++++++++++++++++++++------------------------- - 1 file changed, 37 insertions(+), 25 deletions(-) - -commit 29d5c38a4d8f5cc593dba8dd2ca13a567a59dcf7 -Author: Marek Černocký -Date: Sun Oct 7 13:32:12 2012 +0200 - - Updated Czech translation - - po/cs.po | 60 - ++++++++++++++++++++++++++++++++++++------------------------ - 1 file changed, 36 insertions(+), 24 deletions(-) - -commit 88a0f92047b3b8c4a880d48028284a6aa76691fb -Author: Daniel Mustieles -Date: Sun Sep 30 13:05:13 2012 +0200 - - Updated Spanish translation - - po/es.po | 70 - +++++++++++++++++++++++++++++++++++++--------------------------- - 1 file changed, 41 insertions(+), 29 deletions(-) - -commit 7ae1c5b9721579e3624094101e249f06590bfa59 -Author: Мирослав Николић -Date: Sat Sep 29 06:05:24 2012 +0200 - - Updated Serbian translation - - po/sr.po | 59 - +++++++++++++++++++++++++++++++++++----------------------- - po/sr@latin.po | 59 - +++++++++++++++++++++++++++++++++++----------------------- - 2 files changed, 72 insertions(+), 46 deletions(-) - -commit 69eac0f34023830fb53819245c807cd29d576ba4 -Author: Andika Triwidada -Date: Wed Sep 26 20:09:54 2012 +0700 - - Updated Indonesian translation - - po/id.po | 233 - +++++++++++++++++++++++++++++++++++++++++---------------------- - 1 file changed, 151 insertions(+), 82 deletions(-) - -commit 0eb7dfc820c881dcd7baf2677b5ec3144291447f -Author: Piotr Drąg -Date: Tue Sep 25 23:56:30 2012 +0200 - - Updated Polish translation - - po/pl.po | 65 - ++++++++++++++++++++++++++++++++++++++++------------------------ - 1 file changed, 41 insertions(+), 24 deletions(-) - -commit 69a1ad1e003ce9185c5d659acfbb519958c94365 -Author: Andrej Žnidaršič -Date: Tue Sep 25 19:29:47 2012 +0200 - - Updated Slovenian translation - - po/sl.po | 53 ++++++++++++++++++++++++++++++++++------------------- - 1 file changed, 34 insertions(+), 19 deletions(-) - -commit a5a0d0eada5c8545828fbb0e07e26af0a5626e78 -Author: Álvaro Peña -Date: Tue Sep 25 17:41:17 2012 +0200 - - Bug 680845 - Translatable strings for the time in the events list - - src/events/calendar-appointment.c | 3 ++- - src/events/calendar-task.c | 3 ++- - src/main-window.c | 7 ++++++- - 3 files changed, 10 insertions(+), 3 deletions(-) - -commit 675b601fc99830d71fd7bfb772c4b9a79db184cd -Author: Philip Withnall -Date: Tue Sep 25 00:04:03 2012 +0100 - - build: Bump EDS dependency to 3.5.91 - - This is a follow-up to commit - ed8c002455c2495e0aed74517893d24b505c8144. - - Closes: https://bugzilla.gnome.org/show_bug.cgi?id=684663 - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 6929113e60cb45a2d1fb140e1e13ee98bae8303d -Author: Álvaro Peña -Date: Thu Sep 20 20:12:43 2012 +0200 - - build: Post-release version bump - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 5ae30e17fc16e9d6c0d4434923f4638979fce504 -Author: Álvaro Peña -Date: Thu Sep 20 20:07:39 2012 +0200 - - build: Release version 0.10.0 - - NEWS | 37 +++++++++++++++++++++++++++++++++++++ - 1 file changed, 37 insertions(+) - -commit dc53ed50be550ec75f0648258e194970b269ef49 -Author: Chris Leonard -Date: Fri Sep 14 15:24:41 2012 +0100 - - Updated British English translation - - po/en_GB.po | 281 - +++++++++++++++++++++++++++++++++--------------------------- - 1 file changed, 156 insertions(+), 125 deletions(-) - -commit ed8c002455c2495e0aed74517893d24b505c8144 -Author: Milan Crha -Date: Mon Sep 10 08:19:17 2012 +0200 - - Bug 683570 - Fails to build against evolution-data-server 3.5.91 - - configure.ac | 4 +- - src/event-factories/calendar-client.c | 241 +++++++++++------------ - src/event-factories/calendar-client.h | 2 +- - src/event-factories/calendar-sources.c | 341 - +++++++++------------------------ - src/events/calendar-task.c | 2 +- - 5 files changed, 201 insertions(+), 389 deletions(-) - -commit 0d3dd10e560063d996a0924ceacd7f1f61fe7422 -Author: Milan Crha -Date: Mon Sep 10 08:16:11 2012 +0200 - - Use GTK_PRINT_SETTINGS_OUTPUT_BASENAME only if defined when compiled - - src/main-window.c | 3 +++ - 1 file changed, 3 insertions(+) - -commit 6dbcd0995d839a35cdff202499d51afb5752918a -Author: Marek Černocký -Date: Sat Sep 1 18:22:14 2012 +0200 - - Updated Czech translation - - po/cs.po | 79 - +++++++++++++++++++++++++++++++++++++++++----------------------- - 1 file changed, 51 insertions(+), 28 deletions(-) - -commit 9241763ec34fb6d2d859970140fb5e5460971df8 -Author: Philip Withnall -Date: Fri Aug 24 00:29:31 2012 +0100 - - core: Set basename of output file when doing “Print to File” - - This bumps Almanah’s GTK+ dependency to 3.3.20 (it was: 3.0). - - See: https://live.gnome.org/GnomeGoals/PrintToFile - - configure.ac | 2 +- - src/main-window.c | 3 +++ - 2 files changed, 4 insertions(+), 1 deletion(-) - -commit 811f47c9dbe1a7352b476fbd45cc92ece6e800a2 -Author: Fran Diéguez -Date: Sun Aug 19 22:51:48 2012 +0200 - - Updated Galician translations - - po/gl.po | 153 - +++++++++++++++++++++++++++++++++++---------------------------- - 1 file changed, 84 insertions(+), 69 deletions(-) - -commit 4d359b6c1ad604a41c76741ea36295d3644f1d0e -Author: Fran Diéguez -Date: Mon Aug 13 14:22:48 2012 +0200 - - Updated Galician translations - - po/gl.po | 63 - +++++++++++++++++++++++++++++++++++++++++---------------------- - 1 file changed, 41 insertions(+), 22 deletions(-) - -commit f68c3f84ca52fea39174868f067656ee0f905127 -Author: Matej Urbančič -Date: Tue Aug 7 12:16:50 2012 +0200 - - Updated Slovenian translation - - po/sl.po | 52 ++++++++++++++++++++++++++-------------------------- - 1 file changed, 26 insertions(+), 26 deletions(-) - -commit 50a5eafef276d270ebe67092b30e9247b8e57d7b -Author: Мирослав Николић -Date: Tue Aug 7 08:27:36 2012 +0200 - - Updated Serbian translation - - po/sr.po | 80 - +++++++++++++++++++++++++--------------------------------- - po/sr@latin.po | 80 - +++++++++++++++++++++++++--------------------------------- - 2 files changed, 70 insertions(+), 90 deletions(-) - -commit f93cab82dc8a0c905331038e9959a3004b7671da -Author: Álvaro Peña -Date: Wed Aug 1 18:16:37 2012 +0200 - - Include the event time as new design suggest (#680845) - - src/event-factories/calendar.c | 2 +- - src/event.c | 8 ++++++++ - src/event.h | 2 ++ - src/events/calendar-appointment.c | 15 +++++++++++++++ - src/events/calendar-task.c | 18 +++++++++++++++++- - src/events/calendar-task.h | 2 +- - src/main-window.c | 2 +- - 7 files changed, 45 insertions(+), 4 deletions(-) - -commit f87ba819b4a5f763bf0a6991a65f6edfd779c09f -Author: Daniel Mustieles -Date: Mon Jul 16 16:39:28 2012 +0200 - - Updated Spanish translation - - po/es.po | 44 +++++++++++++++++++++++--------------------- - 1 file changed, 23 insertions(+), 21 deletions(-) - -commit 53a49f5be9ac130091a8ebd72e1460a336417c84 -Author: Andika Triwidada -Date: Mon Jul 16 00:21:05 2012 +0700 - - Updated Indonesian translation - - po/id.po | 602 - +++++++++++++++++++++++++-------------------------------------- - 1 file changed, 241 insertions(+), 361 deletions(-) - -commit 6716935bbb47376c80dc3249790cc7be34d0d9c7 -Author: Piotr Drąg -Date: Sun Jul 15 17:44:57 2012 +0200 - - Updated Polish translation - - po/pl.po | 40 ++++++++++++++++++++-------------------- - 1 file changed, 20 insertions(+), 20 deletions(-) - -commit 8e44f523cf903ea05a334fc753465bc1c93d4b3c -Author: Álvaro Peña -Date: Mon Jul 9 18:27:18 2012 +0200 - - Deactivate the events expander when no events and show an events - counter - - data/almanah.ui | 33 +++++++++++++++++++++++++-------- - src/main-window.c | 19 +++++++++++++++++++ - 2 files changed, 44 insertions(+), 8 deletions(-) - -commit 3e0b220d89255503cae17e4332098f0901f69a92 -Author: Rūdolfs Mazurs -Date: Wed Jun 20 19:35:18 2012 +0300 - - Updated Latvian translation - - po/lv.po | 99 - ++++++++++++++++++++++++++++++++++++++-------------------------- - 1 file changed, 59 insertions(+), 40 deletions(-) - -commit 86e9b933afde1b796a47996d0013cd24e40adb49 -Author: Matej Urbančič -Date: Fri Jun 8 21:10:45 2012 +0200 - - Updated Slovenian translation - - po/sl.po | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -commit a56f2e750e2c95d8e30f25885e2e429f15931ea1 -Author: Bruno Brouard -Date: Sat Jun 2 20:58:07 2012 +0200 - - Updated French translation - - po/fr.po | 82 - ++++++++++++++++++++++++++++++++++++++++------------------------ - 1 file changed, 51 insertions(+), 31 deletions(-) - -commit 981c2562ad682b58d83efb0f4e4d319c92033038 -Author: Мирослав Николић -Date: Fri Jun 1 21:01:56 2012 +0200 - - Updated Serbian translation - - po/sr.po | 92 - ++++++++++++++++++++++++++++++++++++---------------------- - po/sr@latin.po | 92 - ++++++++++++++++++++++++++++++++++++---------------------- - 2 files changed, 116 insertions(+), 68 deletions(-) - -commit 01b34fab1bdc839f250dc67e71fe4b85813a05f9 -Author: Daniel Mustieles -Date: Fri Jun 1 10:27:28 2012 +0200 - - Updated Spanish translation - - po/es.po | 23 ++++++++++++++++------- - 1 file changed, 16 insertions(+), 7 deletions(-) - -commit 67266ed77838dd17da135c8041115a0bd19afdc5 -Author: Piotr Drąg -Date: Thu May 31 20:35:29 2012 +0200 - - Updated Polish translation - - po/pl.po | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -commit 2ae868ba36ec71298a3101b25f6afe42698bc109 -Author: Álvaro Peña -Date: Thu May 31 18:44:46 2012 +0200 - - Fix the calendar button/window style - - data/Makefile.am | 4 +++- - data/calendar-window.css | 4 ++++ - src/interface.c | 9 +++++++++ - src/interface.h | 1 + - src/widgets/calendar-button.c | 14 +++++++++++--- - src/widgets/calendar-window.c | 20 ++++++++++++++++++++ - 6 files changed, 48 insertions(+), 4 deletions(-) - -commit 7e0b3ee0ff44b72109dae8db60a9e7fe4773d263 -Author: Matej Urbančič -Date: Mon May 28 14:55:19 2012 +0200 - - Updated Slovenian translation - - po/sl.po | 63 - ++++++++++++++++++++++++++++++++++++++------------------------- - 1 file changed, 38 insertions(+), 25 deletions(-) - -commit a5f0cb83c0222959338f8dec0829dab379fa63d8 -Author: Daniel Mustieles -Date: Sun May 27 12:28:54 2012 +0200 - - Updated Spanish translation - - po/es.po | 72 - ++++++++++++++++++++++++++++++++++++++-------------------------- - 1 file changed, 43 insertions(+), 29 deletions(-) - -commit b9704c3788b54a3b4dcbdf5235ee57aa62c658e6 -Author: Yuri Myasoedov -Date: Sun May 27 11:38:44 2012 +0400 - - Updated Russian translation - - po/ru.po | 304 - ++++++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 164 insertions(+), 140 deletions(-) - -commit 363eb52c63163b77c243d7ca4e9c0a55097e5c1f -Author: Piotr Drąg -Date: Sat May 26 20:54:36 2012 +0200 - - Updated Polish translation - - po/pl.po | 64 - +++++++++++++++++++++++++++++++++++++++------------------------- - 1 file changed, 39 insertions(+), 25 deletions(-) - -commit a3d78b7061befb3df3fef27a31cdebea6cb79ec1 -Author: Álvaro Peña -Date: Sat May 26 19:17:17 2012 +0200 - - Update maintainers with the alvaropg information - - MAINTAINERS | 4 ++++ - almanah.doap | 7 +++++++ - 2 files changed, 11 insertions(+) - -commit f7a2e0098ad9dca5e7e1741234af8b81cb95e4cc -Author: Álvaro Peña -Date: Sat May 26 18:58:41 2012 +0200 - - Create a date button in the toolbar - - data/almanah.ui | 259 +++++++++++++--------------- - po/POTFILES.in | 2 + - src/Makefile.am | 4 + - src/main-window.c | 76 +++++--- - src/widgets/calendar-button.c | 391 - ++++++++++++++++++++++++++++++++++++++++++ - src/widgets/calendar-button.h | 60 +++++++ - src/widgets/calendar-window.c | 165 ++++++++++++++++++ - src/widgets/calendar-window.h | 59 +++++++ - 8 files changed, 858 insertions(+), 158 deletions(-) - -commit 05185be958f073d444c3517ab9e9543b71ddf0cd -Author: Daniel Winzen -Date: Fri May 18 20:19:41 2012 +0200 - - Updated German translation - - po/de.po | 324 - ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 163 insertions(+), 161 deletions(-) - -commit 877df0a5c29a47509b35a95c9bcb20244e502e14 -Author: Rūdolfs Mazurs -Date: Wed May 16 22:45:36 2012 +0300 - - Added Latvian translation - - po/LINGUAS | 1 + - po/lv.po | 643 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 644 insertions(+) - -commit 3830c9d3c44160abaa4f9fea974649f6b9403124 -Author: Bruno Brouard -Date: Sun Apr 22 16:20:22 2012 +0200 - - Updated French translation - - po/fr.po | 113 - +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 56 insertions(+), 57 deletions(-) - -commit 408bcff36919701fd7c1cfc16407a53d14e6e983 -Author: Joe Hansen -Date: Sat Apr 21 17:12:02 2012 +0200 - - Updated Danish translation - - po/da.po | 108 - +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 54 insertions(+), 54 deletions(-) - -commit de42b202f231b607d3b71ec49514c4bb579fc567 -Author: Мирослав Николић -Date: Sat Mar 31 15:00:08 2012 +0200 - - Updated Serbian translation - - po/sr.po | 309 - +++++++++++++++++++++++++++++---------------------------- - po/sr@latin.po | 309 - +++++++++++++++++++++++++++++---------------------------- - 2 files changed, 310 insertions(+), 308 deletions(-) - -commit dac217eb81b3c1cf06a546dfb83a737fb465958e -Author: Philip Withnall -Date: Thu Mar 29 11:16:07 2012 +0100 - - docs: Add a (really) basic security policy to HACKING - - HACKING | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -commit bda7233463cce82daa90d5036ac18e1bc598a28e -Author: Philip Withnall -Date: Wed Mar 28 22:28:03 2012 +0100 - - docs: Add some general principles to HACKING - - HACKING | 8 ++++++++ - 1 file changed, 8 insertions(+) - -commit 817962cc4d4f5b1999bc5aa91d89142479786052 -Author: Daniel Mustieles -Date: Wed Mar 28 18:28:02 2012 +0200 - - Updated Spanish translation - - po/es.po | 303 - +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 151 insertions(+), 152 deletions(-) - -commit 2818e8eb289bf723d074c75e0e2135605a85d50f -Author: Matej Urbančič -Date: Mon Mar 26 14:10:24 2012 +0200 - - Updated Slovenian translation - - po/sl.po | 294 - +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 146 insertions(+), 148 deletions(-) - -commit 4045ca7ed91fde2f0ec4c607efd71ac0561a0031 -Author: Fran Diéguez -Date: Mon Mar 26 12:23:01 2012 +0200 - - Updated Galician translations - - po/gl.po | 104 - +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 52 insertions(+), 52 deletions(-) - -commit 059179423568c5ef9d00c48fa7e6ae23410ec797 -Author: Piotr Drąg -Date: Mon Mar 26 02:25:10 2012 +0200 - - Updated Polish translation - - po/pl.po | 296 - +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 148 insertions(+), 148 deletions(-) - -commit 4402a3fd6ad6be0693efd2aa104db120394d7852 -Author: Marek Černocký -Date: Sun Mar 25 23:52:15 2012 +0200 - - Updated Czech translation - - po/cs.po | 290 - ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 146 insertions(+), 144 deletions(-) - -commit 97232b1313cadf8ec823ddd33750ca684e36fb97 -Author: Philip Withnall -Date: Sun Mar 25 22:44:36 2012 +0100 - - build: Post-release version bump - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 446ffc5bbb4c02b8eaadf598bf42a45d048f10f2 -Author: Philip Withnall -Date: Sun Mar 25 22:43:44 2012 +0100 - - build: Release version 0.9.0 - - NEWS | 45 +++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 45 insertions(+) - -commit ff90b56f3c5c86c7d954d6bfb27821ed4b785357 -Author: Philip Withnall -Date: Sun Mar 25 22:36:20 2012 +0100 - - build: Re-add MAINTAINERS file - - `make dist` requires it. - - MAINTAINERS | 3 +++ - 1 file changed, 3 insertions(+) - -commit bb4634640139145ede83f871568a1762f6e8d95f -Author: Philip Withnall -Date: Sun Mar 25 22:35:02 2012 +0100 - - build: Update dependencies list in README - - README | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 13f2b0f08096ff4ad9570f65ca2b113fb8143c24 -Author: Philip Withnall -Date: Sun Mar 25 22:20:12 2012 +0100 - - l10n: Update British English translation - - po/en_GB.po | 491 - ++++++++++++++++++++++++++++++++---------------------------- - 1 file changed, 259 insertions(+), 232 deletions(-) - -commit 523de8fa86af7cb85298db4f6d03ec4f44a2d281 -Author: Philip Withnall -Date: Sun Mar 25 22:17:22 2012 +0100 - - core: Fix viewing results of import operations - - src/import-export-dialog.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit e3c64de7ae46cead5684df0f000cfe8a09d60bae -Author: Philip Withnall -Date: Sun Mar 25 22:08:00 2012 +0100 - - core: Fix text export - - It wasn't clearing its output buffer between entries, resulting in the - text output files being output as concatenations of all the previous - entries. - - src/export-operation.c | 3 +++ - 1 file changed, 3 insertions(+) - -commit 0d09d962a17262fb6550fc68a05f0e75683aa2bd -Author: Philip Withnall -Date: Sun Mar 25 22:03:40 2012 +0100 - - core: Fix deserialisation of XML when searching entries - - src/entry.c | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -commit 471dab3ea999e4716c33f72870b510a70fa588d3 -Author: Philip Withnall -Date: Sun Mar 25 11:03:09 2012 +0100 - - core: Work around a GtkBuilder bug with more recent versions of GTK+ - - Work around bgo#672789 in more recent versions of GTK+ by always - requesting - to load the GtkUIManager XML when using - gtk_builder_add_objects_from_file(). - - src/date-entry-dialog.c | 1 + - src/import-export-dialog.c | 2 ++ - src/preferences-dialog.c | 1 + - src/search-dialog.c | 1 + - src/uri-entry-dialog.c | 1 + - 5 files changed, 6 insertions(+) - -commit 934c42b4c69b46b09e6577389e3e5eb2ab51e211 -Author: Philip Withnall -Date: Sun Mar 25 10:25:29 2012 +0100 - - core: Fix punctuation in a tooltip - - data/almanah.ui | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 6eb7d62876aea12b565210c110e8b7b96fd65ab0 -Author: Philip Withnall -Date: Sun Mar 25 10:25:20 2012 +0100 - - core: Add an icon to the hyperlink button - - data/almanah.ui | 1 + - 1 file changed, 1 insertion(+) - -commit 7501b26e7414d95d55f57bd497cc034ba9dfc76c -Author: Philip Withnall -Date: Sun Mar 25 10:17:01 2012 +0100 - - Bug 669927 — Save current entry after a timeout - - Save the current entry every 10 minutes, to deal with the situation - where - a user keeps the same entry open all day, periodically adding to it. - - Closes: https://bugzilla.gnome.org/show_bug.cgi?id=669927 - - src/main-window.c | 38 ++++++++++++++++++++++++++++++++++---- - 1 file changed, 34 insertions(+), 4 deletions(-) - -commit 34762478a7aa99b0acd95245f9c396f0db666b2b -Author: Philip Withnall -Date: Sat Mar 24 23:06:58 2012 +0000 - - core: Use GtkBox instead of Gtk[H|V]Box in the print dialogue - - src/printing.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 542a426082f89e965a22af6e97c4ce06beefa45e -Author: Philip Withnall -Date: Sat Mar 24 23:00:12 2012 +0000 - - Bug 671801 — i18n doesn't work - - Commit 01084bd42ad2747cc582274a3988f17bcf23d6f3 removed - AM_GNU_GETTEXT, - meaning that ENABLE_NLS was *never* defined. This effectively - disabled i18n - for everyone. - - Closes: https://bugzilla.gnome.org/show_bug.cgi?id=671801 - - src/application.c | 2 -- - 1 file changed, 2 deletions(-) - -commit 81c4ee3a1044f07f6704d9e4de723a30a8c13766 -Author: Fran Diéguez -Date: Sat Mar 24 00:14:16 2012 +0100 - - Updated Galician translations - - po/gl.po | 254 - ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 130 insertions(+), 124 deletions(-) - -commit 54451a3934ce73f1abfad470829c35fd0c7f29fa -Author: Bruno Brouard -Date: Wed Mar 21 19:19:04 2012 +0100 - - Updated French translation - - po/fr.po | 258 - +++++++++++++++++++++++++++++++++------------------------------ - 1 file changed, 135 insertions(+), 123 deletions(-) - -commit d0f9694c78b9f71dc68b57739e2556380c1524aa -Author: Мирослав Николић -Date: Sun Feb 26 20:44:05 2012 +0100 - - Updated Serbian translation - - po/sr.po | 127 - +++++++++++++++++++++++++++++++-------------------------- - po/sr@latin.po | 127 - +++++++++++++++++++++++++++++++-------------------------- - 2 files changed, 138 insertions(+), 116 deletions(-) - -commit 6384f10c69d063656a26cc8fcd2c1103aa92dc3d -Author: Philip Withnall -Date: Fri Jan 6 11:22:56 2012 +0000 - - core: Don't call g_thread_init() if we have GLib ≥ 2.31.0 - - src/main.c | 2 ++ - 1 file changed, 2 insertions(+) - -commit 4801c389a96324e477a96624514cbd0bcc92d883 -Author: Philip Withnall -Date: Fri Jan 6 11:21:34 2012 +0000 - - core: Fix chaining up of GApplication::startup signal - - src/application.c | 3 +++ - 1 file changed, 3 insertions(+) - -commit c68e562b332c50460bec9a82dfa3f3b30e96eddb -Author: Philip Withnall -Date: Fri Jan 6 11:09:43 2012 +0000 - - core: Fix build with --enable-spell-checking - - See: bgo#667263 - - src/main-window.c | 37 +++++++++++++++++-------------------- - 1 file changed, 17 insertions(+), 20 deletions(-) - -commit e8eaacbc52dfa54c081b709738bd21a9b196fc0c -Author: Vincent Untz -Date: Fri Jan 6 12:18:41 2012 +0100 - - build: Fix build with encryption support - - We need to check for largefile support to make gpgme happy. - - https://bugzilla.gnome.org/show_bug.cgi?id=666801 - - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -commit 90f6d22a337b9718182c7cc847f9323024b3d0b0 -Author: Philip Withnall -Date: Wed Jan 4 17:45:40 2012 +0000 - - build: Re-enable spell checking now that GtkSpell has GTK+ 3 support - - A GTK+ 3-ready version of GtkSpell is about ready at: - https://github.com/manisandro/gtkspell3 - - Re-enable compilation with --enable-spell-checking accordingly. - - This undoes commit 43768d9a223e769ef8662222b55e2dc6e5a6c48c and - bumps our - GtkSpell dependency to gtkspell-3.0. - - Closes: bgo#667263 - - configure.ac | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -commit 82e2acbf2bb4d1039732cbcfb2c171ea0eb7e192 -Author: Joe Hansen -Date: Mon Jan 2 12:40:55 2012 +0100 - - Updated Danish translation - - po/da.po | 117 - ++++++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 64 insertions(+), 53 deletions(-) - -commit 241eb77d4c04f3341a06f113d2bd1fd1e38f10ed -Author: Muhammet Kara -Date: Sat Dec 31 21:20:13 2011 +0200 - - [l10n]Updated Turkish translation - - po/tr.po | 145 - +++++++++++++++++++++++++++++++++++---------------------------- - 1 file changed, 80 insertions(+), 65 deletions(-) - -commit 7a1c288c8296a49a93001ad49a1aab7eb8be6764 -Author: Mateusz Kacprzak -Date: Sat Dec 17 22:18:14 2011 +0100 - - Added Polish translation - - po/LINGUAS | 1 + - po/pl.po | 661 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 662 insertions(+) - -commit 6bf0229c20f9a5ef92374595ff4d5823f74196f0 -Author: Piotr Drąg -Date: Sat Dec 17 22:16:51 2011 +0100 - - Revert "Added Polish translation" - - This reverts commit 4c5c13f524a000b7ecfcf0bb42a9d18dddeaa577. - - po/LINGUAS | 1 - - po/pl.po | 661 - ------------------------------------------------------------- - 2 files changed, 662 deletions(-) - -commit 4c5c13f524a000b7ecfcf0bb42a9d18dddeaa577 -Author: Piotr Drąg -Date: Sat Dec 17 22:03:30 2011 +0100 - - Added Polish translation - - po/LINGUAS | 1 + - po/pl.po | 661 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 662 insertions(+) - -commit 4b11b928449c8623327694773ead9869603fc802 -Author: Kristjan SCHMIDT -Date: Sat Nov 5 09:13:52 2011 +0100 - - Add Esperanto translation - - po/LINGUAS | 1 + - po/eo.po | 614 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 615 insertions(+) - -commit 75a4dc552d712fe0d4533370e4937c6f4d200076 -Author: Marek Černocký -Date: Wed Nov 2 19:49:38 2011 +0100 - - Updated Czech translation - - po/cs.po | 113 - ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 57 insertions(+), 56 deletions(-) - -commit f963e70db98854937185e749c1b4dbbe919ca12c -Author: Álvaro Peña -Date: Tue Nov 1 21:33:29 2011 +0000 - - core: Move the events list to the bottom of the window - - Closes: bgo#662014 - - data/almanah.ui | 136 - +++++++++++++++++++++++++++--------------------------- - src/main-window.c | 66 +------------------------- - 2 files changed, 69 insertions(+), 133 deletions(-) - -commit faf64d1512c139bd2479d2a9893ca7ddc82f4664 -Author: Gabor Kelemen -Date: Sat Oct 29 17:35:51 2011 +0200 - - Updated Hungarian translation by Balazs Ur - - po/hu.po | 157 - ++++++++++++++++++++++++++++++++++++++------------------------- - 1 file changed, 96 insertions(+), 61 deletions(-) - -commit 826c6a591a2f11908aff1567129872a7ad138c22 -Author: Andrej Žnidaršič -Date: Tue Oct 25 20:36:16 2011 +0200 - - Updated Slovenian translation - - po/sl.po | 166 - ++++++++++++++++++++++++++++++++++++++++++--------------------- - 1 file changed, 112 insertions(+), 54 deletions(-) - -commit 009d24855bf7df122d9fe4e69ac4c3b4572f6b6c -Author: Daniel Mustieles -Date: Tue Oct 25 16:35:52 2011 +0200 - - Updated Spanish translation - - po/es.po | 115 - ++++++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 63 insertions(+), 52 deletions(-) - -commit 69c10c8b4fc42ed48ad1c116f90f12015a7be5de -Author: Mario Blättermann -Date: Mon Oct 24 23:24:13 2011 +0200 - - [l10n] Updated German translation - - po/de.po | 206 - ++++++++++++++++++++------------------------------------------- - 1 file changed, 66 insertions(+), 140 deletions(-) - -commit e573eb06c5391a9fa6e4d1029a9957ab44d81589 -Author: Álvaro Peña -Date: Mon Oct 24 18:39:31 2011 +0200 - - Bug 662016 — Create a toolbar menu item with the fonts style - - data/almanah.ui | 25 +++++++-- - src/Makefile.am | 74 ++++++++++++++------------- - src/main-window.c | 99 - ++++++++++++++++++++++++++++++++++++ - src/widgets/font-style-menu-action.c | 58 +++++++++++++++++++++ - src/widgets/font-style-menu-action.h | 47 +++++++++++++++++ - 5 files changed, 264 insertions(+), 39 deletions(-) - -commit 8b44143df4e844d4c9b4da45186686cf048ebbfa -Author: Muhammet Kara -Date: Fri Sep 30 01:31:39 2011 +0300 - - Added Turkish translation - - po/LINGUAS | 1 + - po/tr.po | 626 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 627 insertions(+) - -commit 24c6d54c1c9b7211336b4b6779bb16a68d587fec -Author: Fran Dieguez -Date: Tue Aug 30 16:58:49 2011 +0200 - - Updated galician translations - - po/gl.po | 607 - ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 312 insertions(+), 295 deletions(-) - -commit e7743e8b0fefeb884278bb15ddd65bd73c12b3c6 -Author: Claude Paroz -Date: Mon Aug 22 09:58:15 2011 +0200 - - Updated French translation - - po/fr.po | 475 - +++++++++++++++++++++++++-------------------------------------- - 1 file changed, 184 insertions(+), 291 deletions(-) - -commit 233aad655e48c8533f513ff03c5100ef8768c149 -Author: Yuri Myasoedov -Date: Fri Jul 29 19:38:10 2011 +0400 - - Updated Russian translation - - po/ru.po | 234 - +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 117 insertions(+), 117 deletions(-) - -commit ddf428130ffe6a457e6be01f30506cd338115b90 -Author: Inaki Larranaga Murgoitio -Date: Thu Jul 28 18:14:15 2011 +0200 - - Added Basque language - - po/LINGUAS | 1 + - po/eu.po | 764 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 765 insertions(+) - -commit ad6c2ee888d70e936608149426dd2ecfdd497141 -Author: Gabriel Speckhahn -Date: Sat Jul 23 09:52:29 2011 -0300 - - Updated Brazilian Portuguese Translation - - po/pt_BR.po | 216 - ++++++++++++++++++++++++++++++++---------------------------- - 1 file changed, 117 insertions(+), 99 deletions(-) - -commit 7d19c7b00b8492684c9814bf160f16755f306911 -Author: Philip Withnall -Date: Tue Jul 19 08:43:38 2011 +0100 - - build: Fix preferences with --enable-spell-checking and - --disable-encryption - - The code to show the dialogue wasn't getting built. - - src/main-window.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 6ebc71c68709b6cc1f371c6fb3dfa20d6bc39f3d -Author: Philip Withnall -Date: Tue Jul 19 08:43:25 2011 +0100 - - core: Remove an extraneous include - - src/interface.c | 3 --- - 1 file changed, 3 deletions(-) - -commit 9a96bcdeb8eaa89943d7f4143c2840341162adaf -Author: Philip Withnall -Date: Thu Jul 14 08:51:54 2011 +0100 - - core: Use the correct priority for search progress callbacks - - This should prevent the situation where the progress callbacks - are scheduled - after the async operation's GAsyncReadyCallback. - - See: bgo#647690 - - src/storage-manager.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -commit 4248338b6fa04ece36b9da1f4283c784517cad25 -Author: Álvaro Peña -Date: Thu Jul 14 08:43:41 2011 +0100 - - core: Fix resizing the search dialogue - - data/almanah.ui | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -commit 85fd0359aab2dd6db26ffbc7ee74a58c0eab0acd -Author: Joe Hansen -Date: Wed Jul 13 22:26:04 2011 +0200 - - Updated Danish translation - - po/da.po | 712 - ++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 367 insertions(+), 345 deletions(-) - -commit 4ad604845c6173d326336e0b142a023eb5656c28 -Author: Мирослав Николић -Date: Fri Jul 8 18:08:13 2011 +0200 - - Updated Serbian translation - - po/sr.po | 82 - +++++++++++++++++++++++++++++++++++++--------------------- - po/sr@latin.po | 82 - +++++++++++++++++++++++++++++++++++++--------------------- - 2 files changed, 106 insertions(+), 58 deletions(-) - -commit 0bd90add8c25b0dd977ac87eb3e7bdb1d7474c4e -Author: Marek Černocký -Date: Tue Jul 5 15:40:29 2011 +0200 - - Updated Czech translation - - po/cs.po | 332 - +++++++++++++++++++++------------------------------------------ - 1 file changed, 109 insertions(+), 223 deletions(-) - -commit 5758286f0e6dc923034fcc5a26644e3845345b5a -Author: Andrej Žnidaršič -Date: Sat Jul 2 20:17:55 2011 +0200 - - Updated Slovenian translation - - po/sl.po | 78 - +++++++++++++++++++++++++++++++++++++++++----------------------- - 1 file changed, 50 insertions(+), 28 deletions(-) - -commit 211049803920d01bd6f1de2c969569420cec4eaa -Author: Mario Blättermann -Date: Tue Jun 28 21:55:38 2011 +0200 - - [l10n] Updated German translation - - po/de.po | 199 - +++++++++++++++++++++++++++++++++++---------------------------- - 1 file changed, 110 insertions(+), 89 deletions(-) - -commit 466e98fec932ac18d9164bfd4a881121d104339d -Author: Daniel Mustieles -Date: Tue Jun 28 21:32:34 2011 +0200 - - Updated Spanish translation - - po/es.po | 207 - ++++++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 113 insertions(+), 94 deletions(-) - -commit cb8ad21e8c32fdce37359e192a7dc3d387af9558 -Author: Álvaro Peña -Date: Mon Jun 27 23:28:41 2011 +0100 - - Bug 647690 — Make search asynchronous - - Add an asynchronous search API and make use of it in the search - dialogue. - Also give the search dialogue a bit of a facelift. - - Closes: bgo#647690 - - data/almanah.ui | 201 - ++++++++++++++++++++++++++++++++------------------ - src/main-window.c | 2 +- - src/search-dialog.c | 175 ++++++++++++++++++++++++++++++++++++------- - src/storage-manager.c | 162 ++++++++++++++++++++++++++++++++++++++++ - src/storage-manager.h | 7 ++ - 5 files changed, 448 insertions(+), 99 deletions(-) - -commit f72bcc9b8703e44360dd89ca76d35550b3bc9293 -Author: Мирослав Николић -Date: Sun May 15 23:57:08 2011 +0200 - - Added Serbian translation - - po/sr@latin.po | 675 - ++++++++++++++++++++++++++++++++++++++++++++++++++++----- - 1 file changed, 621 insertions(+), 54 deletions(-) - -commit 28eee498611bdc07ab52cd59ede0b7398809c232 -Author: Мирослав Николић -Date: Sun May 15 23:55:42 2011 +0200 - - Added Serbian translation - - po/LINGUAS | 2 + - po/sr.po | 621 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - po/sr@latin.po | 54 +++++ - 3 files changed, 677 insertions(+) - -commit 95e9bdd85fccc58c0b5e0ea3c05671a28d6743d2 -Author: Yuri Myasoedov -Date: Thu May 12 20:15:45 2011 +0400 - - Updated Russian translation - - po/ru.po | 685 - ++++++++++++++++++++++++++------------------------------------- - 1 file changed, 287 insertions(+), 398 deletions(-) - -commit 7a436a09f97c3a216191ed443041c0cf5c41c662 -Author: Gabor Kelemen -Date: Sat May 7 19:16:35 2011 +0200 - - Updated Hungarian translation from Balazs Úr - - po/hu.po | 446 - +++++++++++++++++++++++---------------------------------------- - 1 file changed, 160 insertions(+), 286 deletions(-) - -commit 37ba1df32ce4e23a35695fb9e5f42272423ef3af -Author: Djavan Fagundes -Date: Tue May 3 14:42:28 2011 -0300 - - Updated Brazilian Portuguese translation - - po/pt_BR.po | 570 - ++++++++++++++++++++++++++++++------------------------------ - 1 file changed, 283 insertions(+), 287 deletions(-) - -commit a4a170bc05d59345f4ce46b2a48f78c9c268a6e7 -Author: Daniel Korostil -Date: Tue May 3 19:24:28 2011 +0300 - - Added uk translation - - po/LINGUAS | 1 + - po/uk.po | 699 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 700 insertions(+) - -commit 96f723bbc1f1e89cbf62f807778a04bc83747e00 -Author: Andrej Žnidaršič -Date: Wed Apr 27 19:46:14 2011 +0200 - - Updated Slovenian translation - - po/sl.po | 452 - +++++++++++++++++++++++++++------------------------------------ - 1 file changed, 196 insertions(+), 256 deletions(-) - -commit e205209b688ee0c9fc453c84c7565e454fd01771 -Author: Daniel Mustieles -Date: Thu Apr 21 19:33:27 2011 +0200 - - Updated Spanish translation - - po/es.po | 449 - +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 224 insertions(+), 225 deletions(-) - -commit 6637789f8f969278c0c54ec6b528e6816019962f -Author: Marek Černocký -Date: Thu Apr 21 09:49:44 2011 +0200 - - Updated Czech translation - - po/cs.po | 447 - +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 223 insertions(+), 224 deletions(-) - -commit 325433a918c4e7b299c2a1542c5d95eea86beb7b -Author: Álvaro Peña -Date: Wed Apr 20 16:40:16 2011 +0100 - - Bug 647691 — Make search case-insensitive - - src/storage-manager.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -commit 845985fe959d0be0b47a3e71759fa8b13f482d98 -Author: Mario Blättermann -Date: Mon Apr 18 20:28:21 2011 +0200 - - [l10n] Updated German translation - - po/de.po | 441 - +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 218 insertions(+), 223 deletions(-) - -commit abb2fab89d83c354f409ca70e69def53ff8fd6de -Author: Philip Withnall -Date: Mon Apr 18 18:42:21 2011 +0100 - - build: Bump GTK+ and GIO dependencies to 3.0.0 and 2.28.0 respectively - - This is because we now use GtkApplication and GApplication. - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 5953fc9358483fe4b95f2eddeb03db52240099b1 -Author: Philip Withnall -Date: Mon Apr 18 18:32:35 2011 +0100 - - core: Mark the toolbar as a primary toolbar - - data/almanah.ui | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -commit 727d98f1bdf532b7eb7806fb0f752c38c4a74086 -Author: Philip Withnall -Date: Mon Apr 18 17:56:59 2011 +0100 - - core: Bind the StorageManager's key to GSettings - - src/application.c | 9 +++++---- - src/storage-manager.c | 2 +- - 2 files changed, 6 insertions(+), 5 deletions(-) - -commit de24162fe156d7f9e54ff30edd3eaa05cf273b32 -Author: Philip Withnall -Date: Mon Apr 18 17:53:04 2011 +0100 - - core: Hide the main window while exiting to make things look faster - - src/main-window.c | 3 +++ - 1 file changed, 3 insertions(+) - -commit 12bdc2f7d2a9a7049c958285be6564f64aa45fe4 -Author: Philip Withnall -Date: Mon Apr 18 17:52:55 2011 +0100 - - core: Don't double-free the main window on exiting - - src/application.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -commit fbee37f024de85384bfedce2edd320548ec6acd0 -Author: Philip Withnall -Date: Mon Apr 18 17:42:42 2011 +0100 - - core: Remove spurious debug messages - - src/application.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit fb3b0eddb3a57097712ee494dd04b0fd3867b8ae -Author: Philip Withnall -Date: Mon Apr 18 17:41:31 2011 +0100 - - core: Remove unused variables from AlmanahApplication - - src/application.c | 21 --------------------- - 1 file changed, 21 deletions(-) - -commit 37ae45223aeb2395b8db9d6ce1dcfece1590095c -Author: Philip Withnall -Date: Mon Apr 18 17:37:48 2011 +0100 - - core: Move the remaining function from main.c into interface.c - - This allows us to remove main.h. - - configure.ac | 2 +- - src/Makefile.am | 1 - - src/date-entry-dialog.c | 1 - - src/entry.c | 1 - - src/event-manager.c | 1 - - src/event.c | 1 - - src/events/calendar-appointment.c | 2 +- - src/events/calendar-task.c | 2 +- - src/export-operation.c | 1 - - src/import-export-dialog.c | 1 - - src/import-operation.c | 1 - - src/interface.c | 28 +++++++++++++++++++++++++++- - src/interface.h | 1 + - src/main-window.c | 1 - - src/main.c | 32 +++----------------------------- - src/main.h | 33 --------------------------------- - src/preferences-dialog.c | 1 - - src/printing.c | 1 - - src/search-dialog.c | 1 - - src/storage-manager.c | 2 +- - src/uri-entry-dialog.c | 1 - - src/widgets/calendar.c | 1 - - 22 files changed, 35 insertions(+), 81 deletions(-) - -commit a76942bdfee913ef606879f6998c219877ce14be -Author: Philip Withnall -Date: Mon Apr 18 17:23:03 2011 +0100 - - core: Make the XML parser slightly more robust - - src/entry.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -commit 56bec5f5eeb9f0a8497baa186ad7294e9e7f34ff -Author: Philip Withnall -Date: Mon Apr 18 17:22:35 2011 +0100 - - core: Only set the last edited date on import if it's valid - - src/import-operation.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -commit 0d2374f0bd55461b8bb6ca3a234b60fb395c6f32 -Author: Philip Withnall -Date: Thu Apr 14 23:48:54 2011 +0100 - - Bug 622193 — Use single instance - - A long exercise in yak shaving to remove the global struct, port to - GtkApplication and consequently get single instance support. - - Closes: bgo#622193 - - po/POTFILES.in | 9 +- - src/Makefile.am | 2 + - src/application.c | 372 - ++++++++++++++++++++++++++++++++++++++ - src/application.h | 62 +++++++ - src/date-entry-dialog.c | 1 - - src/event-manager.c | 8 +- - src/event.c | 4 +- - src/event.h | 4 +- - src/events/calendar-appointment.c | 11 +- - src/events/calendar-task.c | 11 +- - src/export-operation.c | 59 +++++- - src/export-operation.h | 5 +- - src/import-export-dialog.c | 87 +++++++-- - src/import-export-dialog.h | 3 +- - src/import-operation.c | 65 ++++++- - src/import-operation.h | 5 +- - src/main-window.c | 236 +++++++++++++++++------- - src/main-window.h | 4 +- - src/main.c | 148 +-------------- - src/main.h | 24 --- - src/preferences-dialog.c | 68 ++++++- - src/preferences-dialog.h | 2 +- - src/printing.c | 44 ++--- - src/printing.h | 7 +- - src/search-dialog.c | 29 ++- - src/storage-manager.c | 40 +++- - src/storage-manager.h | 2 +- - src/widgets/calendar.c | 109 ++++++++++- - src/widgets/calendar.h | 7 +- - 29 files changed, 1081 insertions(+), 347 deletions(-) - -commit 5bb69b0b7e70218a62fd7e361ae212ff403f13dd -Author: Mario Blättermann -Date: Sun Apr 17 11:10:54 2011 +0200 - - [l10n] Updated German translation - - po/de.po | 334 - +++++++++++++++++++++++++-------------------------------------- - 1 file changed, 130 insertions(+), 204 deletions(-) - -commit 6d67d5d014de642d9223819fc098e5e7969cb136 -Author: Marek Černocký -Date: Sun Apr 17 10:50:52 2011 +0200 - - Updated Czech translation - - po/cs.po | 361 - +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 176 insertions(+), 185 deletions(-) - -commit 833d1850bfcd87f0e95802d8c2630194d43854d6 -Author: Andrej Žnidaršič -Date: Sat Apr 16 19:38:59 2011 +0200 - - Updated Slovenian translation - - po/sl.po | 355 - +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 174 insertions(+), 181 deletions(-) - -commit 31367cd8a4cf12edda2a631148919d142d73939f -Author: Daniel Mustieles -Date: Fri Apr 15 19:53:30 2011 +0200 - - Updated Spanish translation - - po/es.po | 374 - ++++++++++++++++++++++++++++++--------------------------------- - 1 file changed, 175 insertions(+), 199 deletions(-) - -commit ccc4d67c84c355e7fda359353b3544524b36b5f9 -Author: Philip Withnall -Date: Thu Apr 14 22:13:17 2011 +0100 - - core: Fix a version number in a comment - - src/entry.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 3bfc9106408009a745d0bcfa19719911a7bd96ad -Author: Philip Withnall -Date: Sat Apr 2 22:16:27 2011 +0100 - - core: Add support for hyperlinks - - These replace definitions. Closes: bgo#631835 - - data/almanah.ui | 76 +++++++++++++++++ - src/Makefile.am | 2 + - src/main-window.c | 167 +++++++++++++++++++++++++++++++++++--- - src/uri-entry-dialog.c | 215 - +++++++++++++++++++++++++++++++++++++++++++++++++ - src/uri-entry-dialog.h | 57 +++++++++++++ - 5 files changed, 505 insertions(+), 12 deletions(-) - -commit a90413df6b1edc6a0bb24d938935b0b03d775038 -Author: Philip Withnall -Date: Thu Apr 14 00:59:10 2011 +0100 - - core: Add a new XML-based serialisation format which can represent - links - - The GTK+ default serialisation format can't represent hyperlinks using - a GtkTextTag subclass as we were using. It's a better long-term move - to have - our own serialisation format that we control anyway. This defines - a new - data format version, and uses it as the default, converting entries - as they - are edited/written. - - data/Makefile.am | 3 +- - data/entry-2.0.rnc | 30 ++++ - src/entry.c | 395 - ++++++++++++++++++++++++++++++++++++++++++++++++++++- - 3 files changed, 421 insertions(+), 7 deletions(-) - -commit cd4383736bff24dd403cb6ce398ed28680fc57ea -Author: Philip Withnall -Date: Thu Apr 14 01:01:37 2011 +0100 - - widgets: Add a GtkTextTag subclass for hyperlinks - - This allows us to represent hyperlinks in text buffers as anonymous - tags - which have their URI as a property. - - src/Makefile.am | 4 +- - src/widgets/hyperlink-tag.c | 145 - ++++++++++++++++++++++++++++++++++++++++++++ - src/widgets/hyperlink-tag.h | 56 +++++++++++++++++ - 3 files changed, 204 insertions(+), 1 deletion(-) - -commit 050f22244d8586f7dbb5f5f6050fd2e481cb6cce -Author: Philip Withnall -Date: Sun Nov 7 16:57:16 2010 +0000 - - core: Remove definition support - - It's never worked particularly well or been especially useful, - and will be - replaced by a hyperlinking system. Helps: bgo#631835 - - data/almanah.ui | 241 ------------------------- - src/Makefile.am | 36 +--- - src/add-definition-dialog.c | 284 ------------------------------ - src/add-definition-dialog.h | 60 ------- - src/definition-manager-window.c | 378 - ---------------------------------------- - src/definition-manager-window.h | 51 ------ - src/definition.c | 341 - ------------------------------------ - src/definition.h | 93 ---------- - src/definitions/contact.c | 240 ------------------------- - src/definitions/contact.h | 52 ------ - src/definitions/file.c | 125 ------------- - src/definitions/file.h | 52 ------ - src/definitions/note.c | 138 --------------- - src/definitions/note.h | 52 ------ - src/definitions/uri.c | 140 --------------- - src/definitions/uri.h | 52 ------ - src/import-operation.c | 15 -- - src/interface.c | 51 +----- - src/main-window.c | 188 +------------------- - src/main.c | 4 - - src/main.h | 2 - - src/storage-manager.c | 186 +------------------- - src/storage-manager.h | 8 +- - 23 files changed, 14 insertions(+), 2775 deletions(-) - -commit 74df40837a814d95e11343b16643094968410e59 -Author: Philip Withnall -Date: Thu Apr 14 20:38:56 2011 +0100 - - build: Update almanah.doap and drop MAINTAINERS - - Update almanah.doap to comply with - https://live.gnome.org/MaintainersCorner#doap and drop the (now - unnecessary) - MAINTAINERS file. - - MAINTAINERS | 3 --- - almanah.doap | 19 ++++++++++++------- - 2 files changed, 12 insertions(+), 10 deletions(-) - -commit 6e3a5a52559dd0cfdfdff0202c69934e0385502e -Author: Philip Withnall -Date: Thu Apr 14 19:40:31 2011 +0100 - - build: Post-release version bump - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 83e4080290a7b4ff2d8449bd45865e4dd590ef2b -Author: Philip Withnall -Date: Thu Apr 14 19:38:43 2011 +0100 - - build: Release version 0.8.0 - - NEWS | 42 ++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 42 insertions(+) - -commit dc1f299129b6250437119da220cbb8660c376255 -Author: Philip Withnall -Date: Thu Apr 14 19:19:31 2011 +0100 - - core: Don't conditionally compile preference dialogue response code - - It's applicable to both spell checking and encryption preferences. - - src/preferences-dialog.c | 6 ------ - 1 file changed, 6 deletions(-) - -commit 7d50e148b2b2eb3f6c6973bdd5ef530b14dcf4f2 -Author: Philip Withnall -Date: Thu Apr 14 19:13:21 2011 +0100 - - l10n: Update British English translation - - po/en_GB.po | 350 - +++++++++++++++++++++++++++++------------------------------- - 1 file changed, 171 insertions(+), 179 deletions(-) - -commit 8290b2cad580ccbd4a1caa2e235e38ebd34260ac -Author: Philip Withnall -Date: Thu Apr 14 19:12:53 2011 +0100 - - build: Add a generated file to POTFILES.skip - - po/POTFILES.skip | 1 + - 1 file changed, 1 insertion(+) - -commit 43768d9a223e769ef8662222b55e2dc6e5a6c48c -Author: Philip Withnall -Date: Thu Apr 14 19:09:39 2011 +0100 - - build: Disable spell checking due to GtkSpell not supporting GTK+ 3 - - configure.ac | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -commit 9dc2c1fd153ebada2392bc774875ba6a43df217d -Author: Philip Withnall -Date: Thu Apr 14 19:05:50 2011 +0100 - - core: Remove some unnecessary debug messages - - src/import-export-dialog.c | 8 +++----- - src/import-operation.c | 13 ++++++------- - 2 files changed, 9 insertions(+), 12 deletions(-) - -commit b7649d949735b3f532a11d3f450468871e8eadbc -Author: Philip Withnall -Date: Wed Apr 13 21:06:29 2011 +0100 - - core: Add support for versioning the formats used by entries in - the database - - This should allow for smoother upgrades between different formats - in future, - since we won't have to try and detect which one is in use in a - given entry. - - po/POTFILES.in | 1 + - src/entry.c | 90 - +++++++++++++++++++++++++++++++++++++-------------- - src/entry.h | 11 +++++-- - src/storage-manager.c | 21 +++++++----- - 4 files changed, 88 insertions(+), 35 deletions(-) - -commit de641cd860d41142eb8cfd4e18c8e89c04b40bd7 -Author: Philip Withnall -Date: Wed Apr 13 18:42:54 2011 +0100 - - docs: Update README - - README | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -commit 115337df9c2c9ba556962369ed44da296e08fc65 -Author: Philip Withnall -Date: Wed Apr 13 18:42:46 2011 +0100 - - docs: Add a HACKING file - - HACKING | 96 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 96 insertions(+) - -commit ff62bbb978529faca4b86a9c0eccc33931191ee7 -Author: Philip Withnall -Date: Sat Apr 2 17:48:47 2011 +0100 - - build: Remove generated file from git - - po/Makefile.in.in | 217 - ------------------------------------------------------ - 1 file changed, 217 deletions(-) - -commit ab3dcf36c5738fc3e6f6cb407f91da0f03eee159 -Author: Philip Withnall -Date: Sat Apr 2 17:45:48 2011 +0100 - - build: Add some miscellaneous files to MAINTAINERCLEANFILES - - Makefile.am | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -commit 27fc7138f013d35f93b860a8c003ff9d260db6c0 -Author: Philip Withnall -Date: Sat Apr 2 17:40:13 2011 +0100 - - build: Update git.mk from Pango master - - git.mk | 200 - ++++++++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 111 insertions(+), 89 deletions(-) - -commit fffad8ad73c17c035c1449654d9e2cc389daf248 -Author: Philip Withnall -Date: Tue Jun 29 23:10:54 2010 +0100 - - core: Port to GSettings - - Everything except the Evolution event factory has been - ported. Evolution - itself hasn't yet ported to GSettings, so the Evolution event - factory has - to remain using GConf for the time being. - - configure.ac | 8 ++-- - data/Makefile.am | 29 +++++-------- - data/almanah.convert | 4 ++ - data/almanah.schemas.in | 37 ---------------- - data/org.gnome.almanah.gschema.xml.in.in | 20 +++++++++ - po/POTFILES.in | 2 +- - src/main-window.c | 73 - ++++++++++++++++++++++++++++---- - src/main-window.h | 4 -- - src/main.c | 9 ++-- - src/main.h | 8 +--- - src/preferences-dialog.c | 60 +++----------------------- - src/storage-manager.c | 3 +- - 12 files changed, 119 insertions(+), 138 deletions(-) - -commit 3b74ca62870fee382c0b5fe3621148e550c9798c -Author: Philip Withnall -Date: Sat Apr 2 15:43:38 2011 +0100 - - core: Use a key file to store window geometry - - GConf isn't a suitable place for window widths, heights and - positions, so - store it in a key file instead. This tidies things up ready for - the imminent - move to GSettings. - - data/almanah.schemas.in | 55 ---------------- - src/main-window.c | 170 - +++++++++++++++++++++++++++++++++++++++++++----- - 2 files changed, 153 insertions(+), 72 deletions(-) - -commit a8db5cda3caf294701805e544b76f83bca27a720 -Author: Philip Withnall -Date: Sat Apr 2 12:43:57 2011 +0100 - - definitions: Remove unused variable - - src/definitions/contact.c | 2 -- - 1 file changed, 2 deletions(-) - -commit 9ce42c639c2ed9781b840a23ab359765d64f9391 -Author: Philip Withnall -Date: Sat Apr 2 12:43:19 2011 +0100 - - core: Don't compile encryption-only code when encryption is disabled - - src/storage-manager.c | 2 ++ - 1 file changed, 2 insertions(+) - -commit 5d0ad53b3117859162394a026269a4ce42b18e8d -Author: Philip Withnall -Date: Sat Apr 2 12:41:21 2011 +0100 - - build: Fix dependency information for almanah-marshal.c - - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 999acd3044d95212cd26706a40fdc83772e31188 -Author: Gabor Kelemen -Date: Thu Mar 17 22:59:20 2011 +0100 - - Added Hungarian translation by Gyorgy Ballo - - po/hu.po | 748 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 748 insertions(+) - -commit df32e1f793c5682181010e198cbb522407fee1c0 -Author: Gabor Kelemen -Date: Thu Mar 17 22:58:59 2011 +0100 - - Added hu to LINGUAS - - po/LINGUAS | 1 + - 1 file changed, 1 insertion(+) - -commit 90c0e69a81e8dc67e5a536046556c79017cdc881 -Author: Daniel Nylander -Date: Sun Feb 27 18:08:18 2011 +0100 - - Updated Swedish translation - - po/sv.po | 293 - ++++++++++++++++++++++++++++++++++++--------------------------- - 1 file changed, 169 insertions(+), 124 deletions(-) - -commit b0254a9fe124d6d9bef447bd1be34ef478491f62 -Author: Aron Xu -Date: Mon Feb 14 03:20:42 2011 +0800 - - Remove wrong plural forms header in zh_CN.po - - po/zh_CN.po | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -commit df3ab3c2b9ebf8b18558cdd33388b0b1b16d678f -Author: Milan Crha -Date: Mon Feb 7 12:18:55 2011 +0100 - - Bug #641481 - Cannot build with gtk3/evolution 2.91.6 - - configure.ac | 4 ++-- - src/add-definition-dialog.c | 3 +-- - src/date-entry-dialog.c | 3 +-- - src/events/calendar-appointment.c | 2 +- - src/events/calendar-task.c | 2 +- - src/import-export-dialog.c | 2 -- - src/main.c | 27 ++++++++++++++++++++++++++- - src/main.h | 1 + - src/preferences-dialog.c | 14 +++++++++----- - src/search-dialog.c | 3 +-- - 10 files changed, 43 insertions(+), 18 deletions(-) - -commit ae02e86440bd10b8e3db6556bc5c54492c3b25cb -Author: Andika Triwidada -Date: Wed Jan 19 22:54:03 2011 +0700 - - Updated Indonesian translation - - po/id.po | 328 - +++++++++++++++++++++++++++++++++++++-------------------------- - 1 file changed, 194 insertions(+), 134 deletions(-) - -commit 1be78f56d301f96e38928776a7a7f6148d480a7b -Author: George Stefanakis -Date: Thu Jan 13 21:04:05 2011 +0200 - - Updated Greek translation - - po/el.po | 448 - ++++++++++++++++++++++++++++++--------------------------------- - 1 file changed, 212 insertions(+), 236 deletions(-) - -commit 0028b154f777b6edd521a89ff53c6a49185adcd6 -Author: Fran Diéguez -Date: Sun Jan 9 15:41:34 2011 +0100 - - Updated Galician translations - - po/gl.po | 287 - +++++++++++++++++++++++++++++++++++---------------------------- - 1 file changed, 160 insertions(+), 127 deletions(-) - -commit 3d51f8e4e0aea7e5caf6e8075237c1a7a0ac8d53 -Author: Jordi Estrada -Date: Sat Dec 25 21:54:56 2010 +0100 - - [l10n]Updated Catalan translation - - po/ca.po | 775 - +++++++++++++++++++++++++++++++++++++++++++++++++++++---------- - 1 file changed, 654 insertions(+), 121 deletions(-) - -commit 41fd6d87420d51acc53302fb90bafd1262514860 -Author: Lucian Adrian Grijincu -Date: Tue Nov 30 16:26:56 2010 +0200 - - Updated Romanian translation - - po/LINGUAS | 1 + - po/ro.po | 761 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 762 insertions(+) - -commit 01084bd42ad2747cc582274a3988f17bcf23d6f3 -Author: Philip Withnall -Date: Mon Nov 22 22:04:52 2010 +0000 - - Don't use IT_PROG_INTLTOOL and AM_GNU_GETTEXT - - They conflict. - - configure.ac | 2 -- - 1 file changed, 2 deletions(-) - -commit 4baa7ae0f8b5d6340c61d15868b0153d06e8ddfc -Author: Philip Withnall -Date: Sat Oct 9 00:10:59 2010 +0100 - - Use upstream gettext instead of GLib's gettext - - As explained here: http://blogs.gnome.org/jjardon/2010/10/08 - /use-upstream-gettext-instead-the-glib-one/. - - configure.ac | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -commit 5c7c880e24ebeeb9bbb6c0cec693b22c46309de1 -Author: Philip Withnall -Date: Fri Aug 27 09:17:30 2010 +0100 - - Check for various required functions and headers in configure.ac - - Revealed by running `autoscan`. - - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -commit b745384088cbcd712f68b049cd38c24e2db2bc6c -Author: Carlos José Pereira -Date: Thu Aug 19 13:13:40 2010 -0300 - - Updated Brazilian Portuguese Translation - - po/pt_BR.po | 367 - +++++++++++++++++++++++++++++------------------------------- - 1 file changed, 180 insertions(+), 187 deletions(-) - -commit 17fe76354c49c547c0e7aea276341d5cd9693fc8 -Author: YunQiang Su -Date: Fri Jul 30 18:34:43 2010 +0800 - - Update Simplified Chinese translation. - - po/zh_CN.po | 316 - ++++++++++++++++++++++++++++++++++-------------------------- - 1 file changed, 182 insertions(+), 134 deletions(-) - -commit cb3428e2d019c5b88203480611ca4c069af43bef -Author: Claude Paroz -Date: Sun Jul 4 21:44:44 2010 +0200 - - Updated French translation - - po/fr.po | 228 - +++++++++++++++++++++++++++++---------------------------------- - 1 file changed, 106 insertions(+), 122 deletions(-) - -commit d86483b9b45cd0a64fc14125a5f2a335b45fb173 -Author: Philip Withnall -Date: Wed Jun 30 23:02:59 2010 +0100 - - Add missing files to POTFILES.in - - po/POTFILES.in | 2 ++ - 1 file changed, 2 insertions(+) - -commit 37fff7980a17be5646f902fe0037928380b890e7 -Author: Philip Withnall -Date: Wed Jun 30 23:01:23 2010 +0100 - - Bug 623231 — Dutch translation - - Add a Dutch translation by Heimen . Closes: - bgo#623231 - - po/LINGUAS | 1 + - po/nl.po | 754 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 755 insertions(+) - -commit ee7a625eeeefb53e74f77bfb36352ab41da733bf -Author: Philip Withnall -Date: Tue Jun 29 21:47:32 2010 +0100 - - Remove the F-Spot event factory and type - - F-Spot has removed its D-Bus service - (http://git.gnome.org/browse/f-spot/ - commit/?id=4436219f0143631c49f69a3b7c1915a0cae17ffe), so we can - no longer - query it. Hopefully the event type can be re-added if and when - F-Spot re-adds - its D-Bus service. - - This also removes our dependency on the (deprecated) dbus-glib. - Closes: bgo#622887 - - configure.ac | 2 +- - intltool-extract.in | 875 ------------------------ - intltool-merge.in | 1506 - ------------------------------------------ - intltool-update.in | 1166 -------------------------------- - po/Makefile.in.in | 4 +- - po/POTFILES.in | 1 - - src/Makefile.am | 4 - - src/event-factories/f-spot.c | 250 ------- - src/event-factories/f-spot.h | 52 -- - src/event-factory.h | 3 +- - src/event-manager.c | 2 - - src/events/f-spot-photo.c | 120 ---- - src/events/f-spot-photo.h | 53 -- - 13 files changed, 4 insertions(+), 4034 deletions(-) - -commit 46b3c85e798a8fe78d6e2d153a0128c3a51277c2 -Author: Fran Diéguez -Date: Mon Jun 21 11:12:54 2010 +0200 - - Updated Galician translations - - po/gl.po | 37 +++++++++++++++---------------------- - 1 file changed, 15 insertions(+), 22 deletions(-) - -commit 348c51fad55b44b2a5655c0a5ef665416cadb5ce -Author: Philip Withnall -Date: Thu Jun 10 17:44:52 2010 +0100 - - Makefile improvements - - Improve the marshalling stuff in Makefile.am. - - src/Makefile.am | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -commit bbfced9af71fd5943e381586739106c8c21dd478 -Author: Joe Hansen -Date: Sun May 30 23:16:40 2010 +0200 - - Updated Danish translation - - po/da.po | 311 - ++++++++++++++++++++++++++++++++++++--------------------------- - 1 file changed, 180 insertions(+), 131 deletions(-) - -commit 0dc9997e9982c596604b31983aab2fd8ea577c9c -Author: Fran Diéguez -Date: Mon May 24 12:56:00 2010 +0200 - - Updated Galician translations - - po/gl.po | 288 - +++++++++++++++++++++++++++++++++++---------------------------- - 1 file changed, 160 insertions(+), 128 deletions(-) - -commit f2598064f0acca7a79dc8140a8f3a9bfbef115a3 -Author: Philip Withnall -Date: Tue May 18 00:37:44 2010 +0100 - - Remove import mode - - Remove the old command line import mode in favour of using the - new import - dialogue. - - src/entry.c | 4 ---- - src/main.c | 4 +--- - src/main.h | 1 - - 3 files changed, 1 insertion(+), 8 deletions(-) - -commit 17e418195a79541755dc808574deb7924b409cd8 -Author: Philip Withnall -Date: Sun May 16 18:30:01 2010 +0100 - - Add progress reporting to import/export - - Add a progress bar to the import/export dialogue, reporting the - operation's - activity. This makes the lifecycle of the import/export dialogue a - lot more - complex. - - data/almanah.ui | 14 ++++-- - src/export-operation.c | 99 - +++++++++++++++++++++++++++++++++++------ - src/export-operation.h | 8 +++- - src/import-export-dialog.c | 108 - ++++++++++++++++++++++++++++++++------------- - src/import-operation.c | 69 ++++++++++++++++++++--------- - src/import-operation.h | 2 +- - src/main-window.c | 18 ++++---- - src/main.c | 4 -- - src/main.h | 2 - - 9 files changed, 239 insertions(+), 85 deletions(-) - -commit 2f9fd8078783368beb3744e79c25269a76836503 -Author: Philip Withnall -Date: Sun May 16 16:24:02 2010 +0100 - - Make import/export operations asynchronous - - configure.ac | 2 +- - data/almanah.ui | 7 +- - src/Makefile.am | 4 + - src/export-operation.c | 257 +++++++++++++++++++++ - src/export-operation.h | 60 +++++ - src/import-export-dialog.c | 558 - ++++++++------------------------------------- - src/import-export-dialog.h | 11 +- - src/import-operation.c | 510 - +++++++++++++++++++++++++++++++++++++++++ - src/import-operation.h | 72 ++++++ - src/main.c | 1 + - 10 files changed, 1004 insertions(+), 478 deletions(-) - -commit 72702f8d8aaf9ba397993b173805725cbf4526f0 -Author: Petr Kovar -Date: Sun May 16 23:58:57 2010 +0200 - - Update Czech translation by Marek Cernocky - - po/cs.po | 138 - +++++++++++++++++++++++++++++++++------------------------------ - 1 file changed, 73 insertions(+), 65 deletions(-) - -commit 00fc6fc5188022b9c5fa0e39077df87d52855836 -Author: Mario Blättermann -Date: Sat May 15 22:12:10 2010 +0200 - - Updated German translation - - po/de.po | 164 - ++++++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 89 insertions(+), 75 deletions(-) - -commit d2202414edd78cf9844c54120de7b4dd9ba6fb1a -Author: Andrej Žnidaršič -Date: Fri May 14 20:13:22 2010 +0200 - - Updated Slovenian translation - - po/sl.po | 145 - +++++++++++++++++++++++++++++++++------------------------------ - 1 file changed, 76 insertions(+), 69 deletions(-) - -commit 098a0c918a5a99d19736843323fea68f3e34bfb5 -Author: Jorge González -Date: Wed May 12 08:16:02 2010 +0200 - - Updated Spanish translation - - po/es.po | 160 - ++++++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 87 insertions(+), 73 deletions(-) - -commit 2c27e8c0324a9a293680db8131dd63bffa4be0c5 -Author: Philip Withnall -Date: Tue May 11 13:35:09 2010 +0100 - - Improve the Import/Export UI - - Use a GtkFileChooserButton instead of a GtkFileChooserWidget and - change the - labels around slightly. Add mnemonics. - - data/almanah.ui | 33 ++++++++++++++++++--------------- - src/import-export-dialog.c | 25 ++++++++++++++----------- - 2 files changed, 32 insertions(+), 26 deletions(-) - -commit d154b578686a648d842c3a2310090919d9dcf8ae -Author: Philip Withnall -Date: Tue May 11 08:38:07 2010 +0100 - - Minor memory leak fix - - src/definition.c | 1 + - 1 file changed, 1 insertion(+) - -commit b51c1f504876a127c2df1fcd5794bc2dab6213ab -Author: Philip Withnall -Date: Sun May 9 17:21:04 2010 +0100 - - Fix the dialogue boxes for editing and deleting entries - - src/main-window.c | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -commit ec720ae05db81e0dfca11e37ce365b64a12be152 -Author: Philip Withnall -Date: Sun May 9 17:06:14 2010 +0100 - - Add more AlmanahStorageManager signals - - src/main-window.c | 6 ------ - src/storage-manager.c | 53 - ++++++++++++++++++++++++++++++++++++-------------- - src/widgets/calendar.c | 34 ++++++++++++++++++++++++++++++++ - 3 files changed, 72 insertions(+), 21 deletions(-) - -commit d3d84a21f0e11750a1fe49f0833cd8dee880d52b -Author: Philip Withnall -Date: Sat May 8 23:52:41 2010 +0100 - - Tidy up of AlmanahStorageManager - - This reduces code duplication and privatises and deprecates the - simple SQLite - wrapper which AlmanahStorageManager had previously been using for most - queries. Raw SQLite queries are now used for most things. - - src/definition.c | 4 + - src/storage-manager.c | 367 - ++++++++++++++++++++++++-------------------------- - src/storage-manager.h | 12 -- - 3 files changed, 177 insertions(+), 206 deletions(-) - -commit fc00ec9948692fffb966eaaa75bfb6d073932f5b -Author: Philip Withnall -Date: Sat May 8 21:13:33 2010 +0100 - - Use iterators for large database queries - - Use iterators for almanah_storage_manager_get_entries() and - almanah_storage_manager_search_entries(), rather than allocating - all the - results at once into a list. This saves memory and could be used to - make the - interface more responsive for long-running operations. - - src/import-export-dialog.c | 23 ++-- - src/search-dialog.c | 20 ++-- - src/storage-manager.c | 272 - ++++++++++++++++++++++++++++++--------------- - src/storage-manager.h | 15 ++- - 4 files changed, 214 insertions(+), 116 deletions(-) - -commit 3b2ffefd69cb9e7ce7504eb0ed4ca0e13b6efc8b -Author: Philip Withnall -Date: Sat May 8 11:12:50 2010 +0100 - - Fix misuse of unsigned integers in calendar client - - This is a bit of a hacky solution, but is probably safer than - re-architecting - the calendar client to use GDate types for year, month and day. - - src/event-factories/calendar-client.c | 26 +++++++++++++------------- - 1 file changed, 13 insertions(+), 13 deletions(-) - -commit f49de61e500dfe7f02319ea55b20437f76bf2a1c -Author: Philip Withnall -Date: Sun May 2 23:28:53 2010 +0100 - - Replace null_safe_strcmp() with g_strcmp0() in calendar client - - src/event-factories/calendar-client.c | 37 - ++++++++++++++--------------------- - 1 file changed, 15 insertions(+), 22 deletions(-) - -commit 6befe7b862f90c0c1dcb8d746134502b0206473a -Author: Philip Withnall -Date: Sun May 2 23:27:34 2010 +0100 - - Fix warnings in calendar client - - src/event-factories/calendar-client.c | 43 - +++++++++++++++++++++++++++++------ - 1 file changed, 36 insertions(+), 7 deletions(-) - -commit 015fdc4e4aa4078856c07b91a3fca545402bf95a -Author: Philip Withnall -Date: Sun May 2 23:19:52 2010 +0100 - - Update calendar sources from gnome-panel trunk - - src/event-factories/calendar-client.c | 67 - +++++++++++++++++------------------ - src/event-factories/calendar-client.h | 14 ++++---- - 2 files changed, 40 insertions(+), 41 deletions(-) - -commit 76bcead8a663996f3b5d93ecd4cc69ac16bce27f -Author: Philip Withnall -Date: Sun May 2 23:08:22 2010 +0100 - - Add support for storing the date an entry was last edited - - Whenever an entry is edited, the current date is stored with it - to allow - later analysis. Imported entries have their last-edited dates - preserved as - much as possible; for example, entries imported from text files - will have - their last-edited date as the modification date of the text file. - - src/entry.c | 60 - +++++++++++++++++++++++++++++++++++++++++++++- - src/entry.h | 3 +++ - src/import-export-dialog.c | 21 ++++++++++++---- - src/main-window.c | 13 ++++++---- - src/storage-manager.c | 55 - +++++++++++++++++++++++++++++++++++++----- - 5 files changed, 136 insertions(+), 16 deletions(-) - -commit 6a222b914186f1b1a50b4510563dbb940e84bda0 -Author: Philip Withnall -Date: Sun May 2 22:16:05 2010 +0100 - - Whitespace fixes - - src/storage-manager.c | 258 - +++++++++++++++++++++++--------------------------- - 1 file changed, 121 insertions(+), 137 deletions(-) - -commit 92d7ddcc07038337b907d55c26e0a7e0d0a03415 -Author: Philip Withnall -Date: Sat Apr 24 21:09:11 2010 +0100 - - Ensure the current entry is saved on any change to it - - Previously, it was only being saved for changes to the content. Now, - if an - entry is marked as important (but its content isn't changed), it - will be - saved. - - data/almanah.ui | 1 - - src/entry.c | 9 +++++--- - src/main-window.c | 62 - +++++++++++++++++++++++++++++++++++++------------------ - 3 files changed, 48 insertions(+), 24 deletions(-) - -commit 5d67ce6f892617baa4f05886ae01438453cae13c -Author: Petr Kovar -Date: Sun May 2 18:04:51 2010 +0200 - - Update Czech translation by Marek Cernocky - - po/cs.po | 38 +++++++++++++++++--------------------- - 1 file changed, 17 insertions(+), 21 deletions(-) - -commit 90e9181b3e69926c6932f70524c010b9dfb9ed84 -Author: Mario Blättermann -Date: Thu Apr 29 14:28:05 2010 +0200 - - Updated German translation - - po/de.po | 258 - +++++++++++++++++++++++++++++++++++++++------------------------ - 1 file changed, 160 insertions(+), 98 deletions(-) - -commit 4b22ce8835624ea8c30baa39f27206c352b44ad6 -Author: Andrej Žnidaršič -Date: Sun Apr 25 11:24:28 2010 +0200 - - Updated Slovenian translation - - po/sl.po | 202 - ++++++++++++++++++++++++++++++++++++++------------------------- - 1 file changed, 123 insertions(+), 79 deletions(-) - -commit c3e07522af98c27e7e279633ee6a97bb9b1ea957 -Author: Petr Kovar -Date: Thu Apr 22 23:45:12 2010 +0200 - - Update Czech translation by Marek Cernocky - - po/cs.po | 221 - ++++++++++++++++++++++++++++++++++++++++----------------------- - 1 file changed, 140 insertions(+), 81 deletions(-) - -commit 81585d337abd8a10224e56dbf4682b748f3319b2 -Author: Claude Paroz -Date: Thu Apr 22 11:59:55 2010 +0200 - - Updated French translation - - po/fr.po | 220 - +++++++++++++++++++++++++++++++++++++++------------------------ - 1 file changed, 136 insertions(+), 84 deletions(-) - -commit 9dc9566426af101bbce2ed8382b2408befa3d839 -Author: Jorge González -Date: Thu Apr 22 08:37:48 2010 +0200 - - Updated Spanish translation - - po/es.po | 228 - ++++++++++++++++++++++++++++++++++++++++----------------------- - 1 file changed, 145 insertions(+), 83 deletions(-) - -commit 3a936981cf1e54654edb96e4c2de3421a998e090 -Author: Philip Withnall -Date: Wed Apr 21 21:50:25 2010 +0100 - - Update British English translation - - po/en_GB.po | 207 - ++++++++++++++++++++++++++++++++++++++---------------------- - 1 file changed, 132 insertions(+), 75 deletions(-) - -commit 6419b5276abcc022da9f59b269754333f4f72d7d -Author: Philip Withnall -Date: Wed Apr 21 21:48:55 2010 +0100 - - Add missing translatable file to POTFILES.in - - po/POTFILES.in | 1 + - 1 file changed, 1 insertion(+) - -commit 3543d868138ac92724bfdf35a8302e3d7f75ef51 -Author: Philip Withnall -Date: Wed Apr 21 21:46:16 2010 +0100 - - Fix a signed/unsigned integer comparison - - src/printing.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 446ac9684147a484309ff99ec59d8bb798f01f5f -Author: Philip Withnall -Date: Wed Apr 21 21:44:11 2010 +0100 - - Add text file and database export support - - data/almanah.ui | 8 +++ - src/import-export-dialog.c | 164 - ++++++++++++++++++++++++++++++++++++++++----- - src/main-window.c | 11 +++ - src/main.c | 2 + - src/main.h | 1 + - src/storage-manager.c | 6 ++ - src/storage-manager.h | 2 + - 7 files changed, 177 insertions(+), 17 deletions(-) - -commit ed0aa5669731cda4048f1c68878a3e6d35b90eaa -Author: Philip Withnall -Date: Wed Apr 21 20:44:41 2010 +0100 - - Convert import dialogue to import-export dialogue and tidy it up - - data/almanah.ui | 53 ++-- - po/POTFILES.in | 2 +- - src/Makefile.am | 4 +- - src/import-dialog.c | 720 - -------------------------------------------- - src/import-dialog.h | 83 ------ - src/import-export-dialog.c | 729 - +++++++++++++++++++++++++++++++++++++++++++++ - src/import-export-dialog.h | 83 ++++++ - src/main-window.c | 4 +- - 8 files changed, 842 insertions(+), 836 deletions(-) - -commit 500f4ad3705cbc33d094aaa2902091fcc2087fd7 -Author: Christian.Kirbach -Date: Tue Apr 20 17:01:49 2010 +0200 - - Updated German translation - - po/de.po | 88 - ++++++++++++++++++++++++++++++++++------------------------------ - 1 file changed, 47 insertions(+), 41 deletions(-) - -commit f1ff0ac736fe0ee319960acaaff47ccfc8a378fd -Author: Jorge González -Date: Mon Apr 19 07:26:33 2010 +0200 - - Updated Spanish translation - - po/es.po | 48 +++++++++++++++++++++++++----------------------- - 1 file changed, 25 insertions(+), 23 deletions(-) - -commit c088e79a3199f22e7cf4156d3a26b201ae17ee9d -Author: Matej Urbančič -Date: Sun Apr 18 19:43:10 2010 +0200 - - Updated Slovenian translation - - po/sl.po | 84 - +++++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 44 insertions(+), 40 deletions(-) - -commit cc3633a704db56900e9960afb1e2c25bcea86e3c -Author: Philip Withnall -Date: Sun Apr 18 16:20:52 2010 +0100 - - Ensure spell checking highlights are completely drawn over when - changing day - - src/main-window.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -commit 84889379de9667256702e87254ba70eefe66dd7b -Author: Philip Withnall -Date: Sun Apr 18 16:17:40 2010 +0100 - - Remove spell checking highlighting from printouts - - src/printing.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 23b9be68e261be9f5d9dae0cfa93feede7d4350a -Author: Philip Withnall -Date: Sun Apr 18 16:05:29 2010 +0100 - - Highlight important entries in printouts - - Closes: bgo#572927 - - src/printing.c | 53 ++++++++++++++++++++++++++++++++++++++++++++--------- - 1 file changed, 44 insertions(+), 9 deletions(-) - -commit 422ab587d117c2ad75cc3061479fa4d96849438a -Author: Philip Withnall -Date: Sun Apr 18 15:25:49 2010 +0100 - - Highlight important entries in search results - - data/almanah.ui | 17 ++++++++++++++--- - src/search-dialog.c | 31 ++++++++++++++++++------------- - src/storage-manager.c | 40 ++++++++++++++++++---------------------- - src/storage-manager.h | 4 ++-- - 4 files changed, 52 insertions(+), 40 deletions(-) - -commit ad5ccd5a9ca76d8032e0e4b1d759a18c6daa0157 -Author: Philip Withnall -Date: Sun Apr 18 14:25:57 2010 +0100 - - Highlight important entries in the calendar - - This creates a new AlmanahCalendar widget, which takes care of a - few things - which require extensions to GtkCalendar. This is now used across - the project. - Helps: bgo#572927 - - data/almanah.ui | 4 +- - src/Makefile.am | 4 +- - src/interface.c | 24 -------- - src/main-window.c | 31 ++++------ - src/printing.c | 29 ++++------ - src/storage-manager.c | 28 +++++++++ - src/storage-manager.h | 1 + - src/widgets/calendar.c | 152 - +++++++++++++++++++++++++++++++++++++++++++++++++ - src/widgets/calendar.h | 57 +++++++++++++++++++ - 9 files changed, 265 insertions(+), 65 deletions(-) - -commit 49db044ccb5ca8f6658043915bf0e69e6a156e35 -Author: Philip Withnall -Date: Sun Apr 18 13:28:56 2010 +0100 - - Order search results by descending date - - src/storage-manager.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 7536b548c1d1ac2e8d784c5e43f88123b91fbac5 -Author: Andika Triwidada -Date: Sat Apr 3 20:34:02 2010 +0700 - - Updated Indonesian translation - - po/id.po | 189 - ++++++++++++++++++++++++++++++++++++--------------------------- - 1 file changed, 107 insertions(+), 82 deletions(-) - -commit a40b94ce81a1abbfa6709f9fdbfdf48d9bf86a72 -Author: Jorge González -Date: Tue Mar 16 18:18:15 2010 +0100 - - Updated Spanish translation - - po/es.po | 202 - +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 99 insertions(+), 103 deletions(-) - -commit 7b5724764a17529e97c22d2db1a701ae75609c5d -Author: Joe Hansen -Date: Mon Mar 15 01:02:35 2010 +0100 - - Updated Danish translation - - po/da.po | 87 - ++++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 44 insertions(+), 43 deletions(-) - -commit cd81352e1355e3a71aaaac46915eedf22ce8c68a -Author: Bruno Brouard -Date: Thu Mar 11 22:57:31 2010 +0100 - - Updated French translation - - po/fr.po | 212 - ++++++++++++++++++++++++++++++++++++--------------------------- - 1 file changed, 121 insertions(+), 91 deletions(-) - -commit c1000a399c1c3f06d613f39cc3200843d2316304 -Author: Philip Withnall -Date: Sat Mar 6 21:20:44 2010 +0000 - - Bug 611889 — A little padding in the textaera would be nice - - Added 3px left and right margins to the main text view. Closes: - bgo#611889 - - data/almanah.ui | 2 ++ - 1 file changed, 2 insertions(+) - -commit 58938b6ad633df5770250646caa469fdc7564060 -Author: Leonid Kanter -Date: Sat Mar 6 19:44:41 2010 +0200 - - update Russian translation - - po/ru.po | 703 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 703 insertions(+) - -commit cef3e5241ecaa8a85cf93f048345179abdc17306 -Author: Leonid Kanter -Date: Sat Mar 6 19:44:31 2010 +0200 - - update Russian translation - - po/LINGUAS | 1 + - 1 file changed, 1 insertion(+) - -commit b43e8f9a43295cbd6151bbab488869b8d912ff62 -Author: Fran Diéguez -Date: Fri Mar 5 13:25:29 2010 +0100 - - Updated Galician translation - - po/gl.po | 405 - +++++++++++++++++++++++++++++++++++++++++++-------------------- - 1 file changed, 279 insertions(+), 126 deletions(-) - -commit 3011690b942171ccbae1a3f7b71459359abe9279 -Author: YunQiang Su -Date: Thu Feb 18 10:56:55 2010 +0800 - - Update Simplified Chinese translation. - - po/zh_CN.po | 403 - +++++++++++++++++++++++++++++++++++++++++------------------- - 1 file changed, 278 insertions(+), 125 deletions(-) - -commit f800e824f92a9c45e3e55add5f4faf5ab2a7489a -Author: Antonio Fernandes C. Neto -Date: Fri Feb 5 15:53:07 2010 -0300 - - Updated Brazilian Portuguese Translation - - po/pt_BR.po | 516 - +++++++++++++++++++++++++++++++++++++++++++----------------- - 1 file changed, 373 insertions(+), 143 deletions(-) - -commit ca72f2c8584efe46bbe77e76f915a1a05fa51c99 -Author: Andrej Žnidaršič -Date: Thu Feb 4 19:08:12 2010 +0100 - - Updated Slovenian translation - - po/sl.po | 74 - ++++++++++++++++++++++++++++++++++------------------------------ - 1 file changed, 39 insertions(+), 35 deletions(-) - -commit bfa63b760074b6930279d1030c4e69671f1b8d0b -Author: Mario Blättermann -Date: Thu Feb 4 12:19:39 2010 +0100 - - Updated German translation - - po/de.po | 79 - ++++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 40 insertions(+), 39 deletions(-) - -commit 6fdc88528e147df00656a64612adc4a7fa467b36 -Author: Marios Zindilis -Date: Tue Feb 2 08:13:16 2010 -0800 - - Updated Greek translation - - po/el.po | 476 - +++++++++++++++++++++++++++++++++++++++++++++------------------ - 1 file changed, 341 insertions(+), 135 deletions(-) - -commit f19479f1a3f2098fb1a3e1e97b3ef8d6d2ac3c96 -Author: Marek Černocký -Date: Tue Feb 2 13:16:52 2010 +0100 - - Update Czech translation - - po/cs.po | 82 - ++++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 41 insertions(+), 41 deletions(-) - -commit 57147f6fa9a4ea6365d5be3272c9055c0161a0da -Author: Philip Withnall -Date: Sun Jan 31 15:25:44 2010 +0000 - - Switch to post-release version incrementing (version 0.8.0) - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 4e6927203eda85d7f09dc71d8aa6f10fa99638f1 -Author: Philip Withnall -Date: Sun Jan 31 15:24:09 2010 +0000 - - Release version 0.7.2 - - NEWS | 133 - ++++++++++++++++++++++++++++++++++++++++++++++++++++++----- - configure.ac | 2 +- - 2 files changed, 123 insertions(+), 12 deletions(-) - -commit 165a4921093aa035c7ec7646140b56292e3e917a -Author: Philip Withnall -Date: Sun Jan 31 14:50:18 2010 +0000 - - Updated British English translation - - po/en_GB.po | 74 - ++++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 39 insertions(+), 35 deletions(-) - -commit fa09f7e5fa538706d71a55f5ba6d5793fb6297bc -Author: Philip Withnall -Date: Sun Jan 31 14:47:21 2010 +0000 - - Updated autofoo - - Updated autogen.sh and the magic in configure.ac to use more modern - infrastructure. See: http://live.gnome.org/GnomeGoals/ModernAutotools - - autogen.sh | 151 - +++-------------------------------------------------------- - configure.ac | 16 ++++--- - 2 files changed, 15 insertions(+), 152 deletions(-) - -commit 8095fd51aa194242b3efc3b00ff0e786d272afab -Author: Philip Withnall -Date: Sun Jan 31 14:36:11 2010 +0000 - - Improve key selection - - Improve key selection in the preferences dialogue by filtering - irrelevant - keys (ones for which we don't have the private key) and allowing - the dialogue - to be resized so that long key names can be seen. See: bgo#607964 - - data/almanah.ui | 4 ++++ - src/preferences-dialog.c | 11 ++++++++++- - 2 files changed, 14 insertions(+), 1 deletion(-) - -commit 89fb23235764e0dcf0963ca13af1f49d98d6b661 -Author: Andrej Žnidaršič -Date: Mon Jan 18 16:54:01 2010 +0100 - - Updated Slovenian translation - - po/sl.po | 98 - ++++++++++++++++++++++++++++++++++++---------------------------- - 1 file changed, 55 insertions(+), 43 deletions(-) - -commit 06d0812c8106492037fd414e21f11ee43e47abd8 -Author: Petr Kovar -Date: Sun Jan 17 21:48:48 2010 +0100 - - Updated Czech translation by Marek Cernocky - - po/cs.po | 18 +++++++----------- - 1 file changed, 7 insertions(+), 11 deletions(-) - -commit 3da77e33cfc819d8fd0440cea6dee0d972211a5e -Author: Mario Blättermann -Date: Fri Jan 15 16:21:34 2010 +0100 - - Updated German translation - - po/de.po | 116 - +++++++++++++++++++++++++++++++++++---------------------------- - 1 file changed, 65 insertions(+), 51 deletions(-) - -commit dc32d5df6b1924d44f3b364cc9e8a1b5351c5665 -Author: Joe Hansen -Date: Thu Jan 14 19:10:03 2010 +0100 - - Updated Danish translation - - po/da.po | 211 - ++++++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 115 insertions(+), 96 deletions(-) - -commit 3959191f713b76ce071792413bf12656933189a0 -Author: Petr Kovar -Date: Tue Jan 12 01:10:51 2010 +0100 - - Add Czech translation by Marek Cernocky - - po/LINGUAS | 1 + - po/cs.po | 715 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 716 insertions(+) - -commit cc3d870fb058ba78391d78b995919901dbf111c9 -Author: Daniel Nylander -Date: Sun Jan 10 15:05:35 2010 +0100 - - Updated Swedish translation - - po/sv.po | 122 - +++++++++++++++++++++++++++++++++++++-------------------------- - 1 file changed, 71 insertions(+), 51 deletions(-) - -commit e1cec6b76161e202d90c7ca79e8685c9e9b4fc08 -Author: Philip Withnall -Date: Fri Jan 1 16:12:48 2010 +0000 - - Release version 0.7.1 - - NEWS | 3 +++ - configure.ac | 2 +- - 2 files changed, 4 insertions(+), 1 deletion(-) - -commit 739e88963d908b2fba77b1c2a293b9c267f73137 -Author: Philip Withnall -Date: Fri Jan 1 16:06:32 2010 +0000 - - Fix non-Evolution build - - src/definition.c | 4 ++++ - src/event-factory.h | 2 -- - 2 files changed, 4 insertions(+), 2 deletions(-) - -commit c35bb1978701e5373c8764d61e8cb7c9d223bc6f -Author: Andrej Žnidaršič -Date: Fri Jan 1 09:28:17 2010 +0100 - - Updated Slovenian translation - - po/sl.po | 69 - +++++++++++++++++++++++++++++++++++++++++----------------------- - 1 file changed, 44 insertions(+), 25 deletions(-) - -commit 9e13df9f3a51d7f2368ace966caaf227308aa0e4 -Author: Philip Withnall -Date: Thu Dec 31 12:01:15 2009 +0000 - - Release version 0.7.0 - - Makefile.am | 16 +++++++++------- - NEWS | 12 ++++++++++++ - README | 8 ++++++-- - configure.ac | 2 +- - src/Makefile.am | 16 ++++++++-------- - 5 files changed, 36 insertions(+), 18 deletions(-) - -commit d6b6014060028c79b0b418b396a161ab8f8f8660 -Author: Philip Withnall -Date: Thu Dec 31 11:17:09 2009 +0000 - - Change website from tecnocode.co.uk to live.gnome.org - - README | 2 +- - almanah.doap | 2 +- - src/main-window.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -commit 4188fee3f23791175f6aedc43916462b734f1e72 -Author: Philip Withnall -Date: Thu Dec 31 11:02:30 2009 +0000 - - Updated British English translation - - Also fix a small string problem in the printing code, left over - from earlier - testing. - - po/en_GB.po | 458 - +++++++++++++++++++++++++++++++++++++++------------------ - src/printing.c | 2 +- - 2 files changed, 314 insertions(+), 146 deletions(-) - -commit 165d0d751bf356b84ccc32062f426ca70cf7bf79 -Author: Philip Withnall -Date: Thu Dec 31 10:56:52 2009 +0000 - - Makefile and configure.ac cleanup - - configure.ac | 2 +- - src/Makefile.am | 116 - +++++++++++++++++++++++++++----------------------------- - 2 files changed, 57 insertions(+), 61 deletions(-) - -commit 561cab28f9143aa9caf0439190a3315a46ab01db -Author: Philip Withnall -Date: Thu Dec 31 10:47:46 2009 +0000 - - Improve appearance of Definition Manager dialogue - - It's no longer arranged as a table; instead, a heading and free-form - text - area are used. The focus control for definition error dialogues has - also been - fixed. - - data/almanah.ui | 92 - ++++++++++++----------------------------------- - src/definitions/contact.c | 6 ++-- - src/definitions/file.c | 2 +- - src/definitions/uri.c | 2 +- - 4 files changed, 28 insertions(+), 74 deletions(-) - -commit 76f2d742e0f4b4d79f98d581beef169e9f30dd16 -Author: Philip Withnall -Date: Sun Dec 27 18:21:13 2009 +0000 - - Don't merge identical entires on import - - src/import-dialog.c | 32 +++++++++++++++++++++++++++++--- - 1 file changed, 29 insertions(+), 3 deletions(-) - -commit 96188339b91b20bc12d4c43e44b187aadf583fd5 -Author: Philip Withnall -Date: Tue Dec 22 16:27:21 2009 +0000 - - Bug 594871 — Add line spacing options - - Add line spacing options such that printed entries can be annotated - by hand. - Closes: bgo#594871 - - data/almanah.ui | 1 + - src/printing.c | 47 +++++++++++++++++++++++++++++++++++------------ - 2 files changed, 36 insertions(+), 12 deletions(-) - -commit 0d515746d7fb9bc7b4c5a682a727d84ec88f5f9b -Author: Philip Withnall -Date: Tue Dec 22 15:15:33 2009 +0000 - - Tidy up build process and hide compilation churn - - configure.ac | 46 ++++++++++++++++---------- - src/Makefile.am | 101 - ++++++++++++++++++++++++-------------------------------- - 2 files changed, 72 insertions(+), 75 deletions(-) - -commit e16b019fe921a36b751c7462f8866ce7a2f13b24 -Author: Philip Withnall -Date: Thu Dec 17 08:45:46 2009 +0000 - - Make Evolution dependency optional - - Also remove forced -Wall flag. - - configure.ac | 11 ++++++++++- - src/Makefile.am | 28 +++++++++++++++------------- - src/event-factory.h | 3 +++ - src/event-manager.c | 4 ++++ - 4 files changed, 32 insertions(+), 14 deletions(-) - -commit d176ff98cc3d0f74b537b9025c2704c23561b069 -Author: Jorge González -Date: Sun Dec 20 17:12:20 2009 +0100 - - Updated Spanish translation - - po/es.po | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit a9e59b7264971d9c9220ce0da58cb4a95b56387c -Author: Joe Hansen -Date: Fri Dec 18 00:12:55 2009 +0100 - - Added Danish translation - - po/da.po | 701 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 701 insertions(+) - -commit 1901c7cdb1e2dfbe2a0b41bd9aaf75ef9f12abd3 -Author: Kenneth Nielsen -Date: Fri Dec 18 00:05:47 2009 +0100 - - Added da to list of languages - - po/LINGUAS | 1 + - 1 file changed, 1 insertion(+) - -commit b1bc39bc2b27d3d858d85618f6eddded191f6d48 -Author: Carlos Albornoz -Date: Sun Dec 13 12:43:18 2009 +0100 - - Updated Spanish translation - - Signed-off-by: Jorge González - - po/es.po | 659 - ++++++++++++++++++++++++++++++++++++++++++++++++++------------- - 1 file changed, 528 insertions(+), 131 deletions(-) - -commit 159310a33f94021e61383a35759d3c5da8098004 -Author: Mario Blättermann -Date: Sat Dec 12 11:49:22 2009 +0100 - - Updated German translation - - po/de.po | 104 - +++++++++++++++++++++++++++++---------------------------------- - 1 file changed, 47 insertions(+), 57 deletions(-) - -commit b0d81a0c5fc0b27abb805dbb375d5ccdc7604c3a -Author: Andre Klapper -Date: Fri Dec 11 18:34:36 2009 +0100 - - Add missing file to POTFILES.in - - po/POTFILES.in | 1 + - 1 file changed, 1 insertion(+) - -commit 52b30a4d142a4eaae08f2af24eea9d67f40dd473 -Author: Andrej Žnidaršič -Date: Fri Nov 27 13:25:41 2009 +0100 - - Updated Slovenian translation - - po/sl.po | 1300 - +++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 652 insertions(+), 648 deletions(-) - -commit 727420aaff12e7efa9d0fb7b3c13b6831e2956a9 -Author: Daniel Nylander -Date: Tue Nov 10 01:29:29 2009 +0100 - - Updated Swedish translation - - po/sv.po | 401 - ++++++++++++++++++++++++++++++++++++++------------------------- - 1 file changed, 245 insertions(+), 156 deletions(-) - -commit 7af4b9f69373591a3e439f436ac0626ca2e2cfa3 -Author: Matej Urbančič -Date: Tue Nov 3 13:47:05 2009 +0100 - - Added sl for Slovenian translation - - po/LINGUAS | 1 + - 1 file changed, 1 insertion(+) - -commit 241ad67fc04229322442347fe49c85ed1570d990 -Author: Andrej Žnidaršič -Date: Tue Nov 3 13:46:21 2009 +0100 - - Updated Slovenian translation - - po/sl.po | 648 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 648 insertions(+) - -commit 79bfb759a57212d589201467581f30ec3a952d64 -Author: Philip Withnall -Date: Mon Oct 26 19:46:37 2009 +0000 - - Bug 599598 — Segmentation fault in debian unstable - - Fix a crash if initialisation of libgpgme fails, and also change GPGME - initialisation so it works for GPGME 1.2.x. Closes: bgo#599598 - - configure.ac | 2 ++ - src/storage-manager.c | 15 +++++++++++++-- - src/storage-manager.h | 3 ++- - 3 files changed, 17 insertions(+), 3 deletions(-) - -commit 3a74dc4aa7321a90672506a6f487481a8d8c634f -Author: Mario Blättermann -Date: Sun Oct 4 19:38:16 2009 +0200 - - Updated German translation - - po/de.po | 365 - +++++++++++++++++++++++++++++++++++++++++++-------------------- - 1 file changed, 249 insertions(+), 116 deletions(-) - -commit 412e3431fd98ef685a157eb95d5cd5bec4cb61ab -Author: Claude Paroz -Date: Sat Oct 3 12:04:38 2009 +0200 - - Updated French translation - - po/fr.po | 326 - +++++++++++++++++++++++++++++++++++++++++++-------------------- - 1 file changed, 225 insertions(+), 101 deletions(-) - -commit c50145a822a7f76fc8fbaf0f809bce03ab4dc708 -Author: Andika Triwidada -Date: Mon Sep 28 18:41:03 2009 +0700 - - Added id - - po/LINGUAS | 1 + - po/id.po | 0 - 2 files changed, 1 insertion(+) - -commit 7c93b965f1dc9600acfaa82c4e19533ddd212b71 -Author: Andika Triwidada -Date: Mon Sep 28 18:40:29 2009 +0700 - - Added Indonesian Translation - - po/id.po | 646 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 646 insertions(+) - -commit b4b5ac5793725492444d9bd850e869396132ac26 -Author: Philip Withnall -Date: Thu Sep 24 18:00:45 2009 +0100 - - Fix the UI to follow the GNOME HIG - - data/almanah.ui | 663 - +++++++++++++++++++++++++---------------------- - src/definitions/uri.c | 4 +- - src/interface.c | 10 - - src/interface.h | 1 - - src/main-window.c | 1 - - src/preferences-dialog.c | 3 +- - src/printing.c | 21 +- - 7 files changed, 363 insertions(+), 340 deletions(-) - -commit 97530ba0ac032ef81892f090030db2aeb971e0ca -Author: Philip Withnall -Date: Thu Sep 24 16:08:46 2009 +0100 - - Added import support - - Text files and other Almanah databases can now be imported to the - current database. - - data/almanah.ui | 235 ++++++++++++++ - po/Makefile.in.in | 4 +- - po/POTFILES.in | 1 + - src/Makefile.am | 2 + - src/definition-manager-window.c | 14 +- - src/import-dialog.c | 694 - ++++++++++++++++++++++++++++++++++++++++ - src/import-dialog.h | 83 +++++ - src/main-window.c | 16 +- - src/main.c | 2 + - src/main.h | 1 + - src/storage-manager.c | 132 ++++++-- - src/storage-manager.h | 3 +- - 12 files changed, 1144 insertions(+), 43 deletions(-) - -commit 68d574378db6588d43236330c8ee6e41070d39e5 -Author: Fran Diéguez -Date: Tue Sep 15 23:05:31 2009 +0200 - - Added gl - - po/LINGUAS | 1 + - 1 file changed, 1 insertion(+) - -commit b7a78229140843b33c352217255735638acd3d50 -Author: Fran Diéguez -Date: Tue Sep 15 23:00:04 2009 +0200 - - Added Galician Translation - - po/gl.po | 556 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 556 insertions(+) - -commit 862d508795347e2f222c85fbe0517d1b4359c3de -Author: Kostas Papadimas -Date: Fri Sep 11 19:43:07 2009 +0300 - - Updated Greek translation. - - po/el.po | 108 - ++++++++++++++++++++++++++++++--------------------------------- - 1 file changed, 51 insertions(+), 57 deletions(-) - -commit ed682c932c987e7c27e9c91577963e99d8a4de39 -Author: Philip Withnall -Date: Sat Jun 13 15:53:11 2009 +0100 - - Unmark a %X strftime string as translatable - - The %X strftime placeholder is already locale-dependent. Closes: - bgo#585646 - - src/main-window.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -commit 351e49c5d44900dc39ce8e419957e7b35b1ba328 -Author: Daniel Nylander -Date: Tue Jul 7 13:17:28 2009 +0200 - - Updated Swedish translation - - po/sv.po | 108 - ++++++++++++++++++++++++++++++++++++++++----------------------- - 1 file changed, 68 insertions(+), 40 deletions(-) - -commit 63d4703e5e0167e4cd6756358f5de4e2caca7116 -Author: Claude Paroz -Date: Sat Jun 13 15:58:01 2009 +0200 - - Updated French translation - - po/fr.po | 333 - ++++++++++++++++++++++++++++++++++++--------------------------- - 1 file changed, 189 insertions(+), 144 deletions(-) - -commit 79afb7532b0db4fb449c362498ca9a092c2052a4 -Author: Daniel Nylander -Date: Sat Jun 13 10:49:02 2009 +0200 - - Updated sv translation (Daniel Nylander) - - po/sv.po | 150 - ++++++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 81 insertions(+), 69 deletions(-) - -commit 68d95226bb7bb77d9f69b2e9b0d26f68a230df65 -Author: Aron Xu -Date: Thu May 28 16:00:21 2009 +0800 - - Added Simplified Chinese translation. - - po/zh_CN.po | 552 - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 552 insertions(+) - -commit cdaa34c370ca5f378c91b836bed318d8e883cf27 -Author: Aron Xu -Date: Thu May 28 16:00:05 2009 +0800 - - Added Simplified Chinese translation. - - po/LINGUAS | 1 + - 1 file changed, 1 insertion(+) - -commit 7f0a87ed248cd588d8aa5b3d293bd55db49c9f7c -Author: Mario Blättermann -Date: Tue May 12 22:09:33 2009 +0200 - - Updated German translation - - po/de.po | 102 - +++++++++++++++++++++++++++++++++------------------------------ - 1 file changed, 54 insertions(+), 48 deletions(-) - -commit b26ba3aeebc347e7f7f9f040cb8ba499ab986080 -Author: Βασίλης Κοντογιάνης -Date: Mon May 11 12:31:37 2009 +0100 - - Updated Greek translation - - po/el.po | 190 - +++++++++++++++++++++++++++++---------------------------------- - 1 file changed, 88 insertions(+), 102 deletions(-) - -commit 4d75b8f9807eb1e87eb17b6e9fa1565fc124b98a -Author: Philip Withnall -Date: Sun May 10 19:10:41 2009 +0100 - - Reduce usage of almanah_interface_embolden_label by using Pango - attributes - - data/almanah.ui | 15 +++++++++++++++ - src/definition-manager-window.c | 4 ---- - src/main-window.c | 4 ---- - src/search-dialog.c | 3 --- - 4 files changed, 15 insertions(+), 11 deletions(-) - -commit 11eaffdee9e7c78eecb25a798bb44282696c0655 -Author: Philip Withnall -Date: Sun May 10 18:54:27 2009 +0100 - - Bug 572032 – Allow manual date entry - - data/almanah.ui | 74 +++++++++++++++++- - src/Makefile.am | 2 + - src/date-entry-dialog.c | 202 - ++++++++++++++++++++++++++++++++++++++++++++++++ - src/date-entry-dialog.h | 57 ++++++++++++++ - src/main-window.c | 18 +++++ - src/main.c | 2 + - src/main.h | 1 + - 7 files changed, 355 insertions(+), 1 deletion(-) - -commit 081d79837e10273d778cc376a905b6fce255e229 -Author: Philip Withnall -Date: Sun May 10 09:23:52 2009 +0100 - - Made the text view for entering "note" definitions longer by default - - src/definitions/note.c | 1 + - 1 file changed, 1 insertion(+) - -commit 55f441eb5e93c8fcfdb76b449c9f30c191d2f4ae -Author: Philip Withnall -Date: Sun May 10 09:18:19 2009 +0100 - - Don't display the Add Definition dialogue for pre-existing definition - texts - - src/main-window.c | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) - -commit 5bcaf504d120e1287d5b11721438eb309633d178 -Author: Simos Xenitellis -Date: Fri May 8 17:20:05 2009 +0100 - - Added el to LINGUAS - - po/LINGUAS | 1 + - 1 file changed, 1 insertion(+) - -commit 87b64617aa6ff117ba096df753d8eb20ba5c2201 -Author: Vasilis Kontogiannis -Date: Fri May 8 17:18:18 2009 +0100 - - Added Greek translation - - po/el.po | 555 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 555 insertions(+) - -commit 63b2a1a3836aa4bb6c5b9bc0acc458843181e3ad -Author: Mario Blättermann -Date: Mon May 4 10:12:03 2009 +0200 - - Updated German translation - - po/ChangeLog | 4 ++ - po/de.po | 209 - ++++++++++++++++++++++++++++++----------------------------- - 2 files changed, 110 insertions(+), 103 deletions(-) - -commit 45cee2421c0c70c8d3964818a70c886755053fa5 -Author: Philip Withnall -Date: Sun May 3 17:14:51 2009 +0100 - - Wrap text when adding a new note definition - - src/definitions/note.c | 1 + - 1 file changed, 1 insertion(+) - -commit 04dd158392d331c2ac206859e2a005277e53482c -Author: Philip Withnall -Date: Sun May 3 17:01:33 2009 +0100 - - Made adding definitions case-insensitive - - When adding a definition, pre-existing definitions can populate - the Add - Definition dialogue even if they differ in case to what's been typed. - Definitions are still stored with their original case in the database. - - src/definition-manager-window.c | 53 - ++++++++++++++++++++++++++++++++++++++++- - src/main-window.c | 2 +- - src/storage-manager.c | 28 ++++++++++++++++++++-- - 3 files changed, 79 insertions(+), 4 deletions(-) - -commit 0b17724a31e91a6ced6763ceddeae6e57c8fbaa9 -Author: Philip Withnall -Date: Sun May 3 15:52:55 2009 +0100 - - Bug 580052 – Not encrypting keeps encrypted database - - Delete the old encrypted database if closing a database which wasn't - initially encrypted, or without an encryption key. - - src/storage-manager.c | 22 ++++++++++++---------- - 1 file changed, 12 insertions(+), 10 deletions(-) - -commit 4fb9feb96fc1a20c8e0d259653b224d62e7ebbe5 -Author: Philip Withnall -Date: Sun May 3 15:42:40 2009 +0100 - - Bug 579242 – No error messages for bad keys when closing - - Improved error reporting when closing the database, such that - errors during - encryption are now presented in error dialogues, rather than just - being - printed silently to the console. - - src/Makefile.am | 17 ++++++++++++++++ - src/almanah-marshal.list | 1 + - src/main.c | 35 +++++++++++++++++---------------- - src/storage-manager.c | 50 - +++++++++++++++++++++++++----------------------- - 4 files changed, 62 insertions(+), 41 deletions(-) - -commit dce853f92d564007b1407b5993829e365f149bf7 -Author: Philip Withnall -Date: Sun Apr 26 16:17:35 2009 +0100 - - Fixed e-mail address in DOAP file - - almanah.doap | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 5c5c5c92223b29a44a9dd10746eb1708c2275842 -Author: Philip Withnall -Date: Thu Apr 23 17:58:08 2009 +0100 - - Add more debugging on failure to encrypt the database - - src/storage-manager.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -commit 52e30a28b62b297f3ac3774d4cad6b5fdcd78b3e -Author: Daniel Nylander -Date: Mon Apr 20 17:37:18 2009 +0200 - - Updated sv translation - - po/ChangeLog | 4 ++ - po/sv.po | 168 - ++++++++++++++++++++++++++++++++--------------------------- - 2 files changed, 94 insertions(+), 78 deletions(-) - -commit eb4bc7b7d0f434b25698ec92c80b11363cb9201c -Author: Philip Withnall -Date: Sun Apr 19 23:56:07 2009 +0100 - - Added .gitignore generation support - - Using git.mk from pango, the .gitignore file is now auto-generated. - Removed INSTALL from the repository, since it was only a symlink, - and also - removed the obsolete .bzrignore and .gitignore files. - - .bzrignore | 64 ---------------- - .gitignore | 37 --------- - INSTALL | 1 - - Makefile.am | 22 +++++- - data/Makefile.am | 2 + - data/icons/16x16/Makefile.am | 2 + - data/icons/22x22/Makefile.am | 2 + - data/icons/32x32/Makefile.am | 2 + - data/icons/48x48/Makefile.am | 2 + - data/icons/Makefile.am | 2 + - git.mk | 178 - +++++++++++++++++++++++++++++++++++++++++++ - src/Makefile.am | 2 + - 12 files changed, 212 insertions(+), 104 deletions(-) - -commit 0d02c20d92e3f766c44047b55d39d9481b23543c -Author: Philip Withnall -Date: Sun Apr 19 23:45:10 2009 +0100 - - Compiler warning fixes - - src/add-definition-dialog.c | 6 ++-- - src/add-definition-dialog.h | 4 +-- - src/definition-manager-window.c | 9 ++++-- - src/definition.c | 1 - - src/definition.h | 8 +++--- - src/definitions/contact.c | 1 - - src/definitions/file.c | 3 +- - src/definitions/note.c | 3 +- - src/definitions/uri.c | 3 +- - src/entry.c | 1 - - src/event-factories/calendar.c | 3 +- - src/event-factories/f-spot.c | 1 - - src/event-factory.c | 3 +- - src/event-manager.c | 1 - - src/event.c | 3 +- - src/event.h | 8 +++--- - src/events/calendar-appointment.c | 3 +- - src/events/calendar-task.c | 3 +- - src/events/f-spot-photo.c | 1 - - src/main-window.c | 35 ++++++++++++++++++----- - src/main.c | 2 +- - src/preferences-dialog.c | 7 ++--- - src/printing.c | 5 ++-- - src/search-dialog.c | 10 +++++-- - src/storage-manager.c | 59 - +++++++++++++++++++-------------------- - 25 files changed, 100 insertions(+), 83 deletions(-) - -commit c380c3e5d2b7aeb88e7a46e880882906fb020a76 -Author: Philip Withnall -Date: Fri Apr 17 10:43:17 2009 +0100 - - Migrated to git, adding a DOAP file and moving the ChangeLog - - Added a DOAP file for the use of cgit, fixed some file permissions, - migrated - the svn:ignore property to .gitignore, and moved the ChangeLog to - ChangeLog.pre-git and added Makefile code to generate the ChangeLog - from the - git log in future. - - .gitignore | 37 ++ - AUTHORS | 0 - ChangeLog | 1329 - --------------------------------------------------- - ChangeLog.pre-git | 1361 - +++++++++++++++++++++++++++++++++++++++++++++++++++++ - Makefile.am | 18 +- - NEWS | 0 - README | 0 - almanah.doap | 16 + - configure.ac | 0 - data/Makefile.am | 0 - src/Makefile.am | 0 - src/interface.c | 0 - src/interface.h | 0 - src/main.c | 0 - src/main.h | 0 - 15 files changed, 1431 insertions(+), 1330 deletions(-) diff -Nru almanah-0.11.1/ChangeLog.pre-git almanah-0.12.0/ChangeLog.pre-git --- almanah-0.11.1/ChangeLog.pre-git 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/ChangeLog.pre-git 1970-01-01 00:00:00.000000000 +0000 @@ -1,1361 +0,0 @@ -=== ChangeLog discontinued === - - With the move to git, Almanah is switching from a ChangeLog file - to relying on commit messages to provide change history. Please - write commit messages in the following format - (appropriated from GTK+): - - === begin example commit === - Short explanation of the commit - - Longer explanation explaining exactly what's changed, whether any - external or private interfaces changed, what bugs were fixed (with bug - tracker reference if applicable) and so forth. Be concise but not too - brief. - === end example commit === - - - Always add a brief description of the commit to the _first_ line of - the commit and terminate by two newlines. This may be the title of - a fixed bug, copied from Bugzilla. - - - First line (the brief description) must only be one sentence and - should start with a capital letter unless it starts with a - lowercase symbol or identifier. Don't use a trailing full stop, - and don't exceed 72 characters. - - - The main description (the body) is normal prose and should use - normal punctuation and capital letters where appropriate. - - - When committing code on behalf of others use the --author option, - e.g. git commit -a --author "Joe Coder " and - --signoff. - -2009-04-10 Philip Withnall - - * configure.ac: - * src/Makefile.am: - * src/event-factories/f-spot.c - (almanah_f_spot_event_factory_class_init), - (almanah_f_spot_event_factory_init), - (almanah_f_spot_event_factory_dispose), - (almanah_f_spot_event_factory_finalize), (query_info_complete_cb), - (query_events_complete_cb), (date_to_int64), (cancel_query), - (query_events), (get_events): - * src/event-factories/f-spot.h: - * src/event-factory.h: - * src/event-manager.c: - * src/events/f-spot-photo.c - (almanah_f_spot_photo_event_class_init), - (almanah_f_spot_photo_event_init), - (almanah_f_spot_photo_event_finalize), - (almanah_f_spot_photo_event_new), - (almanah_f_spot_photo_event_format_value), - (almanah_f_spot_photo_event_view): - * src/events/f-spot-photo.h: Added an F-Spot photo event type, allowing - photos in F-Spot for the given day to be listed. (Closes: #578063) - -2009-04-10 Philip Withnall - - * src/interface.c (almanah_interface_create_text_tags): - * src/main-window.c (almanah_main_window_new), - (almanah_main_window_enable_spell_checking), - (almanah_main_window_disable_spell_checking): Ensure we only enable - spell checking once, and tidy up handling of spelling errors once - spell checking has been disabled. (Closes: #578559) - -2009-03-22 Philip Withnall - - * data/almanah.ui: - * src/entry.c (almanah_entry_class_init), (almanah_entry_finalize), - (almanah_entry_get_property), (almanah_entry_set_property), - (almanah_entry_is_important), (almanah_entry_set_is_important): - * src/entry.h: - * src/main-window.c (almanah_main_window_new), - (mw_important_activate_cb), (mw_about_activate_cb), - (mw_calendar_day_selected_cb): - * src/storage-manager.c (create_tables), - (almanah_storage_manager_get_entry), - (almanah_storage_manager_set_entry), - (almanah_storage_manager_search_entries): - * src/storage-manager.h: Add the ability to mark entries as important. - (Helps: #572927) - -2009-03-01 Philip Withnall - - * data/almanah.ui: - * src/main-window.c (save_current_entry), - (mw_insert_time_activate_cb): Added an "Insert Time" action, which - inserts the current time at the cursor position. (Closes: #572544) - -2009-03-01 Philip Withnall - - * src/main-window.c: Added some missing #includes. - * src/storage-manager.c (back_up_file), - (almanah_storage_manager_connect): Make an automatic backup of the - database before opening it just to be safe. (Closes: #572926) - -2009-02-08 Philip Withnall - - * src/Makefile.am: - * src/definition.c: - * src/definition.h: - * src/definitions/contact.c - (almanah_contact_definition_class_init), - (almanah_contact_definition_init), - (almanah_contact_definition_dispose), (contact_view), - (contact_build_dialog), (contact_close_dialog), - (contact_parse_text), (contact_get_blurb): - * src/definitions/contact.h: Add a new "Contact" definition type, - which allows linking of definitions to Evolution contacts. - -2009-01-29 Philip Withnall - - * src/storage-manager.c (database_idle_cb), (encrypt_database): - Only delete the plaintext database file if the encrypted database - file's size is greater than 0B, to try and prevent data loss in - odd situations. - -============ Version 0.6.0 - -2009-01-27 Philip Withnall - - * NEWS: - * configure.ac: Bump to version 0.6.0. - -2009-01-27 Philip Withnall - - * src/definitions/note.c (note_view): Ensure that the main window - doesn't steal the focus when viewing a note from the definition - manager. - * src/definition-manager-window.c - (almanah_definition_manager_window_init): - * src/interface.c: - * src/interface.h: - * src/main-window.c (add_definition_to_current_entry), - (mw_search_activate_cb), (mw_preferences_activate_cb), - (mw_view_definitions_activate_cb): - * src/main.c (almanah_quit), (main): - * src/main.h: Rearrange how dialogues and windows are opened such - that they aren't resident in memory until first opened, which should - speed up Almanah on startup, and reduce initial memory consumption. - -2009-01-27 Philip Withnall - - * src/event-factories/calendar-sources.c: Updated from gnome-panel - trunk. - * src/main.c: - * src/main.h: Fixed copyright headers to update the year. - -2009-01-27 Philip Withnall - - * src/link-factories/: - * src/links/: Remove directories which should've been removed when - renaming links to events. - -2009-01-27 Philip Withnall - - * src/main.c: - * src/main.h: Fix a compilation error when compiling with -fno-common. - -2009-01-14 Philip Withnall - - * data/almanah.schemas.in: - * src/main-window.c (almanah_main_window_new), - (mw_preferences_activate_cb), - (almanah_main_window_enable_spell_checking), - (almanah_main_window_disable_spell_checking): - * src/main-window.h: - * src/main.c (main): - * src/preferences-dialog.c (almanah_preferences_dialog_init), - (almanah_preferences_dialog_dispose), - (almanah_preferences_dialog_new), - (spell_checking_enabled_notify_cb), - (pd_spell_checking_enabled_check_button_toggled_cb): - Allow spell checking to be disabled at runtime with a GConf option. - (Closes: #567359) - -2008-12-24 Philip Withnall - - * src/printing.c (print_entry): Add a default margin of 20px when - printing. (Closes: #564706) - -2008-12-20 Philip Withnall - - * data/almanah.ui: - * src/main-window.c (mw_page_setup_activate_cb), - (mw_print_preview_activate_cb), (mw_print_activate_cb): - * src/main.c (storage_manager_disconnected_cb), (main): - * src/main.h: - * src/printing.c (custom_widget_apply_cb), (almanah_print_entries), - (almanah_print_page_setup): - * src/printing.h: Add Page Setup and Print Preview menu entries, - and improve the print settings code. (Helps: #564706) - -2008-12-13 Philip Withnall - - * data/almanah.ui: - * src/Makefile.am: - * src/definition-manager-window.c - (almanah_definition_manager_window_class_init), - (almanah_definition_manager_window_init), (definitions_dispose_cb), - (almanah_definition_manager_window_dispose), - (almanah_definition_manager_window_new), - (dmw_definition_tree_view_row_activated_cb), - (dmw_view_button_clicked_cb), (dmw_remove_button_clicked_cb), - (definition_selection_changed_cb), (definition_added_cb), - (definition_removed_cb), (populate_definition_store): - * src/definition-manager-window.h: - * src/definition.c (almanah_definition_get_blurb): - * src/definition.h: - * src/definitions/file.c (almanah_file_definition_class_init), - (file_get_blurb): - * src/definitions/note.c (almanah_note_definition_class_init), - (note_get_blurb): - * src/definitions/uri.c (almanah_uri_definition_class_init), - (uri_get_blurb): - * src/interface.c (definition_tag_event_cb): - * src/main-window.c (almanah_main_window_dispose), - (almanah_main_window_new), (mw_entry_buffer_apply_tag_cb), - (mw_view_definitions_activate_cb), (mw_definition_removed_cb): - * src/main-window.h: - * src/storage-manager.c: Added a "Definition Manager" interface, which - allows the user to list all their definitions and manage them. - -2008-12-13 Philip Withnall - - * data/almanah.ui: - * src/add-definition-dialog.c (almanah_add_definition_dialog_new): - * src/main-window.c (almanah_main_window_new): - * src/preferences-dialog.c (almanah_preferences_dialog_new): - * src/search-dialog.c (almanah_search_dialog_new): - * src/storage-manager.c (almanah_storage_manager_class_init), - (almanah_storage_manager_add_definition), - (almanah_storage_manager_remove_definition): Replace the "dry_" UI - prefix with "almanah_" for consistency. - -2008-12-13 Philip Withnall - - * data/almanah.ui: - * src/Makefile.am: - * src/event-factories/calendar.c - (almanah_calendar_event_factory_class_init), - (almanah_calendar_event_factory_init), - (almanah_calendar_event_factory_dispose), (query_events), - (events_changed_cb), (get_events): - * src/event-factories/calendar.h: - * src/event-factory.c (almanah_event_factory_class_init), - (almanah_event_factory_init), (almanah_event_factory_get_property), - (almanah_event_factory_get_type_id), - (almanah_event_factory_query_events), - (almanah_event_factory_get_events): - * src/event-factory.h: - * src/event-manager.c (almanah_event_manager_class_init), - (almanah_event_manager_init), (almanah_event_manager_dispose), - (almanah_event_manager_new), (events_updated_cb), - (almanah_event_manager_query_events), - (almanah_event_manager_get_events): - * src/event-manager.h: - * src/event.c (almanah_event_class_init), (almanah_event_init), - (almanah_event_get_property), (almanah_event_format_value), - (almanah_event_view), (almanah_event_get_name), - (almanah_event_get_description), (almanah_event_get_icon_name): - * src/event.h: - * src/events/calendar-appointment.c - (almanah_calendar_appointment_event_class_init), - (almanah_calendar_appointment_event_init), - (almanah_calendar_appointment_event_finalize), - (almanah_calendar_appointment_event_new), - (almanah_calendar_appointment_event_format_value), - (almanah_calendar_appointment_event_view): - * src/events/calendar-appointment.h: - * src/events/calendar-task.c - (almanah_calendar_task_event_class_init), - (almanah_calendar_task_event_init), - (almanah_calendar_task_event_finalize), - (almanah_calendar_task_event_new), - (almanah_calendar_task_event_format_value), - (almanah_calendar_task_event_view): - * src/events/calendar-task.h: - * src/link-factory.c: - * src/link-factory.h: - * src/link-manager.c: - * src/link-manager.h: - * src/link.c: - * src/link.h: - * src/main-window.c (almanah_main_window_new), - (save_current_entry), (clear_factory_events), - (mw_events_updated_cb), (mw_calendar_day_selected_cb), - (mw_events_selection_changed_cb), (mw_events_value_data_cb), - (mw_events_tree_view_row_activated_cb), - (mw_view_button_clicked_cb): - * src/main.c (almanah_quit), (main): - * src/main.h: - * src/storage-manager.h: Renamed "links" to "events", a name which - slightly better reflects what they are. - -2008-12-07 Philip Withnall - - * src/entry.c (almanah_entry_get_editability): - * src/main-window.c (save_current_entry): - * src/main.c (main): - * src/main.h: Added a command-line --import-mode option to allow - entries to be edited, regardless of their status and the current date. - This allows for old entries to easily be one-time imported into - Almanah from previous diaries. (Closes: #561106) - -2008-12-06 Philip Withnall - - * src/link-factories/calendar.c (get_links): - * src/links/calendar-appointment.c - (almanah_calendar_appointment_link_finalize), - (almanah_calendar_appointment_link_new), - (almanah_calendar_appointment_link_format_value), - (almanah_calendar_appointment_link_view): - * src/links/calendar-appointment.h: - * src/links/calendar-task.c - (almanah_calendar_task_link_format_value), - (almanah_calendar_task_link_view): Allow appointment and task links to - be viewed by spawning Evolution. - * src/main-window.c (clear_factory_links), (mw_links_updated_cb): - Fix a memory leak caused by not unreffing some links. - -2008-12-06 Philip Withnall - - * configure.ac: - * data/almanah.ui: - * src/Makefile.am: - * src/add-definition-dialog.c - (almanah_add_definition_dialog_class_init), - (almanah_add_definition_dialog_init), - (almanah_add_definition_dialog_dispose), - (almanah_add_definition_dialog_finalize), - (almanah_add_definition_dialog_get_property), - (almanah_add_definition_dialog_set_property), - (almanah_add_definition_dialog_new), (destroy_extra_widgets), - (response_cb), (add_type_combo_box_changed_cb), - (almanah_add_definition_dialog_get_text), - (almanah_add_definition_dialog_set_text), - (almanah_add_definition_dialog_get_definition): - * src/add-definition-dialog.h: - * src/add-link-dialog.c: - * src/add-link-dialog.h: - * src/definition.c (almanah_definition_class_init), - (almanah_definition_init), (almanah_definition_finalize), - (almanah_definition_get_property), - (almanah_definition_set_property), (almanah_definition_new), - (almanah_definition_get_type_id), (almanah_definition_get_name), - (almanah_definition_get_description), - (almanah_definition_get_icon_name), (almanah_definition_view), - (almanah_definition_build_dialog), - (almanah_definition_close_dialog), (almanah_definition_parse_text), - (almanah_definition_get_text), (almanah_definition_set_text), - (almanah_definition_get_value), (almanah_definition_set_value), - (almanah_definition_get_value2), (almanah_definition_set_value2), - (almanah_definition_populate_model): - * src/definition.h: - * src/definitions/file.c (almanah_file_definition_class_init), - (almanah_file_definition_init), (file_view), (file_build_dialog), - (file_close_dialog), (file_parse_text): - * src/definitions/file.h: - * src/definitions/note.c (almanah_note_definition_class_init), - (almanah_note_definition_init), (note_view), (note_build_dialog), - (note_close_dialog), (note_parse_text): - * src/definitions/note.h: - * src/definitions/uri.c (almanah_uri_definition_class_init), - (almanah_uri_definition_init), (uri_view), (uri_build_dialog), - (uri_close_dialog), (uri_parse_text): - * src/definitions/uri.h: - * src/entry.h: - * src/interface.c (almanah_create_interface), - (definition_tag_event_cb), (almanah_interface_create_text_tags): - * src/interface.h: - * src/link-factories/calendar-client.c (calendar_client_get_type), - (calendar_client_class_init), - (calendar_client_config_get_timezone), - (calendar_client_config_get_icaltimezone), - (calendar_client_set_timezone), - (calendar_client_timezone_changed_cb), (cal_opened_cb), - (load_calendars), (calendar_client_init), - (calendar_client_finalize), (calendar_client_set_property), - (calendar_client_get_property), (calendar_client_new), - (make_time_for_day_begin), (make_isodate_for_day_begin), - (get_time_from_property), (get_ical_uid), (get_ical_rid), - (get_ical_summary), (get_ical_description), (get_ical_start_time), - (get_ical_end_time), (get_ical_is_all_day), (get_ical_due_time), - (get_ical_percent_complete), (get_ical_completed_time), - (get_ical_priority), (get_source_color), (get_source_uri), - (null_safe_strcmp), (calendar_appointment_equal), - (calendar_appointment_copy), (calendar_appointment_finalize), - (calendar_appointment_init), (resolve_timezone_id), - (calendar_appointment_collect_occurrence), - (calendar_appointment_generate_ocurrences), (calendar_task_equal), - (calendar_task_copy), (calendar_task_finalize), - (calendar_task_init), (calendar_event_free), (calendar_event_new), - (calendar_event_copy), (calendar_event_get_uid), - (calendar_event_equal), (calendar_event_generate_ocurrences), - (calendar_event_debug_dump), (goddamn_this_is_crack), - (calendar_client_handle_query_completed), - (calendar_client_handle_query_result), (check_object_remove), - (calendar_client_handle_objects_removed), - (calendar_client_query_finalize), (calendar_client_stop_query), - (calendar_client_start_query), - (calendar_client_update_appointments), - (calendar_client_update_tasks), (calendar_client_source_finalize), - (compare_calendar_sources), (calendar_client_update_sources_list), - (calendar_client_appointment_sources_changed), - (calendar_client_task_sources_changed), (calendar_client_get_date), - (calendar_client_select_month), (calendar_client_select_day), - (filter_appointment), (filter_task), - (calendar_client_filter_events), (calendar_client_get_events), - (day_from_time_t), (calendar_client_foreach_appointment_day), - (calendar_client_set_task_completed): - * src/link-factories/calendar-client.h: - * src/link-factories/calendar-debug.h: - * src/link-factories/calendar-sources.c - (calendar_sources_get_type), (calendar_sources_class_init), - (calendar_sources_init), (calendar_sources_finalize_source_data), - (calendar_sources_finalize), (calendar_sources_get), - (is_source_selected), (auth_func_cb), (get_ecal_from_source), - (compare_ecal_lists), (debug_dump_selected_sources), - (debug_dump_ecal_list), (backend_restart), (backend_died_cb), - (calendar_sources_load_esource_list), - (calendar_sources_esource_list_changed), - (calendar_sources_selected_sources_notify), - (calendar_sources_load_sources), - (calendar_sources_get_appointment_sources), - (calendar_sources_get_task_sources): - * src/link-factories/calendar-sources.h: - * src/link-factories/calendar.c - (almanah_calendar_link_factory_class_init), - (almanah_calendar_link_factory_init), - (almanah_calendar_link_factory_dispose), (query_links), - (events_changed_cb), (date_to_time), (get_links): - * src/link-factories/calendar.h: - * src/link-factory.c (almanah_link_factory_class_init), - (almanah_link_factory_init), (almanah_link_factory_get_property), - (almanah_link_factory_get_type_id), - (almanah_link_factory_query_links), - (almanah_link_factory_get_links): - * src/link-factory.h: - * src/link-manager.c (almanah_link_manager_class_init), - (almanah_link_manager_init), (almanah_link_manager_dispose), - (almanah_link_manager_new), (links_updated_cb), - (almanah_link_manager_query_links), - (almanah_link_manager_get_links): - * src/link-manager.h: - * src/link.c (almanah_link_class_init), (almanah_link_init), - (almanah_link_get_property), (almanah_link_view), - (almanah_link_get_icon_name): - * src/link.h: - * src/links/calendar-appointment.c - (almanah_calendar_appointment_link_class_init), - (almanah_calendar_appointment_link_init), - (almanah_calendar_appointment_link_finalize), - (almanah_calendar_appointment_link_new), - (almanah_calendar_appointment_link_format_value), - (almanah_calendar_appointment_link_view): - * src/links/calendar-appointment.h: - * src/links/calendar-task.c - (almanah_calendar_task_link_class_init), - (almanah_calendar_task_link_init), - (almanah_calendar_task_link_finalize), - (almanah_calendar_task_link_new), - (almanah_calendar_task_link_format_value), - (almanah_calendar_task_link_view): - * src/links/calendar-task.h: - * src/links/file.c: - * src/links/file.h: - * src/links/note.c: - * src/links/note.h: - * src/links/uri.c: - * src/links/uri.h: - * src/main-window.c (almanah_main_window_new), - (save_current_entry), (add_definition_to_current_entry), - (remove_definition_from_current_entry), - (mw_entry_buffer_cursor_position_cb), (apply_formatting), - (mw_about_activate_cb), (mw_add_definition_activate_cb), - (mw_remove_definition_activate_cb), (clear_factory_links), - (mw_links_updated_cb), (mw_calendar_day_selected_cb), - (mw_links_selection_changed_cb), (mw_links_value_data_cb), - (mw_links_tree_view_row_activated_cb), (mw_view_button_clicked_cb): - * src/main.c (almanah_quit), (main): - * src/main.h: - * src/printing.c (almanah_print_entries): - * src/storage-manager.c (create_tables), - (almanah_storage_manager_get_statistics), - (almanah_storage_manager_set_entry), - (almanah_storage_manager_get_definitions), - (almanah_storage_manager_get_definition), - (almanah_storage_manager_add_definition), - (almanah_storage_manager_remove_definition): - * src/storage-manager.h: Radically rearrange the "links" system so - that "links" are now dynamic objects listed per-day, and immutable by - the user. To replace the old "links", "definitions" have been added, - whereby the user can define some information to be associated with a - string across all the entries in the diary. For example, a person or - project could be defined, and then the same associated data referenced - from multiple entries. - There isn't currently an interface for viewing a list of definitions, - but one is planned. - The old "link" types have been ported to being definition types, and - two *new* link types have been added to complement the new system of - link factories, which allow for dynamic link listing. The new link - types are calendar appointments and tasks, via Evolution. Some of the - code for this (src/link-factories/calendar-*.[ch]) is taken from the - clock applet in gnome-panel, under the GPLv2+. It hasn't been - modified, and should be kept in sync with the originals in - gnome-panel. - -2008-11-16 Philip Withnall - - * src/preferences-dialog.c (almanah_preferences_dialog_new): - Fix a crash caused by dereferencing a NULL pointer. - -2008-11-16 Philip Withnall - - Fix file permissions. - -2008-11-16 Philip Withnall - - * configure.ac: - * data/almanah.ui: - * src/links/uri.c (uri_build_dialog): - * src/preferences-dialog.c (almanah_preferences_dialog_new): - Add accessibility information to the UI, so that it is navigable in - both Accerciser and GOK. Note: adds a dependency on ATK. - -============ Version 0.5.0 - -2008-11-16 Philip Withnall - - * NEWS: - * configure.ac: Bump to version 0.5.0. - * src/Makefile.am: - * src/link.c: Fix a build error where the link type headers - weren't being found. - -2008-11-16 Philip Withnall - - * data/almanah.schemas.in: - * src/main-window.c (almanah_main_window_new): Allow the spelling - language to be set with a GConf key. - -2008-11-16 Philip Withnall - - * README: - * configure.ac: Updated GTK+ dependency to 2.14 for gtk_show_uri(). - * src/link.c (almanah_link_get_value), (almanah_link_get_value2): - * src/link.h: - * src/links/file.c (file_format_value), (file_view): - * src/links/note.c (note_format_value), (note_view): - * src/links/uri.c (uri_format_value), (uri_view): - * src/main-window.c (mw_calendar_day_selected_cb): - * src/storage-manager.c (almanah_storage_manager_add_entry_link): - Clean up the link API a little to reduce the number of string - duplications, and also clean up the code for viewing URIs and files. - -2008-11-13 Philip Withnall - - * src/link.c: Remove an unnecessary comment. - * src/main-window.c (get_selected_date), - (add_link_to_current_entry), (remove_link_from_current_entry), - (mw_calendar_day_selected_cb), (mw_links_value_data_cb): - Refactor some of the date handling code into a separate function. - * src/interface.c (almanah_calendar_month_changed_cb): - * src/storage-manager.c - (almanah_storage_manager_get_month_marked_days): - * src/storage-manager.h: Use a variable-length array for the - mark data for each month. - -2008-11-13 Philip Withnall - - * configure.ac: Use AC_HELP_STRING. - -2008-11-13 Philip Withnall - - * src/entry.c (almanah_entry_get_content): - * src/entry.h: - * src/main-window.c (mw_calendar_day_selected_cb): - * src/printing.c (print_entry): - * src/storage-manager.c (almanah_storage_manager_search_entries): - Fix problems with automatically creating tags when deserialising an - entry into a GtkTextBuffer. - * src/search-dialog.c (sd_search_button_clicked_cb): Make sure the - result list is cleared before doing a new search. - -2008-11-13 Philip Withnall - - * src/storage-manager.c (almanah_storage_manager_disconnect): Fixed - string ("s/almanah/diary/"). - -2008-11-13 Philip Withnall - - * src/interface.c (almanah_calendar_month_changed_cb): - * src/main-window.c (mw_entry_buffer_cursor_position_cb): - * src/storage-manager.c (almanah_storage_manager_query), - (almanah_storage_manager_free_results), - (almanah_storage_manager_get_statistics), - (almanah_storage_manager_get_month_marked_days): Changed from GSlice - allocation to the more-appropriate g_malloc and g_new. - May fix some slice-related crashes on quitting. - -2008-10-28 Philip Withnall - - * src/Makefile.am: - * src/entry.c (almanah_entry_get_content): - * src/interface.c (almanah_create_interface): - * src/main-window.c (almanah_main_window_new), - (mw_preferences_activate_cb): - * src/main.c (storage_manager_disconnected_cb), (almanah_quit), - (main): - * src/main.h: Only allow the Preferences dialogue to be opened if - encryption support is compiled in. - * src/storage-manager.c (almanah_storage_manager_get_statistics): - Fix a crasher when getting database statistics. - -2008-10-28 Philip Withnall - - Updated svn:ignore lists. - -2008-10-26 Philip Withnall - - * configure.ac: - * data/Makefile.am: - * data/almanah.schemas.in: - * src/main-window.c (almanah_main_window_dispose), - (almanah_main_window_new), (save_window_state), - (restore_window_state), (mw_delete_event_cb): Save the window - dimensions and position upon exiting, and restore them when starting - the program. Promotes the dependency on GConf to be mandatory (was - previously dependent on compiling with encryption support). - * src/links/file.c (file_view): Fix a compilation error about - mismatched pointer types. - -2008-10-23 Philip Withnall - - * src/add-link-dialog.c (almanah_add_link_dialog_new): - * src/interface.c: - * src/interface.h: - * src/links/file.c (file_view): - * src/links/note.c: - * src/links/uri.c (uri_view): - * src/main-window.c (almanah_main_window_new), - (save_current_entry), (mw_calendar_day_selected_cb): - * src/main.c (almanah_quit), (main): - * src/preferences-dialog.c (almanah_preferences_dialog_new), - (pd_key_combo_changed_cb), (pd_new_key_button_clicked_cb): - * src/search-dialog.c (almanah_search_dialog_new): - Kill almanah_interface_error. - -2008-10-22 Philip Withnall - - * data/almanah.ui: Fix one missing rename from the previous commit. - * src/entry.c (almanah_entry_get_content): - * src/search-dialog.c (sd_search_button_clicked_cb): - * src/storage-manager.c (almanah_storage_manager_search_entries): - * src/storage-manager.h: Rewrite the method to search for an entry - so that it now works with the new serialised entry format. - -2008-10-22 Philip Withnall - - * src/add-link-dialog.c (almanah_add_link_dialog_new): - * src/interface.c (almanah_get_interface_filename), - (almanah_create_interface), (almanah_interface_embolden_label), - (almanah_interface_error), (almanah_calendar_month_changed_cb): - * src/interface.h: - * src/link.c (almanah_link_view): - * src/links/file.c (file_view): - * src/links/note.c (note_view): - * src/links/uri.c (uri_view): - * src/main-window.c (almanah_main_window_new), - (save_current_entry), (add_link_to_current_entry), - (remove_link_from_current_entry), (mw_delete_event_cb), - (mw_print_activate_cb), (mw_quit_activate_cb), - (mw_search_activate_cb), (mw_preferences_activate_cb), - (mw_about_activate_cb), (mw_calendar_day_selected_cb): - * src/main.c (storage_manager_disconnected_cb), (almanah_quit), - (main): - * src/main.h: - * src/preferences-dialog.c (almanah_preferences_dialog_new), - (pd_key_combo_changed_cb), (pd_new_key_button_clicked_cb): - * src/printing.c (print_entry), (paginate_cb), (draw_page_cb), - (create_custom_widget_cb), (custom_widget_apply_cb), - (almanah_print_entries): - * src/printing.h: - * src/search-dialog.c (almanah_search_dialog_new), - (sd_search_button_clicked_cb), (select_date): - * src/storage-manager.c (get_encryption_key), - (almanah_storage_manager_query), - (almanah_storage_manager_query_async): Rewrite the API to consistently - use the "almanah" namespace, rather than "diary". - -2008-10-22 Philip Withnall - - * src/main-window.c (almanah_main_window_new), - (mw_entry_buffer_cursor_position_cb), - (mw_entry_buffer_insert_text_cb), - (mw_entry_buffer_insert_text_after_cb), (apply_formatting), - (mw_bold_toggled_cb), (mw_italic_toggled_cb), - (mw_underline_toggled_cb): Fix some corner case problems with text - formatting, especially when adding text to the end of a formatted - range. - -2008-10-22 Philip Withnall - - * data/almanah.ui: - * src/main-window.c (almanah_main_window_new), - (mw_entry_buffer_cursor_position_cb), - (mw_entry_buffer_has_selection_cb): Ensure the Cut/Copy/Delete actions - are only sensitive when a text range is selected in the current entry. - Also ensure that the entry text view has the default focus. - -2008-10-19 Philip Withnall - - * src/entry.c (almanah_entry_class_init), (almanah_entry_init), - (almanah_entry_finalize), (almanah_entry_get_property), - (almanah_entry_set_property), (almanah_entry_get_data), - (almanah_entry_set_data), (almanah_entry_get_content), - (almanah_entry_set_content), (almanah_entry_is_empty): - * src/entry.h: - * src/main-window.c (save_current_entry), (mw_about_activate_cb), - (mw_calendar_day_selected_cb): - * src/printing.c (get_iter_attrs), (is_empty_line), - (lay_out_entry), (print_entry), (custom_widget_apply_cb), - (diary_print_entries): - * src/storage-manager.c (almanah_storage_manager_get_statistics), - (almanah_storage_manager_get_entry), - (almanah_storage_manager_set_entry), - (almanah_storage_manager_search_entries): - * src/storage-manager.h: Serialise and deserialise entries when - writing them to/from the database to enable persistence of formatting - tags. Modify the printing code to also be able to deal with - formatting tags. - -2008-10-18 Philip Withnall - - * src/search-dialog.c (almanah_search_dialog_new): Make the "Search" - button the default so that it is activated when enter is pressed in - the search entry. - -2008-10-15 Philip Withnall - - * data/almanah.ui: - * src/preferences-dialog.c (almanah_preferences_dialog_new), - (pd_new_key_button_clicked_cb): Add a button to launch Seahorse - to enable creation of new keys from the preferences dialogue. - (Closes: #539792) - -2008-10-14 Philip Withnall - - * configure.ac: - * data/Makefile.am: - * data/almanah.schemas.in: - * data/almanah.ui: - * src/Makefile.am: - * src/interface.c (diary_create_interface): - * src/main-window.c (almanah_main_window_new), - (mw_preferences_activate_cb): - * src/main.c (diary_quit): - * src/main.h: - * src/preferences-dialog.c (almanah_preferences_dialog_class_init), - (almanah_preferences_dialog_init), - (almanah_preferences_dialog_dispose), - (almanah_preferences_dialog_new), (pd_key_combo_changed_cb), - (pd_response_cb): - * src/preferences-dialog.h: - * src/storage-manager.c (get_encryption_key): Add a preferences - dialogue, with the ability to choose the encryption key, but not - yet the ability to create new keys. (Helps: #539792) - -2008-10-12 Philip Withnall - - * src/main.c (storage_manager_disconnected_cb), (diary_quit), - (main): - * src/main.h: - * src/storage-manager.c (almanah_storage_manager_class_init), - (create_tables), (cipher_operation_free), (database_idle_cb), - (decrypt_database), (encrypt_database), - (almanah_storage_manager_connect), - (almanah_storage_manager_disconnect), - (almanah_storage_manager_query), - (almanah_storage_manager_query_async), - (almanah_storage_manager_get_statistics), - (almanah_storage_manager_entry_exists), - (almanah_storage_manager_get_entry), - (almanah_storage_manager_set_entry), - (almanah_storage_manager_search_entries), - (almanah_storage_manager_get_month_marked_days), - (almanah_storage_manager_get_entry_links), - (almanah_storage_manager_add_entry_link), - (almanah_storage_manager_remove_entry_link): - * src/storage-manager.h: Cleaned up AlmanahStorageManager, removing - all GUI code from it, and replacing it with signals and GErrors. - Also improved recovery from database corruption, with better logic in - place for handling missing or empty plaintext/encrypted database - files. - -2008-10-11 Philip Withnall - - * Makefile.am: - * configure.ac: - * src/Makefile.am: - * src/main-window.c (almanah_main_window_new), - (mw_calendar_day_selected_cb): Make spell checking optional at - compile time. - -2008-10-10 Philip Withnall - - * src/main-window.c (save_current_entry), - (add_link_to_current_entry), (remove_link_from_current_entry): - * src/storage-manager.c (almanah_storage_manager_set_entry): - Remove any GTK+ code from the storage manager, moving it to the - main window instead. Ensure that links aren't orphaned when an entry - is deleted. Similarly, ensure the links treeview is cleared when an - entry is deleted. - -2008-10-10 Philip Withnall - - * data/almanah.ui: - * src/Makefile.am: - * src/add-link-dialog.c (almanah_add_link_dialog_class_init), - (almanah_add_link_dialog_init), (almanah_add_link_dialog_dispose), - (almanah_add_link_dialog_new), (destroy_extra_widgets), - (ald_response_cb), (ald_type_combo_box_changed_cb), (ald_show_cb), - (almanah_add_link_dialog_get_link): - * src/add-link-dialog.h: - * src/entry.c (almanah_entry_class_init), (almanah_entry_init), - (almanah_entry_finalize), (almanah_entry_get_property), - (almanah_entry_set_property), (almanah_entry_new), - (almanah_entry_set_content), (almanah_entry_get_content), - (almanah_entry_get_date), (almanah_entry_get_editability), - (almanah_entry_is_empty): - * src/entry.h: - * src/interface.c (diary_get_interface_filename), - (diary_create_interface), (diary_interface_error), - (diary_calendar_month_changed_cb): - * src/interface.h: - * src/link.c (almanah_link_class_init), (almanah_link_init), - (almanah_link_finalize), (almanah_link_get_property), - (almanah_link_set_property), (almanah_link_new), - (almanah_link_format_value), (almanah_link_view), - (almanah_link_build_dialog), (almanah_link_get_values), - (almanah_link_populate_model), (almanah_link_get_type_id), - (almanah_link_get_name), (almanah_link_get_description), - (almanah_link_get_icon_name), (almanah_link_get_value), - (almanah_link_set_value), (almanah_link_get_value2), - (almanah_link_set_value2): - * src/link.h: - * src/links/file.c (almanah_file_link_class_init), - (almanah_file_link_init), (file_format_value), (file_view), - (file_build_dialog), (file_get_values): - * src/links/file.h: - * src/links/note.c (almanah_note_link_class_init), - (almanah_note_link_init), (note_format_value), (note_view), - (note_build_dialog), (note_get_values): - * src/links/note.h: - * src/links/uri.c (almanah_uri_link_class_init), - (almanah_uri_link_init), (uri_format_value), (uri_view), - (uri_build_dialog), (uri_get_values): - * src/links/uri.h: - * src/main-window.c (almanah_main_window_class_init), - (almanah_main_window_init), (almanah_main_window_dispose), - (almanah_main_window_new), (save_current_entry), - (add_link_to_current_entry), (remove_link_from_current_entry), - (almanah_main_window_select_date), - (mw_entry_buffer_cursor_position_changed_cb), (mw_delete_event_cb), - (mw_quit_activate_cb), (mw_cut_activate_cb), (mw_copy_activate_cb), - (mw_paste_activate_cb), (mw_delete_activate_cb), - (mw_search_activate_cb), (apply_formatting), (mw_bold_toggled_cb), - (mw_italic_toggled_cb), (mw_underline_toggled_cb), - (mw_about_activate_cb), (mw_jump_to_today_activate_cb), - (mw_add_link_activate_cb), (mw_remove_link_activate_cb), - (mw_calendar_day_selected_cb), (mw_links_selection_changed_cb), - (mw_links_value_data_cb), (mw_links_tree_view_row_activated_cb), - (mw_entry_view_focus_out_event_cb), (mw_add_button_clicked_cb), - (mw_remove_button_clicked_cb), (mw_view_button_clicked_cb): - * src/main-window.h: - * src/main.c (diary_quit), (main): - * src/main.h: - * src/printing.c (print_entry): - * src/search-dialog.c (almanah_search_dialog_class_init), - (almanah_search_dialog_init), (almanah_search_dialog_new), - (sd_results_selection_changed_cb), (sd_response_cb), - (sd_search_button_clicked_cb), (select_date), - (sd_view_button_clicked_cb): - * src/search-dialog.h: - * src/storage-manager.c (almanah_storage_manager_error_quark), - (almanah_storage_manager_class_init), - (almanah_storage_manager_init), (almanah_storage_manager_new), - (almanah_storage_manager_finalize), - (almanah_storage_manager_get_property), - (almanah_storage_manager_set_property), (create_tables), - (prepare_gpgme), (open_db_files), (decrypt_database), - (encrypt_database), (almanah_storage_manager_connect), - (almanah_storage_manager_disconnect), - (almanah_storage_manager_query), - (almanah_storage_manager_free_results), - (almanah_storage_manager_query_async), - (almanah_storage_manager_get_statistics), - (almanah_storage_manager_entry_exists), - (almanah_storage_manager_get_entry), - (almanah_storage_manager_set_entry), - (almanah_storage_manager_search_entries), - (almanah_storage_manager_get_month_marked_days), - (almanah_storage_manager_get_entry_links), - (almanah_storage_manager_add_entry_link), - (almanah_storage_manager_remove_entry_link): - * src/storage-manager.h: Major architectural update, moving a lot of - things to GObject, and adding basic text formatting support. - -2008-09-24 Philip Withnall - - * data/almanah.desktop.in: - * src/main-window.c (mw_about_activate_cb): Update the Bugzilla - details and fix a few incorrect and stubbornly-remaining instances - of the old application name. - -2008-08-27 Philip Withnall - - * src/main-window.c: (mw_calendar_day_selected_cb): Force GtkSpell to - re-check the text view for spelling errors when the day changes. - (Closes: #546789) - -2008-08-26 Philip Withnall - - * src/main-window.c: (mw_calendar_day_selected_cb): - * src/storage-manager.c: (diary_storage_manager_entry_exists), - (diary_storage_manager_entry_is_editable), - (diary_storage_manager_set_entry): - * src/storage-manager.h: Tidy up handling past and future diary - entries. Past entries can now be edited, but the user is warned if the - entries are older than a certain age. - * src/printing.c: (print_entry): Fix printing some Pango markup. - -2008-08-16 Philip Withnall - - * src/main.c: (main): Ensure the user's data directory exists before - creating the database file. (Closes: #543963) - -2008-08-16 Philip Withnall - - * data/almanah.desktop.in: - * src/main-window.c: (mw_about_activate_cb): Patch from Mikel - Olasagasti to fix icons in the about dialogue - and main window. (Closes: #543739) - -============ Version 0.4.0 - -2008-07-10 Philip Withnall - - * NEWS: - * configure.ac: Bump to version 0.4.0. - * data/icons/16x16/Makefile.am: - * data/icons/22x22/Makefile.am: - * data/icons/32x32/Makefile.am: - * data/icons/48x48/Makefile.am: Included icon SVGs in tarball. - Updated svn:ignore lists. - -2008-07-08 Philip Withnall - - * README: - * configure.ac: - * data/Makefile.am: - * data/almanah.desktop.in: - * data/almanah.ui: - * data/diary.desktop.in: - * data/diary.ui: - * data/icons/16x16/Makefile.am: - * data/icons/16x16/diary.svg: - * data/icons/22x22/Makefile.am: - * data/icons/22x22/diary.svg: - * data/icons/32x32/Makefile.am: - * data/icons/32x32/diary.svg: - * data/icons/48x48/Makefile.am: - * data/icons/48x48/diary.svg: - * src/Makefile.am: - * src/interface.c: (diary_create_interface): - * src/main.c: (main): Changed the application name from "Diary" to - "Almanah Diary", and the executable from "diary" to "almanah" to make - it less generic. Some data files have moved around, orphaning the old - ones, but the database is still in the same place and retains the old - schema. - -2008-07-06 Philip Withnall - - * src/links/file.c: - * src/links/note.c: - * src/links/uri.c: Fixed licence header to read GPLv3+, rather than - GPLv2+. These files were accidentally skipped when relicencing on - 2008-04-03. - -2008-07-06 Philip Withnall - - * data/diary.ui: - * src/interface.c: (diary_create_interface), - (diary_interface_embolden_label): - * src/interface.h: - * src/main-window.c: (mw_calendar_day_selected_cb): - * src/printing.c: (print_entry), (create_custom_widget_cb): Remove - markup from translatable strings. (Closes: #541709) - * src/storage-manager.c: (diary_storage_manager_connect): Fix a typo - in an error message. (Closes: #541716) - -2008-06-23 Philip Withnall - - * data/icons/16x16/diary.svg: - * data/icons/22x22/diary.svg: - * data/icons/32x32/diary.svg: - * data/icons/48x48/diary.svg: Add SVG versions of the icon. - -2008-06-23 Philip Withnall - - * src/storage-manager.c: (diary_storage_manager_connect), - (diary_storage_manager_disconnect): Improve error messages with - advice on how to fix the problems. - -2008-06-23 Philip Withnall - - * src/interface.c: (diary_create_interface): Remove debug code. - -2008-06-23 Philip Withnall - - * data/diary.ui: Mark some strings as translatable. - * src/interface.c: (diary_create_interface): Improve the error - message when the UI can't be loaded. - -============ Version 0.3.1 - -2008-06-22 Philip Withnall - - * NEWS: - * README: - * configure.ac: Bump to version 0.3.1. - * data/Makefile.am: Fix the desktop file. - -2008-06-22 Philip Withnall - - * NEWS: Fix a typo. - * data/diary.ui: Make the search dialogue non-modal. - * configure.ac: - * src/interface.c: - * src/links/file.c: - * src/main-window.c: - * src/main.c: (diary_quit_real), (main): - * src/main.h: - * src/storage-manager.c: Fix the non-encryption build. - -============ Version 0.3 - -2008-06-20 Philip Withnall - - * NEWS: - * configure.ac: - * data/Makefile.am: Bump to version 0.3. - -2008-06-20 Philip Withnall - - * README: - * configure.ac: - * data/Makefile.am: - * data/icons/16x16/Makefile.am: - * data/icons/22x22/Makefile.am: - * data/icons/32x32/Makefile.am: - * data/icons/48x48/Makefile.am: - * data/icons/Makefile.am: Added new icon by Jakub Szypulka. - * src/storage-manager.c: (diary_storage_manager_connect): Clarified - the error message given when both DB files exist. - -2008-06-08 Philip Withnall - - * README: Updated the bug reporting instructions. - -2008-06-08 Philip Withnall - - * data/diary.ui: - * src/Makefile.am: - * src/interface.c: (diary_create_interface): - * src/main-window.c: (mw_select_date), (mw_search_activate_cb), - (mw_jump_to_today_activate_cb), (mw_calendar_day_selected_cb): - * src/main-window.h: - * src/main.c: (diary_quit): - * src/main.h: - * src/search-dialog.c: (results_selection_changed_cb), - (diary_search_dialog_setup), (sd_destroy_cb), - (sd_search_button_clicked_cb), (select_date), - (sd_results_tree_view_row_activated_cb), - (sd_view_button_clicked_cb): - * src/search-dialog.h: - * src/storage-manager.c: (diary_storage_manager_entry_is_editable), - (diary_storage_manager_set_entry), - (diary_storage_manager_search_entries): - * src/storage-manager.h: Added search functionality with a new search - dialogue. This involved a few cleanups to the interface, and also - resulted in some efficiency improvements by moving some GDates to the - stack from the heap. - -2008-06-07 Philip Withnall - - * data/Makefile.am: - * data/diary.desktop.in: Added a desktop file, and updated svn:ignore - lists. - -2008-06-07 Philip Withnall - - * MAINTAINERS: Added a maintainers file. - -2008-05-22 Philip Withnall - - * src/main-window.c: Add a translator comment to clarify the format - required for the translator-credits string. - -2008-05-22 Philip Withnall - - * Makefile.am: Don't explicitly state where to install documentation. - -2008-05-22 Philip Withnall - - * src/storage-manager.c: Allow the application to close gracefully - if an encryption key can't be found. - -2008-05-21 Philip Withnall - - * src/storage-manager.c: Fix a crasher bug if requesting statistics - for a database with no entries. - -============ Version 0.2 - -2008-05-20 Philip Withnall - - * .bzrignore: Updated bzr ignore list. - * NEWS: - * configure.ac: - * README: Bump to version 0.2. - -2008-05-20 Philip Withnall - - * configure.ac: - * src/storage-manager.c: Made encrypted database support optional, - and cleaned up the code a little. - -2008-05-20 Philip Withnall - - * src/interface.c: - * src/interface.h: - * src/main-window.c: - * src/Makefile.am: - * src/printing.c: - * src/printing.h: - * src/storage-manager.h: - * data/diary.ui: Add printing support. - * configure.ac: Remove redundant dependency on libcryptui. - * intltool-extract.in: - * intltool-merge.in: - * intltool-update.in: Upgrade intltool scripts. - -2008-04-19 Philip Withnall - - * src/main-window.c: - * src/storage-manager.c: Make deletion of entries more robust, and - fix display of the "Add Link" dialogue when opened for a second time. - -2008-04-10 Philip Withnall - - * src/main-window.c: - * src/storage-manager.c: Fix use of memory after freeing it, and - actually delete entries from the database when they're blanked. - -2008-04-08 Philip Withnall - - * configure.ac: - * data/diary.ui: - * src/Makefile.am: - * src/main-window.c: - * src/main.c: - * src/main.h: - * src/storage-manager.c: - * src/storage-manager.h: Add encryption support for the database, with - full backwards-compatibility for the old database filename. Also make - sure to save the current entry on quitting. - -2008-04-03 Philip Withnall - - * COPYING: - * src/add-link-dialog.c: - * src/add-link-dialog.h: - * src/interface.c: - * src/interface.h: - * src/link.c: - * src/link.h: - * src/main-window.c: - * src/main-window.h: - * src/main.c: - * src/main.h: - * src/storage-manager.c: - * src/storage-manager.h: Relicensed from GPLv2+ to GPLv3+. - -2008-04-02 Philip Withnall - - * src/storage-manager.c: Free the query strings with SQLite's memory - functions rather than GLib's. - -============ Version 0.1 - -2008-03-30 Philip Withnall - - * src/storage-manager.c: Fix the time limit on editing entries. - -2008-03-30 Philip Withnall - - * src/main.c: Load the database file from the user's data directory, - rather than the build directory. - -2008-03-30 Philip Withnall - - * NEWS: - * README: Updated documentation. - * src/interface.c: Allowed interface file to load from either package - data directory or build directory. - -2008-03-30 Philip Withnall - - * src/links/email.c: Completely removed e-mail link type. - -2008-03-30 Philip Withnall - - * src/main-window.c: - * src/storage-manager.c: - * src/storage-manager.h: Added some basic statistics on the about - dialogue. - -2008-03-30 Philip Withnall - - * src/Makefile.am: - * src/link.c: - * src/links/note.c: Added "note" link type. - * data/diary.ui: - * src/main-window.c: - * src/storage-manager.c: Various small fixes and UI improvements, as - well as some improvements to the handling of empty entries. - -2008-03-27 Philip Withnall - - * src/links/picasa.c: Removed Picasa link type --- use URIs instead. - * .bzrignore: - * src/Makefile.am: - * src/link.c: - * src/main-window.c: Made the link list more resilient to bad data. - -2008-03-23 Philip Withnall - - * .bzrignore: Updated bzr ignore list. - -2008-03-23 Philip Withnall - - * ChangeLog: Added ChangeLog. - -2008-03-23 Philip Withnall - - * .bzrignore: Updated bzr ignore list. - -2008-03-23 Philip Withnall - - * src/main-window.c: Changed all C strings to en_US and added an - en_GB translation. - -2008-03-23 Philip Withnall - - * src/main.c: Fix a small leak on quit caught with Valgrind. - -2008-03-23 Philip Withnall - - * configure.ac: - * src/Makefile.am: Fixed test profiling in the Makefile. - * src/interface.c: - * src/link.c: - * src/links/email.c: - * src/links/file.c: - * src/links/picasa.c: - * src/links/uri.c: - * src/main-window.c: Some comments moved to stop them showing up in - the POT file unnecessarily. - * src/storage-manager.c: Improvements to the debug code. - -2008-03-23 Philip Withnall - - * src/links/file.c: - * src/links/picasa.c: Added file and picasa link types. - * configure.ac: - * data/diary.ui: - * src/Makefile.am: - * src/interface.c: - * src/link.c: - * src/main-window.c: - * src/main-window.h: A few more small UI fixes, as well as the - addition of spelling checking using GtkSpell. - -2008-03-23 Philip Withnall - - * data/diary.ui: - * src/Makefile.am: - * src/add-link-dialog.c: - * src/add-link-dialog.h: - * src/interface.c: - * src/link.c: - * src/main-window.c: Fixed changing the UI in the "Add Link" dialogue - when the link type was changed. - -2008-03-23 Philip Withnall - - * data/diary.ui: - * src/interface.c: - * src/link.c: - * src/main-window.c: - * src/main.h: - * src/storage-manager.c: - * src/storage-manager.h: Some more UI tweaks to make editing easier. - -2008-03-23 Philip Withnall - - * data/diary.ui: - * src/interface.c: - * src/main-window.c: - * src/main.h: A few small UI fixes and enhancements. - -2008-03-22 Philip Withnall - - * src/links/email.c: - * src/links/uri.c: - * data/diary.ui: - * intltool-extract.in: - * intltool-merge.in: - * intltool-update.in: - * src/Makefile.am: - * src/add-link-dialog.c: - * src/add-link-dialog.h: - * src/interface.c: - * src/link.c: - * src/link.h: - * src/main-window.c: - * src/main.h: - * src/storage-manager.c: Rewrote the link handling and it's all - working quite well now. More link types now need to be added. - -2008-03-22 Philip Withnall - - * src/link.c: - * src/link.h: - * data/diary.ui: - * src/Makefile.am: - * src/add-link-dialog.c: - * src/interface.c: - * src/main-window.c: - * src/main.h: - * src/storage-manager.c: - * src/storage-manager.h: Lots of work on entry links, with most of a - working UI for adding dynamic and differing link types. Unfortunately, - this approach is flawed and so I'll rewrite it after this commit. - -2008-03-21 Philip Withnall - - Initial commit with all the functionality that the Vala version had, - but written in an easier-to-use programming language. diff -Nru almanah-0.11.1/compile almanah-0.12.0/compile --- almanah-0.11.1/compile 2014-09-24 17:34:08.000000000 +0000 +++ almanah-0.12.0/compile 1970-01-01 00:00:00.000000000 +0000 @@ -1,347 +0,0 @@ -#! /bin/sh -# Wrapper for compilers which do not understand '-c -o'. - -scriptversion=2012-10-14.11; # UTC - -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# Written by Tom Tromey . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to or send patches to -# . - -nl=' -' - -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent tools from complaining about whitespace usage. -IFS=" "" $nl" - -file_conv= - -# func_file_conv build_file lazy -# Convert a $build file to $host form and store it in $file -# Currently only supports Windows hosts. If the determined conversion -# type is listed in (the comma separated) LAZY, no conversion will -# take place. -func_file_conv () -{ - file=$1 - case $file in - / | /[!/]*) # absolute file, and not a UNC file - if test -z "$file_conv"; then - # lazily determine how to convert abs files - case `uname -s` in - MINGW*) - file_conv=mingw - ;; - CYGWIN*) - file_conv=cygwin - ;; - *) - file_conv=wine - ;; - esac - fi - case $file_conv/,$2, in - *,$file_conv,*) - ;; - mingw/*) - file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` - ;; - cygwin/*) - file=`cygpath -m "$file" || echo "$file"` - ;; - wine/*) - file=`winepath -w "$file" || echo "$file"` - ;; - esac - ;; - esac -} - -# func_cl_dashL linkdir -# Make cl look for libraries in LINKDIR -func_cl_dashL () -{ - func_file_conv "$1" - if test -z "$lib_path"; then - lib_path=$file - else - lib_path="$lib_path;$file" - fi - linker_opts="$linker_opts -LIBPATH:$file" -} - -# func_cl_dashl library -# Do a library search-path lookup for cl -func_cl_dashl () -{ - lib=$1 - found=no - save_IFS=$IFS - IFS=';' - for dir in $lib_path $LIB - do - IFS=$save_IFS - if $shared && test -f "$dir/$lib.dll.lib"; then - found=yes - lib=$dir/$lib.dll.lib - break - fi - if test -f "$dir/$lib.lib"; then - found=yes - lib=$dir/$lib.lib - break - fi - if test -f "$dir/lib$lib.a"; then - found=yes - lib=$dir/lib$lib.a - break - fi - done - IFS=$save_IFS - - if test "$found" != yes; then - lib=$lib.lib - fi -} - -# func_cl_wrapper cl arg... -# Adjust compile command to suit cl -func_cl_wrapper () -{ - # Assume a capable shell - lib_path= - shared=: - linker_opts= - for arg - do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - eat=1 - case $2 in - *.o | *.[oO][bB][jJ]) - func_file_conv "$2" - set x "$@" -Fo"$file" - shift - ;; - *) - func_file_conv "$2" - set x "$@" -Fe"$file" - shift - ;; - esac - ;; - -I) - eat=1 - func_file_conv "$2" mingw - set x "$@" -I"$file" - shift - ;; - -I*) - func_file_conv "${1#-I}" mingw - set x "$@" -I"$file" - shift - ;; - -l) - eat=1 - func_cl_dashl "$2" - set x "$@" "$lib" - shift - ;; - -l*) - func_cl_dashl "${1#-l}" - set x "$@" "$lib" - shift - ;; - -L) - eat=1 - func_cl_dashL "$2" - ;; - -L*) - func_cl_dashL "${1#-L}" - ;; - -static) - shared=false - ;; - -Wl,*) - arg=${1#-Wl,} - save_ifs="$IFS"; IFS=',' - for flag in $arg; do - IFS="$save_ifs" - linker_opts="$linker_opts $flag" - done - IFS="$save_ifs" - ;; - -Xlinker) - eat=1 - linker_opts="$linker_opts $2" - ;; - -*) - set x "$@" "$1" - shift - ;; - *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) - func_file_conv "$1" - set x "$@" -Tp"$file" - shift - ;; - *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) - func_file_conv "$1" mingw - set x "$@" "$file" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift - done - if test -n "$linker_opts"; then - linker_opts="-link$linker_opts" - fi - exec "$@" $linker_opts - exit 1 -} - -eat= - -case $1 in - '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: compile [--help] [--version] PROGRAM [ARGS] - -Wrapper for compilers which do not understand '-c -o'. -Remove '-o dest.o' from ARGS, run PROGRAM with the remaining -arguments, and rename the output as expected. - -If you are trying to build a whole package this is not the -right script to run: please start by reading the file 'INSTALL'. - -Report bugs to . -EOF - exit $? - ;; - -v | --v*) - echo "compile $scriptversion" - exit $? - ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) - func_cl_wrapper "$@" # Doesn't return... - ;; -esac - -ofile= -cfile= - -for arg -do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - # So we strip '-o arg' only if arg is an object. - eat=1 - case $2 in - *.o | *.obj) - ofile=$2 - ;; - *) - set x "$@" -o "$2" - shift - ;; - esac - ;; - *.c) - cfile=$1 - set x "$@" "$1" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no '-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # '.c' file was seen then we are probably linking. That is also - # ok. - exec "$@" -fi - -# Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` - -# Create the lock directory. -# Note: use '[/\\:.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d -while true; do - if mkdir "$lockdir" >/dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir '$lockdir'; exit 1" 1 2 15 - -# Run the compile. -"$@" -ret=$? - -if test -f "$cofile"; then - test "$cofile" = "$ofile" || mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" -fi - -rmdir "$lockdir" -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff -Nru almanah-0.11.1/config.guess almanah-0.12.0/config.guess --- almanah-0.11.1/config.guess 2014-09-24 17:34:08.000000000 +0000 +++ almanah-0.12.0/config.guess 1970-01-01 00:00:00.000000000 +0000 @@ -1,1535 +0,0 @@ -#! /bin/sh -# Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012, 2013 Free Software Foundation, Inc. - -timestamp='2012-12-29' - -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, see . -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that -# program. This Exception is an additional permission under section 7 -# of the GNU General Public License, version 3 ("GPLv3"). -# -# Originally written by Per Bothner. -# -# You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -# -# Please send patches with a ChangeLog entry to config-patches@gnu.org. - - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] - -Output the configuration name of the system \`$me' is run on. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.guess ($timestamp) - -Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -2012, 2013 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" >&2 - exit 1 ;; - * ) - break ;; - esac -done - -if test $# != 0; then - echo "$me: too many arguments$help" >&2 - exit 1 -fi - -trap 'exit 1' 1 2 15 - -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -# compiler to aid in system detection is discouraged as it requires -# temporary files to be created and, as you can see below, it is a -# headache to deal with in a portable fashion. - -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. - -# Portable tmp directory creation inspired by the Autoconf team. - -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' - -# This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then - PATH=$PATH:/.attbin ; export PATH -fi - -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -# Note: order is significant - the case branches are not exclusive. - -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. - # - # Note: NetBSD doesn't particularly care about the vendor - # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in - armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; - sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ELF__ - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? - os=netbsd - else - os=netbsdelf - fi - ;; - *) - os=netbsd - ;; - esac - # The OS release - # Debian GNU/NetBSD machines have a different userland, and - # thus, need a distinct triplet. However, they do not need - # kernel version information, so it can be replaced with a - # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in - Debian*) - release='-gnu' - ;; - *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - ;; - esac - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; - *:Bitrig:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} - exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; - *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} - exit ;; - macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} - exit ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU - # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in - "EV4 (21064)") - UNAME_MACHINE="alpha" ;; - "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; - "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; - "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; - "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; - "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; - "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; - "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; - "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; - "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; - "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; - "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; - "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; - esac - # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - exitcode=$? - trap '' 0 - exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos - exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos - exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; - *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; - arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; - DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; - s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux${UNAME_RELEASE} - exit ;; - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build - SUN_ARCH="i386" - # If there is a compiler, see if it is configured for 64-bit objects. - # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. - # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - SUN_ARCH="x86_64" - fi - fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) - UNAME_RELEASE=`uname -v` - ;; - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} - exit ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 - case "`/bin/arch`" in - sun3) - echo m68k-sun-sunos${UNAME_RELEASE} - ;; - sun4) - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac - exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor - # > m68000). The system name ranges from "MiNT" over "FreeMiNT" - # to the lowercase version "mint" (or "freemint"). Finally - # the system name "TOS" denotes a system which is actually not - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} - exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} - exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif - #if defined (host_mips) && defined (MIPSEB) - #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); - #endif - #endif - exit (-1); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && - { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} - exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] - then - echo m88k-dg-dgux${UNAME_RELEASE} - else - echo m88k-dg-dguxbcs${UNAME_RELEASE} - fi - else - echo i586-dg-dgux${UNAME_RELEASE} - fi - exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix - exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - - main() - { - if (!__power_pc()) - exit(1); - puts("powerpc-ibm-aix3.2.5"); - exit(0); - } -EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` - then - echo "$SYSTEM_NAME" - else - echo rs6000-ibm-aix3.2.5 - fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi - exit ;; - *:AIX:*:[4567]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 - else - IBM_ARCH=powerpc - fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix - exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 - exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx - exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } -EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; - esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then - eval $set_cc_for_build - - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler - # generating 64-bit code. GNU and HP use different nomenclature: - # - # $ CC_FOR_BUILD=cc ./config.guess - # => hppa2.0w-hp-hpux11.23 - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep -q __LP64__ - then - HP_ARCH="hppa2.0w" - else - HP_ARCH="hppa64" - fi - fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - int - main () - { - long cpu = sysconf (_SC_CPU_VERSION); - /* The order matters, because CPU_IS_HP_MC68K erroneously returns - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ - if (CPU_IS_PA_RISC (cpu)) - { - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; - default: puts ("hppa-hitachi-hiuxwe2"); break; - } - } - else if (CPU_IS_HP_MC68K (cpu)) - puts ("m68k-hitachi-hiuxwe2"); - else puts ("unknown-hitachi-hiuxwe2"); - exit (0); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 - exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd - exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) - UNAME_PROCESSOR=`/usr/bin/uname -p` - case ${UNAME_PROCESSOR} in - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; - *:MINGW64*:*) - echo ${UNAME_MACHINE}-pc-mingw64 - exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:MSYS*:*) - echo ${UNAME_MACHINE}-pc-msys - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; - *:Interix*:*) - case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - IA64) - echo ia64-unknown-interix${UNAME_RELEASE} - exit ;; - esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit ;; - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - *:GNU:*:*) - # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; - aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - aarch64_be:Linux:*:*) - UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; - arm*:Linux:*:*) - eval $set_cc_for_build - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_EABI__ - then - echo ${UNAME_MACHINE}-unknown-linux-gnu - else - if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_PCS_VFP - then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi - else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf - fi - fi - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu - exit ;; - crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu - exit ;; - frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef ${UNAME_MACHINE} - #undef ${UNAME_MACHINE}el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=${UNAME_MACHINE}el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=${UNAME_MACHINE} - #else - CPU= - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - padre:Linux:*:*) - echo sparc-unknown-linux-gnu - exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac - exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit ;; - sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; - x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit ;; - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi - exit ;; - i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi - exit ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. - # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that - # this is a cross-build. - echo i586-pc-msdosdjgpp - exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi - exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv - exit ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; - M68*:*:R3V[5678]*:*) - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; - NCR*:*:4.2:* | MPRAS*:*:4.2:*) - OS_REL='.3' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} - exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit ;; - i*86:VOS:*:*) - # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos - exit ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} - exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi - exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; - x86_64:Haiku:*:*) - echo x86_64-unknown-haiku - exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} - exit ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit ;; - SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} - exit ;; - SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} - exit ;; - SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} - exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit ;; - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; - NEO-?:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk${UNAME_RELEASE} - exit ;; - NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 - # operating systems. - if test "$cputype" = "386"; then - UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 - exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex - exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit ;; - *:ITS:*:*) - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; - esac ;; - *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; - i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' - exit ;; - i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos - exit ;; - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros - exit ;; - x86_64:VMkernel:*:*) - echo ${UNAME_MACHINE}-unknown-esx - exit ;; -esac - -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - -cat >&2 < in order to provide the needed -information to handle your system. - -config.guess timestamp = $timestamp - -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` - -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} -EOF - -exit 1 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff -Nru almanah-0.11.1/config.h.in almanah-0.12.0/config.h.in --- almanah-0.11.1/config.h.in 2014-09-24 18:32:53.000000000 +0000 +++ almanah-0.12.0/config.h.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,147 +0,0 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define if you want debugging enabled */ -#undef ENABLE_DEBUG - -/* Define if you want database encryption support */ -#undef ENABLE_ENCRYPTION - -/* Define if you want spell checking support */ -#undef ENABLE_SPELL_CHECKING - -/* Define to the Gettext package name */ -#undef GETTEXT_PACKAGE - -/* Define to 1 if you have the `alarm' function. */ -#undef HAVE_ALARM - -/* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H - -/* Defined if libecal-1.2 is installed */ -#undef HAVE_EVO - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_LIBINTL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TIME_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - -/* The minimum required version of GPGME */ -#undef MIN_GPGME_VERSION - -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#undef PACKAGE_URL - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Define to 1 if you can safely include both and . */ -#undef TIME_WITH_SYS_TIME - -/* Enable extensions on AIX 3, Interix. */ -#ifndef _ALL_SOURCE -# undef _ALL_SOURCE -#endif -/* Enable GNU extensions on systems that have them. */ -#ifndef _GNU_SOURCE -# undef _GNU_SOURCE -#endif -/* Enable threading extensions on Solaris. */ -#ifndef _POSIX_PTHREAD_SEMANTICS -# undef _POSIX_PTHREAD_SEMANTICS -#endif -/* Enable extensions on HP NonStop. */ -#ifndef _TANDEM_SOURCE -# undef _TANDEM_SOURCE -#endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# undef __EXTENSIONS__ -#endif - - -/* Version number of package */ -#undef VERSION - -/* Enable large inode numbers on Mac OS X 10.5. */ -#ifndef _DARWIN_USE_64_BIT_INODE -# define _DARWIN_USE_64_BIT_INODE 1 -#endif - -/* Number of bits in a file offset, on hosts where this is settable. */ -#undef _FILE_OFFSET_BITS - -/* Define for large files, on AIX-style hosts. */ -#undef _LARGE_FILES - -/* Define to 1 if on MINIX. */ -#undef _MINIX - -/* Define to 2 if the system does not provide POSIX.1 features except with - this defined. */ -#undef _POSIX_1_SOURCE - -/* Define to 1 if you need to in order for `stat' and other things to work. */ -#undef _POSIX_SOURCE - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -#undef inline -#endif - -/* Define to `unsigned int' if does not define. */ -#undef size_t diff -Nru almanah-0.11.1/config.sub almanah-0.12.0/config.sub --- almanah-0.11.1/config.sub 2014-09-24 17:34:08.000000000 +0000 +++ almanah-0.12.0/config.sub 1970-01-01 00:00:00.000000000 +0000 @@ -1,1790 +0,0 @@ -#! /bin/sh -# Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012, 2013 Free Software Foundation, Inc. - -timestamp='2012-12-29' - -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, see . -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that -# program. This Exception is an additional permission under section 7 -# of the GNU General Public License, version 3 ("GPLv3"). - - -# Please send patches with a ChangeLog entry to config-patches@gnu.org. -# -# Configuration subroutine to validate and canonicalize a configuration type. -# Supply the specified configuration type as an argument. -# If it is invalid, we print an error message on stderr and exit with code 1. -# Otherwise, we print the canonical config type on stdout and succeed. - -# You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD - -# This file is supposed to be the same for all GNU packages -# and recognize all the CPU types, system types and aliases -# that are meaningful with *any* GNU software. -# Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish -# a failure to support a valid configuration from a meaningless -# configuration. - -# The goal of this file is to map all the various variations of a given -# machine specification into a single specification in the form: -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or in some cases, the newer four-part form: -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# It is wrong to echo any other type of specification. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS - -Canonicalize a configuration name. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.sub ($timestamp) - -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -2012, 2013 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" - exit 1 ;; - - *local*) - # First pass through any local machine types. - echo $1 - exit ;; - - * ) - break ;; - esac -done - -case $# in - 0) echo "$me: missing argument$help" >&2 - exit 1;; - 1) ;; - *) echo "$me: too many arguments$help" >&2 - exit 1;; -esac - -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - android-linux) - os=-linux-android - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac - -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze*) - os= - basic_machine=$1 - ;; - -bluegene*) - os=-cnk - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*178) - os=-lynxos178 - ;; - -lynx*5) - os=-lynxos5 - ;; - -lynx*) - os=-lynxos - ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; - -psos*) - os=-psos - ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; -esac - -# Decode aliases for certain CPU-COMPANY combinations. -case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc \ - | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ - | avr | avr32 \ - | be32 | be64 \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | epiphany \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | hexagon \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ - | le32 | le64 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ - | mips64r5900 | mips64r5900el \ - | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | moxie \ - | mt \ - | msp430 \ - | nds32 | nds32le | nds32be \ - | nios | nios2 \ - | ns16k | ns32k \ - | open8 \ - | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pyramid \ - | rl78 | rx \ - | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu \ - | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ - | ubicom32 \ - | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | we32k \ - | x86 | xc16x | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; - c54x) - basic_machine=tic54x-unknown - ;; - c55x) - basic_machine=tic55x-unknown - ;; - c6x) - basic_machine=tic6x-unknown - ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; - ms1) - basic_machine=mt-unknown - ;; - - strongarm | thumb | xscale) - basic_machine=arm-unknown - ;; - xgate) - basic_machine=$basic_machine-unknown - os=-none - ;; - xscaleeb) - basic_machine=armeb-unknown - ;; - - xscaleel) - basic_machine=armel-unknown - ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | be32-* | be64-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ - | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ - | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | open8-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pyramid-* \ - | rl78-* | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ - | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile*-* \ - | tron-* \ - | ubicom32-* \ - | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ - | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) - ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) - basic_machine=$basic_machine-unknown - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att - ;; - 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aros) - basic_machine=i386-pc - os=-aros - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=-linux - ;; - blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - bluegene*) - basic_machine=powerpc-ibm - os=-cnk - ;; - c54x-*) - basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c55x-*) - basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c6x-*) - basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dicos) - basic_machine=i686-pc - os=-dicos - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd - ;; - encore | umax | mmax) - basic_machine=ns32k-encore - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose - ;; - fx2800) - basic_machine=i860-alliant - ;; - genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 - ;; - h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp - ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 - ;; - i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 - ;; - i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv - ;; - i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta - ;; - iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) - ;; - *) - os=-irix4 - ;; - esac - ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux - ;; - m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - microblaze*) - basic_machine=microblaze-xilinx - ;; - mingw64) - basic_machine=x86_64-pc - os=-mingw64 - ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; - miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; - msys) - basic_machine=i386-pc - os=-msys - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - nacl) - basic_machine=le32-unknown - os=-nacl - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos - ;; - news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) - ;; - -ns2*) - os=-nextstep2 - ;; - *) - os=-nextstep3 - ;; - esac - ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; - np1) - basic_machine=np1-gould - ;; - neo-tandem) - basic_machine=neo-tandem - ;; - nse-tandem) - basic_machine=nse-tandem - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k - ;; - pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - parisc) - basic_machine=hppa-unknown - os=-linux - ;; - parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pc98) - basic_machine=i386-pc - ;; - pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; - pentium4) - basic_machine=i786-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc | ppcbe) basic_machine=powerpc-unknown - ;; - ppc-* | ppcbe-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown - ;; - ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rdos | rdos64) - basic_machine=x86_64-pc - os=-rdos - ;; - rdos32) - basic_machine=i386-pc - os=-rdos - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff - ;; - rm[46]00) - basic_machine=mips-siemens - ;; - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; - sde) - basic_machine=mipsisa32-sde - os=-elf - ;; - sei) - basic_machine=mips-sei - os=-seiux - ;; - sequent) - basic_machine=i386-sequent - ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sh5el) - basic_machine=sh5le-unknown - ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - st2000) - basic_machine=m68k-tandem - ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 - ;; - strongarm-* | thumb-*) - basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - sv1) - basic_machine=sv1-cray - os=-unicos - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos - ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tile*) - basic_machine=$basic_machine-unknown - os=-linux-gnu - ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; - tpf) - basic_machine=s390x-ibm - os=-tpf - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms - ;; - vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - w65*) - basic_machine=w65-wdc - os=-none - ;; - w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf - ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; - xscale-* | xscalee[bl]-*) - basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` - ;; - ymp) - basic_machine=ymp-cray - os=-unicos - ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - z80-*-coff) - basic_machine=z80-unknown - os=-sim - ;; - none) - basic_machine=none-none - os=-none - ;; - -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond - ;; - op50n) - basic_machine=hppa1.1-oki - ;; - op60c) - basic_machine=hppa1.1-oki - ;; - romp) - basic_machine=romp-ibm - ;; - mmix) - basic_machine=mmix-knuth - ;; - rs6000) - basic_machine=rs6000-ibm - ;; - vax) - basic_machine=vax-dec - ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; - pdp11) - basic_machine=pdp11-dec - ;; - we32k) - basic_machine=we32k-att - ;; - sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; - cydra) - basic_machine=cydra-cydrome - ;; - orion) - basic_machine=orion-highlevel - ;; - orion105) - basic_machine=clipper-highlevel - ;; - mac | mpw | mac-mpw) - basic_machine=m68k-apple - ;; - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; - *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; -esac - -# Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` - ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` - ;; - *) - ;; -esac - -# Decode manufacturer-specific aliases for certain operating systems. - -if [ x"$os" != x"" ] -then -case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux - ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; - -solaris) - os=-solaris2 - ;; - -svr4*) - os=-sysv4 - ;; - -unixware*) - os=-sysv4.2uw - ;; - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; - # First accept the basic system types. - # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) - ;; - *) - os=-nto$os - ;; - esac - ;; - -nto-qnx*) - ;; - -nto*) - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; - -linux-dietlibc) - os=-linux-dietlibc - ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` - ;; - -opened*) - os=-openedition - ;; - -os400*) - os=-os400 - ;; - -wince*) - os=-wince - ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; - -utek*) - os=-bsd - ;; - -dynix*) - os=-bsd - ;; - -acis*) - os=-aos - ;; - -atheos*) - os=-atheos - ;; - -syllable*) - os=-syllable - ;; - -386bsd) - os=-bsd - ;; - -ctix* | -uts*) - os=-sysv - ;; - -nova*) - os=-rtmk-nova - ;; - -ns2 ) - os=-nextstep2 - ;; - -nsk*) - os=-nsk - ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; - -tpf*) - os=-tpf - ;; - -triton*) - os=-sysv3 - ;; - -oss*) - os=-sysv3 - ;; - -svr4) - os=-sysv4 - ;; - -svr3) - os=-sysv3 - ;; - -sysvr4) - os=-sysv4 - ;; - # This must come after -sysvr4. - -sysv*) - ;; - -ose*) - os=-ose - ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint - ;; - -aros*) - os=-aros - ;; - -kaos*) - os=-kaos - ;; - -zvmoe) - os=-zvmoe - ;; - -dicos*) - os=-dicos - ;; - -nacl*) - ;; - -none) - ;; - *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 - exit 1 - ;; -esac -else - -# Here we handle the default operating systems that come with various machines. -# The value should be what the vendor currently ships out the door with their -# machine or put another way, the most popular os provided with the machine. - -# Note that if you're going to try to match "-MANUFACTURER" here (say, -# "-sun"), then you have to tell the case statement up towards the top -# that MANUFACTURER isn't an operating system. Otherwise, code above -# will signal an error saying that MANUFACTURER isn't an operating -# system, and we'll never get to this point. - -case $basic_machine in - score-*) - os=-elf - ;; - spu-*) - os=-elf - ;; - *-acorn) - os=-riscix1.2 - ;; - arm*-rebel) - os=-linux - ;; - arm*-semi) - os=-aout - ;; - c4x-* | tic4x-*) - os=-coff - ;; - hexagon-*) - os=-elf - ;; - tic54x-*) - os=-coff - ;; - tic55x-*) - os=-coff - ;; - tic6x-*) - os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; - pdp11-*) - os=-none - ;; - *-dec | vax-*) - os=-ultrix4.2 - ;; - m68*-apollo) - os=-domain - ;; - i386-sun) - os=-sunos4.0.2 - ;; - m68000-sun) - os=-sunos3 - ;; - m68*-cisco) - os=-aout - ;; - mep-*) - os=-elf - ;; - mips*-cisco) - os=-elf - ;; - mips*-*) - os=-elf - ;; - or32-*) - os=-coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; - sparc-* | *-sun) - os=-sunos4.1.1 - ;; - *-be) - os=-beos - ;; - *-haiku) - os=-haiku - ;; - *-ibm) - os=-aix - ;; - *-knuth) - os=-mmixware - ;; - *-wec) - os=-proelf - ;; - *-winbond) - os=-proelf - ;; - *-oki) - os=-proelf - ;; - *-hp) - os=-hpux - ;; - *-hitachi) - os=-hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv - ;; - *-cbm) - os=-amigaos - ;; - *-dg) - os=-dgux - ;; - *-dolphin) - os=-sysv3 - ;; - m68k-ccur) - os=-rtu - ;; - m88k-omron*) - os=-luna - ;; - *-next ) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 - ;; - *-gould) - os=-sysv - ;; - *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; - *-sgi) - os=-irix - ;; - *-siemens) - os=-sysv4 - ;; - *-masscomp) - os=-rtu - ;; - f30[01]-fujitsu | f700-fujitsu) - os=-uxpv - ;; - *-rom68k) - os=-coff - ;; - *-*bug) - os=-coff - ;; - *-apple) - os=-macos - ;; - *-atari*) - os=-mint - ;; - *) - os=-none - ;; -esac -fi - -# Here we handle the case where we know the os, and the CPU type, but not the -# manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) - vendor=acorn - ;; - -sunos*) - vendor=sun - ;; - -cnk*|-aix*) - vendor=ibm - ;; - -beos*) - vendor=be - ;; - -hpux*) - vendor=hp - ;; - -mpeix*) - vendor=hp - ;; - -hiux*) - vendor=hitachi - ;; - -unos*) - vendor=crds - ;; - -dgux*) - vendor=dg - ;; - -luna*) - vendor=omron - ;; - -genix*) - vendor=ns - ;; - -mvs* | -opened*) - vendor=ibm - ;; - -os400*) - vendor=ibm - ;; - -ptx*) - vendor=sequent - ;; - -tpf*) - vendor=ibm - ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) - vendor=apple - ;; - -hms*) - vendor=hitachi - ;; - -mpw* | -macos*) - vendor=apple - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - vendor=atari - ;; - -vos*) - vendor=stratus - ;; - esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` - ;; -esac - -echo $basic_machine$os -exit - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff -Nru almanah-0.11.1/configure almanah-0.12.0/configure --- almanah-0.11.1/configure 2014-09-24 18:32:47.000000000 +0000 +++ almanah-0.12.0/configure 1970-01-01 00:00:00.000000000 +0000 @@ -1,20399 +0,0 @@ -#! /bin/sh -# Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for almanah 0.11.1. -# -# Report bugs to . -# -# -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. -# -# -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. -## -------------------- ## -## M4sh Initialization. ## -## -------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac -fi - - -as_nl=' -' -export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } -fi - - -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -as_myself= -case $0 in #(( - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break - done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - exit 1 -fi - -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -# Use a proper internal environment variable to ensure we don't fall - # into an infinite loop, continuously re-executing ourselves. - if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then - _as_can_reexec=no; export _as_can_reexec; - # We cannot yet assume a decent shell, so we have to provide a -# neutralization value for shells without unset; and this also -# works around shells that cannot unset nonexistent variables. -# Preserve -v and -x to the replacement shell. -BASH_ENV=/dev/null -ENV=/dev/null -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; -esac -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -# Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -as_fn_exit 255 - fi - # We don't want this to propagate to other subprocesses. - { _as_can_reexec=; unset _as_can_reexec;} -if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which - # is contrary to our usage. Disable this feature. - alias -g '\${1+\"\$@\"}'='\"\$@\"' - setopt NO_GLOB_SUBST -else - case \`(set -o) 2>/dev/null\` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac -fi -" - as_required="as_fn_return () { (exit \$1); } -as_fn_success () { as_fn_return 0; } -as_fn_failure () { as_fn_return 1; } -as_fn_ret_success () { return 0; } -as_fn_ret_failure () { return 1; } - -exitcode=0 -as_fn_success || { exitcode=1; echo as_fn_success failed.; } -as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } -as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } -as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : - -else - exitcode=1; echo positional parameters were not saved. -fi -test x\$exitcode = x0 || exit 1 -test -x / || exit 1" - as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO - as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO - eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && - test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -test \$(( 1 + 1 )) = 2 || exit 1 - - test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( - ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' - ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO - ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO - PATH=/empty FPATH=/empty; export PATH FPATH - test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ - || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1" - if (eval "$as_required") 2>/dev/null; then : - as_have_required=yes -else - as_have_required=no -fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : - -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_found=false -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - as_found=: - case $as_dir in #( - /*) - for as_base in sh bash ksh sh5; do - # Try only shells that exist, to save several forks. - as_shell=$as_dir/$as_base - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : - CONFIG_SHELL=$as_shell as_have_required=yes - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : - break 2 -fi -fi - done;; - esac - as_found=false -done -$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : - CONFIG_SHELL=$SHELL as_have_required=yes -fi; } -IFS=$as_save_IFS - - - if test "x$CONFIG_SHELL" != x; then : - export CONFIG_SHELL - # We cannot yet assume a decent shell, so we have to provide a -# neutralization value for shells without unset; and this also -# works around shells that cannot unset nonexistent variables. -# Preserve -v and -x to the replacement shell. -BASH_ENV=/dev/null -ENV=/dev/null -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; -esac -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -# Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -exit 255 -fi - - if test x$as_have_required = xno; then : - $as_echo "$0: This script requires a shell more modern than all" - $as_echo "$0: the shells that I found on your system." - if test x${ZSH_VERSION+set} = xset ; then - $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" - $as_echo "$0: be upgraded to zsh 4.3.4 or later." - else - $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: https://bugzilla.gnome.org/enter_bug.cgi?product=almanah -$0: about your system, including any error possibly output -$0: before this message. Then install a modern shell, or -$0: manually run the script under such a shell if you do -$0: have one." - fi - exit 1 -fi -fi -fi -SHELL=${CONFIG_SHELL-/bin/sh} -export SHELL -# Unset more variables known to interfere with behavior of common tools. -CLICOLOR_FORCE= GREP_OPTIONS= -unset CLICOLOR_FORCE GREP_OPTIONS - -## --------------------- ## -## M4sh Shell Functions. ## -## --------------------- ## -# as_fn_unset VAR -# --------------- -# Portably unset VAR. -as_fn_unset () -{ - { eval $1=; unset $1;} -} -as_unset=as_fn_unset - -# as_fn_set_status STATUS -# ----------------------- -# Set $? to STATUS, without forking. -as_fn_set_status () -{ - return $1 -} # as_fn_set_status - -# as_fn_exit STATUS -# ----------------- -# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -as_fn_exit () -{ - set +e - as_fn_set_status $1 - exit $1 -} # as_fn_exit - -# as_fn_mkdir_p -# ------------- -# Create "$as_dir" as a directory, including parents if necessary. -as_fn_mkdir_p () -{ - - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || eval $as_mkdir_p || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" - - -} # as_fn_mkdir_p - -# as_fn_executable_p FILE -# ----------------------- -# Test if FILE is an executable regular file. -as_fn_executable_p () -{ - test -f "$1" && test -x "$1" -} # as_fn_executable_p -# as_fn_append VAR VALUE -# ---------------------- -# Append the text in VALUE to the end of the definition contained in VAR. Take -# advantage of any shell optimizations that allow amortized linear growth over -# repeated appends, instead of the typical quadratic growth present in naive -# implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : - eval 'as_fn_append () - { - eval $1+=\$2 - }' -else - as_fn_append () - { - eval $1=\$$1\$2 - } -fi # as_fn_append - -# as_fn_arith ARG... -# ------------------ -# Perform arithmetic evaluation on the ARGs, and store the result in the -# global $as_val. Take advantage of shells that can avoid forks. The arguments -# must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : - eval 'as_fn_arith () - { - as_val=$(( $* )) - }' -else - as_fn_arith () - { - as_val=`expr "$@" || test $? -eq 1` - } -fi # as_fn_arith - - -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- -# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. -as_fn_error () -{ - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 - fi - $as_echo "$as_me: error: $2" >&2 - as_fn_exit $as_status -} # as_fn_error - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - - - as_lineno_1=$LINENO as_lineno_1a=$LINENO - as_lineno_2=$LINENO as_lineno_2a=$LINENO - eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && - test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { - # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - - # If we had to re-execute with $CONFIG_SHELL, we're ensured to have - # already done that, so ensure we don't try to do so again and fall - # in an infinite loop. This has already happened in practice. - _as_can_reexec=no; export _as_can_reexec - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in #((((( --n*) - case `echo 'xy\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - xy) ECHO_C='\c';; - *) echo `echo ksh88 bug on AIX 6.1` > /dev/null - ECHO_T=' ';; - esac;; -*) - ECHO_N='-n';; -esac - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -pR' - fi -else - as_ln_s='cp -pR' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - -if mkdir -p . 2>/dev/null; then - as_mkdir_p='mkdir -p "$as_dir"' -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -as_test_x='test -x' -as_executable_p=as_fn_executable_p - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - -SHELL=${CONFIG_SHELL-/bin/sh} - - -test -n "$DJDIR" || exec 7<&0 &1 - -# Name of the host. -# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, -# so uname gets run too. -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - -# -# Initializations. -# -ac_default_prefix=/usr/local -ac_clean_files= -ac_config_libobj_dir=. -LIBOBJS= -cross_compiling=no -subdirs= -MFLAGS= -MAKEFLAGS= - -# Identity of this package. -PACKAGE_NAME='almanah' -PACKAGE_TARNAME='almanah' -PACKAGE_VERSION='0.11.1' -PACKAGE_STRING='almanah 0.11.1' -PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=almanah' -PACKAGE_URL='http://wiki.gnome.org/Apps/Almanah_Diary' - -ac_unique_file="src/main.c" -# Factoring default headers for most tests. -ac_includes_default="\ -#include -#ifdef HAVE_SYS_TYPES_H -# include -#endif -#ifdef HAVE_SYS_STAT_H -# include -#endif -#ifdef STDC_HEADERS -# include -# include -#else -# ifdef HAVE_STDLIB_H -# include -# endif -#endif -#ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H -# include -# endif -# include -#endif -#ifdef HAVE_STRINGS_H -# include -#endif -#ifdef HAVE_INTTYPES_H -# include -#endif -#ifdef HAVE_STDINT_H -# include -#endif -#ifdef HAVE_UNISTD_H -# include -#endif" - -ac_header_list= -ac_func_list= -ac_subst_vars='am__EXEEXT_FALSE -am__EXEEXT_TRUE -LTLIBOBJS -LIBOBJS -GPGME_CONFIG -ENCRYPTION_LIBS -ENCRYPTION_CFLAGS -SPELL_CHECKING_LIBS -SPELL_CHECKING_CFLAGS -HAVE_EVO_FALSE -HAVE_EVO_TRUE -EVO_LIBS -EVO_CFLAGS -STANDARD_LIBS -STANDARD_CFLAGS -SPELL_CHECKING_FALSE -SPELL_CHECKING_TRUE -ENCRYPTION_FALSE -ENCRYPTION_TRUE -DEBUG_FALSE -DEBUG_TRUE -APPDATA_XML_RULES -appdataxmldir -APPDATA_VALIDATE -GLIB_MKENUMS -GLIB_GENMARSHAL -GSETTINGS_RULES -GLIB_COMPILE_SCHEMAS -gsettingsschemadir -GSETTINGS_DISABLE_SCHEMAS_COMPILE -PKG_CONFIG_LIBDIR -PKG_CONFIG_PATH -PKG_CONFIG -CXXCPP -OTOOL64 -OTOOL -LIPO -NMEDIT -DSYMUTIL -MANIFEST_TOOL -RANLIB -ac_ct_AR -AR -DLLTOOL -OBJDUMP -LN_S -NM -ac_ct_DUMPBIN -DUMPBIN -LD -FGREP -SED -host_os -host_vendor -host_cpu -host -build_os -build_vendor -build_cpu -build -LIBTOOL -am__fastdepCXX_FALSE -am__fastdepCXX_TRUE -CXXDEPMODE -ac_ct_CXX -CXXFLAGS -CXX -DATADIRNAME -ALL_LINGUAS -INTLTOOL_PERL -GMSGFMT -MSGFMT -MSGMERGE -XGETTEXT -INTLTOOL_POLICY_RULE -INTLTOOL_SERVICE_RULE -INTLTOOL_THEME_RULE -INTLTOOL_SCHEMAS_RULE -INTLTOOL_CAVES_RULE -INTLTOOL_XML_NOMERGE_RULE -INTLTOOL_XML_RULE -INTLTOOL_KBD_RULE -INTLTOOL_XAM_RULE -INTLTOOL_UI_RULE -INTLTOOL_SOUNDLIST_RULE -INTLTOOL_SHEET_RULE -INTLTOOL_SERVER_RULE -INTLTOOL_PONG_RULE -INTLTOOL_OAF_RULE -INTLTOOL_PROP_RULE -INTLTOOL_KEYS_RULE -INTLTOOL_DIRECTORY_RULE -INTLTOOL_DESKTOP_RULE -intltool__v_merge_options_0 -intltool__v_merge_options_ -INTLTOOL_V_MERGE_OPTIONS -INTLTOOL__v_MERGE_0 -INTLTOOL__v_MERGE_ -INTLTOOL_V_MERGE -INTLTOOL_EXTRACT -INTLTOOL_MERGE -INTLTOOL_UPDATE -USE_NLS -GETTEXT_PACKAGE -AM_BACKSLASH -AM_DEFAULT_VERBOSITY -AM_DEFAULT_V -AM_V -am__fastdepCC_FALSE -am__fastdepCC_TRUE -CCDEPMODE -am__nodep -AMDEPBACKSLASH -AMDEP_FALSE -AMDEP_TRUE -am__quote -am__include -DEPDIR -am__untar -am__tar -AMTAR -am__leading_dot -SET_MAKE -AWK -mkdir_p -MKDIR_P -INSTALL_STRIP_PROGRAM -STRIP -install_sh -MAKEINFO -AUTOHEADER -AUTOMAKE -AUTOCONF -ACLOCAL -VERSION -PACKAGE -CYGPATH_W -am__isrc -INSTALL_DATA -INSTALL_SCRIPT -INSTALL_PROGRAM -EGREP -GREP -CPP -OBJEXT -EXEEXT -ac_ct_CC -CPPFLAGS -LDFLAGS -CFLAGS -CC -target_alias -host_alias -build_alias -LIBS -ECHO_T -ECHO_N -ECHO_C -DEFS -mandir -localedir -libdir -psdir -pdfdir -dvidir -htmldir -infodir -docdir -oldincludedir -includedir -localstatedir -sharedstatedir -sysconfdir -datadir -datarootdir -libexecdir -sbindir -bindir -program_transform_name -prefix -exec_prefix -PACKAGE_URL -PACKAGE_BUGREPORT -PACKAGE_STRING -PACKAGE_VERSION -PACKAGE_TARNAME -PACKAGE_NAME -PATH_SEPARATOR -SHELL' -ac_subst_files='' -ac_user_opts=' -enable_option_checking -enable_dependency_tracking -enable_silent_rules -enable_nls -enable_shared -enable_static -with_pic -enable_fast_install -with_gnu_ld -with_sysroot -enable_libtool_lock -enable_schemas_compile -enable_appdata_validate -enable_debug -enable_encryption -enable_spell_checking -enable_largefile -' - ac_precious_vars='build_alias -host_alias -target_alias -CC -CFLAGS -LDFLAGS -LIBS -CPPFLAGS -CPP -CXX -CXXFLAGS -CCC -CXXCPP -PKG_CONFIG -PKG_CONFIG_PATH -PKG_CONFIG_LIBDIR -STANDARD_CFLAGS -STANDARD_LIBS -EVO_CFLAGS -EVO_LIBS -SPELL_CHECKING_CFLAGS -SPELL_CHECKING_LIBS -ENCRYPTION_CFLAGS -ENCRYPTION_LIBS' - - -# Initialize some variables set by options. -ac_init_help= -ac_init_version=false -ac_unrecognized_opts= -ac_unrecognized_sep= -# The variables have the same names as the options, with -# dashes changed to underlines. -cache_file=/dev/null -exec_prefix=NONE -no_create= -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -verbose= -x_includes=NONE -x_libraries=NONE - -# Installation directory options. -# These are left unexpanded so users can "make install exec_prefix=/foo" -# and all the variables that are supposed to be based on exec_prefix -# by default will actually change. -# Use braces instead of parens because sh, perl, etc. also accept them. -# (The list follows the same order as the GNU Coding Standards.) -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datarootdir='${prefix}/share' -datadir='${datarootdir}' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -includedir='${prefix}/include' -oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -infodir='${datarootdir}/info' -htmldir='${docdir}' -dvidir='${docdir}' -pdfdir='${docdir}' -psdir='${docdir}' -libdir='${exec_prefix}/lib' -localedir='${datarootdir}/locale' -mandir='${datarootdir}/man' - -ac_prev= -ac_dashdash= -for ac_option -do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval $ac_prev=\$ac_option - ac_prev= - continue - fi - - case $ac_option in - *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *=) ac_optarg= ;; - *) ac_optarg=yes ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case $ac_dashdash$ac_option in - --) - ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir=$ac_optarg ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build_alias ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build_alias=$ac_optarg ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file=$ac_optarg ;; - - --config-cache | -C) - cache_file=config.cache ;; - - -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - - -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ - | --dataroo | --dataro | --datar) - ac_prev=datarootdir ;; - -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ - | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) - datarootdir=$ac_optarg ;; - - -disable-* | --disable-*) - ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"enable_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval enable_$ac_useropt=no ;; - - -docdir | --docdir | --docdi | --doc | --do) - ac_prev=docdir ;; - -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) - docdir=$ac_optarg ;; - - -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) - ac_prev=dvidir ;; - -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) - dvidir=$ac_optarg ;; - - -enable-* | --enable-*) - ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"enable_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval enable_$ac_useropt=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix=$ac_optarg ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he | -h) - ac_init_help=long ;; - -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) - ac_init_help=recursive ;; - -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) - ac_init_help=short ;; - - -host | --host | --hos | --ho) - ac_prev=host_alias ;; - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - - -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) - ac_prev=htmldir ;; - -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ - | --ht=*) - htmldir=$ac_optarg ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir=$ac_optarg ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir=$ac_optarg ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir=$ac_optarg ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - - -localedir | --localedir | --localedi | --localed | --locale) - ac_prev=localedir ;; - -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) - localedir=$ac_optarg ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir=$ac_optarg ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir=$ac_optarg ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix=$ac_optarg ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix=$ac_optarg ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix=$ac_optarg ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - - -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) - ac_prev=pdfdir ;; - -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) - pdfdir=$ac_optarg ;; - - -psdir | --psdir | --psdi | --psd | --ps) - ac_prev=psdir ;; - -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) - psdir=$ac_optarg ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir=$ac_optarg ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir=$ac_optarg ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site=$ac_optarg ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir=$ac_optarg ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir=$ac_optarg ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target_alias ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target_alias=$ac_optarg ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers | -V) - ac_init_version=: ;; - - -with-* | --with-*) - ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"with_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval with_$ac_useropt=\$ac_optarg ;; - - -without-* | --without-*) - ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"with_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval with_$ac_useropt=no ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes=$ac_optarg ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - - -*) as_fn_error $? "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information" - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - case $ac_envvar in #( - '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; - esac - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" - ;; - - esac -done - -if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error $? "missing argument to $ac_option" -fi - -if test -n "$ac_unrecognized_opts"; then - case $enable_option_checking in - no) ;; - fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; - esac -fi - -# Check all directory arguments for consistency. -for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir -do - eval ac_val=\$$ac_var - # Remove trailing slashes. - case $ac_val in - */ ) - ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` - eval $ac_var=\$ac_val;; - esac - # Be sure to have absolute directory names. - case $ac_val in - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac - as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" -done - -# There might be people who depend on the old broken behavior: `$host' -# used to hold the argument of --host etc. -# FIXME: To remove some day. -build=$build_alias -host=$host_alias -target=$target_alias - -# FIXME: To remove some day. -if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -fi - -ac_tool_prefix= -test -n "$host_alias" && ac_tool_prefix=$host_alias- - -test "$silent" = yes && exec 6>/dev/null - - -ac_pwd=`pwd` && test -n "$ac_pwd" && -ac_ls_di=`ls -di .` && -ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error $? "working directory cannot be determined" -test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error $? "pwd does not report name of working directory" - - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$as_myself" || -$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_myself" : 'X\(//\)[^/]' \| \ - X"$as_myself" : 'X\(//\)$' \| \ - X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_myself" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - srcdir=$ac_confdir - if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" -fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" - pwd)` -# When building in place, set srcdir=. -if test "$ac_abs_confdir" = "$ac_pwd"; then - srcdir=. -fi -# Remove unnecessary trailing slashes from srcdir. -# Double slashes in file names in object file debugging info -# mess up M-x gdb in Emacs. -case $srcdir in -*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -esac -for ac_var in $ac_precious_vars; do - eval ac_env_${ac_var}_set=\${${ac_var}+set} - eval ac_env_${ac_var}_value=\$${ac_var} - eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} - eval ac_cv_env_${ac_var}_value=\$${ac_var} -done - -# -# Report the --help message. -# -if test "$ac_init_help" = "long"; then - # 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 almanah 0.11.1 to adapt to many kinds of systems. - -Usage: $0 [OPTION]... [VAR=VALUE]... - -To assign environment variables (e.g., CC, CFLAGS...), specify them as -VAR=VALUE. See below for descriptions of some of the useful variables. - -Defaults for the options are specified in brackets. - -Configuration: - -h, --help display this help and exit - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking ...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - -Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] - -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. - -For better control, use the options below. - -Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/almanah] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] -_ACEOF - - cat <<\_ACEOF - -Program names: - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM run sed PROGRAM on installed program names - -System types: - --build=BUILD configure for building on BUILD [guessed] - --host=HOST cross-compile to build programs to run on HOST [BUILD] -_ACEOF -fi - -if test -n "$ac_init_help"; then - case $ac_init_help in - short | recursive ) echo "Configuration of almanah 0.11.1:";; - esac - cat <<\_ACEOF - -Optional Features: - --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-dependency-tracking - do not reject slow dependency extractors - --disable-dependency-tracking - speeds up one-time build - --enable-silent-rules less verbose build output (undo: "make V=1") - --disable-silent-rules verbose build output (undo: "make V=0") - --disable-nls do not use Native Language Support - --enable-shared[=PKGS] build shared libraries [default=yes] - --enable-static[=PKGS] build static libraries [default=yes] - --enable-fast-install[=PKGS] - optimize for fast installation [default=yes] - --disable-libtool-lock avoid locking (might break parallel builds) - --disable-schemas-compile - Disable regeneration of gschemas.compiled on install - --disable-appdata-validate - Disable validating AppData XML files during check - phase - --enable-debug turn on debugging - --enable-encryption enable database encryption support - --enable-spell-checking enable spell checking support - --disable-largefile omit support for large files - -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use - both] - --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR - (or the compiler's sysroot if not specified). - -Some influential environment variables: - CC C compiler command - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory - LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if - you have headers in a nonstandard directory - CPP C preprocessor - CXX C++ compiler command - CXXFLAGS C++ compiler flags - CXXCPP C++ preprocessor - PKG_CONFIG path to pkg-config utility - PKG_CONFIG_PATH - directories to add to pkg-config's search path - PKG_CONFIG_LIBDIR - path overriding pkg-config's built-in search path - STANDARD_CFLAGS - C compiler flags for STANDARD, overriding pkg-config - STANDARD_LIBS - linker flags for STANDARD, overriding pkg-config - EVO_CFLAGS C compiler flags for EVO, overriding pkg-config - EVO_LIBS linker flags for EVO, overriding pkg-config - SPELL_CHECKING_CFLAGS - C compiler flags for SPELL_CHECKING, overriding pkg-config - SPELL_CHECKING_LIBS - linker flags for SPELL_CHECKING, overriding pkg-config - ENCRYPTION_CFLAGS - C compiler flags for ENCRYPTION, overriding pkg-config - ENCRYPTION_LIBS - linker flags for ENCRYPTION, 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. - -Report bugs to . -almanah home page: . -_ACEOF -ac_status=$? -fi - -if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || - { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || - continue - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. - if test -f "$ac_srcdir/configure.gnu"; then - echo && - $SHELL "$ac_srcdir/configure.gnu" --help=recursive - elif test -f "$ac_srcdir/configure"; then - echo && - $SHELL "$ac_srcdir/configure" --help=recursive - else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi || ac_status=$? - cd "$ac_pwd" || { ac_status=$?; break; } - done -fi - -test -n "$ac_init_help" && exit $ac_status -if $ac_init_version; then - cat <<\_ACEOF -almanah configure 0.11.1 -generated by GNU Autoconf 2.69 - -Copyright (C) 2012 Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. -_ACEOF - exit -fi - -## ------------------------ ## -## Autoconf initialization. ## -## ------------------------ ## - -# ac_fn_c_try_compile LINENO -# -------------------------- -# Try to compile conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext - if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_compile - -# ac_fn_c_try_cpp LINENO -# ---------------------- -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_cpp - -# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists, giving a warning if it cannot be compiled using -# the include files in INCLUDES and setting the cache variable VAR -# accordingly. -ac_fn_c_check_header_mongrel () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval \${$3+:} false; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -$as_echo_n "checking $2 usability... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_header_compiler=yes -else - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -$as_echo_n "checking $2 presence... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <$2> -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - ac_header_preproc=yes -else - ac_header_preproc=no -fi -rm -f conftest.err conftest.i conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( - yes:no: ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; - no:yes:* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ----------------------------------------------------------------------- ## -## Report this to https://bugzilla.gnome.org/enter_bug.cgi?product=almanah ## -## ----------------------------------------------------------------------- ##" - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=\$ac_header_compiler" -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_mongrel - -# ac_fn_c_try_run LINENO -# ---------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. -ac_fn_c_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : - ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status -fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_run - -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile - -# ac_fn_c_try_link LINENO -# ----------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_link () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - test -x conftest$ac_exeext - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information - # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would - # interfere with the next link command; also delete a directory that is - # left behind by Apple's compiler. We do this before executing the actions. - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_link - -# ac_fn_c_check_func LINENO FUNC VAR -# ---------------------------------- -# Tests whether FUNC exists, setting the cache variable VAR accordingly -ac_fn_c_check_func () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Define $2 to an innocuous variant, in case declares $2. - For example, HP-UX 11i declares gettimeofday. */ -#define $2 innocuous_$2 - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $2 - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $2 (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$2 || defined __stub___$2 -choke me -#endif - -int -main () -{ -return $2 (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_func - -# ac_fn_cxx_try_compile LINENO -# ---------------------------- -# Try to compile conftest.$ac_ext, and return whether this succeeded. -ac_fn_cxx_try_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext - if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_cxx_try_compile - -# ac_fn_cxx_try_cpp LINENO -# ------------------------ -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_cxx_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_cxx_try_cpp - -# ac_fn_cxx_try_link LINENO -# ------------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. -ac_fn_cxx_try_link () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - test -x conftest$ac_exeext - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information - # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would - # interfere with the next link command; also delete a directory that is - # left behind by Apple's compiler. We do this before executing the actions. - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_cxx_try_link - -# ac_fn_c_check_type LINENO TYPE VAR INCLUDES -# ------------------------------------------- -# Tests whether TYPE exists after having included INCLUDES, setting cache -# variable VAR accordingly. -ac_fn_c_check_type () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=no" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -if (sizeof ($2)) - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -if (sizeof (($2))) - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - eval "$3=yes" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_type -cat >config.log <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by almanah $as_me 0.11.1, which was -generated by GNU Autoconf 2.69. Invocation command line was - - $ $0 $@ - -_ACEOF -exec 5>>config.log -{ -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## - -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - -_ASUNAME - -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" - done -IFS=$as_save_IFS - -} >&5 - -cat >&5 <<_ACEOF - - -## ----------- ## -## Core tests. ## -## ----------- ## - -_ACEOF - - -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= -ac_must_keep_next=false -for ac_pass in 1 2 -do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; - 2) - as_fn_append ac_configure_args1 " '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac - fi - as_fn_append ac_configure_args " '$ac_arg'" - ;; - esac - done -done -{ ac_configure_args0=; unset ac_configure_args0;} -{ ac_configure_args1=; unset ac_configure_args1;} - -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Use '\'' to represent an apostrophe within the trap. -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo - - $as_echo "## ---------------- ## -## Cache variables. ## -## ---------------- ##" - echo - # The following way of writing the cache mishandles newlines in values, -( - for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) { eval $ac_var=; unset $ac_var;} ;; - esac ;; - esac - done - (set) 2>&1 | - case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - sed -n \ - "s/'\''/'\''\\\\'\'''\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" - ;; #( - *) - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) - echo - - $as_echo "## ----------------- ## -## Output variables. ## -## ----------------- ##" - echo - for ac_var in $ac_subst_vars - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## -## File substitutions. ## -## ------------------- ##" - echo - for ac_var in $ac_subst_files - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi - - if test -s confdefs.h; then - $as_echo "## ----------- ## -## confdefs.h. ## -## ----------- ##" - echo - cat confdefs.h - echo - fi - test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal -done -ac_signal=0 - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -f -r conftest* confdefs.h - -$as_echo "/* confdefs.h */" > confdefs.h - -# Predefined preprocessor variables. - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_URL "$PACKAGE_URL" -_ACEOF - - -# Let the site file select an alternate cache file if it wants to. -# Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE -if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac -elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site -else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site -fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" -do - test "x$ac_site_file" = xNONE && continue - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } - fi -done - -if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special files - # actually), so we avoid doing that. DJGPP emulates it as a regular file. - if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi -else - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file -fi - -as_fn_append ac_header_list " sys/time.h" -as_fn_append ac_header_list " unistd.h" -as_fn_append ac_func_list " alarm" -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - # differences in whitespace do not lead to failure. - ac_old_val_w=`echo x $ac_old_val` - ac_new_val_w=`echo x $ac_new_val` - if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - ac_cache_corrupted=: - else - { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} - eval $ac_var=\$ac_old_val - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) as_fn_append ac_configure_args " '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 -fi -## -------------------- ## -## Main body of script. ## -## -------------------- ## - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - -ac_config_headers="$ac_config_headers config.h" - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CC" && break -done - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -fi - -fi - - -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } - -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done - -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" -# Try to create an executable without -o first, disregard a.out. -# It will help us diagnose broken compilers, and finding out an intuition -# of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` - -# The possible output files: -ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" - -ac_rmfiles= -for ac_file in $ac_files -do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - * ) ac_rmfiles="$ac_rmfiles $ac_file";; - esac -done -rm -f $ac_rmfiles - -if { { ac_try="$ac_link_default" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link_default") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -# in a Makefile. We should not override ac_cv_exeext if it was cached, -# so that the user can short-circuit this test for compilers unknown to -# Autoconf. -for ac_file in $ac_files '' -do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; - then :; else - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - fi - # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' - # argument, so we may need to know it at that point already. - # Even if this section looks crufty: it has the advantage of - # actually working. - break;; - * ) - break;; - esac -done -test "$ac_cv_exeext" = no && ac_cv_exeext= - -else - ac_file='' -fi -if test -z "$ac_file"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } -ac_exeext=$ac_cv_exeext - -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out -ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } -if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - break;; - * ) break;; - esac -done -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } -fi -rm -f conftest conftest$ac_cv_exeext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } - -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -FILE *f = fopen ("conftest.out", "w"); - return ferror (f) || fclose (f) != 0; - - ; - return 0; -} -_ACEOF -ac_clean_files="$ac_clean_files conftest.out" -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -if test "$cross_compiling" != yes; then - { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if { ac_try='./conftest$ac_cv_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } - fi - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - -rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out -ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.o conftest.obj -if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } -fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_compiler_gnu=yes -else - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GCC=yes -else - GCC= -fi -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -else - CFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c89=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : - -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if ${ac_cv_prog_CPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi - - done - ac_cv_prog_CPP=$CPP - -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_GREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_GREP=$GREP -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP" || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_EGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_EGREP=$EGREP -fi - - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - - ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" -if test "x$ac_cv_header_minix_config_h" = xyes; then : - MINIX=yes -else - MINIX= -fi - - - if test "$MINIX" = yes; then - -$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h - - -$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h - - -$as_echo "#define _MINIX 1" >>confdefs.h - - fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 -$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } -if ${ac_cv_safe_to_define___extensions__+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -# define __EXTENSIONS__ 1 - $ac_includes_default -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_safe_to_define___extensions__=yes -else - ac_cv_safe_to_define___extensions__=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 -$as_echo "$ac_cv_safe_to_define___extensions__" >&6; } - test $ac_cv_safe_to_define___extensions__ = yes && - $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h - - $as_echo "#define _ALL_SOURCE 1" >>confdefs.h - - $as_echo "#define _GNU_SOURCE 1" >>confdefs.h - - $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h - - $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h - - - -am__api_version='1.13' - -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 -fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -# Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } -if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in #(( - ./ | .// | /[cC]/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - rm -rf conftest.one conftest.two conftest.dir - echo one > conftest.one - echo two > conftest.two - mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && - test -s conftest.one && test -s conftest.two && - test -s conftest.dir/conftest.one && - test -s conftest.dir/conftest.two - then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - fi - done - done - ;; -esac - - done -IFS=$as_save_IFS - -rm -rf conftest.one conftest.two conftest.dir - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 -$as_echo_n "checking whether build environment is sane... " >&6; } -# 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]*) - as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; -esac -case $srcdir in - *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; -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 ( - am_has_slept=no - for am_try in 1 2; do - echo "timestamp, slept: $am_has_slept" > conftest.file - 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 - 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". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken - alias in your environment" "$LINENO" 5 - fi - if test "$2" = conftest.file || test $am_try -eq 2; then - break - fi - # Just in case. - sleep 1 - am_has_slept=yes - done - test "$2" = conftest.file - ) -then - # Ok. - : -else - as_fn_error $? "newly created file is older than distributed files! -Check your system clock" "$LINENO" 5 -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -# If we didn't sleep, we still need to ensure time stamps of config.status and -# generated files are strictly newer. -am_sleep_pid= -if grep 'slept: no' conftest.file >/dev/null 2>&1; then - ( sleep 1 ) & - am_sleep_pid=$! -fi - -rm -f conftest.file - -test "$program_prefix" != NONE && - program_transform_name="s&^&$program_prefix&;$program_transform_name" -# Use a double $ so make ignores it. -test "$program_suffix" != NONE && - program_transform_name="s&\$&$program_suffix&;$program_transform_name" -# Double any \ or $. -# By default was `s,x,x', remove it if useless. -ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` - -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` - -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi -# Use eval to expand $SHELL -if eval "$MISSING --is-lightweight"; then - am_missing_run="$MISSING " -else - am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} -fi - -if test x"${install_sh}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi - -# 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. -if test "$cross_compiling" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi - -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 -$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } -if test -z "$MKDIR_P"; then - if ${ac_cv_path_mkdir+:} false; then : - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do - for ac_exec_ext in '' $ac_executable_extensions; do - as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ - 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext - break 3;; - esac - done - done - done -IFS=$as_save_IFS - -fi - - test -d ./--version && rmdir ./--version - if test "${ac_cv_path_mkdir+set}" = set; then - MKDIR_P="$ac_cv_path_mkdir -p" - else - # As a last resort, use the slow shell script. Don't cache a - # value for MKDIR_P within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - MKDIR_P="$ac_install_sh -d" - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 -$as_echo "$MKDIR_P" >&6; } - -for ac_prog in gawk mawk nawk awk -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -AWK=$ac_cv_prog_AWK -if test -n "$AWK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -$as_echo "$AWK" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$AWK" && break -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } -set x ${MAKE-make} -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat >conftest.make <<\_ACEOF -SHELL = /bin/sh -all: - @echo '@@@%%%=$(MAKE)=@@@%%%' -_ACEOF -# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. -case `${MAKE-make} -f conftest.make 2>/dev/null` in - *@@@%%%=?*=@@@%%%*) - eval ac_cv_prog_make_${ac_make}_set=yes;; - *) - eval ac_cv_prog_make_${ac_make}_set=no;; -esac -rm -f conftest.make -fi -if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - SET_MAKE= -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" -fi - -rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null - -DEPDIR="${am__leading_dot}deps" - -ac_config_commands="$ac_config_commands depfiles" - - -am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } -rm -f confinc confmf - -# Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then : - enableval=$enable_dependency_tracking; -fi - -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - am__nodep='_no' -fi - if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' -else - AMDEP_TRUE='#' - AMDEP_FALSE= -fi - - -# Check whether --enable-silent-rules was given. -if test "${enable_silent_rules+set}" = set; then : - enableval=$enable_silent_rules; -fi - -case $enable_silent_rules in # ((( - yes) AM_DEFAULT_VERBOSITY=0;; - no) AM_DEFAULT_VERBOSITY=1;; - *) AM_DEFAULT_VERBOSITY=1;; -esac -am_make=${MAKE-make} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; } -if ${am_cv_make_support_nested_variables+:} false; then : - $as_echo_n "(cached) " >&6 -else - if $as_echo 'TRUE=$(BAR$(V)) -BAR0=false -BAR1=true -V=1 -am__doit: - @$(TRUE) -.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then - am_cv_make_support_nested_variables=yes -else - am_cv_make_support_nested_variables=no -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -$as_echo "$am_cv_make_support_nested_variables" >&6; } -if test $am_cv_make_support_nested_variables = yes; then - AM_V='$(V)' - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' -else - AM_V=$AM_DEFAULT_VERBOSITY - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY -fi -AM_BACKSLASH='\' - -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - am__isrc=' -I$(srcdir)' - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 - fi -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi - - -# Define the identity of the package. - PACKAGE='almanah' - VERSION='0.11.1' - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF - -# Some tools Automake needs. - -ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} - - -AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} - - -AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} - - -AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} - - -MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -# For better backward compatibility. To be removed once Automake 1.9.x -# dies out for good. For more background, see: -# -# -mkdir_p='$(MKDIR_P)' - -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -# Always define AMTAR for backward compatibility. Yes, it's still used -# in the wild :-( We should find a proper way to deprecate it ... -AMTAR='$${TAR-tar}' - - -# We'll loop over all known methods to create a tar archive until one works. -_am_tools='gnutar pax cpio none' - -am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' - - - - - -depcc="$CC" am_compiler_list= - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CC_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named 'D' -- because '-MD' means "put the output - # in D". - rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CC_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with - # Solaris 10 /bin/sh. - echo '/* dummy */' > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with '-c' and '-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle '-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs. - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # After this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested. - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok '-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CC_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= - am__fastdepCC_FALSE='#' -else - am__fastdepCC_TRUE='#' - am__fastdepCC_FALSE= -fi - - - - -# Enable silent build when available (Automake 1.11) -# Check whether --enable-silent-rules was given. -if test "${enable_silent_rules+set}" = set; then : - enableval=$enable_silent_rules; -fi - -case $enable_silent_rules in # ((( - yes) AM_DEFAULT_VERBOSITY=0;; - no) AM_DEFAULT_VERBOSITY=1;; - *) AM_DEFAULT_VERBOSITY=0;; -esac -am_make=${MAKE-make} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; } -if ${am_cv_make_support_nested_variables+:} false; then : - $as_echo_n "(cached) " >&6 -else - if $as_echo 'TRUE=$(BAR$(V)) -BAR0=false -BAR1=true -V=1 -am__doit: - @$(TRUE) -.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then - am_cv_make_support_nested_variables=yes -else - am_cv_make_support_nested_variables=no -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -$as_echo "$am_cv_make_support_nested_variables" >&6; } -if test $am_cv_make_support_nested_variables = yes; then - AM_V='$(V)' - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' -else - AM_V=$AM_DEFAULT_VERBOSITY - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY -fi -AM_BACKSLASH='\' - - -GETTEXT_PACKAGE=almanah - -cat >>confdefs.h <<_ACEOF -#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" -_ACEOF - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 -$as_echo_n "checking whether NLS is requested... " >&6; } - # Check whether --enable-nls was given. -if test "${enable_nls+set}" = set; then : - enableval=$enable_nls; USE_NLS=$enableval -else - USE_NLS=yes -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 -$as_echo "$USE_NLS" >&6; } - - - - -case "$am__api_version" in - 1.01234) - as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 - ;; - *) - ;; -esac - -INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | 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; }'` -if test -n "0.35.0"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5 -$as_echo_n "checking for intltool >= 0.35.0... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 -$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } - test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - as_fn_error $? "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 -fi - -# Extract the first word of "intltool-update", so it can be a program name with args. -set dummy intltool-update; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $INTLTOOL_UPDATE in - [\\/]* | ?:[\\/]*) - ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE -if test -n "$INTLTOOL_UPDATE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5 -$as_echo "$INTLTOOL_UPDATE" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -# Extract the first word of "intltool-merge", so it can be a program name with args. -set dummy intltool-merge; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_MERGE+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $INTLTOOL_MERGE in - [\\/]* | ?:[\\/]*) - ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE -if test -n "$INTLTOOL_MERGE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5 -$as_echo "$INTLTOOL_MERGE" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -# Extract the first word of "intltool-extract", so it can be a program name with args. -set dummy intltool-extract; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $INTLTOOL_EXTRACT in - [\\/]* | ?:[\\/]*) - ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT -if test -n "$INTLTOOL_EXTRACT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5 -$as_echo "$INTLTOOL_EXTRACT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 -fi - -if test -z "$AM_DEFAULT_VERBOSITY"; then - AM_DEFAULT_VERBOSITY=1 -fi - - -INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' -INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' -INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;' - - - - -INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' -intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' -intltool__v_merge_options_0='-q' - - - - - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@' -else - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir' -fi - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# Check the gettext tools to make sure they are GNU -# Extract the first word of "xgettext", so it can be a program name with args. -set dummy xgettext; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XGETTEXT+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $XGETTEXT in - [\\/]* | ?:[\\/]*) - ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -XGETTEXT=$ac_cv_path_XGETTEXT -if test -n "$XGETTEXT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 -$as_echo "$XGETTEXT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -# Extract the first word of "msgmerge", so it can be a program name with args. -set dummy msgmerge; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MSGMERGE+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $MSGMERGE in - [\\/]* | ?:[\\/]*) - ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -MSGMERGE=$ac_cv_path_MSGMERGE -if test -n "$MSGMERGE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 -$as_echo "$MSGMERGE" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -# Extract the first word of "msgfmt", so it can be a program name with args. -set dummy msgfmt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MSGFMT+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $MSGFMT in - [\\/]* | ?:[\\/]*) - ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -MSGFMT=$ac_cv_path_MSGFMT -if test -n "$MSGFMT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 -$as_echo "$MSGFMT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -# Extract the first word of "gmsgfmt", so it can be a program name with args. -set dummy gmsgfmt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GMSGFMT+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GMSGFMT in - [\\/]* | ?:[\\/]*) - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" - ;; -esac -fi -GMSGFMT=$ac_cv_path_GMSGFMT -if test -n "$GMSGFMT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 -$as_echo "$GMSGFMT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 -fi -xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" -mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" -mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" -if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 -fi - -# Extract the first word of "perl", so it can be a program name with args. -set dummy perl; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_PERL+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $INTLTOOL_PERL in - [\\/]* | ?:[\\/]*) - ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL -if test -n "$INTLTOOL_PERL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5 -$as_echo "$INTLTOOL_PERL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -if test -z "$INTLTOOL_PERL"; then - as_fn_error $? "perl not found" "$LINENO" 5 -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5 -$as_echo_n "checking for perl >= 5.8.1... " >&6; } -$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 -if test $? -ne 0; then - as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 -else - IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 -$as_echo "$IT_PERL_VERSION" >&6; } -fi -if test "x" != "xno-xml"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5 -$as_echo_n "checking for XML::Parser... " >&6; } - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } - else - as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5 - fi -fi - -# Substitute ALL_LINGUAS so we can use it in po/Makefile - - -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - DATADIRNAME=share -else - case $host in - *-*-solaris*) - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : - DATADIRNAME=share -else - DATADIRNAME=lib -fi - - ;; - *) - DATADIRNAME=lib - ;; - esac -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi - - - - - - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -$as_echo "$CXX" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CXX" && break -done - - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi -fi - - fi -fi -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if ${ac_cv_cxx_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_compiler_gnu=yes -else - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GXX=yes -else - GXX= -fi -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } -if ${ac_cv_prog_cxx_g+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes -else - CXXFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - -else - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -depcc="$CXX" am_compiler_list= - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CXX_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named 'D' -- because '-MD' means "put the output - # in D". - rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with - # Solaris 10 /bin/sh. - echo '/* dummy */' > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with '-c' and '-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle '-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs. - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # After this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested. - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok '-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CXX_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= -fi - - -if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; -then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&5' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; - then - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi -else - eval ac_cv_prog_cc_${ac_cc}_c_o=no -fi -rm -f core conftest* - -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h - -fi - -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi - - -case `pwd` in - *\ * | *\ *) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; -esac - - - -macro_version='2.4.2' -macro_revision='1.3337' - - - - - - - - - - - - - -ltmain="$ac_aux_dir/ltmain.sh" - -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; -esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build -else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; -esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - -# Backslashify metacharacters that are still active within -# double-quoted strings. -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - -ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 -$as_echo_n "checking how to print strings... " >&6; } -# Test print first, because it will be a builtin if present. -if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' -elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='printf %s\n' -else - # Use this function as a fallback that always works. - func_fallback_echo () - { - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' - } - ECHO='func_fallback_echo' -fi - -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "" -} - -case "$ECHO" in - printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 -$as_echo "printf" >&6; } ;; - print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 -$as_echo "print -r" >&6; } ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 -$as_echo "cat" >&6; } ;; -esac - - - - - - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -$as_echo_n "checking for a sed that does not truncate output... " >&6; } -if ${ac_cv_path_SED+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ - for ac_i in 1 2 3 4 5 6 7; do - ac_script="$ac_script$as_nl$ac_script" - done - echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed - { ac_script=; unset ac_script;} - if test -z "$SED"; then - ac_path_SED_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_SED" || continue -# Check for GNU ac_path_SED and select it if it is found. - # Check for GNU $ac_path_SED -case `"$ac_path_SED" --version 2>&1` in -*GNU*) - ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo '' >> "conftest.nl" - "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_SED_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_SED="$ac_path_SED" - ac_path_SED_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_SED_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_SED"; then - as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 - fi -else - ac_cv_path_SED=$SED -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } - SED="$ac_cv_path_SED" - rm -f conftest.sed - -test -z "$SED" && SED=sed -Xsed="$SED -e 1s/^X//" - - - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 -$as_echo_n "checking for fgrep... " >&6; } -if ${ac_cv_path_FGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 - then ac_cv_path_FGREP="$GREP -F" - else - if test -z "$FGREP"; then - ac_path_FGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in fgrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_FGREP" || continue -# Check for GNU ac_path_FGREP and select it if it is found. - # Check for GNU $ac_path_FGREP -case `"$ac_path_FGREP" --version 2>&1` in -*GNU*) - ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'FGREP' >> "conftest.nl" - "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_FGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_FGREP="$ac_path_FGREP" - ac_path_FGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_FGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_FGREP"; then - as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_FGREP=$FGREP -fi - - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 -$as_echo "$ac_cv_path_FGREP" >&6; } - FGREP="$ac_cv_path_FGREP" - - -test -z "$GREP" && GREP=grep - - - - - - - - - - - - - - - - - - - -# Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi - -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -$as_echo_n "checking for ld used by $CC... " >&6; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -$as_echo_n "checking for GNU ld... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -$as_echo_n "checking for non-GNU ld... " >&6; } -fi -if ${lt_cv_path_LD+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &5 -$as_echo "$LD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if ${lt_cv_prog_gnu_ld+:} false; then : - $as_echo_n "(cached) " >&6 -else - # I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 &5 -$as_echo "$lt_cv_prog_gnu_ld" >&6; } -with_gnu_ld=$lt_cv_prog_gnu_ld - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 -$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if ${lt_cv_path_NM+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -else - lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac - ;; - esac - fi - done - IFS="$lt_save_ifs" - done - : ${lt_cv_path_NM=no} -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 -$as_echo "$lt_cv_path_NM" >&6; } -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" -else - # Didn't find any BSD compatible name lister, look for dumpbin. - if test -n "$DUMPBIN"; then : - # Let the user override the test. - else - if test -n "$ac_tool_prefix"; then - for ac_prog in dumpbin "link -dump" - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DUMPBIN+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$DUMPBIN"; then - ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -DUMPBIN=$ac_cv_prog_DUMPBIN -if test -n "$DUMPBIN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 -$as_echo "$DUMPBIN" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$DUMPBIN" && break - done -fi -if test -z "$DUMPBIN"; then - ac_ct_DUMPBIN=$DUMPBIN - for ac_prog in dumpbin "link -dump" -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DUMPBIN"; then - ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN -if test -n "$ac_ct_DUMPBIN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 -$as_echo "$ac_ct_DUMPBIN" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_DUMPBIN" && break -done - - if test "x$ac_ct_DUMPBIN" = x; then - DUMPBIN=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - DUMPBIN=$ac_ct_DUMPBIN - fi -fi - - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in - *COFF*) - DUMPBIN="$DUMPBIN -symbols" - ;; - *) - DUMPBIN=: - ;; - esac - fi - - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" - fi -fi -test -z "$NM" && NM=nm - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 -$as_echo_n "checking the name lister ($NM) interface... " >&6; } -if ${lt_cv_nm_interface+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&5 - (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&5 - (eval echo "\"\$as_me:$LINENO: output\"" >&5) - cat conftest.out >&5 - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" - fi - rm -f conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 -$as_echo "$lt_cv_nm_interface" >&6; } - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -$as_echo_n "checking whether ln -s works... " >&6; } -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } -fi - -# find the maximum length of command line arguments -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 -$as_echo_n "checking the maximum length of command line arguments... " >&6; } -if ${lt_cv_sys_max_cmd_len+:} false; then : - $as_echo_n "(cached) " >&6 -else - i=0 - teststring="ABCD" - - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; - - cygwin* | mingw* | cegcc*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; - - mint*) - # On MiNT this can take a long time and run out of memory. - lt_cv_sys_max_cmd_len=8192; - ;; - - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; - - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; - - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; - - os2*) - # The test takes a long time on OS/2. - lt_cv_sys_max_cmd_len=8192 - ;; - - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else - # Make teststring a little bigger before we do anything with it. - # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do - teststring=$teststring$teststring - done - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ - = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - # Only check the string length outside the loop. - lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` - teststring= - # Add a significant safety factor because C++ compilers can tack on - # massive amounts of additional arguments before passing them to the - # linker. It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - fi - ;; - esac - -fi - -if test -n $lt_cv_sys_max_cmd_len ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 -$as_echo "$lt_cv_sys_max_cmd_len" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 -$as_echo "none" >&6; } -fi -max_cmd_len=$lt_cv_sys_max_cmd_len - - - - - - -: ${CP="cp -f"} -: ${MV="mv -f"} -: ${RM="rm -f"} - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 -$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 -$as_echo "$xsi_shell" >&6; } - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 -$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } -lt_shell_append=no -( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 -$as_echo "$lt_shell_append" >&6; } - - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - lt_unset=unset -else - lt_unset=false -fi - - - - - -# test EBCDIC or ASCII -case `echo X|tr X '\101'` in - A) # ASCII based system - # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr - lt_SP2NL='tr \040 \012' - lt_NL2SP='tr \015\012 \040\040' - ;; - *) # EBCDIC based system - lt_SP2NL='tr \100 \n' - lt_NL2SP='tr \r\n \100\100' - ;; -esac - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -if ${lt_cv_to_host_file_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 - ;; - esac - ;; - *-*-cygwin* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin - ;; - esac - ;; - * ) # unhandled hosts (and "normal" native builds) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; -esac - -fi - -to_host_file_cmd=$lt_cv_to_host_file_cmd -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -$as_echo "$lt_cv_to_host_file_cmd" >&6; } - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -if ${lt_cv_to_tool_file_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else - #assume ordinary cross tools, or native build. -lt_cv_to_tool_file_cmd=func_convert_file_noop -case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 - ;; - esac - ;; -esac - -fi - -to_tool_file_cmd=$lt_cv_to_tool_file_cmd -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -$as_echo "$lt_cv_to_tool_file_cmd" >&6; } - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 -$as_echo_n "checking for $LD option to reload object files... " >&6; } -if ${lt_cv_ld_reload_flag+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ld_reload_flag='-r' -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 -$as_echo "$lt_cv_ld_reload_flag" >&6; } -reload_flag=$lt_cv_ld_reload_flag -case $reload_flag in -"" | " "*) ;; -*) reload_flag=" $reload_flag" ;; -esac -reload_cmds='$LD$reload_flag -o $output$reload_objs' -case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then - reload_cmds=false - fi - ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' - else - reload_cmds='$LD$reload_flag -o $output$reload_objs' - fi - ;; -esac - - - - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. -set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$OBJDUMP"; then - ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -OBJDUMP=$ac_cv_prog_OBJDUMP -if test -n "$OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 -$as_echo "$OBJDUMP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_OBJDUMP"; then - ac_ct_OBJDUMP=$OBJDUMP - # Extract the first word of "objdump", so it can be a program name with args. -set dummy objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_OBJDUMP"; then - ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_OBJDUMP="objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP -if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 -$as_echo "$ac_ct_OBJDUMP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_OBJDUMP" = x; then - OBJDUMP="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - OBJDUMP=$ac_ct_OBJDUMP - fi -else - OBJDUMP="$ac_cv_prog_OBJDUMP" -fi - -test -z "$OBJDUMP" && OBJDUMP=objdump - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 -$as_echo_n "checking how to recognize dependent libraries... " >&6; } -if ${lt_cv_deplibs_check_method+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_file_magic_cmd='$MAGIC_CMD' -lt_cv_file_magic_test_file= -lt_cv_deplibs_check_method='unknown' -# Need to set the preceding variable on all platforms that support -# interlibrary dependencies. -# 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. -# 'pass_all' -- all dependencies passed with no checks. -# 'test_compile' -- check by making test program. -# 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. - -case $host_os in -aix[4-9]*) - lt_cv_deplibs_check_method=pass_all - ;; - -beos*) - lt_cv_deplibs_check_method=pass_all - ;; - -bsdi[45]*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' - lt_cv_file_magic_test_file=/shlib/libc.so - ;; - -cygwin*) - # func_win32_libid is a shell function defined in ltmain.sh - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - ;; - -mingw* | pw32*) - # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump', - # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else - # Keep this pattern in sync with the one in func_win32_libid. - lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; - -cegcc*) - # use the weaker test based on 'objdump'. See mingw*. - lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - ;; - -darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; - -freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; - -interix[3-9]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' - ;; - -irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - lt_cv_deplibs_check_method=pass_all - ;; - -netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' - fi - ;; - -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -*nto* | *qnx*) - lt_cv_deplibs_check_method=pass_all - ;; - -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - fi - ;; - -osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; - -rdos*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv4 | sysv4.3*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; - esac - ;; - -tpf*) - lt_cv_deplibs_check_method=pass_all - ;; -esac - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 -$as_echo "$lt_cv_deplibs_check_method" >&6; } - -file_magic_glob= -want_nocaseglob=no -if test "$build" = "$host"; then - case $host_os in - mingw* | pw32*) - if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then - want_nocaseglob=yes - else - file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` - fi - ;; - esac -fi - -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -test -z "$deplibs_check_method" && deplibs_check_method=unknown - - - - - - - - - - - - - - - - - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$DLLTOOL"; then - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -DLLTOOL=$ac_cv_prog_DLLTOOL -if test -n "$DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -$as_echo "$DLLTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_DLLTOOL"; then - ac_ct_DLLTOOL=$DLLTOOL - # Extract the first word of "dlltool", so it can be a program name with args. -set dummy dlltool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DLLTOOL"; then - ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_DLLTOOL="dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -if test -n "$ac_ct_DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -$as_echo "$ac_ct_DLLTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_DLLTOOL" = x; then - DLLTOOL="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - DLLTOOL=$ac_ct_DLLTOOL - fi -else - DLLTOOL="$ac_cv_prog_DLLTOOL" -fi - -test -z "$DLLTOOL" && DLLTOOL=dlltool - - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_sharedlib_from_linklib_cmd='unknown' - -case $host_os in -cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL - case `$DLLTOOL --help 2>&1` in - *--identify-strict*) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib - ;; - *) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback - ;; - esac - ;; -*) - # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" - ;; -esac - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO - - - - - - - -if test -n "$ac_tool_prefix"; then - for ac_prog in ar - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -AR=$ac_cv_prog_AR -if test -n "$AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -$as_echo "$AR" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$AR" && break - done -fi -if test -z "$AR"; then - ac_ct_AR=$AR - for ac_prog in ar -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_AR"; then - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_AR=$ac_cv_prog_ac_ct_AR -if test -n "$ac_ct_AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -$as_echo "$ac_ct_AR" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_AR" && break -done - - if test "x$ac_ct_AR" = x; then - AR="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - AR=$ac_ct_AR - fi -fi - -: ${AR=ar} -: ${AR_FLAGS=cru} - - - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -$as_echo_n "checking for archiver @FILE support... " >&6; } -if ${lt_cv_ar_at_file+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ar_at_file=no - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - echo conftest.$ac_objext > conftest.lst - lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 - (eval $lt_ar_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if test "$ac_status" -eq 0; then - # Ensure the archiver fails upon bogus file names. - rm -f conftest.$ac_objext libconftest.a - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 - (eval $lt_ar_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if test "$ac_status" -ne 0; then - lt_cv_ar_at_file=@ - fi - fi - rm -f conftest.* libconftest.a - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -$as_echo "$lt_cv_ar_at_file" >&6; } - -if test "x$lt_cv_ar_at_file" = xno; then - archiver_list_spec= -else - archiver_list_spec=$lt_cv_ar_at_file -fi - - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi - -test -z "$STRIP" && STRIP=: - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_RANLIB" = x; then - RANLIB=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - RANLIB=$ac_ct_RANLIB - fi -else - RANLIB="$ac_cv_prog_RANLIB" -fi - -test -z "$RANLIB" && RANLIB=: - - - - - - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" -fi - -case $host_os in - darwin*) - lock_old_archive_extraction=yes ;; - *) - lock_old_archive_extraction=no ;; -esac - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC - - -# Check for command to grab the raw symbol name followed by C symbol from nm. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 -$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if ${lt_cv_sys_global_symbol_pipe+:} false; then : - $as_echo_n "(cached) " >&6 -else - -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -# Character class describing NM global symbol codes. -symcode='[BCDEGRST]' - -# Regexp to match symbols that can be accessed directly from C. -sympat='\([_A-Za-z][_A-Za-z0-9]*\)' - -# Define system-specific variables. -case $host_os in -aix*) - symcode='[BCDT]' - ;; -cygwin* | mingw* | pw32* | cegcc*) - symcode='[ABCDGISTW]' - ;; -hpux*) - if test "$host_cpu" = ia64; then - symcode='[ABCDEGRST]' - fi - ;; -irix* | nonstopux*) - symcode='[BCDEGRST]' - ;; -osf*) - symcode='[BCDEGQRST]' - ;; -solaris*) - symcode='[BDRT]' - ;; -sco3.2v5*) - symcode='[DT]' - ;; -sysv4.2uw2*) - symcode='[DT]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[ABDT]' - ;; -sysv4) - symcode='[DFNSTU]' - ;; -esac - -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[ABCDGIRSTW]' ;; -esac - -# Transform an extracted symbol line into a proper C declaration. -# Some systems (esp. on ia64) link data and code symbols differently, -# so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac - -# Try without a prefix underscore, then with it. -for ac_symprfx in "" "_"; do - - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" - - # Write the raw and C identifiers. - if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. - # Also find C++ and __fastcall symbols from MSVC++, - # which start with @ or ?. - lt_cv_sys_global_symbol_pipe="$AWK '"\ -" {last_section=section; section=\$ 3};"\ -" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ -" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ -" \$ 0!~/External *\|/{next};"\ -" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ -" {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ -" ' prfx=^$ac_symprfx" - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - - # Check to see that the pipe works correctly. - pipe_works=no - - rm -f conftest* - cat > conftest.$ac_ext <<_LT_EOF -#ifdef __cplusplus -extern "C" { -#endif -char nm_test_var; -void nm_test_func(void); -void nm_test_func(void){} -#ifdef __cplusplus -} -#endif -int main(){nm_test_var='a';nm_test_func();return(0);} -_LT_EOF - - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - # Now try to grab the symbols. - nlist=conftest.nm - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 - (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi - - # Make sure that we snagged all the symbols we need. - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ -# define LT_DLSYM_CONST -#elif defined(__osf__) -/* This system does not cope well with relocations in const data. */ -# define LT_DLSYM_CONST -#else -# define LT_DLSYM_CONST const -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -_LT_EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' - - cat <<_LT_EOF >> conftest.$ac_ext - -/* The mapping between symbol names and symbols. */ -LT_DLSYM_CONST struct { - const char *name; - void *address; -} -lt__PROGRAM__LTX_preloaded_symbols[] = -{ - { "@PROGRAM@", (void *) 0 }, -_LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext - cat <<\_LT_EOF >> conftest.$ac_ext - {0, (void *) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt__PROGRAM__LTX_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif -_LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_globsym_save_LIBS=$LIBS - lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 - (eval $ac_link) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi - LIBS=$lt_globsym_save_LIBS - CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi - else - echo "cannot find nm_test_var in $nlist" >&5 - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 - fi - else - echo "$progname: failed program was:" >&5 - cat conftest.$ac_ext >&5 - fi - rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done - -fi - -if test -z "$lt_cv_sys_global_symbol_pipe"; then - lt_cv_sys_global_symbol_to_cdecl= -fi -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 -$as_echo "failed" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } -fi - -# Response file support. -if test "$lt_cv_nm_interface" = "MS dumpbin"; then - nm_file_list_spec='@' -elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then - nm_file_list_spec='@' -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -$as_echo_n "checking for sysroot... " >&6; } - -# Check whether --with-sysroot was given. -if test "${with_sysroot+set}" = set; then : - withval=$with_sysroot; -else - with_sysroot=no -fi - - -lt_sysroot= -case ${with_sysroot} in #( - yes) - if test "$GCC" = yes; then - lt_sysroot=`$CC --print-sysroot 2>/dev/null` - fi - ;; #( - /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` - ;; #( - no|'') - ;; #( - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 -$as_echo "${with_sysroot}" >&6; } - as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 - ;; -esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -$as_echo "${lt_sysroot:-no}" >&6; } - - - - - -# Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -fi - -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '#line '$LINENO' "configure"' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* - ;; - -x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ -s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - powerpc64le-*linux*) - LD="${LD-ld} -m elf32lppclinux" - ;; - powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - powerpcle-*linux*) - LD="${LD-ld} -m elf64lppc" - ;; - powerpc-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*|s390*-*tpf*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 -$as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if ${lt_cv_cc_needs_belf+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - lt_cv_cc_needs_belf=yes -else - lt_cv_cc_needs_belf=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 -$as_echo "$lt_cv_cc_needs_belf" >&6; } - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; -*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) - case $host in - i?86-*-solaris*) - LD="${LD-ld} -m elf_x86_64" - ;; - sparc*-*-solaris*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - # GNU ld 2.21 introduced _sol2 emulations. Use them if available. - if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" - fi - ;; - *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" - fi - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; -esac - -need_locks="$enable_libtool_lock" - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -set dummy ${ac_tool_prefix}mt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$MANIFEST_TOOL"; then - ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -if test -n "$MANIFEST_TOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -$as_echo "$MANIFEST_TOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_MANIFEST_TOOL"; then - ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL - # Extract the first word of "mt", so it can be a program name with args. -set dummy mt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_MANIFEST_TOOL"; then - ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -if test -n "$ac_ct_MANIFEST_TOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_MANIFEST_TOOL" = x; then - MANIFEST_TOOL=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL - fi -else - MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -fi - -test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -if ${lt_cv_path_mainfest_tool+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_path_mainfest_tool=no - echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 - $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out - cat conftest.err >&5 - if $GREP 'Manifest Tool' conftest.out > /dev/null; then - lt_cv_path_mainfest_tool=yes - fi - rm -f conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -$as_echo "$lt_cv_path_mainfest_tool" >&6; } -if test "x$lt_cv_path_mainfest_tool" != xyes; then - MANIFEST_TOOL=: -fi - - - - - - - case $host_os in - rhapsody* | darwin*) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. -set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DSYMUTIL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$DSYMUTIL"; then - ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -DSYMUTIL=$ac_cv_prog_DSYMUTIL -if test -n "$DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 -$as_echo "$DSYMUTIL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_DSYMUTIL"; then - ac_ct_DSYMUTIL=$DSYMUTIL - # Extract the first word of "dsymutil", so it can be a program name with args. -set dummy dsymutil; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DSYMUTIL"; then - ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL -if test -n "$ac_ct_DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 -$as_echo "$ac_ct_DSYMUTIL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_DSYMUTIL" = x; then - DSYMUTIL=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - DSYMUTIL=$ac_ct_DSYMUTIL - fi -else - DSYMUTIL="$ac_cv_prog_DSYMUTIL" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. -set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_NMEDIT+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$NMEDIT"; then - ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -NMEDIT=$ac_cv_prog_NMEDIT -if test -n "$NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 -$as_echo "$NMEDIT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_NMEDIT"; then - ac_ct_NMEDIT=$NMEDIT - # Extract the first word of "nmedit", so it can be a program name with args. -set dummy nmedit; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_NMEDIT"; then - ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_NMEDIT="nmedit" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT -if test -n "$ac_ct_NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 -$as_echo "$ac_ct_NMEDIT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_NMEDIT" = x; then - NMEDIT=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - NMEDIT=$ac_ct_NMEDIT - fi -else - NMEDIT="$ac_cv_prog_NMEDIT" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. -set dummy ${ac_tool_prefix}lipo; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_LIPO+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$LIPO"; then - ac_cv_prog_LIPO="$LIPO" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_LIPO="${ac_tool_prefix}lipo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -LIPO=$ac_cv_prog_LIPO -if test -n "$LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 -$as_echo "$LIPO" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_LIPO"; then - ac_ct_LIPO=$LIPO - # Extract the first word of "lipo", so it can be a program name with args. -set dummy lipo; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_LIPO+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_LIPO"; then - ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_LIPO="lipo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO -if test -n "$ac_ct_LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 -$as_echo "$ac_ct_LIPO" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_LIPO" = x; then - LIPO=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - LIPO=$ac_ct_LIPO - fi -else - LIPO="$ac_cv_prog_LIPO" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. -set dummy ${ac_tool_prefix}otool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$OTOOL"; then - ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OTOOL="${ac_tool_prefix}otool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -OTOOL=$ac_cv_prog_OTOOL -if test -n "$OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 -$as_echo "$OTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_OTOOL"; then - ac_ct_OTOOL=$OTOOL - # Extract the first word of "otool", so it can be a program name with args. -set dummy otool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_OTOOL"; then - ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_OTOOL="otool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL -if test -n "$ac_ct_OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 -$as_echo "$ac_ct_OTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_OTOOL" = x; then - OTOOL=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - OTOOL=$ac_ct_OTOOL - fi -else - OTOOL="$ac_cv_prog_OTOOL" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. -set dummy ${ac_tool_prefix}otool64; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL64+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$OTOOL64"; then - ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -OTOOL64=$ac_cv_prog_OTOOL64 -if test -n "$OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 -$as_echo "$OTOOL64" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_OTOOL64"; then - ac_ct_OTOOL64=$OTOOL64 - # Extract the first word of "otool64", so it can be a program name with args. -set dummy otool64; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_OTOOL64"; then - ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_OTOOL64="otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 -if test -n "$ac_ct_OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 -$as_echo "$ac_ct_OTOOL64" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_OTOOL64" = x; then - OTOOL64=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - OTOOL64=$ac_ct_OTOOL64 - fi -else - OTOOL64="$ac_cv_prog_OTOOL64" -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 -$as_echo_n "checking for -single_module linker flag... " >&6; } -if ${lt_cv_apple_cc_single_mod+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the - # link flags. - rm -rf libconftest.dylib* - echo "int foo(void){return 1;}" > conftest.c - echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ --dynamiclib -Wl,-single_module conftest.c" >&5 - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib -Wl,-single_module conftest.c 2>conftest.err - _lt_result=$? - # If there is a non-empty error log, and "single_module" - # appears in it, assume the flag caused a linker warning - if test -s conftest.err && $GREP single_module conftest.err; then - cat conftest.err >&5 - # Otherwise, if the output was created with a 0 exit code from - # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&5 - fi - rm -rf libconftest.dylib* - rm -f conftest.* - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 -$as_echo "$lt_cv_apple_cc_single_mod" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 -$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if ${lt_cv_ld_exported_symbols_list+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - lt_cv_ld_exported_symbols_list=yes -else - lt_cv_ld_exported_symbols_list=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 -$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 -$as_echo_n "checking for -force_load linker flag... " >&6; } -if ${lt_cv_ld_force_load+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ld_force_load=no - cat > conftest.c << _LT_EOF -int forced_loaded() { return 2;} -_LT_EOF - echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 - echo "$RANLIB libconftest.a" >&5 - $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF -int main() { return 0;} -_LT_EOF - echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 - $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err - _lt_result=$? - if test -s conftest.err && $GREP force_load conftest.err; then - cat conftest.err >&5 - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then - lt_cv_ld_force_load=yes - else - cat conftest.err >&5 - fi - rm -f conftest.err libconftest.a conftest conftest.c - rm -rf conftest.dSYM - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 -$as_echo "$lt_cv_ld_force_load" >&6; } - case $host_os in - rhapsody* | darwin1.[012]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; - darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - esac - ;; - esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then - _lt_dar_single_mod='$single_module' - fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' - else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= - fi - ;; - esac - -for ac_header in dlfcn.h -do : - ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default -" -if test "x$ac_cv_header_dlfcn_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_DLFCN_H 1 -_ACEOF - -fi - -done - - - - -func_stripname_cnf () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname_cnf - - - - - -# Set options - - - - enable_dlopen=no - - - enable_win32_dll=no - - - # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then : - enableval=$enable_shared; p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_shared=yes -fi - - - - - - - - - - # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then : - enableval=$enable_static; p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_static=yes -fi - - - - - - - - - - -# Check whether --with-pic was given. -if test "${with_pic+set}" = set; then : - withval=$with_pic; lt_p=${PACKAGE-default} - case $withval in - yes|no) pic_mode=$withval ;; - *) - pic_mode=default - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for lt_pkg in $withval; do - IFS="$lt_save_ifs" - if test "X$lt_pkg" = "X$lt_p"; then - pic_mode=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - pic_mode=default -fi - - -test -z "$pic_mode" && pic_mode=default - - - - - - - - # Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then : - enableval=$enable_fast_install; p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_fast_install=yes -fi - - - - - - - - - - - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -test -z "$LN_S" && LN_S="ln -s" - - - - - - - - - - - - - - -if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 -$as_echo_n "checking for objdir... " >&6; } -if ${lt_cv_objdir+:} false; then : - $as_echo_n "(cached) " >&6 -else - rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 -$as_echo "$lt_cv_objdir" >&6; } -objdir=$lt_cv_objdir - - - - - -cat >>confdefs.h <<_ACEOF -#define LT_OBJDIR "$lt_cv_objdir/" -_ACEOF - - - - -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Global variables: -ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a - -with_gnu_ld="$lt_cv_prog_gnu_ld" - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$LD" && LD=ld -test -z "$ac_objext" && ac_objext=o - -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` - - -# Only perform the check for file, if the check method requires it -test -z "$MAGIC_CMD" && MAGIC_CMD=file -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 -$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $MAGIC_CMD in -[\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<_LT_EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -_LT_EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac -fi - -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - - - -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 -$as_echo_n "checking for file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $MAGIC_CMD in -[\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<_LT_EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -_LT_EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac -fi - -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - else - MAGIC_CMD=: - fi -fi - - fi - ;; -esac - -# Use C for the default configuration in the libtool script - -lt_save_CC="$CC" -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -# Source file extension for C test sources. -ac_ext=c - -# Object file extension for compiled C test sources. -objext=o -objext=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' - - - - - - - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC - -# Save the default compiler, since it gets overwritten when the other -# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. -compiler_DEFAULT=$CC - -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* - -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* - - -if test -n "$compiler"; then - -lt_prog_compiler_no_builtin_flag= - -if test "$GCC" = yes; then - case $cc_basename in - nvcc*) - lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; - *) - lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; - esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_rtti_exceptions=yes - fi - fi - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } - -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then - lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" -else - : -fi - -fi - - - - - - - lt_prog_compiler_wl= -lt_prog_compiler_pic= -lt_prog_compiler_static= - - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_static='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - lt_prog_compiler_pic='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic='-fno-common' - ;; - - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - lt_prog_compiler_static= - ;; - - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic='-fPIC' - ;; - esac - ;; - - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - lt_prog_compiler_can_build_shared=no - enable_shared=no - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic='-fPIC -shared' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic=-Kconform_pic - fi - ;; - - *) - lt_prog_compiler_pic='-fPIC' - ;; - esac - - case $cc_basename in - nvcc*) # Cuda Compiler Driver 2.2 - lt_prog_compiler_wl='-Xlinker ' - if test -n "$lt_prog_compiler_pic"; then - lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" - fi - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' - else - lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' - fi - ;; - - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; - - hpux9* | hpux10* | hpux11*) - lt_prog_compiler_wl='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - lt_prog_compiler_wl='-Wl,' - # PIC (with -KPIC) is the default. - lt_prog_compiler_static='-non_shared' - ;; - - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. - ecc*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-static' - ;; - # icc used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - icc* | ifort*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fPIC' - lt_prog_compiler_static='-static' - ;; - # Lahey Fortran 8.1. - lf95*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; - nagfor*) - # NAG Fortran compiler - lt_prog_compiler_wl='-Wl,-Wl,,' - lt_prog_compiler_pic='-PIC' - lt_prog_compiler_static='-Bstatic' - ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fpic' - lt_prog_compiler_static='-Bstatic' - ;; - ccc*) - lt_prog_compiler_wl='-Wl,' - # All Alpha code is PIC. - lt_prog_compiler_static='-non_shared' - ;; - xl* | bgxl* | bgf* | mpixl*) - # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-qpic' - lt_prog_compiler_static='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='' - ;; - *Sun\ F* | *Sun*Fortran*) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Qoption ld ' - ;; - *Sun\ C*) - # Sun C 5.9 - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Wl,' - ;; - *Intel*\ [CF]*Compiler*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fPIC' - lt_prog_compiler_static='-static' - ;; - *Portland\ Group*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fpic' - lt_prog_compiler_static='-Bstatic' - ;; - esac - ;; - esac - ;; - - newsos6) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic='-fPIC -shared' - ;; - - osf3* | osf4* | osf5*) - lt_prog_compiler_wl='-Wl,' - # All OSF/1 code is PIC. - lt_prog_compiler_static='-non_shared' - ;; - - rdos*) - lt_prog_compiler_static='-non_shared' - ;; - - solaris*) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in - f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; - esac - ;; - - sunos4*) - lt_prog_compiler_wl='-Qoption ld ' - lt_prog_compiler_pic='-PIC' - lt_prog_compiler_static='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - lt_prog_compiler_pic='-Kconform_pic' - lt_prog_compiler_static='-Bstatic' - fi - ;; - - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - - unicos*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_can_build_shared=no - ;; - - uts4*) - lt_prog_compiler_pic='-pic' - lt_prog_compiler_static='-Bstatic' - ;; - - *) - lt_prog_compiler_can_build_shared=no - ;; - esac - fi - -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic= - ;; - *) - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; -esac - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -if ${lt_cv_prog_compiler_pic+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -$as_echo "$lt_cv_prog_compiler_pic" >&6; } -lt_prog_compiler_pic=$lt_cv_prog_compiler_pic - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if ${lt_cv_prog_compiler_pic_works+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_pic_works=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works=yes - fi - fi - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } - -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then - case $lt_prog_compiler_pic in - "" | " "*) ;; - *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; - esac -else - lt_prog_compiler_pic= - lt_prog_compiler_can_build_shared=no -fi - -fi - - - - - - - - - - - -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if ${lt_cv_prog_compiler_static_works+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works=yes - fi - else - lt_cv_prog_compiler_static_works=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 -$as_echo "$lt_cv_prog_compiler_static_works" >&6; } - -if test x"$lt_cv_prog_compiler_static_works" = xyes; then - : -else - lt_prog_compiler_static= -fi - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o=yes - fi - fi - chmod u+w . 2>&5 - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o=yes - fi - fi - chmod u+w . 2>&5 - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } - - - - -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 -$as_echo_n "checking if we can lock with hard links... " >&6; } - hard_links=yes - $RM conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -else - need_locks=no -fi - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - - runpath_var= - allow_undefined_flag= - always_export_symbols=no - archive_cmds= - archive_expsym_cmds= - compiler_needs_object=no - enable_shared_with_static_runtimes=no - export_dynamic_flag_spec= - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - hardcode_automatic=no - hardcode_direct=no - hardcode_direct_absolute=no - hardcode_libdir_flag_spec= - hardcode_libdir_separator= - hardcode_minus_L=no - hardcode_shlibpath_var=unsupported - inherit_rpath=no - link_all_deplibs=unknown - module_cmds= - module_expsym_cmds= - old_archive_from_new_cmds= - old_archive_from_expsyms_cmds= - thread_safe_flag_spec= - whole_archive_flag_spec= - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - include_expsyms= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. - extract_expsyms_cmds= - - case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; - esac - - ld_shlibs=yes - - # On some targets, GNU ld is compatible enough with the native linker - # that we're better off using the native interface for both. - lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then - case $host_os in - aix*) - # The AIX port of GNU ld has always aspired to compatibility - # with the native linker. However, as the warning in the GNU ld - # block says, versions before 2.19.5* couldn't really create working - # shared libraries, regardless of the interface used. - case `$LD -v 2>&1` in - *\ \(GNU\ Binutils\)\ 2.19.5*) ;; - *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; - *\ \(GNU\ Binutils\)\ [3-9]*) ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - fi - - if test "$lt_use_gnu_ld_interface" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec= - fi - supports_anon_versioning=no - case `$LD -v 2>&1` in - *GNU\ gold*) supports_anon_versioning=yes ;; - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - - # See if GNU ld supports shared libraries. - case $host_os in - aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs=no - cat <<_LT_EOF 1>&2 - -*** Warning: the GNU linker, at least up to release 2.19, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to install binutils -*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. -*** You will then need to restart the configuration process. - -_LT_EOF - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='' - ;; - m68k) - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - esac - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs=no - fi - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' - export_dynamic_flag_spec='${wl}--export-all-symbols' - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' - exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs=no - fi - ;; - - haiku*) - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - link_all_deplibs=yes - ;; - - interix[3-9]*) - hardcode_direct=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - - gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) - tmp_diet=no - if test "$host_os" = linux-dietlibc; then - case $cc_basename in - diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) - esac - fi - if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no - then - tmp_addflag=' $pic_flag' - tmp_sharedflag='-shared' - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - lf95*) # Lahey Fortran 8.1 - whole_archive_flag_spec= - tmp_sharedflag='--shared' ;; - xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) - tmp_sharedflag='-qmkshrobj' - tmp_addflag= ;; - nvcc*) # Cuda Compiler Driver 2.2 - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - compiler_needs_object=yes - ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - compiler_needs_object=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - esac - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - - case $cc_basename in - xlf* | bgf* | bgxlf* | mpixlf*) - # IBM XL Fortran 10.1 on PPC cannot create shared libs itself - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac - else - ld_shlibs=no - fi - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris*) - if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then - ld_shlibs=no - cat <<_LT_EOF 1>&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs=no - cat <<_LT_EOF 1>&2 - -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -_LT_EOF - ;; - *) - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - ;; - - sunos4*) - archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - - if test "$ld_shlibs" = no; then - runpath_var= - hardcode_libdir_flag_spec= - export_dynamic_flag_spec= - whole_archive_flag_spec= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - allow_undefined_flag=unsupported - always_export_symbols=yes - archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct=unsupported - fi - ;; - - aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - archive_cmds='' - hardcode_direct=yes - hardcode_direct_absolute=yes - hardcode_libdir_separator=':' - link_all_deplibs=yes - file_list_spec='${wl}-f,' - - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - export_dynamic_flag_spec='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - if ${lt_cv_aix_libpath_+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }' - lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" - fi - -fi - - aix_libpath=$lt_cv_aix_libpath_ -fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - if ${lt_cv_aix_libpath_+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }' - lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" - fi - -fi - - aix_libpath=$lt_cv_aix_libpath_ -fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec='$convenience' - fi - archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='' - ;; - m68k) - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - esac - ;; - - bsdi[45]*) - export_dynamic_flag_spec=-rdynamic - ;; - - cygwin* | mingw* | pw32* | cegcc*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - case $cc_basename in - cl*) - # Native MSVC - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - always_export_symbols=yes - file_list_spec='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, )='true' - enable_shared_with_static_runtimes=yes - exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - # Don't use ranlib - old_postinstall_cmds='chmod 644 $oldlib' - postlink_cmds='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # Assume MSVC wrapper - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_from_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - enable_shared_with_static_runtimes=yes - ;; - esac - ;; - - darwin* | rhapsody*) - - - archive_cmds_need_lc=no - hardcode_direct=no - hardcode_automatic=yes - hardcode_shlibpath_var=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - - else - whole_archive_flag_spec='' - fi - link_all_deplibs=yes - allow_undefined_flag="$_lt_dar_allow_undefined" - case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - - else - ld_shlibs=no - fi - - ;; - - dgux*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2.*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - hpux9*) - if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' - ;; - - hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - fi - ;; - - hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - - # Older versions of the 11.00 compiler do not understand -b yet - # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 -$as_echo_n "checking if $CC understands -b... " >&6; } -if ${lt_cv_prog_compiler__b+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler__b=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -b" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler__b=yes - fi - else - lt_cv_prog_compiler__b=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 -$as_echo "$lt_cv_prog_compiler__b" >&6; } - -if test x"$lt_cv_prog_compiler__b" = xyes; then - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -fi - - ;; - esac - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - - case $host_cpu in - hppa*64*|ia64*) - hardcode_direct=no - hardcode_shlibpath_var=no - ;; - *) - hardcode_direct=yes - hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. - # This should be the same for all languages, so no per-tag cache variable. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -if ${lt_cv_irix_exported_symbol+:} false; then : - $as_echo_n "(cached) " >&6 -else - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int foo (void) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - lt_cv_irix_exported_symbol=yes -else - lt_cv_irix_exported_symbol=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -$as_echo "$lt_cv_irix_exported_symbol" >&6; } - if test "$lt_cv_irix_exported_symbol" = yes; then - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - fi - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' - fi - archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - inherit_rpath=yes - link_all_deplibs=yes - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - newsos6) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_shlibpath_var=no - ;; - - *nto* | *qnx*) - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct=yes - hardcode_shlibpath_var=no - hardcode_direct_absolute=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac - fi - else - ld_shlibs=no - fi - ;; - - os2*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - fi - archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' - - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' - fi - archive_cmds_need_lc='no' - hardcode_libdir_separator=: - ;; - - solaris*) - no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) - wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' - ;; - *) - wlarc='${wl}' - archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - ;; - esac - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_shlibpath_var=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' - fi - ;; - esac - link_all_deplibs=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - sysv4) - case $host_vendor in - sni) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' - reload_cmds='$CC -r -o $output$reload_objs' - hardcode_direct=no - ;; - motorola) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var=no - ;; - - sysv4.3*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - export_dynamic_flag_spec='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs=yes - fi - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-R,$libdir' - hardcode_libdir_separator=':' - link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - uts4*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - *) - ld_shlibs=no - ;; - esac - - if test x$host_vendor = xsni; then - case $host in - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - export_dynamic_flag_spec='${wl}-Blargedynsym' - ;; - esac - fi - fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 -$as_echo "$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no - -with_gnu_ld=$with_gnu_ld - - - - - - - - - - - - - - - -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if ${lt_cv_archive_cmds_need_lc+:} false; then : - $as_echo_n "(cached) " >&6 -else - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl - pic_flag=$lt_prog_compiler_pic - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 - (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - then - lt_cv_archive_cmds_need_lc=no - else - lt_cv_archive_cmds_need_lc=yes - fi - allow_undefined_flag=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 -$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } - archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc - ;; - esac - fi - ;; -esac - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 -$as_echo_n "checking dynamic linker characteristics... " >&6; } - -if test "$GCC" = yes; then - case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac - case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` - case $lt_search_path_spec in - *\;*) - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` - ;; - *) - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` - ;; - esac - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else - test -d "$lt_sys_path" && \ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done - lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; - } else { - lt_count--; - } - } - } - } - if (lt_foo != "") { lt_freq[lt_foo]++; } - if (lt_freq[lt_foo] == 1) { print lt_foo; } -}'` - # AWK program above erroneously prepends '/' to C:/dos/paths - # for these hosts. - case $host_os in - mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([A-Za-z]:\),\1,g'` ;; - esac - sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix[4-9]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - case $host_cpu in - powerpc) - # Since July 2007 AmigaOS4 officially supports .so libraries. - # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - ;; - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[45]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32* | cegcc*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$cc_basename in - yes,*) - # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" - ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - dynamic_linker='Win32 ld.exe' - ;; - - *,cl*) - # Native MSVC - libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' - - case $build_os in - mingw*) - sys_lib_search_path_spec= - lt_save_ifs=$IFS - IFS=';' - for lt_path in $LIB - do - IFS=$lt_save_ifs - # Let DOS variable expansion print the short 8.3 style file name. - lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` - sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" - done - IFS=$lt_save_ifs - # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` - ;; - cygwin*) - # Convert to unix form, then to dos form, then back to unix form - # but this time dos style (no spaces!) so that the unix form looks - # like /cygdrive/c/PROGRA~1:/cygdr... - sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` - sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` - sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - ;; - *) - sys_lib_search_path_spec="$LIB" - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - # FIXME: find the short name or the path components, as spaces are - # common. (e.g. "Program Files" -> "PROGRA~1") - ;; - esac - - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - dynamic_linker='Win32 link.exe' - ;; - - *) - # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - dynamic_linker='Win32 ld.exe' - ;; - esac - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[23].*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2.*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -haiku*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555, ... - postinstall_cmds='chmod 555 $lib' - # or fails outright, so override atomically: - install_override_mode=555 - ;; - -interix[3-9]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux # correct to gnu/linux during the next big refactor - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - - # Some binutils ld are patched to set DT_RUNPATH - if ${lt_cv_shlibpath_overrides_runpath+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_shlibpath_overrides_runpath=no - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : - lt_cv_shlibpath_overrides_runpath=yes -fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - -fi - - shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -*nto* | *qnx*) - version_type=qnx - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='ldqnx.so' - ;; - -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -rdos*) - dynamic_linker=no - ;; - -solaris*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -uts4*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } -hardcode_action= -if test -n "$hardcode_libdir_flag_spec" || - test -n "$runpath_var" || - test "X$hardcode_automatic" = "Xyes" ; then - - # We can hardcode non-existent directories. - if test "$hardcode_direct" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action=unsupported -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 -$as_echo "$hardcode_action" >&6; } - -if test "$hardcode_action" = relink || - test "$inherit_rpath" = yes; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - - - - - - - if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= - - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; - - darwin*) - # if libdl is installed we need to link against it - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dl_dlopen=yes -else - ac_cv_lib_dl_dlopen=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - -fi - - ;; - - *) - ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -if test "x$ac_cv_func_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 -$as_echo_n "checking for shl_load in -ldld... " >&6; } -if ${ac_cv_lib_dld_shl_load+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (); -int -main () -{ -return shl_load (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dld_shl_load=yes -else - ac_cv_lib_dld_shl_load=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 -$as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" -else - ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -if test "x$ac_cv_func_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dl_dlopen=yes -else - ac_cv_lib_dl_dlopen=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 -$as_echo_n "checking for dlopen in -lsvld... " >&6; } -if ${ac_cv_lib_svld_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsvld $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_svld_dlopen=yes -else - ac_cv_lib_svld_dlopen=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 -$as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 -$as_echo_n "checking for dld_link in -ldld... " >&6; } -if ${ac_cv_lib_dld_dld_link+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dld_link (); -int -main () -{ -return dld_link (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dld_dld_link=yes -else - ac_cv_lib_dld_dld_link=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 -$as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = xyes; then : - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" -fi - - -fi - - -fi - - -fi - - -fi - - -fi - - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 -$as_echo_n "checking whether a program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -#line $LINENO "configure" -#include "confdefs.h" - -#if HAVE_DLFCN_H -#include -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -/* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -int fnord () __attribute__((visibility("default"))); -#endif - -int fnord () { return 42; } -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else - { - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - else puts (dlerror ()); - } - /* dlclose (self); */ - } - else - puts (dlerror ()); - - return status; -} -_LT_EOF - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 - (eval $ac_link) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self=no - fi -fi -rm -fr conftest* - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 -$as_echo "$lt_cv_dlopen_self" >&6; } - - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 -$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self_static+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self_static=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -#line $LINENO "configure" -#include "confdefs.h" - -#if HAVE_DLFCN_H -#include -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -/* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -int fnord () __attribute__((visibility("default"))); -#endif - -int fnord () { return 42; } -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else - { - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - else puts (dlerror ()); - } - /* dlclose (self); */ - } - else - puts (dlerror ()); - - return status; -} -_LT_EOF - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 - (eval $ac_link) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self_static=no - fi -fi -rm -fr conftest* - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 -$as_echo "$lt_cv_dlopen_self_static" >&6; } - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi - - - - - - - - - - - - - - - - - -striplib= -old_striplib= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 -$as_echo_n "checking whether stripping libraries is possible... " >&6; } -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ;; - esac -fi - - - - - - - - - - - - - # Report which library types will actually be built - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 -$as_echo_n "checking if libtool supports shared libraries... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 -$as_echo "$can_build_shared" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 -$as_echo_n "checking whether to build shared libraries... " >&6; } - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - - aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 -$as_echo "$enable_shared" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 -$as_echo_n "checking whether to build static libraries... " >&6; } - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 -$as_echo "$enable_static" >&6; } - - - - -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -CC="$lt_save_CC" - - if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 -$as_echo_n "checking how to run the C++ preprocessor... " >&6; } -if test -z "$CXXCPP"; then - if ${ac_cv_prog_CXXCPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi - - done - ac_cv_prog_CXXCPP=$CXXCPP - -fi - CXXCPP=$ac_cv_prog_CXXCPP -else - ac_cv_prog_CXXCPP=$CXXCPP -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 -$as_echo "$CXXCPP" >&6; } -ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -else - _lt_caught_CXX_error=yes -fi - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -archive_cmds_need_lc_CXX=no -allow_undefined_flag_CXX= -always_export_symbols_CXX=no -archive_expsym_cmds_CXX= -compiler_needs_object_CXX=no -export_dynamic_flag_spec_CXX= -hardcode_direct_CXX=no -hardcode_direct_absolute_CXX=no -hardcode_libdir_flag_spec_CXX= -hardcode_libdir_separator_CXX= -hardcode_minus_L_CXX=no -hardcode_shlibpath_var_CXX=unsupported -hardcode_automatic_CXX=no -inherit_rpath_CXX=no -module_cmds_CXX= -module_expsym_cmds_CXX= -link_all_deplibs_CXX=unknown -old_archive_cmds_CXX=$old_archive_cmds -reload_flag_CXX=$reload_flag -reload_cmds_CXX=$reload_cmds -no_undefined_flag_CXX= -whole_archive_flag_spec_CXX= -enable_shared_with_static_runtimes_CXX=no - -# Source file extension for C++ test sources. -ac_ext=cpp - -# Object file extension for compiled C++ test sources. -objext=o -objext_CXX=$objext - -# No sense in running all these tests if we already determined that -# the CXX compiler isn't working. Some variables (like enable_shared) -# are currently assumed to apply to all compilers on this platform, -# and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="int some_variable = 0;" - - # Code to be used in simple link tests - lt_simple_link_test_code='int main(int, char *[]) { return(0); }' - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - - - - - - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC - - - # save warnings/boilerplate of simple test code - ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* - - ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* - - - # Allow CC to be a program name with arguments. - lt_save_CC=$CC - lt_save_CFLAGS=$CFLAGS - lt_save_LD=$LD - lt_save_GCC=$GCC - GCC=$GXX - lt_save_with_gnu_ld=$with_gnu_ld - lt_save_path_LD=$lt_cv_path_LD - if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx - else - $as_unset lt_cv_prog_gnu_ld - fi - if test -n "${lt_cv_path_LDCXX+set}"; then - lt_cv_path_LD=$lt_cv_path_LDCXX - else - $as_unset lt_cv_path_LD - fi - test -z "${LDCXX+set}" || LD=$LDCXX - CC=${CXX-"c++"} - CFLAGS=$CXXFLAGS - compiler=$CC - compiler_CXX=$CC - for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` - - - if test -n "$compiler"; then - # We don't want -fno-exception when compiling C++ code, so set the - # no_builtin_flag separately - if test "$GXX" = yes; then - lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' - else - lt_prog_compiler_no_builtin_flag_CXX= - fi - - if test "$GXX" = yes; then - # Set up default GNU C++ configuration - - - -# Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi - -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -$as_echo_n "checking for ld used by $CC... " >&6; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -$as_echo_n "checking for GNU ld... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -$as_echo_n "checking for non-GNU ld... " >&6; } -fi -if ${lt_cv_path_LD+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &5 -$as_echo "$LD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if ${lt_cv_prog_gnu_ld+:} false; then : - $as_echo_n "(cached) " >&6 -else - # I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 &5 -$as_echo "$lt_cv_prog_gnu_ld" >&6; } -with_gnu_ld=$lt_cv_prog_gnu_ld - - - - - - - - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' - - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | - $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_CXX= - fi - else - with_gnu_ld=no - wlarc= - - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on - # the platform it is being used on. - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - - else - GXX=no - with_gnu_ld=no - wlarc= - fi - - # PORTME: fill in a description of your system's C++ link characteristics - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - ld_shlibs_CXX=yes - case $host_os in - aix3*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - ;; - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - archive_cmds_CXX='' - hardcode_direct_CXX=yes - hardcode_direct_absolute_CXX=yes - hardcode_libdir_separator_CXX=':' - link_all_deplibs_CXX=yes - file_list_spec_CXX='${wl}-f,' - - if test "$GXX" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct_CXX=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L_CXX=yes - hardcode_libdir_flag_spec_CXX='-L$libdir' - hardcode_libdir_separator_CXX= - fi - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - export_dynamic_flag_spec_CXX='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to - # export. - always_export_symbols_CXX=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag_CXX='-berok' - # Determine the default libpath from the value encoded in an empty - # executable. - if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - if ${lt_cv_aix_libpath__CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }' - lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX="/usr/lib:/lib" - fi - -fi - - aix_libpath=$lt_cv_aix_libpath__CXX -fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - - archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' - allow_undefined_flag_CXX="-z nodefs" - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - if ${lt_cv_aix_libpath__CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }' - lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$lt_cv_aix_libpath__CXX"; then - lt_cv_aix_libpath__CXX="/usr/lib:/lib" - fi - -fi - - aix_libpath=$lt_cv_aix_libpath__CXX -fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag_CXX=' ${wl}-bernotok' - allow_undefined_flag_CXX=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec_CXX='$convenience' - fi - archive_cmds_need_lc_CXX=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_CXX=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs_CXX=no - fi - ;; - - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - cygwin* | mingw* | pw32* | cegcc*) - case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec_CXX=' ' - allow_undefined_flag_CXX=unsupported - always_export_symbols_CXX=yes - file_list_spec_CXX='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' - enable_shared_with_static_runtimes_CXX=yes - # Don't use ranlib - old_postinstall_cmds_CXX='chmod 644 $oldlib' - postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # g++ - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_CXX='-L$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' - allow_undefined_flag_CXX=unsupported - always_export_symbols_CXX=no - enable_shared_with_static_runtimes_CXX=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs_CXX=no - fi - ;; - esac - ;; - darwin* | rhapsody*) - - - archive_cmds_need_lc_CXX=no - hardcode_direct_CXX=no - hardcode_automatic_CXX=yes - hardcode_shlibpath_var_CXX=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - - else - whole_archive_flag_spec_CXX='' - fi - link_all_deplibs_CXX=yes - allow_undefined_flag_CXX="$_lt_dar_allow_undefined" - case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=func_echo_all - archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - if test "$lt_cv_apple_cc_single_mod" != "yes"; then - archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi - - else - ld_shlibs_CXX=no - fi - - ;; - - dgux*) - case $cc_basename in - ec++*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - freebsd2.*) - # C++ shared libraries reported to be fairly broken before - # switch to ELF - ld_shlibs_CXX=no - ;; - - freebsd-elf*) - archive_cmds_need_lc_CXX=no - ;; - - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - ld_shlibs_CXX=yes - ;; - - gnu*) - ;; - - haiku*) - archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - link_all_deplibs_CXX=yes - ;; - - hpux9*) - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: - export_dynamic_flag_spec_CXX='${wl}-E' - hardcode_direct_CXX=yes - hardcode_minus_L_CXX=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aCC*) - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes; then - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - case $host_cpu in - hppa*64*|ia64*) - ;; - *) - export_dynamic_flag_spec_CXX='${wl}-E' - ;; - esac - fi - case $host_cpu in - hppa*64*|ia64*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - ;; - *) - hardcode_direct_CXX=yes - hardcode_direct_absolute_CXX=yes - hardcode_minus_L_CXX=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - esac - - case $cc_basename in - CC*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aCC*) - case $host_cpu in - hppa*64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case $host_cpu in - hppa*64*) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) - archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - - interix[3-9]*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - irix5* | irix6*) - case $cc_basename in - CC*) - # SGI C++ - archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' - fi - fi - link_all_deplibs_CXX=yes - ;; - esac - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - inherit_rpath_CXX=yes - ;; - - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc* | ecpc* ) - # Intel C++ - with_gnu_ld=yes - # version 8.0 and above of icpc choke on multiply defined symbols - # if we add $predep_objects and $postdep_objects, however 7.1 and - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac - archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac - archive_cmds_need_lc_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - case `$CC -V` in - *pgCC\ [1-5].* | *pgcpp\ [1-5].*) - prelink_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' - old_archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' - archive_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - *) # Version 6 and above use weak symbols - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' - ;; - esac - - hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - ;; - cxx*) - # Compaq C++ - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_CXX='-rpath $libdir' - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' - ;; - xl* | mpixl* | bgxl*) - # IBM XL 8.0 on PPC, with GNU ld - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' - hardcode_libdir_flag_spec_CXX='-R$libdir' - whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - compiler_needs_object_CXX=yes - - # Not sure whether something based on - # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 - # would be better. - output_verbose_link_cmd='func_echo_all' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' - ;; - esac - ;; - esac - ;; - - lynxos*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - - m88k*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - - mvs*) - case $cc_basename in - cxx*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - - *nto* | *qnx*) - ld_shlibs_CXX=yes - ;; - - openbsd2*) - # C++ shared libraries are fairly broken - ld_shlibs_CXX=no - ;; - - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - hardcode_direct_absolute_CXX=yes - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - export_dynamic_flag_spec_CXX='${wl}-E' - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - fi - output_verbose_link_cmd=func_echo_all - else - ld_shlibs_CXX=no - fi - ;; - - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - hardcode_libdir_separator_CXX=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - case $host in - osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;; - *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;; - esac - ;; - RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - cxx*) - case $host in - osf3*) - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - ;; - *) - allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' - hardcode_libdir_flag_spec_CXX='-rpath $libdir' - ;; - esac - - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - case $host in - osf3*) - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - *) - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - ;; - esac - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - - psos*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - lcc*) - # Lucid - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - solaris*) - case $cc_basename in - CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - archive_cmds_need_lc_CXX=yes - no_undefined_flag_CXX=' -zdefs' - archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_shlibpath_var_CXX=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' - ;; - esac - link_all_deplibs_CXX=yes - - output_verbose_link_cmd='func_echo_all' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' - ;; - gcx*) - # Green Hills C++ Compiler - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - no_undefined_flag_CXX=' ${wl}-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then - archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - fi - - hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - ;; - esac - fi - ;; - esac - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag_CXX='${wl}-z,text' - archive_cmds_need_lc_CXX=no - hardcode_shlibpath_var_CXX=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - no_undefined_flag_CXX='${wl}-z,text' - allow_undefined_flag_CXX='${wl}-z,nodefs' - archive_cmds_need_lc_CXX=no - hardcode_shlibpath_var_CXX=no - hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir' - hardcode_libdir_separator_CXX=':' - link_all_deplibs_CXX=yes - export_dynamic_flag_spec_CXX='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) - archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~ - '"$old_archive_cmds_CXX" - reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~ - '"$reload_cmds_CXX" - ;; - *) - archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - vxworks*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 -$as_echo "$ld_shlibs_CXX" >&6; } - test "$ld_shlibs_CXX" = no && can_build_shared=no - - GCC_CXX="$GXX" - LD_CXX="$LD" - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly - ## what you are doing... - # Dependencies to place before and after the object being linked: -predep_objects_CXX= -postdep_objects_CXX= -predeps_CXX= -postdeps_CXX= -compiler_lib_search_path_CXX= - -cat > conftest.$ac_ext <<_LT_EOF -class Foo -{ -public: - Foo (void) { a = 0; } -private: - int a; -}; -_LT_EOF - - -_lt_libdeps_save_CFLAGS=$CFLAGS -case "$CC $CFLAGS " in #( -*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; -esac - -if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. - - # Sentinel used to keep track of whether or not we are before - # the conftest object file. - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. - # Remove the space. - if test $p = "-L" || - test $p = "-R"; then - prev=$p - continue - fi - - # Expand the sysroot to ease extracting the directories later. - if test -z "$prev"; then - case $p in - -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; - -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; - -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; - esac - fi - case $p in - =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; - esac - if test "$pre_test_object_deps_done" = no; then - case ${prev} in - -L | -R) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. - if test -z "$compiler_lib_search_path_CXX"; then - compiler_lib_search_path_CXX="${prev}${p}" - else - compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" - fi - ;; - # The "-l" case would never come before the object being - # linked, so don't bother handling this case. - esac - else - if test -z "$postdeps_CXX"; then - postdeps_CXX="${prev}${p}" - else - postdeps_CXX="${postdeps_CXX} ${prev}${p}" - fi - fi - prev= - ;; - - *.lto.$objext) ;; # Ignore GCC LTO objects - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. - if test "$p" = "conftest.$objext"; then - pre_test_object_deps_done=yes - continue - fi - - if test "$pre_test_object_deps_done" = no; then - if test -z "$predep_objects_CXX"; then - predep_objects_CXX="$p" - else - predep_objects_CXX="$predep_objects_CXX $p" - fi - else - if test -z "$postdep_objects_CXX"; then - postdep_objects_CXX="$p" - else - postdep_objects_CXX="$postdep_objects_CXX $p" - fi - fi - ;; - - *) ;; # Ignore the rest. - - esac - done - - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling CXX test program" -fi - -$RM -f confest.$objext -CFLAGS=$_lt_libdeps_save_CFLAGS - -# PORTME: override above test on systems where it is broken -case $host_os in -interix[3-9]*) - # Interix 3.5 installs completely hosed .la files for C++, so rather than - # hack all around it, let's just trust "g++" to DTRT. - predep_objects_CXX= - postdep_objects_CXX= - postdeps_CXX= - ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -esac - - -case " $postdeps_CXX " in -*" -lc "*) archive_cmds_need_lc_CXX=no ;; -esac - compiler_lib_search_dirs_CXX= -if test -n "${compiler_lib_search_path_CXX}"; then - compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - lt_prog_compiler_wl_CXX= -lt_prog_compiler_pic_CXX= -lt_prog_compiler_static_CXX= - - - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_CXX='-Bstatic' - fi - ;; - - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - lt_prog_compiler_pic_CXX='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - lt_prog_compiler_pic_CXX='-DDLL_EXPORT' - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic_CXX='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - lt_prog_compiler_pic_CXX= - ;; - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - lt_prog_compiler_static_CXX= - ;; - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic_CXX=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - ;; - *) - lt_prog_compiler_pic_CXX='-fPIC' - ;; - esac - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic_CXX='-fPIC -shared' - ;; - *) - lt_prog_compiler_pic_CXX='-fPIC' - ;; - esac - else - case $host_os in - aix[4-9]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_CXX='-Bstatic' - else - lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler - # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic_CXX='-DDLL_EXPORT' - ;; - dgux*) - case $cc_basename in - ec++*) - lt_prog_compiler_pic_CXX='-KPIC' - ;; - ghcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - lt_prog_compiler_pic_CXX='+Z' - fi - ;; - aCC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic_CXX='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - interix*) - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) - case $cc_basename in - KCC*) - # KAI C++ Compiler - lt_prog_compiler_wl_CXX='--backend -Wl,' - lt_prog_compiler_pic_CXX='-fPIC' - ;; - ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-static' - ;; - icpc* ) - # Intel C++, used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-fPIC' - lt_prog_compiler_static_CXX='-static' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-fpic' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX='-non_shared' - ;; - xlc* | xlC* | bgxl[cC]* | mpixl[cC]*) - # IBM XL 8.0, 9.0 on PPC and BlueGene - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-qpic' - lt_prog_compiler_static_CXX='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - lt_prog_compiler_wl_CXX='-Qoption ld ' - ;; - esac - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx*) - lt_prog_compiler_pic_CXX='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd*) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic_CXX='-fPIC -shared' - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) - lt_prog_compiler_wl_CXX='--backend -Wl,' - ;; - RCC*) - # Rational C++ 2.4.1 - lt_prog_compiler_pic_CXX='-pic' - ;; - cxx*) - # Digital/Compaq C++ - lt_prog_compiler_wl_CXX='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - solaris*) - case $cc_basename in - CC* | sunCC*) - # Sun C++ 4.2, 5.x and Centerline C++ - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - lt_prog_compiler_wl_CXX='-Qoption ld ' - ;; - gcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC*) - # Sun C++ 4.x - lt_prog_compiler_pic_CXX='-pic' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - lcc*) - # Lucid - lt_prog_compiler_pic_CXX='-pic' - ;; - *) - ;; - esac - ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - case $cc_basename in - CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC*) - # NonStop-UX NCC 3.20 - lt_prog_compiler_pic_CXX='-KPIC' - ;; - *) - ;; - esac - ;; - vxworks*) - ;; - *) - lt_prog_compiler_can_build_shared_CXX=no - ;; - esac - fi - -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_CXX= - ;; - *) - lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" - ;; -esac - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -if ${lt_cv_prog_compiler_pic_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } -lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } -if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_pic_works_CXX=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works_CXX=yes - fi - fi - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } - -if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then - case $lt_prog_compiler_pic_CXX in - "" | " "*) ;; - *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; - esac -else - lt_prog_compiler_pic_CXX= - lt_prog_compiler_can_build_shared_CXX=no -fi - -fi - - - - - -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if ${lt_cv_prog_compiler_static_works_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_static_works_CXX=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works_CXX=yes - fi - else - lt_cv_prog_compiler_static_works_CXX=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } - -if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then - : -else - lt_prog_compiler_static_CXX= -fi - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o_CXX=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o_CXX=yes - fi - fi - chmod u+w . 2>&5 - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o_CXX=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o_CXX=yes - fi - fi - chmod u+w . 2>&5 - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } - - - - -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 -$as_echo_n "checking if we can lock with hard links... " >&6; } - hard_links=yes - $RM conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -else - need_locks=no -fi - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - case $host_os in - aix[4-9]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" - ;; - cygwin* | mingw* | cegcc*) - case $cc_basename in - cl*) - exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' - exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - ;; - esac - ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 -$as_echo "$ld_shlibs_CXX" >&6; } -test "$ld_shlibs_CXX" = no && can_build_shared=no - -with_gnu_ld_CXX=$with_gnu_ld - - - - - - -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc_CXX" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc_CXX=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds_CXX in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_CXX - pic_flag=$lt_prog_compiler_pic_CXX - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_CXX - allow_undefined_flag_CXX= - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 - (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - then - lt_cv_archive_cmds_need_lc_CXX=no - else - lt_cv_archive_cmds_need_lc_CXX=yes - fi - allow_undefined_flag_CXX=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5 -$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; } - archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX - ;; - esac - fi - ;; -esac - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 -$as_echo_n "checking dynamic linker characteristics... " >&6; } - -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix[4-9]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - case $host_cpu in - powerpc) - # Since July 2007 AmigaOS4 officially supports .so libraries. - # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - ;; - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -bsdi[45]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; - -cygwin* | mingw* | pw32* | cegcc*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$cc_basename in - yes,*) - # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - - ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - dynamic_linker='Win32 ld.exe' - ;; - - *,cl*) - # Native MSVC - libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' - - case $build_os in - mingw*) - sys_lib_search_path_spec= - lt_save_ifs=$IFS - IFS=';' - for lt_path in $LIB - do - IFS=$lt_save_ifs - # Let DOS variable expansion print the short 8.3 style file name. - lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` - sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" - done - IFS=$lt_save_ifs - # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` - ;; - cygwin*) - # Convert to unix form, then to dos form, then back to unix form - # but this time dos style (no spaces!) so that the unix form looks - # like /cygdrive/c/PROGRA~1:/cygdr... - sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` - sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` - sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - ;; - *) - sys_lib_search_path_spec="$LIB" - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - # FIXME: find the short name or the path components, as spaces are - # common. (e.g. "Program Files" -> "PROGRA~1") - ;; - esac - - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - dynamic_linker='Win32 link.exe' - ;; - - *) - # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - dynamic_linker='Win32 ld.exe' - ;; - esac - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; - -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -dgux*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else - case $host_os in - freebsd[23].*) objformat=aout ;; - *) objformat=elf ;; - esac - fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2.*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -haiku*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; - -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555, ... - postinstall_cmds='chmod 555 $lib' - # or fails outright, so override atomically: - install_override_mode=555 - ;; - -interix[3-9]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux # correct to gnu/linux during the next big refactor - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; - -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; - -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - - # Some binutils ld are patched to set DT_RUNPATH - if ${lt_cv_shlibpath_overrides_runpath+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_shlibpath_overrides_runpath=no - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : - lt_cv_shlibpath_overrides_runpath=yes -fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - -fi - - shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - -newsos6) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - -*nto* | *qnx*) - version_type=qnx - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='ldqnx.so' - ;; - -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -rdos*) - dynamic_linker=no - ;; - -solaris*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; - -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; - -sysv4 | sysv4.3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; - esac - ;; - -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -uts4*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -*) - dynamic_linker=no - ;; -esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } -hardcode_action_CXX= -if test -n "$hardcode_libdir_flag_spec_CXX" || - test -n "$runpath_var_CXX" || - test "X$hardcode_automatic_CXX" = "Xyes" ; then - - # We can hardcode non-existent directories. - if test "$hardcode_direct_CXX" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no && - test "$hardcode_minus_L_CXX" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_CXX=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_CXX=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_CXX=unsupported -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 -$as_echo "$hardcode_action_CXX" >&6; } - -if test "$hardcode_action_CXX" = relink || - test "$inherit_rpath_CXX" = yes; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - - - - - - - - fi # test -n "$compiler" - - CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS - LDCXX=$LD - LD=$lt_save_LD - GCC=$lt_save_GCC - with_gnu_ld=$lt_save_with_gnu_ld - lt_cv_path_LDCXX=$lt_cv_path_LD - lt_cv_path_LD=$lt_save_path_LD - lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld - lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - - - - - - - - - - - - - ac_config_commands="$ac_config_commands libtool" - - - - -# Only expand once: - - - - - - - - - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi - -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - PKG_CONFIG="" - fi -fi - - - # Check whether --enable-schemas-compile was given. -if test "${enable_schemas_compile+set}" = set; then : - enableval=$enable_schemas_compile; case ${enableval} in - yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; - no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; - *) as_fn_error $? "bad value ${enableval} for --enable-schemas-compile" "$LINENO" 5 ;; - esac -fi - - - - - - - - - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi - -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.16 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - PKG_CONFIG="" - fi -fi - gsettingsschemadir=${datadir}/glib-2.0/schemas - - if test x$cross_compiling != xyes; then - GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` - else - # Extract the first word of "glib-compile-schemas", so it can be a program name with args. -set dummy glib-compile-schemas; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GLIB_COMPILE_SCHEMAS+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GLIB_COMPILE_SCHEMAS in - [\\/]* | ?:[\\/]*) - ac_cv_path_GLIB_COMPILE_SCHEMAS="$GLIB_COMPILE_SCHEMAS" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GLIB_COMPILE_SCHEMAS="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -GLIB_COMPILE_SCHEMAS=$ac_cv_path_GLIB_COMPILE_SCHEMAS -if test -n "$GLIB_COMPILE_SCHEMAS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_SCHEMAS" >&5 -$as_echo "$GLIB_COMPILE_SCHEMAS" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi - - if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then - as_fn_error $? "glib-compile-schemas not found." "$LINENO" 5 - else - : - fi - - GSETTINGS_RULES=' -.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas - -mostlyclean-am: clean-gsettings-schemas - -gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) - -%.gschema.valid: %.gschema.xml $(gsettings__enum_file) - $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p $(@D) && touch $@ - -all-am: $(gsettings_SCHEMAS:.xml=.valid) -uninstall-am: uninstall-gsettings-schemas -install-data-am: install-gsettings-schemas - -.SECONDARY: $(gsettings_SCHEMAS) - -install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) - @$(NORMAL_INSTALL) - if test -n "$^"; then \ - test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ - $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ - fi - -uninstall-gsettings-schemas: - @$(NORMAL_UNINSTALL) - @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) - -clean-gsettings-schemas: - rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) - -ifdef gsettings_ENUM_NAMESPACE -$(gsettings__enum_file): $(gsettings_ENUM_FILES) - $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" $^ > $@.tmp && mv $@.tmp $@ -endif -' - - - - - - - -# Extract the first word of "glib-genmarshal", so it can be a program name with args. -set dummy glib-genmarshal; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GLIB_GENMARSHAL+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GLIB_GENMARSHAL in - [\\/]* | ?:[\\/]*) - ac_cv_path_GLIB_GENMARSHAL="$GLIB_GENMARSHAL" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL -if test -n "$GLIB_GENMARSHAL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_GENMARSHAL" >&5 -$as_echo "$GLIB_GENMARSHAL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -# Extract the first word of "glib-mkenums", so it can be a program name with args. -set dummy glib-mkenums; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GLIB_MKENUMS+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GLIB_MKENUMS in - [\\/]* | ?:[\\/]*) - ac_cv_path_GLIB_MKENUMS="$GLIB_MKENUMS" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GLIB_MKENUMS="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS -if test -n "$GLIB_MKENUMS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_MKENUMS" >&5 -$as_echo "$GLIB_MKENUMS" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - - - - # Check whether --enable-appdata-validate was given. -if test "${enable_appdata_validate+set}" = set; then : - enableval=$enable_appdata_validate; -fi - - - if test "x$enable_appdata_validate" != "xno"; then : - # Extract the first word of "appdata-validate", so it can be a program name with args. -set dummy appdata-validate; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_APPDATA_VALIDATE+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $APPDATA_VALIDATE in - [\\/]* | ?:[\\/]*) - ac_cv_path_APPDATA_VALIDATE="$APPDATA_VALIDATE" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_APPDATA_VALIDATE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -APPDATA_VALIDATE=$ac_cv_path_APPDATA_VALIDATE -if test -n "$APPDATA_VALIDATE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $APPDATA_VALIDATE" >&5 -$as_echo "$APPDATA_VALIDATE" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - if test "x$APPDATA_VALIDATE" = "x"; then : - have_appdata_validate=no -else - have_appdata_validate=yes - -fi -else - have_appdata_validate=no -fi - - if test "x$have_appdata_validate" != "xno"; then : - appdata_validate=yes -else - appdata_validate=no - if test "x$enable_appdata_validate" = "xyes"; then : - as_fn_error $? "AppData validation was requested but appdata-validate was not found" "$LINENO" 5 -fi -fi - - appdataxmldir=${datadir}/appdata - - - APPDATA_XML_RULES=' -.PHONY : uninstall-appdata-xml install-appdata-xml clean-appdata-xml - -mostlyclean-am: clean-appdata-xml - -%.appdata.valid: %.appdata.xml - $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; \ - if test -n "$(APPDATA_VALIDATE)"; \ - then $(APPDATA_VALIDATE) --nonet $${d}$<; fi \ - && touch $@ - -check-am: $(appdata_XML:.appdata.xml=.appdata.valid) -uninstall-am: uninstall-appdata-xml -install-data-am: install-appdata-xml - -.SECONDARY: $(appdata_XML) - -install-appdata-xml: $(appdata_XML) - @$(NORMAL_INSTALL) - if test -n "$^"; then \ - test -z "$(appdataxmldir)" || $(MKDIR_P) "$(DESTDIR)$(appdataxmldir)"; \ - $(INSTALL_DATA) $^ "$(DESTDIR)$(appdataxmldir)"; \ - fi - -uninstall-appdata-xml: - @$(NORMAL_UNINSTALL) - @list='\''$(appdata_XML)'\''; test -n "$(appdataxmldir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '\''$(DESTDIR)$(appdataxmldir)'\'' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(appdataxmldir)" && rm -f $$files - -clean-appdata-xml: - rm -f $(appdata_XML:.appdata.xml=.appdata.valid) -' - - - - - - - - -# Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then : - enableval=$enable_debug; case "${enableval}" in - yes) debug=true ;; - no) debug=false ;; - *) as_fn_error $? "bad value ${enableval} for --enable-debug" "$LINENO" 5 ;; - esac -else - debug=false -fi - - -if test $debug = "true"; then - -$as_echo "#define ENABLE_DEBUG 1" >>confdefs.h - -fi - - if test x$debug = xtrue; then - DEBUG_TRUE= - DEBUG_FALSE='#' -else - DEBUG_TRUE='#' - DEBUG_FALSE= -fi - - -# Check whether --enable-encryption was given. -if test "${enable_encryption+set}" = set; then : - enableval=$enable_encryption; case "${enableval}" in - yes) encryption=true ;; - no) encryption=false ;; - *) as_fn_error $? "bad value ${enableval} for --enable-encryption" "$LINENO" 5 ;; - esac -else - encryption=true -fi - - -if test $encryption = "true"; then - -$as_echo "#define ENABLE_ENCRYPTION 1" >>confdefs.h - -fi - - if test x$encryption = xtrue; then - ENCRYPTION_TRUE= - ENCRYPTION_FALSE='#' -else - ENCRYPTION_TRUE='#' - ENCRYPTION_FALSE= -fi - - -# Check whether --enable-spell-checking was given. -if test "${enable_spell_checking+set}" = set; then : - enableval=$enable_spell_checking; case "${enableval}" in - yes) spell_checking=true ;; - no) spell_checking=false ;; - *) as_fn_error $? "bad value ${enableval} for --enable-spell-checking" "$LINENO" 5 ;; - esac -else - spell_checking=true -fi - - -if test $spell_checking = "true"; then - -$as_echo "#define ENABLE_SPELL_CHECKING 1" >>confdefs.h - -fi - - if test x$spell_checking = xtrue; then - SPELL_CHECKING_TRUE= - SPELL_CHECKING_FALSE='#' -else - SPELL_CHECKING_TRUE='#' - SPELL_CHECKING_FALSE= -fi - - - - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for STANDARD" >&5 -$as_echo_n "checking for STANDARD... " >&6; } - -if test -n "$STANDARD_CFLAGS"; then - pkg_cv_STANDARD_CFLAGS="$STANDARD_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 gtk+-3.0 >= 3.5.6 gmodule-2.0 gthread-2.0 gio-2.0 >= 2.28.0 sqlite3 cairo atk\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 gtk+-3.0 >= 3.5.6 gmodule-2.0 gthread-2.0 gio-2.0 >= 2.28.0 sqlite3 cairo atk") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_STANDARD_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 gtk+-3.0 >= 3.5.6 gmodule-2.0 gthread-2.0 gio-2.0 >= 2.28.0 sqlite3 cairo atk" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$STANDARD_LIBS"; then - pkg_cv_STANDARD_LIBS="$STANDARD_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 gtk+-3.0 >= 3.5.6 gmodule-2.0 gthread-2.0 gio-2.0 >= 2.28.0 sqlite3 cairo atk\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 gtk+-3.0 >= 3.5.6 gmodule-2.0 gthread-2.0 gio-2.0 >= 2.28.0 sqlite3 cairo atk") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_STANDARD_LIBS=`$PKG_CONFIG --libs "glib-2.0 gtk+-3.0 >= 3.5.6 gmodule-2.0 gthread-2.0 gio-2.0 >= 2.28.0 sqlite3 cairo atk" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -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 - STANDARD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 gtk+-3.0 >= 3.5.6 gmodule-2.0 gthread-2.0 gio-2.0 >= 2.28.0 sqlite3 cairo atk" 2>&1` - else - STANDARD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 gtk+-3.0 >= 3.5.6 gmodule-2.0 gthread-2.0 gio-2.0 >= 2.28.0 sqlite3 cairo atk" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$STANDARD_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements (glib-2.0 gtk+-3.0 >= 3.5.6 gmodule-2.0 gthread-2.0 gio-2.0 >= 2.28.0 sqlite3 cairo atk) were not met: - -$STANDARD_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 STANDARD_CFLAGS -and STANDARD_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 STANDARD_CFLAGS -and STANDARD_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 - STANDARD_CFLAGS=$pkg_cv_STANDARD_CFLAGS - STANDARD_LIBS=$pkg_cv_STANDARD_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - - - - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVO" >&5 -$as_echo_n "checking for EVO... " >&6; } - -if test -n "$EVO_CFLAGS"; then - pkg_cv_EVO_CFLAGS="$EVO_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-1.2 >= 3.5.91 libedataserver-1.2\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libecal-1.2 >= 3.5.91 libedataserver-1.2") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_EVO_CFLAGS=`$PKG_CONFIG --cflags "libecal-1.2 >= 3.5.91 libedataserver-1.2" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$EVO_LIBS"; then - pkg_cv_EVO_LIBS="$EVO_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-1.2 >= 3.5.91 libedataserver-1.2\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libecal-1.2 >= 3.5.91 libedataserver-1.2") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_EVO_LIBS=`$PKG_CONFIG --libs "libecal-1.2 >= 3.5.91 libedataserver-1.2" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -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 - EVO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libecal-1.2 >= 3.5.91 libedataserver-1.2" 2>&1` - else - EVO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libecal-1.2 >= 3.5.91 libedataserver-1.2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$EVO_PKG_ERRORS" >&5 - - have_evo=no -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - have_evo=no -else - EVO_CFLAGS=$pkg_cv_EVO_CFLAGS - EVO_LIBS=$pkg_cv_EVO_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - have_evo=yes -fi -if test "x$have_evo" = "xyes"; then - -$as_echo "#define HAVE_EVO 1" >>confdefs.h - -fi - if test x$have_evo = xyes; then - HAVE_EVO_TRUE= - HAVE_EVO_FALSE='#' -else - HAVE_EVO_TRUE='#' - HAVE_EVO_FALSE= -fi - - -EVO_CFLAGS="$EVO_CFLAGS -DE_BOOK_DISABLE_DEPRECATED -DE_CAL_DISABLE_DEPRECATED" - - - -if test $spell_checking = "true"; then - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SPELL_CHECKING" >&5 -$as_echo_n "checking for SPELL_CHECKING... " >&6; } - -if test -n "$SPELL_CHECKING_CFLAGS"; then - pkg_cv_SPELL_CHECKING_CFLAGS="$SPELL_CHECKING_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtkspell3-3.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtkspell3-3.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SPELL_CHECKING_CFLAGS=`$PKG_CONFIG --cflags "gtkspell3-3.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$SPELL_CHECKING_LIBS"; then - pkg_cv_SPELL_CHECKING_LIBS="$SPELL_CHECKING_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtkspell3-3.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtkspell3-3.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_SPELL_CHECKING_LIBS=`$PKG_CONFIG --libs "gtkspell3-3.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -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 - SPELL_CHECKING_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtkspell3-3.0" 2>&1` - else - SPELL_CHECKING_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtkspell3-3.0" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$SPELL_CHECKING_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements (gtkspell3-3.0) were not met: - -$SPELL_CHECKING_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 SPELL_CHECKING_CFLAGS -and SPELL_CHECKING_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 SPELL_CHECKING_CFLAGS -and SPELL_CHECKING_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 - SPELL_CHECKING_CFLAGS=$pkg_cv_SPELL_CHECKING_CFLAGS - SPELL_CHECKING_LIBS=$pkg_cv_SPELL_CHECKING_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - - -fi - -if test $encryption = "true"; then - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ENCRYPTION" >&5 -$as_echo_n "checking for ENCRYPTION... " >&6; } - -if test -n "$ENCRYPTION_CFLAGS"; then - pkg_cv_ENCRYPTION_CFLAGS="$ENCRYPTION_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cryptui-0.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "cryptui-0.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_ENCRYPTION_CFLAGS=`$PKG_CONFIG --cflags "cryptui-0.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$ENCRYPTION_LIBS"; then - pkg_cv_ENCRYPTION_LIBS="$ENCRYPTION_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cryptui-0.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "cryptui-0.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_ENCRYPTION_LIBS=`$PKG_CONFIG --libs "cryptui-0.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -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 - ENCRYPTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cryptui-0.0" 2>&1` - else - ENCRYPTION_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cryptui-0.0" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$ENCRYPTION_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements (cryptui-0.0) were not met: - -$ENCRYPTION_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 ENCRYPTION_CFLAGS -and ENCRYPTION_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 ENCRYPTION_CFLAGS -and ENCRYPTION_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 - ENCRYPTION_CFLAGS=$pkg_cv_ENCRYPTION_CFLAGS - ENCRYPTION_LIBS=$pkg_cv_ENCRYPTION_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - - min_gpgme_version=1.0.0 - # Extract the first word of "gpgme-config", so it can be a program name with args. -set dummy gpgme-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GPGME_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GPGME_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_GPGME_CONFIG="$GPGME_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GPGME_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_GPGME_CONFIG" && ac_cv_path_GPGME_CONFIG=""failed"" - ;; -esac -fi -GPGME_CONFIG=$ac_cv_path_GPGME_CONFIG -if test -n "$GPGME_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPGME_CONFIG" >&5 -$as_echo "$GPGME_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - if test $GPGME_CONFIG != "failed" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPGME" >&5 -$as_echo_n "checking for GPGME... " >&6; } - req_major=`echo $min_gpgme_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'` - req_minor=`echo $min_gpgme_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'` - req_micro=`echo $min_gpgme_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'` - gpgme_config_version=`$GPGME_CONFIG --version` - major=`echo $gpgme_config_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'` - minor=`echo $gpgme_config_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'` - micro=`echo $gpgme_config_version | \ - sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'` - - if test "$major" -eq "$req_major"; then - if test "$minor" -ge "$req_minor"; then - if test "$micro" -ge "$req_micro"; then - ok="yes" - fi - fi - fi - fi - - -cat >>confdefs.h <<_ACEOF -#define MIN_GPGME_VERSION "${min_gpgme_version}" -_ACEOF - - - if test $ok = "yes"; then - ENCRYPTION_CFLAGS="$ENCRYPTION_CFLAGS `$GPGME_CONFIG --cflags`" - ENCRYPTION_LIBS="$ENCRYPTION_LIBS `$GPGME_CONFIG --libs`" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - as_fn_error $? "GPGME $min_gpgme_version or later needed" "$LINENO" 5 - fi -else - ENCRYPTION_CFLAGS="" - ENCRYPTION_LIBS="" -fi - - - - -# Various required functions and headers -for ac_header in libintl.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" -if test "x$ac_cv_header_libintl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBINTL_H 1 -_ACEOF - -fi - -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 -$as_echo_n "checking for inline... " >&6; } -if ${ac_cv_c_inline+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_c_inline=no -for ac_kw in inline __inline__ __inline; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifndef __cplusplus -typedef int foo_t; -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } -#endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_inline=$ac_kw -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - test "$ac_cv_c_inline" != no && break -done - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 -$as_echo "$ac_cv_c_inline" >&6; } - -case $ac_cv_c_inline in - inline | yes) ;; - *) - case $ac_cv_c_inline in - no) ac_val=;; - *) ac_val=$ac_cv_c_inline;; - esac - cat >>confdefs.h <<_ACEOF -#ifndef __cplusplus -#define inline $ac_val -#endif -_ACEOF - ;; -esac - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 -$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } -if ${ac_cv_header_time+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include - -int -main () -{ -if ((struct tm *) 0) -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_time=yes -else - ac_cv_header_time=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 -$as_echo "$ac_cv_header_time" >&6; } -if test $ac_cv_header_time = yes; then - -$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h - -fi - - - - - for ac_header in $ac_header_list -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - - - - - - - for ac_func in $ac_func_list -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5 -$as_echo_n "checking for working mktime... " >&6; } -if ${ac_cv_func_working_mktime+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_func_working_mktime=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Test program from Paul Eggert and Tony Leneis. */ -#ifdef TIME_WITH_SYS_TIME -# include -# include -#else -# ifdef HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - -#include -#include - -#ifdef HAVE_UNISTD_H -# include -#endif - -#ifndef HAVE_ALARM -# define alarm(X) /* empty */ -#endif - -/* Work around redefinition to rpl_putenv by other config tests. */ -#undef putenv - -static time_t time_t_max; -static time_t time_t_min; - -/* Values we'll use to set the TZ environment variable. */ -static const char *tz_strings[] = { - (const char *) 0, "TZ=GMT0", "TZ=JST-9", - "TZ=EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00" -}; -#define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0])) - -/* Return 0 if mktime fails to convert a date in the spring-forward gap. - Based on a problem report from Andreas Jaeger. */ -static int -spring_forward_gap () -{ - /* glibc (up to about 1998-10-07) failed this test. */ - struct tm tm; - - /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" - instead of "TZ=America/Vancouver" in order to detect the bug even - on systems that don't support the Olson extension, or don't have the - full zoneinfo tables installed. */ - putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0"); - - tm.tm_year = 98; - tm.tm_mon = 3; - tm.tm_mday = 5; - tm.tm_hour = 2; - tm.tm_min = 0; - tm.tm_sec = 0; - tm.tm_isdst = -1; - return mktime (&tm) != (time_t) -1; -} - -static int -mktime_test1 (time_t now) -{ - struct tm *lt; - return ! (lt = localtime (&now)) || mktime (lt) == now; -} - -static int -mktime_test (time_t now) -{ - return (mktime_test1 (now) - && mktime_test1 ((time_t) (time_t_max - now)) - && mktime_test1 ((time_t) (time_t_min + now))); -} - -static int -irix_6_4_bug () -{ - /* Based on code from Ariel Faigon. */ - struct tm tm; - tm.tm_year = 96; - tm.tm_mon = 3; - tm.tm_mday = 0; - tm.tm_hour = 0; - tm.tm_min = 0; - tm.tm_sec = 0; - tm.tm_isdst = -1; - mktime (&tm); - return tm.tm_mon == 2 && tm.tm_mday == 31; -} - -static int -bigtime_test (int j) -{ - struct tm tm; - time_t now; - tm.tm_year = tm.tm_mon = tm.tm_mday = tm.tm_hour = tm.tm_min = tm.tm_sec = j; - now = mktime (&tm); - if (now != (time_t) -1) - { - struct tm *lt = localtime (&now); - if (! (lt - && lt->tm_year == tm.tm_year - && lt->tm_mon == tm.tm_mon - && lt->tm_mday == tm.tm_mday - && lt->tm_hour == tm.tm_hour - && lt->tm_min == tm.tm_min - && lt->tm_sec == tm.tm_sec - && lt->tm_yday == tm.tm_yday - && lt->tm_wday == tm.tm_wday - && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst) - == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst)))) - return 0; - } - return 1; -} - -static int -year_2050_test () -{ - /* The correct answer for 2050-02-01 00:00:00 in Pacific time, - ignoring leap seconds. */ - unsigned long int answer = 2527315200UL; - - struct tm tm; - time_t t; - tm.tm_year = 2050 - 1900; - tm.tm_mon = 2 - 1; - tm.tm_mday = 1; - tm.tm_hour = tm.tm_min = tm.tm_sec = 0; - tm.tm_isdst = -1; - - /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" - instead of "TZ=America/Vancouver" in order to detect the bug even - on systems that don't support the Olson extension, or don't have the - full zoneinfo tables installed. */ - putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0"); - - t = mktime (&tm); - - /* Check that the result is either a failure, or close enough - to the correct answer that we can assume the discrepancy is - due to leap seconds. */ - return (t == (time_t) -1 - || (0 < t && answer - 120 <= t && t <= answer + 120)); -} - -int -main () -{ - time_t t, delta; - int i, j; - - /* This test makes some buggy mktime implementations loop. - Give up after 60 seconds; a mktime slower than that - isn't worth using anyway. */ - alarm (60); - - for (;;) - { - t = (time_t_max << 1) + 1; - if (t <= time_t_max) - break; - time_t_max = t; - } - time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max; - - delta = time_t_max / 997; /* a suitable prime number */ - for (i = 0; i < N_STRINGS; i++) - { - if (tz_strings[i]) - putenv ((char*) tz_strings[i]); - - for (t = 0; t <= time_t_max - delta; t += delta) - if (! mktime_test (t)) - return 1; - if (! (mktime_test ((time_t) 1) - && mktime_test ((time_t) (60 * 60)) - && mktime_test ((time_t) (60 * 60 * 24)))) - return 1; - - for (j = 1; ; j <<= 1) - if (! bigtime_test (j)) - return 1; - else if (INT_MAX / 2 < j) - break; - if (! bigtime_test (INT_MAX)) - return 1; - } - return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ()); -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_working_mktime=yes -else - ac_cv_func_working_mktime=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_working_mktime" >&5 -$as_echo "$ac_cv_func_working_mktime" >&6; } -if test $ac_cv_func_working_mktime = no; then - case " $LIBOBJS " in - *" mktime.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS mktime.$ac_objext" - ;; -esac - -fi - -ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" -if test "x$ac_cv_type_size_t" = xyes; then : - -else - -cat >>confdefs.h <<_ACEOF -#define size_t unsigned int -_ACEOF - -fi - -# Check whether --enable-largefile was given. -if test "${enable_largefile+set}" = set; then : - enableval=$enable_largefile; -fi - -if test "$enable_largefile" != no; then - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 -$as_echo_n "checking for special C compiler options needed for large files... " >&6; } -if ${ac_cv_sys_largefile_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_sys_largefile_CC=no - if test "$GCC" != yes; then - ac_save_CC=$CC - while :; do - # IRIX 6.2 and later do not support large files by default, - # so use the C compiler's -n32 option if that helps. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ - - ; - return 0; -} -_ACEOF - if ac_fn_c_try_compile "$LINENO"; then : - break -fi -rm -f core conftest.err conftest.$ac_objext - CC="$CC -n32" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_largefile_CC=' -n32'; break -fi -rm -f core conftest.err conftest.$ac_objext - break - done - CC=$ac_save_CC - rm -f conftest.$ac_ext - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 -$as_echo "$ac_cv_sys_largefile_CC" >&6; } - if test "$ac_cv_sys_largefile_CC" != no; then - CC=$CC$ac_cv_sys_largefile_CC - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -if ${ac_cv_sys_file_offset_bits+:} false; then : - $as_echo_n "(cached) " >&6 -else - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_file_offset_bits=no; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#define _FILE_OFFSET_BITS 64 -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_file_offset_bits=64; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_sys_file_offset_bits=unknown - break -done -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 -$as_echo "$ac_cv_sys_file_offset_bits" >&6; } -case $ac_cv_sys_file_offset_bits in #( - no | unknown) ;; - *) -cat >>confdefs.h <<_ACEOF -#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits -_ACEOF -;; -esac -rm -rf conftest* - if test $ac_cv_sys_file_offset_bits = unknown; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 -$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } -if ${ac_cv_sys_large_files+:} false; then : - $as_echo_n "(cached) " >&6 -else - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_large_files=no; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#define _LARGE_FILES 1 -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_large_files=1; break -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_sys_large_files=unknown - break -done -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 -$as_echo "$ac_cv_sys_large_files" >&6; } -case $ac_cv_sys_large_files in #( - no | unknown) ;; - *) -cat >>confdefs.h <<_ACEOF -#define _LARGE_FILES $ac_cv_sys_large_files -_ACEOF -;; -esac -rm -rf conftest* - fi - - -fi - - -ac_config_files="$ac_config_files Makefile src/Makefile po/Makefile.in data/Makefile data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/256x256/Makefile data/icons/scalable/Makefile data/org.gnome.almanah.gschema.xml.in" - -cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. - -_ACEOF - -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, we kill variables containing newlines. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -( - for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) { eval $ac_var=; unset $ac_var;} ;; - esac ;; - esac - done - - (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes: double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \. - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) | - sed ' - /^ac_cv_env_/b end - t clear - :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - :end' >>confcache -if diff "$cache_file" confcache >/dev/null 2>&1; then :; else - if test -w "$cache_file"; then - if test "x$cache_file" != "x/dev/null"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} - if test ! -f "$cache_file" || test -h "$cache_file"; then - cat confcache >"$cache_file" - else - case $cache_file in #( - */* | ?:*) - mv -f confcache "$cache_file"$$ && - mv -f "$cache_file"$$ "$cache_file" ;; #( - *) - mv -f confcache "$cache_file" ;; - esac - fi - fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi -fi -rm -f confcache - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -DEFS=-DHAVE_CONFIG_H - -ac_libobjs= -ac_ltlibobjs= -U= -for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR - # will be set to the directory where LIBOBJS objects are built. - as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" - as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' -done -LIBOBJS=$ac_libobjs - -LTLIBOBJS=$ac_ltlibobjs - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 -$as_echo_n "checking that generated files are newer than configure... " >&6; } - if test -n "$am_sleep_pid"; then - # Hide warnings about reused PIDs. - wait $am_sleep_pid 2>/dev/null - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 -$as_echo "done" >&6; } -if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error $? "conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error $? "conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi - if test -n "$EXEEXT"; then - am__EXEEXT_TRUE= - am__EXEEXT_FALSE='#' -else - am__EXEEXT_TRUE='#' - am__EXEEXT_FALSE= -fi - - - ac_config_commands="$ac_config_commands po/stamp-it" - - -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${DEBUG_TRUE}" && test -z "${DEBUG_FALSE}"; then - as_fn_error $? "conditional \"DEBUG\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${ENCRYPTION_TRUE}" && test -z "${ENCRYPTION_FALSE}"; then - as_fn_error $? "conditional \"ENCRYPTION\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${SPELL_CHECKING_TRUE}" && test -z "${SPELL_CHECKING_FALSE}"; then - as_fn_error $? "conditional \"SPELL_CHECKING\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${HAVE_EVO_TRUE}" && test -z "${HAVE_EVO_FALSE}"; then - as_fn_error $? "conditional \"HAVE_EVO\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi - -: "${CONFIG_STATUS=./config.status}" -ac_write_fail=0 -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -as_write_fail=0 -cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 -#! $SHELL -# Generated by $as_me. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. - -debug=false -ac_cs_recheck=false -ac_cs_silent=false - -SHELL=\${CONFIG_SHELL-$SHELL} -export SHELL -_ASEOF -cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 -## -------------------- ## -## M4sh Initialization. ## -## -------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac -fi - - -as_nl=' -' -export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } -fi - - -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -as_myself= -case $0 in #(( - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break - done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - exit 1 -fi - -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- -# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. -as_fn_error () -{ - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 - fi - $as_echo "$as_me: error: $2" >&2 - as_fn_exit $as_status -} # as_fn_error - - -# as_fn_set_status STATUS -# ----------------------- -# Set $? to STATUS, without forking. -as_fn_set_status () -{ - return $1 -} # as_fn_set_status - -# as_fn_exit STATUS -# ----------------- -# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -as_fn_exit () -{ - set +e - as_fn_set_status $1 - exit $1 -} # as_fn_exit - -# as_fn_unset VAR -# --------------- -# Portably unset VAR. -as_fn_unset () -{ - { eval $1=; unset $1;} -} -as_unset=as_fn_unset -# as_fn_append VAR VALUE -# ---------------------- -# Append the text in VALUE to the end of the definition contained in VAR. Take -# advantage of any shell optimizations that allow amortized linear growth over -# repeated appends, instead of the typical quadratic growth present in naive -# implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : - eval 'as_fn_append () - { - eval $1+=\$2 - }' -else - as_fn_append () - { - eval $1=\$$1\$2 - } -fi # as_fn_append - -# as_fn_arith ARG... -# ------------------ -# Perform arithmetic evaluation on the ARGs, and store the result in the -# global $as_val. Take advantage of shells that can avoid forks. The arguments -# must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : - eval 'as_fn_arith () - { - as_val=$(( $* )) - }' -else - as_fn_arith () - { - as_val=`expr "$@" || test $? -eq 1` - } -fi # as_fn_arith - - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in #((((( --n*) - case `echo 'xy\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - xy) ECHO_C='\c';; - *) echo `echo ksh88 bug on AIX 6.1` > /dev/null - ECHO_T=' ';; - esac;; -*) - ECHO_N='-n';; -esac - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -pR' - fi -else - as_ln_s='cp -pR' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - - -# as_fn_mkdir_p -# ------------- -# Create "$as_dir" as a directory, including parents if necessary. -as_fn_mkdir_p () -{ - - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || eval $as_mkdir_p || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" - - -} # as_fn_mkdir_p -if mkdir -p . 2>/dev/null; then - as_mkdir_p='mkdir -p "$as_dir"' -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - - -# as_fn_executable_p FILE -# ----------------------- -# Test if FILE is an executable regular file. -as_fn_executable_p () -{ - test -f "$1" && test -x "$1" -} # as_fn_executable_p -as_test_x='test -x' -as_executable_p=as_fn_executable_p - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -exec 6>&1 -## ----------------------------------- ## -## Main body of $CONFIG_STATUS script. ## -## ----------------------------------- ## -_ASEOF -test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# Save the log message, to keep $0 and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. -ac_log=" -This file was extended by almanah $as_me 0.11.1, which was -generated by GNU Autoconf 2.69. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - -on `(hostname || uname -n) 2>/dev/null | sed 1q` -" - -_ACEOF - -case $ac_config_files in *" -"*) set x $ac_config_files; shift; ac_config_files=$*;; -esac - -case $ac_config_headers in *" -"*) set x $ac_config_headers; shift; ac_config_headers=$*;; -esac - - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -# Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" -config_commands="$ac_config_commands" - -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -ac_cs_usage="\ -\`$as_me' instantiates files and other configuration actions -from templates according to the current configuration. Unless the files -and actions are specified as TAGs, all are instantiated by default. - -Usage: $0 [OPTION]... [TAG]... - - -h, --help print this help, then exit - -V, --version print version number and configuration settings, then exit - --config print configuration, then exit - -q, --quiet, --silent - do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE - -Configuration files: -$config_files - -Configuration headers: -$config_headers - -Configuration commands: -$config_commands - -Report bugs to . -almanah home page: ." - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" -ac_cs_version="\\ -almanah config.status 0.11.1 -configured by $0, generated by GNU Autoconf 2.69, - with options \\"\$ac_cs_config\\" - -Copyright (C) 2012 Free Software Foundation, Inc. -This config.status script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it." - -ac_pwd='$ac_pwd' -srcdir='$srcdir' -INSTALL='$INSTALL' -MKDIR_P='$MKDIR_P' -AWK='$AWK' -test -n "\$AWK" || AWK=awk -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# The default lists apply if the user does not specify any file. -ac_need_defaults=: -while test $# != 0 -do - case $1 in - --*=?*) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; - --*=) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg= - ac_shift=: - ;; - *) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; - esac - - case $ac_option in - # Handling of the options. - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; - --config | --confi | --conf | --con | --co | --c ) - $as_echo "$ac_cs_config"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - '') as_fn_error $? "missing file argument" ;; - esac - as_fn_append CONFIG_FILES " '$ac_optarg'" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - as_fn_append CONFIG_HEADERS " '$ac_optarg'" - ac_need_defaults=false;; - --he | --h) - # Conflict between --help and --header - as_fn_error $? "ambiguous option: \`$1' -Try \`$0 --help' for more information.";; - --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. - -*) as_fn_error $? "unrecognized option: \`$1' -Try \`$0 --help' for more information." ;; - - *) as_fn_append ac_config_targets " $1" - ac_need_defaults=false ;; - - esac - shift -done - -ac_configure_extra_args= - -if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -if \$ac_cs_recheck; then - set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion - shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 - CONFIG_SHELL='$SHELL' - export CONFIG_SHELL - exec "\$@" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX - $as_echo "$ac_log" -} >&5 - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -# -# INIT-COMMANDS -# -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" - - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -sed_quote_subst='$sed_quote_subst' -double_quote_subst='$double_quote_subst' -delay_variable_subst='$delay_variable_subst' -macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' -macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' -enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' -enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' -pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' -enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' -SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' -ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' -PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' -host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' -host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' -host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' -build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' -build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' -build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' -SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' -Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' -GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' -EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' -FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' -LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' -NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' -LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' -max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' -ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' -exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' -lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' -lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' -lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' -reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' -reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' -OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' -deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' -file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' -AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' -AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' -STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' -RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' -old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' -old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' -lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' -CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' -CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' -compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' -GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' -objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' -MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' -need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' -DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' -NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' -LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' -OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' -libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' -shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' -extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' -archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' -export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' -whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' -compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' -old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' -archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' -archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' -module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' -module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' -with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' -allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' -no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' -hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' -hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' -hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' -hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' -hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' -inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' -link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' -always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' -export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' -exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' -include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' -prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' -file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' -variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' -need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' -version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' -runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' -shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' -shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' -libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' -library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' -soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' -install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' -postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' -postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' -finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' -finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' -hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' -sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' -hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' -enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' -enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' -enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' -old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' -striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' -compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`' -predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`' -postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`' -predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`' -postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`' -compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`' -LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`' -reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`' -reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`' -old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' -compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' -GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' -archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`' -export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`' -old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`' -archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' -archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' -module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`' -module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' -with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`' -allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' -no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' -inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' -link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' -always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' -export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' -exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' -include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' -prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' -postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' -file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' -compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' -predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`' -postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`' -predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`' -postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`' -compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`' - -LTCC='$LTCC' -LTCFLAGS='$LTCFLAGS' -compiler='$compiler_DEFAULT' - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$1 -_LTECHO_EOF' -} - -# Quote evaled strings. -for var in SHELL \ -ECHO \ -PATH_SEPARATOR \ -SED \ -GREP \ -EGREP \ -FGREP \ -LD \ -NM \ -LN_S \ -lt_SP2NL \ -lt_NL2SP \ -reload_flag \ -OBJDUMP \ -deplibs_check_method \ -file_magic_cmd \ -file_magic_glob \ -want_nocaseglob \ -DLLTOOL \ -sharedlib_from_linklib_cmd \ -AR \ -AR_FLAGS \ -archiver_list_spec \ -STRIP \ -RANLIB \ -CC \ -CFLAGS \ -compiler \ -lt_cv_sys_global_symbol_pipe \ -lt_cv_sys_global_symbol_to_cdecl \ -lt_cv_sys_global_symbol_to_c_name_address \ -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -nm_file_list_spec \ -lt_prog_compiler_no_builtin_flag \ -lt_prog_compiler_pic \ -lt_prog_compiler_wl \ -lt_prog_compiler_static \ -lt_cv_prog_compiler_c_o \ -need_locks \ -MANIFEST_TOOL \ -DSYMUTIL \ -NMEDIT \ -LIPO \ -OTOOL \ -OTOOL64 \ -shrext_cmds \ -export_dynamic_flag_spec \ -whole_archive_flag_spec \ -compiler_needs_object \ -with_gnu_ld \ -allow_undefined_flag \ -no_undefined_flag \ -hardcode_libdir_flag_spec \ -hardcode_libdir_separator \ -exclude_expsyms \ -include_expsyms \ -file_list_spec \ -variables_saved_for_relink \ -libname_spec \ -library_names_spec \ -soname_spec \ -install_override_mode \ -finish_eval \ -old_striplib \ -striplib \ -compiler_lib_search_dirs \ -predep_objects \ -postdep_objects \ -predeps \ -postdeps \ -compiler_lib_search_path \ -LD_CXX \ -reload_flag_CXX \ -compiler_CXX \ -lt_prog_compiler_no_builtin_flag_CXX \ -lt_prog_compiler_pic_CXX \ -lt_prog_compiler_wl_CXX \ -lt_prog_compiler_static_CXX \ -lt_cv_prog_compiler_c_o_CXX \ -export_dynamic_flag_spec_CXX \ -whole_archive_flag_spec_CXX \ -compiler_needs_object_CXX \ -with_gnu_ld_CXX \ -allow_undefined_flag_CXX \ -no_undefined_flag_CXX \ -hardcode_libdir_flag_spec_CXX \ -hardcode_libdir_separator_CXX \ -exclude_expsyms_CXX \ -include_expsyms_CXX \ -file_list_spec_CXX \ -compiler_lib_search_dirs_CXX \ -predep_objects_CXX \ -postdep_objects_CXX \ -predeps_CXX \ -postdeps_CXX \ -compiler_lib_search_path_CXX; do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -# Double-quote double-evaled strings. -for var in reload_cmds \ -old_postinstall_cmds \ -old_postuninstall_cmds \ -old_archive_cmds \ -extract_expsyms_cmds \ -old_archive_from_new_cmds \ -old_archive_from_expsyms_cmds \ -archive_cmds \ -archive_expsym_cmds \ -module_cmds \ -module_expsym_cmds \ -export_symbols_cmds \ -prelink_cmds \ -postlink_cmds \ -postinstall_cmds \ -postuninstall_cmds \ -finish_cmds \ -sys_lib_search_path_spec \ -sys_lib_dlsearch_path_spec \ -reload_cmds_CXX \ -old_archive_cmds_CXX \ -old_archive_from_new_cmds_CXX \ -old_archive_from_expsyms_cmds_CXX \ -archive_cmds_CXX \ -archive_expsym_cmds_CXX \ -module_cmds_CXX \ -module_expsym_cmds_CXX \ -export_symbols_cmds_CXX \ -prelink_cmds_CXX \ -postlink_cmds_CXX; do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -ac_aux_dir='$ac_aux_dir' -xsi_shell='$xsi_shell' -lt_shell_append='$lt_shell_append' - -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi - - - PACKAGE='$PACKAGE' - VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' - RM='$RM' - ofile='$ofile' - - - - - - -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - -# Handling of arguments. -for ac_config_target in $ac_config_targets -do - case $ac_config_target in - "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; - "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; - "data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/Makefile" ;; - "data/icons/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/16x16/Makefile" ;; - "data/icons/22x22/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/22x22/Makefile" ;; - "data/icons/32x32/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/32x32/Makefile" ;; - "data/icons/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/48x48/Makefile" ;; - "data/icons/256x256/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/256x256/Makefile" ;; - "data/icons/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/scalable/Makefile" ;; - "data/org.gnome.almanah.gschema.xml.in") CONFIG_FILES="$CONFIG_FILES data/org.gnome.almanah.gschema.xml.in" ;; - "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; - - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; - esac -done - - -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands -fi - -# Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason against having it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. -# Hook for its removal unless debugging. -# Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. -$debug || -{ - tmp= ac_tmp= - trap 'exit_status=$? - : "${ac_tmp:=$tmp}" - { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status -' 0 - trap 'as_fn_exit 1' 1 2 13 15 -} -# Create a (secure) tmp directory for tmp files. - -{ - tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -d "$tmp" -} || -{ - tmp=./conf$$-$RANDOM - (umask 077 && mkdir "$tmp") -} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 -ac_tmp=$tmp - -# Set up the scripts for CONFIG_FILES section. -# No need to generate them if there are no CONFIG_FILES. -# This happens for instance with `./config.status config.h'. -if test -n "$CONFIG_FILES"; then - - -ac_cr=`echo X | tr X '\015'` -# On cygwin, bash can eat \r inside `` if the user requested igncr. -# But we know of no other shell where ac_cr would be empty at this -# point, so we can use a bashism as a fallback. -if test "x$ac_cr" = x; then - eval ac_cr=\$\'\\r\' -fi -ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` -if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\\r' -else - ac_cs_awk_cr=$ac_cr -fi - -echo 'BEGIN {' >"$ac_tmp/subs1.awk" && -_ACEOF - - -{ - echo "cat >conf$$subs.awk <<_ACEOF" && - echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && - echo "_ACEOF" -} >conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - . ./conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 - - ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` - if test $ac_delim_n = $ac_delim_num; then - break - elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done -rm -f conf$$subs.sh - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && -_ACEOF -sed -n ' -h -s/^/S["/; s/!.*/"]=/ -p -g -s/^[^!]*!// -:repl -t repl -s/'"$ac_delim"'$// -t delim -:nl -h -s/\(.\{148\}\)..*/\1/ -t more1 -s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ -p -n -b repl -:more1 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -p -g -s/.\{148\}// -t nl -:delim -h -s/\(.\{148\}\)..*/\1/ -t more2 -s/["\\]/\\&/g; s/^/"/; s/$/"/ -p -b -:more2 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -p -g -s/.\{148\}// -t delim -' >$CONFIG_STATUS || ac_write_fail=1 -rm -f conf$$subs.awk -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -_ACAWK -cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && - for (key in S) S_is_set[key] = 1 - FS = "" - -} -{ - line = $ 0 - nfields = split(line, field, "@") - substed = 0 - len = length(field[1]) - for (i = 2; i < nfields; i++) { - key = field[i] - keylen = length(key) - if (S_is_set[key]) { - value = S[key] - line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) - len += length(value) + length(field[++i]) - substed = 1 - } else - len += 1 + keylen - } - - print line -} - -_ACAWK -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then - sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -else - cat -fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ - || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 -_ACEOF - -# VPATH may cause trouble with some makes, so we remove sole $(srcdir), -# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ -h -s/// -s/^/:/ -s/[ ]*$/:/ -s/:\$(srcdir):/:/g -s/:\${srcdir}:/:/g -s/:@srcdir@:/:/g -s/^:*// -s/:*$// -x -s/\(=[ ]*\).*/\1/ -G -s/\n// -s/^[^=]*=[ ]*$// -}' -fi - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -fi # test -n "$CONFIG_FILES" - -# Set up the scripts for CONFIG_HEADERS section. -# No need to generate them if there are no CONFIG_HEADERS. -# This happens for instance with `./config.status Makefile'. -if test -n "$CONFIG_HEADERS"; then -cat >"$ac_tmp/defines.awk" <<\_ACAWK || -BEGIN { -_ACEOF - -# Transform confdefs.h into an awk script `defines.awk', embedded as -# here-document in config.status, that substitutes the proper values into -# config.h.in to produce config.h. - -# Create a delimiter string that does not exist in confdefs.h, to ease -# handling of long lines. -ac_delim='%!_!# ' -for ac_last_try in false false :; do - ac_tt=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_tt"; then - break - elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done - -# For the awk script, D is an array of macro values keyed by name, -# likewise P contains macro parameters if any. Preserve backslash -# newline sequences. - -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -sed -n ' -s/.\{148\}/&'"$ac_delim"'/g -t rset -:rset -s/^[ ]*#[ ]*define[ ][ ]*/ / -t def -d -:def -s/\\$// -t bsnl -s/["\\]/\\&/g -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -D["\1"]=" \3"/p -s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p -d -:bsnl -s/["\\]/\\&/g -s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -D["\1"]=" \3\\\\\\n"\\/p -t cont -s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p -t cont -d -:cont -n -s/.\{148\}/&'"$ac_delim"'/g -t clear -:clear -s/\\$// -t bsnlc -s/["\\]/\\&/g; s/^/"/; s/$/"/p -d -:bsnlc -s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p -b cont -' >$CONFIG_STATUS || ac_write_fail=1 - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - for (key in D) D_is_set[key] = 1 - FS = "" -} -/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { - line = \$ 0 - split(line, arg, " ") - if (arg[1] == "#") { - defundef = arg[2] - mac1 = arg[3] - } else { - defundef = substr(arg[1], 2) - mac1 = arg[2] - } - split(mac1, mac2, "(") #) - macro = mac2[1] - prefix = substr(line, 1, index(line, defundef) - 1) - if (D_is_set[macro]) { - # Preserve the white space surrounding the "#". - print prefix "define", macro P[macro] D[macro] - next - } else { - # Replace #undef with comments. This is necessary, for example, - # in the case of _POSIX_SOURCE, which is predefined and required - # on some systems where configure will not decide to define it. - if (defundef == "undef") { - print "/*", prefix defundef, macro, "*/" - next - } - } -} -{ print } -_ACAWK -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 -fi # test -n "$CONFIG_HEADERS" - - -eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" -shift -for ac_tag -do - case $ac_tag in - :[FHLC]) ac_mode=$ac_tag; continue;; - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac - ac_save_IFS=$IFS - IFS=: - set x $ac_tag - IFS=$ac_save_IFS - shift - ac_file=$1 - shift - - case $ac_mode in - :L) ac_source=$1;; - :[FH]) - ac_file_inputs= - for ac_f - do - case $ac_f in - -) ac_f="$ac_tmp/stdin";; - *) # Look for the file first in the build tree, then in the source tree - # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. - test -f "$ac_f" || - case $ac_f in - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; - esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - as_fn_append ac_file_inputs " '$ac_f'" - done - - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' - `' by configure.' - if test x"$ac_file" != x-; then - configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} - fi - # Neutralize special characters interpreted by sed in replacement strings. - case $configure_input in #( - *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | - sed 's/[\\\\&|]/\\\\&/g'`;; #( - *) ac_sed_conf_input=$configure_input;; - esac - - case $ac_tag in - *:-:* | *:-) cat >"$ac_tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; - esac - ;; - esac - - ac_dir=`$as_dirname -- "$ac_file" || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - as_dir="$ac_dir"; as_fn_mkdir_p - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - - case $ac_mode in - :F) - # - # CONFIG_FILE - # - - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; - esac - ac_MKDIR_P=$MKDIR_P - case $MKDIR_P in - [\\/$]* | ?:[\\/]* ) ;; - */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; - esac -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# If the template does not know about datarootdir, expand it. -# FIXME: This hack should be removed a few years after 2.60. -ac_datarootdir_hack=; ac_datarootdir_seen= -ac_sed_dataroot=' -/datarootdir/ { - p - q -} -/@datadir@/p -/@docdir@/p -/@infodir@/p -/@localedir@/p -/@mandir@/p' -case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in -*datarootdir*) ac_datarootdir_seen=yes;; -*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_datarootdir_hack=' - s&@datadir@&$datadir&g - s&@docdir@&$docdir&g - s&@infodir@&$infodir&g - s&@localedir@&$localedir&g - s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; -esac -_ACEOF - -# Neutralize VPATH when `$srcdir' = `.'. -# Shell code in configure.ac might set extrasub. -# FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_sed_extra="$ac_vpsub -$extrasub -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s|@configure_input@|$ac_sed_conf_input|;t t -s&@top_builddir@&$ac_top_builddir_sub&;t t -s&@top_build_prefix@&$ac_top_build_prefix&;t t -s&@srcdir@&$ac_srcdir&;t t -s&@abs_srcdir@&$ac_abs_srcdir&;t t -s&@top_srcdir@&$ac_top_srcdir&;t t -s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -s&@builddir@&$ac_builddir&;t t -s&@abs_builddir@&$ac_abs_builddir&;t t -s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -s&@INSTALL@&$ac_INSTALL&;t t -s&@MKDIR_P@&$ac_MKDIR_P&;t t -$ac_datarootdir_hack -" -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ - >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - -test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ - "$ac_tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&2;} - - rm -f "$ac_tmp/stdin" - case $ac_file in - -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; - *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; - esac \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - ;; - :H) - # - # CONFIG_HEADER - # - if test x"$ac_file" != x-; then - { - $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" - } >"$ac_tmp/config.h" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -$as_echo "$as_me: $ac_file is unchanged" >&6;} - else - rm -f "$ac_file" - mv "$ac_tmp/config.h" "$ac_file" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - fi - else - $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error $? "could not create -" "$LINENO" 5 - fi -# Compute "$ac_file"'s index in $config_headers. -_am_arg="$ac_file" -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || -$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$_am_arg" : 'X\(//\)[^/]' \| \ - X"$_am_arg" : 'X\(//\)$' \| \ - X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$_am_arg" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'`/stamp-h$_am_stamp_count - ;; - - :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 -$as_echo "$as_me: executing $ac_file commands" >&6;} - ;; - esac - - - case $ac_file$ac_mode in - "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Older Autoconf quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval - # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac - shift - for mf - do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - as_dir=$dirpart/$fdir; as_fn_mkdir_p - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done -} - ;; - "libtool":C) - - # See if we are running on zsh, and set the options which allow our - # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - - cfgfile="${ofile}T" - trap "$RM \"$cfgfile\"; exit 1" 1 2 15 - $RM "$cfgfile" - - cat <<_LT_EOF >> "$cfgfile" -#! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - -# The names of the tagged configurations supported by this script. -available_tags="CXX " - -# ### BEGIN LIBTOOL CONFIG - -# Which release of libtool.m4 was used? -macro_version=$macro_version -macro_revision=$macro_revision - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# What type of objects to build. -pic_mode=$pic_mode - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# An echo program that protects backslashes. -ECHO=$lt_ECHO - -# The PATH separator for the build system. -PATH_SEPARATOR=$lt_PATH_SEPARATOR - -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os - -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os - -# A sed program that does not truncate output. -SED=$lt_SED - -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="\$SED -e 1s/^X//" - -# A grep program that handles long lines. -GREP=$lt_GREP - -# An ERE matcher. -EGREP=$lt_EGREP - -# A literal string matcher. -FGREP=$lt_FGREP - -# A BSD- or MS-compatible name lister. -NM=$lt_NM - -# Whether we need soft or hard links. -LN_S=$lt_LN_S - -# What is the maximum length of a command? -max_cmd_len=$max_cmd_len - -# Object file suffix (normally "o"). -objext=$ac_objext - -# Executable file suffix (normally ""). -exeext=$exeext - -# whether the shell understands "unset". -lt_unset=$lt_unset - -# turn spaces into newlines. -SP2NL=$lt_lt_SP2NL - -# turn newlines into spaces. -NL2SP=$lt_lt_NL2SP - -# convert \$build file names to \$host format. -to_host_file_cmd=$lt_cv_to_host_file_cmd - -# convert \$build files to toolchain format. -to_tool_file_cmd=$lt_cv_to_tool_file_cmd - -# An object symbol dumper. -OBJDUMP=$lt_OBJDUMP - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method - -# Command to use when deplibs_check_method = "file_magic". -file_magic_cmd=$lt_file_magic_cmd - -# How to find potential files when deplibs_check_method = "file_magic". -file_magic_glob=$lt_file_magic_glob - -# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -want_nocaseglob=$lt_want_nocaseglob - -# DLL creation program. -DLLTOOL=$lt_DLLTOOL - -# Command to associate shared and link libraries. -sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd - -# The archiver. -AR=$lt_AR - -# Flags to create an archive. -AR_FLAGS=$lt_AR_FLAGS - -# How to feed a file listing to the archiver. -archiver_list_spec=$lt_archiver_list_spec - -# A symbol stripping program. -STRIP=$lt_STRIP - -# Commands used to install an old-style archive. -RANLIB=$lt_RANLIB -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# Whether to use a lock for old archive extraction. -lock_old_archive_extraction=$lock_old_archive_extraction - -# A C compiler. -LTCC=$lt_CC - -# LTCC compiler flags. -LTCFLAGS=$lt_CFLAGS - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - -# Transform the output of nm in a proper C declaration. -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -# Transform the output of nm in a C name address pair. -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - -# Transform the output of nm in a C name address pair when lib prefix is needed. -global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -# Specify filename containing input files for \$NM. -nm_file_list_spec=$lt_nm_file_list_spec - -# The root where to search for dependent libraries,and in which our libraries should be installed. -lt_sysroot=$lt_sysroot - -# The name of the directory that contains temporary libtool files. -objdir=$objdir - -# Used to examine libraries when file_magic_cmd begins with "file". -MAGIC_CMD=$MAGIC_CMD - -# Must we lock files when doing compilation? -need_locks=$lt_need_locks - -# Manifest tool. -MANIFEST_TOOL=$lt_MANIFEST_TOOL - -# Tool to manipulate archived DWARF debug symbol files on Mac OS X. -DSYMUTIL=$lt_DSYMUTIL - -# Tool to change global to local symbols on Mac OS X. -NMEDIT=$lt_NMEDIT - -# Tool to manipulate fat objects and archives on Mac OS X. -LIPO=$lt_LIPO - -# ldd/readelf like tool for Mach-O binaries on Mac OS X. -OTOOL=$lt_OTOOL - -# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. -OTOOL64=$lt_OTOOL64 - -# Old archive suffix (normally "a"). -libext=$libext - -# Shared library suffix (normally ".so"). -shrext_cmds=$lt_shrext_cmds - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at link time. -variables_saved_for_relink=$lt_variables_saved_for_relink - -# Do we need the "lib" prefix for modules? -need_lib_prefix=$need_lib_prefix - -# Do we need a version for libraries? -need_version=$need_version - -# Library versioning type. -version_type=$version_type - -# Shared library runtime path variable. -runpath_var=$runpath_var - -# Shared library path variable. -shlibpath_var=$shlibpath_var - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath - -# Format of library name prefix. -libname_spec=$lt_libname_spec - -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME -library_names_spec=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Permission mode override for installation of shared libraries. -install_override_mode=$lt_install_override_mode - -# Command to use after installation of a shared archive. -postinstall_cmds=$lt_postinstall_cmds - -# Command to use after uninstallation of a shared archive. -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds - -# As "finish_cmds", except a single script fragment to be evaled but -# not shown. -finish_eval=$lt_finish_eval - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs - -# Compile-time system search path for libraries. -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - -# Run-time system search path for libraries. -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -# Whether dlopen is supported. -dlopen_support=$enable_dlopen - -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static - -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - - -# The linker used to build libraries. -LD=$lt_LD - -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# Commands used to build an old-style archive. -old_archive_cmds=$lt_old_archive_cmds - -# A language specific compiler. -CC=$lt_compiler - -# Is the compiler the GNU compiler? -with_gcc=$GCC - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc - -# Whether or not to disallow shared libs when runtime libs are static. -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec - -# Whether the compiler copes with passing no objects directly. -compiler_needs_object=$lt_compiler_needs_object - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds - -# Commands used to build a shared archive. -archive_cmds=$lt_archive_cmds -archive_expsym_cmds=$lt_archive_expsym_cmds - -# Commands used to build a loadable module if different from building -# a shared archive. -module_cmds=$lt_module_cmds -module_expsym_cmds=$lt_module_expsym_cmds - -# Whether we are building with GNU ld or not. -with_gnu_ld=$lt_with_gnu_ld - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag - -# Flag that enforces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec - -# Whether we need a single "-rpath" flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary. -hardcode_direct=$hardcode_direct - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the -# library is relocated. -hardcode_direct_absolute=$hardcode_direct_absolute - -# Set to "yes" if using the -LDIR flag during linking hardcodes DIR -# into the resulting binary. -hardcode_minus_L=$hardcode_minus_L - -# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR -# into the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var - -# Set to "yes" if building a shared library automatically hardcodes DIR -# into the library and all subsequent libraries and executables linked -# against it. -hardcode_automatic=$hardcode_automatic - -# Set to yes if linker adds runtime paths of dependent libraries -# to runtime path list. -inherit_rpath=$inherit_rpath - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs - -# Set to "yes" if exported symbols are required. -always_export_symbols=$always_export_symbols - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms - -# Commands necessary for linking programs (against libraries) with templates. -prelink_cmds=$lt_prelink_cmds - -# Commands necessary for finishing linking programs. -postlink_cmds=$lt_postlink_cmds - -# Specify filename containing input files. -file_list_spec=$lt_file_list_spec - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action - -# The directories searched by this compiler when creating a shared library. -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs - -# Dependencies to place before and after the objects being linked to -# create a shared library. -predep_objects=$lt_predep_objects -postdep_objects=$lt_postdep_objects -predeps=$lt_predeps -postdeps=$lt_postdeps - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path - -# ### END LIBTOOL CONFIG - -_LT_EOF - - case $host_os in - aix3*) - cat <<\_LT_EOF >> "$cfgfile" -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -_LT_EOF - ;; - esac - - -ltmain="$ac_aux_dir/ltmain.sh" - - - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - if test x"$xsi_shell" = xyes; then - sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -func_dirname ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_basename ()$/,/^} # func_basename /c\ -func_basename ()\ -{\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -func_dirname_and_basename ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -func_stripname ()\ -{\ -\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -\ # positional parameters, so assign one to ordinary parameter first.\ -\ func_stripname_result=${3}\ -\ func_stripname_result=${func_stripname_result#"${1}"}\ -\ func_stripname_result=${func_stripname_result%"${2}"}\ -} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -func_split_long_opt ()\ -{\ -\ func_split_long_opt_name=${1%%=*}\ -\ func_split_long_opt_arg=${1#*=}\ -} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -func_split_short_opt ()\ -{\ -\ func_split_short_opt_arg=${1#??}\ -\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -func_lo2o ()\ -{\ -\ case ${1} in\ -\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -\ *) func_lo2o_result=${1} ;;\ -\ esac\ -} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_xform ()$/,/^} # func_xform /c\ -func_xform ()\ -{\ - func_xform_result=${1%.*}.lo\ -} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_arith ()$/,/^} # func_arith /c\ -func_arith ()\ -{\ - func_arith_result=$(( $* ))\ -} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_len ()$/,/^} # func_len /c\ -func_len ()\ -{\ - func_len_result=${#1}\ -} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - -fi - -if test x"$lt_shell_append" = xyes; then - sed -e '/^func_append ()$/,/^} # func_append /c\ -func_append ()\ -{\ - eval "${1}+=\\${2}"\ -} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -func_append_quoted ()\ -{\ -\ func_quote_for_eval "${2}"\ -\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -fi - - - mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - - - cat <<_LT_EOF >> "$ofile" - -# ### BEGIN LIBTOOL TAG CONFIG: CXX - -# The linker used to build libraries. -LD=$lt_LD_CXX - -# How to create reloadable object files. -reload_flag=$lt_reload_flag_CXX -reload_cmds=$lt_reload_cmds_CXX - -# Commands used to build an old-style archive. -old_archive_cmds=$lt_old_archive_cmds_CXX - -# A language specific compiler. -CC=$lt_compiler_CXX - -# Is the compiler the GNU compiler? -with_gcc=$GCC_CXX - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_CXX - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_CXX - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_CXX - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_CXX - -# Whether or not to disallow shared libs when runtime libs are static. -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX - -# Whether the compiler copes with passing no objects directly. -compiler_needs_object=$lt_compiler_needs_object_CXX - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX - -# Commands used to build a shared archive. -archive_cmds=$lt_archive_cmds_CXX -archive_expsym_cmds=$lt_archive_expsym_cmds_CXX - -# Commands used to build a loadable module if different from building -# a shared archive. -module_cmds=$lt_module_cmds_CXX -module_expsym_cmds=$lt_module_expsym_cmds_CXX - -# Whether we are building with GNU ld or not. -with_gnu_ld=$lt_with_gnu_ld_CXX - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_CXX - -# Flag that enforces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_CXX - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX - -# Whether we need a single "-rpath" flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary. -hardcode_direct=$hardcode_direct_CXX - -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the -# library is relocated. -hardcode_direct_absolute=$hardcode_direct_absolute_CXX - -# Set to "yes" if using the -LDIR flag during linking hardcodes DIR -# into the resulting binary. -hardcode_minus_L=$hardcode_minus_L_CXX - -# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR -# into the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX - -# Set to "yes" if building a shared library automatically hardcodes DIR -# into the library and all subsequent libraries and executables linked -# against it. -hardcode_automatic=$hardcode_automatic_CXX - -# Set to yes if linker adds runtime paths of dependent libraries -# to runtime path list. -inherit_rpath=$inherit_rpath_CXX - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_CXX - -# Set to "yes" if exported symbols are required. -always_export_symbols=$always_export_symbols_CXX - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_CXX - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_CXX - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_CXX - -# Commands necessary for linking programs (against libraries) with templates. -prelink_cmds=$lt_prelink_cmds_CXX - -# Commands necessary for finishing linking programs. -postlink_cmds=$lt_postlink_cmds_CXX - -# Specify filename containing input files. -file_list_spec=$lt_file_list_spec_CXX - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_CXX - -# The directories searched by this compiler when creating a shared library. -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX - -# Dependencies to place before and after the objects being linked to -# create a shared library. -predep_objects=$lt_predep_objects_CXX -postdep_objects=$lt_postdep_objects_CXX -predeps=$lt_predeps_CXX -postdeps=$lt_postdeps_CXX - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_CXX - -# ### END LIBTOOL TAG CONFIG: CXX -_LT_EOF - - ;; - "po/stamp-it":C) - if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then - as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 - fi - rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp" - >"po/stamp-it.tmp" - sed '/^#/d - s/^[[].*] *// - /^[ ]*$/d - '"s|^| $ac_top_srcdir/|" \ - "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES" - - sed '/^POTFILES =/,/[^\\]$/ { - /^POTFILES =/!d - r po/POTFILES - } - ' "po/Makefile.in" >"po/Makefile" - rm -f "po/Makefile.tmp" - mv "po/stamp-it.tmp" "po/stamp-it" - ;; - - esac -done # for ac_tag - - -as_fn_exit 0 -_ACEOF -ac_clean_files=$ac_clean_files_save - -test $ac_write_fail = 0 || - as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 - - -# configure is writing to config.log, and then calls config.status. -# config.status does its own redirection, appending to config.log. -# Unfortunately, on DOS this fails, as config.log is still kept open -# by configure, so config.status won't be able to write to it; its -# output is simply discarded. So we exec the FD to /dev/null, -# effectively closing config.log, so it can be properly (re)opened and -# appended to by config.status. When coming back to configure, we -# need to make the FD available again. -if test "$no_create" != yes; then - ac_cs_success=: - ac_config_status_args= - test "$silent" = yes && - ac_config_status_args="$ac_config_status_args --quiet" - exec 5>/dev/null - $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit 1 -fi -if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} -fi - diff -Nru almanah-0.11.1/configure.ac almanah-0.12.0/configure.ac --- almanah-0.11.1/configure.ac 2014-09-24 18:32:08.000000000 +0000 +++ almanah-0.12.0/configure.ac 1970-01-01 00:00:00.000000000 +0000 @@ -1,176 +0,0 @@ -AC_PREREQ(2.63) -AC_INIT([almanah],[0.11.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=almanah],[almanah],[http://wiki.gnome.org/Apps/Almanah_Diary]) - -AC_CONFIG_SRCDIR([src/main.c]) -AC_CONFIG_HEADERS([config.h]) -AC_USE_SYSTEM_EXTENSIONS - -AM_INIT_AUTOMAKE([1.9 dist-bzip2 no-dist-gzip check-news subdir-objects]) - -# Enable silent build when available (Automake 1.11) -m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) - -GETTEXT_PACKAGE=almanah -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define to the Gettext package name]) -AC_SUBST(GETTEXT_PACKAGE) -IT_PROG_INTLTOOL([0.35.0]) - -AC_PROG_CXX -AM_PROG_CC_C_O -LT_INIT([]) -PKG_PROG_PKG_CONFIG -GLIB_GSETTINGS - -AC_PATH_PROG([GLIB_GENMARSHAL],[glib-genmarshal]) -AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums]) - -APPDATA_XML - -dnl *************************************************************************** -dnl Options -dnl *************************************************************************** - -dnl Debugging -AC_ARG_ENABLE([debug], - AS_HELP_STRING([--enable-debug],[turn on debugging]), - [case "${enableval}" in - yes) debug=true ;; - no) debug=false ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;; - esac],[debug=false]) - -if test $debug = "true"; then - AC_DEFINE([ENABLE_DEBUG],[1],[Define if you want debugging enabled]) -fi - -AM_CONDITIONAL([DEBUG], [test x$debug = xtrue]) - -dnl Encryption support -AC_ARG_ENABLE([encryption], - AS_HELP_STRING([--enable-encryption],[enable database encryption support]), - [case "${enableval}" in - yes) encryption=true ;; - no) encryption=false ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-encryption]) ;; - esac],[encryption=true]) - -if test $encryption = "true"; then - AC_DEFINE([ENABLE_ENCRYPTION],[1],[Define if you want database encryption support]) -fi - -AM_CONDITIONAL([ENCRYPTION], [test x$encryption = xtrue]) - -dnl Spell checking -AC_ARG_ENABLE([spell-checking], - AS_HELP_STRING([--enable-spell-checking],[enable spell checking support]), - [case "${enableval}" in - yes) spell_checking=true ;; - no) spell_checking=false ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-spell-checking]) ;; - esac],[spell_checking=true]) - -if test $spell_checking = "true"; then - AC_DEFINE([ENABLE_SPELL_CHECKING],[1],[Define if you want spell checking support]) -fi - -AM_CONDITIONAL([SPELL_CHECKING], [test x$spell_checking = xtrue]) - -dnl *************************************************************************** -dnl Dependencies -dnl *************************************************************************** - -dnl Required dependencies -PKG_CHECK_MODULES(STANDARD, glib-2.0 gtk+-3.0 >= 3.5.6 gmodule-2.0 gthread-2.0 gio-2.0 >= 2.28.0 sqlite3 cairo atk) -AC_SUBST(STANDARD_CFLAGS) -AC_SUBST(STANDARD_LIBS) - -dnl Evolution -PKG_CHECK_MODULES(EVO, libecal-1.2 >= 3.5.91 libedataserver-1.2, have_evo=yes, have_evo=no) -if test "x$have_evo" = "xyes"; then - AC_DEFINE(HAVE_EVO, 1, [Defined if libecal-1.2 is installed]) -fi -AM_CONDITIONAL([HAVE_EVO], [test x$have_evo = xyes]) - -EVO_CFLAGS="$EVO_CFLAGS -DE_BOOK_DISABLE_DEPRECATED -DE_CAL_DISABLE_DEPRECATED" -AC_SUBST(EVO_CFLAGS) -AC_SUBST(EVO_LIBS) - -dnl Spell checking -if test $spell_checking = "true"; then - PKG_CHECK_MODULES(SPELL_CHECKING, gtkspell3-3.0) - AC_SUBST(SPELL_CHECKING_CFLAGS) - AC_SUBST(SPELL_CHECKING_LIBS) -fi - -dnl Encryption support -if test $encryption = "true"; then - PKG_CHECK_MODULES(ENCRYPTION, cryptui-0.0) - - dnl Check for GPGME, which doesn't provide a pkgconfig file - dnl This code courtesy of seahorse - min_gpgme_version=1.0.0 - AC_PATH_PROG(GPGME_CONFIG, gpgme-config, "failed") - if test $GPGME_CONFIG != "failed" ; then - AC_MSG_CHECKING(for GPGME) - req_major=`echo $min_gpgme_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` - req_minor=`echo $min_gpgme_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` - req_micro=`echo $min_gpgme_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` - gpgme_config_version=`$GPGME_CONFIG --version` - major=`echo $gpgme_config_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` - minor=`echo $gpgme_config_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` - micro=`echo $gpgme_config_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` - - if test "$major" -eq "$req_major"; then - if test "$minor" -ge "$req_minor"; then - if test "$micro" -ge "$req_micro"; then - ok="yes" - fi - fi - fi - fi - - AC_DEFINE_UNQUOTED([MIN_GPGME_VERSION],"${min_gpgme_version}",[The minimum required version of GPGME]) - - if test $ok = "yes"; then - ENCRYPTION_CFLAGS="$ENCRYPTION_CFLAGS `$GPGME_CONFIG --cflags`" - ENCRYPTION_LIBS="$ENCRYPTION_LIBS `$GPGME_CONFIG --libs`" - AC_MSG_RESULT(yes) - else - AC_MSG_ERROR(GPGME $min_gpgme_version or later needed) - fi -else - ENCRYPTION_CFLAGS="" - ENCRYPTION_LIBS="" -fi - -AC_SUBST(ENCRYPTION_CFLAGS) -AC_SUBST(ENCRYPTION_LIBS) - -# Various required functions and headers -AC_CHECK_HEADERS([libintl.h]) -AC_C_INLINE -AC_FUNC_MKTIME -AC_TYPE_SIZE_T -AC_SYS_LARGEFILE - -AC_CONFIG_FILES([ -Makefile -src/Makefile -po/Makefile.in -data/Makefile -data/icons/Makefile -data/icons/16x16/Makefile -data/icons/22x22/Makefile -data/icons/32x32/Makefile -data/icons/48x48/Makefile -data/icons/256x256/Makefile -data/icons/scalable/Makefile -data/org.gnome.almanah.gschema.xml.in -]) -AC_OUTPUT diff -Nru almanah-0.11.1/data/almanah.appdata.xml.in almanah-0.12.0/data/almanah.appdata.xml.in --- almanah-0.11.1/data/almanah.appdata.xml.in 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/data/almanah.appdata.xml.in 2019-10-07 13:45:09.000000000 +0000 @@ -1,23 +1,39 @@ - - almanah.desktop + + almanah.desktop CC0-1.0 GPL-3.0+ + Almanah Diary + Keep a diary of your life - <_p> +

Almanah Diary is an application to allow you to keep a diary of your life. - - <_p> +

+

You can encrypt the diary to preserve your privacy. It has editing abilities, including text formatting and printing and shows you a lists of events which happened (on your computer) for each day (such as tasks and appointments from Evolution). - +

+ + + - https://wiki.gnome.org/Apps/Almanah_Diary?action=AttachFile&do=get&target=screenshot-almanah-diary.png + + https://wiki.gnome.org/Apps/Almanah_Diary?action=AttachFile&do=get&target=screenshot-almanah-diary.png + https://wiki.gnome.org/Apps/Almanah_Diary - alvaropg_at_gmail.com -
+ https://gitlab.gnome.org/GNOME/almanah/issues/new + https://www.gnome.org/friends/ + alvaropg_at_gmail.com + GNOME + + AppMenu + ModernToolkit + + almanah + + diff -Nru almanah-0.11.1/data/almanah-app-menu.ui almanah-0.12.0/data/almanah-app-menu.ui --- almanah-0.11.1/data/almanah-app-menu.ui 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/data/almanah-app-menu.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ - - - -
- - _Search - app.search - -
-
- - Pr_eferences - app.preferences - - - _Import - app.import - - - _Export - app.export - - - _Print diary - app.print - -
-
- - _About Almanah Diary - app.about - - - _Quit - app.quit - -
-
-
diff -Nru almanah-0.11.1/data/almanah.css almanah-0.12.0/data/almanah.css --- almanah-0.11.1/data/almanah.css 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/data/almanah.css 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -AlmanahMainWindow GtkToolbar { - border-width: 0px; -} - -AlmanahCalendarButton:active { - background-image: none; - background-color: @menu_bg_color; - - border-image: none; - border-color: @menu_bg_color; - border-radius: 4px 4px 0 0; - - color: @theme_text_color; - text-shadow: none; -} - -AlmanahCalendarButton GtkLabel:active { - color: @theme_text_color; - text-shadow: none; -} - -AlmanahCalendarButton GtkArrow:active { - color: @theme_text_color; -} - -AlmanahCalendarWindow { - background-color: @menu_bg_color; -} - -AlmanahTagEntry { - color: #aaa; - font-size: 8px; - transition: none; -} - -AlmanahTagEntry:focused { - color: @theme_text_color; -} - -AlmanahTagEntry:backdrop { - background-color: @theme_unfocused_base_color; -} - -.almanah-mw-main-content GtkScrolledWindow { - border-style: solid; - border-radius: 0px; - border-width: 0px; - border-bottom-width: 1px; - border-top-width: 1px; - background-color: #fff; -} - -.almanah-mw-main-content GtkScrolledWindow:backdrop { - background-color: @theme_unfocused_base_color; -} diff -Nru almanah-0.11.1/data/almanah.desktop.in almanah-0.12.0/data/almanah.desktop.in --- almanah-0.11.1/data/almanah.desktop.in 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/data/almanah.desktop.in 2019-10-07 13:45:09.000000000 +0000 @@ -1,10 +1,11 @@ [Desktop Entry] -_Name=Almanah Diary -_Comment=Keep a personal diary -_GenericName=Diary +Name=Almanah Diary +Comment=Keep a personal diary +GenericName=Diary # TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! -_Keywords=diary;journal; +Keywords=diary;journal; Exec=almanah +# Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=almanah Terminal=false Type=Application diff -Nru almanah-0.11.1/data/almanah.ui almanah-0.12.0/data/almanah.ui --- almanah-0.11.1/data/almanah.ui 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/data/almanah.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,1023 +0,0 @@ - - - - - - - - gtk-cut - edit-cut - False - - - - - - gtk-copy - edit-copy - False - - - - - - gtk-paste - edit-paste - - - - - - gtk-delete - edit-delete - False - - - - - - gtk-index - Select Date… - edit-select-date - - - - - - - format - F_ormat - - - - - gtk-bold - format-bold - Toggle whether the currently selected text is bold. - - - - - - gtk-italic - format-italic - Toggle whether the currently selected text is italic. - - - - - - gtk-underline - format-underline - Toggle whether the currently selected text is underlined. - - - - - - format-hyperlink - Add/Remove _Hyperlink - Add or remove a hyperlink from the currently selected text to a specified URI. - insert-link-symbolic - - - - - - format-insert-time - Insert _Time - - - - - - - format-important - I_mportant - Toggle whether the current entry is marked as important. - starred-symbolic - - - - - - - show-tags - Show tags - Show tags for the current entry - almanah-tags-symbolic - - - - - - help - _Help - - - - - gtk-jump-to - jump-to-today - Go to _Today - Jump to the current date in the diary. - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 12 - True - GTK_WINDOW_POPUP - - - GTK_ORIENTATION_VERTICAL - 6 - - - 200 - True - False - - - - Calendar - - - - - True - - - - - GTK_ORIENTATION_HORIZONTAL - True - - - True - True - - - False - - - - - True - True - - - False - - - - - False - - - - - - - - True - - - - - - - False - - - - - 6 - - - GTK_ORIENTATION_VERTICAL - 0 - - - - False - True - False - True - 6 - 6 - 0 - 0 - 0 - 0 - 6 - - - 0 - 0 - 1 - 1 - - - - - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - True - True - - - - 300 - 300 - True - True - GTK_WRAP_WORD - 6 - 10 - 10 - 4 - - - Entry editing area - - - - - - - 0 - 1 - 1 - 1 - - - - - True - True - - - - - - - 6 - - - Past events - - - - - - - - - False - True - - - - - - - False - True - - - - - - - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - almanah_mw_event_store - True - False - - - - - - - Past Event List - - - - - - - - 1 - - - - - - - True - - - - 3 - - - - - - - - - - 4 - - - - - - - - - - - False - False - - - - - True - True - - - - - - - - - - - - - - - - gtk-find - - - - - - - - - - - - - - 5 - 400 - - - 6 - True - - - 6 - 6 - True - - - 6 - True - - - True - True - - - - - - Search entry - - - - - - - almanah_sd_search_button_image - Search - True - True - True - - - - - - - False - - - - - True - gtk-cancel - True - True - False - True - - - - - - - False - - - - - False - - - - - 12 - False - - - 6 - True - - - 6 - True - - - - 0 - True - - - - - - True - - - - - False - False - - - False - - - - - False - - - - - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - True - - - almanah_sd_results_store - False - True - - - - - - - Result List - - - - - - - - 4 - - - - - - - - - - 3 - - - - - - - - - True - - - - - - - True - - - - - - - True - - - View Entry - False - True - - - - - - True - gtk-close - True - - - - - - - - almanah_sd_close_button - - - - - 5 - - - 6 - - - 1 - 3 - 6 - 6 - 5 - - - - False - - - - - - - True - gtk-close - True - True - - - - - - - - almanah_pd_close_button - - - - - 5 - - - 6 - - - 6 - 5 - - - True - - - - - - - False - - - - - 0 - - e.g. "14/03/2009" or "14th March 2009". - - - - - - - - - False - - - - - - - - - True - gtk-cancel - - - - - True - gtk-ok - True - True - False - - - - - - - - almanah_ded_cancel_button - almanah_ded_ok_button - - - - - 5 - - - 6 - - - 6 - 5 - - - True - - - - - - - False - - - - - 0 - - e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”. - - - - - - - - - False - - - - - - - - - True - gtk-cancel - - - - - True - gtk-ok - True - True - False - - - - - - - - almanah_ued_cancel_button - almanah_ued_ok_button - - - - - - - - - - - - - - 5 - - - 6 - - - 5 - 6 - - - 6 - - - 0 - - almanah_ied_mode_combo_box - True - - - - - - False - - - - - - almanah_ied_mode_store - - - - - - - 1 - - - - - - - False - - - - - 12 - - - True - almanah_ied_file_chooser - True - - - - - False - - - - - - - GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER - True - - - - - 12 - - - - - - False - - - - - - - - - True - gtk-cancel - - - - - True - - True - True - - - - - - - - almanah_ied_cancel_button - almanah_ied_import_export_button - - - - - - - - - - Successful Entries - - - Merged Entries - - - Failed Entries - - - - - - - - - - - - - - - - - almanah_ird_results_store - - - - 5 - - - 6 - - - 5 - 6 - - - - almanah_ird_view_store - - - - - - - 0 - - - - - False - - - - - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - almanah_ird_filtered_results_store - False - - - - - - - Import Results List - - - - - - - - 3 - - - - - - - - - - 5 - - - - - - - - - - - - - - - View Entry - False - - - - - - True - gtk-close - - - - - - - - almanah_ird_close_button - - - diff -Nru almanah-0.11.1/data/icons/16x16/Makefile.am almanah-0.12.0/data/icons/16x16/Makefile.am --- almanah-0.11.1/data/icons/16x16/Makefile.am 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/data/icons/16x16/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -icondir = $(datadir)/icons/hicolor/16x16/apps -icon_DATA = almanah.png - -EXTRA_DIST = $(icon_DATA) almanah.svg - --include $(top_srcdir)/git.mk diff -Nru almanah-0.11.1/data/icons/16x16/Makefile.in almanah-0.12.0/data/icons/16x16/Makefile.in --- almanah-0.11.1/data/icons/16x16/Makefile.in 2014-09-24 18:32:46.000000000 +0000 +++ almanah-0.12.0/data/icons/16x16/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,519 +0,0 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = data/icons/16x16 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(icondir)" -DATA = $(icon_DATA) -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPDATA_VALIDATE = @APPDATA_VALIDATE@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENCRYPTION_CFLAGS = @ENCRYPTION_CFLAGS@ -ENCRYPTION_LIBS = @ENCRYPTION_LIBS@ -EVO_CFLAGS = @EVO_CFLAGS@ -EVO_LIBS = @EVO_LIBS@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ -GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GLIB_MKENUMS = @GLIB_MKENUMS@ -GMSGFMT = @GMSGFMT@ -GPGME_CONFIG = @GPGME_CONFIG@ -GREP = @GREP@ -GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MSGFMT = @MSGFMT@ -MSGMERGE = @MSGMERGE@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPELL_CHECKING_CFLAGS = @SPELL_CHECKING_CFLAGS@ -SPELL_CHECKING_LIBS = @SPELL_CHECKING_LIBS@ -STANDARD_CFLAGS = @STANDARD_CFLAGS@ -STANDARD_LIBS = @STANDARD_LIBS@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -appdataxmldir = @appdataxmldir@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gsettingsschemadir = @gsettingsschemadir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -icondir = $(datadir)/icons/hicolor/16x16/apps -icon_DATA = almanah.png -EXTRA_DIST = $(icon_DATA) almanah.svg -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/16x16/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/icons/16x16/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-iconDATA: $(icon_DATA) - @$(NORMAL_INSTALL) - @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(icondir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \ - done - -uninstall-iconDATA: - @$(NORMAL_UNINSTALL) - @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir) -tags TAGS: - -ctags CTAGS: - -cscope cscopelist: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(icondir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-iconDATA - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-iconDATA - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - cscopelist-am ctags-am distclean distclean-generic \ - distclean-libtool distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-iconDATA install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags-am uninstall uninstall-am uninstall-iconDATA - - --include $(top_srcdir)/git.mk - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru almanah-0.11.1/data/icons/22x22/Makefile.am almanah-0.12.0/data/icons/22x22/Makefile.am --- almanah-0.11.1/data/icons/22x22/Makefile.am 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/data/icons/22x22/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -icondir = $(datadir)/icons/hicolor/22x22/apps -icon_DATA = almanah.png - -EXTRA_DIST = $(icon_DATA) almanah.svg - --include $(top_srcdir)/git.mk diff -Nru almanah-0.11.1/data/icons/22x22/Makefile.in almanah-0.12.0/data/icons/22x22/Makefile.in --- almanah-0.11.1/data/icons/22x22/Makefile.in 2014-09-24 18:32:46.000000000 +0000 +++ almanah-0.12.0/data/icons/22x22/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,519 +0,0 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = data/icons/22x22 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(icondir)" -DATA = $(icon_DATA) -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPDATA_VALIDATE = @APPDATA_VALIDATE@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENCRYPTION_CFLAGS = @ENCRYPTION_CFLAGS@ -ENCRYPTION_LIBS = @ENCRYPTION_LIBS@ -EVO_CFLAGS = @EVO_CFLAGS@ -EVO_LIBS = @EVO_LIBS@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ -GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GLIB_MKENUMS = @GLIB_MKENUMS@ -GMSGFMT = @GMSGFMT@ -GPGME_CONFIG = @GPGME_CONFIG@ -GREP = @GREP@ -GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MSGFMT = @MSGFMT@ -MSGMERGE = @MSGMERGE@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPELL_CHECKING_CFLAGS = @SPELL_CHECKING_CFLAGS@ -SPELL_CHECKING_LIBS = @SPELL_CHECKING_LIBS@ -STANDARD_CFLAGS = @STANDARD_CFLAGS@ -STANDARD_LIBS = @STANDARD_LIBS@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -appdataxmldir = @appdataxmldir@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gsettingsschemadir = @gsettingsschemadir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -icondir = $(datadir)/icons/hicolor/22x22/apps -icon_DATA = almanah.png -EXTRA_DIST = $(icon_DATA) almanah.svg -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/22x22/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/icons/22x22/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-iconDATA: $(icon_DATA) - @$(NORMAL_INSTALL) - @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(icondir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \ - done - -uninstall-iconDATA: - @$(NORMAL_UNINSTALL) - @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir) -tags TAGS: - -ctags CTAGS: - -cscope cscopelist: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(icondir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-iconDATA - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-iconDATA - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - cscopelist-am ctags-am distclean distclean-generic \ - distclean-libtool distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-iconDATA install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags-am uninstall uninstall-am uninstall-iconDATA - - --include $(top_srcdir)/git.mk - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru almanah-0.11.1/data/icons/256x256/Makefile.am almanah-0.12.0/data/icons/256x256/Makefile.am --- almanah-0.11.1/data/icons/256x256/Makefile.am 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/data/icons/256x256/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -icondir = $(datadir)/icons/hicolor/256x256/apps -icon_DATA = almanah.png - -EXTRA_DIST = $(icon_DATA) almanah.svg - --include $(top_srcdir)/git.mk diff -Nru almanah-0.11.1/data/icons/256x256/Makefile.in almanah-0.12.0/data/icons/256x256/Makefile.in --- almanah-0.11.1/data/icons/256x256/Makefile.in 2014-09-24 18:32:46.000000000 +0000 +++ almanah-0.12.0/data/icons/256x256/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,519 +0,0 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = data/icons/256x256 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(icondir)" -DATA = $(icon_DATA) -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPDATA_VALIDATE = @APPDATA_VALIDATE@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENCRYPTION_CFLAGS = @ENCRYPTION_CFLAGS@ -ENCRYPTION_LIBS = @ENCRYPTION_LIBS@ -EVO_CFLAGS = @EVO_CFLAGS@ -EVO_LIBS = @EVO_LIBS@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ -GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GLIB_MKENUMS = @GLIB_MKENUMS@ -GMSGFMT = @GMSGFMT@ -GPGME_CONFIG = @GPGME_CONFIG@ -GREP = @GREP@ -GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MSGFMT = @MSGFMT@ -MSGMERGE = @MSGMERGE@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPELL_CHECKING_CFLAGS = @SPELL_CHECKING_CFLAGS@ -SPELL_CHECKING_LIBS = @SPELL_CHECKING_LIBS@ -STANDARD_CFLAGS = @STANDARD_CFLAGS@ -STANDARD_LIBS = @STANDARD_LIBS@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -appdataxmldir = @appdataxmldir@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gsettingsschemadir = @gsettingsschemadir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -icondir = $(datadir)/icons/hicolor/256x256/apps -icon_DATA = almanah.png -EXTRA_DIST = $(icon_DATA) almanah.svg -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/256x256/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/icons/256x256/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-iconDATA: $(icon_DATA) - @$(NORMAL_INSTALL) - @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(icondir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \ - done - -uninstall-iconDATA: - @$(NORMAL_UNINSTALL) - @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir) -tags TAGS: - -ctags CTAGS: - -cscope cscopelist: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(icondir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-iconDATA - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-iconDATA - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - cscopelist-am ctags-am distclean distclean-generic \ - distclean-libtool distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-iconDATA install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags-am uninstall uninstall-am uninstall-iconDATA - - --include $(top_srcdir)/git.mk - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru almanah-0.11.1/data/icons/32x32/Makefile.am almanah-0.12.0/data/icons/32x32/Makefile.am --- almanah-0.11.1/data/icons/32x32/Makefile.am 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/data/icons/32x32/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -icondir = $(datadir)/icons/hicolor/32x32/apps -icon_DATA = almanah.png - -EXTRA_DIST = $(icon_DATA) almanah.svg - --include $(top_srcdir)/git.mk diff -Nru almanah-0.11.1/data/icons/32x32/Makefile.in almanah-0.12.0/data/icons/32x32/Makefile.in --- almanah-0.11.1/data/icons/32x32/Makefile.in 2014-09-24 18:32:46.000000000 +0000 +++ almanah-0.12.0/data/icons/32x32/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,519 +0,0 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = data/icons/32x32 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(icondir)" -DATA = $(icon_DATA) -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPDATA_VALIDATE = @APPDATA_VALIDATE@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENCRYPTION_CFLAGS = @ENCRYPTION_CFLAGS@ -ENCRYPTION_LIBS = @ENCRYPTION_LIBS@ -EVO_CFLAGS = @EVO_CFLAGS@ -EVO_LIBS = @EVO_LIBS@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ -GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GLIB_MKENUMS = @GLIB_MKENUMS@ -GMSGFMT = @GMSGFMT@ -GPGME_CONFIG = @GPGME_CONFIG@ -GREP = @GREP@ -GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MSGFMT = @MSGFMT@ -MSGMERGE = @MSGMERGE@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPELL_CHECKING_CFLAGS = @SPELL_CHECKING_CFLAGS@ -SPELL_CHECKING_LIBS = @SPELL_CHECKING_LIBS@ -STANDARD_CFLAGS = @STANDARD_CFLAGS@ -STANDARD_LIBS = @STANDARD_LIBS@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -appdataxmldir = @appdataxmldir@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gsettingsschemadir = @gsettingsschemadir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -icondir = $(datadir)/icons/hicolor/32x32/apps -icon_DATA = almanah.png -EXTRA_DIST = $(icon_DATA) almanah.svg -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/32x32/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/icons/32x32/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-iconDATA: $(icon_DATA) - @$(NORMAL_INSTALL) - @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(icondir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \ - done - -uninstall-iconDATA: - @$(NORMAL_UNINSTALL) - @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir) -tags TAGS: - -ctags CTAGS: - -cscope cscopelist: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(icondir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-iconDATA - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-iconDATA - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - cscopelist-am ctags-am distclean distclean-generic \ - distclean-libtool distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-iconDATA install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags-am uninstall uninstall-am uninstall-iconDATA - - --include $(top_srcdir)/git.mk - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru almanah-0.11.1/data/icons/48x48/Makefile.am almanah-0.12.0/data/icons/48x48/Makefile.am --- almanah-0.11.1/data/icons/48x48/Makefile.am 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/data/icons/48x48/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -icondir = $(datadir)/icons/hicolor/48x48/apps -icon_DATA = almanah.png - -EXTRA_DIST = $(icon_DATA) almanah.svg - --include $(top_srcdir)/git.mk diff -Nru almanah-0.11.1/data/icons/48x48/Makefile.in almanah-0.12.0/data/icons/48x48/Makefile.in --- almanah-0.11.1/data/icons/48x48/Makefile.in 2014-09-24 18:32:46.000000000 +0000 +++ almanah-0.12.0/data/icons/48x48/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,519 +0,0 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = data/icons/48x48 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(icondir)" -DATA = $(icon_DATA) -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPDATA_VALIDATE = @APPDATA_VALIDATE@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENCRYPTION_CFLAGS = @ENCRYPTION_CFLAGS@ -ENCRYPTION_LIBS = @ENCRYPTION_LIBS@ -EVO_CFLAGS = @EVO_CFLAGS@ -EVO_LIBS = @EVO_LIBS@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ -GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GLIB_MKENUMS = @GLIB_MKENUMS@ -GMSGFMT = @GMSGFMT@ -GPGME_CONFIG = @GPGME_CONFIG@ -GREP = @GREP@ -GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MSGFMT = @MSGFMT@ -MSGMERGE = @MSGMERGE@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPELL_CHECKING_CFLAGS = @SPELL_CHECKING_CFLAGS@ -SPELL_CHECKING_LIBS = @SPELL_CHECKING_LIBS@ -STANDARD_CFLAGS = @STANDARD_CFLAGS@ -STANDARD_LIBS = @STANDARD_LIBS@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -appdataxmldir = @appdataxmldir@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gsettingsschemadir = @gsettingsschemadir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -icondir = $(datadir)/icons/hicolor/48x48/apps -icon_DATA = almanah.png -EXTRA_DIST = $(icon_DATA) almanah.svg -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/48x48/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/icons/48x48/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-iconDATA: $(icon_DATA) - @$(NORMAL_INSTALL) - @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(icondir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \ - done - -uninstall-iconDATA: - @$(NORMAL_UNINSTALL) - @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir) -tags TAGS: - -ctags CTAGS: - -cscope cscopelist: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(icondir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-iconDATA - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-iconDATA - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - cscopelist-am ctags-am distclean distclean-generic \ - distclean-libtool distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-iconDATA install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags-am uninstall uninstall-am uninstall-iconDATA - - --include $(top_srcdir)/git.mk - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru almanah-0.11.1/data/icons/Makefile.am almanah-0.12.0/data/icons/Makefile.am --- almanah-0.11.1/data/icons/Makefile.am 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/data/icons/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -SUBDIRS = 16x16 22x22 32x32 48x48 256x256 scalable - --include $(top_srcdir)/git.mk diff -Nru almanah-0.11.1/data/icons/Makefile.in almanah-0.12.0/data/icons/Makefile.in --- almanah-0.11.1/data/icons/Makefile.in 2014-09-24 18:32:46.000000000 +0000 +++ almanah-0.12.0/data/icons/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,643 +0,0 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = data/icons -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ - ctags-recursive dvi-recursive html-recursive info-recursive \ - install-data-recursive install-dvi-recursive \ - install-exec-recursive install-html-recursive \ - install-info-recursive install-pdf-recursive \ - install-ps-recursive install-recursive installcheck-recursive \ - installdirs-recursive pdf-recursive ps-recursive \ - tags-recursive uninstall-recursive -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -am__recursive_targets = \ - $(RECURSIVE_TARGETS) \ - $(RECURSIVE_CLEAN_TARGETS) \ - $(am__extra_recursive_targets) -AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPDATA_VALIDATE = @APPDATA_VALIDATE@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENCRYPTION_CFLAGS = @ENCRYPTION_CFLAGS@ -ENCRYPTION_LIBS = @ENCRYPTION_LIBS@ -EVO_CFLAGS = @EVO_CFLAGS@ -EVO_LIBS = @EVO_LIBS@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ -GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GLIB_MKENUMS = @GLIB_MKENUMS@ -GMSGFMT = @GMSGFMT@ -GPGME_CONFIG = @GPGME_CONFIG@ -GREP = @GREP@ -GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MSGFMT = @MSGFMT@ -MSGMERGE = @MSGMERGE@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPELL_CHECKING_CFLAGS = @SPELL_CHECKING_CFLAGS@ -SPELL_CHECKING_LIBS = @SPELL_CHECKING_LIBS@ -STANDARD_CFLAGS = @STANDARD_CFLAGS@ -STANDARD_LIBS = @STANDARD_LIBS@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -appdataxmldir = @appdataxmldir@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gsettingsschemadir = @gsettingsschemadir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -SUBDIRS = 16x16 22x22 32x32 48x48 256x256 scalable -all: all-recursive - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/icons/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -# This directory's subdirectories are mostly independent; you can cd -# into them and run 'make' without going through this Makefile. -# To change the values of 'make' variables: instead of editing Makefiles, -# (1) if the variable is set in 'config.status', edit 'config.status' -# (which will cause the Makefiles to be regenerated when you run 'make'); -# (2) otherwise, pass the desired values on the 'make' command line. -$(am__recursive_targets): - @fail=; \ - if $(am__make_keepgoing); then \ - failcom='fail=yes'; \ - else \ - failcom='exit 1'; \ - fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-recursive -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-recursive - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-recursive - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - $(am__make_dryrun) \ - || test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: - -.MAKE: $(am__recursive_targets) install-am install-strip - -.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ - check-am clean clean-generic clean-libtool cscopelist-am ctags \ - ctags-am distclean distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-am uninstall uninstall-am - - --include $(top_srcdir)/git.mk - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru almanah-0.11.1/data/icons/meson.build almanah-0.12.0/data/icons/meson.build --- almanah-0.11.1/data/icons/meson.build 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.12.0/data/icons/meson.build 2019-10-07 13:45:09.000000000 +0000 @@ -0,0 +1,24 @@ +icon_sizes = [ + '16x16', + '22x22', + '32x32', + '48x48', + '256x256', +] + +foreach icon_size : icon_sizes + install_data( + join_paths(icon_size, 'almanah.png'), + install_dir: join_paths(icondir, icon_size, 'apps'), + ) +endforeach + +install_data( + join_paths('scalable', 'almanah-tags-symbolic.svg'), + install_dir: join_paths(icondir, 'scalable', 'actions'), +) + +install_data( + join_paths('scalable', 'almanah-symbolic.svg'), + install_dir: join_paths(icondir, 'scalable', 'apps'), +) diff -Nru almanah-0.11.1/data/icons/scalable/almanah-symbolic.svg almanah-0.12.0/data/icons/scalable/almanah-symbolic.svg --- almanah-0.11.1/data/icons/scalable/almanah-symbolic.svg 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.12.0/data/icons/scalable/almanah-symbolic.svg 2019-10-07 13:45:09.000000000 +0000 @@ -0,0 +1,468 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Szypulka + + + + + Jakub Szypulka + + + + + Jakub Szypulka + + + + + + + + + + + diff -Nru almanah-0.11.1/data/icons/scalable/Makefile.am almanah-0.12.0/data/icons/scalable/Makefile.am --- almanah-0.11.1/data/icons/scalable/Makefile.am 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/data/icons/scalable/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -icondir = $(datadir)/icons/hicolor/scalable/actions -icon_DATA = almanah-tags-symbolic.svg - -EXTRA_DIST = $(icon_DATA) - --include ($top_srcdir)/git.mk diff -Nru almanah-0.11.1/data/icons/scalable/Makefile.in almanah-0.12.0/data/icons/scalable/Makefile.in --- almanah-0.11.1/data/icons/scalable/Makefile.in 2014-09-24 18:32:46.000000000 +0000 +++ almanah-0.12.0/data/icons/scalable/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,519 +0,0 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = data/icons/scalable -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(icondir)" -DATA = $(icon_DATA) -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPDATA_VALIDATE = @APPDATA_VALIDATE@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENCRYPTION_CFLAGS = @ENCRYPTION_CFLAGS@ -ENCRYPTION_LIBS = @ENCRYPTION_LIBS@ -EVO_CFLAGS = @EVO_CFLAGS@ -EVO_LIBS = @EVO_LIBS@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ -GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GLIB_MKENUMS = @GLIB_MKENUMS@ -GMSGFMT = @GMSGFMT@ -GPGME_CONFIG = @GPGME_CONFIG@ -GREP = @GREP@ -GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MSGFMT = @MSGFMT@ -MSGMERGE = @MSGMERGE@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPELL_CHECKING_CFLAGS = @SPELL_CHECKING_CFLAGS@ -SPELL_CHECKING_LIBS = @SPELL_CHECKING_LIBS@ -STANDARD_CFLAGS = @STANDARD_CFLAGS@ -STANDARD_LIBS = @STANDARD_LIBS@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -appdataxmldir = @appdataxmldir@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gsettingsschemadir = @gsettingsschemadir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -icondir = $(datadir)/icons/hicolor/scalable/actions -icon_DATA = almanah-tags-symbolic.svg -EXTRA_DIST = $(icon_DATA) -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/scalable/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/icons/scalable/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-iconDATA: $(icon_DATA) - @$(NORMAL_INSTALL) - @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(icondir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \ - done - -uninstall-iconDATA: - @$(NORMAL_UNINSTALL) - @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir) -tags TAGS: - -ctags CTAGS: - -cscope cscopelist: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(icondir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-iconDATA - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-iconDATA - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - cscopelist-am ctags-am distclean distclean-generic \ - distclean-libtool distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-iconDATA install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags-am uninstall uninstall-am uninstall-iconDATA - - --include ($top_srcdir)/git.mk - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru almanah-0.11.1/data/Makefile.am almanah-0.12.0/data/Makefile.am --- almanah-0.11.1/data/Makefile.am 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/data/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,89 +0,0 @@ -SUBDIRS = icons - -EXTRA_DIST = -CLEANFILES = - -############################################################################### -# Icons -############################################################################### - -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor - -install-data-hook: update-icon-cache -uninstall-hook: update-icon-cache -update-icon-cache: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating GTK+ icon cache."; \ - $(gtk_update_icon_cache); \ - else \ - echo "*** Icon cache not updated. After (un)install, run this:"; \ - echo "*** $(gtk_update_icon_cache)"; \ - fi - -############################################################################### -# UI file -############################################################################### - -uidir = $(datadir)/almanah -ui_DATA = \ - almanah.ui \ - almanah-app-menu.ui \ - almanah.css - -EXTRA_DIST += $(ui_DATA) - -############################################################################### -# Desktop file -############################################################################### - -@INTLTOOL_DESKTOP_RULE@ - -desktopdir = $(datadir)/applications -desktop_in_files = almanah.desktop.in -desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) - -EXTRA_DIST += $(desktop_in_files) -CLEANFILES += $(desktop_DATA) - -############################################################################### -# GSettings schemas -############################################################################### - -gsettings_SCHEMAS = org.gnome.almanah.gschema.xml - -@GSETTINGS_RULES@ -@INTLTOOL_XML_NOMERGE_RULE@ - -# Data migration tool -convertdir = $(datadir)/GConf/gsettings -convert_DATA = almanah.convert - -EXTRA_DIST += \ - $(schemas_in_files) \ - $(convert_DATA) \ - $(NULL) -CLEANFILES += $(gsettings_SCHEMAS) - -############################################################################### -# AppData file -############################################################################### - -# AppData -@APPDATA_XML_RULES@ -@INTLTOOL_XML_RULE@ - -appdata_in_files = almanah.appdata.xml.in -appdata_XML = $(appdata_in_files:.appdata.xml.in=.appdata.xml) - -EXTRA_DIST += $(appdata_in_files) -CLEANFILES += $(appdata_XML) - -DISTCHECK_CONFIGURE_FLAGS = --enable-appdata-validate - -############################################################################### -# General -############################################################################### - -EXTRA_DIST += entry-2.0.rnc - --include $(top_srcdir)/git.mk diff -Nru almanah-0.11.1/data/Makefile.in almanah-0.12.0/data/Makefile.in --- almanah-0.11.1/data/Makefile.in 2014-09-24 18:32:46.000000000 +0000 +++ almanah-0.12.0/data/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,817 +0,0 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = data -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(srcdir)/org.gnome.almanah.gschema.xml.in.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = org.gnome.almanah.gschema.xml.in -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ - ctags-recursive dvi-recursive html-recursive info-recursive \ - install-data-recursive install-dvi-recursive \ - install-exec-recursive install-html-recursive \ - install-info-recursive install-pdf-recursive \ - install-ps-recursive install-recursive installcheck-recursive \ - installdirs-recursive pdf-recursive ps-recursive \ - tags-recursive uninstall-recursive -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(desktopdir)" \ - "$(DESTDIR)$(uidir)" -DATA = $(convert_DATA) $(desktop_DATA) $(ui_DATA) -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -am__recursive_targets = \ - $(RECURSIVE_TARGETS) \ - $(RECURSIVE_CLEAN_TARGETS) \ - $(am__extra_recursive_targets) -AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPDATA_VALIDATE = @APPDATA_VALIDATE@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENCRYPTION_CFLAGS = @ENCRYPTION_CFLAGS@ -ENCRYPTION_LIBS = @ENCRYPTION_LIBS@ -EVO_CFLAGS = @EVO_CFLAGS@ -EVO_LIBS = @EVO_LIBS@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ -GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GLIB_MKENUMS = @GLIB_MKENUMS@ -GMSGFMT = @GMSGFMT@ -GPGME_CONFIG = @GPGME_CONFIG@ -GREP = @GREP@ -GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MSGFMT = @MSGFMT@ -MSGMERGE = @MSGMERGE@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPELL_CHECKING_CFLAGS = @SPELL_CHECKING_CFLAGS@ -SPELL_CHECKING_LIBS = @SPELL_CHECKING_LIBS@ -STANDARD_CFLAGS = @STANDARD_CFLAGS@ -STANDARD_LIBS = @STANDARD_LIBS@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -appdataxmldir = @appdataxmldir@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gsettingsschemadir = @gsettingsschemadir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -SUBDIRS = icons - -############################################################################### -# General -############################################################################### -EXTRA_DIST = $(ui_DATA) $(desktop_in_files) $(schemas_in_files) \ - $(convert_DATA) $(NULL) $(appdata_in_files) entry-2.0.rnc -CLEANFILES = $(desktop_DATA) $(gsettings_SCHEMAS) $(appdata_XML) - -############################################################################### -# Icons -############################################################################### -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor - -############################################################################### -# UI file -############################################################################### -uidir = $(datadir)/almanah -ui_DATA = \ - almanah.ui \ - almanah-app-menu.ui \ - almanah.css - -desktopdir = $(datadir)/applications -desktop_in_files = almanah.desktop.in -desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) - -############################################################################### -# GSettings schemas -############################################################################### -gsettings_SCHEMAS = org.gnome.almanah.gschema.xml - -# Data migration tool -convertdir = $(datadir)/GConf/gsettings -convert_DATA = almanah.convert -appdata_in_files = almanah.appdata.xml.in -appdata_XML = $(appdata_in_files:.appdata.xml.in=.appdata.xml) -DISTCHECK_CONFIGURE_FLAGS = --enable-appdata-validate -all: all-recursive - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -org.gnome.almanah.gschema.xml.in: $(top_builddir)/config.status $(srcdir)/org.gnome.almanah.gschema.xml.in.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-convertDATA: $(convert_DATA) - @$(NORMAL_INSTALL) - @list='$(convert_DATA)'; test -n "$(convertdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(convertdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(convertdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(convertdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(convertdir)" || exit $$?; \ - done - -uninstall-convertDATA: - @$(NORMAL_UNINSTALL) - @list='$(convert_DATA)'; test -n "$(convertdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(convertdir)'; $(am__uninstall_files_from_dir) -install-desktopDATA: $(desktop_DATA) - @$(NORMAL_INSTALL) - @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \ - done - -uninstall-desktopDATA: - @$(NORMAL_UNINSTALL) - @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir) -install-uiDATA: $(ui_DATA) - @$(NORMAL_INSTALL) - @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(uidir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(uidir)" || exit $$?; \ - done - -uninstall-uiDATA: - @$(NORMAL_UNINSTALL) - @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) - -# This directory's subdirectories are mostly independent; you can cd -# into them and run 'make' without going through this Makefile. -# To change the values of 'make' variables: instead of editing Makefiles, -# (1) if the variable is set in 'config.status', edit 'config.status' -# (which will cause the Makefiles to be regenerated when you run 'make'); -# (2) otherwise, pass the desired values on the 'make' command line. -$(am__recursive_targets): - @fail=; \ - if $(am__make_keepgoing); then \ - failcom='fail=yes'; \ - else \ - failcom='exit 1'; \ - fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-recursive -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-recursive - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-recursive - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - $(am__make_dryrun) \ - || test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile $(DATA) -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(uidir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: install-convertDATA install-desktopDATA \ - install-uiDATA - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-convertDATA uninstall-desktopDATA \ - uninstall-uiDATA - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) uninstall-hook -.MAKE: $(am__recursive_targets) install-am install-data-am \ - install-strip uninstall-am - -.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ - check-am clean clean-generic clean-libtool cscopelist-am ctags \ - ctags-am distclean distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-convertDATA install-data \ - install-data-am install-data-hook install-desktopDATA \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip install-uiDATA installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am uninstall-convertDATA uninstall-desktopDATA \ - uninstall-hook uninstall-uiDATA - - -install-data-hook: update-icon-cache -uninstall-hook: update-icon-cache -update-icon-cache: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating GTK+ icon cache."; \ - $(gtk_update_icon_cache); \ - else \ - echo "*** Icon cache not updated. After (un)install, run this:"; \ - echo "*** $(gtk_update_icon_cache)"; \ - fi - -############################################################################### -# Desktop file -############################################################################### - -@INTLTOOL_DESKTOP_RULE@ - -@GSETTINGS_RULES@ -@INTLTOOL_XML_NOMERGE_RULE@ - -############################################################################### -# AppData file -############################################################################### - -# AppData -@APPDATA_XML_RULES@ -@INTLTOOL_XML_RULE@ - --include $(top_srcdir)/git.mk - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru almanah-0.11.1/data/meson.build almanah-0.12.0/data/meson.build --- almanah-0.11.1/data/meson.build 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.12.0/data/meson.build 2019-10-07 13:45:09.000000000 +0000 @@ -0,0 +1,52 @@ +desktop = 'almanah.desktop' +i18n.merge_file( + desktop, + type: 'desktop', + input: desktop + '.in', + output: desktop, + po_dir: po_dir, + install: true, + install_dir: join_paths(datadir, 'applications'), +) +if desktop_file_validate.found() + test( + 'Validating @0@'.format(desktop), + desktop_file_validate, + args: [desktop], + workdir: meson.current_build_dir(), + ) +endif + +appdata = 'almanah.appdata.xml' +i18n.merge_file( + appdata, + input: appdata + '.in', + output: appdata, + po_dir: po_dir, + install: true, + install_dir: join_paths(datadir, 'metainfo'), +) +if (appstream_util.found()) + test( + 'Validating ' + appdata, + appstream_util, + args: ['validate', '--nonet', appdata], + workdir: meson.current_build_dir(), + ) +endif + +install_data( + 'almanah.convert', + install_dir: convertdir, +) + +schema_conf = configuration_data() +schema_conf.set('GETTEXT_PACKAGE', meson.project_name()) +configure_file( + input: 'org.gnome.almanah.gschema.xml.in', + output: '@BASENAME@', + configuration: schema_conf, + install_dir: schemadir, +) + +subdir('icons') diff -Nru almanah-0.11.1/data/org.gnome.almanah.gschema.xml.in almanah-0.12.0/data/org.gnome.almanah.gschema.xml.in --- almanah-0.11.1/data/org.gnome.almanah.gschema.xml.in 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.12.0/data/org.gnome.almanah.gschema.xml.in 2019-10-07 13:45:09.000000000 +0000 @@ -0,0 +1,20 @@ + + + + + '' + Database encryption key ID + The ID of the key to use to encrypt and decrypt the database, if Almanah has been built with encryption support. Leave blank to disable database encryption. + + + '' + Spell checking language + The locale specifier of the language in which to check entry spellings. + + + true + Spell checking enabled? + Whether spell checking of entries is enabled. + + + diff -Nru almanah-0.11.1/data/org.gnome.almanah.gschema.xml.in.in almanah-0.12.0/data/org.gnome.almanah.gschema.xml.in.in --- almanah-0.11.1/data/org.gnome.almanah.gschema.xml.in.in 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/data/org.gnome.almanah.gschema.xml.in.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ - - - - - '' - <_summary>Database encryption key ID - <_description>The ID of the key to use to encrypt and decrypt the database, if Almanah has been built with encryption support. Leave blank to disable database encryption. - - - '' - <_summary>Spell checking language - <_description>The locale specifier of the language in which to check entry spellings. - - - true - <_summary>Spell checking enabled? - <_description>Whether spell checking of entries is enabled. - - - diff -Nru almanah-0.11.1/debian/changelog almanah-0.12.0/debian/changelog --- almanah-0.11.1/debian/changelog 2019-09-30 14:54:45.000000000 +0000 +++ almanah-0.12.0/debian/changelog 2019-10-13 08:03:49.000000000 +0000 @@ -1,3 +1,58 @@ +almanah (0.12.0-2) unstable; urgency=medium + + * Upload to unstable + * debian/control: + - Remove evolution-common depends + - Remove seahorse recommends, not needed + + -- Angel Abad Sun, 13 Oct 2019 10:03:49 +0200 + +almanah (0.12.0-1) experimental; urgency=medium + + * New upstream version 0.12.0 + * debian/patches: + - event-factories-Port-to-libecal-2.0.patch: Remove, applied upstream + - events-Removed-Evolution-runtime-dependency.patch: Remove, + applied upstream + - fix-appdata-file.patch: Remove, applied upstream + - trivial-Fixed-indentation.patch: Remove, applied upstream + - libecal-2.0: Remove, applied upstream + - fix_typos: Fix typos in source code + - fix_unknown_gpgme_version: Fix gpgme check on debian + * debian/control: + - Remove gnome-common and intltool from B-D (Closes: 829958) + - Build depends on meson + - Unversion some build depends + - Add libgtksourceview-3.0-dev to build depends + - Add libgcr-3-dev to build depends + - Add desktop-file-utils to build depends + * debian/rules: Remove autoreconf overridden rules + + -- Angel Abad Sat, 12 Oct 2019 11:45:24 +0200 + +almanah (0.11.1-5) unstable; urgency=medium + + * Upload to unstable + * debian/rules: harden almanah binary + + -- Angel Abad Tue, 08 Oct 2019 09:38:11 +0200 + +almanah (0.11.1-4) experimental; urgency=medium + + * Configure only once, fix cross build error. + Thanks to Helmut Grohne (Closes: #941512) + * debian/patches/fix-appdata-file.patch: + Fix errors and merge all appdata patches + * debian/patches/events-Removed-Evolution-runtime-dependency.patch: + Refresh patch. + * Use debhelper-compat instead of debian/compat + * debian/control: Add Rules-Requires-Root: no + * Add debian/upstream/metadata + * Bump Standards-Version to 4.4.1 (no changes) + * debian/control: Remove dh-autoreconf from Build-Depends + + -- Angel Abad Mon, 07 Oct 2019 12:01:25 +0200 + almanah (0.11.1-3) unstable; urgency=medium * Upload to unstable (Closes: #933668) @@ -298,4 +353,3 @@ * Initial release (Closes: #490655) -- Angel Abad (Ikusnet SLL) Sun, 13 Jul 2008 13:36:33 +0200 - diff -Nru almanah-0.11.1/debian/compat almanah-0.12.0/debian/compat --- almanah-0.11.1/debian/compat 2019-09-26 06:15:02.000000000 +0000 +++ almanah-0.12.0/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -9 diff -Nru almanah-0.11.1/debian/control almanah-0.12.0/debian/control --- almanah-0.11.1/debian/control 2019-09-30 14:49:59.000000000 +0000 +++ almanah-0.12.0/debian/control 2019-10-12 10:01:34.000000000 +0000 @@ -2,20 +2,23 @@ Section: gnome Priority: optional Maintainer: Angel Abad -Build-Depends: appstream-util, - debhelper (>= 9), - dh-autoreconf, - gnome-common, - intltool (>= 0.35.0), +Build-Depends: + debhelper-compat (= 12), + meson, libglib2.0-dev, - libgtk-3-dev (>= 3.5.6), + libgtk-3-dev, libsqlite3-dev, - libcryptui-dev (>= 3.0.0), + libcryptui-dev, libgpgme11-dev, libecal2.0-dev, - libedataserver1.2-dev (>= 3.6.0), - libgtkspell3-3-dev -Standards-Version: 3.9.6 + libedataserver1.2-dev, + libgtkspell3-3-dev, + libgtksourceview-3.0-dev, + libgcr-3-dev, + appstream-util, + desktop-file-utils +Rules-Requires-Root: no +Standards-Version: 4.4.1 Vcs-Browser: https://salsa.debian.org/debian/almanah Vcs-Git: https://salsa.debian.org/debian/almanah.git Homepage: http://wiki.gnome.org/Apps/Almanah_Diary @@ -23,8 +26,6 @@ Package: almanah Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - evolution-common (>= 3.6.0) -Recommends: seahorse Description: Application to ease management of a personal diary Almanah is a small application to ease management of a personal diary. It has basic editing and linking abilities like: @@ -32,4 +33,3 @@ - adding links to other content to diary entries - database encryption - search and printing support - diff -Nru almanah-0.11.1/debian/copyright almanah-0.12.0/debian/copyright --- almanah-0.11.1/debian/copyright 2019-09-26 06:15:02.000000000 +0000 +++ almanah-0.12.0/debian/copyright 2019-10-13 08:03:49.000000000 +0000 @@ -4,8 +4,8 @@ Source: http://live.gnome.org/Almanah_Diary Files: * -Copyright: 2008-2012, Philip Withnall - 2011-2014, Álvaro Peña ] +Copyright: 2008-2019, Philip Withnall + 2011-2019, Álvaro Peña ] License: GPL-3 Files: data/icons/* @@ -13,7 +13,7 @@ License: GPL-3 Files: debian/* -Copyright: 2008-2014, Angel Abad +Copyright: 2008-2019, Angel Abad License: GPL-3 License: GPL-3 diff -Nru almanah-0.11.1/debian/patches/Add-a-missing-tag-to-the-AppData-file.patch almanah-0.12.0/debian/patches/Add-a-missing-tag-to-the-AppData-file.patch --- almanah-0.11.1/debian/patches/Add-a-missing-tag-to-the-AppData-file.patch 2019-09-30 14:49:59.000000000 +0000 +++ almanah-0.12.0/debian/patches/Add-a-missing-tag-to-the-AppData-file.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -From 9c94abafe29415dbac1b6460af17c5af254e5859 Mon Sep 17 00:00:00 2001 -From: Richard Hughes -Date: Mon, 25 Jan 2016 15:12:21 +0000 -Subject: [PATCH] Add a missing tag to the AppData file - ---- - data/almanah.appdata.xml.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/data/almanah.appdata.xml.in b/data/almanah.appdata.xml.in -index df93a75..d50f20c 100644 ---- a/data/almanah.appdata.xml.in -+++ b/data/almanah.appdata.xml.in -@@ -31,4 +31,5 @@ - AppMenu - ModernToolkit - -+ almanah - --- -2.20.1 - diff -Nru almanah-0.11.1/debian/patches/data-Updated-the-AppData-format.patch almanah-0.12.0/debian/patches/data-Updated-the-AppData-format.patch --- almanah-0.11.1/debian/patches/data-Updated-the-AppData-format.patch 2019-09-30 14:49:59.000000000 +0000 +++ almanah-0.12.0/debian/patches/data-Updated-the-AppData-format.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -From 45971f9b492b366989ae0afd89243218be9b5fb1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=81lvaro=20Pe=C3=B1a?= -Date: Sat, 7 Mar 2015 20:54:43 +0100 -Subject: [PATCH] data: Updated the AppData format - -Included the fields "name" and "summary". ---- - data/almanah.appdata.xml.in | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/data/almanah.appdata.xml.in b/data/almanah.appdata.xml.in -index 17a0a7d..31db07d 100644 ---- a/data/almanah.appdata.xml.in -+++ b/data/almanah.appdata.xml.in -@@ -4,6 +4,8 @@ - almanah.desktop - CC0-1.0 - GPL-3.0+ -+ Almanah Diary -+ <_summary>Keep a diary of your life - - <_p> - Almanah Diary is an application to allow you to keep a diary of your life. --- -2.20.1 - diff -Nru almanah-0.11.1/debian/patches/event-factories-Port-to-libecal-2.0.patch almanah-0.12.0/debian/patches/event-factories-Port-to-libecal-2.0.patch --- almanah-0.11.1/debian/patches/event-factories-Port-to-libecal-2.0.patch 2019-09-30 14:49:59.000000000 +0000 +++ almanah-0.12.0/debian/patches/event-factories-Port-to-libecal-2.0.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,821 +0,0 @@ -From cb11d217448161562ae6eb4b94d01186e89b275f Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Fri, 17 May 2019 12:22:09 +0200 -Subject: [PATCH] event-factories: Port to libecal-2.0 - -Closes https://gitlab.gnome.org/GNOME/almanah/merge_requests/3 ---- - src/event-factories/calendar-client.c | 452 ++++++++++++------------- - src/event-factories/calendar-sources.c | 11 +- - 3 files changed, 227 insertions(+), 238 deletions(-) - -Index: b/src/event-factories/calendar-client.c -=================================================================== ---- a/src/event-factories/calendar-client.c -+++ b/src/event-factories/calendar-client.c -@@ -80,7 +80,7 @@ - GSList *appointment_sources; - GSList *task_sources; - -- icaltimezone *zone; -+ ICalTimezone *zone; - - GFileMonitor *tz_monitor; - -@@ -229,17 +229,17 @@ - 0); - } - --static icaltimezone * -+static ICalTimezone * - calendar_client_config_get_icaltimezone (void) - { - char *location; -- icaltimezone *zone = NULL; -+ ICalTimezone *zone = NULL; - - location = e_cal_util_get_system_timezone_location (); - if (!location) -- return icaltimezone_get_utc_timezone (); -+ return i_cal_timezone_get_utc_timezone (); - -- zone = icaltimezone_get_builtin_timezone (location); -+ zone = i_cal_timezone_get_builtin_timezone (location); - g_free (location); - - return zone; -@@ -272,51 +272,6 @@ - } - - static void --cal_opened_cb (GObject *source_object, -- GAsyncResult *result, -- gpointer user_data) --{ -- EClient *ecal = E_CLIENT (source_object); -- CalendarClientSource *cl_source = user_data; -- ECalClientSourceType s_type; -- CalendarClient *client = cl_source->client; -- GError *error = NULL; -- -- e_client_open_finish (ecal, result, &error); -- -- s_type = e_cal_client_get_source_type (E_CAL_CLIENT (ecal)); -- -- if (g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_BUSY) && -- !e_client_is_opened (ecal)) -- { -- g_clear_error (&error); -- e_client_open (ecal, TRUE, NULL, cal_opened_cb, cl_source); -- return; -- } -- -- if (error) -- { -- if (s_type == E_CAL_CLIENT_SOURCE_TYPE_EVENTS) -- client->priv->appointment_sources = g_slist_remove (client->priv->appointment_sources, -- cl_source); -- else -- client->priv->task_sources = g_slist_remove (client->priv->task_sources, -- cl_source); -- -- calendar_client_source_finalize (cl_source); -- g_free (cl_source); -- -- g_clear_error (&error); -- return; -- } -- -- if (s_type == E_CAL_CLIENT_SOURCE_TYPE_EVENTS) -- calendar_client_update_appointments (client); -- else -- calendar_client_update_tasks (client); --} -- --static void - load_calendars (CalendarClient *client, - CalendarEventType type) - { -@@ -337,15 +292,12 @@ - - for (l = clients; l != NULL; l = l->next) - { -- EClient *ecal; - CalendarClientSource *cl_source = l->data; - -- ecal = E_CLIENT (cl_source->cal_client); -- -- if (e_client_is_opened (ecal)) -- continue; -- -- e_client_open (ecal, TRUE, NULL, cal_opened_cb, cl_source); -+ if (type == CALENDAR_EVENT_APPOINTMENT) -+ calendar_client_update_appointments (cl_source->client); -+ else -+ calendar_client_update_tasks (cl_source->client); - } - } - -@@ -523,113 +475,129 @@ - } - - static time_t --get_time_from_property (icalcomponent *ical, -- icalproperty_kind prop_kind, -- struct icaltimetype (* get_prop_func) (const icalproperty *prop), -- icaltimezone *default_zone) --{ -- icalproperty *prop; -- struct icaltimetype ical_time; -- icalparameter *param; -- icaltimezone *time_zone = NULL; -+get_time_from_property (ICalComponent *ical, -+ ICalPropertyKind prop_kind, -+ ICalTime * (* get_prop_func) (ICalProperty *prop), -+ ICalTimezone *default_zone) -+{ -+ ICalProperty *prop; -+ ICalTime *ical_time; -+ ICalParameter *param; -+ ICalTimezone *time_zone = NULL; -+ time_t retval; - -- prop = icalcomponent_get_first_property (ical, prop_kind); -+ prop = i_cal_component_get_first_property (ical, prop_kind); - if (!prop) - return 0; - - ical_time = get_prop_func (prop); - -- param = icalproperty_get_first_parameter (prop, ICAL_TZID_PARAMETER); -+ param = i_cal_property_get_first_parameter (prop, I_CAL_TZID_PARAMETER); - if (param) -- time_zone = icaltimezone_get_builtin_timezone_from_tzid (icalparameter_get_tzid (param)); -- else if (icaltime_is_utc (ical_time)) -- time_zone = icaltimezone_get_utc_timezone (); -+ time_zone = i_cal_timezone_get_builtin_timezone_from_tzid (i_cal_parameter_get_tzid (param)); -+ else if (i_cal_time_is_utc (ical_time)) -+ time_zone = i_cal_timezone_get_utc_timezone (); - else - time_zone = default_zone; - -- return icaltime_as_timet_with_zone (ical_time, time_zone); -+ retval = i_cal_time_as_timet_with_zone (ical_time, time_zone); -+ -+ g_clear_object (&ical_time); -+ g_clear_object (¶m); -+ g_clear_object (&prop); -+ -+ return retval; - } - - static char * --get_ical_uid (icalcomponent *ical) -+get_ical_uid (ICalComponent *ical) - { -- return g_strdup (icalcomponent_get_uid (ical)); -+ return g_strdup (i_cal_component_get_uid (ical)); - } - - static char * --get_ical_rid (icalcomponent *ical) -+get_ical_rid (ICalComponent *ical) - { -- icalproperty *prop; -- struct icaltimetype ical_time; -- -- prop = icalcomponent_get_first_property (ical, ICAL_RECURRENCEID_PROPERTY); -- if (!prop) -- return NULL; -- -- ical_time = icalproperty_get_recurrenceid (prop); -- -- return icaltime_is_valid_time (ical_time) && !icaltime_is_null_time (ical_time) ? -- g_strdup (icaltime_as_ical_string (ical_time)) : NULL; -+ return e_cal_util_component_get_recurid_as_string (ical); - } - - static char * --get_ical_summary (icalcomponent *ical) -+get_ical_summary (ICalComponent *ical) - { -- icalproperty *prop; -+ ICalProperty *prop; -+ char *retval; - -- prop = icalcomponent_get_first_property (ical, ICAL_SUMMARY_PROPERTY); -+ prop = i_cal_component_get_first_property (ical, I_CAL_SUMMARY_PROPERTY); - if (!prop) - return NULL; - -- return g_strdup (icalproperty_get_summary (prop)); -+ retval = g_strdup (i_cal_property_get_summary (prop)); -+ -+ g_object_unref (prop); -+ -+ return retval; - } - - static char * --get_ical_description (icalcomponent *ical) -+get_ical_description (ICalComponent *ical) - { -- icalproperty *prop; -+ ICalProperty *prop; -+ char *retval; - -- prop = icalcomponent_get_first_property (ical, ICAL_DESCRIPTION_PROPERTY); -+ prop = i_cal_component_get_first_property (ical, I_CAL_DESCRIPTION_PROPERTY); - if (!prop) - return NULL; - -- return g_strdup (icalproperty_get_description (prop)); -+ retval = g_strdup (i_cal_property_get_description (prop)); -+ -+ g_object_unref (prop); -+ -+ return retval; - } - - static inline time_t --get_ical_start_time (icalcomponent *ical, -- icaltimezone *default_zone) -+get_ical_start_time (ICalComponent *ical, -+ ICalTimezone *default_zone) - { - return get_time_from_property (ical, -- ICAL_DTSTART_PROPERTY, -- icalproperty_get_dtstart, -+ I_CAL_DTSTART_PROPERTY, -+ i_cal_property_get_dtstart, - default_zone); - } - - static inline time_t --get_ical_end_time (icalcomponent *ical, -- icaltimezone *default_zone) -+get_ical_end_time (ICalComponent *ical, -+ ICalTimezone *default_zone) - { - return get_time_from_property (ical, -- ICAL_DTEND_PROPERTY, -- icalproperty_get_dtend, -+ I_CAL_DTEND_PROPERTY, -+ i_cal_property_get_dtend, - default_zone); - } - - static gboolean --get_ical_is_all_day (icalcomponent *ical, -+get_ical_is_all_day (ICalComponent *ical, - time_t start_time, -- icaltimezone *default_zone) -+ ICalTimezone *default_zone) - { -- icalproperty *prop; -- struct tm *start_tm; -- time_t end_time; -- struct icaldurationtype duration; -- struct icaltimetype start_icaltime; -+ ICalProperty *prop; -+ struct tm *start_tm; -+ time_t end_time; -+ ICalDuration *duration; -+ ICalTime *start_icaltime; -+ gboolean retval; - -- start_icaltime = icalcomponent_get_dtstart (ical); -- if (start_icaltime.is_date) -- return TRUE; -+ start_icaltime = i_cal_component_get_dtstart (ical); -+ if (!start_icaltime) -+ return FALSE; -+ -+ if (i_cal_time_is_date (start_icaltime)) -+ { -+ g_object_unref (start_icaltime); -+ return TRUE; -+ } -+ -+ g_clear_object (&start_icaltime); - - start_tm = gmtime (&start_time); - if (start_tm->tm_sec != 0 || -@@ -640,69 +608,80 @@ - if ((end_time = get_ical_end_time (ical, default_zone))) - return (end_time - start_time) % 86400 == 0; - -- prop = icalcomponent_get_first_property (ical, ICAL_DURATION_PROPERTY); -+ prop = i_cal_component_get_first_property (ical, I_CAL_DURATION_PROPERTY); - if (!prop) - return FALSE; - -- duration = icalproperty_get_duration (prop); -+ duration = i_cal_property_get_duration (prop); - -- return icaldurationtype_as_int (duration) % 86400 == 0; -+ retval = i_cal_duration_as_int (duration) % 86400 == 0; -+ -+ g_object_unref (duration); -+ g_object_unref (prop); -+ -+ return retval; - } - - static inline time_t --get_ical_due_time (icalcomponent *ical, -- icaltimezone *default_zone) -+get_ical_due_time (ICalComponent *ical, -+ ICalTimezone *default_zone) - { - return get_time_from_property (ical, -- ICAL_DUE_PROPERTY, -- icalproperty_get_due, -+ I_CAL_DUE_PROPERTY, -+ i_cal_property_get_due, - default_zone); - } - - static guint --get_ical_percent_complete (icalcomponent *ical) -+get_ical_percent_complete (ICalComponent *ical) - { -- icalproperty *prop; -- icalproperty_status status; -+ ICalProperty *prop; -+ ICalPropertyStatus status; - int percent_complete; - -- status = icalcomponent_get_status (ical); -- if (status == ICAL_STATUS_COMPLETED) -+ status = i_cal_component_get_status (ical); -+ if (status == I_CAL_STATUS_COMPLETED) - return 100; - -- prop = icalcomponent_get_first_property (ical, ICAL_COMPLETED_PROPERTY); -- if (prop) -+ if (e_cal_util_component_has_property (ical, I_CAL_COMPLETED_PROPERTY)) - return 100; - -- prop = icalcomponent_get_first_property (ical, ICAL_PERCENTCOMPLETE_PROPERTY); -+ prop = i_cal_component_get_first_property (ical, I_CAL_PERCENTCOMPLETE_PROPERTY); - if (!prop) - return 0; - -- percent_complete = icalproperty_get_percentcomplete (prop); -+ percent_complete = i_cal_property_get_percentcomplete (prop); -+ -+ g_object_unref (prop); - - return CLAMP (percent_complete, 0, 100); - } - - static inline time_t --get_ical_completed_time (icalcomponent *ical, -- icaltimezone *default_zone) -+get_ical_completed_time (ICalComponent *ical, -+ ICalTimezone *default_zone) - { - return get_time_from_property (ical, -- ICAL_COMPLETED_PROPERTY, -- icalproperty_get_completed, -+ I_CAL_COMPLETED_PROPERTY, -+ i_cal_property_get_completed, - default_zone); - } - - static int --get_ical_priority (icalcomponent *ical) -+get_ical_priority (ICalComponent *ical) - { -- icalproperty *prop; -+ ICalProperty *prop; -+ int retval; - -- prop = icalcomponent_get_first_property (ical, ICAL_PRIORITY_PROPERTY); -+ prop = i_cal_component_get_first_property (ical, I_CAL_PRIORITY_PROPERTY); - if (!prop) - return -1; - -- return icalproperty_get_priority (prop); -+ retval = i_cal_property_get_priority (prop); -+ -+ g_object_unref (prop); -+ -+ return retval; - } - - static char * -@@ -827,9 +806,9 @@ - - static void - calendar_appointment_init (CalendarAppointment *appointment, -- icalcomponent *ical, -+ ICalComponent *ical, - CalendarClientSource *source, -- icaltimezone *default_zone) -+ ICalTimezone *default_zone) - { - appointment->uid = get_ical_uid (ical); - appointment->rid = get_ical_rid (ical); -@@ -844,34 +823,38 @@ - default_zone); - } - --static icaltimezone * -+static ICalTimezone * - resolve_timezone_id (const char *tzid, -- gpointer user_data) -+ gpointer user_data, -+ GCancellable *cancellable, -+ GError **error) - { -- icaltimezone *retval; -+ ICalTimezone *retval; - ECalClient *source = user_data; - -- retval = icaltimezone_get_builtin_timezone_from_tzid (tzid); -+ retval = i_cal_timezone_get_builtin_timezone_from_tzid (tzid); - if (!retval) - { -- e_cal_client_get_timezone_sync (source, tzid, &retval, NULL, NULL); -+ retval = e_cal_client_tzlookup_cb (tzid, source, cancellable, error); - } - - return retval; - } - - static gboolean --calendar_appointment_collect_occurrence (ECalComponent *component, -- time_t occurrence_start, -- time_t occurrence_end, -- gpointer data) -+calendar_appointment_collect_occurrence (ICalComponent *component, -+ ICalTime *occurrence_start, -+ ICalTime *occurrence_end, -+ gpointer data, -+ GCancellable *cancellable, -+ GError **error) - { - CalendarOccurrence *occurrence; - GSList **collect_loc = data; - - occurrence = g_new0 (CalendarOccurrence, 1); -- occurrence->start_time = occurrence_start; -- occurrence->end_time = occurrence_end; -+ occurrence->start_time = i_cal_time_as_timet (occurrence_start); -+ occurrence->end_time = i_cal_time_as_timet (occurrence_end); - - *collect_loc = g_slist_prepend (*collect_loc, occurrence); - -@@ -880,30 +863,32 @@ - - static void - calendar_appointment_generate_ocurrences (CalendarAppointment *appointment, -- icalcomponent *ical, -+ ICalComponent *ical, - ECalClient *source, - time_t start, - time_t end, -- icaltimezone *default_zone) -+ ICalTimezone *default_zone) - { -- ECalComponent *ecal; -+ ICalTime *interval_start, *interval_end; - - g_assert (appointment->occurrences == NULL); - -- ecal = e_cal_component_new (); -- e_cal_component_set_icalcomponent (ecal, -- icalcomponent_new_clone (ical)); -- -- e_cal_recur_generate_instances (ecal, -- start, -- end, -- calendar_appointment_collect_occurrence, -- &appointment->occurrences, -- resolve_timezone_id, -- source, -- default_zone); -+ interval_start = i_cal_time_new_from_timet_with_zone (start, FALSE, NULL); -+ interval_end = i_cal_time_new_from_timet_with_zone (end, FALSE, NULL); - -- g_object_unref (ecal); -+ e_cal_recur_generate_instances_sync (ical, -+ interval_start, -+ interval_end, -+ calendar_appointment_collect_occurrence, -+ &appointment->occurrences, -+ resolve_timezone_id, -+ source, -+ default_zone, -+ NULL, -+ NULL); -+ -+ g_clear_object (&interval_start); -+ g_clear_object (&interval_end); - - appointment->occurrences = g_slist_reverse (appointment->occurrences); - } -@@ -962,9 +947,9 @@ - - static void - calendar_task_init (CalendarTask *task, -- icalcomponent *ical, -+ ICalComponent *ical, - CalendarClientSource *source, -- icaltimezone *default_zone) -+ ICalTimezone *default_zone) - { - task->uid = get_ical_uid (ical); - task->summary = get_ical_summary (ical); -@@ -998,57 +983,57 @@ - } - - static CalendarEvent * --calendar_event_new (icalcomponent *ical, -+calendar_event_new (ICalComponent *ical, - CalendarClientSource *source, -- icaltimezone *default_zone) -+ ICalTimezone *default_zone) - { - CalendarEvent *event; - - event = g_new0 (CalendarEvent, 1); - -- switch (icalcomponent_isa (ical)) -+ switch (i_cal_component_isa (ical)) - { -- case ICAL_VEVENT_COMPONENT: -+ case I_CAL_VEVENT_COMPONENT: - event->type = CALENDAR_EVENT_APPOINTMENT; - calendar_appointment_init (CALENDAR_APPOINTMENT (event), - ical, - source, - default_zone); - break; -- case ICAL_VTODO_COMPONENT: -+ case I_CAL_VTODO_COMPONENT: - event->type = CALENDAR_EVENT_TASK; - calendar_task_init (CALENDAR_TASK (event), - ical, - source, - default_zone); - break; -- case ICAL_NO_COMPONENT: -- case ICAL_ANY_COMPONENT: -- case ICAL_XROOT_COMPONENT: -- case ICAL_XATTACH_COMPONENT: -- case ICAL_VJOURNAL_COMPONENT: -- case ICAL_VCALENDAR_COMPONENT: -- case ICAL_VAGENDA_COMPONENT: -- case ICAL_VFREEBUSY_COMPONENT: -- case ICAL_VALARM_COMPONENT: -- case ICAL_XAUDIOALARM_COMPONENT: -- case ICAL_XDISPLAYALARM_COMPONENT: -- case ICAL_XEMAILALARM_COMPONENT: -- case ICAL_XPROCEDUREALARM_COMPONENT: -- case ICAL_VTIMEZONE_COMPONENT: -- case ICAL_XSTANDARD_COMPONENT: -- case ICAL_XDAYLIGHT_COMPONENT: -- case ICAL_X_COMPONENT: -- case ICAL_VSCHEDULE_COMPONENT: -- case ICAL_VQUERY_COMPONENT: -- case ICAL_VREPLY_COMPONENT: -- case ICAL_VCAR_COMPONENT: -- case ICAL_VCOMMAND_COMPONENT: -- case ICAL_XLICINVALID_COMPONENT: -- case ICAL_XLICMIMEPART_COMPONENT: -+ case I_CAL_NO_COMPONENT: -+ case I_CAL_ANY_COMPONENT: -+ case I_CAL_XROOT_COMPONENT: -+ case I_CAL_XATTACH_COMPONENT: -+ case I_CAL_VJOURNAL_COMPONENT: -+ case I_CAL_VCALENDAR_COMPONENT: -+ case I_CAL_VAGENDA_COMPONENT: -+ case I_CAL_VFREEBUSY_COMPONENT: -+ case I_CAL_VALARM_COMPONENT: -+ case I_CAL_XAUDIOALARM_COMPONENT: -+ case I_CAL_XDISPLAYALARM_COMPONENT: -+ case I_CAL_XEMAILALARM_COMPONENT: -+ case I_CAL_XPROCEDUREALARM_COMPONENT: -+ case I_CAL_VTIMEZONE_COMPONENT: -+ case I_CAL_XSTANDARD_COMPONENT: -+ case I_CAL_XDAYLIGHT_COMPONENT: -+ case I_CAL_X_COMPONENT: -+ case I_CAL_VSCHEDULE_COMPONENT: -+ case I_CAL_VQUERY_COMPONENT: -+ case I_CAL_VREPLY_COMPONENT: -+ case I_CAL_VCAR_COMPONENT: -+ case I_CAL_VCOMMAND_COMPONENT: -+ case I_CAL_XLICINVALID_COMPONENT: -+ case I_CAL_XLICMIMEPART_COMPONENT: - default: - g_warning ("Unknown calendar component type: %d\n", -- icalcomponent_isa (ical)); -+ i_cal_component_isa (ical)); - g_free (event); - return NULL; - } -@@ -1140,11 +1125,11 @@ - - static void - calendar_event_generate_ocurrences (CalendarEvent *event, -- icalcomponent *ical, -+ ICalComponent *ical, - ECalClient *source, - time_t start, - time_t end, -- icaltimezone *default_zone) -+ ICalTimezone *default_zone) - { - if (event->type != CALENDAR_EVENT_APPOINTMENT) - return; -@@ -1337,7 +1322,7 @@ - { - CalendarEvent *event; - CalendarEvent *old_event; -- icalcomponent *ical = l->data; -+ ICalComponent *ical = l->data; - char *uid; - - event = calendar_event_new (ical, source, client->priv->zone); -@@ -1416,13 +1401,14 @@ - { - CalendarEvent *event; - ECalComponentId *id = l->data; -- char *uid = g_strdup_printf ("%s%s", id->uid, id->rid ? id->rid : ""); -+ char *uid = g_strdup_printf ("%s%s", e_cal_component_id_get_uid (id), -+ e_cal_component_id_get_rid (id) ? e_cal_component_id_get_rid (id) : ""); - -- if (!id->rid || !(*id->rid)) -+ if (!e_cal_component_id_get_rid (id) || !(e_cal_component_id_get_rid (id)[0])) - { - unsigned int size = g_hash_table_size (query->events); - -- g_hash_table_foreach_remove (query->events, check_object_remove, id->uid); -+ g_hash_table_foreach_remove (query->events, check_object_remove, (gpointer) e_cal_component_id_get_uid (id)); - - if (size != g_hash_table_size (query->events)) - events_changed = TRUE; -@@ -1560,9 +1546,6 @@ - { - CalendarClientSource *cs = l->data; - -- if (!e_client_is_opened (E_CLIENT (cs->cal_client))) -- continue; -- - calendar_client_start_query (client, cs, query); - } - -@@ -1627,9 +1610,6 @@ - { - CalendarClientSource *cs = l->data; - -- if (!e_client_is_opened (E_CLIENT (cs->cal_client))) -- continue; -- - calendar_client_start_query (client, cs, query); - } - -@@ -2066,11 +2046,11 @@ - gboolean task_completed, - guint percent_complete) - { -- GSList *l; -- ECalClient *esource; -- icalcomponent *ical; -- icalproperty *prop; -- icalproperty_status status; -+ GSList *l; -+ ECalClient *esource; -+ ICalComponent *ical; -+ ICalProperty *prop; -+ ICalPropertyStatus status; - - g_return_if_fail (CALENDAR_IS_CLIENT (client)); - g_return_if_fail (task_uid != NULL); -@@ -2097,53 +2077,59 @@ - g_assert (esource != NULL); - - /* Completed time */ -- prop = icalcomponent_get_first_property (ical, -- ICAL_COMPLETED_PROPERTY); -+ prop = i_cal_component_get_first_property (ical, -+ ICAL_COMPLETED_PROPERTY); - if (task_completed) - { -- struct icaltimetype completed_time; -+ ICalTime *completed_time; - -- completed_time = icaltime_current_time_with_zone (client->priv->zone); -+ completed_time = i_cal_time_new_current_with_zone (client->priv->zone); - if (!prop) - { -- icalcomponent_add_property (ical, -- icalproperty_new_completed (completed_time)); -+ i_cal_component_take_property (ical, -+ i_cal_property_new_completed (completed_time)); - } - else - { -- icalproperty_set_completed (prop, completed_time); -+ i_cal_property_set_completed (prop, completed_time); - } -+ -+ g_clear_object (&completed_time); - } - else if (prop) - { -- icalcomponent_remove_property (ical, prop); -+ i_cal_component_remove_property (ical, prop); - } - -+ g_clear_object (&prop); -+ - /* Percent complete */ -- prop = icalcomponent_get_first_property (ical, -- ICAL_PERCENTCOMPLETE_PROPERTY); -+ prop = i_cal_component_get_first_property (ical, -+ I_CAL_PERCENTCOMPLETE_PROPERTY); - if (!prop) - { -- icalcomponent_add_property (ical, -- icalproperty_new_percentcomplete (percent_complete)); -+ i_cal_component_take_property (ical, -+ i_cal_property_new_percentcomplete (percent_complete)); - } - else - { -- icalproperty_set_percentcomplete (prop, percent_complete); -+ i_cal_property_set_percentcomplete (prop, percent_complete); -+ g_object_unref (prop); - } - - /* Status */ -- status = task_completed ? ICAL_STATUS_COMPLETED : ICAL_STATUS_NEEDSACTION; -- prop = icalcomponent_get_first_property (ical, ICAL_STATUS_PROPERTY); -+ status = task_completed ? I_CAL_STATUS_COMPLETED : I_CAL_STATUS_NEEDSACTION; -+ prop = i_cal_component_get_first_property (ical, I_CAL_STATUS_PROPERTY); - if (prop) - { -- icalproperty_set_status (prop, status); -+ i_cal_property_set_status (prop, status); -+ g_object_unref (prop); - } - else - { -- icalcomponent_add_property (ical, -- icalproperty_new_status (status)); -+ i_cal_component_take_property (ical, -+ i_cal_property_new_status (status)); - } - -- e_cal_client_modify_object_sync (esource, ical, CALOBJ_MOD_ALL, NULL, NULL); -+ e_cal_client_modify_object_sync (esource, ical, E_CAL_OBJ_MOD_ALL, E_CAL_OPERATION_FLAG_NONE, NULL, NULL); - } -Index: b/src/event-factories/calendar-sources.c -=================================================================== ---- a/src/event-factories/calendar-sources.c -+++ b/src/event-factories/calendar-sources.c -@@ -54,7 +54,7 @@ - CalendarSources *sources; - guint changed_signal; - -- GSList *clients; -+ GSList *clients; /* ECalClient * */ - ESourceSelector *esource_selector; - - guint timeout_id; -@@ -251,7 +251,7 @@ - ECalClientSourceType client_type, - GSList *existing_clients) - { -- ECalClient *retval; -+ EClient *retval; - GError *error = NULL; - - if (existing_clients) -@@ -271,17 +271,20 @@ - } - } - -- retval = e_cal_client_new (esource, client_type, &error); -+ /* Basically do not wait for the connected state */ -+ retval = e_cal_client_connect_sync (esource, client_type, -1, NULL, &error); - if (!retval) - { - g_warning ("Could not load source '%s' from '%s': %s", - e_source_get_display_name (esource), - e_source_get_uid (esource), - error ? error->message : "Unknown error"); -+ g_clear_error (&error); -+ - return NULL; - } - -- return retval; -+ return E_CAL_CLIENT (retval); - } - - /* - Order doesn't matter diff -Nru almanah-0.11.1/debian/patches/events-Removed-Evolution-runtime-dependency.patch almanah-0.12.0/debian/patches/events-Removed-Evolution-runtime-dependency.patch --- almanah-0.11.1/debian/patches/events-Removed-Evolution-runtime-dependency.patch 2019-09-30 14:49:59.000000000 +0000 +++ almanah-0.12.0/debian/patches/events-Removed-Evolution-runtime-dependency.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,185 +0,0 @@ -From 54ccb8255eaf136a853acef4666b561a561654f2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=81lvaro=20Pe=C3=B1a?= -Date: Mon, 9 Nov 2015 11:27:26 +0100 -Subject: [PATCH] events: Removed Evolution runtime dependency - -We have a runtime dependecy in Almanah because we check for the -org.gnome.evolution.calendar settings to read the timezone, so just use -the EDS e_cal_util_get_system_timezone_location and watch for changes -in /etc/timezone - -https://bugzilla.gnome.org/show_bug.cgi?id=745497 ---- - configure.ac | 3 +- - src/event-factories/calendar-client.c | 71 ++++++++++----------------- - 2 files changed, 29 insertions(+), 45 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 243dfb9..88df7f3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -124,7 +124,8 @@ AC_SUBST(STANDARD_CFLAGS) - AC_SUBST(STANDARD_LIBS) - - dnl Evolution --PKG_CHECK_MODULES(EVO, libecal-1.2 >= 3.5.91 libedataserver-1.2, have_evo=yes, have_evo=no) -+EDS_MIN_VERSION=2.28 -+PKG_CHECK_MODULES(EVO, libecal-1.2 >= 3.5.91 libedataserver-1.2 >= $EDS_MIN_VERSION, have_evo=yes, have_evo=no) - if test "x$have_evo" = "xyes"; then - AC_DEFINE(HAVE_EVO, 1, [Defined if libecal-1.2 is installed]) - fi -diff --git a/src/event-factories/calendar-client.c b/src/event-factories/calendar-client.c -index 7cd6187..c529dbe 100644 ---- a/src/event-factories/calendar-client.c -+++ b/src/event-factories/calendar-client.c -@@ -1,5 +1,7 @@ -+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2-*- */ - /* - * Copyright (C) 2004 Free Software Foundation, Inc. -+ * Copyright (C) 2015 Álvaro Peña - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as -@@ -19,6 +21,9 @@ - * William Jon McCann - * Martin Grimme - * Christian Kellner -+ * -+ * Modified by: -+ * Álvaro Peña - */ - - #include -@@ -77,8 +82,7 @@ struct _CalendarClientPrivate - - icaltimezone *zone; - -- guint zone_listener; -- GSettings *settings; -+ GFileMonitor *tz_monitor; - - guint day; - guint month; -@@ -225,45 +229,29 @@ calendar_client_class_init (CalendarClientClass *klass) - 0); - } - --/* Timezone code adapted from evolution/calendar/gui/calendar-config.c */ --/* The current timezone, e.g. "Europe/London". It may be NULL, in which case -- you should assume UTC. */ --static gchar * --calendar_client_config_get_timezone (GSettings *settings) --{ -- char *location; -- -- if (g_settings_get_boolean (settings, "use-system-timezone")) -- location = e_cal_util_get_system_timezone_location (); -- else -- location = g_settings_get_string (settings, "timezone"); -- -- return location; --} -- - static icaltimezone * --calendar_client_config_get_icaltimezone (GSettings *settings) -+calendar_client_config_get_icaltimezone (void) - { - char *location; - icaltimezone *zone = NULL; -- -- location = calendar_client_config_get_timezone (settings); -+ -+ location = e_cal_util_get_system_timezone_location (); - if (!location) - return icaltimezone_get_utc_timezone (); - - zone = icaltimezone_get_builtin_timezone (location); - g_free (location); -- -+ - return zone; - } - - static void --calendar_client_set_timezone (CalendarClient *client) -+calendar_client_set_timezone (CalendarClient *client) - { - GSList *l; - GSList *esources; - -- client->priv->zone = calendar_client_config_get_icaltimezone (client->priv->settings); -+ client->priv->zone = calendar_client_config_get_icaltimezone (); - - esources = calendar_sources_get_appointment_sources (client->priv->calendar_sources); - for (l = esources; l; l = l->next) { -@@ -274,13 +262,13 @@ calendar_client_set_timezone (CalendarClient *client) - } - - static void --calendar_client_timezone_changed_cb (GSettings *settings, -- const gchar *key, -- CalendarClient *client) -+calendar_client_timezone_changed_cb (G_GNUC_UNUSED GFileMonitor *monitor, -+ G_GNUC_UNUSED GFile *file, -+ G_GNUC_UNUSED GFile *other_file, -+ G_GNUC_UNUSED GFileMonitorEvent *event, -+ gpointer user_data) - { -- if (g_strcmp0 (key, "timezone") == 0 || -- g_strcmp0 (key, "use-system-timezone") == 0) -- calendar_client_set_timezone (client); -+ calendar_client_set_timezone (CALENDAR_CLIENT (user_data)); - } - - static void -@@ -365,11 +353,11 @@ static void - calendar_client_init (CalendarClient *client) - { - GSList *esources; -+ GFile *tz; - - client->priv = CALENDAR_CLIENT_GET_PRIVATE (client); - - client->priv->calendar_sources = calendar_sources_get (); -- client->priv->settings = g_settings_new ("org.gnome.evolution.calendar"); - - esources = calendar_sources_get_appointment_sources (client->priv->calendar_sources); - client->priv->appointment_sources = -@@ -393,9 +381,13 @@ calendar_client_init (CalendarClient *client) - G_CALLBACK (calendar_client_task_sources_changed), - client); - -- client->priv->zone_listener = g_signal_connect (client->priv->settings, "changed", -- G_CALLBACK (calendar_client_timezone_changed_cb), -- client); -+ tz = g_file_new_for_path ("/etc/localtime"); -+ client->priv->tz_monitor = g_file_monitor_file (tz, G_FILE_MONITOR_NONE, NULL, NULL); -+ g_object_unref (tz); -+ if (client->priv->tz_monitor == NULL) -+ g_warning ("Can't monitor /etc/localtime for changes"); -+ else -+ g_signal_connect (client->priv->tz_monitor, "changed", G_CALLBACK (calendar_client_timezone_changed_cb), client); - - client->priv->day = G_MAXUINT; - client->priv->month = G_MAXUINT; -@@ -408,16 +400,7 @@ calendar_client_finalize (GObject *object) - CalendarClient *client = CALENDAR_CLIENT (object); - GSList *l; - -- if (client->priv->zone_listener) -- { -- g_signal_handler_disconnect (client->priv->settings, -- client->priv->zone_listener); -- client->priv->zone_listener = 0; -- } -- -- if (client->priv->settings) -- g_object_unref (client->priv->settings); -- client->priv->settings = NULL; -+ g_clear_object (&client->priv->tz_monitor); - - for (l = client->priv->appointment_sources; l; l = l->next) - { --- -2.20.1 - diff -Nru almanah-0.11.1/debian/patches/fix_typos almanah-0.12.0/debian/patches/fix_typos --- almanah-0.11.1/debian/patches/fix_typos 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.12.0/debian/patches/fix_typos 2019-10-12 09:26:09.000000000 +0000 @@ -0,0 +1,25 @@ +Description: Fix typos +Author: Angel Abad +Forwarded: https://gitlab.gnome.org/GNOME/almanah/issues/3 +Last-Update: 2019-10-12 + +--- almanah-0.12.0.orig/src/vfs.c ++++ almanah-0.12.0/src/vfs.c +@@ -687,7 +687,7 @@ almanah_vfs_io_close (sqlite3_file *pFil + &bytes_written, + NULL, + &child_error) == FALSE) { +- g_warning ("Error writting data to plain file %s: %s\n", self->plain_filename, child_error->message); ++ g_warning ("Error writing data to plain file %s: %s\n", self->plain_filename, child_error->message); + g_object_unref (plain_file); + g_object_unref (plain_output_stream); + g_unlink (self->plain_filename); +@@ -695,7 +695,7 @@ almanah_vfs_io_close (sqlite3_file *pFil + } + + if (bytes_written != self->plain_size) { +- g_warning ("Error writting data to plain file %s: Not all the data has been written to the file\n", self->plain_filename); ++ g_warning ("Error writing data to plain file %s: Not all the data has been written to the file\n", self->plain_filename); + g_object_unref (plain_file); + g_object_unref (plain_output_stream); + g_unlink (self->plain_filename); diff -Nru almanah-0.11.1/debian/patches/fix_unknown_gpgme_version almanah-0.12.0/debian/patches/fix_unknown_gpgme_version --- almanah-0.11.1/debian/patches/fix_unknown_gpgme_version 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.12.0/debian/patches/fix_unknown_gpgme_version 2019-10-12 09:27:35.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Fix gpgme -unknown suffix check on debian package +Author: Angel Abad +Forwarded: not-needed +Last-Update: 2019-10-12 + +--- almanah-0.12.0.orig/build-aux/gpg_check_version.py ++++ almanah-0.12.0/build-aux/gpg_check_version.py +@@ -7,7 +7,7 @@ import subprocess + # Should work on the output for `gpg`, `gpg2` and `gpgme-config`. + def parse_version(gpg_output): + version_line = gpg_output.splitlines()[0] +- return version_line.strip().split(' ')[-1] ++ return version_line.strip().split(' ')[-1].replace('-unknown','') + + # Checks whether the GPG version is compatible with the given version. + # For GPG, this means that the major and minor version should be equal; diff -Nru almanah-0.11.1/debian/patches/libecal-2.0 almanah-0.12.0/debian/patches/libecal-2.0 --- almanah-0.11.1/debian/patches/libecal-2.0 2019-09-30 14:49:59.000000000 +0000 +++ almanah-0.12.0/debian/patches/libecal-2.0 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Description: Build against libecal-2.0. Upstream have done this, but they have ported to meson too so their patch cannot be cherry-picked. - -Forwarded: not-needed - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -86,7 +86,7 @@ - - dnl Evolution - EDS_MIN_VERSION=2.28 --PKG_CHECK_MODULES(EVO, libecal-1.2 >= 3.5.91 libedataserver-1.2 >= $EDS_MIN_VERSION, have_evo=yes, have_evo=no) -+PKG_CHECK_MODULES(EVO, libecal-2.0 libedataserver-1.2 >= $EDS_MIN_VERSION, have_evo=yes, have_evo=no) - if test "x$have_evo" = "xyes"; then - AC_DEFINE(HAVE_EVO, 1, [Defined if libecal-1.2 is installed]) - fi diff -Nru almanah-0.11.1/debian/patches/series almanah-0.12.0/debian/patches/series --- almanah-0.11.1/debian/patches/series 2019-09-30 14:49:59.000000000 +0000 +++ almanah-0.12.0/debian/patches/series 2019-10-12 09:19:05.000000000 +0000 @@ -1,7 +1,2 @@ -events-Removed-Evolution-runtime-dependency.patch -trivial-Fixed-indentation.patch -event-factories-Port-to-libecal-2.0.patch -data-Updated-the-AppData-format.patch -Update-the-AppData-file-to-version-0.7.patch -Add-a-missing-tag-to-the-AppData-file.patch -libecal-2.0 +fix_unknown_gpgme_version +fix_typos diff -Nru almanah-0.11.1/debian/patches/trivial-Fixed-indentation.patch almanah-0.12.0/debian/patches/trivial-Fixed-indentation.patch --- almanah-0.11.1/debian/patches/trivial-Fixed-indentation.patch 2019-09-30 14:49:59.000000000 +0000 +++ almanah-0.12.0/debian/patches/trivial-Fixed-indentation.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,1605 +0,0 @@ -From 1c067dc8abeea88d6bac297b8d032038945527dc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=81lvaro=20Pe=C3=B1a?= -Date: Mon, 28 Dec 2015 11:14:07 +0100 -Subject: [PATCH] trivial: Fixed indentation - ---- - src/event-factories/calendar-client.c | 844 +++++++++++++------------- - 1 file changed, 422 insertions(+), 422 deletions(-) - -diff --git a/src/event-factories/calendar-client.c b/src/event-factories/calendar-client.c -index c529dbe..f0f4726 100644 ---- a/src/event-factories/calendar-client.c -+++ b/src/event-factories/calendar-client.c -@@ -93,27 +93,27 @@ static void calendar_client_class_init (CalendarClientClass *klass); - static void calendar_client_init (CalendarClient *client); - static void calendar_client_finalize (GObject *object); - static void calendar_client_set_property (GObject *object, -- guint prop_id, -- const GValue *value, -- GParamSpec *pspec); -+ guint prop_id, -+ const GValue *value, -+ GParamSpec *pspec); - static void calendar_client_get_property (GObject *object, -- guint prop_id, -- GValue *value, -- GParamSpec *pspec); -+ guint prop_id, -+ GValue *value, -+ GParamSpec *pspec); - - static GSList *calendar_client_update_sources_list (CalendarClient *client, -- GSList *sources, -- GSList *esources, -- guint changed_signal_id); -+ GSList *sources, -+ GSList *esources, -+ guint changed_signal_id); - static void calendar_client_appointment_sources_changed (CalendarClient *client); - static void calendar_client_task_sources_changed (CalendarClient *client); - - static void calendar_client_stop_query (CalendarClient *client, -- CalendarClientSource *source, -- CalendarClientQuery *query); -+ CalendarClientSource *source, -+ CalendarClientQuery *query); - static void calendar_client_start_query (CalendarClient *client, -- CalendarClientSource *source, -- const char *query); -+ CalendarClientSource *source, -+ const char *query); - - static void calendar_client_source_finalize (CalendarClientSource *source); - static void calendar_client_query_finalize (CalendarClientQuery *query); -@@ -124,19 +124,19 @@ static void - calendar_client_update_tasks (CalendarClient *client); - - enum --{ -- PROP_O, -- PROP_DAY, -- PROP_MONTH, -- PROP_YEAR --}; -+ { -+ PROP_O, -+ PROP_DAY, -+ PROP_MONTH, -+ PROP_YEAR -+ }; - - enum --{ -- APPOINTMENTS_CHANGED, -- TASKS_CHANGED, -- LAST_SIGNAL --}; -+ { -+ APPOINTMENTS_CHANGED, -+ TASKS_CHANGED, -+ LAST_SIGNAL -+ }; - - static GObjectClass *parent_class = NULL; - static guint signals [LAST_SIGNAL] = { 0, }; -@@ -145,27 +145,27 @@ GType - calendar_client_get_type (void) - { - static GType client_type = 0; -- -+ - if (!client_type) - { - static const GTypeInfo client_info = -- { -- sizeof (CalendarClientClass), -- NULL, /* base_init */ -- NULL, /* base_finalize */ -- (GClassInitFunc) calendar_client_class_init, -- NULL, /* class_finalize */ -- NULL, /* class_data */ -- sizeof (CalendarClient), -- 0, /* n_preallocs */ -- (GInstanceInitFunc) calendar_client_init, -- }; -- -+ { -+ sizeof (CalendarClientClass), -+ NULL, /* base_init */ -+ NULL, /* base_finalize */ -+ (GClassInitFunc) calendar_client_class_init, -+ NULL, /* class_finalize */ -+ NULL, /* class_data */ -+ sizeof (CalendarClient), -+ 0, /* n_preallocs */ -+ (GInstanceInitFunc) calendar_client_init, -+ }; -+ - client_type = g_type_register_static (G_TYPE_OBJECT, -- "CalendarClient", -- &client_info, 0); -+ "CalendarClient", -+ &client_info, 0); - } -- -+ - return client_type; - } - -@@ -183,50 +183,50 @@ calendar_client_class_init (CalendarClientClass *klass) - g_type_class_add_private (klass, sizeof (CalendarClientPrivate)); - - g_object_class_install_property (gobject_class, -- PROP_DAY, -- g_param_spec_uint ("day", -- "Day", -- "The currently monitored day between 1 and 31 (0 denotes unset)", -- 0, G_MAXUINT, 0, -- G_PARAM_READWRITE)); -+ PROP_DAY, -+ g_param_spec_uint ("day", -+ "Day", -+ "The currently monitored day between 1 and 31 (0 denotes unset)", -+ 0, G_MAXUINT, 0, -+ G_PARAM_READWRITE)); - - g_object_class_install_property (gobject_class, -- PROP_MONTH, -- g_param_spec_uint ("month", -- "Month", -- "The currently monitored month between 0 and 11", -- 0, G_MAXUINT, 0, -- G_PARAM_READWRITE)); -+ PROP_MONTH, -+ g_param_spec_uint ("month", -+ "Month", -+ "The currently monitored month between 0 and 11", -+ 0, G_MAXUINT, 0, -+ G_PARAM_READWRITE)); - - g_object_class_install_property (gobject_class, -- PROP_YEAR, -- g_param_spec_uint ("year", -- "Year", -- "The currently monitored year", -- 0, G_MAXUINT, 0, -- G_PARAM_READWRITE)); -+ PROP_YEAR, -+ g_param_spec_uint ("year", -+ "Year", -+ "The currently monitored year", -+ 0, G_MAXUINT, 0, -+ G_PARAM_READWRITE)); - - signals [APPOINTMENTS_CHANGED] = - g_signal_new ("appointments-changed", -- G_TYPE_FROM_CLASS (gobject_class), -- G_SIGNAL_RUN_LAST, -- G_STRUCT_OFFSET (CalendarClientClass, tasks_changed), -- NULL, -- NULL, -- g_cclosure_marshal_VOID__VOID, -- G_TYPE_NONE, -- 0); -+ G_TYPE_FROM_CLASS (gobject_class), -+ G_SIGNAL_RUN_LAST, -+ G_STRUCT_OFFSET (CalendarClientClass, tasks_changed), -+ NULL, -+ NULL, -+ g_cclosure_marshal_VOID__VOID, -+ G_TYPE_NONE, -+ 0); - - signals [TASKS_CHANGED] = - g_signal_new ("tasks-changed", -- G_TYPE_FROM_CLASS (gobject_class), -- G_SIGNAL_RUN_LAST, -- G_STRUCT_OFFSET (CalendarClientClass, tasks_changed), -- NULL, -- NULL, -- g_cclosure_marshal_VOID__VOID, -- G_TYPE_NONE, -- 0); -+ G_TYPE_FROM_CLASS (gobject_class), -+ G_SIGNAL_RUN_LAST, -+ G_STRUCT_OFFSET (CalendarClientClass, tasks_changed), -+ NULL, -+ NULL, -+ g_cclosure_marshal_VOID__VOID, -+ G_TYPE_NONE, -+ 0); - } - - static icaltimezone * -@@ -256,7 +256,7 @@ calendar_client_set_timezone (CalendarClient *client) - esources = calendar_sources_get_appointment_sources (client->priv->calendar_sources); - for (l = esources; l; l = l->next) { - ECalClient *source = l->data; -- -+ - e_cal_client_set_default_timezone (source, client->priv->zone); - } - } -@@ -273,7 +273,7 @@ calendar_client_timezone_changed_cb (G_GNUC_UNUSED GFileMonitor *monitor, - - static void - cal_opened_cb (GObject *source_object, -- GAsyncResult *result, -+ GAsyncResult *result, - gpointer user_data) - { - EClient *ecal = E_CLIENT (source_object); -@@ -318,26 +318,26 @@ cal_opened_cb (GObject *source_object, - - static void - load_calendars (CalendarClient *client, -- CalendarEventType type) -+ CalendarEventType type) - { - GSList *l, *clients; - - switch (type) - { -- case CALENDAR_EVENT_APPOINTMENT: -- clients = client->priv->appointment_sources; -- break; -- case CALENDAR_EVENT_TASK: -- clients = client->priv->task_sources; -- break; -- case CALENDAR_EVENT_ALL: -- default: -- g_assert_not_reached (); -+ case CALENDAR_EVENT_APPOINTMENT: -+ clients = client->priv->appointment_sources; -+ break; -+ case CALENDAR_EVENT_TASK: -+ clients = client->priv->task_sources; -+ break; -+ case CALENDAR_EVENT_ALL: -+ default: -+ g_assert_not_reached (); - } - - for (l = clients; l != NULL; l = l->next) - { -- EClient *ecal; -+ EClient *ecal; - CalendarClientSource *cl_source = l->data; - - ecal = E_CLIENT (cl_source->cal_client); -@@ -366,20 +366,20 @@ calendar_client_init (CalendarClient *client) - esources = calendar_sources_get_task_sources (client->priv->calendar_sources); - client->priv->task_sources = - calendar_client_update_sources_list (client, NULL, esources, signals [TASKS_CHANGED]); -- -- /* set the timezone before loading the clients */ -+ -+ /* set the timezone before loading the clients */ - calendar_client_set_timezone (client); - load_calendars (client, CALENDAR_EVENT_APPOINTMENT); - load_calendars (client, CALENDAR_EVENT_TASK); - - g_signal_connect_swapped (client->priv->calendar_sources, -- "appointment-sources-changed", -- G_CALLBACK (calendar_client_appointment_sources_changed), -- client); -+ "appointment-sources-changed", -+ G_CALLBACK (calendar_client_appointment_sources_changed), -+ client); - g_signal_connect_swapped (client->priv->calendar_sources, -- "task-sources-changed", -- G_CALLBACK (calendar_client_task_sources_changed), -- client); -+ "task-sources-changed", -+ G_CALLBACK (calendar_client_task_sources_changed), -+ client); - - tz = g_file_new_for_path ("/etc/localtime"); - client->priv->tz_monitor = g_file_monitor_file (tz, G_FILE_MONITOR_NONE, NULL, NULL); -@@ -428,9 +428,9 @@ calendar_client_finalize (GObject *object) - - static void - calendar_client_set_property (GObject *object, -- guint prop_id, -- const GValue *value, -- GParamSpec *pspec) -+ guint prop_id, -+ const GValue *value, -+ GParamSpec *pspec) - { - CalendarClient *client = CALENDAR_CLIENT (object); - -@@ -441,13 +441,13 @@ calendar_client_set_property (GObject *object, - break; - case PROP_MONTH: - calendar_client_select_month (client, -- g_value_get_uint (value), -- client->priv->year); -+ g_value_get_uint (value), -+ client->priv->year); - break; - case PROP_YEAR: - calendar_client_select_month (client, -- client->priv->month, -- g_value_get_uint (value)); -+ client->priv->month, -+ g_value_get_uint (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -@@ -457,9 +457,9 @@ calendar_client_set_property (GObject *object, - - static void - calendar_client_get_property (GObject *object, -- guint prop_id, -- GValue *value, -- GParamSpec *pspec) -+ guint prop_id, -+ GValue *value, -+ GParamSpec *pspec) - { - CalendarClient *client = CALENDAR_CLIENT (object); - -@@ -497,8 +497,8 @@ calendar_client_new (void) - */ - static inline time_t - make_time_for_day_begin (int day, -- int month, -- int year) -+ int month, -+ int year) - { - struct tm localtime_tm = { 0, }; - -@@ -512,8 +512,8 @@ make_time_for_day_begin (int day, - - static inline char * - make_isodate_for_day_begin (int day, -- int month, -- int year) -+ int month, -+ int year) - { - time_t utctime; - -@@ -524,15 +524,15 @@ make_isodate_for_day_begin (int day, - - static time_t - get_time_from_property (icalcomponent *ical, -- icalproperty_kind prop_kind, -- struct icaltimetype (* get_prop_func) (const icalproperty *prop), -+ icalproperty_kind prop_kind, -+ struct icaltimetype (* get_prop_func) (const icalproperty *prop), - icaltimezone *default_zone) - { - icalproperty *prop; - struct icaltimetype ical_time; - icalparameter *param; - icaltimezone *time_zone = NULL; -- -+ - prop = icalcomponent_get_first_property (ical, prop_kind); - if (!prop) - return 0; -@@ -544,7 +544,7 @@ get_time_from_property (icalcomponent *ical, - time_zone = icaltimezone_get_builtin_timezone_from_tzid (icalparameter_get_tzid (param)); - else if (icaltime_is_utc (ical_time)) - time_zone = icaltimezone_get_utc_timezone (); -- else -+ else - time_zone = default_zone; - - return icaltime_as_timet_with_zone (ical_time, time_zone); -@@ -561,14 +561,14 @@ get_ical_rid (icalcomponent *ical) - { - icalproperty *prop; - struct icaltimetype ical_time; -- -+ - prop = icalcomponent_get_first_property (ical, ICAL_RECURRENCEID_PROPERTY); - if (!prop) - return NULL; - - ical_time = icalproperty_get_recurrenceid (prop); - -- return icaltime_is_valid_time (ical_time) && !icaltime_is_null_time (ical_time) ? -+ return icaltime_is_valid_time (ical_time) && !icaltime_is_null_time (ical_time) ? - g_strdup (icaltime_as_ical_string (ical_time)) : NULL; - } - -@@ -601,8 +601,8 @@ get_ical_start_time (icalcomponent *ical, - icaltimezone *default_zone) - { - return get_time_from_property (ical, -- ICAL_DTSTART_PROPERTY, -- icalproperty_get_dtstart, -+ ICAL_DTSTART_PROPERTY, -+ icalproperty_get_dtstart, - default_zone); - } - -@@ -611,8 +611,8 @@ get_ical_end_time (icalcomponent *ical, - icaltimezone *default_zone) - { - return get_time_from_property (ical, -- ICAL_DTEND_PROPERTY, -- icalproperty_get_dtend, -+ ICAL_DTEND_PROPERTY, -+ icalproperty_get_dtend, - default_zone); - } - -@@ -654,8 +654,8 @@ get_ical_due_time (icalcomponent *ical, - icaltimezone *default_zone) - { - return get_time_from_property (ical, -- ICAL_DUE_PROPERTY, -- icalproperty_get_due, -+ ICAL_DUE_PROPERTY, -+ icalproperty_get_due, - default_zone); - } - -@@ -688,8 +688,8 @@ get_ical_completed_time (icalcomponent *ical, - icaltimezone *default_zone) - { - return get_time_from_property (ical, -- ICAL_COMPLETED_PROPERTY, -- icalproperty_get_completed, -+ ICAL_COMPLETED_PROPERTY, -+ icalproperty_get_completed, - default_zone); - } - -@@ -733,12 +733,12 @@ get_source_color (ECalClient *esource) - - static inline gboolean - calendar_appointment_equal (CalendarAppointment *a, -- CalendarAppointment *b) -+ CalendarAppointment *b) - { - GSList *la, *lb; - - if (g_slist_length (a->occurrences) != g_slist_length (b->occurrences)) -- return FALSE; -+ return FALSE; - - for (la = a->occurrences, lb = b->occurrences; la && lb; la = la->next, lb = lb->next) - { -@@ -746,8 +746,8 @@ calendar_appointment_equal (CalendarAppointment *a, - CalendarOccurrence *ob = lb->data; - - if (oa->start_time != ob->start_time || -- oa->end_time != ob->end_time) -- return FALSE; -+ oa->end_time != ob->end_time) -+ return FALSE; - } - - return -@@ -763,7 +763,7 @@ calendar_appointment_equal (CalendarAppointment *a, - - static void - calendar_appointment_copy (CalendarAppointment *appointment, -- CalendarAppointment *appointment_copy) -+ CalendarAppointment *appointment_copy) - { - GSList *l; - -@@ -827,7 +827,7 @@ calendar_appointment_finalize (CalendarAppointment *appointment) - - static void - calendar_appointment_init (CalendarAppointment *appointment, -- icalcomponent *ical, -+ icalcomponent *ical, - CalendarClientSource *source, - icaltimezone *default_zone) - { -@@ -846,7 +846,7 @@ calendar_appointment_init (CalendarAppointment *appointment, - - static icaltimezone * - resolve_timezone_id (const char *tzid, -- gpointer user_data) -+ gpointer user_data) - { - icaltimezone *retval; - ECalClient *source = user_data; -@@ -862,9 +862,9 @@ resolve_timezone_id (const char *tzid, - - static gboolean - calendar_appointment_collect_occurrence (ECalComponent *component, -- time_t occurrence_start, -- time_t occurrence_end, -- gpointer data) -+ time_t occurrence_start, -+ time_t occurrence_end, -+ gpointer data) - { - CalendarOccurrence *occurrence; - GSList **collect_loc = data; -@@ -880,10 +880,10 @@ calendar_appointment_collect_occurrence (ECalComponent *component, - - static void - calendar_appointment_generate_ocurrences (CalendarAppointment *appointment, -- icalcomponent *ical, -- ECalClient *source, -- time_t start, -- time_t end, -+ icalcomponent *ical, -+ ECalClient *source, -+ time_t start, -+ time_t end, - icaltimezone *default_zone) - { - ECalComponent *ecal; -@@ -892,16 +892,16 @@ calendar_appointment_generate_ocurrences (CalendarAppointment *appointment, - - ecal = e_cal_component_new (); - e_cal_component_set_icalcomponent (ecal, -- icalcomponent_new_clone (ical)); -+ icalcomponent_new_clone (ical)); - - e_cal_recur_generate_instances (ecal, -- start, -- end, -- calendar_appointment_collect_occurrence, -- &appointment->occurrences, -- resolve_timezone_id, -- source, -- default_zone); -+ start, -+ end, -+ calendar_appointment_collect_occurrence, -+ &appointment->occurrences, -+ resolve_timezone_id, -+ source, -+ default_zone); - - g_object_unref (ecal); - -@@ -910,7 +910,7 @@ calendar_appointment_generate_ocurrences (CalendarAppointment *appointment, - - static inline gboolean - calendar_task_equal (CalendarTask *a, -- CalendarTask *b) -+ CalendarTask *b) - { - return - g_strcmp0 (a->uid, b->uid) == 0 && -@@ -926,7 +926,7 @@ calendar_task_equal (CalendarTask *a, - - static void - calendar_task_copy (CalendarTask *task, -- CalendarTask *task_copy) -+ CalendarTask *task_copy) - { - g_assert (task != NULL); - g_assert (task_copy != NULL); -@@ -962,7 +962,7 @@ calendar_task_finalize (CalendarTask *task) - - static void - calendar_task_init (CalendarTask *task, -- icalcomponent *ical, -+ icalcomponent *ical, - CalendarClientSource *source, - icaltimezone *default_zone) - { -@@ -1072,11 +1072,11 @@ calendar_event_copy (CalendarEvent *event) - { - case CALENDAR_EVENT_APPOINTMENT: - calendar_appointment_copy (CALENDAR_APPOINTMENT (event), -- CALENDAR_APPOINTMENT (retval)); -+ CALENDAR_APPOINTMENT (retval)); - break; - case CALENDAR_EVENT_TASK: - calendar_task_copy (CALENDAR_TASK (event), -- CALENDAR_TASK (retval)); -+ CALENDAR_TASK (retval)); - break; - case CALENDAR_EVENT_ALL: - default: -@@ -1093,7 +1093,7 @@ calendar_event_get_uid (CalendarEvent *event) - switch (event->type) - { - case CALENDAR_EVENT_APPOINTMENT: -- return g_strdup_printf ("%s%s", CALENDAR_APPOINTMENT (event)->uid, CALENDAR_APPOINTMENT (event)->rid ? CALENDAR_APPOINTMENT (event)->rid : ""); -+ return g_strdup_printf ("%s%s", CALENDAR_APPOINTMENT (event)->uid, CALENDAR_APPOINTMENT (event)->rid ? CALENDAR_APPOINTMENT (event)->rid : ""); - break; - case CALENDAR_EVENT_TASK: - return g_strdup (CALENDAR_TASK (event)->uid); -@@ -1109,7 +1109,7 @@ calendar_event_get_uid (CalendarEvent *event) - - static gboolean - calendar_event_equal (CalendarEvent *a, -- CalendarEvent *b) -+ CalendarEvent *b) - { - if (!a && !b) - return TRUE; -@@ -1124,15 +1124,15 @@ calendar_event_equal (CalendarEvent *a, - { - case CALENDAR_EVENT_APPOINTMENT: - return calendar_appointment_equal (CALENDAR_APPOINTMENT (a), -- CALENDAR_APPOINTMENT (b)); -+ CALENDAR_APPOINTMENT (b)); - case CALENDAR_EVENT_TASK: - return calendar_task_equal (CALENDAR_TASK (a), -- CALENDAR_TASK (b)); -+ CALENDAR_TASK (b)); - case CALENDAR_EVENT_ALL: - default: - break; - } -- -+ - g_assert_not_reached (); - - return FALSE; -@@ -1140,20 +1140,20 @@ calendar_event_equal (CalendarEvent *a, - - static void - calendar_event_generate_ocurrences (CalendarEvent *event, -- icalcomponent *ical, -- ECalClient *source, -- time_t start, -- time_t end, -+ icalcomponent *ical, -+ ECalClient *source, -+ time_t start, -+ time_t end, - icaltimezone *default_zone) - { - if (event->type != CALENDAR_EVENT_APPOINTMENT) - return; - - calendar_appointment_generate_ocurrences (CALENDAR_APPOINTMENT (event), -- ical, -- source, -- start, -- end, -+ ical, -+ source, -+ start, -+ end, - default_zone); - } - -@@ -1165,77 +1165,77 @@ calendar_event_debug_dump (CalendarEvent *event) - { - case CALENDAR_EVENT_APPOINTMENT: - { -- char *start_str; -- char *end_str; -- GSList *l; -- -- start_str = CALENDAR_APPOINTMENT (event)->start_time ? -- isodate_from_time_t (CALENDAR_APPOINTMENT (event)->start_time) : -- g_strdup ("(undefined)"); -- end_str = CALENDAR_APPOINTMENT (event)->end_time ? -- isodate_from_time_t (CALENDAR_APPOINTMENT (event)->end_time) : -- g_strdup ("(undefined)"); -- -- dprintf ("Appointment: uid '%s', summary '%s', description '%s', " -- "start_time '%s', end_time '%s', is_all_day %s\n", -- CALENDAR_APPOINTMENT (event)->uid, -- CALENDAR_APPOINTMENT (event)->summary, -- CALENDAR_APPOINTMENT (event)->description, -- start_str, -- end_str, -- CALENDAR_APPOINTMENT (event)->is_all_day ? "(true)" : "(false)"); -- -- g_free (start_str); -- g_free (end_str); -- -- dprintf (" Occurrences:\n"); -- for (l = CALENDAR_APPOINTMENT (event)->occurrences; l; l = l->next) -- { -- CalendarOccurrence *occurrence = l->data; -- -- start_str = occurrence->start_time ? -- isodate_from_time_t (occurrence->start_time) : -- g_strdup ("(undefined)"); -- -- end_str = occurrence->end_time ? -- isodate_from_time_t (occurrence->end_time) : -- g_strdup ("(undefined)"); -- -- dprintf (" start_time '%s', end_time '%s'\n", -- start_str, end_str); -- -- g_free (start_str); -- g_free (end_str); -- } -+ char *start_str; -+ char *end_str; -+ GSList *l; -+ -+ start_str = CALENDAR_APPOINTMENT (event)->start_time ? -+ isodate_from_time_t (CALENDAR_APPOINTMENT (event)->start_time) : -+ g_strdup ("(undefined)"); -+ end_str = CALENDAR_APPOINTMENT (event)->end_time ? -+ isodate_from_time_t (CALENDAR_APPOINTMENT (event)->end_time) : -+ g_strdup ("(undefined)"); -+ -+ dprintf ("Appointment: uid '%s', summary '%s', description '%s', " -+ "start_time '%s', end_time '%s', is_all_day %s\n", -+ CALENDAR_APPOINTMENT (event)->uid, -+ CALENDAR_APPOINTMENT (event)->summary, -+ CALENDAR_APPOINTMENT (event)->description, -+ start_str, -+ end_str, -+ CALENDAR_APPOINTMENT (event)->is_all_day ? "(true)" : "(false)"); -+ -+ g_free (start_str); -+ g_free (end_str); -+ -+ dprintf (" Occurrences:\n"); -+ for (l = CALENDAR_APPOINTMENT (event)->occurrences; l; l = l->next) -+ { -+ CalendarOccurrence *occurrence = l->data; -+ -+ start_str = occurrence->start_time ? -+ isodate_from_time_t (occurrence->start_time) : -+ g_strdup ("(undefined)"); -+ -+ end_str = occurrence->end_time ? -+ isodate_from_time_t (occurrence->end_time) : -+ g_strdup ("(undefined)"); -+ -+ dprintf (" start_time '%s', end_time '%s'\n", -+ start_str, end_str); -+ -+ g_free (start_str); -+ g_free (end_str); -+ } - } - break; - case CALENDAR_EVENT_TASK: - { -- char *start_str; -- char *due_str; -- char *completed_str; -- -- start_str = CALENDAR_TASK (event)->start_time ? -- isodate_from_time_t (CALENDAR_TASK (event)->start_time) : -- g_strdup ("(undefined)"); -- due_str = CALENDAR_TASK (event)->due_time ? -- isodate_from_time_t (CALENDAR_TASK (event)->due_time) : -- g_strdup ("(undefined)"); -- completed_str = CALENDAR_TASK (event)->completed_time ? -- isodate_from_time_t (CALENDAR_TASK (event)->completed_time) : -- g_strdup ("(undefined)"); -- -- dprintf ("Task: uid '%s', summary '%s', description '%s', " -- "start_time '%s', due_time '%s', percent_complete %d, completed_time '%s'\n", -- CALENDAR_TASK (event)->uid, -- CALENDAR_TASK (event)->summary, -- CALENDAR_TASK (event)->description, -- start_str, -- due_str, -- CALENDAR_TASK (event)->percent_complete, -- completed_str); -- -- g_free (completed_str); -+ char *start_str; -+ char *due_str; -+ char *completed_str; -+ -+ start_str = CALENDAR_TASK (event)->start_time ? -+ isodate_from_time_t (CALENDAR_TASK (event)->start_time) : -+ g_strdup ("(undefined)"); -+ due_str = CALENDAR_TASK (event)->due_time ? -+ isodate_from_time_t (CALENDAR_TASK (event)->due_time) : -+ g_strdup ("(undefined)"); -+ completed_str = CALENDAR_TASK (event)->completed_time ? -+ isodate_from_time_t (CALENDAR_TASK (event)->completed_time) : -+ g_strdup ("(undefined)"); -+ -+ dprintf ("Task: uid '%s', summary '%s', description '%s', " -+ "start_time '%s', due_time '%s', percent_complete %d, completed_time '%s'\n", -+ CALENDAR_TASK (event)->uid, -+ CALENDAR_TASK (event)->summary, -+ CALENDAR_TASK (event)->description, -+ start_str, -+ due_str, -+ CALENDAR_TASK (event)->percent_complete, -+ completed_str); -+ -+ g_free (completed_str); - } - break; - default: -@@ -1247,21 +1247,21 @@ calendar_event_debug_dump (CalendarEvent *event) - - static inline CalendarClientQuery * - goddamn_this_is_crack (CalendarClientSource *source, -- ECalClientView *view, -- gboolean *emit_signal) -+ ECalClientView *view, -+ gboolean *emit_signal) - { - g_assert (view != NULL); - - if (source->completed_query.view == view) - { - if (emit_signal) -- *emit_signal = TRUE; -+ *emit_signal = TRUE; - return &source->completed_query; - } - else if (source->in_progress_query.view == view) - { - if (emit_signal) -- *emit_signal = FALSE; -+ *emit_signal = FALSE; - return &source->in_progress_query; - } - -@@ -1272,19 +1272,19 @@ goddamn_this_is_crack (CalendarClientSource *source, - - static void - calendar_client_handle_query_completed (CalendarClientSource *source, -- const GError *error, -- ECalClientView *view) -+ const GError *error, -+ ECalClientView *view) - { - CalendarClientQuery *query; - - query = goddamn_this_is_crack (source, view, NULL); -- -+ - dprintf ("Query %p completed: %s\n", query, error ? error->message : "Success"); - - if (error) - { - g_warning ("Calendar query failed: %s\n", -- error->message); -+ error->message); - calendar_client_stop_query (source->client, source, query); - return; - } -@@ -1306,8 +1306,8 @@ calendar_client_handle_query_completed (CalendarClientSource *source, - - static void - calendar_client_handle_query_result (CalendarClientSource *source, -- const GSList *objects, -- ECalClientView *view) -+ const GSList *objects, -+ ECalClientView *view) - { - CalendarClientQuery *query; - CalendarClient *client; -@@ -1322,15 +1322,15 @@ calendar_client_handle_query_result (CalendarClientSource *source, - query = goddamn_this_is_crack (source, view, &emit_signal); - - dprintf ("Query %p result: %d objects:\n", -- query, g_list_length (objects)); -+ query, g_list_length (objects)); - - month_begin = make_time_for_day_begin (1, -- client->priv->month, -- client->priv->year); -+ client->priv->month, -+ client->priv->year); - - month_end = make_time_for_day_begin (1, -- client->priv->month + 1, -- client->priv->year); -+ client->priv->month + 1, -+ client->priv->year); - - events_changed = FALSE; - for (l = objects; l; l = l->next) -@@ -1339,36 +1339,36 @@ calendar_client_handle_query_result (CalendarClientSource *source, - CalendarEvent *old_event; - icalcomponent *ical = l->data; - char *uid; -- -+ - event = calendar_event_new (ical, source, client->priv->zone); - if (!event) -- continue; -+ continue; - - calendar_event_generate_ocurrences (event, -- ical, -- source->cal_client, -- month_begin, -- month_end, -+ ical, -+ source->cal_client, -+ month_begin, -+ month_end, - client->priv->zone); - - uid = calendar_event_get_uid (event); -- -+ - old_event = g_hash_table_lookup (query->events, uid); - - if (!calendar_event_equal (event, old_event)) -- { -- dprintf ("Event %s: ", old_event ? "modified" : "added"); -+ { -+ dprintf ("Event %s: ", old_event ? "modified" : "added"); - -- calendar_event_debug_dump (event); -+ calendar_event_debug_dump (event); - -- g_hash_table_replace (query->events, uid, event); -+ g_hash_table_replace (query->events, uid, event); - -- events_changed = TRUE; -- } -+ events_changed = TRUE; -+ } - else -- { -- g_free (uid); -- } -+ { -+ g_free (uid); -+ } - } - - if (emit_signal && events_changed) -@@ -1386,7 +1386,7 @@ check_object_remove (gpointer key, - size_t len; - - len = strlen (uid); -- -+ - if (len <= strlen (key) && strncmp (uid, key, len) == 0) - { - dprintf ("Event removed: "); -@@ -1401,8 +1401,8 @@ check_object_remove (gpointer key, - - static void - calendar_client_handle_objects_removed (CalendarClientSource *source, -- const GSList *ids, -- ECalClientView *view) -+ const GSList *ids, -+ ECalClientView *view) - { - CalendarClientQuery *query; - gboolean emit_signal; -@@ -1419,24 +1419,24 @@ calendar_client_handle_objects_removed (CalendarClientSource *source, - char *uid = g_strdup_printf ("%s%s", id->uid, id->rid ? id->rid : ""); - - if (!id->rid || !(*id->rid)) -- { -- unsigned int size = g_hash_table_size (query->events); -+ { -+ unsigned int size = g_hash_table_size (query->events); - -- g_hash_table_foreach_remove (query->events, check_object_remove, id->uid); -+ g_hash_table_foreach_remove (query->events, check_object_remove, id->uid); - -- if (size != g_hash_table_size (query->events)) -- events_changed = TRUE; -- } -+ if (size != g_hash_table_size (query->events)) -+ events_changed = TRUE; -+ } - else if ((event = g_hash_table_lookup (query->events, uid))) -- { -- dprintf ("Event removed: "); -+ { -+ dprintf ("Event removed: "); - -- calendar_event_debug_dump (event); -+ calendar_event_debug_dump (event); - -- g_assert (g_hash_table_remove (query->events, uid)); -+ g_assert (g_hash_table_remove (query->events, uid)); - -- events_changed = TRUE; -- } -+ events_changed = TRUE; -+ } - g_free (uid); - } - -@@ -1460,8 +1460,8 @@ calendar_client_query_finalize (CalendarClientQuery *query) - - static void - calendar_client_stop_query (CalendarClient *client, -- CalendarClientSource *source, -- CalendarClientQuery *query) -+ CalendarClientSource *source, -+ CalendarClientQuery *query) - { - if (query == &source->in_progress_query) - { -@@ -1481,14 +1481,14 @@ calendar_client_stop_query (CalendarClient *client, - } - else - g_assert_not_reached (); -- -+ - calendar_client_query_finalize (query); - } - - static void - calendar_client_start_query (CalendarClient *client, -- CalendarClientSource *source, -- const char *query) -+ CalendarClientSource *source, -+ const char *query) - { - ECalClientView *view = NULL; - GError *error = NULL; -@@ -1496,7 +1496,7 @@ calendar_client_start_query (CalendarClient *client, - if (!e_cal_client_get_view_sync (source->cal_client, query, &view, NULL, &error)) - { - g_warning ("Error preparing the query: '%s': %s\n", -- query, error->message); -+ query, error->message); - g_error_free (error); - return; - } -@@ -1505,29 +1505,29 @@ calendar_client_start_query (CalendarClient *client, - - if (source->query_in_progress) - calendar_client_stop_query (client, source, &source->in_progress_query); -- -+ - dprintf ("Starting query %p: '%s'\n", &source->in_progress_query, query); - - source->query_in_progress = TRUE; - source->in_progress_query.view = view; - source->in_progress_query.events = - g_hash_table_new_full (g_str_hash, -- g_str_equal, -- g_free, -- (GDestroyNotify) calendar_event_free); -+ g_str_equal, -+ g_free, -+ (GDestroyNotify) calendar_event_free); - - g_signal_connect_swapped (view, "objects-added", -- G_CALLBACK (calendar_client_handle_query_result), -- source); -+ G_CALLBACK (calendar_client_handle_query_result), -+ source); - g_signal_connect_swapped (view, "objects-modified", -- G_CALLBACK (calendar_client_handle_query_result), -- source); -+ G_CALLBACK (calendar_client_handle_query_result), -+ source); - g_signal_connect_swapped (view, "objects-removed", -- G_CALLBACK (calendar_client_handle_objects_removed), -- source); -+ G_CALLBACK (calendar_client_handle_objects_removed), -+ source); - g_signal_connect_swapped (view, "complete", -- G_CALLBACK (calendar_client_handle_query_completed), -- source); -+ G_CALLBACK (calendar_client_handle_query_completed), -+ source); - - e_cal_client_view_start (view, NULL); - } -@@ -1545,21 +1545,21 @@ calendar_client_update_appointments (CalendarClient *client) - return; - - month_begin = make_isodate_for_day_begin (1, -- client->priv->month, -- client->priv->year); -+ client->priv->month, -+ client->priv->year); - - month_end = make_isodate_for_day_begin (1, -- client->priv->month + 1, -- client->priv->year); -+ client->priv->month + 1, -+ client->priv->year); - - query = g_strdup_printf ("occur-in-time-range? (make-time \"%s\") " -- "(make-time \"%s\")", -- month_begin, month_end); -+ "(make-time \"%s\")", -+ month_begin, month_end); - - for (l = client->priv->appointment_sources; l; l = l->next) - { - CalendarClientSource *cs = l->data; -- -+ - if (!e_client_is_opened (E_CLIENT (cs->cal_client))) - continue; - -@@ -1586,7 +1586,7 @@ calendar_client_update_tasks (CalendarClient *client) - * Look at filter_task() to see the behaviour we - * want. - */ -- -+ - char *day_begin; - char *day_end; - -@@ -1596,29 +1596,29 @@ calendar_client_update_tasks (CalendarClient *client) - return; - - day_begin = make_isodate_for_day_begin (client->priv->day, -- client->priv->month, -- client->priv->year); -+ client->priv->month, -+ client->priv->year); - - day_end = make_isodate_for_day_begin (client->priv->day + 1, -- client->priv->month, -- client->priv->year); -+ client->priv->month, -+ client->priv->year); - if (!day_begin || !day_end) - { - g_warning ("Cannot run query with invalid date: %dd %dy %dm\n", -- client->priv->day, -- client->priv->month, -- client->priv->year); -+ client->priv->day, -+ client->priv->month, -+ client->priv->year); - g_free (day_begin); - g_free (day_end); - return; - } -- -+ - query = g_strdup_printf ("(and (occur-in-time-range? (make-time \"%s\") " -- "(make-time \"%s\")) " -- "(or (not is-completed?) " -- "(and (is-completed?) " -- "(not (completed-before? (make-time \"%s\"))))))", -- day_begin, day_end, day_begin); -+ "(make-time \"%s\")) " -+ "(or (not is-completed?) " -+ "(and (is-completed?) " -+ "(not (completed-before? (make-time \"%s\"))))))", -+ day_begin, day_end, day_begin); - #else - query = g_strdup ("#t"); - #endif /* FIX_BROKEN_TASKS_QUERY */ -@@ -1651,23 +1651,23 @@ calendar_client_source_finalize (CalendarClientSource *source) - - calendar_client_query_finalize (&source->completed_query); - calendar_client_query_finalize (&source->in_progress_query); -- -+ - source->query_completed = FALSE; - source->query_in_progress = FALSE; - } - - static int - compare_calendar_sources (CalendarClientSource *s1, -- CalendarClientSource *s2) -+ CalendarClientSource *s2) - { - return (s1->cal_client == s2->cal_client) ? 0 : 1; - } - - static GSList * - calendar_client_update_sources_list (CalendarClient *client, -- GSList *sources, -- GSList *esources, -- guint changed_signal_id) -+ GSList *sources, -+ GSList *esources, -+ guint changed_signal_id) - { - GSList *retval, *l; - -@@ -1683,24 +1683,24 @@ calendar_client_update_sources_list (CalendarClient *client, - dummy_source.cal_client = esource; - - dprintf ("update_sources_list: adding client %s: ", -- e_source_get_uid (e_client_get_source (E_CLIENT (esource)))); -+ e_source_get_uid (e_client_get_source (E_CLIENT (esource)))); - - if ((s = g_slist_find_custom (sources, -- &dummy_source, -- (GCompareFunc) compare_calendar_sources))) -- { -- dprintf ("already on list\n"); -- new_source = s->data; -- sources = g_slist_delete_link (sources, s); -- } -+ &dummy_source, -+ (GCompareFunc) compare_calendar_sources))) -+ { -+ dprintf ("already on list\n"); -+ new_source = s->data; -+ sources = g_slist_delete_link (sources, s); -+ } - else -- { -- dprintf ("added\n"); -- new_source = g_new0 (CalendarClientSource, 1); -- new_source->client = client; -- new_source->cal_client = g_object_ref (esource); -- new_source->changed_signal_id = changed_signal_id; -- } -+ { -+ dprintf ("added\n"); -+ new_source = g_new0 (CalendarClientSource, 1); -+ new_source->client = client; -+ new_source->cal_client = g_object_ref (esource); -+ new_source->changed_signal_id = changed_signal_id; -+ } - - retval = g_slist_prepend (retval, new_source); - } -@@ -1710,7 +1710,7 @@ calendar_client_update_sources_list (CalendarClient *client, - CalendarClientSource *source = l->data; - - dprintf ("Removing client %s from list\n", -- e_source_get_uid (e_client_get_source (E_CLIENT (source->cal_client)))); -+ e_source_get_uid (e_client_get_source (E_CLIENT (source->cal_client)))); - - calendar_client_source_finalize (source); - g_free (source); -@@ -1729,11 +1729,11 @@ calendar_client_appointment_sources_changed (CalendarClient *client) - - esources = calendar_sources_get_appointment_sources (client->priv->calendar_sources); - -- client->priv->appointment_sources = -+ client->priv->appointment_sources = - calendar_client_update_sources_list (client, -- client->priv->appointment_sources, -- esources, -- signals [APPOINTMENTS_CHANGED]); -+ client->priv->appointment_sources, -+ esources, -+ signals [APPOINTMENTS_CHANGED]); - - load_calendars (client, CALENDAR_EVENT_APPOINTMENT); - calendar_client_update_appointments (client); -@@ -1748,11 +1748,11 @@ calendar_client_task_sources_changed (CalendarClient *client) - - esources = calendar_sources_get_task_sources (client->priv->calendar_sources); - -- client->priv->task_sources = -+ client->priv->task_sources = - calendar_client_update_sources_list (client, -- client->priv->task_sources, -- esources, -- signals [TASKS_CHANGED]); -+ client->priv->task_sources, -+ esources, -+ signals [TASKS_CHANGED]); - - load_calendars (client, CALENDAR_EVENT_TASK); - calendar_client_update_tasks (client); -@@ -1778,8 +1778,8 @@ calendar_client_get_date (CalendarClient *client, - - void - calendar_client_select_month (CalendarClient *client, -- guint month, -- guint year) -+ guint month, -+ guint year) - { - g_return_if_fail (CALENDAR_IS_CLIENT (client)); - g_return_if_fail (month <= 11); -@@ -1801,7 +1801,7 @@ calendar_client_select_month (CalendarClient *client, - - void - calendar_client_select_day (CalendarClient *client, -- guint day) -+ guint day) - { - g_return_if_fail (CALENDAR_IS_CLIENT (client)); - g_return_if_fail (day <= 31); -@@ -1830,13 +1830,13 @@ typedef struct - } FilterData; - - typedef void (* CalendarEventFilterFunc) (const char *uid, -- CalendarEvent *event, -- FilterData *filter_data); -+ CalendarEvent *event, -+ FilterData *filter_data); - - static void - filter_appointment (const char *uid, -- CalendarEvent *event, -- FilterData *filter_data) -+ CalendarEvent *event, -+ FilterData *filter_data) - { - GSList *occurrences, *l; - -@@ -1856,16 +1856,16 @@ filter_appointment (const char *uid, - start_time < filter_data->end_time) || - (start_time <= filter_data->start_time && - (end_time - 1) > filter_data->start_time)) -- { -- CalendarEvent *new_event; -- -- new_event = calendar_event_copy (event); -- -- CALENDAR_APPOINTMENT (new_event)->start_time = occurrence->start_time; -- CALENDAR_APPOINTMENT (new_event)->end_time = occurrence->end_time; -- -- filter_data->events = g_slist_prepend (filter_data->events, new_event); -- } -+ { -+ CalendarEvent *new_event; -+ -+ new_event = calendar_event_copy (event); -+ -+ CALENDAR_APPOINTMENT (new_event)->start_time = occurrence->start_time; -+ CALENDAR_APPOINTMENT (new_event)->end_time = occurrence->end_time; -+ -+ filter_data->events = g_slist_prepend (filter_data->events, new_event); -+ } - } - - CALENDAR_APPOINTMENT (event)->occurrences = occurrences; -@@ -1873,8 +1873,8 @@ filter_appointment (const char *uid, - - static void - filter_task (const char *uid, -- CalendarEvent *event, -- FilterData *filter_data) -+ CalendarEvent *event, -+ FilterData *filter_data) - { - #ifdef FIX_BROKEN_TASKS_QUERY - CalendarTask *task; -@@ -1889,22 +1889,22 @@ filter_task (const char *uid, - if (task->start_time && task->start_time > filter_data->start_time) - return; - -- if (task->completed_time && -+ if (task->completed_time && - (task->completed_time < filter_data->start_time || - task->completed_time > filter_data->end_time)) - return; - #endif /* FIX_BROKEN_TASKS_QUERY */ - - filter_data->events = g_slist_prepend (filter_data->events, -- calendar_event_copy (event)); -+ calendar_event_copy (event)); - } - - static GSList * - calendar_client_filter_events (CalendarClient *client, -- GSList *sources, -- CalendarEventFilterFunc filter_func, -- time_t start_time, -- time_t end_time) -+ GSList *sources, -+ CalendarEventFilterFunc filter_func, -+ time_t start_time, -+ time_t end_time) - { - FilterData filter_data; - GSList *l; -@@ -1924,16 +1924,16 @@ calendar_client_filter_events (CalendarClient *client, - CalendarClientSource *source = l->data; - - if (source->query_completed) -- { -- filter_data.events = NULL; -- g_hash_table_foreach (source->completed_query.events, -- (GHFunc) filter_func, -- &filter_data); -+ { -+ filter_data.events = NULL; -+ g_hash_table_foreach (source->completed_query.events, -+ (GHFunc) filter_func, -+ &filter_data); - -- filter_data.events = g_slist_reverse (filter_data.events); -+ filter_data.events = g_slist_reverse (filter_data.events); - -- retval = g_slist_concat (retval, filter_data.events); -- } -+ retval = g_slist_concat (retval, filter_data.events); -+ } - } - - return retval; -@@ -1941,7 +1941,7 @@ calendar_client_filter_events (CalendarClient *client, - - GSList * - calendar_client_get_events (CalendarClient *client, -- CalendarEventType event_mask) -+ CalendarEventType event_mask) - { - GSList *appointments; - GSList *tasks; -@@ -1950,34 +1950,34 @@ calendar_client_get_events (CalendarClient *client, - - g_return_val_if_fail (CALENDAR_IS_CLIENT (client), NULL); - g_return_val_if_fail (client->priv->day != G_MAXUINT && -- client->priv->month != G_MAXUINT && -- client->priv->year != G_MAXUINT, NULL); -+ client->priv->month != G_MAXUINT && -+ client->priv->year != G_MAXUINT, NULL); - - day_begin = make_time_for_day_begin (client->priv->day, -- client->priv->month, -- client->priv->year); -+ client->priv->month, -+ client->priv->year); - day_end = make_time_for_day_begin (client->priv->day + 1, -- client->priv->month, -- client->priv->year); -+ client->priv->month, -+ client->priv->year); - - appointments = NULL; - if (event_mask & CALENDAR_EVENT_APPOINTMENT) - { - appointments = calendar_client_filter_events (client, -- client->priv->appointment_sources, -- filter_appointment, -- day_begin, -- day_end); -+ client->priv->appointment_sources, -+ filter_appointment, -+ day_begin, -+ day_end); - } - - tasks = NULL; - if (event_mask & CALENDAR_EVENT_TASK) - { - tasks = calendar_client_filter_events (client, -- client->priv->task_sources, -- filter_task, -- day_begin, -- day_end); -+ client->priv->task_sources, -+ filter_task, -+ day_begin, -+ day_end); - } - - return g_slist_concat (appointments, tasks); -@@ -1995,8 +1995,8 @@ day_from_time_t (time_t t) - - void - calendar_client_foreach_appointment_day (CalendarClient *client, -- CalendarDayIter iter_func, -- gpointer user_data) -+ CalendarDayIter iter_func, -+ gpointer user_data) - { - GSList *appointments, *l; - gboolean marked_days [32] = { FALSE, }; -@@ -2007,20 +2007,20 @@ calendar_client_foreach_appointment_day (CalendarClient *client, - g_return_if_fail (CALENDAR_IS_CLIENT (client)); - g_return_if_fail (iter_func != NULL); - g_return_if_fail (client->priv->month != G_MAXUINT && -- client->priv->year != G_MAXUINT); -+ client->priv->year != G_MAXUINT); - - month_begin = make_time_for_day_begin (1, -- client->priv->month, -- client->priv->year); -+ client->priv->month, -+ client->priv->year); - month_end = make_time_for_day_begin (1, -- client->priv->month + 1, -- client->priv->year); -- -+ client->priv->month + 1, -+ client->priv->year); -+ - appointments = calendar_client_filter_events (client, -- client->priv->appointment_sources, -- filter_appointment, -- month_begin, -- month_end); -+ client->priv->appointment_sources, -+ filter_appointment, -+ month_begin, -+ month_end); - for (l = appointments; l; l = l->next) - { - CalendarAppointment *appointment = l->data; -@@ -2031,12 +2031,12 @@ calendar_client_foreach_appointment_day (CalendarClient *client, - - if (day_time >= month_begin) - marked_days [day_from_time_t (day_time)] = TRUE; -- -+ - if (appointment->end_time) - { - int day_offset; - int duration = appointment->end_time - appointment->start_time; -- /* mark the days for the appointment, no need to add an extra one when duration is a multiple of 86400 */ -+ /* mark the days for the appointment, no need to add an extra one when duration is a multiple of 86400 */ - for (day_offset = 1; day_offset <= duration / 86400 && duration != day_offset * 86400; day_offset++) - { - time_t day_tm = appointment->start_time + day_offset * 86400; -@@ -2056,15 +2056,15 @@ calendar_client_foreach_appointment_day (CalendarClient *client, - for (i = 1; i < 32; i++) - { - if (marked_days [i]) -- iter_func (client, i, user_data); -+ iter_func (client, i, user_data); - } - } - - void - calendar_client_set_task_completed (CalendarClient *client, -- char *task_uid, -- gboolean task_completed, -- guint percent_complete) -+ char *task_uid, -+ gboolean task_completed, -+ guint percent_complete) - { - GSList *l; - ECalClient *esource; -@@ -2085,7 +2085,7 @@ calendar_client_set_task_completed (CalendarClient *client, - esource = source->cal_client; - e_cal_client_get_object_sync (esource, task_uid, NULL, &ical, NULL, NULL); - if (ical) -- break; -+ break; - } - - if (!ical) -@@ -2098,21 +2098,21 @@ calendar_client_set_task_completed (CalendarClient *client, - - /* Completed time */ - prop = icalcomponent_get_first_property (ical, -- ICAL_COMPLETED_PROPERTY); -+ ICAL_COMPLETED_PROPERTY); - if (task_completed) - { - struct icaltimetype completed_time; - - completed_time = icaltime_current_time_with_zone (client->priv->zone); - if (!prop) -- { -- icalcomponent_add_property (ical, -- icalproperty_new_completed (completed_time)); -- } -+ { -+ icalcomponent_add_property (ical, -+ icalproperty_new_completed (completed_time)); -+ } - else -- { -- icalproperty_set_completed (prop, completed_time); -- } -+ { -+ icalproperty_set_completed (prop, completed_time); -+ } - } - else if (prop) - { -@@ -2121,11 +2121,11 @@ calendar_client_set_task_completed (CalendarClient *client, - - /* Percent complete */ - prop = icalcomponent_get_first_property (ical, -- ICAL_PERCENTCOMPLETE_PROPERTY); -+ ICAL_PERCENTCOMPLETE_PROPERTY); - if (!prop) - { - icalcomponent_add_property (ical, -- icalproperty_new_percentcomplete (percent_complete)); -+ icalproperty_new_percentcomplete (percent_complete)); - } - else - { -@@ -2142,7 +2142,7 @@ calendar_client_set_task_completed (CalendarClient *client, - else - { - icalcomponent_add_property (ical, -- icalproperty_new_status (status)); -+ icalproperty_new_status (status)); - } - - e_cal_client_modify_object_sync (esource, ical, CALOBJ_MOD_ALL, NULL, NULL); --- -2.20.1 - diff -Nru almanah-0.11.1/debian/patches/Update-the-AppData-file-to-version-0.7.patch almanah-0.12.0/debian/patches/Update-the-AppData-file-to-version-0.7.patch --- almanah-0.11.1/debian/patches/Update-the-AppData-file-to-version-0.7.patch 2019-09-30 14:49:59.000000000 +0000 +++ almanah-0.12.0/debian/patches/Update-the-AppData-file-to-version-0.7.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -From b33b67f48587f40adaa1c1e1e34882cafce540e9 Mon Sep 17 00:00:00 2001 -From: Richard Hughes -Date: Fri, 22 Jan 2016 19:10:04 +0000 -Subject: [PATCH] Update the AppData file to version 0.7+ - ---- - data/almanah.appdata.xml.in | 21 +++++++++++++++------ - 1 file changed, 15 insertions(+), 6 deletions(-) - -diff --git a/data/almanah.appdata.xml.in b/data/almanah.appdata.xml.in -index 31db07d..df93a75 100644 ---- a/data/almanah.appdata.xml.in -+++ b/data/almanah.appdata.xml.in -@@ -1,10 +1,10 @@ - - -- -- almanah.desktop -+ -+ almanah.desktop - CC0-1.0 - GPL-3.0+ -- Almanah Diary -+ <_name>Almanah Diary - <_summary>Keep a diary of your life - - <_p> -@@ -18,8 +18,17 @@ - - - -- https://wiki.gnome.org/Apps/Almanah_Diary?action=AttachFile&do=get&target=screenshot-almanah-diary.png -+ -+ https://wiki.gnome.org/Apps/Almanah_Diary?action=AttachFile&do=get&target=screenshot-almanah-diary.png -+ - - https://wiki.gnome.org/Apps/Almanah_Diary -- alvaropg_at_gmail.com -- -+ https://bugzilla.gnome.org/enter_bug.cgi?product=almanah -+ http://www.gnome.org/friends/ -+ alvaropg_at_gmail.com -+ GNOME -+ -+ AppMenu -+ ModernToolkit -+ -+ --- -2.20.1 - diff -Nru almanah-0.11.1/debian/rules almanah-0.12.0/debian/rules --- almanah-0.11.1/debian/rules 2019-09-30 14:49:59.000000000 +0000 +++ almanah-0.12.0/debian/rules 2019-10-12 09:14:08.000000000 +0000 @@ -1,10 +1,6 @@ #!/usr/bin/make -f -%: - dh $@ --with autoreconf - -override_dh_autoreconf: - dh_autoreconf $(CURDIR)/autogen.sh +export DEB_BUILD_MAINT_OPTIONS = hardening=+all -override_dh_auto_configure: - dh_auto_configure -- --disable-silent-rules +%: + dh $@ diff -Nru almanah-0.11.1/debian/upstream/metadata almanah-0.12.0/debian/upstream/metadata --- almanah-0.11.1/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.12.0/debian/upstream/metadata 2019-10-12 08:59:27.000000000 +0000 @@ -0,0 +1,6 @@ +--- +Contact: Álvaro Peña +Name: almanah +Bug-Database: https://gitlab.gnome.org/GNOME/almanah/issues +Repository: https://gitlab.gnome.org/GNOME/almanah.git +Repository-Browse: https://gitlab.gnome.org/GNOME/almanah diff -Nru almanah-0.11.1/depcomp almanah-0.12.0/depcomp --- almanah-0.11.1/depcomp 2014-09-24 17:34:09.000000000 +0000 +++ almanah-0.12.0/depcomp 1970-01-01 00:00:00.000000000 +0000 @@ -1,791 +0,0 @@ -#! /bin/sh -# depcomp - compile a program generating dependencies as side-effects - -scriptversion=2013-05-30.07; # UTC - -# Copyright (C) 1999-2013 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Originally written by Alexandre Oliva . - -case $1 in - '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: depcomp [--help] [--version] PROGRAM [ARGS] - -Run PROGRAMS ARGS to compile a file, generating dependencies -as side-effects. - -Environment variables: - depmode Dependency tracking mode. - source Source file read by 'PROGRAMS ARGS'. - object Object file output by 'PROGRAMS ARGS'. - DEPDIR directory where to store dependencies. - depfile Dependency file to output. - tmpdepfile Temporary file to use when outputting dependencies. - libtool Whether libtool is used (yes/no). - -Report bugs to . -EOF - exit $? - ;; - -v | --v*) - echo "depcomp $scriptversion" - exit $? - ;; -esac - -# Get the directory component of the given path, and save it in the -# global variables '$dir'. Note that this directory component will -# be either empty or ending with a '/' character. This is deliberate. -set_dir_from () -{ - case $1 in - */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; - *) dir=;; - esac -} - -# Get the suffix-stripped basename of the given path, and save it the -# global variable '$base'. -set_base_from () -{ - base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` -} - -# If no dependency file was actually created by the compiler invocation, -# we still have to create a dummy depfile, to avoid errors with the -# Makefile "include basename.Plo" scheme. -make_dummy_depfile () -{ - echo "#dummy" > "$depfile" -} - -# Factor out some common post-processing of the generated depfile. -# Requires the auxiliary global variable '$tmpdepfile' to be set. -aix_post_process_depfile () -{ - # If the compiler actually managed to produce a dependency file, - # post-process it. - if test -f "$tmpdepfile"; then - # Each line is of the form 'foo.o: dependency.h'. - # Do two passes, one to just change these to - # $object: dependency.h - # and one to simply output - # dependency.h: - # which is needed to avoid the deleted-header problem. - { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" - sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" - } > "$depfile" - rm -f "$tmpdepfile" - else - make_dummy_depfile - fi -} - -# A tabulation character. -tab=' ' -# A newline character. -nl=' -' -# Character ranges might be problematic outside the C locale. -# These definitions help. -upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ -lower=abcdefghijklmnopqrstuvwxyz -digits=0123456789 -alpha=${upper}${lower} - -if test -z "$depmode" || test -z "$source" || test -z "$object"; then - echo "depcomp: Variables source, object and depmode must be set" 1>&2 - exit 1 -fi - -# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. -depfile=${depfile-`echo "$object" | - sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} -tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} - -rm -f "$tmpdepfile" - -# Avoid interferences from the environment. -gccflag= dashmflag= - -# Some modes work just like other modes, but use different flags. We -# parameterize here, but still list the modes in the big case below, -# to make depend.m4 easier to write. Note that we *cannot* use a case -# here, because this file can only contain one case statement. -if test "$depmode" = hp; then - # HP compiler uses -M and no extra arg. - gccflag=-M - depmode=gcc -fi - -if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout -fi - -cygpath_u="cygpath -u -f -" -if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvisualcpp -fi - -if test "$depmode" = msvc7msys; then - # This is just like msvc7 but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvc7 -fi - -if test "$depmode" = xlc; then - # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. - gccflag=-qmakedep=gcc,-MF - depmode=gcc -fi - -case "$depmode" in -gcc3) -## gcc 3 implements dependency tracking that does exactly what -## we want. Yay! Note: for some reason libtool 1.4 doesn't like -## it if -MD -MP comes after the -MF stuff. Hmm. -## Unfortunately, FreeBSD c89 acceptance of flags depends upon -## the command line argument order; so add the flags where they -## appear in depend2.am. Note that the slowdown incurred here -## affects only configure: in makefiles, %FASTDEP% shortcuts this. - for arg - do - case $arg in - -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; - *) set fnord "$@" "$arg" ;; - esac - shift # fnord - shift # $arg - done - "$@" - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - mv "$tmpdepfile" "$depfile" - ;; - -gcc) -## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. -## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. -## (see the conditional assignment to $gccflag above). -## There are various ways to get dependency output from gcc. Here's -## why we pick this rather obscure method: -## - Don't want to use -MD because we'd like the dependencies to end -## up in a subdir. Having to rename by hand is ugly. -## (We might end up doing this anyway to support other compilers.) -## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). Also, it might not be -## supported by the other compilers which use the 'gcc' depmode. -## - Using -M directly means running the compiler twice (even worse -## than renaming). - if test -z "$gccflag"; then - gccflag=-MD, - fi - "$@" -Wp,"$gccflag$tmpdepfile" - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - # The second -e expression handles DOS-style file names with drive - # letters. - sed -e 's/^[^:]*: / /' \ - -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the "deleted header file" problem. -## The problem is that when a header file which appears in a .P file -## is deleted, the dependency causes make to die (because there is -## typically no way to rebuild the header). We avoid this by adding -## dummy dependencies for each header file. Too bad gcc doesn't do -## this for us directly. -## Some versions of gcc put a space before the ':'. On the theory -## that the space means something, we add a space to the output as -## well. hp depmode also adds that space, but also prefixes the VPATH -## to the object. Take care to not repeat it in the output. -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -sgi) - if test "$libtool" = yes; then - "$@" "-Wp,-MDupdate,$tmpdepfile" - else - "$@" -MDupdate "$tmpdepfile" - fi - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - - if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files - echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be - # clever and replace this with sed code, as IRIX sed won't handle - # lines with more than a fixed number of characters (4096 in - # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like '#:fec' to the end of the - # dependency line. - tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ - | tr "$nl" ' ' >> "$depfile" - echo >> "$depfile" - # The second pass generates a dummy entry for each header file. - tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" - else - make_dummy_depfile - fi - rm -f "$tmpdepfile" - ;; - -xlc) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -aix) - # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts '$object:' at the - # start of each line; $object doesn't have directory information. - # Version 6 uses the directory in both cases. - set_dir_from "$object" - set_base_from "$object" - if test "$libtool" = yes; then - tmpdepfile1=$dir$base.u - tmpdepfile2=$base.u - tmpdepfile3=$dir.libs/$base.u - "$@" -Wc,-M - else - tmpdepfile1=$dir$base.u - tmpdepfile2=$dir$base.u - tmpdepfile3=$dir$base.u - "$@" -M - fi - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - do - test -f "$tmpdepfile" && break - done - aix_post_process_depfile - ;; - -tcc) - # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 - # FIXME: That version still under development at the moment of writing. - # Make that this statement remains true also for stable, released - # versions. - # It will wrap lines (doesn't matter whether long or short) with a - # trailing '\', as in: - # - # foo.o : \ - # foo.c \ - # foo.h \ - # - # It will put a trailing '\' even on the last line, and will use leading - # spaces rather than leading tabs (at least since its commit 0394caf7 - # "Emit spaces for -MD"). - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. - # We have to change lines of the first kind to '$object: \'. - sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" - # And for each line of the second kind, we have to emit a 'dep.h:' - # dummy dependency, to avoid the deleted-header problem. - sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" - rm -f "$tmpdepfile" - ;; - -## The order of this option in the case statement is important, since the -## shell code in configure will try each of these formats in the order -## listed in this file. A plain '-MD' option would be understood by many -## compilers, so we must ensure this comes after the gcc and icc options. -pgcc) - # Portland's C compiler understands '-MD'. - # Will always output deps to 'file.d' where file is the root name of the - # source file under compilation, even if file resides in a subdirectory. - # The object file name does not affect the name of the '.d' file. - # pgcc 10.2 will output - # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using '\' : - # foo.o: sub/foo.c ... \ - # sub/foo.h ... \ - # ... - set_dir_from "$object" - # Use the source, not the object, to determine the base name, since - # that's sadly what pgcc will do too. - set_base_from "$source" - tmpdepfile=$base.d - - # For projects that build the same source file twice into different object - # files, the pgcc approach of using the *source* file root name can cause - # problems in parallel builds. Use a locking strategy to avoid stomping on - # the same $tmpdepfile. - lockdir=$base.d-lock - trap " - echo '$0: caught signal, cleaning up...' >&2 - rmdir '$lockdir' - exit 1 - " 1 2 13 15 - numtries=100 - i=$numtries - while test $i -gt 0; do - # mkdir is a portable test-and-set. - if mkdir "$lockdir" 2>/dev/null; then - # This process acquired the lock. - "$@" -MD - stat=$? - # Release the lock. - rmdir "$lockdir" - break - else - # If the lock is being held by a different process, wait - # until the winning process is done or we timeout. - while test -d "$lockdir" && test $i -gt 0; do - sleep 1 - i=`expr $i - 1` - done - fi - i=`expr $i - 1` - done - trap - 1 2 13 15 - if test $i -le 0; then - echo "$0: failed to acquire lock after $numtries attempts" >&2 - echo "$0: check lockdir '$lockdir'" >&2 - exit 1 - fi - - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ - | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp2) - # The "hp" stanza above does not work with aCC (C++) and HP's ia64 - # compilers, which have integrated preprocessors. The correct option - # to use with these is +Maked; it writes dependencies to a file named - # 'foo.d', which lands next to the object file, wherever that - # happens to be. - # Much of this is similar to the tru64 case; see comments there. - set_dir_from "$object" - set_base_from "$object" - if test "$libtool" = yes; then - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir.libs/$base.d - "$@" -Wc,+Maked - else - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir$base.d - "$@" +Maked - fi - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile1" "$tmpdepfile2" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" - # Add 'dependent.h:' lines. - sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" - else - make_dummy_depfile - fi - rm -f "$tmpdepfile" "$tmpdepfile2" - ;; - -tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in 'foo.d' instead, so we check for that too. - # Subdirectories are respected. - set_dir_from "$object" - set_base_from "$object" - - if test "$libtool" = yes; then - # Libtool generates 2 separate objects for the 2 libraries. These - # two compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir$base.o.d # libtool 1.5 - tmpdepfile2=$dir.libs/$base.o.d # Likewise. - tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - do - test -f "$tmpdepfile" && break - done - # Same post-processing that is required for AIX mode. - aix_post_process_depfile - ;; - -msvc7) - if test "$libtool" = yes; then - showIncludes=-Wc,-showIncludes - else - showIncludes=-showIncludes - fi - "$@" $showIncludes > "$tmpdepfile" - stat=$? - grep -v '^Note: including file: ' "$tmpdepfile" - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - # The first sed program below extracts the file names and escapes - # backslashes for cygpath. The second sed program outputs the file - # name when reading, but also accumulates all include files in the - # hold buffer in order to output them again at the end. This only - # works with sed implementations that can handle large buffers. - sed < "$tmpdepfile" -n ' -/^Note: including file: *\(.*\)/ { - s//\1/ - s/\\/\\\\/g - p -}' | $cygpath_u | sort -u | sed -n ' -s/ /\\ /g -s/\(.*\)/'"$tab"'\1 \\/p -s/.\(.*\) \\/\1:/ -H -$ { - s/.*/'"$tab"'/ - G - p -}' >> "$depfile" - echo >> "$depfile" # make sure the fragment doesn't end with a backslash - rm -f "$tmpdepfile" - ;; - -msvc7msys) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -#nosideeffect) - # This comment above is used by automake to tell side-effect - # dependency tracking mechanisms from slower ones. - -dashmstdout) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - - # Remove '-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for ':' - # in the target name. This is to cope with DOS-style filenames: - # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. - "$@" $dashmflag | - sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this sed invocation - # correctly. Breaking it into two sed invocations is a workaround. - tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -dashXmstdout) - # This case only exists to satisfy depend.m4. It is never actually - # run, as this mode is specially recognized in the preamble. - exit 1 - ;; - -makedepend) - "$@" || exit $? - # Remove any Libtool call - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - # X makedepend - shift - cleared=no eat=no - for arg - do - case $cleared in - no) - set ""; shift - cleared=yes ;; - esac - if test $eat = yes; then - eat=no - continue - fi - case "$arg" in - -D*|-I*) - set fnord "$@" "$arg"; shift ;; - # Strip any option that makedepend may not understand. Remove - # the object too, otherwise makedepend will parse it as a source file. - -arch) - eat=yes ;; - -*|$object) - ;; - *) - set fnord "$@" "$arg"; shift ;; - esac - done - obj_suffix=`echo "$object" | sed 's/^.*\././'` - touch "$tmpdepfile" - ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" - rm -f "$depfile" - # makedepend may prepend the VPATH from the source file name to the object. - # No need to regex-escape $object, excess matching of '.' is harmless. - sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process the last invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed '1,2d' "$tmpdepfile" \ - | tr ' ' "$nl" \ - | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" "$tmpdepfile".bak - ;; - -cpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - - # Remove '-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - "$@" -E \ - | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - | sed '$ s: \\$::' > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - cat < "$tmpdepfile" >> "$depfile" - sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvisualcpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - - IFS=" " - for arg - do - case "$arg" in - -o) - shift - ;; - $object) - shift - ;; - "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; - *) - set fnord "$@" "$arg" - shift - shift - ;; - esac - done - "$@" -E 2>/dev/null | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" - echo "$tab" >> "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvcmsys) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -none) - exec "$@" - ;; - -*) - echo "Unknown depmode $depmode" 1>&2 - exit 1 - ;; -esac - -exit 0 - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff -Nru almanah-0.11.1/design/almanah_entry.svg almanah-0.12.0/design/almanah_entry.svg --- almanah-0.11.1/design/almanah_entry.svg 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.12.0/design/almanah_entry.svg 2019-10-07 13:45:09.000000000 +0000 @@ -0,0 +1,7055 @@ + + + + + Almanah Design + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Almanah Design + + + Álvaro Peña + + + + + + + + + + + + + + + + + + Activities + + + Mon 20:07 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Mon 20:07 + + Almanah Diary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Quit + About Diary + Overview Entries + + Preferences + Print Diary + Export + Import + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Monday, 19 September + Monday, 19 September + + + + + + + + + + + + + Aa + Aa + + + + + Past events + Past events + + + + + + + + + + + + Call with Yogi Bear + Breakfast with very important client + My best friend birthday! + GNOME 3.20 rock! + today 12:30 @ twitter + today allday @ calendar + yesterday at 08:15 @ calendar + thursday at 15:00 @ google talk + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Diary + + + + 18:45 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 12 ºCGran Vía, Madrid + + add tag + + drag or click hereto add images + + + + + + + + + + + + + + + Confession + Road + + London + X + X + X + + New Tag... + + + + + + + + + + + + + + + + + Mon, 8 December 2014 + There is a woman in the state of Nevada to whom I once lied continuously, consistently, and shamelessly, for the matter of a couple of hours. I don't want to apologize to her. Far be it from me. But I do want to explain. Unfortunately, I do not know her name, much less her present address. If her eyes should chance upon these lines, I hope she will write to me.It was in Reno, Nevada, in the summer of 1892. Also, it was fair-time, and the town was filled with petty crooks and tin-horns, to say nothing of a vast and hungry horde of hoboes. It was the hungry hoboes that made the town a "hungry" town. They "battered" the back doors of the homes of the citizens until the back doors became unresponsive.A hard town for "scoffings," was what the hoboes called it at that time. I know that I missed many a meal, in spite of the fact that I could "throw my feet" with the next one when it came to "slamming a gate" for a "poke-out" or a "set-down," or hitting for a "light piece" on the street. Why, I was so hard put in that town, one day, that I gave the porter the slip and invaded the private car of some itinerant millionnaire. The train started as I made the platform, and I headed for the aforesaid millionnaire with the porter one jump behind and reaching for me. It was a dead heat, for I reached the millionnaire at the same instant that the porter reached me. I had no time for formalities. "Gimme a quarter to eat on," I blurted out. And as I live, that millionnaire dipped into his pocket and gave me ... just ... precisely ... a quarter. It is my conviction that he was so flabbergasted that he obeyed automatically, and it has been a matter of keen regret ever since, on my part, that I didn't ask him for a dollar. I know that I'd have got it. I swung off the platform of that private car with the porter manoeuvring to kick me in the face. He missed me. One is at a terrible disadvantage when trying to swing off the lowest step of a car and not break his neck on the right of way, with, at the same time, an irate Ethiopian on the platform above trying to land him in the face with a number eleven. But I got the quarter! I got it! + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Past events + Past events + + + + + + + + + + + + + + + + + + + + Go to Today + Select Date .. + + diff -Nru almanah-0.11.1/HACKING almanah-0.12.0/HACKING --- almanah-0.11.1/HACKING 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.12.0/HACKING 2019-10-07 13:45:09.000000000 +0000 @@ -0,0 +1,121 @@ +General principles +================== + +The following general principles should guide all development on Almanah: + 1. Data loss is bad. The user's data should never be lost or corrupted. It could be invaluable to them. + 2. Simplicity. Almanah is meant to be a simple program, free from featuritis. All new features should be useful for the majority of users, and designed to be general. + 3. Flexibility. Users write all sorts of things in Almanah, from personal diary entries to logs of work done each day. New features should be designed to be flexible, and not force a particular use case on the user. + +Security policy +=============== + +Threat model: + 1. User's confidential/personal information (in their diary) being copied/viewed by unauthorised people. + - Other users on the same computer. + - Offline attacks on copies of the diary. + 2. User's diary being modified without their permission by unauthorised people. + +Defences: + 1. Encrypt the user's diary when the application isn't open. The assumption is made that if the application is open, the user is present and can stop attacks themselves. + Public-key encryption with the one of the user's GPG keys is used, but this is an arbitrary choice made due to the availability of widgets for handling GPG keys. + The whole diary is encrypted, rather than each entry individually, to make it harder for an attacker to figure out which days have entries (which may reveal a small amount of information about the content in the diary, for example). + 2. Integrity of the diary is maintained through the same layer of encryption. Again, the assumption is made that if the application is open (and thus able to modify the diary) the user is present and can stop attacks themselves. + +Formatting +========== + +All code should follow the same formatting standards which are broadly based on the GNU style (http://www.gnu.org/prep/standards.html) with some +additions. Briefly: + + - Tab indents are used and braces for blocks go on the same line as the block statement: + + if (x < foo (y, z)) { + haha = bar[4] + 5; + } else { + while (z) { + haha += foo (z, z); + z--; + } + return abc (haha); + } + + Braces should be omitted for single-line blocks, but included for all blocks in a multi-part if statement which has blocks containing more than + one line (as above). + + - Spaces should be present between function name and argument block, and after commas: + + foo (z, z) + + - In pointer types, the '*' is grouped with the variable name, not with the base type. + + int *a; + + Not: + + int* a; + + In cases where there is no variable name, for instance, return values, there should be a single space between the base type and the '*'. + + Type casts should have no space between the type and '*', but a space before the variable being cast: + + (gchar*) foobar; + (gchar**) &foobar; + + - Function and variable names are lower_case_with_underscores, type names are CamelCase and macro names are UPPER_CASE_WITH_UNDERSCORES. + + - Comparisons to NULL, TRUE and FALSE should always be made explicit, for clarity. + + - Code should be wrapped at the 150th column, such that it doesn't require horizontal scrolling on a decent-sized display. + Don't wrap at the 80th column. + +Adding API +========== + + - For all functions except trivial internal ones, ensure they have proper guards against bad parameters: + + g_return_if_fail (ALMANAH_IS_ENTRY (self)); + g_return_if_fail (foobar != NULL); + + - All GObject properties must have getter/setter functions. + + - All API which returns allocated memory must be tagged with G_GNUC_WARN_UNUSED_RESULT after its declaration, to safeguard against consumers of the + API forgetting to use (and consequently free) the memory. This is unlikely, but adding the macro costs little and acts as a reminder in the API + documentation to free the result. + + - All GObject *_get_type function declarations must be tagged with the G_GNUC_CONST macro, as well as any other applicable functions + (see the gcc documentation: http://gcc.gnu.org/onlinedocs/gcc/Function-Attributes.html#index-g_t_0040code_007bconst_007d-function-attribute-2207). + +Choosing function names +======================= + +In general, use common sense. However, there are some specific cases where a standard is enforced: + + - For boolean getters (e.g. for FooBar:is-baz) use foo_bar_is_baz, rather than foo_bar_get_is_baz. Note that the property name should be "is-baz", + rather than just "baz". + + - For boolean setters use foo_bar_set_is_baz, rather than foo_bar_set_baz. + +Commit messages +=============== + +Almanah does not use a ChangeLog; it is auto-generated from the git log when packaging a release. Commit messages should follow the GNOME commit +message guidelines (https://wiki.gnome.org/Git/CommitMessages), with the exception that when a commit closes a bug, the short explanation of the commit +should simply be the bug's title, as copied from GitLab (e.g. "Add code examples to documentation"). The long explanation should then +be used to give details of the changes. If the bug's title is not relevant, it should be changed before committing the changes. + +Any commit fixing a bug from GitLab should have “Fixes: #1234” in the long explanation, on a line by itself. + +Unless the short explanation of a commit is a bug title, it should always be prefixed by a tag to describe the part of the project it touches, using +the following format "tag: Short explanation". The following tags are valid: + + - core: for the core code in the src directory, such as AlmanahEntry. + + - build: for build changes and releases. + + - docs: for documentation changes which are not specific to a piece of code, such as updates to NEWS, README, this file, etc. + + - events: for the event (factory) code in src/events and src/event-factories. + + - widgets: for the widget code in src/widgets. + +The only commits which should not have a tag are translation commits, touching only the po directory. diff -Nru almanah-0.11.1/INSTALL almanah-0.12.0/INSTALL --- almanah-0.11.1/INSTALL 2014-09-24 17:34:08.000000000 +0000 +++ almanah-0.12.0/INSTALL 1970-01-01 00:00:00.000000000 +0000 @@ -1,370 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, -Inc. - - Copying and distribution of this file, with or without modification, -are permitted in any medium without royalty provided the copyright -notice and this notice are preserved. This file is offered as-is, -without warranty of any kind. - -Basic Installation -================== - - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for -instructions specific to this package. Some packages provide this -`INSTALL' file but do not implement all of the features documented -below. The lack of an optional feature in a given package is not -necessarily a bug. More recommendations for GNU packages can be found -in *note Makefile Conventions: (standards)Makefile Conventions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. - - The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. - - Running `configure' might take a while. While running, it prints - some messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package, generally using the just-built uninstalled binaries. - - 4. Type `make install' to install the programs and any data files and - documentation. When installing into a prefix owned by root, it is - recommended that the package be configured and built as a regular - user, and only the `make install' phase executed with root - privileges. - - 5. Optionally, type `make installcheck' to repeat any self-tests, but - this time using the binaries in their final installed location. - This target does not install anything. Running this target as a - regular user, particularly if the prior `make install' required - root privileges, verifies that the installation completed - correctly. - - 6. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - - 7. Often, you can also type `make uninstall' to remove the installed - files again. In practice, not all packages have tested that - uninstallation works correctly, even though it is required by the - GNU Coding Standards. - - 8. Some packages, particularly those that use Automake, provide `make - distcheck', which can by used by developers to test that all other - targets like `make install' and `make uninstall' work correctly. - This target is generally not run by end users. - -Compilers and Options -===================== - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c99 CFLAGS=-g LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. This -is known as a "VPATH" build. - - With a non-GNU `make', it is safer to compile the package for one -architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before -reconfiguring for another architecture. - - On MacOS X 10.5 and later systems, you can create libraries and -executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple `-arch' options to the -compiler but only a single `-arch' option to the preprocessor. Like -this: - - ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CPP="gcc -E" CXXCPP="g++ -E" - - This is not guaranteed to produce working output in all cases, you -may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. - -Installation Names -================== - - By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX', where PREFIX must be an -absolute file name. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. In general, the -default for these options is expressed in terms of `${prefix}', so that -specifying just `--prefix' will affect all of the other directory -specifications that were not explicitly provided. - - The most portable way to affect installation locations is to pass the -correct locations to `configure'; however, many packages provide one or -both of the following shortcuts of passing variable assignments to the -`make install' command line to change installation locations without -having to reconfigure or recompile. - - The first method involves providing an override variable for each -affected directory. For example, `make install -prefix=/alternate/directory' will choose an alternate location for all -directory configuration variables that were expressed in terms of -`${prefix}'. Any directories that were specified during `configure', -but not in terms of `${prefix}', must each be overridden at install -time for the entire installation to be relocated. The approach of -makefile variable overrides for each directory variable is required by -the GNU Coding Standards, and ideally causes no recompilation. -However, some platforms have known limitations with the semantics of -shared libraries that end up requiring recompilation when using this -method, particularly noticeable in packages that use GNU Libtool. - - The second method involves providing the `DESTDIR' variable. For -example, `make install DESTDIR=/alternate/directory' will prepend -`/alternate/directory' before all installation names. The approach of -`DESTDIR' overrides is not required by the GNU Coding Standards, and -does not work on platforms that have drive letters. On the other hand, -it does better at avoiding recompilation issues, and works well even -when some directory options were not specified in terms of `${prefix}' -at `configure' time. - -Optional Features -================= - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - - Some packages offer the ability to configure how verbose the -execution of `make' will be. For these packages, running `./configure ---enable-silent-rules' sets the default to minimal output, which can be -overridden with `make V=1'; while running `./configure ---disable-silent-rules' sets the default to verbose, which can be -overridden with `make V=0'. - -Particular systems -================== - - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in -order to use an ANSI C compiler: - - ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" - -and if that doesn't work, install pre-built binaries of GCC for HP-UX. - - HP-UX `make' updates targets which have the same time stamps as -their prerequisites, which makes it generally unusable when shipped -generated files such as `configure' are involved. Use GNU `make' -instead. - - On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try - - ./configure CC="cc" - -and if that doesn't work, try - - ./configure CC="cc -nodtk" - - On Solaris, don't put `/usr/ucb' early in your `PATH'. This -directory contains several dysfunctional programs; working variants of -these programs are available in `/usr/bin'. So, if you need `/usr/ucb' -in your `PATH', put it _after_ `/usr/bin'. - - On Haiku, software installed for all users goes in `/boot/common', -not `/usr/local'. It is recommended to use the following options: - - ./configure --prefix=/boot/common - -Specifying the System Type -========================== - - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS - KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - - Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). - -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf limitation. Until the limitation is lifted, you can use -this workaround: - - CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash - -`configure' Invocation -====================== - - `configure' recognizes the following options to control how it -operates. - -`--help' -`-h' - Print a summary of all of the options to `configure', and exit. - -`--help=short' -`--help=recursive' - Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`--prefix=DIR' - Use DIR as the installation prefix. *note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. - -`--no-create' -`-n' - Run the configure checks, but stop before creating any output - files. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. diff -Nru almanah-0.11.1/install-sh almanah-0.12.0/install-sh --- almanah-0.11.1/install-sh 2014-09-24 17:34:08.000000000 +0000 +++ almanah-0.12.0/install-sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,527 +0,0 @@ -#!/bin/sh -# install - install a program, script, or datafile - -scriptversion=2011-11-20.07; # UTC - -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# 'make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. - -nl=' -' -IFS=" "" $nl" - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi - -# Put in absolute file names if you don't have them in your path; -# or use environment vars. - -chgrpprog=${CHGRPPROG-chgrp} -chmodprog=${CHMODPROG-chmod} -chownprog=${CHOWNPROG-chown} -cmpprog=${CMPPROG-cmp} -cpprog=${CPPROG-cp} -mkdirprog=${MKDIRPROG-mkdir} -mvprog=${MVPROG-mv} -rmprog=${RMPROG-rm} -stripprog=${STRIPPROG-strip} - -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - -posix_mkdir= - -# Desired mode of installed file. -mode=0755 - -chgrpcmd= -chmodcmd=$chmodprog -chowncmd= -mvcmd=$mvprog -rmcmd="$rmprog -f" -stripcmd= - -src= -dst= -dir_arg= -dst_arg= - -copy_on_change=false -no_target_directory= - -usage="\ -Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE - or: $0 [OPTION]... SRCFILES... DIRECTORY - or: $0 [OPTION]... -t DIRECTORY SRCFILES... - or: $0 [OPTION]... -d DIRECTORIES... - -In the 1st form, copy SRCFILE to DSTFILE. -In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. -In the 4th, create DIRECTORIES. - -Options: - --help display this help and exit. - --version display version info and exit. - - -c (ignored) - -C install only if different (preserve the last data modification time) - -d create directories instead of installing files. - -g GROUP $chgrpprog installed files to GROUP. - -m MODE $chmodprog installed files to MODE. - -o USER $chownprog installed files to USER. - -s $stripprog installed files. - -t DIRECTORY install into DIRECTORY. - -T report an error if DSTFILE is a directory. - -Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG - RMPROG STRIPPROG -" - -while test $# -ne 0; do - case $1 in - -c) ;; - - -C) copy_on_change=true;; - - -d) dir_arg=true;; - - -g) chgrpcmd="$chgrpprog $2" - shift;; - - --help) echo "$usage"; exit $?;; - - -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; - - -o) chowncmd="$chownprog $2" - shift;; - - -s) stripcmd=$stripprog;; - - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; - - -T) no_target_directory=true;; - - --version) echo "$0 $scriptversion"; exit $?;; - - --) shift - break;; - - -*) echo "$0: invalid option: $1" >&2 - exit 1;; - - *) break;; - esac - shift -done - -if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then - # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dst_arg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dst_arg" - shift # fnord - fi - shift # arg - dst_arg=$arg - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - done -fi - -if test $# -eq 0; then - if test -z "$dir_arg"; then - echo "$0: no input file specified." >&2 - exit 1 - fi - # It's OK to call 'install-sh -d' without argument. - # This can happen when creating conditional directories. - exit 0 -fi - -if test -z "$dir_arg"; then - do_exit='(exit $ret); exit $ret' - trap "ret=129; $do_exit" 1 - trap "ret=130; $do_exit" 2 - trap "ret=141; $do_exit" 13 - trap "ret=143; $do_exit" 15 - - # Set umask so as not to create temps with too-generous modes. - # However, 'strip' requires both read and write access to temps. - case $mode in - # Optimize common cases. - *644) cp_umask=133;; - *755) cp_umask=22;; - - *[0-7]) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw='% 200' - fi - cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; - *) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw=,u+rw - fi - cp_umask=$mode$u_plus_rw;; - esac -fi - -for src -do - # Protect names problematic for 'test' and other utilities. - case $src in - -* | [=\(\)!]) src=./$src;; - esac - - if test -n "$dir_arg"; then - dst=$src - dstdir=$dst - test -d "$dstdir" - dstdir_status=$? - else - - # Waiting for this to be detected by the "$cpprog $src $dsttmp" command - # might cause directories to be created, which would be especially bad - # if $src (and thus $dsttmp) contains '*'. - if test ! -f "$src" && test ! -d "$src"; then - echo "$0: $src does not exist." >&2 - exit 1 - fi - - if test -z "$dst_arg"; then - echo "$0: no destination specified." >&2 - exit 1 - fi - dst=$dst_arg - - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. - if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 - fi - dstdir=$dst - dst=$dstdir/`basename "$src"` - dstdir_status=0 - else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - - test -d "$dstdir" - dstdir_status=$? - fi - fi - - obsolete_mkdir_used=false - - if test $dstdir_status != 0; then - case $posix_mkdir in - '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; - esac - - if - $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" - ) - then : - else - - # The umask is ridiculous, or mkdir does not conform to POSIX, - # or it failed possibly due to a race condition. Create the - # directory the slow way, step by step, checking for races as we go. - - case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; - esac - - eval "$initialize_posix_glob" - - oIFS=$IFS - IFS=/ - $posix_glob set -f - set fnord $dstdir - shift - $posix_glob set +f - IFS=$oIFS - - prefixes= - - for d - do - test X"$d" = X && continue - - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ - done - - if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true - fi - fi - fi - - if test -n "$dir_arg"; then - { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && - { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || - test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 - else - - # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - - # Trap to clean up those temp files at exit. - trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - - # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && - - # and set any options; do chmod last to preserve setuid bits. - # - # If any of these fail, we abort the whole thing. If we want to - # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $cpprog $src $dsttmp" command. - # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && - { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && - { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - - # If -C, don't bother to copy if it wouldn't change the file. - if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && - set X $old && old=:$2:$4:$5:$6 && - set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - - test "$old" = "$new" && - $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 - then - rm -f "$dsttmp" - else - # Rename the file to the real destination. - $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || - - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - fi || exit 1 - - trap '' 0 - fi -done - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff -Nru almanah-0.11.1/ltmain.sh almanah-0.12.0/ltmain.sh --- almanah-0.11.1/ltmain.sh 2014-09-24 17:34:05.000000000 +0000 +++ almanah-0.12.0/ltmain.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,9655 +0,0 @@ - -# libtool (GNU libtool) 2.4.2 -# Written by Gordon Matzigkeit , 1996 - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. -# This is free software; see the source for copying conditions. There is NO -# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -# GNU Libtool is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, -# or obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -# Usage: $progname [OPTION]... [MODE-ARG]... -# -# Provide generalized library-building support services. -# -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --no-quiet, --no-silent -# print informational messages (default) -# --no-warn don't display warning messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print more informational messages than default -# --no-verbose don't print the extra informational messages -# --version print version information -# -h, --help, --help-all print short, long, or detailed help message -# -# MODE must be one of the following: -# -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory -# -# MODE-ARGS vary depending on the MODE. When passed as first option, -# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. -# Try `$progname --help --mode=MODE' for a more detailed description of MODE. -# -# When reporting a bug, please describe a test case to reproduce it and -# include the following information: -# -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 -# automake: $automake_version -# autoconf: $autoconf_version -# -# Report bugs to . -# GNU libtool home page: . -# General help using GNU software: . - -PROGRAM=libtool -PACKAGE=libtool -VERSION=2.4.2 -TIMESTAMP="" -package_revision=1.3337 - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' -} - -# NLS nuisances: We save the old values to restore during execute mode. -lt_user_locale= -lt_safe_locale= -for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -do - eval "if test \"\${$lt_var+set}\" = set; then - save_$lt_var=\$$lt_var - $lt_var=C - export $lt_var - lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" - fi" -done -LC_ALL=C -LANGUAGE=C -export LANGUAGE LC_ALL - -$lt_unset CDPATH - - -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" - - - -: ${CP="cp -f"} -test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${MAKE="make"} -: ${MKDIR="mkdir"} -: ${MV="mv -f"} -: ${RM="rm -f"} -: ${SHELL="${CONFIG_SHELL-/bin/sh}"} -: ${Xsed="$SED -e 1s/^X//"} - -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 -EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. -EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. - -exit_status=$EXIT_SUCCESS - -# Make sure IFS has a sensible default -lt_nl=' -' -IFS=" $lt_nl" - -dirname="s,/[^/]*$,," -basename="s,^.*/,," - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} # func_dirname may be replaced by extended shell implementation - - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} # func_basename may be replaced by extended shell implementation - - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -} # func_dirname_and_basename may be replaced by extended shell implementation - - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname may be replaced by extended shell implementation - - -# These SED scripts presuppose an absolute path with a trailing slash. -pathcar='s,^/\([^/]*\).*$,\1,' -pathcdr='s,^/[^/]*,,' -removedotparts=':dotsl - s@/\./@/@g - t dotsl - s,/\.$,/,' -collapseslashes='s@/\{1,\}@/@g' -finalslash='s,/*$,/,' - -# func_normal_abspath PATH -# Remove doubled-up and trailing slashes, "." path components, -# and cancel out any ".." path components in PATH after making -# it an absolute path. -# value returned in "$func_normal_abspath_result" -func_normal_abspath () -{ - # Start from root dir and reassemble the path. - func_normal_abspath_result= - func_normal_abspath_tpath=$1 - func_normal_abspath_altnamespace= - case $func_normal_abspath_tpath in - "") - # Empty path, that just means $cwd. - func_stripname '' '/' "`pwd`" - func_normal_abspath_result=$func_stripname_result - return - ;; - # The next three entries are used to spot a run of precisely - # two leading slashes without using negated character classes; - # we take advantage of case's first-match behaviour. - ///*) - # Unusual form of absolute path, do nothing. - ;; - //*) - # Not necessarily an ordinary path; POSIX reserves leading '//' - # and for example Cygwin uses it to access remote file shares - # over CIFS/SMB, so we conserve a leading double slash if found. - func_normal_abspath_altnamespace=/ - ;; - /*) - # Absolute path, do nothing. - ;; - *) - # Relative path, prepend $cwd. - func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath - ;; - esac - # Cancel out all the simple stuff to save iterations. We also want - # the path to end with a slash for ease of parsing, so make sure - # there is one (and only one) here. - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` - while :; do - # Processed it all yet? - if test "$func_normal_abspath_tpath" = / ; then - # If we ascended to the root using ".." the result may be empty now. - if test -z "$func_normal_abspath_result" ; then - func_normal_abspath_result=/ - fi - break - fi - func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcar"` - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcdr"` - # Figure out what to do with it - case $func_normal_abspath_tcomponent in - "") - # Trailing empty path component, ignore it. - ;; - ..) - # Parent dir; strip last assembled component from result. - func_dirname "$func_normal_abspath_result" - func_normal_abspath_result=$func_dirname_result - ;; - *) - # Actual path component, append it. - func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent - ;; - esac - done - # Restore leading double-slash if one was found on entry. - func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result -} - -# func_relative_path SRCDIR DSTDIR -# generates a relative path from SRCDIR to DSTDIR, with a trailing -# slash if non-empty, suitable for immediately appending a filename -# without needing to append a separator. -# value returned in "$func_relative_path_result" -func_relative_path () -{ - func_relative_path_result= - func_normal_abspath "$1" - func_relative_path_tlibdir=$func_normal_abspath_result - func_normal_abspath "$2" - func_relative_path_tbindir=$func_normal_abspath_result - - # Ascend the tree starting from libdir - while :; do - # check if we have found a prefix of bindir - case $func_relative_path_tbindir in - $func_relative_path_tlibdir) - # found an exact match - func_relative_path_tcancelled= - break - ;; - $func_relative_path_tlibdir*) - # found a matching prefix - func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" - func_relative_path_tcancelled=$func_stripname_result - if test -z "$func_relative_path_result"; then - func_relative_path_result=. - fi - break - ;; - *) - func_dirname $func_relative_path_tlibdir - func_relative_path_tlibdir=${func_dirname_result} - if test "x$func_relative_path_tlibdir" = x ; then - # Have to descend all the way to the root! - func_relative_path_result=../$func_relative_path_result - func_relative_path_tcancelled=$func_relative_path_tbindir - break - fi - func_relative_path_result=../$func_relative_path_result - ;; - esac - done - - # Now calculate path; take care to avoid doubling-up slashes. - func_stripname '' '/' "$func_relative_path_result" - func_relative_path_result=$func_stripname_result - func_stripname '/' '/' "$func_relative_path_tcancelled" - if test "x$func_stripname_result" != x ; then - func_relative_path_result=${func_relative_path_result}/${func_stripname_result} - fi - - # Normalisation. If bindir is libdir, return empty string, - # else relative path ending with a slash; either way, target - # file name can be directly appended. - if test ! -z "$func_relative_path_result"; then - func_stripname './' '' "$func_relative_path_result/" - func_relative_path_result=$func_stripname_result - fi -} - -# The name of this program: -func_dirname_and_basename "$progpath" -progname=$func_basename_result - -# Make sure we have an absolute path for reexecution: -case $progpath in - [\\/]*|[A-Za-z]:\\*) ;; - *[\\/]*) - progdir=$func_dirname_result - progdir=`cd "$progdir" && pwd` - progpath="$progdir/$progname" - ;; - *) - save_IFS="$IFS" - IFS=${PATH_SEPARATOR-:} - for progdir in $PATH; do - IFS="$save_IFS" - test -x "$progdir/$progname" && break - done - IFS="$save_IFS" - test -n "$progdir" || progdir=`pwd` - progpath="$progdir/$progname" - ;; -esac - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed="${SED}"' -e 1s/^X//' -sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution that turns a string into a regex matching for the -# string literally. -sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' - -# Sed substitution that converts a w32 file name or path -# which contains forward slashes, into one that contains -# (escaped) backslashes. A very naive implementation. -lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - -# Re-`\' parameter expansions in output of double_quote_subst that were -# `\'-ed in input to the same. If an odd number of `\' preceded a '$' -# in input to double_quote_subst, that '$' was protected from expansion. -# Since each input `\' is now two `\'s, look for any number of runs of -# four `\'s followed by two `\'s and then a '$'. `\' that '$'. -bs='\\' -bs2='\\\\' -bs4='\\\\\\\\' -dollar='\$' -sed_double_backslash="\ - s/$bs4/&\\ -/g - s/^$bs2$dollar/$bs&/ - s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g - s/\n//g" - -# Standard options: -opt_dry_run=false -opt_help=false -opt_quiet=false -opt_verbose=false -opt_warning=: - -# func_echo arg... -# Echo program name prefixed message, along with the current mode -# name if it has been set yet. -func_echo () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }$*" -} - -# func_verbose arg... -# Echo program name prefixed message in verbose mode only. -func_verbose () -{ - $opt_verbose && func_echo ${1+"$@"} - - # A bug in bash halts the script if the last line of a function - # fails when set -e is in force, so we need another command to - # work around that: - : -} - -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} - -# func_error arg... -# Echo program name prefixed message to standard error. -func_error () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 -} - -# func_warning arg... -# Echo program name prefixed warning message to standard error. -func_warning () -{ - $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 - - # bash bug again: - : -} - -# func_fatal_error arg... -# Echo program name prefixed message to standard error, and exit. -func_fatal_error () -{ - func_error ${1+"$@"} - exit $EXIT_FAILURE -} - -# func_fatal_help arg... -# Echo program name prefixed message to standard error, followed by -# a help hint, and exit. -func_fatal_help () -{ - func_error ${1+"$@"} - func_fatal_error "$help" -} -help="Try \`$progname --help' for more information." ## default - - -# func_grep expression filename -# Check whether EXPRESSION matches any line of FILENAME, without output. -func_grep () -{ - $GREP "$1" "$2" >/dev/null 2>&1 -} - - -# func_mkdir_p directory-path -# Make sure the entire path to DIRECTORY-PATH is available. -func_mkdir_p () -{ - my_directory_path="$1" - my_dir_list= - - if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then - - # Protect directory names starting with `-' - case $my_directory_path in - -*) my_directory_path="./$my_directory_path" ;; - esac - - # While some portion of DIR does not yet exist... - while test ! -d "$my_directory_path"; do - # ...make a list in topmost first order. Use a colon delimited - # list incase some portion of path contains whitespace. - my_dir_list="$my_directory_path:$my_dir_list" - - # If the last portion added has no slash in it, the list is done - case $my_directory_path in */*) ;; *) break ;; esac - - # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` - done - my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` - - save_mkdir_p_IFS="$IFS"; IFS=':' - for my_dir in $my_dir_list; do - IFS="$save_mkdir_p_IFS" - # mkdir can fail with a `File exist' error if two processes - # try to create one of the directories concurrently. Don't - # stop in that case! - $MKDIR "$my_dir" 2>/dev/null || : - done - IFS="$save_mkdir_p_IFS" - - # Bail out if we (or some other process) failed to create a directory. - test -d "$my_directory_path" || \ - func_fatal_error "Failed to create \`$1'" - fi -} - - -# func_mktempdir [string] -# Make a temporary directory that won't clash with other running -# libtool processes, and avoids race conditions if possible. If -# given, STRING is the basename for that directory. -func_mktempdir () -{ - my_template="${TMPDIR-/tmp}/${1-$progname}" - - if test "$opt_dry_run" = ":"; then - # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" - else - - # If mktemp works, use that first and foremost - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` - - if test ! -d "$my_tmpdir"; then - # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" - - save_mktempdir_umask=`umask` - umask 0077 - $MKDIR "$my_tmpdir" - umask $save_mktempdir_umask - fi - - # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || \ - func_fatal_error "cannot create temporary directory \`$my_tmpdir'" - fi - - $ECHO "$my_tmpdir" -} - - -# func_quote_for_eval arg -# Aesthetically quote ARG to be evaled later. -# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT -# is double-quoted, suitable for a subsequent eval, whereas -# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters -# which are still active within double quotes backslashified. -func_quote_for_eval () -{ - case $1 in - *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; - *) - func_quote_for_eval_unquoted_result="$1" ;; - esac - - case $func_quote_for_eval_unquoted_result in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and and variable - # expansion for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" - ;; - *) - func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" - esac -} - - -# func_quote_for_expand arg -# Aesthetically quote ARG to be evaled later; same as above, -# but do not quote variable references. -func_quote_for_expand () -{ - case $1 in - *[\\\`\"]*) - my_arg=`$ECHO "$1" | $SED \ - -e "$double_quote_subst" -e "$sed_double_backslash"` ;; - *) - my_arg="$1" ;; - esac - - case $my_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting and command substitution for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - my_arg="\"$my_arg\"" - ;; - esac - - func_quote_for_expand_result="$my_arg" -} - - -# func_show_eval cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. -func_show_eval () -{ - my_cmd="$1" - my_fail_exp="${2-:}" - - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } - - if ${opt_dry_run-false}; then :; else - eval "$my_cmd" - my_status=$? - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi -} - - -# func_show_eval_locale cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. Use the saved locale for evaluation. -func_show_eval_locale () -{ - my_cmd="$1" - my_fail_exp="${2-:}" - - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } - - if ${opt_dry_run-false}; then :; else - eval "$lt_user_locale - $my_cmd" - my_status=$? - eval "$lt_safe_locale" - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi -} - -# func_tr_sh -# Turn $1 into a string suitable for a shell variable name. -# Result is stored in $func_tr_sh_result. All characters -# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -# if $1 begins with a digit, a '_' is prepended as well. -func_tr_sh () -{ - case $1 in - [0-9]* | *[!a-zA-Z0-9_]*) - func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` - ;; - * ) - func_tr_sh_result=$1 - ;; - esac -} - - -# func_version -# Echo version message to standard output and exit. -func_version () -{ - $opt_debug - - $SED -n '/(C)/!b go - :more - /\./!{ - N - s/\n# / / - b more - } - :go - /^# '$PROGRAM' (GNU /,/# warranty; / { - s/^# // - s/^# *$// - s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ - p - }' < "$progpath" - exit $? -} - -# func_usage -# Echo short help message to standard output and exit. -func_usage () -{ - $opt_debug - - $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ - p - }' < "$progpath" - echo - $ECHO "run \`$progname --help | more' for full usage" - exit $? -} - -# func_help [NOEXIT] -# Echo long help message to standard output and exit, -# unless 'noexit' is passed as argument. -func_help () -{ - $opt_debug - - $SED -n '/^# Usage:/,/# Report bugs to/ { - :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* - s*\$host*'"$host"'* - s*\$SHELL*'"$SHELL"'* - s*\$LTCC*'"$LTCC"'* - s*\$LTCFLAGS*'"$LTCFLAGS"'* - s*\$LD*'"$LD"'* - s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ - p - d - } - /^# .* home page:/b print - /^# General help using/b print - ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret - fi -} - -# func_missing_arg argname -# Echo program name prefixed message to standard error and set global -# exit_cmd. -func_missing_arg () -{ - $opt_debug - - func_error "missing argument for $1." - exit_cmd=exit -} - - -# func_split_short_opt shortopt -# Set func_split_short_opt_name and func_split_short_opt_arg shell -# variables after splitting SHORTOPT after the 2nd character. -func_split_short_opt () -{ - my_sed_short_opt='1s/^\(..\).*$/\1/;q' - my_sed_short_rest='1s/^..\(.*\)$/\1/;q' - - func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` - func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -} # func_split_short_opt may be replaced by extended shell implementation - - -# func_split_long_opt longopt -# Set func_split_long_opt_name and func_split_long_opt_arg shell -# variables after splitting LONGOPT at the `=' sign. -func_split_long_opt () -{ - my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' - my_sed_long_arg='1s/^--[^=]*=//' - - func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` - func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -} # func_split_long_opt may be replaced by extended shell implementation - -exit_cmd=: - - - - - -magic="%%%MAGIC variable%%%" -magic_exe="%%%MAGIC EXE variable%%%" - -# Global variables. -nonopt= -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 - -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "${1}=\$${1}\${2}" -} # func_append may be replaced by extended shell implementation - -# func_append_quoted var value -# Quote VALUE and append to the end of shell variable VAR, separated -# by a space. -func_append_quoted () -{ - func_quote_for_eval "${2}" - eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -} # func_append_quoted may be replaced by extended shell implementation - - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "${@}"` -} # func_arith may be replaced by extended shell implementation - - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -} # func_len may be replaced by extended shell implementation - - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} # func_lo2o may be replaced by extended shell implementation - - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} # func_xform may be replaced by extended shell implementation - - -# func_fatal_configuration arg... -# Echo program name prefixed message to standard error, followed by -# a configuration failure hint, and exit. -func_fatal_configuration () -{ - func_error ${1+"$@"} - func_error "See the $PACKAGE documentation for more information." - func_fatal_error "Fatal configuration error." -} - - -# func_config -# Display the configuration for all the tags in this script. -func_config () -{ - re_begincf='^# ### BEGIN LIBTOOL' - re_endcf='^# ### END LIBTOOL' - - # Default configuration. - $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath" - - # Now print the configurations for the tags. - for tagname in $taglist; do - $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath" - done - - exit $? -} - -# func_features -# Display the features supported by this script. -func_features () -{ - echo "host: $host" - if test "$build_libtool_libs" = yes; then - echo "enable shared libraries" - else - echo "disable shared libraries" - fi - if test "$build_old_libs" = yes; then - echo "enable static libraries" - else - echo "disable static libraries" - fi - - exit $? -} - -# func_enable_tag tagname -# Verify that TAGNAME is valid, and either flag an error and exit, or -# enable the TAGNAME tag. We also add TAGNAME to the global $taglist -# variable here. -func_enable_tag () -{ - # Global variable: - tagname="$1" - - re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" - re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" - sed_extractcf="/$re_begincf/,/$re_endcf/p" - - # Validate tagname. - case $tagname in - *[!-_A-Za-z0-9,/]*) - func_fatal_error "invalid tag name: $tagname" - ;; - esac - - # Don't test for the "default" C tag, as we know it's - # there but not specially marked. - case $tagname in - CC) ;; - *) - if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then - taglist="$taglist $tagname" - - # Evaluate the configuration. Be careful to quote the path - # and the sed script, to avoid splitting on whitespace, but - # also don't use non-portable quotes within backquotes within - # quotes we have to do it in 2 steps: - extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` - eval "$extractedcf" - else - func_error "ignoring unknown tag $tagname" - fi - ;; - esac -} - -# func_check_version_match -# Ensure that we are using m4 macros, and libtool script from the same -# release of libtool. -func_check_version_match () -{ - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from an older release. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - fi - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -$progname: but the definition of this LT_INIT comes from revision $macro_revision. -$progname: You should recreate aclocal.m4 with macros from revision $package_revision -$progname: of $PACKAGE $VERSION and run autoconf again. -_LT_EOF - fi - - exit $EXIT_MISMATCH - fi -} - - -# Shorthand for --mode=foo, only valid as the first argument -case $1 in -clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; -compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; -execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; -finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; -install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; -link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; -uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; -esac - - - -# Option defaults: -opt_debug=: -opt_dry_run=false -opt_config=false -opt_preserve_dup_deps=false -opt_features=false -opt_finish=false -opt_help=false -opt_help_all=false -opt_silent=: -opt_warning=: -opt_verbose=: -opt_silent=false -opt_verbose=false - - -# Parse options once, thoroughly. This comes as soon as possible in the -# script to make things like `--version' happen as quickly as we can. -{ - # this just eases exit handling - while test $# -gt 0; do - opt="$1" - shift - case $opt in - --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" - $opt_debug - ;; - --dry-run|--dryrun|-n) - opt_dry_run=: - ;; - --config) - opt_config=: -func_config - ;; - --dlopen|-dlopen) - optarg="$1" - opt_dlopen="${opt_dlopen+$opt_dlopen -}$optarg" - shift - ;; - --preserve-dup-deps) - opt_preserve_dup_deps=: - ;; - --features) - opt_features=: -func_features - ;; - --finish) - opt_finish=: -set dummy --mode finish ${1+"$@"}; shift - ;; - --help) - opt_help=: - ;; - --help-all) - opt_help_all=: -opt_help=': help-all' - ;; - --mode) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_mode="$optarg" -case $optarg in - # Valid mode arguments: - clean|compile|execute|finish|install|link|relink|uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; -esac - shift - ;; - --no-silent|--no-quiet) - opt_silent=false -func_append preserve_args " $opt" - ;; - --no-warning|--no-warn) - opt_warning=false -func_append preserve_args " $opt" - ;; - --no-verbose) - opt_verbose=false -func_append preserve_args " $opt" - ;; - --silent|--quiet) - opt_silent=: -func_append preserve_args " $opt" - opt_verbose=false - ;; - --verbose|-v) - opt_verbose=: -func_append preserve_args " $opt" -opt_silent=false - ;; - --tag) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_tag="$optarg" -func_append preserve_args " $opt $optarg" -func_enable_tag "$optarg" - shift - ;; - - -\?|-h) func_usage ;; - --help) func_help ;; - --version) func_version ;; - - # Separate optargs to long options: - --*=*) - func_split_long_opt "$opt" - set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - - # Separate non-argument short options: - -\?*|-h*|-n*|-v*) - func_split_short_opt "$opt" - set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} - shift - ;; - - --) break ;; - -*) func_fatal_help "unrecognized option \`$opt'" ;; - *) set dummy "$opt" ${1+"$@"}; shift; break ;; - esac - done - - # Validate options: - - # save first non-option argument - if test "$#" -gt 0; then - nonopt="$opt" - shift - fi - - # preserve --debug - test "$opt_debug" = : || func_append preserve_args " --debug" - - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; - *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - - $opt_help || { - # Sanity checks first: - func_check_version_match - - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" - fi - - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" - - # Only execute mode is allowed to have -dlopen flags. - if test -n "$opt_dlopen" && test "$opt_mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$opt_mode' for more information." - } - - - # Bail if the options were screwed - $exit_cmd $EXIT_FAILURE -} - - - - -## ----------- ## -## Main. ## -## ----------- ## - -# func_lalib_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_lalib_p () -{ - test -f "$1" && - $SED -e 4q "$1" 2>/dev/null \ - | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 -} - -# func_lalib_unsafe_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. -# This function implements the same check as func_lalib_p without -# resorting to external programs. To this end, it redirects stdin and -# closes it afterwards, without saving the original file descriptor. -# As a safety measure, use it only where a negative result would be -# fatal anyway. Works if `file' does not exist. -func_lalib_unsafe_p () -{ - lalib_p=no - if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then - for lalib_p_l in 1 2 3 4 - do - read lalib_p_line - case "$lalib_p_line" in - \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; - esac - done - exec 0<&5 5<&- - fi - test "$lalib_p" = yes -} - -# func_ltwrapper_script_p file -# True iff FILE is a libtool wrapper script -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_ltwrapper_script_p () -{ - func_lalib_p "$1" -} - -# func_ltwrapper_executable_p file -# True iff FILE is a libtool wrapper executable -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_ltwrapper_executable_p () -{ - func_ltwrapper_exec_suffix= - case $1 in - *.exe) ;; - *) func_ltwrapper_exec_suffix=.exe ;; - esac - $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1 -} - -# func_ltwrapper_scriptname file -# Assumes file is an ltwrapper_executable -# uses $file to determine the appropriate filename for a -# temporary ltwrapper_script. -func_ltwrapper_scriptname () -{ - func_dirname_and_basename "$1" "" "." - func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" -} - -# func_ltwrapper_p file -# True iff FILE is a libtool wrapper script or wrapper executable -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_ltwrapper_p () -{ - func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1" -} - - -# func_execute_cmds commands fail_cmd -# Execute tilde-delimited COMMANDS. -# If FAIL_CMD is given, eval that upon failure. -# FAIL_CMD may read-access the current command in variable CMD! -func_execute_cmds () -{ - $opt_debug - save_ifs=$IFS; IFS='~' - for cmd in $1; do - IFS=$save_ifs - eval cmd=\"$cmd\" - func_show_eval "$cmd" "${2-:}" - done - IFS=$save_ifs -} - - -# func_source file -# Source FILE, adding directory component if necessary. -# Note that it is not necessary on cygwin/mingw to append a dot to -# FILE even if both FILE and FILE.exe exist: automatic-append-.exe -# behavior happens only for exec(3), not for open(2)! Also, sourcing -# `FILE.' does not work on cygwin managed mounts. -func_source () -{ - $opt_debug - case $1 in - */* | *\\*) . "$1" ;; - *) . "./$1" ;; - esac -} - - -# func_resolve_sysroot PATH -# Replace a leading = in PATH with a sysroot. Store the result into -# func_resolve_sysroot_result -func_resolve_sysroot () -{ - func_resolve_sysroot_result=$1 - case $func_resolve_sysroot_result in - =*) - func_stripname '=' '' "$func_resolve_sysroot_result" - func_resolve_sysroot_result=$lt_sysroot$func_stripname_result - ;; - esac -} - -# func_replace_sysroot PATH -# If PATH begins with the sysroot, replace it with = and -# store the result into func_replace_sysroot_result. -func_replace_sysroot () -{ - case "$lt_sysroot:$1" in - ?*:"$lt_sysroot"*) - func_stripname "$lt_sysroot" '' "$1" - func_replace_sysroot_result="=$func_stripname_result" - ;; - *) - # Including no sysroot. - func_replace_sysroot_result=$1 - ;; - esac -} - -# func_infer_tag arg -# Infer tagged configuration to use if any are available and -# if one wasn't chosen via the "--tag" command line option. -# Only attempt this if the compiler in the base compile -# command doesn't match the default compiler. -# arg is usually of the form 'gcc ...' -func_infer_tag () -{ - $opt_debug - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do - func_append_quoted CC_quoted "$arg" - done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` - case $@ in - # Blanks in the command may have been stripped by the calling shell, - # but not from the CC environment variable when configure was run. - " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ - " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; - # Blanks at the start of $base_compile will cause this to fail - # if we don't check for them as well. - *) - for z in $available_tags; do - if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. - func_append_quoted CC_quoted "$arg" - done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` - case "$@ " in - " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ - " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) - # The compiler in the base compile command matches - # the one in the tagged configuration. - # Assume this is the tagged configuration we want. - tagname=$z - break - ;; - esac - fi - done - # If $tagname still isn't set, then no tagged configuration - # was found and let the user know that the "--tag" command - # line option must be used. - if test -z "$tagname"; then - func_echo "unable to infer tagged configuration" - func_fatal_error "specify a tag with \`--tag'" -# else -# func_verbose "using $tagname tagged configuration" - fi - ;; - esac - fi -} - - - -# func_write_libtool_object output_name pic_name nonpic_name -# Create a libtool object file (analogous to a ".la" file), -# but don't create it if we're doing a dry run. -func_write_libtool_object () -{ - write_libobj=${1} - if test "$build_libtool_libs" = yes; then - write_lobj=\'${2}\' - else - write_lobj=none - fi - - if test "$build_old_libs" = yes; then - write_oldobj=\'${3}\' - else - write_oldobj=none - fi - - $opt_dry_run || { - cat >${write_libobj}T </dev/null` - if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then - func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | - $SED -e "$lt_sed_naive_backslashify"` - else - func_convert_core_file_wine_to_w32_result= - fi - fi -} -# end: func_convert_core_file_wine_to_w32 - - -# func_convert_core_path_wine_to_w32 ARG -# Helper function used by path conversion functions when $build is *nix, and -# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly -# configured wine environment available, with the winepath program in $build's -# $PATH. Assumes ARG has no leading or trailing path separator characters. -# -# ARG is path to be converted from $build format to win32. -# Result is available in $func_convert_core_path_wine_to_w32_result. -# Unconvertible file (directory) names in ARG are skipped; if no directory names -# are convertible, then the result may be empty. -func_convert_core_path_wine_to_w32 () -{ - $opt_debug - # unfortunately, winepath doesn't convert paths, only file names - func_convert_core_path_wine_to_w32_result="" - if test -n "$1"; then - oldIFS=$IFS - IFS=: - for func_convert_core_path_wine_to_w32_f in $1; do - IFS=$oldIFS - func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" - if test -n "$func_convert_core_file_wine_to_w32_result" ; then - if test -z "$func_convert_core_path_wine_to_w32_result"; then - func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" - else - func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" - fi - fi - done - IFS=$oldIFS - fi -} -# end: func_convert_core_path_wine_to_w32 - - -# func_cygpath ARGS... -# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when -# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) -# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or -# (2), returns the Cygwin file name or path in func_cygpath_result (input -# file name or path is assumed to be in w32 format, as previously converted -# from $build's *nix or MSYS format). In case (3), returns the w32 file name -# or path in func_cygpath_result (input file name or path is assumed to be in -# Cygwin format). Returns an empty string on error. -# -# ARGS are passed to cygpath, with the last one being the file name or path to -# be converted. -# -# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH -# environment variable; do not put it in $PATH. -func_cygpath () -{ - $opt_debug - if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then - func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` - if test "$?" -ne 0; then - # on failure, ensure result is empty - func_cygpath_result= - fi - else - func_cygpath_result= - func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" - fi -} -#end: func_cygpath - - -# func_convert_core_msys_to_w32 ARG -# Convert file name or path ARG from MSYS format to w32 format. Return -# result in func_convert_core_msys_to_w32_result. -func_convert_core_msys_to_w32 () -{ - $opt_debug - # awkward: cmd appends spaces to result - func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -} -#end: func_convert_core_msys_to_w32 - - -# func_convert_file_check ARG1 ARG2 -# Verify that ARG1 (a file name in $build format) was converted to $host -# format in ARG2. Otherwise, emit an error message, but continue (resetting -# func_to_host_file_result to ARG1). -func_convert_file_check () -{ - $opt_debug - if test -z "$2" && test -n "$1" ; then - func_error "Could not determine host file name corresponding to" - func_error " \`$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback: - func_to_host_file_result="$1" - fi -} -# end func_convert_file_check - - -# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH -# Verify that FROM_PATH (a path in $build format) was converted to $host -# format in TO_PATH. Otherwise, emit an error message, but continue, resetting -# func_to_host_file_result to a simplistic fallback value (see below). -func_convert_path_check () -{ - $opt_debug - if test -z "$4" && test -n "$3"; then - func_error "Could not determine the host path corresponding to" - func_error " \`$3'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback. This is a deliberately simplistic "conversion" and - # should not be "improved". See libtool.info. - if test "x$1" != "x$2"; then - lt_replace_pathsep_chars="s|$1|$2|g" - func_to_host_path_result=`echo "$3" | - $SED -e "$lt_replace_pathsep_chars"` - else - func_to_host_path_result="$3" - fi - fi -} -# end func_convert_path_check - - -# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG -# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT -# and appending REPL if ORIG matches BACKPAT. -func_convert_path_front_back_pathsep () -{ - $opt_debug - case $4 in - $1 ) func_to_host_path_result="$3$func_to_host_path_result" - ;; - esac - case $4 in - $2 ) func_append func_to_host_path_result "$3" - ;; - esac -} -# end func_convert_path_front_back_pathsep - - -################################################## -# $build to $host FILE NAME CONVERSION FUNCTIONS # -################################################## -# invoked via `$to_host_file_cmd ARG' -# -# In each case, ARG is the path to be converted from $build to $host format. -# Result will be available in $func_to_host_file_result. - - -# func_to_host_file ARG -# Converts the file name ARG from $build format to $host format. Return result -# in func_to_host_file_result. -func_to_host_file () -{ - $opt_debug - $to_host_file_cmd "$1" -} -# end func_to_host_file - - -# func_to_tool_file ARG LAZY -# converts the file name ARG from $build format to toolchain format. Return -# result in func_to_tool_file_result. If the conversion in use is listed -# in (the comma separated) LAZY, no conversion takes place. -func_to_tool_file () -{ - $opt_debug - case ,$2, in - *,"$to_tool_file_cmd",*) - func_to_tool_file_result=$1 - ;; - *) - $to_tool_file_cmd "$1" - func_to_tool_file_result=$func_to_host_file_result - ;; - esac -} -# end func_to_tool_file - - -# func_convert_file_noop ARG -# Copy ARG to func_to_host_file_result. -func_convert_file_noop () -{ - func_to_host_file_result="$1" -} -# end func_convert_file_noop - - -# func_convert_file_msys_to_w32 ARG -# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic -# conversion to w32 is not available inside the cwrapper. Returns result in -# func_to_host_file_result. -func_convert_file_msys_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_msys_to_w32 "$1" - func_to_host_file_result="$func_convert_core_msys_to_w32_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_msys_to_w32 - - -# func_convert_file_cygwin_to_w32 ARG -# Convert file name ARG from Cygwin to w32 format. Returns result in -# func_to_host_file_result. -func_convert_file_cygwin_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - # because $build is cygwin, we call "the" cygpath in $PATH; no need to use - # LT_CYGPATH in this case. - func_to_host_file_result=`cygpath -m "$1"` - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_cygwin_to_w32 - - -# func_convert_file_nix_to_w32 ARG -# Convert file name ARG from *nix to w32 format. Requires a wine environment -# and a working winepath. Returns result in func_to_host_file_result. -func_convert_file_nix_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_file_wine_to_w32 "$1" - func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_nix_to_w32 - - -# func_convert_file_msys_to_cygwin ARG -# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -# Returns result in func_to_host_file_result. -func_convert_file_msys_to_cygwin () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_msys_to_w32 "$1" - func_cygpath -u "$func_convert_core_msys_to_w32_result" - func_to_host_file_result="$func_cygpath_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_msys_to_cygwin - - -# func_convert_file_nix_to_cygwin ARG -# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed -# in a wine environment, working winepath, and LT_CYGPATH set. Returns result -# in func_to_host_file_result. -func_convert_file_nix_to_cygwin () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. - func_convert_core_file_wine_to_w32 "$1" - func_cygpath -u "$func_convert_core_file_wine_to_w32_result" - func_to_host_file_result="$func_cygpath_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_nix_to_cygwin - - -############################################# -# $build to $host PATH CONVERSION FUNCTIONS # -############################################# -# invoked via `$to_host_path_cmd ARG' -# -# In each case, ARG is the path to be converted from $build to $host format. -# The result will be available in $func_to_host_path_result. -# -# Path separators are also converted from $build format to $host format. If -# ARG begins or ends with a path separator character, it is preserved (but -# converted to $host format) on output. -# -# All path conversion functions are named using the following convention: -# file name conversion function : func_convert_file_X_to_Y () -# path conversion function : func_convert_path_X_to_Y () -# where, for any given $build/$host combination the 'X_to_Y' value is the -# same. If conversion functions are added for new $build/$host combinations, -# the two new functions must follow this pattern, or func_init_to_host_path_cmd -# will break. - - -# func_init_to_host_path_cmd -# Ensures that function "pointer" variable $to_host_path_cmd is set to the -# appropriate value, based on the value of $to_host_file_cmd. -to_host_path_cmd= -func_init_to_host_path_cmd () -{ - $opt_debug - if test -z "$to_host_path_cmd"; then - func_stripname 'func_convert_file_' '' "$to_host_file_cmd" - to_host_path_cmd="func_convert_path_${func_stripname_result}" - fi -} - - -# func_to_host_path ARG -# Converts the path ARG from $build format to $host format. Return result -# in func_to_host_path_result. -func_to_host_path () -{ - $opt_debug - func_init_to_host_path_cmd - $to_host_path_cmd "$1" -} -# end func_to_host_path - - -# func_convert_path_noop ARG -# Copy ARG to func_to_host_path_result. -func_convert_path_noop () -{ - func_to_host_path_result="$1" -} -# end func_convert_path_noop - - -# func_convert_path_msys_to_w32 ARG -# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic -# conversion to w32 is not available inside the cwrapper. Returns result in -# func_to_host_path_result. -func_convert_path_msys_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # Remove leading and trailing path separator characters from ARG. MSYS - # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; - # and winepath ignores them completely. - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_msys_to_w32_result" - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_msys_to_w32 - - -# func_convert_path_cygwin_to_w32 ARG -# Convert path ARG from Cygwin to w32 format. Returns result in -# func_to_host_file_result. -func_convert_path_cygwin_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_cygwin_to_w32 - - -# func_convert_path_nix_to_w32 ARG -# Convert path ARG from *nix to w32 format. Requires a wine environment and -# a working winepath. Returns result in func_to_host_file_result. -func_convert_path_nix_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_nix_to_w32 - - -# func_convert_path_msys_to_cygwin ARG -# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -# Returns result in func_to_host_file_result. -func_convert_path_msys_to_cygwin () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_cygpath -u -p "$func_convert_core_msys_to_w32_result" - func_to_host_path_result="$func_cygpath_result" - func_convert_path_check : : \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" : "$1" - fi -} -# end func_convert_path_msys_to_cygwin - - -# func_convert_path_nix_to_cygwin ARG -# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a -# a wine environment, working winepath, and LT_CYGPATH set. Returns result in -# func_to_host_file_result. -func_convert_path_nix_to_cygwin () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # Remove leading and trailing path separator characters from - # ARG. msys behavior is inconsistent here, cygpath turns them - # into '.;' and ';.', and winepath ignores them completely. - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" - func_to_host_path_result="$func_cygpath_result" - func_convert_path_check : : \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" : "$1" - fi -} -# end func_convert_path_nix_to_cygwin - - -# func_mode_compile arg... -func_mode_compile () -{ - $opt_debug - # Get the compilation command and the source file. - base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" - suppress_opt=yes - suppress_output= - arg_mode=normal - libobj= - later= - pie_flag= - - for arg - do - case $arg_mode in - arg ) - # do not "continue". Instead, add this to base_compile - lastarg="$arg" - arg_mode=normal - ;; - - target ) - libobj="$arg" - arg_mode=normal - continue - ;; - - normal ) - # Accept any command-line options. - case $arg in - -o) - test -n "$libobj" && \ - func_fatal_error "you cannot specify \`-o' more than once" - arg_mode=target - continue - ;; - - -pie | -fpie | -fPIE) - func_append pie_flag " $arg" - continue - ;; - - -shared | -static | -prefer-pic | -prefer-non-pic) - func_append later " $arg" - continue - ;; - - -no-suppress) - suppress_opt=no - continue - ;; - - -Xcompiler) - arg_mode=arg # the next one goes into the "base_compile" arg list - continue # The current "srcfile" will either be retained or - ;; # replaced later. I would guess that would be a bug. - - -Wc,*) - func_stripname '-Wc,' '' "$arg" - args=$func_stripname_result - lastarg= - save_ifs="$IFS"; IFS=',' - for arg in $args; do - IFS="$save_ifs" - func_append_quoted lastarg "$arg" - done - IFS="$save_ifs" - func_stripname ' ' '' "$lastarg" - lastarg=$func_stripname_result - - # Add the arguments to base_compile. - func_append base_compile " $lastarg" - continue - ;; - - *) - # Accept the current argument as the source file. - # The previous "srcfile" becomes the current argument. - # - lastarg="$srcfile" - srcfile="$arg" - ;; - esac # case $arg - ;; - esac # case $arg_mode - - # Aesthetically quote the previous argument. - func_append_quoted base_compile "$lastarg" - done # for arg - - case $arg_mode in - arg) - func_fatal_error "you must specify an argument for -Xcompile" - ;; - target) - func_fatal_error "you must specify a target with \`-o'" - ;; - *) - # Get the name of the library object. - test -z "$libobj" && { - func_basename "$srcfile" - libobj="$func_basename_result" - } - ;; - esac - - # Recognize several different file suffixes. - # If the user specifies -o file.o, it is replaced with file.lo - case $libobj in - *.[cCFSifmso] | \ - *.ada | *.adb | *.ads | *.asm | \ - *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) - func_xform "$libobj" - libobj=$func_xform_result - ;; - esac - - case $libobj in - *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; - *) - func_fatal_error "cannot determine name of library object from \`$libobj'" - ;; - esac - - func_infer_tag $base_compile - - for arg in $later; do - case $arg in - -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" - build_old_libs=no - continue - ;; - - -static) - build_libtool_libs=no - build_old_libs=yes - continue - ;; - - -prefer-pic) - pic_mode=yes - continue - ;; - - -prefer-non-pic) - pic_mode=no - continue - ;; - esac - done - - func_quote_for_eval "$libobj" - test "X$libobj" != "X$func_quote_for_eval_result" \ - && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && func_warning "libobj name \`$libobj' may not contain shell special characters." - func_dirname_and_basename "$obj" "/" "" - objname="$func_basename_result" - xdir="$func_dirname_result" - lobj=${xdir}$objdir/$objname - - test -z "$base_compile" && \ - func_fatal_help "you must specify a compilation command" - - # Delete any leftover library objects. - if test "$build_old_libs" = yes; then - removelist="$obj $lobj $libobj ${libobj}T" - else - removelist="$lobj $libobj ${libobj}T" - fi - - # On Cygwin there's no "real" PIC flag so we must build both object types - case $host_os in - cygwin* | mingw* | pw32* | os2* | cegcc*) - pic_mode=default - ;; - esac - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then - # non-PIC code in shared libraries is not supported - pic_mode=default - fi - - # Calculate the filename of the output object if compiler does - # not support -o with -c - if test "$compiler_c_o" = no; then - output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" - else - output_obj= - need_locks=no - lockfile= - fi - - # Lock this critical section if it is needed - # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then - until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do - func_echo "Waiting for $lockfile to be removed" - sleep 2 - done - elif test "$need_locks" = warn; then - if test -f "$lockfile"; then - $ECHO "\ -*** ERROR, $lockfile exists and contains: -`cat $lockfile 2>/dev/null` - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi - func_append removelist " $output_obj" - $ECHO "$srcfile" > "$lockfile" - fi - - $opt_dry_run || $RM $removelist - func_append removelist " $lockfile" - trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - - func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 - srcfile=$func_to_tool_file_result - func_quote_for_eval "$srcfile" - qsrcfile=$func_quote_for_eval_result - - # Only build a PIC object if we are building libtool libraries. - if test "$build_libtool_libs" = yes; then - # Without this assignment, base_compile gets emptied. - fbsd_hideous_sh_bug=$base_compile - - if test "$pic_mode" != no; then - command="$base_compile $qsrcfile $pic_flag" - else - # Don't build PIC code - command="$base_compile $qsrcfile" - fi - - func_mkdir_p "$xdir$objdir" - - if test -z "$output_obj"; then - # Place PIC objects in $objdir - func_append command " -o $lobj" - fi - - func_show_eval_locale "$command" \ - 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' - - if test "$need_locks" = warn && - test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then - $ECHO "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` - -but it should contain: -$srcfile - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed, then go on to compile the next one - if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then - func_show_eval '$MV "$output_obj" "$lobj"' \ - 'error=$?; $opt_dry_run || $RM $removelist; exit $error' - fi - - # Allow error messages only from the first compilation. - if test "$suppress_opt" = yes; then - suppress_output=' >/dev/null 2>&1' - fi - fi - - # Only build a position-dependent object if we build old libraries. - if test "$build_old_libs" = yes; then - if test "$pic_mode" != yes; then - # Don't build PIC code - command="$base_compile $qsrcfile$pie_flag" - else - command="$base_compile $qsrcfile $pic_flag" - fi - if test "$compiler_c_o" = yes; then - func_append command " -o $obj" - fi - - # Suppress compiler output if we already did a PIC compilation. - func_append command "$suppress_output" - func_show_eval_locale "$command" \ - '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - - if test "$need_locks" = warn && - test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then - $ECHO "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` - -but it should contain: -$srcfile - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed - if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then - func_show_eval '$MV "$output_obj" "$obj"' \ - 'error=$?; $opt_dry_run || $RM $removelist; exit $error' - fi - fi - - $opt_dry_run || { - func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" - - # Unlock the critical section if it was locked - if test "$need_locks" != no; then - removelist=$lockfile - $RM "$lockfile" - fi - } - - exit $EXIT_SUCCESS -} - -$opt_help || { - test "$opt_mode" = compile && func_mode_compile ${1+"$@"} -} - -func_mode_help () -{ - # We need to display help for each of the modes. - case $opt_mode in - "") - # Generic help is extracted from the usage comments - # at the start of this file. - func_help - ;; - - clean) - $ECHO \ -"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE... - -Remove files from the build directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, object or program, all the files associated -with it are deleted. Otherwise, only FILE itself is deleted using RM." - ;; - - compile) - $ECHO \ -"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE - -Compile a source file into a libtool library object. - -This mode accepts the following additional options: - - -o OUTPUT-FILE set the output file name to OUTPUT-FILE - -no-suppress do not suppress compiler output for multiple passes - -prefer-pic try to build PIC objects only - -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking - -Wc,FLAG pass FLAG directly to the compiler - -COMPILE-COMMAND is a command to be used in creating a \`standard' object file -from the given SOURCEFILE. - -The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." - ;; - - execute) - $ECHO \ -"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]... - -Automatically set library path, then run a program. - -This mode accepts the following additional options: - - -dlopen FILE add the directory containing FILE to the library path - -This mode sets the library path environment variable according to \`-dlopen' -flags. - -If any of the ARGS are libtool executable wrappers, then they are translated -into their corresponding uninstalled binary, and any of their required library -directories are added to the library path. - -Then, COMMAND is executed, with ARGS as arguments." - ;; - - finish) - $ECHO \ -"Usage: $progname [OPTION]... --mode=finish [LIBDIR]... - -Complete the installation of libtool libraries. - -Each LIBDIR is a directory that contains libtool libraries. - -The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." - ;; - - install) - $ECHO \ -"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND... - -Install executables or libraries. - -INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. - -The following components of INSTALL-COMMAND are treated specially: - - -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation - -The rest of the components are interpreted as arguments to that command (only -BSD-compatible install options are recognized)." - ;; - - link) - $ECHO \ -"Usage: $progname [OPTION]... --mode=link LINK-COMMAND... - -Link object files or libraries together to form another library, or to -create an executable program. - -LINK-COMMAND is a command using the C compiler that you would use to create -a program from several object files. - -The following components of LINK-COMMAND are treated specially: - - -all-static do not do any dynamic linking at all - -avoid-version do not add a version suffix if possible - -bindir BINDIR specify path to binaries directory (for systems where - libraries must be found in the PATH setting at runtime) - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime - -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols - -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) - -export-symbols SYMFILE - try to export only the symbols listed in SYMFILE - -export-symbols-regex REGEX - try to export only the symbols matching REGEX - -LLIBDIR search LIBDIR for required installed libraries - -lNAME OUTPUT-FILE requires the installed library libNAME - -module build a library that can dlopened - -no-fast-install disable the fast-install mode - -no-install link a not-installable executable - -no-undefined declare that a library does not refer to external symbols - -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects - -precious-files-regex REGEX - don't remove output files matching REGEX - -release RELEASE specify package release information - -rpath LIBDIR the created library will eventually be installed in LIBDIR - -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries - -shared only do dynamic linking of libtool libraries - -shrext SUFFIX override the standard shared library file extension - -static do not do any dynamic linking of uninstalled libtool libraries - -static-libtool-libs - do not do any dynamic linking of libtool libraries - -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] - -weak LIBNAME declare that the target provides the LIBNAME interface - -Wc,FLAG - -Xcompiler FLAG pass linker-specific FLAG directly to the compiler - -Wl,FLAG - -Xlinker FLAG pass linker-specific FLAG directly to the linker - -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) - -All other options (arguments beginning with \`-') are ignored. - -Every other argument is treated as a filename. Files ending in \`.la' are -treated as uninstalled libtool libraries, other files are standard or library -object files. - -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is -required, except when creating a convenience library. - -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. - -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file -is created, otherwise an executable program is created." - ;; - - uninstall) - $ECHO \ -"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... - -Remove libraries from an installation directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, all the files associated with it are deleted. -Otherwise, only FILE itself is deleted using RM." - ;; - - *) - func_fatal_help "invalid operation mode \`$opt_mode'" - ;; - esac - - echo - $ECHO "Try \`$progname --help' for more information about other modes." -} - -# Now that we've collected a possible --mode arg, show help if necessary -if $opt_help; then - if test "$opt_help" = :; then - func_mode_help - else - { - func_help noexit - for opt_mode in compile link execute install finish uninstall clean; do - func_mode_help - done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' - { - func_help noexit - for opt_mode in compile link execute install finish uninstall clean; do - echo - func_mode_help - done - } | - sed '1d - /^When reporting/,/^Report/{ - H - d - } - $x - /information about other modes/d - /more detailed .*MODE/d - s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' - fi - exit $? -fi - - -# func_mode_execute arg... -func_mode_execute () -{ - $opt_debug - # The first argument is the command name. - cmd="$nonopt" - test -z "$cmd" && \ - func_fatal_help "you must specify a COMMAND" - - # Handle -dlopen flags immediately. - for file in $opt_dlopen; do - test -f "$file" \ - || func_fatal_help "\`$file' is not a file" - - dir= - case $file in - *.la) - func_resolve_sysroot "$file" - file=$func_resolve_sysroot_result - - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" - - # Read the libtool library. - dlname= - library_names= - func_source "$file" - - # Skip this library if it cannot be dlopened. - if test -z "$dlname"; then - # Warn if it was a shared library. - test -n "$library_names" && \ - func_warning "\`$file' was not linked with \`-export-dynamic'" - continue - fi - - func_dirname "$file" "" "." - dir="$func_dirname_result" - - if test -f "$dir/$objdir/$dlname"; then - func_append dir "/$objdir" - else - if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" - fi - fi - ;; - - *.lo) - # Just add the directory containing the .lo file. - func_dirname "$file" "" "." - dir="$func_dirname_result" - ;; - - *) - func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" - continue - ;; - esac - - # Get the absolute pathname. - absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" - - # Now add the directory to shlibpath_var. - if eval "test -z \"\$$shlibpath_var\""; then - eval "$shlibpath_var=\"\$dir\"" - else - eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" - fi - done - - # This variable tells wrapper scripts just to set shlibpath_var - # rather than running their programs. - libtool_execute_magic="$magic" - - # Check if any of the arguments is a wrapper script. - args= - for file - do - case $file in - -* | *.la | *.lo ) ;; - *) - # Do a test to see if this is really a libtool program. - if func_ltwrapper_script_p "$file"; then - func_source "$file" - # Transform arg to wrapped name. - file="$progdir/$program" - elif func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - func_source "$func_ltwrapper_scriptname_result" - # Transform arg to wrapped name. - file="$progdir/$program" - fi - ;; - esac - # Quote arguments (to preserve shell metacharacters). - func_append_quoted args "$file" - done - - if test "X$opt_dry_run" = Xfalse; then - if test -n "$shlibpath_var"; then - # Export the shlibpath_var. - eval "export $shlibpath_var" - fi - - # Restore saved environment variables - for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES - do - eval "if test \"\${save_$lt_var+set}\" = set; then - $lt_var=\$save_$lt_var; export $lt_var - else - $lt_unset $lt_var - fi" - done - - # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - echo "export $shlibpath_var" - fi - $ECHO "$cmd$args" - exit $EXIT_SUCCESS - fi -} - -test "$opt_mode" = execute && func_mode_execute ${1+"$@"} - - -# func_mode_finish arg... -func_mode_finish () -{ - $opt_debug - libs= - libdirs= - admincmds= - - for opt in "$nonopt" ${1+"$@"} - do - if test -d "$opt"; then - func_append libdirs " $opt" - - elif test -f "$opt"; then - if func_lalib_unsafe_p "$opt"; then - func_append libs " $opt" - else - func_warning "\`$opt' is not a valid libtool archive" - fi - - else - func_fatal_error "invalid argument \`$opt'" - fi - done - - if test -n "$libs"; then - if test -n "$lt_sysroot"; then - sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` - sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" - else - sysroot_cmd= - fi - - # Remove sysroot references - if $opt_dry_run; then - for lib in $libs; do - echo "removing references to $lt_sysroot and \`=' prefixes from $lib" - done - else - tmpdir=`func_mktempdir` - for lib in $libs; do - sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ - > $tmpdir/tmp-la - mv -f $tmpdir/tmp-la $lib - done - ${RM}r "$tmpdir" - fi - fi - - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. - func_execute_cmds "$finish_cmds" 'admincmds="$admincmds -'"$cmd"'"' - fi - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" - $opt_dry_run || eval "$cmds" || func_append admincmds " - $cmds" - fi - done - fi - - # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS - - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - echo "----------------------------------------------------------------------" - echo "Libraries have been installed in:" - for libdir in $libdirs; do - $ECHO " $libdir" - done - echo - echo "If you ever happen to want to link against installed libraries" - echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" - echo "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - echo " during execution" - fi - if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" - echo " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" - - $ECHO " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then - $ECHO " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - echo - - echo "See any operating system documentation about shared libraries for" - case $host in - solaris2.[6789]|solaris2.1[0-9]) - echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" - echo "pages." - ;; - *) - echo "more information, such as the ld(1) and ld.so(8) manual pages." - ;; - esac - echo "----------------------------------------------------------------------" - fi - exit $EXIT_SUCCESS -} - -test "$opt_mode" = finish && func_mode_finish ${1+"$@"} - - -# func_mode_install arg... -func_mode_install () -{ - $opt_debug - # There may be an optional sh(1) argument at the beginning of - # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || - # Allow the use of GNU shtool's install command. - case $nonopt in *shtool*) :;; *) false;; esac; then - # Aesthetically quote it. - func_quote_for_eval "$nonopt" - install_prog="$func_quote_for_eval_result " - arg=$1 - shift - else - install_prog= - arg=$nonopt - fi - - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - func_quote_for_eval "$arg" - func_append install_prog "$func_quote_for_eval_result" - install_shared_prog=$install_prog - case " $install_prog " in - *[\\\ /]cp\ *) install_cp=: ;; - *) install_cp=false ;; - esac - - # We need to accept at least all the BSD install flags. - dest= - files= - opts= - prev= - install_type= - isdir=no - stripme= - no_mode=: - for arg - do - arg2= - if test -n "$dest"; then - func_append files " $dest" - dest=$arg - continue - fi - - case $arg in - -d) isdir=yes ;; - -f) - if $install_cp; then :; else - prev=$arg - fi - ;; - -g | -m | -o) - prev=$arg - ;; - -s) - stripme=" -s" - continue - ;; - -*) - ;; - *) - # If the previous option needed an argument, then skip it. - if test -n "$prev"; then - if test "x$prev" = x-m && test -n "$install_override_mode"; then - arg2=$install_override_mode - no_mode=false - fi - prev= - else - dest=$arg - continue - fi - ;; - esac - - # Aesthetically quote the argument. - func_quote_for_eval "$arg" - func_append install_prog " $func_quote_for_eval_result" - if test -n "$arg2"; then - func_quote_for_eval "$arg2" - fi - func_append install_shared_prog " $func_quote_for_eval_result" - done - - test -z "$install_prog" && \ - func_fatal_help "you must specify an install program" - - test -n "$prev" && \ - func_fatal_help "the \`$prev' option requires an argument" - - if test -n "$install_override_mode" && $no_mode; then - if $install_cp; then :; else - func_quote_for_eval "$install_override_mode" - func_append install_shared_prog " -m $func_quote_for_eval_result" - fi - fi - - if test -z "$files"; then - if test -z "$dest"; then - func_fatal_help "no file or destination specified" - else - func_fatal_help "you must specify a destination" - fi - fi - - # Strip any trailing slash from the destination. - func_stripname '' '/' "$dest" - dest=$func_stripname_result - - # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" - destname= - else - func_dirname_and_basename "$dest" "" "." - destdir="$func_dirname_result" - destname="$func_basename_result" - - # Not a directory, so check to see that there is only one file specified. - set dummy $files; shift - test "$#" -gt 1 && \ - func_fatal_help "\`$dest' is not a directory" - fi - case $destdir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - for file in $files; do - case $file in - *.lo) ;; - *) - func_fatal_help "\`$destdir' must be an absolute directory name" - ;; - esac - done - ;; - esac - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - staticlibs= - future_libdirs= - current_libdirs= - for file in $files; do - - # Do each installation. - case $file in - *.$libext) - # Do the static libraries later. - func_append staticlibs " $file" - ;; - - *.la) - func_resolve_sysroot "$file" - file=$func_resolve_sysroot_result - - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" - - library_names= - old_library= - relink_command= - func_source "$file" - - # Add the libdir to current_libdirs if it is the destination. - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; - *) func_append current_libdirs " $libdir" ;; - esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; - *) func_append future_libdirs " $libdir" ;; - esac - fi - - func_dirname "$file" "/" "" - dir="$func_dirname_result" - func_append dir "$objdir" - - if test -n "$relink_command"; then - # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` - - # Don't allow the user to place us outside of our expected - # location b/c this prevents finding dependent libraries that - # are installed to the same prefix. - # At present, this check doesn't affect windows .dll's that - # are installed into $libdir/../bin (currently, that works fine) - # but it's something to keep an eye on. - test "$inst_prefix_dir" = "$destdir" && \ - func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" - - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. - relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` - else - relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` - fi - - func_warning "relinking \`$file'" - func_show_eval "$relink_command" \ - 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' - fi - - # See the names of the shared library. - set dummy $library_names; shift - if test -n "$1"; then - realname="$1" - shift - - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T - - # Install the shared library and build the symlinks. - func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ - 'exit $?' - tstripme="$stripme" - case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - case $realname in - *.dll.a) - tstripme="" - ;; - esac - ;; - esac - if test -n "$tstripme" && test -n "$striplib"; then - func_show_eval "$striplib $destdir/$realname" 'exit $?' - fi - - if test "$#" -gt 0; then - # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on - # the symlink we replace! Solaris /bin/ln does not understand -f, - # so we also need to try rm && ln -s. - for linkname - do - test "$linkname" != "$realname" \ - && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })" - done - fi - - # Do each command in the postinstall commands. - lib="$destdir/$realname" - func_execute_cmds "$postinstall_cmds" 'exit $?' - fi - - # Install the pseudo-library for information purposes. - func_basename "$file" - name="$func_basename_result" - instname="$dir/$name"i - func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' - - # Maybe install the static library, too. - test -n "$old_library" && func_append staticlibs " $dir/$old_library" - ;; - - *.lo) - # Install (i.e. copy) a libtool object. - - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" - fi - - # Deduce the name of the destination old-style object file. - case $destfile in - *.lo) - func_lo2o "$destfile" - staticdest=$func_lo2o_result - ;; - *.$objext) - staticdest="$destfile" - destfile= - ;; - *) - func_fatal_help "cannot copy a libtool object to \`$destfile'" - ;; - esac - - # Install the libtool object if requested. - test -n "$destfile" && \ - func_show_eval "$install_prog $file $destfile" 'exit $?' - - # Install the old object if enabled. - if test "$build_old_libs" = yes; then - # Deduce the name of the old-style object file. - func_lo2o "$file" - staticobj=$func_lo2o_result - func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?' - fi - exit $EXIT_SUCCESS - ;; - - *) - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" - fi - - # If the file is missing, and there is a .exe on the end, strip it - # because it is most likely a libtool script we actually want to - # install - stripped_ext="" - case $file in - *.exe) - if test ! -f "$file"; then - func_stripname '' '.exe' "$file" - file=$func_stripname_result - stripped_ext=".exe" - fi - ;; - esac - - # Do a test to see if this is really a libtool program. - case $host in - *cygwin* | *mingw*) - if func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - wrapper=$func_ltwrapper_scriptname_result - else - func_stripname '' '.exe' "$file" - wrapper=$func_stripname_result - fi - ;; - *) - wrapper=$file - ;; - esac - if func_ltwrapper_script_p "$wrapper"; then - notinst_deplibs= - relink_command= - - func_source "$wrapper" - - # Check the variables that should have been set. - test -z "$generated_by_libtool_version" && \ - func_fatal_error "invalid libtool wrapper script \`$wrapper'" - - finalize=yes - for lib in $notinst_deplibs; do - # Check to see that each library is installed. - libdir= - if test -f "$lib"; then - func_source "$lib" - fi - libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test - if test -n "$libdir" && test ! -f "$libfile"; then - func_warning "\`$lib' has not been installed in \`$libdir'" - finalize=no - fi - done - - relink_command= - func_source "$wrapper" - - outputname= - if test "$fast_install" = no && test -n "$relink_command"; then - $opt_dry_run || { - if test "$finalize" = yes; then - tmpdir=`func_mktempdir` - func_basename "$file$stripped_ext" - file="$func_basename_result" - outputname="$tmpdir/$file" - # Replace the output file specification. - relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` - - $opt_silent || { - func_quote_for_expand "$relink_command" - eval "func_echo $func_quote_for_expand_result" - } - if eval "$relink_command"; then : - else - func_error "error: relink \`$file' with the above command before installing it" - $opt_dry_run || ${RM}r "$tmpdir" - continue - fi - file="$outputname" - else - func_warning "cannot relink \`$file'" - fi - } - else - # Install the binary that we compiled earlier. - file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` - fi - fi - - # remove .exe since cygwin /usr/bin/install will append another - # one anyway - case $install_prog,$host in - */usr/bin/install*,*cygwin*) - case $file:$destfile in - *.exe:*.exe) - # this is ok - ;; - *.exe:*) - destfile=$destfile.exe - ;; - *:*.exe) - func_stripname '' '.exe' "$destfile" - destfile=$func_stripname_result - ;; - esac - ;; - esac - func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?' - $opt_dry_run || if test -n "$outputname"; then - ${RM}r "$tmpdir" - fi - ;; - esac - done - - for file in $staticlibs; do - func_basename "$file" - name="$func_basename_result" - - # Set up the ranlib parameters. - oldlib="$destdir/$name" - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 - tool_oldlib=$func_to_tool_file_result - - func_show_eval "$install_prog \$file \$oldlib" 'exit $?' - - if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $tool_oldlib" 'exit $?' - fi - - # Do each command in the postinstall commands. - func_execute_cmds "$old_postinstall_cmds" 'exit $?' - done - - test -n "$future_libdirs" && \ - func_warning "remember to run \`$progname --finish$future_libdirs'" - - if test -n "$current_libdirs"; then - # Maybe just do a dry run. - $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' - else - exit $EXIT_SUCCESS - fi -} - -test "$opt_mode" = install && func_mode_install ${1+"$@"} - - -# func_generate_dlsyms outputname originator pic_p -# Extract symbols from dlprefiles and create ${outputname}S.o with -# a dlpreopen symbol table. -func_generate_dlsyms () -{ - $opt_debug - my_outputname="$1" - my_originator="$2" - my_pic_p="${3-no}" - my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` - my_dlsyms= - - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - if test -n "$NM" && test -n "$global_symbol_pipe"; then - my_dlsyms="${my_outputname}S.c" - else - func_error "not configured to extract global symbols from dlpreopened files" - fi - fi - - if test -n "$my_dlsyms"; then - case $my_dlsyms in - "") ;; - *.c) - # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${my_outputname}.nm" - - func_show_eval "$RM $nlist ${nlist}S ${nlist}T" - - # Parse the name list into a source file. - func_verbose "creating $output_objdir/$my_dlsyms" - - $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ -/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ -/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ - -#ifdef __cplusplus -extern \"C\" { -#endif - -#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) -#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" -#endif - -/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ -# define LT_DLSYM_CONST -#elif defined(__osf__) -/* This system does not cope well with relocations in const data. */ -# define LT_DLSYM_CONST -#else -# define LT_DLSYM_CONST const -#endif - -/* External symbol declarations for the compiler. */\ -" - - if test "$dlself" = yes; then - func_verbose "generating symbol list for \`$output'" - - $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" - - # Add our own program objects to the symbol list. - progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` - for progfile in $progfiles; do - func_to_tool_file "$progfile" func_convert_file_msys_to_w32 - func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" - $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" - done - - if test -n "$exclude_expsyms"; then - $opt_dry_run || { - eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - } - fi - - if test -n "$export_symbols_regex"; then - $opt_dry_run || { - eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - } - fi - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" - $opt_dry_run || { - $RM $export_symbols - eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' - case $host in - *cygwin* | *mingw* | *cegcc* ) - eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' - ;; - esac - } - else - $opt_dry_run || { - eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' - eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - case $host in - *cygwin* | *mingw* | *cegcc* ) - eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' - ;; - esac - } - fi - fi - - for dlprefile in $dlprefiles; do - func_verbose "extracting global C symbols from \`$dlprefile'" - func_basename "$dlprefile" - name="$func_basename_result" - case $host in - *cygwin* | *mingw* | *cegcc* ) - # if an import library, we need to obtain dlname - if func_win32_import_lib_p "$dlprefile"; then - func_tr_sh "$dlprefile" - eval "curr_lafile=\$libfile_$func_tr_sh_result" - dlprefile_dlbasename="" - if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then - # Use subshell, to avoid clobbering current variable values - dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` - if test -n "$dlprefile_dlname" ; then - func_basename "$dlprefile_dlname" - dlprefile_dlbasename="$func_basename_result" - else - # no lafile. user explicitly requested -dlpreopen . - $sharedlib_from_linklib_cmd "$dlprefile" - dlprefile_dlbasename=$sharedlib_from_linklib_result - fi - fi - $opt_dry_run || { - if test -n "$dlprefile_dlbasename" ; then - eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' - else - func_warning "Could not compute DLL name from $name" - eval '$ECHO ": $name " >> "$nlist"' - fi - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | - $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" - } - else # not an import lib - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } - fi - ;; - *) - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } - ;; - esac - done - - $opt_dry_run || { - # Make sure we have at least an empty file. - test -f "$nlist" || : > "$nlist" - - if test -n "$exclude_expsyms"; then - $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T - $MV "$nlist"T "$nlist" - fi - - # Try sorting and uniquifying the output. - if $GREP -v "^: " < "$nlist" | - if sort -k 3 /dev/null 2>&1; then - sort -k 3 - else - sort +2 - fi | - uniq > "$nlist"S; then - : - else - $GREP -v "^: " < "$nlist" > "$nlist"S - fi - - if test -f "$nlist"S; then - eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' - else - echo '/* NONE */' >> "$output_objdir/$my_dlsyms" - fi - - echo >> "$output_objdir/$my_dlsyms" "\ - -/* The mapping between symbol names and symbols. */ -typedef struct { - const char *name; - void *address; -} lt_dlsymlist; -extern LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[]; -LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[] = -{\ - { \"$my_originator\", (void *) 0 }," - - case $need_lib_prefix in - no) - eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms" - ;; - *) - eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" - ;; - esac - echo >> "$output_objdir/$my_dlsyms" "\ - {0, (void *) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt_${my_prefix}_LTX_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif\ -" - } # !$opt_dry_run - - pic_flag_for_symtable= - case "$compile_command " in - *" -static "*) ;; - *) - case $host in - # compiling the symbol table file with pic_flag works around - # a FreeBSD bug that causes programs to crash when -lm is - # linked before any other PIC object. But we must not use - # pic_flag when linking with -static. The problem exists in - # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) - pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; - *-*-hpux*) - pic_flag_for_symtable=" $pic_flag" ;; - *) - if test "X$my_pic_p" != Xno; then - pic_flag_for_symtable=" $pic_flag" - fi - ;; - esac - ;; - esac - symtab_cflags= - for arg in $LTCFLAGS; do - case $arg in - -pie | -fpie | -fPIE) ;; - *) func_append symtab_cflags " $arg" ;; - esac - done - - # Now compile the dynamic symbol file. - func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' - - # Clean up the generated files. - func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' - - # Transform the symbol file into the correct name. - symfileobj="$output_objdir/${my_outputname}S.$objext" - case $host in - *cygwin* | *mingw* | *cegcc* ) - if test -f "$output_objdir/$my_outputname.def"; then - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - else - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` - fi - ;; - *) - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` - ;; - esac - ;; - *) - func_fatal_error "unknown suffix for \`$my_dlsyms'" - ;; - esac - else - # We keep going just in case the user didn't refer to - # lt_preloaded_symbols. The linker will fail if global_symbol_pipe - # really was required. - - # Nullify the symbol file. - compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` - fi -} - -# func_win32_libid arg -# return the library type of file 'arg' -# -# Need a lot of goo to handle *both* DLLs and import libs -# Has to be a shell function in order to 'eat' the argument -# that is supplied when $file_magic_command is called. -# Despite the name, also deal with 64 bit binaries. -func_win32_libid () -{ - $opt_debug - win32_libid_type="unknown" - win32_fileres=`file -L $1 2>/dev/null` - case $win32_fileres in - *ar\ archive\ import\ library*) # definitely import - win32_libid_type="x86 archive import" - ;; - *ar\ archive*) # could be an import, or static - # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. - if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | - $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - func_to_tool_file "$1" func_convert_file_msys_to_w32 - win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' - 1,100{ - / I /{ - s,.*,import, - p - q - } - }'` - case $win32_nmres in - import*) win32_libid_type="x86 archive import";; - *) win32_libid_type="x86 archive static";; - esac - fi - ;; - *DLL*) - win32_libid_type="x86 DLL" - ;; - *executable*) # but shell scripts are "executable" too... - case $win32_fileres in - *MS\ Windows\ PE\ Intel*) - win32_libid_type="x86 DLL" - ;; - esac - ;; - esac - $ECHO "$win32_libid_type" -} - -# func_cygming_dll_for_implib ARG -# -# Platform-specific function to extract the -# name of the DLL associated with the specified -# import library ARG. -# Invoked by eval'ing the libtool variable -# $sharedlib_from_linklib_cmd -# Result is available in the variable -# $sharedlib_from_linklib_result -func_cygming_dll_for_implib () -{ - $opt_debug - sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` -} - -# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs -# -# The is the core of a fallback implementation of a -# platform-specific function to extract the name of the -# DLL associated with the specified import library LIBNAME. -# -# SECTION_NAME is either .idata$6 or .idata$7, depending -# on the platform and compiler that created the implib. -# -# Echos the name of the DLL associated with the -# specified import library. -func_cygming_dll_for_implib_fallback_core () -{ - $opt_debug - match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` - $OBJDUMP -s --section "$1" "$2" 2>/dev/null | - $SED '/^Contents of section '"$match_literal"':/{ - # Place marker at beginning of archive member dllname section - s/.*/====MARK====/ - p - d - } - # These lines can sometimes be longer than 43 characters, but - # are always uninteresting - /:[ ]*file format pe[i]\{,1\}-/d - /^In archive [^:]*:/d - # Ensure marker is printed - /^====MARK====/p - # Remove all lines with less than 43 characters - /^.\{43\}/!d - # From remaining lines, remove first 43 characters - s/^.\{43\}//' | - $SED -n ' - # Join marker and all lines until next marker into a single line - /^====MARK====/ b para - H - $ b para - b - :para - x - s/\n//g - # Remove the marker - s/^====MARK====// - # Remove trailing dots and whitespace - s/[\. \t]*$// - # Print - /./p' | - # we now have a list, one entry per line, of the stringified - # contents of the appropriate section of all members of the - # archive which possess that section. Heuristic: eliminate - # all those which have a first or second character that is - # a '.' (that is, objdump's representation of an unprintable - # character.) This should work for all archives with less than - # 0x302f exports -- but will fail for DLLs whose name actually - # begins with a literal '.' or a single character followed by - # a '.'. - # - # Of those that remain, print the first one. - $SED -e '/^\./d;/^.\./d;q' -} - -# func_cygming_gnu_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is a GNU/binutils-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_gnu_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` - test -n "$func_cygming_gnu_implib_tmp" -} - -# func_cygming_ms_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is an MS-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_ms_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` - test -n "$func_cygming_ms_implib_tmp" -} - -# func_cygming_dll_for_implib_fallback ARG -# Platform-specific function to extract the -# name of the DLL associated with the specified -# import library ARG. -# -# This fallback implementation is for use when $DLLTOOL -# does not support the --identify-strict option. -# Invoked by eval'ing the libtool variable -# $sharedlib_from_linklib_cmd -# Result is available in the variable -# $sharedlib_from_linklib_result -func_cygming_dll_for_implib_fallback () -{ - $opt_debug - if func_cygming_gnu_implib_p "$1" ; then - # binutils import library - sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` - elif func_cygming_ms_implib_p "$1" ; then - # ms-generated import library - sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` - else - # unknown - sharedlib_from_linklib_result="" - fi -} - - -# func_extract_an_archive dir oldlib -func_extract_an_archive () -{ - $opt_debug - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" - if test "$lock_old_archive_extraction" = yes; then - lockfile=$f_ex_an_ar_oldlib.lock - until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do - func_echo "Waiting for $lockfile to be removed" - sleep 2 - done - fi - func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ - 'stat=$?; rm -f "$lockfile"; exit $stat' - if test "$lock_old_archive_extraction" = yes; then - $opt_dry_run || rm -f "$lockfile" - fi - if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then - : - else - func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" - fi -} - - -# func_extract_archives gentop oldlib ... -func_extract_archives () -{ - $opt_debug - my_gentop="$1"; shift - my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" - - for my_xlib in $my_oldlibs; do - # Extract the objects. - case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; - *) my_xabs=`pwd`"/$my_xlib" ;; - esac - func_basename "$my_xlib" - my_xlib="$func_basename_result" - my_xlib_u=$my_xlib - while :; do - case " $extracted_archives " in - *" $my_xlib_u "*) - func_arith $extracted_serial + 1 - extracted_serial=$func_arith_result - my_xlib_u=lt$extracted_serial-$my_xlib ;; - *) break ;; - esac - done - extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" - - func_mkdir_p "$my_xdir" - - case $host in - *-darwin*) - func_verbose "Extracting $my_xabs" - # Do not bother doing anything if just a dry run - $opt_dry_run || { - darwin_orig_dir=`pwd` - cd $my_xdir || exit $? - darwin_archive=$my_xabs - darwin_curdir=`pwd` - darwin_base_archive=`basename "$darwin_archive"` - darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` - if test -n "$darwin_arches"; then - darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` - darwin_arch= - func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" - cd "$darwin_curdir" - $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" - done # $darwin_arches - ## Okay now we've a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` - $LIPO -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - $RM -rf unfat-$$ - cd "$darwin_orig_dir" - else - cd $darwin_orig_dir - func_extract_an_archive "$my_xdir" "$my_xabs" - fi # $darwin_arches - } # !$opt_dry_run - ;; - *) - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` - done - - func_extract_archives_result="$my_oldobjs" -} - - -# func_emit_wrapper [arg=no] -# -# Emit a libtool wrapper script on stdout. -# Don't directly open a file because we may want to -# incorporate the script contents within a cygwin/mingw -# wrapper executable. Must ONLY be called from within -# func_mode_link because it depends on a number of variables -# set therein. -# -# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR -# variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is -# the $objdir directory. This is a cygwin/mingw-specific -# behavior. -func_emit_wrapper () -{ - func_emit_wrapper_arg1=${1-no} - - $ECHO "\ -#! $SHELL - -# $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION -# -# The $output program cannot be directly executed until all the libtool -# libraries that it depends on are installed. -# -# This wrapper script should never be moved out of the build directory. -# If it is, it will not operate correctly. - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -sed_quote_subst='$sed_quote_subst' - -# Be Bourne compatible -if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which - # is contrary to our usage. Disable this feature. - alias -g '\${1+\"\$@\"}'='\"\$@\"' - setopt NO_GLOB_SUBST -else - case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -relink_command=\"$relink_command\" - -# This environment variable determines our operation mode. -if test \"\$libtool_install_magic\" = \"$magic\"; then - # install mode needs the following variables: - generated_by_libtool_version='$macro_version' - notinst_deplibs='$notinst_deplibs' -else - # When we are sourced in execute mode, \$file and \$ECHO are already set. - if test \"\$libtool_execute_magic\" != \"$magic\"; then - file=\"\$0\"" - - qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` - $ECHO "\ - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$1 -_LTECHO_EOF' -} - ECHO=\"$qECHO\" - fi - -# Very basic option parsing. These options are (a) specific to -# the libtool wrapper, (b) are identical between the wrapper -# /script/ and the wrapper /executable/ which is used only on -# windows platforms, and (c) all begin with the string "--lt-" -# (application programs are unlikely to have options which match -# this pattern). -# -# There are only two supported options: --lt-debug and -# --lt-dump-script. There is, deliberately, no --lt-help. -# -# The first argument to this parsing function should be the -# script's $0 value, followed by "$@". -lt_option_debug= -func_parse_lt_options () -{ - lt_script_arg0=\$0 - shift - for lt_opt - do - case \"\$lt_opt\" in - --lt-debug) lt_option_debug=1 ;; - --lt-dump-script) - lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` - test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. - lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` - cat \"\$lt_dump_D/\$lt_dump_F\" - exit 0 - ;; - --lt-*) - \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 - exit 1 - ;; - esac - done - - # Print the debug banner immediately: - if test -n \"\$lt_option_debug\"; then - echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 - fi -} - -# Used when --lt-debug. Prints its arguments to stdout -# (redirection is the responsibility of the caller) -func_lt_dump_args () -{ - lt_dump_args_N=1; - for lt_arg - do - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" - lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` - done -} - -# Core function for launching the target application -func_exec_program_core () -{ -" - case $host in - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2* | *-cegcc*) - $ECHO "\ - if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 - func_lt_dump_args \${1+\"\$@\"} 1>&2 - fi - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -" - ;; - - *) - $ECHO "\ - if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 - func_lt_dump_args \${1+\"\$@\"} 1>&2 - fi - exec \"\$progdir/\$program\" \${1+\"\$@\"} -" - ;; - esac - $ECHO "\ - \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 - exit 1 -} - -# A function to encapsulate launching the target application -# Strips options in the --lt-* namespace from \$@ and -# launches target application with the remaining arguments. -func_exec_program () -{ - case \" \$* \" in - *\\ --lt-*) - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done ;; - esac - func_exec_program_core \${1+\"\$@\"} -} - - # Parse options - func_parse_lt_options \"\$0\" \${1+\"\$@\"} - - # Find the directory that this script lives in. - thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` - test \"x\$thisdir\" = \"x\$file\" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` - while test -n \"\$file\"; do - destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` - - # If there was a directory component, then change thisdir. - if test \"x\$destdir\" != \"x\$file\"; then - case \"\$destdir\" in - [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; - *) thisdir=\"\$thisdir/\$destdir\" ;; - esac - fi - - file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` - done - - # Usually 'no', except on cygwin/mingw when embedded into - # the cwrapper. - WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 - if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then - # special case for '.' - if test \"\$thisdir\" = \".\"; then - thisdir=\`pwd\` - fi - # remove .libs from thisdir - case \"\$thisdir\" in - *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; - $objdir ) thisdir=. ;; - esac - fi - - # Try to get the absolute directory name. - absdir=\`cd \"\$thisdir\" && pwd\` - test -n \"\$absdir\" && thisdir=\"\$absdir\" -" - - if test "$fast_install" = yes; then - $ECHO "\ - program=lt-'$outputname'$exeext - progdir=\"\$thisdir/$objdir\" - - if test ! -f \"\$progdir/\$program\" || - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ - test \"X\$file\" != \"X\$progdir/\$program\"; }; then - - file=\"\$\$-\$program\" - - if test ! -d \"\$progdir\"; then - $MKDIR \"\$progdir\" - else - $RM \"\$progdir/\$file\" - fi" - - $ECHO "\ - - # relink executable if necessary - if test -n \"\$relink_command\"; then - if relink_command_output=\`eval \$relink_command 2>&1\`; then : - else - $ECHO \"\$relink_command_output\" >&2 - $RM \"\$progdir/\$file\" - exit 1 - fi - fi - - $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || - { $RM \"\$progdir/\$program\"; - $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; } - $RM \"\$progdir/\$file\" - fi" - else - $ECHO "\ - program='$outputname' - progdir=\"\$thisdir/$objdir\" -" - fi - - $ECHO "\ - - if test -f \"\$progdir/\$program\"; then" - - # fixup the dll searchpath if we need to. - # - # Fix the DLL searchpath if we need to. Do this before prepending - # to shlibpath, because on Windows, both are PATH and uninstalled - # libraries must come first. - if test -n "$dllsearchpath"; then - $ECHO "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - fi - - # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $ECHO "\ - # Add our own library path to $shlibpath_var - $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" - - # Some systems cannot cope with colon-terminated $shlibpath_var - # The second colon is a workaround for a bug in BeOS R4 sed - $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` - - export $shlibpath_var -" - fi - - $ECHO "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. - func_exec_program \${1+\"\$@\"} - fi - else - # The program doesn't exist. - \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 - \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 - \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 - exit 1 - fi -fi\ -" -} - - -# func_emit_cwrapperexe_src -# emit the source code for a wrapper executable on stdout -# Must ONLY be called from within func_mode_link because -# it depends on a number of variable set therein. -func_emit_cwrapperexe_src () -{ - cat < -#include -#ifdef _MSC_VER -# include -# include -# include -#else -# include -# include -# ifdef __CYGWIN__ -# include -# endif -#endif -#include -#include -#include -#include -#include -#include -#include -#include - -/* declarations of non-ANSI functions */ -#if defined(__MINGW32__) -# ifdef __STRICT_ANSI__ -int _putenv (const char *); -# endif -#elif defined(__CYGWIN__) -# ifdef __STRICT_ANSI__ -char *realpath (const char *, char *); -int putenv (char *); -int setenv (const char *, const char *, int); -# endif -/* #elif defined (other platforms) ... */ -#endif - -/* portability defines, excluding path handling macros */ -#if defined(_MSC_VER) -# define setmode _setmode -# define stat _stat -# define chmod _chmod -# define getcwd _getcwd -# define putenv _putenv -# define S_IXUSR _S_IEXEC -# ifndef _INTPTR_T_DEFINED -# define _INTPTR_T_DEFINED -# define intptr_t int -# endif -#elif defined(__MINGW32__) -# define setmode _setmode -# define stat _stat -# define chmod _chmod -# define getcwd _getcwd -# define putenv _putenv -#elif defined(__CYGWIN__) -# define HAVE_SETENV -# define FOPEN_WB "wb" -/* #elif defined (other platforms) ... */ -#endif - -#if defined(PATH_MAX) -# define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) -# define LT_PATHMAX MAXPATHLEN -#else -# define LT_PATHMAX 1024 -#endif - -#ifndef S_IXOTH -# define S_IXOTH 0 -#endif -#ifndef S_IXGRP -# define S_IXGRP 0 -#endif - -/* path handling portability macros */ -#ifndef DIR_SEPARATOR -# define DIR_SEPARATOR '/' -# define PATH_SEPARATOR ':' -#endif - -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) -# define HAVE_DOS_BASED_FILE_SYSTEM -# define FOPEN_WB "wb" -# ifndef DIR_SEPARATOR_2 -# define DIR_SEPARATOR_2 '\\' -# endif -# ifndef PATH_SEPARATOR_2 -# define PATH_SEPARATOR_2 ';' -# endif -#endif - -#ifndef DIR_SEPARATOR_2 -# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) -#else /* DIR_SEPARATOR_2 */ -# define IS_DIR_SEPARATOR(ch) \ - (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) -#endif /* DIR_SEPARATOR_2 */ - -#ifndef PATH_SEPARATOR_2 -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) -#else /* PATH_SEPARATOR_2 */ -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) -#endif /* PATH_SEPARATOR_2 */ - -#ifndef FOPEN_WB -# define FOPEN_WB "w" -#endif -#ifndef _O_BINARY -# define _O_BINARY 0 -#endif - -#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) -#define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ -} while (0) - -#if defined(LT_DEBUGWRAPPER) -static int lt_debug = 1; -#else -static int lt_debug = 0; -#endif - -const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ - -void *xmalloc (size_t num); -char *xstrdup (const char *string); -const char *base_name (const char *name); -char *find_executable (const char *wrapper); -char *chase_symlinks (const char *pathspec); -int make_executable (const char *path); -int check_executable (const char *path); -char *strendzap (char *str, const char *pat); -void lt_debugprintf (const char *file, int line, const char *fmt, ...); -void lt_fatal (const char *file, int line, const char *message, ...); -static const char *nonnull (const char *s); -static const char *nonempty (const char *s); -void lt_setenv (const char *name, const char *value); -char *lt_extend_str (const char *orig_value, const char *add, int to_end); -void lt_update_exe_path (const char *name, const char *value); -void lt_update_lib_path (const char *name, const char *value); -char **prepare_spawn (char **argv); -void lt_dump_script (FILE *f); -EOF - - cat <= 0) - && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) - return 1; - else - return 0; -} - -int -make_executable (const char *path) -{ - int rval = 0; - struct stat st; - - lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", - nonempty (path)); - if ((!path) || (!*path)) - return 0; - - if (stat (path, &st) >= 0) - { - rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR); - } - return rval; -} - -/* Searches for the full path of the wrapper. Returns - newly allocated full path name if found, NULL otherwise - Does not chase symlinks, even on platforms that support them. -*/ -char * -find_executable (const char *wrapper) -{ - int has_slash = 0; - const char *p; - const char *p_next; - /* static buffer for getcwd */ - char tmp[LT_PATHMAX + 1]; - int tmp_len; - char *concat_name; - - lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", - nonempty (wrapper)); - - if ((wrapper == NULL) || (*wrapper == '\0')) - return NULL; - - /* Absolute path? */ -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':') - { - concat_name = xstrdup (wrapper); - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - } - else - { -#endif - if (IS_DIR_SEPARATOR (wrapper[0])) - { - concat_name = xstrdup (wrapper); - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - } -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - } -#endif - - for (p = wrapper; *p; p++) - if (*p == '/') - { - has_slash = 1; - break; - } - if (!has_slash) - { - /* no slashes; search PATH */ - const char *path = getenv ("PATH"); - if (path != NULL) - { - for (p = path; *p; p = p_next) - { - const char *q; - size_t p_len; - for (q = p; *q; q++) - if (IS_PATH_SEPARATOR (*q)) - break; - p_len = q - p; - p_next = (*q == '\0' ? q : q + 1); - if (p_len == 0) - { - /* empty path: current directory */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", - nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = - XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - } - else - { - concat_name = - XMALLOC (char, p_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, p, p_len); - concat_name[p_len] = '/'; - strcpy (concat_name + p_len + 1, wrapper); - } - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - } - } - /* not found in PATH; assume curdir */ - } - /* Relative path | not found in path: prepend cwd */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", - nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - return NULL; -} - -char * -chase_symlinks (const char *pathspec) -{ -#ifndef S_ISLNK - return xstrdup (pathspec); -#else - char buf[LT_PATHMAX]; - struct stat s; - char *tmp_pathspec = xstrdup (pathspec); - char *p; - int has_symlinks = 0; - while (strlen (tmp_pathspec) && !has_symlinks) - { - lt_debugprintf (__FILE__, __LINE__, - "checking path component for symlinks: %s\n", - tmp_pathspec); - if (lstat (tmp_pathspec, &s) == 0) - { - if (S_ISLNK (s.st_mode) != 0) - { - has_symlinks = 1; - break; - } - - /* search backwards for last DIR_SEPARATOR */ - p = tmp_pathspec + strlen (tmp_pathspec) - 1; - while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) - p--; - if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) - { - /* no more DIR_SEPARATORS left */ - break; - } - *p = '\0'; - } - else - { - lt_fatal (__FILE__, __LINE__, - "error accessing file \"%s\": %s", - tmp_pathspec, nonnull (strerror (errno))); - } - } - XFREE (tmp_pathspec); - - if (!has_symlinks) - { - return xstrdup (pathspec); - } - - tmp_pathspec = realpath (pathspec, buf); - if (tmp_pathspec == 0) - { - lt_fatal (__FILE__, __LINE__, - "could not follow symlinks for %s", pathspec); - } - return xstrdup (tmp_pathspec); -#endif -} - -char * -strendzap (char *str, const char *pat) -{ - size_t len, patlen; - - assert (str != NULL); - assert (pat != NULL); - - len = strlen (str); - patlen = strlen (pat); - - if (patlen <= len) - { - str += len - patlen; - if (strcmp (str, pat) == 0) - *str = '\0'; - } - return str; -} - -void -lt_debugprintf (const char *file, int line, const char *fmt, ...) -{ - va_list args; - if (lt_debug) - { - (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); - va_start (args, fmt); - (void) vfprintf (stderr, fmt, args); - va_end (args); - } -} - -static void -lt_error_core (int exit_status, const char *file, - int line, const char *mode, - const char *message, va_list ap) -{ - fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); - vfprintf (stderr, message, ap); - fprintf (stderr, ".\n"); - - if (exit_status >= 0) - exit (exit_status); -} - -void -lt_fatal (const char *file, int line, const char *message, ...) -{ - va_list ap; - va_start (ap, message); - lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); - va_end (ap); -} - -static const char * -nonnull (const char *s) -{ - return s ? s : "(null)"; -} - -static const char * -nonempty (const char *s) -{ - return (s && !*s) ? "(empty)" : nonnull (s); -} - -void -lt_setenv (const char *name, const char *value) -{ - lt_debugprintf (__FILE__, __LINE__, - "(lt_setenv) setting '%s' to '%s'\n", - nonnull (name), nonnull (value)); - { -#ifdef HAVE_SETENV - /* always make a copy, for consistency with !HAVE_SETENV */ - char *str = xstrdup (value); - setenv (name, str, 1); -#else - int len = strlen (name) + 1 + strlen (value) + 1; - char *str = XMALLOC (char, len); - sprintf (str, "%s=%s", name, value); - if (putenv (str) != EXIT_SUCCESS) - { - XFREE (str); - } -#endif - } -} - -char * -lt_extend_str (const char *orig_value, const char *add, int to_end) -{ - char *new_value; - if (orig_value && *orig_value) - { - int orig_value_len = strlen (orig_value); - int add_len = strlen (add); - new_value = XMALLOC (char, add_len + orig_value_len + 1); - if (to_end) - { - strcpy (new_value, orig_value); - strcpy (new_value + orig_value_len, add); - } - else - { - strcpy (new_value, add); - strcpy (new_value + add_len, orig_value); - } - } - else - { - new_value = xstrdup (add); - } - return new_value; -} - -void -lt_update_exe_path (const char *name, const char *value) -{ - lt_debugprintf (__FILE__, __LINE__, - "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", - nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { - char *new_value = lt_extend_str (getenv (name), value, 0); - /* some systems can't cope with a ':'-terminated path #' */ - int len = strlen (new_value); - while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1])) - { - new_value[len-1] = '\0'; - } - lt_setenv (name, new_value); - XFREE (new_value); - } -} - -void -lt_update_lib_path (const char *name, const char *value) -{ - lt_debugprintf (__FILE__, __LINE__, - "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", - nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { - char *new_value = lt_extend_str (getenv (name), value, 0); - lt_setenv (name, new_value); - XFREE (new_value); - } -} - -EOF - case $host_os in - mingw*) - cat <<"EOF" - -/* Prepares an argument vector before calling spawn(). - Note that spawn() does not by itself call the command interpreter - (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : - ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx(&v); - v.dwPlatformId == VER_PLATFORM_WIN32_NT; - }) ? "cmd.exe" : "command.com"). - Instead it simply concatenates the arguments, separated by ' ', and calls - CreateProcess(). We must quote the arguments since Win32 CreateProcess() - interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a - special way: - - Space and tab are interpreted as delimiters. They are not treated as - delimiters if they are surrounded by double quotes: "...". - - Unescaped double quotes are removed from the input. Their only effect is - that within double quotes, space and tab are treated like normal - characters. - - Backslashes not followed by double quotes are not special. - - But 2*n+1 backslashes followed by a double quote become - n backslashes followed by a double quote (n >= 0): - \" -> " - \\\" -> \" - \\\\\" -> \\" - */ -#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -char ** -prepare_spawn (char **argv) -{ - size_t argc; - char **new_argv; - size_t i; - - /* Count number of arguments. */ - for (argc = 0; argv[argc] != NULL; argc++) - ; - - /* Allocate new argument vector. */ - new_argv = XMALLOC (char *, argc + 1); - - /* Put quoted arguments into the new argument vector. */ - for (i = 0; i < argc; i++) - { - const char *string = argv[i]; - - if (string[0] == '\0') - new_argv[i] = xstrdup ("\"\""); - else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) - { - int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); - size_t length; - unsigned int backslashes; - const char *s; - char *quoted_string; - char *p; - - length = 0; - backslashes = 0; - if (quote_around) - length++; - for (s = string; *s != '\0'; s++) - { - char c = *s; - if (c == '"') - length += backslashes + 1; - length++; - if (c == '\\') - backslashes++; - else - backslashes = 0; - } - if (quote_around) - length += backslashes + 1; - - quoted_string = XMALLOC (char, length + 1); - - p = quoted_string; - backslashes = 0; - if (quote_around) - *p++ = '"'; - for (s = string; *s != '\0'; s++) - { - char c = *s; - if (c == '"') - { - unsigned int j; - for (j = backslashes + 1; j > 0; j--) - *p++ = '\\'; - } - *p++ = c; - if (c == '\\') - backslashes++; - else - backslashes = 0; - } - if (quote_around) - { - unsigned int j; - for (j = backslashes; j > 0; j--) - *p++ = '\\'; - *p++ = '"'; - } - *p = '\0'; - - new_argv[i] = quoted_string; - } - else - new_argv[i] = (char *) string; - } - new_argv[argc] = NULL; - - return new_argv; -} -EOF - ;; - esac - - cat <<"EOF" -void lt_dump_script (FILE* f) -{ -EOF - func_emit_wrapper yes | - $SED -n -e ' -s/^\(.\{79\}\)\(..*\)/\1\ -\2/ -h -s/\([\\"]\)/\\\1/g -s/$/\\n/ -s/\([^\n]*\).*/ fputs ("\1", f);/p -g -D' - cat <<"EOF" -} -EOF -} -# end: func_emit_cwrapperexe_src - -# func_win32_import_lib_p ARG -# True if ARG is an import lib, as indicated by $file_magic_cmd -func_win32_import_lib_p () -{ - $opt_debug - case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in - *import*) : ;; - *) false ;; - esac -} - -# func_mode_link arg... -func_mode_link () -{ - $opt_debug - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - # It is impossible to link a dll without this setting, and - # we shouldn't force the makefile maintainer to figure out - # which system we are compiling for in order to pass an extra - # flag for every libtool invocation. - # allow_undefined=no - - # FIXME: Unfortunately, there are problems with the above when trying - # to make a dll which has undefined symbols, in which case not - # even a static library is built. For now, we need to specify - # -no-undefined on the libtool link line when we can be certain - # that all symbols are satisfied, otherwise we get a static library. - allow_undefined=yes - ;; - *) - allow_undefined=yes - ;; - esac - libtool_args=$nonopt - base_compile="$nonopt $@" - compile_command=$nonopt - finalize_command=$nonopt - - compile_rpath= - finalize_rpath= - compile_shlibpath= - finalize_shlibpath= - convenience= - old_convenience= - deplibs= - old_deplibs= - compiler_flags= - linker_flags= - dllsearchpath= - lib_search_path=`pwd` - inst_prefix_dir= - new_inherited_linker_flags= - - avoid_version=no - bindir= - dlfiles= - dlprefiles= - dlself=no - export_dynamic=no - export_symbols= - export_symbols_regex= - generated= - libobjs= - ltlibs= - module=no - no_install=no - objs= - non_pic_objects= - precious_files_regex= - prefer_static_libs=no - preload=no - prev= - prevarg= - release= - rpath= - xrpath= - perm_rpath= - temp_rpath= - thread_safe=no - vinfo= - vinfo_number=no - weak_libs= - single_module="${wl}-single_module" - func_infer_tag $base_compile - - # We need to know -static, to get the right output filenames. - for arg - do - case $arg in - -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" - build_old_libs=no - break - ;; - -all-static | -static | -static-libtool-libs) - case $arg in - -all-static) - if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then - func_warning "complete static linking is impossible in this configuration" - fi - if test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - -static) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=built - ;; - -static-libtool-libs) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - esac - build_libtool_libs=no - build_old_libs=yes - break - ;; - esac - done - - # See if our shared archives depend on static archives. - test -n "$old_archive_from_new_cmds" && build_old_libs=yes - - # Go through the arguments, transforming them on the way. - while test "$#" -gt 0; do - arg="$1" - shift - func_quote_for_eval "$arg" - qarg=$func_quote_for_eval_unquoted_result - func_append libtool_args " $func_quote_for_eval_result" - - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case $prev in - output) - func_append compile_command " @OUTPUT@" - func_append finalize_command " @OUTPUT@" - ;; - esac - - case $prev in - bindir) - bindir="$arg" - prev= - continue - ;; - dlfiles|dlprefiles) - if test "$preload" = no; then - # Add the symbol object into the linking commands. - func_append compile_command " @SYMFILE@" - func_append finalize_command " @SYMFILE@" - preload=yes - fi - case $arg in - *.la | *.lo) ;; # We handle these cases below. - force) - if test "$dlself" = no; then - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - self) - if test "$prev" = dlprefiles; then - dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then - dlself=yes - else - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - *) - if test "$prev" = dlfiles; then - func_append dlfiles " $arg" - else - func_append dlprefiles " $arg" - fi - prev= - continue - ;; - esac - ;; - expsyms) - export_symbols="$arg" - test -f "$arg" \ - || func_fatal_error "symbol file \`$arg' does not exist" - prev= - continue - ;; - expsyms_regex) - export_symbols_regex="$arg" - prev= - continue - ;; - framework) - case $host in - *-*-darwin*) - case "$deplibs " in - *" $qarg.ltframework "*) ;; - *) func_append deplibs " $qarg.ltframework" # this is fixed later - ;; - esac - ;; - esac - prev= - continue - ;; - inst_prefix) - inst_prefix_dir="$arg" - prev= - continue - ;; - objectlist) - if test -f "$arg"; then - save_arg=$arg - moreargs= - for fil in `cat "$save_arg"` - do -# func_append moreargs " $fil" - arg=$fil - # A libtool-controlled object. - - # Check to see that this really is a libtool object. - if func_lalib_unsafe_p "$arg"; then - pic_object= - non_pic_object= - - # Read the .lo file - func_source "$arg" - - if test -z "$pic_object" || - test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" - fi - - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - func_append dlfiles " $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - func_append dlprefiles " $pic_object" - prev= - fi - - # A PIC object. - func_append libobjs " $pic_object" - arg="$pic_object" - fi - - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" - - # A standard non-PIC object - func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - func_append non_pic_objects " $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if $opt_dry_run; then - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - func_lo2o "$arg" - pic_object=$xdir$objdir/$func_lo2o_result - non_pic_object=$xdir$func_lo2o_result - func_append libobjs " $pic_object" - func_append non_pic_objects " $non_pic_object" - else - func_fatal_error "\`$arg' is not a valid libtool object" - fi - fi - done - else - func_fatal_error "link input file \`$arg' does not exist" - fi - arg=$save_arg - prev= - continue - ;; - precious_regex) - precious_files_regex="$arg" - prev= - continue - ;; - release) - release="-$arg" - prev= - continue - ;; - rpath | xrpath) - # We need an absolute path. - case $arg in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - func_fatal_error "only absolute run-paths are allowed" - ;; - esac - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; - *) func_append rpath " $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; - *) func_append xrpath " $arg" ;; - esac - fi - prev= - continue - ;; - shrext) - shrext_cmds="$arg" - prev= - continue - ;; - weak) - func_append weak_libs " $arg" - prev= - continue - ;; - xcclinker) - func_append linker_flags " $qarg" - func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xcompiler) - func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xlinker) - func_append linker_flags " $qarg" - func_append compiler_flags " $wl$qarg" - prev= - func_append compile_command " $wl$qarg" - func_append finalize_command " $wl$qarg" - continue - ;; - *) - eval "$prev=\"\$arg\"" - prev= - continue - ;; - esac - fi # test -n "$prev" - - prevarg="$arg" - - case $arg in - -all-static) - if test -n "$link_static_flag"; then - # See comment for -static flag below, for more details. - func_append compile_command " $link_static_flag" - func_append finalize_command " $link_static_flag" - fi - continue - ;; - - -allow-undefined) - # FIXME: remove this flag sometime in the future. - func_fatal_error "\`-allow-undefined' must not be used because it is the default" - ;; - - -avoid-version) - avoid_version=yes - continue - ;; - - -bindir) - prev=bindir - continue - ;; - - -dlopen) - prev=dlfiles - continue - ;; - - -dlpreopen) - prev=dlprefiles - continue - ;; - - -export-dynamic) - export_dynamic=yes - continue - ;; - - -export-symbols | -export-symbols-regex) - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - func_fatal_error "more than one -exported-symbols argument is not allowed" - fi - if test "X$arg" = "X-export-symbols"; then - prev=expsyms - else - prev=expsyms_regex - fi - continue - ;; - - -framework) - prev=framework - continue - ;; - - -inst-prefix-dir) - prev=inst_prefix - continue - ;; - - # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* - # so, if we see these flags be careful not to treat them like -L - -L[A-Z][A-Z]*:*) - case $with_gcc/$host in - no/*-*-irix* | /*-*-irix*) - func_append compile_command " $arg" - func_append finalize_command " $arg" - ;; - esac - continue - ;; - - -L*) - func_stripname "-L" '' "$arg" - if test -z "$func_stripname_result"; then - if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" - else - func_fatal_error "need path for \`-L' option" - fi - fi - func_resolve_sysroot "$func_stripname_result" - dir=$func_resolve_sysroot_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - absdir=`cd "$dir" && pwd` - test -z "$absdir" && \ - func_fatal_error "cannot determine absolute directory name of \`$dir'" - dir="$absdir" - ;; - esac - case "$deplibs " in - *" -L$dir "* | *" $arg "*) - # Will only happen for absolute or sysroot arguments - ;; - *) - # Preserve sysroot, but never include relative directories - case $dir in - [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; - *) func_append deplibs " -L$dir" ;; - esac - func_append lib_search_path " $dir" - ;; - esac - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$dir:"*) ;; - ::) dllsearchpath=$dir;; - *) func_append dllsearchpath ":$dir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; - *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac - continue - ;; - - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) - # These systems don't actually have a C or math library (as such) - continue - ;; - *-*-os2*) - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C and math libraries are in the System framework - func_append deplibs " System.ltframework" - continue - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - test "X$arg" = "X-lc" && continue - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue - ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; - esac - fi - func_append deplibs " $arg" - continue - ;; - - -module) - module=yes - continue - ;; - - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. - # Darwin uses the -arch flag to determine output architecture. - -model|-arch|-isysroot|--sysroot) - func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - prev=xcompiler - continue - ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - case "$new_inherited_linker_flags " in - *" $arg "*) ;; - * ) func_append new_inherited_linker_flags " $arg" ;; - esac - continue - ;; - - -multi_module) - single_module="${wl}-multi_module" - continue - ;; - - -no-fast-install) - fast_install=no - continue - ;; - - -no-install) - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) - # The PATH hackery in wrapper scripts is required on Windows - # and Darwin in order for the loader to find any dlls it needs. - func_warning "\`-no-install' is ignored for $host" - func_warning "assuming \`-no-fast-install' instead" - fast_install=no - ;; - *) no_install=yes ;; - esac - continue - ;; - - -no-undefined) - allow_undefined=no - continue - ;; - - -objectlist) - prev=objectlist - continue - ;; - - -o) prev=output ;; - - -precious-files-regex) - prev=precious_regex - continue - ;; - - -release) - prev=release - continue - ;; - - -rpath) - prev=rpath - continue - ;; - - -R) - prev=xrpath - continue - ;; - - -R*) - func_stripname '-R' '' "$arg" - dir=$func_stripname_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - =*) - func_stripname '=' '' "$dir" - dir=$lt_sysroot$func_stripname_result - ;; - *) - func_fatal_error "only absolute run-paths are allowed" - ;; - esac - case "$xrpath " in - *" $dir "*) ;; - *) func_append xrpath " $dir" ;; - esac - continue - ;; - - -shared) - # The effects of -shared are defined in a previous loop. - continue - ;; - - -shrext) - prev=shrext - continue - ;; - - -static | -static-libtool-libs) - # The effects of -static are defined in a previous loop. - # We used to do the same as -all-static on platforms that - # didn't have a PIC flag, but the assumption that the effects - # would be equivalent was wrong. It would break on at least - # Digital Unix and AIX. - continue - ;; - - -thread-safe) - thread_safe=yes - continue - ;; - - -version-info) - prev=vinfo - continue - ;; - - -version-number) - prev=vinfo - vinfo_number=yes - continue - ;; - - -weak) - prev=weak - continue - ;; - - -Wc,*) - func_stripname '-Wc,' '' "$arg" - args=$func_stripname_result - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" - func_append arg " $func_quote_for_eval_result" - func_append compiler_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" - arg=$func_stripname_result - ;; - - -Wl,*) - func_stripname '-Wl,' '' "$arg" - args=$func_stripname_result - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" - func_append arg " $wl$func_quote_for_eval_result" - func_append compiler_flags " $wl$func_quote_for_eval_result" - func_append linker_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" - arg=$func_stripname_result - ;; - - -Xcompiler) - prev=xcompiler - continue - ;; - - -Xlinker) - prev=xlinker - continue - ;; - - -XCClinker) - prev=xcclinker - continue - ;; - - # -msg_* for osf cc - -msg_*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - - # Flags to be passed through unchanged, with rationale: - # -64, -mips[0-9] enable 64-bit mode for the SGI compiler - # -r[0-9][0-9]* specify processor for the SGI compiler - # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler - # +DA*, +DD* enable 64-bit mode for the HP compiler - # -q* compiler args for the IBM compiler - # -m*, -t[45]*, -txscale* architecture-specific flags for GCC - # -F/path path to uninstalled frameworks, gcc on darwin - # -p, -pg, --coverage, -fprofile-* profiling flags for GCC - # @file GCC response files - # -tp=* Portland pgcc target processor selection - # --sysroot=* for sysroot support - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" - func_append finalize_command " $arg" - func_append compiler_flags " $arg" - continue - ;; - - # Some other compiler flag. - -* | +*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - - *.$objext) - # A standard object. - func_append objs " $arg" - ;; - - *.lo) - # A libtool-controlled object. - - # Check to see that this really is a libtool object. - if func_lalib_unsafe_p "$arg"; then - pic_object= - non_pic_object= - - # Read the .lo file - func_source "$arg" - - if test -z "$pic_object" || - test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" - fi - - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - func_append dlfiles " $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - func_append dlprefiles " $pic_object" - prev= - fi - - # A PIC object. - func_append libobjs " $pic_object" - arg="$pic_object" - fi - - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" - - # A standard non-PIC object - func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - func_append non_pic_objects " $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if $opt_dry_run; then - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - func_lo2o "$arg" - pic_object=$xdir$objdir/$func_lo2o_result - non_pic_object=$xdir$func_lo2o_result - func_append libobjs " $pic_object" - func_append non_pic_objects " $non_pic_object" - else - func_fatal_error "\`$arg' is not a valid libtool object" - fi - fi - ;; - - *.$libext) - # An archive. - func_append deplibs " $arg" - func_append old_deplibs " $arg" - continue - ;; - - *.la) - # A libtool-controlled library. - - func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. - func_append dlfiles " $func_resolve_sysroot_result" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. - func_append dlprefiles " $func_resolve_sysroot_result" - prev= - else - func_append deplibs " $func_resolve_sysroot_result" - fi - continue - ;; - - # Some other compiler argument. - *) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - esac # arg - - # Now actually substitute the argument into the commands. - if test -n "$arg"; then - func_append compile_command " $arg" - func_append finalize_command " $arg" - fi - done # argument parsing loop - - test -n "$prev" && \ - func_fatal_help "the \`$prevarg' option requires an argument" - - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then - eval arg=\"$export_dynamic_flag_spec\" - func_append compile_command " $arg" - func_append finalize_command " $arg" - fi - - oldlibs= - # calculate the name of the file, without its directory - func_basename "$output" - outputname="$func_basename_result" - libobjs_save="$libobjs" - - if test -n "$shlibpath_var"; then - # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` - else - shlib_search_path= - fi - eval sys_lib_search_path=\"$sys_lib_search_path_spec\" - eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" - - func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" - func_to_tool_file "$output_objdir/" - tool_output_objdir=$func_to_tool_file_result - # Create the object directory. - func_mkdir_p "$output_objdir" - - # Determine the type of output - case $output in - "") - func_fatal_help "you must specify an output file" - ;; - *.$libext) linkmode=oldlib ;; - *.lo | *.$objext) linkmode=obj ;; - *.la) linkmode=lib ;; - *) linkmode=prog ;; # Anything else should be a program. - esac - - specialdeplibs= - - libs= - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) - for deplib in $deplibs; do - if $opt_preserve_dup_deps ; then - case "$libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append libs " $deplib" - done - - if test "$linkmode" = lib; then - libs="$predeps $libs $compiler_lib_search_path $postdeps" - - # Compute libraries that are listed more than once in $predeps - # $postdeps and mark them as special (i.e., whose duplicates are - # not to be eliminated). - pre_post_deps= - if $opt_duplicate_compiler_generated_deps; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in - *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; - esac - func_append pre_post_deps " $pre_post_dep" - done - fi - pre_post_deps= - fi - - deplibs= - newdependency_libs= - newlib_search_path= - need_relink=no # whether we're linking any uninstalled libtool libraries - notinst_deplibs= # not-installed libtool libraries - notinst_path= # paths that contain not-installed libtool libraries - - case $linkmode in - lib) - passes="conv dlpreopen link" - for file in $dlfiles $dlprefiles; do - case $file in - *.la) ;; - *) - func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" - ;; - esac - done - ;; - prog) - compile_deplibs= - finalize_deplibs= - alldeplibs=no - newdlfiles= - newdlprefiles= - passes="conv scan dlopen dlpreopen link" - ;; - *) passes="conv" - ;; - esac - - for pass in $passes; do - # The preopen pass in lib mode reverses $deplibs; put it back here - # so that -L comes before libs that need it for instance... - if test "$linkmode,$pass" = "lib,link"; then - ## FIXME: Find the place where the list is rebuilt in the wrong - ## order, and fix it there properly - tmp_deplibs= - for deplib in $deplibs; do - tmp_deplibs="$deplib $tmp_deplibs" - done - deplibs="$tmp_deplibs" - fi - - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" - deplibs= - fi - if test "$linkmode" = prog; then - case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; - esac - fi - if test "$linkmode,$pass" = "lib,dlpreopen"; then - # Collect and forward deplibs of preopened libtool libs - for lib in $dlprefiles; do - # Ignore non-libtool-libs - dependency_libs= - func_resolve_sysroot "$lib" - case $lib in - *.la) func_source "$func_resolve_sysroot_result" ;; - esac - - # Collect preopened libtool deplibs, except any this library - # has declared as weak libs - for deplib in $dependency_libs; do - func_basename "$deplib" - deplib_base=$func_basename_result - case " $weak_libs " in - *" $deplib_base "*) ;; - *) func_append deplibs " $deplib" ;; - esac - done - done - libs="$dlprefiles" - fi - if test "$pass" = dlopen; then - # Collect dlpreopened libraries - save_deplibs="$deplibs" - deplibs= - fi - - for deplib in $libs; do - lib= - found=no - case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; - * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi - continue - ;; - -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - func_warning "\`-l' is ignored for archives/objects" - continue - fi - func_stripname '-l' '' "$deplib" - name=$func_stripname_result - if test "$linkmode" = lib; then - searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" - else - searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" - fi - for searchdir in $searchdirs; do - for search_ext in .la $std_shrext .so .a; do - # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" - if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes - else - found=no - fi - break 2 - fi - done - done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library - # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, - # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $deplib "*) - if func_lalib_p "$lib"; then - library_names= - old_library= - func_source "$lib" - for l in $old_library $library_names; do - ll="$l" - done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no - func_dirname "$lib" "" "." - ladir="$func_dirname_result" - lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - fi - fi - ;; - *) ;; - esac - fi - fi - ;; # -l - *.ltframework) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; - * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi - continue - ;; - -L*) - case $linkmode in - lib) - deplibs="$deplib $deplibs" - test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - prog) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - if test "$pass" = scan; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - *) - func_warning "\`-L' is ignored for archives/objects" - ;; - esac # linkmode - continue - ;; # -L - -R*) - if test "$pass" = link; then - func_stripname '-R' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - dir=$func_resolve_sysroot_result - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; - *) func_append xrpath " $dir" ;; - esac - fi - deplibs="$deplib $deplibs" - continue - ;; - *.la) - func_resolve_sysroot "$deplib" - lib=$func_resolve_sysroot_result - ;; - *.$libext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - case $linkmode in - lib) - # Linking convenience modules into shared libraries is allowed, - # but linking other static libraries is non-portable. - case " $dlpreconveniencelibs " in - *" $deplib "*) ;; - *) - valid_a_lib=no - case $deplibs_check_method in - match_pattern*) - set dummy $deplibs_check_method; shift - match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` - if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes - fi - ;; - pass_all) - valid_a_lib=yes - ;; - esac - if test "$valid_a_lib" != yes; then - echo - $ECHO "*** Warning: Trying to link with static lib archive $deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because the file extensions .$libext of this argument makes me believe" - echo "*** that it is just a static archive that I should not use here." - else - echo - $ECHO "*** Warning: Linking the shared library $output against the" - $ECHO "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" - fi - ;; - esac - continue - ;; - prog) - if test "$pass" != link; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - continue - ;; - esac # linkmode - ;; # *.$libext - *.lo | *.$objext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. - func_append newdlprefiles " $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - func_append newdlfiles " $deplib" - fi - fi - continue - ;; - %DEPLIBS%) - alldeplibs=yes - continue - ;; - esac # case $deplib - - if test "$found" = yes || test -f "$lib"; then : - else - func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" - fi - - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$lib" \ - || func_fatal_error "\`$lib' is not a valid libtool archive" - - func_dirname "$lib" "" "." - ladir="$func_dirname_result" - - dlname= - dlopen= - dlpreopen= - libdir= - library_names= - old_library= - inherited_linker_flags= - # If the library was installed with an old release of libtool, - # it will not redefine variables installed, or shouldnotlink - installed=yes - shouldnotlink=no - avoidtemprpath= - - - # Read the .la file - func_source "$lib" - - # Convert "-framework foo" to "foo.ltframework" - if test -n "$inherited_linker_flags"; then - tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` - for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do - case " $new_inherited_linker_flags " in - *" $tmp_inherited_linker_flag "*) ;; - *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; - esac - done - fi - dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then - test -n "$dlopen" && func_append dlfiles " $dlopen" - test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" - fi - - if test "$pass" = conv; then - # Only check for convenience libraries - deplibs="$lib $deplibs" - if test -z "$libdir"; then - if test -z "$old_library"; then - func_fatal_error "cannot find name of link library for \`$lib'" - fi - # It is a libtool convenience library, so add in its objects. - func_append convenience " $ladir/$objdir/$old_library" - func_append old_convenience " $ladir/$objdir/$old_library" - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" - fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done - continue - fi # $pass = conv - - - # Get the name of the library we link against. - linklib= - if test -n "$old_library" && - { test "$prefer_static_libs" = yes || - test "$prefer_static_libs,$installed" = "built,no"; }; then - linklib=$old_library - else - for l in $old_library $library_names; do - linklib="$l" - done - fi - if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" - fi - - # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - func_fatal_error "cannot -dlopen a convenience library: \`$lib'" - fi - if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then - # If there is no dlname, no dlopen support or we're linking - # statically, we need to preload. We also need to preload any - # dependent libraries so libltdl's deplib preloader doesn't - # bomb out in the load deplibs phase. - func_append dlprefiles " $lib $dependency_libs" - else - func_append newdlfiles " $lib" - fi - continue - fi # $pass = dlopen - - # We need an absolute path. - case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; - *) - abs_ladir=`cd "$ladir" && pwd` - if test -z "$abs_ladir"; then - func_warning "cannot determine absolute directory name of \`$ladir'" - func_warning "passing it literally to the linker, although it might fail" - abs_ladir="$ladir" - fi - ;; - esac - func_basename "$lib" - laname="$func_basename_result" - - # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then - if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else - dir="$lt_sysroot$libdir" - absdir="$lt_sysroot$libdir" - fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else - if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" - # Remove this search path later - func_append notinst_path " $abs_ladir" - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later - func_append notinst_path " $abs_ladir" - fi - fi # $installed = yes - func_stripname 'lib' '.la' "$laname" - name=$func_stripname_result - - # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" - fi - case "$host" in - # special handling for platforms with PE-DLLs. - *cygwin* | *mingw* | *cegcc* ) - # Linker will automatically link against shared library if both - # static and shared are present. Therefore, ensure we extract - # symbols from the import library if a shared library is present - # (otherwise, the dlopen module name will be incorrect). We do - # this by putting the import library name into $newdlprefiles. - # We recover the dlopen module name by 'saving' the la file - # name in a special purpose variable, and (later) extracting the - # dlname from the la file. - if test -n "$dlname"; then - func_tr_sh "$dir/$linklib" - eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" - func_append newdlprefiles " $dir/$linklib" - else - func_append newdlprefiles " $dir/$old_library" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - func_append dlpreconveniencelibs " $dir/$old_library" - fi - ;; - * ) - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - func_append newdlprefiles " $dir/$old_library" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - func_append dlpreconveniencelibs " $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen finds it. - elif test -n "$dlname"; then - func_append newdlprefiles " $dir/$dlname" - else - func_append newdlprefiles " $dir/$linklib" - fi - ;; - esac - fi # $pass = dlpreopen - - if test -z "$libdir"; then - # Link the convenience library - if test "$linkmode" = lib; then - deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$dir/$old_library $compile_deplibs" - finalize_deplibs="$dir/$old_library $finalize_deplibs" - else - deplibs="$lib $deplibs" # used for prog,scan pass - fi - continue - fi - - - if test "$linkmode" = prog && test "$pass" != link; then - func_append newlib_search_path " $ladir" - deplibs="$lib $deplibs" - - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes - fi - - tmp_libs= - for deplib in $dependency_libs; do - case $deplib in - -L*) func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - esac - # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then - deplibs="$deplib $deplibs" - else - # Need to hardcode shared library paths - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done # for deplib - continue - fi # $linkmode = prog... - - if test "$linkmode,$pass" = "prog,link"; then - if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || - test -z "$old_library"; }; then - # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then - # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in - *"$absdir:"*) ;; - *) func_append temp_rpath "$absdir:" ;; - esac - fi - - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac - fi # $linkmode,$pass = prog,link... - - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && - test -n "$library_names"; }; }; then - # We only need to search for static libraries - continue - fi - fi - - link_static=no # Whether the deplib will be linked statically - use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes; then - use_static_libs=no - fi - if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then - case $host in - *cygwin* | *mingw* | *cegcc*) - # No point in relinking DLLs because paths are not encoded - func_append notinst_deplibs " $lib" - need_relink=no - ;; - *) - if test "$installed" = no; then - func_append notinst_deplibs " $lib" - need_relink=yes - fi - ;; - esac - # This is a shared library - - # Warn about portability, can't link against -module's on some - # systems (darwin). Don't bleat about dlopened modules though! - dlopenmodule="" - for dlpremoduletest in $dlprefiles; do - if test "X$dlpremoduletest" = "X$lib"; then - dlopenmodule="$dlpremoduletest" - break - fi - done - if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then - echo - if test "$linkmode" = prog; then - $ECHO "*** Warning: Linking the executable $output against the loadable module" - else - $ECHO "*** Warning: Linking the shared library $output against the loadable module" - fi - $ECHO "*** $linklib is not portable!" - fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac - fi - - if test -n "$old_archive_from_expsyms_cmds"; then - # figure out the soname - set dummy $library_names - shift - realname="$1" - shift - libname=`eval "\\$ECHO \"$libname_spec\""` - # use dlname if we got it. it's perfectly good, no? - if test -n "$dlname"; then - soname="$dlname" - elif test -n "$soname_spec"; then - # bleh windows - case $host in - *cygwin* | mingw* | *cegcc*) - func_arith $current - $age - major=$func_arith_result - versuffix="-$major" - ;; - esac - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - - # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" - func_basename "$soroot" - soname="$func_basename_result" - func_stripname 'lib' '.dll' "$soname" - newlib=libimp-$func_stripname_result.a - - # If the library has no export list, then create one now - if test -f "$output_objdir/$soname-def"; then : - else - func_verbose "extracting exported symbol list from \`$soname'" - func_execute_cmds "$extract_expsyms_cmds" 'exit $?' - fi - - # Create $newlib - if test -f "$output_objdir/$newlib"; then :; else - func_verbose "generating import library for \`$soname'" - func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' - fi - # make sure the library variables are pointing to the new library - dir=$output_objdir - linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" - - if test "$linkmode" = prog || test "$opt_mode" != relink; then - add_shlibpath= - add_dir= - add= - lib_linked=yes - case $hardcode_action in - immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" - case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; - *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; - *-*-darwin* ) - # if the lib is a (non-dlopened) module then we can not - # link against it, someone is ignoring the earlier warnings - if /usr/bin/file -L $add 2> /dev/null | - $GREP ": [^:]* bundle" >/dev/null ; then - if test "X$dlopenmodule" != "X$lib"; then - $ECHO "*** Warning: lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then - echo - echo "*** And there doesn't seem to be a static archive available" - echo "*** The link will probably fail, sorry" - else - add="$dir/$old_library" - fi - elif test -n "$old_library"; then - add="$dir/$old_library" - fi - fi - esac - elif test "$hardcode_minus_L" = no; then - case $host in - *-*-sunos*) add_shlibpath="$dir" ;; - esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - relink) - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$absdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - *) lib_linked=no ;; - esac - - if test "$lib_linked" != yes; then - func_fatal_configuration "unsupported hardcode properties" - fi - - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; - *) func_append compile_shlibpath "$add_shlibpath:" ;; - esac - fi - if test "$linkmode" = prog; then - test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" - test -n "$add" && compile_deplibs="$add $compile_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && - test "$hardcode_minus_L" != yes && - test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) func_append finalize_shlibpath "$libdir:" ;; - esac - fi - fi - fi - - if test "$linkmode" = prog || test "$opt_mode" = relink; then - add_shlibpath= - add_dir= - add= - # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) func_append finalize_shlibpath "$libdir:" ;; - esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then - if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" - else - add="$libdir/$linklib" - fi - else - # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - fi - - if test "$linkmode" = prog; then - test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" - test -n "$add" && finalize_deplibs="$add $finalize_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - fi - fi - elif test "$linkmode" = prog; then - # Here we assume that one of hardcode_direct or hardcode_minus_L - # is not unsupported. This is valid on all known static and - # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" - compile_deplibs="$dir/$linklib $compile_deplibs" - finalize_deplibs="$dir/$linklib $finalize_deplibs" - else - compile_deplibs="-l$name -L$dir $compile_deplibs" - finalize_deplibs="-l$name -L$dir $finalize_deplibs" - fi - elif test "$build_libtool_libs" = yes; then - # Not a shared library - if test "$deplibs_check_method" != pass_all; then - # We're trying link a shared library against a static one - # but the system doesn't support it. - - # Just print a warning and add the library to dependency_libs so - # that the program can be linked against the static library. - echo - $ECHO "*** Warning: This system can not link to static lib archive $lib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then - echo "*** But as you try to build a module library, libtool will still create " - echo "*** a static module, that should work as long as the dlopening application" - echo "*** is linked with the -dlopen flag to resolve symbols at runtime." - if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - else - deplibs="$dir/$old_library $deplibs" - link_static=yes - fi - fi # link shared/static library? - - if test "$linkmode" = lib; then - if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then - # Extract -R from dependency_libs - temp_deplibs= - for libdir in $dependency_libs; do - case $libdir in - -R*) func_stripname '-R' '' "$libdir" - temp_xrpath=$func_stripname_result - case " $xrpath " in - *" $temp_xrpath "*) ;; - *) func_append xrpath " $temp_xrpath";; - esac;; - *) func_append temp_deplibs " $libdir";; - esac - done - dependency_libs="$temp_deplibs" - fi - - func_append newlib_search_path " $absdir" - # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" - # ... and its dependency_libs - tmp_libs= - for deplib in $dependency_libs; do - newdependency_libs="$deplib $newdependency_libs" - case $deplib in - -L*) func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result";; - *) func_resolve_sysroot "$deplib" ;; - esac - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $func_resolve_sysroot_result "*) - func_append specialdeplibs " $func_resolve_sysroot_result" ;; - esac - fi - func_append tmp_libs " $func_resolve_sysroot_result" - done - - if test "$link_all_deplibs" != no; then - # Add the search paths of all dependency libraries - for deplib in $dependency_libs; do - path= - case $deplib in - -L*) path="$deplib" ;; - *.la) - func_resolve_sysroot "$deplib" - deplib=$func_resolve_sysroot_result - func_dirname "$deplib" "" "." - dir=$func_dirname_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - func_warning "cannot determine absolute directory name of \`$dir'" - absdir="$dir" - fi - ;; - esac - if $GREP "^installed=no" $deplib > /dev/null; then - case $host in - *-*-darwin*) - depdepl= - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do - depdepl=$tmp - done - if test -f "$absdir/$objdir/$depdepl" ; then - depdepl="$absdir/$objdir/$depdepl" - darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` - if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` - fi - func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" - path= - fi - fi - ;; - *) - path="-L$absdir/$objdir" - ;; - esac - else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" - test "$absdir" != "$libdir" && \ - func_warning "\`$deplib' seems to be moved" - - path="-L$absdir" - fi - ;; - esac - case " $deplibs " in - *" $path "*) ;; - *) deplibs="$path $deplibs" ;; - esac - done - fi # link_all_deplibs != no - fi # linkmode = lib - done # for deplib in $libs - if test "$pass" = link; then - if test "$linkmode" = "prog"; then - compile_deplibs="$new_inherited_linker_flags $compile_deplibs" - finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" - else - compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - fi - fi - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then - # Link the dlpreopened libraries before other libraries - for deplib in $save_deplibs; do - deplibs="$deplib $deplibs" - done - fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then - # Make sure lib_search_path contains only unique directories. - lib_search_path= - for dir in $newlib_search_path; do - case "$lib_search_path " in - *" $dir "*) ;; - *) func_append lib_search_path " $dir" ;; - esac - done - newlib_search_path= - fi - - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else - vars="compile_deplibs finalize_deplibs" - fi - for var in $vars dependency_libs; do - # Add libraries to $var in reverse order - eval tmp_libs=\"\$$var\" - new_libs= - for deplib in $tmp_libs; do - # FIXME: Pedantically, this is the right thing to do, so - # that some nasty dependency loop isn't accidentally - # broken: - #new_libs="$deplib $new_libs" - # Pragmatically, this seems to cause very few problems in - # practice: - case $deplib in - -L*) new_libs="$deplib $new_libs" ;; - -R*) ;; - *) - # And here is the reason: when a library appears more - # than once as an explicit dependence of a library, or - # is implicitly linked in more than once by the - # compiler, it is considered special, and multiple - # occurrences thereof are not removed. Compare this - # with having the same library being listed as a - # dependency of multiple other libraries: in this case, - # we know (pedantically, we assume) the library does not - # need to be listed more than once, so we keep only the - # last copy. This is not always right, but it is rare - # enough that we require users that really mean to play - # such unportable linking tricks to link the library - # using -Wl,-lname, so that libtool does not consider it - # for duplicate removal. - case " $specialdeplibs " in - *" $deplib "*) new_libs="$deplib $new_libs" ;; - *) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$deplib $new_libs" ;; - esac - ;; - esac - ;; - esac - done - tmp_libs= - for deplib in $new_libs; do - case $deplib in - -L*) - case " $tmp_libs " in - *" $deplib "*) ;; - *) func_append tmp_libs " $deplib" ;; - esac - ;; - *) func_append tmp_libs " $deplib" ;; - esac - done - eval $var=\"$tmp_libs\" - done # for var - fi - # Last step: remove runtime libs from dependency_libs - # (they stay in deplibs) - tmp_libs= - for i in $dependency_libs ; do - case " $predeps $postdeps $compiler_lib_search_path " in - *" $i "*) - i="" - ;; - esac - if test -n "$i" ; then - func_append tmp_libs " $i" - fi - done - dependency_libs=$tmp_libs - done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" - fi - if test "$linkmode" = prog || test "$linkmode" = lib; then - dlprefiles="$newdlprefiles" - fi - - case $linkmode in - oldlib) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for archives" - fi - - case " $deplibs" in - *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for archives" ;; - esac - - test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for archives" - - test -n "$xrpath" && \ - func_warning "\`-R' is ignored for archives" - - test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for archives" - - test -n "$release" && \ - func_warning "\`-release' is ignored for archives" - - test -n "$export_symbols$export_symbols_regex" && \ - func_warning "\`-export-symbols' is ignored for archives" - - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" - func_append objs "$old_deplibs" - ;; - - lib) - # Make sure we only generate libraries of the form `libNAME.la'. - case $outputname in - lib*) - func_stripname 'lib' '.la' "$outputname" - name=$func_stripname_result - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - ;; - *) - test "$module" = no && \ - func_fatal_help "libtool library \`$output' must begin with \`lib'" - - if test "$need_lib_prefix" != no; then - # Add the "lib" prefix for modules if required - func_stripname '' '.la' "$outputname" - name=$func_stripname_result - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - else - func_stripname '' '.la' "$outputname" - libname=$func_stripname_result - fi - ;; - esac - - if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" - else - echo - $ECHO "*** Warning: Linking the shared library $output against the non-libtool" - $ECHO "*** objects $objs is not portable!" - func_append libobjs " $objs" - fi - fi - - test "$dlself" != no && \ - func_warning "\`-dlopen self' is ignored for libtool libraries" - - set dummy $rpath - shift - test "$#" -gt 1 && \ - func_warning "ignoring multiple \`-rpath's for a libtool library" - - install_libdir="$1" - - oldlibs= - if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then - # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so - # convenience libraries should have the same extension an - # archive normally would. - oldlibs="$output_objdir/$libname.$libext $oldlibs" - build_libtool_libs=convenience - build_old_libs=yes - fi - - test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for convenience libraries" - - test -n "$release" && \ - func_warning "\`-release' is ignored for convenience libraries" - else - - # Parse the version information argument. - save_ifs="$IFS"; IFS=':' - set dummy $vinfo 0 0 0 - shift - IFS="$save_ifs" - - test -n "$7" && \ - func_fatal_help "too many parameters to \`-version-info'" - - # convert absolute version numbers to libtool ages - # this retains compatibility with .la files and attempts - # to make the code below a bit more comprehensible - - case $vinfo_number in - yes) - number_major="$1" - number_minor="$2" - number_revision="$3" - # - # There are really only two kinds -- those that - # use the current revision as the major version - # and those that subtract age and use age as - # a minor version. But, then there is irix - # which has an extra 1 added just for fun - # - case $version_type in - # correct linux to gnu/linux during the next big refactor - darwin|linux|osf|windows|none) - func_arith $number_major + $number_minor - current=$func_arith_result - age="$number_minor" - revision="$number_revision" - ;; - freebsd-aout|freebsd-elf|qnx|sunos) - current="$number_major" - revision="$number_minor" - age="0" - ;; - irix|nonstopux) - func_arith $number_major + $number_minor - current=$func_arith_result - age="$number_minor" - revision="$number_minor" - lt_irix_increment=no - ;; - esac - ;; - no) - current="$1" - revision="$2" - age="$3" - ;; - esac - - # Check that each of the things are valid numbers. - case $current in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - func_error "CURRENT \`$current' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" - ;; - esac - - case $revision in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - func_error "REVISION \`$revision' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" - ;; - esac - - case $age in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - func_error "AGE \`$age' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" - ;; - esac - - if test "$age" -gt "$current"; then - func_error "AGE \`$age' is greater than the current interface number \`$current'" - func_fatal_error "\`$vinfo' is not valid version information" - fi - - # Calculate the version variables. - major= - versuffix= - verstring= - case $version_type in - none) ;; - - darwin) - # Like Linux, but with the current version available in - # verstring for coding it into the library header - func_arith $current - $age - major=.$func_arith_result - versuffix="$major.$age.$revision" - # Darwin ld doesn't like 0 for these options... - func_arith $current + 1 - minor_current=$func_arith_result - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" - verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" - ;; - - freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; - ;; - - freebsd-elf) - major=".$current" - versuffix=".$current" - ;; - - irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then - func_arith $current - $age - else - func_arith $current - $age + 1 - fi - major=$func_arith_result - - case $version_type in - nonstopux) verstring_prefix=nonstopux ;; - *) verstring_prefix=sgi ;; - esac - verstring="$verstring_prefix$major.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$revision - while test "$loop" -ne 0; do - func_arith $revision - $loop - iface=$func_arith_result - func_arith $loop - 1 - loop=$func_arith_result - verstring="$verstring_prefix$major.$iface:$verstring" - done - - # Before this point, $major must not contain `.'. - major=.$major - versuffix="$major.$revision" - ;; - - linux) # correct to gnu/linux during the next big refactor - func_arith $current - $age - major=.$func_arith_result - versuffix="$major.$age.$revision" - ;; - - osf) - func_arith $current - $age - major=.$func_arith_result - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$age - while test "$loop" -ne 0; do - func_arith $current - $loop - iface=$func_arith_result - func_arith $loop - 1 - loop=$func_arith_result - verstring="$verstring:${iface}.0" - done - - # Make executables depend on our current version. - func_append verstring ":${current}.0" - ;; - - qnx) - major=".$current" - versuffix=".$current" - ;; - - sunos) - major=".$current" - versuffix=".$current.$revision" - ;; - - windows) - # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. - func_arith $current - $age - major=$func_arith_result - versuffix="-$major" - ;; - - *) - func_fatal_configuration "unknown library version type \`$version_type'" - ;; - esac - - # Clear the version info if we defaulted, and they specified a release. - if test -z "$vinfo" && test -n "$release"; then - major= - case $version_type in - darwin) - # we can't check for "0.0" in archive_cmds due to quoting - # problems, so we reset it completely - verstring= - ;; - *) - verstring="0.0" - ;; - esac - if test "$need_version" = no; then - versuffix= - else - versuffix=".0.0" - fi - fi - - # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then - major= - versuffix= - verstring="" - fi - - # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - func_warning "undefined symbols not allowed in $host shared libraries" - build_libtool_libs=no - build_old_libs=yes - fi - else - # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" - fi - - fi - - func_generate_dlsyms "$libname" "$libname" "yes" - func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= - - if test "$opt_mode" != relink; then - # Remove our outputs, but don't remove object files since they - # may have been created when compiling PIC objects. - removelist= - tempremovelist=`$ECHO "$output_objdir/*"` - for p in $tempremovelist; do - case $p in - *.$objext | *.gcno) - ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then - if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 - then - continue - fi - fi - func_append removelist " $p" - ;; - *) ;; - esac - done - test -n "$removelist" && \ - func_show_eval "${RM}r \$removelist" - fi - - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then - func_append oldlibs " $output_objdir/$libname.$libext" - - # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` - fi - - # Eliminate all temporary directories. - #for path in $notinst_path; do - # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` - # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` - # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` - #done - - if test -n "$xrpath"; then - # If the user specified any rpath flags, then add them. - temp_xrpath= - for libdir in $xrpath; do - func_replace_sysroot "$libdir" - func_append temp_xrpath " -R$func_replace_sysroot_result" - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then - dependency_libs="$temp_xrpath $dependency_libs" - fi - fi - - # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" - dlfiles= - for lib in $old_dlfiles; do - case " $dlprefiles $dlfiles " in - *" $lib "*) ;; - *) func_append dlfiles " $lib" ;; - esac - done - - # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" - dlprefiles= - for lib in $old_dlprefiles; do - case "$dlprefiles " in - *" $lib "*) ;; - *) func_append dlprefiles " $lib" ;; - esac - done - - if test "$build_libtool_libs" = yes; then - if test -n "$rpath"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) - # these systems don't actually have a c library (as such)! - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C library is in the System framework - func_append deplibs " System.ltframework" - ;; - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then - func_append deplibs " -lc" - fi - ;; - esac - fi - - # Transform deplibs into only deplibs that can be linked in shared. - name_save=$name - libname_save=$libname - release_save=$release - versuffix_save=$versuffix - major_save=$major - # I'm not sure if I'm treating the release correctly. I think - # release should show up in the -l (ie -lgmp5) so we don't want to - # add it in twice. Is that correct? - release="" - versuffix="" - major="" - newdeplibs= - droppeddeps=no - case $deplibs_check_method in - pass_all) - # Don't check for shared/static. Everything works. - # This might be a little naive. We might want to check - # whether the library exists or not. But this is on - # osf3 & osf4 and I'm not really sure... Just - # implementing what was already the behavior. - newdeplibs=$deplibs - ;; - test_compile) - # This code stresses the "libraries are programs" paradigm to its - # limits. Maybe even breaks it. We compile a program, linking it - # against the deplibs as a proxy for the library. Then we can check - # whether they linked in statically or dynamically with ldd. - $opt_dry_run || $RM conftest.c - cat > conftest.c </dev/null` - $nocaseglob - else - potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` - fi - for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null | - $GREP " -> " >/dev/null; then - continue - fi - # The statement above tries to avoid entering an - # endless loop below, in case of cyclic links. - # We might still enter an endless loop, since a link - # loop can be closed while we follow links, - # but so what? - potlib="$potent_lib" - while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` - case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; - esac - done - if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | - $SED -e 10q | - $EGREP "$file_magic_regex" > /dev/null; then - func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - echo - $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $ECHO "*** with $libname but no candidates were found. (...for file magic test)" - else - $ECHO "*** with $libname and none of the candidates passed a file format test" - $ECHO "*** using a file magic. Last file checked: $potlib" - fi - fi - ;; - *) - # Add a -L argument. - func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. - ;; - match_pattern*) - set dummy $deplibs_check_method; shift - match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` - for a_deplib in $deplibs; do - case $a_deplib in - -l*) - func_stripname -l '' "$a_deplib" - name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) - func_append newdeplibs " $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then - libname=`eval "\\$ECHO \"$libname_spec\""` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test - if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ - $EGREP "$match_pattern_regex" > /dev/null; then - func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - echo - $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" - else - $ECHO "*** with $libname and none of the candidates passed a file format test" - $ECHO "*** using a regex pattern. Last file checked: $potlib" - fi - fi - ;; - *) - # Add a -L argument. - func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. - ;; - none | unknown | *) - newdeplibs="" - tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do - # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` - done - fi - case $tmp_deplibs in - *[!\ \ ]*) - echo - if test "X$deplibs_check_method" = "Xnone"; then - echo "*** Warning: inter-library dependencies are not supported in this platform." - else - echo "*** Warning: inter-library dependencies are not known to be supported." - fi - echo "*** All declared inter-library dependencies are being dropped." - droppeddeps=yes - ;; - esac - ;; - esac - versuffix=$versuffix_save - major=$major_save - release=$release_save - libname=$libname_save - name=$name_save - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library with the System framework - newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` - ;; - esac - - if test "$droppeddeps" = yes; then - if test "$module" = yes; then - echo - echo "*** Warning: libtool could not satisfy all declared inter-library" - $ECHO "*** dependencies of module $libname. Therefore, libtool will create" - echo "*** a static module, that should work as long as the dlopening" - echo "*** application is linked with the -dlopen flag." - if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - else - echo "*** The inter-library dependencies that have been dropped here will be" - echo "*** automatically added whenever a program is linked with this library" - echo "*** or is declared to -dlopen it." - - if test "$allow_undefined" = no; then - echo - echo "*** Since this library must not contain undefined symbols," - echo "*** because either the platform does not support them or" - echo "*** it was explicitly requested with -no-undefined," - echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - fi - fi - # Done checking deplibs! - deplibs=$newdeplibs - fi - # Time to change all our "foo.ltframework" stuff back to "-framework foo" - case $host in - *-*-darwin*) - newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - ;; - esac - - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $deplibs " in - *" -L$path/$objdir "*) - func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) func_append new_libs " $deplib" ;; - esac - ;; - *) func_append new_libs " $deplib" ;; - esac - done - deplibs="$new_libs" - - # All the library-specific variables (install_libdir is set above). - library_names= - old_library= - dlname= - - # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - # Remove ${wl} instances when linking with ld. - # FIXME: should test the right _cmds variable. - case $archive_cmds in - *\$LD\ *) wl= ;; - esac - if test "$hardcode_into_libs" = yes; then - # Hardcode the library paths - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" - test "$opt_mode" != relink && rpath="$compile_rpath$rpath" - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - func_replace_sysroot "$libdir" - libdir=$func_replace_sysroot_result - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - func_append dep_rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) func_append perm_rpath " $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - func_append rpath "$dir:" - done - eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" - fi - test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" - fi - - shlibpath="$finalize_shlibpath" - test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" - if test -n "$shlibpath"; then - eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi - - # Get the real and link names of the library. - eval shared_ext=\"$shrext_cmds\" - eval library_names=\"$library_names_spec\" - set dummy $library_names - shift - realname="$1" - shift - - if test -n "$soname_spec"; then - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - if test -z "$dlname"; then - dlname=$soname - fi - - lib="$output_objdir/$realname" - linknames= - for link - do - func_append linknames " $link" - done - - # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` - test "X$libobjs" = "X " && libobjs= - - delfiles= - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" - func_append delfiles " $export_symbols" - fi - - orig_export_symbols= - case $host_os in - cygwin* | mingw* | cegcc*) - if test -n "$export_symbols" && test -z "$export_symbols_regex"; then - # exporting using user supplied symfile - if test "x`$SED 1q $export_symbols`" != xEXPORTS; then - # and it's NOT already a .def file. Must figure out - # which of the given symbols are data symbols and tag - # them as such. So, trigger use of export_symbols_cmds. - # export_symbols gets reassigned inside the "prepare - # the list of exported symbols" if statement, so the - # include_expsyms logic still works. - orig_export_symbols="$export_symbols" - export_symbols= - always_export_symbols=yes - fi - fi - ;; - esac - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $opt_dry_run || $RM $export_symbols - cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' - for cmd1 in $cmds; do - IFS="$save_ifs" - # Take the normal branch if the nm_file_list_spec branch - # doesn't work or if tool conversion is not needed. - case $nm_file_list_spec~$to_tool_file_cmd in - *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) - try_normal_branch=yes - eval cmd=\"$cmd1\" - func_len " $cmd" - len=$func_len_result - ;; - *) - try_normal_branch=no - ;; - esac - if test "$try_normal_branch" = yes \ - && { test "$len" -lt "$max_cmd_len" \ - || test "$max_cmd_len" -le -1; } - then - func_show_eval "$cmd" 'exit $?' - skipped_export=false - elif test -n "$nm_file_list_spec"; then - func_basename "$output" - output_la=$func_basename_result - save_libobjs=$libobjs - save_output=$output - output=${output_objdir}/${output_la}.nm - func_to_tool_file "$output" - libobjs=$nm_file_list_spec$func_to_tool_file_result - func_append delfiles " $output" - func_verbose "creating $NM input file list: $output" - for obj in $save_libobjs; do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" - done > "$output" - eval cmd=\"$cmd1\" - func_show_eval "$cmd" 'exit $?' - output=$save_output - libobjs=$save_libobjs - skipped_export=false - else - # The command line is too long to execute in one step. - func_verbose "using reloadable object file for export list..." - skipped_export=: - # Break out early, otherwise skipped_export may be - # set to false by a later but shorter cmd. - break - fi - done - IFS="$save_ifs" - if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then - func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - func_show_eval '$MV "${export_symbols}T" "$export_symbols"' - fi - fi - fi - - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then - # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" - # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine - # though. Also, the filter scales superlinearly with the number of - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi - - tmp_deplibs= - for test_deplib in $deplibs; do - case " $convenience " in - *" $test_deplib "*) ;; - *) - func_append tmp_deplibs " $test_deplib" - ;; - esac - done - deplibs="$tmp_deplibs" - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec" && - test "$compiler_needs_object" = yes && - test -z "$libobjs"; then - # extract the archives, so we have objects to list. - # TODO: could optimize this to just extract one archive. - whole_archive_flag_spec= - fi - if test -n "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - else - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $convenience - func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then - eval flag=\"$thread_safe_flag_spec\" - func_append linker_flags " $flag" - fi - - # Make a backup of the uninstalled library when relinking - if test "$opt_mode" = relink; then - $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? - fi - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - eval test_cmds=\"$module_expsym_cmds\" - cmds=$module_expsym_cmds - else - eval test_cmds=\"$module_cmds\" - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - eval test_cmds=\"$archive_expsym_cmds\" - cmds=$archive_expsym_cmds - else - eval test_cmds=\"$archive_cmds\" - cmds=$archive_cmds - fi - fi - - if test "X$skipped_export" != "X:" && - func_len " $test_cmds" && - len=$func_len_result && - test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - : - else - # The command line is too long to link in one step, link piecewise - # or, if using GNU ld and skipped_export is not :, use a linker - # script. - - # Save the value of $output and $libobjs because we want to - # use them later. If we have whole_archive_flag_spec, we - # want to use save_libobjs as it was before - # whole_archive_flag_spec was expanded, because we can't - # assume the linker understands whole_archive_flag_spec. - # This may have to be revisited, in case too many - # convenience libraries get linked in and end up exceeding - # the spec. - if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - fi - save_output=$output - func_basename "$output" - output_la=$func_basename_result - - # Clear the reloadable object creation command queue and - # initialize k to one. - test_cmds= - concat_cmds= - objlist= - last_robj= - k=1 - - if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then - output=${output_objdir}/${output_la}.lnkscript - func_verbose "creating GNU ld script: $output" - echo 'INPUT (' > $output - for obj in $save_libobjs - do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" >> $output - done - echo ')' >> $output - func_append delfiles " $output" - func_to_tool_file "$output" - output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk - func_verbose "creating linker input file list: $output" - : > $output - set x $save_libobjs - shift - firstobj= - if test "$compiler_needs_object" = yes; then - firstobj="$1 " - shift - fi - for obj - do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" >> $output - done - func_append delfiles " $output" - func_to_tool_file "$output" - output=$firstobj\"$file_list_spec$func_to_tool_file_result\" - else - if test -n "$save_libobjs"; then - func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext - eval test_cmds=\"$reload_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 - - # Loop over the list of objects to be linked. - for obj in $save_libobjs - do - func_len " $obj" - func_arith $len + $func_len_result - len=$func_arith_result - if test "X$objlist" = X || - test "$len" -lt "$max_cmd_len"; then - func_append objlist " $obj" - else - # The command $test_cmds is almost too long, add a - # command to the queue. - if test "$k" -eq 1 ; then - # The first file doesn't have a previous command to add. - reload_objs=$objlist - eval concat_cmds=\"$reload_cmds\" - else - # All subsequent reloadable object files will link in - # the last one created. - reload_objs="$objlist $last_robj" - eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" - fi - last_robj=$output_objdir/$output_la-${k}.$objext - func_arith $k + 1 - k=$func_arith_result - output=$output_objdir/$output_la-${k}.$objext - objlist=" $obj" - func_len " $last_robj" - func_arith $len0 + $func_len_result - len=$func_arith_result - fi - done - # Handle the remaining objects by creating one last - # reloadable object file. All subsequent reloadable object - # files will link in the last one created. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - reload_objs="$objlist $last_robj" - eval concat_cmds=\"\${concat_cmds}$reload_cmds\" - if test -n "$last_robj"; then - eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" - fi - func_append delfiles " $output" - - else - output= - fi - - if ${skipped_export-false}; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $opt_dry_run || $RM $export_symbols - libobjs=$output - # Append the command to create the export file. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" - if test -n "$last_robj"; then - eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" - fi - fi - - test -n "$save_libobjs" && - func_verbose "creating a temporary reloadable object file: $output" - - # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' - for cmd in $concat_cmds; do - IFS="$save_ifs" - $opt_silent || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" - } - $opt_dry_run || eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) - fi - - exit $lt_exit - } - done - IFS="$save_ifs" - - if test -n "$export_symbols_regex" && ${skipped_export-false}; then - func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - func_show_eval '$MV "${export_symbols}T" "$export_symbols"' - fi - fi - - if ${skipped_export-false}; then - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test -n "$orig_export_symbols"; then - # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" - # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine - # though. Also, the filter scales superlinearly with the number of - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi - fi - - libobjs=$output - # Restore the value of output. - output=$save_output - - if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - fi - # Expand the library linking commands again to reset the - # value of $libobjs for piecewise linking. - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - cmds=$module_expsym_cmds - else - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - cmds=$archive_expsym_cmds - else - cmds=$archive_cmds - fi - fi - fi - - if test -n "$delfiles"; then - # Append the command to remove temporary files to $cmds. - eval cmds=\"\$cmds~\$RM $delfiles\" - fi - - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles - func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $opt_silent || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" - } - $opt_dry_run || eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) - fi - - exit $lt_exit - } - done - IFS="$save_ifs" - - # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then - $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? - - if test -n "$convenience"; then - if test -z "$whole_archive_flag_spec"; then - func_show_eval '${RM}r "$gentop"' - fi - fi - - exit $EXIT_SUCCESS - fi - - # Create links to the real library. - for linkname in $linknames; do - if test "$realname" != "$linkname"; then - func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' - fi - done - - # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then - # On all known operating systems, these are identical. - dlname="$soname" - fi - fi - ;; - - obj) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for objects" - fi - - case " $deplibs" in - *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for objects" ;; - esac - - test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for objects" - - test -n "$xrpath" && \ - func_warning "\`-R' is ignored for objects" - - test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for objects" - - test -n "$release" && \ - func_warning "\`-release' is ignored for objects" - - case $output in - *.lo) - test -n "$objs$old_deplibs" && \ - func_fatal_error "cannot build library object \`$output' from non-libtool objects" - - libobj=$output - func_lo2o "$libobj" - obj=$func_lo2o_result - ;; - *) - libobj= - obj="$output" - ;; - esac - - # Delete the old objects. - $opt_dry_run || $RM $obj $libobj - - # Objects from convenience libraries. This assumes - # single-version convenience libraries. Whenever we create - # different ones for PIC/non-PIC, this we'll have to duplicate - # the extraction. - reload_conv_objs= - gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. - wl= - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` - else - gentop="$output_objdir/${obj}x" - func_append generated " $gentop" - - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi - - # If we're not building shared, we need to use non_pic_objs - test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" - - # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - - output="$obj" - func_execute_cmds "$reload_cmds" 'exit $?' - - # Exit if we aren't doing a library object file. - if test -z "$libobj"; then - if test -n "$gentop"; then - func_show_eval '${RM}r "$gentop"' - fi - - exit $EXIT_SUCCESS - fi - - if test "$build_libtool_libs" != yes; then - if test -n "$gentop"; then - func_show_eval '${RM}r "$gentop"' - fi - - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. - # $show "echo timestamp > $libobj" - # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? - exit $EXIT_SUCCESS - fi - - if test -n "$pic_flag" || test "$pic_mode" != default; then - # Only do commands if we really have different PIC objects. - reload_objs="$libobjs $reload_conv_objs" - output="$libobj" - func_execute_cmds "$reload_cmds" 'exit $?' - fi - - if test -n "$gentop"; then - func_show_eval '${RM}r "$gentop"' - fi - - exit $EXIT_SUCCESS - ;; - - prog) - case $host in - *cygwin*) func_stripname '' '.exe' "$output" - output=$func_stripname_result.exe;; - esac - test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for programs" - - test -n "$release" && \ - func_warning "\`-release' is ignored for programs" - - test "$preload" = yes \ - && test "$dlopen_support" = unknown \ - && test "$dlopen_self" = unknown \ - && test "$dlopen_self_static" = unknown && \ - func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework - compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` - finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` - ;; - esac - - case $host in - *-*-darwin*) - # Don't allow lazy linking, it breaks C++ global constructors - # But is supposedly fixed on 10.4 or later (yay!). - if test "$tagname" = CXX ; then - case ${MACOSX_DEPLOYMENT_TARGET-10.0} in - 10.[0123]) - func_append compile_command " ${wl}-bind_at_load" - func_append finalize_command " ${wl}-bind_at_load" - ;; - esac - fi - # Time to change all our "foo.ltframework" stuff back to "-framework foo" - compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - ;; - esac - - - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $compile_deplibs " in - *" -L$path/$objdir "*) - func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $compile_deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) func_append new_libs " $deplib" ;; - esac - ;; - *) func_append new_libs " $deplib" ;; - esac - done - compile_deplibs="$new_libs" - - - func_append compile_command " $compile_deplibs" - func_append finalize_command " $finalize_deplibs" - - if test -n "$rpath$xrpath"; then - # If the user specified any rpath flags, then add them. - for libdir in $rpath $xrpath; do - # This is the magic to use -rpath. - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - done - fi - - # Now hardcode the library paths - rpath= - hardcode_libdirs= - for libdir in $compile_rpath $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) func_append perm_rpath " $libdir" ;; - esac - fi - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$libdir:"*) ;; - ::) dllsearchpath=$libdir;; - *) func_append dllsearchpath ":$libdir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; - *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - compile_rpath="$rpath" - - rpath= - hardcode_libdirs= - for libdir in $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in - *" $libdir "*) ;; - *) func_append finalize_perm_rpath " $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - finalize_rpath="$rpath" - - if test -n "$libobjs" && test "$build_old_libs" = yes; then - # Transform all the library objects into standard objects. - compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` - finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` - fi - - func_generate_dlsyms "$outputname" "@PROGRAM@" "no" - - # template prelinking step - if test -n "$prelink_cmds"; then - func_execute_cmds "$prelink_cmds" 'exit $?' - fi - - wrappers_required=yes - case $host in - *cegcc* | *mingw32ce*) - # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no - ;; - *cygwin* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi - ;; - *) - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - wrappers_required=no - fi - ;; - esac - if test "$wrappers_required" = no; then - # Replace the output file specification. - compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" - - # We have no uninstalled library dependencies, so finalize right now. - exit_status=0 - func_show_eval "$link_command" 'exit_status=$?' - - if test -n "$postlink_cmds"; then - func_to_tool_file "$output" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - - # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' - fi - - exit $exit_status - fi - - if test -n "$compile_shlibpath$finalize_shlibpath"; then - compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" - fi - if test -n "$finalize_shlibpath"; then - finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" - fi - - compile_var= - finalize_var= - if test -n "$runpath_var"; then - if test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - func_append rpath "$dir:" - done - compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - if test -n "$finalize_perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $finalize_perm_rpath; do - func_append rpath "$dir:" - done - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - fi - - if test "$no_install" = yes; then - # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" - # Replace the output file specification. - link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - # Delete the old output file. - $opt_dry_run || $RM $output - # Link the executable and exit - func_show_eval "$link_command" 'exit $?' - - if test -n "$postlink_cmds"; then - func_to_tool_file "$output" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - - exit $EXIT_SUCCESS - fi - - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - - func_warning "this platform does not like uninstalled shared libraries" - func_warning "\`$output' will be relinked during installation" - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= - fi - else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - fi - fi - - # Replace the output file specification. - link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` - - # Delete the old output files. - $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname - - func_show_eval "$link_command" 'exit $?' - - if test -n "$postlink_cmds"; then - func_to_tool_file "$output_objdir/$outputname" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - - # Now create the wrapper script. - func_verbose "creating $output" - - # Quote the relink command for shipping. - if test -n "$relink_command"; then - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" - fi - done - relink_command="(cd `pwd`; $relink_command)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - fi - - # Only actually do things if not in dry run mode. - $opt_dry_run || { - # win32 will think the script is a binary if it has - # a .exe suffix, so we strip it off here. - case $output in - *.exe) func_stripname '' '.exe' "$output" - output=$func_stripname_result ;; - esac - # test for cygwin because mv fails w/o .exe extensions - case $host in - *cygwin*) - exeext=.exe - func_stripname '' '.exe' "$outputname" - outputname=$func_stripname_result ;; - *) exeext= ;; - esac - case $host in - *cygwin* | *mingw* ) - func_dirname_and_basename "$output" "" "." - output_name=$func_basename_result - output_path=$func_dirname_result - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" - $RM $cwrappersource $cwrapper - trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 - - func_emit_cwrapperexe_src > $cwrappersource - - # The wrapper executable is built using the $host compiler, - # because it contains $host paths and files. If cross- - # compiling, it, like the target executable, must be - # executed on the $host or under an emulation environment. - $opt_dry_run || { - $LTCC $LTCFLAGS -o $cwrapper $cwrappersource - $STRIP $cwrapper - } - - # Now, create the wrapper script for func_source use: - func_ltwrapper_scriptname $cwrapper - $RM $func_ltwrapper_scriptname_result - trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 - $opt_dry_run || { - # note: this script will not be executed, so do not chmod. - if test "x$build" = "x$host" ; then - $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result - else - func_emit_wrapper no > $func_ltwrapper_scriptname_result - fi - } - ;; - * ) - $RM $output - trap "$RM $output; exit $EXIT_FAILURE" 1 2 15 - - func_emit_wrapper no > $output - chmod +x $output - ;; - esac - } - exit $EXIT_SUCCESS - ;; - esac - - # See if we need to build an old-fashioned archive. - for oldlib in $oldlibs; do - - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save $symfileobj" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" - build_libtool_libs=no - else - oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then - func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" - fi - - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $addlibs - func_append oldobjs " $func_extract_archives_result" - fi - - # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then - cmds=$old_archive_from_new_cmds - else - - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles - func_append oldobjs " $func_extract_archives_result" - fi - - # POSIX demands no paths to be encoded in archives. We have - # to avoid creating archives with duplicate basenames if we - # might have to extract them afterwards, e.g., when creating a - # static archive out of a convenience library, or when linking - # the entirety of a libtool archive into another (currently - # not supported by libtool). - if (for obj in $oldobjs - do - func_basename "$obj" - $ECHO "$func_basename_result" - done | sort | sort -uc >/dev/null 2>&1); then - : - else - echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - func_mkdir_p "$gentop" - save_oldobjs=$oldobjs - oldobjs= - counter=1 - for obj in $save_oldobjs - do - func_basename "$obj" - objbase="$func_basename_result" - case " $oldobjs " in - " ") oldobjs=$obj ;; - *[\ /]"$objbase "*) - while :; do - # Make sure we don't pick an alternate name that also - # overlaps. - newobj=lt$counter-$objbase - func_arith $counter + 1 - counter=$func_arith_result - case " $oldobjs " in - *[\ /]"$newobj "*) ;; - *) if test ! -f "$gentop/$newobj"; then break; fi ;; - esac - done - func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - func_append oldobjs " $gentop/$newobj" - ;; - *) func_append oldobjs " $obj" ;; - esac - done - fi - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 - tool_oldlib=$func_to_tool_file_result - eval cmds=\"$old_archive_cmds\" - - func_len " $cmds" - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - cmds=$old_archive_cmds - elif test -n "$archiver_list_spec"; then - func_verbose "using command file archive linking..." - for obj in $oldobjs - do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" - done > $output_objdir/$libname.libcmd - func_to_tool_file "$output_objdir/$libname.libcmd" - oldobjs=" $archiver_list_spec$func_to_tool_file_result" - cmds=$old_archive_cmds - else - # the command line is too long to link in one step, link in parts - func_verbose "using piecewise archive linking..." - save_RANLIB=$RANLIB - RANLIB=: - objlist= - concat_cmds= - save_oldobjs=$oldobjs - oldobjs= - # Is there a better way of finding the last object in the list? - for obj in $save_oldobjs - do - last_oldobj=$obj - done - eval test_cmds=\"$old_archive_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 - for obj in $save_oldobjs - do - func_len " $obj" - func_arith $len + $func_len_result - len=$func_arith_result - func_append objlist " $obj" - if test "$len" -lt "$max_cmd_len"; then - : - else - # the above command should be used before it gets too long - oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then - RANLIB=$save_RANLIB - fi - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" - objlist= - len=$len0 - fi - done - RANLIB=$save_RANLIB - oldobjs=$objlist - if test "X$oldobjs" = "X" ; then - eval cmds=\"\$concat_cmds\" - else - eval cmds=\"\$concat_cmds~\$old_archive_cmds\" - fi - fi - fi - func_execute_cmds "$cmds" 'exit $?' - done - - test -n "$generated" && \ - func_show_eval "${RM}r$generated" - - # Now create the libtool archive. - case $output in - *.la) - old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" - func_verbose "creating $output" - - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" - fi - done - # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then - relink_command= - fi - - # Only create the output if not a dry run. - $opt_dry_run || { - for installed in no yes; do - if test "$installed" = yes; then - if test -z "$install_libdir"; then - break - fi - output="$output_objdir/$outputname"i - # Replace all uninstalled libtool libraries with the installed ones - newdependency_libs= - for deplib in $dependency_libs; do - case $deplib in - *.la) - func_basename "$deplib" - name="$func_basename_result" - func_resolve_sysroot "$deplib" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" - func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" - ;; - -L*) - func_stripname -L '' "$deplib" - func_replace_sysroot "$func_stripname_result" - func_append newdependency_libs " -L$func_replace_sysroot_result" - ;; - -R*) - func_stripname -R '' "$deplib" - func_replace_sysroot "$func_stripname_result" - func_append newdependency_libs " -R$func_replace_sysroot_result" - ;; - *) func_append newdependency_libs " $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" - newdlfiles= - - for lib in $dlfiles; do - case $lib in - *.la) - func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" - func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" - ;; - *) func_append newdlfiles " $lib" ;; - esac - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - case $lib in - *.la) - # Only pass preopened files to the pseudo-archive (for - # eventual linking with the app. that links it) if we - # didn't already link the preopened objects directly into - # the library: - func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" - func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" - ;; - esac - done - dlprefiles="$newdlprefiles" - else - newdlfiles= - for lib in $dlfiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - func_append newdlfiles " $abs" - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - func_append newdlprefiles " $abs" - done - dlprefiles="$newdlprefiles" - fi - $RM $output - # place dlname in correct position for cygwin - # In fact, it would be nice if we could use this code for all target - # systems that can't hard-code library paths into their executables - # and that have no shared library path variable independent of PATH, - # but it turns out we can't easily determine that from inspecting - # libtool variables, so we have to hard-code the OSs to which it - # applies here; at the moment, that means platforms that use the PE - # object format with DLL files. See the long comment at the top of - # tests/bindir.at for full details. - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) - # If a -bindir argument was supplied, place the dll there. - if test "x$bindir" != x ; - then - func_relative_path "$install_libdir" "$bindir" - tdlname=$func_relative_path_result$dlname - else - # Otherwise fall back on heuristic. - tdlname=../bin/$dlname - fi - ;; - esac - $ECHO > $output "\ -# $outputname - a libtool library file -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='$tdlname' - -# Names of this library. -library_names='$library_names' - -# The name of the static archive. -old_library='$old_library' - -# Linker flags that can not go in dependency_libs. -inherited_linker_flags='$new_inherited_linker_flags' - -# Libraries that this one depends upon. -dependency_libs='$dependency_libs' - -# Names of additional weak libraries provided by this library -weak_library_names='$weak_libs' - -# Version information for $libname. -current=$current -age=$age -revision=$revision - -# Is this an already installed library? -installed=$installed - -# Should we warn about portability when linking against -modules? -shouldnotlink=$module - -# Files to dlopen/dlpreopen -dlopen='$dlfiles' -dlpreopen='$dlprefiles' - -# Directory that this library needs to be installed in: -libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then - $ECHO >> $output "\ -relink_command=\"$relink_command\"" - fi - done - } - - # Do a symbolic link so that the libtool archive can be found in - # LD_LIBRARY_PATH before the program is installed. - func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?' - ;; - esac - exit $EXIT_SUCCESS -} - -{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} - - -# func_mode_uninstall arg... -func_mode_uninstall () -{ - $opt_debug - RM="$nonopt" - files= - rmforce= - exit_status=0 - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - for arg - do - case $arg in - -f) func_append RM " $arg"; rmforce=yes ;; - -*) func_append RM " $arg" ;; - *) func_append files " $arg" ;; - esac - done - - test -z "$RM" && \ - func_fatal_help "you must specify an RM program" - - rmdirs= - - for file in $files; do - func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then - odir="$objdir" - else - odir="$dir/$objdir" - fi - func_basename "$file" - name="$func_basename_result" - test "$opt_mode" = uninstall && odir="$dir" - - # Remember odir for removal later, being careful to avoid duplicates - if test "$opt_mode" = clean; then - case " $rmdirs " in - *" $odir "*) ;; - *) func_append rmdirs " $odir" ;; - esac - fi - - # Don't error if the file doesn't exist and rm -f was used. - if { test -L "$file"; } >/dev/null 2>&1 || - { test -h "$file"; } >/dev/null 2>&1 || - test -f "$file"; then - : - elif test -d "$file"; then - exit_status=1 - continue - elif test "$rmforce" = yes; then - continue - fi - - rmfiles="$file" - - case $name in - *.la) - # Possibly a libtool archive, so verify it. - if func_lalib_p "$file"; then - func_source $dir/$name - - # Delete the libtool libraries and symlinks. - for n in $library_names; do - func_append rmfiles " $odir/$n" - done - test -n "$old_library" && func_append rmfiles " $odir/$old_library" - - case "$opt_mode" in - clean) - case " $library_names " in - *" $dlname "*) ;; - *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; - esac - test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" - ;; - uninstall) - if test -n "$library_names"; then - # Do each command in the postuninstall commands. - func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' - fi - - if test -n "$old_library"; then - # Do each command in the old_postuninstall commands. - func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' - fi - # FIXME: should reinstall the best remaining shared library. - ;; - esac - fi - ;; - - *.lo) - # Possibly a libtool object, so verify it. - if func_lalib_p "$file"; then - - # Read the .lo file - func_source $dir/$name - - # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then - func_append rmfiles " $dir/$pic_object" - fi - - # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then - func_append rmfiles " $dir/$non_pic_object" - fi - fi - ;; - - *) - if test "$opt_mode" = clean ; then - noexename=$name - case $file in - *.exe) - func_stripname '' '.exe' "$file" - file=$func_stripname_result - func_stripname '' '.exe' "$name" - noexename=$func_stripname_result - # $file with .exe has already been added to rmfiles, - # add $file without .exe - func_append rmfiles " $file" - ;; - esac - # Do a test to see if this is a libtool program. - if func_ltwrapper_p "$file"; then - if func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - relink_command= - func_source $func_ltwrapper_scriptname_result - func_append rmfiles " $func_ltwrapper_scriptname_result" - else - relink_command= - func_source $dir/$noexename - fi - - # note $name still contains .exe if it was in $file originally - # as does the version of $file that was added into $rmfiles - func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then - func_append rmfiles " $odir/lt-$name" - fi - if test "X$noexename" != "X$name" ; then - func_append rmfiles " $odir/lt-${noexename}.c" - fi - fi - fi - ;; - esac - func_show_eval "$RM $rmfiles" 'exit_status=1' - done - - # Try to remove the ${objdir}s in the directories where we deleted files - for dir in $rmdirs; do - if test -d "$dir"; then - func_show_eval "rmdir $dir >/dev/null 2>&1" - fi - done - - exit $exit_status -} - -{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} - -test -z "$opt_mode" && { - help="$generic_help" - func_fatal_help "you must specify a MODE" -} - -test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$opt_mode'" - -if test -n "$exec_cmd"; then - eval exec "$exec_cmd" - exit $EXIT_FAILURE -fi - -exit $exit_status - - -# The TAGs below are defined such that we never get into a situation -# in which we disable both kinds of libraries. Given conflicting -# choices, we go for a static library, that is the most portable, -# since we can't tell whether shared libraries were disabled because -# the user asked for that or because the platform doesn't support -# them. This is particularly important on AIX, because we don't -# support having both static and shared libraries enabled at the same -# time on that platform, so we default to a shared-only configuration. -# If a disable-shared tag is given, we'll fallback to a static-only -# configuration. But we'll never go from static-only to shared-only. - -# ### BEGIN LIBTOOL TAG CONFIG: disable-shared -build_libtool_libs=no -build_old_libs=yes -# ### END LIBTOOL TAG CONFIG: disable-shared - -# ### BEGIN LIBTOOL TAG CONFIG: disable-static -build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` -# ### END LIBTOOL TAG CONFIG: disable-static - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: -# vi:sw=2 - diff -Nru almanah-0.11.1/Makefile.am almanah-0.12.0/Makefile.am --- almanah-0.11.1/Makefile.am 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,65 +0,0 @@ -SUBDIRS = src po data - -EXTRA_DIST = \ - autogen.sh \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in \ - README \ - COPYING \ - AUTHORS \ - NEWS \ - MAINTAINERS \ - ChangeLog.pre-git \ - almanah.doap - -DISTCLEANFILES = \ - intltool-extract \ - intltool-merge \ - intltool-update - -MAINTAINERCLEANFILES = \ - $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \ - $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \ - INSTALL \ - config.h.in \ - ABOUT-NLS \ - config.rpath \ - po/Makevars.template \ - po/Rules-quot \ - po/boldquot.sed \ - po/en@boldquot.header \ - po/en@quot.header \ - po/insert-header.sin \ - po/quot.sed \ - po/remove-potcdate.sin \ - $(NULL) - -# Copy all the spec files. Of course, only one is actually used. -dist-hook: - for specfile in *.spec; do \ - if test -f $$specfile; then \ - cp -p $$specfile $(distdir); \ - fi \ - done - -# ChangeLog -ChangeLog: $(srcdir)/ChangeLog -$(srcdir)/ChangeLog: - $(AM_V_GEN)(if test -d "$(srcdir)/.git"; then \ - (GIT_DIR=$(top_srcdir)/.git ./missing --run \ - git log d8d3d82934d1627da5e49c8784b5297e27550e69.. --stat) | fmt --split-only > $@.tmp \ - && mv -f $@.tmp $@ \ - || ($(RM) $@.tmp; \ - echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \ - (test -f $@ || echo git-log is required to generate this file >> $@)); \ - else \ - test -f $@ || \ - (echo A git checkout and git-log is required to generate ChangeLog >&2 && \ - echo A git checkout and git-log is required to generate this file >> $@); \ - fi) -.PHONY: $(srcdir)/ChangeLog - -MAINTAINERCLEANFILES += ChangeLog - --include $(top_srcdir)/git.mk diff -Nru almanah-0.11.1/Makefile.in almanah-0.12.0/Makefile.in --- almanah-0.11.1/Makefile.in 2014-09-24 18:32:46.000000000 +0000 +++ almanah-0.12.0/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,890 +0,0 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = . -DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in COPYING compile config.guess config.sub \ - depcomp install-sh missing ltmain.sh -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno config.status.lineno -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ - ctags-recursive dvi-recursive html-recursive info-recursive \ - install-data-recursive install-dvi-recursive \ - install-exec-recursive install-html-recursive \ - install-info-recursive install-pdf-recursive \ - install-ps-recursive install-recursive installcheck-recursive \ - installdirs-recursive pdf-recursive ps-recursive \ - tags-recursive uninstall-recursive -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -am__recursive_targets = \ - $(RECURSIVE_TARGETS) \ - $(RECURSIVE_CLEAN_TARGETS) \ - $(am__extra_recursive_targets) -AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - cscope distdir dist dist-all distcheck -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ - $(LISP)config.h.in -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -CSCOPE = cscope -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - if test -d "$(distdir)"; then \ - find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -rf "$(distdir)" \ - || { sleep 5 && rm -rf "$(distdir)"; }; \ - else :; fi -am__post_remove_distdir = $(am__remove_distdir) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -GZIP_ENV = --best -DIST_ARCHIVES = $(distdir).tar.bz2 -DIST_TARGETS = dist-bzip2 -distuninstallcheck_listfiles = find . -type f -print -am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ - | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' -distcleancheck_listfiles = find . -type f -print -ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPDATA_VALIDATE = @APPDATA_VALIDATE@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENCRYPTION_CFLAGS = @ENCRYPTION_CFLAGS@ -ENCRYPTION_LIBS = @ENCRYPTION_LIBS@ -EVO_CFLAGS = @EVO_CFLAGS@ -EVO_LIBS = @EVO_LIBS@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ -GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GLIB_MKENUMS = @GLIB_MKENUMS@ -GMSGFMT = @GMSGFMT@ -GPGME_CONFIG = @GPGME_CONFIG@ -GREP = @GREP@ -GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MSGFMT = @MSGFMT@ -MSGMERGE = @MSGMERGE@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPELL_CHECKING_CFLAGS = @SPELL_CHECKING_CFLAGS@ -SPELL_CHECKING_LIBS = @SPELL_CHECKING_LIBS@ -STANDARD_CFLAGS = @STANDARD_CFLAGS@ -STANDARD_LIBS = @STANDARD_LIBS@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -appdataxmldir = @appdataxmldir@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gsettingsschemadir = @gsettingsschemadir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -SUBDIRS = src po data -EXTRA_DIST = \ - autogen.sh \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in \ - README \ - COPYING \ - AUTHORS \ - NEWS \ - MAINTAINERS \ - ChangeLog.pre-git \ - almanah.doap - -DISTCLEANFILES = \ - intltool-extract \ - intltool-merge \ - intltool-update - -MAINTAINERCLEANFILES = $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \ - $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) INSTALL \ - config.h.in ABOUT-NLS config.rpath po/Makevars.template \ - po/Rules-quot po/boldquot.sed po/en@boldquot.header \ - po/en@quot.header po/insert-header.sin po/quot.sed \ - po/remove-potcdate.sin $(NULL) ChangeLog -all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - -.SUFFIXES: -am--refresh: Makefile - @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ - $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - -$(top_srcdir)/configure: $(am__configure_deps) - $(am__cd) $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -$(am__aclocal_m4_deps): - -config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi - -stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status config.h -$(srcdir)/config.h.in: $(am__configure_deps) - ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) - rm -f stamp-h1 - touch $@ - -distclean-hdr: - -rm -f config.h stamp-h1 - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool config.lt - -# This directory's subdirectories are mostly independent; you can cd -# into them and run 'make' without going through this Makefile. -# To change the values of 'make' variables: instead of editing Makefiles, -# (1) if the variable is set in 'config.status', edit 'config.status' -# (which will cause the Makefiles to be regenerated when you run 'make'); -# (2) otherwise, pass the desired values on the 'make' command line. -$(am__recursive_targets): - @fail=; \ - if $(am__make_keepgoing); then \ - failcom='fail=yes'; \ - else \ - failcom='exit 1'; \ - fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-recursive -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-recursive - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscope: cscope.files - test ! -s cscope.files \ - || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) -clean-cscope: - -rm -f cscope.files -cscope.files: clean-cscope cscopelist -cscopelist: cscopelist-recursive - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -rm -f cscope.out cscope.in.out cscope.po.out cscope.files - -distdir: $(DISTFILES) - @case `sed 15q $(srcdir)/NEWS` in \ - *"$(VERSION)"*) : ;; \ - *) \ - echo "NEWS not updated; not releasing" 1>&2; \ - exit 1;; \ - esac - $(am__remove_distdir) - test -d "$(distdir)" || mkdir "$(distdir)" - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - $(am__make_dryrun) \ - || test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook - -test -n "$(am__skip_mode_fix)" \ - || find "$(distdir)" -type d ! -perm -755 \ - -exec chmod u+rwx,go+rx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r "$(distdir)" -dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__post_remove_distdir) -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__post_remove_distdir) - -dist-lzip: distdir - tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__post_remove_distdir) - -dist-xz: distdir - tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__post_remove_distdir) - -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__post_remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__post_remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__post_remove_distdir) - -dist dist-all: - $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' - $(am__post_remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lz*) \ - lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ - *.tar.xz*) \ - xz -dc $(distdir).tar.xz | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir) - chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst - chmod a-w $(distdir) - test -d $(distdir)/_build || exit 0; \ - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(AM_DISTCHECK_CONFIGURE_FLAGS) \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ - && cd "$$am__cwd" \ - || exit 1 - $(am__post_remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' -distuninstallcheck: - @test -n '$(distuninstallcheck_dir)' || { \ - echo 'ERROR: trying to run $@ with an empty' \ - '$$(distuninstallcheck_dir)' >&2; \ - exit 1; \ - }; \ - $(am__cd) '$(distuninstallcheck_dir)' || { \ - echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ - exit 1; \ - }; \ - test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 -check-am: all-am -check: check-recursive -all-am: Makefile config.h -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-hdr \ - distclean-libtool distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: - -.MAKE: $(am__recursive_targets) all install-am install-strip - -.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ - am--refresh check check-am clean clean-cscope clean-generic \ - clean-libtool cscope cscopelist-am ctags ctags-am dist \ - dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \ - dist-tarZ dist-xz dist-zip distcheck distclean \ - distclean-generic distclean-hdr distclean-libtool \ - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am - - -# Copy all the spec files. Of course, only one is actually used. -dist-hook: - for specfile in *.spec; do \ - if test -f $$specfile; then \ - cp -p $$specfile $(distdir); \ - fi \ - done - -# ChangeLog -ChangeLog: $(srcdir)/ChangeLog -$(srcdir)/ChangeLog: - $(AM_V_GEN)(if test -d "$(srcdir)/.git"; then \ - (GIT_DIR=$(top_srcdir)/.git ./missing --run \ - git log d8d3d82934d1627da5e49c8784b5297e27550e69.. --stat) | fmt --split-only > $@.tmp \ - && mv -f $@.tmp $@ \ - || ($(RM) $@.tmp; \ - echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \ - (test -f $@ || echo git-log is required to generate this file >> $@)); \ - else \ - test -f $@ || \ - (echo A git checkout and git-log is required to generate ChangeLog >&2 && \ - echo A git checkout and git-log is required to generate this file >> $@); \ - fi) -.PHONY: $(srcdir)/ChangeLog - --include $(top_srcdir)/git.mk - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru almanah-0.11.1/meson.build almanah-0.12.0/meson.build --- almanah-0.11.1/meson.build 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.12.0/meson.build 2019-10-07 13:45:09.000000000 +0000 @@ -0,0 +1,132 @@ +project( + 'almanah', + 'c', + license: 'GPL3+', + version: '0.12.0', + default_options: [ + 'b_ndebug=if-release', + ], + meson_version: '>= 0.47', +) + +cc = meson.get_compiler('c') +gnome = import('gnome') +i18n = import('i18n') +python3 = import('python3') +# TODO: switch to python module once meson 0.50 is released +# https://github.com/mesonbuild/meson/issues/4070 +python = python3.find_python().path() +data_dir = join_paths(meson.source_root(), 'data') +po_dir = join_paths(meson.source_root(), 'po') + +prefix = get_option('prefix') +datadir = join_paths(prefix, get_option('datadir')) +icondir = join_paths(datadir, 'icons', 'hicolor') +localedir = join_paths(prefix, get_option('localedir')) +pkgdatadir = join_paths(datadir, meson.project_name()) +schemadir = join_paths(datadir, 'glib-2.0', 'schemas') +convertdir = join_paths(datadir, 'GConf', 'gsettings') + +# Dependencies +glib = dependency('glib-2.0') +gtk = dependency('gtk+-3.0', version: '>= 3.15') +gmodule = dependency('gmodule-2.0') +gthread = dependency('gthread-2.0') +gio = dependency('gio-2.0', version: '>= 2.32') +gtksourceview = dependency('gtksourceview-3.0') +sqlite = dependency('sqlite3') +cairo = dependency('cairo') +atk = dependency('atk') +gcr = dependency('gcr-base-3') +cryptui = dependency('cryptui-0.0') + +# Options +evolution_support = get_option('evolution') +spell_checking_support = get_option('spell_checking') + +# Check for GPGME, which doesn't provide a pkgconfig file +# This code courtesy of seahorse +# TODO: replace this with native meson checking after +# https://github.com/mesonbuild/meson/pull/5213 is merged +min_gpgme_version = '1.0.0' +gpgme = cc.find_library('gpgme') +gpgme_config = find_program('gpgme-config') +gpg_check_version = find_program(join_paths('build-aux', 'gpg_check_version.py')) +gpgme_version_check = run_command([python, gpg_check_version, gpgme_config.path(), 'true', min_gpgme_version ]) +gpgme_version = gpgme_version_check.stdout() +message('GPGME version: @0@'.format(gpgme_version)) +if gpgme_version_check.returncode() != 0 + error('Incompatible version of GPGME. Minimal version required is @0@'.format(min_gpgme_version)) +endif + +libecal = dependency('libecal-2.0', version: '>= 3.33.2', required: evolution_support) +libedataserver = dependency('libedataserver-1.2', version: '>= 2.28', required: evolution_support) +have_evolution = libecal.found() and libedataserver.found() + +gtkspell = dependency('gtkspell3-3.0', required: spell_checking_support) +have_spell_check = gtkspell.found() + +appstream_util = find_program('appstream-util', required: false) +desktop_file_validate = find_program('desktop-file-validate', required: false) + +almanah_deps = [ + glib, + gtk, + gmodule, + gthread, + gio, + gtksourceview, + sqlite, + cairo, + atk, + gcr, + cryptui, + gpgme, + libecal, + libedataserver, + gtkspell, +] + +# configuration +conf = configuration_data() +conf.set_quoted('VERSION', '@VCS_TAG@') +conf.set_quoted('PACKAGE_NAME', meson.project_name()) +conf.set_quoted('PACKAGE_URL', 'https://wiki.gnome.org/Apps/Almanah_Diary') +conf.set_quoted('PACKAGE_DATA_DIR', pkgdatadir) +conf.set_quoted('PACKAGE_LOCALE_DIR', localedir) +conf.set_quoted('MIN_GPGME_VERSION', min_gpgme_version) +conf.set_quoted('GETTEXT_PACKAGE', meson.project_name()) +if get_option('buildtype').contains('debug') + conf.set('ENABLE_DEBUG', 1) +endif +if have_spell_check + conf.set('ENABLE_SPELL_CHECKING', 1) +endif +if have_evolution + conf.set('HAVE_EVO', 1) + # FIXME: We haven’t kept up to date with the post-3.8 deprecations yet: + # https://gitlab.gnome.org/GNOME/almanah/issues/1 + #conf.set('EDS_DISABLE_DEPRECATED', 1) +endif + +config = vcs_tag( + input: configure_file( + output: 'config.h.in', + configuration: conf, + ), + output: 'config.h', +) + +# Post-install scripts +meson.add_install_script( + python, + join_paths(meson.source_root(), 'build-aux', 'post_install.py'), + icondir, + schemadir, +) + +# Subfolders +subdir('data') +subdir('src') +subdir('po') +subdir('tests') diff -Nru almanah-0.11.1/meson_options.txt almanah-0.12.0/meson_options.txt --- almanah-0.11.1/meson_options.txt 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.12.0/meson_options.txt 2019-10-07 13:45:09.000000000 +0000 @@ -0,0 +1,2 @@ +option('evolution', type: 'feature', value: 'enabled', description: 'Enable Evolution calendar integration') +option('spell_checking', type: 'feature', value: 'enabled', description: 'Enable spell checking support') diff -Nru almanah-0.11.1/missing almanah-0.12.0/missing --- almanah-0.11.1/missing 2014-09-24 17:34:08.000000000 +0000 +++ almanah-0.12.0/missing 1970-01-01 00:00:00.000000000 +0000 @@ -1,215 +0,0 @@ -#! /bin/sh -# Common wrapper for a few potentially missing GNU programs. - -scriptversion=2012-06-26.16; # UTC - -# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Originally written by Fran,cois Pinard , 1996. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try '$0 --help' for more information" - exit 1 -fi - -case $1 in - - --is-lightweight) - # Used by our autoconf macros to check whether the available missing - # script is modern enough. - exit 0 - ;; - - --run) - # Back-compat with the calling convention used by older automake. - shift - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due -to PROGRAM being missing or too old. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - -Supported PROGRAM values: - aclocal autoconf autoheader autom4te automake makeinfo - bison yacc flex lex help2man - -Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and -'g' are ignored when checking the name. - -Send bug reports to ." - exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit $? - ;; - - -*) - echo 1>&2 "$0: unknown '$1' option" - echo 1>&2 "Try '$0 --help' for more information" - exit 1 - ;; - -esac - -# Run the given program, remember its exit status. -"$@"; st=$? - -# If it succeeded, we are done. -test $st -eq 0 && exit 0 - -# Also exit now if we it failed (or wasn't found), and '--version' was -# passed; such an option is passed most likely to detect whether the -# program is present and works. -case $2 in --version|--help) exit $st;; esac - -# Exit code 63 means version mismatch. This often happens when the user -# tries to use an ancient version of a tool on a file that requires a -# minimum version. -if test $st -eq 63; then - msg="probably too old" -elif test $st -eq 127; then - # Program was missing. - msg="missing on your system" -else - # Program was found and executed, but failed. Give up. - exit $st -fi - -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software - -program_details () -{ - case $1 in - aclocal|automake) - echo "The '$1' program is part of the GNU Automake package:" - echo "<$gnu_software_URL/automake>" - echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/autoconf>" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - autoconf|autom4te|autoheader) - echo "The '$1' program is part of the GNU Autoconf package:" - echo "<$gnu_software_URL/autoconf/>" - echo "It also requires GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - esac -} - -give_advice () -{ - # Normalize program name to check for. - normalized_program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - - printf '%s\n' "'$1' is $msg." - - configure_deps="'configure.ac' or m4 files included by 'configure.ac'" - case $normalized_program in - autoconf*) - echo "You should only need it if you modified 'configure.ac'," - echo "or m4 files included by it." - program_details 'autoconf' - ;; - autoheader*) - echo "You should only need it if you modified 'acconfig.h' or" - echo "$configure_deps." - program_details 'autoheader' - ;; - automake*) - echo "You should only need it if you modified 'Makefile.am' or" - echo "$configure_deps." - program_details 'automake' - ;; - aclocal*) - echo "You should only need it if you modified 'acinclude.m4' or" - echo "$configure_deps." - program_details 'aclocal' - ;; - autom4te*) - echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." - program_details 'autom4te' - ;; - bison*|yacc*) - echo "You should only need it if you modified a '.y' file." - echo "You may want to install the GNU Bison package:" - echo "<$gnu_software_URL/bison/>" - ;; - lex*|flex*) - echo "You should only need it if you modified a '.l' file." - echo "You may want to install the Fast Lexical Analyzer package:" - echo "<$flex_URL>" - ;; - help2man*) - echo "You should only need it if you modified a dependency" \ - "of a man page." - echo "You may want to install the GNU Help2man package:" - echo "<$gnu_software_URL/help2man/>" - ;; - makeinfo*) - echo "You should only need it if you modified a '.texi' file, or" - echo "any other file indirectly affecting the aspect of the manual." - echo "You might want to install the Texinfo package:" - echo "<$gnu_software_URL/texinfo/>" - echo "The spurious makeinfo call might also be the consequence of" - echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" - echo "want to install GNU make:" - echo "<$gnu_software_URL/make/>" - ;; - *) - echo "You might have modified some files without having the proper" - echo "tools for further handling them. Check the 'README' file, it" - echo "often tells you about the needed prerequisites for installing" - echo "this package. You may also peek at any GNU archive site, in" - echo "case some other package contains this missing '$1' program." - ;; - esac -} - -give_advice "$1" | sed -e '1s/^/WARNING: /' \ - -e '2,$s/^/ /' >&2 - -# Propagate the correct exit status (expected to be 127 for a program -# not found, 63 for a program that failed due to version mismatch). -exit $st - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff -Nru almanah-0.11.1/NEWS almanah-0.12.0/NEWS --- almanah-0.11.1/NEWS 2014-09-24 17:37:32.000000000 +0000 +++ almanah-0.12.0/NEWS 2019-10-07 13:45:09.000000000 +0000 @@ -1,19 +1,56 @@ -Overview of changes from Almanah 0.11.0 to Almanah 0.11.1 +Overview of changes from Almanah 0.11.0 to Almanah 0.12.0 ========================================================= -Major changes: -* Improved AppData support for Software App. +* Move encryption support to SQLiteVFS to improve performance and reduce the + chance of data loss from use of temporary files -Update translations: -* Czech (Marek Černocký) -* French (Michael Scherer) -* German (Benjamin St) -* Greek (Dimitris Spingos) -* Hungarian (Balázs Úr) -* Indonesian (Andika Triwidada) -* Slovenian (Matej Urbančič) -* Serbian (Мирослав Николић) -* Turkish (Muhammet Kara) +* Various GTK version and API updates + - Migrated from GtkToolbar to GtkHeaderBar + +* Various AppData file updates + +* Support undo and redo + +* Port to Meson + +* Port to libecal-2.0 + +* Bugs fixed: + - #1 Meson build claims implicit function declaration warnings + - !1 build: Port to meson + - !4 docs: Port README to Markdown and update it + - !5 event-factories: Fix an incorrect string comparison + +* Translation updates: + - Arabic + - Bokmål, Norwegian + - Bosnian + - Catalan + - Chinese (China) + - Czech + - Danish + - Dutch + - English (United Kingdom) + - Esperanto + - Finnish + - French + - Friulian + - German + - Greek, Modern (1453-) + - Hungarian + - Indonesian + - Occitan (post 1500) + - Polish + - Portuguese + - Portuguese (Brazil) + - Russian + - Serbian + - Slovenian + - Spanish + - Swedish + - Thai + - Turkish + - Ukrainian Overview of changes from Almanah 0.10.8 to Almanah 0.11.0 ========================================================= diff -Nru almanah-0.11.1/po/ar.po almanah-0.12.0/po/ar.po --- almanah-0.11.1/po/ar.po 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/ar.po 2019-10-07 13:45:09.000000000 +0000 @@ -11,6 +11,7 @@ "PO-Revision-Date: 2008-08-02 10:10+0100\n" "Last-Translator: Djihed Afifi \n" "Language-Team: Arabeyes \n" +"Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru almanah-0.11.1/po/bs.po almanah-0.12.0/po/bs.po --- almanah-0.11.1/po/bs.po 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.12.0/po/bs.po 2019-10-07 13:45:09.000000000 +0000 @@ -0,0 +1,732 @@ +# Bosnian translation for bosnianuniversetranslation +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the bosnianuniversetranslation package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: bosnianuniversetranslation\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=almanah&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2015-02-27 03:33+0000\n" +"PO-Revision-Date: 2015-03-03 00:22+0100\n" +"Last-Translator: Samir Ribić \n" +"Language-Team: Bosnian \n" +"Language: bs\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%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Poedit 1.7.4\n" +"X-Launchpad-Export-Date: 2015-02-15 06:15+0000\n" + +#: ../data/almanah.appdata.xml.in.h:1 +msgid "" +"Almanah Diary is an application to allow you to keep a diary of your life." +msgstr "" +"Almanah dnevnik je aplikacija koja vam omogućava pisanje dnevnika o vašem " +"životu." + +#: ../data/almanah.appdata.xml.in.h:2 +msgid "" +"You can encrypt the diary to preserve your privacy. It has editing " +"abilities, including text formatting and printing and shows you a lists of " +"events which happened (on your computer) for each day (such as tasks and " +"appointments from Evolution)." +msgstr "" +"Dnevnik možete šifrirati da biste zaštitili vašu privatnost. Moguće je " +"vršiti razna uređivanja uključujući i formatiranje teksta i štampanje, a " +"moguće je i izvršiti prikaz liste proteklih događaja (na vašem računaru) za " +"svaki dan posebno (kao što su zadaci i sastanci iz Evolutiona)." + +#: ../data/almanah.desktop.in.h:1 ../src/application.c:133 +#: ../src/main-window.c:144 +msgid "Almanah Diary" +msgstr "Almanah dnevnik" + +#: ../data/almanah.desktop.in.h:2 +msgid "Keep a personal diary" +msgstr "Pišite lični dnevnik" + +#. Translators: This is the default nami of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. +#: ../data/almanah.desktop.in.h:3 ../src/application.c:272 +msgid "Diary" +msgstr "Dnevnik" + +#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../data/almanah.desktop.in.h:5 +msgid "diary;journal;" +msgstr "dnevnik;" + +#: ../src/ui/almanah.ui.h:1 +msgid "Calendar" +msgstr "Kalendar" + +#: ../src/ui/almanah.ui.h:2 +msgid "Go to Today" +msgstr "Idi na današnji dan" + +#: ../src/ui/almanah.ui.h:3 +msgid "Select Date…" +msgstr "Odaberite datum…" + +#: ../src/ui/almanah.ui.h:4 +msgid "Entry editing area" +msgstr "Oblast za uređivanje unosa" + +#: ../src/ui/almanah.ui.h:5 +msgid "Past events" +msgstr "Protekli događaji" + +#: ../src/ui/almanah.ui.h:6 +msgid "Past Event List" +msgstr "Lista proteklih događaja" + +#: ../src/ui/almanah.ui.h:7 +msgid "Search entry" +msgstr "Pretraga unosa" + +#: ../src/ui/almanah.ui.h:8 ../src/search-dialog.c:69 +msgid "Search" +msgstr "Pretraži" + +#: ../src/ui/almanah.ui.h:9 +msgid "Result List" +msgstr "Lista rezultata" + +#: ../src/ui/almanah.ui.h:10 +msgid "View Entry" +msgstr "Pogledaj unos" + +#: ../src/ui/almanah.ui.h:11 +msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." +msgstr "npr. \"14/03/2009\" or \"14-ti mart 2009.\"." + +#: ../src/ui/almanah.ui.h:12 +msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." +msgstr "" +"npr. “http://google.com/” ili “file:///home/korisnik/fotografije/fotografija." +"jpg”." + +#: ../src/ui/almanah.ui.h:13 +msgid "Successful Entries" +msgstr "Uspješni unosi" + +#: ../src/ui/almanah.ui.h:14 +msgid "Merged Entries" +msgstr "Spojeni unosi" + +#: ../src/ui/almanah.ui.h:15 +msgid "Failed Entries" +msgstr "Neuspjeli unosi" + +#: ../src/ui/almanah.ui.h:16 +msgid "Import Results List" +msgstr "Uvoz liste rezultata" + +#: ../data/org.gnome.almanah.gschema.xml.in.h:1 +msgid "Database encryption key ID" +msgstr "Broj ključa za šifriranje baze podataka" + +#: ../data/org.gnome.almanah.gschema.xml.in.h:2 +msgid "" +"The ID of the key to use to encrypt and decrypt the database, if Almanah has " +"been built with encryption support. Leave blank to disable database " +"encryption." +msgstr "" +"Broj (ID) ključa korištenog za šifriranje i dešifriranje baze podataka, ako " +"je Almanah kreiran tako da podržava šifriranje. Ostavite prazno ako želite " +"onemogućiti šifriranje baze podataka." + +#: ../data/org.gnome.almanah.gschema.xml.in.h:3 +msgid "Spell checking language" +msgstr "Jezik za provjeru pravopisa" + +#: ../data/org.gnome.almanah.gschema.xml.in.h:4 +msgid "The locale specifier of the language in which to check entry spellings." +msgstr "" +"Specifikator lokalizacije za jezik za koji će se vršiti provjera pravopisa." + +#: ../data/org.gnome.almanah.gschema.xml.in.h:5 +msgid "Spell checking enabled?" +msgstr "Provjera pravopisa omogućena?" + +#: ../data/org.gnome.almanah.gschema.xml.in.h:6 +msgid "Whether spell checking of entries is enabled." +msgstr "Da li je omogućena provjera pravopisa za unose." + +#: ../src/application.c:255 +msgid "Error opening database" +msgstr "Greška pri otvaranju baze" + +#: ../src/application.c:332 +msgid "Enable debug mode" +msgstr "Omogući debug mod" + +#: ../src/application.c:349 +msgid "" +"Manage your diary. Only one instance of the program may be open at any time." +msgstr "" +"Pazite na vaš dnevnik. Samo jedna instanca programa može biti pokrenuta u " +"bilo kojem trenutku." + +#. Print an error +#: ../src/application.c:360 +#, c-format +msgid "Command line options could not be parsed: %s\n" +msgstr "Opcije komandne linije nisu mogle biti rasčlanjene: %s\n" + +#: ../src/application.c:379 +msgid "Error encrypting database" +msgstr "Greška pri šifriranju baze podataka" + +#: ../src/application.c:521 +msgid "" +"Almanah is free software: you can redistribute it and/or modify it under the " +"terms of the GNU General Public License as published by the Free Software " +"Foundation, either version 3 of the License, or (at your option) any later " +"version." +msgstr "" +"Almanah je softver otvorenog koda: možete ga redistribuirati/prilagođavati " +"pod uslovima GNU Opće javne licence verzije 3, ili (po vašem izboru) bilo " +"koje novije verzije, objavljene od strane Free Software Foundationa." + +#: ../src/application.c:525 +msgid "" +"Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " +"details." +msgstr "" +"Almanah se distribuira u nadi da će nekome biti od koristi, ali BEZ BILO " +"KAKVIH GARANCIJA; čak i bez podrazumijevane KOMERCIJALIZACIJSKE garancije " +"ili POGODNOSTI ZA ODREĐENU NAMJENU. Za više informacija, pogledajte GNU Opću " +"javnu licencu." + +#: ../src/application.c:529 +msgid "" +"You should have received a copy of the GNU General Public License along with " +"Almanah. If not, see ." +msgstr "" +"Kopiju GNU Opće javne licence trebali ste dobiti zajedno sa Almanahom. Ako " +"to nije slučaj, posjetite ." + +#: ../src/application.c:544 +#, c-format +msgid "A helpful diary keeper, storing %u entries." +msgstr "Praktični dnevnik, pohranjuje %u unosa." + +#: ../src/application.c:548 +msgid "Copyright © 2008-2009 Philip Withnall" +msgstr "Sva prava zadržana © 2008-2009 Philip Withnall" + +#. Translators: please include your names here to bje credited for your hard work! +#. * Format: +#. * "Translator nami 1 \n" +#. * "Translator nami 2 " +#. +#: ../src/application.c:556 +msgid "translator-credits" +msgstr "" +" Kenan Dervišević https://launchpad.net/~kenan3008\n" +" Samir Ribić https://launchpad.net/~megaribi" + +#: ../src/application.c:560 +msgid "Almanah Website" +msgstr "Almanah web stranica" + +#: ../src/application.c:588 +#, c-format +msgid "" +"Couldn't load the CSS resources. The interface might not be styled " +"correctly: %s" +msgstr "" +"Ne mogu učitati CSS resurse. Sučelje možda neće biti pravilnog stila: %s" + +#: ../src/date-entry-dialog.c:72 +msgid "Select Date" +msgstr "Odaberi datum" + +#: ../src/date-entry-dialog.c:127 ../src/import-export-dialog.c:169 +#: ../src/import-export-dialog.c:474 ../src/main-window.c:206 +#: ../src/preferences-dialog.c:179 ../src/search-dialog.c:95 +#: ../src/uri-entry-dialog.c:126 +msgid "UI data could not be loaded" +msgstr "UI datoteka\" nije mogla biti učitana" + +#: ../src/entry.c:303 +#, c-format +msgid "Invalid data version number %u." +msgstr "Netačan broj verzije podataka %u." + +#: ../src/events/calendar-appointment.c:51 +msgid "Calendar Appointment" +msgstr "Kalendarski sastanak" + +#: ../src/events/calendar-appointment.c:52 +msgid "An appointment on an Evolution calendar." +msgstr "Sastanak na Evolution kalendaru." + +#. Translators: This is a time string with the format hh:mm +#: ../src/events/calendar-appointment.c:89 ../src/events/calendar-task.c:90 +#, c-format +msgid "%.2d:%.2d" +msgstr "%.2d:%.2d" + +#: ../src/events/calendar-appointment.c:135 ../src/events/calendar-task.c:125 +msgid "Error launching Evolution" +msgstr "Greška pri pokretanju Evolutiona" + +#: ../src/events/calendar-task.c:51 +msgid "Calendar Task" +msgstr "Kalendarski zadatak" + +#: ../src/events/calendar-task.c:52 +msgid "A task on an Evolution calendar." +msgstr "Zadatak na Evolution kalendaru." + +#: ../src/export-operation.c:47 ../src/import-operation.c:45 +msgid "Text Files" +msgstr "Tekstualne datoteke" + +#: ../src/export-operation.c:48 +msgid "" +"Select a _folder to export the entries to as text files, one per entry, with " +"names in the format 'yyyy-mm-dd', and no extension. All entries will be " +"exported, unencrypted in plain text format." +msgstr "" +"Odaberite _direktorij za izvoz unosa u tekstualne datoteke, i to jedna po " +"unosu, sa imenima oblika 'gggg-mm-dd', bez ekstenzija. Svi unosi će biti " +"izvezeni i dešifrovani u obični tekstualni oblik." + +#: ../src/export-operation.c:52 ../src/import-operation.c:50 +msgid "Database" +msgstr "Baza podataka" + +#: ../src/export-operation.c:53 +msgid "" +"Select a _filename for a complete copy of the unencrypted Almanah Diary " +"database to be given." +msgstr "" +"Odaberite _naziv datoteke za potpunu kopiju nešifrovane baze podataka " +"Almanah dnevnika." + +#: ../src/export-operation.c:256 ../src/export-operation.c:313 +#, c-format +msgid "Error changing exported file permissions: %s" +msgstr "Greška promjene ovlašćenja izvezene datoteke: %s" + +#: ../src/gtk/menus.ui.h:1 +msgid "_Search" +msgstr "_Traži" + +#: ../src/gtk/menus.ui.h:2 +msgid "Pr_eferences" +msgstr "_Postavke" + +#. Set the button label +#: ../src/gtk/menus.ui.h:3 ../src/import-export-dialog.c:209 +msgid "_Import" +msgstr "U_vezi" + +#: ../src/gtk/menus.ui.h:4 ../src/import-export-dialog.c:209 +msgid "_Export" +msgstr "I_zvezi" + +#: ../src/gtk/menus.ui.h:5 +msgid "_Print diary" +msgstr "_Štampaj dnevnik" + +#: ../src/gtk/menus.ui.h:6 +msgid "_About Almanah Diary" +msgstr "_O Almanah dnevniku" + +#: ../src/gtk/menus.ui.h:7 +msgid "_Quit" +msgstr "_Izlaz" + +#: ../src/gtk/menus.ui.h:8 +msgid "_Cut" +msgstr "_Isijeci" + +#: ../src/gtk/menus.ui.h:9 +msgid "_Copy" +msgstr "_Kopiraj" + +#: ../src/gtk/menus.ui.h:10 +msgid "_Paste" +msgstr "_Umetni" + +#: ../src/gtk/menus.ui.h:11 +msgid "_Delete" +msgstr "_Obriši" + +#: ../src/gtk/menus.ui.h:12 +msgid "Insert _Time" +msgstr "Umetni _vrijeme" + +#: ../src/gtk/menus.ui.h:13 +msgid "Add/Remove _Hyperlink" +msgstr "Dodaj/Ukloni _hiperlink" + +#: ../src/gtk/menus.ui.h:14 +msgid "_Bold" +msgstr "_Masno" + +#: ../src/gtk/menus.ui.h:15 +msgid "_Italic" +msgstr "_Kurziv" + +#: ../src/gtk/menus.ui.h:16 +msgid "_Underline" +msgstr "_Podvučeno" + +#: ../src/import-export-dialog.c:203 +msgid "Import _mode: " +msgstr "_Režim uvoza: " + +#: ../src/import-export-dialog.c:203 +msgid "Export _mode: " +msgstr "_Režim izvoza: " + +#. Set the window title +#: ../src/import-export-dialog.c:206 +msgid "Import Entries" +msgstr "Import unosa" + +#: ../src/import-export-dialog.c:206 +msgid "Export Entries" +msgstr "Izvoz unosa" + +#: ../src/import-export-dialog.c:246 +msgid "Import failed" +msgstr "Neuspješan uvoz" + +#: ../src/import-export-dialog.c:284 +msgid "Export failed" +msgstr "Neuspješan izvoz" + +#: ../src/import-export-dialog.c:297 +msgid "Export successful" +msgstr "Uspješan izvoz" + +#: ../src/import-export-dialog.c:298 +msgid "The diary was successfully exported." +msgstr "Dnevnik je uspješno izvezen." + +#: ../src/import-export-dialog.c:446 +msgid "Import Results" +msgstr "Rezultati uvoza" + +#. Translators: This is a strftime()-format string for the dates displayed in import results. +#. Translators: This is a strftime()-format string for the date to display when asking about editing a diary entry. +#. Translators: This is a strftime()-format string for the date to display when asking about deleting a diary entry. +#. Translators: This is a strftime()-format string for the date displayed above each printed entry. +#. Translators: This is a strftime()-format string for the dates displayed in search results. +#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. +#: ../src/import-export-dialog.c:541 ../src/main-window.c:564 +#: ../src/main-window.c:594 ../src/printing.c:263 ../src/search-dialog.c:180 +#: ../src/widgets/calendar-button.c:327 +msgid "%A, %e %B %Y" +msgstr "%A, %e %B %Y" + +#: ../src/import-operation.c:46 +msgid "" +"Select a _folder containing text files, one per entry, with names in the " +"format 'yyyy-mm-dd', and no extension. Any and all such files will be " +"imported." +msgstr "" +"Odaberite _direktorij koji sadrži tekstualne datoteke, jednu po unosu, sa " +"imenima oblika 'gggg-mm-dd', bez ekstenzija. Sve datoteke te vrste će biti " +"uvezene." + +#: ../src/import-operation.c:51 +msgid "Select a database _file created by Almanah Diary to import." +msgstr "Odaberite _datoteku baze za uvoz kreiranu pomoću Almanah dnevnika." + +#: ../src/import-operation.c:248 +#, c-format +msgid "Error deserializing imported entry into buffer: %s" +msgstr "Greška pri deserijalizaciji uvezenog unosa u bufferu: %s" + +#: ../src/import-operation.c:264 +#, c-format +msgid "" +"Error deserializing existing entry into buffer; overwriting with imported " +"entry: %s" +msgstr "" +"Greška pri deserijalizaciju postojećeg unosa u bufferu; pripisujem " +"postojećim uvezenim unosom: %s" + +#. Append some header text for the imported entry +#. Translators: This text is appended to an existing entry when an entry is being imported to the same date. +#. * The imported entry is appended to this text. +#: ../src/import-operation.c:305 +#, c-format +msgid "" +"\n" +"\n" +"Entry imported from \"%s\":\n" +"\n" +msgstr "" +"\n" +"\n" +"Unos uvezen iz \"%s\":\n" +"\n" + +#: ../src/main-window.c:568 +#, c-format +msgid "Are you sure you want to edit this diary entry for %s?" +msgstr "Jeste li sigurni da želite urediti ovaj unos u dnevniku za %s?" + +#: ../src/main-window.c:598 +#, c-format +msgid "Are you sure you want to delete this diary entry for %s?" +msgstr "Jeste li sigurni da želite obrisati ovaj unos u dnevniku za %s?" + +#. Print a warning about the unknown tag +#: ../src/main-window.c:707 +#, c-format +msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." +msgstr "" +"Nepoznata ili duplicirana tekstualna oznaka \"%s\" u unosu. Zanemarujem." + +#: ../src/main-window.c:944 +msgid "Error opening URI" +msgstr "Greška pri otvaranju adrese" + +#. Translators: this is an event source nami (liki Calendar appointment) and the time when the event takes place +#: ../src/main-window.c:1123 +#, c-format +msgid "%s @ %s" +msgstr "%s @ %s" + +#: ../src/main-window.c:1225 +msgid "Entry content could not be loaded" +msgstr "Sadržaj unosa nije mogao biti učitan" + +#: ../src/main-window.c:1393 +msgid "Spelling checker could not be initialized" +msgstr "Provjera pravopisa nije mogla biti inicijalizirana" + +#: ../src/preferences-dialog.c:85 +msgid "Almanah Preferences" +msgstr "Almanah postavke" + +#. Grab our child widgets +#: ../src/preferences-dialog.c:204 +msgid "Encryption key: " +msgstr "Ključ za šifriranje: " + +#: ../src/preferences-dialog.c:209 +msgid "None (don't encrypt)" +msgstr "Ništa (bez šifriranja)" + +#: ../src/preferences-dialog.c:233 +msgid "New _Key" +msgstr "Novi _ključ" + +#. Set up the "Enable spell checking" check button +#: ../src/preferences-dialog.c:239 +msgid "Enable _spell checking" +msgstr "Omogući provjeru _pravopisa" + +#: ../src/preferences-dialog.c:264 +msgid "Error saving the encryption key" +msgstr "Greška pri snimanju ključa za šifriranje" + +#: ../src/preferences-dialog.c:283 +msgid "Error opening Seahorse" +msgstr "Greška pri otvaranju Seahorsea" + +#: ../src/printing.c:277 +msgid "This entry is marked as important." +msgstr "Ovaj unos je označen kao važan." + +#: ../src/printing.c:298 +msgid "No entry for this date." +msgstr "Za ovaj datum nema unosa." + +#: ../src/printing.c:453 +msgid "Start date:" +msgstr "Početni datum:" + +#: ../src/printing.c:455 +msgid "End date:" +msgstr "Krajnji datum:" + +#. Linije spacing +#: ../src/printing.c:471 +msgid "Line spacing:" +msgstr "Prored:" + +#: ../src/search-dialog.c:221 +msgid "Search canceled." +msgstr "Pretraga je otkazana." + +#. Translators: This is an error message wrapper for when searches encounter an error. The placeholder is for an error message. +#: ../src/search-dialog.c:224 +#, c-format +msgid "Error: %s" +msgstr "Greška: %s" + +#. Success! +#: ../src/search-dialog.c:229 +#, c-format +msgid "Found %d entry:" +msgid_plural "Found %d entries:" +msgstr[0] "Pronađen je %d unos:" +msgstr[1] "Pronađena su %d unosa:" +msgstr[2] "Pronađeno je %d unosa:" + +#: ../src/search-dialog.c:278 +msgid "Searching…" +msgstr "Tražim…" + +#: ../src/storage-manager.c:232 +#, c-format +msgid "" +"Could not open database \"%s\". SQLite provided the following error message: " +"%s" +msgstr "" +"Nije moguće otvoriti bazu \"%s\". SQLite je ispisao sljedeću poruku o " +"greški: %s" + +#: ../src/storage-manager.c:274 +#, c-format +msgid "" +"Could not run query \"%s\". SQLite provided the following error message: %s" +msgstr "" +"Nije moguće pokrenuti upit \"%s\". SQLite je ispisao sljedeću poruku o " +"greški: %s" + +#: ../src/storage-manager.c:580 +msgid "Error deserializing entry into buffer while searching." +msgstr "Greška pri deserijalizaciji unosa u buffer prilikom pretrage." + +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Unesite adresu" + +#: ../src/vfs.c:233 +#, c-format +msgid "GPGME is not at least version %s" +msgstr "GPGME verzija mora biti barem %s" + +#: ../src/vfs.c:240 +#, c-format +msgid "GPGME doesn't support OpenPGP: %s" +msgstr "GPGME ne podržava OpenPGP: %s" + +#: ../src/vfs.c:247 +#, c-format +msgid "Error creating cipher context: %s" +msgstr "Greška pri kreiranju šifriranog konteksta: %s" + +#: ../src/vfs.c:267 +#, c-format +msgid "Can't create a new GIOChannel for the encrypted database: %s" +msgstr "Ne mogu da napravim novi GIO kanal za šifrovane baze podataka: %s" + +#: ../src/vfs.c:275 +#, c-format +msgid "Error opening encrypted database file \"%s\": %s" +msgstr "Greška pri otvaranju šifrirane datoteke baze podataka \"%s\": %s" + +#: ../src/vfs.c:291 +#, c-format +msgid "Error creating Callback base data buffer: %s" +msgstr "Greška stvaranja međumemorije podataka baze opoziva: %s" + +#: ../src/vfs.c:299 +#, c-format +msgid "Can't create a new GIOChannel for the plain database: %s" +msgstr "Ne mogu da napravim novi GIO kanal za obične baze podataka: %s" + +#: ../src/vfs.c:307 +#, c-format +msgid "Error opening plain database file \"%s\": %s" +msgstr "Greška pri otvaranju obične datoteke baze \"%s\": %s" + +#: ../src/vfs.c:403 +#, c-format +msgid "Error getting encryption key: %s" +msgstr "Greška pri dobavljanju ključa za šifriranje: %s" + +#: ../src/vfs.c:427 ../src/vfs.c:433 +#, c-format +msgid "Error encrypting database: %s" +msgstr "Greška pri šifriranju baze: %s" + +#. Translators: The first and second params are file paths, the last param is an error message. +#: ../src/vfs.c:485 +#, c-format +msgid "Error copying the file from %s to %s: %s" +msgstr "Greška umnožavanja datoteke iz „%s“ u „%s“: %s" + +#: ../src/vfs.c:491 +#, c-format +msgid "Error changing database backup file permissions: %s" +msgstr "Greška promjene ovlašćenja datoteke rezerve baze podataka: %s" + +#: ../src/vfs.c:591 +#, c-format +msgid "Error closing file: %s" +msgstr "Greška prilikom zatvaranja datoteke: %s" + +#. Translators: the first parameter is a filename, the second is an error message. +#. Translators: the first parameter is a filename. +#: ../src/vfs.c:990 ../src/vfs.c:1017 +#, c-format +msgid "Error backing up file ‘%s’" +msgstr "Greška stvaranja rezerve datoteke „%s“" + +#: ../src/vfs.c:1003 +#, c-format +msgid "Error decrypting database: %s" +msgstr "Greška pri dešifrovanju baze: %s" + +#: ../src/vfs.c:1043 +#, c-format +msgid "Error changing database file permissions: %s" +msgstr "Greška promjene ovlašćenja datoteke baze podataka: %s" + +#: ../src/widgets/calendar-button.c:156 +#, c-format +msgid "UI data could not be loaded: %s" +msgstr "UI podaci se ne mogu učitati: %s" + +#: ../src/widgets/calendar-button.c:166 +msgid "Can't load calendar window object from UI file" +msgstr "Nije moguće učitati objekat prozora kalendara iz UI datoteke" + +#. Translators: This is the detail string for important days as displayed in the calendar. +#: ../src/widgets/calendar.c:176 +msgid "Important!" +msgstr "Važno!" + +#: ../src/widgets/calendar-window.c:80 +msgid "Unknown input device" +msgstr "Nepoznat ulazni uređaj" + +#: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:166 +msgid "add tag" +msgstr "dodaj oznaku" + +#: ../src/widgets/entry-tags-area.c:101 +msgid "Write the tag and press enter to save it" +msgstr "Zapišite oznaku i pritisnite „Unesi“ da je sačuvate" + +#: ../src/widgets/tag-accessible.c:165 +msgid "Remove the tag from the entry" +msgstr "Uklonite oznaku iz tekućeg unosa" + +#. Looks liki gtk_widget_set_tooltip_text don't works here, even in the init... ? +#: ../src/widgets/tag.c:416 +msgid "Remove tag" +msgstr "Ukloni oznaku" + +#: ../src/widgets/tag-entry.c:85 +msgid "Tag entry" +msgstr "Unos oznake" diff -Nru almanah-0.11.1/po/ca.po almanah-0.12.0/po/ca.po --- almanah-0.11.1/po/ca.po 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/ca.po 2019-10-07 13:45:09.000000000 +0000 @@ -7,322 +7,296 @@ msgid "" msgstr "" "Project-Id-Version: diary\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-25 21:52+0100\n" -"PO-Revision-Date: 2010-12-25 21:53+0100\n" -"Last-Translator: Jordi Estrada \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=almanah&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2015-11-30 15:36+0000\n" +"PO-Revision-Date: 2015-11-30 18:11+0100\n" +"Last-Translator: Robert Antoni Buj Gelonch \n" "Language-Team: Catalan \n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Poedit 1.8.6\n" -#: ../data/almanah.desktop.in.h:1 ../src/main-window.c:134 ../src/main.c:112 +#: ../data/almanah.appdata.xml.in.h:1 +msgid "Keep a diary of your life" +msgstr "Manté una agenda de la vostra vida" + +#: ../data/almanah.appdata.xml.in.h:2 +msgid "" +"Almanah Diary is an application to allow you to keep a diary of your life." +msgstr "" +"L'agenda Almanah és una aplicació que us permetrà mantenir una agenda de la " +"vostra vida." + +#: ../data/almanah.appdata.xml.in.h:3 +msgid "" +"You can encrypt the diary to preserve your privacy. It has editing " +"abilities, including text formatting and printing and shows you a lists of " +"events which happened (on your computer) for each day (such as tasks and " +"appointments from Evolution)." +msgstr "" +"Podeu xifrar l'agenda per preservar la vostra privacitat. Té les habilitats " +"d'edició, que inclouen la formatació de text i la impressió de text, i també " +"us mostra una llista dels esdeveniments que van succeir (en l'ordinador " +"actual) per a cada dia (com ara les tasques i les cites d'Evolution)." + +#: ../data/almanah.desktop.in.h:1 ../src/application.c:133 +#: ../src/main-window.c:156 msgid "Almanah Diary" -msgstr "Diari Almanah" +msgstr "Agenda Almanah" #: ../data/almanah.desktop.in.h:2 -msgid "Diary" -msgstr "Diari" - -#: ../data/almanah.desktop.in.h:3 msgid "Keep a personal diary" -msgstr "Manteniu un diari personal" +msgstr "Manteniu una agenda personal" -#: ../data/almanah.schemas.in.h:1 -msgid "Database encryption key ID" -msgstr "Identificador de la clau d'encriptació de la base de dades" - -#: ../data/almanah.schemas.in.h:2 -msgid "Main window X position" -msgstr "Posició X de la finestra principal" +#. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. +#: ../data/almanah.desktop.in.h:3 ../src/application.c:272 +msgid "Diary" +msgstr "Agenda" -#: ../data/almanah.schemas.in.h:3 -msgid "Main window Y position" -msgstr "Posició Y de la finestra principal" +#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../data/almanah.desktop.in.h:5 +msgid "diary;journal;" +msgstr "agenda;diari;" -#: ../data/almanah.schemas.in.h:4 -msgid "Main window height" -msgstr "Alçada de la finestra principal" +#: ../src/ui/almanah.ui.h:1 +msgid "Calendar" +msgstr "Calendari" -#: ../data/almanah.schemas.in.h:5 -msgid "Main window maximization" -msgstr "Maximització de la finestra principal" +#: ../src/ui/almanah.ui.h:2 +msgid "Go to Today" +msgstr "Vés a avui" -#: ../data/almanah.schemas.in.h:6 -msgid "Main window width" -msgstr "Amplada de la finestra principal" +#: ../src/ui/almanah.ui.h:3 +msgid "Select Date…" +msgstr "Seleccioneu una data…" -#: ../data/almanah.schemas.in.h:7 -msgid "Spell checking enabled?" -msgstr "Voleu habilitar la verificació de l'ortografia?" +#: ../src/ui/almanah.ui.h:4 +msgid "Entry editing area" +msgstr "Àrea d'edició de l'entrada" -#: ../data/almanah.schemas.in.h:8 -msgid "Spell checking language" -msgstr "Idioma de la verificació de l'ortografia" +#: ../src/ui/almanah.ui.h:5 +msgid "Past events" +msgstr "Esdeveniments anteriors" -#: ../data/almanah.schemas.in.h:9 -msgid "" -"The ID of the key to use to encrypt and decrypt the database, if Almanah has " -"been built with encryption support. Leave blank to disable database " -"encryption." -msgstr "" -"L'identificador de la clau a utilitzar per encriptar i desencriptar la base " -"de dades, si l'Almanah s'ha muntat amb compatibilitat d'encriptació. Deixeu-" -"lo en blanc per inhabilitar l'encriptació de la base de dades." - -#: ../data/almanah.schemas.in.h:10 -msgid "The X position of the main window." -msgstr "La posició X de la finestra principal." - -#: ../data/almanah.schemas.in.h:11 -msgid "The Y position of the main window." -msgstr "La posició Y de la finestra principal." - -#: ../data/almanah.schemas.in.h:12 -msgid "The height of the main window." -msgstr "L'alçada de la finestra principal." +#: ../src/ui/almanah.ui.h:6 +msgid "Past Event List" +msgstr "Llista d'esdeveniments passats" -#: ../data/almanah.schemas.in.h:13 -msgid "The locale specifier of the language in which to check entry spellings." -msgstr "" -"La configuració local específica de l'idioma en la qual es verificarà " -"l'ortografia de les entrades." +#: ../src/ui/almanah.ui.h:7 +msgid "Search entry" +msgstr "Entrada de la cerca" -#: ../data/almanah.schemas.in.h:14 -msgid "The width of the main window." -msgstr "L'amplada de la finestra principal." +#: ../src/ui/almanah.ui.h:8 ../src/search-dialog.c:69 +msgid "Search" +msgstr "Cerca" -#: ../data/almanah.schemas.in.h:15 -msgid "Whether spell checking of entries is enabled." -msgstr "Si la verificació de l'ortografia de les entrades està habilitada." +#: ../src/ui/almanah.ui.h:9 +msgid "Result List" +msgstr "Llista de resultats" -#: ../data/almanah.schemas.in.h:16 -msgid "Whether the main window should start maximized." -msgstr "Si la finestra principal s'hauria d'iniciar maximitzada." - -#: ../data/almanah.ui.h:1 -msgid "Add a definition for the currently selected text." -msgstr "Afegeix una definició per al text seleccionat." +#: ../src/ui/almanah.ui.h:10 +msgid "View Entry" +msgstr "Visualitza l'entrada" -#: ../data/almanah.ui.h:2 -msgid "Calendar" -msgstr "Calendari" +#: ../src/ui/almanah.ui.h:11 +msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." +msgstr "p. ex. «14/03/2009» o «14 de març de 2009»." -#: ../data/almanah.ui.h:3 -msgid "Definition Description" -msgstr "Descripció de la definició" - -#: ../data/almanah.ui.h:4 -msgid "Definition List" -msgstr "Llista de definicions" - -#: ../data/almanah.ui.h:5 -msgid "Definition Type" -msgstr "Tipus de definició" - -#: ../data/almanah.ui.h:6 -msgid "Definition type:" -msgstr "Tipus de definició:" +#: ../src/ui/almanah.ui.h:12 +msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." +msgstr "p. ex. «http://google.cat/» o «file:///home/jo/Imatges/imatge.jpg»." -#: ../data/almanah.ui.h:7 -msgid "Entry editing area" -msgstr "Àrea d'edició de l'entrada" +#: ../src/ui/almanah.ui.h:13 +msgid "Successful Entries" +msgstr "Entrades correctes" -#: ../data/almanah.ui.h:8 -msgid "F_ormat" -msgstr "F_ormata" +#: ../src/ui/almanah.ui.h:14 +msgid "Merged Entries" +msgstr "Entrades fusionades" -#: ../data/almanah.ui.h:9 +#: ../src/ui/almanah.ui.h:15 msgid "Failed Entries" msgstr "Entrades fallades" -#: ../data/almanah.ui.h:10 -msgid "Go to _Today" -msgstr "Ves a _avui" - -#: ../data/almanah.ui.h:11 -msgid "I_mportant" -msgstr "I_mportant" - -#: ../data/almanah.ui.h:12 +#: ../src/ui/almanah.ui.h:16 msgid "Import Results List" msgstr "Importa la llista de resultats" -#: ../data/almanah.ui.h:13 -msgid "Insert _Time" -msgstr "Insereix l'_hora" - -#: ../data/almanah.ui.h:14 -msgid "Jump to the current date in the diary." -msgstr "Vés a la data actual en el diari." - -#: ../data/almanah.ui.h:15 -msgid "Merged Entries" -msgstr "Entrades fusionades" - -#: ../data/almanah.ui.h:16 ../src/definition-manager-window.c:246 -msgid "Nothing selected" -msgstr "No s'ha seleccionat res" +#: ../data/org.gnome.almanah.gschema.xml.in.h:1 +msgid "Database encryption key ID" +msgstr "Id. de la clau de xifratge de la base de dades" -#: ../data/almanah.ui.h:17 -msgid "Past Event List" -msgstr "Llista d'esdeveniments passats" +#: ../data/org.gnome.almanah.gschema.xml.in.h:2 +msgid "" +"The ID of the key to use to encrypt and decrypt the database, if Almanah has " +"been built with encryption support. Leave blank to disable database " +"encryption." +msgstr "" +"L'id. de la clau a utilitzar per xifrar i desxifrar la base de dades, si " +"Almanah es va construir amb compatibilitat per al xifratge. Deixeu-ho en " +"blanc per inhabilitar el xifratge de la base de dades." -#: ../data/almanah.ui.h:18 -msgid "Past Events" -msgstr "Esdeveniments passats" +#: ../data/org.gnome.almanah.gschema.xml.in.h:3 +msgid "Spell checking language" +msgstr "Idioma de la verificació de l'ortografia" -#: ../data/almanah.ui.h:19 -msgid "Pr_eferences" -msgstr "Pr_eferències" +#: ../data/org.gnome.almanah.gschema.xml.in.h:4 +msgid "The locale specifier of the language in which to check entry spellings." +msgstr "" +"La configuració regional específica de l'idioma en la qual es verificarà " +"l'ortografia de les entrades." -#: ../data/almanah.ui.h:20 -msgid "Remove the definition from the currently selected text." -msgstr "Suprimeix la definició del text seleccionat." +#: ../data/org.gnome.almanah.gschema.xml.in.h:5 +msgid "Spell checking enabled?" +msgstr "Voleu habilitar la verificació de l'ortografia?" -#: ../data/almanah.ui.h:21 -msgid "Result List" -msgstr "Llista de resultats" +#: ../data/org.gnome.almanah.gschema.xml.in.h:6 +msgid "Whether spell checking of entries is enabled." +msgstr "Si la verificació de l'ortografia de les entrades està habilitada." -#: ../data/almanah.ui.h:22 -msgid "Results:" -msgstr "Resultats:" +#: ../src/application.c:255 +msgid "Error opening database" +msgstr "S'ha produït un error en obrir la base de dades" -#: ../data/almanah.ui.h:23 ../src/search-dialog.c:61 -msgid "Search" -msgstr "Cerca" +#: ../src/application.c:332 +msgid "Enable debug mode" +msgstr "Habilita el mode de depuració" -#: ../data/almanah.ui.h:24 -msgid "Search entry" -msgstr "Entrada de la cerca" +#: ../src/application.c:349 +msgid "" +"Manage your diary. Only one instance of the program may be open at any time." +msgstr "" +"Gestioneu la vostra agenda. Només una instància del programa pot obrir-se en " +"qualsevol instant." -#: ../data/almanah.ui.h:25 -msgid "Select Date…" -msgstr "Seleccioneu una data…" +#. Print an error +#: ../src/application.c:360 +#, c-format +msgid "Command line options could not be parsed: %s\n" +msgstr "No s'han pogut analitzar les opcions de la línia d'ordres: %s\n" -#: ../data/almanah.ui.h:26 -msgid "Successful Entries" -msgstr "Entrades correctes" +#: ../src/application.c:379 +msgid "Error encrypting database" +msgstr "S'ha produït un error en xifrar la base de dades" -#: ../data/almanah.ui.h:27 -msgid "Toggle whether the current entry is marked as important." -msgstr "Commuta si l'entrada actual està marcada com a important." - -#: ../data/almanah.ui.h:28 -msgid "Toggle whether the currently selected text is bold." -msgstr "Commuta si el text seleccionat està en negreta." - -#: ../data/almanah.ui.h:29 -msgid "Toggle whether the currently selected text is italic." -msgstr "Commuta si el text seleccionat està en cursiva." - -#: ../data/almanah.ui.h:30 -msgid "Toggle whether the currently selected text is underlined." -msgstr "Commuta si el text seleccionat està subratllat." - -#: ../data/almanah.ui.h:31 -msgid "View" -msgstr "Visualitza" +#: ../src/application.c:522 +msgid "" +"Almanah is free software: you can redistribute it and/or modify it under the " +"terms of the GNU General Public License as published by the Free Software " +"Foundation, either version 3 of the License, or (at your option) any later " +"version." +msgstr "" +"Almanah és programari lliure; podeu redistribuir-ho i/o modificar-ho sota " +"els termes de la Llicència Pública General GNU tal com ha estat publicada " +"per la Free Software Foundation; ja sigui la versió 3 de la Llicència o bé " +"(si ho preferiu) qualsevol altra versió posterior." -#: ../data/almanah.ui.h:32 -msgid "View Entry" -msgstr "Visualitza l'entrada" +#: ../src/application.c:526 +msgid "" +"Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " +"details." +msgstr "" +"Almanah es distribueix amb l'expectativa que serà útil, però SENSE CAP " +"GARANTIA; ni tan sols la garantia implícita de COMERCIABILITAT o ADEQUACIÓ " +"PER UN PROPÒSIT PARTICULAR. Vegeu la Llicència Pública General GNU per " +"obtenir-ne més detalls." -#: ../data/almanah.ui.h:33 -msgid "View Event" -msgstr "Visualitza l'esdeveniment" - -#: ../data/almanah.ui.h:34 -msgid "_Add Definition" -msgstr "_Afegeix una definició" - -#: ../data/almanah.ui.h:35 -msgid "_Definitions" -msgstr "_Definicions" +#: ../src/application.c:530 +msgid "" +"You should have received a copy of the GNU General Public License along with " +"Almanah. If not, see ." +msgstr "" +"Hauríeu d'haver rebut una còpia de la Llicència Pública General GNU " +"juntament amb aquest programa; en cas contrari, consulteu ." -#: ../data/almanah.ui.h:36 -msgid "_Edit" -msgstr "_Edita" +#: ../src/application.c:545 +#, c-format +msgid "A helpful diary keeper, storing %u entries." +msgstr "Un arxivador útil d'agenda, que emmagatzema %u entrades." -#: ../data/almanah.ui.h:37 -msgid "_Export…" -msgstr "_Exporta…" - -#: ../data/almanah.ui.h:38 -msgid "_File" -msgstr "_Fitxer" - -#: ../data/almanah.ui.h:39 -msgid "_Help" -msgstr "A_juda" - -#: ../data/almanah.ui.h:40 -msgid "_Import…" -msgstr "_Importa…" - -#: ../data/almanah.ui.h:41 -msgid "_Print…" -msgstr "_Imprimeix…" - -#: ../data/almanah.ui.h:42 -msgid "_Remove Definition" -msgstr "_Suprimeix la definició" - -#: ../data/almanah.ui.h:43 -msgid "_Search…" -msgstr "_Cerca…" - -#: ../data/almanah.ui.h:44 -msgid "_View Definitions" -msgstr "_Visualitza les definicions" +#: ../src/application.c:549 +msgid "Copyright © 2008-2009 Philip Withnall" +msgstr "Copyright © 2008-2009 Philip Withnall" -#: ../data/almanah.ui.h:45 -msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." -msgstr "per exemple «14/03/2009» o «14 de març de 2009»." +#. Translators: please include your names here to be credited for your hard work! +#. * Format: +#. * "Translator name 1 \n" +#. * "Translator name 2 " +#. +#: ../src/application.c:557 +msgid "translator-credits" +msgstr "" +"Gil Forcada \n" +"Jordi Estrada \n" +"Robert Antoni Buj Gelonch " -#: ../src/add-definition-dialog.c:82 -msgid "Add Definition" -msgstr "Afegeix una definició" +#: ../src/application.c:561 +msgid "Almanah Website" +msgstr "Lloc web d'Almanah" -#: ../src/add-definition-dialog.c:164 ../src/date-entry-dialog.c:131 -#: ../src/import-export-dialog.c:112 ../src/import-export-dialog.c:415 -#: ../src/definition-manager-window.c:132 ../src/main-window.c:171 -#: ../src/preferences-dialog.c:143 ../src/search-dialog.c:87 +#: ../src/application.c:589 #, c-format -msgid "UI file \"%s\" could not be loaded" -msgstr "No s'ha pogut carregar el fitxer d'interfície gràfica «%s»" +msgid "" +"Couldn't load the CSS resources. The interface might not be styled " +"correctly: %s" +msgstr "" +"No s'han pogut carregar els recursos CSS. La interfície podria no estar " +"estilitzada correctament: %s" -#: ../src/date-entry-dialog.c:74 +#: ../src/date-entry-dialog.c:72 msgid "Select Date" msgstr "Seleccioneu una data" -#: ../src/events/calendar-appointment.c:49 +#: ../src/date-entry-dialog.c:127 ../src/import-export-dialog.c:169 +#: ../src/import-export-dialog.c:475 ../src/main-window.c:228 +#: ../src/preferences-dialog.c:177 ../src/search-dialog.c:95 +#: ../src/uri-entry-dialog.c:126 +msgid "UI data could not be loaded" +msgstr "No s'han pogut carregar les dades de la interfície gràfica" + +#: ../src/entry.c:303 +#, c-format +msgid "Invalid data version number %u." +msgstr "Dades no vàlides del número de versió %u." + +#: ../src/events/calendar-appointment.c:51 msgid "Calendar Appointment" msgstr "Cita de calendari" -#: ../src/events/calendar-appointment.c:50 +#: ../src/events/calendar-appointment.c:52 msgid "An appointment on an Evolution calendar." -msgstr "Una cita en un calendari de l'Evolution." +msgstr "Una cita en un calendari d'Evolution." + +#. Translators: This is a time string with the format hh:mm +#: ../src/events/calendar-appointment.c:89 ../src/events/calendar-task.c:90 +#, c-format +msgid "%.2d:%.2d" +msgstr "%.2d:%.2d" -#: ../src/events/calendar-appointment.c:120 ../src/events/calendar-task.c:109 +#: ../src/events/calendar-appointment.c:135 ../src/events/calendar-task.c:125 msgid "Error launching Evolution" -msgstr "S'ha produït un error en executar l'Evolution" +msgstr "S'ha produït un error en executar Evolution" -#: ../src/events/calendar-task.c:49 +#: ../src/events/calendar-task.c:51 msgid "Calendar Task" msgstr "Tasca de calendari" -#: ../src/events/calendar-task.c:50 +#: ../src/events/calendar-task.c:52 msgid "A task on an Evolution calendar." -msgstr "Una tasca en una calendari de l'Evolution." +msgstr "Una tasca en un calendari d'Evolution." -#: ../src/export-operation.c:46 ../src/import-operation.c:46 +#: ../src/export-operation.c:47 ../src/import-operation.c:45 msgid "Text Files" msgstr "Fitxers de text" -#: ../src/export-operation.c:47 +#: ../src/export-operation.c:48 msgid "" "Select a _folder to export the entries to as text files, one per entry, with " "names in the format 'yyyy-mm-dd', and no extension. All entries will be " @@ -330,63 +304,135 @@ msgstr "" "Seleccioneu una _carpeta on exportar les entrades com a fitxers de text, un " "per entrada, amb els noms en el format «yyyy-mm-dd» i sense extensió. " -"S'exportaran totes les entrades en format de text net sense encriptar." +"S'exportaran totes les entrades en format de text senzill sense xifrar." -#: ../src/export-operation.c:51 ../src/import-operation.c:51 +#: ../src/export-operation.c:52 ../src/import-operation.c:50 msgid "Database" msgstr "Base de dades" -#: ../src/export-operation.c:52 +#: ../src/export-operation.c:53 msgid "" "Select a _filename for a complete copy of the unencrypted Almanah Diary " "database to be given." msgstr "" -"Seleccioneu un nom de _fitxer per la còpia completa de la base de dades del " -"diari Almanah sense encriptar a donar." +"Seleccioneu el nom a donar al fitxer amb una còpia completa de la base de " +"dades de l'agenda Almanah sense xifrar." + +#: ../src/export-operation.c:256 ../src/export-operation.c:313 +#, c-format +msgid "Error changing exported file permissions: %s" +msgstr "S'ha produït un error en canviar els permisos del fitxer exportat: %s" + +#: ../src/gtk/menus.ui.h:1 +msgid "_Search" +msgstr "_Cerca" + +#: ../src/gtk/menus.ui.h:2 +msgid "Pr_eferences" +msgstr "Pr_eferències" + +#: ../src/gtk/menus.ui.h:3 +msgctxt "Main menu" +msgid "_Import" +msgstr "_Importa" + +#: ../src/gtk/menus.ui.h:4 +msgctxt "Main menu" +msgid "_Export" +msgstr "_Exporta" + +#: ../src/gtk/menus.ui.h:5 +msgid "_Print diary" +msgstr "Im_primeix l'agenda" + +#: ../src/gtk/menus.ui.h:6 +msgid "_About Almanah Diary" +msgstr "Quant _a l'agenda Almanah" + +#: ../src/gtk/menus.ui.h:7 +msgid "_Quit" +msgstr "_Surt" + +#: ../src/gtk/menus.ui.h:8 +msgid "_Bold" +msgstr "_Negreta" + +#: ../src/gtk/menus.ui.h:9 +msgid "_Italic" +msgstr "_Itàlica" + +#: ../src/gtk/menus.ui.h:10 +msgid "_Underline" +msgstr "_Subratlla" + +#: ../src/gtk/menus.ui.h:11 +msgid "_Cut" +msgstr "_Retalla" + +#: ../src/gtk/menus.ui.h:12 +msgid "_Copy" +msgstr "_Copia" + +#: ../src/gtk/menus.ui.h:13 +msgid "_Paste" +msgstr "_Enganxa" + +#: ../src/gtk/menus.ui.h:14 ../src/main-window.c:629 +msgid "_Delete" +msgstr "_Suprimeix" + +#: ../src/gtk/menus.ui.h:15 +msgid "Insert _Time" +msgstr "Insereix l'_hora" -#: ../src/import-export-dialog.c:145 +#: ../src/gtk/menus.ui.h:16 +msgid "Add/Remove _Hyperlink" +msgstr "Afegeix o suprimeix un _enllaç" + +#: ../src/import-export-dialog.c:203 msgid "Import _mode: " msgstr "_Mode d'importació: " -#: ../src/import-export-dialog.c:145 +#: ../src/import-export-dialog.c:203 msgid "Export _mode: " msgstr "_Mode d'exportació: " #. Set the window title -#: ../src/import-export-dialog.c:148 +#: ../src/import-export-dialog.c:206 msgid "Import Entries" msgstr "Importa entrades" -#: ../src/import-export-dialog.c:148 +#: ../src/import-export-dialog.c:206 msgid "Export Entries" msgstr "Exporta entrades" -#. Set the button label -#: ../src/import-export-dialog.c:151 +#: ../src/import-export-dialog.c:210 +msgctxt "Dialog button" msgid "_Import" msgstr "_Importa" -#: ../src/import-export-dialog.c:151 +#: ../src/import-export-dialog.c:210 +msgctxt "Dialog button" msgid "_Export" msgstr "_Exporta" -#: ../src/import-export-dialog.c:188 +#: ../src/import-export-dialog.c:247 msgid "Import failed" msgstr "Ha fallat la importació" -#: ../src/import-export-dialog.c:226 +#: ../src/import-export-dialog.c:285 msgid "Export failed" msgstr "Ha fallat l'exportació" -#: ../src/import-export-dialog.c:239 +#: ../src/import-export-dialog.c:298 msgid "Export successful" msgstr "Exportació correcta" -#: ../src/import-export-dialog.c:240 +#: ../src/import-export-dialog.c:299 msgid "The diary was successfully exported." -msgstr "El diari s'ha exportat correctament." +msgstr "L'agenda s'ha exportat correctament." -#: ../src/import-export-dialog.c:389 +#: ../src/import-export-dialog.c:447 msgid "Import Results" msgstr "Resultats de la importació" @@ -396,47 +442,48 @@ #. Translators: This is a strftime()-format string for the date displayed at the top of the main window. #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. -#: ../src/import-export-dialog.c:482 ../src/main-window.c:394 -#: ../src/main-window.c:419 ../src/main-window.c:1058 ../src/printing.c:263 -#: ../src/search-dialog.c:161 +#: ../src/import-export-dialog.c:542 ../src/main-window.c:590 +#: ../src/main-window.c:621 ../src/main-window.c:1228 ../src/printing.c:263 +#: ../src/search-dialog.c:180 msgid "%A, %e %B %Y" -msgstr "%A, %e de %B de %Y" +msgstr "%A, %e %B de %Y" -#: ../src/import-operation.c:47 +#: ../src/import-operation.c:46 msgid "" "Select a _folder containing text files, one per entry, with names in the " "format 'yyyy-mm-dd', and no extension. Any and all such files will be " "imported." msgstr "" -"Seleccioneu una _carpeta que contingui fitxers de text, un per entrada, amb " -"noms en el format «yyyy-mm-dd» i sense extensió. S'importaran tots i " -"qualsevol d'aquests fitxers." +"Seleccioneu una _carpeta que contingui els fitxers de text, un per entrada, " +"amb els noms en el format «yyyy-mm-dd» i sense extensió. S'importaran tots " +"aquests fitxers." -#: ../src/import-operation.c:52 +#: ../src/import-operation.c:51 msgid "Select a database _file created by Almanah Diary to import." msgstr "" -"Seleccioneu un _fitxer de base de dades creat pel diari Almanah per importar." +"Seleccioneu un _fitxer de base de dades que s'hagi creat amb l'agenda " +"Almanah per importar-ho." -#: ../src/import-operation.c:199 +#: ../src/import-operation.c:248 #, c-format msgid "Error deserializing imported entry into buffer: %s" msgstr "" -"S'ha produït un error en deserialitzar una entrada importada a la memòria " +"S'ha produït un error en desserialitzar una entrada importada a la memòria " "intermèdia: %s" -#: ../src/import-operation.c:215 +#: ../src/import-operation.c:264 #, c-format msgid "" "Error deserializing existing entry into buffer; overwriting with imported " "entry: %s" msgstr "" -"S'ha produït un error en deserialitzar una entrada existent a la memòria " +"S'ha produït un error en desserialitzar una entrada existent a la memòria " "intermèdia. S'està sobreescrivint amb l'entrada importada: %s" #. Append some header text for the imported entry #. Translators: This text is appended to an existing entry when an entry is being imported to the same date. #. * The imported entry is appended to this text. -#: ../src/import-operation.c:256 +#: ../src/import-operation.c:305 #, c-format msgid "" "\n" @@ -449,210 +496,89 @@ "S'ha importat l'entrada de «%s»:\n" "\n" -#: ../src/definition-manager-window.c:72 -msgid "Definition Manager" -msgstr "Gestor de definicions" - -#: ../src/definition-manager-window.c:203 +#: ../src/main-window.c:594 #, c-format -msgid "Are you sure you want to delete the definition for \"%s\"?" -msgstr "Segur que voleu suprimir la definició per a «%s»?" - -#: ../src/definitions/contact.c:53 -msgid "Contact" -msgstr "Contacte" - -#: ../src/definitions/contact.c:54 -msgid "An Evolution contact." -msgstr "Un contacte de l'Evolution." - -#: ../src/definitions/contact.c:73 -msgid "Select Contact" -msgstr "Seleccioneu un contacte" - -#: ../src/definitions/contact.c:103 ../src/definitions/contact.c:224 -msgid "Error opening contact" -msgstr "S'ha produït un error en obrir el contacte" - -#: ../src/definitions/contact.c:136 -msgid "Error opening Evolution" -msgstr "S'ha produït un error en obrir l'Evolution" - -#: ../src/definitions/file.c:48 -msgid "File" -msgstr "Fitxer" - -#: ../src/definitions/file.c:49 -msgid "An attached file." -msgstr "Un fitxer adjunt." - -#: ../src/definitions/file.c:74 -msgid "Error opening file" -msgstr "S'ha produït un error en obrir el fitxer" - -#: ../src/definitions/file.c:93 -msgid "Select File" -msgstr "Seleccioneu un fitxer" - -#: ../src/definitions/note.c:49 -msgid "Note" -msgstr "Nota" - -#: ../src/definitions/note.c:50 -msgid "A note about an important event." -msgstr "Una nota sobre un esdeveniment important." - -#: ../src/definitions/uri.c:50 -msgid "URI" -msgstr "URI" - -#: ../src/definitions/uri.c:51 -msgid "A URI of a file or web page." -msgstr "Un URI d'un fitxer o d'una pàgina web." - -#: ../src/definitions/uri.c:76 -msgid "Error opening URI" -msgstr "S'ha produït un error en obrir l'URI" +msgid "Are you sure you want to edit this diary entry for %s?" +msgstr "Segur que voleu editar aquesta entrada de l'agenda per %s?" -#: ../src/definitions/uri.c:99 -msgid "URI: " -msgstr "URI: " +#: ../src/main-window.c:597 ../src/main-window.c:628 +msgid "_Cancel" +msgstr "_Cancel·la" -#: ../src/main-window.c:398 -#, c-format -msgid "Are you sure you want to edit this diary entry for %s?" -msgstr "Segur que voleu editar aquesta entrada del diari per a %s?" +#: ../src/main-window.c:598 +msgid "_Edit" +msgstr "_Edita" -#: ../src/main-window.c:423 +#: ../src/main-window.c:625 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" -msgstr "Segur que voleu suprimir aquesta entrada del diari per a %s?" +msgstr "Segur que voleu suprimir aquesta entrada de l'agenda per %s?" #. Print a warning about the unknown tag -#: ../src/main-window.c:610 +#: ../src/main-window.c:735 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." msgstr "" -"L'etiqueta de text «%s» està duplicada o és desconeguda en l'entrada. " -"S'ignorarà." - -#: ../src/main-window.c:891 -msgid "" -"Almanah is free software: you can redistribute it and/or modify it under the " -"terms of the GNU General Public License as published by the Free Software " -"Foundation, either version 3 of the License, or (at your option) any later " -"version." -msgstr "" -"L'Almanah és programari lliure; podeu redistribuir-lo i/o modificar-lo sota " -"els termes de la Llicència Pública General GNU tal com ha estat publicada " -"per la Free Software Foundation; ja sigui la versió 3 de la Llicència o bé " -"(si ho preferiu) qualsevol altra versió posterior." - -#: ../src/main-window.c:895 -msgid "" -"Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " -"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " -"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " -"details." -msgstr "" -"L'Almanah es distribueix amb l'expectativa que serà útil, però SENSE CAP " -"GARANTIA; ni tan sols la garantia implícita de COMERCIABILITAT o ADEQUACIÓ " -"PER UN PROPÒSIT PARTICULAR. Vegeu la Llicència Pública General GNU per " -"obtenir-ne més detalls." +"L'etiqueta de text «%s» està duplicada a l'entrada o es desconeix, s'ignora." -#: ../src/main-window.c:899 -msgid "" -"You should have received a copy of the GNU General Public License along with " -"Almanah. If not, see ." -msgstr "" -"Hauríeu d'haver rebut una còpia de la Llicència Pública General GNU " -"juntament amb aquest programa; en cas contrari, consulteu ." +#: ../src/main-window.c:976 +msgid "Error opening URI" +msgstr "S'ha produït un error en obrir l'URI" -#: ../src/main-window.c:910 +#. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place +#: ../src/main-window.c:1155 #, c-format -msgid "A helpful diary keeper, storing %u entries and %u definitions." -msgstr "" -"Un programa útil per mantenir un diari. Hi ha %u entrades i %u definicions." - -#: ../src/main-window.c:916 -msgid "Copyright © 2008-2009 Philip Withnall" -msgstr "Copyright © 2008-2009 Philip Withnall" - -#. Translators: please include your names here to be credited for your hard work! -#. * Format: -#. * "Translator name 1 \n" -#. * "Translator name 2 " -#. -#: ../src/main-window.c:924 -msgid "translator-credits" -msgstr "" -"Gil Forcada \n" -"Jordi Estrada " +msgid "%s @ %s" +msgstr "%s @ %s" -#: ../src/main-window.c:928 -msgid "Almanah Website" -msgstr "Lloc web de l'Almanah" - -#: ../src/main-window.c:1085 +#: ../src/main-window.c:1261 msgid "Entry content could not be loaded" msgstr "No s'ha pogut carregar el contingut de l'entrada" -#: ../src/main.c:38 -msgid "Error encrypting database" -msgstr "S'ha produït un error en encriptar la base de dades" - -#: ../src/main.c:99 -msgid "Enable debug mode" -msgstr "Habilita el mode de depuració" - -#. Options -#: ../src/main.c:116 -msgid "- Manage your diary" -msgstr "- Gestioneu el vostre diari" - -#: ../src/main.c:126 -msgid "Command-line options could not be parsed" -msgstr "No s'han pogut analitzar les opcions de la línia d'ordres" +#. Translators: this sentence is just used in startup to estimate the width +#. of a 15 words sentence. Translate with some random sentences with just 15 words. +#. See: https://bugzilla.gnome.org/show_bug.cgi?id=754841 +#: ../src/main-window.c:1416 +msgid "" +"This is just a fifteen words sentence to calculate the diary entry text view " +"size" +msgstr "" +"Això tan sols és una frase de quinze paraules per calcular la mida del text" -#: ../src/main.c:157 -msgid "Error opening database" -msgstr "S'ha produït un error en obrir la base de dades" +#: ../src/main-window.c:1453 +msgid "Spelling checker could not be initialized" +msgstr "No s'ha pogut inicialitzar el verificador ortogràfic" -#: ../src/preferences-dialog.c:79 -msgid "Almanah Preferences" -msgstr "Preferències de l'Almanah" +#: ../src/preferences-dialog.c:83 +msgid "Preferences" +msgstr "Preferències" #. Grab our child widgets -#: ../src/preferences-dialog.c:168 +#: ../src/preferences-dialog.c:204 msgid "Encryption key: " -msgstr "Clau d'encriptació: " +msgstr "Clau de xifratge: " -#: ../src/preferences-dialog.c:173 +#: ../src/preferences-dialog.c:208 msgid "None (don't encrypt)" -msgstr "Cap (no encriptis)" +msgstr "Cap (no xifris)" -#: ../src/preferences-dialog.c:197 +#: ../src/preferences-dialog.c:213 msgid "New _Key" -msgstr "_Clau nova" +msgstr "Nova _clau" #. Set up the "Enable spell checking" check button -#: ../src/preferences-dialog.c:204 +#: ../src/preferences-dialog.c:237 msgid "Enable _spell checking" msgstr "Habilita la _verificació de l'ortografia" -#: ../src/preferences-dialog.c:234 +#: ../src/preferences-dialog.c:262 msgid "Error saving the encryption key" -msgstr "S'ha produït un error en desar la clau d'encriptació" +msgstr "S'ha produït un error en desar la clau de xifratge" -#: ../src/preferences-dialog.c:253 +#: ../src/preferences-dialog.c:281 msgid "Error opening Seahorse" msgstr "S'ha produït un error en obrir el Seahorse" -#: ../src/preferences-dialog.c:291 -msgid "Spelling checker could not be initialized" -msgstr "No s'ha pogut inicialitzar el verificador ortogràfic" - #: ../src/printing.c:277 msgid "This entry is marked as important." msgstr "Aquesta entrada està marcada com a important." @@ -661,102 +587,365 @@ msgid "No entry for this date." msgstr "No hi ha cap entrada en aquesta data." -#: ../src/printing.c:453 +#: ../src/printing.c:457 msgid "Start date:" msgstr "Data d'inici:" -#: ../src/printing.c:455 +#: ../src/printing.c:459 msgid "End date:" msgstr "Data final:" #. Line spacing -#: ../src/printing.c:471 +#: ../src/printing.c:475 msgid "Line spacing:" -msgstr "Espai entre línies:" +msgstr "Interlineat:" + +#: ../src/search-dialog.c:221 +msgid "Search canceled." +msgstr "S'ha cancel·lat la cerca." + +#. Translators: This is an error message wrapper for when searches encounter an error. The placeholder is for an error message. +#: ../src/search-dialog.c:224 +#, c-format +msgid "Error: %s" +msgstr "Error: %s" + +#. Success! +#: ../src/search-dialog.c:229 +#, c-format +msgid "Found %d entry:" +msgid_plural "Found %d entries:" +msgstr[0] "Ha trobat %d entrada:" +msgstr[1] "Ha trobat %d entrades:" + +#: ../src/search-dialog.c:278 +msgid "Searching…" +msgstr "_S'està cercant…" + +#: ../src/storage-manager.c:248 +#, c-format +msgid "" +"Could not open database \"%s\". SQLite provided the following error message: " +"%s" +msgstr "" +"No s'ha pogut obrir la base de dades «%s». SQLite ha proporcionat el " +"missatge d'error següent: %s" + +#: ../src/storage-manager.c:291 +#, c-format +msgid "" +"Could not run query \"%s\". SQLite provided the following error message: %s" +msgstr "" +"No s'ha pogut executar la consulta «%s». SQLite ha proporcionat el missatge " +"d'error següent: %s" + +#: ../src/storage-manager.c:597 +msgid "Error deserializing entry into buffer while searching." +msgstr "" +"S'ha produït un error en desserialitzar l'entrada a la memòria intermèdia " +"mentre se cercava." -#: ../src/storage-manager.c:257 +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Introduïu l'URI" + +#: ../src/vfs.c:239 #, c-format msgid "GPGME is not at least version %s" msgstr "La versió del GPGME no és almenys la %s" -#: ../src/storage-manager.c:266 +#: ../src/vfs.c:246 #, c-format msgid "GPGME doesn't support OpenPGP: %s" -msgstr "El GPGME no permet l'us de l'OpenPGP: %s" +msgstr "GPGME no és compatible amb OpenPGP: %s" -#: ../src/storage-manager.c:275 +#: ../src/vfs.c:253 #, c-format msgid "Error creating cipher context: %s" msgstr "S'ha produït un error en crear el context per al criptògraf: %s" -#: ../src/storage-manager.c:304 +#: ../src/vfs.c:273 +#, c-format +msgid "Can't create a new GIOChannel for the encrypted database: %s" +msgstr "No es pot crear un nou GIOChannel per a la base de dades xifrada: %s" + +#: ../src/vfs.c:281 #, c-format msgid "Error opening encrypted database file \"%s\": %s" msgstr "" -"S'ha produït un error en obrir el fitxer de base de dades encriptat «%s»: %s" +"S'ha produït un error en obrir el fitxer de la base de dades xifrada «%s»: %s" -#: ../src/storage-manager.c:323 +#: ../src/vfs.c:297 #, c-format -msgid "Error opening plain database file \"%s\": %s" -msgstr "S'ha produït un error en obrir el fitxer de bases de dades «%s»: %s" - -#: ../src/storage-manager.c:371 -msgid "" -"The encrypted database is empty. The plain database file has been left " -"undeleted as backup." +msgid "Error creating Callback base data buffer: %s" msgstr "" -"La base de dades encriptada està buida. El fitxer de base de dades s'ha " -"deixat com a còpia de seguretat." +"S'ha produït un error en crear l'àrea de memòria temporal amb el codi " +"executable passat com argument: %s" -#. Delete the plain file -#: ../src/storage-manager.c:374 +#: ../src/vfs.c:305 #, c-format -msgid "Could not delete plain database file \"%s\"." -msgstr "No s'ha pogut suprimir el fitxer de base de dades «%s»." +msgid "Can't create a new GIOChannel for the plain database: %s" +msgstr "No es pot crear un nou GIOChannel per a la base de dades senzilla: %s" -#: ../src/storage-manager.c:415 +#: ../src/vfs.c:313 #, c-format -msgid "Error decrypting database: %s" -msgstr "S'ha produït un error en desencriptar la base de dades: %s" +msgid "Error opening plain database file \"%s\": %s" +msgstr "" +"S'ha produït un error en obrir el fitxer de base de dades senzilla «%s»: %s" -#: ../src/storage-manager.c:449 +#: ../src/vfs.c:409 #, c-format msgid "Error getting encryption key: %s" -msgstr "S'ha produït un error en obtenir la clau d'encriptació: %s" +msgstr "S'ha produït un error en obtenir la clau de xifratge: %s" -#: ../src/storage-manager.c:470 +#: ../src/vfs.c:433 ../src/vfs.c:439 #, c-format msgid "Error encrypting database: %s" -msgstr "S'ha produït un error en encriptar la base de dades: %s" +msgstr "S'ha produït un error en xifrar la base de dades: %s" -#: ../src/storage-manager.c:572 +#. Translators: The first and second params are file paths, the last param is an error message. +#: ../src/vfs.c:489 #, c-format -msgid "" -"Could not open database \"%s\". SQLite provided the following error message: " -"%s" +msgid "Error copying the file from %s to %s: %s" +msgstr "S'ha produït un error en copiar el fitxer de %s a %s: %s" + +#: ../src/vfs.c:495 +#, c-format +msgid "Error changing database backup file permissions: %s" msgstr "" -"No s'ha pogut obrir la base de dades «%s». L'SQLite ha proporcionat el " -"missatge d'error següent: %s" +"S'ha produït un error en canviar els permisos del fitxer de la còpia de " +"seguretat de la base de dades: %s" -#: ../src/storage-manager.c:647 +#: ../src/vfs.c:595 #, c-format -msgid "" -"Could not run query \"%s\". SQLite provided the following error message: %s" +msgid "Error closing file: %s" +msgstr "S'ha produït un error en tancar el fitxer: %s" + +#. Translators: the first parameter is a filename, the second is an error message. +#. Translators: the first parameter is a filename. +#: ../src/vfs.c:994 ../src/vfs.c:1021 +#, c-format +msgid "Error backing up file ‘%s’" +msgstr "S'ha produït un error en fer la còpia de seguretat del fitxer «%s»" + +#: ../src/vfs.c:1007 +#, c-format +msgid "Error decrypting database: %s" +msgstr "S'ha produït un error en desxifrar la base de dades: %s" + +#: ../src/vfs.c:1047 +#, c-format +msgid "Error changing database file permissions: %s" msgstr "" -"No s'ha pogut executar la consulta «%s». L'SQLite ha proporcionat el " -"missatge d'error següent: %s" +"S'ha produït un error en canviar els permisos del fitxer de la base de " +"dades: %s" -#: ../src/storage-manager.c:964 -msgid "Error deserializing entry into buffer while searching." +#: ../src/widgets/calendar-button.c:142 +#, c-format +msgid "UI data could not be loaded: %s" +msgstr "No s'han pogut carregar les dades de la interfície gràfica: %s" + +#: ../src/widgets/calendar-button.c:152 +msgid "Can't load calendar window object from UI file" msgstr "" -"S'ha produït un error en deserialitzar l'entrada a la memòria intermèdia " -"mentre es cercava." +"No es pot carregar l'objecte de finestra del calendari sense un fitxer " +"d'interfície gràfica" #. Translators: This is the detail string for important days as displayed in the calendar. -#: ../src/widgets/calendar.c:116 +#: ../src/widgets/calendar.c:176 msgid "Important!" msgstr "Important" +#: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:166 +msgid "add tag" +msgstr "afegeix l'etiqueta" + +#: ../src/widgets/entry-tags-area.c:101 +msgid "Write the tag and press enter to save it" +msgstr "Escriviu l'etiqueta i premeu la tecla de retorn per desar-la" + +#: ../src/widgets/tag-accessible.c:165 +msgid "Remove the tag from the entry" +msgstr "Suprimeix l'etiqueta de l'entrada." + +#. Looks like gtk_widget_set_tooltip_text don't works here, even in the init... ? +#: ../src/widgets/tag.c:416 +msgid "Remove tag" +msgstr "Suprimeix l'etiqueta" + +#: ../src/widgets/tag-entry.c:85 +msgid "Tag entry" +msgstr "Etiqueta l'entrada" + +#~ msgid "Almanah Preferences" +#~ msgstr "Preferències de l'Almanah" + +#~ msgid "Main window X position" +#~ msgstr "Posició X de la finestra principal" + +#~ msgid "Main window Y position" +#~ msgstr "Posició Y de la finestra principal" + +#~ msgid "Main window height" +#~ msgstr "Alçada de la finestra principal" + +#~ msgid "Main window maximization" +#~ msgstr "Maximització de la finestra principal" + +#~ msgid "Main window width" +#~ msgstr "Amplada de la finestra principal" + +#~ msgid "The X position of the main window." +#~ msgstr "La posició X de la finestra principal." + +#~ msgid "The Y position of the main window." +#~ msgstr "La posició Y de la finestra principal." + +#~ msgid "The height of the main window." +#~ msgstr "L'alçada de la finestra principal." + +#~ msgid "The width of the main window." +#~ msgstr "L'amplada de la finestra principal." + +#~ msgid "Whether the main window should start maximized." +#~ msgstr "Si la finestra principal s'hauria d'iniciar maximitzada." + +#~ msgid "Add a definition for the currently selected text." +#~ msgstr "Afegeix una definició per al text seleccionat." + +#~ msgid "Definition Description" +#~ msgstr "Descripció de la definició" + +#~ msgid "Definition List" +#~ msgstr "Llista de definicions" + +#~ msgid "Definition Type" +#~ msgstr "Tipus de definició" + +#~ msgid "Definition type:" +#~ msgstr "Tipus de definició:" + +#~ msgid "F_ormat" +#~ msgstr "F_ormata" + +#~ msgid "I_mportant" +#~ msgstr "I_mportant" + +#~ msgid "Jump to the current date in the diary." +#~ msgstr "Vés a la data actual en el diari." + +#~ msgid "Nothing selected" +#~ msgstr "No s'ha seleccionat res" + +#~ msgid "Results:" +#~ msgstr "Resultats:" + +#~ msgid "Toggle whether the current entry is marked as important." +#~ msgstr "Commuta si l'entrada actual està marcada com a important." + +#~ msgid "Toggle whether the currently selected text is bold." +#~ msgstr "Commuta si el text seleccionat està en negreta." + +#~ msgid "Toggle whether the currently selected text is italic." +#~ msgstr "Commuta si el text seleccionat està en cursiva." + +#~ msgid "Toggle whether the currently selected text is underlined." +#~ msgstr "Commuta si el text seleccionat està subratllat." + +#~ msgid "View" +#~ msgstr "Visualitza" + +#~ msgid "View Event" +#~ msgstr "Visualitza l'esdeveniment" + +#~ msgid "_Add Definition" +#~ msgstr "_Afegeix una definició" + +#~ msgid "_Definitions" +#~ msgstr "_Definicions" + +#~ msgid "_Export…" +#~ msgstr "_Exporta…" + +#~ msgid "_File" +#~ msgstr "_Fitxer" + +#~ msgid "_Help" +#~ msgstr "A_juda" + +#~ msgid "_Import…" +#~ msgstr "_Importa…" + +#~ msgid "_Print…" +#~ msgstr "_Imprimeix…" + +#~ msgid "_Remove Definition" +#~ msgstr "_Suprimeix la definició" + +#~ msgid "_View Definitions" +#~ msgstr "_Visualitza les definicions" + +#~ msgid "Add Definition" +#~ msgstr "Afegeix una definició" + +#~ msgid "Definition Manager" +#~ msgstr "Gestor de definicions" + +#~ msgid "Are you sure you want to delete the definition for \"%s\"?" +#~ msgstr "Segur que voleu suprimir la definició per a «%s»?" + +#~ msgid "Contact" +#~ msgstr "Contacte" + +#~ msgid "An Evolution contact." +#~ msgstr "Un contacte de l'Evolution." + +#~ msgid "Select Contact" +#~ msgstr "Seleccioneu un contacte" + +#~ msgid "Error opening contact" +#~ msgstr "S'ha produït un error en obrir el contacte" + +#~ msgid "Error opening Evolution" +#~ msgstr "S'ha produït un error en obrir l'Evolution" + +#~ msgid "File" +#~ msgstr "Fitxer" + +#~ msgid "An attached file." +#~ msgstr "Un fitxer adjunt." + +#~ msgid "Select File" +#~ msgstr "Seleccioneu un fitxer" + +#~ msgid "Note" +#~ msgstr "Nota" + +#~ msgid "A note about an important event." +#~ msgstr "Una nota sobre un esdeveniment important." + +#~ msgid "URI" +#~ msgstr "URI" + +#~ msgid "A URI of a file or web page." +#~ msgstr "Un URI d'un fitxer o d'una pàgina web." + +#~ msgid "URI: " +#~ msgstr "URI: " + +#~ msgid "- Manage your diary" +#~ msgstr "- Gestioneu el vostre diari" + +#~ msgid "" +#~ "The encrypted database is empty. The plain database file has been left " +#~ "undeleted as backup." +#~ msgstr "" +#~ "La base de dades encriptada està buida. El fitxer de base de dades s'ha " +#~ "deixat com a còpia de seguretat." + +#~ msgid "Could not delete plain database file \"%s\"." +#~ msgstr "No s'ha pogut suprimir el fitxer de base de dades «%s»." + #~ msgid "Due to an unknown error the file cannot be opened." #~ msgstr "No es pot obrir el fitxer degut a un error desconegut." diff -Nru almanah-0.11.1/po/ChangeLog almanah-0.12.0/po/ChangeLog --- almanah-0.11.1/po/ChangeLog 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/ChangeLog 1970-01-01 00:00:00.000000000 +0000 @@ -1,274 +0,0 @@ -2009-05-04 Mario Blättermann - - * de.po: Updated German translation - -2009-04-20 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2009-04-11 Mario Blättermann - - * de.po: Updated German translation - -2009-04-10 Philip Withnall - - * POTFILES.in: Added F-Spot photo event type. - -2009-03-25 Philip Withnall - - * en_GB.po: Updated British English translation by Jen Ockwell - . - -2009-03-24 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2009-03-23 Mario Blättermann - - * de.po: Updated German translation - -2009-03-07 Mario Blättermann - - * de.po: Updated German translation - -2009-03-03 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2009-02-13 Mario Blättermann - - * de.po: Updated German translation - -2009-02-11 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2009-02-08 Philip Withnall - - * POTFILES.in: Added new contact definition file. - -2009-02-01 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2009-01-27 Philip Withnall - - * POTFILES.in: Removed two non-existent files. - * en_GB.po: Updated British English translation. - -2008-12-30 Leonardo Ferreira Fontenelle - - * pt_BR.po: Updated Brazilian Portuguese translation. Contributed by - Taylon Silmer and Vladimir Melo. Reviewed by Vladimir Melo. - -2008-12-23 Claude Paroz - - * fr.po: Updated French translation. - -2008-12-13 Philip Withnall - - * POTFILES.in: Changed files in accordance with various renamings. - -2008-12-05 Mario Blättermann - - * de.po: Updated German translation - -2008-11-28 Mario Blättermann - - * de.po: Updated German translation - -2008-11-25 Claude Paroz - - * fr.po: Updated French translation by Pierre Lemaire and Claude Paroz. - -2008-11-16 Philip Withnall - - * en_GB.po: Updated British English translation. - -2008-11-13 Philip Withnall - - * POTFILES.in: Added "Add Link" dialogue file. - * en_GB.po: Updated British English translation. - -2008-10-19 Jorge Gonzalez - - * es.po: Updated Spanish translation - -2008-10-18 Jorge Gonzalez - - * es.po: Updated Spanish translation - -2008-10-14 Philip Withnall - - * POTFILES.in: Added preferences dialogue and GConf schema files. - -2008-10-10 Philip Withnall - - * Makefile.in.in: intltool updated - -2008-10-09 Jonh Wendell - - * pt_BR.po: Updated Brazilian Portuguese translation by Fábio Nogueira. - -2008-10-08 Kjartan Maraas - - * nb.po: Added Norwegian bokmål translation. - -2008-10-04 Ilkka Tuohela - - * fi.po: Added Finnish translation. - * LINGUAS: Added fi - -2008-09-27 Robert-André Mauchin - - * fr.po: Updated French translation. - -2008-09-17 Theppitak Karoonboonyanan - - * LINGUAS: Added 'th'. - * th.po: Added Thai translation by Anuchit Sakulwilailert. - -2008-09-09 Leonardo Ferreira Fontenelle - - * pt_BR.po: Brazilian Portuguese translation updated by Fabrício - Godoy. - -2008-08-27 Philip Withnall - - * Makefile.in.in: intltool updated - -2008-08-02 Djihed Afifi - - * ar.po: Updated Arabic Translation by Djihed Afifi. - -2008-07-31 Djihed Afifi - - * ar.po: Added Arabic Translation. - * LINGUAS: Added ar. - -2008-07-25 Daniel Nylander - - * sv.po: Updated Swedish translation. - -2008-07-21 Leonardo Ferreira Fontenelle - - * pt_BR.po: Translation updated by Fábio Nogueira. - -2008-07-13 Jorge Gonzalez - - * es.po: Updated Spanish translation - -2008-07-09 Philip Withnall - - * LINGUAS: Added de (German) translation. - * de.po: Added German translation by Christoph Wickert. - -2008-07-08 Philip Withnall - - * POTFILES.in: Updated to reflect new application name. - * en_GB.po: Updated British English translation. - -2008-07-07 Leonardo Ferreira Fontenelle - - * pt_BR.po: Fixed some fuzzy strings. - -2008-07-06 Leonardo Ferreira Fontenelle - - * LINGUAS: Added pt_BR. - * pt_BR.po: Added Brazilian Portuguese translation, by Fabricio Godoy. - -2008-07-06 Philip Withnall - - * en_GB.po: Updated British English translation. - -2008-06-27 Jorge Gonzalez - - * es.po: Added Spanish translation - * LINGUAS: Added es - -2008-06-24 Philip Withnall - - * en_GB.po: Updated British English translation. - -2008-06-23 Daniel Nylander - - * sv.po: Added Swedish translation. - * LINGUAS: Added sv - -2008-06-23 Philip Withnall - - * POTFILES.in: Fix translation of the UI. - * en_GB.po: Updated British English translation. - -2008-06-23 Gil Forcada - - * ca.po: Added Catalan translation. - * LINGUAS: Added ca and oc (was missing). - -2008-06-22 Yannig Marchegay - - * oc.po: New Occitan translation. - -2008-06-22 Claude Paroz - - * LINGUAS: Changed fr_Fr to fr. - -2008-06-22 Claude Paroz - - * fr.po: renamed fr_FR.po to fr.po and updated translation. - * ChangeLog, LINGUAS, POTFILES.in: removed executable bit. - -2008-06-20 Philip Withnall - - * en_GB.po: Updated British English translation. - * POTFILES.in: Added desktop file. - -2008-06-20 Philip Withnall - - * en_GB.po: Updated British English translation. - -2008-06-08 Philip Withnall - - * POTFILES.in: Added search dialogue files. - -2008-05-22 Philip Withnall - - * LINGUAS: - * fr_FR.po: Add French translation by Jean-François Martin. - * en_GB.po: Updated British English translation. - -2008-05-20 Philip Withnall - - * POTFILES.in: Added printing files. - * en_GB.po: Updated British English translation. - -2008-03-30 Philip Withnall - - * POTFILES.in: Updated to remove old files. - * en_GB.po: Updated British English translation. - -2008-03-27 Philip Withnall - - * en_GB.po: Removed Picasa link type --- use URIs instead. - -2008-03-23 Philip Withnall - - * ChangeLog: Added ChangeLog. - -2008-03-23 Philip Withnall - - * en_GB.po: Added British English translation. - * LINGUAS: Added en_GB (British English) translation. - -2008-03-23 Philip Withnall - - * POTFILES.in: Added some missing files. - -2008-03-22 Philip Withnall - - * Makefile.in.in: Updated due to new intltool. - -2008-03-21 Philip Withnall - - Initial commit with all the functionality that the Vala version had, - but written in an easier-to-use programming language. diff -Nru almanah-0.11.1/po/cs.po almanah-0.12.0/po/cs.po --- almanah-0.11.1/po/cs.po 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/cs.po 2019-10-07 13:45:09.000000000 +0000 @@ -1,15 +1,15 @@ # Czech translation for almanah. # Copyright (C) 2009, 2010 the author(s) of almanah. # This file is distributed under the same license as the almanah package. -# Marek Černocký , 2009, 2010, 2011, 2012, 2013. +# Marek Černocký , 2009, 2010, 2011, 2012, 2013, 2014, 2015. # msgid "" msgstr "" "Project-Id-Version: almanah master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=almanah&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-11-17 17:58+0000\n" -"PO-Revision-Date: 2013-12-03 21:57+0100\n" +"POT-Creation-Date: 2015-10-14 17:59+0000\n" +"PO-Revision-Date: 2015-10-15 12:04+0200\n" "Last-Translator: Marek Černocký \n" "Language-Team: Czech \n" "Language: cs\n" @@ -20,12 +20,16 @@ "X-Generator: Gtranslator 2.91.6\n" #: ../data/almanah.appdata.xml.in.h:1 +msgid "Keep a diary of your life" +msgstr "Uchovávejte si diář svého života" + +#: ../data/almanah.appdata.xml.in.h:2 msgid "" "Almanah Diary is an application to allow you to keep a diary of your life." msgstr "" "Diář Almanah je aplikace, ve které si můžete vést poznámky ze svého života." -#: ../data/almanah.appdata.xml.in.h:2 +#: ../data/almanah.appdata.xml.in.h:3 msgid "" "You can encrypt the diary to preserve your privacy. It has editing " "abilities, including text formatting and printing and shows you a lists of " @@ -37,37 +41,8 @@ "událostí, které se staly, den po dni (podobně jako se zobrazují úkoly a " "schůzky v aplikaci Evolution)." -#: ../data/almanah-app-menu.ui.h:1 -msgid "_Search" -msgstr "_Hledat" - -#: ../data/almanah-app-menu.ui.h:2 -msgid "Pr_eferences" -msgstr "Př_edvolby" - -#. Set the button label -#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 -msgid "_Import" -msgstr "_Importovat" - -#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 -msgid "_Export" -msgstr "_Exportovat" - -#: ../data/almanah-app-menu.ui.h:5 -msgid "_Print diary" -msgstr "Vy_tisknout diář" - -#: ../data/almanah-app-menu.ui.h:6 -msgid "_About Almanah Diary" -msgstr "O diáři _Almanah" - -#: ../data/almanah-app-menu.ui.h:7 -msgid "_Quit" -msgstr "U_končit" - -#: ../data/almanah.desktop.in.h:1 ../src/application.c:132 -#: ../src/main-window.c:136 +#: ../data/almanah.desktop.in.h:1 ../src/application.c:133 +#: ../src/main-window.c:155 msgid "Almanah Diary" msgstr "Diář Almanah" @@ -76,7 +51,7 @@ msgstr "Vést si osobní diář" #. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. -#: ../data/almanah.desktop.in.h:3 ../src/application.c:263 +#: ../data/almanah.desktop.in.h:3 ../src/application.c:272 msgid "Diary" msgstr "Diář" @@ -85,131 +60,75 @@ msgid "diary;journal;" msgstr "diář;plánovač;záznamník;" -#: ../data/almanah.ui.h:1 -msgid "Select Date…" -msgstr "Vybrat datum…" - -#: ../data/almanah.ui.h:2 -msgid "F_ormat" -msgstr "F_ormát" - -#: ../data/almanah.ui.h:3 -msgid "Toggle whether the currently selected text is bold." -msgstr "Přepíná, zda je aktuálně vybraný text tučný." - -#: ../data/almanah.ui.h:4 -msgid "Toggle whether the currently selected text is italic." -msgstr "Přepíná, zda je aktuálně vybraný text kurzívou." - -#: ../data/almanah.ui.h:5 -msgid "Toggle whether the currently selected text is underlined." -msgstr "Přepíná, zda je aktuálně vybraný text podtržený." - -#: ../data/almanah.ui.h:6 -msgid "Add/Remove _Hyperlink" -msgstr "Přidat/odebrat _hypertextový odkaz" - -#: ../data/almanah.ui.h:7 -msgid "" -"Add or remove a hyperlink from the currently selected text to a specified " -"URI." -msgstr "" -"Ve vybraném textu přidat nebo odebrat hypertextový odkaz na zadanou adresu " -"URI." - -#: ../data/almanah.ui.h:8 -msgid "Insert _Time" -msgstr "_Vložit čas" - -#: ../data/almanah.ui.h:9 -msgid "I_mportant" -msgstr "Dů_ležité" - -#: ../data/almanah.ui.h:10 -msgid "Toggle whether the current entry is marked as important." -msgstr "Přepíná, zda je současný záznam označený jako důležitý." - -#: ../data/almanah.ui.h:11 -msgid "Show tags" -msgstr "Zobrazovat štitky" - -#: ../data/almanah.ui.h:12 -msgid "Show tags for the current entry" -msgstr "Zobrazovat štítky pro aktuální záznam" - -#: ../data/almanah.ui.h:13 -msgid "_Help" -msgstr "_Nápověda" - -#: ../data/almanah.ui.h:14 -msgid "Go to _Today" -msgstr "Přejí_t na dnešek" - -#: ../data/almanah.ui.h:15 -msgid "Jump to the current date in the diary." -msgstr "Přejít v diáři na dnešní datum." - -#: ../data/almanah.ui.h:16 +#: ../src/ui/almanah.ui.h:1 msgid "Calendar" msgstr "Kalendář" -#: ../data/almanah.ui.h:17 +#: ../src/ui/almanah.ui.h:2 +msgid "Go to Today" +msgstr "Přejít na dnešek" + +#: ../src/ui/almanah.ui.h:3 +msgid "Select Date…" +msgstr "Vybrat datum…" + +#: ../src/ui/almanah.ui.h:4 msgid "Entry editing area" msgstr "Oblast pro úpravu záznamů" -#: ../data/almanah.ui.h:18 +#: ../src/ui/almanah.ui.h:5 msgid "Past events" msgstr "Poslední události" -#: ../data/almanah.ui.h:19 +#: ../src/ui/almanah.ui.h:6 msgid "Past Event List" msgstr "Seznam posledních událostí" -#: ../data/almanah.ui.h:20 +#: ../src/ui/almanah.ui.h:7 msgid "Search entry" msgstr "Hledat záznam" -#: ../data/almanah.ui.h:21 ../src/search-dialog.c:69 +#: ../src/ui/almanah.ui.h:8 ../src/search-dialog.c:69 msgid "Search" msgstr "Hledat" -#: ../data/almanah.ui.h:22 +#: ../src/ui/almanah.ui.h:9 msgid "Result List" msgstr "Seznam výsledků" -#: ../data/almanah.ui.h:23 +#: ../src/ui/almanah.ui.h:10 msgid "View Entry" msgstr "Zobrazit záznam" -#: ../data/almanah.ui.h:24 +#: ../src/ui/almanah.ui.h:11 msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." msgstr "např. „14/03/2009“ nebo „14th March 2009“." -#: ../data/almanah.ui.h:25 +#: ../src/ui/almanah.ui.h:12 msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." msgstr "např. “http://google.cz/” nebo “file:///home/ja/Obrázky/fotka.jpg”." -#: ../data/almanah.ui.h:26 +#: ../src/ui/almanah.ui.h:13 msgid "Successful Entries" msgstr "Úspěšné záznamy" -#: ../data/almanah.ui.h:27 +#: ../src/ui/almanah.ui.h:14 msgid "Merged Entries" msgstr "Sloučené záznamy" -#: ../data/almanah.ui.h:28 +#: ../src/ui/almanah.ui.h:15 msgid "Failed Entries" msgstr "Neúspěšné zázmamy" -#: ../data/almanah.ui.h:29 +#: ../src/ui/almanah.ui.h:16 msgid "Import Results List" msgstr "Seznam výsledků importu" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 +#: ../data/org.gnome.almanah.gschema.xml.in.h:1 msgid "Database encryption key ID" msgstr "ID šifrovacího klíče databáze" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +#: ../data/org.gnome.almanah.gschema.xml.in.h:2 msgid "" "The ID of the key to use to encrypt and decrypt the database, if Almanah has " "been built with encryption support. Leave blank to disable database " @@ -219,39 +138,32 @@ "aplikace Almanah sestavená s podporou šifrování. Pokud chcete šifrování " "databáze zakázat, ponechte pole prázdné." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 +#: ../data/org.gnome.almanah.gschema.xml.in.h:3 msgid "Spell checking language" msgstr "Jazyk kontroly pravopisu" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +#: ../data/org.gnome.almanah.gschema.xml.in.h:4 msgid "The locale specifier of the language in which to check entry spellings." msgstr "" "Národní identifikátor jazyka, pro který se má provádět kontrola pravopisu." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +#: ../data/org.gnome.almanah.gschema.xml.in.h:5 msgid "Spell checking enabled?" msgstr "Povolená kontrola pravopisu?" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 +#: ../data/org.gnome.almanah.gschema.xml.in.h:6 msgid "Whether spell checking of entries is enabled." msgstr "Zda je zapnutá kontrola pravopisu záznamů." -#: ../src/application.c:246 +#: ../src/application.c:255 msgid "Error opening database" msgstr "Chyba při otevírání databáze" -#. Error loading the CSS -#: ../src/application.c:275 -#, c-format -msgid "" -"Couldn't load the CSS file '%s'. The interface might not be styled correctly" -msgstr "Nelze načíst soubor CSS „%s“. Rozhraní nemusí být správně ostylováno." - -#: ../src/application.c:319 +#: ../src/application.c:332 msgid "Enable debug mode" msgstr "Zapnout režim ladění" -#: ../src/application.c:336 +#: ../src/application.c:349 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" @@ -259,24 +171,16 @@ "programu." #. Print an error -#: ../src/application.c:347 +#: ../src/application.c:360 #, c-format msgid "Command line options could not be parsed: %s\n" msgstr "Nelze zpracovat přepínače příkazového řádku: %s\n" -#: ../src/application.c:366 +#: ../src/application.c:379 msgid "Error encrypting database" msgstr "Chyba při šifrování databáze" -#: ../src/application.c:419 ../src/date-entry-dialog.c:129 -#: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 -#: ../src/main-window.c:195 ../src/preferences-dialog.c:191 -#: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 -#, c-format -msgid "UI file \"%s\" could not be loaded" -msgstr "Nelze načíst soubor „%s“ s uživatelským rozhraním" - -#: ../src/application.c:542 +#: ../src/application.c:522 msgid "" "Almanah is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -288,7 +192,7 @@ "Free Software Foundation, a to buď ve verzi 3 této licence nebo (dle vaší " "volby) v libovolné novější verzi." -#: ../src/application.c:546 +#: ../src/application.c:526 msgid "" "Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -300,7 +204,7 @@ "KONKRÉTNÍ ÚČEL. Více podrobností najdete přímo v licenci GNU General Public " "License." -#: ../src/application.c:550 +#: ../src/application.c:530 msgid "" "You should have received a copy of the GNU General Public License along with " "Almanah. If not, see ." @@ -309,12 +213,12 @@ "License. Pokud se tak nestalo, podívejte se na ." -#: ../src/application.c:565 +#: ../src/application.c:545 #, c-format msgid "A helpful diary keeper, storing %u entries." msgstr "Užitečný diář na hlídání termínů, uloženo %u záznamů." -#: ../src/application.c:569 +#: ../src/application.c:549 msgid "Copyright © 2008-2009 Philip Withnall" msgstr "Copyright © 2008-2009 Philip Withnall" @@ -323,18 +227,33 @@ #. * "Translator name 1 \n" #. * "Translator name 2 " #. -#: ../src/application.c:577 +#: ../src/application.c:557 msgid "translator-credits" msgstr "Marek Černocký " -#: ../src/application.c:581 +#: ../src/application.c:561 msgid "Almanah Website" msgstr "Webové stránky Almanah" +#: ../src/application.c:589 +#, c-format +msgid "" +"Couldn't load the CSS resources. The interface might not be styled " +"correctly: %s" +msgstr "" +"Nelze načíst prostředky CSS. Rozhraní nemusí být správně ostylováno: %s" + #: ../src/date-entry-dialog.c:72 msgid "Select Date" msgstr "Výběr data" +#: ../src/date-entry-dialog.c:127 ../src/import-export-dialog.c:169 +#: ../src/import-export-dialog.c:475 ../src/main-window.c:225 +#: ../src/preferences-dialog.c:177 ../src/search-dialog.c:95 +#: ../src/uri-entry-dialog.c:126 +msgid "UI data could not be loaded" +msgstr "Nelze načíst data uživatelského rozhraní" + #: ../src/entry.c:303 #, c-format msgid "Invalid data version number %u." @@ -398,52 +317,128 @@ msgid "Error changing exported file permissions: %s" msgstr "Chyba při změně oprávnění exportovaného souboru: %s" -#: ../src/import-export-dialog.c:202 +#: ../src/gtk/menus.ui.h:1 +msgid "_Search" +msgstr "_Hledat" + +#: ../src/gtk/menus.ui.h:2 +msgid "Pr_eferences" +msgstr "Př_edvolby" + +#: ../src/gtk/menus.ui.h:3 +msgctxt "Main menu" +msgid "_Import" +msgstr "_Importovat" + +#: ../src/gtk/menus.ui.h:4 +msgctxt "Main menu" +msgid "_Export" +msgstr "_Exportovat" + +#: ../src/gtk/menus.ui.h:5 +msgid "_Print diary" +msgstr "Vy_tisknout diář" + +#: ../src/gtk/menus.ui.h:6 +msgid "_About Almanah Diary" +msgstr "O diáři _Almanah" + +#: ../src/gtk/menus.ui.h:7 +msgid "_Quit" +msgstr "U_končit" + +#: ../src/gtk/menus.ui.h:8 +msgid "_Bold" +msgstr "_Tučné" + +#: ../src/gtk/menus.ui.h:9 +msgid "_Italic" +msgstr "Ku_rzíva" + +#: ../src/gtk/menus.ui.h:10 +msgid "_Underline" +msgstr "Po_dtržené" + +#: ../src/gtk/menus.ui.h:11 +msgid "_Cut" +msgstr "_Vyjmout" + +#: ../src/gtk/menus.ui.h:12 +msgid "_Copy" +msgstr "_Kopírovat" + +#: ../src/gtk/menus.ui.h:13 +msgid "_Paste" +msgstr "V_ložit" + +#: ../src/gtk/menus.ui.h:14 ../src/main-window.c:626 +msgid "_Delete" +msgstr "_Smazat" + +#: ../src/gtk/menus.ui.h:15 +msgid "Insert _Time" +msgstr "Vloži_t čas" + +#: ../src/gtk/menus.ui.h:16 +msgid "Add/Remove _Hyperlink" +msgstr "Přidat/odebrat _hypertextový odkaz" + +#: ../src/import-export-dialog.c:203 msgid "Import _mode: " msgstr "Reži_m importu: " -#: ../src/import-export-dialog.c:202 +#: ../src/import-export-dialog.c:203 msgid "Export _mode: " msgstr "Reži_m exportu: " #. Set the window title -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Import Entries" msgstr "Import záznamů" -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Export Entries" msgstr "Export záznamů" -#: ../src/import-export-dialog.c:245 +#: ../src/import-export-dialog.c:210 +msgctxt "Dialog button" +msgid "_Import" +msgstr "_Importovat" + +#: ../src/import-export-dialog.c:210 +msgctxt "Dialog button" +msgid "_Export" +msgstr "_Exportovat" + +#: ../src/import-export-dialog.c:247 msgid "Import failed" msgstr "Import selhal" -#: ../src/import-export-dialog.c:283 +#: ../src/import-export-dialog.c:285 msgid "Export failed" msgstr "Export selhal" -#: ../src/import-export-dialog.c:296 +#: ../src/import-export-dialog.c:298 msgid "Export successful" msgstr "Export úspěšný" -#: ../src/import-export-dialog.c:297 +#: ../src/import-export-dialog.c:299 msgid "The diary was successfully exported." msgstr "Diář byl úspěšně vyexportován." -#: ../src/import-export-dialog.c:445 +#: ../src/import-export-dialog.c:447 msgid "Import Results" msgstr "Výsledky importu" #. Translators: This is a strftime()-format string for the dates displayed in import results. #. Translators: This is a strftime()-format string for the date to display when asking about editing a diary entry. #. Translators: This is a strftime()-format string for the date to display when asking about deleting a diary entry. +#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. -#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. -#: ../src/import-export-dialog.c:539 ../src/main-window.c:567 -#: ../src/main-window.c:597 ../src/printing.c:263 ../src/search-dialog.c:182 -#: ../src/widgets/calendar-button.c:309 +#: ../src/import-export-dialog.c:542 ../src/main-window.c:587 +#: ../src/main-window.c:618 ../src/main-window.c:1225 ../src/printing.c:263 +#: ../src/search-dialog.c:180 msgid "%A, %e %B %Y" msgstr "%A, %e. %B %Y" @@ -494,68 +489,87 @@ "Záznam importován z „%s“:\n" "\n" -#: ../src/main-window.c:571 +#: ../src/main-window.c:591 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" msgstr "Opravdu chcete upravit tento záznam v diáři na %s?" -#: ../src/main-window.c:601 +#: ../src/main-window.c:594 ../src/main-window.c:625 +msgid "_Cancel" +msgstr "_Zrušit" + +#: ../src/main-window.c:595 +msgid "_Edit" +msgstr "_Upravit" + +#: ../src/main-window.c:622 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" msgstr "Opravdu chcete smazat tento záznam v diáři na %s?" #. Print a warning about the unknown tag -#: ../src/main-window.c:710 +#: ../src/main-window.c:732 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." msgstr "" "Neznámá nebo duplicitní textová značka „%s“ v záznamu. Bude se ignorovat." -#: ../src/main-window.c:918 +#: ../src/main-window.c:973 msgid "Error opening URI" msgstr "Chyba při otevírání URI" #. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place -#: ../src/main-window.c:1092 +#: ../src/main-window.c:1152 #, c-format msgid "%s @ %s" msgstr "%s v %s" -#: ../src/main-window.c:1171 +#: ../src/main-window.c:1258 msgid "Entry content could not be loaded" msgstr "Obsah záznamu nelze načíst" -#: ../src/main-window.c:1348 +#. Translators: this sentence is just used in startup to estimate the width +#. of a 15 words sentence. Translate with some randome sentences with just 15 words. +#. See: https://bugzilla.gnome.org/show_bug.cgi?id=754841 +#: ../src/main-window.c:1414 +msgid "" +"This is just a fifteen words sentence to calculate the diary entry text view " +"size" +msgstr "" +"Toto je prostě jen věta dlouhá patnáct slov pro výpočet délky textového " +"vstupu v diáři" + +#: ../src/main-window.c:1450 msgid "Spelling checker could not be initialized" msgstr "Nelze inicializovat kontrolu pravopisu" -#: ../src/preferences-dialog.c:91 -msgid "Almanah Preferences" -msgstr "Předvolby Almanah" +#: ../src/preferences-dialog.c:83 +msgid "Preferences" +msgstr "Předvolby" #. Grab our child widgets -#: ../src/preferences-dialog.c:217 +#: ../src/preferences-dialog.c:204 msgid "Encryption key: " msgstr "Šifrovací klíč:" -#: ../src/preferences-dialog.c:222 +#: ../src/preferences-dialog.c:208 msgid "None (don't encrypt)" msgstr "Žádný (nešifrovat)" -#: ../src/preferences-dialog.c:246 +#: ../src/preferences-dialog.c:213 msgid "New _Key" msgstr "Nový _klíč" #. Set up the "Enable spell checking" check button -#: ../src/preferences-dialog.c:253 +#: ../src/preferences-dialog.c:237 msgid "Enable _spell checking" msgstr "Zapnout kontrolu pravopi_su" -#: ../src/preferences-dialog.c:279 +#: ../src/preferences-dialog.c:262 msgid "Error saving the encryption key" msgstr "Chyba při ukládání šifrovacího klíče" -#: ../src/preferences-dialog.c:298 +#: ../src/preferences-dialog.c:281 msgid "Error opening Seahorse" msgstr "Chyba při otevírání aplikace Seahorse" @@ -580,18 +594,18 @@ msgid "Line spacing:" msgstr "Řádkování:" -#: ../src/search-dialog.c:223 +#: ../src/search-dialog.c:221 msgid "Search canceled." msgstr "Hledání zrušeno." #. Translators: This is an error message wrapper for when searches encounter an error. The placeholder is for an error message. -#: ../src/search-dialog.c:226 +#: ../src/search-dialog.c:224 #, c-format msgid "Error: %s" msgstr "Chyba: %s" #. Success! -#: ../src/search-dialog.c:231 +#: ../src/search-dialog.c:229 #, c-format msgid "Found %d entry:" msgid_plural "Found %d entries:" @@ -599,111 +613,125 @@ msgstr[1] "Nalezeny %d záznamy:" msgstr[2] "Nalezeno %d záznamů:" -#: ../src/search-dialog.c:280 +#: ../src/search-dialog.c:278 msgid "Searching…" msgstr "Hledá se…" -#: ../src/storage-manager.c:276 +#: ../src/storage-manager.c:248 +#, c-format +msgid "" +"Could not open database \"%s\". SQLite provided the following error message: " +"%s" +msgstr "" +"Nelze otevřít databázi „%s“. Aplikace SQLite poskytla následující chybovou " +"zprávu: %s" + +#: ../src/storage-manager.c:291 +#, c-format +msgid "" +"Could not run query \"%s\". SQLite provided the following error message: %s" +msgstr "" +"Nelze spustit dotaz „%s“. Aplikace SQLite poskytla následující chybovou " +"zprávu: %s" + +#: ../src/storage-manager.c:597 +msgid "Error deserializing entry into buffer while searching." +msgstr "Chyba při deserializaci záznamu do vyrovnávací paměti během hledání." + +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Zadání adresy URI" + +#: ../src/vfs.c:239 #, c-format msgid "GPGME is not at least version %s" msgstr "GPGME není v minimální potřebné verzi %s" -#: ../src/storage-manager.c:285 +#: ../src/vfs.c:246 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "GPGME nepodporuje OpenPGP: %s" -#: ../src/storage-manager.c:294 +#: ../src/vfs.c:253 #, c-format msgid "Error creating cipher context: %s" msgstr "Chyba při vytváření kontextu šifry: %s" -#: ../src/storage-manager.c:323 +#: ../src/vfs.c:273 +#, c-format +msgid "Can't create a new GIOChannel for the encrypted database: %s" +msgstr "Nelze vytvořit nový GIOChannel pro šifrovanou databázi: %s" + +#: ../src/vfs.c:281 #, c-format msgid "Error opening encrypted database file \"%s\": %s" msgstr "Chyba při otevírání šifrovaného databázového souboru „%s“: %s" -#: ../src/storage-manager.c:342 +#: ../src/vfs.c:297 #, c-format -msgid "Error opening plain database file \"%s\": %s" -msgstr "Chyba při otevírání prostého databázového souboru „%s“: %s" - -#: ../src/storage-manager.c:390 -msgid "" -"The encrypted database is empty. The plain database file has been left " -"undeleted as backup." +msgid "Error creating Callback base data buffer: %s" msgstr "" -"Šifrovaná databáze je prázdná. Prostý databázový soubor byl ponechán jako " -"záloha." +"Chyba při vytváření vyrovnávací paměti pro základní data zpětných volání: %s" -#. Delete the plain file -#: ../src/storage-manager.c:393 +#: ../src/vfs.c:305 #, c-format -msgid "Could not delete plain database file \"%s\"." -msgstr "Nelze smazat prostý databázový soubor „%s“." +msgid "Can't create a new GIOChannel for the plain database: %s" +msgstr "Nelze vytvořit nový GIOChannel pro prostou databázi: %s" -#: ../src/storage-manager.c:434 +#: ../src/vfs.c:313 #, c-format -msgid "Error decrypting database: %s" -msgstr "Chyba při dešifrování databáze: %s" +msgid "Error opening plain database file \"%s\": %s" +msgstr "Chyba při otevírání prostého databázového souboru „%s“: %s" -#: ../src/storage-manager.c:468 +#: ../src/vfs.c:409 #, c-format msgid "Error getting encryption key: %s" msgstr "Chyba při získávání šifrovacího klíče: %s" -#: ../src/storage-manager.c:489 +#: ../src/vfs.c:433 ../src/vfs.c:439 #, c-format msgid "Error encrypting database: %s" msgstr "Chyba při šifrování databáze: %s" -#: ../src/storage-manager.c:549 +#. Translators: The first and second params are file paths, the last param is an error message. +#: ../src/vfs.c:489 +#, c-format +msgid "Error copying the file from %s to %s: %s" +msgstr "Chyba při kopírování souboru z %s do %s: %s" + +#: ../src/vfs.c:495 #, c-format msgid "Error changing database backup file permissions: %s" msgstr "Chyba při změně oprávnění souboru se zálohou databáze: %s" -#: ../src/storage-manager.c:571 ../src/storage-manager.c:627 +#: ../src/vfs.c:595 #, c-format -msgid "Error changing database file permissions: %s" -msgstr "Chyba při změně oprávnění databázového souboru: %s" +msgid "Error closing file: %s" +msgstr "Chyba při zavírání souboru: %s" #. Translators: the first parameter is a filename, the second is an error message. -#: ../src/storage-manager.c:583 ../src/storage-manager.c:611 +#. Translators: the first parameter is a filename. +#: ../src/vfs.c:994 ../src/vfs.c:1021 #, c-format -msgid "Error backing up file ‘%s’: %s" -msgstr "Chyba při zálohování souboru „%s“: %s" +msgid "Error backing up file ‘%s’" +msgstr "Chyba při zálohování souboru „%s“" -#: ../src/storage-manager.c:620 +#: ../src/vfs.c:1007 #, c-format -msgid "" -"Could not open database \"%s\". SQLite provided the following error message: " -"%s" -msgstr "" -"Nelze otevřít databázi „%s“. Aplikace SQLite poskytla následující chybovou " -"zprávu: %s" +msgid "Error decrypting database: %s" +msgstr "Chyba při dešifrování databáze: %s" -#: ../src/storage-manager.c:704 +#: ../src/vfs.c:1047 #, c-format -msgid "" -"Could not run query \"%s\". SQLite provided the following error message: %s" -msgstr "" -"Nelze spustit dotaz „%s“. Aplikace SQLite poskytla následující chybovou " -"zprávu: %s" - -#: ../src/storage-manager.c:1010 -msgid "Error deserializing entry into buffer while searching." -msgstr "Chyba při deserializaci záznamu do vyrovnávací paměti během hledání." - -#: ../src/uri-entry-dialog.c:71 -msgid "Enter URI" -msgstr "Zadání adresy URI" +msgid "Error changing database file permissions: %s" +msgstr "Chyba při změně oprávnění databázového souboru: %s" -#: ../src/widgets/calendar-button.c:140 +#: ../src/widgets/calendar-button.c:142 #, c-format -msgid "UI file \"%s\" could not be loaded: %s" -msgstr "Nelze načíst soubor „%s“ s uživatelským rozhraním: %s" +msgid "UI data could not be loaded: %s" +msgstr "Nelze načíst data uživatelského rozhraní: %s" -#: ../src/widgets/calendar-button.c:150 +#: ../src/widgets/calendar-button.c:152 msgid "Can't load calendar window object from UI file" msgstr "" "Ze souboru s uživatelským rozhraním nelze načíst objekt okna s kalendářem" @@ -713,10 +741,6 @@ msgid "Important!" msgstr "Důležité!" -#: ../src/widgets/calendar-window.c:80 -msgid "Unknown input device" -msgstr "Neznámé vstupní zařízení" - #: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:166 msgid "add tag" msgstr "přidat štítek" @@ -737,3 +761,6 @@ #: ../src/widgets/tag-entry.c:85 msgid "Tag entry" msgstr "Záznam štítku" + +#~ msgid "Almanah Preferences" +#~ msgstr "Předvolby Almanah" diff -Nru almanah-0.11.1/po/da.po almanah-0.12.0/po/da.po --- almanah-0.11.1/po/da.po 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/da.po 2019-10-07 13:45:09.000000000 +0000 @@ -2,6 +2,7 @@ # Copyright (C) 2013 almanah's COPYRIGHT HOLDER # This file is distributed under the same license as the almanah package. # Joe Hansen (joedalton2@yahoo.dk), 2009, 2010, 2011, 2012, 2013. +# Alan Mortensen , 2016. # Korrekturlæst Torben Grøn Helligsø, 2010. # Korrekturlæst Aputsiaq Janussen, 2013. # @@ -10,23 +11,34 @@ msgid "" msgstr "" "Project-Id-Version: almanah master\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-10 23:27+0200\n" -"PO-Revision-Date: 2013-09-10 12:42+0000\n" -"Last-Translator: Joe Hansen \n" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" +"product=almanah&keywords=I18N+L10N&component=General\n" +"POT-Creation-Date: 2017-02-27 16:29+0000\n" +"PO-Revision-Date: 2016-11-02 19:53+0100\n" +"Last-Translator: Alan Mortensen \n" "Language-Team: Danish \n" "Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.8.7.1\n" -#: ../data/almanah.appdata.xml.in.h:1 +#: ../data/almanah.appdata.xml.in.h:1 ../data/almanah.desktop.in.h:1 +#: ../src/application.c:135 ../src/main-window.c:163 +msgid "Almanah Diary" +msgstr "Almanah - dagbog" + +#: ../data/almanah.appdata.xml.in.h:2 +msgid "Keep a diary of your life" +msgstr "Før dagbog over dit liv" + +#: ../data/almanah.appdata.xml.in.h:3 msgid "" "Almanah Diary is an application to allow you to keep a diary of your life." msgstr "Almanah Diary er et program, som du kan bruge som dagbog i dit liv." -#: ../data/almanah.appdata.xml.in.h:2 +#: ../data/almanah.appdata.xml.in.h:4 msgid "" "You can encrypt the diary to preserve your privacy. It has editing " "abilities, including text formatting and printing and shows you a lists of " @@ -38,46 +50,12 @@ "viser en liste over hændelser (på din computer) for dig om hvad der skete " "hver dag (såsom opgaver og aftaler fra Evolution)." -#: ../data/almanah-app-menu.ui.h:1 -msgid "_Search" -msgstr "_Søg" - -#: ../data/almanah-app-menu.ui.h:2 -msgid "Pr_eferences" -msgstr "_Indstillinger" - -#. Set the button label -#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 -msgid "_Import" -msgstr "_Importer" - -#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 -msgid "_Export" -msgstr "_Eksporter" - -#: ../data/almanah-app-menu.ui.h:5 -msgid "_Print diary" -msgstr "_Udskriv dagbog" - -#: ../data/almanah-app-menu.ui.h:6 -msgid "_About Almanah Diary" -msgstr "_Om Almanah - dagbog" - -#: ../data/almanah-app-menu.ui.h:7 -msgid "_Quit" -msgstr "_Afslut" - -#: ../data/almanah.desktop.in.h:1 ../src/application.c:132 -#: ../src/main-window.c:136 -msgid "Almanah Diary" -msgstr "Almanah - dagbog" - #: ../data/almanah.desktop.in.h:2 msgid "Keep a personal diary" -msgstr "Hold en personlig dagbog" +msgstr "Før en personlig dagbog" #. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. -#: ../data/almanah.desktop.in.h:3 ../src/application.c:263 +#: ../data/almanah.desktop.in.h:3 ../src/application.c:274 msgid "Diary" msgstr "Dagbog" @@ -86,201 +64,130 @@ msgid "diary;journal;" msgstr "dagbog;journal;logbog;" -#: ../data/almanah.ui.h:1 -msgid "Select Date…" -msgstr "Vælg dato…" - -#: ../data/almanah.ui.h:2 -msgid "F_ormat" -msgstr "F_ormat" - -#: ../data/almanah.ui.h:3 -msgid "Toggle whether the currently selected text is bold." -msgstr "Skifter mellem om den aktuelt markeret tekst er fed eller ej." - -#: ../data/almanah.ui.h:4 -msgid "Toggle whether the currently selected text is italic." -msgstr "Skifter mellem om den aktuelt markeret tekst er kursiv eller ej." - -#: ../data/almanah.ui.h:5 -msgid "Toggle whether the currently selected text is underlined." -msgstr "Skifter mellem om den aktuelt markeret tekst er understreget eller ej." - -#: ../data/almanah.ui.h:6 -msgid "Add/Remove _Hyperlink" -msgstr "Tilføj/fjern _hyperhenvisning" - -#: ../data/almanah.ui.h:7 -msgid "" -"Add or remove a hyperlink from the currently selected text to a specified " -"URI." -msgstr "" -"Tilføj eller fjern en hyperhenvisning fra den aktuelt valgte tekst til en " -"angivet adresse." - -#: ../data/almanah.ui.h:8 -msgid "Insert _Time" -msgstr "Indsæt _tid" - -#: ../data/almanah.ui.h:9 -msgid "I_mportant" -msgstr "Vi_gtigt" - -#: ../data/almanah.ui.h:10 -msgid "Toggle whether the current entry is marked as important." -msgstr "Skifter mellem om den aktuelle post er markeret som vigtig eller ej." - -#: ../data/almanah.ui.h:11 -msgid "Show tags" -msgstr "Vis mærker" - -#: ../data/almanah.ui.h:12 -msgid "Show tags for the current entry" -msgstr "Vis mærker for den aktuelle post" - -#: ../data/almanah.ui.h:13 -msgid "_Help" -msgstr "_Hjælp" - -#: ../data/almanah.ui.h:14 -msgid "Go to _Today" -msgstr "Gå _til I dag" - -#: ../data/almanah.ui.h:15 -msgid "Jump to the current date in the diary." -msgstr "Gå til den aktuelle dato i dagbogen." - -#: ../data/almanah.ui.h:16 +#: ../src/ui/almanah.ui.h:1 msgid "Calendar" msgstr "Kalender" -#: ../data/almanah.ui.h:17 +#: ../src/ui/almanah.ui.h:2 +msgid "Go to Today" +msgstr "Gå til i dag" + +#: ../src/ui/almanah.ui.h:3 +msgid "Select Date…" +msgstr "Vælg dato …" + +#: ../src/ui/almanah.ui.h:4 msgid "Entry editing area" msgstr "Postredigeringsområde" -#: ../data/almanah.ui.h:18 +#: ../src/ui/almanah.ui.h:5 msgid "Past events" msgstr "Tidligere begivenheder" -#: ../data/almanah.ui.h:19 +#: ../src/ui/almanah.ui.h:6 msgid "Past Event List" msgstr "Tidligere begivenhedsliste" -#: ../data/almanah.ui.h:20 +#: ../src/ui/almanah.ui.h:7 msgid "Search entry" msgstr "Søgetekst" -#: ../data/almanah.ui.h:21 ../src/search-dialog.c:69 +#: ../src/ui/almanah.ui.h:8 ../src/search-dialog.c:69 msgid "Search" msgstr "Søg" -#: ../data/almanah.ui.h:22 +#: ../src/ui/almanah.ui.h:9 msgid "Result List" msgstr "Resultatliste" -#: ../data/almanah.ui.h:23 +#: ../src/ui/almanah.ui.h:10 msgid "View Entry" msgstr "Vis post" -#: ../data/almanah.ui.h:24 +#. Translators: Use two common date formats from your locale which will be parsed correctly by GLib +#: ../src/ui/almanah.ui.h:12 msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." -msgstr "f.eks. \"14/03/2009\" eller \"14. marts 2009\"." +msgstr "f.eks. “14/03/2009” eller “14. marts 2009”." -#: ../data/almanah.ui.h:25 +#. Translators: Use two popular URIs from your locale, preferably one on the Internet and one local file. +#: ../src/ui/almanah.ui.h:14 msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." -msgstr "" -"f.eks. \"http://google.com/\" eller \"file:///home/me/Photos/photo.jpg\"." +msgstr "f.eks. “http://google.com/” eller “file:///home/me/Photos/photo.jpg”." # Succesfulde poster, poster med succes, vellykkede poster -#: ../data/almanah.ui.h:26 +#: ../src/ui/almanah.ui.h:15 msgid "Successful Entries" msgstr "Vellykkede poster" -#: ../data/almanah.ui.h:27 +#: ../src/ui/almanah.ui.h:16 msgid "Merged Entries" msgstr "Flettede poster" # mislykkede poster -#: ../data/almanah.ui.h:28 +#: ../src/ui/almanah.ui.h:17 msgid "Failed Entries" msgstr "Poster der mislykkedes" -#: ../data/almanah.ui.h:29 +#: ../src/ui/almanah.ui.h:18 msgid "Import Results List" msgstr "Importer resultatliste" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 +#: ../data/org.gnome.almanah.gschema.xml.in.h:1 msgid "Database encryption key ID" msgstr "Nøgle-id til kryptering af database" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +#: ../data/org.gnome.almanah.gschema.xml.in.h:2 msgid "" "The ID of the key to use to encrypt and decrypt the database, if Almanah has " "been built with encryption support. Leave blank to disable database " "encryption." msgstr "" "Id på nøglen der bruges til at kryptere og afkryptere databasen, hvis " -"Almanah er blevet bygget med krypteringsunderstøttelse. Efterlad uudfyldt " -"for at slå datakryptering fra." +"Almanah er blevet bygget med krypteringsunderstøttelse. Efterlad tom for at " +"slå datakryptering fra." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 +#: ../data/org.gnome.almanah.gschema.xml.in.h:3 msgid "Spell checking language" msgstr "Stavekontrollens sprog" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +#: ../data/org.gnome.almanah.gschema.xml.in.h:4 msgid "The locale specifier of the language in which to check entry spellings." msgstr "" "Sprogangivelsen på det sprog som skal bruges til at tjekke stavningen med." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +#: ../data/org.gnome.almanah.gschema.xml.in.h:5 msgid "Spell checking enabled?" msgstr "Stavekontrol slået til?" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 +#: ../data/org.gnome.almanah.gschema.xml.in.h:6 msgid "Whether spell checking of entries is enabled." msgstr "Hvorvidt stavekontrol er slået til." -#: ../src/application.c:246 +#: ../src/application.c:257 msgid "Error opening database" msgstr "Fejl under åbning af database" -#. Error loading the CSS -#: ../src/application.c:275 -#, c-format -msgid "" -"Couldn't load the CSS file '%s'. The interface might not be styled correctly" -msgstr "" -"Kunne ikke indlæse CSS-filen \"%s\". Grænsefladen er måske ikke korrekt opsat" - -#: ../src/application.c:319 +#: ../src/application.c:336 msgid "Enable debug mode" msgstr "Slå fejlsøgningstilstand til" -#: ../src/application.c:336 +#: ../src/application.c:353 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" "Håndter din dagbog. Kun en instans af programmet kan være åben ad gangen." #. Print an error -#: ../src/application.c:347 +#: ../src/application.c:364 #, c-format msgid "Command line options could not be parsed: %s\n" msgstr "Kommandolinjetilvalg kunne ikke fortolkes: %s\n" -#: ../src/application.c:366 +#: ../src/application.c:383 msgid "Error encrypting database" msgstr "Fejl under kryptering af database" -#: ../src/application.c:419 ../src/date-entry-dialog.c:129 -#: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 -#: ../src/main-window.c:195 ../src/preferences-dialog.c:191 -#: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 -#, c-format -msgid "UI file \"%s\" could not be loaded" -msgstr "UI-fil \"%s\" kunne ikke indlæses" - -#: ../src/application.c:542 +#: ../src/application.c:526 msgid "" "Almanah is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -292,7 +199,7 @@ "Foundation, enten version 3 af denne licens, eller (ved dit valg) enhver " "senere version." -#: ../src/application.c:546 +#: ../src/application.c:530 msgid "" "Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -304,7 +211,7 @@ "EGNETHED TIL ET SPECIFIKT FORMÅL. Se GNU General Public License for " "yderligere detaljer." -#: ../src/application.c:550 +#: ../src/application.c:534 msgid "" "You should have received a copy of the GNU General Public License along with " "Almanah. If not, see ." @@ -312,12 +219,12 @@ "Du bør have modtaget en kopi af GNU General Public License sammen med " "Almanah. Hvis ikke, så se ." -#: ../src/application.c:565 +#: ../src/application.c:549 #, c-format msgid "A helpful diary keeper, storing %u entries." msgstr "En nyttig dagbog, der gemmer %u poster." -#: ../src/application.c:569 +#: ../src/application.c:553 msgid "Copyright © 2008-2009 Philip Withnall" msgstr "Ophavsret © 2008-2009 Philip Withnall" @@ -326,22 +233,39 @@ #. * "Translator name 1 \n" #. * "Translator name 2 " #. -#: ../src/application.c:577 +#: ../src/application.c:561 msgid "translator-credits" msgstr "" "Joe Hansen , 2009, 2010, 2011, 2012, 2013.\n" +"Alan Mortensen , 2016.\n" "\n" "Dansk-gruppen \n" "Mere info: http://www.dansk-gruppen.dk" -#: ../src/application.c:581 +#: ../src/application.c:565 msgid "Almanah Website" msgstr "Almanahs internetside" +#: ../src/application.c:593 +#, c-format +msgid "" +"Couldn't load the CSS resources. The interface might not be styled " +"correctly: %s" +msgstr "" +"Kunne ikke indlæse CSS-ressourcerne. Grænsefladen er måske ikke korrekt " +"opsat: %s" + #: ../src/date-entry-dialog.c:72 msgid "Select Date" msgstr "Vælg dato" +#: ../src/date-entry-dialog.c:127 ../src/import-export-dialog.c:169 +#: ../src/import-export-dialog.c:476 ../src/main-window.c:235 +#: ../src/preferences-dialog.c:177 ../src/search-dialog.c:95 +#: ../src/uri-entry-dialog.c:126 +msgid "UI data could not be loaded" +msgstr "UI-data kunne ikke indlæses" + #: ../src/entry.c:303 #, c-format msgid "Invalid data version number %u." @@ -373,77 +297,161 @@ msgid "A task on an Evolution calendar." msgstr "En opgave i en Evolutionkalender." -#: ../src/export-operation.c:45 ../src/import-operation.c:45 +#: ../src/export-operation.c:47 ../src/import-operation.c:45 msgid "Text Files" msgstr "Tekstfiler" -#: ../src/export-operation.c:46 +#: ../src/export-operation.c:48 msgid "" "Select a _folder to export the entries to as text files, one per entry, with " "names in the format 'yyyy-mm-dd', and no extension. All entries will be " "exported, unencrypted in plain text format." msgstr "" -"Vælg en _mappe indeholdende tekstfiler, en per post, med navne i formatet " -"'åååå-mm-dd', og ingen filendelser. Alle sådanne filer vil blive " -"eksporteret, ukrypteret i almindeligt tekstformat." +"Vælg en _mappe, hvor posterne vil blive eksporteret til som tekstfiler. Der " +"vil blive oprettet en fil per post med navne i formatet 'åååå-mm-dd' og uden " +"filendelse. Alle poster vil blive eksporteret ukrypteret i almindeligt " +"tekstformat." -#: ../src/export-operation.c:50 ../src/import-operation.c:50 +#: ../src/export-operation.c:52 ../src/import-operation.c:50 msgid "Database" msgstr "Database" -#: ../src/export-operation.c:51 +#: ../src/export-operation.c:53 msgid "" "Select a _filename for a complete copy of the unencrypted Almanah Diary " "database to be given." msgstr "" "Vælg et _filnavn for en fuldstændig kopi af den ukrypterede Almanahdatabase." -#: ../src/import-export-dialog.c:202 +#: ../src/export-operation.c:256 ../src/export-operation.c:313 +#, c-format +msgid "Error changing exported file permissions: %s" +msgstr "Fejl i forsøget på at ændre rettigheder for den eksporterede fil: %s" + +#: ../src/gtk/menus.ui.h:1 +msgid "_Search" +msgstr "_Søg" + +#: ../src/gtk/menus.ui.h:2 +msgid "Pr_eferences" +msgstr "_Indstillinger" + +# Optræder sammen med _Indstillinger +#: ../src/gtk/menus.ui.h:3 +msgctxt "Main menu" +msgid "_Import" +msgstr "I_mporter" + +#: ../src/gtk/menus.ui.h:4 +msgctxt "Main menu" +msgid "_Export" +msgstr "_Eksporter" + +#: ../src/gtk/menus.ui.h:5 +msgid "_Print diary" +msgstr "_Udskriv dagbog" + +#: ../src/gtk/menus.ui.h:6 +msgid "_About Almanah Diary" +msgstr "_Om Almanah - dagbog" + +#: ../src/gtk/menus.ui.h:7 +msgid "_Quit" +msgstr "_Afslut" + +#: ../src/gtk/menus.ui.h:8 +msgid "_Bold" +msgstr "_Fed" + +#: ../src/gtk/menus.ui.h:9 +msgid "_Italic" +msgstr "_Kursiv" + +#: ../src/gtk/menus.ui.h:10 +msgid "_Underline" +msgstr "_Understreget" + +#: ../src/gtk/menus.ui.h:11 +msgid "_Cut" +msgstr "K_lip" + +#: ../src/gtk/menus.ui.h:12 +msgid "_Copy" +msgstr "_Kopiér" + +#: ../src/gtk/menus.ui.h:13 +msgid "_Paste" +msgstr "_Indsæt" + +#: ../src/gtk/menus.ui.h:14 ../src/main-window.c:640 +msgid "_Delete" +msgstr "_Slet" + +#: ../src/gtk/menus.ui.h:15 +msgid "Insert _Time" +msgstr "Indsæt _tid" + +#: ../src/gtk/menus.ui.h:16 +msgid "Add/Remove _Hyperlink" +msgstr "Tilføj/fjern _hyperlink" + +#: ../src/import-export-dialog.c:203 msgid "Import _mode: " msgstr "Import_tilstand: " -#: ../src/import-export-dialog.c:202 +#: ../src/import-export-dialog.c:203 msgid "Export _mode: " msgstr "Eksport_tilstand: " #. Set the window title -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Import Entries" msgstr "Importer poster" -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Export Entries" msgstr "Eksporter poster" -#: ../src/import-export-dialog.c:245 +#. Translators: These are verbs. +#: ../src/import-export-dialog.c:211 +msgctxt "Dialog button" +msgid "_Import" +msgstr "_Importer" + +#: ../src/import-export-dialog.c:211 +msgctxt "Dialog button" +msgid "_Export" +msgstr "_Eksporter" + +#: ../src/import-export-dialog.c:248 msgid "Import failed" msgstr "Import mislykkedes" -#: ../src/import-export-dialog.c:283 +#: ../src/import-export-dialog.c:286 msgid "Export failed" msgstr "Eksport mislykkedes" -#: ../src/import-export-dialog.c:296 +#: ../src/import-export-dialog.c:299 msgid "Export successful" msgstr "Eksport lykkedes" -#: ../src/import-export-dialog.c:297 +#: ../src/import-export-dialog.c:300 msgid "The diary was successfully exported." msgstr "Dagbogen blev eksporteret." -#: ../src/import-export-dialog.c:445 +#: ../src/import-export-dialog.c:448 msgid "Import Results" msgstr "Importresultater" #. Translators: This is a strftime()-format string for the dates displayed in import results. #. Translators: This is a strftime()-format string for the date to display when asking about editing a diary entry. #. Translators: This is a strftime()-format string for the date to display when asking about deleting a diary entry. +#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. -#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. -#: ../src/import-export-dialog.c:539 ../src/main-window.c:567 -#: ../src/main-window.c:597 ../src/printing.c:263 ../src/search-dialog.c:182 -#: ../src/widgets/calendar-button.c:309 +#: ../src/import-export-dialog.c:543 ../src/main-window.c:601 +#: ../src/main-window.c:632 ../src/main-window.c:1271 ../src/printing.c:263 +#: ../src/search-dialog.c:180 msgid "%A, %e %B %Y" msgstr "%A, %e. %B %Y" @@ -467,7 +475,7 @@ #: ../src/import-operation.c:248 #, c-format msgid "Error deserializing imported entry into buffer: %s" -msgstr "Fejl under indlæsning af importeret post til mellemlager: %s" +msgstr "Fejl under afserialisering af importeret post til buffer: %s" #: ../src/import-operation.c:264 #, c-format @@ -475,7 +483,7 @@ "Error deserializing existing entry into buffer; overwriting with imported " "entry: %s" msgstr "" -"Fejl under indlæsning af eksisterende post til mellemlager; overskrevet med " +"Fejl under afserialisering af eksisterende post til buffer; overskrevet med " "importeret post: %s" #. Append some header text for the imported entry @@ -491,70 +499,89 @@ msgstr "" "\n" "\n" -"Post importeret fra \"%s\":\n" +"Post importeret fra “%s”:\n" "\n" -#: ../src/main-window.c:571 +#: ../src/main-window.c:605 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" msgstr "Er du sikker på, at du ønsker at redigere denne dagbogspost for %s?" -#: ../src/main-window.c:601 +#: ../src/main-window.c:608 ../src/main-window.c:639 +msgid "_Cancel" +msgstr "_Annullér" + +#: ../src/main-window.c:609 +msgid "_Edit" +msgstr "_Redigér" + +#: ../src/main-window.c:636 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" msgstr "Er du sikker på, at du ønsker at slette denne dagbogspost for %s?" #. Print a warning about the unknown tag -#: ../src/main-window.c:710 +#: ../src/main-window.c:746 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." -msgstr "Ukendt eller duplikeret tekstmærke \"%s\" i post. Ignorerer." +msgstr "Ukendt eller duplikeret tekstmærke “%s” i post. Ignorerer." -#: ../src/main-window.c:918 +#: ../src/main-window.c:987 msgid "Error opening URI" msgstr "Fejl under åbning af URI" #. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place -#: ../src/main-window.c:1092 +#: ../src/main-window.c:1198 #, c-format msgid "%s @ %s" msgstr "%s @ %s" -#: ../src/main-window.c:1171 +#: ../src/main-window.c:1304 msgid "Entry content could not be loaded" msgstr "Postindhold kunne ikke indlæses" -#: ../src/main-window.c:1344 +#. Translators: this sentence is just used in startup to estimate the width +#. of a 15 words sentence. Translate with some random sentences with just 15 words. +#. See: https://bugzilla.gnome.org/show_bug.cgi?id=754841 +#: ../src/main-window.c:1459 +msgid "" +"This is just a fifteen words sentence to calculate the diary entry text view " +"size" +msgstr "" +"Dette er bare en sætning på 15 ord for at beregne tekstens størrelse i " +"dagbogen" + +#: ../src/main-window.c:1496 msgid "Spelling checker could not be initialized" msgstr "Stavekontrol kunne ikke startes" -#: ../src/preferences-dialog.c:91 -msgid "Almanah Preferences" -msgstr "Indstillinger for Almanah" +#: ../src/preferences-dialog.c:83 +msgid "Preferences" +msgstr "Indstillinger" #. Grab our child widgets -#: ../src/preferences-dialog.c:217 +#: ../src/preferences-dialog.c:204 msgid "Encryption key: " msgstr "Krypteringsnøgle: " -#: ../src/preferences-dialog.c:222 +#: ../src/preferences-dialog.c:208 msgid "None (don't encrypt)" msgstr "Ingen (krypter ikke)" -#: ../src/preferences-dialog.c:246 +#: ../src/preferences-dialog.c:213 msgid "New _Key" msgstr "Ny _nøgle" #. Set up the "Enable spell checking" check button -#: ../src/preferences-dialog.c:253 +#: ../src/preferences-dialog.c:237 msgid "Enable _spell checking" msgstr "Slå _stavekontrol til" -#: ../src/preferences-dialog.c:279 +#: ../src/preferences-dialog.c:262 msgid "Error saving the encryption key" -msgstr "Fejl under gemning af krypteringsnøgle" +msgstr "Kunne ikke gemme krypteringsnøglen" -#: ../src/preferences-dialog.c:298 +#: ../src/preferences-dialog.c:281 msgid "Error opening Seahorse" msgstr "Fejl under åbning af Seahorse" @@ -566,125 +593,153 @@ msgid "No entry for this date." msgstr "Ingen post på denne dato." -#: ../src/printing.c:453 +#: ../src/printing.c:457 msgid "Start date:" msgstr "Startdato:" -#: ../src/printing.c:455 +#: ../src/printing.c:459 msgid "End date:" msgstr "Slutdato:" #. Line spacing -#: ../src/printing.c:471 +#: ../src/printing.c:475 msgid "Line spacing:" msgstr "Linjeafstand:" -#: ../src/search-dialog.c:223 +#: ../src/search-dialog.c:221 msgid "Search canceled." msgstr "Søgning afbrudt." #. Translators: This is an error message wrapper for when searches encounter an error. The placeholder is for an error message. -#: ../src/search-dialog.c:226 +#: ../src/search-dialog.c:224 #, c-format msgid "Error: %s" msgstr "Fejl: %s" #. Success! -#: ../src/search-dialog.c:231 +#: ../src/search-dialog.c:229 #, c-format msgid "Found %d entry:" msgid_plural "Found %d entries:" msgstr[0] "Fandt %d post:" msgstr[1] "Fandt %d poster:" -#: ../src/search-dialog.c:280 +#: ../src/search-dialog.c:278 msgid "Searching…" -msgstr "Søger…" +msgstr "Søger …" + +#: ../src/storage-manager.c:247 +#, c-format +msgid "" +"Could not open database \"%s\". SQLite provided the following error message: " +"%s" +msgstr "" +"Kunne ikke åbne database “%s”. SQLite kom med den følgende fejlbesked: %s" + +#: ../src/storage-manager.c:290 +#, c-format +msgid "" +"Could not run query \"%s\". SQLite provided the following error message: %s" +msgstr "" +"Kunne ikke køre forespørgslen “%s”. SQLite kom med følgende fejlbesked: %s" + +#: ../src/storage-manager.c:596 +msgid "Error deserializing entry into buffer while searching." +msgstr "Fejl under afserialisering af post til buffer under søgning." + +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Indtast URI" # GPGME er ikke en højere version end %s -#: ../src/storage-manager.c:275 +#: ../src/vfs.c:291 #, c-format msgid "GPGME is not at least version %s" msgstr "GPGME er ikke mindst version %s" -#: ../src/storage-manager.c:284 +#: ../src/vfs.c:298 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "GPGME understøtter ikke OpenPGP: %s" -#: ../src/storage-manager.c:293 +#: ../src/vfs.c:305 #, c-format msgid "Error creating cipher context: %s" msgstr "Fejl under oprettelse af chifferkontekst: %s" -#: ../src/storage-manager.c:322 +#: ../src/vfs.c:325 #, c-format -msgid "Error opening encrypted database file \"%s\": %s" -msgstr "Fejl under åbning af krypteret databasefil \"%s\": %s" +msgid "Can't create a new GIOChannel for the encrypted database: %s" +msgstr "Kan ikke oprette en ny GIOChannel til den krypterede database: %s" -#: ../src/storage-manager.c:341 +#: ../src/vfs.c:333 #, c-format -msgid "Error opening plain database file \"%s\": %s" -msgstr "Fejl under åbning af ukrypteret databasefil \"%s\": %s" +msgid "Error opening encrypted database file \"%s\": %s" +msgstr "Fejl under åbning af krypteret databasefil “%s”: %s" -#: ../src/storage-manager.c:389 -msgid "" -"The encrypted database is empty. The plain database file has been left " -"undeleted as backup." -msgstr "" -"Den krypterede database er tom. Den ukrypterede databasefil er blevet " -"efterladt som sikkerhedskopi." +#: ../src/vfs.c:349 +#, c-format +msgid "Error creating Callback base data buffer: %s" +msgstr "Fejl under oprettelse af buffer til Callback-basisdata: %s" -#. Delete the plain file -#: ../src/storage-manager.c:392 +#: ../src/vfs.c:357 #, c-format -msgid "Could not delete plain database file \"%s\"." -msgstr "Kunne ikke slette den ukrypterede databasefil \"%s\"." +msgid "Can't create a new GIOChannel for the plain database: %s" +msgstr "Kan ikke oprette en ny GIOChannel til den ukrypterede database: %s" -#: ../src/storage-manager.c:433 +#: ../src/vfs.c:365 #, c-format -msgid "Error decrypting database: %s" -msgstr "Fejl under afkryptering af database: %s" +msgid "Error opening plain database file \"%s\": %s" +msgstr "Fejl under åbning af ukrypteret databasefil “%s”: %s" -#: ../src/storage-manager.c:467 +#: ../src/vfs.c:461 #, c-format msgid "Error getting encryption key: %s" msgstr "Fejl under indlæsning af krypteringsnøgle: %s" -#: ../src/storage-manager.c:488 +#: ../src/vfs.c:485 ../src/vfs.c:491 #, c-format msgid "Error encrypting database: %s" msgstr "Fejl under kryptering af database: %s" -#: ../src/storage-manager.c:590 +#. Translators: The first and second params are file paths, the last param is an error message. +#: ../src/vfs.c:541 #, c-format -msgid "" -"Could not open database \"%s\". SQLite provided the following error message: " -"%s" -msgstr "" -"Kunne ikke åbne database \"%s\". SQLite kom med den følgende fejlbesked: %s" +msgid "Error copying the file from %s to %s: %s" +msgstr "Fejl under kopiering af filen fra %s til %s: %s" -#: ../src/storage-manager.c:667 +#: ../src/vfs.c:547 #, c-format -msgid "" -"Could not run query \"%s\". SQLite provided the following error message: %s" -msgstr "" -"Kunne ikke køre forespørgslen \"%s\". SQLite kom med følgende fejlbesked: %s" +msgid "Error changing database backup file permissions: %s" +msgstr "Fejl i forsøget på at ændre filrettigheder for sikkerhedskopi: %s" -#: ../src/storage-manager.c:973 -msgid "Error deserializing entry into buffer while searching." -msgstr "Fejl under afserialisering af post til mellemlager under søgning." +#: ../src/vfs.c:647 +#, c-format +msgid "Error closing file: %s" +msgstr "Fejl i forsøget på at lukke filen: %s" -#: ../src/uri-entry-dialog.c:71 -msgid "Enter URI" -msgstr "Indtast URI" +#. Translators: the first parameter is a filename. +#: ../src/vfs.c:1046 ../src/vfs.c:1073 +#, c-format +msgid "Error backing up file ‘%s’" +msgstr "Fejl i forsøget på at sikkerhedskopiere filen “%s”" -#: ../src/widgets/calendar-button.c:140 +#: ../src/vfs.c:1059 #, c-format -msgid "UI file \"%s\" could not be loaded: %s" -msgstr "UI-fil \"%s\" kunne ikke indlæses: %s" +msgid "Error decrypting database: %s" +msgstr "Fejl under dekryptering af database: %s" -#: ../src/widgets/calendar-button.c:150 +#: ../src/vfs.c:1099 +#, c-format +msgid "Error changing database file permissions: %s" +msgstr "Fejl i forsøget på at ændre rettigheder for databasefilen: %s" + +#: ../src/widgets/calendar-button.c:142 +#, c-format +msgid "UI data could not be loaded: %s" +msgstr "UI-data kunne ikke indlæses: %s" + +#: ../src/widgets/calendar-button.c:152 msgid "Can't load calendar window object from UI file" msgstr "Kan ikke indlæse objekt for kalendervindue fra brugerfladefil" @@ -693,15 +748,75 @@ msgid "Important!" msgstr "Vigtigt!" -#: ../src/widgets/calendar-window.c:80 -msgid "Unknown input device" -msgstr "Ukendt inputenhed" - -#: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:162 +#: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:166 msgid "add tag" msgstr "tilføj mærke" +#: ../src/widgets/entry-tags-area.c:101 +msgid "Write the tag and press enter to save it" +msgstr "Skriv mærket og tryk Enter for at gemme det" + +#: ../src/widgets/tag-accessible.c:165 +msgid "Remove the tag from the entry" +msgstr "Fjern mærket fra posten" + #. Looks like gtk_widget_set_tooltip_text don't works here, even in the init... ? -#: ../src/widgets/tag.c:400 +#: ../src/widgets/tag.c:416 msgid "Remove tag" msgstr "Fjern mærke" + +#: ../src/widgets/tag-entry.c:85 +msgid "Tag entry" +msgstr "Sæt mærke for post" + +#~ msgid "F_ormat" +#~ msgstr "F_ormat" + +#~ msgid "Toggle whether the currently selected text is bold." +#~ msgstr "Skifter mellem om den aktuelt markeret tekst er fed eller ej." + +#~ msgid "Toggle whether the currently selected text is italic." +#~ msgstr "Skifter mellem om den aktuelt markeret tekst er kursiv eller ej." + +#~ msgid "Toggle whether the currently selected text is underlined." +#~ msgstr "" +#~ "Skifter mellem om den aktuelt markeret tekst er understreget eller ej." + +#~ msgid "" +#~ "Add or remove a hyperlink from the currently selected text to a specified " +#~ "URI." +#~ msgstr "" +#~ "Tilføj eller fjern en hyperhenvisning fra den aktuelt valgte tekst til en " +#~ "angivet adresse." + +#~ msgid "I_mportant" +#~ msgstr "Vi_gtigt" + +#~ msgid "Toggle whether the current entry is marked as important." +#~ msgstr "" +#~ "Skifter mellem om den aktuelle post er markeret som vigtig eller ej." + +#~ msgid "Show tags" +#~ msgstr "Vis mærker" + +#~ msgid "_Help" +#~ msgstr "_Hjælp" + +#~ msgid "Jump to the current date in the diary." +#~ msgstr "Gå til den aktuelle dato i dagbogen." + +#~ msgid "Almanah Preferences" +#~ msgstr "Indstillinger for Almanah" + +#~ msgid "" +#~ "The encrypted database is empty. The plain database file has been left " +#~ "undeleted as backup." +#~ msgstr "" +#~ "Den krypterede database er tom. Den ukrypterede databasefil er blevet " +#~ "efterladt som sikkerhedskopi." + +#~ msgid "Could not delete plain database file \"%s\"." +#~ msgstr "Kunne ikke slette den ukrypterede databasefil “%s”." + +#~ msgid "Unknown input device" +#~ msgstr "Ukendt inputenhed" diff -Nru almanah-0.11.1/po/de.po almanah-0.12.0/po/de.po --- almanah-0.11.1/po/de.po 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/de.po 2019-10-07 13:45:09.000000000 +0000 @@ -4,7 +4,7 @@ # # Philip Withnall , 2008. # Christoph Wickert , 2008. -# Mario Blättermann , 2008-2011. +# Mario Blättermann , 2008-2011, 2015. # Christian Kirbach , 2009, 2010. # Benjamin Steinwender , 2014. # @@ -13,25 +13,29 @@ "Project-Id-Version: almanah master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=almanah&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2014-02-20 03:31+0000\n" -"PO-Revision-Date: 2014-03-07 21:32+0100\n" -"Last-Translator: Benjamin Steinwender \n" +"POT-Creation-Date: 2015-10-14 17:59+0000\n" +"PO-Revision-Date: 2015-12-30 12:31+0100\n" +"Last-Translator: Mario Blättermann \n" "Language-Team: Deutsch \n" -"Language: de_DE\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.6.4\n" +"X-Generator: Poedit 1.8.5\n" #: ../data/almanah.appdata.xml.in.h:1 +msgid "Keep a diary of your life" +msgstr "Ein Tagebuch Ihres Lebens schreiben" + +#: ../data/almanah.appdata.xml.in.h:2 msgid "" "Almanah Diary is an application to allow you to keep a diary of your life." msgstr "" "Almanah ist eine Anwendung, welche es Ihnen ermöglicht, ein Tagebuch über " "ihr Leben zu führen." -#: ../data/almanah.appdata.xml.in.h:2 +#: ../data/almanah.appdata.xml.in.h:3 msgid "" "You can encrypt the diary to preserve your privacy. It has editing " "abilities, including text formatting and printing and shows you a lists of " @@ -43,38 +47,8 @@ "Anzeigen einer Liste von Ereignissen (von Ihrem Rechner) für jeden Tag (z.B. " "Aufgaben und Termine) geboten." -#: ../data/almanah-app-menu.ui.h:1 -#| msgid "Search" -msgid "_Search" -msgstr "_Suchen" - -#: ../data/almanah-app-menu.ui.h:2 -msgid "Pr_eferences" -msgstr "_Einstellungen" - -#. Set the button label -#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 -msgid "_Import" -msgstr "_Importieren" - -#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 -msgid "_Export" -msgstr "_Exportieren" - -#: ../data/almanah-app-menu.ui.h:5 -msgid "_Print diary" -msgstr "Tagebuch _drucken" - -#: ../data/almanah-app-menu.ui.h:6 -msgid "_About Almanah Diary" -msgstr "_Infos über Almanah" - -#: ../data/almanah-app-menu.ui.h:7 -msgid "_Quit" -msgstr "_Beenden" - -#: ../data/almanah.desktop.in.h:1 ../src/application.c:132 -#: ../src/main-window.c:136 +#: ../data/almanah.desktop.in.h:1 ../src/application.c:133 +#: ../src/main-window.c:155 msgid "Almanah Diary" msgstr "Almanah" @@ -83,7 +57,7 @@ msgstr "Ein persönliches Tagebuch führen" #. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. -#: ../data/almanah.desktop.in.h:3 ../src/application.c:263 +#: ../data/almanah.desktop.in.h:3 ../src/application.c:272 msgid "Diary" msgstr "Tagebuch" @@ -92,137 +66,75 @@ msgid "diary;journal;" msgstr "Tagebuch;Aufzeichnungen;Almanah;" -#: ../data/almanah.ui.h:1 -msgid "Select Date…" -msgstr "Datum auswählen …" - -#: ../data/almanah.ui.h:2 -msgid "F_ormat" -msgstr "F_ormat" - -#: ../data/almanah.ui.h:3 -msgid "Toggle whether the currently selected text is bold." -msgstr "" -"Fettschrift für den gegenwärtig ausgewählten Text ein- oder ausschalten." - -#: ../data/almanah.ui.h:4 -msgid "Toggle whether the currently selected text is italic." -msgstr "" -"Kursivschrift für den gegenwärtig ausgewählten Text ein- oder ausschalten." - -#: ../data/almanah.ui.h:5 -msgid "Toggle whether the currently selected text is underlined." -msgstr "" -"Unterstreichung für den gegenwärtig ausgewählten Text ein- oder ausschalten." - -#: ../data/almanah.ui.h:6 -msgid "Add/Remove _Hyperlink" -msgstr "_Hyperlink hinzufügen oder entfernen" - -#: ../data/almanah.ui.h:7 -msgid "" -"Add or remove a hyperlink from the currently selected text to a specified " -"URI." -msgstr "" -"Einen Hyperlink zu einer angegebenen Adresse zum gegenwärtig ausgewählten " -"Text hinzufügen oder daraus entfernen." - -#: ../data/almanah.ui.h:8 -msgid "Insert _Time" -msgstr "Zei_t einfügen" - -#: ../data/almanah.ui.h:9 -msgid "I_mportant" -msgstr "_Wichtig" - -#: ../data/almanah.ui.h:10 -msgid "Toggle whether the current entry is marked as important." -msgstr "" -"Wichtig-Markierung für den gegenwärtigen Eintrag ein- oder ausschalten." - -#: ../data/almanah.ui.h:11 -msgid "Show tags" -msgstr "Schlagwörter anzeigen" - -#: ../data/almanah.ui.h:12 -#| msgid "Jump to the current date in the diary." -msgid "Show tags for the current entry" -msgstr "Schlagwörter des aktuellen Eintrages zeigen" - -#: ../data/almanah.ui.h:13 -msgid "_Help" -msgstr "_Hilfe" - -#: ../data/almanah.ui.h:14 -msgid "Go to _Today" -msgstr "Zum _heutigen Tag gehen" - -#: ../data/almanah.ui.h:15 -msgid "Jump to the current date in the diary." -msgstr "Zum aktuellen Datum im Tagebuch springen." - -#: ../data/almanah.ui.h:16 +#: ../src/ui/almanah.ui.h:1 msgid "Calendar" msgstr "Kalender" -#: ../data/almanah.ui.h:17 +#: ../src/ui/almanah.ui.h:2 +msgid "Go to Today" +msgstr "Zum heutigen Tag gehen" + +#: ../src/ui/almanah.ui.h:3 +msgid "Select Date…" +msgstr "Datum auswählen …" + +#: ../src/ui/almanah.ui.h:4 msgid "Entry editing area" msgstr "Editierbereich für Einträge" -#: ../data/almanah.ui.h:18 -#| msgid "Past Events" +#: ../src/ui/almanah.ui.h:5 msgid "Past events" msgstr "Vergangene Ereignisse" -#: ../data/almanah.ui.h:19 +#: ../src/ui/almanah.ui.h:6 msgid "Past Event List" msgstr "Liste der letzten Ereignisse" -#: ../data/almanah.ui.h:20 +#: ../src/ui/almanah.ui.h:7 msgid "Search entry" msgstr "Eintrag suchen" -#: ../data/almanah.ui.h:21 ../src/search-dialog.c:69 +#: ../src/ui/almanah.ui.h:8 ../src/search-dialog.c:69 msgid "Search" msgstr "Suchen" -#: ../data/almanah.ui.h:22 +#: ../src/ui/almanah.ui.h:9 msgid "Result List" msgstr "Ergebnisliste" -#: ../data/almanah.ui.h:23 +#: ../src/ui/almanah.ui.h:10 msgid "View Entry" msgstr "Eintrag anzeigen" -#: ../data/almanah.ui.h:24 +#: ../src/ui/almanah.ui.h:11 msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." msgstr "z.B. »14.03.2009« oder »14. März 2009«." -#: ../data/almanah.ui.h:25 +#: ../src/ui/almanah.ui.h:12 msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." msgstr "z.B. »http://google.de/« oder »file:///home/ich/Fotos/foto.jpg«." -#: ../data/almanah.ui.h:26 +#: ../src/ui/almanah.ui.h:13 msgid "Successful Entries" msgstr "Erfolgreiche Einträge" -#: ../data/almanah.ui.h:27 +#: ../src/ui/almanah.ui.h:14 msgid "Merged Entries" msgstr "Zusammengeführte Einträge" -#: ../data/almanah.ui.h:28 +#: ../src/ui/almanah.ui.h:15 msgid "Failed Entries" msgstr "Fehlgeschlagene Einträge" -#: ../data/almanah.ui.h:29 +#: ../src/ui/almanah.ui.h:16 msgid "Import Results List" msgstr "Ergebnisliste importieren" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 +#: ../data/org.gnome.almanah.gschema.xml.in.h:1 msgid "Database encryption key ID" msgstr "Schlüsselkennung für Datenbank" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +#: ../data/org.gnome.almanah.gschema.xml.in.h:2 msgid "" "The ID of the key to use to encrypt and decrypt the database, if Almanah has " "been built with encryption support. Leave blank to disable database " @@ -233,40 +145,31 @@ "Verschlüsselungen erstellt wurde. Bitte leer lassen, wenn die " "Verschlüsselung der Datenbank deaktiviert sein soll." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 +#: ../data/org.gnome.almanah.gschema.xml.in.h:3 msgid "Spell checking language" msgstr "Sprache für Rechtschreibprüfung" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +#: ../data/org.gnome.almanah.gschema.xml.in.h:4 msgid "The locale specifier of the language in which to check entry spellings." msgstr "Die Kennung der Sprache für die Rechtschreibprüfung der Einträge." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +#: ../data/org.gnome.almanah.gschema.xml.in.h:5 msgid "Spell checking enabled?" msgstr "Rechtschreibprüfung aktiviert?" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 +#: ../data/org.gnome.almanah.gschema.xml.in.h:6 msgid "Whether spell checking of entries is enabled." msgstr "Legt fest, ob die Rechtschreibprüfung für die Einträge aktiviert ist." -#: ../src/application.c:246 +#: ../src/application.c:255 msgid "Error opening database" msgstr "Fehler beim Öffnen der Datenbank" -#. Error loading the CSS -#: ../src/application.c:275 -#, c-format -msgid "" -"Couldn't load the CSS file '%s'. The interface might not be styled correctly" -msgstr "" -"Die CSS-Datei »%s« konnte nicht geladen werden. Die Oberfläche wird " -"möglicherweise nicht korrekt dargestellt" - -#: ../src/application.c:319 +#: ../src/application.c:332 msgid "Enable debug mode" msgstr "Debug-Modus einschalten" -#: ../src/application.c:336 +#: ../src/application.c:349 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" @@ -274,24 +177,16 @@ "Programms gleichzeitig geöffnet werden." #. Print an error -#: ../src/application.c:347 +#: ../src/application.c:360 #, c-format msgid "Command line options could not be parsed: %s\n" msgstr "Befehlszeilen-Optionen konnten nicht verarbeitet werden: %s\n" -#: ../src/application.c:366 +#: ../src/application.c:379 msgid "Error encrypting database" msgstr "Fehler beim Verschlüsseln der Datenbank" -#: ../src/application.c:419 ../src/date-entry-dialog.c:129 -#: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 -#: ../src/main-window.c:195 ../src/preferences-dialog.c:191 -#: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 -#, c-format -msgid "UI file \"%s\" could not be loaded" -msgstr "Benutzerschnittstellen-Datei »%s« konnte nicht geladen werden." - -#: ../src/application.c:542 +#: ../src/application.c:522 msgid "" "Almanah is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -303,7 +198,7 @@ "wie sie von der Free Software Foundation festgelegt wurden; entweder in " "Version 2 der Lizenz oder (nach Ihrem Ermessen) in jeder neueren Lizenz." -#: ../src/application.c:546 +#: ../src/application.c:526 msgid "" "Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -316,7 +211,7 @@ "Sie für weitere Informationen bitte in der »GNU General Public License« (GNU " "GPL) nach." -#: ../src/application.c:550 +#: ../src/application.c:530 msgid "" "You should have received a copy of the GNU General Public License along with " "Almanah. If not, see ." @@ -325,12 +220,12 @@ "erhalten haben. Falls nicht, schauen Sie unter ." -#: ../src/application.c:565 +#: ../src/application.c:545 #, c-format msgid "A helpful diary keeper, storing %u entries." msgstr "Ein hilfreicher Tagebuchführer, der %u Einträge enthält." -#: ../src/application.c:569 +#: ../src/application.c:549 msgid "Copyright © 2008-2009 Philip Withnall" msgstr "Copyright © 2008-2009 Philip Withnall" @@ -339,7 +234,7 @@ #. * "Translator name 1 \n" #. * "Translator name 2 " #. -#: ../src/application.c:577 +#: ../src/application.c:557 msgid "translator-credits" msgstr "" "Christoph Wickert \n" @@ -347,14 +242,30 @@ "Christian Kirbach \n" "Benjamin Steinwender " -#: ../src/application.c:581 +#: ../src/application.c:561 msgid "Almanah Website" msgstr "Almanah-Website" +#: ../src/application.c:589 +#, c-format +msgid "" +"Couldn't load the CSS resources. The interface might not be styled " +"correctly: %s" +msgstr "" +"Die CSS-Ressourcen konnten nicht geladen werden. Die Oberfläche wird " +"möglicherweise nicht korrekt dargestellt: %s" + #: ../src/date-entry-dialog.c:72 msgid "Select Date" msgstr "Datum auswählen" +#: ../src/date-entry-dialog.c:127 ../src/import-export-dialog.c:169 +#: ../src/import-export-dialog.c:475 ../src/main-window.c:225 +#: ../src/preferences-dialog.c:177 ../src/search-dialog.c:95 +#: ../src/uri-entry-dialog.c:126 +msgid "UI data could not be loaded" +msgstr "Benutzerschnittstellen-Datei konnte nicht geladen werden." + #: ../src/entry.c:303 #, c-format msgid "Invalid data version number %u." @@ -415,56 +326,131 @@ #: ../src/export-operation.c:256 ../src/export-operation.c:313 #, c-format -#| msgid "Error opening encrypted database file \"%s\": %s" msgid "Error changing exported file permissions: %s" msgstr "Fehler beim Ändern der exportierten Dateiberechtigungen: %s" -#: ../src/import-export-dialog.c:202 +#: ../src/gtk/menus.ui.h:1 +msgid "_Search" +msgstr "_Suchen" + +#: ../src/gtk/menus.ui.h:2 +msgid "Pr_eferences" +msgstr "_Einstellungen" + +#: ../src/gtk/menus.ui.h:3 +msgctxt "Main menu" +msgid "_Import" +msgstr "_Importieren" + +#: ../src/gtk/menus.ui.h:4 +msgctxt "Main menu" +msgid "_Export" +msgstr "_Exportieren" + +#: ../src/gtk/menus.ui.h:5 +msgid "_Print diary" +msgstr "Tagebuch _drucken" + +#: ../src/gtk/menus.ui.h:6 +msgid "_About Almanah Diary" +msgstr "_Infos über Almanah" + +#: ../src/gtk/menus.ui.h:7 +msgid "_Quit" +msgstr "_Beenden" + +#: ../src/gtk/menus.ui.h:8 +msgid "_Bold" +msgstr "_Fett" + +#: ../src/gtk/menus.ui.h:9 +msgid "_Italic" +msgstr "_Kursiv" + +#: ../src/gtk/menus.ui.h:10 +msgid "_Underline" +msgstr "_Unterstrichen" + +#: ../src/gtk/menus.ui.h:11 +msgid "_Cut" +msgstr "_Auschneiden" + +#: ../src/gtk/menus.ui.h:12 +msgid "_Copy" +msgstr "_Kopieren" + +#: ../src/gtk/menus.ui.h:13 +msgid "_Paste" +msgstr "E_infügen" + +#: ../src/gtk/menus.ui.h:14 ../src/main-window.c:626 +msgid "_Delete" +msgstr "_Löschen" + +#: ../src/gtk/menus.ui.h:15 +msgid "Insert _Time" +msgstr "Zei_t einfügen" + +#: ../src/gtk/menus.ui.h:16 +msgid "Add/Remove _Hyperlink" +msgstr "_Hyperlink hinzufügen oder entfernen" + +#: ../src/import-export-dialog.c:203 msgid "Import _mode: " msgstr "Import_modus: " -#: ../src/import-export-dialog.c:202 +#: ../src/import-export-dialog.c:203 msgid "Export _mode: " msgstr "Export_modus: " #. Set the window title -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Import Entries" msgstr "Einträge importieren" -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Export Entries" msgstr "Einträge exportieren" -#: ../src/import-export-dialog.c:245 +#: ../src/import-export-dialog.c:210 +msgctxt "Dialog button" +msgid "_Import" +msgstr "_Importieren" + +#: ../src/import-export-dialog.c:210 +msgctxt "Dialog button" +msgid "_Export" +msgstr "_Exportieren" + +#: ../src/import-export-dialog.c:247 msgid "Import failed" msgstr "Importieren fehlgeschlagen" -#: ../src/import-export-dialog.c:283 +#: ../src/import-export-dialog.c:285 msgid "Export failed" msgstr "Exportieren fehlgeschlagen" -#: ../src/import-export-dialog.c:296 +#: ../src/import-export-dialog.c:298 msgid "Export successful" msgstr "Export wurde erfolgreich abgeschlossen" -#: ../src/import-export-dialog.c:297 +#: ../src/import-export-dialog.c:299 msgid "The diary was successfully exported." msgstr "Das Tagebuch wurde erfolgreich exportiert." -#: ../src/import-export-dialog.c:445 +#: ../src/import-export-dialog.c:447 msgid "Import Results" msgstr "Ergebnisse des Imports" #. Translators: This is a strftime()-format string for the dates displayed in import results. #. Translators: This is a strftime()-format string for the date to display when asking about editing a diary entry. #. Translators: This is a strftime()-format string for the date to display when asking about deleting a diary entry. +#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. -#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. -#: ../src/import-export-dialog.c:539 ../src/main-window.c:567 -#: ../src/main-window.c:597 ../src/printing.c:263 ../src/search-dialog.c:182 -#: ../src/widgets/calendar-button.c:309 +#: ../src/import-export-dialog.c:542 ../src/main-window.c:587 +#: ../src/main-window.c:618 ../src/main-window.c:1225 ../src/printing.c:263 +#: ../src/search-dialog.c:180 msgid "%A, %e %B %Y" msgstr "%A, %e. %B %Y" @@ -515,68 +501,87 @@ "Eintrag importiert aus »%s«:\n" "\n" -#: ../src/main-window.c:571 +#: ../src/main-window.c:591 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" msgstr "" "Sind Sie sicher, dass Sie diesen Tagebucheintrag für %s löschen möchten?" -#: ../src/main-window.c:601 +#: ../src/main-window.c:594 ../src/main-window.c:625 +msgid "_Cancel" +msgstr "Abbre_chen" + +#: ../src/main-window.c:595 +msgid "_Edit" +msgstr "_Bearbeiten" + +#: ../src/main-window.c:622 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" msgstr "Sind sie sicher, dass Sie den Tagebucheintrag für %s löschen möchten?" #. Print a warning about the unknown tag -#: ../src/main-window.c:710 +#: ../src/main-window.c:732 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." msgstr "Unbekannter oder doppelter Text-Tag »%s« im Eintrag, wird ignoriert." -#: ../src/main-window.c:918 +#: ../src/main-window.c:973 msgid "Error opening URI" msgstr "Fehler beim Öffnen der Adresse" #. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place -#: ../src/main-window.c:1092 +#: ../src/main-window.c:1152 #, c-format msgid "%s @ %s" msgstr "%s @ %s" -#: ../src/main-window.c:1171 +#: ../src/main-window.c:1258 msgid "Entry content could not be loaded" msgstr "Inhalt des Eintrages konnte nicht geladen werden" -#: ../src/main-window.c:1348 +#. Translators: this sentence is just used in startup to estimate the width +#. of a 15 words sentence. Translate with some randome sentences with just 15 words. +#. See: https://bugzilla.gnome.org/show_bug.cgi?id=754841 +#: ../src/main-window.c:1414 +msgid "" +"This is just a fifteen words sentence to calculate the diary entry text view " +"size" +msgstr "" +"Dies ist ein einfacher Satz mit fünfzehn Wörtern zur Kalkulation der " +"Textgröße in der Ansicht" + +#: ../src/main-window.c:1450 msgid "Spelling checker could not be initialized" msgstr "Die Rechtschreibprüfung konnte nicht gestartet werden" -#: ../src/preferences-dialog.c:91 -msgid "Almanah Preferences" -msgstr "Almanah-Einstellungen" +#: ../src/preferences-dialog.c:83 +msgid "Preferences" +msgstr "Einstellungen" #. Grab our child widgets -#: ../src/preferences-dialog.c:217 +#: ../src/preferences-dialog.c:204 msgid "Encryption key: " msgstr "Kryptographischer Schlüssel: " -#: ../src/preferences-dialog.c:222 +#: ../src/preferences-dialog.c:208 msgid "None (don't encrypt)" msgstr "Keine (nicht verschlüsseln)" -#: ../src/preferences-dialog.c:246 +#: ../src/preferences-dialog.c:213 msgid "New _Key" msgstr "Neuer _Schlüssel" #. Set up the "Enable spell checking" check button -#: ../src/preferences-dialog.c:253 +#: ../src/preferences-dialog.c:237 msgid "Enable _spell checking" msgstr "Recht_schreibprüfung aktivieren" -#: ../src/preferences-dialog.c:279 +#: ../src/preferences-dialog.c:262 msgid "Error saving the encryption key" msgstr "Fehler beim Speichern des Schlüssels" -#: ../src/preferences-dialog.c:298 +#: ../src/preferences-dialog.c:281 msgid "Error opening Seahorse" msgstr "Fehler beim Öffnen von Seahorse" @@ -601,134 +606,146 @@ msgid "Line spacing:" msgstr "Zeilenabstand:" -#: ../src/search-dialog.c:223 +#: ../src/search-dialog.c:221 msgid "Search canceled." msgstr "Suche abgebrochen." #. Translators: This is an error message wrapper for when searches encounter an error. The placeholder is for an error message. -#: ../src/search-dialog.c:226 +#: ../src/search-dialog.c:224 #, c-format msgid "Error: %s" msgstr "Fehler: %s" #. Success! -#: ../src/search-dialog.c:231 +#: ../src/search-dialog.c:229 #, c-format msgid "Found %d entry:" msgid_plural "Found %d entries:" msgstr[0] "%d Eintrag gefunden:" msgstr[1] "%d Einträge gefunden:" -#: ../src/search-dialog.c:280 +#: ../src/search-dialog.c:278 msgid "Searching…" msgstr "Suche läuft …" -#: ../src/storage-manager.c:276 +#: ../src/storage-manager.c:248 +#, c-format +msgid "" +"Could not open database \"%s\". SQLite provided the following error message: " +"%s" +msgstr "" +"Die Datenbank »%s« konnte nicht geöffnet werden. SQLite gab die folgende " +"Fehlermeldung zurück: %s" + +#: ../src/storage-manager.c:291 +#, c-format +msgid "" +"Could not run query \"%s\". SQLite provided the following error message: %s" +msgstr "" +"Die Abfrage »%s« konnte nicht ausgeführt werden. SQLite gab die folgende " +"Fehlermeldung zurück: %s" + +#: ../src/storage-manager.c:597 +msgid "Error deserializing entry into buffer while searching." +msgstr "" +"Fehler beim Deserialisieren des Eintrags in den Puffer während der Suche." + +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Adresse eingeben" + +#: ../src/vfs.c:239 #, c-format msgid "GPGME is not at least version %s" msgstr "GPGME liegt nicht in der Mindestversion %s vor" -#: ../src/storage-manager.c:285 +#: ../src/vfs.c:246 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "GPGME unterstützt kein OpenPGP: %s" -#: ../src/storage-manager.c:294 +#: ../src/vfs.c:253 #, c-format msgid "Error creating cipher context: %s" msgstr "Fehler beim Erzeugen des Verschlüsselungskontextes: %s" -#: ../src/storage-manager.c:323 +#: ../src/vfs.c:273 +#, c-format +msgid "Can't create a new GIOChannel for the encrypted database: %s" +msgstr "" +"Es kann kein neuer GIOChannel für die verschlüsselte Datenbank angelegt " +"werden: %s" + +#: ../src/vfs.c:281 #, c-format msgid "Error opening encrypted database file \"%s\": %s" msgstr "Fehler beim Öffnen der verschlüsselten Datenbankdatei »%s«: %s" -#: ../src/storage-manager.c:342 +#: ../src/vfs.c:297 #, c-format -msgid "Error opening plain database file \"%s\": %s" -msgstr "Fehler beim Öffnen der unverschlüsselten Datenbankdatei »%s«: %s" - -#: ../src/storage-manager.c:390 -msgid "" -"The encrypted database is empty. The plain database file has been left " -"undeleted as backup." -msgstr "" -"Die verschlüsselte Datenbank ist leer. Die Klartext-Datenbankdatei wurde als " -"Sicherungsdatei erhalten." +msgid "Error creating Callback base data buffer: %s" +msgstr "Fehler beim Erzeugen des Callback-Basis-Datenpuffers: %s" -#. Delete the plain file -#: ../src/storage-manager.c:393 +#: ../src/vfs.c:305 #, c-format -msgid "Could not delete plain database file \"%s\"." -msgstr "Die einfache Datenbankdatei »%s« konnte nicht gelöscht werden." +msgid "Can't create a new GIOChannel for the plain database: %s" +msgstr "" +"Es kann kein neuer GIOChannel für die Klartext-Datenbank angelegt werden: %s" -#: ../src/storage-manager.c:434 +#: ../src/vfs.c:313 #, c-format -msgid "Error decrypting database: %s" -msgstr "Fehler beim Entschlüsseln der Datenbank: %s" +msgid "Error opening plain database file \"%s\": %s" +msgstr "Fehler beim Öffnen der unverschlüsselten Datenbankdatei »%s«: %s" -#: ../src/storage-manager.c:468 +#: ../src/vfs.c:409 #, c-format msgid "Error getting encryption key: %s" msgstr "Fehler beim Holen des OpenPGP-Schlüssels: %s" -#: ../src/storage-manager.c:489 +#: ../src/vfs.c:433 ../src/vfs.c:439 #, c-format msgid "Error encrypting database: %s" msgstr "Fehler beim Verschlüsseln der Datenbank: %s" -#: ../src/storage-manager.c:549 +#. Translators: The first and second params are file paths, the last param is an error message. +#: ../src/vfs.c:489 +#, c-format +msgid "Error copying the file from %s to %s: %s" +msgstr "Fehler beim Kopieren der Datei %s nach %s: %s" + +#: ../src/vfs.c:495 #, c-format -#| msgid "Error opening plain database file \"%s\": %s" msgid "Error changing database backup file permissions: %s" msgstr "Fehler beim Ändern der Sicherungsdatenbank-Dateiberechtigungen: %s" -#: ../src/storage-manager.c:571 ../src/storage-manager.c:627 +#: ../src/vfs.c:595 #, c-format -#| msgid "Error opening plain database file \"%s\": %s" -msgid "Error changing database file permissions: %s" -msgstr "Fehler beim Ändern der Datenbank-Dateiberechtigungen: %s" +msgid "Error closing file: %s" +msgstr "Fehler beim Schließen der Datei: %s" #. Translators: the first parameter is a filename, the second is an error message. -#: ../src/storage-manager.c:583 ../src/storage-manager.c:611 +#. Translators: the first parameter is a filename. +#: ../src/vfs.c:994 ../src/vfs.c:1021 #, c-format -#| msgid "Error opening plain database file \"%s\": %s" -msgid "Error backing up file ‘%s’: %s" -msgstr "Fehler beim Sichern der Datei »%s«: %s" +msgid "Error backing up file ‘%s’" +msgstr "Fehler beim Sichern der Datei »%s«" -#: ../src/storage-manager.c:620 +#: ../src/vfs.c:1007 #, c-format -msgid "" -"Could not open database \"%s\". SQLite provided the following error message: " -"%s" -msgstr "" -"Die Datenbank »%s« konnte nicht geöffnet werden. SQLite gab die folgende " -"Fehlermeldung zurück: %s" +msgid "Error decrypting database: %s" +msgstr "Fehler beim Entschlüsseln der Datenbank: %s" -#: ../src/storage-manager.c:704 +#: ../src/vfs.c:1047 #, c-format -msgid "" -"Could not run query \"%s\". SQLite provided the following error message: %s" -msgstr "" -"Die Abfrage »%s« konnte nicht ausgeführt werden. SQLite gab die folgende " -"Fehlermeldung zurück: %s" - -#: ../src/storage-manager.c:1010 -msgid "Error deserializing entry into buffer while searching." -msgstr "" -"Fehler beim Deserialisieren des Eintrags in den Puffer während der Suche." - -#: ../src/uri-entry-dialog.c:71 -msgid "Enter URI" -msgstr "Adresse eingeben" +msgid "Error changing database file permissions: %s" +msgstr "Fehler beim Ändern der Datenbank-Dateiberechtigungen: %s" -#: ../src/widgets/calendar-button.c:140 +#: ../src/widgets/calendar-button.c:142 #, c-format -#| msgid "UI file \"%s\" could not be loaded" -msgid "UI file \"%s\" could not be loaded: %s" -msgstr "Benutzerschnittstellen-Datei »%s« konnte nicht geladen werden: %s" +msgid "UI data could not be loaded: %s" +msgstr "Benutzerschnittstellen-Datei konnte nicht geladen werden: %s" -#: ../src/widgets/calendar-button.c:150 +#: ../src/widgets/calendar-button.c:152 msgid "Can't load calendar window object from UI file" msgstr "" "Konnte Kalenderfenster-Objekt aus der Benutzerschnittstellen-Datei nicht " @@ -739,10 +756,6 @@ msgid "Important!" msgstr "Wichtig!" -#: ../src/widgets/calendar-window.c:80 -msgid "Unknown input device" -msgstr "Unbekanntes Eingabegerät" - #: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:166 msgid "add tag" msgstr "Schlagwort hinzufügen" @@ -762,10 +775,68 @@ msgstr "Schlagwort entfernen" #: ../src/widgets/tag-entry.c:85 -#| msgid "Search entry" msgid "Tag entry" msgstr "Schlagworteintrag" +#~ msgid "F_ormat" +#~ msgstr "F_ormat" + +#~ msgid "Toggle whether the currently selected text is bold." +#~ msgstr "" +#~ "Fettschrift für den gegenwärtig ausgewählten Text ein- oder ausschalten." + +#~ msgid "Toggle whether the currently selected text is italic." +#~ msgstr "" +#~ "Kursivschrift für den gegenwärtig ausgewählten Text ein- oder ausschalten." + +#~ msgid "Toggle whether the currently selected text is underlined." +#~ msgstr "" +#~ "Unterstreichung für den gegenwärtig ausgewählten Text ein- oder " +#~ "ausschalten." + +#~ msgid "" +#~ "Add or remove a hyperlink from the currently selected text to a specified " +#~ "URI." +#~ msgstr "" +#~ "Einen Hyperlink zu einer angegebenen Adresse zum gegenwärtig ausgewählten " +#~ "Text hinzufügen oder daraus entfernen." + +#~ msgid "I_mportant" +#~ msgstr "_Wichtig" + +#~ msgid "Toggle whether the current entry is marked as important." +#~ msgstr "" +#~ "Wichtig-Markierung für den gegenwärtigen Eintrag ein- oder ausschalten." + +#~ msgid "Show tags" +#~ msgstr "Schlagwörter anzeigen" + +#~| msgid "Jump to the current date in the diary." +#~ msgid "Show tags for the current entry" +#~ msgstr "Schlagwörter des aktuellen Eintrages zeigen" + +#~ msgid "_Help" +#~ msgstr "_Hilfe" + +#~ msgid "Jump to the current date in the diary." +#~ msgstr "Zum aktuellen Datum im Tagebuch springen." + +#~ msgid "Almanah Preferences" +#~ msgstr "Almanah-Einstellungen" + +#~ msgid "" +#~ "The encrypted database is empty. The plain database file has been left " +#~ "undeleted as backup." +#~ msgstr "" +#~ "Die verschlüsselte Datenbank ist leer. Die Klartext-Datenbankdatei wurde " +#~ "als Sicherungsdatei erhalten." + +#~ msgid "Could not delete plain database file \"%s\"." +#~ msgstr "Die einfache Datenbankdatei »%s« konnte nicht gelöscht werden." + +#~ msgid "Unknown input device" +#~ msgstr "Unbekanntes Eingabegerät" + #~ msgid "_File" #~ msgstr "_Datei" @@ -778,9 +849,6 @@ #~ msgid "_Print…" #~ msgstr "_Drucken …" -#~ msgid "_Edit" -#~ msgstr "_Bearbeiten" - #~ msgid "_Search…" #~ msgstr "_Suchen …" diff -Nru almanah-0.11.1/po/el.po almanah-0.12.0/po/el.po --- almanah-0.11.1/po/el.po 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/el.po 2019-10-07 13:45:09.000000000 +0000 @@ -9,26 +9,30 @@ "Project-Id-Version: almanah - master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=almanah&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-12-22 18:22+0000\n" -"PO-Revision-Date: 2014-01-05 09:29+0300\n" -"Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) \n" +"POT-Creation-Date: 2015-08-18 18:09+0000\n" +"PO-Revision-Date: 2015-08-30 13:04+0300\n" +"Last-Translator: Tom Tryfonidis \n" "Language-Team: www.gnome.gr\n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Virtaal 0.7.1\n" +"X-Generator: Poedit 1.8.4\n" "X-Project-Style: gnome\n" #: ../data/almanah.appdata.xml.in.h:1 +msgid "Keep a diary of your life" +msgstr "Κρατήστε ένα ημερολόγιο της ζωής σας" + +#: ../data/almanah.appdata.xml.in.h:2 msgid "" "Almanah Diary is an application to allow you to keep a diary of your life." msgstr "" "Το ημερολόγιο Almanah είναι μια εφαρμογή που σας επιτρέπει να κρατάτε ένα " "ημερολόγιο της ζωή σας." -#: ../data/almanah.appdata.xml.in.h:2 +#: ../data/almanah.appdata.xml.in.h:3 msgid "" "You can encrypt the diary to preserve your privacy. It has editing " "abilities, including text formatting and printing and shows you a lists of " @@ -41,37 +45,8 @@ "που συνέβησαν (στον υπολογιστή σας) για κάθε ημέρα (όπως εργασίες και " "συναντήσεις από το Evolution)." -#: ../data/almanah-app-menu.ui.h:1 -msgid "_Search" -msgstr "_Αναζήτηση" - -#: ../data/almanah-app-menu.ui.h:2 -msgid "Pr_eferences" -msgstr "Προτιμήσ_εις" - -#. Set the button label -#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 -msgid "_Import" -msgstr "Ε_ισαγωγή" - -#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 -msgid "_Export" -msgstr "Ε_ξαγωγή" - -#: ../data/almanah-app-menu.ui.h:5 -msgid "_Print diary" -msgstr "_Εκτύπωση ημερολογίου" - -#: ../data/almanah-app-menu.ui.h:6 -msgid "_About Almanah Diary" -msgstr "_Περί του ημερολογίου Almanah" - -#: ../data/almanah-app-menu.ui.h:7 -msgid "_Quit" -msgstr "Έ_ξοδος" - -#: ../data/almanah.desktop.in.h:1 ../src/application.c:132 -#: ../src/main-window.c:136 +#: ../data/almanah.desktop.in.h:1 ../src/application.c:133 +#: ../src/main-window.c:144 msgid "Almanah Diary" msgstr "Ημερολόγιο Almanah" @@ -80,7 +55,7 @@ msgstr "Διατήρηση ενός προσωπικού ημερολόγιο" #. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. -#: ../data/almanah.desktop.in.h:3 ../src/application.c:263 +#: ../data/almanah.desktop.in.h:3 ../src/application.c:272 msgid "Diary" msgstr "Ημερολόγιο" @@ -89,134 +64,75 @@ msgid "diary;journal;" msgstr "ημερολόγιο;καταγραφή;" -#: ../data/almanah.ui.h:1 -msgid "Select Date…" -msgstr "Επιλογή ημερομηνίας…" - -#: ../data/almanah.ui.h:2 -msgid "F_ormat" -msgstr "Μ_ορφή" - -#: ../data/almanah.ui.h:3 -msgid "Toggle whether the currently selected text is bold." -msgstr "Εναλλαγή μορφοποίησης του τρέχοντος επιλεγμένου κειμένου ως έντονο." - -#: ../data/almanah.ui.h:4 -msgid "Toggle whether the currently selected text is italic." -msgstr "" -"Εναλλαγή της μορφοποίησης του τρέχοντος επιλεγμένου κειμένου ως πλαγιαστό." - -#: ../data/almanah.ui.h:5 -msgid "Toggle whether the currently selected text is underlined." -msgstr "" -"Εναλλαγή της μορφοποίησης του τρέχοντος επιλεγμένου κειμένου ως " -"υπογραμμισμένο." - -#: ../data/almanah.ui.h:6 -msgid "Add/Remove _Hyperlink" -msgstr "Προσθήκη/αφαίρεση _υπερσυνδέσμου" - -#: ../data/almanah.ui.h:7 -msgid "" -"Add or remove a hyperlink from the currently selected text to a specified " -"URI." -msgstr "" -"Προσθήκη ή αφαίρεση υπερσυνδέσμου από το τρέχον επιλεγμένο κείμενο σε μια " -"συγκεκριμένη URI." - -#: ../data/almanah.ui.h:8 -msgid "Insert _Time" -msgstr "Εισαγωγή ώ_ρας" - -#: ../data/almanah.ui.h:9 -msgid "I_mportant" -msgstr "Σ_ημαντικό" - -#: ../data/almanah.ui.h:10 -msgid "Toggle whether the current entry is marked as important." -msgstr "Εναλλαγής σημείωσης της τρέχουσας καταχώρησης ως σημαντικής." - -#: ../data/almanah.ui.h:11 -msgid "Show tags" -msgstr "Εμφάνιση καρτελών" - -#: ../data/almanah.ui.h:12 -msgid "Show tags for the current entry" -msgstr "Εμφάνιση ετικετών για την τρέχουσα καταχώριση" - -#: ../data/almanah.ui.h:13 -msgid "_Help" -msgstr "_Βοήθεια" - -#: ../data/almanah.ui.h:14 -msgid "Go to _Today" -msgstr "Πήγαινε στο _Σήμερα" - -#: ../data/almanah.ui.h:15 -msgid "Jump to the current date in the diary." -msgstr "Μετάβαση στην τρέχουσα ημερομηνία στο ημερολόγιο." - -#: ../data/almanah.ui.h:16 +#: ../src/ui/almanah.ui.h:1 msgid "Calendar" msgstr "Ημερολόγιο" -#: ../data/almanah.ui.h:17 +#: ../src/ui/almanah.ui.h:2 +msgid "Go to Today" +msgstr "Πήγαινε στο Σήμερα" + +#: ../src/ui/almanah.ui.h:3 +msgid "Select Date…" +msgstr "Επιλογή ημερομηνίας…" + +#: ../src/ui/almanah.ui.h:4 msgid "Entry editing area" msgstr "Περιοχή επεξεργασίας καταχώρισης" -#: ../data/almanah.ui.h:18 +#: ../src/ui/almanah.ui.h:5 msgid "Past events" msgstr "Προηγούμενα συμβάντα" -#: ../data/almanah.ui.h:19 +#: ../src/ui/almanah.ui.h:6 msgid "Past Event List" msgstr "Κατάλογος προηγούμενου γεγονότος" -#: ../data/almanah.ui.h:20 +#: ../src/ui/almanah.ui.h:7 msgid "Search entry" msgstr "Αναζήτηση καταχώρισης" -#: ../data/almanah.ui.h:21 ../src/search-dialog.c:69 +#: ../src/ui/almanah.ui.h:8 ../src/search-dialog.c:69 msgid "Search" msgstr "Αναζήτηση" -#: ../data/almanah.ui.h:22 +#: ../src/ui/almanah.ui.h:9 msgid "Result List" msgstr "Λίστα αποτελέσματος" -#: ../data/almanah.ui.h:23 +#: ../src/ui/almanah.ui.h:10 msgid "View Entry" msgstr "Προβολή καταχώρισης" -#: ../data/almanah.ui.h:24 +#: ../src/ui/almanah.ui.h:11 msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." msgstr "π.χ. \"14/03/2009\" ή \"14 Μαρτίου 2009\"." -#: ../data/almanah.ui.h:25 +#: ../src/ui/almanah.ui.h:12 msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." msgstr "π.χ. “http://google.com/” ή “file:///home/me/Photos/photo.jpg”." -#: ../data/almanah.ui.h:26 +#: ../src/ui/almanah.ui.h:13 msgid "Successful Entries" msgstr "Επιτυχημένες καταχωρήσεις" -#: ../data/almanah.ui.h:27 +#: ../src/ui/almanah.ui.h:14 msgid "Merged Entries" msgstr "Συγχωνευμένες καταχωρήσεις" -#: ../data/almanah.ui.h:28 +#: ../src/ui/almanah.ui.h:15 msgid "Failed Entries" msgstr "Αποτυχημένες καταχωρήσεις" -#: ../data/almanah.ui.h:29 +#: ../src/ui/almanah.ui.h:16 msgid "Import Results List" msgstr "Εισαγωγής λίστας αποτελεσμάτων" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 +#: ../data/org.gnome.almanah.gschema.xml.in.h:1 msgid "Database encryption key ID" msgstr "Αναγνωριστικό κλειδί κρυπτογράφησης βάσης δεδομένων" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +#: ../data/org.gnome.almanah.gschema.xml.in.h:2 msgid "" "The ID of the key to use to encrypt and decrypt the database, if Almanah has " "been built with encryption support. Leave blank to disable database " @@ -227,42 +143,33 @@ "χτιστεί με υποστήριξη κρυπτογράφησης. Αφήστε κενό για απενεργοποίηση " "κρυπτογράφησης της βάσης δεδομένων." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 +#: ../data/org.gnome.almanah.gschema.xml.in.h:3 msgid "Spell checking language" msgstr "Γλώσσα ορθογραφικού ελέγχου" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +#: ../data/org.gnome.almanah.gschema.xml.in.h:4 msgid "The locale specifier of the language in which to check entry spellings." msgstr "" "Ο τοπικός προσδιορισμός της γλώσσας στην οποία ελέγχεται η ορθογραφία " "εισαγωγής." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +#: ../data/org.gnome.almanah.gschema.xml.in.h:5 msgid "Spell checking enabled?" msgstr "Είναι ενεργός ο ορθογραφικός έλεγχος;" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 +#: ../data/org.gnome.almanah.gschema.xml.in.h:6 msgid "Whether spell checking of entries is enabled." msgstr "Εάν ο ορθογραφικός έλεγχος των καταχωρίσεων είναι ενεργός." -#: ../src/application.c:246 +#: ../src/application.c:255 msgid "Error opening database" msgstr "Σφάλμα ανοίγματος βάσης δεδομένων" -#. Error loading the CSS -#: ../src/application.c:275 -#, c-format -msgid "" -"Couldn't load the CSS file '%s'. The interface might not be styled correctly" -msgstr "" -"Αδύνατη η φόρτωση του αρχείου CSS '%s'. Η διεπαφή μπορεί να μην έχει σωστή " -"τεχνοτροπία" - -#: ../src/application.c:319 +#: ../src/application.c:332 msgid "Enable debug mode" msgstr "Ενεργοποίηση κατάστασης εκσφαλμάτωσης" -#: ../src/application.c:336 +#: ../src/application.c:349 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" @@ -270,24 +177,16 @@ "να ανοιχθεί οποτεδήποτε." #. Print an error -#: ../src/application.c:347 +#: ../src/application.c:360 #, c-format msgid "Command line options could not be parsed: %s\n" msgstr "Οι επιλογές της γραμμής εντολών δεν μπορούν να αναλυθούν: %s\n" -#: ../src/application.c:366 +#: ../src/application.c:379 msgid "Error encrypting database" msgstr "Σφάλμα κρυπτογράφησης βάσης δεδομένων" -#: ../src/application.c:419 ../src/date-entry-dialog.c:129 -#: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 -#: ../src/main-window.c:195 ../src/preferences-dialog.c:191 -#: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 -#, c-format -msgid "UI file \"%s\" could not be loaded" -msgstr "Το αρχείο UI \"%s\" δεν μπορεί να φορτωθεί" - -#: ../src/application.c:542 +#: ../src/application.c:522 msgid "" "Almanah is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -299,7 +198,7 @@ "δημοσιοποιήθηκαν από Ίδρυμα Ελεύθερου Λογισμικού, είτε η έκδοση 3 της " "άδειας, ή (κατά επιλογή σας) αποιαδήποτε μεταγενέστερη έκδοση." -#: ../src/application.c:546 +#: ../src/application.c:526 msgid "" "Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -311,7 +210,7 @@ "ΚΑΤΑΛΛΗΛΟΤΗΤΑΣ ΓΙΑ ΕΙΔΙΚΟ ΣΚΟΠΟ. Δείτε τη GNU Geneal Public License για " "περισσότερες λεπτομέρειες." -#: ../src/application.c:550 +#: ../src/application.c:530 msgid "" "You should have received a copy of the GNU General Public License along with " "Almanah. If not, see ." @@ -319,12 +218,12 @@ "Πρέπει να έχετε λάβει ένα αντίγραφο της GNU General Public License σύμφωνα " "με το Almanah. Αν όχι , δείτε ." -#: ../src/application.c:565 +#: ../src/application.c:545 #, c-format msgid "A helpful diary keeper, storing %u entries." msgstr "Μια χρήσιμη διατήρηση ημερολογίου, που αποθηκεύει %u καταχωρίσεις." -#: ../src/application.c:569 +#: ../src/application.c:549 msgid "Copyright © 2008-2009 Philip Withnall" msgstr "Πνευματικά δικαιώματα © 2008-2009 Philip Withnall" @@ -333,22 +232,41 @@ #. * "Translator name 1 \n" #. * "Translator name 2 " #. -#: ../src/application.c:577 +#: ../src/application.c:557 msgid "translator-credits" msgstr "" "Ελληνική μεταφραστική ομάδα GNOME\n" " Δημήτρης Σπίγγος \n" -" Βασίλης Κοντογιάννης ,\n" -"Για περισσότερες πληροφορίες, επισκεφθείτε την σελίδα http://www.gnome.gr/" +" Βασίλης Κοντογιάννης \n" +" Μύρων Αποστολάκης \n" +"\n" +"Για περισσότερες πληροφορίες, επισκεφθείτε τη σελίδα\n" +"http://gnome.gr/" -#: ../src/application.c:581 +#: ../src/application.c:561 msgid "Almanah Website" msgstr "Ιστοσελίδα Almanah" +#: ../src/application.c:589 +#, c-format +msgid "" +"Couldn't load the CSS resources. The interface might not be styled " +"correctly: %s" +msgstr "" +"Αδύνατη η φόρτωση του αρχείου CSS. Η διεπαφή μπορεί να μην έχει σωστή " +"τεχνοτροπία: %s" + #: ../src/date-entry-dialog.c:72 msgid "Select Date" msgstr "Επιλογή ημερομηνίας" +#: ../src/date-entry-dialog.c:127 ../src/import-export-dialog.c:169 +#: ../src/import-export-dialog.c:475 ../src/main-window.c:210 +#: ../src/preferences-dialog.c:177 ../src/search-dialog.c:95 +#: ../src/uri-entry-dialog.c:126 +msgid "UI data could not be loaded" +msgstr "Τα δεδομένα UI δεν μπορούν να φορτωθούν" + #: ../src/entry.c:303 #, c-format msgid "Invalid data version number %u." @@ -411,52 +329,128 @@ msgid "Error changing exported file permissions: %s" msgstr "Σφάλμα αλλαγής εξαγόμενων δικαιωμάτων αρχείου: %s" -#: ../src/import-export-dialog.c:202 +#: ../src/gtk/menus.ui.h:1 +msgid "_Search" +msgstr "_Αναζήτηση" + +#: ../src/gtk/menus.ui.h:2 +msgid "Pr_eferences" +msgstr "Προτιμήσ_εις" + +#: ../src/gtk/menus.ui.h:3 +msgctxt "Main menu" +msgid "_Import" +msgstr "Ε_ισαγωγή" + +#: ../src/gtk/menus.ui.h:4 +msgctxt "Main menu" +msgid "_Export" +msgstr "Ε_ξαγωγή" + +#: ../src/gtk/menus.ui.h:5 +msgid "_Print diary" +msgstr "_Εκτύπωση ημερολογίου" + +#: ../src/gtk/menus.ui.h:6 +msgid "_About Almanah Diary" +msgstr "_Περί του ημερολογίου Almanah" + +#: ../src/gtk/menus.ui.h:7 +msgid "_Quit" +msgstr "Έ_ξοδος" + +#: ../src/gtk/menus.ui.h:8 +msgid "_Bold" +msgstr "Έ_ντονα" + +#: ../src/gtk/menus.ui.h:9 +msgid "_Italic" +msgstr "_Πλάγια" + +#: ../src/gtk/menus.ui.h:10 +msgid "_Underline" +msgstr "_Υπογράμμιση" + +#: ../src/gtk/menus.ui.h:11 +msgid "_Cut" +msgstr "_Αποκοπή" + +#: ../src/gtk/menus.ui.h:12 +msgid "_Copy" +msgstr "_Αντιγραφή" + +#: ../src/gtk/menus.ui.h:13 +msgid "_Paste" +msgstr "Ε_πικόλληση" + +#: ../src/gtk/menus.ui.h:14 ../src/main-window.c:607 +msgid "_Delete" +msgstr "_Διαγραφή" + +#: ../src/gtk/menus.ui.h:15 +msgid "Insert _Time" +msgstr "Εισαγωγή ώ_ρας" + +#: ../src/gtk/menus.ui.h:16 +msgid "Add/Remove _Hyperlink" +msgstr "Προσθήκη/αφαίρεση _υπερσυνδέσμου" + +#: ../src/import-export-dialog.c:203 msgid "Import _mode: " msgstr "Λειτουργία _εισαγωγής: " -#: ../src/import-export-dialog.c:202 +#: ../src/import-export-dialog.c:203 msgid "Export _mode: " msgstr "Λειτουργία ε_ξαγωγής: " #. Set the window title -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Import Entries" msgstr "Εισαγωγή καταχωρήσεων" -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Export Entries" msgstr "Εξαγωγή καταχωρήσεων" -#: ../src/import-export-dialog.c:245 +#: ../src/import-export-dialog.c:210 +msgctxt "Dialog button" +msgid "_Import" +msgstr "Ε_ισαγωγή" + +#: ../src/import-export-dialog.c:210 +msgctxt "Dialog button" +msgid "_Export" +msgstr "Ε_ξαγωγή" + +#: ../src/import-export-dialog.c:247 msgid "Import failed" msgstr "Η εισαγωγή απέτυχε" -#: ../src/import-export-dialog.c:283 +#: ../src/import-export-dialog.c:285 msgid "Export failed" msgstr "Η εξαγωγή απέτυχε" -#: ../src/import-export-dialog.c:296 +#: ../src/import-export-dialog.c:298 msgid "Export successful" msgstr "Επιτυχής εξαγωγή" -#: ../src/import-export-dialog.c:297 +#: ../src/import-export-dialog.c:299 msgid "The diary was successfully exported." msgstr "Το ημερολόγιο εξήχθη επιτυχώς." -#: ../src/import-export-dialog.c:445 +#: ../src/import-export-dialog.c:447 msgid "Import Results" msgstr "Αποτελέσματα εισαγωγής" #. Translators: This is a strftime()-format string for the dates displayed in import results. #. Translators: This is a strftime()-format string for the date to display when asking about editing a diary entry. #. Translators: This is a strftime()-format string for the date to display when asking about deleting a diary entry. +#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. -#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. -#: ../src/import-export-dialog.c:539 ../src/main-window.c:567 -#: ../src/main-window.c:597 ../src/printing.c:263 ../src/search-dialog.c:182 -#: ../src/widgets/calendar-button.c:309 +#: ../src/import-export-dialog.c:542 ../src/main-window.c:568 +#: ../src/main-window.c:599 ../src/main-window.c:1202 ../src/printing.c:263 +#: ../src/search-dialog.c:180 msgid "%A, %e %B %Y" msgstr "%A, %e %B %Y" @@ -507,14 +501,22 @@ "Η καταχώρηση εισήχθηκε από το \"%s\":\n" "\n" -#: ../src/main-window.c:571 +#: ../src/main-window.c:572 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" msgstr "" "Είστε σίγουροι ότι θέλετε να επεξεργαστείτε αυτή την καταχώριση του " "ημερολογίου για %s;" -#: ../src/main-window.c:601 +#: ../src/main-window.c:575 ../src/main-window.c:606 +msgid "_Cancel" +msgstr "A_κύρωση" + +#: ../src/main-window.c:576 +msgid "_Edit" +msgstr "_Επεξεργασία" + +#: ../src/main-window.c:603 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" msgstr "" @@ -522,57 +524,57 @@ "%s;" #. Print a warning about the unknown tag -#: ../src/main-window.c:710 +#: ../src/main-window.c:713 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." msgstr "" "Άγνωστη ή διπλότυπη ετικέτα κειμένου \"%s\" στην καταχώριση. Παράβλεψη." -#: ../src/main-window.c:918 +#: ../src/main-window.c:950 msgid "Error opening URI" msgstr "Σφάλμα ανοίγματος URI" #. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place -#: ../src/main-window.c:1092 +#: ../src/main-window.c:1129 #, c-format msgid "%s @ %s" msgstr "%s @ %s" -#: ../src/main-window.c:1171 +#: ../src/main-window.c:1235 msgid "Entry content could not be loaded" msgstr "Το περιεχόμενο της καταχώρισης δε μπορεί να φορτωθεί" -#: ../src/main-window.c:1348 +#: ../src/main-window.c:1354 msgid "Spelling checker could not be initialized" msgstr "Ο ορθογράφος δε μπόρεσε να αρχικοποιηθεί" -#: ../src/preferences-dialog.c:91 -msgid "Almanah Preferences" -msgstr "Προτιμήσεις Almanah" +#: ../src/preferences-dialog.c:83 +msgid "Preferences" +msgstr "Προτιμήσεις" #. Grab our child widgets -#: ../src/preferences-dialog.c:217 +#: ../src/preferences-dialog.c:204 msgid "Encryption key: " msgstr "Κλειδί κρυπτογράφησης: " -#: ../src/preferences-dialog.c:222 +#: ../src/preferences-dialog.c:208 msgid "None (don't encrypt)" msgstr "Κανένα (να μην κρυπτογραφηθεί)" -#: ../src/preferences-dialog.c:246 +#: ../src/preferences-dialog.c:213 msgid "New _Key" msgstr "Νέο _κλειδί" #. Set up the "Enable spell checking" check button -#: ../src/preferences-dialog.c:253 +#: ../src/preferences-dialog.c:237 msgid "Enable _spell checking" msgstr "Ενεργοποίηση ελέγχου _ορθογραφίας" -#: ../src/preferences-dialog.c:279 +#: ../src/preferences-dialog.c:262 msgid "Error saving the encryption key" msgstr "Σφάλμα αποθήκευσης κλειδιού κρυπτογράφησης" -#: ../src/preferences-dialog.c:298 +#: ../src/preferences-dialog.c:281 msgid "Error opening Seahorse" msgstr "Σφάλμα ανοίγματος εφαρμογής Seahorse" @@ -597,131 +599,147 @@ msgid "Line spacing:" msgstr "Απόσταση γραμμών:" -#: ../src/search-dialog.c:223 +#: ../src/search-dialog.c:221 msgid "Search canceled." msgstr "Η αναζήτηση ακυρώθηκε." #. Translators: This is an error message wrapper for when searches encounter an error. The placeholder is for an error message. -#: ../src/search-dialog.c:226 +#: ../src/search-dialog.c:224 #, c-format msgid "Error: %s" msgstr "Σφάλμα: %s" #. Success! -#: ../src/search-dialog.c:231 +#: ../src/search-dialog.c:229 #, c-format msgid "Found %d entry:" msgid_plural "Found %d entries:" msgstr[0] "Βρέθηκε %d καταχώριση:" msgstr[1] "Βρέθηκαν %d καταχωρίσεις:" -#: ../src/search-dialog.c:280 +#: ../src/search-dialog.c:278 msgid "Searching…" msgstr "Αναζήτηση…" -#: ../src/storage-manager.c:276 +#: ../src/storage-manager.c:248 +#, c-format +msgid "" +"Could not open database \"%s\". SQLite provided the following error message: " +"%s" +msgstr "" +"Δεν μπορεί να ανοίξει την βάση δεδομένων \"%s\". Το SQLite παρήγαγε το " +"παρακάτω μήνυμα σφάλματος: %s" + +#: ../src/storage-manager.c:291 +#, c-format +msgid "" +"Could not run query \"%s\". SQLite provided the following error message: %s" +msgstr "" +"Δεν μπορεί να εκτελέσει το ερώτημα \"%s\". To SQLite παρήγαγε το παρακάτω " +"μήνυμα σφάλματος: %s" + +#: ../src/storage-manager.c:597 +msgid "Error deserializing entry into buffer while searching." +msgstr "" +"Σφάλμα αποσειριοποίησης εισαγωγής στην ενδιάμεση μνήμη κατά την αναζήτηση." + +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Εισαγωγή URI" + +#: ../src/vfs.c:239 #, c-format msgid "GPGME is not at least version %s" msgstr "Το GPGME είναι κάτω από την ελάχιστη έκδοση %s" -#: ../src/storage-manager.c:285 +#: ../src/vfs.c:246 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "Το GPGME δεν υποστηρίζει το OpenPGP: %s" -#: ../src/storage-manager.c:294 +#: ../src/vfs.c:253 #, c-format msgid "Error creating cipher context: %s" msgstr "Σφάλμα ανοίγματος κρυπτογραφημένου περιβάλλοντος: %s" -#: ../src/storage-manager.c:323 +#: ../src/vfs.c:273 +#, c-format +msgid "Can't create a new GIOChannel for the encrypted database: %s" +msgstr "" +"Δεν μπορεί να δημιουργηθεί ένα καινουριο GIOChannel για την κρυπτογραφημένη " +"βάση δεδομένων:%s" + +#: ../src/vfs.c:281 #, c-format msgid "Error opening encrypted database file \"%s\": %s" msgstr "Σφάλμα ανοίγματος κρυπτογραφημένου αρχείου βάσης δεδομένων \"%s\": %s" -#: ../src/storage-manager.c:342 +#: ../src/vfs.c:297 #, c-format -msgid "Error opening plain database file \"%s\": %s" -msgstr "Σφάλμα ανοίγματος απλού αρχείου βάσης δεδομένων \"%s\": %s" - -#: ../src/storage-manager.c:390 -msgid "" -"The encrypted database is empty. The plain database file has been left " -"undeleted as backup." -msgstr "" -"Η κρυπτογραφημένη βάση δεδομένων είναι άδεια. Το απλό αρχείο βάσης δεδομένων " -"παραμένει για χρήση ως αντιγράφου ασφαλείας." +msgid "Error creating Callback base data buffer: %s" +msgstr "Σφάλμα δημιουργίας επανάκλησης βασικών δεδομένων ενδιάμεσης μνήμης: %s" -#. Delete the plain file -#: ../src/storage-manager.c:393 +#: ../src/vfs.c:305 #, c-format -msgid "Could not delete plain database file \"%s\"." -msgstr "Αδυναμία διαγραφής απλού αρχείου βάσης δεδομένων \"%s\"." +msgid "Can't create a new GIOChannel for the plain database: %s" +msgstr "" +"Δεν μπορεί να δημιουργηθεί νέο GIOChannel για την απλή βάση δεδομένων:%s" -#: ../src/storage-manager.c:434 +#: ../src/vfs.c:313 #, c-format -msgid "Error decrypting database: %s" -msgstr "Σφάλμα αποκρυπτογράφησης βάσης δεδομένων: %s" +msgid "Error opening plain database file \"%s\": %s" +msgstr "Σφάλμα ανοίγματος απλού αρχείου βάσης δεδομένων \"%s\": %s" -#: ../src/storage-manager.c:468 +#: ../src/vfs.c:409 #, c-format msgid "Error getting encryption key: %s" msgstr "Σφάλμα ανάκτησης κλειδιού κρυπτογράφησης: %s" -#: ../src/storage-manager.c:489 +#: ../src/vfs.c:433 ../src/vfs.c:439 #, c-format msgid "Error encrypting database: %s" msgstr "Σφάλμα κρυπτογράφησης βάσης δεδομένων: %s" -#: ../src/storage-manager.c:549 +#. Translators: The first and second params are file paths, the last param is an error message. +#: ../src/vfs.c:489 +#, c-format +msgid "Error copying the file from %s to %s: %s" +msgstr "Σφάλμα κατά την αντιγραφή του αρχείου από %s σε %s : %s " + +#: ../src/vfs.c:495 #, c-format msgid "Error changing database backup file permissions: %s" msgstr "" "Σφάλμα κατά την αλλαγή δικαιωμάτων αρχείου εφεδρικής βάσης δεδομένων: %s" -#: ../src/storage-manager.c:571 ../src/storage-manager.c:627 +#: ../src/vfs.c:595 #, c-format -msgid "Error changing database file permissions: %s" -msgstr "Σφάλμα κατά την αλλαγή δικαιωμάτων αρχείου βάσης δεδομένων: %s" +msgid "Error closing file: %s" +msgstr "Σφάλμα κλεισίματος αρχείου: %s" #. Translators: the first parameter is a filename, the second is an error message. -#: ../src/storage-manager.c:583 ../src/storage-manager.c:611 +#. Translators: the first parameter is a filename. +#: ../src/vfs.c:994 ../src/vfs.c:1021 #, c-format -msgid "Error backing up file ‘%s’: %s" -msgstr "Σφάλμα κατά την δημιουργία εφεδρικού αρχείου ‘%s’: %s" +msgid "Error backing up file ‘%s’" +msgstr "Σφάλμα κατά την δημιουργία εφεδρικού αρχείου ‘%s’" -#: ../src/storage-manager.c:620 +#: ../src/vfs.c:1007 #, c-format -msgid "" -"Could not open database \"%s\". SQLite provided the following error message: " -"%s" -msgstr "" -"Δεν μπορεί να ανοίξει την βάση δεδομένων \"%s\". Το SQLite παρήγαγε το " -"παρακάτω μήνυμα σφάλματος: %s" +msgid "Error decrypting database: %s" +msgstr "Σφάλμα αποκρυπτογράφησης βάσης δεδομένων: %s" -#: ../src/storage-manager.c:704 +#: ../src/vfs.c:1047 #, c-format -msgid "" -"Could not run query \"%s\". SQLite provided the following error message: %s" -msgstr "" -"Δεν μπορεί να εκτελέσει το ερώτημα \"%s\". To SQLite παρήγαγε το παρακάτω " -"μήνυμα σφάλματος: %s" - -#: ../src/storage-manager.c:1010 -msgid "Error deserializing entry into buffer while searching." -msgstr "" -"Σφάλμα αποσειριοποίησης εισαγωγής στην ενδιάμεση μνήμη κατά την αναζήτηση." - -#: ../src/uri-entry-dialog.c:71 -msgid "Enter URI" -msgstr "Εισαγωγή URI" +msgid "Error changing database file permissions: %s" +msgstr "Σφάλμα κατά την αλλαγή δικαιωμάτων αρχείου βάσης δεδομένων: %s" -#: ../src/widgets/calendar-button.c:140 +#: ../src/widgets/calendar-button.c:142 #, c-format -msgid "UI file \"%s\" could not be loaded: %s" -msgstr "Το αρχείο UI \"%s\" δεν μπορεί να φορτωθεί: %s" +msgid "UI data could not be loaded: %s" +msgstr "Τα δεδομένα UI δεν μπορούν να φορτωθούν: %s" -#: ../src/widgets/calendar-button.c:150 +#: ../src/widgets/calendar-button.c:152 msgid "Can't load calendar window object from UI file" msgstr "Αδύνατη η φόρτωση αντικειμένου παραθύρου ημερολογίου από αρχείο UI" @@ -730,10 +748,6 @@ msgid "Important!" msgstr "Σημαντικό!" -#: ../src/widgets/calendar-window.c:80 -msgid "Unknown input device" -msgstr "Άγνωστη συσκευή εισόδου" - #: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:166 msgid "add tag" msgstr "προσθήκη ετικέτας" @@ -755,6 +769,62 @@ msgid "Tag entry" msgstr "Καταχώριση ετικέτας" +#~ msgid "Almanah Preferences" +#~ msgstr "Προτιμήσεις Almanah" + +#~ msgid "F_ormat" +#~ msgstr "Μ_ορφή" + +#~ msgid "Toggle whether the currently selected text is bold." +#~ msgstr "Εναλλαγή μορφοποίησης του τρέχοντος επιλεγμένου κειμένου ως έντονο." + +#~ msgid "Toggle whether the currently selected text is italic." +#~ msgstr "" +#~ "Εναλλαγή της μορφοποίησης του τρέχοντος επιλεγμένου κειμένου ως πλαγιαστό." + +#~ msgid "Toggle whether the currently selected text is underlined." +#~ msgstr "" +#~ "Εναλλαγή της μορφοποίησης του τρέχοντος επιλεγμένου κειμένου ως " +#~ "υπογραμμισμένο." + +#~ msgid "" +#~ "Add or remove a hyperlink from the currently selected text to a specified " +#~ "URI." +#~ msgstr "" +#~ "Προσθήκη ή αφαίρεση υπερσυνδέσμου από το τρέχον επιλεγμένο κείμενο σε μια " +#~ "συγκεκριμένη URI." + +#~ msgid "I_mportant" +#~ msgstr "Σ_ημαντικό" + +#~ msgid "Toggle whether the current entry is marked as important." +#~ msgstr "Εναλλαγής σημείωσης της τρέχουσας καταχώρησης ως σημαντικής." + +#~ msgid "Show tags" +#~ msgstr "Εμφάνιση καρτελών" + +#~ msgid "Show tags for the current entry" +#~ msgstr "Εμφάνιση ετικετών για την τρέχουσα καταχώριση" + +#~ msgid "_Help" +#~ msgstr "_Βοήθεια" + +#~ msgid "Jump to the current date in the diary." +#~ msgstr "Μετάβαση στην τρέχουσα ημερομηνία στο ημερολόγιο." + +#~ msgid "" +#~ "The encrypted database is empty. The plain database file has been left " +#~ "undeleted as backup." +#~ msgstr "" +#~ "Η κρυπτογραφημένη βάση δεδομένων είναι άδεια. Το απλό αρχείο βάσης " +#~ "δεδομένων παραμένει για χρήση ως αντιγράφου ασφαλείας." + +#~ msgid "Could not delete plain database file \"%s\"." +#~ msgstr "Αδυναμία διαγραφής απλού αρχείου βάσης δεδομένων \"%s\"." + +#~ msgid "Unknown input device" +#~ msgstr "Άγνωστη συσκευή εισόδου" + #~ msgid "Main window X position" #~ msgstr "Θέση X κεντρικού παραθύρου" @@ -818,9 +888,6 @@ #~ msgid "_Definitions" #~ msgstr "_Ορισμοί" -#~ msgid "_Edit" -#~ msgstr "_Επεξεργασία" - #~ msgid "_Export…" #~ msgstr "_Εξαγωγή..." @@ -869,9 +936,6 @@ #~ msgid "An attached file." #~ msgstr "Συνημμένο αρχείο." -#~ msgid "Error opening file" -#~ msgstr "Σφάλμα ανοίγματος αρχείου" - #~ msgid "Select File" #~ msgstr "Επιλογή αρχείου" diff -Nru almanah-0.11.1/po/en_GB.po almanah-0.12.0/po/en_GB.po --- almanah-0.11.1/po/en_GB.po 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/en_GB.po 2019-10-07 13:45:09.000000000 +0000 @@ -1,18 +1,17 @@ # English (British) translation. # Copyright (C) 2008 Philip Withnall # This file is distributed under the same license as the diary package. -# Philip Withnall , 2009, 2010, 2011, 2012. +# Philip Withnall , 2009, 2010, 2011, 2012, 2015. # Jen Ockwell , 2009. # Chris Leonard , 2012. # Bruce Cowan , 2012. msgid "" msgstr "" "Project-Id-Version: almanah\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=almana" -"h&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-09-10 06:20+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-06-23 23:51+0100\n" "PO-Revision-Date: 2012-09-14 15:24+0100\n" -"Last-Translator: Bruce Cowan \n" +"Last-Translator: Philip Withnall \n" "Language-Team: British English \n" "Language: en_GB\n" "MIME-Version: 1.0\n" @@ -22,8 +21,30 @@ "X-Generator: Virtaal 0.7.1\n" "X-Project-Style: gnome\n" -#: ../data/almanah.desktop.in.h:1 ../src/application.c:101 -#: ../src/main-window.c:151 +#: ../data/almanah.appdata.xml.in.h:1 +msgid "Keep a diary of your life" +msgstr "Keep a diary of your life" + +#: ../data/almanah.appdata.xml.in.h:2 +msgid "" +"Almanah Diary is an application to allow you to keep a diary of your life." +msgstr "" +"Almanah Diary is an application to allow you to keep a diary of your life." + +#: ../data/almanah.appdata.xml.in.h:3 +msgid "" +"You can encrypt the diary to preserve your privacy. It has editing " +"abilities, including text formatting and printing and shows you a lists of " +"events which happened (on your computer) for each day (such as tasks and " +"appointments from Evolution)." +msgstr "" +"You can encrypt the diary to preserve your privacy. It has editing " +"abilities, including text formatting and printing and shows you a list of " +"events which happened (on your computer) for each day (such as tasks and " +"appointments from Evolution)." + +#: ../data/almanah.desktop.in.h:1 ../src/application.c:133 +#: ../src/main-window.c:144 msgid "Almanah Diary" msgstr "Almanah Diary" @@ -32,228 +53,210 @@ msgstr "Keep a personal diary" #. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. -#: ../data/almanah.desktop.in.h:3 ../src/main-window.c:305 +#: ../data/almanah.desktop.in.h:3 ../src/application.c:272 msgid "Diary" msgstr "Diary" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 -msgid "Database encryption key ID" -msgstr "Database encryption key ID" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 -msgid "" -"The ID of the key to use to encrypt and decrypt the database, if Almanah has " -"been built with encryption support. Leave blank to disable database " -"encryption." -msgstr "" -"The ID of the key to use to encrypt and decrypt the database, if Almanah has " -"been built with encryption support. Leave blank to disable database " -"encryption." +#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../data/almanah.desktop.in.h:5 +msgid "diary;journal;" +msgstr "diary;journal;" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 -msgid "Spell checking language" -msgstr "Spell checking language" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 -msgid "The locale specifier of the language in which to check entry spellings." -msgstr "" -"The locale specifier of the language in which to check entry spellings." - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 -msgid "Spell checking enabled?" -msgstr "Spell checking enabled?" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 -msgid "Whether spell checking of entries is enabled." -msgstr "Whether spell checking of entries is enabled." - -#: ../data/almanah.ui.h:1 -msgid "_File" -msgstr "_File" - -#: ../data/almanah.ui.h:2 -msgid "_Import…" -msgstr "_Import…" - -#: ../data/almanah.ui.h:3 -msgid "_Export…" -msgstr "_Export…" - -#: ../data/almanah.ui.h:4 -msgid "_Print…" -msgstr "_Print…" +#: ../src/ui/almanah.ui.h:1 +msgid "Calendar" +msgstr "Calendar" -#: ../data/almanah.ui.h:5 -msgid "_Edit" -msgstr "_Edit" +#: ../src/ui/almanah.ui.h:2 +msgid "Go to Today" +msgstr "Go to Today" -#: ../data/almanah.ui.h:6 +#: ../src/ui/almanah.ui.h:3 msgid "Select Date…" msgstr "Select Date…" -#: ../data/almanah.ui.h:7 -msgid "_Search…" -msgstr "_Search…" - -#: ../data/almanah.ui.h:8 -msgid "Pr_eferences" -msgstr "Pr_eferences" - -#: ../data/almanah.ui.h:9 -msgid "F_ormat" -msgstr "F_ormat" - -#: ../data/almanah.ui.h:10 -msgid "Toggle whether the currently selected text is bold." -msgstr "Toggle whether the currently selected text is bold." - -#: ../data/almanah.ui.h:11 -msgid "Toggle whether the currently selected text is italic." -msgstr "Toggle whether the currently selected text is italic." - -#: ../data/almanah.ui.h:12 -msgid "Toggle whether the currently selected text is underlined." -msgstr "Toggle whether the currently selected text is underlined." - -#: ../data/almanah.ui.h:13 -msgid "Add/Remove _Hyperlink" -msgstr "Add/Remove _Hyperlink" - -#: ../data/almanah.ui.h:14 -msgid "" -"Add or remove a hyperlink from the currently selected text to a specified " -"URI." -msgstr "" -"Add or remove a hyperlink from the currently selected text to a specified " -"URI." - -#: ../data/almanah.ui.h:15 -msgid "Insert _Time" -msgstr "Insert _Time" - -#: ../data/almanah.ui.h:16 -msgid "I_mportant" -msgstr "I_mportant" - -#: ../data/almanah.ui.h:17 -msgid "Toggle whether the current entry is marked as important." -msgstr "Toggle whether the current entry is marked as important." - -#: ../data/almanah.ui.h:18 -msgid "_Help" -msgstr "_Help" - -#: ../data/almanah.ui.h:19 -msgid "Go to _Today" -msgstr "Go to _Today" - -#: ../data/almanah.ui.h:20 -msgid "Jump to the current date in the diary." -msgstr "Jump to the current date in the diary." - -#: ../data/almanah.ui.h:21 -msgid "Font Style" -msgstr "Font Style" - -#: ../data/almanah.ui.h:22 -msgid "Change font style for selected text." -msgstr "Change font style for selected text." - -#: ../data/almanah.ui.h:23 -msgid "_Font Style" -msgstr "_Font Style" - -#: ../data/almanah.ui.h:24 -msgid "Calendar" -msgstr "Calendar" - -#: ../data/almanah.ui.h:25 +#: ../src/ui/almanah.ui.h:4 msgid "Entry editing area" msgstr "Entry editing area" -#: ../data/almanah.ui.h:26 +#: ../src/ui/almanah.ui.h:5 msgid "Past events" msgstr "Past events" -#: ../data/almanah.ui.h:27 +#: ../src/ui/almanah.ui.h:6 msgid "Past Event List" msgstr "Past Event List" -#: ../data/almanah.ui.h:28 +#: ../src/ui/almanah.ui.h:7 msgid "Search entry" msgstr "Search entry" -#: ../data/almanah.ui.h:29 ../src/search-dialog.c:69 +#: ../src/ui/almanah.ui.h:8 ../src/search-dialog.c:69 msgid "Search" msgstr "Search" -#: ../data/almanah.ui.h:30 +#: ../src/ui/almanah.ui.h:9 msgid "Result List" msgstr "Result List" -#: ../data/almanah.ui.h:31 +#: ../src/ui/almanah.ui.h:10 msgid "View Entry" msgstr "View Entry" -#: ../data/almanah.ui.h:32 +#: ../src/ui/almanah.ui.h:11 msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." msgstr "e.g. \"14/03/2009\" or \"14th March 2009\"." -#: ../data/almanah.ui.h:33 +#: ../src/ui/almanah.ui.h:12 msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." msgstr "e.g. “http://google.co.uk/” or “file:///home/me/Photos/photo.jpg”." -#: ../data/almanah.ui.h:34 +#: ../src/ui/almanah.ui.h:13 msgid "Successful Entries" msgstr "Successful Entries" -#: ../data/almanah.ui.h:35 +#: ../src/ui/almanah.ui.h:14 msgid "Merged Entries" msgstr "Merged Entries" -#: ../data/almanah.ui.h:36 +#: ../src/ui/almanah.ui.h:15 msgid "Failed Entries" msgstr "Failed Entries" -#: ../data/almanah.ui.h:37 +#: ../src/ui/almanah.ui.h:16 msgid "Import Results List" msgstr "Import Results List" -#: ../src/application.c:205 +#: ../data/org.gnome.almanah.gschema.xml.in.h:1 +msgid "Database encryption key ID" +msgstr "Database encryption key ID" + +#: ../data/org.gnome.almanah.gschema.xml.in.h:2 +msgid "" +"The ID of the key to use to encrypt and decrypt the database, if Almanah has " +"been built with encryption support. Leave blank to disable database " +"encryption." +msgstr "" +"The ID of the key to use to encrypt and decrypt the database, if Almanah has " +"been built with encryption support. Leave blank to disable database " +"encryption." + +#: ../data/org.gnome.almanah.gschema.xml.in.h:3 +msgid "Spell checking language" +msgstr "Spell checking language" + +#: ../data/org.gnome.almanah.gschema.xml.in.h:4 +msgid "The locale specifier of the language in which to check entry spellings." +msgstr "" +"The locale specifier of the language in which to check entry spellings." + +#: ../data/org.gnome.almanah.gschema.xml.in.h:5 +msgid "Spell checking enabled?" +msgstr "Spell checking enabled?" + +#: ../data/org.gnome.almanah.gschema.xml.in.h:6 +msgid "Whether spell checking of entries is enabled." +msgstr "Whether spell checking of entries is enabled." + +#: ../src/application.c:255 msgid "Error opening database" msgstr "Error opening database" -#: ../src/application.c:253 +#: ../src/application.c:332 msgid "Enable debug mode" msgstr "Enable debug mode" -#: ../src/application.c:270 +#: ../src/application.c:349 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" "Manage your diary. Only one instance of the program may be open at any time." #. Print an error -#: ../src/application.c:281 +#: ../src/application.c:360 #, c-format msgid "Command line options could not be parsed: %s\n" msgstr "Command line options could not be parsed: %s\n" -#: ../src/application.c:300 +#: ../src/application.c:379 msgid "Error encrypting database" msgstr "Error encrypting database" +#: ../src/application.c:522 +msgid "" +"Almanah is free software: you can redistribute it and/or modify it under the " +"terms of the GNU General Public License as published by the Free Software " +"Foundation, either version 3 of the License, or (at your option) any later " +"version." +msgstr "" +"Almanah is free software: you can redistribute it and/or modify it under the " +"terms of the GNU General Public Licence as published by the Free Software " +"Foundation, either version 3 of the Licence, or (at your option) any later " +"version." + +#: ../src/application.c:526 +msgid "" +"Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " +"details." +msgstr "" +"Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE. See the GNU General Public Licence for more " +"details." + +#: ../src/application.c:530 +msgid "" +"You should have received a copy of the GNU General Public License along with " +"Almanah. If not, see ." +msgstr "" +"You should have received a copy of the GNU General Public Licence along with " +"Almanah. If not, see ." + +#: ../src/application.c:545 +#, c-format +msgid "A helpful diary keeper, storing %u entries." +msgstr "A helpful diary keeper, storing %u entries." + +#: ../src/application.c:549 +msgid "Copyright © 2008-2009 Philip Withnall" +msgstr "Copyright © 2008-2009 Philip Withnall" + +#. Translators: please include your names here to be credited for your hard work! +#. * Format: +#. * "Translator name 1 \n" +#. * "Translator name 2 " +#. +#: ../src/application.c:557 +msgid "translator-credits" +msgstr "" +"Philip Withnall \n" +"Jen Ockwell \n" +"Chris Leonard " + +#: ../src/application.c:561 +msgid "Almanah Website" +msgstr "Almanah Website" + +#: ../src/application.c:589 +#, c-format +msgid "" +"Couldn't load the CSS resources. The interface might not be styled " +"correctly: %s" +msgstr "" +"Couldn’t load the CSS resources. The interface might not be styled " +"correctly: %s" + #: ../src/date-entry-dialog.c:72 msgid "Select Date" msgstr "Select Date" -#: ../src/date-entry-dialog.c:129 ../src/import-export-dialog.c:168 -#: ../src/import-export-dialog.c:472 ../src/main-window.c:219 -#: ../src/preferences-dialog.c:191 ../src/search-dialog.c:97 -#: ../src/uri-entry-dialog.c:128 -#, c-format -msgid "UI file \"%s\" could not be loaded" -msgstr "UI file \"%s\" could not be loaded" +#: ../src/date-entry-dialog.c:127 ../src/import-export-dialog.c:169 +#: ../src/import-export-dialog.c:474 ../src/main-window.c:210 +#: ../src/preferences-dialog.c:177 ../src/search-dialog.c:95 +#: ../src/uri-entry-dialog.c:126 +msgid "UI data could not be loaded" +msgstr "UI data could not be loaded" #: ../src/entry.c:303 #, c-format @@ -268,7 +271,13 @@ msgid "An appointment on an Evolution calendar." msgstr "An appointment on an Evolution calendar." -#: ../src/events/calendar-appointment.c:134 ../src/events/calendar-task.c:124 +#. Translators: This is a time string with the format hh:mm +#: ../src/events/calendar-appointment.c:89 ../src/events/calendar-task.c:90 +#, c-format +msgid "%.2d:%.2d" +msgstr "%.2d:%.2d" + +#: ../src/events/calendar-appointment.c:135 ../src/events/calendar-task.c:125 msgid "Error launching Evolution" msgstr "Error launching Evolution" @@ -280,11 +289,11 @@ msgid "A task on an Evolution calendar." msgstr "A task on an Evolution calendar." -#: ../src/export-operation.c:45 ../src/import-operation.c:45 +#: ../src/export-operation.c:47 ../src/import-operation.c:45 msgid "Text Files" msgstr "Text Files" -#: ../src/export-operation.c:46 +#: ../src/export-operation.c:48 msgid "" "Select a _folder to export the entries to as text files, one per entry, with " "names in the format 'yyyy-mm-dd', and no extension. All entries will be " @@ -294,11 +303,11 @@ "names in the format 'yyyy-mm-dd', and no extension. All entries will be " "exported, unencrypted in plain text format." -#: ../src/export-operation.c:50 ../src/import-operation.c:50 +#: ../src/export-operation.c:52 ../src/import-operation.c:50 msgid "Database" msgstr "Database" -#: ../src/export-operation.c:51 +#: ../src/export-operation.c:53 msgid "" "Select a _filename for a complete copy of the unencrypted Almanah Diary " "database to be given." @@ -306,61 +315,122 @@ "Select a _filename for a complete copy of the unencrypted Almanah Diary " "database to be given." -#: ../src/import-export-dialog.c:202 +#: ../src/export-operation.c:256 ../src/export-operation.c:313 +#, c-format +msgid "Error changing exported file permissions: %s" +msgstr "Error changing exported file permissions: %s" + +#: ../src/gtk/menus.ui.h:1 +msgid "_Search" +msgstr "_Search" + +#: ../src/gtk/menus.ui.h:2 +msgid "Pr_eferences" +msgstr "Pr_eferences" + +#. Set the button label +#: ../src/gtk/menus.ui.h:3 ../src/import-export-dialog.c:209 +msgid "_Import" +msgstr "_Import" + +#: ../src/gtk/menus.ui.h:4 ../src/import-export-dialog.c:209 +msgid "_Export" +msgstr "_Export" + +#: ../src/gtk/menus.ui.h:5 +msgid "_Print diary" +msgstr "_Print diary" + +#: ../src/gtk/menus.ui.h:6 +msgid "_About Almanah Diary" +msgstr "_About Almanah Diary" + +#: ../src/gtk/menus.ui.h:7 +msgid "_Quit" +msgstr "_Quit" + +#: ../src/gtk/menus.ui.h:8 +msgid "_Bold" +msgstr "_Bold" + +#: ../src/gtk/menus.ui.h:9 +msgid "_Italic" +msgstr "_Italic" + +#: ../src/gtk/menus.ui.h:10 +msgid "_Underline" +msgstr "_Underline" + +#: ../src/gtk/menus.ui.h:11 +msgid "_Cut" +msgstr "_Cut" + +#: ../src/gtk/menus.ui.h:12 +msgid "_Copy" +msgstr "_Copy" + +#: ../src/gtk/menus.ui.h:13 +msgid "_Paste" +msgstr "_Paste" + +#: ../src/gtk/menus.ui.h:14 ../src/main-window.c:607 +msgid "_Delete" +msgstr "_Delete" + +#: ../src/gtk/menus.ui.h:15 +msgid "Insert _Time" +msgstr "Insert _Time" + +#: ../src/gtk/menus.ui.h:16 +msgid "Add/Remove _Hyperlink" +msgstr "Add/Remove _Hyperlink" + +#: ../src/import-export-dialog.c:203 msgid "Import _mode: " msgstr "Import _mode: " -#: ../src/import-export-dialog.c:202 +#: ../src/import-export-dialog.c:203 msgid "Export _mode: " msgstr "Export _mode: " #. Set the window title -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Import Entries" msgstr "Import Entries" -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Export Entries" msgstr "Export Entries" -#. Set the button label -#: ../src/import-export-dialog.c:208 -msgid "_Import" -msgstr "_Import" - -#: ../src/import-export-dialog.c:208 -msgid "_Export" -msgstr "_Export" - -#: ../src/import-export-dialog.c:245 +#: ../src/import-export-dialog.c:246 msgid "Import failed" msgstr "Import failed" -#: ../src/import-export-dialog.c:283 +#: ../src/import-export-dialog.c:284 msgid "Export failed" msgstr "Export failed" -#: ../src/import-export-dialog.c:296 +#: ../src/import-export-dialog.c:297 msgid "Export successful" msgstr "Export successful" -#: ../src/import-export-dialog.c:297 +#: ../src/import-export-dialog.c:298 msgid "The diary was successfully exported." msgstr "The diary was successfully exported." -#: ../src/import-export-dialog.c:445 +#: ../src/import-export-dialog.c:446 msgid "Import Results" msgstr "Import Results" #. Translators: This is a strftime()-format string for the dates displayed in import results. #. Translators: This is a strftime()-format string for the date to display when asking about editing a diary entry. #. Translators: This is a strftime()-format string for the date to display when asking about deleting a diary entry. +#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. -#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. -#: ../src/import-export-dialog.c:539 ../src/main-window.c:603 -#: ../src/main-window.c:633 ../src/printing.c:263 ../src/search-dialog.c:182 -#: ../src/widgets/calendar-button.c:317 +#: ../src/import-export-dialog.c:541 ../src/main-window.c:568 +#: ../src/main-window.c:599 ../src/main-window.c:1202 ../src/printing.c:263 +#: ../src/search-dialog.c:180 msgid "%A, %e %B %Y" msgstr "%A, %e %B %Y" @@ -408,118 +478,75 @@ "Entry imported from \"%s\":\n" "\n" -#: ../src/main-window.c:607 +#: ../src/main-window.c:572 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" msgstr "Are you sure you want to edit this diary entry for %s?" -#: ../src/main-window.c:637 +#: ../src/main-window.c:575 ../src/main-window.c:606 +msgid "_Cancel" +msgstr "_Cancel" + +#: ../src/main-window.c:576 +msgid "_Edit" +msgstr "_Edit" + +#: ../src/main-window.c:603 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" msgstr "Are you sure you want to delete this diary entry for %s?" #. Print a warning about the unknown tag -#: ../src/main-window.c:746 +#: ../src/main-window.c:713 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." msgstr "Unknown or duplicate text tag \"%s\" in entry. Ignoring." -#: ../src/main-window.c:1062 +#: ../src/main-window.c:950 msgid "Error opening URI" msgstr "Error opening URI" -#: ../src/main-window.c:1178 -msgid "" -"Almanah is free software: you can redistribute it and/or modify it under the " -"terms of the GNU General Public License as published by the Free Software " -"Foundation, either version 3 of the License, or (at your option) any later " -"version." -msgstr "" -"Almanah is free software: you can redistribute it and/or modify it under the " -"terms of the GNU General Public Licence as published by the Free Software " -"Foundation, either version 3 of the Licence, or (at your option) any later " -"version." - -#: ../src/main-window.c:1182 -msgid "" -"Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " -"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " -"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " -"details." -msgstr "" -"Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " -"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " -"FOR A PARTICULAR PURPOSE. See the GNU General Public Licence for more " -"details." - -#: ../src/main-window.c:1186 -msgid "" -"You should have received a copy of the GNU General Public License along with " -"Almanah. If not, see ." -msgstr "" -"You should have received a copy of the GNU General Public Licence along with " -"Almanah. If not, see ." - -#: ../src/main-window.c:1201 +#. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place +#: ../src/main-window.c:1129 #, c-format -msgid "A helpful diary keeper, storing %u entries." -msgstr "A helpful diary keeper, storing %u entries." - -#: ../src/main-window.c:1205 -msgid "Copyright © 2008-2009 Philip Withnall" -msgstr "Copyright © 2008-2009 Philip Withnall" - -#. Translators: please include your names here to be credited for your hard work! -#. * Format: -#. * "Translator name 1 \n" -#. * "Translator name 2 " -#. -#: ../src/main-window.c:1213 -msgid "translator-credits" -msgstr "" -"Philip Withnall \n" -"Jen Ockwell \n" -"Chris Leonard " - -#: ../src/main-window.c:1217 -msgid "Almanah Website" -msgstr "Almanah Website" +msgid "%s @ %s" +msgstr "%s @ %s" -#: ../src/main-window.c:1464 +#: ../src/main-window.c:1235 msgid "Entry content could not be loaded" msgstr "Entry content could not be loaded" -#: ../src/main-window.c:1559 +#: ../src/main-window.c:1354 msgid "Spelling checker could not be initialized" msgstr "Spelling checker could not be initialised" -#: ../src/preferences-dialog.c:91 +#: ../src/preferences-dialog.c:83 msgid "Almanah Preferences" msgstr "Almanah Preferences" #. Grab our child widgets -#: ../src/preferences-dialog.c:217 +#: ../src/preferences-dialog.c:202 msgid "Encryption key: " msgstr "Encryption key: " -#: ../src/preferences-dialog.c:222 +#: ../src/preferences-dialog.c:207 msgid "None (don't encrypt)" msgstr "None (don't encrypt)" -#: ../src/preferences-dialog.c:246 +#: ../src/preferences-dialog.c:231 msgid "New _Key" msgstr "New _Key" #. Set up the "Enable spell checking" check button -#: ../src/preferences-dialog.c:253 +#: ../src/preferences-dialog.c:237 msgid "Enable _spell checking" msgstr "Enable _spell checking" -#: ../src/preferences-dialog.c:279 +#: ../src/preferences-dialog.c:262 msgid "Error saving the encryption key" msgstr "Error saving the encryption key" -#: ../src/preferences-dialog.c:298 +#: ../src/preferences-dialog.c:281 msgid "Error opening Seahorse" msgstr "Error opening Seahorse" @@ -544,133 +571,243 @@ msgid "Line spacing:" msgstr "Line spacing:" -#: ../src/search-dialog.c:223 +#: ../src/search-dialog.c:221 msgid "Search canceled." msgstr "Search cancelled." #. Translators: This is an error message wrapper for when searches encounter an error. The placeholder is for an error message. -#: ../src/search-dialog.c:226 +#: ../src/search-dialog.c:224 #, c-format msgid "Error: %s" msgstr "Error: %s" #. Success! -#: ../src/search-dialog.c:231 +#: ../src/search-dialog.c:229 #, c-format msgid "Found %d entry:" msgid_plural "Found %d entries:" msgstr[0] "Found %d entry:" msgstr[1] "Found %d entries:" -#: ../src/search-dialog.c:280 +#: ../src/search-dialog.c:278 msgid "Searching…" msgstr "Searching…" -#: ../src/storage-manager.c:259 +#: ../src/storage-manager.c:248 +#, c-format +msgid "" +"Could not open database \"%s\". SQLite provided the following error message: " +"%s" +msgstr "" +"Could not open database \"%s\". SQLite provided the following error message: " +"%s" + +#: ../src/storage-manager.c:291 +#, c-format +msgid "" +"Could not run query \"%s\". SQLite provided the following error message: %s" +msgstr "" +"Could not run query \"%s\". SQLite provided the following error message: %s" + +#: ../src/storage-manager.c:597 +msgid "Error deserializing entry into buffer while searching." +msgstr "Error deserialising entry into buffer while searching." + +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Enter URI" + +#: ../src/vfs.c:239 #, c-format msgid "GPGME is not at least version %s" msgstr "GPGME is not at least version %s" -#: ../src/storage-manager.c:268 +#: ../src/vfs.c:246 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "GPGME doesn't support OpenPGP: %s" -#: ../src/storage-manager.c:277 +#: ../src/vfs.c:253 #, c-format msgid "Error creating cipher context: %s" msgstr "Error creating cipher context: %s" -#: ../src/storage-manager.c:306 +#: ../src/vfs.c:273 +#, c-format +msgid "Can't create a new GIOChannel for the encrypted database: %s" +msgstr "Can’t create a new GIOChannel for the encrypted database: %s" + +#: ../src/vfs.c:281 #, c-format msgid "Error opening encrypted database file \"%s\": %s" msgstr "Error opening encrypted database file \"%s\": %s" -#: ../src/storage-manager.c:325 +#: ../src/vfs.c:297 #, c-format -msgid "Error opening plain database file \"%s\": %s" -msgstr "Error opening plain database file \"%s\": %s" - -#: ../src/storage-manager.c:373 -msgid "" -"The encrypted database is empty. The plain database file has been left " -"undeleted as backup." -msgstr "" -"The encrypted database is empty. The plain database file has been left " -"undeleted as backup." +msgid "Error creating Callback base data buffer: %s" +msgstr "Error creating Callback base data buffer: %s" -#. Delete the plain file -#: ../src/storage-manager.c:376 +#: ../src/vfs.c:305 #, c-format -msgid "Could not delete plain database file \"%s\"." -msgstr "Could not delete plain database file \"%s\"." +msgid "Can't create a new GIOChannel for the plain database: %s" +msgstr "Can't create a new GIOChannel for the plain database: %s" -#: ../src/storage-manager.c:417 +#: ../src/vfs.c:313 #, c-format -msgid "Error decrypting database: %s" -msgstr "Error decrypting database: %s" +msgid "Error opening plain database file \"%s\": %s" +msgstr "Error opening plain database file \"%s\": %s" -#: ../src/storage-manager.c:451 +#: ../src/vfs.c:409 #, c-format msgid "Error getting encryption key: %s" msgstr "Error getting encryption key: %s" -#: ../src/storage-manager.c:472 +#: ../src/vfs.c:433 ../src/vfs.c:439 #, c-format msgid "Error encrypting database: %s" msgstr "Error encrypting database: %s" -#: ../src/storage-manager.c:574 +#. Translators: The first and second params are file paths, the last param is an error message. +#: ../src/vfs.c:489 #, c-format -msgid "" -"Could not open database \"%s\". SQLite provided the following error message: " -"%s" -msgstr "" -"Could not open database \"%s\". SQLite provided the following error message: " -"%s" +msgid "Error copying the file from %s to %s: %s" +msgstr "Error copying the file from %s to %s: %s" -#: ../src/storage-manager.c:651 +#: ../src/vfs.c:495 #, c-format -msgid "" -"Could not run query \"%s\". SQLite provided the following error message: %s" -msgstr "" -"Could not run query \"%s\". SQLite provided the following error message: %s" +msgid "Error changing database backup file permissions: %s" +msgstr "Error changing database backup file permissions: %s" -#: ../src/storage-manager.c:954 -msgid "Error deserializing entry into buffer while searching." -msgstr "Error deserialising entry into buffer while searching." +#: ../src/vfs.c:595 +#, c-format +msgid "Error closing file: %s" +msgstr "Error closing file: %s" + +#. Translators: the first parameter is a filename, the second is an error message. +#. Translators: the first parameter is a filename. +#: ../src/vfs.c:994 ../src/vfs.c:1021 +#, c-format +msgid "Error backing up file ‘%s’" +msgstr "Error backing up file ‘%s’" + +#: ../src/vfs.c:1007 +#, c-format +msgid "Error decrypting database: %s" +msgstr "Error decrypting database: %s" + +#: ../src/vfs.c:1047 +#, c-format +msgid "Error changing database file permissions: %s" +msgstr "Error changing database file permissions: %s" + +#: ../src/widgets/calendar-button.c:142 +#, c-format +msgid "UI data could not be loaded: %s" +msgstr "UI data could not be loaded: %s" + +#: ../src/widgets/calendar-button.c:152 +msgid "Can't load calendar window object from UI file" +msgstr "Can't load calendar window object from UI file" #. Translators: This is the detail string for important days as displayed in the calendar. #: ../src/widgets/calendar.c:176 msgid "Important!" msgstr "Important!" -#: ../src/widgets/calendar-button.c:135 -#, c-format -msgid "UI file \"%s\" could not be loaded: %s" -msgstr "UI file \"%s\" could not be loaded: %s" +#: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:166 +msgid "add tag" +msgstr "add tag" -#: ../src/widgets/calendar-button.c:145 -msgid "Can't load calendar window object from UI file" -msgstr "Can't load calendar window object from UI file" +#: ../src/widgets/entry-tags-area.c:101 +msgid "Write the tag and press enter to save it" +msgstr "Write the tag and press enter to save it" -#. Error loading the CSS -#: ../src/widgets/calendar-window.c:63 -#, c-format -msgid "" -"Couldn't load the CSS file '%s' for calendar window. The interface might not " -"be styled correctly" -msgstr "" -"Couldn't load the CSS file '%s' for calendar window. The interface might not " -"be styled correctly" +#: ../src/widgets/tag-accessible.c:165 +msgid "Remove the tag from the entry" +msgstr "Remove the tag from the entry" -#: ../src/widgets/calendar-window.c:100 -msgid "Unknown input device" -msgstr "Unknown input device" +#. Looks like gtk_widget_set_tooltip_text don't works here, even in the init... ? +#: ../src/widgets/tag.c:416 +msgid "Remove tag" +msgstr "Remove tag" -#: ../src/uri-entry-dialog.c:71 -msgid "Enter URI" -msgstr "Enter URI" +#: ../src/widgets/tag-entry.c:85 +msgid "Tag entry" +msgstr "Tag entry" + +#~ msgid "F_ormat" +#~ msgstr "F_ormat" + +#~ msgid "Toggle whether the currently selected text is bold." +#~ msgstr "Toggle whether the currently selected text is bold." + +#~ msgid "Toggle whether the currently selected text is italic." +#~ msgstr "Toggle whether the currently selected text is italic." + +#~ msgid "Toggle whether the currently selected text is underlined." +#~ msgstr "Toggle whether the currently selected text is underlined." + +#~ msgid "" +#~ "Add or remove a hyperlink from the currently selected text to a specified " +#~ "URI." +#~ msgstr "" +#~ "Add or remove a hyperlink from the currently selected text to a specified " +#~ "URI." + +#~ msgid "I_mportant" +#~ msgstr "I_mportant" + +#~ msgid "Toggle whether the current entry is marked as important." +#~ msgstr "Toggle whether the current entry is marked as important." + +#~ msgid "Show tags" +#~ msgstr "Show tags" + +#~ msgid "Show tags for the current entry" +#~ msgstr "Show tags for the current entry" + +#~ msgid "_Help" +#~ msgstr "_Help" + +#~ msgid "Jump to the current date in the diary." +#~ msgstr "Jump to the current date in the diary." + +#~ msgid "Unknown input device" +#~ msgstr "Unknown input device" + +#~ msgid "_File" +#~ msgstr "_File" + +#~ msgid "_Import…" +#~ msgstr "_Import…" + +#~ msgid "_Export…" +#~ msgstr "_Export…" + +#~ msgid "_Print…" +#~ msgstr "_Print…" + +#~ msgid "_Search…" +#~ msgstr "_Search…" + +#~ msgid "Font Style" +#~ msgstr "Font Style" + +#~ msgid "Change font style for selected text." +#~ msgstr "Change font style for selected text." + +#~ msgid "_Font Style" +#~ msgstr "_Font Style" + +#~ msgid "" +#~ "The encrypted database is empty. The plain database file has been left " +#~ "undeleted as backup." +#~ msgstr "" +#~ "The encrypted database is empty. The plain database file has been left " +#~ "undeleted as backup." + +#~ msgid "Could not delete plain database file \"%s\"." +#~ msgstr "Could not delete plain database file \"%s\"." #~ msgid "Add a definition for the currently selected text." #~ msgstr "Add a definition for the currently selected text." @@ -741,9 +878,6 @@ #~ msgid "An attached file." #~ msgstr "An attached file." -#~ msgid "Error opening file" -#~ msgstr "Error opening file" - #~ msgid "Select File" #~ msgstr "Select File" diff -Nru almanah-0.11.1/po/eo.po almanah-0.12.0/po/eo.po --- almanah-0.11.1/po/eo.po 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/eo.po 2019-10-07 13:45:09.000000000 +0000 @@ -1,245 +1,246 @@ # Esperanto translation for almanah. # Copyright (C) 2011 Free Software Foundation, Inc. # This file is distributed under the same license as the almanah package. -# Kristjan SCHMIDT , 2011. -# +# Kristjan SCHMIDT , 2011, 2017. msgid "" msgstr "" "Project-Id-Version: almanah master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=almanah&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-11-02 18:49+0000\n" -"PO-Revision-Date: 2011-11-05 09:11+0100\n" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=almana" +"h&keywords=I18N+L10N&component=General\n" +"POT-Creation-Date: 2017-02-27 16:29+0000\n" +"PO-Revision-Date: 2017-06-10 17:56+0200\n" "Last-Translator: Kristjan SCHMIDT \n" -"Language-Team: Esperanto \n" +"Language-Team: Esperanto \n" +"Language: eo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bits\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Virtaal 0.7.1\n" +"X-Project-Style: gnome\n" -#: ../data/almanah.desktop.in.h:1 ../src/application.c:103 -#: ../src/main-window.c:140 +#: ../data/almanah.appdata.xml.in.h:1 ../data/almanah.desktop.in.h:1 +#: ../src/application.c:135 ../src/main-window.c:163 msgid "Almanah Diary" msgstr "" -#: ../data/almanah.desktop.in.h:2 -msgid "Diary" -msgstr "Taglibro" - -#: ../data/almanah.desktop.in.h:3 -msgid "Keep a personal diary" +#: ../data/almanah.appdata.xml.in.h:2 +msgid "Keep a diary of your life" msgstr "" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 -msgid "Database encryption key ID" -msgstr "" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 -msgid "Spell checking enabled?" -msgstr "Ĉu literumkontrolo estas enŝaltite?" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 -msgid "Spell checking language" -msgstr "Lingvo de la literumkontrolo" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +#: ../data/almanah.appdata.xml.in.h:3 msgid "" -"The ID of the key to use to encrypt and decrypt the database, if Almanah has " -"been built with encryption support. Leave blank to disable database " -"encryption." +"Almanah Diary is an application to allow you to keep a diary of your life." msgstr "" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 -msgid "The locale specifier of the language in which to check entry spellings." +#: ../data/almanah.appdata.xml.in.h:4 +msgid "" +"You can encrypt the diary to preserve your privacy. It has editing " +"abilities, including text formatting and printing and shows you a lists of " +"events which happened (on your computer) for each day (such as tasks and " +"appointments from Evolution)." msgstr "" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 -msgid "Whether spell checking of entries is enabled." +#: ../data/almanah.desktop.in.h:2 +msgid "Keep a personal diary" msgstr "" -#: ../data/almanah.ui.h:1 -msgid "" -"Add or remove a hyperlink from the currently selected text to a specified " -"URI." -msgstr "" +#. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. +#: ../data/almanah.desktop.in.h:3 ../src/application.c:274 +msgid "Diary" +msgstr "Taglibro" -#: ../data/almanah.ui.h:2 -msgid "Add/Remove _Hyperlink" +#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../data/almanah.desktop.in.h:5 +msgid "diary;journal;" msgstr "" -#: ../data/almanah.ui.h:3 +#: ../src/ui/almanah.ui.h:1 msgid "Calendar" msgstr "Kalendaro" -#: ../data/almanah.ui.h:4 -msgid "Change font style for selected text" -msgstr "" - -#: ../data/almanah.ui.h:5 -msgid "Entry editing area" -msgstr "" - -#: ../data/almanah.ui.h:6 -msgid "F_ormat" -msgstr "F_ormo" - -#: ../data/almanah.ui.h:7 -msgid "Failed Entries" -msgstr "" +#: ../src/ui/almanah.ui.h:2 +#| msgid "Go to _Today" +msgid "Go to Today" +msgstr "Iri al hodiaŭ" -#: ../data/almanah.ui.h:8 -msgid "Font Style" -msgstr "Tiparstilo" - -#: ../data/almanah.ui.h:9 -msgid "Go to _Today" -msgstr "Iri al _hodiaŭ" - -#: ../data/almanah.ui.h:10 -msgid "I_mportant" -msgstr "_Grave" - -#: ../data/almanah.ui.h:11 -msgid "Import Results List" -msgstr "" - -#: ../data/almanah.ui.h:12 -msgid "Insert _Time" -msgstr "Enmeti _horon" +#: ../src/ui/almanah.ui.h:3 +msgid "Select Date…" +msgstr "Elekti daton…" -#: ../data/almanah.ui.h:13 -msgid "Jump to the current date in the diary." +#: ../src/ui/almanah.ui.h:4 +msgid "Entry editing area" msgstr "" -#: ../data/almanah.ui.h:14 -msgid "Merged Entries" +#: ../src/ui/almanah.ui.h:5 +msgid "Past events" msgstr "" -#: ../data/almanah.ui.h:15 +#: ../src/ui/almanah.ui.h:6 msgid "Past Event List" msgstr "" -#: ../data/almanah.ui.h:16 -msgid "Past Events" +#: ../src/ui/almanah.ui.h:7 +msgid "Search entry" msgstr "" -#: ../data/almanah.ui.h:17 -msgid "Pr_eferences" -msgstr "_Agordoj" +#: ../src/ui/almanah.ui.h:8 ../src/search-dialog.c:69 +msgid "Search" +msgstr "Serĉi" -#: ../data/almanah.ui.h:18 +#: ../src/ui/almanah.ui.h:9 msgid "Result List" msgstr "" -#: ../data/almanah.ui.h:19 ../src/search-dialog.c:69 -msgid "Search" -msgstr "Serĉi" +#: ../src/ui/almanah.ui.h:10 +msgid "View Entry" +msgstr "" -#: ../data/almanah.ui.h:20 -msgid "Search entry" +#. Translators: Use two common date formats from your locale which will be parsed correctly by GLib +#: ../src/ui/almanah.ui.h:12 +msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." msgstr "" -#: ../data/almanah.ui.h:21 -msgid "Select Date…" -msgstr "Elekti daton..." +#. Translators: Use two popular URIs from your locale, preferably one on the Internet and one local file. +#: ../src/ui/almanah.ui.h:14 +msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." +msgstr "" -#: ../data/almanah.ui.h:22 +#: ../src/ui/almanah.ui.h:15 msgid "Successful Entries" msgstr "" -#: ../data/almanah.ui.h:23 -msgid "Toggle whether the current entry is marked as important." +#: ../src/ui/almanah.ui.h:16 +msgid "Merged Entries" msgstr "" -#: ../data/almanah.ui.h:24 -msgid "Toggle whether the currently selected text is bold." +#: ../src/ui/almanah.ui.h:17 +msgid "Failed Entries" msgstr "" -#: ../data/almanah.ui.h:25 -msgid "Toggle whether the currently selected text is italic." +#: ../src/ui/almanah.ui.h:18 +msgid "Import Results List" msgstr "" -#: ../data/almanah.ui.h:26 -msgid "Toggle whether the currently selected text is underlined." +#: ../data/org.gnome.almanah.gschema.xml.in.h:1 +msgid "Database encryption key ID" msgstr "" -#: ../data/almanah.ui.h:27 -msgid "View Entry" +#: ../data/org.gnome.almanah.gschema.xml.in.h:2 +msgid "" +"The ID of the key to use to encrypt and decrypt the database, if Almanah has " +"been built with encryption support. Leave blank to disable database " +"encryption." msgstr "" -#: ../data/almanah.ui.h:28 -msgid "_Edit" -msgstr "R_edakti" - -#: ../data/almanah.ui.h:29 -msgid "_Export…" -msgstr "E_lporti..." - -#: ../data/almanah.ui.h:30 -msgid "_File" -msgstr "_Doserio" - -#: ../data/almanah.ui.h:31 -msgid "_Font Style" -msgstr "_Tiparstilo" - -#: ../data/almanah.ui.h:32 -msgid "_Help" -msgstr "_Helpo" - -#: ../data/almanah.ui.h:33 -msgid "_Import…" -msgstr "E_nporti..." - -#: ../data/almanah.ui.h:34 -msgid "_Print…" -msgstr "_Presi…" - -#: ../data/almanah.ui.h:35 -msgid "_Search…" -msgstr "_Serĉi…" +#: ../data/org.gnome.almanah.gschema.xml.in.h:3 +msgid "Spell checking language" +msgstr "Lingvo de la literumkontrolo" -#: ../data/almanah.ui.h:36 -msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." +#: ../data/org.gnome.almanah.gschema.xml.in.h:4 +msgid "The locale specifier of the language in which to check entry spellings." msgstr "" -#: ../data/almanah.ui.h:37 -msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." +#: ../data/org.gnome.almanah.gschema.xml.in.h:5 +msgid "Spell checking enabled?" +msgstr "Ĉu literumkontrolo estas enŝaltite?" + +#: ../data/org.gnome.almanah.gschema.xml.in.h:6 +msgid "Whether spell checking of entries is enabled." msgstr "" -#: ../src/application.c:204 +#: ../src/application.c:257 msgid "Error opening database" msgstr "" -#: ../src/application.c:252 +#: ../src/application.c:336 msgid "Enable debug mode" msgstr "" -#: ../src/application.c:269 +#: ../src/application.c:353 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" #. Print an error -#: ../src/application.c:280 +#: ../src/application.c:364 #, c-format msgid "Command line options could not be parsed: %s\n" msgstr "" -#: ../src/application.c:299 +#: ../src/application.c:383 msgid "Error encrypting database" msgstr "" +#: ../src/application.c:526 +msgid "" +"Almanah is free software: you can redistribute it and/or modify it under the " +"terms of the GNU General Public License as published by the Free Software " +"Foundation, either version 3 of the License, or (at your option) any later " +"version." +msgstr "" +"Almanah estas libera programaro: vi povas distribui kaj/aŭ modifi ĝin sub la " +"kondiĉoj de la Ĝenerala Publika Permesilo de GNU eldonite de la 'Free " +"Software Foundation'; aŭ en la 3a versio de la permesilo aŭ (laŭ via volo) " +"en iu sekva versio." + +#: ../src/application.c:530 +msgid "" +"Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " +"details." +msgstr "" +"Almanah estas distribuite kun la espero ke ĝi estos utila, sed SEN IA AJN " +"GARANTIO; eĉ sen la implica garantio de NEGOCEBLO aŭ ADAPTADO AL IU APARTA " +"CELO. Vidu la Ĝeneralan Publikan Permesilon de GNU por pli da detaloj." + +#: ../src/application.c:534 +msgid "" +"You should have received a copy of the GNU General Public License along with " +"Almanah. If not, see ." +msgstr "" +"Vi devintus ricevi kopion de la Ĝenerala Publika Permesilo de GNU kune kun " +"Almanah. Se ne, iru al ." + +#: ../src/application.c:549 +#, c-format +msgid "A helpful diary keeper, storing %u entries." +msgstr "" + +#: ../src/application.c:553 +msgid "Copyright © 2008-2009 Philip Withnall" +msgstr "Kopirajto © 2008-2009 Philip WITHNALL" + +#. Translators: please include your names here to be credited for your hard work! +#. * Format: +#. * "Translator name 1 \n" +#. * "Translator name 2 " +#. +#: ../src/application.c:561 +msgid "translator-credits" +msgstr "Kristjan SCHMIDT" + +#: ../src/application.c:565 +msgid "Almanah Website" +msgstr "Retpaĝaro de Almanah" + +#: ../src/application.c:593 +#, c-format +msgid "" +"Couldn't load the CSS resources. The interface might not be styled " +"correctly: %s" +msgstr "" + #: ../src/date-entry-dialog.c:72 msgid "Select Date" msgstr "Elekti daton" -#: ../src/date-entry-dialog.c:128 ../src/import-export-dialog.c:167 -#: ../src/import-export-dialog.c:470 ../src/main-window.c:203 -#: ../src/preferences-dialog.c:190 ../src/search-dialog.c:96 -#: ../src/uri-entry-dialog.c:127 -#, c-format -msgid "UI file \"%s\" could not be loaded" +#: ../src/date-entry-dialog.c:127 ../src/import-export-dialog.c:169 +#: ../src/import-export-dialog.c:476 ../src/main-window.c:235 +#: ../src/preferences-dialog.c:177 ../src/search-dialog.c:95 +#: ../src/uri-entry-dialog.c:126 +msgid "UI data could not be loaded" msgstr "" #: ../src/entry.c:303 @@ -247,90 +248,178 @@ msgid "Invalid data version number %u." msgstr "" -#: ../src/events/calendar-appointment.c:49 +#: ../src/events/calendar-appointment.c:51 msgid "Calendar Appointment" msgstr "" -#: ../src/events/calendar-appointment.c:50 +#: ../src/events/calendar-appointment.c:52 msgid "An appointment on an Evolution calendar." msgstr "" -#: ../src/events/calendar-appointment.c:119 ../src/events/calendar-task.c:108 +#. Translators: This is a time string with the format hh:mm +#: ../src/events/calendar-appointment.c:89 ../src/events/calendar-task.c:90 +#, c-format +msgid "%.2d:%.2d" +msgstr "%.2d:%.2d" + +#: ../src/events/calendar-appointment.c:135 ../src/events/calendar-task.c:125 msgid "Error launching Evolution" msgstr "" -#: ../src/events/calendar-task.c:49 +#: ../src/events/calendar-task.c:51 msgid "Calendar Task" msgstr "" -#: ../src/events/calendar-task.c:50 +#: ../src/events/calendar-task.c:52 msgid "A task on an Evolution calendar." msgstr "" -#: ../src/export-operation.c:45 ../src/import-operation.c:45 +#: ../src/export-operation.c:47 ../src/import-operation.c:45 msgid "Text Files" msgstr "Tekstdosieroj" -#: ../src/export-operation.c:46 +#: ../src/export-operation.c:48 msgid "" "Select a _folder to export the entries to as text files, one per entry, with " "names in the format 'yyyy-mm-dd', and no extension. All entries will be " "exported, unencrypted in plain text format." msgstr "" -#: ../src/export-operation.c:50 ../src/import-operation.c:50 +#: ../src/export-operation.c:52 ../src/import-operation.c:50 msgid "Database" msgstr "Datumbazo" -#: ../src/export-operation.c:51 +#: ../src/export-operation.c:53 msgid "" "Select a _filename for a complete copy of the unencrypted Almanah Diary " "database to be given." msgstr "" -#: ../src/import-export-dialog.c:201 +#: ../src/export-operation.c:256 ../src/export-operation.c:313 +#, c-format +msgid "Error changing exported file permissions: %s" +msgstr "" + +#: ../src/gtk/menus.ui.h:1 +#| msgid "Search" +msgid "_Search" +msgstr "_Serĉi" + +#: ../src/gtk/menus.ui.h:2 +msgid "Pr_eferences" +msgstr "_Agordoj" + +#: ../src/gtk/menus.ui.h:3 +#, fuzzy +#| msgid "_Import" +msgctxt "Main menu" +msgid "_Import" +msgstr "E_nporti" + +#: ../src/gtk/menus.ui.h:4 +#, fuzzy +#| msgid "_Export" +msgctxt "Main menu" +msgid "_Export" +msgstr "E_lporti" + +#: ../src/gtk/menus.ui.h:5 +msgid "_Print diary" +msgstr "" + +#: ../src/gtk/menus.ui.h:6 +msgid "_About Almanah Diary" +msgstr "" + +#: ../src/gtk/menus.ui.h:7 +msgid "_Quit" +msgstr "Ĉ_esi" + +#: ../src/gtk/menus.ui.h:8 +msgid "_Bold" +msgstr "" + +#: ../src/gtk/menus.ui.h:9 +msgid "_Italic" +msgstr "" + +#: ../src/gtk/menus.ui.h:10 +msgid "_Underline" +msgstr "_Substreki" + +#: ../src/gtk/menus.ui.h:11 +msgid "_Cut" +msgstr "" + +#: ../src/gtk/menus.ui.h:12 +msgid "_Copy" +msgstr "_Kopii" + +#: ../src/gtk/menus.ui.h:13 +msgid "_Paste" +msgstr "_Alglui" + +#: ../src/gtk/menus.ui.h:14 ../src/main-window.c:640 +msgid "_Delete" +msgstr "_Forigi" + +#: ../src/gtk/menus.ui.h:15 +msgid "Insert _Time" +msgstr "Enmeti _horon" + +#: ../src/gtk/menus.ui.h:16 +msgid "Add/Remove _Hyperlink" +msgstr "" + +#: ../src/import-export-dialog.c:203 msgid "Import _mode: " -msgstr "Enport_reĝimo:" +msgstr "Enport_reĝimo: " -#: ../src/import-export-dialog.c:201 +#: ../src/import-export-dialog.c:203 msgid "Export _mode: " -msgstr "Elport_reĝimo:" +msgstr "Elport_reĝimo: " #. Set the window title -#: ../src/import-export-dialog.c:204 +#: ../src/import-export-dialog.c:206 msgid "Import Entries" msgstr "" -#: ../src/import-export-dialog.c:204 +#: ../src/import-export-dialog.c:206 msgid "Export Entries" msgstr "" -#. Set the button label -#: ../src/import-export-dialog.c:207 +#. Translators: These are verbs. +#: ../src/import-export-dialog.c:211 +#, fuzzy +#| msgid "_Import" +msgctxt "Dialog button" msgid "_Import" msgstr "E_nporti" -#: ../src/import-export-dialog.c:207 +#: ../src/import-export-dialog.c:211 +#, fuzzy +#| msgid "_Export" +msgctxt "Dialog button" msgid "_Export" msgstr "E_lporti" -#: ../src/import-export-dialog.c:244 +#: ../src/import-export-dialog.c:248 msgid "Import failed" msgstr "Enporto malsukcesis" -#: ../src/import-export-dialog.c:282 +#: ../src/import-export-dialog.c:286 msgid "Export failed" msgstr "Elporto malsukcesis" -#: ../src/import-export-dialog.c:295 +#: ../src/import-export-dialog.c:299 msgid "Export successful" msgstr "Elporto sukcesis" -#: ../src/import-export-dialog.c:296 +#: ../src/import-export-dialog.c:300 msgid "The diary was successfully exported." msgstr "" -#: ../src/import-export-dialog.c:444 +#: ../src/import-export-dialog.c:448 msgid "Import Results" msgstr "" @@ -340,9 +429,9 @@ #. Translators: This is a strftime()-format string for the date displayed at the top of the main window. #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. -#: ../src/import-export-dialog.c:537 ../src/main-window.c:575 -#: ../src/main-window.c:600 ../src/main-window.c:1380 ../src/printing.c:263 -#: ../src/search-dialog.c:181 +#: ../src/import-export-dialog.c:543 ../src/main-window.c:601 +#: ../src/main-window.c:632 ../src/main-window.c:1271 ../src/printing.c:263 +#: ../src/search-dialog.c:180 msgid "%A, %e %B %Y" msgstr "" @@ -381,114 +470,85 @@ "\n" msgstr "" -#: ../src/main-window.c:579 +#: ../src/main-window.c:605 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" msgstr "" -#: ../src/main-window.c:604 +#: ../src/main-window.c:608 ../src/main-window.c:639 +msgid "_Cancel" +msgstr "_Nuligi" + +#: ../src/main-window.c:609 +msgid "_Edit" +msgstr "R_edakti" + +#: ../src/main-window.c:636 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" msgstr "" #. Print a warning about the unknown tag -#: ../src/main-window.c:706 +#: ../src/main-window.c:746 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." msgstr "" -#: ../src/main-window.c:1022 +#: ../src/main-window.c:987 msgid "Error opening URI" msgstr "" -#: ../src/main-window.c:1138 -msgid "" -"Almanah is free software: you can redistribute it and/or modify it under the " -"terms of the GNU General Public License as published by the Free Software " -"Foundation, either version 3 of the License, or (at your option) any later " -"version." -msgstr "" -"Almanah estas libera programaro; vi povas distribui kaj/aŭ modifi ĝin sub la " -"kondiĉoj de la Ĝenerala Publika Permesilo de GNU eldonite de la 'Free " -"Software Foundation'; aŭ en la 2a versio de la permesilo aŭ (laŭ via volo) " -"en iu sekva versio." +#. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place +#: ../src/main-window.c:1198 +#, c-format +msgid "%s @ %s" +msgstr "%s @ %s" -#: ../src/main-window.c:1142 -msgid "" -"Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " -"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " -"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " -"details." +#: ../src/main-window.c:1304 +msgid "Entry content could not be loaded" msgstr "" -"Almanah estas distribuite kun la espero ke ĝi estos utila, sed SEN IA AJN " -"GARANTIO; eĉ sen la implica garantio de NEGOCEBLO aŭ ADAPTADO AL IU APARTA " -"CELO. Vidu la Ĝeneralan Publikan Permesilon de GNU por pli da detaloj." -#: ../src/main-window.c:1146 +#. Translators: this sentence is just used in startup to estimate the width +#. of a 15 words sentence. Translate with some random sentences with just 15 words. +#. See: https://bugzilla.gnome.org/show_bug.cgi?id=754841 +#: ../src/main-window.c:1459 msgid "" -"You should have received a copy of the GNU General Public License along with " -"Almanah. If not, see ." -msgstr "" -"Vi devintus ricevi kopion de la Ĝenerala Publika Permesilo de GNU kune kun " -"Almanah. Se ne, iru al ." - -#: ../src/main-window.c:1161 -#, c-format -msgid "A helpful diary keeper, storing %u entries." -msgstr "" - -#: ../src/main-window.c:1165 -msgid "Copyright © 2008-2009 Philip Withnall" -msgstr "Kopirajto © 2008-2009 Philip WITHNALL" - -#. Translators: please include your names here to be credited for your hard work! -#. * Format: -#. * "Translator name 1 \n" -#. * "Translator name 2 " -#. -#: ../src/main-window.c:1173 -msgid "translator-credits" -msgstr "Kristjan SCHMIDT, 2011." - -#: ../src/main-window.c:1177 -msgid "Almanah Website" -msgstr "Retpaĝaro de Almanah" - -#: ../src/main-window.c:1407 -msgid "Entry content could not be loaded" +"This is just a fifteen words sentence to calculate the diary entry text view " +"size" msgstr "" -#: ../src/main-window.c:1473 +#: ../src/main-window.c:1496 msgid "Spelling checker could not be initialized" msgstr "" -#: ../src/preferences-dialog.c:91 -msgid "Almanah Preferences" -msgstr "Aagordoj de Almanah" +#: ../src/preferences-dialog.c:83 +#| msgid "Pr_eferences" +msgid "Preferences" +msgstr "Agordoj" #. Grab our child widgets -#: ../src/preferences-dialog.c:216 +#: ../src/preferences-dialog.c:204 msgid "Encryption key: " msgstr "" -#: ../src/preferences-dialog.c:221 +#: ../src/preferences-dialog.c:208 msgid "None (don't encrypt)" msgstr "" -#: ../src/preferences-dialog.c:245 +#: ../src/preferences-dialog.c:213 msgid "New _Key" msgstr "Nova ŝ_losilo" #. Set up the "Enable spell checking" check button -#: ../src/preferences-dialog.c:252 +#: ../src/preferences-dialog.c:237 msgid "Enable _spell checking" msgstr "Enŝalti _literumkontrolon" -#: ../src/preferences-dialog.c:278 +#: ../src/preferences-dialog.c:262 msgid "Error saving the encryption key" msgstr "" -#: ../src/preferences-dialog.c:297 +#: ../src/preferences-dialog.c:281 msgid "Error opening Seahorse" msgstr "" @@ -500,108 +560,151 @@ msgid "No entry for this date." msgstr "" -#: ../src/printing.c:453 +#: ../src/printing.c:457 msgid "Start date:" msgstr "Komencdato:" -#: ../src/printing.c:455 +#: ../src/printing.c:459 msgid "End date:" msgstr "Findato:" #. Line spacing -#: ../src/printing.c:471 +#: ../src/printing.c:475 msgid "Line spacing:" msgstr "" -#: ../src/search-dialog.c:222 +#: ../src/search-dialog.c:221 msgid "Search canceled." msgstr "" #. Translators: This is an error message wrapper for when searches encounter an error. The placeholder is for an error message. -#: ../src/search-dialog.c:225 +#: ../src/search-dialog.c:224 #, c-format msgid "Error: %s" msgstr "Eraro: %s" #. Success! -#: ../src/search-dialog.c:230 +#: ../src/search-dialog.c:229 #, c-format msgid "Found %d entry:" msgid_plural "Found %d entries:" msgstr[0] "" msgstr[1] "" -#: ../src/search-dialog.c:279 +#: ../src/search-dialog.c:278 msgid "Searching…" -msgstr "Serĉante..." +msgstr "Serĉante…" -#: ../src/storage-manager.c:259 +#: ../src/storage-manager.c:247 +#, c-format +msgid "" +"Could not open database \"%s\". SQLite provided the following error message: " +"%s" +msgstr "" + +#: ../src/storage-manager.c:290 +#, c-format +msgid "" +"Could not run query \"%s\". SQLite provided the following error message: %s" +msgstr "" + +#: ../src/storage-manager.c:596 +msgid "Error deserializing entry into buffer while searching." +msgstr "" + +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "" + +#: ../src/vfs.c:291 #, c-format msgid "GPGME is not at least version %s" msgstr "" -#: ../src/storage-manager.c:268 +#: ../src/vfs.c:298 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "" -#: ../src/storage-manager.c:277 +#: ../src/vfs.c:305 #, c-format msgid "Error creating cipher context: %s" msgstr "" -#: ../src/storage-manager.c:306 +#: ../src/vfs.c:325 #, c-format -msgid "Error opening encrypted database file \"%s\": %s" +msgid "Can't create a new GIOChannel for the encrypted database: %s" msgstr "" -#: ../src/storage-manager.c:325 +#: ../src/vfs.c:333 #, c-format -msgid "Error opening plain database file \"%s\": %s" +msgid "Error opening encrypted database file \"%s\": %s" msgstr "" -#: ../src/storage-manager.c:373 -msgid "" -"The encrypted database is empty. The plain database file has been left " -"undeleted as backup." +#: ../src/vfs.c:349 +#, c-format +msgid "Error creating Callback base data buffer: %s" msgstr "" -#. Delete the plain file -#: ../src/storage-manager.c:376 +#: ../src/vfs.c:357 #, c-format -msgid "Could not delete plain database file \"%s\"." +msgid "Can't create a new GIOChannel for the plain database: %s" msgstr "" -#: ../src/storage-manager.c:417 +#: ../src/vfs.c:365 #, c-format -msgid "Error decrypting database: %s" +msgid "Error opening plain database file \"%s\": %s" msgstr "" -#: ../src/storage-manager.c:451 +#: ../src/vfs.c:461 #, c-format msgid "Error getting encryption key: %s" msgstr "" -#: ../src/storage-manager.c:472 +#: ../src/vfs.c:485 ../src/vfs.c:491 #, c-format msgid "Error encrypting database: %s" msgstr "" -#: ../src/storage-manager.c:574 +#. Translators: The first and second params are file paths, the last param is an error message. +#: ../src/vfs.c:541 #, c-format -msgid "" -"Could not open database \"%s\". SQLite provided the following error message: " -"%s" +msgid "Error copying the file from %s to %s: %s" msgstr "" -#: ../src/storage-manager.c:651 +#: ../src/vfs.c:547 #, c-format -msgid "" -"Could not run query \"%s\". SQLite provided the following error message: %s" +msgid "Error changing database backup file permissions: %s" msgstr "" -#: ../src/storage-manager.c:954 -msgid "Error deserializing entry into buffer while searching." +#: ../src/vfs.c:647 +#, c-format +msgid "Error closing file: %s" +msgstr "" + +#. Translators: the first parameter is a filename. +#: ../src/vfs.c:1046 ../src/vfs.c:1073 +#, c-format +msgid "Error backing up file ‘%s’" +msgstr "" + +#: ../src/vfs.c:1059 +#, c-format +msgid "Error decrypting database: %s" +msgstr "" + +#: ../src/vfs.c:1099 +#, c-format +msgid "Error changing database file permissions: %s" +msgstr "" + +#: ../src/widgets/calendar-button.c:142 +#, c-format +msgid "UI data could not be loaded: %s" +msgstr "" + +#: ../src/widgets/calendar-button.c:152 +msgid "Can't load calendar window object from UI file" msgstr "" #. Translators: This is the detail string for important days as displayed in the calendar. @@ -609,6 +712,56 @@ msgid "Important!" msgstr "Grave!" -#: ../src/uri-entry-dialog.c:71 -msgid "Enter URI" +#: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:166 +msgid "add tag" +msgstr "" + +#: ../src/widgets/entry-tags-area.c:101 +msgid "Write the tag and press enter to save it" msgstr "" + +#: ../src/widgets/tag-accessible.c:165 +msgid "Remove the tag from the entry" +msgstr "" + +#. Looks like gtk_widget_set_tooltip_text don't works here, even in the init... ? +#: ../src/widgets/tag.c:416 +msgid "Remove tag" +msgstr "" + +#: ../src/widgets/tag-entry.c:85 +msgid "Tag entry" +msgstr "" + +#~ msgid "F_ormat" +#~ msgstr "F_ormo" + +#~ msgid "Font Style" +#~ msgstr "Tiparstilo" + +#~ msgid "I_mportant" +#~ msgstr "_Grave" + +#~ msgid "_Export…" +#~ msgstr "E_lporti…" + +#~ msgid "_File" +#~ msgstr "_Dosiero" + +#~ msgid "_Font Style" +#~ msgstr "_Tiparstilo" + +#~ msgid "_Help" +#~ msgstr "_Helpo" + +#~ msgid "_Import…" +#~ msgstr "E_nporti…" + +#~ msgid "_Print…" +#~ msgstr "_Presi…" + +#~ msgid "_Search…" +#~ msgstr "_Serĉi…" + +#~ msgid "Almanah Preferences" +#~ msgstr "Aagordoj de Almanah" diff -Nru almanah-0.11.1/po/es.po almanah-0.12.0/po/es.po --- almanah-0.11.1/po/es.po 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/es.po 2019-10-07 13:45:09.000000000 +0000 @@ -1,35 +1,45 @@ # translation of diary.HEAD.po to Español # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Carlos Albornoz , 2009. # Jorge González , 2008, 2009, 2010. -# Daniel Mustieles , 2011, 2012, 2013. +# +# Daniel Mustieles , 2011, 2012, 2013, 2015, 2015. # msgid "" msgstr "" "Project-Id-Version: diary.HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=almanah&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-11-17 17:58+0000\n" -"PO-Revision-Date: 2013-11-20 13:30+0100\n" +"POT-Creation-Date: 2016-07-14 15:50+0000\n" +"PO-Revision-Date: 2015-12-01 13:17+0100\n" "Last-Translator: Daniel Mustieles \n" -"Language-Team: Español \n" -"Language: \n" +"Language-Team: Español; Castellano \n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Gtranslator 2.91.5\n" -"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"X-Generator: Gtranslator 2.91.6\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/almanah.appdata.xml.in.h:1 ../data/almanah.desktop.in.h:1 +#: ../src/application.c:133 ../src/main-window.c:156 +msgid "Almanah Diary" +msgstr "Diario Almanah" + +#: ../data/almanah.appdata.xml.in.h:2 +msgid "Keep a diary of your life" +msgstr "Mantiene un diario de su vida" -#: ../data/almanah.appdata.xml.in.h:1 +#: ../data/almanah.appdata.xml.in.h:3 msgid "" "Almanah Diary is an application to allow you to keep a diary of your life." msgstr "" "Diario Almanah es una aplicación que le permite mantener un diario de su " "vida." -#: ../data/almanah.appdata.xml.in.h:2 +#: ../data/almanah.appdata.xml.in.h:4 msgid "" "You can encrypt the diary to preserve your privacy. It has editing " "abilities, including text formatting and printing and shows you a lists of " @@ -41,46 +51,12 @@ "eventos que han ocurrido (en su equipo) para cada día (igual que las tareas " "y las citas de Evolution)." -#: ../data/almanah-app-menu.ui.h:1 -msgid "_Search" -msgstr "_Buscar" - -#: ../data/almanah-app-menu.ui.h:2 -msgid "Pr_eferences" -msgstr "Prefere_ncias" - -#. Set the button label -#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 -msgid "_Import" -msgstr "_Importar" - -#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 -msgid "_Export" -msgstr "_Exportar" - -#: ../data/almanah-app-menu.ui.h:5 -msgid "_Print diary" -msgstr "_imprimir diario" - -#: ../data/almanah-app-menu.ui.h:6 -msgid "_About Almanah Diary" -msgstr "A_cerca del Diario Almanah" - -#: ../data/almanah-app-menu.ui.h:7 -msgid "_Quit" -msgstr "_Salir" - -#: ../data/almanah.desktop.in.h:1 ../src/application.c:132 -#: ../src/main-window.c:136 -msgid "Almanah Diary" -msgstr "Diario Almanah" - #: ../data/almanah.desktop.in.h:2 msgid "Keep a personal diary" msgstr "Mantenga un diario personal" #. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. -#: ../data/almanah.desktop.in.h:3 ../src/application.c:263 +#: ../data/almanah.desktop.in.h:3 ../src/application.c:272 msgid "Diary" msgstr "Diario" @@ -89,131 +65,77 @@ msgid "diary;journal;" msgstr "diario;" -#: ../data/almanah.ui.h:1 -msgid "Select Date…" -msgstr "Seleccionar fecha…" - -#: ../data/almanah.ui.h:2 -msgid "F_ormat" -msgstr "F_ormato" - -#: ../data/almanah.ui.h:3 -msgid "Toggle whether the currently selected text is bold." -msgstr "Cambiar si el texto seleccionado actualmente está en negrita." - -#: ../data/almanah.ui.h:4 -msgid "Toggle whether the currently selected text is italic." -msgstr "Cambiar si el texto seleccionado actualmente está en cursiva." - -#: ../data/almanah.ui.h:5 -msgid "Toggle whether the currently selected text is underlined." -msgstr "Cambiar si el texto seleccionado actualmente está subrayado." - -#: ../data/almanah.ui.h:6 -msgid "Add/Remove _Hyperlink" -msgstr "Añadir/Quitar _hiperenlace" - -#: ../data/almanah.ui.h:7 -msgid "" -"Add or remove a hyperlink from the currently selected text to a specified " -"URI." -msgstr "" -"Añadir o quitar un hiperenlace desde el texto actualmente seleccionado a un " -"URI especificado." - -#: ../data/almanah.ui.h:8 -msgid "Insert _Time" -msgstr "Insertar _hora" - -#: ../data/almanah.ui.h:9 -msgid "I_mportant" -msgstr "I_mportante" - -#: ../data/almanah.ui.h:10 -msgid "Toggle whether the current entry is marked as important." -msgstr "Cambiar si la entrada actual es marcada como importante." - -#: ../data/almanah.ui.h:11 -msgid "Show tags" -msgstr "Mostrar etiquetas" - -#: ../data/almanah.ui.h:12 -msgid "Show tags for the current entry" -msgstr "Mostrar etiquetas para la entrada actual" - -#: ../data/almanah.ui.h:13 -msgid "_Help" -msgstr "Ay_uda" - -#: ../data/almanah.ui.h:14 -msgid "Go to _Today" -msgstr "Ir a _hoy" - -#: ../data/almanah.ui.h:15 -msgid "Jump to the current date in the diary." -msgstr "Saltar a la fecha actual en el diario." - -#: ../data/almanah.ui.h:16 +#: ../src/ui/almanah.ui.h:1 msgid "Calendar" msgstr "Calendario" -#: ../data/almanah.ui.h:17 +#: ../src/ui/almanah.ui.h:2 +msgid "Go to Today" +msgstr "Ir a hoy" + +#: ../src/ui/almanah.ui.h:3 +msgid "Select Date…" +msgstr "Seleccionar fecha…" + +#: ../src/ui/almanah.ui.h:4 msgid "Entry editing area" msgstr "Área de edición de entrada" -#: ../data/almanah.ui.h:18 +#: ../src/ui/almanah.ui.h:5 msgid "Past events" msgstr "Eventos pasados" -#: ../data/almanah.ui.h:19 +#: ../src/ui/almanah.ui.h:6 msgid "Past Event List" msgstr "Lista de eventos pasados" -#: ../data/almanah.ui.h:20 +#: ../src/ui/almanah.ui.h:7 msgid "Search entry" msgstr "Buscar" -#: ../data/almanah.ui.h:21 ../src/search-dialog.c:69 +#: ../src/ui/almanah.ui.h:8 ../src/search-dialog.c:69 msgid "Search" msgstr "Buscar" -#: ../data/almanah.ui.h:22 +#: ../src/ui/almanah.ui.h:9 msgid "Result List" msgstr "Lista de resultados" -#: ../data/almanah.ui.h:23 +#: ../src/ui/almanah.ui.h:10 msgid "View Entry" msgstr "Ver entrada" -#: ../data/almanah.ui.h:24 +#. Translators: Use two common date formats from your locale which will be parsed correctly by GLib +#: ../src/ui/almanah.ui.h:12 msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." msgstr "ej. «14/03/2009» o «14 de marzo 2009»." -#: ../data/almanah.ui.h:25 +#. Translators: Use two popular URIs from your locale, preferably one on the Internet and one local file. +#: ../src/ui/almanah.ui.h:14 msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." msgstr "ej. “http://google.com/” o “file:///home/yo/Fotos/foto.jpg”." -#: ../data/almanah.ui.h:26 +#: ../src/ui/almanah.ui.h:15 msgid "Successful Entries" msgstr "Entradas exitosas" -#: ../data/almanah.ui.h:27 +#: ../src/ui/almanah.ui.h:16 msgid "Merged Entries" msgstr "Entradas combinadas" -#: ../data/almanah.ui.h:28 +#: ../src/ui/almanah.ui.h:17 msgid "Failed Entries" msgstr "Entradas fallidas" -#: ../data/almanah.ui.h:29 +#: ../src/ui/almanah.ui.h:18 msgid "Import Results List" msgstr "Importar lista de resultados" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 +#: ../data/org.gnome.almanah.gschema.xml.in.h:1 msgid "Database encryption key ID" msgstr "ID de la clave de cifrado de la base de datos" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +#: ../data/org.gnome.almanah.gschema.xml.in.h:2 msgid "" "The ID of the key to use to encrypt and decrypt the database, if Almanah has " "been built with encryption support. Leave blank to disable database " @@ -223,42 +145,33 @@ "se ha construido con soporte de cifrado. Déjelo en blanco para desactivar e " "cifrado de la base de datos." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 +#: ../data/org.gnome.almanah.gschema.xml.in.h:3 msgid "Spell checking language" msgstr "Revisión ortográfica de idiomas" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +#: ../data/org.gnome.almanah.gschema.xml.in.h:4 msgid "The locale specifier of the language in which to check entry spellings." msgstr "" "La configuración local específica del idioma en el cual se comprobará la " "ortografía de las entradas." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +#: ../data/org.gnome.almanah.gschema.xml.in.h:5 msgid "Spell checking enabled?" msgstr "¿Activar revisión ortográfica?" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 +#: ../data/org.gnome.almanah.gschema.xml.in.h:6 msgid "Whether spell checking of entries is enabled." msgstr "La corrección ortográfica de las entradas está activada." -#: ../src/application.c:246 +#: ../src/application.c:255 msgid "Error opening database" msgstr "Error al abrir la base de datos" -#. Error loading the CSS -#: ../src/application.c:275 -#, c-format -msgid "" -"Couldn't load the CSS file '%s'. The interface might not be styled correctly" -msgstr "" -"No se pudo cargar el archivo CSS «%s». Es posible que la interfaz no se " -"muestre correctamente." - -#: ../src/application.c:319 +#: ../src/application.c:332 msgid "Enable debug mode" msgstr "Activar modo de depuración" -#: ../src/application.c:336 +#: ../src/application.c:349 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" @@ -266,24 +179,16 @@ "tiempo." #. Print an error -#: ../src/application.c:347 +#: ../src/application.c:360 #, c-format msgid "Command line options could not be parsed: %s\n" msgstr "No se pudieron analizar las opciones de la línea de comandos: %s\n" -#: ../src/application.c:366 +#: ../src/application.c:379 msgid "Error encrypting database" msgstr "Error al cifrar la base de datos: %s" -#: ../src/application.c:419 ../src/date-entry-dialog.c:129 -#: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 -#: ../src/main-window.c:195 ../src/preferences-dialog.c:191 -#: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 -#, c-format -msgid "UI file \"%s\" could not be loaded" -msgstr "No se pudo cargar el archivo de interfaz de usuario «%s»" - -#: ../src/application.c:542 +#: ../src/application.c:522 msgid "" "Almanah is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -295,7 +200,7 @@ "Software Foundation; tanto en la versión 3 de la Licencia como (a su " "elección) cualquier versión posterior." -#: ../src/application.c:546 +#: ../src/application.c:526 msgid "" "Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -307,7 +212,7 @@ "PARA UN PROPÓSITO PARTICULAR. Vea la Licencia Publica General para más " "detalles." -#: ../src/application.c:550 +#: ../src/application.c:530 msgid "" "You should have received a copy of the GNU General Public License along with " "Almanah. If not, see ." @@ -315,12 +220,12 @@ "Debería haber recibido una copia de la Licencia Pública General GNU junto " "con Almanah. Si no la recibió, consulte ." -#: ../src/application.c:565 +#: ../src/application.c:545 #, c-format msgid "A helpful diary keeper, storing %u entries." msgstr "Un diario útil, almacenando %u entradas." -#: ../src/application.c:569 +#: ../src/application.c:549 msgid "Copyright © 2008-2009 Philip Withnall" msgstr "Copyright © 2008-2009 Philip Withnall" @@ -329,20 +234,36 @@ #. * "Translator name 1 \n" #. * "Translator name 2 " #. -#: ../src/application.c:577 +#: ../src/application.c:557 msgid "translator-credits" msgstr "" "Jorge González , 2008, 2010\n" "Carlos Albornoz , 2009" -#: ../src/application.c:581 +#: ../src/application.c:561 msgid "Almanah Website" msgstr "Página web de Almanah" +#: ../src/application.c:589 +#, c-format +msgid "" +"Couldn't load the CSS resources. The interface might not be styled " +"correctly: %s" +msgstr "" +"No se pudo cargar el recurso CSS. Es posible que la interfaz no se muestre " +"correctamente: %s" + #: ../src/date-entry-dialog.c:72 msgid "Select Date" msgstr "Seleccionar fecha" +#: ../src/date-entry-dialog.c:127 ../src/import-export-dialog.c:169 +#: ../src/import-export-dialog.c:475 ../src/main-window.c:228 +#: ../src/preferences-dialog.c:177 ../src/search-dialog.c:95 +#: ../src/uri-entry-dialog.c:126 +msgid "UI data could not be loaded" +msgstr "No se pudieron cargar los datos de la interfaz de usuario" + #: ../src/entry.c:303 #, c-format msgid "Invalid data version number %u." @@ -402,56 +323,131 @@ #: ../src/export-operation.c:256 ../src/export-operation.c:313 #, c-format -#| msgid "Error opening encrypted database file \"%s\": %s" msgid "Error changing exported file permissions: %s" msgstr "Error al cambiar los permisos del archivo exportado: %s" -#: ../src/import-export-dialog.c:202 +#: ../src/gtk/menus.ui.h:1 +msgid "_Search" +msgstr "_Buscar" + +#: ../src/gtk/menus.ui.h:2 +msgid "Pr_eferences" +msgstr "Prefere_ncias" + +#: ../src/gtk/menus.ui.h:3 +msgctxt "Main menu" +msgid "_Import" +msgstr "_Importar" + +#: ../src/gtk/menus.ui.h:4 +msgctxt "Main menu" +msgid "_Export" +msgstr "_Exportar" + +#: ../src/gtk/menus.ui.h:5 +msgid "_Print diary" +msgstr "_imprimir diario" + +#: ../src/gtk/menus.ui.h:6 +msgid "_About Almanah Diary" +msgstr "A_cerca del Diario Almanah" + +#: ../src/gtk/menus.ui.h:7 +msgid "_Quit" +msgstr "_Salir" + +#: ../src/gtk/menus.ui.h:8 +msgid "_Bold" +msgstr "_Negrita" + +#: ../src/gtk/menus.ui.h:9 +msgid "_Italic" +msgstr "_Cursiva" + +#: ../src/gtk/menus.ui.h:10 +msgid "_Underline" +msgstr "S_ubrayado" + +#: ../src/gtk/menus.ui.h:11 +msgid "_Cut" +msgstr "_Cortar" + +#: ../src/gtk/menus.ui.h:12 +msgid "_Copy" +msgstr "_Copiar" + +#: ../src/gtk/menus.ui.h:13 +msgid "_Paste" +msgstr "_Pegar" + +#: ../src/gtk/menus.ui.h:14 ../src/main-window.c:629 +msgid "_Delete" +msgstr "_Eliminar" + +#: ../src/gtk/menus.ui.h:15 +msgid "Insert _Time" +msgstr "Insertar _hora" + +#: ../src/gtk/menus.ui.h:16 +msgid "Add/Remove _Hyperlink" +msgstr "Añadir/Quitar _hiperenlace" + +#: ../src/import-export-dialog.c:203 msgid "Import _mode: " msgstr "_Modo importar: " -#: ../src/import-export-dialog.c:202 +#: ../src/import-export-dialog.c:203 msgid "Export _mode: " msgstr "_Modo exportar: " #. Set the window title -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Import Entries" msgstr "Importar entradas" -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Export Entries" msgstr "Exportar entradas" -#: ../src/import-export-dialog.c:245 +#: ../src/import-export-dialog.c:210 +msgctxt "Dialog button" +msgid "_Import" +msgstr "_Importar" + +#: ../src/import-export-dialog.c:210 +msgctxt "Dialog button" +msgid "_Export" +msgstr "_Exportar" + +#: ../src/import-export-dialog.c:247 msgid "Import failed" msgstr "Falló la importación" -#: ../src/import-export-dialog.c:283 +#: ../src/import-export-dialog.c:285 msgid "Export failed" msgstr "Falló la exportación" -#: ../src/import-export-dialog.c:296 +#: ../src/import-export-dialog.c:298 msgid "Export successful" msgstr "Exportación satisfactoria" -#: ../src/import-export-dialog.c:297 +#: ../src/import-export-dialog.c:299 msgid "The diary was successfully exported." msgstr "El diario se exportó de forma satisfactoria." -#: ../src/import-export-dialog.c:445 +#: ../src/import-export-dialog.c:447 msgid "Import Results" msgstr "Importar resultados" #. Translators: This is a strftime()-format string for the dates displayed in import results. #. Translators: This is a strftime()-format string for the date to display when asking about editing a diary entry. #. Translators: This is a strftime()-format string for the date to display when asking about deleting a diary entry. +#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. -#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. -#: ../src/import-export-dialog.c:539 ../src/main-window.c:567 -#: ../src/main-window.c:597 ../src/printing.c:263 ../src/search-dialog.c:182 -#: ../src/widgets/calendar-button.c:309 +#: ../src/import-export-dialog.c:542 ../src/main-window.c:590 +#: ../src/main-window.c:621 ../src/main-window.c:1228 ../src/printing.c:263 +#: ../src/search-dialog.c:180 msgid "%A, %e %B %Y" msgstr "%A, %e de %B de %Y" @@ -501,68 +497,87 @@ "Entrada importada desde \"%s\":\n" "\n" -#: ../src/main-window.c:571 +#: ../src/main-window.c:594 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" msgstr "¿Está seguro de que quiere editar esta entrada del diario para %s?" -#: ../src/main-window.c:601 +#: ../src/main-window.c:597 ../src/main-window.c:628 +msgid "_Cancel" +msgstr "_Cancelar" + +#: ../src/main-window.c:598 +msgid "_Edit" +msgstr "_Editar" + +#: ../src/main-window.c:625 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" msgstr "¿Está seguro de que quiere borrar esta entrada del diario para %s?" #. Print a warning about the unknown tag -#: ../src/main-window.c:710 +#: ../src/main-window.c:735 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." msgstr "" "Etiqueta de texto «%s» desconocida o duplicada en la entrada. Ignorando." -#: ../src/main-window.c:918 +#: ../src/main-window.c:976 msgid "Error opening URI" msgstr "Error abriendo URI" #. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place -#: ../src/main-window.c:1092 +#: ../src/main-window.c:1155 #, c-format msgid "%s @ %s" msgstr "%s - %s" -#: ../src/main-window.c:1171 +#: ../src/main-window.c:1261 msgid "Entry content could not be loaded" msgstr "No se pudo cargar el contenido de la entrada: %s" -#: ../src/main-window.c:1348 +#. Translators: this sentence is just used in startup to estimate the width +#. of a 15 words sentence. Translate with some random sentences with just 15 words. +#. See: https://bugzilla.gnome.org/show_bug.cgi?id=754841 +#: ../src/main-window.c:1416 +msgid "" +"This is just a fifteen words sentence to calculate the diary entry text view " +"size" +msgstr "" +"Una frase de quince palabras para calcular el tamaño de la vista de una " +"entrada" + +#: ../src/main-window.c:1453 msgid "Spelling checker could not be initialized" msgstr "No se pudo inicializar el corrector ortográfico: %s" -#: ../src/preferences-dialog.c:91 -msgid "Almanah Preferences" -msgstr "Preferencias de Almanah" +#: ../src/preferences-dialog.c:83 +msgid "Preferences" +msgstr "Preferencias" #. Grab our child widgets -#: ../src/preferences-dialog.c:217 +#: ../src/preferences-dialog.c:204 msgid "Encryption key: " msgstr "Clave de cifrado: " -#: ../src/preferences-dialog.c:222 +#: ../src/preferences-dialog.c:208 msgid "None (don't encrypt)" msgstr "Ninguna (no cifrar)" -#: ../src/preferences-dialog.c:246 +#: ../src/preferences-dialog.c:213 msgid "New _Key" msgstr "_Clave nueva" #. Set up the "Enable spell checking" check button -#: ../src/preferences-dialog.c:253 +#: ../src/preferences-dialog.c:237 msgid "Enable _spell checking" msgstr "Activar la corrección ortográfica" -#: ../src/preferences-dialog.c:279 +#: ../src/preferences-dialog.c:262 msgid "Error saving the encryption key" msgstr "Error al guardar la clave de cifrado: %s" -#: ../src/preferences-dialog.c:298 +#: ../src/preferences-dialog.c:281 msgid "Error opening Seahorse" msgstr "Error al abrir Seahorse: %s" @@ -574,146 +589,156 @@ msgid "No entry for this date." msgstr "No hay entradas para esta fecha." -#: ../src/printing.c:453 +#: ../src/printing.c:457 msgid "Start date:" msgstr "Fecha de inicio:" -#: ../src/printing.c:455 +#: ../src/printing.c:459 msgid "End date:" msgstr "Fecha de finalización:" #. Line spacing -#: ../src/printing.c:471 +#: ../src/printing.c:475 msgid "Line spacing:" msgstr "Espaciado de líneas:" -#: ../src/search-dialog.c:223 +#: ../src/search-dialog.c:221 msgid "Search canceled." msgstr "Búsqueda cancelada" #. Translators: This is an error message wrapper for when searches encounter an error. The placeholder is for an error message. -#: ../src/search-dialog.c:226 +#: ../src/search-dialog.c:224 #, c-format msgid "Error: %s" msgstr "Error: %s" #. Success! -#: ../src/search-dialog.c:231 +#: ../src/search-dialog.c:229 #, c-format msgid "Found %d entry:" msgid_plural "Found %d entries:" msgstr[0] "Encontrada %d entrada:" msgstr[1] "Encontradas %d entradas:" -#: ../src/search-dialog.c:280 +#: ../src/search-dialog.c:278 msgid "Searching…" msgstr "Buscando…" -#: ../src/storage-manager.c:276 +#: ../src/storage-manager.c:248 +#, c-format +msgid "" +"Could not open database \"%s\". SQLite provided the following error message: " +"%s" +msgstr "" +"No se pudo abrir la base de datos «%s». SQLite proporcionó el siguiente " +"mensaje de error: %s" + +#: ../src/storage-manager.c:291 +#, c-format +msgid "" +"Could not run query \"%s\". SQLite provided the following error message: %s" +msgstr "" +"No se pudo ejecutar la consulta «%s». SQLite proporcionó el siguiente " +"mensaje de error: %s" + +#: ../src/storage-manager.c:597 +msgid "Error deserializing entry into buffer while searching." +msgstr "Error al deserializar la entrada en el búfer mientras se buscaba." + +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Introducir URI" + +#: ../src/vfs.c:239 #, c-format msgid "GPGME is not at least version %s" msgstr "La versión de GPGME no es al menos la %s" -#: ../src/storage-manager.c:285 +#: ../src/vfs.c:246 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "GPGME no soporta OpenPGP: %s" -#: ../src/storage-manager.c:294 +#: ../src/vfs.c:253 #, c-format msgid "Error creating cipher context: %s" msgstr "Error al crear el contexto de cifrado: %s" -#: ../src/storage-manager.c:323 +#: ../src/vfs.c:273 +#, c-format +msgid "Can't create a new GIOChannel for the encrypted database: %s" +msgstr "No se puede crear un GIOChannel para la base de datos cifrada: %s" + +#: ../src/vfs.c:281 #, c-format msgid "Error opening encrypted database file \"%s\": %s" msgstr "Error al abrir el archivo cifrado de la base de datos «%s»: %s" -#: ../src/storage-manager.c:342 +#: ../src/vfs.c:297 #, c-format -msgid "Error opening plain database file \"%s\": %s" -msgstr "Error al abrir el archivo plano de la base de datos «%s»: %s" +msgid "Error creating Callback base data buffer: %s" +msgstr "Error al crear el búfer de de base de datos de retorno de llamada: %s" -#: ../src/storage-manager.c:390 -msgid "" -"The encrypted database is empty. The plain database file has been left " -"undeleted as backup." -msgstr "" -"El base de datos cifrada está vacía. El archivo plano de la base de datos se " -"ha dejado como copia de seguridad." - -#. Delete the plain file -#: ../src/storage-manager.c:393 +#: ../src/vfs.c:305 #, c-format -msgid "Could not delete plain database file \"%s\"." -msgstr "No se pudo borrar el archivo plano de la base de datos «%s»." +msgid "Can't create a new GIOChannel for the plain database: %s" +msgstr "" +"No se puede crear un GIOChannel para la base de datos en texto plano: %s" -#: ../src/storage-manager.c:434 +#: ../src/vfs.c:313 #, c-format -msgid "Error decrypting database: %s" -msgstr "Error al descifrar la base de datos: %s" +msgid "Error opening plain database file \"%s\": %s" +msgstr "Error al abrir el archivo plano de la base de datos «%s»: %s" -#: ../src/storage-manager.c:468 +#: ../src/vfs.c:409 #, c-format msgid "Error getting encryption key: %s" msgstr "Error al obtener la clave de cifrado: %s" -#: ../src/storage-manager.c:489 +#: ../src/vfs.c:433 ../src/vfs.c:439 #, c-format msgid "Error encrypting database: %s" msgstr "Error al cifrar la base de datos: %s" -#: ../src/storage-manager.c:549 +#. Translators: The first and second params are file paths, the last param is an error message. +#: ../src/vfs.c:489 +#, c-format +msgid "Error copying the file from %s to %s: %s" +msgstr "Error al copiar el archivo de %s a %s: %s" + +#: ../src/vfs.c:495 #, c-format -#| msgid "Error opening plain database file \"%s\": %s" msgid "Error changing database backup file permissions: %s" msgstr "" "Error al cambiar los permisos del archivo de respaldo de la base de datos: %s" -#: ../src/storage-manager.c:571 ../src/storage-manager.c:627 +#: ../src/vfs.c:595 #, c-format -#| msgid "Error opening plain database file \"%s\": %s" -msgid "Error changing database file permissions: %s" -msgstr "Error al cambiar los permisos del archivo de la base de datos: %s" +msgid "Error closing file: %s" +msgstr "Error al cerrar el archivo: %s" -#. Translators: the first parameter is a filename, the second is an error message. -#: ../src/storage-manager.c:583 ../src/storage-manager.c:611 +#. Translators: the first parameter is a filename. +#: ../src/vfs.c:994 ../src/vfs.c:1021 #, c-format -#| msgid "Error opening plain database file \"%s\": %s" -msgid "Error backing up file ‘%s’: %s" -msgstr "Error al crear el archivo de respaldo «%s»: %s" +msgid "Error backing up file ‘%s’" +msgstr "Error al respaldar el archivo «%s»" -#: ../src/storage-manager.c:620 +#: ../src/vfs.c:1007 #, c-format -msgid "" -"Could not open database \"%s\". SQLite provided the following error message: " -"%s" -msgstr "" -"No se pudo abrir la base de datos «%s». SQLite proporcionó el siguiente " -"mensaje de error: %s" +msgid "Error decrypting database: %s" +msgstr "Error al descifrar la base de datos: %s" -#: ../src/storage-manager.c:704 +#: ../src/vfs.c:1047 #, c-format -msgid "" -"Could not run query \"%s\". SQLite provided the following error message: %s" -msgstr "" -"No se pudo ejecutar la consulta «%s». SQLite proporcionó el siguiente mensaje " -"de error: %s" - -#: ../src/storage-manager.c:1010 -msgid "Error deserializing entry into buffer while searching." -msgstr "Error al deserializar la entrada en el búfer mientras se buscaba." - -#: ../src/uri-entry-dialog.c:71 -msgid "Enter URI" -msgstr "Introducir URI" +msgid "Error changing database file permissions: %s" +msgstr "Error al cambiar los permisos del archivo de la base de datos: %s" -#: ../src/widgets/calendar-button.c:140 +#: ../src/widgets/calendar-button.c:142 #, c-format -msgid "UI file \"%s\" could not be loaded: %s" -msgstr "No se pudo cargar el archivo de interfaz de usuario «%s»: %s" +msgid "UI data could not be loaded: %s" +msgstr "No se pudieron cargar los datos de la interfaz de usuario: %s" -#: ../src/widgets/calendar-button.c:150 +#: ../src/widgets/calendar-button.c:152 msgid "Can't load calendar window object from UI file" msgstr "" "No se puede cargar el objeto de ventana de calendario desde el archivo de IU" @@ -723,10 +748,6 @@ msgid "Important!" msgstr "Importante" -#: ../src/widgets/calendar-window.c:80 -msgid "Unknown input device" -msgstr "Dispositivo de entrada desconocido" - #: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:166 msgid "add tag" msgstr "añadir etiqueta" @@ -736,7 +757,6 @@ msgstr "Escriba la etiqueta y pulse Intro para guardarla" #: ../src/widgets/tag-accessible.c:165 -#| msgid "Show tags for the current entry" msgid "Remove the tag from the entry" msgstr "Quitar la etiqueta de la entrada" @@ -746,10 +766,66 @@ msgstr "Quitar etiqueta" #: ../src/widgets/tag-entry.c:85 -#| msgid "Search entry" msgid "Tag entry" msgstr "Etiquetar entrada" +#~ msgid "Almanah Preferences" +#~ msgstr "Preferencias de Almanah" + +#~ msgid "F_ormat" +#~ msgstr "F_ormato" + +#~ msgid "Toggle whether the currently selected text is bold." +#~ msgstr "Cambiar si el texto seleccionado actualmente está en negrita." + +#~ msgid "Toggle whether the currently selected text is italic." +#~ msgstr "Cambiar si el texto seleccionado actualmente está en cursiva." + +#~ msgid "Toggle whether the currently selected text is underlined." +#~ msgstr "Cambiar si el texto seleccionado actualmente está subrayado." + +#~ msgid "" +#~ "Add or remove a hyperlink from the currently selected text to a specified " +#~ "URI." +#~ msgstr "" +#~ "Añadir o quitar un hiperenlace desde el texto actualmente seleccionado a " +#~ "un URI especificado." + +#~ msgid "I_mportant" +#~ msgstr "I_mportante" + +#~ msgid "Toggle whether the current entry is marked as important." +#~ msgstr "Cambiar si la entrada actual es marcada como importante." + +#~ msgid "Show tags" +#~ msgstr "Mostrar etiquetas" + +#~ msgid "Show tags for the current entry" +#~ msgstr "Mostrar etiquetas para la entrada actual" + +#~ msgid "_Help" +#~ msgstr "Ay_uda" + +#~ msgid "Jump to the current date in the diary." +#~ msgstr "Saltar a la fecha actual en el diario." + +#~| msgid "Error closing file: %s" +#~ msgid "Error loading resources file: %s" +#~ msgstr "Error al cargar el archivo de recursos: %s" + +#~ msgid "Unknown input device" +#~ msgstr "Dispositivo de entrada desconocido" + +#~ msgid "" +#~ "The encrypted database is empty. The plain database file has been left " +#~ "undeleted as backup." +#~ msgstr "" +#~ "El base de datos cifrada está vacía. El archivo plano de la base de datos " +#~ "se ha dejado como copia de seguridad." + +#~ msgid "Could not delete plain database file \"%s\"." +#~ msgstr "No se pudo borrar el archivo plano de la base de datos «%s»." + #~ msgid "_File" #~ msgstr "_Archivo" @@ -762,9 +838,6 @@ #~ msgid "_Print…" #~ msgstr "_Imprimir…" -#~ msgid "_Edit" -#~ msgstr "_Editar" - #~ msgid "_Search…" #~ msgstr "_Buscar…" @@ -846,9 +919,6 @@ #~ msgid "An attached file." #~ msgstr "Un archivo adjunto." -#~ msgid "Error opening file" -#~ msgstr "Error al abrir el archivo" - #~ msgid "Select File" #~ msgstr "Seleccionar archivo" diff -Nru almanah-0.11.1/po/fi.po almanah-0.12.0/po/fi.po --- almanah-0.11.1/po/fi.po 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/fi.po 2019-10-07 13:45:09.000000000 +0000 @@ -1,171 +1,318 @@ # Finnish messages for diary. # Copyright (C) 2008 Free Software Foundation Inc. -# Suomennos: http://gnome.fi/ +# Suomennos: https://l10n.gnome.org/teams/fi/ # # Ilkka Tuohela , 2008. # msgid "" msgstr "" "Project-Id-Version: diary\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-22 08:57+0300\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=almanah&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2014-09-28 18:07+0000\n" "PO-Revision-Date: 2008-10-04 08:00+0300\n" "Last-Translator: Ilkka Tuohela \n" "Language-Team: Finnish \n" +"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11.2\n" -#: ../data/almanah.desktop.in.h:1 ../data/almanah.ui.h:2 ../src/main.c:82 +#: ../data/almanah.appdata.xml.in.h:1 +msgid "" +"Almanah Diary is an application to allow you to keep a diary of your life." +msgstr "" + +#: ../data/almanah.appdata.xml.in.h:2 +msgid "" +"You can encrypt the diary to preserve your privacy. It has editing " +"abilities, including text formatting and printing and shows you a lists of " +"events which happened (on your computer) for each day (such as tasks and " +"appointments from Evolution)." +msgstr "" + +#: ../data/almanah-app-menu.ui.h:1 +msgid "_Search" +msgstr "_Etsi" + +#: ../data/almanah-app-menu.ui.h:2 +msgid "Pr_eferences" +msgstr "" + +#. Set the button label +#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 +msgid "_Import" +msgstr "" + +#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 +msgid "_Export" +msgstr "" + +#: ../data/almanah-app-menu.ui.h:5 +msgid "_Print diary" +msgstr "" + +#: ../data/almanah-app-menu.ui.h:6 +#, fuzzy +#| msgid "Almanah Diary" +msgid "_About Almanah Diary" +msgstr "Almanah-kalenteri" + +#: ../data/almanah-app-menu.ui.h:7 +msgid "_Quit" +msgstr "" + +#: ../data/almanah.desktop.in.h:1 ../src/application.c:132 +#: ../src/main-window.c:136 msgid "Almanah Diary" msgstr "Almanah-kalenteri" #: ../data/almanah.desktop.in.h:2 +msgid "Keep a personal diary" +msgstr "Järjestele henkilökohtaista kalenteriasi" + +#. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. +#: ../data/almanah.desktop.in.h:3 ../src/application.c:260 msgid "Diary" msgstr "Kalenteri" -#: ../data/almanah.desktop.in.h:3 -msgid "Keep a personal diary" -msgstr "Järjestele henkilökohtaista kalenteriasi" +#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../data/almanah.desktop.in.h:5 +msgid "diary;journal;" +msgstr "" #: ../data/almanah.ui.h:1 -msgid "Add Link" -msgstr "Lisää linkki" +#, fuzzy +#| msgid "Select File" +msgid "Select Date…" +msgstr "Valitse tiedosto" + +#: ../data/almanah.ui.h:2 +msgid "F_ormat" +msgstr "" #: ../data/almanah.ui.h:3 -msgid "Attached Links" -msgstr "Liitetyt linkit" +msgid "Toggle whether the currently selected text is bold." +msgstr "" #: ../data/almanah.ui.h:4 -msgid "Calendar" -msgstr "Kalenteri" +msgid "Toggle whether the currently selected text is italic." +msgstr "" #: ../data/almanah.ui.h:5 -msgid "Go To Today" -msgstr "Siirry tähän päivään" +msgid "Toggle whether the currently selected text is underlined." +msgstr "" #: ../data/almanah.ui.h:6 -msgid "Link Type" -msgstr "Linkin tyyppi" +#, fuzzy +#| msgid "Remove Link" +msgid "Add/Remove _Hyperlink" +msgstr "Poista linkki" #: ../data/almanah.ui.h:7 -msgid "Remove Link" -msgstr "Poista linkki" +msgid "" +"Add or remove a hyperlink from the currently selected text to a specified " +"URI." +msgstr "" #: ../data/almanah.ui.h:8 -msgid "Results" -msgstr "Tulokset" +msgid "Insert _Time" +msgstr "" #: ../data/almanah.ui.h:9 -msgid "Search" -msgstr "Etsi" +msgid "I_mportant" +msgstr "" #: ../data/almanah.ui.h:10 -msgid "View" -msgstr "Näytä" +msgid "Toggle whether the current entry is marked as important." +msgstr "" #: ../data/almanah.ui.h:11 -msgid "View Entry" -msgstr "Näytä merkintä" +msgid "Show tags" +msgstr "" #: ../data/almanah.ui.h:12 -msgid "_Edit" -msgstr "_Muokkaa" +msgid "Show tags for the current entry" +msgstr "" #: ../data/almanah.ui.h:13 -msgid "_File" -msgstr "_Tiedosto" - -#: ../data/almanah.ui.h:14 msgid "_Help" msgstr "O_hje" +#: ../data/almanah.ui.h:14 +#, fuzzy +#| msgid "Go To Today" +msgid "Go to _Today" +msgstr "Siirry tähän päivään" + #: ../data/almanah.ui.h:15 -msgid "_Search" -msgstr "_Etsi" +msgid "Jump to the current date in the diary." +msgstr "" -#: ../src/interface.c:45 -#, c-format -msgid "UI file \"%s/almanah/almanah.ui\" could not be loaded." -msgstr "Käyttöliittymätiedostoa \"%s/almanah/almanah.ui\" ei voitu ladata." +#: ../data/almanah.ui.h:16 +msgid "Calendar" +msgstr "Kalenteri" + +#: ../data/almanah.ui.h:17 +msgid "Entry editing area" +msgstr "" -#. Type, Name, Description, Icon, Columns, Format function, View function, Dialogue build function, Get values function -#. { "email", N_("E-mail"), N_("An e-mail you sent or received."), "mail-read", 2, &link_email_format_value, &link_email_view, &link_email_build_dialog, &link_email_get_values }, -#. Translators: These are the names and descriptions of the different link types. -#: ../src/link.c:52 -msgid "File" -msgstr "Tiedosto" - -#: ../src/link.c:52 -msgid "An attached file." -msgstr "Liitetiedosto." - -#: ../src/link.c:53 -msgid "Note" -msgstr "Huomautus" - -#: ../src/link.c:53 -msgid "A note about an important event." -msgstr "Huomautus tärkeästä tapahtumasta." - -#: ../src/link.c:54 ../src/links/uri.c:50 -msgid "URI" -msgstr "URI" - -#: ../src/link.c:54 -msgid "A URI of a file or web page." -msgstr "Tiedoston tai www-sivun URI." - -#: ../src/links/file.c:39 -msgid "Due to an unknown error the file cannot be opened." -msgstr "Tuntemattoman virheen takia tiedostoa ei voi avata." +#: ../data/almanah.ui.h:18 +msgid "Past events" +msgstr "" -#: ../src/links/file.c:50 -msgid "Select File" -msgstr "Valitse tiedosto" +#: ../data/almanah.ui.h:19 +msgid "Past Event List" +msgstr "" -#: ../src/links/uri.c:39 -msgid "Due to an unknown error the URI cannot be opened." -msgstr "URIa ei voi avata tuntemattomasta syystä." +#: ../data/almanah.ui.h:20 +#, fuzzy +#| msgid "Search" +msgid "Search entry" +msgstr "Etsi" -#: ../src/main-window.c:178 +#: ../data/almanah.ui.h:21 ../src/search-dialog.c:69 +msgid "Search" +msgstr "Etsi" + +#: ../data/almanah.ui.h:22 +#, fuzzy +#| msgid "Results" +msgid "Result List" +msgstr "Tulokset" + +#: ../data/almanah.ui.h:23 +msgid "View Entry" +msgstr "Näytä merkintä" + +#: ../data/almanah.ui.h:24 +msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." +msgstr "" + +#: ../data/almanah.ui.h:25 +msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." +msgstr "" + +#: ../data/almanah.ui.h:26 +msgid "Successful Entries" +msgstr "" + +#: ../data/almanah.ui.h:27 +msgid "Merged Entries" +msgstr "" + +#: ../data/almanah.ui.h:28 +msgid "Failed Entries" +msgstr "" + +#: ../data/almanah.ui.h:29 +msgid "Import Results List" +msgstr "" + +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 +msgid "Database encryption key ID" +msgstr "" + +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +msgid "" +"The ID of the key to use to encrypt and decrypt the database, if Almanah has " +"been built with encryption support. Leave blank to disable database " +"encryption." +msgstr "" + +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 +msgid "Spell checking language" +msgstr "" + +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +msgid "The locale specifier of the language in which to check entry spellings." +msgstr "" + +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +msgid "Spell checking enabled?" +msgstr "" + +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 +msgid "Whether spell checking of entries is enabled." +msgstr "" + +#: ../src/application.c:243 +#, fuzzy +#| msgid "Error encrypting database: %s" +msgid "Error opening database" +msgstr "Virhe salattaessa tietokantaa: %s" + +#. Error loading the CSS +#: ../src/application.c:272 #, c-format -msgid "The spelling checker could not be initialized: %s" -msgstr "Oikolukua ei voitu alustaa: %s" +msgid "" +"Couldn't load the CSS file '%s'. The interface might not be styled correctly" +msgstr "" + +#: ../src/application.c:316 +msgid "Enable debug mode" +msgstr "Käytä vianetsintätilaa" + +#: ../src/application.c:333 +msgid "" +"Manage your diary. Only one instance of the program may be open at any time." +msgstr "" + +#. Print an error +#: ../src/application.c:344 +#, fuzzy, c-format +#| msgid "Command-line options could not be parsed. Error: %s" +msgid "Command line options could not be parsed: %s\n" +msgstr "Komentorivivalitsimia ei voitu tulkita. Virhe: %s" + +#: ../src/application.c:363 +#, fuzzy +#| msgid "Error encrypting database: %s" +msgid "Error encrypting database" +msgstr "Virhe salattaessa tietokantaa: %s" + +#: ../src/application.c:424 ../src/date-entry-dialog.c:129 +#: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 +#: ../src/main-window.c:195 ../src/preferences-dialog.c:191 +#: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 +#, fuzzy, c-format +#| msgid "UI file \"%s/almanah/almanah.ui\" could not be loaded." +msgid "UI file \"%s\" could not be loaded" +msgstr "Käyttöliittymätiedostoa \"%s/almanah/almanah.ui\" ei voitu ladata." -#: ../src/main-window.c:265 +#: ../src/application.c:547 msgid "" -"Diary is free software: you can redistribute it and/or modify it under the " +"Almanah is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " "Foundation, either version 3 of the License, or (at your option) any later " "version." msgstr "" -#: ../src/main-window.c:269 +#: ../src/application.c:551 msgid "" -"Diary is distributed in the hope that it will be useful, but WITHOUT ANY " +"Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " "FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " "details." msgstr "" -#: ../src/main-window.c:273 +#: ../src/application.c:555 msgid "" "You should have received a copy of the GNU General Public License along with " -"Diary. If not, see ." +"Almanah. If not, see ." msgstr "" -#: ../src/main-window.c:284 +#: ../src/application.c:570 #, c-format -msgid "" -"A helpful diary keeper, storing %u entries with %u links and a total of %u " -"characters." +msgid "A helpful diary keeper, storing %u entries." msgstr "" -#: ../src/main-window.c:291 -msgid "Copyright © 2008 Philip Withnall" +#: ../src/application.c:574 +#, fuzzy +#| msgid "Copyright © 2008 Philip Withnall" +msgid "Copyright © 2008-2009 Philip Withnall" msgstr "Tekijänoikeudet © 2008 Philip Withnall" #. Translators: please include your names here to be credited for your hard work! @@ -173,133 +320,491 @@ #. * "Translator name 1 \n" #. * "Translator name 2 " #. -#: ../src/main-window.c:299 +#: ../src/application.c:582 msgid "translator-credits" msgstr "" "Ilkka Tuohela, 2008.\n" "\n" -"http://gnome.fi/" +"https://l10n.gnome.org/teams/fi/" -#: ../src/main-window.c:303 +#: ../src/application.c:586 msgid "Almanah Website" msgstr "Almanahin www-sivut" -#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. +#: ../src/date-entry-dialog.c:72 +#, fuzzy +#| msgid "Select File" +msgid "Select Date" +msgstr "Valitse tiedosto" + +#: ../src/entry.c:303 +#, c-format +msgid "Invalid data version number %u." +msgstr "" + +#: ../src/events/calendar-appointment.c:51 +msgid "Calendar Appointment" +msgstr "" + +#: ../src/events/calendar-appointment.c:52 +msgid "An appointment on an Evolution calendar." +msgstr "" + +#. Translators: This is a time string with the format hh:mm +#: ../src/events/calendar-appointment.c:89 ../src/events/calendar-task.c:90 +#, c-format +msgid "%.2d:%.2d" +msgstr "" + +#: ../src/events/calendar-appointment.c:135 ../src/events/calendar-task.c:125 +msgid "Error launching Evolution" +msgstr "" + +#: ../src/events/calendar-task.c:51 +#, fuzzy +#| msgid "Calendar" +msgid "Calendar Task" +msgstr "Kalenteri" + +#: ../src/events/calendar-task.c:52 +msgid "A task on an Evolution calendar." +msgstr "" + +#: ../src/export-operation.c:47 ../src/import-operation.c:45 +#, fuzzy +#| msgid "Select File" +msgid "Text Files" +msgstr "Valitse tiedosto" + +#: ../src/export-operation.c:48 +msgid "" +"Select a _folder to export the entries to as text files, one per entry, with " +"names in the format 'yyyy-mm-dd', and no extension. All entries will be " +"exported, unencrypted in plain text format." +msgstr "" + +#: ../src/export-operation.c:52 ../src/import-operation.c:50 +msgid "Database" +msgstr "" + +#: ../src/export-operation.c:53 +msgid "" +"Select a _filename for a complete copy of the unencrypted Almanah Diary " +"database to be given." +msgstr "" + +#: ../src/export-operation.c:256 ../src/export-operation.c:313 +#, fuzzy, c-format +#| msgid "Error opening encrypted database file \"%s\": %s" +msgid "Error changing exported file permissions: %s" +msgstr "Virhe avattaessa salattua tietokantatiedostoa \"%s\": %s" + +#: ../src/import-export-dialog.c:202 +msgid "Import _mode: " +msgstr "" + +#: ../src/import-export-dialog.c:202 +msgid "Export _mode: " +msgstr "" + +#. Set the window title +#: ../src/import-export-dialog.c:205 +msgid "Import Entries" +msgstr "" + +#: ../src/import-export-dialog.c:205 +msgid "Export Entries" +msgstr "" + +#: ../src/import-export-dialog.c:245 +msgid "Import failed" +msgstr "" + +#: ../src/import-export-dialog.c:283 +msgid "Export failed" +msgstr "" + +#: ../src/import-export-dialog.c:296 +msgid "Export successful" +msgstr "" + +#: ../src/import-export-dialog.c:297 +msgid "The diary was successfully exported." +msgstr "" + +#: ../src/import-export-dialog.c:445 +#, fuzzy +#| msgid "Results" +msgid "Import Results" +msgstr "Tulokset" + +#. Translators: This is a strftime()-format string for the dates displayed in import results. +#. Translators: This is a strftime()-format string for the date to display when asking about editing a diary entry. +#. Translators: This is a strftime()-format string for the date to display when asking about deleting a diary entry. #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. -#: ../src/main-window.c:349 ../src/printing.c:66 ../src/search-dialog.c:62 +#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. +#: ../src/import-export-dialog.c:539 ../src/main-window.c:567 +#: ../src/main-window.c:597 ../src/printing.c:263 ../src/search-dialog.c:182 +#: ../src/widgets/calendar-button.c:309 msgid "%A, %e %B %Y" msgstr "%A, %e. %Bta %Y" -#: ../src/main.c:70 -msgid "Enable debug mode" -msgstr "Käytä vianetsintätilaa" +#: ../src/import-operation.c:46 +msgid "" +"Select a _folder containing text files, one per entry, with names in the " +"format 'yyyy-mm-dd', and no extension. Any and all such files will be " +"imported." +msgstr "" -#. Options -#: ../src/main.c:86 -msgid "- Manage your diary" -msgstr "- hallitse kalenteriasi" +#: ../src/import-operation.c:51 +msgid "Select a database _file created by Almanah Diary to import." +msgstr "" -#: ../src/main.c:96 +#: ../src/import-operation.c:248 #, c-format -msgid "Command-line options could not be parsed. Error: %s" -msgstr "Komentorivivalitsimia ei voitu tulkita. Virhe: %s" +msgid "Error deserializing imported entry into buffer: %s" +msgstr "" + +#: ../src/import-operation.c:264 +#, c-format +msgid "" +"Error deserializing existing entry into buffer; overwriting with imported " +"entry: %s" +msgstr "" + +#. Append some header text for the imported entry +#. Translators: This text is appended to an existing entry when an entry is being imported to the same date. +#. * The imported entry is appended to this text. +#: ../src/import-operation.c:305 +#, c-format +msgid "" +"\n" +"\n" +"Entry imported from \"%s\":\n" +"\n" +msgstr "" + +#: ../src/main-window.c:571 +#, c-format +msgid "Are you sure you want to edit this diary entry for %s?" +msgstr "Haluatko varmasti muokata tätä kalenterimerkintää %s?" -#: ../src/printing.c:82 +#: ../src/main-window.c:601 +#, c-format +msgid "Are you sure you want to delete this diary entry for %s?" +msgstr "Haluatko varmasti poistaa tämän kalenterimerkinnän %s?" + +#. Print a warning about the unknown tag +#: ../src/main-window.c:710 +#, c-format +msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." +msgstr "" + +#: ../src/main-window.c:918 +msgid "Error opening URI" +msgstr "" + +#. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place +#: ../src/main-window.c:1092 +#, c-format +msgid "%s @ %s" +msgstr "" + +#: ../src/main-window.c:1171 +msgid "Entry content could not be loaded" +msgstr "" + +#: ../src/main-window.c:1348 +#, fuzzy +#| msgid "The spelling checker could not be initialized: %s" +msgid "Spelling checker could not be initialized" +msgstr "Oikolukua ei voitu alustaa: %s" + +#: ../src/preferences-dialog.c:91 +msgid "Almanah Preferences" +msgstr "" + +#. Grab our child widgets +#: ../src/preferences-dialog.c:217 +#, fuzzy +#| msgid "Error getting encryption key: %s" +msgid "Encryption key: " +msgstr "Virhe haettaessa salausavainta: %s" + +#: ../src/preferences-dialog.c:222 +msgid "None (don't encrypt)" +msgstr "" + +#: ../src/preferences-dialog.c:246 +msgid "New _Key" +msgstr "" + +#. Set up the "Enable spell checking" check button +#: ../src/preferences-dialog.c:253 +msgid "Enable _spell checking" +msgstr "" + +#: ../src/preferences-dialog.c:279 +#, fuzzy +#| msgid "Error getting encryption key: %s" +msgid "Error saving the encryption key" +msgstr "Virhe haettaessa salausavainta: %s" + +#: ../src/preferences-dialog.c:298 +msgid "Error opening Seahorse" +msgstr "" + +#: ../src/printing.c:277 +msgid "This entry is marked as important." +msgstr "" + +#: ../src/printing.c:298 msgid "No entry for this date." msgstr "Tänään ei ole merkintöjä." -#: ../src/printing.c:215 -msgid "Start Date" +#: ../src/printing.c:453 +#, fuzzy +#| msgid "Start Date" +msgid "Start date:" msgstr "Aloituspäivä" -#: ../src/printing.c:218 -msgid "End Date" +#: ../src/printing.c:455 +#, fuzzy +#| msgid "End Date" +msgid "End date:" msgstr "Päättymispäivä" -#: ../src/storage-manager.c:184 +#. Line spacing +#: ../src/printing.c:471 +msgid "Line spacing:" +msgstr "" + +#: ../src/search-dialog.c:223 +msgid "Search canceled." +msgstr "" + +#. Translators: This is an error message wrapper for when searches encounter an error. The placeholder is for an error message. +#: ../src/search-dialog.c:226 +#, c-format +msgid "Error: %s" +msgstr "" + +#. Success! +#: ../src/search-dialog.c:231 +#, c-format +msgid "Found %d entry:" +msgid_plural "Found %d entries:" +msgstr[0] "" +msgstr[1] "" + +#: ../src/search-dialog.c:280 +#, fuzzy +#| msgid "Search" +msgid "Searching…" +msgstr "Etsi" + +#: ../src/storage-manager.c:232 +#, c-format +msgid "" +"Could not open database \"%s\". SQLite provided the following error message: " +"%s" +msgstr "Tietokantaa \"%s\" ei voitu avata. SQLite antoi seuraavan virhee: %s" + +#: ../src/storage-manager.c:274 +#, c-format +msgid "" +"Could not run query \"%s\". SQLite provided the following error message: %s" +msgstr "Kyselyä \"%s\" ei voitu suorittaa. SQLite antoi seuraavan virheen: %s" + +#: ../src/storage-manager.c:580 +msgid "Error deserializing entry into buffer while searching." +msgstr "" + +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "" + +#: ../src/vfs.c:102 +#, c-format +msgid "GPGME is not at least version %s" +msgstr "" + +#: ../src/vfs.c:109 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "GPGME ei tue OpenPGP:tä: %s" -#: ../src/storage-manager.c:193 +#: ../src/vfs.c:116 #, c-format msgid "Error creating cipher context: %s" msgstr "Virhe luotaessa sifferikontekstia: %s" -#: ../src/storage-manager.c:222 +#: ../src/vfs.c:136 +#, c-format +msgid "Can't create a new GIOChannel for the encrypted database: %s" +msgstr "" + +#: ../src/vfs.c:144 #, c-format msgid "Error opening encrypted database file \"%s\": %s" msgstr "Virhe avattaessa salattua tietokantatiedostoa \"%s\": %s" -#: ../src/storage-manager.c:242 +#: ../src/vfs.c:151 +#, c-format +msgid "Can't create a new GIOChannel for the plain database: %s" +msgstr "" + +#: ../src/vfs.c:162 #, c-format msgid "Error opening plain database file \"%s\": %s" msgstr "Virhe avattaessa selväkielistä tietokantatiedostoa \"%s\": %s" -#: ../src/storage-manager.c:312 +#: ../src/vfs.c:214 #, c-format msgid "Error decrypting database: %s" msgstr "Virhe purettaessa tietokannan salausta: %s" -#: ../src/storage-manager.c:345 +#: ../src/vfs.c:246 #, c-format msgid "Error getting encryption key: %s" msgstr "Virhe haettaessa salausavainta: %s" -#: ../src/storage-manager.c:366 +#: ../src/vfs.c:264 #, c-format msgid "Error encrypting database: %s" msgstr "Virhe salattaessa tietokantaa: %s" -#: ../src/storage-manager.c:377 +#: ../src/vfs.c:276 +msgid "" +"The encrypted database is empty. The plain database file has been left " +"undeleted as backup." +msgstr "" + +#. Delete the plain file +#: ../src/vfs.c:279 #, c-format msgid "Could not delete plain database file \"%s\"." msgstr "Selväkielistä tietokantatiedostoa \"%s\" ei voitu poistaa." -#: ../src/storage-manager.c:425 +#. Translators: The first and second params are file paths, the last param is an error message. +#: ../src/vfs.c:346 +#, fuzzy, c-format +#| msgid "Error opening plain database file \"%s\": %s" +msgid "Error copying the file from %s to %s: %s" +msgstr "Virhe avattaessa selväkielistä tietokantatiedostoa \"%s\": %s" + +#: ../src/vfs.c:352 +#, fuzzy, c-format +#| msgid "Error opening plain database file \"%s\": %s" +msgid "Error changing database backup file permissions: %s" +msgstr "Virhe avattaessa selväkielistä tietokantatiedostoa \"%s\": %s" + +#. Translators: the first parameter is a filename, the second is an error message. +#. Translators: the first parameter is a filename. +#: ../src/vfs.c:693 ../src/vfs.c:721 #, c-format -msgid "" -"Both an encrypted and plaintext version of the database exist as \"%s\" and " -"\"%s\", and one is likely corrupt. Please delete the corrupt one (i.e. one " -"which is 0KiB in size) before continuing. If neither file is 0KiB, the " -"problem will most likely have been caused by Diary being unable to encrypt " -"the database, so you should move the first file." +msgid "Error backing up file ‘%s’" msgstr "" -#: ../src/storage-manager.c:450 -#, c-format -msgid "" -"Could not open database \"%s\". SQLite provided the following error message: " -"%s" +#: ../src/vfs.c:739 +#, fuzzy, c-format +#| msgid "Error opening plain database file \"%s\": %s" +msgid "Error changing database file permissions: %s" +msgstr "Virhe avattaessa selväkielistä tietokantatiedostoa \"%s\": %s" + +#: ../src/widgets/calendar-button.c:140 +#, fuzzy, c-format +#| msgid "UI file \"%s/almanah/almanah.ui\" could not be loaded." +msgid "UI file \"%s\" could not be loaded: %s" +msgstr "Käyttöliittymätiedostoa \"%s/almanah/almanah.ui\" ei voitu ladata." + +#: ../src/widgets/calendar-button.c:150 +msgid "Can't load calendar window object from UI file" msgstr "" -"Tietokantaa \"%s\" ei voitu avata. SQLite antoi seuraavan virhee: %s" -#: ../src/storage-manager.c:482 -#, c-format -msgid "" -"Error getting encryption key: GConf key \"%s\" invalid or empty. Your diary " -"will not be encrypted; please install Seahorse and set up a default key, or " -"ignore this message." +#. Translators: This is the detail string for important days as displayed in the calendar. +#: ../src/widgets/calendar.c:176 +msgid "Important!" msgstr "" -"Virhe noudettaessa salausavainta: GConf-avain \"%s\" on viallinen tai tyhjä. " -"Kalenterisi ei ole salattu; asenna Seahorse ja aseta oletusavain, tai " -"jätä tämä viesti huomioimatta." -#: ../src/storage-manager.c:526 ../src/storage-manager.c:559 -#, c-format -msgid "" -"Could not run query \"%s\". SQLite provided the following error message: %s" +#: ../src/widgets/calendar-window.c:80 +msgid "Unknown input device" msgstr "" -"Kyselyä \"%s\" ei voitu suorittaa. SQLite antoi seuraavan virheen: %s" -#: ../src/storage-manager.c:707 -#, c-format -msgid "Are you sure you want to edit this diary entry for %s?" -msgstr "Haluatko varmasti muokata tätä kalenterimerkintää %s?" +#: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:166 +msgid "add tag" +msgstr "" -#: ../src/storage-manager.c:734 -#, c-format -msgid "Are you sure you want to delete this diary entry for %s?" -msgstr "Haluatko varmasti poistaa tämän kalenterimerkinnän %s?" +#: ../src/widgets/entry-tags-area.c:101 +msgid "Write the tag and press enter to save it" +msgstr "" + +#: ../src/widgets/tag-accessible.c:165 +msgid "Remove the tag from the entry" +msgstr "" + +#. Looks like gtk_widget_set_tooltip_text don't works here, even in the init... ? +#: ../src/widgets/tag.c:416 +#, fuzzy +#| msgid "Remove Link" +msgid "Remove tag" +msgstr "Poista linkki" + +#: ../src/widgets/tag-entry.c:85 +msgid "Tag entry" +msgstr "" + +#~ msgid "Add Link" +#~ msgstr "Lisää linkki" + +#~ msgid "Attached Links" +#~ msgstr "Liitetyt linkit" + +#~ msgid "Link Type" +#~ msgstr "Linkin tyyppi" + +#~ msgid "View" +#~ msgstr "Näytä" + +#~ msgid "_Edit" +#~ msgstr "_Muokkaa" + +#~ msgid "_File" +#~ msgstr "_Tiedosto" + +#~ msgid "File" +#~ msgstr "Tiedosto" + +#~ msgid "An attached file." +#~ msgstr "Liitetiedosto." + +#~ msgid "Note" +#~ msgstr "Huomautus" + +#~ msgid "A note about an important event." +#~ msgstr "Huomautus tärkeästä tapahtumasta." + +#~ msgid "URI" +#~ msgstr "URI" + +#~ msgid "A URI of a file or web page." +#~ msgstr "Tiedoston tai www-sivun URI." + +#~ msgid "Due to an unknown error the file cannot be opened." +#~ msgstr "Tuntemattoman virheen takia tiedostoa ei voi avata." + +#~ msgid "Due to an unknown error the URI cannot be opened." +#~ msgstr "URIa ei voi avata tuntemattomasta syystä." + +#~ msgid "- Manage your diary" +#~ msgstr "- hallitse kalenteriasi" +#~ msgid "" +#~ "Error getting encryption key: GConf key \"%s\" invalid or empty. Your " +#~ "diary will not be encrypted; please install Seahorse and set up a default " +#~ "key, or ignore this message." +#~ msgstr "" +#~ "Virhe noudettaessa salausavainta: GConf-avain \"%s\" on viallinen tai " +#~ "tyhjä. Kalenterisi ei ole salattu; asenna Seahorse ja aseta oletusavain, " +#~ "tai jätä tämä viesti huomioimatta." diff -Nru almanah-0.11.1/po/fr.po almanah-0.12.0/po/fr.po --- almanah-0.11.1/po/fr.po 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/fr.po 2019-10-07 13:45:09.000000000 +0000 @@ -8,32 +8,41 @@ # Yannick Tailliez , 2008. # Robert-André Mauchin , 2008. # Pierre Lemaire , 2008. -# Alain Lojewski , 2013. +# Alain Lojewski , 2013_2016. +# Charles Monzat , 2018. # msgid "" msgstr "" "Project-Id-Version: almanah HEAD\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=almanah&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-12-18 13:50+0000\n" -"PO-Revision-Date: 2014-03-16 19:27+0100\n" -"Last-Translator: Michael Scherer \n" -"Language-Team: GNOME French Team \n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/almanah/issues\n" +"POT-Creation-Date: 2018-06-10 15:49+0000\n" +"PO-Revision-Date: 2018-08-30 15:07+0200\n" +"Last-Translator: Charles Monzat \n" +"Language-Team: français \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n>1;\n" -"X-Generator: Poedit 1.5.4\n" -"Language: Fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Gtranslator 2.91.7\n" -#: ../data/almanah.appdata.xml.in.h:1 +#: ../data/almanah.appdata.xml.in.h:1 ../data/almanah.desktop.in.h:1 +#: ../src/application.c:135 ../src/main-window.c:163 +msgid "Almanah Diary" +msgstr "Journal Almanah" + +#: ../data/almanah.appdata.xml.in.h:2 +msgid "Keep a diary of your life" +msgstr "Tenez le journal de votre vie" + +#: ../data/almanah.appdata.xml.in.h:3 msgid "" "Almanah Diary is an application to allow you to keep a diary of your life." msgstr "" "Almanah Diary est une application qui vous permet de garder un journal de " "votre vie." -#: ../data/almanah.appdata.xml.in.h:2 +#: ../data/almanah.appdata.xml.in.h:4 msgid "" "You can encrypt the diary to preserve your privacy. It has editing " "abilities, including text formatting and printing and shows you a lists of " @@ -41,50 +50,16 @@ "appointments from Evolution)." msgstr "" "Vous pouvez chiffrer le journal pour protéger votre vie privée. Il est " -"possible d'éditer et de formater le texte, de l'imprimer et d'afficher une " -"liste d'événements sur votre ordinateur pour chaque jour (tel que les taches " -"et les rendez vous d'Evolution)." - -#: ../data/almanah-app-menu.ui.h:1 -msgid "_Search" -msgstr "_Rechercher" - -#: ../data/almanah-app-menu.ui.h:2 -msgid "Pr_eferences" -msgstr "Préfér_ences" - -#. Set the button label -#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 -msgid "_Import" -msgstr "_Importer" - -#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 -msgid "_Export" -msgstr "_Exporter" - -#: ../data/almanah-app-menu.ui.h:5 -msgid "_Print diary" -msgstr "_Imprimer le journal" - -#: ../data/almanah-app-menu.ui.h:6 -msgid "_About Almanah Diary" -msgstr "À _propos de Journal Almanah" - -#: ../data/almanah-app-menu.ui.h:7 -msgid "_Quit" -msgstr "_Quitter" - -#: ../data/almanah.desktop.in.h:1 ../src/application.c:132 -#: ../src/main-window.c:136 -msgid "Almanah Diary" -msgstr "Journal Almanah" +"possible d’éditer et de formater le texte, de l’imprimer et d’afficher une " +"liste d’événements sur votre ordinateur pour chaque jour (tel que les tâches " +"et les rendez-vous d’Evolution)." #: ../data/almanah.desktop.in.h:2 msgid "Keep a personal diary" msgstr "Tenir un journal personnel" #. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. -#: ../data/almanah.desktop.in.h:3 ../src/application.c:263 +#: ../data/almanah.desktop.in.h:3 ../src/application.c:274 msgid "Diary" msgstr "Journal" @@ -93,205 +68,133 @@ msgid "diary;journal;" msgstr "journal intime;" -#: ../data/almanah.ui.h:1 -msgid "Select Date…" -msgstr "Sélectionner la date…" - -#: ../data/almanah.ui.h:2 -msgid "F_ormat" -msgstr "F_ormat" - -#: ../data/almanah.ui.h:3 -msgid "Toggle whether the currently selected text is bold." -msgstr "Indique si le texte actuellement sélectionné est en gras." - -#: ../data/almanah.ui.h:4 -msgid "Toggle whether the currently selected text is italic." -msgstr "Indique si le texte actuellement sélectionné est en italique." - -#: ../data/almanah.ui.h:5 -msgid "Toggle whether the currently selected text is underlined." -msgstr "Indique si le texte actuellement sélectionné est souligné." - -#: ../data/almanah.ui.h:6 -msgid "Add/Remove _Hyperlink" -msgstr "Ajouter/enlèver un _hyperlien" - -#: ../data/almanah.ui.h:7 -msgid "" -"Add or remove a hyperlink from the currently selected text to a specified " -"URI." -msgstr "" -"Ajoute ou enlève un hyperlien du texte actuellement sélectionné vers un URI " -"donné." - -#: ../data/almanah.ui.h:8 -msgid "Insert _Time" -msgstr "Insérer l'_heure" - -#: ../data/almanah.ui.h:9 -msgid "I_mportant" -msgstr "I_mportant" - -#: ../data/almanah.ui.h:10 -msgid "Toggle whether the current entry is marked as important." -msgstr "Indique si l'élément actuel est marqué comme important." - -#: ../data/almanah.ui.h:11 -msgid "Show tags" -msgstr "Afficher les étiquettes" - -#: ../data/almanah.ui.h:12 -#| msgid "Jump to the current date in the diary." -msgid "Show tags for the current entry" -msgstr "Afficher les étiquettes pour l'entrée actuelle" - -#: ../data/almanah.ui.h:13 -msgid "_Help" -msgstr "Aid_e" - -#: ../data/almanah.ui.h:14 -msgid "Go to _Today" -msgstr "Aller à _aujourd'hui" - -#: ../data/almanah.ui.h:15 -msgid "Jump to the current date in the diary." -msgstr "Saute à la date actuelle du journal." - -#: ../data/almanah.ui.h:16 +#: ../src/ui/almanah.ui.h:1 msgid "Calendar" msgstr "Calendrier" -#: ../data/almanah.ui.h:17 +#: ../src/ui/almanah.ui.h:2 +msgid "Go to Today" +msgstr "Aller à aujourd’hui" + +#: ../src/ui/almanah.ui.h:3 +msgid "Select Date…" +msgstr "Sélectionner la date…" + +#: ../src/ui/almanah.ui.h:4 msgid "Entry editing area" -msgstr "Zone de saisie des entrées" +msgstr "Zone de modification des saisies" -#: ../data/almanah.ui.h:18 +#: ../src/ui/almanah.ui.h:5 msgid "Past events" msgstr "Événements passés" -#: ../data/almanah.ui.h:19 +#: ../src/ui/almanah.ui.h:6 msgid "Past Event List" msgstr "Liste des événements passés" -#: ../data/almanah.ui.h:20 +#: ../src/ui/almanah.ui.h:7 msgid "Search entry" msgstr "Zone de saisie de la recherche" -#: ../data/almanah.ui.h:21 ../src/search-dialog.c:69 +#: ../src/ui/almanah.ui.h:8 ../src/search-dialog.c:69 msgid "Search" msgstr "Rechercher" -#: ../data/almanah.ui.h:22 +#: ../src/ui/almanah.ui.h:9 msgid "Result List" msgstr "Liste des résultats" -#: ../data/almanah.ui.h:23 +#: ../src/ui/almanah.ui.h:10 msgid "View Entry" -msgstr "Afficher l'élément" +msgstr "Afficher l’élément" -#: ../data/almanah.ui.h:24 +#. Translators: Use two common date formats from your locale which will be parsed correctly by GLib +#: ../src/ui/almanah.ui.h:12 msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." msgstr "par ex. « 14/03/2009 » ou « 14 mars 2009 »." -#: ../data/almanah.ui.h:25 +#. Translators: Use two popular URIs from your locale, preferably one on the Internet and one local file. +#: ../src/ui/almanah.ui.h:14 msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." msgstr "" "par ex. « http://google.com/ » ou « file:///home/moi/Photos/photo.jpg »." -#: ../data/almanah.ui.h:26 +#: ../src/ui/almanah.ui.h:15 msgid "Successful Entries" msgstr "Éléments corrects" -#: ../data/almanah.ui.h:27 +#: ../src/ui/almanah.ui.h:16 msgid "Merged Entries" msgstr "Éléments fusionnés" -#: ../data/almanah.ui.h:28 +#: ../src/ui/almanah.ui.h:17 msgid "Failed Entries" msgstr "Éléments non importés" -#: ../data/almanah.ui.h:29 +#: ../src/ui/almanah.ui.h:18 msgid "Import Results List" -msgstr "Liste des résultats de l'importation" +msgstr "Liste des résultats de l’importation" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 +#: ../data/org.gnome.almanah.gschema.xml.in.h:1 msgid "Database encryption key ID" msgstr "Identifiant de la clé de chiffrement de la base de données" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +#: ../data/org.gnome.almanah.gschema.xml.in.h:2 msgid "" "The ID of the key to use to encrypt and decrypt the database, if Almanah has " "been built with encryption support. Leave blank to disable database " "encryption." msgstr "" -"L'identifiant de la clé à utiliser pour chiffrer et déchiffrer la base de " +"L’identifiant de la clé à utiliser pour chiffrer et déchiffrer la base de " "données, pour le cas où Almanah a été compilé avec la prise en charge du " "chiffrement. Le laisser vide pour désactiver le chiffrement de la base de " "données." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 +#: ../data/org.gnome.almanah.gschema.xml.in.h:3 msgid "Spell checking language" msgstr "Langue pour la vérification orthographique" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +#: ../data/org.gnome.almanah.gschema.xml.in.h:4 msgid "The locale specifier of the language in which to check entry spellings." msgstr "" "Indication de la langue à utiliser pour la vérification orthographique des " "entrées." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +#: ../data/org.gnome.almanah.gschema.xml.in.h:5 msgid "Spell checking enabled?" msgstr "Vérification orthographique activée ?" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 +#: ../data/org.gnome.almanah.gschema.xml.in.h:6 msgid "Whether spell checking of entries is enabled." msgstr "" "Indique si la correction orthographique est activée dans les zones de saisie." -#: ../src/application.c:246 +#: ../src/application.c:257 msgid "Error opening database" -msgstr "Erreur lors de l'ouverture de la base de données" +msgstr "Erreur lors de l’ouverture de la base de données" -#. Error loading the CSS -#: ../src/application.c:275 -#, c-format -msgid "" -"Couldn't load the CSS file '%s'. The interface might not be styled correctly" -msgstr "" -"Impossible de charger le fichier CSS « %s ». Il se peut que l'interface ne " -"soit pas correctement agencée" - -#: ../src/application.c:319 +#: ../src/application.c:336 msgid "Enable debug mode" msgstr "Activer le mode de débogage" -#: ../src/application.c:336 +#: ../src/application.c:353 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" "Gérer votre journal. Une seule instance du programme peut être lancée " -"n'importe quand." +"n’importe quand." #. Print an error -#: ../src/application.c:347 +#: ../src/application.c:364 #, c-format msgid "Command line options could not be parsed: %s\n" -msgstr "Les options de la ligne de commande n'ont pas pu être analysées : %s\n" +msgstr "Les options de la ligne de commande n’ont pas pu être analysées : %s\n" -#: ../src/application.c:366 +#: ../src/application.c:383 msgid "Error encrypting database" msgstr "Erreur lors du chiffrement de la base de données" -#: ../src/application.c:419 ../src/date-entry-dialog.c:129 -#: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 -#: ../src/main-window.c:195 ../src/preferences-dialog.c:191 -#: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 -#, c-format -msgid "UI file \"%s\" could not be loaded" -msgstr "Le fichier d'interface « %s » n'a pas pu être chargé" - -#: ../src/application.c:542 +#: ../src/application.c:526 msgid "" "Almanah is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -303,33 +206,33 @@ "publiée par la Free Software Foundation ; soit la version 3 de la Licence, " "ou (à votre discrétion) une version ultérieure quelconque." -#: ../src/application.c:546 +#: ../src/application.c:530 msgid "" "Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " "FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " "details." msgstr "" -"Almanah est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE " +"Almanah est distribué dans l’espoir qu’il sera utile, mais SANS AUCUNE " "GARANTIE ; sans même une garantie implicite de COMMERCIABILITÉ ou DE " "CONFORMITÉ À UNE UTILISATION PARTICULIÈRE. Voir la Licence Publique Générale " "GNU pour plus de détails." -#: ../src/application.c:550 +#: ../src/application.c:534 msgid "" "You should have received a copy of the GNU General Public License along with " "Almanah. If not, see ." msgstr "" "Vous devriez avoir reçu un exemplaire de la Licence Publique Générale GNU " -"avec Almanah. Si ce n'est pas le cas, consultez ." -#: ../src/application.c:565 +#: ../src/application.c:549 #, c-format msgid "A helpful diary keeper, storing %u entries." msgstr "Un organisateur de journal personnel bien utile, stockant %u entrées." -#: ../src/application.c:569 +#: ../src/application.c:553 msgid "Copyright © 2008-2009 Philip Withnall" msgstr "Copyright © 2008-2009 Philip Withnall" @@ -338,7 +241,7 @@ #. * "Translator name 1 \n" #. * "Translator name 2 " #. -#: ../src/application.c:577 +#: ../src/application.c:561 msgid "translator-credits" msgstr "" "Philip Withnall \n" @@ -349,14 +252,30 @@ "Pierre Lemaire \n" "Michael Scherer " -#: ../src/application.c:581 +#: ../src/application.c:565 msgid "Almanah Website" -msgstr "Site Web d'Almanah" +msgstr "Site Web d’Almanah" + +#: ../src/application.c:593 +#, c-format +msgid "" +"Couldn't load the CSS resources. The interface might not be styled " +"correctly: %s" +msgstr "" +"Impossible de charger le fichier CSS. Il se peut que l’interface ne soit pas " +"correctement agencée : %s" #: ../src/date-entry-dialog.c:72 msgid "Select Date" msgstr "Sélectionner la date" +#: ../src/date-entry-dialog.c:127 ../src/import-export-dialog.c:169 +#: ../src/import-export-dialog.c:476 ../src/main-window.c:235 +#: ../src/preferences-dialog.c:177 ../src/search-dialog.c:95 +#: ../src/uri-entry-dialog.c:126 +msgid "UI data could not be loaded" +msgstr "Les données d’interface utilisateur n’ont pu être chargées" + #: ../src/entry.c:303 #, c-format msgid "Invalid data version number %u." @@ -378,7 +297,7 @@ #: ../src/events/calendar-appointment.c:135 ../src/events/calendar-task.c:125 msgid "Error launching Evolution" -msgstr "Erreur lors du lancement d'Evolution" +msgstr "Erreur lors du lancement d’Evolution" #: ../src/events/calendar-task.c:51 msgid "Calendar Task" @@ -398,7 +317,7 @@ "names in the format 'yyyy-mm-dd', and no extension. All entries will be " "exported, unencrypted in plain text format." msgstr "" -"Choisissez un _dossier afin d'y exporter les articles sous forme de fichiers " +"Choisissez un _dossier afin d’y exporter les articles sous forme de fichiers " "texte, un par article. Les noms de fichier sont créés selon le modèle « aaaa-" "mm-jj », sans extension. Tous les articles sont exportés dans un format " "texte brut, non chiffré." @@ -417,56 +336,132 @@ #: ../src/export-operation.c:256 ../src/export-operation.c:313 #, c-format -#| msgid "Error opening encrypted database file \"%s\": %s" msgid "Error changing exported file permissions: %s" msgstr "Erreur lors du changement des permissions du fichier exporté : %s" -#: ../src/import-export-dialog.c:202 +#: ../src/gtk/menus.ui.h:1 +msgid "_Search" +msgstr "_Rechercher" + +#: ../src/gtk/menus.ui.h:2 +msgid "Pr_eferences" +msgstr "Préfér_ences" + +#: ../src/gtk/menus.ui.h:3 +msgctxt "Main menu" +msgid "_Import" +msgstr "_Importer" + +#: ../src/gtk/menus.ui.h:4 +msgctxt "Main menu" +msgid "_Export" +msgstr "_Exporter" + +#: ../src/gtk/menus.ui.h:5 +msgid "_Print diary" +msgstr "_Imprimer le journal" + +#: ../src/gtk/menus.ui.h:6 +msgid "_About Almanah Diary" +msgstr "À _propos de Journal Almanah" + +#: ../src/gtk/menus.ui.h:7 +msgid "_Quit" +msgstr "_Quitter" + +#: ../src/gtk/menus.ui.h:8 +msgid "_Bold" +msgstr "_Gras" + +#: ../src/gtk/menus.ui.h:9 +msgid "_Italic" +msgstr "_Italique" + +#: ../src/gtk/menus.ui.h:10 +msgid "_Underline" +msgstr "So_uligné" + +#: ../src/gtk/menus.ui.h:11 +msgid "_Cut" +msgstr "_Couper" + +#: ../src/gtk/menus.ui.h:12 +msgid "_Copy" +msgstr "Co_pier" + +#: ../src/gtk/menus.ui.h:13 +msgid "_Paste" +msgstr "C_oller" + +#: ../src/gtk/menus.ui.h:14 ../src/main-window.c:640 +msgid "_Delete" +msgstr "_Supprimer" + +#: ../src/gtk/menus.ui.h:15 +msgid "Insert _Time" +msgstr "Insérer l’_heure" + +#: ../src/gtk/menus.ui.h:16 +msgid "Add/Remove _Hyperlink" +msgstr "Ajouter/enlever un hyperlie_n" + +#: ../src/import-export-dialog.c:203 msgid "Import _mode: " -msgstr "_Mode d'importation : " +msgstr "_Mode d’importation : " -#: ../src/import-export-dialog.c:202 +#: ../src/import-export-dialog.c:203 msgid "Export _mode: " -msgstr "Mode d'e_xportation : " +msgstr "_Mode d’exportation : " #. Set the window title -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Import Entries" msgstr "Importer les éléments" -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Export Entries" msgstr "Exporter les éléments" -#: ../src/import-export-dialog.c:245 +#. Translators: These are verbs. +#: ../src/import-export-dialog.c:211 +msgctxt "Dialog button" +msgid "_Import" +msgstr "_Importer" + +#: ../src/import-export-dialog.c:211 +msgctxt "Dialog button" +msgid "_Export" +msgstr "_Exporter" + +#: ../src/import-export-dialog.c:248 msgid "Import failed" -msgstr "L'importation a échoué" +msgstr "L’importation a échoué" -#: ../src/import-export-dialog.c:283 +#: ../src/import-export-dialog.c:286 msgid "Export failed" -msgstr "L'exportation a échoué" +msgstr "L’exportation a échoué" -#: ../src/import-export-dialog.c:296 +#: ../src/import-export-dialog.c:299 msgid "Export successful" -msgstr "L'exportation a réussi" +msgstr "L’exportation a réussi" -#: ../src/import-export-dialog.c:297 +#: ../src/import-export-dialog.c:300 msgid "The diary was successfully exported." msgstr "Le journal a été exporté avec succès." -#: ../src/import-export-dialog.c:445 +#: ../src/import-export-dialog.c:448 msgid "Import Results" -msgstr "Résultats d'importation" +msgstr "Résultats d’importation" #. Translators: This is a strftime()-format string for the dates displayed in import results. #. Translators: This is a strftime()-format string for the date to display when asking about editing a diary entry. #. Translators: This is a strftime()-format string for the date to display when asking about deleting a diary entry. +#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. -#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. -#: ../src/import-export-dialog.c:539 ../src/main-window.c:567 -#: ../src/main-window.c:597 ../src/printing.c:263 ../src/search-dialog.c:182 -#: ../src/widgets/calendar-button.c:309 +#: ../src/import-export-dialog.c:543 ../src/main-window.c:601 +#: ../src/main-window.c:632 ../src/main-window.c:1271 ../src/printing.c:263 +#: ../src/search-dialog.c:180 msgid "%A, %e %B %Y" msgstr "%A %e %B %Y" @@ -484,13 +479,13 @@ msgid "Select a database _file created by Almanah Diary to import." msgstr "" "Choisissez un _fichier base de données créé par Journal Almanah afin de " -"l'importer." +"l’importer." #: ../src/import-operation.c:248 #, c-format msgid "Error deserializing imported entry into buffer: %s" msgstr "" -"Erreur lors de la désérialisation de l'élément importé dans le tampon : %s" +"Erreur lors de la désérialisation de l’élément importé dans le tampon : %s" #: ../src/import-operation.c:264 #, c-format @@ -498,8 +493,8 @@ "Error deserializing existing entry into buffer; overwriting with imported " "entry: %s" msgstr "" -"Erreur lors de la désérialisation de l'entrée existante dans le tampon ; " -"écrasement par l'élément importé : %s" +"Erreur lors de la désérialisation de l’entrée existante dans le tampon ; " +"écrasement par l’élément importé : %s" #. Append some header text for the imported entry #. Translators: This text is appended to an existing entry when an entry is being imported to the same date. @@ -517,69 +512,87 @@ "Élément importé de « %s » :\n" "\n" -#: ../src/main-window.c:571 +#: ../src/main-window.c:605 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" msgstr "Voulez-vous vraiment modifier cette entrée de journal du %s ?" -#: ../src/main-window.c:601 +#: ../src/main-window.c:608 ../src/main-window.c:639 +msgid "_Cancel" +msgstr "_Annuler" + +#: ../src/main-window.c:609 +msgid "_Edit" +msgstr "_Modifier" + +#: ../src/main-window.c:636 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" msgstr "Voulez-vous vraiment supprimer cette entrée de journal du %s ?" #. Print a warning about the unknown tag -#: ../src/main-window.c:710 +#: ../src/main-window.c:746 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." -msgstr "Étiquette texte « %s » de l'entrée inconnue ou en double. Ignorée." +msgstr "Étiquette texte « %s » de l’entrée inconnue ou en double. Ignorée." -#: ../src/main-window.c:918 +#: ../src/main-window.c:987 msgid "Error opening URI" -msgstr "Erreur lors de l'ouverture de l'URI" +msgstr "Erreur lors de l’ouverture de l’URI" #. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place -#: ../src/main-window.c:1092 +#: ../src/main-window.c:1198 #, c-format msgid "%s @ %s" msgstr "%s @ %s" -#: ../src/main-window.c:1171 +#: ../src/main-window.c:1304 msgid "Entry content could not be loaded" -msgstr "Le contenu de l'entrée n'a pas pu être chargé" +msgstr "Le contenu de l’entrée n’a pas pu être chargé" -#: ../src/main-window.c:1348 +#. Translators: this sentence is just used in startup to estimate the width +#. of a 15 words sentence. Translate with some random sentences with just 15 words. +#. See: https://bugzilla.gnome.org/show_bug.cgi?id=754841 +#: ../src/main-window.c:1459 +msgid "" +"This is just a fifteen words sentence to calculate the diary entry text view " +"size" +msgstr "" +"Cette phrase de quinze mots sert à calculer la taille de la zone de saisie" + +#: ../src/main-window.c:1496 msgid "Spelling checker could not be initialized" -msgstr "Le correcteur orthographique n'a pas pu être initialisé" +msgstr "Le correcteur orthographique n’a pas pu être initialisé" -#: ../src/preferences-dialog.c:91 -msgid "Almanah Preferences" -msgstr "Préférences d'Almanah" +#: ../src/preferences-dialog.c:83 +msgid "Preferences" +msgstr "Préférences" #. Grab our child widgets -#: ../src/preferences-dialog.c:217 +#: ../src/preferences-dialog.c:204 msgid "Encryption key: " msgstr "Clé de chiffrement : " -#: ../src/preferences-dialog.c:222 +#: ../src/preferences-dialog.c:208 msgid "None (don't encrypt)" msgstr "Aucune (ne pas chiffrer)" -#: ../src/preferences-dialog.c:246 +#: ../src/preferences-dialog.c:213 msgid "New _Key" msgstr "Nouvelle _clé" #. Set up the "Enable spell checking" check button -#: ../src/preferences-dialog.c:253 +#: ../src/preferences-dialog.c:237 msgid "Enable _spell checking" -msgstr "Activer la _vérification orthographique" +msgstr "Activer la vérification _orthographique" -#: ../src/preferences-dialog.c:279 +#: ../src/preferences-dialog.c:262 msgid "Error saving the encryption key" -msgstr "Erreur lors de l'enregistrement de la clé de chiffrement" +msgstr "Erreur lors de l’enregistrement de la clé de chiffrement" -#: ../src/preferences-dialog.c:298 +#: ../src/preferences-dialog.c:281 msgid "Error opening Seahorse" -msgstr "Erreur lors de l'ouverture de Seahorse" +msgstr "Erreur lors de l’ouverture de Seahorse" #: ../src/printing.c:277 msgid "This entry is marked as important." @@ -589,186 +602,249 @@ msgid "No entry for this date." msgstr "Aucune entrée pour cette date." -#: ../src/printing.c:453 +#: ../src/printing.c:457 msgid "Start date:" msgstr "Date de début :" -#: ../src/printing.c:455 +#: ../src/printing.c:459 msgid "End date:" msgstr "Date de fin :" #. Line spacing -#: ../src/printing.c:471 +#: ../src/printing.c:475 msgid "Line spacing:" msgstr "Interligne :" -#: ../src/search-dialog.c:223 +#: ../src/search-dialog.c:221 msgid "Search canceled." msgstr "Recherche annulée." #. Translators: This is an error message wrapper for when searches encounter an error. The placeholder is for an error message. -#: ../src/search-dialog.c:226 +#: ../src/search-dialog.c:224 #, c-format msgid "Error: %s" msgstr "Erreur : %s" #. Success! -#: ../src/search-dialog.c:231 +#: ../src/search-dialog.c:229 #, c-format msgid "Found %d entry:" msgid_plural "Found %d entries:" msgstr[0] "%d entrée trouvée :" msgstr[1] "%d entrées trouvées :" -#: ../src/search-dialog.c:280 +#: ../src/search-dialog.c:278 msgid "Searching…" msgstr "Recherche en cours…" -#: ../src/storage-manager.c:276 +#: ../src/storage-manager.c:247 +#, c-format +msgid "" +"Could not open database \"%s\". SQLite provided the following error message: " +"%s" +msgstr "" +"Impossible d’ouvrir la base de données « %s ». SQLite a fourni le message " +"d’erreur suivant : %s" + +#: ../src/storage-manager.c:290 +#, c-format +msgid "" +"Could not run query \"%s\". SQLite provided the following error message: %s" +msgstr "" +"Impossible de lancer la requête « %s ». SQLite a fourni le message d’erreur " +"suivant : %s" + +#: ../src/storage-manager.c:596 +msgid "Error deserializing entry into buffer while searching." +msgstr "" +"Erreur lors de la désérialisation de l’entrée dans le tampon pendant la " +"recherche." + +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Saisissez l’URI" + +#: ../src/vfs.c:291 #, c-format msgid "GPGME is not at least version %s" msgstr "La version de GPGME est inférieure à %s" -#: ../src/storage-manager.c:285 +#: ../src/vfs.c:298 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "GPGME ne prend pas en charge OpenPGP : %s" -#: ../src/storage-manager.c:294 +#: ../src/vfs.c:305 #, c-format msgid "Error creating cipher context: %s" msgstr "Erreur lors de la création du contexte de chiffrement : %s" -#: ../src/storage-manager.c:323 +#: ../src/vfs.c:325 #, c-format -msgid "Error opening encrypted database file \"%s\": %s" +msgid "Can't create a new GIOChannel for the encrypted database: %s" msgstr "" -"Erreur lors de l'ouverture du fichier chiffré de la base de données « %s » : " -"%s" +"Impossible de créer l’interface technique (GIOChannel) pour la base de " +"données chiffrées : %s" -#: ../src/storage-manager.c:342 +#: ../src/vfs.c:333 #, c-format -msgid "Error opening plain database file \"%s\": %s" +msgid "Error opening encrypted database file \"%s\": %s" msgstr "" -"Erreur lors de l'ouverture du fichier en clair de la base de données " -"« %s » : %s" +"Erreur lors de l’ouverture du fichier chiffré de la base de données « %s » : " +"%s" -#: ../src/storage-manager.c:390 -msgid "" -"The encrypted database is empty. The plain database file has been left " -"undeleted as backup." +#: ../src/vfs.c:349 +#, c-format +msgid "Error creating Callback base data buffer: %s" msgstr "" -"La base de données chiffrée est vide. Le fichier de base de données en clair " -"n'a pas été supprimé et est disponible comme sauvegarde." +"Erreur lors de la création du mécanisme de retour du tampon de données : %s" -#. Delete the plain file -#: ../src/storage-manager.c:393 +#: ../src/vfs.c:357 #, c-format -msgid "Could not delete plain database file \"%s\"." +msgid "Can't create a new GIOChannel for the plain database: %s" msgstr "" -"Impossible de supprimer le fichier en clair de la base de données « %s »." +"Impossible de créer l’interface technique (GIOChannel) pour la base de " +"données en texte brut : %s" -#: ../src/storage-manager.c:434 +#: ../src/vfs.c:365 #, c-format -msgid "Error decrypting database: %s" -msgstr "Erreur lors du déchiffrement de la base de données : %s" +msgid "Error opening plain database file \"%s\": %s" +msgstr "" +"Erreur lors de l’ouverture du fichier en clair de la base de données " +"« %s » : %s" -#: ../src/storage-manager.c:468 +#: ../src/vfs.c:461 #, c-format msgid "Error getting encryption key: %s" -msgstr "Erreur lors de l'obtention de la clé de chiffrement : %s" +msgstr "Erreur lors de l’obtention de la clé de chiffrement : %s" -#: ../src/storage-manager.c:489 +#: ../src/vfs.c:485 ../src/vfs.c:491 #, c-format msgid "Error encrypting database: %s" msgstr "Erreur lors du chiffrement de la base de données : %s" -#: ../src/storage-manager.c:549 +#. Translators: The first and second params are file paths, the last param is an error message. +#: ../src/vfs.c:541 +#, c-format +msgid "Error copying the file from %s to %s: %s" +msgstr "Erreur lors de la copie du fichier de %s vers %s : %s" + +#: ../src/vfs.c:547 #, c-format -#| msgid "Error opening plain database file \"%s\": %s" msgid "Error changing database backup file permissions: %s" msgstr "" "Erreur lors du changement des permissions du fichier de sauvegarde : %s" -#: ../src/storage-manager.c:571 ../src/storage-manager.c:627 +#: ../src/vfs.c:647 #, c-format -#| msgid "Error opening plain database file \"%s\": %s" -msgid "Error changing database file permissions: %s" -msgstr "" -"Erreur lors du changement des permissions du fichier de base de données : %s" +msgid "Error closing file: %s" +msgstr "Erreur lors de la clôture du fichier : %s" -#. Translators: the first parameter is a filename, the second is an error message. -#: ../src/storage-manager.c:583 ../src/storage-manager.c:611 +#. Translators: the first parameter is a filename. +#: ../src/vfs.c:1046 ../src/vfs.c:1073 #, c-format -#| msgid "Error opening plain database file \"%s\": %s" -msgid "Error backing up file ‘%s’: %s" -msgstr "Erreur lors de la sauvegarde du fichier « %s » : %s" +msgid "Error backing up file ‘%s’" +msgstr "Erreur lors de la sauvegarde du fichier « %s »" -#: ../src/storage-manager.c:620 +#: ../src/vfs.c:1059 #, c-format -msgid "" -"Could not open database \"%s\". SQLite provided the following error message: " -"%s" -msgstr "" -"Impossible d'ouvrir la base de données « %s ». SQLite a fourni le message " -"d'erreur suivant : %s" +msgid "Error decrypting database: %s" +msgstr "Erreur lors du déchiffrement de la base de données : %s" -#: ../src/storage-manager.c:704 +#: ../src/vfs.c:1099 #, c-format -msgid "" -"Could not run query \"%s\". SQLite provided the following error message: %s" -msgstr "" -"Impossible de lancer la requête « %s ». SQLite a fourni le message d'erreur " -"suivant : %s" - -#: ../src/storage-manager.c:1010 -msgid "Error deserializing entry into buffer while searching." +msgid "Error changing database file permissions: %s" msgstr "" -"Erreur lors de la désérialisation de l'entrée dans le tampon pendant la " -"recherche." - -#: ../src/uri-entry-dialog.c:71 -msgid "Enter URI" -msgstr "Saisissez l'URI" +"Erreur lors du changement des permissions du fichier de base de données : %s" -#: ../src/widgets/calendar-button.c:140 +#: ../src/widgets/calendar-button.c:142 #, c-format -msgid "UI file \"%s\" could not be loaded: %s" -msgstr "Le fichier d'interface « %s » n'a pas pu être chargé : %s" +msgid "UI data could not be loaded: %s" +msgstr "Les données d’interface utilisateur n’ont pas pu être chargées : %s" -#: ../src/widgets/calendar-button.c:150 +#: ../src/widgets/calendar-button.c:152 msgid "Can't load calendar window object from UI file" msgstr "" -"Impossible de charger l'objet fenêtre du calendrier à partir du fichier " -"d'interface" +"Impossible de charger l’objet fenêtre du calendrier à partir du fichier " +"d’interface" #. Translators: This is the detail string for important days as displayed in the calendar. #: ../src/widgets/calendar.c:176 msgid "Important!" msgstr "Important !" -#: ../src/widgets/calendar-window.c:80 -msgid "Unknown input device" -msgstr "Périphérique d'entrée inconnu" - #: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:166 msgid "add tag" msgstr "ajouter une étiquette" #: ../src/widgets/entry-tags-area.c:101 msgid "Write the tag and press enter to save it" -msgstr "Écrire l'étiquette et appuyer sur entrée pour enregistrer" +msgstr "Écrire l’étiquette et appuyer sur entrée pour l’enregistrer" #: ../src/widgets/tag-accessible.c:165 msgid "Remove the tag from the entry" -msgstr "Retirer l'étiquette de l'entrée" +msgstr "Supprimer l’étiquette de l’élément" #. Looks like gtk_widget_set_tooltip_text don't works here, even in the init... ? #: ../src/widgets/tag.c:416 msgid "Remove tag" -msgstr "Supprimer l'étiquette" +msgstr "Supprimer l’étiquette" #: ../src/widgets/tag-entry.c:85 -#| msgid "Search entry" msgid "Tag entry" -msgstr "Ajout d'étiquette" +msgstr "Ajout d’étiquette" + +#~ msgid "F_ormat" +#~ msgstr "F_ormat" + +#~ msgid "Toggle whether the currently selected text is bold." +#~ msgstr "Indique si le texte actuellement sélectionné est en gras." + +#~ msgid "Toggle whether the currently selected text is italic." +#~ msgstr "Indique si le texte actuellement sélectionné est en italique." + +#~ msgid "Toggle whether the currently selected text is underlined." +#~ msgstr "Indique si le texte actuellement sélectionné est souligné." + +#~ msgid "" +#~ "Add or remove a hyperlink from the currently selected text to a specified " +#~ "URI." +#~ msgstr "" +#~ "Ajoute ou enlève un hyperlien du texte actuellement sélectionné vers un " +#~ "URI donné." + +#~ msgid "I_mportant" +#~ msgstr "I_mportant" + +#~ msgid "Toggle whether the current entry is marked as important." +#~ msgstr "Indique si l'élément actuel est marqué comme important." + +#~ msgid "Show tags" +#~ msgstr "Afficher les étiquettes" + +#~| msgid "Jump to the current date in the diary." +#~ msgid "Show tags for the current entry" +#~ msgstr "Afficher les étiquettes pour l'entrée actuelle" + +#~ msgid "_Help" +#~ msgstr "Aid_e" + +#~ msgid "Jump to the current date in the diary." +#~ msgstr "Saute à la date actuelle du journal." + +#~ msgid "Almanah Preferences" +#~ msgstr "Préférences d'Almanah" + +#~ msgid "" +#~ "The encrypted database is empty. The plain database file has been left " +#~ "undeleted as backup." +#~ msgstr "" +#~ "La base de données chiffrée est vide. Le fichier de base de données en " +#~ "clair n'a pas été supprimé et est disponible comme sauvegarde." + +#~ msgid "Could not delete plain database file \"%s\"." +#~ msgstr "" +#~ "Impossible de supprimer le fichier en clair de la base de données « %s »." + +#~ msgid "Unknown input device" +#~ msgstr "Périphérique d'entrée inconnu" diff -Nru almanah-0.11.1/po/fur.po almanah-0.12.0/po/fur.po --- almanah-0.11.1/po/fur.po 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.12.0/po/fur.po 2019-10-07 13:45:09.000000000 +0000 @@ -0,0 +1,719 @@ +# Friulian translation for almanah. +# Copyright (C) 2017 almanah's COPYRIGHT HOLDER +# This file is distributed under the same license as the almanah package. +# Fabio Tomat , 2017. +# +msgid "" +msgstr "" +"Project-Id-Version: almanah master\n" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" +"product=almanah&keywords=I18N+L10N&component=General\n" +"POT-Creation-Date: 2017-02-27 16:29+0000\n" +"PO-Revision-Date: 2017-03-08 22:05+0100\n" +"Language-Team: Friulian \n" +"Language: fur\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Last-Translator: Fabio Tomat \n" +"X-Generator: Poedit 1.8.12\n" + +#: ../data/almanah.appdata.xml.in.h:1 ../data/almanah.desktop.in.h:1 +#: ../src/application.c:135 ../src/main-window.c:163 +msgid "Almanah Diary" +msgstr "Diari Almanah" + +#: ../data/almanah.appdata.xml.in.h:2 +msgid "Keep a diary of your life" +msgstr "Ten un diari de tô vite" + +#: ../data/almanah.appdata.xml.in.h:3 +msgid "" +"Almanah Diary is an application to allow you to keep a diary of your life." +msgstr "" +"Diari Almanah e je une aplicazion che ti permet di tignî un diari de tô vite." + +#: ../data/almanah.appdata.xml.in.h:4 +msgid "" +"You can encrypt the diary to preserve your privacy. It has editing " +"abilities, including text formatting and printing and shows you a lists of " +"events which happened (on your computer) for each day (such as tasks and " +"appointments from Evolution)." +msgstr "" +"Tu puedis cifrâ il diari par preservâ la tô privacy. Al à abilitâts di " +"editôr, includudis la formatazion dal test, stampe e mostrâ listis di events " +"che ti son capitadis (sul to computer) par ogni dî (come ativitâts e " +"apontaments di evolution)." + +#: ../data/almanah.desktop.in.h:2 +msgid "Keep a personal diary" +msgstr "Ten un diari personâl" + +#. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. +#: ../data/almanah.desktop.in.h:3 ../src/application.c:274 +msgid "Diary" +msgstr "Diari" + +#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../data/almanah.desktop.in.h:5 +msgid "diary;journal;" +msgstr "diari;agjende;" + +#: ../src/ui/almanah.ui.h:1 +msgid "Calendar" +msgstr "Calendari" + +#: ../src/ui/almanah.ui.h:2 +msgid "Go to Today" +msgstr "Va a vuê" + +#: ../src/ui/almanah.ui.h:3 +msgid "Select Date…" +msgstr "Selezione date..." + +#: ../src/ui/almanah.ui.h:4 +msgid "Entry editing area" +msgstr "Aree di modifiche de vôs" + +#: ../src/ui/almanah.ui.h:5 +msgid "Past events" +msgstr "Events passâts" + +#: ../src/ui/almanah.ui.h:6 +msgid "Past Event List" +msgstr "Liste events passats" + +#: ../src/ui/almanah.ui.h:7 +msgid "Search entry" +msgstr "Cîr vôs" + +#: ../src/ui/almanah.ui.h:8 ../src/search-dialog.c:69 +msgid "Search" +msgstr "Cîr" + +#: ../src/ui/almanah.ui.h:9 +msgid "Result List" +msgstr "Liste risultâts" + +#: ../src/ui/almanah.ui.h:10 +msgid "View Entry" +msgstr "Viôt vôs" + +#. Translators: Use two common date formats from your locale which will be parsed correctly by GLib +#: ../src/ui/almanah.ui.h:12 +msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." +msgstr "p.e. \"14/03/2009\" o \"14 di Març dal 2009\"." + +#. Translators: Use two popular URIs from your locale, preferably one on the Internet and one local file. +#: ../src/ui/almanah.ui.h:14 +msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." +msgstr "p.e. “http://google.com/” o “file:///home/jo/Fotos/foto.jpg”." + +#: ../src/ui/almanah.ui.h:15 +msgid "Successful Entries" +msgstr "" + +#: ../src/ui/almanah.ui.h:16 +msgid "Merged Entries" +msgstr "" + +#: ../src/ui/almanah.ui.h:17 +msgid "Failed Entries" +msgstr "" + +#: ../src/ui/almanah.ui.h:18 +msgid "Import Results List" +msgstr "" + +#: ../data/org.gnome.almanah.gschema.xml.in.h:1 +msgid "Database encryption key ID" +msgstr "" + +#: ../data/org.gnome.almanah.gschema.xml.in.h:2 +msgid "" +"The ID of the key to use to encrypt and decrypt the database, if Almanah has " +"been built with encryption support. Leave blank to disable database " +"encryption." +msgstr "" + +#: ../data/org.gnome.almanah.gschema.xml.in.h:3 +msgid "Spell checking language" +msgstr "" + +#: ../data/org.gnome.almanah.gschema.xml.in.h:4 +msgid "The locale specifier of the language in which to check entry spellings." +msgstr "" + +#: ../data/org.gnome.almanah.gschema.xml.in.h:5 +msgid "Spell checking enabled?" +msgstr "" + +#: ../data/org.gnome.almanah.gschema.xml.in.h:6 +msgid "Whether spell checking of entries is enabled." +msgstr "" + +#: ../src/application.c:257 +msgid "Error opening database" +msgstr "" + +#: ../src/application.c:336 +msgid "Enable debug mode" +msgstr "" + +#: ../src/application.c:353 +msgid "" +"Manage your diary. Only one instance of the program may be open at any time." +msgstr "" + +#. Print an error +#: ../src/application.c:364 +#, c-format +msgid "Command line options could not be parsed: %s\n" +msgstr "" + +#: ../src/application.c:383 +msgid "Error encrypting database" +msgstr "" + +#: ../src/application.c:526 +msgid "" +"Almanah is free software: you can redistribute it and/or modify it under the " +"terms of the GNU General Public License as published by the Free Software " +"Foundation, either version 3 of the License, or (at your option) any later " +"version." +msgstr "" + +#: ../src/application.c:530 +msgid "" +"Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " +"details." +msgstr "" + +#: ../src/application.c:534 +msgid "" +"You should have received a copy of the GNU General Public License along with " +"Almanah. If not, see ." +msgstr "" + +#: ../src/application.c:549 +#, c-format +msgid "A helpful diary keeper, storing %u entries." +msgstr "" + +#: ../src/application.c:553 +msgid "Copyright © 2008-2009 Philip Withnall" +msgstr "" + +#. Translators: please include your names here to be credited for your hard work! +#. * Format: +#. * "Translator name 1 \n" +#. * "Translator name 2 " +#. +#: ../src/application.c:561 +msgid "translator-credits" +msgstr "Fabio Tomat " + +#: ../src/application.c:565 +msgid "Almanah Website" +msgstr "Sît web Almanah" + +#: ../src/application.c:593 +#, c-format +msgid "" +"Couldn't load the CSS resources. The interface might not be styled " +"correctly: %s" +msgstr "" + +#: ../src/date-entry-dialog.c:72 +msgid "Select Date" +msgstr "Selezione date" + +#: ../src/date-entry-dialog.c:127 ../src/import-export-dialog.c:169 +#: ../src/import-export-dialog.c:476 ../src/main-window.c:235 +#: ../src/preferences-dialog.c:177 ../src/search-dialog.c:95 +#: ../src/uri-entry-dialog.c:126 +msgid "UI data could not be loaded" +msgstr "" + +#: ../src/entry.c:303 +#, c-format +msgid "Invalid data version number %u." +msgstr "" + +#: ../src/events/calendar-appointment.c:51 +msgid "Calendar Appointment" +msgstr "Apontament calendari" + +#: ../src/events/calendar-appointment.c:52 +msgid "An appointment on an Evolution calendar." +msgstr "Un apontament suntun calendari di Evolution." + +#. Translators: This is a time string with the format hh:mm +#: ../src/events/calendar-appointment.c:89 ../src/events/calendar-task.c:90 +#, c-format +msgid "%.2d:%.2d" +msgstr "" + +#: ../src/events/calendar-appointment.c:135 ../src/events/calendar-task.c:125 +msgid "Error launching Evolution" +msgstr "" + +#: ../src/events/calendar-task.c:51 +msgid "Calendar Task" +msgstr "Ativitât calendari" + +#: ../src/events/calendar-task.c:52 +msgid "A task on an Evolution calendar." +msgstr "Une ativitât suntun calendari di Evolution." + +#: ../src/export-operation.c:47 ../src/import-operation.c:45 +msgid "Text Files" +msgstr "File di test" + +#: ../src/export-operation.c:48 +msgid "" +"Select a _folder to export the entries to as text files, one per entry, with " +"names in the format 'yyyy-mm-dd', and no extension. All entries will be " +"exported, unencrypted in plain text format." +msgstr "" + +#: ../src/export-operation.c:52 ../src/import-operation.c:50 +msgid "Database" +msgstr "Base di dâts" + +#: ../src/export-operation.c:53 +msgid "" +"Select a _filename for a complete copy of the unencrypted Almanah Diary " +"database to be given." +msgstr "" + +#: ../src/export-operation.c:256 ../src/export-operation.c:313 +#, c-format +msgid "Error changing exported file permissions: %s" +msgstr "" + +#: ../src/gtk/menus.ui.h:1 +msgid "_Search" +msgstr "_Cîr" + +#: ../src/gtk/menus.ui.h:2 +msgid "Pr_eferences" +msgstr "Pr_eferencis" + +#: ../src/gtk/menus.ui.h:3 +msgctxt "Main menu" +msgid "_Import" +msgstr "_Impuarte" + +#: ../src/gtk/menus.ui.h:4 +msgctxt "Main menu" +msgid "_Export" +msgstr "_Espuarte" + +#: ../src/gtk/menus.ui.h:5 +msgid "_Print diary" +msgstr "_Stampe diari" + +#: ../src/gtk/menus.ui.h:6 +msgid "_About Almanah Diary" +msgstr "_Informazions su Diari Almanah" + +#: ../src/gtk/menus.ui.h:7 +msgid "_Quit" +msgstr "_Jes" + +#: ../src/gtk/menus.ui.h:8 +msgid "_Bold" +msgstr "_Neret" + +#: ../src/gtk/menus.ui.h:9 +msgid "_Italic" +msgstr "Cors_îf" + +#: ../src/gtk/menus.ui.h:10 +msgid "_Underline" +msgstr "_Sotlineât" + +#: ../src/gtk/menus.ui.h:11 +msgid "_Cut" +msgstr "_Taie" + +#: ../src/gtk/menus.ui.h:12 +msgid "_Copy" +msgstr "_Copie" + +#: ../src/gtk/menus.ui.h:13 +msgid "_Paste" +msgstr "T_ache" + +#: ../src/gtk/menus.ui.h:14 ../src/main-window.c:640 +msgid "_Delete" +msgstr "_Elimine" + +#: ../src/gtk/menus.ui.h:15 +msgid "Insert _Time" +msgstr "Inserìs _ore" + +#: ../src/gtk/menus.ui.h:16 +msgid "Add/Remove _Hyperlink" +msgstr "Zonte/Gjave colegament _ipertestuâl" + +#: ../src/import-export-dialog.c:203 +msgid "Import _mode: " +msgstr "" + +#: ../src/import-export-dialog.c:203 +msgid "Export _mode: " +msgstr "" + +#. Set the window title +#: ../src/import-export-dialog.c:206 +msgid "Import Entries" +msgstr "" + +#: ../src/import-export-dialog.c:206 +msgid "Export Entries" +msgstr "" + +#. Translators: These are verbs. +#: ../src/import-export-dialog.c:211 +msgctxt "Dialog button" +msgid "_Import" +msgstr "_Impuarte" + +#: ../src/import-export-dialog.c:211 +msgctxt "Dialog button" +msgid "_Export" +msgstr "_Espuarte" + +#: ../src/import-export-dialog.c:248 +msgid "Import failed" +msgstr "Importazion falide" + +#: ../src/import-export-dialog.c:286 +msgid "Export failed" +msgstr "Esportazion falide" + +#: ../src/import-export-dialog.c:299 +msgid "Export successful" +msgstr "Esportazion lade ben" + +#: ../src/import-export-dialog.c:300 +msgid "The diary was successfully exported." +msgstr "" + +#: ../src/import-export-dialog.c:448 +msgid "Import Results" +msgstr "" + +#. Translators: This is a strftime()-format string for the dates displayed in import results. +#. Translators: This is a strftime()-format string for the date to display when asking about editing a diary entry. +#. Translators: This is a strftime()-format string for the date to display when asking about deleting a diary entry. +#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. +#. Translators: This is a strftime()-format string for the date displayed above each printed entry. +#. Translators: This is a strftime()-format string for the dates displayed in search results. +#: ../src/import-export-dialog.c:543 ../src/main-window.c:601 +#: ../src/main-window.c:632 ../src/main-window.c:1271 ../src/printing.c:263 +#: ../src/search-dialog.c:180 +msgid "%A, %e %B %Y" +msgstr "%A, %e di %B dal %Y" + +#: ../src/import-operation.c:46 +msgid "" +"Select a _folder containing text files, one per entry, with names in the " +"format 'yyyy-mm-dd', and no extension. Any and all such files will be " +"imported." +msgstr "" + +#: ../src/import-operation.c:51 +msgid "Select a database _file created by Almanah Diary to import." +msgstr "" + +#: ../src/import-operation.c:248 +#, c-format +msgid "Error deserializing imported entry into buffer: %s" +msgstr "" + +#: ../src/import-operation.c:264 +#, c-format +msgid "" +"Error deserializing existing entry into buffer; overwriting with imported " +"entry: %s" +msgstr "" + +#. Append some header text for the imported entry +#. Translators: This text is appended to an existing entry when an entry is being imported to the same date. +#. * The imported entry is appended to this text. +#: ../src/import-operation.c:305 +#, c-format +msgid "" +"\n" +"\n" +"Entry imported from \"%s\":\n" +"\n" +msgstr "" + +#: ../src/main-window.c:605 +#, c-format +msgid "Are you sure you want to edit this diary entry for %s?" +msgstr "" + +#: ../src/main-window.c:608 ../src/main-window.c:639 +msgid "_Cancel" +msgstr "_Anule" + +#: ../src/main-window.c:609 +msgid "_Edit" +msgstr "_Modifiche" + +#: ../src/main-window.c:636 +#, c-format +msgid "Are you sure you want to delete this diary entry for %s?" +msgstr "" + +#. Print a warning about the unknown tag +#: ../src/main-window.c:746 +#, c-format +msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." +msgstr "" + +#: ../src/main-window.c:987 +msgid "Error opening URI" +msgstr "Erôr tal vierzi il URI" + +#. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place +#: ../src/main-window.c:1198 +#, c-format +msgid "%s @ %s" +msgstr "%s - %s" + +#: ../src/main-window.c:1304 +msgid "Entry content could not be loaded" +msgstr "" + +#. Translators: this sentence is just used in startup to estimate the width +#. of a 15 words sentence. Translate with some random sentences with just 15 words. +#. See: https://bugzilla.gnome.org/show_bug.cgi?id=754841 +#: ../src/main-window.c:1459 +msgid "" +"This is just a fifteen words sentence to calculate the diary entry text view " +"size" +msgstr "" + +#: ../src/main-window.c:1496 +msgid "Spelling checker could not be initialized" +msgstr "" + +#: ../src/preferences-dialog.c:83 +msgid "Preferences" +msgstr "Preferencis" + +#. Grab our child widgets +#: ../src/preferences-dialog.c:204 +msgid "Encryption key: " +msgstr "Clâf di cifradure: " + +#: ../src/preferences-dialog.c:208 +msgid "None (don't encrypt)" +msgstr "Nissune (no stâ cifrâ)" + +#: ../src/preferences-dialog.c:213 +msgid "New _Key" +msgstr "Gnove _clâf" + +#. Set up the "Enable spell checking" check button +#: ../src/preferences-dialog.c:237 +msgid "Enable _spell checking" +msgstr "Abilte control _ortografic" + +#: ../src/preferences-dialog.c:262 +msgid "Error saving the encryption key" +msgstr "Erôr tal salvâ la clâf di cifradure" + +#: ../src/preferences-dialog.c:281 +msgid "Error opening Seahorse" +msgstr "Erôr tal vierzi Seahorse" + +#: ../src/printing.c:277 +msgid "This entry is marked as important." +msgstr "Cheste vôs e je segnade come impuartante." + +#: ../src/printing.c:298 +msgid "No entry for this date." +msgstr "Nissune vôs par cheste date." + +#: ../src/printing.c:457 +msgid "Start date:" +msgstr "Date inizi:" + +#: ../src/printing.c:459 +msgid "End date:" +msgstr "Date fin:" + +#. Line spacing +#: ../src/printing.c:475 +msgid "Line spacing:" +msgstr "" + +#: ../src/search-dialog.c:221 +msgid "Search canceled." +msgstr "Cirî anulât." + +#. Translators: This is an error message wrapper for when searches encounter an error. The placeholder is for an error message. +#: ../src/search-dialog.c:224 +#, c-format +msgid "Error: %s" +msgstr "Erôr: %s" + +#. Success! +#: ../src/search-dialog.c:229 +#, c-format +msgid "Found %d entry:" +msgid_plural "Found %d entries:" +msgstr[0] "Cjatade %d vôs:" +msgstr[1] "Cjatadis %d vôs:" + +#: ../src/search-dialog.c:278 +msgid "Searching…" +msgstr "Daûr a cirî..." + +#: ../src/storage-manager.c:247 +#, c-format +msgid "" +"Could not open database \"%s\". SQLite provided the following error message: " +"%s" +msgstr "" + +#: ../src/storage-manager.c:290 +#, c-format +msgid "" +"Could not run query \"%s\". SQLite provided the following error message: %s" +msgstr "" + +#: ../src/storage-manager.c:596 +msgid "Error deserializing entry into buffer while searching." +msgstr "" + +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Inserìs URI" + +#: ../src/vfs.c:291 +#, c-format +msgid "GPGME is not at least version %s" +msgstr "" + +#: ../src/vfs.c:298 +#, c-format +msgid "GPGME doesn't support OpenPGP: %s" +msgstr "" + +#: ../src/vfs.c:305 +#, c-format +msgid "Error creating cipher context: %s" +msgstr "" + +#: ../src/vfs.c:325 +#, c-format +msgid "Can't create a new GIOChannel for the encrypted database: %s" +msgstr "" + +#: ../src/vfs.c:333 +#, c-format +msgid "Error opening encrypted database file \"%s\": %s" +msgstr "" + +#: ../src/vfs.c:349 +#, c-format +msgid "Error creating Callback base data buffer: %s" +msgstr "" + +#: ../src/vfs.c:357 +#, c-format +msgid "Can't create a new GIOChannel for the plain database: %s" +msgstr "" + +#: ../src/vfs.c:365 +#, c-format +msgid "Error opening plain database file \"%s\": %s" +msgstr "" + +#: ../src/vfs.c:461 +#, c-format +msgid "Error getting encryption key: %s" +msgstr "" + +#: ../src/vfs.c:485 ../src/vfs.c:491 +#, c-format +msgid "Error encrypting database: %s" +msgstr "" + +#. Translators: The first and second params are file paths, the last param is an error message. +#: ../src/vfs.c:541 +#, c-format +msgid "Error copying the file from %s to %s: %s" +msgstr "" + +#: ../src/vfs.c:547 +#, c-format +msgid "Error changing database backup file permissions: %s" +msgstr "" + +#: ../src/vfs.c:647 +#, c-format +msgid "Error closing file: %s" +msgstr "Erôr tal sierâ il file: %s" + +#. Translators: the first parameter is a filename. +#: ../src/vfs.c:1046 ../src/vfs.c:1073 +#, c-format +msgid "Error backing up file ‘%s’" +msgstr "" + +#: ../src/vfs.c:1059 +#, c-format +msgid "Error decrypting database: %s" +msgstr "" + +#: ../src/vfs.c:1099 +#, c-format +msgid "Error changing database file permissions: %s" +msgstr "" + +#: ../src/widgets/calendar-button.c:142 +#, c-format +msgid "UI data could not be loaded: %s" +msgstr "" + +#: ../src/widgets/calendar-button.c:152 +msgid "Can't load calendar window object from UI file" +msgstr "" + +#. Translators: This is the detail string for important days as displayed in the calendar. +#: ../src/widgets/calendar.c:176 +msgid "Important!" +msgstr "Impuartant!" + +#: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:166 +msgid "add tag" +msgstr "" + +#: ../src/widgets/entry-tags-area.c:101 +msgid "Write the tag and press enter to save it" +msgstr "" + +#: ../src/widgets/tag-accessible.c:165 +msgid "Remove the tag from the entry" +msgstr "" + +#. Looks like gtk_widget_set_tooltip_text don't works here, even in the init... ? +#: ../src/widgets/tag.c:416 +msgid "Remove tag" +msgstr "" + +#: ../src/widgets/tag-entry.c:85 +msgid "Tag entry" +msgstr "" diff -Nru almanah-0.11.1/po/hu.po almanah-0.12.0/po/hu.po --- almanah-0.11.1/po/hu.po 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/hu.po 2019-10-07 13:45:09.000000000 +0000 @@ -1,20 +1,20 @@ # Hungarian translation for almanah. -# Copyright (C) 2011 Free Software Foundation, Inc. +# Copyright (C) 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc. # This file is distributed under the same license as the almanah package. # # György Balló , 2011. # Gabor Kelemen , 2011. -# Balázs Úr , 2011, 2012, 2013, 2014. +# Balázs Úr , 2011, 2012, 2013, 2014, 2015, 2016. msgid "" msgstr "" "Project-Id-Version: almanah master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=almanah&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-12-18 13:50+0000\n" -"PO-Revision-Date: 2014-02-23 15:35+0100\n" -"Last-Translator: Balázs Úr \n" -"Language-Team: Hungarian \n" -"Language: \n" +"POT-Creation-Date: 2015-10-14 17:59+0000\n" +"PO-Revision-Date: 2016-02-08 18:09+0100\n" +"Last-Translator: Balázs Úr \n" +"Language-Team: Hungarian \n" +"Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -22,13 +22,17 @@ "X-Generator: Lokalize 1.2\n" #: ../data/almanah.appdata.xml.in.h:1 +msgid "Keep a diary of your life" +msgstr "Vezessen naplót az életéről" + +#: ../data/almanah.appdata.xml.in.h:2 msgid "" "Almanah Diary is an application to allow you to keep a diary of your life." msgstr "" "Az Almanah napló egy olyan alkalmazás, amely lehetővé teszi az élete " "naplójának vezetését." -#: ../data/almanah.appdata.xml.in.h:2 +#: ../data/almanah.appdata.xml.in.h:3 msgid "" "You can encrypt the diary to preserve your privacy. It has editing " "abilities, including text formatting and printing and shows you a lists of " @@ -40,37 +44,8 @@ "megjeleníti azon események listáját, amelyek (a számítógépén) az adott " "napokon történtek (úgymint feladatok és találkozók az Evolution programból)." -#: ../data/almanah-app-menu.ui.h:1 -msgid "_Search" -msgstr "_Keresés" - -#: ../data/almanah-app-menu.ui.h:2 -msgid "Pr_eferences" -msgstr "Beá_llítások" - -#. Set the button label -#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 -msgid "_Import" -msgstr "_Importálás" - -#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 -msgid "_Export" -msgstr "_Exportálás" - -#: ../data/almanah-app-menu.ui.h:5 -msgid "_Print diary" -msgstr "_Napló nyomtatása" - -#: ../data/almanah-app-menu.ui.h:6 -msgid "_About Almanah Diary" -msgstr "Az Almanah napló né_vjegye" - -#: ../data/almanah-app-menu.ui.h:7 -msgid "_Quit" -msgstr "_Kilépés" - -#: ../data/almanah.desktop.in.h:1 ../src/application.c:132 -#: ../src/main-window.c:136 +#: ../data/almanah.desktop.in.h:1 ../src/application.c:133 +#: ../src/main-window.c:155 msgid "Almanah Diary" msgstr "Almanah napló" @@ -79,7 +54,7 @@ msgstr "Személyes napló vezetése" #. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. -#: ../data/almanah.desktop.in.h:3 ../src/application.c:263 +#: ../data/almanah.desktop.in.h:3 ../src/application.c:272 msgid "Diary" msgstr "Napló" @@ -88,131 +63,75 @@ msgid "diary;journal;" msgstr "napló;folyóirat;" -#: ../data/almanah.ui.h:1 -msgid "Select Date…" -msgstr "Dátum kiválasztása…" - -#: ../data/almanah.ui.h:2 -msgid "F_ormat" -msgstr "F_ormátum" - -#: ../data/almanah.ui.h:3 -msgid "Toggle whether the currently selected text is bold." -msgstr "Félkövérré változtatja a kijelölt szöveget." - -#: ../data/almanah.ui.h:4 -msgid "Toggle whether the currently selected text is italic." -msgstr "Dőltté változtatja a kijelölt szöveget." - -#: ../data/almanah.ui.h:5 -msgid "Toggle whether the currently selected text is underlined." -msgstr "Aláhúzza a jelenleg kijelölt szöveget." - -#: ../data/almanah.ui.h:6 -msgid "Add/Remove _Hyperlink" -msgstr "_Hiperhivatkozás hozzáadása/eltávolítása" - -#: ../data/almanah.ui.h:7 -msgid "" -"Add or remove a hyperlink from the currently selected text to a specified " -"URI." -msgstr "" -"Hiperhivatkozás felvétele a jelenleg kijelölt szövegről a megadott URI-" -"címre, vagy annak eltávolítása." - -#: ../data/almanah.ui.h:8 -msgid "Insert _Time" -msgstr "_Idő beszúrása" - -#: ../data/almanah.ui.h:9 -msgid "I_mportant" -msgstr "F_ontos" - -#: ../data/almanah.ui.h:10 -msgid "Toggle whether the current entry is marked as important." -msgstr "Fontosnak jelöli a jelenlegi bejegyzést." - -#: ../data/almanah.ui.h:11 -msgid "Show tags" -msgstr "Címkék megjelenítése" - -#: ../data/almanah.ui.h:12 -msgid "Show tags for the current entry" -msgstr "Címkék megjelenítése a jelenlegi bejegyzéshez" - -#: ../data/almanah.ui.h:13 -msgid "_Help" -msgstr "_Súgó" - -#: ../data/almanah.ui.h:14 -msgid "Go to _Today" -msgstr "Ugrás a _mai napra" - -#: ../data/almanah.ui.h:15 -msgid "Jump to the current date in the diary." -msgstr "Ugrás az aktuális napra a naplóban." - -#: ../data/almanah.ui.h:16 +#: ../src/ui/almanah.ui.h:1 msgid "Calendar" msgstr "Naptár" -#: ../data/almanah.ui.h:17 +#: ../src/ui/almanah.ui.h:2 +msgid "Go to Today" +msgstr "Ugrás a mai napra" + +#: ../src/ui/almanah.ui.h:3 +msgid "Select Date…" +msgstr "Dátum kiválasztása…" + +#: ../src/ui/almanah.ui.h:4 msgid "Entry editing area" msgstr "Bejegyzésszerkesztési terület" -#: ../data/almanah.ui.h:18 +#: ../src/ui/almanah.ui.h:5 msgid "Past events" msgstr "Legutóbbi események" -#: ../data/almanah.ui.h:19 +#: ../src/ui/almanah.ui.h:6 msgid "Past Event List" msgstr "Legutóbbi események listája" -#: ../data/almanah.ui.h:20 +#: ../src/ui/almanah.ui.h:7 msgid "Search entry" msgstr "Bejegyzés keresése" -#: ../data/almanah.ui.h:21 ../src/search-dialog.c:69 +#: ../src/ui/almanah.ui.h:8 ../src/search-dialog.c:69 msgid "Search" msgstr "Keresés" -#: ../data/almanah.ui.h:22 +#: ../src/ui/almanah.ui.h:9 msgid "Result List" msgstr "Eredménylista" -#: ../data/almanah.ui.h:23 +#: ../src/ui/almanah.ui.h:10 msgid "View Entry" msgstr "Bejegyzés megjelenítése" -#: ../data/almanah.ui.h:24 +#: ../src/ui/almanah.ui.h:11 msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." msgstr "például: „2009/03/14” vagy „2009. március 14.”." -#: ../data/almanah.ui.h:25 +#: ../src/ui/almanah.ui.h:12 msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." msgstr "például: „http://google.com/” vagy „file:///home/én/Képek/kép.jpg”." -#: ../data/almanah.ui.h:26 +#: ../src/ui/almanah.ui.h:13 msgid "Successful Entries" msgstr "Sikeres bejegyzések" -#: ../data/almanah.ui.h:27 +#: ../src/ui/almanah.ui.h:14 msgid "Merged Entries" msgstr "Egyesített bejegyzések" -#: ../data/almanah.ui.h:28 +#: ../src/ui/almanah.ui.h:15 msgid "Failed Entries" msgstr "Sikertelen bejegyzések" -#: ../data/almanah.ui.h:29 +#: ../src/ui/almanah.ui.h:16 msgid "Import Results List" msgstr "Eredmények listájának importálása" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 +#: ../data/org.gnome.almanah.gschema.xml.in.h:1 msgid "Database encryption key ID" msgstr "Adatbázis-titkosítási kulcs azonosítója" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +#: ../data/org.gnome.almanah.gschema.xml.in.h:2 msgid "" "The ID of the key to use to encrypt and decrypt the database, if Almanah has " "been built with encryption support. Leave blank to disable database " @@ -222,64 +141,47 @@ "ha az Almanah titkosítási támogatással került fordításra. Az adatbázis " "titkosításának letiltásához hagyja ezt a mezőt üresen." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 +#: ../data/org.gnome.almanah.gschema.xml.in.h:3 msgid "Spell checking language" msgstr "Helyesírás-ellenőrzés nyelve" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +#: ../data/org.gnome.almanah.gschema.xml.in.h:4 msgid "The locale specifier of the language in which to check entry spellings." msgstr "A nyelv, amin a bejegyzések helyesírása ellenőrzésre kerül." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +#: ../data/org.gnome.almanah.gschema.xml.in.h:5 msgid "Spell checking enabled?" msgstr "Helyesírás-ellenőrzés engedélyezve?" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 +#: ../data/org.gnome.almanah.gschema.xml.in.h:6 msgid "Whether spell checking of entries is enabled." msgstr "A bejegyzések helyesírás-ellenőrzése engedélyezve legyen-e?" -#: ../src/application.c:246 +#: ../src/application.c:255 msgid "Error opening database" msgstr "Hiba történt az adatbázis megnyitásakor" -#. Error loading the CSS -#: ../src/application.c:275 -#, c-format -msgid "" -"Couldn't load the CSS file '%s'. The interface might not be styled correctly" -msgstr "" -"Nem tölthető be a CSS fájl: „%s”. A felület valószínűleg nem megfelelő " -"stílusú" - -#: ../src/application.c:319 +#: ../src/application.c:332 msgid "Enable debug mode" msgstr "Hibakereső üzemmód bekapcsolása" -#: ../src/application.c:336 +#: ../src/application.c:349 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" "Személyes napló kezelése. Egyszerre csak egy példányban futtatható a program." #. Print an error -#: ../src/application.c:347 +#: ../src/application.c:360 #, c-format msgid "Command line options could not be parsed: %s\n" msgstr "A parancssori kapcsolók nem értelmezhetők: %s\n" -#: ../src/application.c:366 +#: ../src/application.c:379 msgid "Error encrypting database" msgstr "Hiba az adatbázis titkosításakor" -#: ../src/application.c:419 ../src/date-entry-dialog.c:129 -#: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 -#: ../src/main-window.c:195 ../src/preferences-dialog.c:191 -#: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 -#, c-format -msgid "UI file \"%s\" could not be loaded" -msgstr "A(z) „%s” UI fájl nem tölthető be" - -#: ../src/application.c:542 +#: ../src/application.c:522 msgid "" "Almanah is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -290,7 +192,7 @@ "Software Foundation által kiadott GNU General Public License harmadik (vagy " "bármely későbbi) változatában foglaltak alapján." -#: ../src/application.c:546 +#: ../src/application.c:526 msgid "" "Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -302,7 +204,7 @@ "alkalmas-e a KÖZREADÁSRA vagy EGY BIZONYOS FELADAT ELVÉGZÉSÉRE. További " "részletekért tanulmányozza a GNU GPL licencet." -#: ../src/application.c:550 +#: ../src/application.c:530 msgid "" "You should have received a copy of the GNU General Public License along with " "Almanah. If not, see ." @@ -310,12 +212,12 @@ "Az Almanah programhoz a GNU General Public License egy példánya is jár, ha " "nem kapta meg, itt elolvashatja: ." -#: ../src/application.c:565 +#: ../src/application.c:545 #, c-format msgid "A helpful diary keeper, storing %u entries." msgstr "Egy hasznos naplóíró, amely %u bejegyzést tárol." -#: ../src/application.c:569 +#: ../src/application.c:549 msgid "Copyright © 2008-2009 Philip Withnall" msgstr "Copyright © 2008-2009 Philip Withnall" @@ -324,18 +226,34 @@ #. * "Translator name 1 \n" #. * "Translator name 2 " #. -#: ../src/application.c:577 +#: ../src/application.c:557 msgid "translator-credits" msgstr "Balló György " -#: ../src/application.c:581 +#: ../src/application.c:561 msgid "Almanah Website" msgstr "Az Almanah webhelye" +#: ../src/application.c:589 +#, c-format +msgid "" +"Couldn't load the CSS resources. The interface might not be styled " +"correctly: %s" +msgstr "" +"Nem tölthetők be a CSS-erőforrások. A felület valószínűleg nem lesz " +"megfelelően formázva: %s" + #: ../src/date-entry-dialog.c:72 msgid "Select Date" msgstr "Dátum kiválasztása" +#: ../src/date-entry-dialog.c:127 ../src/import-export-dialog.c:169 +#: ../src/import-export-dialog.c:475 ../src/main-window.c:225 +#: ../src/preferences-dialog.c:177 ../src/search-dialog.c:95 +#: ../src/uri-entry-dialog.c:126 +msgid "UI data could not be loaded" +msgstr "Az UI adatokat nem sikerült betölteni" + #: ../src/entry.c:303 #, c-format msgid "Invalid data version number %u." @@ -396,56 +314,131 @@ #: ../src/export-operation.c:256 ../src/export-operation.c:313 #, c-format -#| msgid "Error opening encrypted database file \"%s\": %s" msgid "Error changing exported file permissions: %s" msgstr "Hiba az exportált fájl jogosultságainak módosításakor: %s" -#: ../src/import-export-dialog.c:202 +#: ../src/gtk/menus.ui.h:1 +msgid "_Search" +msgstr "_Keresés" + +#: ../src/gtk/menus.ui.h:2 +msgid "Pr_eferences" +msgstr "Beá_llítások" + +#: ../src/gtk/menus.ui.h:3 +msgctxt "Main menu" +msgid "_Import" +msgstr "_Importálás" + +#: ../src/gtk/menus.ui.h:4 +msgctxt "Main menu" +msgid "_Export" +msgstr "_Exportálás" + +#: ../src/gtk/menus.ui.h:5 +msgid "_Print diary" +msgstr "_Napló nyomtatása" + +#: ../src/gtk/menus.ui.h:6 +msgid "_About Almanah Diary" +msgstr "Az Almanah napló né_vjegye" + +#: ../src/gtk/menus.ui.h:7 +msgid "_Quit" +msgstr "_Kilépés" + +#: ../src/gtk/menus.ui.h:8 +msgid "_Bold" +msgstr "_Félkövér" + +#: ../src/gtk/menus.ui.h:9 +msgid "_Italic" +msgstr "_Dőlt" + +#: ../src/gtk/menus.ui.h:10 +msgid "_Underline" +msgstr "_Aláhúzott" + +#: ../src/gtk/menus.ui.h:11 +msgid "_Cut" +msgstr "_Kivágás" + +#: ../src/gtk/menus.ui.h:12 +msgid "_Copy" +msgstr "_Másolás" + +#: ../src/gtk/menus.ui.h:13 +msgid "_Paste" +msgstr "_Beillesztés" + +#: ../src/gtk/menus.ui.h:14 ../src/main-window.c:626 +msgid "_Delete" +msgstr "_Törlés" + +#: ../src/gtk/menus.ui.h:15 +msgid "Insert _Time" +msgstr "_Idő beszúrása" + +#: ../src/gtk/menus.ui.h:16 +msgid "Add/Remove _Hyperlink" +msgstr "_Hiperhivatkozás hozzáadása/eltávolítása" + +#: ../src/import-export-dialog.c:203 msgid "Import _mode: " msgstr "Importálás _módja:" -#: ../src/import-export-dialog.c:202 +#: ../src/import-export-dialog.c:203 msgid "Export _mode: " msgstr "Exportálás _módja:" #. Set the window title -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Import Entries" msgstr "Bejegyzések importálása" -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Export Entries" msgstr "Bejegyzések exportálása" -#: ../src/import-export-dialog.c:245 +#: ../src/import-export-dialog.c:210 +msgctxt "Dialog button" +msgid "_Import" +msgstr "_Importálás" + +#: ../src/import-export-dialog.c:210 +msgctxt "Dialog button" +msgid "_Export" +msgstr "_Exportálás" + +#: ../src/import-export-dialog.c:247 msgid "Import failed" msgstr "Az importálás meghiúsult" -#: ../src/import-export-dialog.c:283 +#: ../src/import-export-dialog.c:285 msgid "Export failed" msgstr "Az exportálás meghiúsult" -#: ../src/import-export-dialog.c:296 +#: ../src/import-export-dialog.c:298 msgid "Export successful" msgstr "Az exportálás sikeres" -#: ../src/import-export-dialog.c:297 +#: ../src/import-export-dialog.c:299 msgid "The diary was successfully exported." msgstr "A napló sikeresen exportálva." -#: ../src/import-export-dialog.c:445 +#: ../src/import-export-dialog.c:447 msgid "Import Results" msgstr "Importálás eredménye" #. Translators: This is a strftime()-format string for the dates displayed in import results. #. Translators: This is a strftime()-format string for the date to display when asking about editing a diary entry. #. Translators: This is a strftime()-format string for the date to display when asking about deleting a diary entry. +#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. -#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. -#: ../src/import-export-dialog.c:539 ../src/main-window.c:567 -#: ../src/main-window.c:597 ../src/printing.c:263 ../src/search-dialog.c:182 -#: ../src/widgets/calendar-button.c:309 +#: ../src/import-export-dialog.c:542 ../src/main-window.c:587 +#: ../src/main-window.c:618 ../src/main-window.c:1225 ../src/printing.c:263 +#: ../src/search-dialog.c:180 msgid "%A, %e %B %Y" msgstr "%Y. %B %e. %A" @@ -495,69 +488,88 @@ "Bejegyzés importálva innen: „%s”, tartalma:\n" "\n" -#: ../src/main-window.c:571 +#: ../src/main-window.c:591 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" msgstr "Biztosan szeretné szerkeszteni ezt a naplóbejegyzést ehhez: %s?" -#: ../src/main-window.c:601 +#: ../src/main-window.c:594 ../src/main-window.c:625 +msgid "_Cancel" +msgstr "_Mégse" + +#: ../src/main-window.c:595 +msgid "_Edit" +msgstr "S_zerkesztés" + +#: ../src/main-window.c:622 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" msgstr "Biztosan szeretné törölni ezt a naplóbejegyzést ehhez: %s?" #. Print a warning about the unknown tag -#: ../src/main-window.c:710 +#: ../src/main-window.c:732 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." msgstr "" "Ismeretlen vagy kettőzött szövegcímke a bejegyzésben: „%s”. Figyelmen kívül " "hagyva." -#: ../src/main-window.c:918 +#: ../src/main-window.c:973 msgid "Error opening URI" msgstr "Hiba az URI megnyitásakor" #. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place -#: ../src/main-window.c:1092 +#: ../src/main-window.c:1152 #, c-format msgid "%s @ %s" msgstr "%s @ %s" -#: ../src/main-window.c:1171 +#: ../src/main-window.c:1258 msgid "Entry content could not be loaded" msgstr "A bejegyzés tartalma nem tölthető be" -#: ../src/main-window.c:1348 +#. Translators: this sentence is just used in startup to estimate the width +#. of a 15 words sentence. Translate with some randome sentences with just 15 words. +#. See: https://bugzilla.gnome.org/show_bug.cgi?id=754841 +#: ../src/main-window.c:1414 +msgid "" +"This is just a fifteen words sentence to calculate the diary entry text view " +"size" +msgstr "" +"Ez egy egyszerű tizenöt szóból álló példa mondat a napló bejegyzés szöveg " +"nézet méretének kiszámításához" + +#: ../src/main-window.c:1450 msgid "Spelling checker could not be initialized" msgstr "Nem sikerült inicializálni a helyesírás-ellenőrzőt" -#: ../src/preferences-dialog.c:91 -msgid "Almanah Preferences" -msgstr "Almanah beállításai" +#: ../src/preferences-dialog.c:83 +msgid "Preferences" +msgstr "Beállítások" #. Grab our child widgets -#: ../src/preferences-dialog.c:217 +#: ../src/preferences-dialog.c:204 msgid "Encryption key: " msgstr "Titkosítási kulcs:" -#: ../src/preferences-dialog.c:222 +#: ../src/preferences-dialog.c:208 msgid "None (don't encrypt)" msgstr "Nincs (ne titkosítson)" -#: ../src/preferences-dialog.c:246 +#: ../src/preferences-dialog.c:213 msgid "New _Key" msgstr "Ú_j kulcs" #. Set up the "Enable spell checking" check button -#: ../src/preferences-dialog.c:253 +#: ../src/preferences-dialog.c:237 msgid "Enable _spell checking" msgstr "_Helyesírás-ellenőrző engedélyezése" -#: ../src/preferences-dialog.c:279 +#: ../src/preferences-dialog.c:262 msgid "Error saving the encryption key" msgstr "Hiba a titkosítási kulcs mentésekor" -#: ../src/preferences-dialog.c:298 +#: ../src/preferences-dialog.c:281 msgid "Error opening Seahorse" msgstr "Hiba a Seahorse megnyitásakor" @@ -582,133 +594,144 @@ msgid "Line spacing:" msgstr "Sorköz:" -#: ../src/search-dialog.c:223 +#: ../src/search-dialog.c:221 msgid "Search canceled." msgstr "Keresés megszakítva." #. Translators: This is an error message wrapper for when searches encounter an error. The placeholder is for an error message. -#: ../src/search-dialog.c:226 +#: ../src/search-dialog.c:224 #, c-format msgid "Error: %s" msgstr "Hiba: %s" #. Success! -#: ../src/search-dialog.c:231 +#: ../src/search-dialog.c:229 #, c-format msgid "Found %d entry:" msgid_plural "Found %d entries:" msgstr[0] "%d bejegyzés található:" msgstr[1] "%d bejegyzés található:" -#: ../src/search-dialog.c:280 +#: ../src/search-dialog.c:278 msgid "Searching…" msgstr "Keresés…" -#: ../src/storage-manager.c:276 +#: ../src/storage-manager.c:248 +#, c-format +msgid "" +"Could not open database \"%s\". SQLite provided the following error message: " +"%s" +msgstr "" +"A(z) „%s” adatbázis nem nyitható meg. Az SQLite a következő hibaüzenetet " +"szolgáltatta: %s" + +#: ../src/storage-manager.c:291 +#, c-format +msgid "" +"Could not run query \"%s\". SQLite provided the following error message: %s" +msgstr "" +"A(z) „%s” lekérdezés nem futtatható. Az SQLite a következő hibaüzenetet " +"szolgáltatta: %s" + +#: ../src/storage-manager.c:597 +msgid "Error deserializing entry into buffer while searching." +msgstr "Hiba a bejegyzés pufferbe történő visszafejtésekor keresés közben." + +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Adjon meg egy URI-t" + +#: ../src/vfs.c:239 #, c-format msgid "GPGME is not at least version %s" msgstr "A GPGME verziója nincs legalább %s" -#: ../src/storage-manager.c:285 +#: ../src/vfs.c:246 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "A GPGME nem támogatja az OpenPGP-t: %s" -#: ../src/storage-manager.c:294 +#: ../src/vfs.c:253 #, c-format msgid "Error creating cipher context: %s" msgstr "Hiba a rejtjelező kontextus létrehozásakor: %s" -#: ../src/storage-manager.c:323 +#: ../src/vfs.c:273 +#, c-format +msgid "Can't create a new GIOChannel for the encrypted database: %s" +msgstr "" +"Nem sikerült az új GIOChannel létrehozása a titkosított adatbázishoz: %s" + +#: ../src/vfs.c:281 #, c-format msgid "Error opening encrypted database file \"%s\": %s" msgstr "Hiba a(z) „%s” titkosított adatbázisfájl megnyitásakor: %s" -#: ../src/storage-manager.c:342 +#: ../src/vfs.c:297 #, c-format -msgid "Error opening plain database file \"%s\": %s" -msgstr "Hiba a(z) „%s” sima adatbázisfájl megnyitásakor: %s" - -#: ../src/storage-manager.c:390 -msgid "" -"The encrypted database is empty. The plain database file has been left " -"undeleted as backup." -msgstr "" -"A titkosított adatbázis üres. A sima adatbázisfájl – biztonsági mentésként – " -"nem került törlésre." +msgid "Error creating Callback base data buffer: %s" +msgstr "Hiba a visszahívás alapadatpuffer létrehozásakor: %s" -#. Delete the plain file -#: ../src/storage-manager.c:393 +#: ../src/vfs.c:305 #, c-format -msgid "Could not delete plain database file \"%s\"." -msgstr "A(z) „%s” sima adatbázisfájl nem törölhető." +msgid "Can't create a new GIOChannel for the plain database: %s" +msgstr "Nem sikerült az új GIOChannel létrehozása az egyszerű adatbázishoz: %s" -#: ../src/storage-manager.c:434 +#: ../src/vfs.c:313 #, c-format -msgid "Error decrypting database: %s" -msgstr "Hiba az adatbázis visszafejtésekor: %s" +msgid "Error opening plain database file \"%s\": %s" +msgstr "Hiba a(z) „%s” sima adatbázisfájl megnyitásakor: %s" -#: ../src/storage-manager.c:468 +#: ../src/vfs.c:409 #, c-format msgid "Error getting encryption key: %s" msgstr "Hiba a titkosítási kulcs lekérésekor: %s" -#: ../src/storage-manager.c:489 +#: ../src/vfs.c:433 ../src/vfs.c:439 #, c-format msgid "Error encrypting database: %s" msgstr "Hiba az adatbázis titkosításakor: %s" -#: ../src/storage-manager.c:549 +#. Translators: The first and second params are file paths, the last param is an error message. +#: ../src/vfs.c:489 +#, c-format +msgid "Error copying the file from %s to %s: %s" +msgstr "Hiba a fájl másolásakor: %s -> %s: %s" + +#: ../src/vfs.c:495 #, c-format -#| msgid "Error opening plain database file \"%s\": %s" msgid "Error changing database backup file permissions: %s" msgstr "" "Hiba az adatbázis biztonsági mentés fájl jogosultságainak módosításakor: %s" -#: ../src/storage-manager.c:571 ../src/storage-manager.c:627 +#: ../src/vfs.c:595 #, c-format -#| msgid "Error opening plain database file \"%s\": %s" -msgid "Error changing database file permissions: %s" -msgstr "Hiba az adatbázisfájl jogosultságainak módosításakor: %s" +msgid "Error closing file: %s" +msgstr "Hiba a fájl lezárásakor: %s" #. Translators: the first parameter is a filename, the second is an error message. -#: ../src/storage-manager.c:583 ../src/storage-manager.c:611 +#. Translators: the first parameter is a filename. +#: ../src/vfs.c:994 ../src/vfs.c:1021 #, c-format -#| msgid "Error opening plain database file \"%s\": %s" -msgid "Error backing up file ‘%s’: %s" -msgstr "Hiba a(z) „%s” fájl biztonsági mentésekor: %s" +msgid "Error backing up file ‘%s’" +msgstr "Hiba a(z) „%s” fájl biztonsági mentésekor" -#: ../src/storage-manager.c:620 +#: ../src/vfs.c:1007 #, c-format -msgid "" -"Could not open database \"%s\". SQLite provided the following error message: " -"%s" -msgstr "" -"A(z) „%s” adatbázis nem nyitható meg. Az SQLite a következő hibaüzenetet " -"szolgáltatta: %s" +msgid "Error decrypting database: %s" +msgstr "Hiba az adatbázis visszafejtésekor: %s" -#: ../src/storage-manager.c:704 +#: ../src/vfs.c:1047 #, c-format -msgid "" -"Could not run query \"%s\". SQLite provided the following error message: %s" -msgstr "" -"A(z) „%s” lekérdezés nem futtatható. Az SQLite a következő hibaüzenetet " -"szolgáltatta: %s" - -#: ../src/storage-manager.c:1010 -msgid "Error deserializing entry into buffer while searching." -msgstr "Hiba a bejegyzés pufferbe történő visszafejtésekor keresés közben." - -#: ../src/uri-entry-dialog.c:71 -msgid "Enter URI" -msgstr "Adjon meg egy URI-t" +msgid "Error changing database file permissions: %s" +msgstr "Hiba az adatbázisfájl jogosultságainak módosításakor: %s" -#: ../src/widgets/calendar-button.c:140 +#: ../src/widgets/calendar-button.c:142 #, c-format -msgid "UI file \"%s\" could not be loaded: %s" -msgstr "A(z) „%s” UI fájl nem tölthető be: %s" +msgid "UI data could not be loaded: %s" +msgstr "Az UI adatokat nem sikerült betölteni: %s" -#: ../src/widgets/calendar-button.c:150 +#: ../src/widgets/calendar-button.c:152 msgid "Can't load calendar window object from UI file" msgstr "Nem lehet betölteni naptár ablak objektumot UI fájlból" @@ -717,10 +740,6 @@ msgid "Important!" msgstr "Fontos!" -#: ../src/widgets/calendar-window.c:80 -msgid "Unknown input device" -msgstr "Ismeretlen beviteli eszköz" - #: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:166 msgid "add tag" msgstr "címke hozzáadása" @@ -730,7 +749,6 @@ msgstr "Írja be a címkét és nyomja meg az entert a mentéshez" #: ../src/widgets/tag-accessible.c:165 -#| msgid "Show tags for the current entry" msgid "Remove the tag from the entry" msgstr "Címke eltávolítása a bejegyzésből" @@ -740,10 +758,62 @@ msgstr "Címke eltávolítása" #: ../src/widgets/tag-entry.c:85 -#| msgid "Search entry" msgid "Tag entry" msgstr "Címke bejegyzés" +#~ msgid "Almanah Preferences" +#~ msgstr "Almanah beállításai" + +#~ msgid "Unknown input device" +#~ msgstr "Ismeretlen beviteli eszköz" + +#~ msgid "F_ormat" +#~ msgstr "F_ormátum" + +#~ msgid "Toggle whether the currently selected text is bold." +#~ msgstr "Félkövérré változtatja a kijelölt szöveget." + +#~ msgid "Toggle whether the currently selected text is italic." +#~ msgstr "Dőltté változtatja a kijelölt szöveget." + +#~ msgid "Toggle whether the currently selected text is underlined." +#~ msgstr "Aláhúzza a jelenleg kijelölt szöveget." + +#~ msgid "" +#~ "Add or remove a hyperlink from the currently selected text to a specified " +#~ "URI." +#~ msgstr "" +#~ "Hiperhivatkozás felvétele a jelenleg kijelölt szövegről a megadott URI-" +#~ "címre, vagy annak eltávolítása." + +#~ msgid "I_mportant" +#~ msgstr "F_ontos" + +#~ msgid "Toggle whether the current entry is marked as important." +#~ msgstr "Fontosnak jelöli a jelenlegi bejegyzést." + +#~ msgid "Show tags" +#~ msgstr "Címkék megjelenítése" + +#~ msgid "Show tags for the current entry" +#~ msgstr "Címkék megjelenítése a jelenlegi bejegyzéshez" + +#~ msgid "_Help" +#~ msgstr "_Súgó" + +#~ msgid "Jump to the current date in the diary." +#~ msgstr "Ugrás az aktuális napra a naplóban." + +#~ msgid "" +#~ "The encrypted database is empty. The plain database file has been left " +#~ "undeleted as backup." +#~ msgstr "" +#~ "A titkosított adatbázis üres. A sima adatbázisfájl – biztonsági " +#~ "mentésként – nem került törlésre." + +#~ msgid "Could not delete plain database file \"%s\"." +#~ msgstr "A(z) „%s” sima adatbázisfájl nem törölhető." + #~ msgid "Change font style for selected text" #~ msgstr "A kijelölt szöveg betűkészletének megváltoztatása" @@ -756,9 +826,6 @@ #~ msgid "View Event" #~ msgstr "Esemény megjelenítése" -#~ msgid "_Edit" -#~ msgstr "S_zerkesztés" - #~ msgid "_Export…" #~ msgstr "_Exportálás…" diff -Nru almanah-0.11.1/po/id.po almanah-0.12.0/po/id.po --- almanah-0.11.1/po/id.po 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/id.po 2019-10-07 13:45:09.000000000 +0000 @@ -8,8 +8,8 @@ "Project-Id-Version: almanah master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=almanah&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-12-18 13:50+0000\n" -"PO-Revision-Date: 2014-03-28 18:36+0700\n" +"POT-Creation-Date: 2015-10-14 17:59+0000\n" +"PO-Revision-Date: 2016-07-07 12:58+0700\n" "Last-Translator: Andika Triwidada \n" "Language-Team: GNOME Indonesian Translation Team \n" "Language: id\n" @@ -18,16 +18,20 @@ "Content-Transfer-Encoding: 8bit\n" "X-Poedit-SourceCharset: UTF-8\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.5.7\n" +"X-Generator: Poedit 1.8.8\n" #: ../data/almanah.appdata.xml.in.h:1 +msgid "Keep a diary of your life" +msgstr "Catat buku harian kehidupan Anda" + +#: ../data/almanah.appdata.xml.in.h:2 msgid "" "Almanah Diary is an application to allow you to keep a diary of your life." msgstr "" "Buku Harian Almanah adalah aplikasi untuk mencatat buku harian kehidupan " "Anda." -#: ../data/almanah.appdata.xml.in.h:2 +#: ../data/almanah.appdata.xml.in.h:3 msgid "" "You can encrypt the diary to preserve your privacy. It has editing " "abilities, including text formatting and printing and shows you a lists of " @@ -39,37 +43,8 @@ "peristiwa yang terjadi (pada komputer Anda) untuk setiap hari (seperti " "misalnya tugas dan janji temu dari Evolution)." -#: ../data/almanah-app-menu.ui.h:1 -msgid "_Search" -msgstr "_Cari" - -#: ../data/almanah-app-menu.ui.h:2 -msgid "Pr_eferences" -msgstr "Pr_eferensi" - -#. Set the button label -#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 -msgid "_Import" -msgstr "_Impor" - -#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 -msgid "_Export" -msgstr "_Ekspor" - -#: ../data/almanah-app-menu.ui.h:5 -msgid "_Print diary" -msgstr "_Cetak buku harian" - -#: ../data/almanah-app-menu.ui.h:6 -msgid "_About Almanah Diary" -msgstr "Tent_ang Buku Harian Almanah" - -#: ../data/almanah-app-menu.ui.h:7 -msgid "_Quit" -msgstr "_Keluar" - -#: ../data/almanah.desktop.in.h:1 ../src/application.c:132 -#: ../src/main-window.c:136 +#: ../data/almanah.desktop.in.h:1 ../src/application.c:133 +#: ../src/main-window.c:155 msgid "Almanah Diary" msgstr "Buku Harian Almanah" @@ -78,7 +53,7 @@ msgstr "Simpan buku harian pribadi" #. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. -#: ../data/almanah.desktop.in.h:3 ../src/application.c:263 +#: ../data/almanah.desktop.in.h:3 ../src/application.c:272 msgid "Diary" msgstr "Buku Harian" @@ -87,131 +62,75 @@ msgid "diary;journal;" msgstr "buku harian;jurnal;" -#: ../data/almanah.ui.h:1 -msgid "Select Date…" -msgstr "Pilih Tanggal…" - -#: ../data/almanah.ui.h:2 -msgid "F_ormat" -msgstr "Bent_uk" - -#: ../data/almanah.ui.h:3 -msgid "Toggle whether the currently selected text is bold." -msgstr "Jungkit apakah teks yang sedang dipilih ditebalkan." - -#: ../data/almanah.ui.h:4 -msgid "Toggle whether the currently selected text is italic." -msgstr "Jungkit apakah teks yang sedang dipilih dimiringkan." - -#: ../data/almanah.ui.h:5 -msgid "Toggle whether the currently selected text is underlined." -msgstr "Jungkit apakah teks yang sedang dipilih digaris-bawahi." - -#: ../data/almanah.ui.h:6 -msgid "Add/Remove _Hyperlink" -msgstr "Tambah/Hapus _Hyperlink" - -#: ../data/almanah.ui.h:7 -msgid "" -"Add or remove a hyperlink from the currently selected text to a specified " -"URI." -msgstr "" -"Tambah atau hapus hyperlink dari teks yang sedang dipilih ke URL yang " -"dinyatakan." - -#: ../data/almanah.ui.h:8 -msgid "Insert _Time" -msgstr "Sisipkan Wak_tu" - -#: ../data/almanah.ui.h:9 -msgid "I_mportant" -msgstr "Penti_ng" - -#: ../data/almanah.ui.h:10 -msgid "Toggle whether the current entry is marked as important." -msgstr "Jungkit apakah entri kini ditandai sebagai penting." - -#: ../data/almanah.ui.h:11 -msgid "Show tags" -msgstr "Tampilkan tag" - -#: ../data/almanah.ui.h:12 -msgid "Show tags for the current entry" -msgstr "Tampilkan tag untuk entri saat ini" - -#: ../data/almanah.ui.h:13 -msgid "_Help" -msgstr "Ba_ntuan" - -#: ../data/almanah.ui.h:14 -msgid "Go to _Today" -msgstr "Lihat _Hari Ini" - -#: ../data/almanah.ui.h:15 -msgid "Jump to the current date in the diary." -msgstr "Lompat ke tanggal kini di buku harian." - -#: ../data/almanah.ui.h:16 +#: ../src/ui/almanah.ui.h:1 msgid "Calendar" msgstr "Kalender" -#: ../data/almanah.ui.h:17 +#: ../src/ui/almanah.ui.h:2 +msgid "Go to Today" +msgstr "Ke hari ini" + +#: ../src/ui/almanah.ui.h:3 +msgid "Select Date…" +msgstr "Pilih Tanggal…" + +#: ../src/ui/almanah.ui.h:4 msgid "Entry editing area" msgstr "Wilayah penyuntingan entri" -#: ../data/almanah.ui.h:18 +#: ../src/ui/almanah.ui.h:5 msgid "Past events" msgstr "Kejadian lampau" -#: ../data/almanah.ui.h:19 +#: ../src/ui/almanah.ui.h:6 msgid "Past Event List" msgstr "Daftar Kejadian Lalu" -#: ../data/almanah.ui.h:20 +#: ../src/ui/almanah.ui.h:7 msgid "Search entry" msgstr "Cari entri" -#: ../data/almanah.ui.h:21 ../src/search-dialog.c:69 +#: ../src/ui/almanah.ui.h:8 ../src/search-dialog.c:69 msgid "Search" msgstr "Cari" -#: ../data/almanah.ui.h:22 +#: ../src/ui/almanah.ui.h:9 msgid "Result List" msgstr "Daftar Hasil" -#: ../data/almanah.ui.h:23 +#: ../src/ui/almanah.ui.h:10 msgid "View Entry" msgstr "Tilik Entri" -#: ../data/almanah.ui.h:24 +#: ../src/ui/almanah.ui.h:11 msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." msgstr "mis. \"14/03/2009\" atau \"14 Maret 2009\"." -#: ../data/almanah.ui.h:25 +#: ../src/ui/almanah.ui.h:12 msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." msgstr "mis. \"http://google.com/\" atau \"file:///home/me/Photos/photo.jpg\"." -#: ../data/almanah.ui.h:26 +#: ../src/ui/almanah.ui.h:13 msgid "Successful Entries" msgstr "Entri Sukses" -#: ../data/almanah.ui.h:27 +#: ../src/ui/almanah.ui.h:14 msgid "Merged Entries" msgstr "Entri Tergabung" -#: ../data/almanah.ui.h:28 +#: ../src/ui/almanah.ui.h:15 msgid "Failed Entries" msgstr "Entri Gagal" -#: ../data/almanah.ui.h:29 +#: ../src/ui/almanah.ui.h:16 msgid "Import Results List" msgstr "Daftar Hasil Impor" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 +#: ../data/org.gnome.almanah.gschema.xml.in.h:1 msgid "Database encryption key ID" msgstr "ID kunci penyandian basis data" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +#: ../data/org.gnome.almanah.gschema.xml.in.h:2 msgid "" "The ID of the key to use to encrypt and decrypt the database, if Almanah has " "been built with encryption support. Leave blank to disable database " @@ -221,40 +140,31 @@ "Almanah telah dibangun dengan dukungan penyandian. Biarkan kosong untuk " "mematikan penyandian basis data." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 +#: ../data/org.gnome.almanah.gschema.xml.in.h:3 msgid "Spell checking language" msgstr "Bahasa pemeriksaan ejaan" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +#: ../data/org.gnome.almanah.gschema.xml.in.h:4 msgid "The locale specifier of the language in which to check entry spellings." msgstr "Nama locale bahasa untuk memeriksa ejaan entri." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +#: ../data/org.gnome.almanah.gschema.xml.in.h:5 msgid "Spell checking enabled?" msgstr "Pemeriksaan ejaan diaktifkan?" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 +#: ../data/org.gnome.almanah.gschema.xml.in.h:6 msgid "Whether spell checking of entries is enabled." msgstr "Apakah pemeriksaan ejaan entri diaktifkan." -#: ../src/application.c:246 +#: ../src/application.c:255 msgid "Error opening database" msgstr "Galat membuka basis data" -#. Error loading the CSS -#: ../src/application.c:275 -#, c-format -msgid "" -"Couldn't load the CSS file '%s'. The interface might not be styled correctly" -msgstr "" -"Tak bisa memuat berkas CSS '%s'. Antar muka mungkin tak ditata gayanya " -"secara benar" - -#: ../src/application.c:319 +#: ../src/application.c:332 msgid "Enable debug mode" msgstr "Aktifkan moda awakutu" -#: ../src/application.c:336 +#: ../src/application.c:349 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" @@ -262,24 +172,16 @@ "suatu saat." #. Print an error -#: ../src/application.c:347 +#: ../src/application.c:360 #, c-format msgid "Command line options could not be parsed: %s\n" msgstr "Opsi baris perintah tak dapat diurai: %s\n" -#: ../src/application.c:366 +#: ../src/application.c:379 msgid "Error encrypting database" msgstr "Galat menyandikan basis data" -#: ../src/application.c:419 ../src/date-entry-dialog.c:129 -#: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 -#: ../src/main-window.c:195 ../src/preferences-dialog.c:191 -#: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 -#, c-format -msgid "UI file \"%s\" could not be loaded" -msgstr "Berkas UI \"%s\" tak dapat dimuat" - -#: ../src/application.c:542 +#: ../src/application.c:522 msgid "" "Almanah is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -291,7 +193,7 @@ "dipublikasikan oleh Free Software Foundation, apakah Lisensi versi 3 atau " "(sesuai pilihan Anda) versi selanjutnya." -#: ../src/application.c:546 +#: ../src/application.c:526 msgid "" "Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -303,7 +205,7 @@ "KECOCOKAN UNTUK TUJUAN TERTENTU sekalipun. Lihat GNU General Public License " "untuk rincian lebih lanjut." -#: ../src/application.c:550 +#: ../src/application.c:530 msgid "" "You should have received a copy of the GNU General Public License along with " "Almanah. If not, see ." @@ -311,12 +213,12 @@ "Anda mestinya menerima salinan GNU General Public License bersamaan dengan " "Almanah. Jika tidak, lihat ." -#: ../src/application.c:565 +#: ../src/application.c:545 #, c-format msgid "A helpful diary keeper, storing %u entries." msgstr "Penyimpan buku harian yang penuh bantuan, menyimpan %u entri." -#: ../src/application.c:569 +#: ../src/application.c:549 msgid "Copyright © 2008-2009 Philip Withnall" msgstr "Hak Cipta © 2008-2009 Philip Withnall" @@ -325,18 +227,34 @@ #. * "Translator name 1 \n" #. * "Translator name 2 " #. -#: ../src/application.c:577 +#: ../src/application.c:557 msgid "translator-credits" msgstr "Andika Triwidada , 2009-2014" -#: ../src/application.c:581 +#: ../src/application.c:561 msgid "Almanah Website" msgstr "Situs Web Almanah" +#: ../src/application.c:589 +#, c-format +msgid "" +"Couldn't load the CSS resources. The interface might not be styled " +"correctly: %s" +msgstr "" +"Tak bisa memuat sumber daya CSS. Antar muka mungkin tak ditata gayanya " +"secara benar: %s" + #: ../src/date-entry-dialog.c:72 msgid "Select Date" msgstr "Pilih Tanggal" +#: ../src/date-entry-dialog.c:127 ../src/import-export-dialog.c:169 +#: ../src/import-export-dialog.c:475 ../src/main-window.c:225 +#: ../src/preferences-dialog.c:177 ../src/search-dialog.c:95 +#: ../src/uri-entry-dialog.c:126 +msgid "UI data could not be loaded" +msgstr "Data UI tak bisa dimuat" + #: ../src/entry.c:303 #, c-format msgid "Invalid data version number %u." @@ -399,52 +317,128 @@ msgid "Error changing exported file permissions: %s" msgstr "Galat saat mengubah ijin berkas yang diekspor: %s" -#: ../src/import-export-dialog.c:202 +#: ../src/gtk/menus.ui.h:1 +msgid "_Search" +msgstr "_Cari" + +#: ../src/gtk/menus.ui.h:2 +msgid "Pr_eferences" +msgstr "Pr_eferensi" + +#: ../src/gtk/menus.ui.h:3 +msgctxt "Main menu" +msgid "_Import" +msgstr "_Impor" + +#: ../src/gtk/menus.ui.h:4 +msgctxt "Main menu" +msgid "_Export" +msgstr "_Ekspor" + +#: ../src/gtk/menus.ui.h:5 +msgid "_Print diary" +msgstr "_Cetak buku harian" + +#: ../src/gtk/menus.ui.h:6 +msgid "_About Almanah Diary" +msgstr "Tent_ang Buku Harian Almanah" + +#: ../src/gtk/menus.ui.h:7 +msgid "_Quit" +msgstr "_Keluar" + +#: ../src/gtk/menus.ui.h:8 +msgid "_Bold" +msgstr "Te_bal" + +#: ../src/gtk/menus.ui.h:9 +msgid "_Italic" +msgstr "M_iring" + +#: ../src/gtk/menus.ui.h:10 +msgid "_Underline" +msgstr "Garis Ba_wah" + +#: ../src/gtk/menus.ui.h:11 +msgid "_Cut" +msgstr "Po_tong" + +#: ../src/gtk/menus.ui.h:12 +msgid "_Copy" +msgstr "_Salin" + +#: ../src/gtk/menus.ui.h:13 +msgid "_Paste" +msgstr "Tem_pel" + +#: ../src/gtk/menus.ui.h:14 ../src/main-window.c:626 +msgid "_Delete" +msgstr "_Hapus" + +#: ../src/gtk/menus.ui.h:15 +msgid "Insert _Time" +msgstr "Sisipkan Wak_tu" + +#: ../src/gtk/menus.ui.h:16 +msgid "Add/Remove _Hyperlink" +msgstr "Tambah/Hapus _Hyperlink" + +#: ../src/import-export-dialog.c:203 msgid "Import _mode: " msgstr "_Moda impor: " -#: ../src/import-export-dialog.c:202 +#: ../src/import-export-dialog.c:203 msgid "Export _mode: " msgstr "_Moda ekspor: " #. Set the window title -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Import Entries" msgstr "Impor Entri" -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Export Entries" msgstr "Ekspor Entri" -#: ../src/import-export-dialog.c:245 +#: ../src/import-export-dialog.c:210 +msgctxt "Dialog button" +msgid "_Import" +msgstr "_Impor" + +#: ../src/import-export-dialog.c:210 +msgctxt "Dialog button" +msgid "_Export" +msgstr "_Ekspor" + +#: ../src/import-export-dialog.c:247 msgid "Import failed" msgstr "Impor gagal" -#: ../src/import-export-dialog.c:283 +#: ../src/import-export-dialog.c:285 msgid "Export failed" msgstr "Ekspor gagal" -#: ../src/import-export-dialog.c:296 +#: ../src/import-export-dialog.c:298 msgid "Export successful" msgstr "Pengeksporan sukses" -#: ../src/import-export-dialog.c:297 +#: ../src/import-export-dialog.c:299 msgid "The diary was successfully exported." msgstr "Buku harian sukses diekspor." -#: ../src/import-export-dialog.c:445 +#: ../src/import-export-dialog.c:447 msgid "Import Results" msgstr "Hasil Impor" #. Translators: This is a strftime()-format string for the dates displayed in import results. #. Translators: This is a strftime()-format string for the date to display when asking about editing a diary entry. #. Translators: This is a strftime()-format string for the date to display when asking about deleting a diary entry. +#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. -#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. -#: ../src/import-export-dialog.c:539 ../src/main-window.c:567 -#: ../src/main-window.c:597 ../src/printing.c:263 ../src/search-dialog.c:182 -#: ../src/widgets/calendar-button.c:309 +#: ../src/import-export-dialog.c:542 ../src/main-window.c:587 +#: ../src/main-window.c:618 ../src/main-window.c:1225 ../src/printing.c:263 +#: ../src/search-dialog.c:180 msgid "%A, %e %B %Y" msgstr "%A, %e %B %Y" @@ -494,67 +488,86 @@ "Entri diimpor dari \"%s\":\n" "\n" -#: ../src/main-window.c:571 +#: ../src/main-window.c:591 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" msgstr "Anda yakin ingin menyunting entri buku harian ini bagi %s?" -#: ../src/main-window.c:601 +#: ../src/main-window.c:594 ../src/main-window.c:625 +msgid "_Cancel" +msgstr "_Batal" + +#: ../src/main-window.c:595 +msgid "_Edit" +msgstr "_Sunting" + +#: ../src/main-window.c:622 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" msgstr "Anda yakin ingin menghapus entri buku harian ini bagi %s?" #. Print a warning about the unknown tag -#: ../src/main-window.c:710 +#: ../src/main-window.c:732 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." msgstr "Tag teks tak dikenal atau berganda \"%s\" dalam entri. Diabaikan." -#: ../src/main-window.c:918 +#: ../src/main-window.c:973 msgid "Error opening URI" msgstr "Galat membuka URI" #. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place -#: ../src/main-window.c:1092 +#: ../src/main-window.c:1152 #, c-format msgid "%s @ %s" msgstr "%s @ %s" -#: ../src/main-window.c:1171 +#: ../src/main-window.c:1258 msgid "Entry content could not be loaded" msgstr "Isi entri tak dapat dimuat" -#: ../src/main-window.c:1348 +#. Translators: this sentence is just used in startup to estimate the width +#. of a 15 words sentence. Translate with some randome sentences with just 15 words. +#. See: https://bugzilla.gnome.org/show_bug.cgi?id=754841 +#: ../src/main-window.c:1414 +msgid "" +"This is just a fifteen words sentence to calculate the diary entry text view " +"size" +msgstr "" +"Ini adalah sebuah kalimat lima belas kata untuk menghitung ukuran tilikan " +"teks entri buku harian" + +#: ../src/main-window.c:1450 msgid "Spelling checker could not be initialized" msgstr "Pemeriksa ejaan tak dapat diinisialisasi" -#: ../src/preferences-dialog.c:91 -msgid "Almanah Preferences" -msgstr "Preferensi Almanah" +#: ../src/preferences-dialog.c:83 +msgid "Preferences" +msgstr "Preferensi" #. Grab our child widgets -#: ../src/preferences-dialog.c:217 +#: ../src/preferences-dialog.c:204 msgid "Encryption key: " msgstr "Kunci penyandian: " -#: ../src/preferences-dialog.c:222 +#: ../src/preferences-dialog.c:208 msgid "None (don't encrypt)" msgstr "Tak ada (jangan disandikan)" -#: ../src/preferences-dialog.c:246 +#: ../src/preferences-dialog.c:213 msgid "New _Key" msgstr "_Kunci Baru" #. Set up the "Enable spell checking" check button -#: ../src/preferences-dialog.c:253 +#: ../src/preferences-dialog.c:237 msgid "Enable _spell checking" msgstr "Aktfikan pemeriksaan ejaan" -#: ../src/preferences-dialog.c:279 +#: ../src/preferences-dialog.c:262 msgid "Error saving the encryption key" msgstr "Galat menyimpan kunci penyandian" -#: ../src/preferences-dialog.c:298 +#: ../src/preferences-dialog.c:281 msgid "Error opening Seahorse" msgstr "Gagal membuka Seahorse" @@ -579,126 +592,139 @@ msgid "Line spacing:" msgstr "Jarak baris:" -#: ../src/search-dialog.c:223 +#: ../src/search-dialog.c:221 msgid "Search canceled." msgstr "Pencarian dibatalkan." #. Translators: This is an error message wrapper for when searches encounter an error. The placeholder is for an error message. -#: ../src/search-dialog.c:226 +#: ../src/search-dialog.c:224 #, c-format msgid "Error: %s" msgstr "Galat: %s" #. Success! -#: ../src/search-dialog.c:231 +#: ../src/search-dialog.c:229 #, c-format msgid "Found %d entry:" msgid_plural "Found %d entries:" msgstr[0] "Ditemukan %d entri:" -#: ../src/search-dialog.c:280 +#: ../src/search-dialog.c:278 msgid "Searching…" msgstr "Mencari…" -#: ../src/storage-manager.c:276 +#: ../src/storage-manager.c:248 +#, c-format +msgid "" +"Could not open database \"%s\". SQLite provided the following error message: " +"%s" +msgstr "" +"Tak bisa membuka basis data \"%s\". SQLite memberikan pesan galat berikut: %s" + +#: ../src/storage-manager.c:291 +#, c-format +msgid "" +"Could not run query \"%s\". SQLite provided the following error message: %s" +msgstr "" +"Tak bisa menjalankan query \"%s\". SQLite memberikan pesan galat berikut: %s" + +#: ../src/storage-manager.c:597 +msgid "Error deserializing entry into buffer while searching." +msgstr "Galat deserialisasi entri ke dalam penyangga ketika mencari." + +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Masukkan URI" + +#: ../src/vfs.c:239 #, c-format msgid "GPGME is not at least version %s" msgstr "GPGME kurang dari versi minimal %s" -#: ../src/storage-manager.c:285 +#: ../src/vfs.c:246 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "GPGME tak mendukung OpenPGP: %s" -#: ../src/storage-manager.c:294 +#: ../src/vfs.c:253 #, c-format msgid "Error creating cipher context: %s" msgstr "Galat membuat konteks cipher: %s" -#: ../src/storage-manager.c:323 +#: ../src/vfs.c:273 +#, c-format +msgid "Can't create a new GIOChannel for the encrypted database: %s" +msgstr "Tak bisa membuat suatu GIOChannel baru bagi basis data terenkripsi: %s" + +#: ../src/vfs.c:281 #, c-format msgid "Error opening encrypted database file \"%s\": %s" msgstr "Galat membuka berkas basis data tersandi \"%s\": %s" -#: ../src/storage-manager.c:342 +#: ../src/vfs.c:297 #, c-format -msgid "Error opening plain database file \"%s\": %s" -msgstr "Galat membuka berkas basis data polos \"%s\": %s" +msgid "Error creating Callback base data buffer: %s" +msgstr "Kesalahan saat membuat penyangga data basis Callback: %s" -#: ../src/storage-manager.c:390 -msgid "" -"The encrypted database is empty. The plain database file has been left " -"undeleted as backup." -msgstr "" -"Basis data tersandi kosong. Berkas basis data polos telah dibiarkan tak " -"dihapus sebagai cadangan." - -#. Delete the plain file -#: ../src/storage-manager.c:393 +#: ../src/vfs.c:305 #, c-format -msgid "Could not delete plain database file \"%s\"." -msgstr "Tak bisa menghapus berkas basis data polos \"%s\"." +msgid "Can't create a new GIOChannel for the plain database: %s" +msgstr "Tak bisa membuat suatu GIOChannel baru bagi basis data polos: %s" -#: ../src/storage-manager.c:434 +#: ../src/vfs.c:313 #, c-format -msgid "Error decrypting database: %s" -msgstr "Galat membongkar sandi basis data: %s" +msgid "Error opening plain database file \"%s\": %s" +msgstr "Galat membuka berkas basis data polos \"%s\": %s" -#: ../src/storage-manager.c:468 +#: ../src/vfs.c:409 #, c-format msgid "Error getting encryption key: %s" msgstr "Galat memperoleh kunci penyandian: %s" -#: ../src/storage-manager.c:489 +#: ../src/vfs.c:433 ../src/vfs.c:439 #, c-format msgid "Error encrypting database: %s" msgstr "Galat menyandikan basis data: %s" -#: ../src/storage-manager.c:549 +#. Translators: The first and second params are file paths, the last param is an error message. +#: ../src/vfs.c:489 +#, c-format +msgid "Error copying the file from %s to %s: %s" +msgstr "Galat saat menyalin berkas dari %s ke %s: %s" + +#: ../src/vfs.c:495 #, c-format msgid "Error changing database backup file permissions: %s" msgstr "Galat saat mengubah ijin berkas cadangan basis data: %s" -#: ../src/storage-manager.c:571 ../src/storage-manager.c:627 +#: ../src/vfs.c:595 #, c-format -msgid "Error changing database file permissions: %s" -msgstr "Galat saat mengubah ijin berkas basis data: %s" +msgid "Error closing file: %s" +msgstr "Kesalahan saat menutup berkas: %s" #. Translators: the first parameter is a filename, the second is an error message. -#: ../src/storage-manager.c:583 ../src/storage-manager.c:611 +#. Translators: the first parameter is a filename. +#: ../src/vfs.c:994 ../src/vfs.c:1021 #, c-format -msgid "Error backing up file ‘%s’: %s" -msgstr "Galat saat membuat cadangan berkas '%s': %s" +msgid "Error backing up file ‘%s’" +msgstr "Galat saat membuat cadangan berkas '%s'" -#: ../src/storage-manager.c:620 +#: ../src/vfs.c:1007 #, c-format -msgid "" -"Could not open database \"%s\". SQLite provided the following error message: " -"%s" -msgstr "" -"Tak bisa membuka basis data \"%s\". SQLite memberikan pesan galat berikut: %s" +msgid "Error decrypting database: %s" +msgstr "Galat membongkar sandi basis data: %s" -#: ../src/storage-manager.c:704 +#: ../src/vfs.c:1047 #, c-format -msgid "" -"Could not run query \"%s\". SQLite provided the following error message: %s" -msgstr "" -"Tak bisa menjalankan query \"%s\". SQLite memberikan pesan galat berikut: %s" - -#: ../src/storage-manager.c:1010 -msgid "Error deserializing entry into buffer while searching." -msgstr "Galat deserialisasi entri ke dalam penyangga ketika mencari." - -#: ../src/uri-entry-dialog.c:71 -msgid "Enter URI" -msgstr "Masukkan URI" +msgid "Error changing database file permissions: %s" +msgstr "Galat saat mengubah ijin berkas basis data: %s" -#: ../src/widgets/calendar-button.c:140 +#: ../src/widgets/calendar-button.c:142 #, c-format -msgid "UI file \"%s\" could not be loaded: %s" -msgstr "Berkas UI \"%s\" tak dapat dimuat: %s" +msgid "UI data could not be loaded: %s" +msgstr "Data UI tidak bisa dimuat: %s" -#: ../src/widgets/calendar-button.c:150 +#: ../src/widgets/calendar-button.c:152 msgid "Can't load calendar window object from UI file" msgstr "Tak bisa memuat objek jendela kalender dari berkas UI" @@ -707,10 +733,6 @@ msgid "Important!" msgstr "Penting!" -#: ../src/widgets/calendar-window.c:80 -msgid "Unknown input device" -msgstr "Perangkat masukan tak dikenal" - #: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:166 msgid "add tag" msgstr "tambah tag" diff -Nru almanah-0.11.1/po/LINGUAS almanah-0.12.0/po/LINGUAS --- almanah-0.11.1/po/LINGUAS 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/LINGUAS 2019-10-07 13:45:09.000000000 +0000 @@ -1,5 +1,6 @@ # Please keep this list sorted alphabetically ar +bs ca cs da @@ -11,6 +12,7 @@ eu fi fr +fur gl hu id @@ -19,6 +21,7 @@ nl oc pl +pt pt_BR ro ru diff -Nru almanah-0.11.1/po/Makefile.in.in almanah-0.12.0/po/Makefile.in.in --- almanah-0.11.1/po/Makefile.in.in 2014-09-24 17:34:01.000000000 +0000 +++ almanah-0.12.0/po/Makefile.in.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,222 +0,0 @@ -# Makefile for program source directory in GNU NLS utilities package. -# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper -# Copyright (C) 2004-2008 Rodney Dawes -# -# This file may be copied and used freely without restrictions. It may -# be used in projects which are not available under a GNU Public License, -# but which still want to provide support for the GNU gettext functionality. -# -# - Modified by Owen Taylor to use GETTEXT_PACKAGE -# instead of PACKAGE and to look for po2tbl in ./ not in intl/ -# -# - Modified by jacob berkman to install -# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize -# -# - Modified by Rodney Dawes for use with intltool -# -# We have the following line for use by intltoolize: -# INTLTOOL_MAKEFILE - -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = @top_builddir@ -VPATH = @srcdir@ - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -datadir = @datadir@ -datarootdir = @datarootdir@ -libdir = @libdir@ -DATADIRNAME = @DATADIRNAME@ -itlocaledir = $(prefix)/$(DATADIRNAME)/locale -subdir = po -install_sh = @install_sh@ -# Automake >= 1.8 provides @mkdir_p@. -# Until it can be supposed, use the safe fallback: -mkdir_p = $(install_sh) -d - -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ - -GMSGFMT = @GMSGFMT@ -MSGFMT = @MSGFMT@ -XGETTEXT = @XGETTEXT@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot - -ALL_LINGUAS = @ALL_LINGUAS@ - -PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi) - -USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi) - -USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) - -POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) - -DISTFILES = Makefile.in.in POTFILES.in $(POFILES) -EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS - -POTFILES = \ -# This comment gets stripped out - -CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done) - -.SUFFIXES: -.SUFFIXES: .po .pox .gmo .mo .msg .cat - -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V)) -INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) -INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@; - -.po.pox: - $(MAKE) $(GETTEXT_PACKAGE).pot - $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox - -.po.mo: - $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $< - -.po.gmo: - $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \ - && rm -f $$file && $(GMSGFMT) -o $$file $< - -.po.cat: - sed -f ../intl/po2msg.sed < $< > $*.msg \ - && rm -f $@ && gencat $@ $*.msg - - -all: all-@USE_NLS@ - -all-yes: $(CATALOGS) -all-no: - -$(GETTEXT_PACKAGE).pot: $(POTFILES) - $(GENPOT) - -install: install-data -install-data: install-data-@USE_NLS@ -install-data-no: all -install-data-yes: all - linguas="$(USE_LINGUAS)"; \ - for lang in $$linguas; do \ - dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ - $(mkdir_p) $$dir; \ - if test -r $$lang.gmo; then \ - $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ - echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \ - else \ - $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ - echo "installing $(srcdir)/$$lang.gmo as" \ - "$$dir/$(GETTEXT_PACKAGE).mo"; \ - fi; \ - if test -r $$lang.gmo.m; then \ - $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ - echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ - else \ - if test -r $(srcdir)/$$lang.gmo.m ; then \ - $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \ - $$dir/$(GETTEXT_PACKAGE).mo.m; \ - echo "installing $(srcdir)/$$lang.gmo.m as" \ - "$$dir/$(GETTEXT_PACKAGE).mo.m"; \ - else \ - true; \ - fi; \ - fi; \ - done - -# Empty stubs to satisfy archaic automake needs -dvi info ctags tags CTAGS TAGS ID: - -# Define this as empty until I found a useful application. -install-exec installcheck: - -uninstall: - linguas="$(USE_LINGUAS)"; \ - for lang in $$linguas; do \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ - done - -check: all $(GETTEXT_PACKAGE).pot - rm -f missing notexist - srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m - if [ -r missing -o -r notexist ]; then \ - exit 1; \ - fi - -mostlyclean: - rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp - rm -f .intltool-merge-cache - -clean: mostlyclean - -distclean: clean - rm -f Makefile Makefile.in POTFILES stamp-it - rm -f *.mo *.msg *.cat *.cat.m *.gmo - -maintainer-clean: distclean - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - rm -f Makefile.in.in - -distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) -dist distdir: $(DISTFILES) - dists="$(DISTFILES)"; \ - extra_dists="$(EXTRA_DISTFILES)"; \ - for file in $$extra_dists; do \ - test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \ - done; \ - for file in $$dists; do \ - test -f $$file || file="$(srcdir)/$$file"; \ - ln $$file $(distdir) 2> /dev/null \ - || cp -p $$file $(distdir); \ - done - -update-po: Makefile - $(MAKE) $(GETTEXT_PACKAGE).pot - tmpdir=`pwd`; \ - linguas="$(USE_LINGUAS)"; \ - for lang in $$linguas; do \ - echo "$$lang:"; \ - result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \ - if $$result; then \ - if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ - rm -f $$tmpdir/$$lang.new.po; \ - else \ - if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ - :; \ - else \ - echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ - rm -f $$tmpdir/$$lang.new.po; \ - exit 1; \ - fi; \ - fi; \ - else \ - echo "msgmerge for $$lang.gmo failed!"; \ - rm -f $$tmpdir/$$lang.new.po; \ - fi; \ - done - -Makefile POTFILES: stamp-it - @if test ! -f $@; then \ - rm -f stamp-it; \ - $(MAKE) stamp-it; \ - fi - -stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \ - $(SHELL) ./config.status - -# Tell versions [3.59,3.63) of GNU make not to export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru almanah-0.11.1/po/meson.build almanah-0.12.0/po/meson.build --- almanah-0.11.1/po/meson.build 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.12.0/po/meson.build 2019-10-07 13:45:09.000000000 +0000 @@ -0,0 +1,4 @@ +i18n.gettext( + meson.project_name(), + preset: 'glib', +) diff -Nru almanah-0.11.1/po/nb.po almanah-0.12.0/po/nb.po --- almanah-0.11.1/po/nb.po 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/nb.po 2019-10-07 13:45:09.000000000 +0000 @@ -1,168 +1,202 @@ # Norwegian bokmål translation of hamster-applet. # Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Kjartan Maraas , 2008. +# Kjartan Maraas , 2008-2017. # msgid "" msgstr "" -"Project-Id-Version: hamster-applet\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-08 22:25+0200\n" -"PO-Revision-Date: 2008-10-08 22:27+0200\n" +"Project-Id-Version: almanah\n" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=almanah&keywords=I18N+L10N&component=General\n" +"POT-Creation-Date: 2017-02-27 16:29+0000\n" +"PO-Revision-Date: 2017-11-19 15:22+0100\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norsk bokal \n" +"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../data/almanah.desktop.in.h:1 ../data/almanah.ui.h:2 ../src/main.c:82 +#: ../data/almanah.appdata.xml.in.h:1 ../data/almanah.desktop.in.h:1 +#: ../src/application.c:135 ../src/main-window.c:163 msgid "Almanah Diary" +msgstr "Almanah dagbok" + +#: ../data/almanah.appdata.xml.in.h:2 +msgid "Keep a diary of your life" +msgstr "Skriv dagbok om livet ditt" + +#: ../data/almanah.appdata.xml.in.h:3 +msgid "" +"Almanah Diary is an application to allow you to keep a diary of your life." msgstr "" -#: ../data/almanah.desktop.in.h:2 -msgid "Diary" -msgstr "Dagbok" +#: ../data/almanah.appdata.xml.in.h:4 +msgid "" +"You can encrypt the diary to preserve your privacy. It has editing " +"abilities, including text formatting and printing and shows you a lists of " +"events which happened (on your computer) for each day (such as tasks and " +"appointments from Evolution)." +msgstr "" -#: ../data/almanah.desktop.in.h:3 +#: ../data/almanah.desktop.in.h:2 msgid "Keep a personal diary" -msgstr "" +msgstr "Skriv en personlig dagbok" -#: ../data/almanah.ui.h:1 -msgid "Add Link" -msgstr "Legg til lenke" +#. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. +#: ../data/almanah.desktop.in.h:3 ../src/application.c:274 +msgid "Diary" +msgstr "Dagbok" -#: ../data/almanah.ui.h:3 -msgid "Attached Links" -msgstr "" +#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../data/almanah.desktop.in.h:5 +msgid "diary;journal;" +msgstr "dagbok;" -#: ../data/almanah.ui.h:4 +#: ../src/ui/almanah.ui.h:1 msgid "Calendar" msgstr "Kalender" -#: ../data/almanah.ui.h:5 -msgid "Go To Today" +#: ../src/ui/almanah.ui.h:2 +msgid "Go to Today" msgstr "Gå til i dag" -#: ../data/almanah.ui.h:6 -msgid "Link Type" -msgstr "Type lenke" - -#: ../data/almanah.ui.h:7 -msgid "Remove Link" -msgstr "Fjern lenke" - -#: ../data/almanah.ui.h:8 -msgid "Results" -msgstr "Resultater" +#: ../src/ui/almanah.ui.h:3 +msgid "Select Date…" +msgstr "Velg dato …" + +#: ../src/ui/almanah.ui.h:4 +msgid "Entry editing area" +msgstr "" + +#: ../src/ui/almanah.ui.h:5 +msgid "Past events" +msgstr "Tidligere hendelser" + +#: ../src/ui/almanah.ui.h:6 +msgid "Past Event List" +msgstr "" -#: ../data/almanah.ui.h:9 +#: ../src/ui/almanah.ui.h:7 +msgid "Search entry" +msgstr "Søkeoppføring" + +#: ../src/ui/almanah.ui.h:8 ../src/search-dialog.c:69 msgid "Search" msgstr "Søk" -#: ../data/almanah.ui.h:10 -msgid "View" -msgstr "Vis" +#: ../src/ui/almanah.ui.h:9 +msgid "Result List" +msgstr "Resultatliste" -#: ../data/almanah.ui.h:11 +#: ../src/ui/almanah.ui.h:10 msgid "View Entry" msgstr "Vis oppføring" -#: ../data/almanah.ui.h:12 -msgid "_Edit" -msgstr "R_ediger" +#. Translators: Use two common date formats from your locale which will be parsed correctly by GLib +#: ../src/ui/almanah.ui.h:12 +msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." +msgstr "" -#: ../data/almanah.ui.h:13 -msgid "_File" -msgstr "_Fil" - -#: ../data/almanah.ui.h:14 -msgid "_Help" -msgstr "_Hjelp" +#. Translators: Use two popular URIs from your locale, preferably one on the Internet and one local file. +#: ../src/ui/almanah.ui.h:14 +msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." +msgstr "" -#: ../data/almanah.ui.h:15 -msgid "_Search" -msgstr "_Søk" +#: ../src/ui/almanah.ui.h:15 +msgid "Successful Entries" +msgstr "" -#: ../src/interface.c:45 -#, c-format -msgid "UI file \"%s/almanah/almanah.ui\" could not be loaded." +#: ../src/ui/almanah.ui.h:16 +msgid "Merged Entries" msgstr "" -#. Type, Name, Description, Icon, Columns, Format function, View function, Dialogue build function, Get values function -#. { "email", N_("E-mail"), N_("An e-mail you sent or received."), "mail-read", 2, &link_email_format_value, &link_email_view, &link_email_build_dialog, &link_email_get_values }, -#. Translators: These are the names and descriptions of the different link types. -#: ../src/link.c:52 -msgid "File" -msgstr "Fil" +#: ../src/ui/almanah.ui.h:17 +msgid "Failed Entries" +msgstr "" -#: ../src/link.c:52 -msgid "An attached file." +#: ../src/ui/almanah.ui.h:18 +msgid "Import Results List" msgstr "" -#: ../src/link.c:53 -msgid "Note" +#: ../data/org.gnome.almanah.gschema.xml.in.h:1 +msgid "Database encryption key ID" msgstr "" -#: ../src/link.c:53 -msgid "A note about an important event." +#: ../data/org.gnome.almanah.gschema.xml.in.h:2 +msgid "" +"The ID of the key to use to encrypt and decrypt the database, if Almanah has " +"been built with encryption support. Leave blank to disable database " +"encryption." +msgstr "" + +#: ../data/org.gnome.almanah.gschema.xml.in.h:3 +msgid "Spell checking language" msgstr "" -#: ../src/link.c:54 ../src/links/uri.c:50 -msgid "URI" -msgstr "URI" +#: ../data/org.gnome.almanah.gschema.xml.in.h:4 +msgid "The locale specifier of the language in which to check entry spellings." +msgstr "" -#: ../src/link.c:54 -msgid "A URI of a file or web page." +#: ../data/org.gnome.almanah.gschema.xml.in.h:5 +msgid "Spell checking enabled?" msgstr "" -#: ../src/links/file.c:39 -msgid "Due to an unknown error the file cannot be opened." +#: ../data/org.gnome.almanah.gschema.xml.in.h:6 +msgid "Whether spell checking of entries is enabled." msgstr "" -#: ../src/links/file.c:50 -msgid "Select File" -msgstr "Velg fil" +#: ../src/application.c:257 +msgid "Error opening database" +msgstr "" + +#: ../src/application.c:336 +msgid "Enable debug mode" +msgstr "" -#: ../src/links/uri.c:39 -msgid "Due to an unknown error the URI cannot be opened." +#: ../src/application.c:353 +msgid "" +"Manage your diary. Only one instance of the program may be open at any time." msgstr "" -#: ../src/main-window.c:178 +#. Print an error +#: ../src/application.c:364 #, c-format -msgid "The spelling checker could not be initialized: %s" +msgid "Command line options could not be parsed: %s\n" +msgstr "" + +#: ../src/application.c:383 +msgid "Error encrypting database" msgstr "" -#: ../src/main-window.c:265 +#: ../src/application.c:526 msgid "" -"Diary is free software: you can redistribute it and/or modify it under the " +"Almanah is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " "Foundation, either version 3 of the License, or (at your option) any later " "version." msgstr "" -#: ../src/main-window.c:269 +#: ../src/application.c:530 msgid "" -"Diary is distributed in the hope that it will be useful, but WITHOUT ANY " +"Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " "FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " "details." msgstr "" -#: ../src/main-window.c:273 +#: ../src/application.c:534 msgid "" "You should have received a copy of the GNU General Public License along with " -"Diary. If not, see ." +"Almanah. If not, see ." msgstr "" -#: ../src/main-window.c:284 +#: ../src/application.c:549 #, c-format -msgid "" -"A helpful diary keeper, storing %u entries with %u links and a total of %u " -"characters." +msgid "A helpful diary keeper, storing %u entries." msgstr "" -#: ../src/main-window.c:291 -msgid "Copyright © 2008 Philip Withnall" +#: ../src/application.c:553 +msgid "Copyright © 2008-2009 Philip Withnall" msgstr "" #. Translators: please include your names here to be credited for your hard work! @@ -170,125 +204,508 @@ #. * "Translator name 1 \n" #. * "Translator name 2 " #. -#: ../src/main-window.c:299 +#: ../src/application.c:561 msgid "translator-credits" msgstr "Kjartan Maraas " -#: ../src/main-window.c:303 -#, fuzzy +#: ../src/application.c:565 msgid "Almanah Website" -msgstr "Hamster nettsted" +msgstr "Almanah nettsted" + +#: ../src/application.c:593 +#, c-format +msgid "" +"Couldn't load the CSS resources. The interface might not be styled " +"correctly: %s" +msgstr "" + +#: ../src/date-entry-dialog.c:72 +msgid "Select Date" +msgstr "Velg dato" + +#: ../src/date-entry-dialog.c:127 ../src/import-export-dialog.c:169 +#: ../src/import-export-dialog.c:476 ../src/main-window.c:235 +#: ../src/preferences-dialog.c:177 ../src/search-dialog.c:95 +#: ../src/uri-entry-dialog.c:126 +msgid "UI data could not be loaded" +msgstr "" + +#: ../src/entry.c:303 +#, c-format +msgid "Invalid data version number %u." +msgstr "" + +#: ../src/events/calendar-appointment.c:51 +msgid "Calendar Appointment" +msgstr "" + +#: ../src/events/calendar-appointment.c:52 +msgid "An appointment on an Evolution calendar." +msgstr "" + +#. Translators: This is a time string with the format hh:mm +#: ../src/events/calendar-appointment.c:89 ../src/events/calendar-task.c:90 +#, c-format +msgid "%.2d:%.2d" +msgstr "" + +#: ../src/events/calendar-appointment.c:135 ../src/events/calendar-task.c:125 +msgid "Error launching Evolution" +msgstr "" + +#: ../src/events/calendar-task.c:51 +msgid "Calendar Task" +msgstr "Kalenderoppgave" + +#: ../src/events/calendar-task.c:52 +msgid "A task on an Evolution calendar." +msgstr "" + +#: ../src/export-operation.c:47 ../src/import-operation.c:45 +msgid "Text Files" +msgstr "Tekstfiler" + +#: ../src/export-operation.c:48 +msgid "" +"Select a _folder to export the entries to as text files, one per entry, with " +"names in the format 'yyyy-mm-dd', and no extension. All entries will be " +"exported, unencrypted in plain text format." +msgstr "" + +#: ../src/export-operation.c:52 ../src/import-operation.c:50 +msgid "Database" +msgstr "Database" + +#: ../src/export-operation.c:53 +msgid "" +"Select a _filename for a complete copy of the unencrypted Almanah Diary " +"database to be given." +msgstr "" + +#: ../src/export-operation.c:256 ../src/export-operation.c:313 +#, c-format +msgid "Error changing exported file permissions: %s" +msgstr "" + +#: ../src/gtk/menus.ui.h:1 +msgid "_Search" +msgstr "_Søk" + +#: ../src/gtk/menus.ui.h:2 +msgid "Pr_eferences" +msgstr "_Brukervalg" + +#: ../src/gtk/menus.ui.h:3 +msgctxt "Main menu" +msgid "_Import" +msgstr "_Importer" + +#: ../src/gtk/menus.ui.h:4 +msgctxt "Main menu" +msgid "_Export" +msgstr "_Eksporter" + +#: ../src/gtk/menus.ui.h:5 +msgid "_Print diary" +msgstr "" + +#: ../src/gtk/menus.ui.h:6 +msgid "_About Almanah Diary" +msgstr "_Om Almanah dagbok" + +#: ../src/gtk/menus.ui.h:7 +msgid "_Quit" +msgstr "A_vslutt" +#: ../src/gtk/menus.ui.h:8 +msgid "_Bold" +msgstr "_Uthevet" + +#: ../src/gtk/menus.ui.h:9 +msgid "_Italic" +msgstr "_Kursiv" + +#: ../src/gtk/menus.ui.h:10 +msgid "_Underline" +msgstr "_Understrek" + +#: ../src/gtk/menus.ui.h:11 +msgid "_Cut" +msgstr "Klipp _ut" + +#: ../src/gtk/menus.ui.h:12 +msgid "_Copy" +msgstr "_Kopier" + +#: ../src/gtk/menus.ui.h:13 +msgid "_Paste" +msgstr "_Lim inn" + +#: ../src/gtk/menus.ui.h:14 ../src/main-window.c:640 +msgid "_Delete" +msgstr "_Slett" + +#: ../src/gtk/menus.ui.h:15 +msgid "Insert _Time" +msgstr "Sett inn _tid" + +#: ../src/gtk/menus.ui.h:16 +msgid "Add/Remove _Hyperlink" +msgstr "Legg til/fjern _hyperlenke" + +#: ../src/import-export-dialog.c:203 +msgid "Import _mode: " +msgstr "" + +#: ../src/import-export-dialog.c:203 +msgid "Export _mode: " +msgstr "" + +#. Set the window title +#: ../src/import-export-dialog.c:206 +msgid "Import Entries" +msgstr "" + +#: ../src/import-export-dialog.c:206 +msgid "Export Entries" +msgstr "" + +#. Translators: These are verbs. +#: ../src/import-export-dialog.c:211 +msgctxt "Dialog button" +msgid "_Import" +msgstr "_Importer" + +#: ../src/import-export-dialog.c:211 +msgctxt "Dialog button" +msgid "_Export" +msgstr "_Eksporter" + +#: ../src/import-export-dialog.c:248 +msgid "Import failed" +msgstr "Import feilet" + +#: ../src/import-export-dialog.c:286 +msgid "Export failed" +msgstr "Eksport feilet" + +#: ../src/import-export-dialog.c:299 +msgid "Export successful" +msgstr "Eksport fullført" + +#: ../src/import-export-dialog.c:300 +msgid "The diary was successfully exported." +msgstr "" + +#: ../src/import-export-dialog.c:448 +msgid "Import Results" +msgstr "Importer resultater" + +#. Translators: This is a strftime()-format string for the dates displayed in import results. +#. Translators: This is a strftime()-format string for the date to display when asking about editing a diary entry. +#. Translators: This is a strftime()-format string for the date to display when asking about deleting a diary entry. #. Translators: This is a strftime()-format string for the date displayed at the top of the main window. #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. -#: ../src/main-window.c:349 ../src/printing.c:66 ../src/search-dialog.c:62 +#: ../src/import-export-dialog.c:543 ../src/main-window.c:601 +#: ../src/main-window.c:632 ../src/main-window.c:1271 ../src/printing.c:263 +#: ../src/search-dialog.c:180 msgid "%A, %e %B %Y" msgstr "%A, %e %B %Y" -#: ../src/main.c:70 -msgid "Enable debug mode" +#: ../src/import-operation.c:46 +msgid "" +"Select a _folder containing text files, one per entry, with names in the " +"format 'yyyy-mm-dd', and no extension. Any and all such files will be " +"imported." msgstr "" -#. Options -#: ../src/main.c:86 -msgid "- Manage your diary" +#: ../src/import-operation.c:51 +msgid "Select a database _file created by Almanah Diary to import." msgstr "" -#: ../src/main.c:96 +#: ../src/import-operation.c:248 #, c-format -msgid "Command-line options could not be parsed. Error: %s" +msgid "Error deserializing imported entry into buffer: %s" msgstr "" -#: ../src/printing.c:82 +#: ../src/import-operation.c:264 +#, c-format +msgid "" +"Error deserializing existing entry into buffer; overwriting with imported " +"entry: %s" +msgstr "" + +#. Append some header text for the imported entry +#. Translators: This text is appended to an existing entry when an entry is being imported to the same date. +#. * The imported entry is appended to this text. +#: ../src/import-operation.c:305 +#, c-format +msgid "" +"\n" +"\n" +"Entry imported from \"%s\":\n" +"\n" +msgstr "" + +#: ../src/main-window.c:605 +#, c-format +msgid "Are you sure you want to edit this diary entry for %s?" +msgstr "" + +#: ../src/main-window.c:608 ../src/main-window.c:639 +msgid "_Cancel" +msgstr "A_vbryt" + +#: ../src/main-window.c:609 +msgid "_Edit" +msgstr "R_ediger" + +#: ../src/main-window.c:636 +#, c-format +msgid "Are you sure you want to delete this diary entry for %s?" +msgstr "" + +#. Print a warning about the unknown tag +#: ../src/main-window.c:746 +#, c-format +msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." +msgstr "" + +#: ../src/main-window.c:987 +msgid "Error opening URI" +msgstr "" + +#. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place +#: ../src/main-window.c:1198 +#, c-format +msgid "%s @ %s" +msgstr "" + +#: ../src/main-window.c:1304 +msgid "Entry content could not be loaded" +msgstr "" + +#. Translators: this sentence is just used in startup to estimate the width +#. of a 15 words sentence. Translate with some random sentences with just 15 words. +#. See: https://bugzilla.gnome.org/show_bug.cgi?id=754841 +#: ../src/main-window.c:1459 +msgid "" +"This is just a fifteen words sentence to calculate the diary entry text view " +"size" +msgstr "" + +#: ../src/main-window.c:1496 +msgid "Spelling checker could not be initialized" +msgstr "" + +#: ../src/preferences-dialog.c:83 +msgid "Preferences" +msgstr "" + +#. Grab our child widgets +#: ../src/preferences-dialog.c:204 +msgid "Encryption key: " +msgstr "" + +#: ../src/preferences-dialog.c:208 +msgid "None (don't encrypt)" +msgstr "" + +#: ../src/preferences-dialog.c:213 +msgid "New _Key" +msgstr "" + +#. Set up the "Enable spell checking" check button +#: ../src/preferences-dialog.c:237 +msgid "Enable _spell checking" +msgstr "" + +#: ../src/preferences-dialog.c:262 +msgid "Error saving the encryption key" +msgstr "" + +#: ../src/preferences-dialog.c:281 +msgid "Error opening Seahorse" +msgstr "" + +#: ../src/printing.c:277 +msgid "This entry is marked as important." +msgstr "" + +#: ../src/printing.c:298 msgid "No entry for this date." msgstr "" -#: ../src/printing.c:215 -msgid "Start Date" -msgstr "Startdato" - -#: ../src/printing.c:218 -msgid "End Date" -msgstr "Sluttdato" +#: ../src/printing.c:457 +msgid "Start date:" +msgstr "Startdato:" + +#: ../src/printing.c:459 +msgid "End date:" +msgstr "Sluttdato:" + +#. Line spacing +#: ../src/printing.c:475 +msgid "Line spacing:" +msgstr "" + +#: ../src/search-dialog.c:221 +msgid "Search canceled." +msgstr "Søk avbrutt" -#: ../src/storage-manager.c:184 +#. Translators: This is an error message wrapper for when searches encounter an error. The placeholder is for an error message. +#: ../src/search-dialog.c:224 +#, c-format +msgid "Error: %s" +msgstr "Feil: %s" + +#. Success! +#: ../src/search-dialog.c:229 +#, c-format +msgid "Found %d entry:" +msgid_plural "Found %d entries:" +msgstr[0] "" +msgstr[1] "" + +#: ../src/search-dialog.c:278 +msgid "Searching…" +msgstr "Søker …" + +#: ../src/storage-manager.c:247 +#, c-format +msgid "" +"Could not open database \"%s\". SQLite provided the following error message: " +"%s" +msgstr "" + +#: ../src/storage-manager.c:290 +#, c-format +msgid "" +"Could not run query \"%s\". SQLite provided the following error message: %s" +msgstr "" + +#: ../src/storage-manager.c:596 +msgid "Error deserializing entry into buffer while searching." +msgstr "" + +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "" + +#: ../src/vfs.c:291 +#, c-format +msgid "GPGME is not at least version %s" +msgstr "" + +#: ../src/vfs.c:298 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "" -#: ../src/storage-manager.c:193 +#: ../src/vfs.c:305 #, c-format msgid "Error creating cipher context: %s" msgstr "" -#: ../src/storage-manager.c:222 +#: ../src/vfs.c:325 +#, c-format +msgid "Can't create a new GIOChannel for the encrypted database: %s" +msgstr "" + +#: ../src/vfs.c:333 #, c-format msgid "Error opening encrypted database file \"%s\": %s" msgstr "" -#: ../src/storage-manager.c:242 +#: ../src/vfs.c:349 #, c-format -msgid "Error opening plain database file \"%s\": %s" +msgid "Error creating Callback base data buffer: %s" msgstr "" -#: ../src/storage-manager.c:312 +#: ../src/vfs.c:357 #, c-format -msgid "Error decrypting database: %s" +msgid "Can't create a new GIOChannel for the plain database: %s" msgstr "" -#: ../src/storage-manager.c:345 +#: ../src/vfs.c:365 +#, c-format +msgid "Error opening plain database file \"%s\": %s" +msgstr "" + +#: ../src/vfs.c:461 #, c-format msgid "Error getting encryption key: %s" msgstr "" -#: ../src/storage-manager.c:366 +#: ../src/vfs.c:485 ../src/vfs.c:491 #, c-format msgid "Error encrypting database: %s" msgstr "" -#: ../src/storage-manager.c:377 +#. Translators: The first and second params are file paths, the last param is an error message. +#: ../src/vfs.c:541 #, c-format -msgid "Could not delete plain database file \"%s\"." +msgid "Error copying the file from %s to %s: %s" msgstr "" -#: ../src/storage-manager.c:425 +#: ../src/vfs.c:547 #, c-format -msgid "" -"Both an encrypted and plaintext version of the database exist as \"%s\" and " -"\"%s\", and one is likely corrupt. Please delete the corrupt one (i.e. one " -"which is 0KiB in size) before continuing. If neither file is 0KiB, the " -"problem will most likely have been caused by Diary being unable to encrypt " -"the database, so you should move the first file." +msgid "Error changing database backup file permissions: %s" msgstr "" -#: ../src/storage-manager.c:450 +#: ../src/vfs.c:647 #, c-format -msgid "" -"Could not open database \"%s\". SQLite provided the following error message: " -"%s" +msgid "Error closing file: %s" msgstr "" -#: ../src/storage-manager.c:482 +#. Translators: the first parameter is a filename. +#: ../src/vfs.c:1046 ../src/vfs.c:1073 #, c-format -msgid "" -"Error getting encryption key: GConf key \"%s\" invalid or empty. Your diary " -"will not be encrypted; please install Seahorse and set up a default key, or " -"ignore this message." +msgid "Error backing up file ‘%s’" msgstr "" -#: ../src/storage-manager.c:526 ../src/storage-manager.c:559 +#: ../src/vfs.c:1059 #, c-format -msgid "" -"Could not run query \"%s\". SQLite provided the following error message: %s" +msgid "Error decrypting database: %s" msgstr "" -#: ../src/storage-manager.c:707 +#: ../src/vfs.c:1099 #, c-format -msgid "Are you sure you want to edit this diary entry for %s?" +msgid "Error changing database file permissions: %s" msgstr "" -#: ../src/storage-manager.c:734 +#: ../src/widgets/calendar-button.c:142 #, c-format -msgid "Are you sure you want to delete this diary entry for %s?" +msgid "UI data could not be loaded: %s" +msgstr "" + +#: ../src/widgets/calendar-button.c:152 +msgid "Can't load calendar window object from UI file" +msgstr "" + +#. Translators: This is the detail string for important days as displayed in the calendar. +#: ../src/widgets/calendar.c:176 +msgid "Important!" +msgstr "" + +#: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:166 +msgid "add tag" +msgstr "" + +#: ../src/widgets/entry-tags-area.c:101 +msgid "Write the tag and press enter to save it" +msgstr "" + +#: ../src/widgets/tag-accessible.c:165 +msgid "Remove the tag from the entry" +msgstr "" + +#. Looks like gtk_widget_set_tooltip_text don't works here, even in the init... ? +#: ../src/widgets/tag.c:416 +msgid "Remove tag" +msgstr "Fjern etikett" + +#: ../src/widgets/tag-entry.c:85 +msgid "Tag entry" msgstr "" diff -Nru almanah-0.11.1/po/nl.po almanah-0.12.0/po/nl.po --- almanah-0.11.1/po/nl.po 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/nl.po 2019-10-07 13:45:09.000000000 +0000 @@ -10,6 +10,7 @@ "PO-Revision-Date: 2010-06-30 20:52+0200\n" "Last-Translator: Heimen \n" "Language-Team: \n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru almanah-0.11.1/po/oc.po almanah-0.12.0/po/oc.po --- almanah-0.11.1/po/oc.po 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/oc.po 2019-10-07 13:45:09.000000000 +0000 @@ -1,231 +1,785 @@ -# French translation of diary. -# Copyright (C) 2008 The Free Software Foundation, Inc. +# Occitan translation of diary. +# Copyright (C) 2008-2012 The Free Software Foundation, Inc. # This file is distributed under the same license as the diary package. -# -# Philip Withnall , 2008. -# Jean-François Martin , 2008. -# Claude Paroz , 2008. -# +# Cédric Valmary (Tot en òc) , 2015. msgid "" msgstr "" -"Project-Id-Version: diary HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-06-22 20:40+0200\n" -"PO-Revision-Date: 2008-06-22 21:23+0200\n" -"Last-Translator: Claude Paroz \n" -"Language-Team: GNOME French Team \n" +"Project-Id-Version: almanah HEAD\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=almanah" +"&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-05-14 08:57+0000\n" +"PO-Revision-Date: 2015-05-16 11:24+0200\n" +"Last-Translator: Cédric Valmary (Tot en òc) \n" +"Language-Team: Tot en òc (totenoc.eu)\n" +"Language: oc\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Virtaal 0.7.1\n" +"X-Project-Style: gnome\n" + +#: ../data/almanah-app-menu.ui.h:1 +msgid "_Search" +msgstr "_Recercar" + +#: ../data/almanah-app-menu.ui.h:2 +msgid "Pr_eferences" +msgstr "Pref_eréncias" + +#. Set the button label +#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 +msgid "_Import" +msgstr "_Importar" + +#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 +msgid "_Export" +msgstr "_Exportar" + +#: ../data/almanah-app-menu.ui.h:5 +msgid "_Print diary" +msgstr "_Imprimir lo jornal" + +#: ../data/almanah-app-menu.ui.h:6 +msgid "_About Almanah Diary" +msgstr "A _prepaus de Jornal Almanah" + +#: ../data/almanah-app-menu.ui.h:7 +msgid "_Quit" +msgstr "_Quitar" + +#: ../data/almanah.desktop.in.h:1 ../src/application.c:132 +#: ../src/main-window.c:135 +msgid "Almanah Diary" +msgstr "Jornal Almanah" -#: ../data/diary.desktop.in.h:1 ../src/main.c:82 +#: ../data/almanah.desktop.in.h:2 +msgid "Keep a personal diary" +msgstr "Tenir un jornal personal" + +#. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. +#: ../data/almanah.desktop.in.h:3 ../src/application.c:263 msgid "Diary" -msgstr "Diary" +msgstr "Jornal" -#: ../data/diary.desktop.in.h:2 -msgid "Keep a personal diary" -msgstr "" +#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../data/almanah.desktop.in.h:5 +msgid "diary;journal;" +msgstr "jornal;" + +#: ../data/almanah.ui.h:1 +msgid "Select Date…" +msgstr "Seleccionar la data…" + +#: ../data/almanah.ui.h:2 +msgid "F_ormat" +msgstr "F_ormat" + +#: ../data/almanah.ui.h:3 +msgid "Toggle whether the currently selected text is bold." +msgstr "Indica se le tèxte actualament seleccionat es en gras." + +#: ../data/almanah.ui.h:4 +msgid "Toggle whether the currently selected text is italic." +msgstr "Indica se le tèxte actualament seleccionat es en italica." + +#: ../data/almanah.ui.h:5 +msgid "Toggle whether the currently selected text is underlined." +msgstr "Indica se le tèxte actualament seleccionat es solinhat." + +#: ../data/almanah.ui.h:6 +msgid "Add/Remove _Hyperlink" +msgstr "Apondre/levar un _iperligam" -#: ../src/interface.c:45 -#, c-format -msgid "UI file \"%s/diary/diary.ui\" could not be loaded. Error: %s" +#: ../data/almanah.ui.h:7 +msgid "" +"Add or remove a hyperlink from the currently selected text to a specified " +"URI." msgstr "" +"Apond o lèva un iperligam del tèxte actualament seleccionat cap a un URI " +"donat." + +#: ../data/almanah.ui.h:8 +msgid "Insert _Time" +msgstr "Inserir l'_ora" + +#: ../data/almanah.ui.h:9 +msgid "I_mportant" +msgstr "I_mportant" + +#: ../data/almanah.ui.h:10 +msgid "Toggle whether the current entry is marked as important." +msgstr "Indica se l'element actual es marcat coma important." + +#: ../data/almanah.ui.h:11 +msgid "_Help" +msgstr "Ajud_a" + +#: ../data/almanah.ui.h:12 +msgid "Go to _Today" +msgstr "Anar a _uèi" + +#: ../data/almanah.ui.h:13 +msgid "Jump to the current date in the diary." +msgstr "Sauta a la data actuala del jornal." + +#: ../data/almanah.ui.h:14 +msgid "Calendar" +msgstr "Calendièr" + +#: ../data/almanah.ui.h:15 +msgid "Entry editing area" +msgstr "Zòna de picada de las entradas" + +#: ../data/almanah.ui.h:16 +msgid "Past events" +msgstr "Eveniments passats" -#. Type, Name, Description, Icon, Columns, Format function, View function, Dialogue build function, Get values function -#. { "email", N_("E-mail"), N_("An e-mail you sent or received."), "mail-read", 2, &link_email_format_value, &link_email_view, &link_email_build_dialog, &link_email_get_values }, -#. Translators: These are the names and descriptions of the different link types. -#: ../src/link.c:52 -msgid "File" -msgstr "Fichièr" +#: ../data/almanah.ui.h:17 +msgid "Past Event List" +msgstr "Lista dels eveniments passats" -#: ../src/link.c:52 -msgid "An attached file." +#: ../data/almanah.ui.h:18 +msgid "Search entry" +msgstr "Zòna de picada de la recèrca" + +#: ../data/almanah.ui.h:19 ../src/search-dialog.c:69 +msgid "Search" +msgstr "Recercar" + +#: ../data/almanah.ui.h:20 +msgid "Result List" +msgstr "Lista dels resultats" + +#: ../data/almanah.ui.h:21 +msgid "View Entry" +msgstr "Afichar l'element" + +#: ../data/almanah.ui.h:22 +msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." +msgstr "per ex. « 14/03/2009 » o « 14 de març de 2009 »." + +#: ../data/almanah.ui.h:23 +msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." +msgstr "per ex. « http://google.com/ » o « file:///home/ieu/Fotos/foto.jpg »." + +#: ../data/almanah.ui.h:24 +msgid "Successful Entries" +msgstr "Elements corrèctes" + +#: ../data/almanah.ui.h:25 +msgid "Merged Entries" +msgstr "Elements fusionats" + +#: ../data/almanah.ui.h:26 +msgid "Failed Entries" +msgstr "Elements pas importats" + +#: ../data/almanah.ui.h:27 +msgid "Import Results List" +msgstr "Lista dels resultats de l'importacion" + +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 +msgid "Database encryption key ID" +msgstr "Identificant de la clau de chiframent de la banca de donadas" + +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +msgid "" +"The ID of the key to use to encrypt and decrypt the database, if Almanah has " +"been built with encryption support. Leave blank to disable database " +"encryption." msgstr "" +"L'identificant de la clau d'utilizar per chifrar e deschifrar la banca de " +"donadas, pel cas qu'Almanah es estat compilat amb la presa en carga del " +"chiframent. Lo daissar void per desactivar lo chiframent de la banca de " +"donadas." -#: ../src/link.c:53 -msgid "Note" -msgstr "Nòta" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 +msgid "Spell checking language" +msgstr "Lenga per la verificacion ortografica" -#: ../src/link.c:53 -msgid "A note about an important event." +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +msgid "The locale specifier of the language in which to check entry spellings." msgstr "" +"Indicacion de la lenga d'utilizar per la verificacion ortografica de las " +"entradas." -#: ../src/link.c:54 ../src/links/uri.c:55 -msgid "URI" -msgstr "URI" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +msgid "Spell checking enabled?" +msgstr "Verificacion ortografica activada ?" -#: ../src/link.c:54 -msgid "A URI of a file or web page." +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 +msgid "Whether spell checking of entries is enabled." msgstr "" +"Indica se la correccion ortografica es activada dins las zònas de picada." -#: ../src/links/file.c:44 -msgid "Due to an unknown error the file cannot be opened." +#: ../src/application.c:246 +msgid "Error opening database" +msgstr "Error al moment de la dobertura de la banca de donadas" + +#. Error loading the CSS +#: ../src/application.c:275 +#, c-format +msgid "" +"Couldn't load the CSS file '%s'. The interface might not be styled correctly" msgstr "" +"Impossible de cargar lo fichièr CSS « %s ». Es possible que l'interfàcia siá " +"pas corrèctament agençada" -#: ../src/links/file.c:55 -msgid "Select File" -msgstr "Seleccionatz un fichièr" +#: ../src/application.c:319 +msgid "Enable debug mode" +msgstr "Activar lo mòde de desbugatge" -#: ../src/links/uri.c:44 -msgid "Due to an unknown error the URI cannot be opened." +#: ../src/application.c:336 +msgid "" +"Manage your diary. Only one instance of the program may be open at any time." msgstr "" +"Gerir vòstre jornal. Una sola instància del programa pòt èsser aviada quora " +"que siá." -#: ../src/main-window.c:178 +#. Print an error +#: ../src/application.c:347 #, c-format -msgid "The spelling checker could not be initialized: %s" -msgstr "" +msgid "Command line options could not be parsed: %s\n" +msgstr "Las opcions de la linha de comanda an pas pogut èsser analisadas : %s\n" + +#: ../src/application.c:366 +msgid "Error encrypting database" +msgstr "Error al moment del chiframent de la banca de donadas" -#: ../src/main-window.c:265 +#: ../src/application.c:419 ../src/date-entry-dialog.c:129 +#: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 +#: ../src/main-window.c:194 ../src/preferences-dialog.c:191 +#: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 +#, c-format +msgid "UI file \"%s\" could not be loaded" +msgstr "Lo fichièr d'interfàcia « %s » a pas pogut èsser cargat" + +#: ../src/application.c:542 msgid "" -"Diary is free software: you can redistribute it and/or modify it under the " +"Almanah is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " "Foundation, either version 3 of the License, or (at your option) any later " "version." msgstr "" +"Almanah es un logicial liure ; lo podètz redistribuir e/o lo modificar al " +"títol de las clausas de la Licéncia Publica Generala GNU, tala coma " +"publicada per la Free Software Foundation ; siá la version 3 de la Licéncia, " +"o (coma volètz) una version ulteriora quina que siá." -#: ../src/main-window.c:269 +#: ../src/application.c:546 msgid "" -"Diary is distributed in the hope that it will be useful, but WITHOUT ANY " +"Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " "FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " "details." msgstr "" +"Almanah es distribuit dins l'esper que serà utile, mas SENS CAP DE GARANTIDA " +"; sens la quita garantida implicita de COMERCIABILITAT o DE CONFORMITAT A " +"UNA UTILIZACION PARTICULARA. Veire la Licéncia Publica Generala GNU per mai " +"de detalhs." -#: ../src/main-window.c:273 +#: ../src/application.c:550 msgid "" "You should have received a copy of the GNU General Public License along with " -"Diary. If not, see ." +"Almanah. If not, see ." msgstr "" +"Vos caldriá aver recebut un exemplar de la Licéncia Publica Generala GNU amb " +"Almanah. S'es pas lo cas, consultatz ." -#: ../src/main-window.c:284 +#: ../src/application.c:565 #, c-format -msgid "" -"A helpful diary keeper, storing %u entries with %u links and a total of %u " -"characters." +msgid "A helpful diary keeper, storing %u entries." msgstr "" +"Un organizador de jornal personal plan utile, qu'emmagazina %u entradas." -#: ../src/main-window.c:291 -msgid "Copyright © 2008 Philip Withnall" -msgstr "Copyright © 2008 Philip Withnall" +#: ../src/application.c:569 +msgid "Copyright © 2008-2009 Philip Withnall" +msgstr "Copyright © 2008-2009 Philip Withnall" #. Translators: please include your names here to be credited for your hard work! #. * Format: #. * "Translator name 1 \n" #. * "Translator name 2 " #. -#: ../src/main-window.c:299 +#: ../src/application.c:577 msgid "translator-credits" -msgstr "Yannig Marchegay (Kokoyaya) " +msgstr "Cédric Valmary (Tot en òc) " -#: ../src/main-window.c:303 -msgid "Diary Website" -msgstr "Sit web de Diary" +#: ../src/application.c:581 +msgid "Almanah Website" +msgstr "Site Web d'Almanah" -#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. -#. Translators: This is a strftime()-format string for the date displayed above each printed entry. -#: ../src/main-window.c:348 ../src/printing.c:66 -msgid "%A, %e %B %Y" +#: ../src/date-entry-dialog.c:72 +msgid "Select Date" +msgstr "Seleccionar la data" + +#: ../src/entry.c:303 +#, c-format +msgid "Invalid data version number %u." +msgstr "Numèro de version de las donadas %u invalid." + +#: ../src/events/calendar-appointment.c:51 +msgid "Calendar Appointment" +msgstr "Rendètz-vos d'Agenda" + +#: ../src/events/calendar-appointment.c:52 +msgid "An appointment on an Evolution calendar." +msgstr "Un rendètz-vos dins un calendièr Evolution." + +#. Translators: This is a time string with the format hh:mm +#: ../src/events/calendar-appointment.c:89 ../src/events/calendar-task.c:90 +#, c-format +msgid "%.2d:%.2d" +msgstr "%.2d:%.2d" + +#: ../src/events/calendar-appointment.c:135 ../src/events/calendar-task.c:125 +msgid "Error launching Evolution" +msgstr "Error al moment de l'aviada d'Evolution" + +#: ../src/events/calendar-task.c:51 +msgid "Calendar Task" +msgstr "Prètzfach d'Agenda" + +#: ../src/events/calendar-task.c:52 +msgid "A task on an Evolution calendar." +msgstr "Un prètzfach dins un calendièr Evolution." + +#: ../src/export-operation.c:45 ../src/import-operation.c:45 +msgid "Text Files" +msgstr "Fichièrs tèxte" + +#: ../src/export-operation.c:46 +msgid "" +"Select a _folder to export the entries to as text files, one per entry, with " +"names in the format 'yyyy-mm-dd', and no extension. All entries will be " +"exported, unencrypted in plain text format." +msgstr "" +"Causissètz un _dorsièr per i exportar los articles jos la forma de fichièrs " +"tèxte, un per article. Los noms de fichièr son creats segon lo modèl « aaaa-" +"mm-jj », sens extension. Totes los articles son exportats dins un format " +"tèxte brut, pas chifrat." + +#: ../src/export-operation.c:50 ../src/import-operation.c:50 +msgid "Database" +msgstr "Banca de donadas" + +#: ../src/export-operation.c:51 +msgid "" +"Select a _filename for a complete copy of the unencrypted Almanah Diary " +"database to be given." msgstr "" +"Causissètz un nom de _fichièr per una còpia completa e non chifrada de la " +"banca de donadas del jornal Almanah." -#: ../src/main.c:70 -msgid "Enable debug mode" +#: ../src/import-export-dialog.c:202 +msgid "Import _mode: " +msgstr "_Mòde d'importacion : " + +#: ../src/import-export-dialog.c:202 +msgid "Export _mode: " +msgstr "Mòde d'e_xportacion : " + +#. Set the window title +#: ../src/import-export-dialog.c:205 +msgid "Import Entries" +msgstr "Importar los elements" + +#: ../src/import-export-dialog.c:205 +msgid "Export Entries" +msgstr "Exportar los elements" + +#: ../src/import-export-dialog.c:245 +msgid "Import failed" +msgstr "L'importation a fracassat" + +#: ../src/import-export-dialog.c:283 +msgid "Export failed" +msgstr "L'exportacion a fracassat" + +#: ../src/import-export-dialog.c:296 +msgid "Export successful" +msgstr "L'exportacion a capitat" + +#: ../src/import-export-dialog.c:297 +msgid "The diary was successfully exported." +msgstr "Lo jornal es estat exportat amb succès." + +#: ../src/import-export-dialog.c:445 +msgid "Import Results" +msgstr "Resultats d'importation" + +#. Translators: This is a strftime()-format string for the dates displayed in import results. +#. Translators: This is a strftime()-format string for the date to display when asking about editing a diary entry. +#. Translators: This is a strftime()-format string for the date to display when asking about deleting a diary entry. +#. Translators: This is a strftime()-format string for the date displayed above each printed entry. +#. Translators: This is a strftime()-format string for the dates displayed in search results. +#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. +#: ../src/import-export-dialog.c:539 ../src/main-window.c:566 +#: ../src/main-window.c:596 ../src/printing.c:263 ../src/search-dialog.c:182 +#: ../src/widgets/calendar-button.c:309 +msgid "%A, %e %B %Y" +msgstr "%A %e %B %Y" + +#: ../src/import-operation.c:46 +msgid "" +"Select a _folder containing text files, one per entry, with names in the " +"format 'yyyy-mm-dd', and no extension. Any and all such files will be " +"imported." msgstr "" +"Causissètz un _dorsièr que conten de fichièrs tèxte, un per element, que lo " +"format de son nom correspond a « aaaa-mm-jj » e sens extension. Totes los " +"fichièrs correspondents seràn importats." -#. Options -#: ../src/main.c:86 -msgid "- Manage your diary" +#: ../src/import-operation.c:51 +msgid "Select a database _file created by Almanah Diary to import." msgstr "" +"Causissètz un _fichièr banca de donadas creat per Jornal Almanah per tal de " +"l'importar." -#: ../src/main.c:96 +#: ../src/import-operation.c:248 #, c-format -msgid "Command-line options could not be parsed. Error: %s" +msgid "Error deserializing imported entry into buffer: %s" msgstr "" +"Error al moment de la deserializacion de l'element importat dins lo tampon : " +"%s" -#: ../src/printing.c:80 -msgid "No entry for this date." +#: ../src/import-operation.c:264 +#, c-format +msgid "" +"Error deserializing existing entry into buffer; overwriting with imported " +"entry: %s" msgstr "" +"Error al moment de la deserializacion de l'entrada existenta dins lo tampon ;" +" espotiment per l'element importat : %s" -#: ../src/printing.c:210 -msgid "Start Date" -msgstr "Data de debuta" +#. Append some header text for the imported entry +#. Translators: This text is appended to an existing entry when an entry is being imported to the same date. +#. * The imported entry is appended to this text. +#: ../src/import-operation.c:305 +#, c-format +msgid "" +"\n" +"\n" +"Entry imported from \"%s\":\n" +"\n" +msgstr "" +"\n" +"\n" +"Element importat de « %s » :\n" +"\n" -#: ../src/printing.c:212 -msgid "End Date" -msgstr "Data de fin" +#: ../src/main-window.c:570 +#, c-format +msgid "Are you sure you want to edit this diary entry for %s?" +msgstr "Sètz segur que volètz modifier aquesta entrada de jornal del %s ?" -#. Translators: This is a strftime()-format string for the dates displayed in search results. -#: ../src/search-dialog.c:62 -msgid "%A, %e %B %Y" -msgstr "" +#: ../src/main-window.c:600 +#, c-format +msgid "Are you sure you want to delete this diary entry for %s?" +msgstr "Sètz segur que volètz suprimir aquesta entrada de jornal del %s ?" -#: ../src/storage-manager.c:184 +#. Print a warning about the unknown tag +#: ../src/main-window.c:709 +#, c-format +msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." +msgstr "Etiqueta tèxte « %s » de l'entrada desconeguda o en doble. Ignorada." + +#: ../src/main-window.c:908 +msgid "Error opening URI" +msgstr "Error al moment de la dobertura de l'URI" + +#. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place +#: ../src/main-window.c:1082 +#, c-format +msgid "%s @ %s" +msgstr "%s @ %s" + +#: ../src/main-window.c:1161 +msgid "Entry content could not be loaded" +msgstr "Lo contengut de l'entrada a pas pogut èsser cargat" + +#: ../src/main-window.c:1326 +msgid "Spelling checker could not be initialized" +msgstr "Lo corrector ortografic a pas pogut èsser inicializat" + +#: ../src/preferences-dialog.c:91 +msgid "Almanah Preferences" +msgstr "Preferéncias d'Almanah" + +#. Grab our child widgets +#: ../src/preferences-dialog.c:217 +msgid "Encryption key: " +msgstr "Clau de chiframent : " + +#: ../src/preferences-dialog.c:222 +msgid "None (don't encrypt)" +msgstr "Pas cap (de chifrar pas)" + +#: ../src/preferences-dialog.c:246 +msgid "New _Key" +msgstr "_Clau novèla" + +#. Set up the "Enable spell checking" check button +#: ../src/preferences-dialog.c:253 +msgid "Enable _spell checking" +msgstr "Activar la _verificacion ortografica" + +#: ../src/preferences-dialog.c:279 +msgid "Error saving the encryption key" +msgstr "Error al moment de l'enregistrament de la clau de chiframent" + +#: ../src/preferences-dialog.c:298 +msgid "Error opening Seahorse" +msgstr "Error al moment de la dobertura de Seahorse" + +#: ../src/printing.c:277 +msgid "This entry is marked as important." +msgstr "Aqueste article es marcat coma important." + +#: ../src/printing.c:298 +msgid "No entry for this date." +msgstr "Pas cap d'entrada per aquesta data." + +#: ../src/printing.c:453 +msgid "Start date:" +msgstr "Data de començament :" + +#: ../src/printing.c:455 +msgid "End date:" +msgstr "Data de fin :" + +#. Line spacing +#: ../src/printing.c:471 +msgid "Line spacing:" +msgstr "Interlinha :" + +#: ../src/search-dialog.c:223 +msgid "Search canceled." +msgstr "Recèrca anullada." + +#. Translators: This is an error message wrapper for when searches encounter an error. The placeholder is for an error message. +#: ../src/search-dialog.c:226 +#, c-format +msgid "Error: %s" +msgstr "Error : %s" + +#. Success! +#: ../src/search-dialog.c:231 +#, c-format +msgid "Found %d entry:" +msgid_plural "Found %d entries:" +msgstr[0] "%d entrada trobada :" +msgstr[1] "%d entradas trobadas :" + +#: ../src/search-dialog.c:280 +msgid "Searching…" +msgstr "Recèrca en cors…" + +#: ../src/storage-manager.c:275 +#, c-format +msgid "GPGME is not at least version %s" +msgstr "La version de GPGME es inferiora a %s" + +#: ../src/storage-manager.c:284 #, c-format msgid "GPGME doesn't support OpenPGP: %s" -msgstr "" +msgstr "GPGME pren pas en carga OpenPGP : %s" -#: ../src/storage-manager.c:193 +#: ../src/storage-manager.c:293 #, c-format msgid "Error creating cipher context: %s" -msgstr "" +msgstr "Error al moment de la creacion del contèxte de chiframent : %s" -#: ../src/storage-manager.c:222 +#: ../src/storage-manager.c:322 #, c-format msgid "Error opening encrypted database file \"%s\": %s" msgstr "" +"Error al moment de la dobertura del fichièr chifrat de la banca de donadas « " +"%s » : %s" -#: ../src/storage-manager.c:242 +#: ../src/storage-manager.c:341 #, c-format msgid "Error opening plain database file \"%s\": %s" msgstr "" +"Error al moment de la dobertura del fichièr en clar de la banca de donadas « " +"%s » : %s" -#: ../src/storage-manager.c:312 -#, c-format -msgid "Error decrypting database: %s" +#: ../src/storage-manager.c:389 +msgid "" +"The encrypted database is empty. The plain database file has been left " +"undeleted as backup." msgstr "" +"La banca de donadas chifrada es voida. Lo fichièr de banca de donadas en " +"clar es pas estat suprimit e es disponible coma sauvegarde." -#: ../src/storage-manager.c:345 +#. Delete the plain file +#: ../src/storage-manager.c:392 #, c-format -msgid "Error getting encryption key: %s" +msgid "Could not delete plain database file \"%s\"." msgstr "" +"Impossible de suprimir lo fichièr en clar de la banca de donadas « %s »." -#: ../src/storage-manager.c:366 +#: ../src/storage-manager.c:433 #, c-format -msgid "Error encrypting database: %s" -msgstr "" +msgid "Error decrypting database: %s" +msgstr "Error al moment del deschiframent de la banca de donadas : %s" -#: ../src/storage-manager.c:377 +#: ../src/storage-manager.c:467 #, c-format -msgid "Could not delete plain database file \"%s\"." -msgstr "" +msgid "Error getting encryption key: %s" +msgstr "Error al moment de l'obtencion de la clau de chiframent : %s" -#: ../src/storage-manager.c:425 +#: ../src/storage-manager.c:488 #, c-format -msgid "" -"Both an encrypted and plaintext version of the database exist as \"%s\" and " -"\"%s\", and one is likely corrupt. Please delete the corrupt one before " -"continuing." -msgstr "" +msgid "Error encrypting database: %s" +msgstr "Error al moment del chiframent de la banca de donadas : %s" -#: ../src/storage-manager.c:450 +#: ../src/storage-manager.c:590 #, c-format msgid "" "Could not open database \"%s\". SQLite provided the following error message: " "%s" msgstr "" +"Impossible de dobrir la banca de donadas « %s ». SQLite a provesit lo " +"messatge d'error seguent : %s" -#: ../src/storage-manager.c:482 -#, c-format -msgid "Error getting encryption key: GConf key \"%s\" invalid or empty." -msgstr "" - -#: ../src/storage-manager.c:526 ../src/storage-manager.c:559 +#: ../src/storage-manager.c:667 #, c-format msgid "" "Could not run query \"%s\". SQLite provided the following error message: %s" msgstr "" +"Impossible d'aviar la requèsta « %s ». SQLite a provesit lo messatge d'error " +"seguent : %s" -#: ../src/storage-manager.c:686 -#, c-format -msgid "Are you sure you want to delete this diary entry for %s?" +#: ../src/storage-manager.c:973 +msgid "Error deserializing entry into buffer while searching." msgstr "" +"Error al moment de la deserializacion de l'entrada dins lo tampon pendent la " +"recèrca." +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Picatz l'URI" + +#: ../src/widgets/calendar-button.c:140 +#, c-format +msgid "UI file \"%s\" could not be loaded: %s" +msgstr "Lo fichièr d'interfàcia « %s » a pas pogut èsser cargat : %s" + +#: ../src/widgets/calendar-button.c:150 +msgid "Can't load calendar window object from UI file" +msgstr "" +"Impossible de cargar l'objècte fenèstra del calendièr a partir del fichièr " +"d'interfàcia" + +#. Translators: This is the detail string for important days as displayed in the calendar. +#: ../src/widgets/calendar.c:176 +msgid "Important!" +msgstr "Important !" + +#: ../src/widgets/calendar-window.c:80 +msgid "Unknown input device" +msgstr "Periferic d'entrada desconegut" + +#. Looks like gtk_widget_set_tooltip_text don't works here, even in the init... ? +#: ../src/widgets/tag.c:400 +msgid "Remove tag" +msgstr "Suprimir l'etiqueta" + +#~ msgid "" +#~ "Almanah Diary is an application to allow you to keep a diary of your life." +#~ msgstr "" +#~ "Almanah Diary est une application qui vous permet de garder un journal de " +#~ "votre vie." + +#~ msgid "" +#~ "You can encrypt the diary to preserve your privacy. It has editing " +#~ "abilities, including text formatting and printing and shows you a lists of " +#~ "events which happened (on your computer) for each day (such as tasks and " +#~ "appointments from Evolution)." +#~ msgstr "" +#~ "Vous pouvez chiffrer le journal pour protéger votre vie privée. Il est " +#~ "possible d'éditer et de formater le texte, de l'imprimer et d'afficher une " +#~ "liste d'événements sur votre ordinateur pour chaque jour (tel que les taches " +#~ "et les rendez vous d'Evolution)." + +#, fuzzy +#~| msgid "Go to _Today" +#~ msgid "Go to Today" +#~ msgstr "Aller à _aujourd'hui" + +#, fuzzy, c-format +#~| msgid "" +#~| "Couldn't load the CSS file '%s'. The interface might not be styled " +#~| "correctly" +#~ msgid "" +#~ "Couldn't load the CSS resources. The interface might not be styled " +#~ "correctly: %s" +#~ msgstr "" +#~ "Impossible de charger le fichier CSS « %s ». Il se peut que l'interface ne " +#~ "soit pas correctement agencée" + +#, fuzzy +#~| msgid "UI file \"%s\" could not be loaded" +#~ msgid "UI data could not be loaded" +#~ msgstr "Le fichier d'interface « %s » n'a pas pu être chargé" + +#, c-format +#~ msgid "Error changing exported file permissions: %s" +#~ msgstr "Erreur lors du changement des permissions du fichier exporté : %s" + +#, fuzzy, c-format +#~| msgid "Error decrypting database: %s" +#~ msgid "Error creating Callback base data buffer: %s" +#~ msgstr "Erreur lors du déchiffrement de la base de données : %s" + +#, fuzzy, c-format +#~| msgid "Error changing database file permissions: %s" +#~ msgid "Error copying the file from %s to %s: %s" +#~ msgstr "" +#~ "Erreur lors du changement des permissions du fichier de base de données : %s" + +#, c-format +#~ msgid "Error changing database backup file permissions: %s" +#~ msgstr "" +#~ "Erreur lors du changement des permissions du fichier de sauvegarde : %s" + +#, fuzzy, c-format +#~| msgid "Error backing up file ‘%s’: %s" +#~ msgid "Error closing file: %s" +#~ msgstr "Erreur lors de la sauvegarde du fichier « %s » : %s" + +#, fuzzy, c-format +#~| msgid "Error backing up file ‘%s’: %s" +#~ msgid "Error backing up file ‘%s’" +#~ msgstr "Erreur lors de la sauvegarde du fichier « %s » : %s" + +#, c-format +#~ msgid "Error changing database file permissions: %s" +#~ msgstr "" +#~ "Erreur lors du changement des permissions du fichier de base de données : %s" + +#, fuzzy, c-format +#~| msgid "UI file \"%s\" could not be loaded: %s" +#~ msgid "UI data could not be loaded: %s" +#~ msgstr "Le fichier d'interface « %s » n'a pas pu être chargé : %s" + +#~ msgid "add tag" +#~ msgstr "ajouter une étiquette" + +#~ msgid "Write the tag and press enter to save it" +#~ msgstr "Écrire l'étiquette et appuyer sur entrée pour enregistrer" + +#~ msgid "Remove the tag from the entry" +#~ msgstr "Retirer l'étiquette de l'entrée" + +#~ msgid "Tag entry" +#~ msgstr "Ajout d'étiquette" + +#~ msgid "Show tags" +#~ msgstr "Afficher les étiquettes" + +#~| msgid "Jump to the current date in the diary." +#~ msgid "Show tags for the current entry" +#~ msgstr "Afficher les étiquettes pour l'entrée actuelle" diff -Nru almanah-0.11.1/po/pl.po almanah-0.12.0/po/pl.po --- almanah-0.11.1/po/pl.po 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/pl.po 2019-10-07 13:45:09.000000000 +0000 @@ -1,36 +1,41 @@ -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Aviary.pl -# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz -# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas: -# gnomepl@aviary.pl -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +# Polish translation for almanah. +# Copyright © 2011-2017 the almanah authors. +# This file is distributed under the same license as the almanah package. # Mateusz Kacprzak , 2011. -# Piotr Drąg , 2012-2013. -# Aviary.pl , 2011-2013. +# Piotr Drąg , 2012-2017. +# Aviary.pl , 2011-2017. +# msgid "" msgstr "" "Project-Id-Version: almanah\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-17 18:58+0100\n" -"PO-Revision-Date: 2013-11-17 19:00+0100\n" +"POT-Creation-Date: 2017-03-27 20:42+0200\n" +"PO-Revision-Date: 2017-03-27 20:44+0200\n" "Last-Translator: Piotr Drąg \n" -"Language-Team: Polish \n" +"Language-Team: Polish \n" "Language: pl\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 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Poedit-Language: Polish\n" -"X-Poedit-Country: Poland\n" -#: ../data/almanah.appdata.xml.in.h:1 +#: ../data/almanah.appdata.xml.in.h:1 ../data/almanah.desktop.in.h:1 +#: ../src/application.c:135 ../src/main-window.c:163 +msgid "Almanah Diary" +msgstr "Pamiętnik Almanah" + +#: ../data/almanah.appdata.xml.in.h:2 +msgid "Keep a diary of your life" +msgstr "Prowadzenie osobistego dziennika" + +#: ../data/almanah.appdata.xml.in.h:3 msgid "" "Almanah Diary is an application to allow you to keep a diary of your life." msgstr "" "Pamiętnik Almanah to program umożliwiający prowadzenie osobistego dziennika." -#: ../data/almanah.appdata.xml.in.h:2 +#: ../data/almanah.appdata.xml.in.h:4 msgid "" "You can encrypt the diary to preserve your privacy. It has editing " "abilities, including text formatting and printing and shows you a lists of " @@ -38,50 +43,16 @@ "appointments from Evolution)." msgstr "" "Program wyświetla listę wydarzeń (na komputerze) dla każdego dnia (np. " -"zadania i spotkania z programu Evolution) oraz posiada funkcje redagowania, " -"takie jak formatowanie tekstu i drukowanie. Można także zaszyfrować " +"zadania i spotkania z programu Evolution) oraz posiada funkcje redagowania, " +"takie jak formatowanie tekstu i drukowanie. Można także zaszyfrować " "pamiętnik, aby strzec swojej prywatności." -#: ../data/almanah-app-menu.ui.h:1 -msgid "_Search" -msgstr "Wy_szukaj" - -#: ../data/almanah-app-menu.ui.h:2 -msgid "Pr_eferences" -msgstr "_Preferencje" - -#. Set the button label -#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 -msgid "_Import" -msgstr "Zai_mportuj" - -#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 -msgid "_Export" -msgstr "Wy_eksportuj" - -#: ../data/almanah-app-menu.ui.h:5 -msgid "_Print diary" -msgstr "Wy_drukuj pamiętnik" - -#: ../data/almanah-app-menu.ui.h:6 -msgid "_About Almanah Diary" -msgstr "_O pamiętniku Almanah" - -#: ../data/almanah-app-menu.ui.h:7 -msgid "_Quit" -msgstr "Za_kończ" - -#: ../data/almanah.desktop.in.h:1 ../src/application.c:132 -#: ../src/main-window.c:136 -msgid "Almanah Diary" -msgstr "Pamiętnik Almanah" - #: ../data/almanah.desktop.in.h:2 msgid "Keep a personal diary" msgstr "Prowadzenie osobistego pamiętnika" #. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. -#: ../data/almanah.desktop.in.h:3 ../src/application.c:263 +#: ../data/almanah.desktop.in.h:3 ../src/application.c:274 msgid "Diary" msgstr "Pamiętnik" @@ -90,201 +61,131 @@ msgid "diary;journal;" msgstr "pamiętnik;dziennik;" -#: ../data/almanah.ui.h:1 -msgid "Select Date…" -msgstr "Wybierz datę…" - -#: ../data/almanah.ui.h:2 -msgid "F_ormat" -msgstr "F_ormat" - -#: ../data/almanah.ui.h:3 -msgid "Toggle whether the currently selected text is bold." -msgstr "Przełącza, czy obecnie zaznaczony tekst jest pogrubiony." - -#: ../data/almanah.ui.h:4 -msgid "Toggle whether the currently selected text is italic." -msgstr "Przełącza, czy obecnie zaznaczony tekst jest pochylony." - -#: ../data/almanah.ui.h:5 -msgid "Toggle whether the currently selected text is underlined." -msgstr "Przełącza, czy obecnie zaznaczony tekst jest podkreślony." - -#: ../data/almanah.ui.h:6 -msgid "Add/Remove _Hyperlink" -msgstr "Dodaj/usuń _odnośnik" - -#: ../data/almanah.ui.h:7 -msgid "" -"Add or remove a hyperlink from the currently selected text to a specified " -"URI." -msgstr "" -"Dodaje lub usuwa odnośnik z obecnie zaznaczonego tekstu do podanego adresu " -"URI." - -#: ../data/almanah.ui.h:8 -msgid "Insert _Time" -msgstr "Wstaw godzi_nę" - -#: ../data/almanah.ui.h:9 -msgid "I_mportant" -msgstr "Waż_ne" - -#: ../data/almanah.ui.h:10 -msgid "Toggle whether the current entry is marked as important." -msgstr "Przełącza, czy bieżący wpis jest oznaczony jako ważny." - -#: ../data/almanah.ui.h:11 -msgid "Show tags" -msgstr "Wyświetlanie etykiet" - -#: ../data/almanah.ui.h:12 -msgid "Show tags for the current entry" -msgstr "Wyświetla etykiety dla bieżącego wpisu" - -#: ../data/almanah.ui.h:13 -msgid "_Help" -msgstr "Pomo_c" - -#: ../data/almanah.ui.h:14 -msgid "Go to _Today" -msgstr "Bieżący _dzień" - -#: ../data/almanah.ui.h:15 -msgid "Jump to the current date in the diary." -msgstr "Przechodzi do bieżącej daty w pamiętniku." - -#: ../data/almanah.ui.h:16 +#: ../src/ui/almanah.ui.h:1 msgid "Calendar" msgstr "Kalendarz" -#: ../data/almanah.ui.h:17 +#: ../src/ui/almanah.ui.h:2 +msgid "Go to Today" +msgstr "Bieżący dzień" + +#: ../src/ui/almanah.ui.h:3 +msgid "Select Date…" +msgstr "Wybierz datę…" + +#: ../src/ui/almanah.ui.h:4 msgid "Entry editing area" msgstr "Obszar modyfikowania wpisów" -#: ../data/almanah.ui.h:18 +#: ../src/ui/almanah.ui.h:5 msgid "Past events" msgstr "Przeszłe wydarzenia" -#: ../data/almanah.ui.h:19 +#: ../src/ui/almanah.ui.h:6 msgid "Past Event List" msgstr "Lista przeszłych wydarzeń" -#: ../data/almanah.ui.h:20 +#: ../src/ui/almanah.ui.h:7 msgid "Search entry" msgstr "Przeszukaj wpis" -#: ../data/almanah.ui.h:21 ../src/search-dialog.c:69 +#: ../src/ui/almanah.ui.h:8 ../src/search-dialog.c:69 msgid "Search" msgstr "Wyszukaj" -#: ../data/almanah.ui.h:22 +#: ../src/ui/almanah.ui.h:9 msgid "Result List" msgstr "Lista wyników" -#: ../data/almanah.ui.h:23 +#: ../src/ui/almanah.ui.h:10 msgid "View Entry" msgstr "Wyświetl wpis" -#: ../data/almanah.ui.h:24 +#. Translators: Use two common date formats from your locale which will be parsed correctly by GLib +#: ../src/ui/almanah.ui.h:12 msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." -msgstr "np. \"14/03/2009\" lub \"14 marca 2009\"." +msgstr "np. „14.03.2009” lub „14 marca 2009”." -#: ../data/almanah.ui.h:25 +#. Translators: Use two popular URIs from your locale, preferably one on the Internet and one local file. +#: ../src/ui/almanah.ui.h:14 msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." -msgstr "np. \"http://google.pl/\" lub \"file:///home/ja/Zdjęcia/zdjęcie.jpg\"." +msgstr "np. „https://google.pl/” lub „file:///home/ja/Obrazy/zdjęcie.jpg”." # pozycja na liście wyników importowania -#: ../data/almanah.ui.h:26 +#: ../src/ui/almanah.ui.h:15 msgid "Successful Entries" msgstr "Pomyślnie zaimportowane wpisy" # pozycja na liście wyników importowania -#: ../data/almanah.ui.h:27 +#: ../src/ui/almanah.ui.h:16 msgid "Merged Entries" msgstr "Połączone wpisy" # pozycja na liście wyników importowania -#: ../data/almanah.ui.h:28 +#: ../src/ui/almanah.ui.h:17 msgid "Failed Entries" msgstr "Nie powiodło się importowanie wpisów" -#: ../data/almanah.ui.h:29 +#: ../src/ui/almanah.ui.h:18 msgid "Import Results List" msgstr "Lista wyników importowania" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 +#: ../data/org.gnome.almanah.gschema.xml.in.h:1 msgid "Database encryption key ID" msgstr "Identyfikator klucza szyfrującego bazy danych" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +#: ../data/org.gnome.almanah.gschema.xml.in.h:2 msgid "" "The ID of the key to use to encrypt and decrypt the database, if Almanah has " "been built with encryption support. Leave blank to disable database " "encryption." msgstr "" -"Identyfikator klucza szyfrującego i deszyfrującego bazy danych, jeśli " -"program Almanah został utworzony z obsługą szyfrowania. Pozostawienie " +"Identyfikator klucza szyfrującego i deszyfrującego bazy danych, jeśli " +"program Almanah został utworzony z obsługą szyfrowania. Pozostawienie " "pustego pola wyłączy szyfrowanie baz danych." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 +#: ../data/org.gnome.almanah.gschema.xml.in.h:3 msgid "Spell checking language" msgstr "Język sprawdzania pisowni" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +#: ../data/org.gnome.almanah.gschema.xml.in.h:4 msgid "The locale specifier of the language in which to check entry spellings." msgstr "Określa język, który będzie użyty do sprawdzania pisowni we wpisach." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +#: ../data/org.gnome.almanah.gschema.xml.in.h:5 msgid "Spell checking enabled?" msgstr "Sprawdzanie pisowni włączone?" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 +#: ../data/org.gnome.almanah.gschema.xml.in.h:6 msgid "Whether spell checking of entries is enabled." msgstr "Określa, czy sprawdzanie pisowni we wpisach jest włączone." -#: ../src/application.c:246 +#: ../src/application.c:257 msgid "Error opening database" msgstr "Błąd podczas otwierania bazy danych" -#. Error loading the CSS -#: ../src/application.c:275 -#, c-format -msgid "" -"Couldn't load the CSS file '%s'. The interface might not be styled correctly" -msgstr "" -"Nie można wczytać pliku CSS \"%s\". Interfejs może wyglądać niepoprawnie" - -#: ../src/application.c:319 +#: ../src/application.c:336 msgid "Enable debug mode" msgstr "Włącza tryb debugowania" -#: ../src/application.c:336 +#: ../src/application.c:353 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" "Zarządzanie osobistym pamiętnikiem. Tylko jedna kopia programu może być " -"otwarta w danym momencie." +"otwarta w danym momencie." #. Print an error -#: ../src/application.c:347 +#: ../src/application.c:364 #, c-format msgid "Command line options could not be parsed: %s\n" msgstr "Opcje wiersza poleceń nie mogły zostać przetworzone: %s\n" -#: ../src/application.c:366 +#: ../src/application.c:383 msgid "Error encrypting database" msgstr "Błąd podczas szyfrowania bazy danych" -#: ../src/application.c:419 ../src/date-entry-dialog.c:129 -#: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 -#: ../src/main-window.c:195 ../src/preferences-dialog.c:191 -#: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 -#, c-format -msgid "UI file \"%s\" could not be loaded" -msgstr "Nie można wczytać pliku interfejsu użytkownika \"%s\"" - -#: ../src/application.c:542 +#: ../src/application.c:526 msgid "" "Almanah is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -293,36 +194,36 @@ msgstr "" "Program Almanah jest wolnym oprogramowaniem; można go rozprowadzać dalej i/" "lub modyfikować na warunkach Powszechnej Licencji Publicznej GNU, wydanej " -"przez Fundację Wolnego Oprogramowania (Free Software Foundation) - według " -"wersji trzeciej tej Licencji lub którejś z późniejszych wersji." +"przez Fundację Wolnego Oprogramowania (Free Software Foundation) — według " +"wersji trzeciej tej Licencji lub którejś z późniejszych wersji." -#: ../src/application.c:546 +#: ../src/application.c:530 msgid "" "Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " "FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " "details." msgstr "" -"Program Almanah rozpowszechniany jest z nadzieją, iż będzie on użyteczny - " +"Program Almanah rozpowszechniany jest z nadzieją, iż będzie on użyteczny — " "jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji PRZYDATNOŚCI " -"HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu uzyskania " -"bliższych informacji należy zapoznać się z Powszechną Licencją Publiczną GNU." +"HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu uzyskania " +"bliższych informacji należy zapoznać się z Powszechną Licencją Publiczną GNU." -#: ../src/application.c:550 +#: ../src/application.c:534 msgid "" "You should have received a copy of the GNU General Public License along with " "Almanah. If not, see ." msgstr "" -"Z pewnością wraz z programem Almanah dostarczono także egzemplarz " +"Z pewnością wraz z programem Almanah dostarczono także egzemplarz " "Powszechnej Licencji Publicznej GNU (GNU General Public License); jeśli nie " -"- proszę odwiedzić stronę internetową ." +"— proszę odwiedzić stronę internetową ." -#: ../src/application.c:565 +#: ../src/application.c:549 #, c-format msgid "A helpful diary keeper, storing %u entries." -msgstr "Pomocny zarządca pamiętnika, przechowuje %u wpisów." +msgstr "Pomocny zarządca pamiętnika, liczba wpisów: %u." -#: ../src/application.c:569 +#: ../src/application.c:553 msgid "Copyright © 2008-2009 Philip Withnall" msgstr "Copyright © 2008-2009 Philip Withnall" @@ -331,21 +232,36 @@ #. * "Translator name 1 \n" #. * "Translator name 2 " #. -#: ../src/application.c:577 +#: ../src/application.c:561 msgid "translator-credits" msgstr "" "Mateusz Kacprzak , 2011\n" -"Piotr Drąg , 2012-2013\n" -"Aviary.pl , 2011-2013" +"Piotr Drąg , 2012-2017\n" +"Aviary.pl , 2011-2017" -#: ../src/application.c:581 +#: ../src/application.c:565 msgid "Almanah Website" msgstr "Witryna programu Almanah" +#: ../src/application.c:593 +#, c-format +msgid "" +"Couldn't load the CSS resources. The interface might not be styled " +"correctly: %s" +msgstr "" +"Nie można wczytać zasobów CSS. Interfejs może wyglądać niepoprawnie: %s" + #: ../src/date-entry-dialog.c:72 msgid "Select Date" msgstr "Wybór daty" +#: ../src/date-entry-dialog.c:127 ../src/import-export-dialog.c:169 +#: ../src/import-export-dialog.c:476 ../src/main-window.c:235 +#: ../src/preferences-dialog.c:177 ../src/search-dialog.c:95 +#: ../src/uri-entry-dialog.c:126 +msgid "UI data could not be loaded" +msgstr "Nie można wczytać danych interfejsu użytkownika" + #: ../src/entry.c:303 #, c-format msgid "Invalid data version number %u." @@ -357,7 +273,7 @@ #: ../src/events/calendar-appointment.c:52 msgid "An appointment on an Evolution calendar." -msgstr "Przypomnienie w kalendarzu programu Evolution." +msgstr "Przypomnienie w kalendarzu programu Evolution." #. Translators: This is a time string with the format hh:mm #: ../src/events/calendar-appointment.c:89 ../src/events/calendar-task.c:90 @@ -375,13 +291,13 @@ #: ../src/events/calendar-task.c:52 msgid "A task on an Evolution calendar." -msgstr "Zadanie w kalendarzu programu Evolution." +msgstr "Zadanie w kalendarzu programu Evolution." #: ../src/export-operation.c:47 ../src/import-operation.c:45 msgid "Text Files" msgstr "Pliki tekstowe" -# instrukcja w oknie eksportu +# instrukcja w oknie eksportu #: ../src/export-operation.c:48 msgid "" "Select a _folder to export the entries to as text files, one per entry, with " @@ -389,7 +305,7 @@ "exported, unencrypted in plain text format." msgstr "" "Proszę wybrać _katalog, aby wyeksportować wpisy jako pliki tekstowe, osobny " -"plik dla każdego wpisu, nazwany według formatu \"rrrr-mm-dd\", bez " +"plik dla każdego wpisu, nazwany według formatu „rrrr-mm-dd”, bez " "rozszerzenia. Wszystkie wpisy zostaną wyeksportowane, niezaszyfrowane, jako " "zwykłe pliki tekstowe." @@ -397,7 +313,7 @@ msgid "Database" msgstr "Baza danych" -# instrukcja w oknie eksportu +# instrukcja w oknie eksportu #: ../src/export-operation.c:53 msgid "" "Select a _filename for a complete copy of the unencrypted Almanah Diary " @@ -411,56 +327,133 @@ msgid "Error changing exported file permissions: %s" msgstr "Błąd podczas zmieniania uprawnień wyeksportowanego pliku: %s" -#: ../src/import-export-dialog.c:202 +#: ../src/gtk/menus.ui.h:1 +msgid "_Search" +msgstr "Wy_szukaj" + +#: ../src/gtk/menus.ui.h:2 +msgid "Pr_eferences" +msgstr "_Preferencje" + +#: ../src/gtk/menus.ui.h:3 +msgctxt "Main menu" +msgid "_Import" +msgstr "Zai_mportuj" + +#: ../src/gtk/menus.ui.h:4 +msgctxt "Main menu" +msgid "_Export" +msgstr "Wy_eksportuj" + +#: ../src/gtk/menus.ui.h:5 +msgid "_Print diary" +msgstr "Wy_drukuj pamiętnik" + +#: ../src/gtk/menus.ui.h:6 +msgid "_About Almanah Diary" +msgstr "_O pamiętniku Almanah" + +#: ../src/gtk/menus.ui.h:7 +msgid "_Quit" +msgstr "Za_kończ" + +#: ../src/gtk/menus.ui.h:8 +msgid "_Bold" +msgstr "Pogru_bienie" + +#: ../src/gtk/menus.ui.h:9 +msgid "_Italic" +msgstr "Po_chylenie" + +#: ../src/gtk/menus.ui.h:10 +msgid "_Underline" +msgstr "Po_dkreślenie" + +#: ../src/gtk/menus.ui.h:11 +msgid "_Cut" +msgstr "_Wytnij" + +#: ../src/gtk/menus.ui.h:12 +msgid "_Copy" +msgstr "S_kopiuj" + +#: ../src/gtk/menus.ui.h:13 +msgid "_Paste" +msgstr "Wk_lej" + +#: ../src/gtk/menus.ui.h:14 ../src/main-window.c:640 +msgid "_Delete" +msgstr "_Usuń" + +#: ../src/gtk/menus.ui.h:15 +msgid "Insert _Time" +msgstr "Wstaw godzi_nę" + +#: ../src/gtk/menus.ui.h:16 +msgid "Add/Remove _Hyperlink" +msgstr "Dodaj/usuń _odnośnik" + +#: ../src/import-export-dialog.c:203 msgid "Import _mode: " msgstr "_Tryb importu: " -#: ../src/import-export-dialog.c:202 +#: ../src/import-export-dialog.c:203 msgid "Export _mode: " msgstr "_Tryb eksportu: " #. Set the window title -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Import Entries" msgstr "Import wpisów" -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Export Entries" msgstr "Eksport wpisów" -#: ../src/import-export-dialog.c:245 +#. Translators: These are verbs. +#: ../src/import-export-dialog.c:211 +msgctxt "Dialog button" +msgid "_Import" +msgstr "Zai_mportuj" + +#: ../src/import-export-dialog.c:211 +msgctxt "Dialog button" +msgid "_Export" +msgstr "Wy_eksportuj" + +#: ../src/import-export-dialog.c:248 msgid "Import failed" msgstr "Importowanie się nie powiodło" -#: ../src/import-export-dialog.c:283 +#: ../src/import-export-dialog.c:286 msgid "Export failed" msgstr "Eksportowanie się nie powiodło" -#: ../src/import-export-dialog.c:296 +#: ../src/import-export-dialog.c:299 msgid "Export successful" msgstr "Eksportowanie się powiodło" -#: ../src/import-export-dialog.c:297 +#: ../src/import-export-dialog.c:300 msgid "The diary was successfully exported." msgstr "Pamiętnik został pomyślnie wyeksportowany." -#: ../src/import-export-dialog.c:445 +#: ../src/import-export-dialog.c:448 msgid "Import Results" msgstr "Wyniki importowania" #. Translators: This is a strftime()-format string for the dates displayed in import results. #. Translators: This is a strftime()-format string for the date to display when asking about editing a diary entry. #. Translators: This is a strftime()-format string for the date to display when asking about deleting a diary entry. +#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. -#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. -#: ../src/import-export-dialog.c:539 ../src/main-window.c:567 -#: ../src/main-window.c:597 ../src/printing.c:263 ../src/search-dialog.c:182 -#: ../src/widgets/calendar-button.c:309 +#: ../src/import-export-dialog.c:543 ../src/main-window.c:601 +#: ../src/main-window.c:632 ../src/main-window.c:1271 ../src/printing.c:263 +#: ../src/search-dialog.c:180 msgid "%A, %e %B %Y" -msgstr "%A, %e %B %Y" +msgstr "%A, %-d %B %Y" -# instrukcja w oknie importu +# instrukcja w oknie importu #: ../src/import-operation.c:46 msgid "" "Select a _folder containing text files, one per entry, with names in the " @@ -468,10 +461,10 @@ "imported." msgstr "" "Proszę wybrać _katalog zawierający pliki tekstowe, osobny plik dla każdego " -"wpisu, nazwany według formatu \"rrrr-mm-dd\", bez rozszerzenia. Wszystkie " -"pliki w tym formacie zostaną zaimportowane." +"wpisu, nazwany według formatu „rrrr-mm-dd”, bez rozszerzenia. Wszystkie " +"pliki w tym formacie zostaną zaimportowane." -# instrukcja w oknie importu +# instrukcja w oknie importu #: ../src/import-operation.c:51 msgid "Select a database _file created by Almanah Diary to import." msgstr "" @@ -505,70 +498,89 @@ msgstr "" "\n" "\n" -"Wpis zaimportowany z \"%s\":\n" +"Wpis zaimportowany z „%s”:\n" "\n" -#: ../src/main-window.c:571 +#: ../src/main-window.c:605 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" -msgstr "Na pewno zmienić ten wpis pamiętnika z %s?" +msgstr "Na pewno zmodyfikować ten wpis pamiętnika z %s?" -#: ../src/main-window.c:601 +#: ../src/main-window.c:608 ../src/main-window.c:639 +msgid "_Cancel" +msgstr "_Anuluj" + +#: ../src/main-window.c:609 +msgid "_Edit" +msgstr "_Modyfikuj" + +#: ../src/main-window.c:636 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" -msgstr "Na pewno usunąć ten wpis pamiętnika z %s?" +msgstr "Na pewno usunąć ten wpis pamiętnika z %s?" #. Print a warning about the unknown tag -#: ../src/main-window.c:710 +#: ../src/main-window.c:746 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." -msgstr "Nieznana lub powtarzająca się etykieta \"%s\" we wpisie. Ignorowanie." +msgstr "Nieznana lub powtarzająca się etykieta „%s” we wpisie. Ignorowanie." -#: ../src/main-window.c:918 +#: ../src/main-window.c:987 msgid "Error opening URI" msgstr "Błąd podczas otwierania adresu URI" #. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place -#: ../src/main-window.c:1092 +#: ../src/main-window.c:1198 #, c-format msgid "%s @ %s" -msgstr "%s o %s" +msgstr "%s o %s" -#: ../src/main-window.c:1171 +#: ../src/main-window.c:1304 msgid "Entry content could not be loaded" msgstr "Nie można wczytać treści wpisu" -#: ../src/main-window.c:1348 +#. Translators: this sentence is just used in startup to estimate the width +#. of a 15 words sentence. Translate with some random sentences with just 15 words. +#. See: https://bugzilla.gnome.org/show_bug.cgi?id=754841 +#: ../src/main-window.c:1459 +msgid "" +"This is just a fifteen words sentence to calculate the diary entry text view " +"size" +msgstr "" +"To jest po prostu zdanie o piętnastu wyrazach służące do obliczenia rozmiaru " +"pola wpisu dziennika" + +#: ../src/main-window.c:1496 msgid "Spelling checker could not be initialized" msgstr "Nie można uruchomić sprawdzania pisowni" -#: ../src/preferences-dialog.c:91 -msgid "Almanah Preferences" -msgstr "Preferencje programu Almanah" +#: ../src/preferences-dialog.c:83 +msgid "Preferences" +msgstr "Preferencje" #. Grab our child widgets -#: ../src/preferences-dialog.c:217 +#: ../src/preferences-dialog.c:204 msgid "Encryption key: " msgstr "Klucz szyfrowania: " -#: ../src/preferences-dialog.c:222 +#: ../src/preferences-dialog.c:208 msgid "None (don't encrypt)" msgstr "Brak (bez szyfrowania)" -#: ../src/preferences-dialog.c:246 +#: ../src/preferences-dialog.c:213 msgid "New _Key" msgstr "Nowy _klucz" #. Set up the "Enable spell checking" check button -#: ../src/preferences-dialog.c:253 +#: ../src/preferences-dialog.c:237 msgid "Enable _spell checking" msgstr "_Sprawdzanie pisowni" -#: ../src/preferences-dialog.c:279 +#: ../src/preferences-dialog.c:262 msgid "Error saving the encryption key" msgstr "Błąd podczas zapisywania klucza szyfrującego" -#: ../src/preferences-dialog.c:298 +#: ../src/preferences-dialog.c:281 msgid "Error opening Seahorse" msgstr "Błąd podczas otwierania programu Seahorse" @@ -580,31 +592,31 @@ msgid "No entry for this date." msgstr "Brak wpisów dla podanej daty." -#: ../src/printing.c:453 +#: ../src/printing.c:457 msgid "Start date:" msgstr "Data rozpoczęcia:" -#: ../src/printing.c:455 +#: ../src/printing.c:459 msgid "End date:" msgstr "Data zakończenia:" #. Line spacing -#: ../src/printing.c:471 +#: ../src/printing.c:475 msgid "Line spacing:" msgstr "Odstęp między wierszami:" -#: ../src/search-dialog.c:223 +#: ../src/search-dialog.c:221 msgid "Search canceled." msgstr "Anulowano wyszukiwanie." #. Translators: This is an error message wrapper for when searches encounter an error. The placeholder is for an error message. -#: ../src/search-dialog.c:226 +#: ../src/search-dialog.c:224 #, c-format msgid "Error: %s" msgstr "Błąd: %s" #. Success! -#: ../src/search-dialog.c:231 +#: ../src/search-dialog.c:229 #, c-format msgid "Found %d entry:" msgid_plural "Found %d entries:" @@ -612,137 +624,145 @@ msgstr[1] "Odnaleziono %d wpisy:" msgstr[2] "Odnaleziono %d wpisów:" -#: ../src/search-dialog.c:280 +#: ../src/search-dialog.c:278 msgid "Searching…" msgstr "Wyszukiwanie…" -#: ../src/storage-manager.c:276 +#: ../src/storage-manager.c:247 +#, c-format +msgid "" +"Could not open database \"%s\". SQLite provided the following error message: " +"%s" +msgstr "" +"Nie można otworzyć bazy danych „%s”. Biblioteka SQLite wysłała następujący " +"komunikat o błędzie: %s" + +#: ../src/storage-manager.c:290 +#, c-format +msgid "" +"Could not run query \"%s\". SQLite provided the following error message: %s" +msgstr "" +"Nie można wykonać zapytania „%s”. Biblioteka SQLite wysłała następujący " +"komunikat o błędzie: %s" + +#: ../src/storage-manager.c:596 +msgid "Error deserializing entry into buffer while searching." +msgstr "Błąd podczas rozszeregowywania wpisu do bufora podczas wyszukiwania." + +# belka tytułowa okna +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Wprowadzanie adresu URI" + +#: ../src/vfs.c:291 #, c-format msgid "GPGME is not at least version %s" -msgstr "Biblioteka GPGME nie jest w wersji co najmniej %s" +msgstr "Biblioteka GPGME nie jest w wersji co najmniej %s" -#: ../src/storage-manager.c:285 +#: ../src/vfs.c:298 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "Biblioteka GPGME nie obsługuje standardu OpenPGP: %s" -#: ../src/storage-manager.c:294 +#: ../src/vfs.c:305 #, c-format msgid "Error creating cipher context: %s" msgstr "Błąd podczas tworzenia kontekstu szyfrowania: %s" -#: ../src/storage-manager.c:323 +#: ../src/vfs.c:325 #, c-format -msgid "Error opening encrypted database file \"%s\": %s" -msgstr "Błąd podczas otwierania zaszyfrowanego pliku bazy danych \"%s\": %s" +msgid "Can't create a new GIOChannel for the encrypted database: %s" +msgstr "Nie można utworzyć nowego GIOChannel dla zaszyfrowanej bazy danych: %s" -#: ../src/storage-manager.c:342 +#: ../src/vfs.c:333 #, c-format -msgid "Error opening plain database file \"%s\": %s" -msgstr "Błąd podczas otwierania pliku bazy danych \"%s\": %s" +msgid "Error opening encrypted database file \"%s\": %s" +msgstr "Błąd podczas otwierania zaszyfrowanego pliku bazy danych „%s”: %s" -#: ../src/storage-manager.c:390 -msgid "" -"The encrypted database is empty. The plain database file has been left " -"undeleted as backup." -msgstr "" -"Zaszyfrowany plik bazy danych jest pusty. Zwykły plik bazy danych " -"pozostawiono jako kopię zapasową." +#: ../src/vfs.c:349 +#, c-format +msgid "Error creating Callback base data buffer: %s" +msgstr "Błąd podczas tworzenia bufora danych podstawy Callback: %s" -#. Delete the plain file -#: ../src/storage-manager.c:393 +#: ../src/vfs.c:357 #, c-format -msgid "Could not delete plain database file \"%s\"." -msgstr "Nie można usunąć pliku bazy danych \"%s\"." +msgid "Can't create a new GIOChannel for the plain database: %s" +msgstr "Nie można utworzyć nowego GIOChannel dla prostej bazy danych: %s" -#: ../src/storage-manager.c:434 +#: ../src/vfs.c:365 #, c-format -msgid "Error decrypting database: %s" -msgstr "Błąd podczas deszyfrowania bazy danych: %s" +msgid "Error opening plain database file \"%s\": %s" +msgstr "Błąd podczas otwierania pliku prostej bazy danych „%s”: %s" -#: ../src/storage-manager.c:468 +#: ../src/vfs.c:461 #, c-format msgid "Error getting encryption key: %s" msgstr "Błąd podczas pobierania klucza szyfrującego: %s" -#: ../src/storage-manager.c:489 +#: ../src/vfs.c:485 ../src/vfs.c:491 #, c-format msgid "Error encrypting database: %s" msgstr "Błąd podczas szyfrowania bazy danych: %s" -#: ../src/storage-manager.c:549 +#. Translators: The first and second params are file paths, the last param is an error message. +#: ../src/vfs.c:541 +#, c-format +msgid "Error copying the file from %s to %s: %s" +msgstr "Błąd podczas kopiowania pliku z %s do %s: %s" + +#: ../src/vfs.c:547 #, c-format msgid "Error changing database backup file permissions: %s" msgstr "" "Błąd podczas zmieniania uprawnień pliku kopii zapasowej bazy danych: %s" -#: ../src/storage-manager.c:571 ../src/storage-manager.c:627 +#: ../src/vfs.c:647 #, c-format -msgid "Error changing database file permissions: %s" -msgstr "Błąd podczas zmieniania uprawnień pliku bazy danych: %s" +msgid "Error closing file: %s" +msgstr "Błąd podczas zamykania pliku: %s" -#. Translators: the first parameter is a filename, the second is an error message. -#: ../src/storage-manager.c:583 ../src/storage-manager.c:611 +#. Translators: the first parameter is a filename. +#: ../src/vfs.c:1046 ../src/vfs.c:1073 #, c-format -msgid "Error backing up file ‘%s’: %s" -msgstr "Błąd podczas tworzenia kopii zapasowej pliku \"%s\": %s" +msgid "Error backing up file ‘%s’" +msgstr "Błąd podczas tworzenia kopii zapasowej pliku „%s”" -#: ../src/storage-manager.c:620 +#: ../src/vfs.c:1059 #, c-format -msgid "" -"Could not open database \"%s\". SQLite provided the following error message: " -"%s" -msgstr "" -"Nie można otworzyć bazy danych \"%s\". Biblioteka SQLite wysłała następujący " -"komunikat o błędzie: %s" +msgid "Error decrypting database: %s" +msgstr "Błąd podczas deszyfrowania bazy danych: %s" -#: ../src/storage-manager.c:704 +#: ../src/vfs.c:1099 #, c-format -msgid "" -"Could not run query \"%s\". SQLite provided the following error message: %s" -msgstr "" -"Nie można wykonać zapytania \"%s\". Biblioteka SQLite wysłała następujący " -"komunikat o błędzie: %s" - -#: ../src/storage-manager.c:1010 -msgid "Error deserializing entry into buffer while searching." -msgstr "Błąd podczas rozszeregowywania wpisu do bufora podczas wyszukiwania." - -# belka tytułowa okna -#: ../src/uri-entry-dialog.c:71 -msgid "Enter URI" -msgstr "Wprowadzanie adresu URI" +msgid "Error changing database file permissions: %s" +msgstr "Błąd podczas zmieniania uprawnień pliku bazy danych: %s" -#: ../src/widgets/calendar-button.c:140 +#: ../src/widgets/calendar-button.c:142 #, c-format -msgid "UI file \"%s\" could not be loaded: %s" -msgstr "Nie można wczytać pliku interfejsu użytkownika \"%s\": %s" +msgid "UI data could not be loaded: %s" +msgstr "Nie można wczytać danych interfejsu użytkownika: %s" -#: ../src/widgets/calendar-button.c:150 +#: ../src/widgets/calendar-button.c:152 msgid "Can't load calendar window object from UI file" msgstr "" -"Nie można wczytać obiektu okna kalendarza z pliku interfejsu użytkownika" +"Nie można wczytać obiektu okna kalendarza z pliku interfejsu użytkownika" #. Translators: This is the detail string for important days as displayed in the calendar. #: ../src/widgets/calendar.c:176 msgid "Important!" msgstr "Ważne" -#: ../src/widgets/calendar-window.c:80 -msgid "Unknown input device" -msgstr "Nieznane urządzenie wejściowe" - #: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:166 msgid "add tag" msgstr "dodaj etykietę" #: ../src/widgets/entry-tags-area.c:101 msgid "Write the tag and press enter to save it" -msgstr "Proszę napisać etykietę i nacisnąć klawisz Enter, aby ją zapisać" +msgstr "Proszę napisać etykietę i nacisnąć klawisz Enter, aby ją zapisać" #: ../src/widgets/tag-accessible.c:165 msgid "Remove the tag from the entry" -msgstr "Usuwa etykietę z wpisu" +msgstr "Usuwa etykietę z wpisu" #. Looks like gtk_widget_set_tooltip_text don't works here, even in the init... ? #: ../src/widgets/tag.c:416 diff -Nru almanah-0.11.1/po/POTFILES.in almanah-0.12.0/po/POTFILES.in --- almanah-0.11.1/po/POTFILES.in 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/POTFILES.in 2019-10-07 13:45:09.000000000 +0000 @@ -1,16 +1,15 @@ # List of source files containing translatable strings. -[encoding: UTF-8] data/almanah.appdata.xml.in -[type: gettext/glade]data/almanah-app-menu.ui data/almanah.desktop.in -[type: gettext/glade]data/almanah.ui -data/org.gnome.almanah.gschema.xml.in.in +src/ui/almanah.ui +data/org.gnome.almanah.gschema.xml.in src/application.c src/date-entry-dialog.c src/entry.c src/events/calendar-appointment.c src/events/calendar-task.c src/export-operation.c +src/gtk/menus.ui src/import-export-dialog.c src/import-operation.c src/interface.c @@ -21,9 +20,9 @@ src/search-dialog.c src/storage-manager.c src/uri-entry-dialog.c +src/vfs.c src/widgets/calendar-button.c src/widgets/calendar.c -src/widgets/calendar-window.c src/widgets/eggwrapbox.c src/widgets/entry-tags-area.c src/widgets/tag-accessible.c diff -Nru almanah-0.11.1/po/pt_BR.po almanah-0.12.0/po/pt_BR.po --- almanah-0.11.1/po/pt_BR.po 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/pt_BR.po 2019-10-07 13:45:09.000000000 +0000 @@ -1,5 +1,5 @@ # Brazilian Portuguese translation of Almanah. -# Copyright (C) 2008-2013 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # This file is distributed under the same license as the almanah package. # Fabrício Godoy , 2008. # Fábio Nogueira , 2008. @@ -8,36 +8,40 @@ # Antonio Fernandes C. Neto , 2009,2013. # Carlos José Pereira , 2010. # Gabriel Speckhahn , 2011. -# Rafael Ferreira , 2012, 2013. # Adorilson Bezerra , 2013. # Ramon Brandão , 2013. -# Enrico Nicoletto , 2013. +# Enrico Nicoletto , 2013, 2015. +# Rafael Fontenelle , 2012, 2013, 2015. # msgid "" msgstr "" "Project-Id-Version: Almanah\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=almanah&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-11-17 18:01+0000\n" -"PO-Revision-Date: 2013-11-19 19:36-0300\n" -"Last-Translator: Enrico Nicoletto \n" +"POT-Creation-Date: 2015-10-14 17:59+0000\n" +"PO-Revision-Date: 2015-10-18 17:20-0200\n" +"Last-Translator: Rafael Fontenelle \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 1.5.7\n" +"X-Generator: Poedit 1.8.5\n" "X-Project-Style: gnome\n" #: ../data/almanah.appdata.xml.in.h:1 +msgid "Keep a diary of your life" +msgstr "Mantenha um diário da sua vida" + +#: ../data/almanah.appdata.xml.in.h:2 msgid "" "Almanah Diary is an application to allow you to keep a diary of your life." msgstr "" "O diário Almanah é um aplicativo que lhe permite manter um diário da sua " "vida." -#: ../data/almanah.appdata.xml.in.h:2 +#: ../data/almanah.appdata.xml.in.h:3 msgid "" "You can encrypt the diary to preserve your privacy. It has editing " "abilities, including text formatting and printing and shows you a lists of " @@ -49,37 +53,8 @@ "mostra a você uma lista de eventos que aconteceram (no seu computador) para " "cada dia (como tarefas e compromissos do Evolution)." -#: ../data/almanah-app-menu.ui.h:1 -msgid "_Search" -msgstr "_Pesquisar" - -#: ../data/almanah-app-menu.ui.h:2 -msgid "Pr_eferences" -msgstr "Pr_eferências" - -#. Set the button label -#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 -msgid "_Import" -msgstr "_Importar" - -#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 -msgid "_Export" -msgstr "_Exportar" - -#: ../data/almanah-app-menu.ui.h:5 -msgid "_Print diary" -msgstr "_Imprimir diário" - -#: ../data/almanah-app-menu.ui.h:6 -msgid "_About Almanah Diary" -msgstr "_Sobre o Diário Almanah" - -#: ../data/almanah-app-menu.ui.h:7 -msgid "_Quit" -msgstr "_Sair" - -#: ../data/almanah.desktop.in.h:1 ../src/application.c:132 -#: ../src/main-window.c:136 +#: ../data/almanah.desktop.in.h:1 ../src/application.c:133 +#: ../src/main-window.c:155 msgid "Almanah Diary" msgstr "Diário Almanah" @@ -88,7 +63,7 @@ msgstr "Mantenha um diário pessoal" #. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. -#: ../data/almanah.desktop.in.h:3 ../src/application.c:263 +#: ../data/almanah.desktop.in.h:3 ../src/application.c:272 msgid "Diary" msgstr "Diário" @@ -97,176 +72,111 @@ msgid "diary;journal;" msgstr "diário;blog;" -#: ../data/almanah.ui.h:1 -msgid "Select Date…" -msgstr "Selecionar data…" - -#: ../data/almanah.ui.h:2 -msgid "F_ormat" -msgstr "F_ormatar" - -#: ../data/almanah.ui.h:3 -msgid "Toggle whether the currently selected text is bold." -msgstr "Define se o texto atualmente selecionado é negrito." - -#: ../data/almanah.ui.h:4 -msgid "Toggle whether the currently selected text is italic." -msgstr "Define se o texto atualmente selecionado é itálico." - -#: ../data/almanah.ui.h:5 -msgid "Toggle whether the currently selected text is underlined." -msgstr "Define se o texto atualmente selecionado é sublinhado." - -#: ../data/almanah.ui.h:6 -msgid "Add/Remove _Hyperlink" -msgstr "Adicionar/remover _hiperlink" - -#: ../data/almanah.ui.h:7 -msgid "" -"Add or remove a hyperlink from the currently selected text to a specified " -"URI." -msgstr "" -"Adiciona e remove um hiperlink de um texto atualmente selecionado para um " -"URI especificada." - -#: ../data/almanah.ui.h:8 -msgid "Insert _Time" -msgstr "Inserir _hora" - -#: ../data/almanah.ui.h:9 -msgid "I_mportant" -msgstr "I_mportante" - -#: ../data/almanah.ui.h:10 -msgid "Toggle whether the current entry is marked as important." -msgstr "Define se a entrada atual é marcada como importante." - -#: ../data/almanah.ui.h:11 -msgid "Show tags" -msgstr "Mostrar etiquetas" - -#: ../data/almanah.ui.h:12 -msgid "Show tags for the current entry" -msgstr "Mostra etiquetas para a entrada atual" - -#: ../data/almanah.ui.h:13 -msgid "_Help" -msgstr "Aj_uda" - -#: ../data/almanah.ui.h:14 -msgid "Go to _Today" -msgstr "Ir para _hoje" - -#: ../data/almanah.ui.h:15 -msgid "Jump to the current date in the diary." -msgstr "Vai para a data atual no diário." - -#: ../data/almanah.ui.h:16 +#: ../src/ui/almanah.ui.h:1 msgid "Calendar" msgstr "Calendário" -#: ../data/almanah.ui.h:17 +#: ../src/ui/almanah.ui.h:2 +msgid "Go to Today" +msgstr "Ir para hoje" + +#: ../src/ui/almanah.ui.h:3 +msgid "Select Date…" +msgstr "Selecionar data…" + +#: ../src/ui/almanah.ui.h:4 msgid "Entry editing area" msgstr "Área de edição de entrada" -#: ../data/almanah.ui.h:18 +#: ../src/ui/almanah.ui.h:5 msgid "Past events" msgstr "Últimos eventos" -#: ../data/almanah.ui.h:19 +#: ../src/ui/almanah.ui.h:6 msgid "Past Event List" msgstr "Lista dos últimos eventos" -#: ../data/almanah.ui.h:20 +#: ../src/ui/almanah.ui.h:7 msgid "Search entry" msgstr "Pesquisar entrada" -#: ../data/almanah.ui.h:21 ../src/search-dialog.c:69 +#: ../src/ui/almanah.ui.h:8 ../src/search-dialog.c:69 msgid "Search" msgstr "Pesquisar" -#: ../data/almanah.ui.h:22 +#: ../src/ui/almanah.ui.h:9 msgid "Result List" msgstr "Lista de resultado" -#: ../data/almanah.ui.h:23 +#: ../src/ui/almanah.ui.h:10 msgid "View Entry" msgstr "Ver entrada" -#: ../data/almanah.ui.h:24 +#: ../src/ui/almanah.ui.h:11 msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." msgstr "ex: \"14/03/2009\" ou \"14 de março de 2009\"." -#: ../data/almanah.ui.h:25 +#: ../src/ui/almanah.ui.h:12 msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." msgstr "ex: “http://google.com/” ou “file:///home/eu/Fotos/foto.jpg”." -#: ../data/almanah.ui.h:26 +#: ../src/ui/almanah.ui.h:13 msgid "Successful Entries" msgstr "Entradas com sucesso" -#: ../data/almanah.ui.h:27 +#: ../src/ui/almanah.ui.h:14 msgid "Merged Entries" msgstr "Entradas mescladas" -#: ../data/almanah.ui.h:28 +#: ../src/ui/almanah.ui.h:15 msgid "Failed Entries" msgstr "Entradas que falharam" -#: ../data/almanah.ui.h:29 +#: ../src/ui/almanah.ui.h:16 msgid "Import Results List" msgstr "Lista de resultado da importação" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 +#: ../data/org.gnome.almanah.gschema.xml.in.h:1 msgid "Database encryption key ID" -msgstr "ID da chave de criptografia da base de dados" +msgstr "ID da chave de criptografia do banco de dados" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +#: ../data/org.gnome.almanah.gschema.xml.in.h:2 msgid "" "The ID of the key to use to encrypt and decrypt the database, if Almanah has " "been built with encryption support. Leave blank to disable database " "encryption." msgstr "" -"A ID da chave usada para criptografar e descriptografar a base de dados, se " +"A ID da chave usada para criptografar e descriptografar o banco de dados, se " "o Almanah tiver sido compilado com suporte a criptografia. Deixe em branco " -"para desabilitar a criptografia da base de dados." +"para desabilitar a criptografia do banco de dados." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 +#: ../data/org.gnome.almanah.gschema.xml.in.h:3 msgid "Spell checking language" msgstr "Verificação ortográfica para o idioma" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +#: ../data/org.gnome.almanah.gschema.xml.in.h:4 msgid "The locale specifier of the language in which to check entry spellings." msgstr "" "O especificador de localização do idioma que verifica as ortografias de " "entrada." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +#: ../data/org.gnome.almanah.gschema.xml.in.h:5 msgid "Spell checking enabled?" msgstr "A verificação ortográfica está habilitada?" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 +#: ../data/org.gnome.almanah.gschema.xml.in.h:6 msgid "Whether spell checking of entries is enabled." msgstr "Se a verificação ortográfica de entradas está habilitada." -#: ../src/application.c:246 +#: ../src/application.c:255 msgid "Error opening database" msgstr "Erro ao abrir o banco de dados" -#. Error loading the CSS -#: ../src/application.c:275 -#, c-format -msgid "" -"Couldn't load the CSS file '%s'. The interface might not be styled correctly" -msgstr "" -"Não foi possível carregar o arquivo CSS \"%s\". A interface pode não estar " -"configurada com estilo corretamente." - -#: ../src/application.c:319 +#: ../src/application.c:332 msgid "Enable debug mode" msgstr "Habilitar o modo de depuração" -#: ../src/application.c:336 +#: ../src/application.c:349 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" @@ -274,24 +184,16 @@ "cada vez." #. Print an error -#: ../src/application.c:347 +#: ../src/application.c:360 #, c-format msgid "Command line options could not be parsed: %s\n" msgstr "Não foi possível analisar as opções da linha de comando: %s\n" -#: ../src/application.c:366 +#: ../src/application.c:379 msgid "Error encrypting database" msgstr "Erro ao criptografar o banco de dados" -#: ../src/application.c:419 ../src/date-entry-dialog.c:129 -#: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 -#: ../src/main-window.c:195 ../src/preferences-dialog.c:191 -#: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 -#, c-format -msgid "UI file \"%s\" could not be loaded" -msgstr "Não foi possível carregar o arquivo de interface gráfica \"%s\"" - -#: ../src/application.c:542 +#: ../src/application.c:522 msgid "" "Almanah is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -303,7 +205,7 @@ "publicada pela Free Software Foundation, tanto na versão 3 da licença, " "quanto (a seu critério) qualquer versão posterior." -#: ../src/application.c:546 +#: ../src/application.c:526 msgid "" "Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -315,7 +217,7 @@ "UM PROPÓSITO EM PARTICULAR. Veja a Licença Pública Geral GNU (GNU General " "Public License) para mais detalhes." -#: ../src/application.c:550 +#: ../src/application.c:530 msgid "" "You should have received a copy of the GNU General Public License along with " "Almanah. If not, see ." @@ -324,12 +226,12 @@ "Public License) junto com o Almanah. Caso contrário, consulte ." -#: ../src/application.c:565 +#: ../src/application.c:545 #, c-format msgid "A helpful diary keeper, storing %u entries." msgstr "Um criador de diário útil, armazenando %u entradas." -#: ../src/application.c:569 +#: ../src/application.c:549 msgid "Copyright © 2008-2009 Philip Withnall" msgstr "Copyright © 2008-2009 Philip Withnall" @@ -338,7 +240,7 @@ #. * "Translator name 1 \n" #. * "Translator name 2 " #. -#: ../src/application.c:577 +#: ../src/application.c:557 msgid "translator-credits" msgstr "" "Fabrício Godoy \n" @@ -349,14 +251,30 @@ "Carlos José Pereira \n" "Rafael Ferreira " -#: ../src/application.c:581 +#: ../src/application.c:561 msgid "Almanah Website" msgstr "Site do Almanah" +#: ../src/application.c:589 +#, c-format +msgid "" +"Couldn't load the CSS resources. The interface might not be styled " +"correctly: %s" +msgstr "" +"Não foi possível carregar recursos CSS. A interface pode não estar " +"configurada com estilo corretamente: %s" + #: ../src/date-entry-dialog.c:72 msgid "Select Date" msgstr "Selecionar data" +#: ../src/date-entry-dialog.c:127 ../src/import-export-dialog.c:169 +#: ../src/import-export-dialog.c:475 ../src/main-window.c:225 +#: ../src/preferences-dialog.c:177 ../src/search-dialog.c:95 +#: ../src/uri-entry-dialog.c:126 +msgid "UI data could not be loaded" +msgstr "Não foi possível carregar os dados de interface gráfica" + #: ../src/entry.c:303 #, c-format msgid "Invalid data version number %u." @@ -412,59 +330,135 @@ "database to be given." msgstr "" "Selecione um nome de ar_quivo onde será gerada uma cópia completa e sem " -"criptografia da base de dados do Diário Almanah." +"criptografia do banco de dados do Diário Almanah." #: ../src/export-operation.c:256 ../src/export-operation.c:313 #, c-format msgid "Error changing exported file permissions: %s" msgstr "Erro ao alterar permissões dos arquivos exportados: %s" -#: ../src/import-export-dialog.c:202 +#: ../src/gtk/menus.ui.h:1 +msgid "_Search" +msgstr "_Pesquisar" + +#: ../src/gtk/menus.ui.h:2 +msgid "Pr_eferences" +msgstr "Pr_eferências" + +#: ../src/gtk/menus.ui.h:3 +msgctxt "Main menu" +msgid "_Import" +msgstr "_Importar" + +#: ../src/gtk/menus.ui.h:4 +msgctxt "Main menu" +msgid "_Export" +msgstr "_Exportar" + +#: ../src/gtk/menus.ui.h:5 +msgid "_Print diary" +msgstr "_Imprimir diário" + +#: ../src/gtk/menus.ui.h:6 +msgid "_About Almanah Diary" +msgstr "_Sobre o Diário Almanah" + +#: ../src/gtk/menus.ui.h:7 +msgid "_Quit" +msgstr "_Sair" + +#: ../src/gtk/menus.ui.h:8 +msgid "_Bold" +msgstr "_Negrito" + +#: ../src/gtk/menus.ui.h:9 +msgid "_Italic" +msgstr "_Itálico" + +#: ../src/gtk/menus.ui.h:10 +msgid "_Underline" +msgstr "S_ublinhado" + +#: ../src/gtk/menus.ui.h:11 +msgid "_Cut" +msgstr "Re_cortar" + +#: ../src/gtk/menus.ui.h:12 +msgid "_Copy" +msgstr "_Copiar" + +#: ../src/gtk/menus.ui.h:13 +msgid "_Paste" +msgstr "Co_lar" + +#: ../src/gtk/menus.ui.h:14 ../src/main-window.c:626 +msgid "_Delete" +msgstr "E_xcluir" + +#: ../src/gtk/menus.ui.h:15 +msgid "Insert _Time" +msgstr "Inserir _hora" + +#: ../src/gtk/menus.ui.h:16 +msgid "Add/Remove _Hyperlink" +msgstr "Adicionar/remover _hiperlink" + +#: ../src/import-export-dialog.c:203 msgid "Import _mode: " msgstr "_Modo de importação: " -#: ../src/import-export-dialog.c:202 +#: ../src/import-export-dialog.c:203 msgid "Export _mode: " msgstr "_Modo de exportação: " #. Set the window title -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Import Entries" msgstr "Importar entradas" -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Export Entries" msgstr "Exportar entradas" -#: ../src/import-export-dialog.c:245 +#: ../src/import-export-dialog.c:210 +msgctxt "Dialog button" +msgid "_Import" +msgstr "_Importar" + +#: ../src/import-export-dialog.c:210 +msgctxt "Dialog button" +msgid "_Export" +msgstr "_Exportar" + +#: ../src/import-export-dialog.c:247 msgid "Import failed" msgstr "Importação falhou" -#: ../src/import-export-dialog.c:283 +#: ../src/import-export-dialog.c:285 msgid "Export failed" msgstr "Exportação falhou" -#: ../src/import-export-dialog.c:296 +#: ../src/import-export-dialog.c:298 msgid "Export successful" msgstr "Exportação feita com sucesso" -#: ../src/import-export-dialog.c:297 +#: ../src/import-export-dialog.c:299 msgid "The diary was successfully exported." msgstr "O diário foi exportado com sucesso." -#: ../src/import-export-dialog.c:445 +#: ../src/import-export-dialog.c:447 msgid "Import Results" msgstr "Resultados da importação" #. Translators: This is a strftime()-format string for the dates displayed in import results. #. Translators: This is a strftime()-format string for the date to display when asking about editing a diary entry. #. Translators: This is a strftime()-format string for the date to display when asking about deleting a diary entry. +#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. -#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. -#: ../src/import-export-dialog.c:539 ../src/main-window.c:567 -#: ../src/main-window.c:597 ../src/printing.c:263 ../src/search-dialog.c:182 -#: ../src/widgets/calendar-button.c:309 +#: ../src/import-export-dialog.c:542 ../src/main-window.c:587 +#: ../src/main-window.c:618 ../src/main-window.c:1225 ../src/printing.c:263 +#: ../src/search-dialog.c:180 msgid "%A, %e %B %Y" msgstr "%A, %e de %B de %Y" @@ -481,7 +475,7 @@ #: ../src/import-operation.c:51 msgid "Select a database _file created by Almanah Diary to import." msgstr "" -"Selecionar um _arquivo de base de dados criado pelo Diário Almanah para " +"Selecionar um _arquivo de banco de dados criado pelo Diário Almanah para " "importar." #: ../src/import-operation.c:248 @@ -514,68 +508,87 @@ "Entrada importada para \"%s\":\n" "\n" -#: ../src/main-window.c:571 +#: ../src/main-window.c:591 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" msgstr "Você tem certeza que quer editar essa entrada de diário para %s?" -#: ../src/main-window.c:601 +#: ../src/main-window.c:594 ../src/main-window.c:625 +msgid "_Cancel" +msgstr "_Cancelar" + +#: ../src/main-window.c:595 +msgid "_Edit" +msgstr "_Editar" + +#: ../src/main-window.c:622 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" msgstr "Você tem certeza que quer excluir essa entrada de diário para %s?" #. Print a warning about the unknown tag -#: ../src/main-window.c:710 +#: ../src/main-window.c:732 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." msgstr "" "Etiqueta de texto \"%s\" desconhecida ou duplicada na entrada. Ignorando." -#: ../src/main-window.c:918 +#: ../src/main-window.c:973 msgid "Error opening URI" msgstr "Erro ao abrir a URI" #. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place -#: ../src/main-window.c:1092 +#: ../src/main-window.c:1152 #, c-format msgid "%s @ %s" msgstr "%s @ %s" -#: ../src/main-window.c:1171 +#: ../src/main-window.c:1258 msgid "Entry content could not be loaded" msgstr "Não foi possível carregar o conteúdo de entrada" -#: ../src/main-window.c:1348 +#. Translators: this sentence is just used in startup to estimate the width +#. of a 15 words sentence. Translate with some randome sentences with just 15 words. +#. See: https://bugzilla.gnome.org/show_bug.cgi?id=754841 +#: ../src/main-window.c:1414 +msgid "" +"This is just a fifteen words sentence to calculate the diary entry text view " +"size" +msgstr "" +"Esta é apenas uma frase de quinze palavras para calcular o tamanho de " +"exibição de texto de entrada de diário" + +#: ../src/main-window.c:1450 msgid "Spelling checker could not be initialized" msgstr "Não foi possível inicializar a verificação ortográfica" -#: ../src/preferences-dialog.c:91 -msgid "Almanah Preferences" -msgstr "Preferências do Almanah" +#: ../src/preferences-dialog.c:83 +msgid "Preferences" +msgstr "Preferências" #. Grab our child widgets -#: ../src/preferences-dialog.c:217 +#: ../src/preferences-dialog.c:204 msgid "Encryption key: " msgstr "Chave de criptografia: " -#: ../src/preferences-dialog.c:222 +#: ../src/preferences-dialog.c:208 msgid "None (don't encrypt)" msgstr "Nenhuma (não criptografar)" -#: ../src/preferences-dialog.c:246 +#: ../src/preferences-dialog.c:213 msgid "New _Key" msgstr "Nova _chave" #. Set up the "Enable spell checking" check button -#: ../src/preferences-dialog.c:253 +#: ../src/preferences-dialog.c:237 msgid "Enable _spell checking" msgstr "Habilitar _verificação ortográfica" -#: ../src/preferences-dialog.c:279 +#: ../src/preferences-dialog.c:262 msgid "Error saving the encryption key" msgstr "Erro ao salvar a chave de criptografia" -#: ../src/preferences-dialog.c:298 +#: ../src/preferences-dialog.c:281 msgid "Error opening Seahorse" msgstr "Erro ao abrir o Seahorse" @@ -600,129 +613,145 @@ msgid "Line spacing:" msgstr "Espaçamento de linha:" -#: ../src/search-dialog.c:223 +#: ../src/search-dialog.c:221 msgid "Search canceled." msgstr "Pesquisa cancelada." #. Translators: This is an error message wrapper for when searches encounter an error. The placeholder is for an error message. -#: ../src/search-dialog.c:226 +#: ../src/search-dialog.c:224 #, c-format msgid "Error: %s" msgstr "Erro: %s" #. Success! -#: ../src/search-dialog.c:231 +#: ../src/search-dialog.c:229 #, c-format msgid "Found %d entry:" msgid_plural "Found %d entries:" msgstr[0] "%d entrada localizada:" msgstr[1] "%d entradas localizadas:" -#: ../src/search-dialog.c:280 +#: ../src/search-dialog.c:278 msgid "Searching…" msgstr "Pesquisando…" -#: ../src/storage-manager.c:276 +#: ../src/storage-manager.c:248 +#, c-format +msgid "" +"Could not open database \"%s\". SQLite provided the following error message: " +"%s" +msgstr "" +"Não foi possível abrir o banco de dados em \"%s\". O SQLite retornou a " +"seguinte mensagem de erro: %s" + +#: ../src/storage-manager.c:291 +#, c-format +msgid "" +"Could not run query \"%s\". SQLite provided the following error message: %s" +msgstr "" +"Não foi possível executar a consulta \"%s\". O SQLite retornou a seguinte " +"mensagem de erro: %s" + +#: ../src/storage-manager.c:597 +msgid "Error deserializing entry into buffer while searching." +msgstr "Erro ao desserializar entrada dentro do buffer durante a pesquisa." + +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Digite o URI" + +#: ../src/vfs.c:239 #, c-format msgid "GPGME is not at least version %s" msgstr "O GPGME não está na versão mínima %s" -#: ../src/storage-manager.c:285 +#: ../src/vfs.c:246 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "O GPGME não tem suporte a OpenPGP: %s" -#: ../src/storage-manager.c:294 +#: ../src/vfs.c:253 #, c-format msgid "Error creating cipher context: %s" msgstr "Erro ao criar o contexto cifrado: %s" -#: ../src/storage-manager.c:323 +#: ../src/vfs.c:273 +#, c-format +msgid "Can't create a new GIOChannel for the encrypted database: %s" +msgstr "" +"Não foi possível criar um novo GIOChannel para o banco de dados " +"criptografado: %s" + +#: ../src/vfs.c:281 #, c-format msgid "Error opening encrypted database file \"%s\": %s" msgstr "Erro ao abrir o arquivo de banco de dados criptografado em \"%s\": %s" -#: ../src/storage-manager.c:342 +#: ../src/vfs.c:297 #, c-format -msgid "Error opening plain database file \"%s\": %s" -msgstr "Erro ao abrir o arquivo de banco de dados em \"%s\": %s" +msgid "Error creating Callback base data buffer: %s" +msgstr "Erro ao criar buffer de dados base da callback: %s" -#: ../src/storage-manager.c:390 -msgid "" -"The encrypted database is empty. The plain database file has been left " -"undeleted as backup." -msgstr "" -"A base de dados criptografada está vazia. O arquivo da base de dados foi " -"desfeito como backup." - -#. Delete the plain file -#: ../src/storage-manager.c:393 +#: ../src/vfs.c:305 #, c-format -msgid "Could not delete plain database file \"%s\"." -msgstr "Não foi possível excluir o arquivo de banco de dados em \"%s\"." +msgid "Can't create a new GIOChannel for the plain database: %s" +msgstr "" +"Não foi possível criar um novo GIOChannel para o banco de dados plano: %s" -#: ../src/storage-manager.c:434 +#: ../src/vfs.c:313 #, c-format -msgid "Error decrypting database: %s" -msgstr "Erro ao descriptografar o banco de dados: %s" +msgid "Error opening plain database file \"%s\": %s" +msgstr "Erro ao abrir o arquivo de banco de dados em \"%s\": %s" -#: ../src/storage-manager.c:468 +#: ../src/vfs.c:409 #, c-format msgid "Error getting encryption key: %s" msgstr "Erro ao obter a chave de criptografia: %s" -#: ../src/storage-manager.c:489 +#: ../src/vfs.c:433 ../src/vfs.c:439 #, c-format msgid "Error encrypting database: %s" msgstr "Erro ao criptografar o banco de dados: %s" -#: ../src/storage-manager.c:549 +#. Translators: The first and second params are file paths, the last param is an error message. +#: ../src/vfs.c:489 +#, c-format +msgid "Error copying the file from %s to %s: %s" +msgstr "Erro ao copiar o arquivo de %s para %s: %s" + +#: ../src/vfs.c:495 #, c-format msgid "Error changing database backup file permissions: %s" msgstr "Erro ao alterar permissões dos arquivos backup do banco de dados: %s" -#: ../src/storage-manager.c:571 ../src/storage-manager.c:627 +#: ../src/vfs.c:595 #, c-format -msgid "Error changing database file permissions: %s" -msgstr "Erro ao alterar permissões dos arquivos de banco de dados: %s" +msgid "Error closing file: %s" +msgstr "Erro ao fechar o arquivo: %s" #. Translators: the first parameter is a filename, the second is an error message. -#: ../src/storage-manager.c:583 ../src/storage-manager.c:611 +#. Translators: the first parameter is a filename. +#: ../src/vfs.c:994 ../src/vfs.c:1021 #, c-format -msgid "Error backing up file ‘%s’: %s" -msgstr "Erro ao fazer backup do arquivo \"%s\": %s" +msgid "Error backing up file ‘%s’" +msgstr "Erro ao fazer backup do arquivo \"%s\"" -#: ../src/storage-manager.c:620 +#: ../src/vfs.c:1007 #, c-format -msgid "" -"Could not open database \"%s\". SQLite provided the following error message: " -"%s" -msgstr "" -"Não foi possível abrir o banco de dados em \"%s\". O SQLite retornou a " -"seguinte mensagem de erro: %s" +msgid "Error decrypting database: %s" +msgstr "Erro ao descriptografar o banco de dados: %s" -#: ../src/storage-manager.c:704 +#: ../src/vfs.c:1047 #, c-format -msgid "" -"Could not run query \"%s\". SQLite provided the following error message: %s" -msgstr "" -"Não foi possível executar a consulta \"%s\". O SQLite retornou a seguinte " -"mensagem de erro: %s" - -#: ../src/storage-manager.c:1010 -msgid "Error deserializing entry into buffer while searching." -msgstr "Erro ao desserializar entrada dentro do buffer durante a pesquisa." - -#: ../src/uri-entry-dialog.c:71 -msgid "Enter URI" -msgstr "Digite o URI" +msgid "Error changing database file permissions: %s" +msgstr "Erro ao alterar permissões dos arquivos de banco de dados: %s" -#: ../src/widgets/calendar-button.c:140 +#: ../src/widgets/calendar-button.c:142 #, c-format -msgid "UI file \"%s\" could not be loaded: %s" -msgstr "Não foi possível carregar arquivo de interface gráfica \"%s\": %s" +msgid "UI data could not be loaded: %s" +msgstr "Não foi possível carregar os dados de interface gráfica: %s" -#: ../src/widgets/calendar-button.c:150 +#: ../src/widgets/calendar-button.c:152 msgid "Can't load calendar window object from UI file" msgstr "" "Não foi possível carregar objeto da janela de calendário do arquivo de " @@ -733,10 +762,6 @@ msgid "Important!" msgstr "Importante!" -#: ../src/widgets/calendar-window.c:80 -msgid "Unknown input device" -msgstr "Dispositivo de entrada desconhecido" - #: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:166 msgid "add tag" msgstr "Adicionar etiqueta" @@ -757,3 +782,59 @@ #: ../src/widgets/tag-entry.c:85 msgid "Tag entry" msgstr "Entrada da etiqueta" + +#~ msgid "Almanah Preferences" +#~ msgstr "Preferências do Almanah" + +#~ msgid "Error loading resources file: %s" +#~ msgstr "Ocorreu erro ao carregar o arquivo de recursos: %s" + +#~ msgid "Unknown input device" +#~ msgstr "Dispositivo de entrada desconhecido" + +#~ msgid "F_ormat" +#~ msgstr "F_ormatar" + +#~ msgid "Toggle whether the currently selected text is bold." +#~ msgstr "Define se o texto atualmente selecionado é negrito." + +#~ msgid "Toggle whether the currently selected text is italic." +#~ msgstr "Define se o texto atualmente selecionado é itálico." + +#~ msgid "Toggle whether the currently selected text is underlined." +#~ msgstr "Define se o texto atualmente selecionado é sublinhado." + +#~ msgid "" +#~ "Add or remove a hyperlink from the currently selected text to a specified " +#~ "URI." +#~ msgstr "" +#~ "Adiciona e remove um hiperlink de um texto atualmente selecionado para um " +#~ "URI especificada." + +#~ msgid "I_mportant" +#~ msgstr "I_mportante" + +#~ msgid "Toggle whether the current entry is marked as important." +#~ msgstr "Define se a entrada atual é marcada como importante." + +#~ msgid "Show tags" +#~ msgstr "Mostrar etiquetas" + +#~ msgid "Show tags for the current entry" +#~ msgstr "Mostra etiquetas para a entrada atual" + +#~ msgid "_Help" +#~ msgstr "Aj_uda" + +#~ msgid "Jump to the current date in the diary." +#~ msgstr "Vai para a data atual no diário." + +#~ msgid "" +#~ "The encrypted database is empty. The plain database file has been left " +#~ "undeleted as backup." +#~ msgstr "" +#~ "O banco de dados criptografado está vazio. O arquivo do banco de dados " +#~ "foi desfeito como backup." + +#~ msgid "Could not delete plain database file \"%s\"." +#~ msgstr "Não foi possível excluir o arquivo de banco de dados em \"%s\"." diff -Nru almanah-0.11.1/po/pt.po almanah-0.12.0/po/pt.po --- almanah-0.11.1/po/pt.po 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.12.0/po/pt.po 2019-10-07 13:45:09.000000000 +0000 @@ -0,0 +1,813 @@ +# +# <>, 2014, X5, v~5, 2015. +# +msgid "" +msgstr "" +"Project-Id-Version: almanah master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=almanah&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2015-10-14 17:59+0000\n" +"PO-Revision-Date: 2015-10-26 09:30+0000\n" +"Last-Translator: <>\n" +"Language-Team: Português \n" +"Language: pt\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Gtranslator 2.91.6\n" + +#: ../data/almanah.appdata.xml.in.h:1 +msgid "Keep a diary of your life" +msgstr "Mantenha um diário da sua vida" + +#: ../data/almanah.appdata.xml.in.h:2 +msgid "" +"Almanah Diary is an application to allow you to keep a diary of your life." +msgstr "" +"O diário Almanah é uma aplicação que lhe permite manter um diário da sua " +"vida." + +#: ../data/almanah.appdata.xml.in.h:3 +msgid "" +"You can encrypt the diary to preserve your privacy. It has editing " +"abilities, including text formatting and printing and shows you a lists of " +"events which happened (on your computer) for each day (such as tasks and " +"appointments from Evolution)." +msgstr "" +"Pode encriptar o diário para manter a sua privacidade. Possui alguns " +"recursos de edição, incluindo formatação de texto e impressão e mostra-lhe " +"uma lista de eventos que aconteceram (no seu computador) para cada dia (como " +"tarefas e compromissos do Evolution)." + +#: ../data/almanah.desktop.in.h:1 ../src/application.c:133 +#: ../src/main-window.c:155 +msgid "Almanah Diary" +msgstr "Diário Almanah" + +#: ../data/almanah.desktop.in.h:2 +msgid "Keep a personal diary" +msgstr "Mantenha um diário pessoal" + +#. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. +#: ../data/almanah.desktop.in.h:3 ../src/application.c:272 +msgid "Diary" +msgstr "Diário" + +#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../data/almanah.desktop.in.h:5 +msgid "diary;journal;" +msgstr "diário;blogue;jornal;" + +#: ../src/ui/almanah.ui.h:1 +msgid "Calendar" +msgstr "Calendário" + +#: ../src/ui/almanah.ui.h:2 +msgid "Go to Today" +msgstr "Ir para Hoje" + +#: ../src/ui/almanah.ui.h:3 +msgid "Select Date…" +msgstr "Selecionar data…" + +#: ../src/ui/almanah.ui.h:4 +msgid "Entry editing area" +msgstr "Área de edição de entrada" + +#: ../src/ui/almanah.ui.h:5 +msgid "Past events" +msgstr "Eventos passados" + +#: ../src/ui/almanah.ui.h:6 +msgid "Past Event List" +msgstr "Lista de eventos passados" + +#: ../src/ui/almanah.ui.h:7 +msgid "Search entry" +msgstr "Procurar entrada" + +#: ../src/ui/almanah.ui.h:8 ../src/search-dialog.c:69 +msgid "Search" +msgstr "Procurar" + +#: ../src/ui/almanah.ui.h:9 +msgid "Result List" +msgstr "Lista de resultados" + +#: ../src/ui/almanah.ui.h:10 +msgid "View Entry" +msgstr "Ver entrada" + +#: ../src/ui/almanah.ui.h:11 +msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." +msgstr "ex: \"14/03/2009\" ou \"14 de março de 2009\"." + +#: ../src/ui/almanah.ui.h:12 +msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." +msgstr "ex: “http://google.com/” ou “file:///home/eu/Fotografias/foto.jpg”." + +#: ../src/ui/almanah.ui.h:13 +msgid "Successful Entries" +msgstr "Entradas bem sucedidas" + +#: ../src/ui/almanah.ui.h:14 +msgid "Merged Entries" +msgstr "Entradas unidas" + +#: ../src/ui/almanah.ui.h:15 +msgid "Failed Entries" +msgstr "Entradas falhadas" + +#: ../src/ui/almanah.ui.h:16 +msgid "Import Results List" +msgstr "Lista de resultados importados" + +#: ../data/org.gnome.almanah.gschema.xml.in.h:1 +msgid "Database encryption key ID" +msgstr "ID da chave de encriptação da base de dados" + +#: ../data/org.gnome.almanah.gschema.xml.in.h:2 +msgid "" +"The ID of the key to use to encrypt and decrypt the database, if Almanah has " +"been built with encryption support. Leave blank to disable database " +"encryption." +msgstr "" +"A ID da chave usada para encriptar e desencriptar a base de dados, se o " +"Almanah tiver sido compilado com suporte a encriptação. Deixe em branco para " +"desativar a encriptação da base de dados." + +#: ../data/org.gnome.almanah.gschema.xml.in.h:3 +msgid "Spell checking language" +msgstr "Idioma da verificação ortográfica" + +#: ../data/org.gnome.almanah.gschema.xml.in.h:4 +msgid "The locale specifier of the language in which to check entry spellings." +msgstr "" +"O especificador de localização do idioma em que verificar a ortografia." + +#: ../data/org.gnome.almanah.gschema.xml.in.h:5 +msgid "Spell checking enabled?" +msgstr "Ativar verificação ortográfica?" + +#: ../data/org.gnome.almanah.gschema.xml.in.h:6 +msgid "Whether spell checking of entries is enabled." +msgstr "Se a verificação ortográfica de entradas está ativada." + +#: ../src/application.c:255 +msgid "Error opening database" +msgstr "Erro ao abrir a base de dados" + +#: ../src/application.c:332 +msgid "Enable debug mode" +msgstr "Ativar o modo de depuração" + +#: ../src/application.c:349 +msgid "" +"Manage your diary. Only one instance of the program may be open at any time." +msgstr "" +"Gerir o seu diário. Só uma instância do programa pode ser aberta de cada vez." + +#. Print an error +#: ../src/application.c:360 +#, c-format +msgid "Command line options could not be parsed: %s\n" +msgstr "Impossível analisar as opções da linha de comando: %s\n" + +#: ../src/application.c:379 +msgid "Error encrypting database" +msgstr "Erro ao encriptar a base de dados" + +#: ../src/application.c:522 +msgid "" +"Almanah is free software: you can redistribute it and/or modify it under the " +"terms of the GNU General Public License as published by the Free Software " +"Foundation, either version 3 of the License, or (at your option) any later " +"version." +msgstr "" +"O Almanah é um programa gratuito: pode redistribuí-lo e/ou modificá-lo sob " +"os termos da GNU GNU General Public License publicada pela Free Software " +"Foundation, tanto na versão 3 da licença, quanto (à sua discrição) qualquer " +"versão posterior." + +#: ../src/application.c:526 +msgid "" +"Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " +"details." +msgstr "" +"O Almanah é distribuído na esperança de que seja útil, mas SEM NENHUMA " +"GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou ADEQUAÇÃO A " +"UM PROPÓSITO EM PARTICULAR. Veja a GNU General Public License para mais " +"detalhes." + +#: ../src/application.c:530 +msgid "" +"You should have received a copy of the GNU General Public License along with " +"Almanah. If not, see ." +msgstr "" +"Deve ter recebido uma cópia da GNU General Public License junto com o " +"Almanah. Caso contrário, veja ." + +#: ../src/application.c:545 +#, c-format +msgid "A helpful diary keeper, storing %u entries." +msgstr "Um diário útil, armazenando %u entradas." + +#: ../src/application.c:549 +msgid "Copyright © 2008-2009 Philip Withnall" +msgstr "Copyright © 2008-2009 Philip Withnall" + +#. Translators: please include your names here to be credited for your hard work! +#. * Format: +#. * "Translator name 1 \n" +#. * "Translator name 2 " +#. +#: ../src/application.c:557 +msgid "translator-credits" +msgstr "" +"Tiago S., 2014\n" +"Pedro Albuquerque " + +#: ../src/application.c:561 +msgid "Almanah Website" +msgstr "Site do Almanah" + +#: ../src/application.c:589 +#, c-format +msgid "" +"Couldn't load the CSS resources. The interface might not be styled " +"correctly: %s" +msgstr "" +"Impossível carregar os recursos CSS \"%s\". O ambiente pode não estar " +"corretamente configurado com estilo." + +#: ../src/date-entry-dialog.c:72 +msgid "Select Date" +msgstr "Selecionar data" + +#: ../src/date-entry-dialog.c:127 ../src/import-export-dialog.c:169 +#: ../src/import-export-dialog.c:475 ../src/main-window.c:225 +#: ../src/preferences-dialog.c:177 ../src/search-dialog.c:95 +#: ../src/uri-entry-dialog.c:126 +msgid "UI data could not be loaded" +msgstr "Impossível carregar dados de UI" + +#: ../src/entry.c:303 +#, c-format +msgid "Invalid data version number %u." +msgstr "Dados do número da versão inválidos %u." + +#: ../src/events/calendar-appointment.c:51 +msgid "Calendar Appointment" +msgstr "Calendário de compromissos" + +#: ../src/events/calendar-appointment.c:52 +msgid "An appointment on an Evolution calendar." +msgstr "Um compromisso num calendário do Evolution." + +#. Translators: This is a time string with the format hh:mm +#: ../src/events/calendar-appointment.c:89 ../src/events/calendar-task.c:90 +#, c-format +msgid "%.2d:%.2d" +msgstr "%.2d:%.2d" + +#: ../src/events/calendar-appointment.c:135 ../src/events/calendar-task.c:125 +msgid "Error launching Evolution" +msgstr "Erro ao lançar o Evolution" + +#: ../src/events/calendar-task.c:51 +msgid "Calendar Task" +msgstr "Calendário de tarefas" + +#: ../src/events/calendar-task.c:52 +msgid "A task on an Evolution calendar." +msgstr "Uma tarefa num calendário do Evolution." + +#: ../src/export-operation.c:47 ../src/import-operation.c:45 +msgid "Text Files" +msgstr "Ficheiros de texto" + +#: ../src/export-operation.c:48 +msgid "" +"Select a _folder to export the entries to as text files, one per entry, with " +"names in the format 'yyyy-mm-dd', and no extension. All entries will be " +"exported, unencrypted in plain text format." +msgstr "" +"Selecione uma _Pasta para exportar as entradas como ficheiros de texto, uma " +"por entrada, com nomes no formato \"aaaa-mm-dd\" e sem extensão. Todas as " +"entradas serão exportadas sem encriptação, no formato de texto simples." + +#: ../src/export-operation.c:52 ../src/import-operation.c:50 +msgid "Database" +msgstr "Base de dados" + +#: ../src/export-operation.c:53 +msgid "" +"Select a _filename for a complete copy of the unencrypted Almanah Diary " +"database to be given." +msgstr "" +"Selecione um _Ficheiro para a cópia completa e sem encriptação da base de " +"dados do Diário Almanah." + +#: ../src/export-operation.c:256 ../src/export-operation.c:313 +#, c-format +msgid "Error changing exported file permissions: %s" +msgstr "Erro ao alterar permissões dos ficheiros exportados: %s" + +#: ../src/gtk/menus.ui.h:1 +msgid "_Search" +msgstr "_Procurar" + +#: ../src/gtk/menus.ui.h:2 +msgid "Pr_eferences" +msgstr "Pr_Eferências" + +#: ../src/gtk/menus.ui.h:3 +msgctxt "Main menu" +msgid "_Import" +msgstr "_Importar" + +#: ../src/gtk/menus.ui.h:4 +msgctxt "Main menu" +msgid "_Export" +msgstr "_Exportar" + +#: ../src/gtk/menus.ui.h:5 +msgid "_Print diary" +msgstr "_Imprimir diário" + +#: ../src/gtk/menus.ui.h:6 +msgid "_About Almanah Diary" +msgstr "_Sobre o Diário Almanah" + +#: ../src/gtk/menus.ui.h:7 +msgid "_Quit" +msgstr "_Sair" + +#: ../src/gtk/menus.ui.h:8 +msgid "_Bold" +msgstr "_Negrito" + +#: ../src/gtk/menus.ui.h:9 +msgid "_Italic" +msgstr "_Itálico" + +#: ../src/gtk/menus.ui.h:10 +msgid "_Underline" +msgstr "_Sublinhado" + +#: ../src/gtk/menus.ui.h:11 +msgid "_Cut" +msgstr "_Cortar" + +#: ../src/gtk/menus.ui.h:12 +msgid "_Copy" +msgstr "Co_Piar" + +#: ../src/gtk/menus.ui.h:13 +msgid "_Paste" +msgstr "C_Olar" + +#: ../src/gtk/menus.ui.h:14 ../src/main-window.c:626 +msgid "_Delete" +msgstr "_Eliminar" + +#: ../src/gtk/menus.ui.h:15 +msgid "Insert _Time" +msgstr "Inserir _Hora" + +#: ../src/gtk/menus.ui.h:16 +msgid "Add/Remove _Hyperlink" +msgstr "Adicionar/Remover _Hiperligação" + +#: ../src/import-export-dialog.c:203 +msgid "Import _mode: " +msgstr "_Modo de importação: " + +#: ../src/import-export-dialog.c:203 +msgid "Export _mode: " +msgstr "_Modo de exportação: " + +#. Set the window title +#: ../src/import-export-dialog.c:206 +msgid "Import Entries" +msgstr "Importar entradas" + +#: ../src/import-export-dialog.c:206 +msgid "Export Entries" +msgstr "Exportar entradas" + +#: ../src/import-export-dialog.c:210 +msgctxt "Dialog button" +msgid "_Import" +msgstr "_Importar" + +#: ../src/import-export-dialog.c:210 +msgctxt "Dialog button" +msgid "_Export" +msgstr "_Exportar" + +#: ../src/import-export-dialog.c:247 +msgid "Import failed" +msgstr "Importação falhou" + +#: ../src/import-export-dialog.c:285 +msgid "Export failed" +msgstr "Exportação falhou" + +#: ../src/import-export-dialog.c:298 +msgid "Export successful" +msgstr "Exportação feita com sucesso" + +#: ../src/import-export-dialog.c:299 +msgid "The diary was successfully exported." +msgstr "O diário foi exportado com sucesso." + +#: ../src/import-export-dialog.c:447 +msgid "Import Results" +msgstr "Resultados da importação" + +#. Translators: This is a strftime()-format string for the dates displayed in import results. +#. Translators: This is a strftime()-format string for the date to display when asking about editing a diary entry. +#. Translators: This is a strftime()-format string for the date to display when asking about deleting a diary entry. +#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. +#. Translators: This is a strftime()-format string for the date displayed above each printed entry. +#. Translators: This is a strftime()-format string for the dates displayed in search results. +#: ../src/import-export-dialog.c:542 ../src/main-window.c:587 +#: ../src/main-window.c:618 ../src/main-window.c:1225 ../src/printing.c:263 +#: ../src/search-dialog.c:180 +msgid "%A, %e %B %Y" +msgstr "%A, %e de %B de %Y" + +#: ../src/import-operation.c:46 +msgid "" +"Select a _folder containing text files, one per entry, with names in the " +"format 'yyyy-mm-dd', and no extension. Any and all such files will be " +"imported." +msgstr "" +"Selecione uma _Pasta contendo ficheiros de texto, um por entrada, com nomes " +"no formato \"aaaa-mm-dd\" e sem extensão. Todos e quaisquer desses ficheiros " +"serão importados." + +#: ../src/import-operation.c:51 +msgid "Select a database _file created by Almanah Diary to import." +msgstr "" +"Selecionar um _Ficheiro de base de dados criado pelo Diário Almanah para " +"importar." + +#: ../src/import-operation.c:248 +#, c-format +msgid "Error deserializing imported entry into buffer: %s" +msgstr "Erro ao remover serialização da entrada importada no buffer: %s" + +#: ../src/import-operation.c:264 +#, c-format +msgid "" +"Error deserializing existing entry into buffer; overwriting with imported " +"entry: %s" +msgstr "" +"Erro ao remover serialização da entrada importada no buffer; a sobrescrever " +"com entrada importada: %s" + +#. Append some header text for the imported entry +#. Translators: This text is appended to an existing entry when an entry is being imported to the same date. +#. * The imported entry is appended to this text. +#: ../src/import-operation.c:305 +#, c-format +msgid "" +"\n" +"\n" +"Entry imported from \"%s\":\n" +"\n" +msgstr "" +"\n" +"\n" +"Entrada importada para \"%s\":\n" +"\n" + +#: ../src/main-window.c:591 +#, c-format +msgid "Are you sure you want to edit this diary entry for %s?" +msgstr "Tem a certeza que quer editar esta entrada de diário para %s?" + +#: ../src/main-window.c:594 ../src/main-window.c:625 +msgid "_Cancel" +msgstr "_Cancelar" + +#: ../src/main-window.c:595 +msgid "_Edit" +msgstr "_Editar" + +#: ../src/main-window.c:622 +#, c-format +msgid "Are you sure you want to delete this diary entry for %s?" +msgstr "Tem a certeza que quer eliminar esta entrada de diário para %s?" + +#. Print a warning about the unknown tag +#: ../src/main-window.c:732 +#, c-format +msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." +msgstr "" +"Etiqueta de texto \"%s\" desconhecida ou duplicada na entrada. A ignorar..." + +#: ../src/main-window.c:973 +msgid "Error opening URI" +msgstr "Erro ao abrir URI" + +#. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place +#: ../src/main-window.c:1152 +#, c-format +msgid "%s @ %s" +msgstr "%s @ %s" + +#: ../src/main-window.c:1258 +msgid "Entry content could not be loaded" +msgstr "Impossível carregar o conteúdo da entrada" + +#. Translators: this sentence is just used in startup to estimate the width +#. of a 15 words sentence. Translate with some randome sentences with just 15 words. +#. See: https://bugzilla.gnome.org/show_bug.cgi?id=754841 +#: ../src/main-window.c:1414 +msgid "" +"This is just a fifteen words sentence to calculate the diary entry text view " +"size" +msgstr "" +"Esta é uma frase de quinze palavras para calcular o tamanho do texto a ver" + +#: ../src/main-window.c:1450 +msgid "Spelling checker could not be initialized" +msgstr "Impossível inicializar a verificação ortográfica" + +#: ../src/preferences-dialog.c:83 +msgid "Preferences" +msgstr "Preferências" + +#. Grab our child widgets +#: ../src/preferences-dialog.c:204 +msgid "Encryption key: " +msgstr "Chave de encriptação: " + +#: ../src/preferences-dialog.c:208 +msgid "None (don't encrypt)" +msgstr "Nenhuma (não encriptar)" + +#: ../src/preferences-dialog.c:213 +msgid "New _Key" +msgstr "Nova _Chave" + +#. Set up the "Enable spell checking" check button +#: ../src/preferences-dialog.c:237 +msgid "Enable _spell checking" +msgstr "Ativar _Verificação ortográfica" + +#: ../src/preferences-dialog.c:262 +msgid "Error saving the encryption key" +msgstr "Erro ao gravar a chave de encriptação" + +#: ../src/preferences-dialog.c:281 +msgid "Error opening Seahorse" +msgstr "Erro ao abrir o Seahorse" + +#: ../src/printing.c:277 +msgid "This entry is marked as important." +msgstr "Esta entrada está marcada como importante." + +#: ../src/printing.c:298 +msgid "No entry for this date." +msgstr "Nenhuma entrada para esta data." + +#: ../src/printing.c:453 +msgid "Start date:" +msgstr "Data inicial:" + +#: ../src/printing.c:455 +msgid "End date:" +msgstr "Data final:" + +#. Line spacing +#: ../src/printing.c:471 +msgid "Line spacing:" +msgstr "Espaçamento de linha:" + +#: ../src/search-dialog.c:221 +msgid "Search canceled." +msgstr "Procura cancelada." + +#. Translators: This is an error message wrapper for when searches encounter an error. The placeholder is for an error message. +#: ../src/search-dialog.c:224 +#, c-format +msgid "Error: %s" +msgstr "Erro: %s" + +#. Success! +#: ../src/search-dialog.c:229 +#, c-format +msgid "Found %d entry:" +msgid_plural "Found %d entries:" +msgstr[0] "%d entrada encontrada:" +msgstr[1] "%d entradas encontradas:" + +#: ../src/search-dialog.c:278 +msgid "Searching…" +msgstr "A procurar…" + +#: ../src/storage-manager.c:248 +#, c-format +msgid "" +"Could not open database \"%s\". SQLite provided the following error message: " +"%s" +msgstr "" +"Impossível abrir a base de dados \"%s\". O SQLite devolveu a seguinte " +"mensagem de erro: %s" + +#: ../src/storage-manager.c:291 +#, c-format +msgid "" +"Could not run query \"%s\". SQLite provided the following error message: %s" +msgstr "" +"Impossível executar a consulta \"%s\". O SQLite devolveu a seguinte mensagem " +"de erro: %s" + +#: ../src/storage-manager.c:597 +msgid "Error deserializing entry into buffer while searching." +msgstr "Erro ao remover serialização da entrada no buffer durante a procura." + +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Insira o URI" + +#: ../src/vfs.c:239 +#, c-format +msgid "GPGME is not at least version %s" +msgstr "O GPGME não está na versão mínima %s" + +#: ../src/vfs.c:246 +#, c-format +msgid "GPGME doesn't support OpenPGP: %s" +msgstr "O GPGME não tem suporte OpenPGP: %s" + +#: ../src/vfs.c:253 +#, c-format +msgid "Error creating cipher context: %s" +msgstr "Erro ao criar o contexto cifrado: %s" + +#: ../src/vfs.c:273 +#, c-format +msgid "Can't create a new GIOChannel for the encrypted database: %s" +msgstr "" +"Impossível criar um novo GIOChannel para a base de dados encriptada: %s" + +#: ../src/vfs.c:281 +#, c-format +msgid "Error opening encrypted database file \"%s\": %s" +msgstr "Erro ao abrir o ficheiro de base de dados encriptado \"%s\": %s" + +#: ../src/vfs.c:297 +#, c-format +msgid "Error creating Callback base data buffer: %s" +msgstr "Erro ao criar buffer de dados base de recurso: %s" + +#: ../src/vfs.c:305 +#, c-format +msgid "Can't create a new GIOChannel for the plain database: %s" +msgstr "Impossível criar um novo GIOChannel para a base de dados simples: %s" + +#: ../src/vfs.c:313 +#, c-format +msgid "Error opening plain database file \"%s\": %s" +msgstr "Erro ao abrir o ficheiro de base de dados simples \"%s\": %s" + +#: ../src/vfs.c:409 +#, c-format +msgid "Error getting encryption key: %s" +msgstr "Erro ao obter a chave de encriptação: %s" + +#: ../src/vfs.c:433 ../src/vfs.c:439 +#, c-format +msgid "Error encrypting database: %s" +msgstr "Erro ao encriptar a base de dados: %s" + +#. Translators: The first and second params are file paths, the last param is an error message. +#: ../src/vfs.c:489 +#, c-format +msgid "Error copying the file from %s to %s: %s" +msgstr "Erro ao copiar o ficheiro de %s para %s: %s" + +#: ../src/vfs.c:495 +#, c-format +msgid "Error changing database backup file permissions: %s" +msgstr "" +"Erro ao alterar permissões dos ficheiros de cópia de segurança da base de " +"dados: %s" + +#: ../src/vfs.c:595 +#, c-format +msgid "Error closing file: %s" +msgstr "Erro ao fechar o ficheiro: %s" + +#. Translators: the first parameter is a filename, the second is an error message. +#. Translators: the first parameter is a filename. +#: ../src/vfs.c:994 ../src/vfs.c:1021 +#, c-format +msgid "Error backing up file ‘%s’" +msgstr "Erro ao fazer cópia de segurança do ficheiro \"%s\"" + +#: ../src/vfs.c:1007 +#, c-format +msgid "Error decrypting database: %s" +msgstr "Erro ao desencriptar a base de dados: %s" + +#: ../src/vfs.c:1047 +#, c-format +msgid "Error changing database file permissions: %s" +msgstr "Erro ao alterar permissões do ficheiro da base de dados: %s" + +#: ../src/widgets/calendar-button.c:142 +#, c-format +msgid "UI data could not be loaded: %s" +msgstr "Impossível carregar dados do UI: %s" + +#: ../src/widgets/calendar-button.c:152 +msgid "Can't load calendar window object from UI file" +msgstr "Impossível carregar objeto da janela de calendário do ficheiro de UI" + +#. Translators: This is the detail string for important days as displayed in the calendar. +#: ../src/widgets/calendar.c:176 +msgid "Important!" +msgstr "Importante!" + +#: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:166 +msgid "add tag" +msgstr "adicionar etiqueta" + +#: ../src/widgets/entry-tags-area.c:101 +msgid "Write the tag and press enter to save it" +msgstr "Escreva a etiqueta e prima Enter para gravá-la" + +#: ../src/widgets/tag-accessible.c:165 +msgid "Remove the tag from the entry" +msgstr "Remover a etiqueta da entrada" + +#. Looks like gtk_widget_set_tooltip_text don't works here, even in the init... ? +#: ../src/widgets/tag.c:416 +msgid "Remove tag" +msgstr "Remover etiqueta" + +#: ../src/widgets/tag-entry.c:85 +msgid "Tag entry" +msgstr "Entrada da etiqueta" + +#~ msgid "Almanah Preferences" +#~ msgstr "Preferências do Almanah" + +#~ msgid "F_ormat" +#~ msgstr "F_ormatar" + +#~ msgid "Toggle whether the currently selected text is bold." +#~ msgstr "Define se o texto selecionado atualmente é negrito." + +#~ msgid "Toggle whether the currently selected text is italic." +#~ msgstr "Define se o texto selecionado atualmente é itálico." + +#~ msgid "Toggle whether the currently selected text is underlined." +#~ msgstr "Define se o texto selecionado atualmente é sublinhado." + +#~ msgid "" +#~ "Add or remove a hyperlink from the currently selected text to a specified " +#~ "URI." +#~ msgstr "" +#~ "Adiciona ou remove uma hiperligação de um texto selecionado atualmente " +#~ "para um URI especificada." + +#~ msgid "I_mportant" +#~ msgstr "I_mportante" + +#~ msgid "Toggle whether the current entry is marked as important." +#~ msgstr "Define se a entrada atual é marcada como importante." + +#~ msgid "Show tags" +#~ msgstr "Mostrar etiquetas" + +#~ msgid "Show tags for the current entry" +#~ msgstr "Mostra etiquetas para a entrada atual" + +#~ msgid "_Help" +#~ msgstr "Aj_uda" + +#~ msgid "Jump to the current date in the diary." +#~ msgstr "Vai para a data atual no diário." + +#~ msgid "" +#~ "The encrypted database is empty. The plain database file has been left " +#~ "undeleted as backup." +#~ msgstr "" +#~ "A base de dados criptografada está vazia. O ficheiro da base de dados foi " +#~ "desfeito como cópia de segurança." + +#~ msgid "Could not delete plain database file \"%s\"." +#~ msgstr "Não foi possível excluir o ficheiro de base de dados em \"%s\"." + +#~ msgid "Unknown input device" +#~ msgstr "Dispositivo de entrada desconhecido" diff -Nru almanah-0.11.1/po/ru.po almanah-0.12.0/po/ru.po --- almanah-0.11.1/po/ru.po 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/ru.po 2019-10-07 13:45:09.000000000 +0000 @@ -10,179 +10,131 @@ msgid "" msgstr "" "Project-Id-Version: ru\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=almanah&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-15 12:50+0000\n" -"PO-Revision-Date: 2013-02-20 00:24+0400\n" -"Last-Translator: Yuri Myasoedov \n" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" +"product=almanah&keywords=I18N+L10N&component=General\n" +"POT-Creation-Date: 2017-02-27 16:29+0000\n" +"PO-Revision-Date: 2017-03-14 23:24+0300\n" +"Last-Translator: Stas Solovey \n" "Language-Team: русский \n" "Language: ru\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%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -"X-Generator: Poedit 1.5.4\n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Poedit 1.8.11\n" -#: ../data/almanah-app-menu.ui.h:1 -msgid "_Search" -msgstr "И_скать" - -#: ../data/almanah-app-menu.ui.h:2 -msgid "Pr_eferences" -msgstr "На_стройки" - -#. Set the button label -#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 -msgid "_Import" -msgstr "_Импорт" - -#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 -msgid "_Export" -msgstr "_Экспортировать" - -#: ../data/almanah-app-menu.ui.h:5 -msgid "_Print diary" -msgstr "Рас_печатать дневник" - -#: ../data/almanah-app-menu.ui.h:6 -msgid "_About Almanah Diary" -msgstr "_О дневнике Almanah" - -#: ../data/almanah-app-menu.ui.h:7 -msgid "_Quit" -msgstr "В_ыйти" - -#: ../data/almanah.desktop.in.h:1 ../src/application.c:129 -#: ../src/main-window.c:135 +#: ../data/almanah.appdata.xml.in.h:1 ../data/almanah.desktop.in.h:1 +#: ../src/application.c:135 ../src/main-window.c:163 msgid "Almanah Diary" msgstr "Дневник Almanah" +#: ../data/almanah.appdata.xml.in.h:2 +msgid "Keep a diary of your life" +msgstr "Ведите свой личный дневник" + +#: ../data/almanah.appdata.xml.in.h:3 +msgid "" +"Almanah Diary is an application to allow you to keep a diary of your life." +msgstr "Дневник Almanah — это приложение, позволяющее вести личный дневник." + +#: ../data/almanah.appdata.xml.in.h:4 +msgid "" +"You can encrypt the diary to preserve your privacy. It has editing " +"abilities, including text formatting and printing and shows you a lists of " +"events which happened (on your computer) for each day (such as tasks and " +"appointments from Evolution)." +msgstr "" +"Для обеспечения безопасности можно зашифровать дневник. Приложение обладает " +"возможностями редактирования, включая форматирование текста и печать, и " +"показывает список событий, происходящих (на вашем компьютере) для каждого " +"дня (например, задачи и встречи из Evolution)." + #: ../data/almanah.desktop.in.h:2 msgid "Keep a personal diary" -msgstr "Вести личный дневник" +msgstr "Ведение личного дневника" #. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. -#: ../data/almanah.desktop.in.h:3 ../src/application.c:260 +#: ../data/almanah.desktop.in.h:3 ../src/application.c:274 msgid "Diary" msgstr "Дневник" -#: ../data/almanah.ui.h:1 -msgid "Select Date…" -msgstr "Выбрать дату..." - -#: ../data/almanah.ui.h:2 -msgid "F_ormat" -msgstr "Ф_ормат" - -#: ../data/almanah.ui.h:3 -msgid "Toggle whether the currently selected text is bold." -msgstr "Жирный" - -#: ../data/almanah.ui.h:4 -msgid "Toggle whether the currently selected text is italic." -msgstr "Курсив" - -#: ../data/almanah.ui.h:5 -msgid "Toggle whether the currently selected text is underlined." -msgstr "Подчёркнутый" +#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../data/almanah.desktop.in.h:5 +msgid "diary;journal;" +msgstr "дневник;журнал;" -#: ../data/almanah.ui.h:6 -msgid "Add/Remove _Hyperlink" -msgstr "_Добавить или удалить гиперссылку" - -#: ../data/almanah.ui.h:7 -msgid "" -"Add or remove a hyperlink from the currently selected text to a specified " -"URI." -msgstr "" -"Добавить или удалить гиперссылку из выделенного текста в указанный URI." - -#: ../data/almanah.ui.h:8 -msgid "Insert _Time" -msgstr "Вставить _время" - -#: ../data/almanah.ui.h:9 -msgid "I_mportant" -msgstr "В_ажное" - -#: ../data/almanah.ui.h:10 -msgid "Toggle whether the current entry is marked as important." -msgstr "Пометить эту запись как важную." - -#: ../data/almanah.ui.h:11 -msgid "_Help" -msgstr "_Справка" - -#: ../data/almanah.ui.h:12 -msgid "Go to _Today" -msgstr "Перейти к _сегодняшней дате" - -#: ../data/almanah.ui.h:13 -msgid "Jump to the current date in the diary." -msgstr "Перейти к текущей дате в дневнике." - -#: ../data/almanah.ui.h:14 +#: ../src/ui/almanah.ui.h:1 msgid "Calendar" msgstr "Календарь" -#: ../data/almanah.ui.h:15 +#: ../src/ui/almanah.ui.h:2 +msgid "Go to Today" +msgstr "Перейти к сегодняшней дате" + +#: ../src/ui/almanah.ui.h:3 +msgid "Select Date…" +msgstr "Выбрать дату..." + +#: ../src/ui/almanah.ui.h:4 msgid "Entry editing area" msgstr "Область редактирования записи" -#: ../data/almanah.ui.h:16 +#: ../src/ui/almanah.ui.h:5 msgid "Past events" msgstr "Прошедшие события" -#: ../data/almanah.ui.h:17 +#: ../src/ui/almanah.ui.h:6 msgid "Past Event List" msgstr "Список прошедших событий" -#: ../data/almanah.ui.h:18 +#: ../src/ui/almanah.ui.h:7 msgid "Search entry" msgstr "Искать запись" -#: ../data/almanah.ui.h:19 ../src/search-dialog.c:69 +#: ../src/ui/almanah.ui.h:8 ../src/search-dialog.c:69 msgid "Search" msgstr "Искать" -#: ../data/almanah.ui.h:20 +#: ../src/ui/almanah.ui.h:9 msgid "Result List" msgstr "Список результатов" -#: ../data/almanah.ui.h:21 +#: ../src/ui/almanah.ui.h:10 msgid "View Entry" msgstr "Просмотр записи" -#: ../data/almanah.ui.h:22 +#. Translators: Use two common date formats from your locale which will be parsed correctly by GLib +#: ../src/ui/almanah.ui.h:12 msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." -msgstr "например, «14/03/2009» или «14 марта 2009»." +msgstr "например, «14.03.2009» или «14 марта 2009»." -#: ../data/almanah.ui.h:23 +#. Translators: Use two popular URIs from your locale, preferably one on the Internet and one local file. +#: ../src/ui/almanah.ui.h:14 msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." -msgstr "напр., «http://google.com/» или «file:///home/me/Photos/photo.jpg»." +msgstr "например, «http://google.com/» или «file:///home/me/Photos/photo.jpg»." -#: ../data/almanah.ui.h:24 +#: ../src/ui/almanah.ui.h:15 msgid "Successful Entries" msgstr "Успешные записи" -#: ../data/almanah.ui.h:25 +#: ../src/ui/almanah.ui.h:16 msgid "Merged Entries" msgstr "Объединённые записи" -#: ../data/almanah.ui.h:26 +#: ../src/ui/almanah.ui.h:17 msgid "Failed Entries" msgstr "Неудачные записи" -#: ../data/almanah.ui.h:27 +#: ../src/ui/almanah.ui.h:18 msgid "Import Results List" msgstr "Импортировать список результатов" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 +#: ../data/org.gnome.almanah.gschema.xml.in.h:1 msgid "Database encryption key ID" msgstr "Идентификатор ключа шифрования базы данных" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +#: ../data/org.gnome.almanah.gschema.xml.in.h:2 msgid "" "The ID of the key to use to encrypt and decrypt the database, if Almanah has " "been built with encryption support. Leave blank to disable database " @@ -192,39 +144,31 @@ "был создан с поддержкой шифрования. Оставьте поля пустыми, чтобы выключить " "шифрование." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 +#: ../data/org.gnome.almanah.gschema.xml.in.h:3 msgid "Spell checking language" msgstr "Язык проверки орфографии" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +#: ../data/org.gnome.almanah.gschema.xml.in.h:4 msgid "The locale specifier of the language in which to check entry spellings." msgstr "Определение языка для проверки орфографии записи." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +#: ../data/org.gnome.almanah.gschema.xml.in.h:5 msgid "Spell checking enabled?" msgstr "Включить проверку орфографии?" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 +#: ../data/org.gnome.almanah.gschema.xml.in.h:6 msgid "Whether spell checking of entries is enabled." msgstr "Включена ли проверка орфографии для записей." -#: ../src/application.c:243 +#: ../src/application.c:257 msgid "Error opening database" msgstr "Ошибка при открытии базы данных" -#. Error loading the CSS -#: ../src/application.c:272 -#, c-format -msgid "" -"Couldn't load the CSS file '%s'. The interface might not be styled correctly" -msgstr "" -"Не удалось загрузить CSS-файл «%s». Стиль интерфейса может быть неправильным" - -#: ../src/application.c:316 +#: ../src/application.c:336 msgid "Enable debug mode" msgstr "Включить режим отладки" -#: ../src/application.c:333 +#: ../src/application.c:353 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" @@ -232,24 +176,16 @@ "программы." #. Print an error -#: ../src/application.c:344 +#: ../src/application.c:364 #, c-format msgid "Command line options could not be parsed: %s\n" msgstr "Не удалось разобрать аргументы командной строки: %s\n" -#: ../src/application.c:363 +#: ../src/application.c:383 msgid "Error encrypting database" msgstr "Ошибка при шифровании базы данных" -#: ../src/application.c:409 ../src/date-entry-dialog.c:129 -#: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 -#: ../src/main-window.c:194 ../src/preferences-dialog.c:191 -#: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 -#, c-format -msgid "UI file \"%s\" could not be loaded" -msgstr "Не удалось загрузить файл пользовательского интерфейса «%s»" - -#: ../src/application.c:532 +#: ../src/application.c:526 msgid "" "Almanah is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -261,7 +197,7 @@ "лицензии GNU General Public License, опубликованной Фондом Свободного " "Программного Обеспечения (Free Software Foundation)." -#: ../src/application.c:536 +#: ../src/application.c:530 msgid "" "Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -269,10 +205,10 @@ "details." msgstr "" "Almanah распространяется с надеждой, что он будет полезен, но БЕЗ КАКОЙ ЛИБО " -"ГАРАНТИИ, даже без подразумеваемой гарантии ГОДНОСТИ или СООТВЕТСТВИИ " +"ГАРАНТИИ, даже без подразумеваемой гарантии ГОДНОСТИ или СООТВЕТСТВИЯ " "КОНКРЕТНОЙ ЦЕЛИ. Смотрите лицензию GNU General Public License для деталей." -#: ../src/application.c:540 +#: ../src/application.c:534 msgid "" "You should have received a copy of the GNU General Public License along with " "Almanah. If not, see ." @@ -280,12 +216,12 @@ "Вы должны были получить копию лицензии GNU General Public License вместе с " "Almanah. Если это не так, то смотрите ." -#: ../src/application.c:555 +#: ../src/application.c:549 #, c-format msgid "A helpful diary keeper, storing %u entries." msgstr "Полезный дневник, хранящий %u записей." -#: ../src/application.c:559 +#: ../src/application.c:553 msgid "Copyright © 2008-2009 Philip Withnall" msgstr "Copyright В© 2008-2009 Philip Withnall" @@ -294,20 +230,37 @@ #. * "Translator name 1 \n" #. * "Translator name 2 " #. -#: ../src/application.c:567 +#: ../src/application.c:561 msgid "translator-credits" msgstr "" -"Кузаченко Диана Юсуповна \n" -"Юрий Мясоедов " +"Диана Кузаченко , 2010.\n" +"Юрий Мясоедов , 2013.\n" +"Алексей Кабанов , 2016." -#: ../src/application.c:571 +#: ../src/application.c:565 msgid "Almanah Website" msgstr "Веб-сайт Almanah" +#: ../src/application.c:593 +#, c-format +msgid "" +"Couldn't load the CSS resources. The interface might not be styled " +"correctly: %s" +msgstr "" +"Не удалось загрузить CSS-ресурсы. Стиль интерфейса может оказаться " +"неправильным: %s" + #: ../src/date-entry-dialog.c:72 msgid "Select Date" msgstr "Выбрать дату" +#: ../src/date-entry-dialog.c:127 ../src/import-export-dialog.c:169 +#: ../src/import-export-dialog.c:476 ../src/main-window.c:235 +#: ../src/preferences-dialog.c:177 ../src/search-dialog.c:95 +#: ../src/uri-entry-dialog.c:126 +msgid "UI data could not be loaded" +msgstr "Не удалось загрузить данные пользовательского интерфейса" + #: ../src/entry.c:303 #, c-format msgid "Invalid data version number %u." @@ -339,11 +292,11 @@ msgid "A task on an Evolution calendar." msgstr "Задача из календаря Evolution." -#: ../src/export-operation.c:45 ../src/import-operation.c:45 +#: ../src/export-operation.c:47 ../src/import-operation.c:45 msgid "Text Files" msgstr "Текстовые файлы" -#: ../src/export-operation.c:46 +#: ../src/export-operation.c:48 msgid "" "Select a _folder to export the entries to as text files, one per entry, with " "names in the format 'yyyy-mm-dd', and no extension. All entries will be " @@ -353,11 +306,11 @@ "запись), имена которых имеют формат «гггг-мм-дд». Все такие файлы будут " "экспортированы открытым текстом без шифрования." -#: ../src/export-operation.c:50 ../src/import-operation.c:50 +#: ../src/export-operation.c:52 ../src/import-operation.c:50 msgid "Database" msgstr "База данных" -#: ../src/export-operation.c:51 +#: ../src/export-operation.c:53 msgid "" "Select a _filename for a complete copy of the unencrypted Almanah Diary " "database to be given." @@ -365,54 +318,136 @@ "Выберите _имя файла для полного копирования незашифрованной базы данных " "дневника Almanah." -#: ../src/import-export-dialog.c:202 +#: ../src/export-operation.c:256 ../src/export-operation.c:313 +#, c-format +msgid "Error changing exported file permissions: %s" +msgstr "Ошибка при изменении прав доступа к экспортированному файлу: %s" + +#: ../src/gtk/menus.ui.h:1 +msgid "_Search" +msgstr "И_скать" + +#: ../src/gtk/menus.ui.h:2 +msgid "Pr_eferences" +msgstr "На_стройки" + +#: ../src/gtk/menus.ui.h:3 +msgctxt "Main menu" +msgid "_Import" +msgstr "_Импортировать" + +#: ../src/gtk/menus.ui.h:4 +msgctxt "Main menu" +msgid "_Export" +msgstr "_Экспортировать" + +#: ../src/gtk/menus.ui.h:5 +msgid "_Print diary" +msgstr "Рас_печатать дневник" + +#: ../src/gtk/menus.ui.h:6 +msgid "_About Almanah Diary" +msgstr "_О дневнике Almanah" + +#: ../src/gtk/menus.ui.h:7 +msgid "_Quit" +msgstr "В_ыйти" + +#: ../src/gtk/menus.ui.h:8 +msgid "_Bold" +msgstr "_Жирный" + +#: ../src/gtk/menus.ui.h:9 +msgid "_Italic" +msgstr "_Курсив" + +#: ../src/gtk/menus.ui.h:10 +msgid "_Underline" +msgstr "_Подчёркнутый" + +#: ../src/gtk/menus.ui.h:11 +msgid "_Cut" +msgstr "Вы_резать" + +#: ../src/gtk/menus.ui.h:12 +msgid "_Copy" +msgstr "_Копировать" + +#: ../src/gtk/menus.ui.h:13 +msgid "_Paste" +msgstr "_Вставить" + +#: ../src/gtk/menus.ui.h:14 ../src/main-window.c:640 +msgid "_Delete" +msgstr "_Удалить" + +#: ../src/gtk/menus.ui.h:15 +msgid "Insert _Time" +msgstr "Вставить _время" + +#: ../src/gtk/menus.ui.h:16 +msgid "Add/Remove _Hyperlink" +msgstr "_Добавить или удалить гиперссылку" + +#: ../src/import-export-dialog.c:203 msgid "Import _mode: " msgstr "_Режим импортирования:" -#: ../src/import-export-dialog.c:202 +#: ../src/import-export-dialog.c:203 msgid "Export _mode: " msgstr "_Режим экспортирования:" #. Set the window title -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Import Entries" msgstr "Импорт записей" -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Export Entries" msgstr "Экспоритрование записей" -#: ../src/import-export-dialog.c:245 +#. Translators: These are verbs. +#: ../src/import-export-dialog.c:211 +msgctxt "Dialog button" +msgid "_Import" +msgstr "_Импортировать" + +#: ../src/import-export-dialog.c:211 +msgctxt "Dialog button" +msgid "_Export" +msgstr "_Экспортировать" + +#: ../src/import-export-dialog.c:248 msgid "Import failed" msgstr "Импортирование не удалось" -#: ../src/import-export-dialog.c:283 +#: ../src/import-export-dialog.c:286 msgid "Export failed" msgstr "Сбой экспортирования" -#: ../src/import-export-dialog.c:296 +#: ../src/import-export-dialog.c:299 msgid "Export successful" msgstr "Экспортирование прошло успешно" -#: ../src/import-export-dialog.c:297 +#: ../src/import-export-dialog.c:300 msgid "The diary was successfully exported." msgstr "Дневник успешно экспортирован." -#: ../src/import-export-dialog.c:445 +#: ../src/import-export-dialog.c:448 msgid "Import Results" msgstr "Импортировать результы" #. Translators: This is a strftime()-format string for the dates displayed in import results. #. Translators: This is a strftime()-format string for the date to display when asking about editing a diary entry. #. Translators: This is a strftime()-format string for the date to display when asking about deleting a diary entry. +#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. -#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. -#: ../src/import-export-dialog.c:539 ../src/main-window.c:566 -#: ../src/main-window.c:596 ../src/printing.c:263 ../src/search-dialog.c:182 -#: ../src/widgets/calendar-button.c:309 +#: ../src/import-export-dialog.c:543 ../src/main-window.c:601 +#: ../src/main-window.c:632 ../src/main-window.c:1271 ../src/printing.c:263 +#: ../src/search-dialog.c:180 msgid "%A, %e %B %Y" -msgstr "%A, %e %B %Y" +msgstr "%A, %e %b. %Y" #: ../src/import-operation.c:46 msgid "" @@ -459,67 +494,86 @@ "Запись импортирована из «%s»:\n" "\n" -#: ../src/main-window.c:570 +#: ../src/main-window.c:605 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" msgstr "Действительно хотите изменить эту запись в дневнике для %s?" -#: ../src/main-window.c:600 +#: ../src/main-window.c:608 ../src/main-window.c:639 +msgid "_Cancel" +msgstr "_Отменить" + +#: ../src/main-window.c:609 +msgid "_Edit" +msgstr "_Правка" + +#: ../src/main-window.c:636 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" msgstr "Действительно хотите удалить эту запись в дневнике для %s?" #. Print a warning about the unknown tag -#: ../src/main-window.c:709 +#: ../src/main-window.c:746 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." -msgstr "Неизвестный или дублированный текстовый тег «%s» в записи. Пропуск." +msgstr "Неизвестная или дублированная текстовая метка «%s» в записи. Пропуск." -#: ../src/main-window.c:908 +#: ../src/main-window.c:987 msgid "Error opening URI" msgstr "Ошибка при открытии URI" #. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place -#: ../src/main-window.c:1082 +#: ../src/main-window.c:1198 #, c-format msgid "%s @ %s" msgstr "%s в %s" -#: ../src/main-window.c:1161 +#: ../src/main-window.c:1304 msgid "Entry content could not be loaded" msgstr "Не удалось загрузить содержимое записи" -#: ../src/main-window.c:1326 +#. Translators: this sentence is just used in startup to estimate the width +#. of a 15 words sentence. Translate with some random sentences with just 15 words. +#. See: https://bugzilla.gnome.org/show_bug.cgi?id=754841 +#: ../src/main-window.c:1459 +msgid "" +"This is just a fifteen words sentence to calculate the diary entry text view " +"size" +msgstr "" +"Это просто тестовое предложение из пятнадцати слов, дающее возможность " +"оценить ширину области просмотра записи дневника" + +#: ../src/main-window.c:1496 msgid "Spelling checker could not be initialized" msgstr "Не удалось инициализировать модуль проверки орфографии" -#: ../src/preferences-dialog.c:91 -msgid "Almanah Preferences" -msgstr "Настройки Almanah" +#: ../src/preferences-dialog.c:83 +msgid "Preferences" +msgstr "Настройки" #. Grab our child widgets -#: ../src/preferences-dialog.c:217 +#: ../src/preferences-dialog.c:204 msgid "Encryption key: " msgstr "Ключ шифрования: " -#: ../src/preferences-dialog.c:222 +#: ../src/preferences-dialog.c:208 msgid "None (don't encrypt)" msgstr "Нет (не шифровать)" -#: ../src/preferences-dialog.c:246 +#: ../src/preferences-dialog.c:213 msgid "New _Key" msgstr "Создать _ключ" #. Set up the "Enable spell checking" check button -#: ../src/preferences-dialog.c:253 +#: ../src/preferences-dialog.c:237 msgid "Enable _spell checking" msgstr "Включить _проверку орфографии" -#: ../src/preferences-dialog.c:279 +#: ../src/preferences-dialog.c:262 msgid "Error saving the encryption key" msgstr "Ошибка при сохранении ключа шифрования" -#: ../src/preferences-dialog.c:298 +#: ../src/preferences-dialog.c:281 msgid "Error opening Seahorse" msgstr "Ошибка при открытии Seahorse" @@ -531,31 +585,31 @@ msgid "No entry for this date." msgstr "Нет записей на эту дату." -#: ../src/printing.c:453 +#: ../src/printing.c:457 msgid "Start date:" msgstr "Начальная дата:" -#: ../src/printing.c:455 +#: ../src/printing.c:459 msgid "End date:" msgstr "Последняя дата:" #. Line spacing -#: ../src/printing.c:471 +#: ../src/printing.c:475 msgid "Line spacing:" msgstr "Межстрочный интервал:" -#: ../src/search-dialog.c:223 +#: ../src/search-dialog.c:221 msgid "Search canceled." msgstr "Поиск отменён." #. Translators: This is an error message wrapper for when searches encounter an error. The placeholder is for an error message. -#: ../src/search-dialog.c:226 +#: ../src/search-dialog.c:224 #, c-format msgid "Error: %s" msgstr "Ошибка: %s" #. Success! -#: ../src/search-dialog.c:231 +#: ../src/search-dialog.c:229 #, c-format msgid "Found %d entry:" msgid_plural "Found %d entries:" @@ -563,91 +617,120 @@ msgstr[1] "Найдено %d записи:" msgstr[2] "Найдено %d записей:" -#: ../src/search-dialog.c:280 +#: ../src/search-dialog.c:278 msgid "Searching…" msgstr "Поиск…" -#: ../src/storage-manager.c:275 +#: ../src/storage-manager.c:247 +#, c-format +msgid "" +"Could not open database \"%s\". SQLite provided the following error message: " +"%s" +msgstr "Не удалось открыть базу данных «%s». SQLite выдал следующую ошибку: %s" + +#: ../src/storage-manager.c:290 +#, c-format +msgid "" +"Could not run query \"%s\". SQLite provided the following error message: %s" +msgstr "Не удалось сделать запрос «%s». SQLite выдал следующую ошибку: %s" + +#: ../src/storage-manager.c:596 +msgid "Error deserializing entry into buffer while searching." +msgstr "Ошибка при десериализации записи в буфер во время поиска." + +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Введите URI" + +#: ../src/vfs.c:291 #, c-format msgid "GPGME is not at least version %s" msgstr "GPGME версии не %s" -#: ../src/storage-manager.c:284 +#: ../src/vfs.c:298 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "GPGME не поддерживает OpenPGP: %s" -#: ../src/storage-manager.c:293 +#: ../src/vfs.c:305 #, c-format msgid "Error creating cipher context: %s" msgstr "Ошибка при создании контекста шифра: %s" -#: ../src/storage-manager.c:322 +#: ../src/vfs.c:325 #, c-format -msgid "Error opening encrypted database file \"%s\": %s" -msgstr "Ошибка при открытии файла шифрованной базы данных «%s»: %s" +msgid "Can't create a new GIOChannel for the encrypted database: %s" +msgstr "Не удаётся создать новый GIOChannel для зашифрованной базы данных: %s" -#: ../src/storage-manager.c:341 +#: ../src/vfs.c:333 #, c-format -msgid "Error opening plain database file \"%s\": %s" -msgstr "Ошибка при открытии файла незашифрованной базы данных «%s»: %s" +msgid "Error opening encrypted database file \"%s\": %s" +msgstr "Ошибка при открытии файла зашифрованной базы данных «%s»: %s" -#: ../src/storage-manager.c:389 -msgid "" -"The encrypted database is empty. The plain database file has been left " -"undeleted as backup." -msgstr "" -"Зашифрованная база данных пуста. Файл незашифрованной базы данных останется " -"резервной копией." +#: ../src/vfs.c:349 +#, c-format +msgid "Error creating Callback base data buffer: %s" +msgstr "Ошибка создания буфера базы данных Callback: %s" -#. Delete the plain file -#: ../src/storage-manager.c:392 +#: ../src/vfs.c:357 #, c-format -msgid "Could not delete plain database file \"%s\"." -msgstr "Не удалось удалить файл незашифрованной базы данных «%s»." +msgid "Can't create a new GIOChannel for the plain database: %s" +msgstr "Не удаётся создать новый GIOChannel для обычной базы данных: %s" -#: ../src/storage-manager.c:433 +#: ../src/vfs.c:365 #, c-format -msgid "Error decrypting database: %s" -msgstr "Ошибка при расшифровке базы данных: %s" +msgid "Error opening plain database file \"%s\": %s" +msgstr "Ошибка при открытии файла обычной базы данных «%s»: %s" -#: ../src/storage-manager.c:467 +#: ../src/vfs.c:461 #, c-format msgid "Error getting encryption key: %s" msgstr "Ошибка при получении ключа шифрования: %s" -#: ../src/storage-manager.c:488 +#: ../src/vfs.c:485 ../src/vfs.c:491 #, c-format msgid "Error encrypting database: %s" msgstr "Ошибка при шифровании базы данных: %s" -#: ../src/storage-manager.c:590 +#. Translators: The first and second params are file paths, the last param is an error message. +#: ../src/vfs.c:541 #, c-format -msgid "" -"Could not open database \"%s\". SQLite provided the following error message: " -"%s" -msgstr "Не удалось открыть базу данных «%s». SQLite выдал следующую ошибку: %s" +msgid "Error copying the file from %s to %s: %s" +msgstr "Ошибка при копировании файла из %s в %s: %s" -#: ../src/storage-manager.c:667 +#: ../src/vfs.c:547 #, c-format -msgid "" -"Could not run query \"%s\". SQLite provided the following error message: %s" -msgstr "Не удалось сделать запрос «%s». SQLite выдал следующую ошибку: %s" +msgid "Error changing database backup file permissions: %s" +msgstr "" +"Ошибка при изменении прав доступа к файлу резервной копии базы данных: %s" -#: ../src/storage-manager.c:970 -msgid "Error deserializing entry into buffer while searching." -msgstr "Ошибка при десериализации записи в буфер во время поиска." +#: ../src/vfs.c:647 +#, c-format +msgid "Error closing file: %s" +msgstr "Ошибка при закрытии файла: %s" -#: ../src/uri-entry-dialog.c:71 -msgid "Enter URI" -msgstr "Введите URI" +#. Translators: the first parameter is a filename. +#: ../src/vfs.c:1046 ../src/vfs.c:1073 +#, c-format +msgid "Error backing up file ‘%s’" +msgstr "Ошибка при создании резервной копии файла «%s»" + +#: ../src/vfs.c:1059 +#, c-format +msgid "Error decrypting database: %s" +msgstr "Ошибка при расшифровке базы данных: %s" -#: ../src/widgets/calendar-button.c:140 +#: ../src/vfs.c:1099 #, c-format -msgid "UI file \"%s\" could not be loaded: %s" -msgstr "Не удалось загрузить файл пользовательского интерфейса «%s»: %s" +msgid "Error changing database file permissions: %s" +msgstr "Ошибка при изменении прав доступа к файлу базы данных: %s" -#: ../src/widgets/calendar-button.c:150 +#: ../src/widgets/calendar-button.c:142 +#, c-format +msgid "UI data could not be loaded: %s" +msgstr "Не удалось загрузить данные пользовательского интерфейса: %s" + +#: ../src/widgets/calendar-button.c:152 msgid "Can't load calendar window object from UI file" msgstr "" "Не удалось загрузить объект окна календаря из файла пользовательского " @@ -658,15 +741,73 @@ msgid "Important!" msgstr "Важное!" -#: ../src/widgets/calendar-window.c:80 -msgid "Unknown input device" -msgstr "Неизвестное устройство ввода" +#: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:166 +msgid "add tag" +msgstr "добавить метку" + +#: ../src/widgets/entry-tags-area.c:101 +msgid "Write the tag and press enter to save it" +msgstr "Наберите метку и нажмите Enter для её сохранения" + +#: ../src/widgets/tag-accessible.c:165 +msgid "Remove the tag from the entry" +msgstr "Убрать метку с записи" #. Looks like gtk_widget_set_tooltip_text don't works here, even in the init... ? -#: ../src/widgets/tag.c:400 +#: ../src/widgets/tag.c:416 msgid "Remove tag" msgstr "Удалить метку" +#: ../src/widgets/tag-entry.c:85 +msgid "Tag entry" +msgstr "Поставить метку записи" + +#~ msgid "F_ormat" +#~ msgstr "Ф_ормат" + +#~ msgid "Toggle whether the currently selected text is bold." +#~ msgstr "Жирный" + +#~ msgid "Toggle whether the currently selected text is italic." +#~ msgstr "Курсив" + +#~ msgid "Toggle whether the currently selected text is underlined." +#~ msgstr "Подчёркнутый" + +#~ msgid "" +#~ "Add or remove a hyperlink from the currently selected text to a specified " +#~ "URI." +#~ msgstr "" +#~ "Добавить или удалить гиперссылку из выделенного текста в указанный URI." + +#~ msgid "I_mportant" +#~ msgstr "В_ажное" + +#~ msgid "Toggle whether the current entry is marked as important." +#~ msgstr "Пометить эту запись как важную." + +#~ msgid "_Help" +#~ msgstr "_Справка" + +#~ msgid "Jump to the current date in the diary." +#~ msgstr "Перейти к текущей дате в дневнике." + +#~ msgid "Almanah Preferences" +#~ msgstr "Настройки Almanah" + +#~ msgid "" +#~ "The encrypted database is empty. The plain database file has been left " +#~ "undeleted as backup." +#~ msgstr "" +#~ "Зашифрованная база данных пуста. Файл незашифрованной базы данных " +#~ "останется резервной копией." + +#~ msgid "Could not delete plain database file \"%s\"." +#~ msgstr "Не удалось удалить файл незашифрованной базы данных «%s»." + +#~ msgid "Unknown input device" +#~ msgstr "Неизвестное устройство ввода" + #~ msgid "_File" #~ msgstr "_Файл" @@ -679,9 +820,6 @@ #~ msgid "_Print…" #~ msgstr "_Печать..." -#~ msgid "_Edit" -#~ msgstr "_Правка" - #~ msgid "_Search…" #~ msgstr "_Поиск..." diff -Nru almanah-0.11.1/po/sl.po almanah-0.12.0/po/sl.po --- almanah-0.11.1/po/sl.po 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/sl.po 2019-10-07 13:45:09.000000000 +0000 @@ -3,15 +3,15 @@ # This file is distributed under the same license as the almanah package. # # Andrej Žnidaršič , 2009-2010. -# Matej Urbančič , 2010-2013. +# Matej Urbančič , 2010-2017. # msgid "" msgstr "" "Project-Id-Version: almanah master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=almanah&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-12-18 13:50+0000\n" -"PO-Revision-Date: 2013-12-22 19:10+0100\n" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" +"product=almanah&keywords=I18N+L10N&component=General\n" +"POT-Creation-Date: 2017-07-24 15:43+0200\n" +"PO-Revision-Date: 2017-07-24 15:56+0200\n" "Last-Translator: Matej Urbančič \n" "Language-Team: Slovenian GNOME Translation Team \n" "Language: sl_SI\n" @@ -21,199 +21,119 @@ "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" "X-Poedit-SourceCharset: utf-8\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 2.0.1\n" -#: ../data/almanah.appdata.xml.in.h:1 +#: ../data/almanah.appdata.xml.in.h:1 ../data/almanah.desktop.in.h:1 +#: ../src/application.c:135 ../src/main-window.c:163 +msgid "Almanah Diary" +msgstr "Dnevnik Almanah" + +#: ../data/almanah.appdata.xml.in.h:2 +msgid "Keep a diary of your life" +msgstr "Zapisujte si dnevnik vašega življenja!" + +#: ../data/almanah.appdata.xml.in.h:3 msgid "" "Almanah Diary is an application to allow you to keep a diary of your life." -msgstr "" -"Snevnik Almanah je program, ki omogoča pisanje dnevnika vašega življenja." +msgstr "Almanah je program, ki omogoča pisanje dnevnika vašega življenja." -#: ../data/almanah.appdata.xml.in.h:2 +#: ../data/almanah.appdata.xml.in.h:4 msgid "" "You can encrypt the diary to preserve your privacy. It has editing " "abilities, including text formatting and printing and shows you a lists of " "events which happened (on your computer) for each day (such as tasks and " "appointments from Evolution)." msgstr "" -"Dnevnik je mogoče šifrirati in s tem ohraniti zasebnost. Omogoča urejanje " +"Dnevnik je mogoče šifrirati in s tem zagotoviti zasebnost. Omogoča urejanje " "oblikovanja in tiskanje, pokaže sezname dogodkov (ki so zabeleženi " "digitalno) za vsak dan (na primer naloge in sestanki, povzeti iz programa " "Evolution)" -#: ../data/almanah-app-menu.ui.h:1 -msgid "_Search" -msgstr "_Poišči" - -#: ../data/almanah-app-menu.ui.h:2 -msgid "Pr_eferences" -msgstr "_Možnosti" - -#. Set the button label -#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 -msgid "_Import" -msgstr "_Uvozi" - -#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 -msgid "_Export" -msgstr "_Izvozi" - -#: ../data/almanah-app-menu.ui.h:5 -msgid "_Print diary" -msgstr "_Natisni dnevnik" - -#: ../data/almanah-app-menu.ui.h:6 -msgid "_About Almanah Diary" -msgstr "_O osebnem dnevniku" - -#: ../data/almanah-app-menu.ui.h:7 -msgid "_Quit" -msgstr "_Končaj" - -#: ../data/almanah.desktop.in.h:1 ../src/application.c:132 -#: ../src/main-window.c:136 -msgid "Almanah Diary" -msgstr "Almanah dnevnik" - #: ../data/almanah.desktop.in.h:2 msgid "Keep a personal diary" -msgstr "Pišite osebni dnevnik" +msgstr "Zapisujte si osebni dnevnik" #. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. -#: ../data/almanah.desktop.in.h:3 ../src/application.c:263 +#: ../data/almanah.desktop.in.h:3 ../src/application.c:274 msgid "Diary" msgstr "Dnevnik" #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! #: ../data/almanah.desktop.in.h:5 msgid "diary;journal;" -msgstr "blog;dnevnik;časopis;" - -#: ../data/almanah.ui.h:1 -msgid "Select Date…" -msgstr "Izbor datuma ..." - -#: ../data/almanah.ui.h:2 -msgid "F_ormat" -msgstr "_Oblika" - -#: ../data/almanah.ui.h:3 -msgid "Toggle whether the currently selected text is bold." -msgstr "Preklopi izpis trenutno izbranega besedila kot krepko." - -#: ../data/almanah.ui.h:4 -msgid "Toggle whether the currently selected text is italic." -msgstr "Preklopi izpis trenutno izbranega besedila kot ležeče." - -#: ../data/almanah.ui.h:5 -msgid "Toggle whether the currently selected text is underlined." -msgstr "Preklopi izpis trenutno izbranega besedila kot podčrtano." +msgstr "blog;dnevnik;časopis;almanah;" -#: ../data/almanah.ui.h:6 -msgid "Add/Remove _Hyperlink" -msgstr "Dodaj /odstrani _hiperpovezavo" - -#: ../data/almanah.ui.h:7 -msgid "" -"Add or remove a hyperlink from the currently selected text to a specified " -"URI." -msgstr "" -"Doda ali odstrani hiperpovezavo iz trenutno izbranega besedila na naveden " -"URI." - -#: ../data/almanah.ui.h:8 -msgid "Insert _Time" -msgstr "Vstavi _čas" - -#: ../data/almanah.ui.h:9 -msgid "I_mportant" -msgstr "P_omembno" - -#: ../data/almanah.ui.h:10 -msgid "Toggle whether the current entry is marked as important." -msgstr "Preklopi oznako trenutnega vnosa kot pomembno." - -#: ../data/almanah.ui.h:11 -msgid "Show tags" -msgstr "Prikaži oznake" - -#: ../data/almanah.ui.h:12 -msgid "Show tags for the current entry" -msgstr "Pokaži oznake za trenutni izbor" - -#: ../data/almanah.ui.h:13 -msgid "_Help" -msgstr "Pomo_č" - -#: ../data/almanah.ui.h:14 -msgid "Go to _Today" -msgstr "Pojdi na _današnji dan" - -#: ../data/almanah.ui.h:15 -msgid "Jump to the current date in the diary." -msgstr "Skoči na trenutni datum v dnevniku." - -#: ../data/almanah.ui.h:16 +#: ../src/ui/almanah.ui.h:1 msgid "Calendar" msgstr "Koledar" -#: ../data/almanah.ui.h:17 +#: ../src/ui/almanah.ui.h:2 +msgid "Go to Today" +msgstr "Pojdi na današnji dan" + +#: ../src/ui/almanah.ui.h:3 +msgid "Select Date…" +msgstr "Izbor datuma ..." + +#: ../src/ui/almanah.ui.h:4 msgid "Entry editing area" msgstr "Območje urejanje vnosa" -#: ../data/almanah.ui.h:18 +#: ../src/ui/almanah.ui.h:5 msgid "Past events" msgstr "Pretekli dogodki" -#: ../data/almanah.ui.h:19 +#: ../src/ui/almanah.ui.h:6 msgid "Past Event List" msgstr "Seznam preteklih dogodkov" -#: ../data/almanah.ui.h:20 +#: ../src/ui/almanah.ui.h:7 msgid "Search entry" msgstr "Iskanje vnosa" -#: ../data/almanah.ui.h:21 ../src/search-dialog.c:69 +#: ../src/ui/almanah.ui.h:8 ../src/search-dialog.c:69 msgid "Search" msgstr "Iskanje" -#: ../data/almanah.ui.h:22 +#: ../src/ui/almanah.ui.h:9 msgid "Result List" msgstr "Seznam rezultatov" -#: ../data/almanah.ui.h:23 +#: ../src/ui/almanah.ui.h:10 msgid "View Entry" msgstr "Ogled vnosa" -#: ../data/almanah.ui.h:24 +#. Translators: Use two common date formats from your locale which will be parsed correctly by GLib +#: ../src/ui/almanah.ui.h:12 msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." -msgstr "na primer: \"14. marec 2009\" ali \"14.3.2009\"." +msgstr "na primer: \"14. marec 2017\" ali \"14. 3. 2017\"." -#: ../data/almanah.ui.h:25 +#. Translators: Use two popular URIs from your locale, preferably one on the Internet and one local file. +#: ../src/ui/almanah.ui.h:14 msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." msgstr "na primer “http://google.com/” ali “file:///home/me/Photos/photo.jpg”." -#: ../data/almanah.ui.h:26 +#: ../src/ui/almanah.ui.h:15 msgid "Successful Entries" -msgstr "Uspešni vnosi" +msgstr "Uspešno vpisani vnosi" -#: ../data/almanah.ui.h:27 +#: ../src/ui/almanah.ui.h:16 msgid "Merged Entries" msgstr "Združeni vnosi" -#: ../data/almanah.ui.h:28 +#: ../src/ui/almanah.ui.h:17 msgid "Failed Entries" msgstr "Spodleteli vnosi" -#: ../data/almanah.ui.h:29 +#: ../src/ui/almanah.ui.h:18 msgid "Import Results List" msgstr "Seznam rezultatov uvoza" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 +#: ../data/org.gnome.almanah.gschema.xml.in.h:1 msgid "Database encryption key ID" msgstr "ID šifrirnega ključa podatkovne zbirke" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +#: ../data/org.gnome.almanah.gschema.xml.in.h:2 msgid "" "The ID of the key to use to encrypt and decrypt the database, if Almanah has " "been built with encryption support. Leave blank to disable database " @@ -223,64 +143,47 @@ "primeru, da je bil program preveden s podporo za šifriranje. Prazno polje " "pomeni, da podatki ne bodo šifrirani." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 +#: ../data/org.gnome.almanah.gschema.xml.in.h:3 msgid "Spell checking language" msgstr "Jezik črkovanja" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +#: ../data/org.gnome.almanah.gschema.xml.in.h:4 msgid "The locale specifier of the language in which to check entry spellings." msgstr "Krajevno določilo jezika v katerem naj bo prevedeno črkovanje vnosa." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +#: ../data/org.gnome.almanah.gschema.xml.in.h:5 msgid "Spell checking enabled?" msgstr "Ali naj bo črkovanja omogočeno?" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 +#: ../data/org.gnome.almanah.gschema.xml.in.h:6 msgid "Whether spell checking of entries is enabled." msgstr "Ali naj bo preverjanje črkovanja omogočeno." -#: ../src/application.c:246 +#: ../src/application.c:257 msgid "Error opening database" msgstr "Napaka med odpiranjem podatkovne zbirke" -#. Error loading the CSS -#: ../src/application.c:275 -#, c-format -msgid "" -"Couldn't load the CSS file '%s'. The interface might not be styled correctly" -msgstr "" -"Datoteke CSS '%s' ni mogoče naložiti. Vmesnik morda ne bo oblikovan do " -"popolnosti." - -#: ../src/application.c:319 +#: ../src/application.c:336 msgid "Enable debug mode" msgstr "Omogoči razhroščevalni način" -#: ../src/application.c:336 +#: ../src/application.c:353 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" "Upravljajte svoj dnevnik. Hkrati lahko odprete le en primerek programa." #. Print an error -#: ../src/application.c:347 +#: ../src/application.c:364 #, c-format msgid "Command line options could not be parsed: %s\n" msgstr "Možnosti ukazne vrstice ni mogoče razčleniti: %s\n" -#: ../src/application.c:366 +#: ../src/application.c:383 msgid "Error encrypting database" msgstr "Napaka med šifriranjem podatkovne zbirke" -#: ../src/application.c:419 ../src/date-entry-dialog.c:129 -#: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 -#: ../src/main-window.c:195 ../src/preferences-dialog.c:191 -#: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 -#, c-format -msgid "UI file \"%s\" could not be loaded" -msgstr "Uporabniškega vmesnika datoteke \"%s\" ni mogoče naložiti" - -#: ../src/application.c:542 +#: ../src/application.c:526 msgid "" "Almanah is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -288,11 +191,11 @@ "version." msgstr "" "Almanah je prosta programska oprema; program lahko razširjate in/ali " -"spreminjate pod pogoji Splošnega dovoljenja GNU (GNU General PublicLicense), " -"kot ga je objavila ustanova Free Software Foundation; bodisi različice 2 ali " -"(po vaši izbiri) katerekoli poznejše različice." +"spreminjate pod pogoji Splošnega Javnega dovoljenja GNU (GNU General Public " +"License), kot ga je objavila ustanova Free Software Foundation; bodisi " +"različice 2 ali (po vaši izbiri) katerekoli poznejše različice." -#: ../src/application.c:546 +#: ../src/application.c:530 msgid "" "Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -301,22 +204,24 @@ msgstr "" "Almanah se razširja v upanju, da bo uporaben, vendar BREZ VSAKRŠNEGA " "JAMSTVA; tudi brez posredne zagotovitve CENOVNE VREDNOSTI ali PRIMERNOSTI ZA " -"DOLOČEN NAMEN. Za podrobnosti glejte besedilo GNU General Public License." +"DOLOČEN NAMEN. Za podrobnosti glejte besedilo dovoljenja GNU General Public " +"License." -#: ../src/application.c:550 +#: ../src/application.c:534 msgid "" "You should have received a copy of the GNU General Public License along with " "Almanah. If not, see ." msgstr "" -"Skupaj s programom bi morali dobiti tudi kopijo GNU splošne javne licence. V " -"primeru, da je niste, si oglejte ." +"Skupaj s programom bi morali prejeti tudi kopijo Splošnega Javnega " +"dovoljenja GNU (GNO GPL). V primeru, da je niste, si oglejte ." -#: ../src/application.c:565 +#: ../src/application.c:549 #, c-format msgid "A helpful diary keeper, storing %u entries." -msgstr "Priročen dnevnik, shranjuje %u vnosov." +msgstr "Priročen dnevnik, ki beleži %u vnosov." -#: ../src/application.c:569 +#: ../src/application.c:553 msgid "Copyright © 2008-2009 Philip Withnall" msgstr "Zasluge © 2008-2009 Philip Withnall" @@ -325,22 +230,40 @@ #. * "Translator name 1 \n" #. * "Translator name 2 " #. -#: ../src/application.c:577 +#: ../src/application.c:561 msgid "translator-credits" -msgstr "Andrej Žnidaršič " +msgstr "" +"Andrej Žnidaršič\n" +"Matej Urbančič " -#: ../src/application.c:581 +#: ../src/application.c:565 msgid "Almanah Website" -msgstr "Spletna stran Almanah" +msgstr "Spletna stran programa Almanah" + +#: ../src/application.c:593 +#, c-format +msgid "" +"Couldn't load the CSS resources. The interface might not be styled " +"correctly: %s" +msgstr "" +"Datoteke CSS ni mogoče naložiti. Vmesnik morda ne bo oblikovan do " +"popolnosti: %s." #: ../src/date-entry-dialog.c:72 msgid "Select Date" -msgstr "Izberi datum" +msgstr "Izbor datuma" + +#: ../src/date-entry-dialog.c:127 ../src/import-export-dialog.c:169 +#: ../src/import-export-dialog.c:476 ../src/main-window.c:235 +#: ../src/preferences-dialog.c:177 ../src/search-dialog.c:95 +#: ../src/uri-entry-dialog.c:126 +msgid "UI data could not be loaded" +msgstr "Podatkov vmesnika ni mogoče naložiti." #: ../src/entry.c:303 #, c-format msgid "Invalid data version number %u." -msgstr "Neveljavni podatki o številki različice %u." +msgstr "Neveljavni podatki o različici %u." #: ../src/events/calendar-appointment.c:51 msgid "Calendar Appointment" @@ -399,52 +322,129 @@ msgid "Error changing exported file permissions: %s" msgstr "Napaka spreminjanja dovoljenj izvožene datoteke: %s" -#: ../src/import-export-dialog.c:202 +#: ../src/gtk/menus.ui.h:1 +msgid "_Search" +msgstr "_Poišči" + +#: ../src/gtk/menus.ui.h:2 +msgid "Pr_eferences" +msgstr "_Možnosti" + +#: ../src/gtk/menus.ui.h:3 +msgctxt "Main menu" +msgid "_Import" +msgstr "_Uvozi" + +#: ../src/gtk/menus.ui.h:4 +msgctxt "Main menu" +msgid "_Export" +msgstr "_Izvozi" + +#: ../src/gtk/menus.ui.h:5 +msgid "_Print diary" +msgstr "_Natisni dnevnik" + +#: ../src/gtk/menus.ui.h:6 +msgid "_About Almanah Diary" +msgstr "_O osebnem dnevniku" + +#: ../src/gtk/menus.ui.h:7 +msgid "_Quit" +msgstr "_Končaj" + +#: ../src/gtk/menus.ui.h:8 +msgid "_Bold" +msgstr "_Krepko" + +#: ../src/gtk/menus.ui.h:9 +msgid "_Italic" +msgstr "_Ležeče" + +#: ../src/gtk/menus.ui.h:10 +msgid "_Underline" +msgstr "_Podpisano" + +#: ../src/gtk/menus.ui.h:11 +msgid "_Cut" +msgstr "_Izreži" + +#: ../src/gtk/menus.ui.h:12 +msgid "_Copy" +msgstr "_Kopiraj" + +#: ../src/gtk/menus.ui.h:13 +msgid "_Paste" +msgstr "_Prilepi" + +#: ../src/gtk/menus.ui.h:14 ../src/main-window.c:640 +msgid "_Delete" +msgstr "_Izbriši" + +#: ../src/gtk/menus.ui.h:15 +msgid "Insert _Time" +msgstr "Vstavi _čas" + +#: ../src/gtk/menus.ui.h:16 +msgid "Add/Remove _Hyperlink" +msgstr "Dodaj /odstrani _hiperpovezavo" + +#: ../src/import-export-dialog.c:203 msgid "Import _mode: " msgstr "_Način uvoza: " -#: ../src/import-export-dialog.c:202 +#: ../src/import-export-dialog.c:203 msgid "Export _mode: " msgstr "_Način izvoza:" #. Set the window title -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Import Entries" msgstr "Uvozi vnose" -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Export Entries" msgstr "Vnosi izvoza" -#: ../src/import-export-dialog.c:245 +#. Translators: These are verbs. +#: ../src/import-export-dialog.c:211 +msgctxt "Dialog button" +msgid "_Import" +msgstr "_Uvozi" + +#: ../src/import-export-dialog.c:211 +msgctxt "Dialog button" +msgid "_Export" +msgstr "_Izvozi" + +#: ../src/import-export-dialog.c:248 msgid "Import failed" msgstr "Uvoz ni uspel" -#: ../src/import-export-dialog.c:283 +#: ../src/import-export-dialog.c:286 msgid "Export failed" msgstr "Izvoz je spodletel" -#: ../src/import-export-dialog.c:296 +#: ../src/import-export-dialog.c:299 msgid "Export successful" msgstr "Izvoz je bil uspešeno" -#: ../src/import-export-dialog.c:297 +#: ../src/import-export-dialog.c:300 msgid "The diary was successfully exported." msgstr "Dnevnik je bil uspešno izvožen." -#: ../src/import-export-dialog.c:445 +#: ../src/import-export-dialog.c:448 msgid "Import Results" msgstr "Rezultati uvoza" #. Translators: This is a strftime()-format string for the dates displayed in import results. #. Translators: This is a strftime()-format string for the date to display when asking about editing a diary entry. #. Translators: This is a strftime()-format string for the date to display when asking about deleting a diary entry. +#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. -#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. -#: ../src/import-export-dialog.c:539 ../src/main-window.c:567 -#: ../src/main-window.c:597 ../src/printing.c:263 ../src/search-dialog.c:182 -#: ../src/widgets/calendar-button.c:309 +#: ../src/import-export-dialog.c:543 ../src/main-window.c:601 +#: ../src/main-window.c:632 ../src/main-window.c:1271 ../src/printing.c:263 +#: ../src/search-dialog.c:180 msgid "%A, %e %B %Y" msgstr "%A, %e. %m. %Y" @@ -489,70 +489,89 @@ msgstr "" "\n" "\n" -"Vnos uvožen iz \"%s\":\n" +"Vnos uvožen iz »%s«:\n" "\n" -#: ../src/main-window.c:571 +#: ../src/main-window.c:605 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" -msgstr "Ali ste prepričani, da želite urejati dnevniški vnos za %s?" +msgstr "Ali ste prepričani, da želite urediti dnevniški vnos za %s?" -#: ../src/main-window.c:601 +#: ../src/main-window.c:608 ../src/main-window.c:639 +msgid "_Cancel" +msgstr "_Prekliči" + +#: ../src/main-window.c:609 +msgid "_Edit" +msgstr "_Uredi" + +#: ../src/main-window.c:636 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" msgstr "Ali ste prepričani, da želite izbrisati dnevniški vnos za %s?" #. Print a warning about the unknown tag -#: ../src/main-window.c:710 +#: ../src/main-window.c:746 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." -msgstr "Neznana ali podvojena oznaka \"%s\" v vnosu. Oznaka je prezrta." +msgstr "Neznana ali podvojena oznaka »%s« v vnosu. Oznaka je prezrta." -#: ../src/main-window.c:918 +#: ../src/main-window.c:987 msgid "Error opening URI" msgstr "Napaka med odpiranjem URI" #. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place -#: ../src/main-window.c:1092 +#: ../src/main-window.c:1198 #, c-format msgid "%s @ %s" msgstr "%s @ %s" -#: ../src/main-window.c:1171 +#: ../src/main-window.c:1304 msgid "Entry content could not be loaded" msgstr "Vsebine vnosa ni mogoče naložiti" -#: ../src/main-window.c:1348 +#. Translators: this sentence is just used in startup to estimate the width +#. of a 15 words sentence. Translate with some random sentences with just 15 words. +#. See: https://bugzilla.gnome.org/show_bug.cgi?id=754841 +#: ../src/main-window.c:1459 +msgid "" +"This is just a fifteen words sentence to calculate the diary entry text view " +"size" +msgstr "" +"To je zgolj petnajst besed dolgo besedilo za izračun velikosti v vmesniku " +"pogleda dnevnika Almanah." + +#: ../src/main-window.c:1496 msgid "Spelling checker could not be initialized" msgstr "Preverjanja črkovanja ni mogoče zagnati" -#: ../src/preferences-dialog.c:91 -msgid "Almanah Preferences" -msgstr "Možnosti Almanah" +#: ../src/preferences-dialog.c:83 +msgid "Preferences" +msgstr "Možnosti" #. Grab our child widgets -#: ../src/preferences-dialog.c:217 +#: ../src/preferences-dialog.c:204 msgid "Encryption key: " msgstr "Šifrirni ključ: " -#: ../src/preferences-dialog.c:222 +#: ../src/preferences-dialog.c:208 msgid "None (don't encrypt)" msgstr "Brez (brez šifriranja)" -#: ../src/preferences-dialog.c:246 +#: ../src/preferences-dialog.c:213 msgid "New _Key" msgstr "Nov _ključ" #. Set up the "Enable spell checking" check button -#: ../src/preferences-dialog.c:253 +#: ../src/preferences-dialog.c:237 msgid "Enable _spell checking" msgstr "Omogoči _črkovanje" -#: ../src/preferences-dialog.c:279 +#: ../src/preferences-dialog.c:262 msgid "Error saving the encryption key" msgstr "Napaka med shranjevanjem šifrirnega ključa" -#: ../src/preferences-dialog.c:298 +#: ../src/preferences-dialog.c:281 msgid "Error opening Seahorse" msgstr "Napaka med odpiranjem Seahorse" @@ -564,31 +583,31 @@ msgid "No entry for this date." msgstr "Ni vnosov za ta datum." -#: ../src/printing.c:453 +#: ../src/printing.c:457 msgid "Start date:" msgstr "Začetni datum:" -#: ../src/printing.c:455 +#: ../src/printing.c:459 msgid "End date:" msgstr "Končni datum:" #. Line spacing -#: ../src/printing.c:471 +#: ../src/printing.c:475 msgid "Line spacing:" msgstr "Razmik med vrsticami:" -#: ../src/search-dialog.c:223 +#: ../src/search-dialog.c:221 msgid "Search canceled." msgstr "Iskanje je bilo preklicano." #. Translators: This is an error message wrapper for when searches encounter an error. The placeholder is for an error message. -#: ../src/search-dialog.c:226 +#: ../src/search-dialog.c:224 #, c-format msgid "Error: %s" msgstr "Napaka: %s" #. Success! -#: ../src/search-dialog.c:231 +#: ../src/search-dialog.c:229 #, c-format msgid "Found %d entry:" msgid_plural "Found %d entries:" @@ -597,111 +616,125 @@ msgstr[2] "Najdena sta bila %d vnosa:" msgstr[3] "Najdeni so bili %d vnosi:" -#: ../src/search-dialog.c:280 +#: ../src/search-dialog.c:278 msgid "Searching…" msgstr "Iskanje ..." -#: ../src/storage-manager.c:276 +#: ../src/storage-manager.c:247 +#, c-format +msgid "" +"Could not open database \"%s\". SQLite provided the following error message: " +"%s" +msgstr "" +"Podatkovne zbirke »%s« ni mogoče odpreti. SQLite poroča naslednje poročilo o " +"napaki: %s" + +#: ../src/storage-manager.c:290 +#, c-format +msgid "" +"Could not run query \"%s\". SQLite provided the following error message: %s" +msgstr "" +"Poizvedbe »%s« ni mogoče zagnati. SQLite poroča naslednje poročilo o napaki: " +"%s" + +#: ../src/storage-manager.c:596 +msgid "Error deserializing entry into buffer while searching." +msgstr "Napaka med ločitvijo vnosa iz zaporedja v medpomnilnik med iskanjem." + +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Vnesite URI" + +#: ../src/vfs.c:291 #, c-format msgid "GPGME is not at least version %s" -msgstr "Različica GPGME ni vsaj različice %s" +msgstr "Različica GPGME ni vsaj %s" -#: ../src/storage-manager.c:285 +#: ../src/vfs.c:298 #, c-format msgid "GPGME doesn't support OpenPGP: %s" -msgstr "GPGME ne podpira OpenPGP: %s" +msgstr "GPGME ne omogoča podpore OpenPGP: %s" -#: ../src/storage-manager.c:294 +#: ../src/vfs.c:305 #, c-format msgid "Error creating cipher context: %s" msgstr "Napaka ustvarjanja vsebine cifre: %s" -#: ../src/storage-manager.c:323 +#: ../src/vfs.c:325 #, c-format -msgid "Error opening encrypted database file \"%s\": %s" -msgstr "Napaka odpiranja šifrirane datoteke podatkovne zbirke \"%s\": %s" +msgid "Can't create a new GIOChannel for the encrypted database: %s" +msgstr "" +"Ni mogoče ustraviti novega kanala GIOChannel za šifrirano podatkovno zbirko: " +"%s" -#: ../src/storage-manager.c:342 +#: ../src/vfs.c:333 #, c-format -msgid "Error opening plain database file \"%s\": %s" -msgstr "Napaka odpiranja besedilne podatkovne zbirke \"%s\": %s" +msgid "Error opening encrypted database file \"%s\": %s" +msgstr "Napaka odpiranja šifrirane datoteke podatkovne zbirke »%s«: %s" -#: ../src/storage-manager.c:390 -msgid "" -"The encrypted database is empty. The plain database file has been left " -"undeleted as backup." -msgstr "" -"Šifrirana podatkovna zbirka je prazna. Besedilna podatkovne zbirke je " -"ohranjena kot varnostna kopija." +#: ../src/vfs.c:349 +#, c-format +msgid "Error creating Callback base data buffer: %s" +msgstr "Napaka ustvarjanja predpomnilnika podatkov Callback: %s" -#. Delete the plain file -#: ../src/storage-manager.c:393 +#: ../src/vfs.c:357 #, c-format -msgid "Could not delete plain database file \"%s\"." -msgstr "Besedilne podatkovne zbirke \"%s\" ni mogoče izbrisati." +msgid "Can't create a new GIOChannel for the plain database: %s" +msgstr "Ni mogoče ustraviti novega kanala GIOChannel za podatkovno zbirko: %s" -#: ../src/storage-manager.c:434 +#: ../src/vfs.c:365 #, c-format -msgid "Error decrypting database: %s" -msgstr "Napaka dešifriranja podatkovne zbirke: %s" +msgid "Error opening plain database file \"%s\": %s" +msgstr "Napaka odpiranja besedilne podatkovne zbirke »%s«: %s" -#: ../src/storage-manager.c:468 +#: ../src/vfs.c:461 #, c-format msgid "Error getting encryption key: %s" msgstr "Napaka pridobivanja šifrirnega ključa: %s" -#: ../src/storage-manager.c:489 +#: ../src/vfs.c:485 ../src/vfs.c:491 #, c-format msgid "Error encrypting database: %s" msgstr "Napaka med šifriranjem podatkovne zbirke: %s" -#: ../src/storage-manager.c:549 +#. Translators: The first and second params are file paths, the last param is an error message. +#: ../src/vfs.c:541 +#, c-format +msgid "Error copying the file from %s to %s: %s" +msgstr "Napaka med kopiranjem datoteke iz %s v %s: %s" + +#: ../src/vfs.c:547 #, c-format msgid "Error changing database backup file permissions: %s" msgstr "Napaka spreminjanja dovoljenj datoteke varnostne kopije: %s" -#: ../src/storage-manager.c:571 ../src/storage-manager.c:627 +#: ../src/vfs.c:647 #, c-format -msgid "Error changing database file permissions: %s" -msgstr "Napaka spreminjanja dovoljenj datoteke podatkovne zbirke: %s" +msgid "Error closing file: %s" +msgstr "Napaka med zapiranjem datoteke: %s" -#. Translators: the first parameter is a filename, the second is an error message. -#: ../src/storage-manager.c:583 ../src/storage-manager.c:611 +#. Translators: the first parameter is a filename. +#: ../src/vfs.c:1046 ../src/vfs.c:1073 #, c-format -msgid "Error backing up file ‘%s’: %s" -msgstr "Napaka ustvarjanja varnostne kopije datoteke ‘%s’: %s" +msgid "Error backing up file ‘%s’" +msgstr "Napaka shranjevanja varnostne kopije v datoteko »%s«" -#: ../src/storage-manager.c:620 +#: ../src/vfs.c:1059 #, c-format -msgid "" -"Could not open database \"%s\". SQLite provided the following error message: " -"%s" -msgstr "" -"Podatkovne zbirke \"%s\" ni mogoče odpreti. SQLite poroča naslednje poročilo " -"o napaki: %s" +msgid "Error decrypting database: %s" +msgstr "Napaka dešifriranja podatkovne zbirke: %s" -#: ../src/storage-manager.c:704 +#: ../src/vfs.c:1099 #, c-format -msgid "" -"Could not run query \"%s\". SQLite provided the following error message: %s" -msgstr "" -"Poizvedbe \"%s\" ni mogoče zagnati. SQLite poroča naslednje poročilo o " -"napaki: %s" - -#: ../src/storage-manager.c:1010 -msgid "Error deserializing entry into buffer while searching." -msgstr "Napaka med ločitvijo vnosa iz zaporedja v medpomnilnik med iskanjem." - -#: ../src/uri-entry-dialog.c:71 -msgid "Enter URI" -msgstr "Vnesite URI" +msgid "Error changing database file permissions: %s" +msgstr "Napaka spreminjanja dovoljenj datoteke podatkovne zbirke: %s" -#: ../src/widgets/calendar-button.c:140 +#: ../src/widgets/calendar-button.c:142 #, c-format -msgid "UI file \"%s\" could not be loaded: %s" -msgstr "Uporabniškega vmesnika \"%s\" ni mogoče naložiti: %s" +msgid "UI data could not be loaded: %s" +msgstr "Podatkov vmesnika ni mogoče naložiti: %s" -#: ../src/widgets/calendar-button.c:150 +#: ../src/widgets/calendar-button.c:152 msgid "Can't load calendar window object from UI file" msgstr "" "Ni mogoče naložiti predmeta okna koledarja iz datoteke uporabniškega vmesnika" @@ -711,10 +744,6 @@ msgid "Important!" msgstr "Pomembno!" -#: ../src/widgets/calendar-window.c:80 -msgid "Unknown input device" -msgstr "Neznana vhodna naprava" - #: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:166 msgid "add tag" msgstr "dodaj oznako" @@ -736,6 +765,59 @@ msgid "Tag entry" msgstr "Vnos oznake" +#~ msgid "F_ormat" +#~ msgstr "_Oblika" + +#~ msgid "Toggle whether the currently selected text is bold." +#~ msgstr "Preklopi izpis trenutno izbranega besedila kot krepko." + +#~ msgid "Toggle whether the currently selected text is italic." +#~ msgstr "Preklopi izpis trenutno izbranega besedila kot ležeče." + +#~ msgid "Toggle whether the currently selected text is underlined." +#~ msgstr "Preklopi izpis trenutno izbranega besedila kot podčrtano." + +#~ msgid "" +#~ "Add or remove a hyperlink from the currently selected text to a specified " +#~ "URI." +#~ msgstr "" +#~ "Doda ali odstrani hiperpovezavo iz trenutno izbranega besedila na naveden " +#~ "URI." + +#~ msgid "I_mportant" +#~ msgstr "P_omembno" + +#~ msgid "Toggle whether the current entry is marked as important." +#~ msgstr "Preklopi oznako trenutnega vnosa kot pomembno." + +#~ msgid "Show tags" +#~ msgstr "Prikaži oznake" + +#~ msgid "Show tags for the current entry" +#~ msgstr "Pokaži oznake za trenutni izbor" + +#~ msgid "_Help" +#~ msgstr "Pomo_č" + +#~ msgid "Jump to the current date in the diary." +#~ msgstr "Skoči na trenutni datum v dnevniku." + +#~ msgid "Almanah Preferences" +#~ msgstr "Možnosti Almanah" + +#~ msgid "" +#~ "The encrypted database is empty. The plain database file has been left " +#~ "undeleted as backup." +#~ msgstr "" +#~ "Šifrirana podatkovna zbirka je prazna. Besedilna podatkovne zbirke je " +#~ "ohranjena kot varnostna kopija." + +#~ msgid "Could not delete plain database file \"%s\"." +#~ msgstr "Besedilne podatkovne zbirke \"%s\" ni mogoče izbrisati." + +#~ msgid "Unknown input device" +#~ msgstr "Neznana vhodna naprava" + #~ msgid "Font Style" #~ msgstr "Slog pisave" @@ -757,9 +839,6 @@ #~ msgid "_Print…" #~ msgstr "_Natisni ..." -#~ msgid "_Edit" -#~ msgstr "_Uredi" - #~ msgid "_Search…" #~ msgstr "_Iskanje ..." @@ -832,9 +911,6 @@ #~ msgid "An attached file." #~ msgstr "Pripeta datoteka." -#~ msgid "Error opening file" -#~ msgstr "Napaka med odpiranjem datoteke" - #~ msgid "Select File" #~ msgstr "Izbor datoteke" diff -Nru almanah-0.11.1/po/sr@latin.po almanah-0.12.0/po/sr@latin.po --- almanah-0.11.1/po/sr@latin.po 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/sr@latin.po 2019-10-07 13:45:09.000000000 +0000 @@ -1,17 +1,17 @@ -# Language almanah translations for F package. -# Copyright (C) 2011 THE F'S COPYRIGHT HOLDER -# This file is distributed under the same license as the F package. -# Miroslav Nikolić , 2011—2014. +# Serbian translations for almanah. +# Copyright (C) 2014 THE F'S COPYRIGHT HOLDER +# This file is distributed under the same license as the almanah package. +# Miroslav Nikolić , 2011—2015. msgid "" msgstr "" "Project-Id-Version: almanah\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=almana" -"h&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-12-18 13:50+0000\n" -"PO-Revision-Date: 2014-01-29 10:25+0200\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=almanah" +"&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2015-10-14 17:59+0000\n" +"PO-Revision-Date: 2015-12-28 11:24+0200\n" "Last-Translator: Miroslav Nikolić \n" "Language-Team: Serbian \n" -"Language: sr\n" +"Language: sr@latin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -20,11 +20,15 @@ "X-Project-Style: gnome\n" #: ../data/almanah.appdata.xml.in.h:1 +msgid "Keep a diary of your life" +msgstr "Vodite dnevnik vašeg života" + +#: ../data/almanah.appdata.xml.in.h:2 msgid "" "Almanah Diary is an application to allow you to keep a diary of your life." msgstr "Almanah je program koji vam omogućava da vodite dnevnik vašeg života." -#: ../data/almanah.appdata.xml.in.h:2 +#: ../data/almanah.appdata.xml.in.h:3 msgid "" "You can encrypt the diary to preserve your privacy. It has editing " "abilities, including text formatting and printing and shows you a lists of " @@ -36,37 +40,8 @@ "vam spiskove događaja (na vašem računaru) za svaki dan (kao što su zadaci i " "sastanci iz Evolucije)." -#: ../data/almanah-app-menu.ui.h:1 -msgid "_Search" -msgstr "_Traži" - -#: ../data/almanah-app-menu.ui.h:2 -msgid "Pr_eferences" -msgstr "_Postavke" - -#. Set the button label -#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 -msgid "_Import" -msgstr "_Uvezi" - -#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 -msgid "_Export" -msgstr "_Izvezi" - -#: ../data/almanah-app-menu.ui.h:5 -msgid "_Print diary" -msgstr "_Štampaj dnevnik" - -#: ../data/almanah-app-menu.ui.h:6 -msgid "_About Almanah Diary" -msgstr "_O dnevniku Almanah" - -#: ../data/almanah-app-menu.ui.h:7 -msgid "_Quit" -msgstr "_Izađi" - -#: ../data/almanah.desktop.in.h:1 ../src/application.c:132 -#: ../src/main-window.c:136 +#: ../data/almanah.desktop.in.h:1 ../src/application.c:133 +#: ../src/main-window.c:155 msgid "Almanah Diary" msgstr "Dnevnik Almanah" @@ -75,7 +50,7 @@ msgstr "Vodite lični dnevnik" #. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. -#: ../data/almanah.desktop.in.h:3 ../src/application.c:263 +#: ../data/almanah.desktop.in.h:3 ../src/application.c:272 msgid "Diary" msgstr "Dnevnik" @@ -84,132 +59,78 @@ msgid "diary;journal;" msgstr "dnevnik;zapisnik;" -#: ../data/almanah.ui.h:1 -msgid "Select Date…" -msgstr "Izaberi datum…" - -#: ../data/almanah.ui.h:2 -msgid "F_ormat" -msgstr "_Format" - -#: ../data/almanah.ui.h:3 -msgid "Toggle whether the currently selected text is bold." -msgstr "Odredite da li je trenutno izabrani tekst podebljan." - -#: ../data/almanah.ui.h:4 -msgid "Toggle whether the currently selected text is italic." -msgstr "Odredite da li je trenutno izabrani tekst iskošen." - -#: ../data/almanah.ui.h:5 -msgid "Toggle whether the currently selected text is underlined." -msgstr "Odredite da li je trenutno izabrani tekst podvučen." - -#: ../data/almanah.ui.h:6 -msgid "Add/Remove _Hyperlink" -msgstr "Dodaj/ukloni _hipervezu" - -#: ../data/almanah.ui.h:7 -msgid "" -"Add or remove a hyperlink from the currently selected text to a specified " -"URI." -msgstr "" -"Dodajte ili uklonite hipervezu iz trenutno izabranog teksta u zadatu adresu." - -#: ../data/almanah.ui.h:8 -msgid "Insert _Time" -msgstr "Umetni _vreme" - -#: ../data/almanah.ui.h:9 -msgid "I_mportant" -msgstr "_Važno" - -#: ../data/almanah.ui.h:10 -msgid "Toggle whether the current entry is marked as important." -msgstr "Odredite da li je trenutni unos označen kao važan." - -#: ../data/almanah.ui.h:11 -msgid "Show tags" -msgstr "Prikaži oznake" - -#: ../data/almanah.ui.h:12 -msgid "Show tags for the current entry" -msgstr "Prikažite oznake za tekući unos" - -#: ../data/almanah.ui.h:13 -msgid "_Help" -msgstr "Po_moć" - -#: ../data/almanah.ui.h:14 -msgid "Go to _Today" -msgstr "_Idi na današnje" - -#: ../data/almanah.ui.h:15 -msgid "Jump to the current date in the diary." -msgstr "Prebacite se na tekući datum u dnevniku." - -#: ../data/almanah.ui.h:16 +#: ../src/ui/almanah.ui.h:1 msgid "Calendar" msgstr "Kalendar" -#: ../data/almanah.ui.h:17 +#: ../src/ui/almanah.ui.h:2 +#| msgid "Go to _Today" +msgid "Go to Today" +msgstr "Idi na današnje" + +#: ../src/ui/almanah.ui.h:3 +msgid "Select Date…" +msgstr "Izaberi datum…" + +#: ../src/ui/almanah.ui.h:4 msgid "Entry editing area" msgstr "Oblast za uređivanje unosa" -#: ../data/almanah.ui.h:18 +#: ../src/ui/almanah.ui.h:5 msgid "Past events" msgstr "Prošli događaji" -#: ../data/almanah.ui.h:19 +#: ../src/ui/almanah.ui.h:6 msgid "Past Event List" msgstr "Spisak prošlih događaja" -#: ../data/almanah.ui.h:20 +#: ../src/ui/almanah.ui.h:7 msgid "Search entry" msgstr "Unos pretrage" -#: ../data/almanah.ui.h:21 ../src/search-dialog.c:69 +#: ../src/ui/almanah.ui.h:8 ../src/search-dialog.c:69 msgid "Search" msgstr "Potraži" -#: ../data/almanah.ui.h:22 +#: ../src/ui/almanah.ui.h:9 msgid "Result List" msgstr "Spisak rezultata" -#: ../data/almanah.ui.h:23 +#: ../src/ui/almanah.ui.h:10 msgid "View Entry" msgstr "Prikaži unos" -#: ../data/almanah.ui.h:24 +#: ../src/ui/almanah.ui.h:11 msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." msgstr "npr. „16.07.2033“ ili „16. jul 2033.“." -#: ../data/almanah.ui.h:25 +#: ../src/ui/almanah.ui.h:12 msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." msgstr "" "npr. „http://google.com/“ ili „datoteka:///lična_fascikla/Marko/fotografije/" "slika.jpg“." -#: ../data/almanah.ui.h:26 +#: ../src/ui/almanah.ui.h:13 msgid "Successful Entries" msgstr "Uspešni unosi" -#: ../data/almanah.ui.h:27 +#: ../src/ui/almanah.ui.h:14 msgid "Merged Entries" msgstr "Spojeni unosi" -#: ../data/almanah.ui.h:28 +#: ../src/ui/almanah.ui.h:15 msgid "Failed Entries" msgstr "Neuspeli unosi" -#: ../data/almanah.ui.h:29 +#: ../src/ui/almanah.ui.h:16 msgid "Import Results List" msgstr "Spisak rezultata uvoženja" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 +#: ../data/org.gnome.almanah.gschema.xml.in.h:1 msgid "Database encryption key ID" msgstr "IB ključa šifrovanja baze podataka" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +#: ../data/org.gnome.almanah.gschema.xml.in.h:2 msgid "" "The ID of the key to use to encrypt and decrypt the database, if Almanah has " "been built with encryption support. Leave blank to disable database " @@ -219,40 +140,31 @@ "Almanah izgrađen sa podrškom za šifrovanje. Ostavite prazno da onemogućite " "šifrovanje baze podataka." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 +#: ../data/org.gnome.almanah.gschema.xml.in.h:3 msgid "Spell checking language" msgstr "Jezik provere pisanja" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +#: ../data/org.gnome.almanah.gschema.xml.in.h:4 msgid "The locale specifier of the language in which to check entry spellings." msgstr "Šifra jezika za koji će se vršiti provera pisanja." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +#: ../data/org.gnome.almanah.gschema.xml.in.h:5 msgid "Spell checking enabled?" msgstr "Provera pisanja je uključena?" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 +#: ../data/org.gnome.almanah.gschema.xml.in.h:6 msgid "Whether spell checking of entries is enabled." msgstr "Ako je izabrano, vršiće se provera prilikom pisanja." -#: ../src/application.c:246 +#: ../src/application.c:255 msgid "Error opening database" msgstr "Greška prilikom otvaranja baze podataka" -#. Error loading the CSS -#: ../src/application.c:275 -#, c-format -msgid "" -"Couldn't load the CSS file '%s'. The interface might not be styled correctly" -msgstr "" -"Ne mogu da učitam CSS datoteku „%s“. Sučelje ne može biti ispravno " -"stilizovano." - -#: ../src/application.c:319 +#: ../src/application.c:332 msgid "Enable debug mode" msgstr "Uključuje režim za ispravljanje grešaka" -#: ../src/application.c:336 +#: ../src/application.c:349 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" @@ -260,24 +172,16 @@ "isto vreme." #. Print an error -#: ../src/application.c:347 +#: ../src/application.c:360 #, c-format msgid "Command line options could not be parsed: %s\n" msgstr "Opcije linije naredbi ne mogu biti obrađene: %s\n" -#: ../src/application.c:366 +#: ../src/application.c:379 msgid "Error encrypting database" msgstr "Greška prilikom šifrovanja baze podataka" -#: ../src/application.c:419 ../src/date-entry-dialog.c:129 -#: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 -#: ../src/main-window.c:195 ../src/preferences-dialog.c:191 -#: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 -#, c-format -msgid "UI file \"%s\" could not be loaded" -msgstr "Ne mogu da učitam datoteku korisničkog sučelja „%s“" - -#: ../src/application.c:542 +#: ../src/application.c:522 msgid "" "Almanah is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -289,7 +193,7 @@ "softvera, bilo verzije 3 licence ili (po vašem izboru) bilo koje novije " "verzije." -#: ../src/application.c:546 +#: ../src/application.c:526 msgid "" "Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -300,7 +204,7 @@ "čak i bez primenjene garancije TRŽIŠNE VREDNOSTI ili PRILAGOĐENOSTI ODREĐENOJ " "NAMENI. Pogledajte Gnuovu opštu javnu licencu za više detalja." -#: ../src/application.c:550 +#: ../src/application.c:530 msgid "" "You should have received a copy of the GNU General Public License along with " "Almanah. If not, see ." @@ -308,12 +212,12 @@ "Treba da ste primili primerak Gnuove opšte javne licence uz Almanah. Ako " "niste, pogledajte ." -#: ../src/application.c:565 +#: ../src/application.c:545 #, c-format msgid "A helpful diary keeper, storing %u entries." msgstr "Koristan čuvar dnevnika, sadrži %u unosa." -#: ../src/application.c:569 +#: ../src/application.c:549 msgid "Copyright © 2008-2009 Philip Withnall" msgstr "Autorska prava © 2008-2009 Filip Vitnal" @@ -322,18 +226,40 @@ #. * "Translator name 1 \n" #. * "Translator name 2 " #. -#: ../src/application.c:577 +#: ../src/application.c:557 msgid "translator-credits" -msgstr " Miroslav Nikolić, miroslavnikolic@rocketmail.com" +msgstr "" +"Miroslav Nikolić, miroslavnikolic@rocketmail.com\n" +"\n" +"http://prevod.org — prevod na srpski jezik" -#: ../src/application.c:581 +#: ../src/application.c:561 msgid "Almanah Website" msgstr "Veb stranica Almanaha" +#: ../src/application.c:589 +#, c-format +#| msgid "" +#| "Couldn't load the CSS file '%s'. The interface might not be styled " +#| "correctly" +msgid "" +"Couldn't load the CSS resources. The interface might not be styled " +"correctly: %s" +msgstr "" +"Ne mogu da učitam CSS izvorišta. Sučelje ne može biti ispravno stilizovano: %s" + #: ../src/date-entry-dialog.c:72 msgid "Select Date" msgstr "Izaberite datum" +#: ../src/date-entry-dialog.c:127 ../src/import-export-dialog.c:169 +#: ../src/import-export-dialog.c:475 ../src/main-window.c:225 +#: ../src/preferences-dialog.c:177 ../src/search-dialog.c:95 +#: ../src/uri-entry-dialog.c:126 +#| msgid "UI file \"%s\" could not be loaded" +msgid "UI data could not be loaded" +msgstr "Ne mogu da učitam podatke korisničkog sučelja" + #: ../src/entry.c:303 #, c-format msgid "Invalid data version number %u." @@ -393,56 +319,135 @@ #: ../src/export-operation.c:256 ../src/export-operation.c:313 #, c-format -#| msgid "Error opening encrypted database file \"%s\": %s" msgid "Error changing exported file permissions: %s" msgstr "Greška promene ovlašćenja izvezene datoteke: %s" -#: ../src/import-export-dialog.c:202 +#: ../src/gtk/menus.ui.h:1 +msgid "_Search" +msgstr "_Traži" + +#: ../src/gtk/menus.ui.h:2 +msgid "Pr_eferences" +msgstr "_Postavke" + +#: ../src/gtk/menus.ui.h:3 +#| msgid "_Import" +msgctxt "Main menu" +msgid "_Import" +msgstr "_Uvezi" + +#: ../src/gtk/menus.ui.h:4 +#| msgid "_Export" +msgctxt "Main menu" +msgid "_Export" +msgstr "_Izvezi" + +#: ../src/gtk/menus.ui.h:5 +msgid "_Print diary" +msgstr "_Štampaj dnevnik" + +#: ../src/gtk/menus.ui.h:6 +msgid "_About Almanah Diary" +msgstr "_O dnevniku Almanah" + +#: ../src/gtk/menus.ui.h:7 +msgid "_Quit" +msgstr "_Izađi" + +#: ../src/gtk/menus.ui.h:8 +msgid "_Bold" +msgstr "_Podebljano" + +#: ../src/gtk/menus.ui.h:9 +msgid "_Italic" +msgstr "_Iskošeno" + +#: ../src/gtk/menus.ui.h:10 +msgid "_Underline" +msgstr "Pod_vučeno" + +#: ../src/gtk/menus.ui.h:11 +msgid "_Cut" +msgstr "_Iseci" + +#: ../src/gtk/menus.ui.h:12 +msgid "_Copy" +msgstr "U_množi" + +#: ../src/gtk/menus.ui.h:13 +msgid "_Paste" +msgstr "U_baci" + +#: ../src/gtk/menus.ui.h:14 ../src/main-window.c:626 +msgid "_Delete" +msgstr "_Obriši" + +#: ../src/gtk/menus.ui.h:15 +msgid "Insert _Time" +msgstr "Umetni _vreme" + +#: ../src/gtk/menus.ui.h:16 +msgid "Add/Remove _Hyperlink" +msgstr "Dodaj/ukloni _hipervezu" + +#: ../src/import-export-dialog.c:203 msgid "Import _mode: " msgstr "Režim _uvoza: " -#: ../src/import-export-dialog.c:202 +#: ../src/import-export-dialog.c:203 msgid "Export _mode: " msgstr "Režim _izvoza: " #. Set the window title -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Import Entries" msgstr "Unosi za uvoz" -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Export Entries" msgstr "Unosi za izvoz" -#: ../src/import-export-dialog.c:245 +#: ../src/import-export-dialog.c:210 +#| msgid "_Import" +msgctxt "Dialog button" +msgid "_Import" +msgstr "_Uvezi" + +#: ../src/import-export-dialog.c:210 +#| msgid "_Export" +msgctxt "Dialog button" +msgid "_Export" +msgstr "_Izvezi" + +#: ../src/import-export-dialog.c:247 msgid "Import failed" msgstr "Uvoz nije uspeo" -#: ../src/import-export-dialog.c:283 +#: ../src/import-export-dialog.c:285 msgid "Export failed" msgstr "Izvoz nije uspeo" -#: ../src/import-export-dialog.c:296 +#: ../src/import-export-dialog.c:298 msgid "Export successful" msgstr "Izvoz je uspeo" -#: ../src/import-export-dialog.c:297 +#: ../src/import-export-dialog.c:299 msgid "The diary was successfully exported." msgstr "Dnevnik je uspešno izvežen." -#: ../src/import-export-dialog.c:445 +#: ../src/import-export-dialog.c:447 msgid "Import Results" msgstr "Rezultati uvoženja" #. Translators: This is a strftime()-format string for the dates displayed in import results. #. Translators: This is a strftime()-format string for the date to display when asking about editing a diary entry. #. Translators: This is a strftime()-format string for the date to display when asking about deleting a diary entry. +#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. -#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. -#: ../src/import-export-dialog.c:539 ../src/main-window.c:567 -#: ../src/main-window.c:597 ../src/printing.c:263 ../src/search-dialog.c:182 -#: ../src/widgets/calendar-button.c:309 +#: ../src/import-export-dialog.c:542 ../src/main-window.c:587 +#: ../src/main-window.c:618 ../src/main-window.c:1225 ../src/printing.c:263 +#: ../src/search-dialog.c:180 msgid "%A, %e %B %Y" msgstr "%A, %e %B %Y" @@ -491,67 +496,87 @@ "Unos je uvežen iz „%s“:\n" "\n" -#: ../src/main-window.c:571 +#: ../src/main-window.c:591 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" msgstr "Da li ste sigurni da želite da uredite ovaj unos dnevnika za „%s“?" -#: ../src/main-window.c:601 +#: ../src/main-window.c:594 ../src/main-window.c:625 +msgid "_Cancel" +msgstr "_Otkaži" + +#: ../src/main-window.c:595 +msgid "_Edit" +msgstr "_Uredi" + +#: ../src/main-window.c:622 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" msgstr "Da li ste sigurni da želite da obrišete ovaj unos dnevnika za „%s“?" #. Print a warning about the unknown tag -#: ../src/main-window.c:710 +#: ../src/main-window.c:732 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." msgstr "Nepoznata ili duplirana oznaka teksta „%s“ u unosu. Zanemarujem." -#: ../src/main-window.c:918 +#: ../src/main-window.c:973 msgid "Error opening URI" msgstr "Greška prilikom otvaranja adrese" #. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place -#: ../src/main-window.c:1092 +#: ../src/main-window.c:1152 #, c-format msgid "%s @ %s" msgstr "%s u %s" -#: ../src/main-window.c:1171 +#: ../src/main-window.c:1258 msgid "Entry content could not be loaded" msgstr "Sadržaj unosa ne može biti učitan" -#: ../src/main-window.c:1348 +#. Translators: this sentence is just used in startup to estimate the width +#. of a 15 words sentence. Translate with some randome sentences with just 15 words. +#. See: https://bugzilla.gnome.org/show_bug.cgi?id=754841 +#: ../src/main-window.c:1414 +msgid "" +"This is just a fifteen words sentence to calculate the diary entry text view " +"size" +msgstr "" +"Ovo je samo rečenica od petnaest reči za izračunavanje veličine pregleda " +"teksta za unos dnevnika" + +#: ../src/main-window.c:1450 msgid "Spelling checker could not be initialized" msgstr "Provera pisanja ne može biti započeta" -#: ../src/preferences-dialog.c:91 -msgid "Almanah Preferences" -msgstr "Postavke Almanaha" +#: ../src/preferences-dialog.c:83 +#| msgid "Pr_eferences" +msgid "Preferences" +msgstr "Postavke" #. Grab our child widgets -#: ../src/preferences-dialog.c:217 +#: ../src/preferences-dialog.c:204 msgid "Encryption key: " msgstr "Ključ šifrovanja: " -#: ../src/preferences-dialog.c:222 +#: ../src/preferences-dialog.c:208 msgid "None (don't encrypt)" msgstr "Ništa (ne šifruj)" -#: ../src/preferences-dialog.c:246 +#: ../src/preferences-dialog.c:213 msgid "New _Key" msgstr "_Novi ključ" #. Set up the "Enable spell checking" check button -#: ../src/preferences-dialog.c:253 +#: ../src/preferences-dialog.c:237 msgid "Enable _spell checking" msgstr "Uključi _proveru pisanja" -#: ../src/preferences-dialog.c:279 +#: ../src/preferences-dialog.c:262 msgid "Error saving the encryption key" msgstr "Greška prilikom čuvanja ključa za šifrovanje" -#: ../src/preferences-dialog.c:298 +#: ../src/preferences-dialog.c:281 msgid "Error opening Seahorse" msgstr "Greška prilikom otvaranja priveska ključeva" @@ -576,18 +601,18 @@ msgid "Line spacing:" msgstr "Razmak reda:" -#: ../src/search-dialog.c:223 +#: ../src/search-dialog.c:221 msgid "Search canceled." msgstr "Pretraga je otkazana." #. Translators: This is an error message wrapper for when searches encounter an error. The placeholder is for an error message. -#: ../src/search-dialog.c:226 +#: ../src/search-dialog.c:224 #, c-format msgid "Error: %s" msgstr "Greška: %s" #. Success! -#: ../src/search-dialog.c:231 +#: ../src/search-dialog.c:229 #, c-format msgid "Found %d entry:" msgid_plural "Found %d entries:" @@ -596,114 +621,126 @@ msgstr[2] "Pronašao sam %d stavki:" msgstr[3] "Pronašao sam jednu stavku:" -#: ../src/search-dialog.c:280 +#: ../src/search-dialog.c:278 msgid "Searching…" msgstr "Tražim…" -#: ../src/storage-manager.c:276 +#: ../src/storage-manager.c:248 +#, c-format +msgid "" +"Could not open database \"%s\". SQLite provided the following error message: " +"%s" +msgstr "" +"Ne mogu da otvorim bazu podataka „%s“. SKuLajt je obezbedio sledeću poruku o " +"grešci: %s" + +#: ../src/storage-manager.c:291 +#, c-format +msgid "" +"Could not run query \"%s\". SQLite provided the following error message: %s" +msgstr "" +"Ne mogu da pokrenem upit „%s“. SKuLajt je obezbedio sledeću poruku o grešci: " +"%s" + +#: ../src/storage-manager.c:597 +msgid "Error deserializing entry into buffer while searching." +msgstr "Greška u raščlanjivanju unosa u baferu tokom pretraživanja." + +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Unesite adresu" + +#: ../src/vfs.c:239 #, c-format msgid "GPGME is not at least version %s" msgstr "GPGME nije najnovije izdanje %s" -#: ../src/storage-manager.c:285 +#: ../src/vfs.c:246 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "GPGME ne podržava OpenPGP: %s" -#: ../src/storage-manager.c:294 +#: ../src/vfs.c:253 #, c-format msgid "Error creating cipher context: %s" msgstr "Greška prilikom stvaranja konteksta šifrovanja: %s" -#: ../src/storage-manager.c:323 +#: ../src/vfs.c:273 +#, c-format +msgid "Can't create a new GIOChannel for the encrypted database: %s" +msgstr "Ne mogu da napravim novi GIO kanal za šifrovane baze podataka: %s" + +#: ../src/vfs.c:281 #, c-format msgid "Error opening encrypted database file \"%s\": %s" msgstr "Greška prilikom otvaranja šifrovane datoteke baze podataka „%s“: %s" -#: ../src/storage-manager.c:342 +#: ../src/vfs.c:297 #, c-format -msgid "Error opening plain database file \"%s\": %s" -msgstr "Greška prilikom otvaranja obične datoteke baze podataka „%s“: %s" - -#: ../src/storage-manager.c:390 -msgid "" -"The encrypted database is empty. The plain database file has been left " -"undeleted as backup." -msgstr "" -"Šifrovana baza podataka je prazna. Datoteka obične baze podataka nije " -"obrisana prilikom pravljenja rezervne kopije." +msgid "Error creating Callback base data buffer: %s" +msgstr "Greška stvaranja međumemorije podataka baze opoziva: %s" -#. Delete the plain file -#: ../src/storage-manager.c:393 +#: ../src/vfs.c:305 #, c-format -msgid "Could not delete plain database file \"%s\"." -msgstr "Ne mogu da obrišem datoteku obične baze podataka „%s“." +msgid "Can't create a new GIOChannel for the plain database: %s" +msgstr "Ne mogu da napravim novi GIO kanal za obične baze podataka: %s" -#: ../src/storage-manager.c:434 +#: ../src/vfs.c:313 #, c-format -msgid "Error decrypting database: %s" -msgstr "Greška prilikom dešifrovanja baze podataka: %s" +msgid "Error opening plain database file \"%s\": %s" +msgstr "Greška prilikom otvaranja obične datoteke baze podataka „%s“: %s" -#: ../src/storage-manager.c:468 +#: ../src/vfs.c:409 #, c-format msgid "Error getting encryption key: %s" msgstr "Greška prilikom nabavljanja ključa za šifrovanje: %s" -#: ../src/storage-manager.c:489 +#: ../src/vfs.c:433 ../src/vfs.c:439 #, c-format msgid "Error encrypting database: %s" msgstr "Greška prilikom šifrovanja baze podataka: %s" -#: ../src/storage-manager.c:549 +#. Translators: The first and second params are file paths, the last param is an error message. +#: ../src/vfs.c:489 +#, c-format +msgid "Error copying the file from %s to %s: %s" +msgstr "Greška umnožavanja datoteke iz „%s“ u „%s“: %s" + +#: ../src/vfs.c:495 #, c-format -#| msgid "Error opening plain database file \"%s\": %s" msgid "Error changing database backup file permissions: %s" msgstr "Greška promene ovlašćenja datoteke rezerve baze podataka: %s" -#: ../src/storage-manager.c:571 ../src/storage-manager.c:627 +#: ../src/vfs.c:595 #, c-format -#| msgid "Error opening plain database file \"%s\": %s" -msgid "Error changing database file permissions: %s" -msgstr "Greška promene ovlašćenja datoteke baze podataka: %s" +#| msgid "Error backing up file ‘%s’" +msgid "Error closing file: %s" +msgstr "Greška zatvaranja datoteke: %s" #. Translators: the first parameter is a filename, the second is an error message. -#: ../src/storage-manager.c:583 ../src/storage-manager.c:611 +#. Translators: the first parameter is a filename. +#: ../src/vfs.c:994 ../src/vfs.c:1021 #, c-format -#| msgid "Error opening plain database file \"%s\": %s" -msgid "Error backing up file ‘%s’: %s" -msgstr "Greška stvaranja rezerve datoteke „%s“: %s" +msgid "Error backing up file ‘%s’" +msgstr "Greška stvaranja rezerve datoteke „%s“" -#: ../src/storage-manager.c:620 +#: ../src/vfs.c:1007 #, c-format -msgid "" -"Could not open database \"%s\". SQLite provided the following error message: " -"%s" -msgstr "" -"Ne mogu da otvorim bazu podataka „%s“. SKuLajt je obezbedio sledeću poruku o " -"grešci: %s" +msgid "Error decrypting database: %s" +msgstr "Greška prilikom dešifrovanja baze podataka: %s" -#: ../src/storage-manager.c:704 +#: ../src/vfs.c:1047 #, c-format -msgid "" -"Could not run query \"%s\". SQLite provided the following error message: %s" -msgstr "" -"Ne mogu da pokrenem upit „%s“. SKuLajt je obezbedio sledeću poruku o grešci: " -"%s" - -#: ../src/storage-manager.c:1010 -msgid "Error deserializing entry into buffer while searching." -msgstr "Greška u raščlanjivanju unosa u baferu tokom pretraživanja." - -#: ../src/uri-entry-dialog.c:71 -msgid "Enter URI" -msgstr "Unesite adresu" +msgid "Error changing database file permissions: %s" +msgstr "Greška promene ovlašćenja datoteke baze podataka: %s" -#: ../src/widgets/calendar-button.c:140 +#: ../src/widgets/calendar-button.c:142 #, c-format -msgid "UI file \"%s\" could not be loaded: %s" -msgstr "Ne mogu da učitam datoteku korisničkog sučelja „%s“: %s" +#| msgid "UI file \"%s\" could not be loaded: %s" +msgid "UI data could not be loaded: %s" +msgstr "Ne mogu da učitam podatke korisničkog sučelja: %s" -#: ../src/widgets/calendar-button.c:150 +#: ../src/widgets/calendar-button.c:152 msgid "Can't load calendar window object from UI file" msgstr "" "Ne mogu da učitam objekat prozora kalendara iz datoteke korisničkog sučelja" @@ -713,10 +750,6 @@ msgid "Important!" msgstr "Važno!" -#: ../src/widgets/calendar-window.c:80 -msgid "Unknown input device" -msgstr "Nepoznat ulazni uređaj" - #: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:166 msgid "add tag" msgstr "dodaj oznaku" @@ -726,7 +759,6 @@ msgstr "Zapišite oznaku i pritisnite „Unesi“ da je sačuvate" #: ../src/widgets/tag-accessible.c:165 -#| msgid "Show tags for the current entry" msgid "Remove the tag from the entry" msgstr "Uklonite oznaku iz tekućeg unosa" @@ -736,6 +768,58 @@ msgstr "Uklonite oznaku" #: ../src/widgets/tag-entry.c:85 -#| msgid "Search entry" msgid "Tag entry" msgstr "Unos oznake" + +#~ msgid "F_ormat" +#~ msgstr "_Format" + +#~ msgid "Toggle whether the currently selected text is bold." +#~ msgstr "Odredite da li je trenutno izabrani tekst podebljan." + +#~ msgid "Toggle whether the currently selected text is italic." +#~ msgstr "Odredite da li je trenutno izabrani tekst iskošen." + +#~ msgid "Toggle whether the currently selected text is underlined." +#~ msgstr "Odredite da li je trenutno izabrani tekst podvučen." + +#~ msgid "" +#~ "Add or remove a hyperlink from the currently selected text to a specified " +#~ "URI." +#~ msgstr "" +#~ "Dodajte ili uklonite hipervezu iz trenutno izabranog teksta u zadatu " +#~ "adresu." + +#~ msgid "I_mportant" +#~ msgstr "_Važno" + +#~ msgid "Toggle whether the current entry is marked as important." +#~ msgstr "Odredite da li je trenutni unos označen kao važan." + +#~ msgid "Show tags" +#~ msgstr "Prikaži oznake" + +#~ msgid "Show tags for the current entry" +#~ msgstr "Prikažite oznake za tekući unos" + +#~ msgid "_Help" +#~ msgstr "Po_moć" + +#~ msgid "Jump to the current date in the diary." +#~ msgstr "Prebacite se na tekući datum u dnevniku." + +#~ msgid "Almanah Preferences" +#~ msgstr "Postavke Almanaha" + +#~ msgid "Unknown input device" +#~ msgstr "Nepoznat ulazni uređaj" + +#~ msgid "" +#~ "The encrypted database is empty. The plain database file has been left " +#~ "undeleted as backup." +#~ msgstr "" +#~ "Šifrovana baza podataka je prazna. Datoteka obične baze podataka nije " +#~ "obrisana prilikom pravljenja rezervne kopije." + +#~ msgid "Could not delete plain database file \"%s\"." +#~ msgstr "Ne mogu da obrišem datoteku obične baze podataka „%s“." diff -Nru almanah-0.11.1/po/sr.po almanah-0.12.0/po/sr.po --- almanah-0.11.1/po/sr.po 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/sr.po 2019-10-07 13:45:09.000000000 +0000 @@ -1,14 +1,14 @@ -# Language almanah translations for F package. -# Copyright (C) 2011 THE F'S COPYRIGHT HOLDER -# This file is distributed under the same license as the F package. -# Мирослав Николић , 2011—2014. +# Serbian translations for almanah. +# Copyright (C) 2014 THE F'S COPYRIGHT HOLDER +# This file is distributed under the same license as the almanah package. +# Мирослав Николић , 2011—2015. msgid "" msgstr "" "Project-Id-Version: almanah\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=almana" -"h&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-12-18 13:50+0000\n" -"PO-Revision-Date: 2014-01-29 10:25+0200\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=almanah" +"&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2015-10-14 17:59+0000\n" +"PO-Revision-Date: 2015-12-28 11:24+0200\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian \n" "Language: sr\n" @@ -20,11 +20,15 @@ "X-Project-Style: gnome\n" #: ../data/almanah.appdata.xml.in.h:1 +msgid "Keep a diary of your life" +msgstr "Водите дневник вашег живота" + +#: ../data/almanah.appdata.xml.in.h:2 msgid "" "Almanah Diary is an application to allow you to keep a diary of your life." msgstr "Алманах је програм који вам омогућава да водите дневник вашег живота." -#: ../data/almanah.appdata.xml.in.h:2 +#: ../data/almanah.appdata.xml.in.h:3 msgid "" "You can encrypt the diary to preserve your privacy. It has editing " "abilities, including text formatting and printing and shows you a lists of " @@ -36,37 +40,8 @@ "вам спискове догађаја (на вашем рачунару) за сваки дан (као што су задаци и " "састанци из Еволуције)." -#: ../data/almanah-app-menu.ui.h:1 -msgid "_Search" -msgstr "_Тражи" - -#: ../data/almanah-app-menu.ui.h:2 -msgid "Pr_eferences" -msgstr "_Поставке" - -#. Set the button label -#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 -msgid "_Import" -msgstr "_Увези" - -#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 -msgid "_Export" -msgstr "_Извези" - -#: ../data/almanah-app-menu.ui.h:5 -msgid "_Print diary" -msgstr "_Штампај дневник" - -#: ../data/almanah-app-menu.ui.h:6 -msgid "_About Almanah Diary" -msgstr "_О дневнику Алманах" - -#: ../data/almanah-app-menu.ui.h:7 -msgid "_Quit" -msgstr "_Изађи" - -#: ../data/almanah.desktop.in.h:1 ../src/application.c:132 -#: ../src/main-window.c:136 +#: ../data/almanah.desktop.in.h:1 ../src/application.c:133 +#: ../src/main-window.c:155 msgid "Almanah Diary" msgstr "Дневник Алманах" @@ -75,7 +50,7 @@ msgstr "Водите лични дневник" #. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. -#: ../data/almanah.desktop.in.h:3 ../src/application.c:263 +#: ../data/almanah.desktop.in.h:3 ../src/application.c:272 msgid "Diary" msgstr "Дневник" @@ -84,132 +59,78 @@ msgid "diary;journal;" msgstr "дневник;записник;" -#: ../data/almanah.ui.h:1 -msgid "Select Date…" -msgstr "Изабери датум…" - -#: ../data/almanah.ui.h:2 -msgid "F_ormat" -msgstr "_Формат" - -#: ../data/almanah.ui.h:3 -msgid "Toggle whether the currently selected text is bold." -msgstr "Одредите да ли је тренутно изабрани текст подебљан." - -#: ../data/almanah.ui.h:4 -msgid "Toggle whether the currently selected text is italic." -msgstr "Одредите да ли је тренутно изабрани текст искошен." - -#: ../data/almanah.ui.h:5 -msgid "Toggle whether the currently selected text is underlined." -msgstr "Одредите да ли је тренутно изабрани текст подвучен." - -#: ../data/almanah.ui.h:6 -msgid "Add/Remove _Hyperlink" -msgstr "Додај/уклони _хипервезу" - -#: ../data/almanah.ui.h:7 -msgid "" -"Add or remove a hyperlink from the currently selected text to a specified " -"URI." -msgstr "" -"Додајте или уклоните хипервезу из тренутно изабраног текста у задату адресу." - -#: ../data/almanah.ui.h:8 -msgid "Insert _Time" -msgstr "Уметни _време" - -#: ../data/almanah.ui.h:9 -msgid "I_mportant" -msgstr "_Важно" - -#: ../data/almanah.ui.h:10 -msgid "Toggle whether the current entry is marked as important." -msgstr "Одредите да ли је тренутни унос означен као важан." - -#: ../data/almanah.ui.h:11 -msgid "Show tags" -msgstr "Прикажи ознаке" - -#: ../data/almanah.ui.h:12 -msgid "Show tags for the current entry" -msgstr "Прикажите ознаке за текући унос" - -#: ../data/almanah.ui.h:13 -msgid "_Help" -msgstr "По_моћ" - -#: ../data/almanah.ui.h:14 -msgid "Go to _Today" -msgstr "_Иди на данашње" - -#: ../data/almanah.ui.h:15 -msgid "Jump to the current date in the diary." -msgstr "Пребаците се на текући датум у дневнику." - -#: ../data/almanah.ui.h:16 +#: ../src/ui/almanah.ui.h:1 msgid "Calendar" msgstr "Календар" -#: ../data/almanah.ui.h:17 +#: ../src/ui/almanah.ui.h:2 +#| msgid "Go to _Today" +msgid "Go to Today" +msgstr "Иди на данашње" + +#: ../src/ui/almanah.ui.h:3 +msgid "Select Date…" +msgstr "Изабери датум…" + +#: ../src/ui/almanah.ui.h:4 msgid "Entry editing area" msgstr "Област за уређивање уноса" -#: ../data/almanah.ui.h:18 +#: ../src/ui/almanah.ui.h:5 msgid "Past events" msgstr "Прошли догађаји" -#: ../data/almanah.ui.h:19 +#: ../src/ui/almanah.ui.h:6 msgid "Past Event List" msgstr "Списак прошлих догађаја" -#: ../data/almanah.ui.h:20 +#: ../src/ui/almanah.ui.h:7 msgid "Search entry" msgstr "Унос претраге" -#: ../data/almanah.ui.h:21 ../src/search-dialog.c:69 +#: ../src/ui/almanah.ui.h:8 ../src/search-dialog.c:69 msgid "Search" msgstr "Потражи" -#: ../data/almanah.ui.h:22 +#: ../src/ui/almanah.ui.h:9 msgid "Result List" msgstr "Списак резултата" -#: ../data/almanah.ui.h:23 +#: ../src/ui/almanah.ui.h:10 msgid "View Entry" msgstr "Прикажи унос" -#: ../data/almanah.ui.h:24 +#: ../src/ui/almanah.ui.h:11 msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." msgstr "нпр. „16.07.2033“ или „16. јул 2033.“." -#: ../data/almanah.ui.h:25 +#: ../src/ui/almanah.ui.h:12 msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." msgstr "" "нпр. „http://google.com/“ или „датотека:///лична_фасцикла/Марко/фотографије/" "слика.jpg“." -#: ../data/almanah.ui.h:26 +#: ../src/ui/almanah.ui.h:13 msgid "Successful Entries" msgstr "Успешни уноси" -#: ../data/almanah.ui.h:27 +#: ../src/ui/almanah.ui.h:14 msgid "Merged Entries" msgstr "Спојени уноси" -#: ../data/almanah.ui.h:28 +#: ../src/ui/almanah.ui.h:15 msgid "Failed Entries" msgstr "Неуспели уноси" -#: ../data/almanah.ui.h:29 +#: ../src/ui/almanah.ui.h:16 msgid "Import Results List" msgstr "Списак резултата увожења" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 +#: ../data/org.gnome.almanah.gschema.xml.in.h:1 msgid "Database encryption key ID" msgstr "ИБ кључа шифровања базе података" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +#: ../data/org.gnome.almanah.gschema.xml.in.h:2 msgid "" "The ID of the key to use to encrypt and decrypt the database, if Almanah has " "been built with encryption support. Leave blank to disable database " @@ -219,40 +140,31 @@ "Алманах изграђен са подршком за шифровање. Оставите празно да онемогућите " "шифровање базе података." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 +#: ../data/org.gnome.almanah.gschema.xml.in.h:3 msgid "Spell checking language" msgstr "Језик провере писања" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +#: ../data/org.gnome.almanah.gschema.xml.in.h:4 msgid "The locale specifier of the language in which to check entry spellings." msgstr "Шифра језика за који ће се вршити провера писања." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +#: ../data/org.gnome.almanah.gschema.xml.in.h:5 msgid "Spell checking enabled?" msgstr "Провера писања је укључена?" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 +#: ../data/org.gnome.almanah.gschema.xml.in.h:6 msgid "Whether spell checking of entries is enabled." msgstr "Ако је изабрано, вршиће се провера приликом писања." -#: ../src/application.c:246 +#: ../src/application.c:255 msgid "Error opening database" msgstr "Грешка приликом отварања базе података" -#. Error loading the CSS -#: ../src/application.c:275 -#, c-format -msgid "" -"Couldn't load the CSS file '%s'. The interface might not be styled correctly" -msgstr "" -"Не могу да учитам ЦСС датотеку „%s“. Сучеље не може бити исправно " -"стилизовано." - -#: ../src/application.c:319 +#: ../src/application.c:332 msgid "Enable debug mode" msgstr "Укључује режим за исправљање грешака" -#: ../src/application.c:336 +#: ../src/application.c:349 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" @@ -260,24 +172,16 @@ "исто време." #. Print an error -#: ../src/application.c:347 +#: ../src/application.c:360 #, c-format msgid "Command line options could not be parsed: %s\n" msgstr "Опције линије наредби не могу бити обрађене: %s\n" -#: ../src/application.c:366 +#: ../src/application.c:379 msgid "Error encrypting database" msgstr "Грешка приликом шифровања базе података" -#: ../src/application.c:419 ../src/date-entry-dialog.c:129 -#: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 -#: ../src/main-window.c:195 ../src/preferences-dialog.c:191 -#: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 -#, c-format -msgid "UI file \"%s\" could not be loaded" -msgstr "Не могу да учитам датотеку корисничког сучеља „%s“" - -#: ../src/application.c:542 +#: ../src/application.c:522 msgid "" "Almanah is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -289,7 +193,7 @@ "софтвера, било верзије 3 лиценце или (по вашем избору) било које новије " "верзије." -#: ../src/application.c:546 +#: ../src/application.c:526 msgid "" "Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -300,7 +204,7 @@ "чак и без примењене гаранције ТРЖИШНЕ ВРЕДНОСТИ или ПРИЛАГОЂЕНОСТИ ОДРЕЂЕНОЈ " "НАМЕНИ. Погледајте Гнуову општу јавну лиценцу за више детаља." -#: ../src/application.c:550 +#: ../src/application.c:530 msgid "" "You should have received a copy of the GNU General Public License along with " "Almanah. If not, see ." @@ -308,12 +212,12 @@ "Треба да сте примили примерак Гнуове опште јавне лиценце уз Алманах. Ако " "нисте, погледајте ." -#: ../src/application.c:565 +#: ../src/application.c:545 #, c-format msgid "A helpful diary keeper, storing %u entries." msgstr "Користан чувар дневника, садржи %u уносa." -#: ../src/application.c:569 +#: ../src/application.c:549 msgid "Copyright © 2008-2009 Philip Withnall" msgstr "Ауторска права © 2008-2009 Филип Витнал" @@ -322,18 +226,40 @@ #. * "Translator name 1 \n" #. * "Translator name 2 " #. -#: ../src/application.c:577 +#: ../src/application.c:557 msgid "translator-credits" -msgstr " Мирослав Николић, miroslavnikolic@rocketmail.com" +msgstr "" +"Мирослав Николић, miroslavnikolic@rocketmail.com\n" +"\n" +"http://prevod.org — превод на српски језик" -#: ../src/application.c:581 +#: ../src/application.c:561 msgid "Almanah Website" msgstr "Веб страница Алманаха" +#: ../src/application.c:589 +#, c-format +#| msgid "" +#| "Couldn't load the CSS file '%s'. The interface might not be styled " +#| "correctly" +msgid "" +"Couldn't load the CSS resources. The interface might not be styled " +"correctly: %s" +msgstr "" +"Не могу да учитам ЦСС изворишта. Сучеље не може бити исправно стилизовано: %s" + #: ../src/date-entry-dialog.c:72 msgid "Select Date" msgstr "Изаберите датум" +#: ../src/date-entry-dialog.c:127 ../src/import-export-dialog.c:169 +#: ../src/import-export-dialog.c:475 ../src/main-window.c:225 +#: ../src/preferences-dialog.c:177 ../src/search-dialog.c:95 +#: ../src/uri-entry-dialog.c:126 +#| msgid "UI file \"%s\" could not be loaded" +msgid "UI data could not be loaded" +msgstr "Не могу да учитам податке корисничког сучеља" + #: ../src/entry.c:303 #, c-format msgid "Invalid data version number %u." @@ -393,56 +319,135 @@ #: ../src/export-operation.c:256 ../src/export-operation.c:313 #, c-format -#| msgid "Error opening encrypted database file \"%s\": %s" msgid "Error changing exported file permissions: %s" msgstr "Грешка промене овлашћења извезене датотеке: %s" -#: ../src/import-export-dialog.c:202 +#: ../src/gtk/menus.ui.h:1 +msgid "_Search" +msgstr "_Тражи" + +#: ../src/gtk/menus.ui.h:2 +msgid "Pr_eferences" +msgstr "_Поставке" + +#: ../src/gtk/menus.ui.h:3 +#| msgid "_Import" +msgctxt "Main menu" +msgid "_Import" +msgstr "_Увези" + +#: ../src/gtk/menus.ui.h:4 +#| msgid "_Export" +msgctxt "Main menu" +msgid "_Export" +msgstr "_Извези" + +#: ../src/gtk/menus.ui.h:5 +msgid "_Print diary" +msgstr "_Штампај дневник" + +#: ../src/gtk/menus.ui.h:6 +msgid "_About Almanah Diary" +msgstr "_О дневнику Алманах" + +#: ../src/gtk/menus.ui.h:7 +msgid "_Quit" +msgstr "_Изађи" + +#: ../src/gtk/menus.ui.h:8 +msgid "_Bold" +msgstr "_Подебљано" + +#: ../src/gtk/menus.ui.h:9 +msgid "_Italic" +msgstr "_Искошено" + +#: ../src/gtk/menus.ui.h:10 +msgid "_Underline" +msgstr "Под_вучено" + +#: ../src/gtk/menus.ui.h:11 +msgid "_Cut" +msgstr "_Исеци" + +#: ../src/gtk/menus.ui.h:12 +msgid "_Copy" +msgstr "У_множи" + +#: ../src/gtk/menus.ui.h:13 +msgid "_Paste" +msgstr "У_баци" + +#: ../src/gtk/menus.ui.h:14 ../src/main-window.c:626 +msgid "_Delete" +msgstr "_Обриши" + +#: ../src/gtk/menus.ui.h:15 +msgid "Insert _Time" +msgstr "Уметни _време" + +#: ../src/gtk/menus.ui.h:16 +msgid "Add/Remove _Hyperlink" +msgstr "Додај/уклони _хипервезу" + +#: ../src/import-export-dialog.c:203 msgid "Import _mode: " msgstr "Режим _увоза: " -#: ../src/import-export-dialog.c:202 +#: ../src/import-export-dialog.c:203 msgid "Export _mode: " msgstr "Режим _извоза: " #. Set the window title -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Import Entries" msgstr "Уноси за увоз" -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Export Entries" msgstr "Уноси за извоз" -#: ../src/import-export-dialog.c:245 +#: ../src/import-export-dialog.c:210 +#| msgid "_Import" +msgctxt "Dialog button" +msgid "_Import" +msgstr "_Увези" + +#: ../src/import-export-dialog.c:210 +#| msgid "_Export" +msgctxt "Dialog button" +msgid "_Export" +msgstr "_Извези" + +#: ../src/import-export-dialog.c:247 msgid "Import failed" msgstr "Увоз није успео" -#: ../src/import-export-dialog.c:283 +#: ../src/import-export-dialog.c:285 msgid "Export failed" msgstr "Извоз није успео" -#: ../src/import-export-dialog.c:296 +#: ../src/import-export-dialog.c:298 msgid "Export successful" msgstr "Извоз је успео" -#: ../src/import-export-dialog.c:297 +#: ../src/import-export-dialog.c:299 msgid "The diary was successfully exported." msgstr "Дневник је успешно извежен." -#: ../src/import-export-dialog.c:445 +#: ../src/import-export-dialog.c:447 msgid "Import Results" msgstr "Резултати увожења" #. Translators: This is a strftime()-format string for the dates displayed in import results. #. Translators: This is a strftime()-format string for the date to display when asking about editing a diary entry. #. Translators: This is a strftime()-format string for the date to display when asking about deleting a diary entry. +#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. -#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. -#: ../src/import-export-dialog.c:539 ../src/main-window.c:567 -#: ../src/main-window.c:597 ../src/printing.c:263 ../src/search-dialog.c:182 -#: ../src/widgets/calendar-button.c:309 +#: ../src/import-export-dialog.c:542 ../src/main-window.c:587 +#: ../src/main-window.c:618 ../src/main-window.c:1225 ../src/printing.c:263 +#: ../src/search-dialog.c:180 msgid "%A, %e %B %Y" msgstr "%A, %e %B %Y" @@ -491,67 +496,87 @@ "Унос је увежен из „%s“:\n" "\n" -#: ../src/main-window.c:571 +#: ../src/main-window.c:591 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" msgstr "Да ли сте сигурни да желите да уредите овај унос дневника за „%s“?" -#: ../src/main-window.c:601 +#: ../src/main-window.c:594 ../src/main-window.c:625 +msgid "_Cancel" +msgstr "_Откажи" + +#: ../src/main-window.c:595 +msgid "_Edit" +msgstr "_Уреди" + +#: ../src/main-window.c:622 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" msgstr "Да ли сте сигурни да желите да обришете овај унос дневника за „%s“?" #. Print a warning about the unknown tag -#: ../src/main-window.c:710 +#: ../src/main-window.c:732 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." msgstr "Непозната или дуплирана ознака текста „%s“ у уносу. Занемарујем." -#: ../src/main-window.c:918 +#: ../src/main-window.c:973 msgid "Error opening URI" msgstr "Грешка приликом отварања адресе" #. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place -#: ../src/main-window.c:1092 +#: ../src/main-window.c:1152 #, c-format msgid "%s @ %s" msgstr "%s у %s" -#: ../src/main-window.c:1171 +#: ../src/main-window.c:1258 msgid "Entry content could not be loaded" msgstr "Садржај уноса не може бити учитан" -#: ../src/main-window.c:1348 +#. Translators: this sentence is just used in startup to estimate the width +#. of a 15 words sentence. Translate with some randome sentences with just 15 words. +#. See: https://bugzilla.gnome.org/show_bug.cgi?id=754841 +#: ../src/main-window.c:1414 +msgid "" +"This is just a fifteen words sentence to calculate the diary entry text view " +"size" +msgstr "" +"Ово је само реченица од петнаест речи за израчунавање величине прегледа " +"текста за унос дневника" + +#: ../src/main-window.c:1450 msgid "Spelling checker could not be initialized" msgstr "Провера писања не може бити започета" -#: ../src/preferences-dialog.c:91 -msgid "Almanah Preferences" -msgstr "Поставке Алманаха" +#: ../src/preferences-dialog.c:83 +#| msgid "Pr_eferences" +msgid "Preferences" +msgstr "Поставке" #. Grab our child widgets -#: ../src/preferences-dialog.c:217 +#: ../src/preferences-dialog.c:204 msgid "Encryption key: " msgstr "Кључ шифровања: " -#: ../src/preferences-dialog.c:222 +#: ../src/preferences-dialog.c:208 msgid "None (don't encrypt)" msgstr "Ништа (не шифруј)" -#: ../src/preferences-dialog.c:246 +#: ../src/preferences-dialog.c:213 msgid "New _Key" msgstr "_Нови кључ" #. Set up the "Enable spell checking" check button -#: ../src/preferences-dialog.c:253 +#: ../src/preferences-dialog.c:237 msgid "Enable _spell checking" msgstr "Укључи _проверу писања" -#: ../src/preferences-dialog.c:279 +#: ../src/preferences-dialog.c:262 msgid "Error saving the encryption key" msgstr "Грешка приликом чувања кључа за шифровање" -#: ../src/preferences-dialog.c:298 +#: ../src/preferences-dialog.c:281 msgid "Error opening Seahorse" msgstr "Грешка приликом отварања привеска кључева" @@ -576,18 +601,18 @@ msgid "Line spacing:" msgstr "Размак реда:" -#: ../src/search-dialog.c:223 +#: ../src/search-dialog.c:221 msgid "Search canceled." msgstr "Претрага је отказана." #. Translators: This is an error message wrapper for when searches encounter an error. The placeholder is for an error message. -#: ../src/search-dialog.c:226 +#: ../src/search-dialog.c:224 #, c-format msgid "Error: %s" msgstr "Грешка: %s" #. Success! -#: ../src/search-dialog.c:231 +#: ../src/search-dialog.c:229 #, c-format msgid "Found %d entry:" msgid_plural "Found %d entries:" @@ -596,114 +621,126 @@ msgstr[2] "Пронашао сам %d ставки:" msgstr[3] "Пронашао сам једну ставку:" -#: ../src/search-dialog.c:280 +#: ../src/search-dialog.c:278 msgid "Searching…" msgstr "Тражим…" -#: ../src/storage-manager.c:276 +#: ../src/storage-manager.c:248 +#, c-format +msgid "" +"Could not open database \"%s\". SQLite provided the following error message: " +"%s" +msgstr "" +"Не могу да отворим базу података „%s“. СКуЛајт је обезбедио следећу поруку о " +"грешци: %s" + +#: ../src/storage-manager.c:291 +#, c-format +msgid "" +"Could not run query \"%s\". SQLite provided the following error message: %s" +msgstr "" +"Не могу да покренем упит „%s“. СКуЛајт је обезбедио следећу поруку о грешци: " +"%s" + +#: ../src/storage-manager.c:597 +msgid "Error deserializing entry into buffer while searching." +msgstr "Грешка у рашчлањивању уноса у баферу током претраживања." + +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Унесите адресу" + +#: ../src/vfs.c:239 #, c-format msgid "GPGME is not at least version %s" msgstr "ГПГМЕ није најновије издање %s" -#: ../src/storage-manager.c:285 +#: ../src/vfs.c:246 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "ГПГМЕ не подржава ОпенПГП: %s" -#: ../src/storage-manager.c:294 +#: ../src/vfs.c:253 #, c-format msgid "Error creating cipher context: %s" msgstr "Грешка приликом стварања контекста шифровања: %s" -#: ../src/storage-manager.c:323 +#: ../src/vfs.c:273 +#, c-format +msgid "Can't create a new GIOChannel for the encrypted database: %s" +msgstr "Не могу да направим нови ГИО канал за шифроване базе података: %s" + +#: ../src/vfs.c:281 #, c-format msgid "Error opening encrypted database file \"%s\": %s" msgstr "Грешка приликом отварања шифроване датотеке базе података „%s“: %s" -#: ../src/storage-manager.c:342 +#: ../src/vfs.c:297 #, c-format -msgid "Error opening plain database file \"%s\": %s" -msgstr "Грешка приликом отварања обичне датотеке базе података „%s“: %s" - -#: ../src/storage-manager.c:390 -msgid "" -"The encrypted database is empty. The plain database file has been left " -"undeleted as backup." -msgstr "" -"Шифрована база података је празна. Датотека обичне базе података није " -"обрисана приликом прављења резервне копије." +msgid "Error creating Callback base data buffer: %s" +msgstr "Грешка стварања међумеморије података базе опозива: %s" -#. Delete the plain file -#: ../src/storage-manager.c:393 +#: ../src/vfs.c:305 #, c-format -msgid "Could not delete plain database file \"%s\"." -msgstr "Не могу да обришем датотеку обичне базе података „%s“." +msgid "Can't create a new GIOChannel for the plain database: %s" +msgstr "Не могу да направим нови ГИО канал за обичне базе података: %s" -#: ../src/storage-manager.c:434 +#: ../src/vfs.c:313 #, c-format -msgid "Error decrypting database: %s" -msgstr "Грешка приликом дешифровања базе података: %s" +msgid "Error opening plain database file \"%s\": %s" +msgstr "Грешка приликом отварања обичне датотеке базе података „%s“: %s" -#: ../src/storage-manager.c:468 +#: ../src/vfs.c:409 #, c-format msgid "Error getting encryption key: %s" msgstr "Грешка приликом набављања кључа за шифровање: %s" -#: ../src/storage-manager.c:489 +#: ../src/vfs.c:433 ../src/vfs.c:439 #, c-format msgid "Error encrypting database: %s" msgstr "Грешка приликом шифровања базе података: %s" -#: ../src/storage-manager.c:549 +#. Translators: The first and second params are file paths, the last param is an error message. +#: ../src/vfs.c:489 +#, c-format +msgid "Error copying the file from %s to %s: %s" +msgstr "Грешка умножавања датотеке из „%s“ у „%s“: %s" + +#: ../src/vfs.c:495 #, c-format -#| msgid "Error opening plain database file \"%s\": %s" msgid "Error changing database backup file permissions: %s" msgstr "Грешка промене овлашћења датотеке резерве базе података: %s" -#: ../src/storage-manager.c:571 ../src/storage-manager.c:627 +#: ../src/vfs.c:595 #, c-format -#| msgid "Error opening plain database file \"%s\": %s" -msgid "Error changing database file permissions: %s" -msgstr "Грешка промене овлашћења датотеке базе података: %s" +#| msgid "Error backing up file ‘%s’" +msgid "Error closing file: %s" +msgstr "Грешка затварања датотеке: %s" #. Translators: the first parameter is a filename, the second is an error message. -#: ../src/storage-manager.c:583 ../src/storage-manager.c:611 +#. Translators: the first parameter is a filename. +#: ../src/vfs.c:994 ../src/vfs.c:1021 #, c-format -#| msgid "Error opening plain database file \"%s\": %s" -msgid "Error backing up file ‘%s’: %s" -msgstr "Грешка стварања резерве датотеке „%s“: %s" +msgid "Error backing up file ‘%s’" +msgstr "Грешка стварања резерве датотеке „%s“" -#: ../src/storage-manager.c:620 +#: ../src/vfs.c:1007 #, c-format -msgid "" -"Could not open database \"%s\". SQLite provided the following error message: " -"%s" -msgstr "" -"Не могу да отворим базу података „%s“. СКуЛајт је обезбедио следећу поруку о " -"грешци: %s" +msgid "Error decrypting database: %s" +msgstr "Грешка приликом дешифровања базе података: %s" -#: ../src/storage-manager.c:704 +#: ../src/vfs.c:1047 #, c-format -msgid "" -"Could not run query \"%s\". SQLite provided the following error message: %s" -msgstr "" -"Не могу да покренем упит „%s“. СКуЛајт је обезбедио следећу поруку о грешци: " -"%s" - -#: ../src/storage-manager.c:1010 -msgid "Error deserializing entry into buffer while searching." -msgstr "Грешка у рашчлањивању уноса у баферу током претраживања." - -#: ../src/uri-entry-dialog.c:71 -msgid "Enter URI" -msgstr "Унесите адресу" +msgid "Error changing database file permissions: %s" +msgstr "Грешка промене овлашћења датотеке базе података: %s" -#: ../src/widgets/calendar-button.c:140 +#: ../src/widgets/calendar-button.c:142 #, c-format -msgid "UI file \"%s\" could not be loaded: %s" -msgstr "Не могу да учитам датотеку корисничког сучеља „%s“: %s" +#| msgid "UI file \"%s\" could not be loaded: %s" +msgid "UI data could not be loaded: %s" +msgstr "Не могу да учитам податке корисничког сучеља: %s" -#: ../src/widgets/calendar-button.c:150 +#: ../src/widgets/calendar-button.c:152 msgid "Can't load calendar window object from UI file" msgstr "" "Не могу да учитам објекат прозора календара из датотеке корисничког сучеља" @@ -713,10 +750,6 @@ msgid "Important!" msgstr "Важно!" -#: ../src/widgets/calendar-window.c:80 -msgid "Unknown input device" -msgstr "Непознат улазни уређај" - #: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:166 msgid "add tag" msgstr "додај ознаку" @@ -726,7 +759,6 @@ msgstr "Запишите ознаку и притисните „Унеси“ да је сачувате" #: ../src/widgets/tag-accessible.c:165 -#| msgid "Show tags for the current entry" msgid "Remove the tag from the entry" msgstr "Уклоните ознаку из текућег уноса" @@ -736,6 +768,58 @@ msgstr "Уклоните ознаку" #: ../src/widgets/tag-entry.c:85 -#| msgid "Search entry" msgid "Tag entry" msgstr "Унос ознаке" + +#~ msgid "F_ormat" +#~ msgstr "_Формат" + +#~ msgid "Toggle whether the currently selected text is bold." +#~ msgstr "Одредите да ли је тренутно изабрани текст подебљан." + +#~ msgid "Toggle whether the currently selected text is italic." +#~ msgstr "Одредите да ли је тренутно изабрани текст искошен." + +#~ msgid "Toggle whether the currently selected text is underlined." +#~ msgstr "Одредите да ли је тренутно изабрани текст подвучен." + +#~ msgid "" +#~ "Add or remove a hyperlink from the currently selected text to a specified " +#~ "URI." +#~ msgstr "" +#~ "Додајте или уклоните хипервезу из тренутно изабраног текста у задату " +#~ "адресу." + +#~ msgid "I_mportant" +#~ msgstr "_Важно" + +#~ msgid "Toggle whether the current entry is marked as important." +#~ msgstr "Одредите да ли је тренутни унос означен као важан." + +#~ msgid "Show tags" +#~ msgstr "Прикажи ознаке" + +#~ msgid "Show tags for the current entry" +#~ msgstr "Прикажите ознаке за текући унос" + +#~ msgid "_Help" +#~ msgstr "По_моћ" + +#~ msgid "Jump to the current date in the diary." +#~ msgstr "Пребаците се на текући датум у дневнику." + +#~ msgid "Almanah Preferences" +#~ msgstr "Поставке Алманаха" + +#~ msgid "Unknown input device" +#~ msgstr "Непознат улазни уређај" + +#~ msgid "" +#~ "The encrypted database is empty. The plain database file has been left " +#~ "undeleted as backup." +#~ msgstr "" +#~ "Шифрована база података је празна. Датотека обичне базе података није " +#~ "обрисана приликом прављења резервне копије." + +#~ msgid "Could not delete plain database file \"%s\"." +#~ msgstr "Не могу да обришем датотеку обичне базе података „%s“." diff -Nru almanah-0.11.1/po/sv.po almanah-0.12.0/po/sv.po --- almanah-0.11.1/po/sv.po 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/sv.po 2019-10-07 13:45:09.000000000 +0000 @@ -1,383 +1,437 @@ # Swedish translation for almanah. -# Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright © 2008-2016 Free Software Foundation, Inc. # This file is distributed under the same license as the diary package. # Daniel Nylander , 2008, 2009, 2010, 2011. -# +# Anders Jonsson , 2015, 2016. +# Josef Andersson , 2015. msgid "" msgstr "" "Project-Id-Version: almanah\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-27 18:04+0100\n" -"PO-Revision-Date: 2011-02-27 18:08+0100\n" -"Last-Translator: Daniel Nylander \n" -"Language-Team: Swedish \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=almanah&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2015-10-14 17:59+0000\n" +"PO-Revision-Date: 2016-01-26 22:47+0100\n" +"Last-Translator: Anders Jonsson \n" +"Language-Team: Swedish\n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.8.6\n" +"X-Project-Style: gnome\n" + +#: ../data/almanah.appdata.xml.in.h:1 +msgid "Keep a diary of your life" +msgstr "För dagbok över ditt liv" -#: ../data/almanah.desktop.in.h:1 -#: ../src/main-window.c:134 -#: ../src/main.c:137 +#: ../data/almanah.appdata.xml.in.h:2 +msgid "" +"Almanah Diary is an application to allow you to keep a diary of your life." +msgstr "" +"Almanah dagbok är ett program som låter dig föra en dagbok över ditt liv." + +#: ../data/almanah.appdata.xml.in.h:3 +msgid "" +"You can encrypt the diary to preserve your privacy. It has editing " +"abilities, including text formatting and printing and shows you a lists of " +"events which happened (on your computer) for each day (such as tasks and " +"appointments from Evolution)." +msgstr "" +"Du kan kryptera dagboken för att skydda ditt privatliv. Det har funktioner " +"för redigering, inkluderande textformatering och utskrift och visar dig en " +"lista över händelser som inträffat (på din dator) för varje dag (som " +"exempelvis uppgifter och möten från Evolution)." + +#: ../data/almanah.desktop.in.h:1 ../src/application.c:133 +#: ../src/main-window.c:155 msgid "Almanah Diary" -msgstr "Dagboksprogrammet Almanah" +msgstr "Almanah dagbok" #: ../data/almanah.desktop.in.h:2 +msgid "Keep a personal diary" +msgstr "För en personlig dagbok" + +#. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. +#: ../data/almanah.desktop.in.h:3 ../src/application.c:272 msgid "Diary" msgstr "Dagbok" -#: ../data/almanah.desktop.in.h:3 -msgid "Keep a personal diary" -msgstr "För en personlig dagbok" +#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../data/almanah.desktop.in.h:5 +msgid "diary;journal;" +msgstr "dagbok;journal;" -#: ../data/almanah.schemas.in.h:1 -msgid "Database encryption key ID" -msgstr "Nyckel-id för databaskryptering" +#: ../src/ui/almanah.ui.h:1 +msgid "Calendar" +msgstr "Kalender" -#: ../data/almanah.schemas.in.h:2 -msgid "Main window X position" -msgstr "Huvudfönstrets X-position" - -#: ../data/almanah.schemas.in.h:3 -msgid "Main window Y position" -msgstr "Huvudfönstrets Y-position" - -#: ../data/almanah.schemas.in.h:4 -msgid "Main window height" -msgstr "Huvudfönstrets höjd" - -#: ../data/almanah.schemas.in.h:5 -msgid "Main window maximization" -msgstr "Maximering av huvudfönstret" - -#: ../data/almanah.schemas.in.h:6 -msgid "Main window width" -msgstr "Huvudfönstrets bredd" +#: ../src/ui/almanah.ui.h:2 +msgid "Go to Today" +msgstr "Gå till idag" -#: ../data/almanah.schemas.in.h:7 -msgid "Spell checking enabled?" -msgstr "Stavningskontroll aktiverat?" +#: ../src/ui/almanah.ui.h:3 +msgid "Select Date…" +msgstr "Välj datum…" -#: ../data/almanah.schemas.in.h:8 -msgid "Spell checking language" -msgstr "Språk för stavningskontroll" +#: ../src/ui/almanah.ui.h:4 +msgid "Entry editing area" +msgstr "Postredigeringsyta" -#: ../data/almanah.schemas.in.h:9 -msgid "The ID of the key to use to encrypt and decrypt the database, if Almanah has been built with encryption support. Leave blank to disable database encryption." -msgstr "Id för nyckeln som ska användas för att kryptera och dekryptera databasen, om Almanah har byggts med krypteringsstöd. Lämna tom för att inaktivera databaskryptering." - -#: ../data/almanah.schemas.in.h:10 -msgid "The X position of the main window." -msgstr "X-positionen för huvudfönstret." - -#: ../data/almanah.schemas.in.h:11 -msgid "The Y position of the main window." -msgstr "Y-positionen för huvudfönstret." - -#: ../data/almanah.schemas.in.h:12 -msgid "The height of the main window." -msgstr "Höjden på huvudfönstret." +#: ../src/ui/almanah.ui.h:5 +msgid "Past events" +msgstr "Tidigare händelser" -#: ../data/almanah.schemas.in.h:13 -msgid "The locale specifier of the language in which to check entry spellings." -msgstr "Lokalangivaren för språket i vilket posterna ska stavningskontrolleras." +#: ../src/ui/almanah.ui.h:6 +msgid "Past Event List" +msgstr "Lista över tidigare händelser" -#: ../data/almanah.schemas.in.h:14 -msgid "The width of the main window." -msgstr "Bredden för huvudfönstret." +#: ../src/ui/almanah.ui.h:7 +msgid "Search entry" +msgstr "Sök post" -#: ../data/almanah.schemas.in.h:15 -msgid "Whether spell checking of entries is enabled." -msgstr "Huruvida stavningskontroll av poster är aktiverat." +#: ../src/ui/almanah.ui.h:8 ../src/search-dialog.c:69 +msgid "Search" +msgstr "Sök" -#: ../data/almanah.schemas.in.h:16 -msgid "Whether the main window should start maximized." -msgstr "Huruvida huvudfönstret ska startas maximerat." +#: ../src/ui/almanah.ui.h:9 +msgid "Result List" +msgstr "Resultatlista" -#: ../data/almanah.ui.h:1 -msgid "Add a definition for the currently selected text." -msgstr "Lägg till en definition för den markerade texten." +#: ../src/ui/almanah.ui.h:10 +msgid "View Entry" +msgstr "Visa post" -#: ../data/almanah.ui.h:2 -msgid "Calendar" -msgstr "Kalender" +#: ../src/ui/almanah.ui.h:11 +msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." +msgstr "exempelvis ”14/03/2009” eller ”14 mars 2009”." -#: ../data/almanah.ui.h:3 -msgid "Definition Description" -msgstr "Definitionsbeskrivning" - -#: ../data/almanah.ui.h:4 -msgid "Definition List" -msgstr "Definitionslista" - -#: ../data/almanah.ui.h:5 -msgid "Definition Type" -msgstr "Definitionstyp" - -#: ../data/almanah.ui.h:6 -msgid "Definition type:" -msgstr "Definitionstyp:" +#: ../src/ui/almanah.ui.h:12 +msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." +msgstr "" +"exempelvis ”http://google.com/” eller ”file:///home/jag/Foton/foto.jpg”." -#: ../data/almanah.ui.h:7 -msgid "Entry editing area" -msgstr "Postredigeringsyta" +#: ../src/ui/almanah.ui.h:13 +msgid "Successful Entries" +msgstr "Lyckade poster" -#: ../data/almanah.ui.h:8 -msgid "F_ormat" -msgstr "F_ormat" +#: ../src/ui/almanah.ui.h:14 +msgid "Merged Entries" +msgstr "Sammanfogade poster" -#: ../data/almanah.ui.h:9 +#: ../src/ui/almanah.ui.h:15 msgid "Failed Entries" msgstr "Misslyckade poster" -#: ../data/almanah.ui.h:10 -msgid "Go to _Today" -msgstr "Gå till _idag" - -#: ../data/almanah.ui.h:11 -msgid "I_mportant" -msgstr "_Viktigt" - -#: ../data/almanah.ui.h:12 +#: ../src/ui/almanah.ui.h:16 msgid "Import Results List" msgstr "Importera resultatlista" -#: ../data/almanah.ui.h:13 -msgid "Insert _Time" -msgstr "Infoga _tid" - -#: ../data/almanah.ui.h:14 -msgid "Jump to the current date in the diary." -msgstr "Hoppa till aktuellt datum i dagboken." - -#: ../data/almanah.ui.h:15 -msgid "Merged Entries" -msgstr "Sammanfogade poster" +#: ../data/org.gnome.almanah.gschema.xml.in.h:1 +msgid "Database encryption key ID" +msgstr "Nyckel-id för databaskryptering" -#: ../data/almanah.ui.h:16 -#: ../src/definition-manager-window.c:246 -msgid "Nothing selected" -msgstr "Ingenting markerat" +#: ../data/org.gnome.almanah.gschema.xml.in.h:2 +msgid "" +"The ID of the key to use to encrypt and decrypt the database, if Almanah has " +"been built with encryption support. Leave blank to disable database " +"encryption." +msgstr "" +"Id för nyckeln som ska användas för att kryptera och dekryptera databasen om " +"Almanah har byggts med krypteringsstöd. Lämna tom för att inaktivera " +"databaskryptering." -#: ../data/almanah.ui.h:17 -msgid "Past Event List" -msgstr "Lista över tidigare händelser" +#: ../data/org.gnome.almanah.gschema.xml.in.h:3 +msgid "Spell checking language" +msgstr "Språk för stavningskontroll" -#: ../data/almanah.ui.h:18 -msgid "Past Events" -msgstr "Tidigare händelser" +#: ../data/org.gnome.almanah.gschema.xml.in.h:4 +msgid "The locale specifier of the language in which to check entry spellings." +msgstr "" +"Lokalangivaren för språket i vilket posterna ska stavningskontrolleras." -#: ../data/almanah.ui.h:19 -msgid "Pr_eferences" -msgstr "Ins_tällningar" +#: ../data/org.gnome.almanah.gschema.xml.in.h:5 +msgid "Spell checking enabled?" +msgstr "Stavningskontroll aktiverad?" -#: ../data/almanah.ui.h:20 -msgid "Remove the definition from the currently selected text." -msgstr "Ta bort definitionen från den markerade texten." +#: ../data/org.gnome.almanah.gschema.xml.in.h:6 +msgid "Whether spell checking of entries is enabled." +msgstr "Huruvida stavningskontroll av poster är aktiverad." -#: ../data/almanah.ui.h:21 -msgid "Result List" -msgstr "Resultatlista" +#: ../src/application.c:255 +msgid "Error opening database" +msgstr "Fel vid öppnande av databasen" -#: ../data/almanah.ui.h:22 -msgid "Results:" -msgstr "Resultat:" +#: ../src/application.c:332 +msgid "Enable debug mode" +msgstr "Aktivera felsökningsläge" -#: ../data/almanah.ui.h:23 -#: ../src/search-dialog.c:60 -msgid "Search" -msgstr "Sök" +#: ../src/application.c:349 +msgid "" +"Manage your diary. Only one instance of the program may be open at any time." +msgstr "" +"Hantera din dagbok. Endast en instans av programmet kan köras samtidigt." -#: ../data/almanah.ui.h:24 -msgid "Search entry" -msgstr "Sök post" +#. Print an error +#: ../src/application.c:360 +#, c-format +msgid "Command line options could not be parsed: %s\n" +msgstr "Kommandoradsflaggor kunde inte tolkas: %s\n" -#: ../data/almanah.ui.h:25 -msgid "Select Date…" -msgstr "Välj datum..." +#: ../src/application.c:379 +msgid "Error encrypting database" +msgstr "Fel vid kryptering av databasen" -#: ../data/almanah.ui.h:26 -msgid "Successful Entries" -msgstr "Lyckade poster" +#: ../src/application.c:522 +msgid "" +"Almanah is free software: you can redistribute it and/or modify it under the " +"terms of the GNU General Public License as published by the Free Software " +"Foundation, either version 3 of the License, or (at your option) any later " +"version." +msgstr "" +"Almanah är fri programvara. Du kan distribuera det och/eller modifiera det " +"under villkoren i GNU General Public License, publicerad av Free Software " +"Foundation, antingen version 3 eller (om du så vill) någon senare version." -#: ../data/almanah.ui.h:27 -msgid "Toggle whether the current entry is marked as important." -msgstr "Växla huruvida den aktuella posten är markerad som viktig." - -#: ../data/almanah.ui.h:28 -msgid "Toggle whether the currently selected text is bold." -msgstr "Växla huruvida den markerade texten är med fet stil." - -#: ../data/almanah.ui.h:29 -msgid "Toggle whether the currently selected text is italic." -msgstr "Växla huruvida den markerade texten är med kursiv stil." - -#: ../data/almanah.ui.h:30 -msgid "Toggle whether the currently selected text is underlined." -msgstr "Växla huruvida den markerade texten är understruken." - -#: ../data/almanah.ui.h:31 -msgid "View" -msgstr "Visa" +#: ../src/application.c:526 +msgid "" +"Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " +"details." +msgstr "" +"Almanah distribueras i hopp om att det ska vara användbart, men UTAN NÅGON " +"SOM HELST GARANTI, även utan underförstådd garanti om SÄLJBARHET eller " +"LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General Public License för " +"ytterligare information." -#: ../data/almanah.ui.h:32 -msgid "View Entry" -msgstr "Visa post" +#: ../src/application.c:530 +msgid "" +"You should have received a copy of the GNU General Public License along with " +"Almanah. If not, see ." +msgstr "" +"Du bör ha fått en kopia av GNU General Public License tillsammans med " +"Almanah. Om inte, se ." -#: ../data/almanah.ui.h:33 -msgid "View Event" -msgstr "Visa händelse" - -#: ../data/almanah.ui.h:34 -msgid "_Add Definition" -msgstr "_Lägg till definition" - -#: ../data/almanah.ui.h:35 -msgid "_Definitions" -msgstr "_Definitioner" +#: ../src/application.c:545 +#, c-format +msgid "A helpful diary keeper, storing %u entries." +msgstr "Ett behjälpligt dagboksprogram, lagrar %u poster." -#: ../data/almanah.ui.h:36 -msgid "_Edit" -msgstr "R_edigera" +#: ../src/application.c:549 +msgid "Copyright © 2008-2009 Philip Withnall" +msgstr "Copyright © 2008-2009 Philip Withnall" -#: ../data/almanah.ui.h:37 -msgid "_Export…" -msgstr "_Exportera…" - -#: ../data/almanah.ui.h:38 -msgid "_File" -msgstr "_Arkiv" - -#: ../data/almanah.ui.h:39 -msgid "_Help" -msgstr "_Hjälp" - -#: ../data/almanah.ui.h:40 -msgid "_Import…" -msgstr "_Importera…" - -#: ../data/almanah.ui.h:41 -msgid "_Print…" -msgstr "Skriv _ut…" - -#: ../data/almanah.ui.h:42 -msgid "_Remove Definition" -msgstr "_Ta bort definition" - -#: ../data/almanah.ui.h:43 -msgid "_Search…" -msgstr "_Sök..." - -#: ../data/almanah.ui.h:44 -msgid "_View Definitions" -msgstr "_Visa definitioner" +#. Translators: please include your names here to be credited for your hard work! +#. * Format: +#. * "Translator name 1 \n" +#. * "Translator name 2 " +#. +#: ../src/application.c:557 +msgid "translator-credits" +msgstr "" +"Daniel Nylander \n" +"Anders Jonsson \n" +"Josef Andersson \n" +"\n" +"Skicka synpunkter på översättningen till\n" +"." -#: ../data/almanah.ui.h:45 -msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." -msgstr "t.ex. \"14/03/2009\" eller \"14 mars 2009\"." +#: ../src/application.c:561 +msgid "Almanah Website" +msgstr "Webbplats för Almanah" -#: ../src/add-definition-dialog.c:81 -msgid "Add Definition" -msgstr "Lägg till definition" - -#: ../src/add-definition-dialog.c:163 -#: ../src/date-entry-dialog.c:130 -#: ../src/import-export-dialog.c:111 -#: ../src/import-export-dialog.c:413 -#: ../src/definition-manager-window.c:132 -#: ../src/main-window.c:171 -#: ../src/preferences-dialog.c:144 -#: ../src/search-dialog.c:86 +#: ../src/application.c:589 #, c-format -msgid "UI file \"%s\" could not be loaded" -msgstr "Användargränssnittsfilen \"%s\" kunde inte läsas in" +msgid "" +"Couldn't load the CSS resources. The interface might not be styled " +"correctly: %s" +msgstr "" +"Kunde inte läsa in CSS-resurser. Gränssnittet kanske inte visas korrekt: %s" -#: ../src/date-entry-dialog.c:73 +#: ../src/date-entry-dialog.c:72 msgid "Select Date" msgstr "Välj datum" -#: ../src/events/calendar-appointment.c:49 +#: ../src/date-entry-dialog.c:127 ../src/import-export-dialog.c:169 +#: ../src/import-export-dialog.c:475 ../src/main-window.c:225 +#: ../src/preferences-dialog.c:177 ../src/search-dialog.c:95 +#: ../src/uri-entry-dialog.c:126 +msgid "UI data could not be loaded" +msgstr "Användargränssnittsfilen kunde inte läsas in" + +#: ../src/entry.c:303 +#, c-format +msgid "Invalid data version number %u." +msgstr "Ogiltigt dataversionsnummer %u." + +#: ../src/events/calendar-appointment.c:51 msgid "Calendar Appointment" msgstr "Kalendermöte" -#: ../src/events/calendar-appointment.c:50 +#: ../src/events/calendar-appointment.c:52 msgid "An appointment on an Evolution calendar." msgstr "Ett möte i en Evolution-kalender." -#: ../src/events/calendar-appointment.c:120 -#: ../src/events/calendar-task.c:109 +#. Translators: This is a time string with the format hh:mm +#: ../src/events/calendar-appointment.c:89 ../src/events/calendar-task.c:90 +#, c-format +msgid "%.2d:%.2d" +msgstr "%.2d:%.2d" + +#: ../src/events/calendar-appointment.c:135 ../src/events/calendar-task.c:125 msgid "Error launching Evolution" msgstr "Fel vid start av Evolution" -#: ../src/events/calendar-task.c:49 +#: ../src/events/calendar-task.c:51 msgid "Calendar Task" msgstr "Kalenderaktivitet" -#: ../src/events/calendar-task.c:50 +#: ../src/events/calendar-task.c:52 msgid "A task on an Evolution calendar." msgstr "En uppgift i en Evolution-kalender." -#: ../src/export-operation.c:46 -#: ../src/import-operation.c:46 +#: ../src/export-operation.c:47 ../src/import-operation.c:45 msgid "Text Files" msgstr "Textfiler" -#: ../src/export-operation.c:47 -msgid "Select a _folder to export the entries to as text files, one per entry, with names in the format 'yyyy-mm-dd', and no extension. All entries will be exported, unencrypted in plain text format." -msgstr "Välj en _mapp att exportera posterna till som textfiler, en per post, med namn i formatet \"åååå-mm-dd\" och utan filändelse. Var och en av dessa poster kommer att exporteras som vanliga okrypterade textfiler." +#: ../src/export-operation.c:48 +msgid "" +"Select a _folder to export the entries to as text files, one per entry, with " +"names in the format 'yyyy-mm-dd', and no extension. All entries will be " +"exported, unencrypted in plain text format." +msgstr "" +"Välj en _mapp att exportera posterna till som textfiler, en per post, med " +"namn i formatet ”åååå-mm-dd” och utan filändelse. Var och en av dessa poster " +"kommer att exporteras som vanliga okrypterade textfiler." -#: ../src/export-operation.c:51 -#: ../src/import-operation.c:51 +#: ../src/export-operation.c:52 ../src/import-operation.c:50 msgid "Database" msgstr "Databas" -#: ../src/export-operation.c:52 -msgid "Select a _filename for a complete copy of the unencrypted Almanah Diary database to be given." -msgstr "Välj ett _filnamn för en komplett kopia av den okrypterade Almanah-dagboksdatabasen." +#: ../src/export-operation.c:53 +msgid "" +"Select a _filename for a complete copy of the unencrypted Almanah Diary " +"database to be given." +msgstr "" +"Välj ett _filnamn för en komplett kopia av den okrypterade Almanah-" +"dagboksdatabasen." + +#: ../src/export-operation.c:256 ../src/export-operation.c:313 +#, c-format +msgid "Error changing exported file permissions: %s" +msgstr "Fel vid ändring av exporterade filrättigheter: %s" -#: ../src/import-export-dialog.c:144 +#: ../src/gtk/menus.ui.h:1 +msgid "_Search" +msgstr "_Sök" + +#: ../src/gtk/menus.ui.h:2 +msgid "Pr_eferences" +msgstr "Ins_tällningar" + +#: ../src/gtk/menus.ui.h:3 +msgctxt "Main menu" +msgid "_Import" +msgstr "_Import" + +#: ../src/gtk/menus.ui.h:4 +msgctxt "Main menu" +msgid "_Export" +msgstr "_Export" + +#: ../src/gtk/menus.ui.h:5 +msgid "_Print diary" +msgstr "Skriv _ut dagbok" + +#: ../src/gtk/menus.ui.h:6 +msgid "_About Almanah Diary" +msgstr "_Om Almanah dagbok" + +#: ../src/gtk/menus.ui.h:7 +msgid "_Quit" +msgstr "A_vsluta" + +#: ../src/gtk/menus.ui.h:8 +msgid "_Bold" +msgstr "_Fet" + +#: ../src/gtk/menus.ui.h:9 +msgid "_Italic" +msgstr "_Kursiv" + +#: ../src/gtk/menus.ui.h:10 +msgid "_Underline" +msgstr "_Understruken" + +#: ../src/gtk/menus.ui.h:11 +msgid "_Cut" +msgstr "_Klipp ut" + +#: ../src/gtk/menus.ui.h:12 +msgid "_Copy" +msgstr "_Kopiera" + +#: ../src/gtk/menus.ui.h:13 +msgid "_Paste" +msgstr "_Klistra in" + +#: ../src/gtk/menus.ui.h:14 ../src/main-window.c:626 +msgid "_Delete" +msgstr "_Ta bort" + +#: ../src/gtk/menus.ui.h:15 +msgid "Insert _Time" +msgstr "Infoga _tid" + +#: ../src/gtk/menus.ui.h:16 +msgid "Add/Remove _Hyperlink" +msgstr "Lägg till/Ta bort _hyperlänk" + +#: ../src/import-export-dialog.c:203 msgid "Import _mode: " -msgstr "Importerings_läge:" +msgstr "Import_läge: " -#: ../src/import-export-dialog.c:144 +#: ../src/import-export-dialog.c:203 msgid "Export _mode: " -msgstr "Exporterin_gsläge:" +msgstr "Export_läge: " #. Set the window title -#: ../src/import-export-dialog.c:147 +#: ../src/import-export-dialog.c:206 msgid "Import Entries" msgstr "Importera poster" -#: ../src/import-export-dialog.c:147 +#: ../src/import-export-dialog.c:206 msgid "Export Entries" msgstr "Exportera poster" -#. Set the button label -#: ../src/import-export-dialog.c:150 +#: ../src/import-export-dialog.c:210 +msgctxt "Dialog button" msgid "_Import" msgstr "_Importera" -#: ../src/import-export-dialog.c:150 +#: ../src/import-export-dialog.c:210 +msgctxt "Dialog button" msgid "_Export" msgstr "_Exportera" -#: ../src/import-export-dialog.c:187 +#: ../src/import-export-dialog.c:247 msgid "Import failed" msgstr "Importen misslyckades" -#: ../src/import-export-dialog.c:225 +#: ../src/import-export-dialog.c:285 msgid "Export failed" msgstr "Exporten misslyckades" -#: ../src/import-export-dialog.c:238 +#: ../src/import-export-dialog.c:298 msgid "Export successful" msgstr "Exporten lyckades" -#: ../src/import-export-dialog.c:239 +#: ../src/import-export-dialog.c:299 msgid "The diary was successfully exported." msgstr "Export av dagboken lyckades." -#: ../src/import-export-dialog.c:387 +#: ../src/import-export-dialog.c:447 msgid "Import Results" msgstr "Resultat av import" @@ -387,37 +441,45 @@ #. Translators: This is a strftime()-format string for the date displayed at the top of the main window. #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. -#: ../src/import-export-dialog.c:480 -#: ../src/main-window.c:394 -#: ../src/main-window.c:419 -#: ../src/main-window.c:1058 -#: ../src/printing.c:263 -#: ../src/search-dialog.c:160 +#: ../src/import-export-dialog.c:542 ../src/main-window.c:587 +#: ../src/main-window.c:618 ../src/main-window.c:1225 ../src/printing.c:263 +#: ../src/search-dialog.c:180 msgid "%A, %e %B %Y" msgstr "%A, %e %B %Y" -#: ../src/import-operation.c:47 -msgid "Select a _folder containing text files, one per entry, with names in the format 'yyyy-mm-dd', and no extension. Any and all such files will be imported." -msgstr "Välj en _mapp som innehåller textfiler, en per post, med namn i formatet \"åååå-mm-dd\" och utan filändelse. Var och en av dessa filer kommer att importeras." +#: ../src/import-operation.c:46 +msgid "" +"Select a _folder containing text files, one per entry, with names in the " +"format 'yyyy-mm-dd', and no extension. Any and all such files will be " +"imported." +msgstr "" +"Välj en _mapp som innehåller textfiler, en per post, med namn i formatet " +"”åååå-mm-dd” och utan filändelse. Var och en av dessa filer kommer att " +"importeras." -#: ../src/import-operation.c:52 +#: ../src/import-operation.c:51 msgid "Select a database _file created by Almanah Diary to import." -msgstr "Välj en _databasfil att importera som skapats av dagboksprogrammet Almanah." +msgstr "" +"Välj en _databasfil att importera som skapats av dagboksprogrammet Almanah." -#: ../src/import-operation.c:199 +#: ../src/import-operation.c:248 #, c-format msgid "Error deserializing imported entry into buffer: %s" msgstr "Fel vid deserialisering av importerad post i buffert: %s" -#: ../src/import-operation.c:215 +#: ../src/import-operation.c:264 #, c-format -msgid "Error deserializing existing entry into buffer; overwriting with imported entry: %s" -msgstr "Fel vid deserialisering av befintlig post i buffert, skriver över med importerad post: %s" +msgid "" +"Error deserializing existing entry into buffer; overwriting with imported " +"entry: %s" +msgstr "" +"Fel vid deserialisering av befintlig post i buffert, skriver över med " +"importerad post: %s" #. Append some header text for the imported entry #. Translators: This text is appended to an existing entry when an entry is being imported to the same date. #. * The imported entry is appended to this text. -#: ../src/import-operation.c:256 +#: ../src/import-operation.c:305 #, c-format msgid "" "\n" @@ -427,192 +489,91 @@ msgstr "" "\n" "\n" -"Post importerad från \"%s\":\n" +"Post importerad från ”%s”:\n" "\n" -#: ../src/definition-manager-window.c:72 -msgid "Definition Manager" -msgstr "Definitionshanterare" - -#: ../src/definition-manager-window.c:203 -#, c-format -msgid "Are you sure you want to delete the definition for \"%s\"?" -msgstr "Är du säker på att du vill ta bort definitionen för \"%s\"?" - -#: ../src/definitions/contact.c:53 -msgid "Contact" -msgstr "Kontakt" - -#: ../src/definitions/contact.c:54 -msgid "An Evolution contact." -msgstr "En Evolution-kontakt." - -#: ../src/definitions/contact.c:73 -msgid "Select Contact" -msgstr "Välj kontakt" - -#: ../src/definitions/contact.c:103 -#: ../src/definitions/contact.c:224 -msgid "Error opening contact" -msgstr "Fel vid öppnande av kontakten" - -#: ../src/definitions/contact.c:136 -msgid "Error opening Evolution" -msgstr "Fel vid öppnande av Evolution" - -#: ../src/definitions/file.c:48 -msgid "File" -msgstr "Fil" - -#: ../src/definitions/file.c:49 -msgid "An attached file." -msgstr "En bifogad fil." - -#: ../src/definitions/file.c:74 -msgid "Error opening file" -msgstr "Fel vid öppnade av filen" - -#: ../src/definitions/file.c:93 -msgid "Select File" -msgstr "Välj fil" - -#: ../src/definitions/note.c:49 -msgid "Note" -msgstr "Anteckning" - -#: ../src/definitions/note.c:50 -msgid "A note about an important event." -msgstr "En anteckning om en viktig händelse." - -#: ../src/definitions/uri.c:50 -msgid "URI" -msgstr "URI" - -#: ../src/definitions/uri.c:51 -msgid "A URI of a file or web page." -msgstr "En URI till en fil eller webbsida." - -#: ../src/definitions/uri.c:76 -msgid "Error opening URI" -msgstr "Fel vid öppnande av URI" - -#: ../src/definitions/uri.c:99 -msgid "URI: " -msgstr "URI: " - -#: ../src/main-window.c:398 +#: ../src/main-window.c:591 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" msgstr "Är du säker på att du vill redigera denna dagbokspost för %s?" -#: ../src/main-window.c:423 +#: ../src/main-window.c:594 ../src/main-window.c:625 +msgid "_Cancel" +msgstr "_Avbryt" + +#: ../src/main-window.c:595 +msgid "_Edit" +msgstr "R_edigera" + +#: ../src/main-window.c:622 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" msgstr "Är du säker på att du vill ta bort denna dagbokspost för %s?" #. Print a warning about the unknown tag -#: ../src/main-window.c:610 +#: ../src/main-window.c:732 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." -msgstr "Okänd eller dubblett texttagg \"%s\" i post. Ignorerar." - -#: ../src/main-window.c:891 -msgid "Almanah is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version." -msgstr "Almanah är fri programvara. Du kan distribuera det och/eller modifiera det under villkoren i GNU General Public License, publicerad av Free Software Foundation, antingen version 3 eller (om du så vill) någon senare version." - -#: ../src/main-window.c:895 -msgid "Almanah is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details." -msgstr "Almanah distribueras i hopp om att det ska vara användbart, men UTAN NÅGON SOM HELST GARANTI, även utan underförstådd garanti om SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General Public License för ytterligare information." +msgstr "Okänd eller dubblett texttagg ”%s” i post. Ignorerar." -#: ../src/main-window.c:899 -msgid "You should have received a copy of the GNU General Public License along with Almanah. If not, see ." -msgstr "Du bör ha fått en kopia av GNU General Public License tillsammans med Almanah. Om inte, se ." +#: ../src/main-window.c:973 +msgid "Error opening URI" +msgstr "Fel vid öppnande av URI" -#: ../src/main-window.c:910 +#. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place +#: ../src/main-window.c:1152 #, c-format -msgid "A helpful diary keeper, storing %u entries and %u definitions." -msgstr "Ett behjälpligt dagboksprogram, lagrar %u poster och %u definitioner." - -#: ../src/main-window.c:916 -msgid "Copyright © 2008-2009 Philip Withnall" -msgstr "Copyright © 2008-2009 Philip Withnall" +msgid "%s @ %s" +msgstr "%s @ %s" -#. Translators: please include your names here to be credited for your hard work! -#. * Format: -#. * "Translator name 1 \n" -#. * "Translator name 2 " -#. -#: ../src/main-window.c:924 -msgid "translator-credits" -msgstr "" -"Daniel Nylander \n" -"\n" -"Skicka synpunkter på översättningen till\n" -"." - -#: ../src/main-window.c:928 -msgid "Almanah Website" -msgstr "Webbplats för Almanah" - -#: ../src/main-window.c:1085 +#: ../src/main-window.c:1258 msgid "Entry content could not be loaded" msgstr "Postens innehåll kunde inte läsas in" -#: ../src/main.c:38 -msgid "Error encrypting database" -msgstr "Fel vid kryptering av databasen" - -#: ../src/main.c:125 -msgid "Enable debug mode" -msgstr "Aktivera felsökningsläge" - -#. Options -#: ../src/main.c:141 -msgid "- Manage your diary" -msgstr "- Hantera din dagbok" - -#: ../src/main.c:151 -msgid "Command-line options could not be parsed" -msgstr "Kommandoradsflaggor kunde inte tolkas" +#. Translators: this sentence is just used in startup to estimate the width +#. of a 15 words sentence. Translate with some randome sentences with just 15 words. +#. See: https://bugzilla.gnome.org/show_bug.cgi?id=754841 +#: ../src/main-window.c:1414 +msgid "" +"This is just a fifteen words sentence to calculate the diary entry text view " +"size" +msgstr "" +"Detta är en mening på femton ord för att beräkna längden på poster i dagboken" -#: ../src/main.c:182 -msgid "Error opening database" -msgstr "Fel vid öppnande av databasen" +#: ../src/main-window.c:1450 +msgid "Spelling checker could not be initialized" +msgstr "Stavningskontrollen kunde inte initieras" -#: ../src/preferences-dialog.c:80 -msgid "Almanah Preferences" -msgstr "Inställningar för Almanah" +#: ../src/preferences-dialog.c:83 +msgid "Preferences" +msgstr "Inställningar" #. Grab our child widgets -#: ../src/preferences-dialog.c:169 +#: ../src/preferences-dialog.c:204 msgid "Encryption key: " msgstr "Krypteringsnyckel: " -#: ../src/preferences-dialog.c:174 +#: ../src/preferences-dialog.c:208 msgid "None (don't encrypt)" msgstr "Ingen (kryptera inte)" -#: ../src/preferences-dialog.c:198 +#: ../src/preferences-dialog.c:213 msgid "New _Key" msgstr "Ny n_yckel" #. Set up the "Enable spell checking" check button -#: ../src/preferences-dialog.c:205 +#: ../src/preferences-dialog.c:237 msgid "Enable _spell checking" msgstr "Aktivera _stavningskontroll" -#: ../src/preferences-dialog.c:235 +#: ../src/preferences-dialog.c:262 msgid "Error saving the encryption key" msgstr "Fel vid sparande av krypteringsnyckeln" -#: ../src/preferences-dialog.c:254 +#: ../src/preferences-dialog.c:281 msgid "Error opening Seahorse" msgstr "Fel vid öppnande av Seahorse" -#: ../src/preferences-dialog.c:293 -msgid "Spelling checker could not be initialized" -msgstr "Stavningskontrollen kunde inte initieras" - #: ../src/printing.c:277 msgid "This entry is marked as important." msgstr "Denna post är markerad som viktig." @@ -634,113 +595,404 @@ msgid "Line spacing:" msgstr "Radutrymme:" -#: ../src/storage-manager.c:257 +#: ../src/search-dialog.c:221 +msgid "Search canceled." +msgstr "Sökning avbruten." + +#. Translators: This is an error message wrapper for when searches encounter an error. The placeholder is for an error message. +#: ../src/search-dialog.c:224 +#, c-format +msgid "Error: %s" +msgstr "Fel: %s" + +#. Success! +#: ../src/search-dialog.c:229 +#, c-format +msgid "Found %d entry:" +msgid_plural "Found %d entries:" +msgstr[0] "Hittade %d post:" +msgstr[1] "Hittade %d poster:" + +#: ../src/search-dialog.c:278 +msgid "Searching…" +msgstr "Söker…" + +#: ../src/storage-manager.c:248 +#, c-format +msgid "" +"Could not open database \"%s\". SQLite provided the following error message: " +"%s" +msgstr "Kunde inte öppna databasen ”%s”. SQLite gav följande felmeddelande: %s" + +#: ../src/storage-manager.c:291 +#, c-format +msgid "" +"Could not run query \"%s\". SQLite provided the following error message: %s" +msgstr "Kunde inte köra frågan \"%s\". SQLite gav följande felmeddelande: %s" + +#: ../src/storage-manager.c:597 +msgid "Error deserializing entry into buffer while searching." +msgstr "Fel vid deserialisering av post i buffert under sökning." + +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Ange URI" + +#: ../src/vfs.c:239 #, c-format msgid "GPGME is not at least version %s" msgstr "GPGME är inte minst version %s" -#: ../src/storage-manager.c:266 +#: ../src/vfs.c:246 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "GPGME har inte stöd för OpenPGP: %s" -#: ../src/storage-manager.c:275 +#: ../src/vfs.c:253 #, c-format msgid "Error creating cipher context: %s" msgstr "Fel vid skapande av chiffersammanhang: %s" -#: ../src/storage-manager.c:304 +#: ../src/vfs.c:273 #, c-format -msgid "Error opening encrypted database file \"%s\": %s" -msgstr "Fel vid öppnade av krypterade databasfilen \"%s\": %s" +msgid "Can't create a new GIOChannel for the encrypted database: %s" +msgstr "Kan inte skapa ny GIOChannel för den krypterade databasen: %s" -#: ../src/storage-manager.c:323 +#: ../src/vfs.c:281 #, c-format -msgid "Error opening plain database file \"%s\": %s" -msgstr "Fel vid öppnade av vanliga databasfilen \"%s\": %s" +msgid "Error opening encrypted database file \"%s\": %s" +msgstr "Fel vid öppnande av krypterade databasfilen ”%s”: %s" -#: ../src/storage-manager.c:371 -msgid "The encrypted database is empty. The plain database file has been left undeleted as backup." -msgstr "Krypterade databasen är tom. Den vanliga databasfilen har lämnats kvar som säkerhetskopia." +#: ../src/vfs.c:297 +#, c-format +msgid "Error creating Callback base data buffer: %s" +msgstr "Fel vid skapande av en basdatabuffert för Callback: %s" -#. Delete the plain file -#: ../src/storage-manager.c:374 +#: ../src/vfs.c:305 #, c-format -msgid "Could not delete plain database file \"%s\"." -msgstr "Kunde inte ta bort vanliga databasfilen \"%s\"." +msgid "Can't create a new GIOChannel for the plain database: %s" +msgstr "Kan inte skapa ny GIOChannel för databasen: %s" -#: ../src/storage-manager.c:415 +#: ../src/vfs.c:313 #, c-format -msgid "Error decrypting database: %s" -msgstr "Fel vid dekryptering av databas: %s" +msgid "Error opening plain database file \"%s\": %s" +msgstr "Fel vid öppnande av databasfilen ”%s”: %s" -#: ../src/storage-manager.c:449 +#: ../src/vfs.c:409 #, c-format msgid "Error getting encryption key: %s" msgstr "Fel vid hämtning av krypteringsnyckel: %s" -#: ../src/storage-manager.c:470 +#: ../src/vfs.c:433 ../src/vfs.c:439 #, c-format msgid "Error encrypting database: %s" msgstr "Fel vid kryptering av databas: %s" -#: ../src/storage-manager.c:572 +#. Translators: The first and second params are file paths, the last param is an error message. +#: ../src/vfs.c:489 #, c-format -msgid "Could not open database \"%s\". SQLite provided the following error message: %s" -msgstr "Kunde inte öppna databasen \"%s\". SQLite gav följande felmeddelande: %s" +msgid "Error copying the file from %s to %s: %s" +msgstr "Fel vid kopiering av filen från %s till %s: %s" -#: ../src/storage-manager.c:647 +#: ../src/vfs.c:495 #, c-format -msgid "Could not run query \"%s\". SQLite provided the following error message: %s" -msgstr "Kunde inte köra frågan \"%s\". SQLite gav följande felmeddelande: %s" +msgid "Error changing database backup file permissions: %s" +msgstr "Fel vid ändring av rättigheter för säkerhetskopia av databas: %s" -#: ../src/storage-manager.c:964 -msgid "Error deserializing entry into buffer while searching." -msgstr "Fel vid deserialisering av post i buffert under sökning." +#: ../src/vfs.c:595 +#, c-format +msgid "Error closing file: %s" +msgstr "Fel vid stängning av filen: %s" + +#. Translators: the first parameter is a filename, the second is an error message. +#. Translators: the first parameter is a filename. +#: ../src/vfs.c:994 ../src/vfs.c:1021 +#, c-format +msgid "Error backing up file ‘%s’" +msgstr "Fel vid säkerhetskopiering av filen ”%s”" + +#: ../src/vfs.c:1007 +#, c-format +msgid "Error decrypting database: %s" +msgstr "Fel vid dekryptering av databas: %s" + +#: ../src/vfs.c:1047 +#, c-format +msgid "Error changing database file permissions: %s" +msgstr "Fel vid ändring av filrättigheter för databas: %s" + +#: ../src/widgets/calendar-button.c:142 +#, c-format +msgid "UI data could not be loaded: %s" +msgstr "Användargränssnittsfilen kunde inte läsas in: %s" + +#: ../src/widgets/calendar-button.c:152 +msgid "Can't load calendar window object from UI file" +msgstr "Kan inte läsa in kalenderfönsterobjekt från användargränssnittsfil" #. Translators: This is the detail string for important days as displayed in the calendar. -#: ../src/widgets/calendar.c:116 +#: ../src/widgets/calendar.c:176 msgid "Important!" msgstr "Viktigt!" +#: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:166 +msgid "add tag" +msgstr "lägg till tagg" + +#: ../src/widgets/entry-tags-area.c:101 +msgid "Write the tag and press enter to save it" +msgstr "Skriv in taggen och tryck retur för att spara den" + +#: ../src/widgets/tag-accessible.c:165 +msgid "Remove the tag from the entry" +msgstr "Ta bort taggen från posten" + +#. Looks like gtk_widget_set_tooltip_text don't works here, even in the init... ? +#: ../src/widgets/tag.c:416 +msgid "Remove tag" +msgstr "Ta bort tagg" + +#: ../src/widgets/tag-entry.c:85 +msgid "Tag entry" +msgstr "Tagga post" + +#~ msgid "Almanah Preferences" +#~ msgstr "Inställningar för Almanah" + +#~ msgid "F_ormat" +#~ msgstr "F_ormat" + +#~ msgid "Toggle whether the currently selected text is bold." +#~ msgstr "Växla huruvida den markerade texten är med fet stil." + +#~ msgid "Toggle whether the currently selected text is italic." +#~ msgstr "Växla huruvida den markerade texten är med kursiv stil." + +#~ msgid "Toggle whether the currently selected text is underlined." +#~ msgstr "Växla huruvida den markerade texten är understruken." + +#~ msgid "" +#~ "Add or remove a hyperlink from the currently selected text to a specified " +#~ "URI." +#~ msgstr "" +#~ "Lägg till eller ta bort en hyperlänk från den nu markerade texten till en " +#~ "angiven URI." + +#~ msgid "I_mportant" +#~ msgstr "_Viktigt" + +#~ msgid "Toggle whether the current entry is marked as important." +#~ msgstr "Växla huruvida den aktuella posten är markerad som viktig." + +#~ msgid "Show tags" +#~ msgstr "Visa taggar" + +#~ msgid "Show tags for the current entry" +#~ msgstr "Visa taggar för den aktuella posten" + +#~ msgid "_Help" +#~ msgstr "_Hjälp" + +#~ msgid "Jump to the current date in the diary." +#~ msgstr "Hoppa till aktuellt datum i dagboken." + +#~ msgid "" +#~ "The encrypted database is empty. The plain database file has been left " +#~ "undeleted as backup." +#~ msgstr "" +#~ "Krypterade databasen är tom. Den vanliga databasfilen har lämnats kvar " +#~ "som säkerhetskopia." + +#~ msgid "Could not delete plain database file \"%s\"." +#~ msgstr "Kunde inte ta bort vanliga databasfilen ”%s”." + +#~ msgid "Unknown input device" +#~ msgstr "Okänd inmatningsenhet" + +#~ msgid "Main window X position" +#~ msgstr "Huvudfönstrets X-position" + +#~ msgid "Main window Y position" +#~ msgstr "Huvudfönstrets Y-position" + +#~ msgid "Main window height" +#~ msgstr "Huvudfönstrets höjd" + +#~ msgid "Main window maximization" +#~ msgstr "Maximering av huvudfönstret" + +#~ msgid "Main window width" +#~ msgstr "Huvudfönstrets bredd" + +#~ msgid "The X position of the main window." +#~ msgstr "X-positionen för huvudfönstret." + +#~ msgid "The Y position of the main window." +#~ msgstr "Y-positionen för huvudfönstret." + +#~ msgid "The height of the main window." +#~ msgstr "Höjden på huvudfönstret." + +#~ msgid "The width of the main window." +#~ msgstr "Bredden för huvudfönstret." + +#~ msgid "Whether the main window should start maximized." +#~ msgstr "Huruvida huvudfönstret ska startas maximerat." + +#~ msgid "Add a definition for the currently selected text." +#~ msgstr "Lägg till en definition för den markerade texten." + +#~ msgid "Definition Description" +#~ msgstr "Definitionsbeskrivning" + +#~ msgid "Definition List" +#~ msgstr "Definitionslista" + +#~ msgid "Definition Type" +#~ msgstr "Definitionstyp" + +#~ msgid "Definition type:" +#~ msgstr "Definitionstyp:" + +#~ msgid "Nothing selected" +#~ msgstr "Ingenting markerat" + +#~ msgid "Results:" +#~ msgstr "Resultat:" + +#~ msgid "View" +#~ msgstr "Visa" + +#~ msgid "View Event" +#~ msgstr "Visa händelse" + +#~ msgid "_Add Definition" +#~ msgstr "_Lägg till definition" + +#~ msgid "_Definitions" +#~ msgstr "_Definitioner" + +#~ msgid "_Export…" +#~ msgstr "_Exportera…" + +#~ msgid "_File" +#~ msgstr "_Arkiv" + +#~ msgid "_Import…" +#~ msgstr "_Importera…" + +#~ msgid "_Print…" +#~ msgstr "Skriv _ut…" + +#~ msgid "_Remove Definition" +#~ msgstr "_Ta bort definition" + +#~ msgid "_View Definitions" +#~ msgstr "_Visa definitioner" + +#~ msgid "Add Definition" +#~ msgstr "Lägg till definition" + +#~ msgid "Definition Manager" +#~ msgstr "Definitionshanterare" + +#~ msgid "Are you sure you want to delete the definition for \"%s\"?" +#~ msgstr "Är du säker på att du vill ta bort definitionen för \"%s\"?" + +#~ msgid "Contact" +#~ msgstr "Kontakt" + +#~ msgid "An Evolution contact." +#~ msgstr "En Evolution-kontakt." + +#~ msgid "Select Contact" +#~ msgstr "Välj kontakt" + +#~ msgid "Error opening contact" +#~ msgstr "Fel vid öppnande av kontakten" + +#~ msgid "Error opening Evolution" +#~ msgstr "Fel vid öppnande av Evolution" + +#~ msgid "File" +#~ msgstr "Fil" + +#~ msgid "An attached file." +#~ msgstr "En bifogad fil." + +#~ msgid "Select File" +#~ msgstr "Välj fil" + +#~ msgid "Note" +#~ msgstr "Anteckning" + +#~ msgid "A note about an important event." +#~ msgstr "En anteckning om en viktig händelse." + +#~ msgid "URI" +#~ msgstr "URI" + +#~ msgid "A URI of a file or web page." +#~ msgstr "En URI till en fil eller webbsida." + +#~ msgid "URI: " +#~ msgstr "URI: " + +#~ msgid "- Manage your diary" +#~ msgstr "- Hantera din dagbok" + #~ msgid "F-Spot Photo" #~ msgstr "F-Spot-foto" + #~ msgid "A photo stored in F-Spot." #~ msgstr "Ett foto lagrat i F-Spot." + #~ msgid "Error launching F-Spot" #~ msgstr "Fel vid start av F-Spot" + #~ msgid "Enable import mode" #~ msgstr "Aktivera importeringsläge" + #~ msgid "Description: " #~ msgstr "Beskrivning:" + #~ msgid "Type: " #~ msgstr "Typ:" + #~ msgid "%X" #~ msgstr "%X" + #~ msgid "Error closing database" #~ msgstr "Fel vid stängning av databasen" + #~ msgid "" #~ "Error getting encryption key: GConf key \"%s\" invalid or empty. Your " #~ "diary will not be encrypted; please install Seahorse and set up a default " #~ "key, or ignore this message." #~ msgstr "" -#~ "Fel vid hämtning av krypteringnyckel: GConf-nyckeln \"%s\" är ogiltig " +#~ "Fel vid hämtning av krypteringsnyckel: GConf-nyckeln \"%s\" är ogiltig " #~ "eller tom. Din dagbok kommer inte att vara krypterad; installera Seahorse " #~ "och ange en standardnyckel eller ignorera detta meddelande." + #~ msgid "Add Link" #~ msgstr "Lägg till länk" + #~ msgid "Attached Links" #~ msgstr "Bifogade länkar" #, fuzzy #~ msgid "View Link" #~ msgstr "Visa post" + #~ msgid "Due to an unknown error the file cannot be opened." #~ msgstr "På grund av ett okänt fel kunde filen inte öppnas." + #~ msgid "Due to an unknown error the URI cannot be opened." #~ msgstr "På grund av ett okänt fel kunde URI:n inte öppnas." + #~ msgid "Diary Website" #~ msgstr "Webbplatsen för Dagbok" + #~ msgid "" #~ "Both an encrypted and plaintext version of the database exist as \"%s\" " #~ "and \"%s\", and one is likely corrupt. Please delete the corrupt one (i." @@ -753,6 +1005,6 @@ #~ "som är 0 KiB stor) innan du fortsätter. Om ingen av filerna är 0 KiB kan " #~ "problemet sannolikt ha orsakats av att Dagbok inte kan kryptera " #~ "databasen. I så fall bör du flytta den första filen." + #~ msgid "%A, %e %B %Y" #~ msgstr "%A, %e %B %Y" - diff -Nru almanah-0.11.1/po/th.po almanah-0.12.0/po/th.po --- almanah-0.11.1/po/th.po 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/th.po 2019-10-07 13:45:09.000000000 +0000 @@ -12,6 +12,7 @@ "PO-Revision-Date: 2008-09-17 19:34+0700\n" "Last-Translator: อนุชิต สกุลวิไลเลิศ \n" "Language-Team: Thai \n" +"Language: th\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru almanah-0.11.1/po/tr.po almanah-0.12.0/po/tr.po --- almanah-0.11.1/po/tr.po 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/tr.po 2019-10-07 13:45:09.000000000 +0000 @@ -1,15 +1,16 @@ # Turkish translation for almanah. # Copyright (C) 2011 almanah's COPYRIGHT HOLDER # This file is distributed under the same license as the almanah package. -# Muhammet Kara , 2011, 2014. +# İşbaran Akçayır , 2015. +# Muhammet Kara , 2011, 2014, 2015, 2016. # msgid "" msgstr "" "Project-Id-Version: almanah master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=almanah&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-12-18 13:50+0000\n" -"PO-Revision-Date: 2014-06-19 15:47+0300\n" +"POT-Creation-Date: 2015-10-14 17:59+0000\n" +"PO-Revision-Date: 2016-11-30 22:59+0300\n" "Last-Translator: Muhammet Kara \n" "Language-Team: Türkçe \n" "Language: tr\n" @@ -17,56 +18,33 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Gtranslator 2.91.6\n" +"X-Generator: Gtranslator 2.91.7\n" +"X-POOTLE-MTIME: 1425020097.000000\n" #: ../data/almanah.appdata.xml.in.h:1 +msgid "Keep a diary of your life" +msgstr "Hayatınızın günlüğünü tutun" + +#: ../data/almanah.appdata.xml.in.h:2 msgid "" "Almanah Diary is an application to allow you to keep a diary of your life." msgstr "" "Almanak Günlüğü, size hayatınızın günlüğünü tutma olanağı sağlayan bir " "uygulamadır." -#: ../data/almanah.appdata.xml.in.h:2 +#: ../data/almanah.appdata.xml.in.h:3 msgid "" "You can encrypt the diary to preserve your privacy. It has editing " "abilities, including text formatting and printing and shows you a lists of " "events which happened (on your computer) for each day (such as tasks and " "appointments from Evolution)." msgstr "" +"Gizliliğinizi korumak için günlüğü şifreleyebilirsiniz. Metin biçimleme ve " +"yazdırma ve gerçekleşen olayları (bilgisayarınızda) her gün (Evolution'dan " +"görevler veya randevular gibi) gösterme gibi düzenleme yetenekleri vardır." -#: ../data/almanah-app-menu.ui.h:1 -#| msgid "Search" -msgid "_Search" -msgstr "_Ara" - -#: ../data/almanah-app-menu.ui.h:2 -msgid "Pr_eferences" -msgstr "T_ercihler" - -#. Set the button label -#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 -msgid "_Import" -msgstr "_İçe Aktar" - -#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 -msgid "_Export" -msgstr "_Dışa Aktar" - -#: ../data/almanah-app-menu.ui.h:5 -msgid "_Print diary" -msgstr "Güzlüğü _yazdır" - -#: ../data/almanah-app-menu.ui.h:6 -#| msgid "Almanah Diary" -msgid "_About Almanah Diary" -msgstr "Almanak Günlüğü _Hakkında" - -#: ../data/almanah-app-menu.ui.h:7 -msgid "_Quit" -msgstr "_Çıkış" - -#: ../data/almanah.desktop.in.h:1 ../src/application.c:132 -#: ../src/main-window.c:136 +#: ../data/almanah.desktop.in.h:1 ../src/application.c:133 +#: ../src/main-window.c:155 msgid "Almanah Diary" msgstr "Almanah Günlüğü" @@ -75,7 +53,7 @@ msgstr "Kişisel bir günlük tutun" #. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. -#: ../data/almanah.desktop.in.h:3 ../src/application.c:263 +#: ../data/almanah.desktop.in.h:3 ../src/application.c:272 msgid "Diary" msgstr "Günlük" @@ -84,134 +62,77 @@ msgid "diary;journal;" msgstr "günlük;jurnal;" -#: ../data/almanah.ui.h:1 -msgid "Select Date…" -msgstr "Tarih Seç..." - -#: ../data/almanah.ui.h:2 -msgid "F_ormat" -msgstr "B_içim" - -#: ../data/almanah.ui.h:3 -msgid "Toggle whether the currently selected text is bold." -msgstr "Geçerli olarak seçili metni kalın yap/geri al." - -#: ../data/almanah.ui.h:4 -msgid "Toggle whether the currently selected text is italic." -msgstr "Geçerli olarak seçili metni eğik yap/geri al." - -#: ../data/almanah.ui.h:5 -msgid "Toggle whether the currently selected text is underlined." -msgstr "Geçerli olarak seçili metni altı çizili yap/geri al." - -#: ../data/almanah.ui.h:6 -msgid "Add/Remove _Hyperlink" -msgstr "_Köprü Ekle/Kaldır" - -#: ../data/almanah.ui.h:7 -msgid "" -"Add or remove a hyperlink from the currently selected text to a specified " -"URI." -msgstr "" -"Şu anda seçili olan metinden belirtilen bir URI'ye köprü ekle ya da kaldır." - -#: ../data/almanah.ui.h:8 -msgid "Insert _Time" -msgstr "_Saat Ekle" - -#: ../data/almanah.ui.h:9 -msgid "I_mportant" -msgstr "Ö_nemli" - -#: ../data/almanah.ui.h:10 -msgid "Toggle whether the current entry is marked as important." -msgstr "Geçerli girdinin önemli olarak işaretlenmesini aç/kapat." - -#: ../data/almanah.ui.h:11 -msgid "Show tags" -msgstr "Etiketleri göster" - -#: ../data/almanah.ui.h:12 -#| msgid "Jump to the current date in the diary." -msgid "Show tags for the current entry" -msgstr "Geçerli girdinin etiketlerini göster" - -#: ../data/almanah.ui.h:13 -msgid "_Help" -msgstr "_Yardım" - -#: ../data/almanah.ui.h:14 -msgid "Go to _Today" -msgstr "_Bugüne Git" - -#: ../data/almanah.ui.h:15 -msgid "Jump to the current date in the diary." -msgstr "Günlükte geçerli güne atla." - -#: ../data/almanah.ui.h:16 +#: ../src/ui/almanah.ui.h:1 msgid "Calendar" msgstr "Takvim" -#: ../data/almanah.ui.h:17 +#: ../src/ui/almanah.ui.h:2 +msgid "Go to Today" +msgstr "Bugüne Git" + +#: ../src/ui/almanah.ui.h:3 +msgid "Select Date…" +msgstr "Tarih Seç..." + +#: ../src/ui/almanah.ui.h:4 msgid "Entry editing area" msgstr "Girdi düzenleme alanı" -#: ../data/almanah.ui.h:18 -#| msgid "Past Events" +#: ../src/ui/almanah.ui.h:5 msgid "Past events" msgstr "Eski olaylar" -#: ../data/almanah.ui.h:19 +#: ../src/ui/almanah.ui.h:6 msgid "Past Event List" msgstr "Eski Olay Listesi" -#: ../data/almanah.ui.h:20 +#: ../src/ui/almanah.ui.h:7 msgid "Search entry" msgstr "Girdi ara" -#: ../data/almanah.ui.h:21 ../src/search-dialog.c:69 +#: ../src/ui/almanah.ui.h:8 ../src/search-dialog.c:69 msgid "Search" msgstr "Ara" -#: ../data/almanah.ui.h:22 +#: ../src/ui/almanah.ui.h:9 msgid "Result List" msgstr "Sonuç Listesi" -#: ../data/almanah.ui.h:23 +#: ../src/ui/almanah.ui.h:10 msgid "View Entry" msgstr "Girdi Görüntüle" -#: ../data/almanah.ui.h:24 +#: ../src/ui/almanah.ui.h:11 msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." msgstr "örneğin \"14/03/2009\" ya da \"14 Mart 2009\"." -#: ../data/almanah.ui.h:25 +#: ../src/ui/almanah.ui.h:12 msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." msgstr "" "örneğin “http://google.com.tr/” ya da “file:///home/ben/Fotoğraflar/fotograf." "jpg”." -#: ../data/almanah.ui.h:26 +#: ../src/ui/almanah.ui.h:13 msgid "Successful Entries" msgstr "Başarılı Girdiler" -#: ../data/almanah.ui.h:27 +#: ../src/ui/almanah.ui.h:14 msgid "Merged Entries" msgstr "Birleştirilen Girdiler" -#: ../data/almanah.ui.h:28 +#: ../src/ui/almanah.ui.h:15 msgid "Failed Entries" msgstr "Başarısız Girdiler" -#: ../data/almanah.ui.h:29 +#: ../src/ui/almanah.ui.h:16 msgid "Import Results List" msgstr "Sonuç Listesini İçe Aktar" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 +#: ../data/org.gnome.almanah.gschema.xml.in.h:1 msgid "Database encryption key ID" msgstr "Veri tabanı şifreleme anahtarı kimliği" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +#: ../data/org.gnome.almanah.gschema.xml.in.h:2 msgid "" "The ID of the key to use to encrypt and decrypt the database, if Almanah has " "been built with encryption support. Leave blank to disable database " @@ -221,39 +142,31 @@ "açmak için kullanılacak anahtarın kimliği. Veri tabanı şifrelemeyi devre " "dışı bırakmak için bu alanı boş bırakın." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 +#: ../data/org.gnome.almanah.gschema.xml.in.h:3 msgid "Spell checking language" msgstr "İmla denetimi dili" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +#: ../data/org.gnome.almanah.gschema.xml.in.h:4 msgid "The locale specifier of the language in which to check entry spellings." msgstr "Girdi yazım denetimi yapılacak dilin yerel belirteci (locale)" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +#: ../data/org.gnome.almanah.gschema.xml.in.h:5 msgid "Spell checking enabled?" msgstr "İmla denetimi etkinleştirilsin mi?" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 +#: ../data/org.gnome.almanah.gschema.xml.in.h:6 msgid "Whether spell checking of entries is enabled." msgstr "Girdilerde yazım denetiminin etkin olup olmadığı." -#: ../src/application.c:246 +#: ../src/application.c:255 msgid "Error opening database" msgstr "Veri tabanı açılırken hata" -#. Error loading the CSS -#: ../src/application.c:275 -#, c-format -msgid "" -"Couldn't load the CSS file '%s'. The interface might not be styled correctly" -msgstr "" -"CSS dosyası '%s' yüklenemedi. Arayüz düzgün biçemlendirilmemiş olabilir." - -#: ../src/application.c:319 +#: ../src/application.c:332 msgid "Enable debug mode" msgstr "Hata ayıklama kipini etkinleştir" -#: ../src/application.c:336 +#: ../src/application.c:349 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" @@ -261,24 +174,16 @@ "olabilir." #. Print an error -#: ../src/application.c:347 +#: ../src/application.c:360 #, c-format msgid "Command line options could not be parsed: %s\n" msgstr "Komut satırı seçenekleri ayrıştırılamadı: %s\n" -#: ../src/application.c:366 +#: ../src/application.c:379 msgid "Error encrypting database" msgstr "Veri tabanı şifrelenirken hata" -#: ../src/application.c:419 ../src/date-entry-dialog.c:129 -#: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 -#: ../src/main-window.c:195 ../src/preferences-dialog.c:191 -#: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 -#, c-format -msgid "UI file \"%s\" could not be loaded" -msgstr "Kullanıcı arayüzü (UI) dosyası \"%s\" yüklenemedi" - -#: ../src/application.c:542 +#: ../src/application.c:522 msgid "" "Almanah is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -289,7 +194,7 @@ "Genel Kamu Lisansı üçüncü sürüm ya da (seçiminize istinaden) sonraki bir " "sürüm şartlarınca değiştirilebilir ve dağıtılabilir." -#: ../src/application.c:546 +#: ../src/application.c:526 msgid "" "Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -300,7 +205,7 @@ "GARANTİSİ YOKTUR; aynı zamanda BİR AMACA UYGUNLUĞU ya da SATILABİLİRLİĞİ " "garanti etmez. Daha fazla ayrıntı için GNU Genel Kamu Lisansını inceleyin." -#: ../src/application.c:550 +#: ../src/application.c:530 msgid "" "You should have received a copy of the GNU General Public License along with " "Almanah. If not, see ." @@ -309,12 +214,12 @@ "olmalısınız. Eğer almadıysanız, adresini " "ziyaret ediniz." -#: ../src/application.c:565 +#: ../src/application.c:545 #, c-format msgid "A helpful diary keeper, storing %u entries." -msgstr "" +msgstr "Kullanışlı bir günlük tutucu, %u girdi tutuyor." -#: ../src/application.c:569 +#: ../src/application.c:549 msgid "Copyright © 2008-2009 Philip Withnall" msgstr "Telif Hakkı © 2008-2009 Philip Withnall" @@ -323,18 +228,33 @@ #. * "Translator name 1 \n" #. * "Translator name 2 " #. -#: ../src/application.c:577 +#: ../src/application.c:557 msgid "translator-credits" -msgstr "Muhammet Kara " +msgstr "Muhammet Kara " -#: ../src/application.c:581 +#: ../src/application.c:561 msgid "Almanah Website" msgstr "Almanah Web Sitesi" +#: ../src/application.c:589 +#, c-format +msgid "" +"Couldn't load the CSS resources. The interface might not be styled " +"correctly: %s" +msgstr "" +"CSS kaynakları yüklenemedi. Arayüz düzgün biçemlendirilmemiş olabilir: %s" + #: ../src/date-entry-dialog.c:72 msgid "Select Date" msgstr "Tarih Seç" +#: ../src/date-entry-dialog.c:127 ../src/import-export-dialog.c:169 +#: ../src/import-export-dialog.c:475 ../src/main-window.c:225 +#: ../src/preferences-dialog.c:177 ../src/search-dialog.c:95 +#: ../src/uri-entry-dialog.c:126 +msgid "UI data could not be loaded" +msgstr "Kullanıcı arayüzü (UI) verileri yüklenemedi" + #: ../src/entry.c:303 #, c-format msgid "Invalid data version number %u." @@ -394,56 +314,135 @@ #: ../src/export-operation.c:256 ../src/export-operation.c:313 #, c-format -#| msgid "Error opening encrypted database file \"%s\": %s" msgid "Error changing exported file permissions: %s" msgstr "Dışa aktarılan dosyanın izinleri değiştirilirken hata oluştu: %s" -#: ../src/import-export-dialog.c:202 +#: ../src/gtk/menus.ui.h:1 +msgid "_Search" +msgstr "_Ara" + +#: ../src/gtk/menus.ui.h:2 +msgid "Pr_eferences" +msgstr "T_ercihler" + +#: ../src/gtk/menus.ui.h:3 +#| msgid "_Import" +msgctxt "Main menu" +msgid "_Import" +msgstr "_İçe Aktar" + +#: ../src/gtk/menus.ui.h:4 +#| msgid "_Export" +msgctxt "Main menu" +msgid "_Export" +msgstr "_Dışa Aktar" + +#: ../src/gtk/menus.ui.h:5 +msgid "_Print diary" +msgstr "Güzlüğü _yazdır" + +#: ../src/gtk/menus.ui.h:6 +msgid "_About Almanah Diary" +msgstr "Almanak Günlüğü _Hakkında" + +#: ../src/gtk/menus.ui.h:7 +msgid "_Quit" +msgstr "_Çıkış" + +#: ../src/gtk/menus.ui.h:8 +msgid "_Bold" +msgstr "_Kalın" + +#: ../src/gtk/menus.ui.h:9 +msgid "_Italic" +msgstr "_Eğik" + +#: ../src/gtk/menus.ui.h:10 +msgid "_Underline" +msgstr "_Altı Çizili" + +#: ../src/gtk/menus.ui.h:11 +msgid "_Cut" +msgstr "_Kes" + +#: ../src/gtk/menus.ui.h:12 +msgid "_Copy" +msgstr "Ko_pyala" + +#: ../src/gtk/menus.ui.h:13 +msgid "_Paste" +msgstr "_Yapıştır" + +#: ../src/gtk/menus.ui.h:14 ../src/main-window.c:626 +msgid "_Delete" +msgstr "_Sil" + +#: ../src/gtk/menus.ui.h:15 +msgid "Insert _Time" +msgstr "_Saat Ekle" + +#: ../src/gtk/menus.ui.h:16 +msgid "Add/Remove _Hyperlink" +msgstr "_Köprü Ekle/Kaldır" + +#: ../src/import-export-dialog.c:203 msgid "Import _mode: " msgstr "İçe aktarma _kipi: " -#: ../src/import-export-dialog.c:202 +#: ../src/import-export-dialog.c:203 msgid "Export _mode: " msgstr "Dışa aktarma _kipi:" #. Set the window title -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Import Entries" msgstr "Girdileri İçe Aktar" -#: ../src/import-export-dialog.c:205 +#: ../src/import-export-dialog.c:206 msgid "Export Entries" msgstr "Girdileri Dışa Aktar" -#: ../src/import-export-dialog.c:245 +#: ../src/import-export-dialog.c:210 +#| msgid "_Import" +msgctxt "Dialog button" +msgid "_Import" +msgstr "_İçe Aktar" + +#: ../src/import-export-dialog.c:210 +#| msgid "_Export" +msgctxt "Dialog button" +msgid "_Export" +msgstr "_Dışa Aktar" + +#: ../src/import-export-dialog.c:247 msgid "Import failed" msgstr "İçe aktarma başarısız oldu" -#: ../src/import-export-dialog.c:283 +#: ../src/import-export-dialog.c:285 msgid "Export failed" msgstr "Dışa aktarma başarısız oldu" -#: ../src/import-export-dialog.c:296 +#: ../src/import-export-dialog.c:298 msgid "Export successful" msgstr "Dışa aktarma başarılı" -#: ../src/import-export-dialog.c:297 +#: ../src/import-export-dialog.c:299 msgid "The diary was successfully exported." msgstr "Günlük başarıyla dışa aktarıldı." -#: ../src/import-export-dialog.c:445 +#: ../src/import-export-dialog.c:447 msgid "Import Results" msgstr "Sonuçları İçe Aktar" #. Translators: This is a strftime()-format string for the dates displayed in import results. #. Translators: This is a strftime()-format string for the date to display when asking about editing a diary entry. #. Translators: This is a strftime()-format string for the date to display when asking about deleting a diary entry. +#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. -#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. -#: ../src/import-export-dialog.c:539 ../src/main-window.c:567 -#: ../src/main-window.c:597 ../src/printing.c:263 ../src/search-dialog.c:182 -#: ../src/widgets/calendar-button.c:309 +#: ../src/import-export-dialog.c:542 ../src/main-window.c:587 +#: ../src/main-window.c:618 ../src/main-window.c:1225 ../src/printing.c:263 +#: ../src/search-dialog.c:180 msgid "%A, %e %B %Y" msgstr "%A, %e %B %Y" @@ -453,6 +452,9 @@ "format 'yyyy-mm-dd', and no extension. Any and all such files will be " "imported." msgstr "" +"Her biri bir girdiye karşılık gelen metin dosyaları içeren bir _klasör " +"seçin, isimleri 'yyyy-mm-dd' biçiminde ve uzantısız. Tüm bu şekildeki " +"dosyalar içe aktarılacaktır." #: ../src/import-operation.c:51 msgid "Select a database _file created by Almanah Diary to import." @@ -463,7 +465,7 @@ #: ../src/import-operation.c:248 #, c-format msgid "Error deserializing imported entry into buffer: %s" -msgstr "" +msgstr "İçe aktarılan girdinin tampon belleğe seri çözümünde hata: %s" #: ../src/import-operation.c:264 #, c-format @@ -471,6 +473,8 @@ "Error deserializing existing entry into buffer; overwriting with imported " "entry: %s" msgstr "" +"Mevcut girdinin tampon belleğe seri çözümünde hata; içe aktarılan girdiyle " +"üzerine yazılıyor: %s" #. Append some header text for the imported entry #. Translators: This text is appended to an existing entry when an entry is being imported to the same date. @@ -488,67 +492,88 @@ "\"%s\"den içe aktarılmış girdi:\n" "\n" -#: ../src/main-window.c:571 +#: ../src/main-window.c:591 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" -msgstr "" +msgstr "%s için bu günlük girdisini düzenlemek istediğinize emin misiniz?" + +#: ../src/main-window.c:594 ../src/main-window.c:625 +msgid "_Cancel" +msgstr "_İptal" + +#: ../src/main-window.c:595 +msgid "_Edit" +msgstr "_Düzenle" -#: ../src/main-window.c:601 +#: ../src/main-window.c:622 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" -msgstr "" +msgstr "%s için bu günlük girdisini silmek istediğinize emin misiniz?" #. Print a warning about the unknown tag -#: ../src/main-window.c:710 +#: ../src/main-window.c:732 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." msgstr "" +"Girdide bilinmeyen ya da kopya metin etiketi \"%s\". Göz ardı ediliyor." -#: ../src/main-window.c:918 +#: ../src/main-window.c:973 msgid "Error opening URI" msgstr "URI açılırken hata" #. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place -#: ../src/main-window.c:1092 +#: ../src/main-window.c:1152 #, c-format msgid "%s @ %s" -msgstr "" +msgstr "%s @ %s" -#: ../src/main-window.c:1171 +#: ../src/main-window.c:1258 msgid "Entry content could not be loaded" msgstr "Girdi içeriği yüklenemedi" -#: ../src/main-window.c:1348 +#. Translators: this sentence is just used in startup to estimate the width +#. of a 15 words sentence. Translate with some randome sentences with just 15 words. +#. See: https://bugzilla.gnome.org/show_bug.cgi?id=754841 +#: ../src/main-window.c:1414 +msgid "" +"This is just a fifteen words sentence to calculate the diary entry text view " +"size" +msgstr "" +"Özgür yazılım herkesçe istenilen sayıda makineye kurulabilir, kopyası " +"çıkarılabilir ve istenilen kimselere dağıtılabilir, hatta satılabilir." + +#: ../src/main-window.c:1450 msgid "Spelling checker could not be initialized" msgstr "Yazım denetçisi ilklendirilemedi" -#: ../src/preferences-dialog.c:91 -msgid "Almanah Preferences" -msgstr "Almanah Tercihleri" +#: ../src/preferences-dialog.c:83 +#| msgid "Pr_eferences" +msgid "Preferences" +msgstr "Tercihler" #. Grab our child widgets -#: ../src/preferences-dialog.c:217 +#: ../src/preferences-dialog.c:204 msgid "Encryption key: " msgstr "Şifreleme anahtarı: " -#: ../src/preferences-dialog.c:222 +#: ../src/preferences-dialog.c:208 msgid "None (don't encrypt)" msgstr "Hiçbiri (şifreleme)" -#: ../src/preferences-dialog.c:246 +#: ../src/preferences-dialog.c:213 msgid "New _Key" msgstr "Yeni _Anahtar" #. Set up the "Enable spell checking" check button -#: ../src/preferences-dialog.c:253 +#: ../src/preferences-dialog.c:237 msgid "Enable _spell checking" msgstr "_Yazım denetimini etkinleştir" -#: ../src/preferences-dialog.c:279 +#: ../src/preferences-dialog.c:262 msgid "Error saving the encryption key" msgstr "Şifreleme anahtarı kaydedilirken hata" -#: ../src/preferences-dialog.c:298 +#: ../src/preferences-dialog.c:281 msgid "Error opening Seahorse" msgstr "Seahorse açılırken hata" @@ -573,138 +598,145 @@ msgid "Line spacing:" msgstr "Satır aralığı:" -#: ../src/search-dialog.c:223 +#: ../src/search-dialog.c:221 msgid "Search canceled." msgstr "Arama iptal edildi." #. Translators: This is an error message wrapper for when searches encounter an error. The placeholder is for an error message. -#: ../src/search-dialog.c:226 +#: ../src/search-dialog.c:224 #, c-format msgid "Error: %s" msgstr "Hata: %s" #. Success! -#: ../src/search-dialog.c:231 +#: ../src/search-dialog.c:229 #, c-format msgid "Found %d entry:" msgid_plural "Found %d entries:" msgstr[0] "%d girdi bulundu:" -#: ../src/search-dialog.c:280 +#: ../src/search-dialog.c:278 msgid "Searching…" msgstr "Arıyor..." -#: ../src/storage-manager.c:276 +#: ../src/storage-manager.c:248 +#, c-format +msgid "" +"Could not open database \"%s\". SQLite provided the following error message: " +"%s" +msgstr "Veri tabanı \"%s\" açılamadı. SQLite şu hata iletisini verdi: %s" + +#: ../src/storage-manager.c:291 +#, c-format +msgid "" +"Could not run query \"%s\". SQLite provided the following error message: %s" +msgstr "Sorgu \"%s\" çalıştırılamadı. SQLite şu hata iletisini verdi: %s" + +#: ../src/storage-manager.c:597 +msgid "Error deserializing entry into buffer while searching." +msgstr "Arama yaparken girdinin tampon belleğe seri çözümünde hata." + +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "URI Girin" + +#: ../src/vfs.c:239 #, c-format msgid "GPGME is not at least version %s" msgstr "GPGME en az %s sürümünde değil" -#: ../src/storage-manager.c:285 +#: ../src/vfs.c:246 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "GPGME, OpenPGP'i desteklemiyor: %s" -#: ../src/storage-manager.c:294 +#: ../src/vfs.c:253 #, c-format msgid "Error creating cipher context: %s" msgstr "Şifreleme bağlamı oluşturulurken hata: %s" -#: ../src/storage-manager.c:323 +#: ../src/vfs.c:273 +#, c-format +msgid "Can't create a new GIOChannel for the encrypted database: %s" +msgstr "Şifreli veri tabanı için yeni GIOChannel oluşturulamıyor: %s" + +#: ../src/vfs.c:281 #, c-format msgid "Error opening encrypted database file \"%s\": %s" msgstr "Şifrelenmiş veri tabanı dosyası \"%s\" açılırken hata: %s" -#: ../src/storage-manager.c:342 +#: ../src/vfs.c:297 #, c-format -msgid "Error opening plain database file \"%s\": %s" -msgstr "Düz veri tabanı dosyası \"%s\" açılırken hata: %s" +msgid "Error creating Callback base data buffer: %s" +msgstr "Geriçağrı taban veri tampon belleği oluşturmada hata: %s" -#: ../src/storage-manager.c:390 -msgid "" -"The encrypted database is empty. The plain database file has been left " -"undeleted as backup." -msgstr "" - -#. Delete the plain file -#: ../src/storage-manager.c:393 +#: ../src/vfs.c:305 #, c-format -msgid "Could not delete plain database file \"%s\"." -msgstr "Düz veri tabanı dosyası \"%s\" silinemedi." +msgid "Can't create a new GIOChannel for the plain database: %s" +msgstr "Düz veri tabanı için yeni GIOChannel oluşturulamıyor: %s" -#: ../src/storage-manager.c:434 +#: ../src/vfs.c:313 #, c-format -msgid "Error decrypting database: %s" -msgstr "Veri tabanı açılırken hata: %s" +msgid "Error opening plain database file \"%s\": %s" +msgstr "Düz veri tabanı dosyası \"%s\" açılırken hata: %s" -#: ../src/storage-manager.c:468 +#: ../src/vfs.c:409 #, c-format msgid "Error getting encryption key: %s" msgstr "Şifreleme anahtarı alınırken hata: %s" -#: ../src/storage-manager.c:489 +#: ../src/vfs.c:433 ../src/vfs.c:439 #, c-format msgid "Error encrypting database: %s" msgstr "Veri tabanı şifrelenirken hata: %s" -#: ../src/storage-manager.c:549 -#, fuzzy, c-format -#| msgid "Error opening plain database file \"%s\": %s" +#. Translators: The first and second params are file paths, the last param is an error message. +#: ../src/vfs.c:489 +#, c-format +msgid "Error copying the file from %s to %s: %s" +msgstr "Dosyanın %s konumundan %s konumuna kopyalanmasında hata: %s" + +#: ../src/vfs.c:495 +#, c-format msgid "Error changing database backup file permissions: %s" -msgstr "Düz veri tabanı dosyası \"%s\" açılırken hata: %s" +msgstr "Veri tabanı yedek dosyası izinleri değiştirmede hata: %s" -#: ../src/storage-manager.c:571 ../src/storage-manager.c:627 -#, fuzzy, c-format -#| msgid "Error opening plain database file \"%s\": %s" -msgid "Error changing database file permissions: %s" -msgstr "Düz veri tabanı dosyası \"%s\" açılırken hata: %s" +#: ../src/vfs.c:595 +#, c-format +msgid "Error closing file: %s" +msgstr "Dosyanın kapatılmasında hata: %s" #. Translators: the first parameter is a filename, the second is an error message. -#: ../src/storage-manager.c:583 ../src/storage-manager.c:611 -#, fuzzy, c-format -#| msgid "Error opening plain database file \"%s\": %s" -msgid "Error backing up file ‘%s’: %s" -msgstr "Düz veri tabanı dosyası \"%s\" açılırken hata: %s" - -#: ../src/storage-manager.c:620 +#. Translators: the first parameter is a filename. +#: ../src/vfs.c:994 ../src/vfs.c:1021 #, c-format -msgid "" -"Could not open database \"%s\". SQLite provided the following error message: " -"%s" -msgstr "" +msgid "Error backing up file ‘%s’" +msgstr "‘%s’ dosyasının yedeklenmesinde hata" -#: ../src/storage-manager.c:704 +#: ../src/vfs.c:1007 #, c-format -msgid "" -"Could not run query \"%s\". SQLite provided the following error message: %s" -msgstr "" - -#: ../src/storage-manager.c:1010 -msgid "Error deserializing entry into buffer while searching." -msgstr "" +msgid "Error decrypting database: %s" +msgstr "Veri tabanı açılırken hata: %s" -#: ../src/uri-entry-dialog.c:71 -msgid "Enter URI" -msgstr "URI Girin" +#: ../src/vfs.c:1047 +#, c-format +msgid "Error changing database file permissions: %s" +msgstr "Veri tabanı dosya izinleri değiştirilirken hata: %s" -#: ../src/widgets/calendar-button.c:140 -#, fuzzy, c-format -#| msgid "UI file \"%s\" could not be loaded" -msgid "UI file \"%s\" could not be loaded: %s" -msgstr "Kullanıcı arayüzü (UI) dosyası \"%s\" yüklenemedi" +#: ../src/widgets/calendar-button.c:142 +#, c-format +msgid "UI data could not be loaded: %s" +msgstr "Kullanıcı arayüzü (UI) verileri yüklenemedi: %s" -#: ../src/widgets/calendar-button.c:150 +#: ../src/widgets/calendar-button.c:152 msgid "Can't load calendar window object from UI file" -msgstr "" +msgstr "Takvim pencere nesnesi UI dosyasından yüklenemiyor" #. Translators: This is the detail string for important days as displayed in the calendar. #: ../src/widgets/calendar.c:176 msgid "Important!" msgstr "Önemli!" -#: ../src/widgets/calendar-window.c:80 -msgid "Unknown input device" -msgstr "Bilinmeyen giriş aygıtı" - #: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:166 msgid "add tag" msgstr "etiket ekle" @@ -723,19 +755,61 @@ msgstr "Etiketi kaldır" #: ../src/widgets/tag-entry.c:85 -#| msgid "Search entry" msgid "Tag entry" msgstr "Etiket girişi" +#~ msgid "Almanah Preferences" +#~ msgstr "Almanah Tercihleri" + +#~ msgid "F_ormat" +#~ msgstr "B_içim" + +#~ msgid "Toggle whether the currently selected text is bold." +#~ msgstr "Geçerli olarak seçili metni kalın yap/geri al." + +#~ msgid "Toggle whether the currently selected text is italic." +#~ msgstr "Geçerli olarak seçili metni eğik yap/geri al." + +#~ msgid "Toggle whether the currently selected text is underlined." +#~ msgstr "Geçerli olarak seçili metni altı çizili yap/geri al." + +#~ msgid "" +#~ "Add or remove a hyperlink from the currently selected text to a specified " +#~ "URI." +#~ msgstr "" +#~ "Şu anda seçili olan metinden belirtilen bir URI'ye köprü ekle ya da " +#~ "kaldır." + +#~ msgid "I_mportant" +#~ msgstr "Ö_nemli" + +#~ msgid "Toggle whether the current entry is marked as important." +#~ msgstr "Geçerli girdinin önemli olarak işaretlenmesini aç/kapat." + +#~ msgid "Show tags" +#~ msgstr "Etiketleri göster" + +#~ msgid "Show tags for the current entry" +#~ msgstr "Geçerli girdinin etiketlerini göster" + +#~ msgid "_Help" +#~ msgstr "_Yardım" + +#~ msgid "Jump to the current date in the diary." +#~ msgstr "Günlükte geçerli güne atla." + +#~ msgid "Unknown input device" +#~ msgstr "Bilinmeyen giriş aygıtı" + +#~ msgid "Could not delete plain database file \"%s\"." +#~ msgstr "Düz veri tabanı dosyası \"%s\" silinemedi." + #~ msgid "Change font style for selected text" #~ msgstr "Seçilen metin için yazıtipi biçemini değiştir" #~ msgid "Font Style" #~ msgstr "Yazıtipi Biçemi" -#~ msgid "_Edit" -#~ msgstr "_Düzenle" - #~ msgid "_Export…" #~ msgstr "_Dışa Aktar..." diff -Nru almanah-0.11.1/po/uk.po almanah-0.12.0/po/uk.po --- almanah-0.11.1/po/uk.po 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/uk.po 2019-10-07 13:45:09.000000000 +0000 @@ -12,6 +12,7 @@ "PO-Revision-Date: 2011-04-18 00:16+0300\n" "Last-Translator: Sergiy Gavrylov \n" "Language-Team: Ukrainian \n" +"Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru almanah-0.11.1/po/zh_CN.po almanah-0.12.0/po/zh_CN.po --- almanah-0.11.1/po/zh_CN.po 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/po/zh_CN.po 2019-10-07 13:45:09.000000000 +0000 @@ -12,6 +12,7 @@ "PO-Revision-Date: 2011-02-14 03:20+0800\n" "Last-Translator: YunQiang Su \n" "Language-Team: Chinese (simplified) \n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru almanah-0.11.1/README almanah-0.12.0/README --- almanah-0.11.1/README 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/README 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -Almanah -======= - -Almanah is a small GTK+ application to allow you to keep a diary of your life. - -News -==== - -See NEWS file. - -Dependencies -============ - -GNOME 3.0 development platform - http://www.gnome.org/ -SQLite 3 - http://sqlite.org/ -GtkSpell 3.0 (optional) - http://gtkspell.sourceforge.net/ or https://github.com/manisandro/gtkspell3 -GPGME (optional) - http://www.gnupg.org/gpgme.html -Evolution Data Server (optional) - https://wiki.gnome.org/Apps/Evolution - -Copyright -========= - -Philip Withnall - -Icon by Jakub Szypulka - -BUGS -==== - -Bugs should be filed in GNOME's Bugzilla: -https://bugzilla.gnome.org/enter_bug.cgi?product=almanah - -To get a better debug output, run: -# almanah --debug - -Contact -======= - -Philip Withnall -https://wiki.gnome.org/Apps/Almanah_Diary diff -Nru almanah-0.11.1/README.md almanah-0.12.0/README.md --- almanah-0.11.1/README.md 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.12.0/README.md 2019-10-07 13:45:09.000000000 +0000 @@ -0,0 +1,41 @@ +Almanah +======= + +Almanah is a small GTK+ application to allow you to keep a diary of your life. + +News +--- + +See NEWS file. + +Dependencies +--- + + * [GNOME 3.0 development platform](http://www.gnome.org/) + * [SQLite 3](http://sqlite.org/) + * [GtkSpell 3.0](http://gtkspell.sourceforge.net/) (optional) + * [GPGME](http://www.gnupg.org/gpgme.html) (optional) + * [Evolution Data Server](https://wiki.gnome.org/Apps/Evolution) (optional) + +Copyright +--- + +Philip Withnall + +Icon by Jakub Szypulka + +Bugs +--- + +Bugs should be [filed in GNOME GitLab](https://gitlab.gnome.org/GNOME/almanah/issues/new). + +To get better debug output, run: +``` +almanah --debug +``` + +Contact +--- + + * Philip Withnall + * https://wiki.gnome.org/Apps/Almanah_Diary diff -Nru almanah-0.11.1/src/almanah.gresource.xml almanah-0.12.0/src/almanah.gresource.xml --- almanah-0.11.1/src/almanah.gresource.xml 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.12.0/src/almanah.gresource.xml 2019-10-07 13:45:09.000000000 +0000 @@ -0,0 +1,8 @@ + + + + gtk/menus.ui + css/almanah.css + ui/almanah.ui + + diff -Nru almanah-0.11.1/src/almanah-marshal.c almanah-0.12.0/src/almanah-marshal.c --- almanah-0.11.1/src/almanah-marshal.c 2014-09-24 17:34:15.000000000 +0000 +++ almanah-0.12.0/src/almanah-marshal.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,145 +0,0 @@ - -#ifndef __almanah_marshal_MARSHAL_H__ -#define __almanah_marshal_MARSHAL_H__ - -#include - -G_BEGIN_DECLS - -#ifdef G_ENABLE_DEBUG -#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_schar (v) -#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) -#define g_marshal_value_peek_int(v) g_value_get_int (v) -#define g_marshal_value_peek_uint(v) g_value_get_uint (v) -#define g_marshal_value_peek_long(v) g_value_get_long (v) -#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v) -#define g_marshal_value_peek_int64(v) g_value_get_int64 (v) -#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v) -#define g_marshal_value_peek_enum(v) g_value_get_enum (v) -#define g_marshal_value_peek_flags(v) g_value_get_flags (v) -#define g_marshal_value_peek_float(v) g_value_get_float (v) -#define g_marshal_value_peek_double(v) g_value_get_double (v) -#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) -#define g_marshal_value_peek_param(v) g_value_get_param (v) -#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) -#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) -#define g_marshal_value_peek_object(v) g_value_get_object (v) -#define g_marshal_value_peek_variant(v) g_value_get_variant (v) -#else /* !G_ENABLE_DEBUG */ -/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. - * Do not access GValues directly in your code. Instead, use the - * g_value_get_*() functions - */ -#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int -#define g_marshal_value_peek_char(v) (v)->data[0].v_int -#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint -#define g_marshal_value_peek_int(v) (v)->data[0].v_int -#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint -#define g_marshal_value_peek_long(v) (v)->data[0].v_long -#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 -#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 -#define g_marshal_value_peek_enum(v) (v)->data[0].v_long -#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_float(v) (v)->data[0].v_float -#define g_marshal_value_peek_double(v) (v)->data[0].v_double -#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer -#endif /* !G_ENABLE_DEBUG */ - - -/* VOID:STRING,STRING (almanah-marshal.list:1) */ -extern void almanah_marshal_VOID__STRING_STRING (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); -void -almanah_marshal_VOID__STRING_STRING (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__STRING_STRING) (gpointer data1, - gpointer arg_1, - gpointer arg_2, - gpointer data2); - register GMarshalFunc_VOID__STRING_STRING callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__STRING_STRING) (marshal_data ? marshal_data : cc->callback); - - callback (data1, - g_marshal_value_peek_string (param_values + 1), - g_marshal_value_peek_string (param_values + 2), - data2); -} - -/* VOID:OBJECT,STRING (almanah-marshal.list:2) */ -extern void almanah_marshal_VOID__OBJECT_STRING (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); -void -almanah_marshal_VOID__OBJECT_STRING (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__OBJECT_STRING) (gpointer data1, - gpointer arg_1, - gpointer arg_2, - gpointer data2); - register GMarshalFunc_VOID__OBJECT_STRING callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__OBJECT_STRING) (marshal_data ? marshal_data : cc->callback); - - callback (data1, - g_marshal_value_peek_object (param_values + 1), - g_marshal_value_peek_string (param_values + 2), - data2); -} - -G_END_DECLS - -#endif /* __almanah_marshal_MARSHAL_H__ */ - diff -Nru almanah-0.11.1/src/almanah-marshal.h almanah-0.12.0/src/almanah-marshal.h --- almanah-0.11.1/src/almanah-marshal.h 2014-09-24 17:34:15.000000000 +0000 +++ almanah-0.12.0/src/almanah-marshal.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ - -#ifndef __almanah_marshal_MARSHAL_H__ -#define __almanah_marshal_MARSHAL_H__ - -#include - -G_BEGIN_DECLS - -/* VOID:STRING,STRING (almanah-marshal.list:1) */ -extern void almanah_marshal_VOID__STRING_STRING (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* VOID:OBJECT,STRING (almanah-marshal.list:2) */ -extern void almanah_marshal_VOID__OBJECT_STRING (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -G_END_DECLS - -#endif /* __almanah_marshal_MARSHAL_H__ */ - diff -Nru almanah-0.11.1/src/almanah-marshal.list almanah-0.12.0/src/almanah-marshal.list --- almanah-0.11.1/src/almanah-marshal.list 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/src/almanah-marshal.list 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -VOID:STRING,STRING -VOID:OBJECT,STRING diff -Nru almanah-0.11.1/src/application.c almanah-0.12.0/src/application.c --- almanah-0.11.1/src/application.c 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/src/application.c 2019-10-07 13:45:09.000000000 +0000 @@ -17,6 +17,8 @@ * along with Almanah. If not, see . */ +#include + #include #include #include @@ -43,9 +45,7 @@ static gint handle_command_line (GApplication *application, GApplicationCommandLine *command_line); static void window_removed (GtkApplication *application, GtkWindow *window); -static void almanah_application_init_actions (AlmanahApplication *self); - -/* GMenu application actions */ +/* Application actions */ static void action_search_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data); static void action_preferences_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data); static void action_import_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data); @@ -54,6 +54,9 @@ static void action_about_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data); static void action_quit_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data); +/* Some callbacks */ +void almanah_application_style_provider_parsing_error_cb (GtkCssProvider *provider, GtkCssSection *section, GError *error, gpointer user_data); + struct _AlmanahApplicationPrivate { gboolean debug; @@ -210,6 +213,18 @@ } } +/* This function is taken from the Gedit code, so thanks guys! */ +static void +add_accelerator (GtkApplication *app, const gchar *action_name, const gchar *accel) +{ + const gchar *vaccels[] = { + accel, + NULL + }; + + gtk_application_set_accels_for_action (app, action_name, vaccels); +} + static void startup (GApplication *application) { @@ -217,7 +232,6 @@ gchar *db_filename; GError *error = NULL; GtkCssProvider *style_provider; - gchar *css_path; /* Chain up. */ G_APPLICATION_CLASS (almanah_application_parent_class)->startup (application); @@ -235,12 +249,9 @@ /* Open the DB */ db_filename = g_build_filename (g_get_user_data_dir (), "diary.db", NULL); - priv->storage_manager = almanah_storage_manager_new (db_filename, NULL); + priv->storage_manager = almanah_storage_manager_new (db_filename, priv->settings); g_free (db_filename); - g_settings_bind (priv->settings, "encryption-key", priv->storage_manager, "encryption-key", - G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_NO_SENSITIVITY); - if (almanah_storage_manager_connect (priv->storage_manager, &error) == FALSE) { GtkWidget *dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error opening database")); @@ -265,20 +276,26 @@ priv->page_setup = gtk_page_setup_new (); - /* Load GMenu application actions */ - almanah_application_init_actions (ALMANAH_APPLICATION (application)); + /* Application actions */ + g_action_map_add_action_entries (G_ACTION_MAP (application), app_entries, G_N_ELEMENTS (app_entries), application); - css_path = g_build_filename (almanah_get_css_path (), "almanah.css", NULL); + /* Application CSS styles */ style_provider = gtk_css_provider_new (); - if (!gtk_css_provider_load_from_path (style_provider, css_path, NULL)) { - /* Error loading the CSS */ - g_warning (_("Couldn't load the CSS file '%s'. The interface might not be styled correctly"), css_path); - g_error_free (error); - } else { - gtk_style_context_add_provider_for_screen (gdk_screen_get_default (), GTK_STYLE_PROVIDER (style_provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); - } - g_free (css_path); + g_signal_connect (G_OBJECT (style_provider), "parsing-error", G_CALLBACK (almanah_application_style_provider_parsing_error_cb), NULL); + gtk_css_provider_load_from_resource (style_provider, "/org/gnome/Almanah/css/almanah.css"); + gtk_style_context_add_provider_for_screen (gdk_screen_get_default (), GTK_STYLE_PROVIDER (style_provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); g_object_unref (style_provider); + + /* Shortcuts */ + add_accelerator(GTK_APPLICATION (application), "win.select-date", "D"); + add_accelerator(GTK_APPLICATION (application), "win.bold", "B"); + add_accelerator(GTK_APPLICATION (application), "win.italic", "I"); + add_accelerator(GTK_APPLICATION (application), "win.underline", "U"); + add_accelerator(GTK_APPLICATION (application), "win.hyperlink", "H"); + add_accelerator(GTK_APPLICATION (application), "win.insert-time", "T"); + add_accelerator(GTK_APPLICATION (application), "win.important", "M"); + add_accelerator(GTK_APPLICATION (application), "win.undo", "Z"); + add_accelerator(GTK_APPLICATION (application), "win.redo", "Z"); } /* Nullify our pointer to the main window when it gets destroyed (e.g. when we quit) so that we don't then try @@ -359,7 +376,7 @@ } static void -storage_manager_disconnected_cb (AlmanahStorageManager *self, const gchar *gpgme_error_message, const gchar *warning_message, GtkApplication *application) +storage_manager_disconnected_cb (__attribute__ ((unused)) AlmanahStorageManager *storage_manager, const gchar *gpgme_error_message, const gchar *warning_message, GtkApplication *self) { if (gpgme_error_message != NULL || warning_message != NULL) { GtkWidget *dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, @@ -377,7 +394,15 @@ } /* Allow the end of the applaction */ - g_application_release (G_APPLICATION (application)); + g_application_release (G_APPLICATION (self)); +} + +static gboolean +storage_disconnect_idle_cb (AlmanahStorageManager *storage_manager) +{ + almanah_storage_manager_disconnect (storage_manager, NULL); + + return FALSE; } static void @@ -394,53 +419,13 @@ g_application_hold (G_APPLICATION (application)); g_signal_connect (priv->storage_manager, "disconnected", (GCallback) storage_manager_disconnected_cb, application); - almanah_storage_manager_disconnect (priv->storage_manager, NULL); + g_idle_add ((GSourceFunc) storage_disconnect_idle_cb, priv->storage_manager); } GTK_APPLICATION_CLASS (almanah_application_parent_class)->window_removed (application, window); } static void -almanah_application_init_actions (AlmanahApplication *self) -{ - GtkBuilder *builder; - GError *error = NULL; - const gchar *interface_filename = almanah_get_interface_app_menu_filename (); - - g_action_map_add_action_entries (G_ACTION_MAP (self), app_entries, G_N_ELEMENTS (app_entries), self); - - builder = gtk_builder_new (); - if (gtk_builder_add_from_file (builder, interface_filename, &error) == FALSE) { - /* Show an error */ - GtkWidget *dialog = gtk_message_dialog_new (NULL, - GTK_DIALOG_MODAL, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, - _("UI file \"%s\" could not be loaded"), interface_filename); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", error->message); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - - g_error_free (error); - g_object_unref (builder); - - exit (1); - } - - gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE); - gtk_application_set_app_menu (GTK_APPLICATION (self), G_MENU_MODEL (gtk_builder_get_object (builder, "almanah_app_menu"))); - -#ifndef ENABLE_ENCRYPTION -#ifndef ENABLE_SPELL_CHECKING - /* Remove the "Preferences" entry from the menu */ - g_action_map_remove_action (G_ACTION_MAP (self), "preferences"); -#endif /* !ENABLE_SPELL_CHECKING */ -#endif /* !ENABLE_ENCRYPTION */ - - g_object_unref (builder); -} - -static void action_search_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data) { AlmanahApplication *application; @@ -458,7 +443,6 @@ static void action_preferences_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data) { -#if defined(ENABLE_ENCRYPTION) || defined(ENABLE_SPELL_CHECKING) AlmanahApplication *application; GSettings *settings; AlmanahPreferencesDialog *dialog; @@ -466,13 +450,13 @@ application = ALMANAH_APPLICATION (user_data); settings = almanah_application_dup_settings (application); dialog = almanah_preferences_dialog_new (settings); + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (application->priv->main_window)); g_object_unref (settings); gtk_widget_show_all (GTK_WIDGET (dialog)); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (GTK_WIDGET (dialog)); -#endif /* ENABLE_ENCRYPTION || ENABLE_SPELL_CHECKING */ } static void @@ -579,7 +563,7 @@ "license", license, "wrap-license", TRUE, "website-label", _("Almanah Website"), - "website", "http://live.gnome.org/Almanah_Diary", + "website", PACKAGE_URL, NULL); g_free (license); @@ -600,6 +584,15 @@ gtk_widget_destroy (GTK_WIDGET (main_window)); } +void +almanah_application_style_provider_parsing_error_cb (__attribute__ ((unused)) GtkCssProvider *provider, + __attribute__ ((unused)) GtkCssSection *section, + GError *error, + __attribute__ ((unused)) gpointer user_data) +{ + g_warning (_("Couldn't load the CSS resources. The interface might not be styled correctly: %s"), error->message); +} + AlmanahApplication * almanah_application_new (void) { diff -Nru almanah-0.11.1/src/css/almanah.css almanah-0.12.0/src/css/almanah.css --- almanah-0.11.1/src/css/almanah.css 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.12.0/src/css/almanah.css 2019-10-07 13:45:09.000000000 +0000 @@ -0,0 +1,23 @@ +AlmanahTagEntry { + color: #aaa; + font-size: 8px; + transition: none; +} + +AlmanahTagEntry:focus { + color: @theme_fg_color; +} + +.almanah-mw-scrolled { + border-bottom-width: 1px; + border-top-width: 0px; + border-left-width: 0px; + border-right-width: 0px; +} + +.almanah-events-scrolled { + border-bottom-width: 0px; + border-top-width: 1px; + border-left-width: 0px; + border-right-width: 0px; +} diff -Nru almanah-0.11.1/src/date-entry-dialog.c almanah-0.12.0/src/date-entry-dialog.c --- almanah-0.11.1/src/date-entry-dialog.c 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/src/date-entry-dialog.c 2019-10-07 13:45:09.000000000 +0000 @@ -111,22 +111,20 @@ AlmanahDateEntryDialog *date_entry_dialog; AlmanahDateEntryDialogPrivate *priv; GError *error = NULL; - const gchar *interface_filename = almanah_get_interface_filename (); const gchar *object_names[] = { "almanah_date_entry_dialog", - "almanah_ui_manager", /* HACK: work around bgo#672789 */ NULL }; builder = gtk_builder_new (); - if (gtk_builder_add_objects_from_file (builder, interface_filename, (gchar**) object_names, &error) == FALSE) { + if (gtk_builder_add_objects_from_resource (builder, "/org/gnome/Almanah/ui/almanah.ui", (gchar**) object_names, &error) == 0) { /* Show an error */ GtkWidget *dialog = gtk_message_dialog_new (NULL, - GTK_DIALOG_MODAL, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, - _("UI file \"%s\" could not be loaded"), interface_filename); + GTK_DIALOG_MODAL, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + _("UI data could not be loaded")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", error->message); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); diff -Nru almanah-0.11.1/src/event-factories/calendar-client.c almanah-0.12.0/src/event-factories/calendar-client.c --- almanah-0.11.1/src/event-factories/calendar-client.c 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/src/event-factories/calendar-client.c 2019-10-07 13:45:09.000000000 +0000 @@ -1,5 +1,7 @@ +/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2-*- */ /* * Copyright (C) 2004 Free Software Foundation, Inc. + * Copyright (C) 2015 Álvaro Peña * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -19,6 +21,9 @@ * William Jon McCann * Martin Grimme * Christian Kellner + * + * Modified by: + * Álvaro Peña */ #include @@ -75,10 +80,9 @@ GSList *appointment_sources; GSList *task_sources; - icaltimezone *zone; + ICalTimezone *zone; - guint zone_listener; - GSettings *settings; + GFileMonitor *tz_monitor; guint day; guint month; @@ -89,27 +93,27 @@ static void calendar_client_init (CalendarClient *client); static void calendar_client_finalize (GObject *object); static void calendar_client_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec); + guint prop_id, + const GValue *value, + GParamSpec *pspec); static void calendar_client_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); + guint prop_id, + GValue *value, + GParamSpec *pspec); static GSList *calendar_client_update_sources_list (CalendarClient *client, - GSList *sources, - GSList *esources, - guint changed_signal_id); + GSList *sources, + GSList *esources, + guint changed_signal_id); static void calendar_client_appointment_sources_changed (CalendarClient *client); static void calendar_client_task_sources_changed (CalendarClient *client); static void calendar_client_stop_query (CalendarClient *client, - CalendarClientSource *source, - CalendarClientQuery *query); + CalendarClientSource *source, + CalendarClientQuery *query); static void calendar_client_start_query (CalendarClient *client, - CalendarClientSource *source, - const char *query); + CalendarClientSource *source, + const char *query); static void calendar_client_source_finalize (CalendarClientSource *source); static void calendar_client_query_finalize (CalendarClientQuery *query); @@ -120,19 +124,19 @@ calendar_client_update_tasks (CalendarClient *client); enum -{ - PROP_O, - PROP_DAY, - PROP_MONTH, - PROP_YEAR -}; + { + PROP_O, + PROP_DAY, + PROP_MONTH, + PROP_YEAR + }; enum -{ - APPOINTMENTS_CHANGED, - TASKS_CHANGED, - LAST_SIGNAL -}; + { + APPOINTMENTS_CHANGED, + TASKS_CHANGED, + LAST_SIGNAL + }; static GObjectClass *parent_class = NULL; static guint signals [LAST_SIGNAL] = { 0, }; @@ -141,27 +145,27 @@ calendar_client_get_type (void) { static GType client_type = 0; - + if (!client_type) { static const GTypeInfo client_info = - { - sizeof (CalendarClientClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) calendar_client_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (CalendarClient), - 0, /* n_preallocs */ - (GInstanceInitFunc) calendar_client_init, - }; - + { + sizeof (CalendarClientClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) calendar_client_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (CalendarClient), + 0, /* n_preallocs */ + (GInstanceInitFunc) calendar_client_init, + }; + client_type = g_type_register_static (G_TYPE_OBJECT, - "CalendarClient", - &client_info, 0); + "CalendarClient", + &client_info, 0); } - + return client_type; } @@ -179,185 +183,121 @@ g_type_class_add_private (klass, sizeof (CalendarClientPrivate)); g_object_class_install_property (gobject_class, - PROP_DAY, - g_param_spec_uint ("day", - "Day", - "The currently monitored day between 1 and 31 (0 denotes unset)", - 0, G_MAXUINT, 0, - G_PARAM_READWRITE)); + PROP_DAY, + g_param_spec_uint ("day", + "Day", + "The currently monitored day between 1 and 31 (0 denotes unset)", + 0, G_MAXUINT, 0, + G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, - PROP_MONTH, - g_param_spec_uint ("month", - "Month", - "The currently monitored month between 0 and 11", - 0, G_MAXUINT, 0, - G_PARAM_READWRITE)); + PROP_MONTH, + g_param_spec_uint ("month", + "Month", + "The currently monitored month between 0 and 11", + 0, G_MAXUINT, 0, + G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, - PROP_YEAR, - g_param_spec_uint ("year", - "Year", - "The currently monitored year", - 0, G_MAXUINT, 0, - G_PARAM_READWRITE)); + PROP_YEAR, + g_param_spec_uint ("year", + "Year", + "The currently monitored year", + 0, G_MAXUINT, 0, + G_PARAM_READWRITE)); signals [APPOINTMENTS_CHANGED] = g_signal_new ("appointments-changed", - G_TYPE_FROM_CLASS (gobject_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (CalendarClientClass, tasks_changed), - NULL, - NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (CalendarClientClass, tasks_changed), + NULL, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); signals [TASKS_CHANGED] = g_signal_new ("tasks-changed", - G_TYPE_FROM_CLASS (gobject_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (CalendarClientClass, tasks_changed), - NULL, - NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); -} - -/* Timezone code adapted from evolution/calendar/gui/calendar-config.c */ -/* The current timezone, e.g. "Europe/London". It may be NULL, in which case - you should assume UTC. */ -static gchar * -calendar_client_config_get_timezone (GSettings *settings) -{ - char *location; - - if (g_settings_get_boolean (settings, "use-system-timezone")) - location = e_cal_util_get_system_timezone_location (); - else - location = g_settings_get_string (settings, "timezone"); - - return location; + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (CalendarClientClass, tasks_changed), + NULL, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); } -static icaltimezone * -calendar_client_config_get_icaltimezone (GSettings *settings) +static ICalTimezone * +calendar_client_config_get_icaltimezone (void) { char *location; - icaltimezone *zone = NULL; - - location = calendar_client_config_get_timezone (settings); + ICalTimezone *zone = NULL; + + location = e_cal_util_get_system_timezone_location (); if (!location) - return icaltimezone_get_utc_timezone (); + return i_cal_timezone_get_utc_timezone (); - zone = icaltimezone_get_builtin_timezone (location); + zone = i_cal_timezone_get_builtin_timezone (location); g_free (location); - + return zone; } static void -calendar_client_set_timezone (CalendarClient *client) +calendar_client_set_timezone (CalendarClient *client) { GSList *l; GSList *esources; - client->priv->zone = calendar_client_config_get_icaltimezone (client->priv->settings); + client->priv->zone = calendar_client_config_get_icaltimezone (); esources = calendar_sources_get_appointment_sources (client->priv->calendar_sources); for (l = esources; l; l = l->next) { ECalClient *source = l->data; - + e_cal_client_set_default_timezone (source, client->priv->zone); } } static void -calendar_client_timezone_changed_cb (GSettings *settings, - const gchar *key, - CalendarClient *client) +calendar_client_timezone_changed_cb (G_GNUC_UNUSED GFileMonitor *monitor, + G_GNUC_UNUSED GFile *file, + G_GNUC_UNUSED GFile *other_file, + G_GNUC_UNUSED GFileMonitorEvent *event, + gpointer user_data) { - if (g_strcmp0 (key, "timezone") == 0 || - g_strcmp0 (key, "use-system-timezone") == 0) - calendar_client_set_timezone (client); -} - -static void -cal_opened_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) -{ - EClient *ecal = E_CLIENT (source_object); - CalendarClientSource *cl_source = user_data; - ECalClientSourceType s_type; - CalendarClient *client = cl_source->client; - GError *error = NULL; - - e_client_open_finish (ecal, result, &error); - - s_type = e_cal_client_get_source_type (E_CAL_CLIENT (ecal)); - - if (g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_BUSY) && - !e_client_is_opened (ecal)) - { - g_clear_error (&error); - e_client_open (ecal, TRUE, NULL, cal_opened_cb, cl_source); - return; - } - - if (error) - { - if (s_type == E_CAL_CLIENT_SOURCE_TYPE_EVENTS) - client->priv->appointment_sources = g_slist_remove (client->priv->appointment_sources, - cl_source); - else - client->priv->task_sources = g_slist_remove (client->priv->task_sources, - cl_source); - - calendar_client_source_finalize (cl_source); - g_free (cl_source); - - g_clear_error (&error); - return; - } - - if (s_type == E_CAL_CLIENT_SOURCE_TYPE_EVENTS) - calendar_client_update_appointments (client); - else - calendar_client_update_tasks (client); + calendar_client_set_timezone (CALENDAR_CLIENT (user_data)); } static void load_calendars (CalendarClient *client, - CalendarEventType type) + CalendarEventType type) { GSList *l, *clients; switch (type) { - case CALENDAR_EVENT_APPOINTMENT: - clients = client->priv->appointment_sources; - break; - case CALENDAR_EVENT_TASK: - clients = client->priv->task_sources; - break; - case CALENDAR_EVENT_ALL: - default: - g_assert_not_reached (); + case CALENDAR_EVENT_APPOINTMENT: + clients = client->priv->appointment_sources; + break; + case CALENDAR_EVENT_TASK: + clients = client->priv->task_sources; + break; + case CALENDAR_EVENT_ALL: + default: + g_assert_not_reached (); } for (l = clients; l != NULL; l = l->next) { - EClient *ecal; CalendarClientSource *cl_source = l->data; - ecal = E_CLIENT (cl_source->cal_client); - - if (e_client_is_opened (ecal)) - continue; - - e_client_open (ecal, TRUE, NULL, cal_opened_cb, cl_source); + if (type == CALENDAR_EVENT_APPOINTMENT) + calendar_client_update_appointments (cl_source->client); + else + calendar_client_update_tasks (cl_source->client); } } @@ -365,11 +305,11 @@ calendar_client_init (CalendarClient *client) { GSList *esources; + GFile *tz; client->priv = CALENDAR_CLIENT_GET_PRIVATE (client); client->priv->calendar_sources = calendar_sources_get (); - client->priv->settings = g_settings_new ("org.gnome.evolution.calendar"); esources = calendar_sources_get_appointment_sources (client->priv->calendar_sources); client->priv->appointment_sources = @@ -378,24 +318,28 @@ esources = calendar_sources_get_task_sources (client->priv->calendar_sources); client->priv->task_sources = calendar_client_update_sources_list (client, NULL, esources, signals [TASKS_CHANGED]); - - /* set the timezone before loading the clients */ + + /* set the timezone before loading the clients */ calendar_client_set_timezone (client); load_calendars (client, CALENDAR_EVENT_APPOINTMENT); load_calendars (client, CALENDAR_EVENT_TASK); g_signal_connect_swapped (client->priv->calendar_sources, - "appointment-sources-changed", - G_CALLBACK (calendar_client_appointment_sources_changed), - client); + "appointment-sources-changed", + G_CALLBACK (calendar_client_appointment_sources_changed), + client); g_signal_connect_swapped (client->priv->calendar_sources, - "task-sources-changed", - G_CALLBACK (calendar_client_task_sources_changed), - client); - - client->priv->zone_listener = g_signal_connect (client->priv->settings, "changed", - G_CALLBACK (calendar_client_timezone_changed_cb), - client); + "task-sources-changed", + G_CALLBACK (calendar_client_task_sources_changed), + client); + + tz = g_file_new_for_path ("/etc/localtime"); + client->priv->tz_monitor = g_file_monitor_file (tz, G_FILE_MONITOR_NONE, NULL, NULL); + g_object_unref (tz); + if (client->priv->tz_monitor == NULL) + g_warning ("Can't monitor /etc/localtime for changes"); + else + g_signal_connect (client->priv->tz_monitor, "changed", G_CALLBACK (calendar_client_timezone_changed_cb), client); client->priv->day = G_MAXUINT; client->priv->month = G_MAXUINT; @@ -408,16 +352,7 @@ CalendarClient *client = CALENDAR_CLIENT (object); GSList *l; - if (client->priv->zone_listener) - { - g_signal_handler_disconnect (client->priv->settings, - client->priv->zone_listener); - client->priv->zone_listener = 0; - } - - if (client->priv->settings) - g_object_unref (client->priv->settings); - client->priv->settings = NULL; + g_clear_object (&client->priv->tz_monitor); for (l = client->priv->appointment_sources; l; l = l->next) { @@ -445,9 +380,9 @@ static void calendar_client_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) + guint prop_id, + const GValue *value, + GParamSpec *pspec) { CalendarClient *client = CALENDAR_CLIENT (object); @@ -458,13 +393,13 @@ break; case PROP_MONTH: calendar_client_select_month (client, - g_value_get_uint (value), - client->priv->year); + g_value_get_uint (value), + client->priv->year); break; case PROP_YEAR: calendar_client_select_month (client, - client->priv->month, - g_value_get_uint (value)); + client->priv->month, + g_value_get_uint (value)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -474,9 +409,9 @@ static void calendar_client_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) + guint prop_id, + GValue *value, + GParamSpec *pspec) { CalendarClient *client = CALENDAR_CLIENT (object); @@ -514,8 +449,8 @@ */ static inline time_t make_time_for_day_begin (int day, - int month, - int year) + int month, + int year) { struct tm localtime_tm = { 0, }; @@ -529,8 +464,8 @@ static inline char * make_isodate_for_day_begin (int day, - int month, - int year) + int month, + int year) { time_t utctime; @@ -540,113 +475,129 @@ } static time_t -get_time_from_property (icalcomponent *ical, - icalproperty_kind prop_kind, - struct icaltimetype (* get_prop_func) (const icalproperty *prop), - icaltimezone *default_zone) -{ - icalproperty *prop; - struct icaltimetype ical_time; - icalparameter *param; - icaltimezone *time_zone = NULL; - - prop = icalcomponent_get_first_property (ical, prop_kind); +get_time_from_property (ICalComponent *ical, + ICalPropertyKind prop_kind, + ICalTime * (* get_prop_func) (ICalProperty *prop), + ICalTimezone *default_zone) +{ + ICalProperty *prop; + ICalTime *ical_time; + ICalParameter *param; + ICalTimezone *time_zone = NULL; + time_t retval; + + prop = i_cal_component_get_first_property (ical, prop_kind); if (!prop) return 0; ical_time = get_prop_func (prop); - param = icalproperty_get_first_parameter (prop, ICAL_TZID_PARAMETER); + param = i_cal_property_get_first_parameter (prop, I_CAL_TZID_PARAMETER); if (param) - time_zone = icaltimezone_get_builtin_timezone_from_tzid (icalparameter_get_tzid (param)); - else if (icaltime_is_utc (ical_time)) - time_zone = icaltimezone_get_utc_timezone (); - else + time_zone = i_cal_timezone_get_builtin_timezone_from_tzid (i_cal_parameter_get_tzid (param)); + else if (i_cal_time_is_utc (ical_time)) + time_zone = i_cal_timezone_get_utc_timezone (); + else time_zone = default_zone; - return icaltime_as_timet_with_zone (ical_time, time_zone); + retval = i_cal_time_as_timet_with_zone (ical_time, time_zone); + + g_clear_object (&ical_time); + g_clear_object (¶m); + g_clear_object (&prop); + + return retval; } static char * -get_ical_uid (icalcomponent *ical) +get_ical_uid (ICalComponent *ical) { - return g_strdup (icalcomponent_get_uid (ical)); + return g_strdup (i_cal_component_get_uid (ical)); } static char * -get_ical_rid (icalcomponent *ical) +get_ical_rid (ICalComponent *ical) { - icalproperty *prop; - struct icaltimetype ical_time; - - prop = icalcomponent_get_first_property (ical, ICAL_RECURRENCEID_PROPERTY); - if (!prop) - return NULL; - - ical_time = icalproperty_get_recurrenceid (prop); - - return icaltime_is_valid_time (ical_time) && !icaltime_is_null_time (ical_time) ? - g_strdup (icaltime_as_ical_string (ical_time)) : NULL; + return e_cal_util_component_get_recurid_as_string (ical); } static char * -get_ical_summary (icalcomponent *ical) +get_ical_summary (ICalComponent *ical) { - icalproperty *prop; + ICalProperty *prop; + char *retval; - prop = icalcomponent_get_first_property (ical, ICAL_SUMMARY_PROPERTY); + prop = i_cal_component_get_first_property (ical, I_CAL_SUMMARY_PROPERTY); if (!prop) return NULL; - return g_strdup (icalproperty_get_summary (prop)); + retval = g_strdup (i_cal_property_get_summary (prop)); + + g_object_unref (prop); + + return retval; } static char * -get_ical_description (icalcomponent *ical) +get_ical_description (ICalComponent *ical) { - icalproperty *prop; + ICalProperty *prop; + char *retval; - prop = icalcomponent_get_first_property (ical, ICAL_DESCRIPTION_PROPERTY); + prop = i_cal_component_get_first_property (ical, I_CAL_DESCRIPTION_PROPERTY); if (!prop) return NULL; - return g_strdup (icalproperty_get_description (prop)); + retval = g_strdup (i_cal_property_get_description (prop)); + + g_object_unref (prop); + + return retval; } static inline time_t -get_ical_start_time (icalcomponent *ical, - icaltimezone *default_zone) +get_ical_start_time (ICalComponent *ical, + ICalTimezone *default_zone) { return get_time_from_property (ical, - ICAL_DTSTART_PROPERTY, - icalproperty_get_dtstart, + I_CAL_DTSTART_PROPERTY, + i_cal_property_get_dtstart, default_zone); } static inline time_t -get_ical_end_time (icalcomponent *ical, - icaltimezone *default_zone) +get_ical_end_time (ICalComponent *ical, + ICalTimezone *default_zone) { return get_time_from_property (ical, - ICAL_DTEND_PROPERTY, - icalproperty_get_dtend, + I_CAL_DTEND_PROPERTY, + i_cal_property_get_dtend, default_zone); } static gboolean -get_ical_is_all_day (icalcomponent *ical, +get_ical_is_all_day (ICalComponent *ical, time_t start_time, - icaltimezone *default_zone) + ICalTimezone *default_zone) { - icalproperty *prop; - struct tm *start_tm; - time_t end_time; - struct icaldurationtype duration; - struct icaltimetype start_icaltime; + ICalProperty *prop; + struct tm *start_tm; + time_t end_time; + ICalDuration *duration; + ICalTime *start_icaltime; + gboolean retval; - start_icaltime = icalcomponent_get_dtstart (ical); - if (start_icaltime.is_date) - return TRUE; + start_icaltime = i_cal_component_get_dtstart (ical); + if (!start_icaltime) + return FALSE; + + if (i_cal_time_is_date (start_icaltime)) + { + g_object_unref (start_icaltime); + return TRUE; + } + + g_clear_object (&start_icaltime); start_tm = gmtime (&start_time); if (start_tm->tm_sec != 0 || @@ -657,69 +608,80 @@ if ((end_time = get_ical_end_time (ical, default_zone))) return (end_time - start_time) % 86400 == 0; - prop = icalcomponent_get_first_property (ical, ICAL_DURATION_PROPERTY); + prop = i_cal_component_get_first_property (ical, I_CAL_DURATION_PROPERTY); if (!prop) return FALSE; - duration = icalproperty_get_duration (prop); + duration = i_cal_property_get_duration (prop); + + retval = i_cal_duration_as_int (duration) % 86400 == 0; - return icaldurationtype_as_int (duration) % 86400 == 0; + g_object_unref (duration); + g_object_unref (prop); + + return retval; } static inline time_t -get_ical_due_time (icalcomponent *ical, - icaltimezone *default_zone) +get_ical_due_time (ICalComponent *ical, + ICalTimezone *default_zone) { return get_time_from_property (ical, - ICAL_DUE_PROPERTY, - icalproperty_get_due, + I_CAL_DUE_PROPERTY, + i_cal_property_get_due, default_zone); } static guint -get_ical_percent_complete (icalcomponent *ical) +get_ical_percent_complete (ICalComponent *ical) { - icalproperty *prop; - icalproperty_status status; + ICalProperty *prop; + ICalPropertyStatus status; int percent_complete; - status = icalcomponent_get_status (ical); - if (status == ICAL_STATUS_COMPLETED) + status = i_cal_component_get_status (ical); + if (status == I_CAL_STATUS_COMPLETED) return 100; - prop = icalcomponent_get_first_property (ical, ICAL_COMPLETED_PROPERTY); - if (prop) + if (e_cal_util_component_has_property (ical, I_CAL_COMPLETED_PROPERTY)) return 100; - prop = icalcomponent_get_first_property (ical, ICAL_PERCENTCOMPLETE_PROPERTY); + prop = i_cal_component_get_first_property (ical, I_CAL_PERCENTCOMPLETE_PROPERTY); if (!prop) return 0; - percent_complete = icalproperty_get_percentcomplete (prop); + percent_complete = i_cal_property_get_percentcomplete (prop); + + g_object_unref (prop); return CLAMP (percent_complete, 0, 100); } static inline time_t -get_ical_completed_time (icalcomponent *ical, - icaltimezone *default_zone) +get_ical_completed_time (ICalComponent *ical, + ICalTimezone *default_zone) { return get_time_from_property (ical, - ICAL_COMPLETED_PROPERTY, - icalproperty_get_completed, + I_CAL_COMPLETED_PROPERTY, + i_cal_property_get_completed, default_zone); } static int -get_ical_priority (icalcomponent *ical) +get_ical_priority (ICalComponent *ical) { - icalproperty *prop; + ICalProperty *prop; + int retval; - prop = icalcomponent_get_first_property (ical, ICAL_PRIORITY_PROPERTY); + prop = i_cal_component_get_first_property (ical, I_CAL_PRIORITY_PROPERTY); if (!prop) return -1; - return icalproperty_get_priority (prop); + retval = i_cal_property_get_priority (prop); + + g_object_unref (prop); + + return retval; } static char * @@ -750,12 +712,12 @@ static inline gboolean calendar_appointment_equal (CalendarAppointment *a, - CalendarAppointment *b) + CalendarAppointment *b) { GSList *la, *lb; if (g_slist_length (a->occurrences) != g_slist_length (b->occurrences)) - return FALSE; + return FALSE; for (la = a->occurrences, lb = b->occurrences; la && lb; la = la->next, lb = lb->next) { @@ -763,8 +725,8 @@ CalendarOccurrence *ob = lb->data; if (oa->start_time != ob->start_time || - oa->end_time != ob->end_time) - return FALSE; + oa->end_time != ob->end_time) + return FALSE; } return @@ -780,7 +742,7 @@ static void calendar_appointment_copy (CalendarAppointment *appointment, - CalendarAppointment *appointment_copy) + CalendarAppointment *appointment_copy) { GSList *l; @@ -844,9 +806,9 @@ static void calendar_appointment_init (CalendarAppointment *appointment, - icalcomponent *ical, + ICalComponent *ical, CalendarClientSource *source, - icaltimezone *default_zone) + ICalTimezone *default_zone) { appointment->uid = get_ical_uid (ical); appointment->rid = get_ical_rid (ical); @@ -861,34 +823,38 @@ default_zone); } -static icaltimezone * +static ICalTimezone * resolve_timezone_id (const char *tzid, - gpointer user_data) + gpointer user_data, + GCancellable *cancellable, + GError **error) { - icaltimezone *retval; + ICalTimezone *retval; ECalClient *source = user_data; - retval = icaltimezone_get_builtin_timezone_from_tzid (tzid); + retval = i_cal_timezone_get_builtin_timezone_from_tzid (tzid); if (!retval) { - e_cal_client_get_timezone_sync (source, tzid, &retval, NULL, NULL); + retval = e_cal_client_tzlookup_cb (tzid, source, cancellable, error); } return retval; } static gboolean -calendar_appointment_collect_occurrence (ECalComponent *component, - time_t occurrence_start, - time_t occurrence_end, - gpointer data) +calendar_appointment_collect_occurrence (ICalComponent *component, + ICalTime *occurrence_start, + ICalTime *occurrence_end, + gpointer data, + GCancellable *cancellable, + GError **error) { CalendarOccurrence *occurrence; GSList **collect_loc = data; occurrence = g_new0 (CalendarOccurrence, 1); - occurrence->start_time = occurrence_start; - occurrence->end_time = occurrence_end; + occurrence->start_time = i_cal_time_as_timet (occurrence_start); + occurrence->end_time = i_cal_time_as_timet (occurrence_end); *collect_loc = g_slist_prepend (*collect_loc, occurrence); @@ -897,37 +863,39 @@ static void calendar_appointment_generate_ocurrences (CalendarAppointment *appointment, - icalcomponent *ical, - ECalClient *source, - time_t start, - time_t end, - icaltimezone *default_zone) + ICalComponent *ical, + ECalClient *source, + time_t start, + time_t end, + ICalTimezone *default_zone) { - ECalComponent *ecal; + ICalTime *interval_start, *interval_end; g_assert (appointment->occurrences == NULL); - ecal = e_cal_component_new (); - e_cal_component_set_icalcomponent (ecal, - icalcomponent_new_clone (ical)); - - e_cal_recur_generate_instances (ecal, - start, - end, - calendar_appointment_collect_occurrence, - &appointment->occurrences, - resolve_timezone_id, - source, - default_zone); + interval_start = i_cal_time_new_from_timet_with_zone (start, FALSE, NULL); + interval_end = i_cal_time_new_from_timet_with_zone (end, FALSE, NULL); - g_object_unref (ecal); + e_cal_recur_generate_instances_sync (ical, + interval_start, + interval_end, + calendar_appointment_collect_occurrence, + &appointment->occurrences, + resolve_timezone_id, + source, + default_zone, + NULL, + NULL); + + g_clear_object (&interval_start); + g_clear_object (&interval_end); appointment->occurrences = g_slist_reverse (appointment->occurrences); } static inline gboolean calendar_task_equal (CalendarTask *a, - CalendarTask *b) + CalendarTask *b) { return g_strcmp0 (a->uid, b->uid) == 0 && @@ -943,7 +911,7 @@ static void calendar_task_copy (CalendarTask *task, - CalendarTask *task_copy) + CalendarTask *task_copy) { g_assert (task != NULL); g_assert (task_copy != NULL); @@ -979,9 +947,9 @@ static void calendar_task_init (CalendarTask *task, - icalcomponent *ical, + ICalComponent *ical, CalendarClientSource *source, - icaltimezone *default_zone) + ICalTimezone *default_zone) { task->uid = get_ical_uid (ical); task->summary = get_ical_summary (ical); @@ -1015,57 +983,57 @@ } static CalendarEvent * -calendar_event_new (icalcomponent *ical, +calendar_event_new (ICalComponent *ical, CalendarClientSource *source, - icaltimezone *default_zone) + ICalTimezone *default_zone) { CalendarEvent *event; event = g_new0 (CalendarEvent, 1); - switch (icalcomponent_isa (ical)) + switch (i_cal_component_isa (ical)) { - case ICAL_VEVENT_COMPONENT: + case I_CAL_VEVENT_COMPONENT: event->type = CALENDAR_EVENT_APPOINTMENT; calendar_appointment_init (CALENDAR_APPOINTMENT (event), ical, source, default_zone); break; - case ICAL_VTODO_COMPONENT: + case I_CAL_VTODO_COMPONENT: event->type = CALENDAR_EVENT_TASK; calendar_task_init (CALENDAR_TASK (event), ical, source, default_zone); break; - case ICAL_NO_COMPONENT: - case ICAL_ANY_COMPONENT: - case ICAL_XROOT_COMPONENT: - case ICAL_XATTACH_COMPONENT: - case ICAL_VJOURNAL_COMPONENT: - case ICAL_VCALENDAR_COMPONENT: - case ICAL_VAGENDA_COMPONENT: - case ICAL_VFREEBUSY_COMPONENT: - case ICAL_VALARM_COMPONENT: - case ICAL_XAUDIOALARM_COMPONENT: - case ICAL_XDISPLAYALARM_COMPONENT: - case ICAL_XEMAILALARM_COMPONENT: - case ICAL_XPROCEDUREALARM_COMPONENT: - case ICAL_VTIMEZONE_COMPONENT: - case ICAL_XSTANDARD_COMPONENT: - case ICAL_XDAYLIGHT_COMPONENT: - case ICAL_X_COMPONENT: - case ICAL_VSCHEDULE_COMPONENT: - case ICAL_VQUERY_COMPONENT: - case ICAL_VREPLY_COMPONENT: - case ICAL_VCAR_COMPONENT: - case ICAL_VCOMMAND_COMPONENT: - case ICAL_XLICINVALID_COMPONENT: - case ICAL_XLICMIMEPART_COMPONENT: + case I_CAL_NO_COMPONENT: + case I_CAL_ANY_COMPONENT: + case I_CAL_XROOT_COMPONENT: + case I_CAL_XATTACH_COMPONENT: + case I_CAL_VJOURNAL_COMPONENT: + case I_CAL_VCALENDAR_COMPONENT: + case I_CAL_VAGENDA_COMPONENT: + case I_CAL_VFREEBUSY_COMPONENT: + case I_CAL_VALARM_COMPONENT: + case I_CAL_XAUDIOALARM_COMPONENT: + case I_CAL_XDISPLAYALARM_COMPONENT: + case I_CAL_XEMAILALARM_COMPONENT: + case I_CAL_XPROCEDUREALARM_COMPONENT: + case I_CAL_VTIMEZONE_COMPONENT: + case I_CAL_XSTANDARD_COMPONENT: + case I_CAL_XDAYLIGHT_COMPONENT: + case I_CAL_X_COMPONENT: + case I_CAL_VSCHEDULE_COMPONENT: + case I_CAL_VQUERY_COMPONENT: + case I_CAL_VREPLY_COMPONENT: + case I_CAL_VCAR_COMPONENT: + case I_CAL_VCOMMAND_COMPONENT: + case I_CAL_XLICINVALID_COMPONENT: + case I_CAL_XLICMIMEPART_COMPONENT: default: g_warning ("Unknown calendar component type: %d\n", - icalcomponent_isa (ical)); + i_cal_component_isa (ical)); g_free (event); return NULL; } @@ -1089,11 +1057,11 @@ { case CALENDAR_EVENT_APPOINTMENT: calendar_appointment_copy (CALENDAR_APPOINTMENT (event), - CALENDAR_APPOINTMENT (retval)); + CALENDAR_APPOINTMENT (retval)); break; case CALENDAR_EVENT_TASK: calendar_task_copy (CALENDAR_TASK (event), - CALENDAR_TASK (retval)); + CALENDAR_TASK (retval)); break; case CALENDAR_EVENT_ALL: default: @@ -1110,7 +1078,7 @@ switch (event->type) { case CALENDAR_EVENT_APPOINTMENT: - return g_strdup_printf ("%s%s", CALENDAR_APPOINTMENT (event)->uid, CALENDAR_APPOINTMENT (event)->rid ? CALENDAR_APPOINTMENT (event)->rid : ""); + return g_strdup_printf ("%s%s", CALENDAR_APPOINTMENT (event)->uid, CALENDAR_APPOINTMENT (event)->rid ? CALENDAR_APPOINTMENT (event)->rid : ""); break; case CALENDAR_EVENT_TASK: return g_strdup (CALENDAR_TASK (event)->uid); @@ -1126,7 +1094,7 @@ static gboolean calendar_event_equal (CalendarEvent *a, - CalendarEvent *b) + CalendarEvent *b) { if (!a && !b) return TRUE; @@ -1141,15 +1109,15 @@ { case CALENDAR_EVENT_APPOINTMENT: return calendar_appointment_equal (CALENDAR_APPOINTMENT (a), - CALENDAR_APPOINTMENT (b)); + CALENDAR_APPOINTMENT (b)); case CALENDAR_EVENT_TASK: return calendar_task_equal (CALENDAR_TASK (a), - CALENDAR_TASK (b)); + CALENDAR_TASK (b)); case CALENDAR_EVENT_ALL: default: break; } - + g_assert_not_reached (); return FALSE; @@ -1157,20 +1125,20 @@ static void calendar_event_generate_ocurrences (CalendarEvent *event, - icalcomponent *ical, - ECalClient *source, - time_t start, - time_t end, - icaltimezone *default_zone) + ICalComponent *ical, + ECalClient *source, + time_t start, + time_t end, + ICalTimezone *default_zone) { if (event->type != CALENDAR_EVENT_APPOINTMENT) return; calendar_appointment_generate_ocurrences (CALENDAR_APPOINTMENT (event), - ical, - source, - start, - end, + ical, + source, + start, + end, default_zone); } @@ -1182,77 +1150,77 @@ { case CALENDAR_EVENT_APPOINTMENT: { - char *start_str; - char *end_str; - GSList *l; - - start_str = CALENDAR_APPOINTMENT (event)->start_time ? - isodate_from_time_t (CALENDAR_APPOINTMENT (event)->start_time) : - g_strdup ("(undefined)"); - end_str = CALENDAR_APPOINTMENT (event)->end_time ? - isodate_from_time_t (CALENDAR_APPOINTMENT (event)->end_time) : - g_strdup ("(undefined)"); - - dprintf ("Appointment: uid '%s', summary '%s', description '%s', " - "start_time '%s', end_time '%s', is_all_day %s\n", - CALENDAR_APPOINTMENT (event)->uid, - CALENDAR_APPOINTMENT (event)->summary, - CALENDAR_APPOINTMENT (event)->description, - start_str, - end_str, - CALENDAR_APPOINTMENT (event)->is_all_day ? "(true)" : "(false)"); - - g_free (start_str); - g_free (end_str); - - dprintf (" Occurrences:\n"); - for (l = CALENDAR_APPOINTMENT (event)->occurrences; l; l = l->next) - { - CalendarOccurrence *occurrence = l->data; - - start_str = occurrence->start_time ? - isodate_from_time_t (occurrence->start_time) : - g_strdup ("(undefined)"); - - end_str = occurrence->end_time ? - isodate_from_time_t (occurrence->end_time) : - g_strdup ("(undefined)"); - - dprintf (" start_time '%s', end_time '%s'\n", - start_str, end_str); - - g_free (start_str); - g_free (end_str); - } + char *start_str; + char *end_str; + GSList *l; + + start_str = CALENDAR_APPOINTMENT (event)->start_time ? + isodate_from_time_t (CALENDAR_APPOINTMENT (event)->start_time) : + g_strdup ("(undefined)"); + end_str = CALENDAR_APPOINTMENT (event)->end_time ? + isodate_from_time_t (CALENDAR_APPOINTMENT (event)->end_time) : + g_strdup ("(undefined)"); + + dprintf ("Appointment: uid '%s', summary '%s', description '%s', " + "start_time '%s', end_time '%s', is_all_day %s\n", + CALENDAR_APPOINTMENT (event)->uid, + CALENDAR_APPOINTMENT (event)->summary, + CALENDAR_APPOINTMENT (event)->description, + start_str, + end_str, + CALENDAR_APPOINTMENT (event)->is_all_day ? "(true)" : "(false)"); + + g_free (start_str); + g_free (end_str); + + dprintf (" Occurrences:\n"); + for (l = CALENDAR_APPOINTMENT (event)->occurrences; l; l = l->next) + { + CalendarOccurrence *occurrence = l->data; + + start_str = occurrence->start_time ? + isodate_from_time_t (occurrence->start_time) : + g_strdup ("(undefined)"); + + end_str = occurrence->end_time ? + isodate_from_time_t (occurrence->end_time) : + g_strdup ("(undefined)"); + + dprintf (" start_time '%s', end_time '%s'\n", + start_str, end_str); + + g_free (start_str); + g_free (end_str); + } } break; case CALENDAR_EVENT_TASK: { - char *start_str; - char *due_str; - char *completed_str; - - start_str = CALENDAR_TASK (event)->start_time ? - isodate_from_time_t (CALENDAR_TASK (event)->start_time) : - g_strdup ("(undefined)"); - due_str = CALENDAR_TASK (event)->due_time ? - isodate_from_time_t (CALENDAR_TASK (event)->due_time) : - g_strdup ("(undefined)"); - completed_str = CALENDAR_TASK (event)->completed_time ? - isodate_from_time_t (CALENDAR_TASK (event)->completed_time) : - g_strdup ("(undefined)"); - - dprintf ("Task: uid '%s', summary '%s', description '%s', " - "start_time '%s', due_time '%s', percent_complete %d, completed_time '%s'\n", - CALENDAR_TASK (event)->uid, - CALENDAR_TASK (event)->summary, - CALENDAR_TASK (event)->description, - start_str, - due_str, - CALENDAR_TASK (event)->percent_complete, - completed_str); + char *start_str; + char *due_str; + char *completed_str; + + start_str = CALENDAR_TASK (event)->start_time ? + isodate_from_time_t (CALENDAR_TASK (event)->start_time) : + g_strdup ("(undefined)"); + due_str = CALENDAR_TASK (event)->due_time ? + isodate_from_time_t (CALENDAR_TASK (event)->due_time) : + g_strdup ("(undefined)"); + completed_str = CALENDAR_TASK (event)->completed_time ? + isodate_from_time_t (CALENDAR_TASK (event)->completed_time) : + g_strdup ("(undefined)"); + + dprintf ("Task: uid '%s', summary '%s', description '%s', " + "start_time '%s', due_time '%s', percent_complete %d, completed_time '%s'\n", + CALENDAR_TASK (event)->uid, + CALENDAR_TASK (event)->summary, + CALENDAR_TASK (event)->description, + start_str, + due_str, + CALENDAR_TASK (event)->percent_complete, + completed_str); - g_free (completed_str); + g_free (completed_str); } break; default: @@ -1264,21 +1232,21 @@ static inline CalendarClientQuery * goddamn_this_is_crack (CalendarClientSource *source, - ECalClientView *view, - gboolean *emit_signal) + ECalClientView *view, + gboolean *emit_signal) { g_assert (view != NULL); if (source->completed_query.view == view) { if (emit_signal) - *emit_signal = TRUE; + *emit_signal = TRUE; return &source->completed_query; } else if (source->in_progress_query.view == view) { if (emit_signal) - *emit_signal = FALSE; + *emit_signal = FALSE; return &source->in_progress_query; } @@ -1289,19 +1257,19 @@ static void calendar_client_handle_query_completed (CalendarClientSource *source, - const GError *error, - ECalClientView *view) + const GError *error, + ECalClientView *view) { CalendarClientQuery *query; query = goddamn_this_is_crack (source, view, NULL); - + dprintf ("Query %p completed: %s\n", query, error ? error->message : "Success"); if (error) { g_warning ("Calendar query failed: %s\n", - error->message); + error->message); calendar_client_stop_query (source->client, source, query); return; } @@ -1323,8 +1291,8 @@ static void calendar_client_handle_query_result (CalendarClientSource *source, - const GSList *objects, - ECalClientView *view) + const GSList *objects, + ECalClientView *view) { CalendarClientQuery *query; CalendarClient *client; @@ -1339,53 +1307,53 @@ query = goddamn_this_is_crack (source, view, &emit_signal); dprintf ("Query %p result: %d objects:\n", - query, g_list_length (objects)); + query, g_list_length (objects)); month_begin = make_time_for_day_begin (1, - client->priv->month, - client->priv->year); + client->priv->month, + client->priv->year); month_end = make_time_for_day_begin (1, - client->priv->month + 1, - client->priv->year); + client->priv->month + 1, + client->priv->year); events_changed = FALSE; for (l = objects; l; l = l->next) { CalendarEvent *event; CalendarEvent *old_event; - icalcomponent *ical = l->data; + ICalComponent *ical = l->data; char *uid; - + event = calendar_event_new (ical, source, client->priv->zone); if (!event) - continue; + continue; calendar_event_generate_ocurrences (event, - ical, - source->cal_client, - month_begin, - month_end, + ical, + source->cal_client, + month_begin, + month_end, client->priv->zone); uid = calendar_event_get_uid (event); - + old_event = g_hash_table_lookup (query->events, uid); if (!calendar_event_equal (event, old_event)) - { - dprintf ("Event %s: ", old_event ? "modified" : "added"); + { + dprintf ("Event %s: ", old_event ? "modified" : "added"); - calendar_event_debug_dump (event); + calendar_event_debug_dump (event); - g_hash_table_replace (query->events, uid, event); + g_hash_table_replace (query->events, uid, event); - events_changed = TRUE; - } + events_changed = TRUE; + } else - { - g_free (uid); - } + { + g_free (uid); + } } if (emit_signal && events_changed) @@ -1403,7 +1371,7 @@ size_t len; len = strlen (uid); - + if (len <= strlen (key) && strncmp (uid, key, len) == 0) { dprintf ("Event removed: "); @@ -1418,8 +1386,8 @@ static void calendar_client_handle_objects_removed (CalendarClientSource *source, - const GSList *ids, - ECalClientView *view) + const GSList *ids, + ECalClientView *view) { CalendarClientQuery *query; gboolean emit_signal; @@ -1433,27 +1401,28 @@ { CalendarEvent *event; ECalComponentId *id = l->data; - char *uid = g_strdup_printf ("%s%s", id->uid, id->rid ? id->rid : ""); + char *uid = g_strdup_printf ("%s%s", e_cal_component_id_get_uid (id), + e_cal_component_id_get_rid (id) ? e_cal_component_id_get_rid (id) : ""); - if (!id->rid || !(*id->rid)) - { - unsigned int size = g_hash_table_size (query->events); + if (!e_cal_component_id_get_rid (id) || !(e_cal_component_id_get_rid (id)[0])) + { + unsigned int size = g_hash_table_size (query->events); - g_hash_table_foreach_remove (query->events, check_object_remove, id->uid); + g_hash_table_foreach_remove (query->events, check_object_remove, (gpointer) e_cal_component_id_get_uid (id)); - if (size != g_hash_table_size (query->events)) - events_changed = TRUE; - } + if (size != g_hash_table_size (query->events)) + events_changed = TRUE; + } else if ((event = g_hash_table_lookup (query->events, uid))) - { - dprintf ("Event removed: "); + { + dprintf ("Event removed: "); - calendar_event_debug_dump (event); + calendar_event_debug_dump (event); - g_assert (g_hash_table_remove (query->events, uid)); + g_assert (g_hash_table_remove (query->events, uid)); - events_changed = TRUE; - } + events_changed = TRUE; + } g_free (uid); } @@ -1477,8 +1446,8 @@ static void calendar_client_stop_query (CalendarClient *client, - CalendarClientSource *source, - CalendarClientQuery *query) + CalendarClientSource *source, + CalendarClientQuery *query) { if (query == &source->in_progress_query) { @@ -1498,14 +1467,14 @@ } else g_assert_not_reached (); - + calendar_client_query_finalize (query); } static void calendar_client_start_query (CalendarClient *client, - CalendarClientSource *source, - const char *query) + CalendarClientSource *source, + const char *query) { ECalClientView *view = NULL; GError *error = NULL; @@ -1513,7 +1482,7 @@ if (!e_cal_client_get_view_sync (source->cal_client, query, &view, NULL, &error)) { g_warning ("Error preparing the query: '%s': %s\n", - query, error->message); + query, error->message); g_error_free (error); return; } @@ -1522,29 +1491,29 @@ if (source->query_in_progress) calendar_client_stop_query (client, source, &source->in_progress_query); - + dprintf ("Starting query %p: '%s'\n", &source->in_progress_query, query); source->query_in_progress = TRUE; source->in_progress_query.view = view; source->in_progress_query.events = g_hash_table_new_full (g_str_hash, - g_str_equal, - g_free, - (GDestroyNotify) calendar_event_free); + g_str_equal, + g_free, + (GDestroyNotify) calendar_event_free); g_signal_connect_swapped (view, "objects-added", - G_CALLBACK (calendar_client_handle_query_result), - source); + G_CALLBACK (calendar_client_handle_query_result), + source); g_signal_connect_swapped (view, "objects-modified", - G_CALLBACK (calendar_client_handle_query_result), - source); + G_CALLBACK (calendar_client_handle_query_result), + source); g_signal_connect_swapped (view, "objects-removed", - G_CALLBACK (calendar_client_handle_objects_removed), - source); + G_CALLBACK (calendar_client_handle_objects_removed), + source); g_signal_connect_swapped (view, "complete", - G_CALLBACK (calendar_client_handle_query_completed), - source); + G_CALLBACK (calendar_client_handle_query_completed), + source); e_cal_client_view_start (view, NULL); } @@ -1562,23 +1531,20 @@ return; month_begin = make_isodate_for_day_begin (1, - client->priv->month, - client->priv->year); + client->priv->month, + client->priv->year); month_end = make_isodate_for_day_begin (1, - client->priv->month + 1, - client->priv->year); + client->priv->month + 1, + client->priv->year); query = g_strdup_printf ("occur-in-time-range? (make-time \"%s\") " - "(make-time \"%s\")", - month_begin, month_end); + "(make-time \"%s\")", + month_begin, month_end); for (l = client->priv->appointment_sources; l; l = l->next) { CalendarClientSource *cs = l->data; - - if (!e_client_is_opened (E_CLIENT (cs->cal_client))) - continue; calendar_client_start_query (client, cs, query); } @@ -1603,7 +1569,7 @@ * Look at filter_task() to see the behaviour we * want. */ - + char *day_begin; char *day_end; @@ -1613,29 +1579,29 @@ return; day_begin = make_isodate_for_day_begin (client->priv->day, - client->priv->month, - client->priv->year); + client->priv->month, + client->priv->year); day_end = make_isodate_for_day_begin (client->priv->day + 1, - client->priv->month, - client->priv->year); + client->priv->month, + client->priv->year); if (!day_begin || !day_end) { g_warning ("Cannot run query with invalid date: %dd %dy %dm\n", - client->priv->day, - client->priv->month, - client->priv->year); + client->priv->day, + client->priv->month, + client->priv->year); g_free (day_begin); g_free (day_end); return; } - + query = g_strdup_printf ("(and (occur-in-time-range? (make-time \"%s\") " - "(make-time \"%s\")) " - "(or (not is-completed?) " - "(and (is-completed?) " - "(not (completed-before? (make-time \"%s\"))))))", - day_begin, day_end, day_begin); + "(make-time \"%s\")) " + "(or (not is-completed?) " + "(and (is-completed?) " + "(not (completed-before? (make-time \"%s\"))))))", + day_begin, day_end, day_begin); #else query = g_strdup ("#t"); #endif /* FIX_BROKEN_TASKS_QUERY */ @@ -1644,9 +1610,6 @@ { CalendarClientSource *cs = l->data; - if (!e_client_is_opened (E_CLIENT (cs->cal_client))) - continue; - calendar_client_start_query (client, cs, query); } @@ -1668,23 +1631,23 @@ calendar_client_query_finalize (&source->completed_query); calendar_client_query_finalize (&source->in_progress_query); - + source->query_completed = FALSE; source->query_in_progress = FALSE; } static int compare_calendar_sources (CalendarClientSource *s1, - CalendarClientSource *s2) + CalendarClientSource *s2) { return (s1->cal_client == s2->cal_client) ? 0 : 1; } static GSList * calendar_client_update_sources_list (CalendarClient *client, - GSList *sources, - GSList *esources, - guint changed_signal_id) + GSList *sources, + GSList *esources, + guint changed_signal_id) { GSList *retval, *l; @@ -1700,24 +1663,24 @@ dummy_source.cal_client = esource; dprintf ("update_sources_list: adding client %s: ", - e_source_get_uid (e_client_get_source (E_CLIENT (esource)))); + e_source_get_uid (e_client_get_source (E_CLIENT (esource)))); if ((s = g_slist_find_custom (sources, - &dummy_source, - (GCompareFunc) compare_calendar_sources))) - { - dprintf ("already on list\n"); - new_source = s->data; - sources = g_slist_delete_link (sources, s); - } + &dummy_source, + (GCompareFunc) compare_calendar_sources))) + { + dprintf ("already on list\n"); + new_source = s->data; + sources = g_slist_delete_link (sources, s); + } else - { - dprintf ("added\n"); - new_source = g_new0 (CalendarClientSource, 1); - new_source->client = client; - new_source->cal_client = g_object_ref (esource); - new_source->changed_signal_id = changed_signal_id; - } + { + dprintf ("added\n"); + new_source = g_new0 (CalendarClientSource, 1); + new_source->client = client; + new_source->cal_client = g_object_ref (esource); + new_source->changed_signal_id = changed_signal_id; + } retval = g_slist_prepend (retval, new_source); } @@ -1727,7 +1690,7 @@ CalendarClientSource *source = l->data; dprintf ("Removing client %s from list\n", - e_source_get_uid (e_client_get_source (E_CLIENT (source->cal_client)))); + e_source_get_uid (e_client_get_source (E_CLIENT (source->cal_client)))); calendar_client_source_finalize (source); g_free (source); @@ -1746,11 +1709,11 @@ esources = calendar_sources_get_appointment_sources (client->priv->calendar_sources); - client->priv->appointment_sources = + client->priv->appointment_sources = calendar_client_update_sources_list (client, - client->priv->appointment_sources, - esources, - signals [APPOINTMENTS_CHANGED]); + client->priv->appointment_sources, + esources, + signals [APPOINTMENTS_CHANGED]); load_calendars (client, CALENDAR_EVENT_APPOINTMENT); calendar_client_update_appointments (client); @@ -1765,11 +1728,11 @@ esources = calendar_sources_get_task_sources (client->priv->calendar_sources); - client->priv->task_sources = + client->priv->task_sources = calendar_client_update_sources_list (client, - client->priv->task_sources, - esources, - signals [TASKS_CHANGED]); + client->priv->task_sources, + esources, + signals [TASKS_CHANGED]); load_calendars (client, CALENDAR_EVENT_TASK); calendar_client_update_tasks (client); @@ -1795,8 +1758,8 @@ void calendar_client_select_month (CalendarClient *client, - guint month, - guint year) + guint month, + guint year) { g_return_if_fail (CALENDAR_IS_CLIENT (client)); g_return_if_fail (month <= 11); @@ -1818,7 +1781,7 @@ void calendar_client_select_day (CalendarClient *client, - guint day) + guint day) { g_return_if_fail (CALENDAR_IS_CLIENT (client)); g_return_if_fail (day <= 31); @@ -1847,13 +1810,13 @@ } FilterData; typedef void (* CalendarEventFilterFunc) (const char *uid, - CalendarEvent *event, - FilterData *filter_data); + CalendarEvent *event, + FilterData *filter_data); static void filter_appointment (const char *uid, - CalendarEvent *event, - FilterData *filter_data) + CalendarEvent *event, + FilterData *filter_data) { GSList *occurrences, *l; @@ -1873,16 +1836,16 @@ start_time < filter_data->end_time) || (start_time <= filter_data->start_time && (end_time - 1) > filter_data->start_time)) - { - CalendarEvent *new_event; + { + CalendarEvent *new_event; + + new_event = calendar_event_copy (event); + + CALENDAR_APPOINTMENT (new_event)->start_time = occurrence->start_time; + CALENDAR_APPOINTMENT (new_event)->end_time = occurrence->end_time; - new_event = calendar_event_copy (event); - - CALENDAR_APPOINTMENT (new_event)->start_time = occurrence->start_time; - CALENDAR_APPOINTMENT (new_event)->end_time = occurrence->end_time; - - filter_data->events = g_slist_prepend (filter_data->events, new_event); - } + filter_data->events = g_slist_prepend (filter_data->events, new_event); + } } CALENDAR_APPOINTMENT (event)->occurrences = occurrences; @@ -1890,8 +1853,8 @@ static void filter_task (const char *uid, - CalendarEvent *event, - FilterData *filter_data) + CalendarEvent *event, + FilterData *filter_data) { #ifdef FIX_BROKEN_TASKS_QUERY CalendarTask *task; @@ -1906,22 +1869,22 @@ if (task->start_time && task->start_time > filter_data->start_time) return; - if (task->completed_time && + if (task->completed_time && (task->completed_time < filter_data->start_time || task->completed_time > filter_data->end_time)) return; #endif /* FIX_BROKEN_TASKS_QUERY */ filter_data->events = g_slist_prepend (filter_data->events, - calendar_event_copy (event)); + calendar_event_copy (event)); } static GSList * calendar_client_filter_events (CalendarClient *client, - GSList *sources, - CalendarEventFilterFunc filter_func, - time_t start_time, - time_t end_time) + GSList *sources, + CalendarEventFilterFunc filter_func, + time_t start_time, + time_t end_time) { FilterData filter_data; GSList *l; @@ -1941,16 +1904,16 @@ CalendarClientSource *source = l->data; if (source->query_completed) - { - filter_data.events = NULL; - g_hash_table_foreach (source->completed_query.events, - (GHFunc) filter_func, - &filter_data); + { + filter_data.events = NULL; + g_hash_table_foreach (source->completed_query.events, + (GHFunc) filter_func, + &filter_data); - filter_data.events = g_slist_reverse (filter_data.events); + filter_data.events = g_slist_reverse (filter_data.events); - retval = g_slist_concat (retval, filter_data.events); - } + retval = g_slist_concat (retval, filter_data.events); + } } return retval; @@ -1958,7 +1921,7 @@ GSList * calendar_client_get_events (CalendarClient *client, - CalendarEventType event_mask) + CalendarEventType event_mask) { GSList *appointments; GSList *tasks; @@ -1967,34 +1930,34 @@ g_return_val_if_fail (CALENDAR_IS_CLIENT (client), NULL); g_return_val_if_fail (client->priv->day != G_MAXUINT && - client->priv->month != G_MAXUINT && - client->priv->year != G_MAXUINT, NULL); + client->priv->month != G_MAXUINT && + client->priv->year != G_MAXUINT, NULL); day_begin = make_time_for_day_begin (client->priv->day, - client->priv->month, - client->priv->year); + client->priv->month, + client->priv->year); day_end = make_time_for_day_begin (client->priv->day + 1, - client->priv->month, - client->priv->year); + client->priv->month, + client->priv->year); appointments = NULL; if (event_mask & CALENDAR_EVENT_APPOINTMENT) { appointments = calendar_client_filter_events (client, - client->priv->appointment_sources, - filter_appointment, - day_begin, - day_end); + client->priv->appointment_sources, + filter_appointment, + day_begin, + day_end); } tasks = NULL; if (event_mask & CALENDAR_EVENT_TASK) { tasks = calendar_client_filter_events (client, - client->priv->task_sources, - filter_task, - day_begin, - day_end); + client->priv->task_sources, + filter_task, + day_begin, + day_end); } return g_slist_concat (appointments, tasks); @@ -2012,8 +1975,8 @@ void calendar_client_foreach_appointment_day (CalendarClient *client, - CalendarDayIter iter_func, - gpointer user_data) + CalendarDayIter iter_func, + gpointer user_data) { GSList *appointments, *l; gboolean marked_days [32] = { FALSE, }; @@ -2024,20 +1987,20 @@ g_return_if_fail (CALENDAR_IS_CLIENT (client)); g_return_if_fail (iter_func != NULL); g_return_if_fail (client->priv->month != G_MAXUINT && - client->priv->year != G_MAXUINT); + client->priv->year != G_MAXUINT); month_begin = make_time_for_day_begin (1, - client->priv->month, - client->priv->year); + client->priv->month, + client->priv->year); month_end = make_time_for_day_begin (1, - client->priv->month + 1, - client->priv->year); - + client->priv->month + 1, + client->priv->year); + appointments = calendar_client_filter_events (client, - client->priv->appointment_sources, - filter_appointment, - month_begin, - month_end); + client->priv->appointment_sources, + filter_appointment, + month_begin, + month_end); for (l = appointments; l; l = l->next) { CalendarAppointment *appointment = l->data; @@ -2048,12 +2011,12 @@ if (day_time >= month_begin) marked_days [day_from_time_t (day_time)] = TRUE; - + if (appointment->end_time) { int day_offset; int duration = appointment->end_time - appointment->start_time; - /* mark the days for the appointment, no need to add an extra one when duration is a multiple of 86400 */ + /* mark the days for the appointment, no need to add an extra one when duration is a multiple of 86400 */ for (day_offset = 1; day_offset <= duration / 86400 && duration != day_offset * 86400; day_offset++) { time_t day_tm = appointment->start_time + day_offset * 86400; @@ -2073,21 +2036,21 @@ for (i = 1; i < 32; i++) { if (marked_days [i]) - iter_func (client, i, user_data); + iter_func (client, i, user_data); } } void calendar_client_set_task_completed (CalendarClient *client, - char *task_uid, - gboolean task_completed, - guint percent_complete) -{ - GSList *l; - ECalClient *esource; - icalcomponent *ical; - icalproperty *prop; - icalproperty_status status; + char *task_uid, + gboolean task_completed, + guint percent_complete) +{ + GSList *l; + ECalClient *esource; + ICalComponent *ical; + ICalProperty *prop; + ICalPropertyStatus status; g_return_if_fail (CALENDAR_IS_CLIENT (client)); g_return_if_fail (task_uid != NULL); @@ -2102,7 +2065,7 @@ esource = source->cal_client; e_cal_client_get_object_sync (esource, task_uid, NULL, &ical, NULL, NULL); if (ical) - break; + break; } if (!ical) @@ -2114,53 +2077,59 @@ g_assert (esource != NULL); /* Completed time */ - prop = icalcomponent_get_first_property (ical, - ICAL_COMPLETED_PROPERTY); + prop = i_cal_component_get_first_property (ical, + I_CAL_COMPLETED_PROPERTY); if (task_completed) { - struct icaltimetype completed_time; + ICalTime *completed_time; - completed_time = icaltime_current_time_with_zone (client->priv->zone); + completed_time = i_cal_time_new_current_with_zone (client->priv->zone); if (!prop) - { - icalcomponent_add_property (ical, - icalproperty_new_completed (completed_time)); - } + { + i_cal_component_take_property (ical, + i_cal_property_new_completed (completed_time)); + } else - { - icalproperty_set_completed (prop, completed_time); - } + { + i_cal_property_set_completed (prop, completed_time); + } + + g_clear_object (&completed_time); } else if (prop) { - icalcomponent_remove_property (ical, prop); + i_cal_component_remove_property (ical, prop); } + g_clear_object (&prop); + /* Percent complete */ - prop = icalcomponent_get_first_property (ical, - ICAL_PERCENTCOMPLETE_PROPERTY); + prop = i_cal_component_get_first_property (ical, + I_CAL_PERCENTCOMPLETE_PROPERTY); if (!prop) { - icalcomponent_add_property (ical, - icalproperty_new_percentcomplete (percent_complete)); + i_cal_component_take_property (ical, + i_cal_property_new_percentcomplete (percent_complete)); } else { - icalproperty_set_percentcomplete (prop, percent_complete); + i_cal_property_set_percentcomplete (prop, percent_complete); + g_object_unref (prop); } /* Status */ - status = task_completed ? ICAL_STATUS_COMPLETED : ICAL_STATUS_NEEDSACTION; - prop = icalcomponent_get_first_property (ical, ICAL_STATUS_PROPERTY); + status = task_completed ? I_CAL_STATUS_COMPLETED : I_CAL_STATUS_NEEDSACTION; + prop = i_cal_component_get_first_property (ical, I_CAL_STATUS_PROPERTY); if (prop) { - icalproperty_set_status (prop, status); + i_cal_property_set_status (prop, status); + g_object_unref (prop); } else { - icalcomponent_add_property (ical, - icalproperty_new_status (status)); + i_cal_component_take_property (ical, + i_cal_property_new_status (status)); } - e_cal_client_modify_object_sync (esource, ical, CALOBJ_MOD_ALL, NULL, NULL); + e_cal_client_modify_object_sync (esource, ical, E_CAL_OBJ_MOD_ALL, E_CAL_OPERATION_FLAG_NONE, NULL, NULL); } diff -Nru almanah-0.11.1/src/event-factories/calendar-sources.c almanah-0.12.0/src/event-factories/calendar-sources.c --- almanah-0.11.1/src/event-factories/calendar-sources.c 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/src/event-factories/calendar-sources.c 2019-10-07 13:45:09.000000000 +0000 @@ -54,7 +54,7 @@ CalendarSources *sources; guint changed_signal; - GSList *clients; + GSList *clients; /* ECalClient * */ ESourceSelector *esource_selector; guint timeout_id; @@ -251,7 +251,7 @@ ECalClientSourceType client_type, GSList *existing_clients) { - ECalClient *retval; + EClient *retval; GError *error = NULL; if (existing_clients) @@ -262,7 +262,7 @@ { ECalClient *client = E_CAL_CLIENT (l->data); - if (g_strcmp0 (e_source_get_uid (esource), e_source_get_uid (e_client_get_source (E_CLIENT (client))))) + if (g_str_equal (e_source_get_uid (esource), e_source_get_uid (e_client_get_source (E_CLIENT (client))))) { dprintf (" load_esource: found existing source ... returning that\n"); @@ -271,17 +271,20 @@ } } - retval = e_cal_client_new (esource, client_type, &error); + /* Basically do not wait for the connected state */ + retval = e_cal_client_connect_sync (esource, client_type, -1, NULL, &error); if (!retval) { g_warning ("Could not load source '%s' from '%s': %s", e_source_get_display_name (esource), e_source_get_uid (esource), error ? error->message : "Unknown error"); + g_clear_error (&error); + return NULL; } - return retval; + return E_CAL_CLIENT (retval); } /* - Order doesn't matter @@ -449,7 +452,7 @@ dprintf ("Loading sources:\n"); dprintf (" sources_extension: %s\n", sources_extension); - source_data->esource_selector = E_SOURCE_SELECTOR (e_source_selector_new (sources->priv->esource_registry, sources_extension)); + source_data->esource_selector = E_SOURCE_SELECTOR (g_object_ref_sink (e_source_selector_new (sources->priv->esource_registry, sources_extension))); g_signal_connect (source_data->esource_selector, "selection-changed", G_CALLBACK (calendar_sources_selection_changed_cb), source_data); diff -Nru almanah-0.11.1/src/event-factories/e-cell-renderer-color.c almanah-0.12.0/src/event-factories/e-cell-renderer-color.c --- almanah-0.11.1/src/event-factories/e-cell-renderer-color.c 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/src/event-factories/e-cell-renderer-color.c 2019-10-07 13:45:09.000000000 +0000 @@ -16,9 +16,7 @@ * License along with this program; if not, see . */ -#ifdef HAVE_CONFIG_H #include -#endif #include "e-cell-renderer-color.h" @@ -35,7 +33,7 @@ }; struct _ECellRendererColorPrivate { - GdkColor *color; + GdkRGBA *color; }; G_DEFINE_TYPE ( @@ -127,7 +125,7 @@ if (!gdk_rectangle_intersect (cell_area, &pix_rect, &draw_rect)) return; - gdk_cairo_set_source_color (cr, priv->color); + gdk_cairo_set_source_rgba (cr, priv->color); cairo_rectangle (cr, pix_rect.x, pix_rect.y, draw_rect.width, draw_rect.height); cairo_fill (cr); @@ -146,7 +144,7 @@ switch (property_id) { case PROP_COLOR: if (priv->color != NULL) - gdk_color_free (priv->color); + gdk_rgba_free (priv->color); priv->color = g_value_dup_boxed (value); return; } @@ -181,7 +179,7 @@ priv = E_CELL_RENDERER_COLOR_GET_PRIVATE (object); if (priv->color != NULL) - gdk_color_free (priv->color); + gdk_rgba_free (priv->color); /* Chain up to parent's finalize() method. */ G_OBJECT_CLASS (e_cell_renderer_color_parent_class)->finalize (object); diff -Nru almanah-0.11.1/src/event-factories/e-source-selector.c almanah-0.12.0/src/event-factories/e-source-selector.c --- almanah-0.11.1/src/event-factories/e-source-selector.c 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/src/event-factories/e-source-selector.c 2019-10-07 13:45:09.000000000 +0000 @@ -21,9 +21,7 @@ * Author: Ettore Perazzoli */ -#ifdef HAVE_CONFIG_H #include -#endif #include @@ -270,7 +268,7 @@ extension = e_source_get_extension (source, extension_name); if (extension != NULL) { - GdkColor color; + GdkRGBA color; const gchar *color_spec = NULL; gboolean show_color = FALSE; gboolean show_toggle; @@ -284,7 +282,7 @@ E_SOURCE_SELECTABLE (extension)); if (color_spec != NULL && *color_spec != '\0') - show_color = gdk_color_parse (color_spec, &color); + show_color = gdk_rgba_parse (&color, color_spec); show_toggle = e_source_selector_get_show_toggles (selector); diff -Nru almanah-0.11.1/src/event-factory-builtins.c almanah-0.12.0/src/event-factory-builtins.c --- almanah-0.11.1/src/event-factory-builtins.c 2014-09-24 18:32:53.000000000 +0000 +++ almanah-0.12.0/src/event-factory-builtins.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ - - - -#include "event-factory.h" -#include "event-factory-builtins.h" - -/* enumerations from "event-factory.h" */ -GType -almanah_event_factory_type_get_type (void) -{ - static GType etype = 0; - if (etype == 0) { - static const GEnumValue values[] = { - { ALMANAH_EVENT_FACTORY_UNKNOWN, "ALMANAH_EVENT_FACTORY_UNKNOWN", "unknown" }, - { ALMANAH_EVENT_FACTORY_CALENDAR, "ALMANAH_EVENT_FACTORY_CALENDAR", "calendar" }, - { 0, NULL, NULL } - }; - etype = g_enum_register_static ("AlmanahEventFactoryType", values); - } - return etype; -} - - - diff -Nru almanah-0.11.1/src/event-factory-builtins.h almanah-0.12.0/src/event-factory-builtins.h --- almanah-0.11.1/src/event-factory-builtins.h 2014-09-24 18:32:53.000000000 +0000 +++ almanah-0.12.0/src/event-factory-builtins.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ - - - -#ifndef __ALMANAH_EVENT_FACTORY_BUILTINS_H__ -#define __ALMANAH_EVENT_FACTORY_BUILTINS_H__ - -#include - -G_BEGIN_DECLS -/* enumerations from "event-factory.h" */ -GType almanah_event_factory_type_get_type (void) G_GNUC_CONST; -#define ALMANAH_TYPE_EVENT_FACTORY_TYPE (almanah_event_factory_type_get_type()) -G_END_DECLS - -#endif /* __ALMANAH_EVENT_FACTORY_BUILTINS_H__ */ - - - diff -Nru almanah-0.11.1/src/event-factory.c almanah-0.12.0/src/event-factory.c --- almanah-0.11.1/src/event-factory.c 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/src/event-factory.c 2019-10-07 13:45:09.000000000 +0000 @@ -20,7 +20,7 @@ #include #include "event-factory.h" -#include "event-factory-builtins.h" +#include "enums.h" static void almanah_event_factory_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec); diff -Nru almanah-0.11.1/src/event-manager.c almanah-0.12.0/src/event-manager.c --- almanah-0.11.1/src/event-manager.c 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/src/event-manager.c 2019-10-07 13:45:09.000000000 +0000 @@ -21,7 +21,7 @@ #include "event-manager.h" #include "event-factory.h" -#include "event-factory-builtins.h" +#include "enums.h" typedef struct { AlmanahEventFactoryType type_id; diff -Nru almanah-0.11.1/src/events/calendar-appointment.c almanah-0.12.0/src/events/calendar-appointment.c --- almanah-0.11.1/src/events/calendar-appointment.c 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/src/events/calendar-appointment.c 2019-10-07 13:45:09.000000000 +0000 @@ -79,14 +79,14 @@ almanah_calendar_appointment_event_new (const gchar *summary, GTime start_time) { AlmanahCalendarAppointmentEvent *event = g_object_new (ALMANAH_TYPE_CALENDAR_APPOINTMENT_EVENT, NULL); - struct tm utc_date_tm; + struct tm date_tm; event->priv->summary = g_strdup (summary); event->priv->start_time = start_time; - gmtime_r ((const time_t*) &(ALMANAH_CALENDAR_APPOINTMENT_EVENT (event)->priv->start_time), &utc_date_tm); + localtime_r ((const time_t*) &(ALMANAH_CALENDAR_APPOINTMENT_EVENT (event)->priv->start_time), &date_tm); /* Translators: This is a time string with the format hh:mm */ - event->priv->time = g_strdup_printf (_("%.2d:%.2d"), utc_date_tm.tm_hour, utc_date_tm.tm_min); + event->priv->time = g_strdup_printf (_("%.2d:%.2d"), date_tm.tm_hour, date_tm.tm_min); return event; } diff -Nru almanah-0.11.1/src/events/calendar-task.c almanah-0.12.0/src/events/calendar-task.c --- almanah-0.11.1/src/events/calendar-task.c 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/src/events/calendar-task.c 2019-10-07 13:45:09.000000000 +0000 @@ -80,14 +80,14 @@ almanah_calendar_task_event_new (const gchar *uid, const gchar *summary, GTime start_time) { AlmanahCalendarTaskEvent *event = g_object_new (ALMANAH_TYPE_CALENDAR_TASK_EVENT, NULL); - struct tm utc_date_tm; + struct tm date_tm; event->priv->uid = g_strdup (uid); event->priv->summary = g_strdup (summary); - gmtime_r ((const time_t*) &(start_time), &utc_date_tm); + localtime_r ((const time_t*) &(start_time), &date_tm); /* Translators: This is a time string with the format hh:mm */ - event->priv->time = g_strdup_printf (_("%.2d:%.2d"), utc_date_tm.tm_hour, utc_date_tm.tm_min); + event->priv->time = g_strdup_printf (_("%.2d:%.2d"), date_tm.tm_hour, date_tm.tm_min); return event; } diff -Nru almanah-0.11.1/src/export-operation.c almanah-0.12.0/src/export-operation.c --- almanah-0.11.1/src/export-operation.c 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/src/export-operation.c 2019-10-07 13:45:09.000000000 +0000 @@ -301,7 +301,7 @@ /* We ignore the progress callbacks, since this is a fairly fast operation, and it exports all the entries at once. */ /* Get the input file (current unencrypted database) */ - source = g_file_new_for_path (almanah_storage_manager_get_filename (self->priv->storage_manager, TRUE)); + source = g_file_new_for_path (almanah_storage_manager_get_filename (self->priv->storage_manager)); /* Copy the current database to that location */ success = g_file_copy (source, destination, G_FILE_COPY_OVERWRITE, cancellable, NULL, NULL, error); diff -Nru almanah-0.11.1/src/gtk/menus.ui almanah-0.12.0/src/gtk/menus.ui --- almanah-0.11.1/src/gtk/menus.ui 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.12.0/src/gtk/menus.ui 2019-10-07 13:45:09.000000000 +0000 @@ -0,0 +1,83 @@ + + + +
+ + _Search + app.search + +
+
+ + Pr_eferences + app.preferences + + + _Import + app.import + + + _Export + app.export + + + _Print diary + app.print + +
+
+ + _About Almanah Diary + app.about + + + _Quit + app.quit + +
+
+ +
+ + _Bold + win.bold + + + _Italic + win.italic + + + _Underline + win.underline + +
+
+ + _Cut + win.cut + + + _Copy + win.copy + + + _Paste + win.paste + + + _Delete + win.cut + +
+
+ + Insert _Time + win.insert-time + + + Add/Remove _Hyperlink + win.hyperlink + +
+
+
diff -Nru almanah-0.11.1/src/import-export-dialog.c almanah-0.12.0/src/import-export-dialog.c --- almanah-0.11.1/src/import-export-dialog.c 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/src/import-export-dialog.c 2019-10-07 13:45:09.000000000 +0000 @@ -150,11 +150,9 @@ AlmanahImportExportDialog *import_export_dialog; AlmanahImportExportDialogPrivate *priv; GError *error = NULL; - const gchar *interface_filename = almanah_get_interface_filename (); const gchar *object_names[] = { "almanah_ied_mode_store", "almanah_import_export_dialog", - "almanah_ui_manager", /* HACK: work around bgo#672789 */ NULL }; @@ -162,10 +160,13 @@ builder = gtk_builder_new (); - if (gtk_builder_add_objects_from_file (builder, interface_filename, (gchar**) object_names, &error) == FALSE) { + if (gtk_builder_add_objects_from_resource (builder, "/org/gnome/Almanah/ui/almanah.ui", (gchar**) object_names, &error) == 0) { /* Show an error */ - GtkWidget *dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, - _("UI file \"%s\" could not be loaded"), interface_filename); + GtkWidget *dialog = gtk_message_dialog_new (NULL, + GTK_DIALOG_MODAL, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + _("UI data could not be loaded")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", error->message); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -204,8 +205,10 @@ /* Set the window title */ gtk_window_set_title (GTK_WINDOW (import_export_dialog), (import == TRUE) ? _("Import Entries") : _("Export Entries")); - /* Set the button label */ - gtk_button_set_label (GTK_BUTTON (priv->import_export_button), (import == TRUE) ? _("_Import") : _("_Export")); + /* Set the button label. */ + gtk_button_set_label (GTK_BUTTON (priv->import_export_button), + /* Translators: These are verbs. */ + (import == TRUE) ? C_("Dialog button", "_Import") : C_("Dialog button", "_Export")); /* Populate the mode combo box */ if (import == TRUE) @@ -454,22 +457,23 @@ AlmanahImportResultsDialog *results_dialog; AlmanahImportResultsDialogPrivate *priv; GError *error = NULL; - const gchar *interface_filename = almanah_get_interface_filename (); const gchar *object_names[] = { "almanah_ird_view_store", "almanah_ird_results_store", "almanah_ird_filtered_results_store", "almanah_import_results_dialog", - "almanah_ui_manager", /* HACK: work around bgo#672789 */ NULL }; builder = gtk_builder_new (); - if (gtk_builder_add_objects_from_file (builder, interface_filename, (gchar**) object_names, &error) == FALSE) { + if (gtk_builder_add_objects_from_resource (builder, "/org/gnome/Almanah/ui/almanah.ui", (gchar**) object_names, &error) == 0) { /* Show an error */ - GtkWidget *dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, - _("UI file \"%s\" could not be loaded"), interface_filename); + GtkWidget *dialog = gtk_message_dialog_new (NULL, + GTK_DIALOG_MODAL, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + _("UI data could not be loaded")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", error->message); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); diff -Nru almanah-0.11.1/src/import-operation.c almanah-0.12.0/src/import-operation.c --- almanah-0.11.1/src/import-operation.c 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/src/import-operation.c 2019-10-07 13:45:09.000000000 +0000 @@ -437,6 +437,7 @@ AlmanahStorageManager *database; AlmanahStorageManagerIter iter; gboolean success = FALSE; + GSettings *settings; /* Get the display name for use with set_entry(), below */ file_info = g_file_query_info (source, G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME, G_FILE_QUERY_INFO_NONE, cancellable, error); @@ -448,7 +449,9 @@ /* Open the database */ path = g_file_get_path (source); - database = almanah_storage_manager_new (path, NULL); + settings = g_settings_new ("org.gnome.almanah"); + database = almanah_storage_manager_new (path, settings); + g_object_unref (settings); g_free (path); /* Connect to the database */ diff -Nru almanah-0.11.1/src/interface.c almanah-0.12.0/src/interface.c --- almanah-0.11.1/src/interface.c 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/src/interface.c 2019-10-07 13:45:09.000000000 +0000 @@ -26,15 +26,6 @@ #include "interface.h" const gchar * -almanah_get_interface_filename (void) -{ - if (g_file_test ("./data/almanah.ui", G_FILE_TEST_EXISTS) == TRUE) - return "./data/almanah.ui"; - else - return PACKAGE_DATA_DIR"/almanah/almanah.ui"; -} - -const gchar * almanah_get_interface_app_menu_filename (void) { if (g_file_test ("./data/almanah-app-menu.ui", G_FILE_TEST_EXISTS) == TRUE) @@ -43,15 +34,6 @@ return PACKAGE_DATA_DIR"/almanah/almanah-app-menu.ui"; } -const gchar * -almanah_get_css_path (void) -{ - if (g_file_test ("./data", G_FILE_TEST_IS_DIR) == TRUE) - return "./data"; - else - return PACKAGE_DATA_DIR"/almanah"; -} - void almanah_interface_create_text_tags (GtkTextBuffer *text_buffer, gboolean connect_events) { diff -Nru almanah-0.11.1/src/interface.h almanah-0.12.0/src/interface.h --- almanah-0.11.1/src/interface.h 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/src/interface.h 2019-10-07 13:45:09.000000000 +0000 @@ -24,9 +24,7 @@ G_BEGIN_DECLS -const gchar *almanah_get_interface_filename (void); const gchar *almanah_get_interface_app_menu_filename (void); -const gchar *almanah_get_css_path (void); void almanah_interface_create_text_tags (GtkTextBuffer *text_buffer, gboolean connect_events); void almanah_calendar_month_changed_cb (GtkCalendar *calendar, gpointer user_data); gboolean almanah_run_on_screen (GdkScreen *screen, const gchar *command_line, GError **error); diff -Nru almanah-0.11.1/src/main.c almanah-0.12.0/src/main.c --- almanah-0.11.1/src/main.c 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/src/main.c 2019-10-07 13:45:09.000000000 +0000 @@ -32,7 +32,6 @@ #if !GLIB_CHECK_VERSION (2, 31, 0) g_thread_init (NULL); #endif - g_type_init (); application = almanah_application_new (); status = g_application_run (G_APPLICATION (application), argc, argv); diff -Nru almanah-0.11.1/src/main-window.c almanah-0.12.0/src/main-window.c --- almanah-0.11.1/src/main-window.c 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/src/main-window.c 2019-10-07 13:45:09.000000000 +0000 @@ -2,6 +2,7 @@ /* * Almanah * Copyright (C) Philip Withnall 2008-2009 + * Álvaro Peña 2014-2015 * * Almanah is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,6 +25,7 @@ #include #include #include +#include #ifdef ENABLE_SPELL_CHECKING #include #endif /* ENABLE_SPELL_CHECKING */ @@ -44,6 +46,10 @@ /* Interval for automatically saving the current entry. Currently an arbitrary 10 minutes. */ #define SAVE_ENTRY_INTERVAL 10 * 60 /* seconds */ +#define ALMANAH_MAIN_WINDOW_DESKTOP_INTERFACE_SETTINGS_SCHEMA "org.gnome.desktop.interface" +#define ALMANAH_MAIN_WINDOW_DOCUMENT_FONT_KEY_NAME "document-font-name" +#define ALMANAH_MAIN_WINDOW_FIXED_MARGIN_FONT 20 + static void almanah_main_window_dispose (GObject *object); #ifdef ENABLE_SPELL_CHECKING static void spell_checking_enabled_changed_cb (GSettings *settings, gchar *key, AlmanahMainWindow *self); @@ -55,52 +61,53 @@ static void restore_window_state (AlmanahMainWindow *self); static gboolean mw_delete_event_cb (GtkWindow *window, gpointer user_data); static void mw_entry_buffer_cursor_position_cb (GObject *object, GParamSpec *pspec, AlmanahMainWindow *main_window); -static void mw_entry_buffer_insert_text_cb (GtkTextBuffer *text_buffer, GtkTextIter *start, gchar *text, gint len, AlmanahMainWindow *main_window); -static void mw_entry_buffer_insert_text_after_cb (GtkTextBuffer *text_buffer, GtkTextIter *start, gchar *text, gint len, AlmanahMainWindow *main_window); +static void mw_entry_buffer_insert_text_cb (GtkSourceBuffer *text_buffer, GtkTextIter *start, gchar *text, gint len, AlmanahMainWindow *main_window); +static void mw_entry_buffer_insert_text_after_cb (GtkSourceBuffer *text_buffer, GtkTextIter *start, gchar *text, gint len, AlmanahMainWindow *main_window); static void mw_entry_buffer_has_selection_cb (GObject *object, GParamSpec *pspec, AlmanahMainWindow *main_window); -static void mw_bold_toggled_cb (GtkToggleAction *action, AlmanahMainWindow *main_window); -static void mw_italic_toggled_cb (GtkToggleAction *action, AlmanahMainWindow *main_window); -static void mw_underline_toggled_cb (GtkToggleAction *action, AlmanahMainWindow *main_window); -static void mw_hyperlink_toggled_cb (GtkToggleAction *action, AlmanahMainWindow *main_window); + static void mw_events_updated_cb (AlmanahEventManager *event_manager, AlmanahEventFactoryType type_id, AlmanahMainWindow *main_window); static gboolean save_entry_timeout_cb (AlmanahMainWindow *self); -static gint get_icon_margin (void); -static void mw_setup_toolbar (AlmanahMainWindow *main_window, AlmanahApplication *application, GtkBuilder *builder); +static void mw_setup_headerbar (AlmanahMainWindow *main_window, AlmanahApplication *application); + +static void mw_setup_size_text_view (AlmanahMainWindow *self); +static int mw_get_font_width (GtkWidget *widget, const gchar *font_name); + +/* GActions callbacks */ +void mw_cut_activate_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data); +void mw_copy_activate_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data); +void mw_paste_activate_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data); +void mw_delete_activate_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data); +void mw_insert_time_activate_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data); +void mw_important_toggle_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data); +void mw_show_tags_toggle_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data); +void mw_select_date_activate_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data); +void mw_bold_toggle_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data); +void mw_italic_toggle_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data); +void mw_underline_toggle_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data); +void mw_hyperlink_toggle_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data); +static void mw_undo_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data); +static void mw_redo_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data); + +static void mw_source_buffer_notify_can_undo_redo_cb (GObject *obj, GParamSpec *pspec, gpointer user_data); -/* GtkBuilder callbacks */ -void mw_cut_activate_cb (GtkAction *action, AlmanahMainWindow *main_window); -void mw_copy_activate_cb (GtkAction *action, AlmanahMainWindow *main_window); -void mw_paste_activate_cb (GtkAction *action, AlmanahMainWindow *main_window); -void mw_delete_activate_cb (GtkAction *action, AlmanahMainWindow *main_window); -void mw_insert_time_activate_cb (GtkAction *action, AlmanahMainWindow *main_window); -void mw_important_activate_cb (GtkAction *action, AlmanahMainWindow *main_window); -void mw_show_tags_activate_cb (GtkAction *action, AlmanahMainWindow *main_window); -void mw_select_date_activate_cb (GtkAction *action, AlmanahMainWindow *main_window); -void mw_jump_to_today_activate_cb (GtkAction *action, AlmanahMainWindow *main_window); -void mw_old_entries_activate_cb (GtkAction *action, AlmanahMainWindow *main_window); void mw_events_tree_view_row_activated_cb (GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, AlmanahMainWindow *main_window); /* Other callbacks */ void mw_calendar_day_selected_cb (AlmanahCalendarButton *calendar, AlmanahMainWindow *main_window); -static void mw_menu_button_popup_visible_cb (GtkWidget *menu, GParamSpec *pspec, GtkWidget *button); +void mw_calendar_select_date_clicked_cb (AlmanahCalendarButton *calendar, AlmanahMainWindow *main_window); +void mw_desktop_interface_settings_changed (GSettings *settings, const gchar *key, gpointer user_data); struct _AlmanahMainWindowPrivate { - GtkTextView *entry_view; - GtkTextBuffer *entry_buffer; + GtkWidget *header_bar; + GtkSourceView *entry_view; + GtkSourceBuffer *entry_buffer; AlmanahEntryTagsArea *entry_tags_area; AlmanahCalendarButton *calendar_button; GtkListStore *event_store; GtkWidget *events_expander; GtkLabel *events_count_label; GtkTreeSelection *events_selection; - GtkToggleAction *bold_action; - GtkToggleAction *italic_action; - GtkToggleAction *underline_action; - GtkToggleAction *hyperlink_action; - GtkAction *cut_action; - GtkAction *copy_action; - GtkAction *delete_action; - GtkAction *important_action; + GtkWidget *entry_scrolled; gboolean updating_formatting; gboolean pending_bold_active; @@ -111,6 +118,9 @@ gulong current_entry_notify_id; /* signal handler for current_entry::notify */ guint save_entry_timeout_id; /* source ID for timer to save current entry periodically */ + GSettings *desktop_interface_settings; + GtkCssProvider *css_provider; + #ifdef ENABLE_SPELL_CHECKING GSettings *settings; gulong spell_checking_enabled_changed_id; /* signal handler for application->settings::changed::spell-checking-enabled */ @@ -120,6 +130,23 @@ G_DEFINE_TYPE (AlmanahMainWindow, almanah_main_window, GTK_TYPE_APPLICATION_WINDOW) #define ALMANAH_MAIN_WINDOW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ALMANAH_TYPE_MAIN_WINDOW, AlmanahMainWindowPrivate)) +static GActionEntry win_entries[] = { + { "cut", mw_cut_activate_cb }, + { "copy", mw_copy_activate_cb }, + { "paste", mw_paste_activate_cb }, + { "delete", mw_delete_activate_cb }, + { "select-date", mw_select_date_activate_cb }, + { "insert-time", mw_insert_time_activate_cb }, + { "important", NULL, NULL, "false", mw_important_toggle_cb }, + { "show-tags", NULL, NULL, "false", mw_show_tags_toggle_cb }, + { "bold", NULL, NULL, "false", mw_bold_toggle_cb }, + { "italic", NULL, NULL, "false", mw_italic_toggle_cb }, + { "underline", NULL, NULL, "false", mw_underline_toggle_cb }, + { "hyperlink", NULL, NULL, "false", mw_hyperlink_toggle_cb }, + { "undo", mw_undo_cb }, + { "redo", mw_redo_cb } +}; + static void almanah_main_window_class_init (AlmanahMainWindowClass *klass) { @@ -135,6 +162,18 @@ gtk_window_set_title (GTK_WINDOW (self), _("Almanah Diary")); g_signal_connect (self, "delete-event", G_CALLBACK (mw_delete_event_cb), NULL); + + g_action_map_add_action_entries (G_ACTION_MAP (self), + win_entries, + G_N_ELEMENTS (win_entries), + self); + + self->priv->header_bar = gtk_header_bar_new (); + gtk_window_set_titlebar (GTK_WINDOW (self), self->priv->header_bar); + gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (self->priv->header_bar), TRUE); + + self->priv->desktop_interface_settings = NULL; + self->priv->css_provider = NULL; } static void @@ -149,6 +188,9 @@ set_current_entry (ALMANAH_MAIN_WINDOW (object), NULL); + g_clear_object (&priv->desktop_interface_settings); + g_clear_object (&priv->css_provider); + #ifdef ENABLE_SPELL_CHECKING if (priv->settings != NULL) { if (priv->spell_checking_enabled_changed_id != 0) { @@ -174,11 +216,9 @@ AlmanahMainWindowPrivate *priv; GError *error = NULL; AlmanahStorageManager *storage_manager; - const gchar *interface_filename = almanah_get_interface_filename (); const gchar *object_names[] = { "almanah_main_window", "almanah_mw_event_store", - "almanah_ui_manager", NULL }; @@ -186,13 +226,13 @@ builder = gtk_builder_new (); - if (gtk_builder_add_objects_from_file (builder, interface_filename, (gchar**) object_names, &error) == FALSE) { + if (gtk_builder_add_objects_from_resource (builder, "/org/gnome/Almanah/ui/almanah.ui", (gchar**) object_names, &error) == 0) { /* Show an error */ GtkWidget *dialog = gtk_message_dialog_new (NULL, - GTK_DIALOG_MODAL, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, - _("UI file \"%s\" could not be loaded"), interface_filename); + GTK_DIALOG_MODAL, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + _("UI data could not be loaded")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", error->message); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -218,6 +258,7 @@ priv = ALMANAH_MAIN_WINDOW (main_window)->priv; /* Grab our child widgets */ + priv->entry_scrolled = GTK_WIDGET (gtk_builder_get_object (builder, "almanah_mw_main_content_scrolled_window")); priv->entry_view = GTK_TEXT_VIEW (gtk_builder_get_object (builder, "almanah_mw_entry_view")); priv->entry_buffer = gtk_text_view_get_buffer (priv->entry_view); priv->entry_tags_area = ALMANAH_ENTRY_TAGS_AREA (gtk_builder_get_object (builder, "almanah_mw_entry_tags_area")); @@ -225,14 +266,6 @@ priv->events_expander = GTK_WIDGET (gtk_builder_get_object (builder, "almanah_mw_events_expander")); priv->events_count_label = GTK_LABEL (gtk_builder_get_object (builder, "almanah_mw_events_count_label")); priv->events_selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (gtk_builder_get_object (builder, "almanah_mw_events_tree_view"))); - priv->bold_action = GTK_TOGGLE_ACTION (gtk_builder_get_object (builder, "almanah_ui_bold"));; - priv->italic_action = GTK_TOGGLE_ACTION (gtk_builder_get_object (builder, "almanah_ui_italic")); - priv->underline_action = GTK_TOGGLE_ACTION (gtk_builder_get_object (builder, "almanah_ui_underline")); - priv->hyperlink_action = GTK_TOGGLE_ACTION (gtk_builder_get_object (builder, "almanah_ui_hyperlink")); - priv->cut_action = GTK_ACTION (gtk_builder_get_object (builder, "almanah_ui_cut")); - priv->copy_action = GTK_ACTION (gtk_builder_get_object (builder, "almanah_ui_copy")); - priv->delete_action = GTK_ACTION (gtk_builder_get_object (builder, "almanah_ui_delete")); - priv->important_action = GTK_ACTION (gtk_builder_get_object (builder, "almanah_ui_important")); #ifdef ENABLE_SPELL_CHECKING /* Set up spell checking, if it's enabled */ @@ -262,6 +295,10 @@ /* Similarly, make sure we're notified when there's a selection so we can change the status of cut/copy/paste actions */ g_signal_connect (priv->entry_buffer, "notify::has-selection", G_CALLBACK (mw_entry_buffer_has_selection_cb), main_window); + /* Update the undo/redo actions when the undo/redo stack changes. */ + g_signal_connect (priv->entry_buffer, "notify::can-undo", G_CALLBACK (mw_source_buffer_notify_can_undo_redo_cb), main_window); + g_signal_connect (priv->entry_buffer, "notify::can-redo", G_CALLBACK (mw_source_buffer_notify_can_undo_redo_cb), main_window); + /* Set the storage to the tags area */ storage_manager = almanah_application_dup_storage_manager (application); almanah_entry_tags_area_set_storage_manager (priv->entry_tags_area, storage_manager); @@ -269,22 +306,19 @@ /* The entry GtkTextView is the widget that grab the focus after a tag was added */ almanah_entry_tags_area_set_back_widget (priv->entry_tags_area, GTK_WIDGET (priv->entry_view)); - /* Connect up the formatting actions */ - g_signal_connect (priv->bold_action, "toggled", G_CALLBACK (mw_bold_toggled_cb), main_window); - g_signal_connect (priv->italic_action, "toggled", G_CALLBACK (mw_italic_toggled_cb), main_window); - g_signal_connect (priv->underline_action, "toggled", G_CALLBACK (mw_underline_toggled_cb), main_window); - g_signal_connect (priv->hyperlink_action, "toggled", (GCallback) mw_hyperlink_toggled_cb, main_window); - /* Notification for event changes */ event_manager = almanah_application_dup_event_manager (application); g_signal_connect (event_manager, "events-updated", G_CALLBACK (mw_events_updated_cb), main_window); g_object_unref (event_manager); /* Set up the main toolbar */ - mw_setup_toolbar (main_window, application, builder); + mw_setup_headerbar (main_window, application); + + /* Setting up the diary entry text view */ + mw_setup_size_text_view (main_window); /* Select the current day and month */ - mw_jump_to_today_activate_cb (NULL, main_window); + almanah_calendar_button_select_today(main_window->priv->calendar_button); /* Set up a timeout for saving the current entry every so often. */ priv->save_entry_timeout_id = g_timeout_add_seconds (SAVE_ENTRY_INTERVAL, (GSourceFunc) save_entry_timeout_cb, main_window); @@ -297,7 +331,7 @@ } static void -current_entry_notify_cb (AlmanahEntry *entry, GParamSpec *pspec, AlmanahMainWindow *self) +current_entry_notify_cb (__attribute__ ((unused)) AlmanahEntry *entry, __attribute__ ((unused)) GParamSpec *pspec, AlmanahMainWindow *self) { /* As the entry's been changed, mark it as edited so that it has to be saved */ gtk_text_buffer_set_modified (self->priv->entry_buffer, TRUE); @@ -571,9 +605,10 @@ _("Are you sure you want to edit this diary entry for %s?"), date_string); gtk_dialog_add_buttons (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, - GTK_STOCK_EDIT, GTK_RESPONSE_ACCEPT, + _("_Cancel"), GTK_RESPONSE_REJECT, + _("_Edit"), GTK_RESPONSE_ACCEPT, NULL); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); gtk_widget_show_all (dialog); if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_ACCEPT) { @@ -601,9 +636,10 @@ _("Are you sure you want to delete this diary entry for %s?"), date_string); gtk_dialog_add_buttons (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, - GTK_STOCK_DELETE, GTK_RESPONSE_ACCEPT, + _("_Cancel"), GTK_RESPONSE_REJECT, + _("_Delete"), GTK_RESPONSE_ACCEPT, NULL); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); gtk_widget_show_all (dialog); if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_ACCEPT) { @@ -648,7 +684,7 @@ } static void -mw_entry_buffer_cursor_position_cb (GObject *object, GParamSpec *pspec, AlmanahMainWindow *main_window) +mw_entry_buffer_cursor_position_cb (__attribute__ ((unused)) GObject *object, __attribute__ ((unused)) GParamSpec *pspec, AlmanahMainWindow *main_window) { GtkTextIter iter; AlmanahMainWindowPrivate *priv = main_window->priv; @@ -677,7 +713,7 @@ while (tag_list != NULL) { GtkTextTag *tag; gchar *tag_name; - GtkToggleAction *action = NULL; + const gchar *action_name = NULL; tag = GTK_TEXT_TAG (tag_list->data); g_object_get (tag, "name", &tag_name, NULL); @@ -685,26 +721,26 @@ /* See if we can do anything with the tag */ if (tag_name != NULL) { if (strcmp (tag_name, "bold") == 0) { - action = priv->bold_action; + action_name = "bold"; bold_toggled = TRUE; } else if (strcmp (tag_name, "italic") == 0) { - action = priv->italic_action; + action_name = "italic"; italic_toggled = TRUE; } else if (strcmp (tag_name, "underline") == 0) { - action = priv->underline_action; + action_name = "underline"; underline_toggled = TRUE; } } /* Hyperlink? */ if (ALMANAH_IS_HYPERLINK_TAG (tag)) { - action = priv->hyperlink_action; + action_name = "hyperlink"; hyperlink_toggled = TRUE; } - if (action != NULL) { + if (action_name != NULL) { /* Force the toggle status on the action */ - gtk_toggle_action_set_active (action, TRUE); + g_action_group_change_action_state (G_ACTION_GROUP (main_window), action_name, g_variant_new_boolean (TRUE)); } else if (tag_name == NULL || strcmp (tag_name, "gtkspell-misspelled") != 0) { /* Print a warning about the unknown tag */ g_warning (_("Unknown or duplicate text tag \"%s\" in entry. Ignoring."), tag_name); @@ -719,14 +755,13 @@ if (range_selected == FALSE) { /* Untoggle the remaining actions */ if (bold_toggled == FALSE) - gtk_toggle_action_set_active (priv->bold_action, FALSE); + g_action_group_change_action_state (G_ACTION_GROUP (main_window), "bold", g_variant_new_boolean (FALSE)); if (italic_toggled == FALSE) - gtk_toggle_action_set_active (priv->italic_action, FALSE); + g_action_group_change_action_state (G_ACTION_GROUP (main_window), "italic", g_variant_new_boolean (FALSE)); if (underline_toggled == FALSE) - gtk_toggle_action_set_active (priv->underline_action, FALSE); - + g_action_group_change_action_state (G_ACTION_GROUP (main_window), "underline", g_variant_new_boolean (FALSE)); if (hyperlink_toggled == FALSE) { - gtk_toggle_action_set_active (priv->hyperlink_action, FALSE); + g_action_group_change_action_state (G_ACTION_GROUP (main_window), "hyperlink", g_variant_new_boolean (FALSE)); } } @@ -735,19 +770,29 @@ } static void -mw_entry_buffer_insert_text_cb (GtkTextBuffer *text_buffer, GtkTextIter *start, gchar *text, gint len, AlmanahMainWindow *main_window) +mw_entry_buffer_insert_text_cb (__attribute__ ((unused)) GtkSourceBuffer *text_buffer, + __attribute__ ((unused)) GtkTextIter *start, + __attribute__ ((unused)) gchar *text, + __attribute__ ((unused)) gint len, + AlmanahMainWindow *main_window) { AlmanahMainWindowPrivate *priv = main_window->priv; + GVariant *action_state; priv->updating_formatting = TRUE; - priv->pending_bold_active = gtk_toggle_action_get_active (priv->bold_action); - priv->pending_italic_active = gtk_toggle_action_get_active (priv->italic_action); - priv->pending_underline_active = gtk_toggle_action_get_active (priv->underline_action); + action_state = g_action_group_get_action_state (G_ACTION_GROUP (main_window), "bold"); + priv->pending_bold_active = g_variant_get_boolean (action_state); + + action_state = g_action_group_get_action_state (G_ACTION_GROUP (main_window), "italic"); + priv->pending_italic_active = g_variant_get_boolean (action_state); + + action_state = g_action_group_get_action_state (G_ACTION_GROUP (main_window), "underline"); + priv->pending_underline_active = g_variant_get_boolean (action_state); } static void -mw_entry_buffer_insert_text_after_cb (GtkTextBuffer *text_buffer, GtkTextIter *end, gchar *text, gint len, AlmanahMainWindow *main_window) +mw_entry_buffer_insert_text_after_cb (GtkSourceBuffer *text_buffer, GtkTextIter *end, __attribute__ ((unused)) gchar *text, gint len, AlmanahMainWindow *main_window) { GtkTextIter start; AlmanahMainWindowPrivate *priv = main_window->priv; @@ -766,17 +811,23 @@ } static void -mw_entry_buffer_has_selection_cb (GObject *object, GParamSpec *pspec, AlmanahMainWindow *main_window) +mw_entry_buffer_has_selection_cb (GObject *object, __attribute__ ((unused)) GParamSpec *pspec, AlmanahMainWindow *main_window) { gboolean has_selection = gtk_text_buffer_get_has_selection (GTK_TEXT_BUFFER (object)); + GAction *action; + + action = g_action_map_lookup_action (G_ACTION_MAP (main_window), "cut"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), has_selection); - gtk_action_set_sensitive (main_window->priv->cut_action, has_selection); - gtk_action_set_sensitive (main_window->priv->copy_action, has_selection); - gtk_action_set_sensitive (main_window->priv->delete_action, has_selection); + action = g_action_map_lookup_action (G_ACTION_MAP (main_window), "copy"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), has_selection); + + action = g_action_map_lookup_action (G_ACTION_MAP (main_window), "delete"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), has_selection); } static gboolean -mw_delete_event_cb (GtkWindow *window, gpointer user_data) +mw_delete_event_cb (GtkWindow *window, __attribute__ ((unused)) gpointer user_data) { almanah_main_window_save_current_entry (ALMANAH_MAIN_WINDOW (window), TRUE); save_window_state (ALMANAH_MAIN_WINDOW (window)); @@ -787,35 +838,40 @@ } void -mw_cut_activate_cb (GtkAction *action, AlmanahMainWindow *main_window) +mw_cut_activate_cb (__attribute__ ((unused)) GSimpleAction *action, __attribute__ ((unused)) GVariant *parameter, gpointer user_data) { + AlmanahMainWindow *main_window = ALMANAH_MAIN_WINDOW (user_data); GtkClipboard *clipboard = gtk_clipboard_get_for_display (gtk_widget_get_display (GTK_WIDGET (main_window)), GDK_SELECTION_CLIPBOARD); gtk_text_buffer_cut_clipboard (main_window->priv->entry_buffer, clipboard, TRUE); } void -mw_copy_activate_cb (GtkAction *action, AlmanahMainWindow *main_window) +mw_copy_activate_cb (__attribute__ ((unused)) GSimpleAction *action, __attribute__ ((unused)) GVariant *parameter, gpointer user_data) { + AlmanahMainWindow *main_window = ALMANAH_MAIN_WINDOW (user_data); GtkClipboard *clipboard = gtk_clipboard_get_for_display (gtk_widget_get_display (GTK_WIDGET (main_window)), GDK_SELECTION_CLIPBOARD); gtk_text_buffer_copy_clipboard (main_window->priv->entry_buffer, clipboard); } void -mw_paste_activate_cb (GtkAction *action, AlmanahMainWindow *main_window) +mw_paste_activate_cb (__attribute__ ((unused)) GSimpleAction *action, __attribute__ ((unused)) GVariant *parameter, gpointer user_data) { + AlmanahMainWindow *main_window = ALMANAH_MAIN_WINDOW (user_data); GtkClipboard *clipboard = gtk_clipboard_get_for_display (gtk_widget_get_display (GTK_WIDGET (main_window)), GDK_SELECTION_CLIPBOARD); gtk_text_buffer_paste_clipboard (main_window->priv->entry_buffer, clipboard, NULL, TRUE); } void -mw_delete_activate_cb (GtkAction *action, AlmanahMainWindow *main_window) +mw_delete_activate_cb (__attribute__ ((unused)) GSimpleAction *action, __attribute__ ((unused)) GVariant *parameter, gpointer user_data) { + AlmanahMainWindow *main_window = ALMANAH_MAIN_WINDOW (user_data); gtk_text_buffer_delete_selection (main_window->priv->entry_buffer, TRUE, TRUE); } void -mw_insert_time_activate_cb (GtkAction *action, AlmanahMainWindow *main_window) +mw_insert_time_activate_cb (__attribute__ ((unused)) GSimpleAction *action, __attribute__ ((unused)) GVariant *parameter, gpointer user_data) { + AlmanahMainWindow *main_window = ALMANAH_MAIN_WINDOW (user_data); gchar time_string[100]; time_t time_struct; @@ -825,23 +881,27 @@ } void -mw_important_activate_cb (GtkAction *action, AlmanahMainWindow *main_window) +mw_important_toggle_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data) { - almanah_entry_set_is_important (main_window->priv->current_entry, gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); + AlmanahMainWindow *main_window = ALMANAH_MAIN_WINDOW (user_data); + + almanah_entry_set_is_important (main_window->priv->current_entry, g_variant_get_boolean (parameter)); + g_simple_action_set_state (action, parameter); } void -mw_show_tags_activate_cb (GtkAction *action, AlmanahMainWindow *main_window) +mw_show_tags_toggle_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data) { - if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) - gtk_widget_show (GTK_WIDGET (main_window->priv->entry_tags_area)); - else - gtk_widget_hide (GTK_WIDGET (main_window->priv->entry_tags_area)); + AlmanahMainWindow *main_window = ALMANAH_MAIN_WINDOW (user_data); + + gtk_widget_set_visible (GTK_WIDGET (main_window->priv->entry_tags_area), g_variant_get_boolean (parameter)); + g_simple_action_set_state (action, parameter); } void -mw_select_date_activate_cb (GtkAction *action, AlmanahMainWindow *main_window) +mw_select_date_activate_cb (__attribute__ ((unused)) GSimpleAction *action, __attribute__ ((unused)) GVariant *parameter, gpointer user_data) { + AlmanahMainWindow *main_window = ALMANAH_MAIN_WINDOW (user_data); AlmanahDateEntryDialog *dialog = almanah_date_entry_dialog_new (); almanah_calendar_button_popdown (main_window->priv->calendar_button); @@ -878,26 +938,35 @@ gtk_text_buffer_set_modified (priv->entry_buffer, TRUE); } -static void -mw_bold_toggled_cb (GtkToggleAction *action, AlmanahMainWindow *main_window) +void +mw_bold_toggle_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data) { - apply_formatting (main_window, "bold", gtk_toggle_action_get_active (action)); + AlmanahMainWindow *main_window = ALMANAH_MAIN_WINDOW (user_data); + + apply_formatting (main_window, "bold", g_variant_get_boolean(parameter)); + g_simple_action_set_state (action, parameter); } -static void -mw_italic_toggled_cb (GtkToggleAction *action, AlmanahMainWindow *main_window) +void +mw_italic_toggle_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data) { - apply_formatting (main_window, "italic", gtk_toggle_action_get_active (action)); + AlmanahMainWindow *main_window = ALMANAH_MAIN_WINDOW (user_data); + + apply_formatting (main_window, "italic", g_variant_get_boolean(parameter)); + g_simple_action_set_state (action, parameter); } -static void -mw_underline_toggled_cb (GtkToggleAction *action, AlmanahMainWindow *main_window) +void +mw_underline_toggle_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data) { - apply_formatting (main_window, "underline", gtk_toggle_action_get_active (action)); + AlmanahMainWindow *main_window = ALMANAH_MAIN_WINDOW (user_data); + + apply_formatting (main_window, "underline", g_variant_get_boolean(parameter)); + g_simple_action_set_state (action, parameter); } static gboolean -hyperlink_tag_event_cb (GtkTextTag *tag, GObject *object, GdkEvent *event, GtkTextIter *iter, AlmanahMainWindow *self) +hyperlink_tag_event_cb (GtkTextTag *tag, __attribute__ ((unused)) GObject *object, GdkEvent *event, __attribute__ ((unused)) GtkTextIter *iter, AlmanahMainWindow *self) { AlmanahHyperlinkTag *hyperlink_tag = ALMANAH_HYPERLINK_TAG (tag); @@ -929,20 +998,30 @@ return FALSE; } -static void -mw_hyperlink_toggled_cb (GtkToggleAction *action, AlmanahMainWindow *self) +void +mw_hyperlink_toggle_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data) { + AlmanahMainWindow *self = ALMANAH_MAIN_WINDOW (user_data); AlmanahMainWindowPrivate *priv = self->priv; GtkTextIter start, end; + gboolean update_state = FALSE; + + /* The action state must be changed just in three cases and not always: + 1. when the text under the cursor changes and is into (or out) a hyperlink tag. + 2. when doesn't meets 1, the action is toggled to true and the user accepts the dialog. + 3. when doesn't meets 1 and the action is toggled to false. */ /* Make sure we don't muck up the formatting when the actions are having * their sensitivity set by the code. */ - if (priv->updating_formatting == TRUE) - return; + if (priv->updating_formatting == TRUE) { + /* Case 1 */ + update_state = TRUE; + goto finish; + } gtk_text_buffer_get_selection_bounds (priv->entry_buffer, &start, &end); - if (gtk_toggle_action_get_active (action) == TRUE) { + if (g_variant_get_boolean (parameter) == TRUE) { /* Add a new hyperlink on the selected text */ AlmanahUriEntryDialog *uri_entry_dialog; @@ -968,6 +1047,9 @@ /* The text tag table keeps a reference */ g_object_unref (tag); + + /* Case 2 */ + update_state = TRUE; } gtk_widget_destroy (GTK_WIDGET (uri_entry_dialog)); @@ -1012,24 +1094,48 @@ g_slist_free (tags); } + + /* Case 3 */ + update_state = TRUE; } gtk_text_buffer_set_modified (priv->entry_buffer, TRUE); + + finish: + if (update_state) + g_simple_action_set_state (action, parameter); } -void -mw_jump_to_today_activate_cb (GtkAction *action, AlmanahMainWindow *main_window) +static void +mw_undo_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data) { - GDate current_date; - g_date_set_time_t (¤t_date, time (NULL)); - almanah_calendar_button_select_date (main_window->priv->calendar_button, ¤t_date); + AlmanahMainWindow *main_window = ALMANAH_MAIN_WINDOW (user_data); + + gtk_source_buffer_undo (main_window->priv->entry_buffer); } -void -mw_old_entries_activate_cb (GtkAction *action, AlmanahMainWindow *main_window) +static void +mw_redo_cb (GSimpleAction *action, GVariant *parameter, gpointer user_data) { - /* TODO: Show the old entries */ - g_debug ("Old entries clicked, but nothing implemented yet..."); + AlmanahMainWindow *main_window = ALMANAH_MAIN_WINDOW (user_data); + + gtk_source_buffer_redo (main_window->priv->entry_buffer); +} + +static void +mw_source_buffer_notify_can_undo_redo_cb (GObject *obj, GParamSpec *pspec, gpointer user_data) +{ + AlmanahMainWindow *main_window = ALMANAH_MAIN_WINDOW (user_data); + GAction *action; + + /* Update whether the undo and redo actions are enabled. */ + action = g_action_map_lookup_action (G_ACTION_MAP (main_window), "undo"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + gtk_source_buffer_can_undo (main_window->priv->entry_buffer)); + + action = g_action_map_lookup_action (G_ACTION_MAP (main_window), "redo"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + gtk_source_buffer_can_redo (main_window->priv->entry_buffer)); } static void @@ -1123,7 +1229,7 @@ } void -mw_calendar_day_selected_cb (AlmanahCalendarButton *calendar_button, AlmanahMainWindow *main_window) +mw_calendar_day_selected_cb (__attribute__ ((unused)) AlmanahCalendarButton *calendar_button, AlmanahMainWindow *main_window) { AlmanahApplication *application; AlmanahStorageManager *storage_manager; @@ -1134,6 +1240,24 @@ #endif /* ENABLE_SPELL_CHECKING */ AlmanahMainWindowPrivate *priv = main_window->priv; AlmanahEntry *entry; + GAction *action; + gboolean future_entry; + const gchar *affected_actions[] = { + "cut", + "copy", + "paste", + "delete", + "insert-time", + "show-tags", + "bold", + "italic", + "underline", + "hyperlink", + "important", + NULL + }; + guint i = 0; + gchar calendar_string[100]; /* Set up */ application = ALMANAH_APPLICATION (gtk_window_get_application (GTK_WINDOW (main_window))); @@ -1143,6 +1267,9 @@ /* Update the date label */ almanah_calendar_button_get_date (main_window->priv->calendar_button, &calendar_date); + /* Translators: This is a strftime()-format string for the date displayed at the top of the main window. */ + g_date_strftime (calendar_string, sizeof (calendar_string), _("%A, %e %B %Y"), &calendar_date); + gtk_header_bar_set_title (GTK_HEADER_BAR (main_window->priv->header_bar), calendar_string); /* Update the entry */ storage_manager = almanah_application_dup_storage_manager (application); @@ -1154,9 +1281,15 @@ set_current_entry (main_window, entry); g_object_unref (entry); - gtk_text_view_set_editable (priv->entry_view, almanah_entry_get_editability (priv->current_entry) != ALMANAH_ENTRY_FUTURE ? TRUE : FALSE); - gtk_action_set_sensitive (priv->important_action, almanah_entry_get_editability (priv->current_entry) != ALMANAH_ENTRY_FUTURE ? TRUE : FALSE); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (priv->important_action), almanah_entry_is_important (priv->current_entry)); + future_entry = almanah_entry_get_editability (priv->current_entry) == ALMANAH_ENTRY_FUTURE; + gtk_text_view_set_editable (priv->entry_view, !future_entry); + for (i = 0; affected_actions[i] != NULL; i++) { + action = g_action_map_lookup_action (G_ACTION_MAP (main_window), affected_actions[i]); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), !future_entry); + if (strcmp (affected_actions[i], "important") == 0) + g_simple_action_set_state (G_SIMPLE_ACTION (action), g_variant_new_boolean(almanah_entry_is_important (priv->current_entry))); + } + /* Prepare for the possibility of failure --- do as much of the general interface changes as possible first */ gtk_list_store_clear (priv->event_store); @@ -1206,8 +1339,16 @@ almanah_entry_tags_area_set_entry (priv->entry_tags_area, priv->current_entry); } + +void +mw_calendar_select_date_clicked_cb (__attribute__ ((unused)) AlmanahCalendarButton *calendar, AlmanahMainWindow *main_window) +{ + g_action_group_activate_action (G_ACTION_GROUP (main_window), "select-date", NULL); +} + + void -mw_events_tree_view_row_activated_cb (GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, AlmanahMainWindow *main_window) +mw_events_tree_view_row_activated_cb (__attribute__ ((unused)) GtkTreeView *tree_view, GtkTreePath *path, __attribute__ ((unused)) GtkTreeViewColumn *column, AlmanahMainWindow *main_window) { AlmanahEvent *event; GtkTreeIter iter; @@ -1222,116 +1363,123 @@ } static void -mw_menu_button_popup_visible_cb (GtkWidget *menu, GParamSpec *pspec, GtkWidget *button) +mw_setup_headerbar (AlmanahMainWindow *main_window, AlmanahApplication *application) { - /* Set on/off the active menu style when the menu is visible */ - if (gtk_widget_get_visible (menu)) - gtk_style_context_add_class (gtk_widget_get_style_context (button), "active-menu"); - else - gtk_style_context_remove_class (gtk_widget_get_style_context (button), "active-menu"); + GtkWidget *button, *button_image; + GMenu *menu; + AlmanahStorageManager *storage_manager; + + /* Setup the calendar button */ + storage_manager = almanah_application_dup_storage_manager (application); + main_window->priv->calendar_button = ALMANAH_CALENDAR_BUTTON (almanah_calendar_button_new (storage_manager)); + g_object_unref (storage_manager); + g_signal_connect (main_window->priv->calendar_button, "day-selected", G_CALLBACK (mw_calendar_day_selected_cb), main_window); + g_signal_connect (main_window->priv->calendar_button, "select-date-clicked", G_CALLBACK (mw_calendar_select_date_clicked_cb), main_window); + gtk_style_context_add_class (gtk_widget_get_style_context (main_window->priv->header_bar), "image-button"); + button_image = gtk_image_new_from_icon_name ("x-office-calendar-symbolic", GTK_ICON_SIZE_MENU); + gtk_button_set_image (GTK_BUTTON (main_window->priv->calendar_button), button_image); + gtk_header_bar_pack_start (GTK_HEADER_BAR (main_window->priv->header_bar), GTK_WIDGET (main_window->priv->calendar_button)); + + /* Hamburger menu */ + button = gtk_menu_button_new (); + menu = gtk_application_get_menu_by_id (gtk_window_get_application (GTK_WINDOW (main_window)), "main-window-menu"); + gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (button), G_MENU_MODEL (menu)); + button_image = gtk_image_new_from_icon_name ("open-menu-symbolic", GTK_ICON_SIZE_MENU); + gtk_button_set_image (GTK_BUTTON (button), button_image); + gtk_header_bar_pack_end (GTK_HEADER_BAR (main_window->priv->header_bar), button); + + /* Important entry */ + button = gtk_toggle_button_new (); + gtk_style_context_add_class (gtk_widget_get_style_context (button), "image-button"); + button_image = gtk_image_new_from_icon_name ("starred-symbolic", GTK_ICON_SIZE_MENU); + gtk_button_set_image (GTK_BUTTON (button), button_image); + gtk_actionable_set_action_name (GTK_ACTIONABLE (button), "win.important"); + gtk_header_bar_pack_end (GTK_HEADER_BAR (main_window->priv->header_bar), button); + + /* Show/hide tags: future "side pane", for photos and other elements */ + button = gtk_toggle_button_new (); + button_image = gtk_image_new_from_icon_name ("almanah-tags-symbolic", GTK_ICON_SIZE_MENU); + gtk_button_set_image (GTK_BUTTON (button), button_image); + gtk_actionable_set_action_name (GTK_ACTIONABLE (button), "win.show-tags"); + gtk_header_bar_pack_end (GTK_HEADER_BAR (main_window->priv->header_bar), button); } -static gint -get_icon_margin (void) + +static void +mw_setup_size_text_view (AlmanahMainWindow *self) { - gint toolbar_size, menu_size; + gchar *font_name = NULL; + gchar *css_font = NULL; + int fixed_width; - gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &menu_size, NULL); - gtk_icon_size_lookup (GTK_ICON_SIZE_LARGE_TOOLBAR, &toolbar_size, NULL); - return (gint) ((toolbar_size - menu_size) / 2); + g_return_if_fail (ALMANAH_IS_MAIN_WINDOW (self)); + + /* Read the document font name & size, calculate the size of a random sentence + with 15 words and change the minimum size for the text view. */ + + if (self->priv->desktop_interface_settings == NULL) { + self->priv->desktop_interface_settings = g_settings_new (ALMANAH_MAIN_WINDOW_DESKTOP_INTERFACE_SETTINGS_SCHEMA); + g_signal_connect (self->priv->desktop_interface_settings, "changed", G_CALLBACK (mw_desktop_interface_settings_changed), self); + } + font_name = g_settings_get_string (self->priv->desktop_interface_settings, ALMANAH_MAIN_WINDOW_DOCUMENT_FONT_KEY_NAME); + css_font = g_strdup_printf (".almanah-mw-entry-view { font: %s; }", font_name); + if (self->priv->css_provider == NULL) { + GtkStyleContext *style_context; + + self->priv->css_provider = gtk_css_provider_new (); + style_context = gtk_widget_get_style_context (GTK_WIDGET (self->priv->entry_view)); + gtk_style_context_add_provider (style_context, GTK_STYLE_PROVIDER (self->priv->css_provider), GTK_STYLE_PROVIDER_PRIORITY_USER); + } + gtk_css_provider_load_from_data (self->priv->css_provider, css_font, strlen(css_font), NULL); + + /* Setting up entry GtkTextView size based on font size plus a margin */ + fixed_width = mw_get_font_width (GTK_WIDGET (self->priv->entry_view), font_name) + ALMANAH_MAIN_WINDOW_FIXED_MARGIN_FONT; + /* The ScrolledWindow (parent container for the text view) must be at + least the new width plus the text view margin */ + gtk_widget_set_size_request(GTK_WIDGET (self->priv->entry_view), fixed_width, -1); + + g_free (font_name); + g_free (css_font); } -static void -mw_setup_toolbar (AlmanahMainWindow *main_window, AlmanahApplication *application, GtkBuilder *builder) + +static int +mw_get_font_width (GtkWidget *widget, const gchar *font_name) { - GtkToolbar *toolbar; - GtkToolItem *tool_item; - GtkWidget *button, *button_image, *popup; - GtkUIManager *manager; - AlmanahStorageManager *storage_manager; + int width, height; + PangoFontDescription *desc; + PangoLayout *layout; - toolbar = GTK_TOOLBAR (gtk_builder_get_object (builder, "almanah_mw_toolbar")); - manager = GTK_UI_MANAGER (gtk_builder_get_object (builder, "almanah_ui_manager")); + desc = pango_font_description_from_string (font_name); + layout = pango_layout_new (gtk_widget_get_pango_context (widget)); + pango_layout_set_font_description (layout, desc); + /* Translators: this sentence is just used in startup to estimate the width + of a 15 words sentence. Translate with some random sentences with just 15 words. + See: https://bugzilla.gnome.org/show_bug.cgi?id=754841 */ + pango_layout_set_text (layout, _("This is just a fifteen words sentence to calculate the diary entry text view size"), -1); - /* Accel */ - gtk_window_add_accel_group (GTK_WINDOW (main_window), - gtk_ui_manager_get_accel_group (manager)); - - /* Allow drag the window using the toolbar */ - gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (toolbar)), GTK_STYLE_CLASS_MENUBAR); - gtk_toolbar_set_icon_size (toolbar, GTK_ICON_SIZE_MENU); + pango_layout_get_pixel_size (layout, &width, &height); - /* The text style button */ - tool_item = gtk_tool_item_new (); - button = gtk_menu_button_new (); - popup = gtk_ui_manager_get_widget (manager, "/almanah_mw_font_menu"); - gtk_menu_button_set_popup (GTK_MENU_BUTTON (button), popup); - button_image = gtk_image_new_from_icon_name ("gtk-select-font", GTK_ICON_SIZE_MENU); - g_object_set (button_image, "margin", get_icon_margin (), NULL); - gtk_button_set_image (GTK_BUTTON (button), button_image); - gtk_container_add (GTK_CONTAINER (tool_item), button); - g_signal_connect (popup, "notify::visible", G_CALLBACK (mw_menu_button_popup_visible_cb), button); - gtk_container_add (GTK_CONTAINER (toolbar), GTK_WIDGET (tool_item)); - - /* Insert a dynamic space between the insert link and calendar & important. - * This can't be done using the in the UI file at the moment - */ - tool_item = gtk_separator_tool_item_new (); - gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (tool_item), FALSE); - gtk_tool_item_set_expand (tool_item, TRUE); - gtk_container_add (GTK_CONTAINER (toolbar), GTK_WIDGET (tool_item)); + g_object_unref (layout); + pango_font_description_free (desc); - /* Setup the calendar button */ - storage_manager = almanah_application_dup_storage_manager (application); - main_window->priv->calendar_button = ALMANAH_CALENDAR_BUTTON (almanah_calendar_button_new (storage_manager)); - g_object_unref (storage_manager); - g_signal_connect (main_window->priv->calendar_button, "day-selected", G_CALLBACK (mw_calendar_day_selected_cb), main_window); - /* Use the same action for the today button in the dropdown window */ - almanah_calendar_button_set_today_action (main_window->priv->calendar_button, GTK_ACTION (gtk_builder_get_object (builder, "almanah_ui_jump_to_today"))); - almanah_calendar_button_set_select_date_action (main_window->priv->calendar_button, GTK_ACTION (gtk_builder_get_object (builder, "almanah_ui_select_date"))); - /* Insert the calendar button into the toolbar through a GtkToolItem but button style */ - tool_item = gtk_tool_item_new (); - gtk_container_add (GTK_CONTAINER (tool_item), GTK_WIDGET (main_window->priv->calendar_button)); - gtk_container_add (GTK_CONTAINER (toolbar), GTK_WIDGET (tool_item)); + return width; +} - /* Important entry */ - tool_item = gtk_separator_tool_item_new (); - gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (tool_item), FALSE); - gtk_container_add (GTK_CONTAINER (toolbar), GTK_WIDGET (tool_item)); - tool_item = gtk_toggle_tool_button_new (); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (tool_item), GTK_ACTION (gtk_builder_get_object (builder, "almanah_ui_important"))); - gtk_container_add (GTK_CONTAINER (toolbar), GTK_WIDGET (tool_item)); - - /* Another dynamic tool_item */ - tool_item = gtk_separator_tool_item_new (); - gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (tool_item), FALSE); - gtk_tool_item_set_expand (tool_item, TRUE); - gtk_container_add (GTK_CONTAINER (toolbar), GTK_WIDGET (tool_item)); - /* Show/hide tags: future "side pane", for photos and other elements */ - tool_item = gtk_toggle_tool_button_new (); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (tool_item), GTK_ACTION (gtk_builder_get_object (builder, "almanah_ui_show_tags"))); - gtk_container_add (GTK_CONTAINER (toolbar), GTK_WIDGET (tool_item)); - - /* Menu button with the common GNOME applications style (Nautilus, Epiphany, ...) */ - tool_item = gtk_separator_tool_item_new (); - gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (tool_item), FALSE); - gtk_container_add (GTK_CONTAINER (toolbar), GTK_WIDGET (tool_item)); - tool_item = gtk_tool_item_new (); - button = gtk_menu_button_new (); - popup = gtk_ui_manager_get_widget (manager, "/almanah_mw_menu_button"); - gtk_menu_button_set_popup (GTK_MENU_BUTTON (button), popup); - button_image = gtk_image_new_from_icon_name ("emblem-system-symbolic", GTK_ICON_SIZE_MENU); - g_object_set (button_image, "margin", get_icon_margin (), NULL); - gtk_button_set_image (GTK_BUTTON (button), button_image); - gtk_container_add (GTK_CONTAINER (tool_item), button); - gtk_container_add (GTK_CONTAINER (toolbar), GTK_WIDGET (tool_item)); - g_signal_connect (popup, "notify::visible", G_CALLBACK (mw_menu_button_popup_visible_cb), button); +void +mw_desktop_interface_settings_changed (G_GNUC_UNUSED GSettings *settings, const gchar *key, gpointer user_data) +{ + if (strcmp (ALMANAH_MAIN_WINDOW_DOCUMENT_FONT_KEY_NAME, key) != 0) + return; + + mw_setup_size_text_view (ALMANAH_MAIN_WINDOW (user_data)); } + #ifdef ENABLE_SPELL_CHECKING static void -spell_checking_enabled_changed_cb (GSettings *settings, gchar *key, AlmanahMainWindow *self) +spell_checking_enabled_changed_cb (GSettings *settings, __attribute__ ((unused)) gchar *key, AlmanahMainWindow *self) { gboolean enabled = g_settings_get_boolean (settings, "spell-checking-enabled"); diff -Nru almanah-0.11.1/src/Makefile.am almanah-0.12.0/src/Makefile.am --- almanah-0.11.1/src/Makefile.am 2014-09-24 17:33:27.000000000 +0000 +++ almanah-0.12.0/src/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,144 +0,0 @@ -bin_PROGRAMS = almanah - -almanah_SOURCES = \ - $(ALMANAH_MARSHAL_FILES) \ - $(ALMANAH_ENUM_FILES) \ - main.c \ - application.c \ - application.h \ - interface.c \ - interface.h \ - main-window.c \ - main-window.h \ - storage-manager.c \ - storage-manager.h \ - search-dialog.c \ - search-dialog.h \ - printing.c \ - printing.h \ - entry.c \ - entry.h \ - event.c \ - event.h \ - event-factory.c \ - event-factory.h \ - event-manager.c \ - event-manager.h \ - date-entry-dialog.c \ - date-entry-dialog.h \ - import-export-dialog.c \ - import-export-dialog.h \ - import-operation.c \ - import-operation.h \ - export-operation.c \ - export-operation.h \ - uri-entry-dialog.c \ - uri-entry-dialog.h \ - widgets/calendar.c \ - widgets/calendar.h \ - widgets/calendar-button.h \ - widgets/calendar-button.c \ - widgets/calendar-window.h \ - widgets/calendar-window.c \ - widgets/eggwrapbox.h \ - widgets/eggwrapbox.c \ - widgets/eggwrapbox-enums.h \ - widgets/eggwrapbox-enums.c \ - widgets/entry-tags-area.h \ - widgets/entry-tags-area.c \ - widgets/hyperlink-tag.c \ - widgets/hyperlink-tag.h \ - widgets/tag-accessible.c \ - widgets/tag-accessible.h \ - widgets/tag.c \ - widgets/tag.h \ - widgets/tag-entry.c \ - widgets/tag-entry.h - -if HAVE_EVO -almanah_SOURCES += \ - event-factories/calendar.c \ - event-factories/calendar.h \ - event-factories/calendar-client.c \ - event-factories/calendar-client.h \ - event-factories/calendar-debug.h \ - event-factories/calendar-sources.c \ - event-factories/calendar-sources.h \ - event-factories/e-cell-renderer-color.c \ - event-factories/e-cell-renderer-color.h \ - event-factories/e-source-selector.c \ - event-factories/e-source-selector.h \ - events/calendar-appointment.c \ - events/calendar-appointment.h \ - events/calendar-task.c \ - events/calendar-task.h -endif - -if ENCRYPTION -almanah_SOURCES += \ - preferences-dialog.c \ - preferences-dialog.h -endif - -almanah_CPPFLAGS = \ - -DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ - -I$(srcdir)/events \ - -I$(srcdir)/event-factories \ - $(DISABLE_DEPRECATED) \ - $(AM_CPPFLAGS) - -almanah_CFLAGS = \ - $(STANDARD_CFLAGS) \ - $(EVO_CFLAGS) \ - $(ENCRYPTION_CFLAGS) \ - $(SPELL_CHECKING_CFLAGS) \ - $(WARN_CFLAGS) \ - $(AM_CFLAGS) - -almanah_LDADD = \ - $(STANDARD_LIBS) \ - $(EVO_LIBS) \ - $(ENCRYPTION_LIBS) \ - $(SPELL_CHECKING_LIBS) \ - $(AM_LDADD) - -# Marshalling -ALMANAH_MARSHAL_FILES = \ - almanah-marshal.c \ - almanah-marshal.h - -almanah-marshal.h: almanah-marshal.list - $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=almanah_marshal --header $< > $@ -almanah-marshal.c: almanah-marshal.list almanah-marshal.h - $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=almanah_marshal --header --body $< > $@ - -# Enums -ALMANAH_ENUM_FILES = \ - event-factory-builtins.h \ - event-factory-builtins.c - -event-factory-builtins.h: event-factory.h Makefile - $(AM_V_GEN)(cd $(srcdir) && $(GLIB_MKENUMS) \ - --fhead "#ifndef __ALMANAH_EVENT_FACTORY_BUILTINS_H__\n#define __ALMANAH_EVENT_FACTORY_BUILTINS_H__\n\n#include \n\nG_BEGIN_DECLS\n" \ - --fprod "/* enumerations from \"@filename@\" */\n" \ - --vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define ALMANAH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ - --ftail "G_END_DECLS\n\n#endif /* __ALMANAH_EVENT_FACTORY_BUILTINS_H__ */" \ - event-factory.h) > $(@F) - -event-factory-builtins.c: event-factory.h Makefile event-factory-builtins.h - $(AM_V_GEN)(cd $(srcdir) && $(GLIB_MKENUMS) \ - --fhead "#include \"event-factory.h\"\n#include \"event-factory-builtins.h\"" \ - --fprod "\n/* enumerations from \"@filename@\" */" \ - --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ - --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ - --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ - event-factory.h) > $(@F) - -CLEANFILES = \ - $(ALMANAH_MARSHAL_FILES) \ - $(ALMANAH_ENUM_FILES) - -EXTRA_DIST = almanah-marshal.list - --include $(top_srcdir)/git.mk diff -Nru almanah-0.11.1/src/Makefile.in almanah-0.12.0/src/Makefile.in --- almanah-0.11.1/src/Makefile.in 2014-09-24 18:32:46.000000000 +0000 +++ almanah-0.12.0/src/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,1435 +0,0 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -bin_PROGRAMS = almanah$(EXEEXT) -@HAVE_EVO_TRUE@am__append_1 = \ -@HAVE_EVO_TRUE@ event-factories/calendar.c \ -@HAVE_EVO_TRUE@ event-factories/calendar.h \ -@HAVE_EVO_TRUE@ event-factories/calendar-client.c \ -@HAVE_EVO_TRUE@ event-factories/calendar-client.h \ -@HAVE_EVO_TRUE@ event-factories/calendar-debug.h \ -@HAVE_EVO_TRUE@ event-factories/calendar-sources.c \ -@HAVE_EVO_TRUE@ event-factories/calendar-sources.h \ -@HAVE_EVO_TRUE@ event-factories/e-cell-renderer-color.c \ -@HAVE_EVO_TRUE@ event-factories/e-cell-renderer-color.h \ -@HAVE_EVO_TRUE@ event-factories/e-source-selector.c \ -@HAVE_EVO_TRUE@ event-factories/e-source-selector.h \ -@HAVE_EVO_TRUE@ events/calendar-appointment.c \ -@HAVE_EVO_TRUE@ events/calendar-appointment.h \ -@HAVE_EVO_TRUE@ events/calendar-task.c \ -@HAVE_EVO_TRUE@ events/calendar-task.h - -@ENCRYPTION_TRUE@am__append_2 = \ -@ENCRYPTION_TRUE@ preferences-dialog.c \ -@ENCRYPTION_TRUE@ preferences-dialog.h - -subdir = src -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" -PROGRAMS = $(bin_PROGRAMS) -am__almanah_SOURCES_DIST = almanah-marshal.c almanah-marshal.h \ - event-factory-builtins.h event-factory-builtins.c main.c \ - application.c application.h interface.c interface.h \ - main-window.c main-window.h storage-manager.c \ - storage-manager.h search-dialog.c search-dialog.h printing.c \ - printing.h entry.c entry.h event.c event.h event-factory.c \ - event-factory.h event-manager.c event-manager.h \ - date-entry-dialog.c date-entry-dialog.h import-export-dialog.c \ - import-export-dialog.h import-operation.c import-operation.h \ - export-operation.c export-operation.h uri-entry-dialog.c \ - uri-entry-dialog.h widgets/calendar.c widgets/calendar.h \ - widgets/calendar-button.h widgets/calendar-button.c \ - widgets/calendar-window.h widgets/calendar-window.c \ - widgets/eggwrapbox.h widgets/eggwrapbox.c \ - widgets/eggwrapbox-enums.h widgets/eggwrapbox-enums.c \ - widgets/entry-tags-area.h widgets/entry-tags-area.c \ - widgets/hyperlink-tag.c widgets/hyperlink-tag.h \ - widgets/tag-accessible.c widgets/tag-accessible.h \ - widgets/tag.c widgets/tag.h widgets/tag-entry.c \ - widgets/tag-entry.h event-factories/calendar.c \ - event-factories/calendar.h event-factories/calendar-client.c \ - event-factories/calendar-client.h \ - event-factories/calendar-debug.h \ - event-factories/calendar-sources.c \ - event-factories/calendar-sources.h \ - event-factories/e-cell-renderer-color.c \ - event-factories/e-cell-renderer-color.h \ - event-factories/e-source-selector.c \ - event-factories/e-source-selector.h \ - events/calendar-appointment.c events/calendar-appointment.h \ - events/calendar-task.c events/calendar-task.h \ - preferences-dialog.c preferences-dialog.h -am__objects_1 = almanah-almanah-marshal.$(OBJEXT) -am__objects_2 = almanah-event-factory-builtins.$(OBJEXT) -am__dirstamp = $(am__leading_dot)dirstamp -@HAVE_EVO_TRUE@am__objects_3 = \ -@HAVE_EVO_TRUE@ event-factories/almanah-calendar.$(OBJEXT) \ -@HAVE_EVO_TRUE@ event-factories/almanah-calendar-client.$(OBJEXT) \ -@HAVE_EVO_TRUE@ event-factories/almanah-calendar-sources.$(OBJEXT) \ -@HAVE_EVO_TRUE@ event-factories/almanah-e-cell-renderer-color.$(OBJEXT) \ -@HAVE_EVO_TRUE@ event-factories/almanah-e-source-selector.$(OBJEXT) \ -@HAVE_EVO_TRUE@ events/almanah-calendar-appointment.$(OBJEXT) \ -@HAVE_EVO_TRUE@ events/almanah-calendar-task.$(OBJEXT) -@ENCRYPTION_TRUE@am__objects_4 = almanah-preferences-dialog.$(OBJEXT) -am_almanah_OBJECTS = $(am__objects_1) $(am__objects_2) \ - almanah-main.$(OBJEXT) almanah-application.$(OBJEXT) \ - almanah-interface.$(OBJEXT) almanah-main-window.$(OBJEXT) \ - almanah-storage-manager.$(OBJEXT) \ - almanah-search-dialog.$(OBJEXT) almanah-printing.$(OBJEXT) \ - almanah-entry.$(OBJEXT) almanah-event.$(OBJEXT) \ - almanah-event-factory.$(OBJEXT) \ - almanah-event-manager.$(OBJEXT) \ - almanah-date-entry-dialog.$(OBJEXT) \ - almanah-import-export-dialog.$(OBJEXT) \ - almanah-import-operation.$(OBJEXT) \ - almanah-export-operation.$(OBJEXT) \ - almanah-uri-entry-dialog.$(OBJEXT) \ - widgets/almanah-calendar.$(OBJEXT) \ - widgets/almanah-calendar-button.$(OBJEXT) \ - widgets/almanah-calendar-window.$(OBJEXT) \ - widgets/almanah-eggwrapbox.$(OBJEXT) \ - widgets/almanah-eggwrapbox-enums.$(OBJEXT) \ - widgets/almanah-entry-tags-area.$(OBJEXT) \ - widgets/almanah-hyperlink-tag.$(OBJEXT) \ - widgets/almanah-tag-accessible.$(OBJEXT) \ - widgets/almanah-tag.$(OBJEXT) \ - widgets/almanah-tag-entry.$(OBJEXT) $(am__objects_3) \ - $(am__objects_4) -almanah_OBJECTS = $(am_almanah_OBJECTS) -am__DEPENDENCIES_1 = -almanah_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -almanah_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(almanah_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = -SOURCES = $(almanah_SOURCES) -DIST_SOURCES = $(am__almanah_SOURCES_DIST) -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -APPDATA_VALIDATE = @APPDATA_VALIDATE@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENCRYPTION_CFLAGS = @ENCRYPTION_CFLAGS@ -ENCRYPTION_LIBS = @ENCRYPTION_LIBS@ -EVO_CFLAGS = @EVO_CFLAGS@ -EVO_LIBS = @EVO_LIBS@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ -GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GLIB_MKENUMS = @GLIB_MKENUMS@ -GMSGFMT = @GMSGFMT@ -GPGME_CONFIG = @GPGME_CONFIG@ -GREP = @GREP@ -GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MSGFMT = @MSGFMT@ -MSGMERGE = @MSGMERGE@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPELL_CHECKING_CFLAGS = @SPELL_CHECKING_CFLAGS@ -SPELL_CHECKING_LIBS = @SPELL_CHECKING_LIBS@ -STANDARD_CFLAGS = @STANDARD_CFLAGS@ -STANDARD_LIBS = @STANDARD_LIBS@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -appdataxmldir = @appdataxmldir@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gsettingsschemadir = @gsettingsschemadir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -almanah_SOURCES = $(ALMANAH_MARSHAL_FILES) $(ALMANAH_ENUM_FILES) \ - main.c application.c application.h interface.c interface.h \ - main-window.c main-window.h storage-manager.c \ - storage-manager.h search-dialog.c search-dialog.h printing.c \ - printing.h entry.c entry.h event.c event.h event-factory.c \ - event-factory.h event-manager.c event-manager.h \ - date-entry-dialog.c date-entry-dialog.h import-export-dialog.c \ - import-export-dialog.h import-operation.c import-operation.h \ - export-operation.c export-operation.h uri-entry-dialog.c \ - uri-entry-dialog.h widgets/calendar.c widgets/calendar.h \ - widgets/calendar-button.h widgets/calendar-button.c \ - widgets/calendar-window.h widgets/calendar-window.c \ - widgets/eggwrapbox.h widgets/eggwrapbox.c \ - widgets/eggwrapbox-enums.h widgets/eggwrapbox-enums.c \ - widgets/entry-tags-area.h widgets/entry-tags-area.c \ - widgets/hyperlink-tag.c widgets/hyperlink-tag.h \ - widgets/tag-accessible.c widgets/tag-accessible.h \ - widgets/tag.c widgets/tag.h widgets/tag-entry.c \ - widgets/tag-entry.h $(am__append_1) $(am__append_2) -almanah_CPPFLAGS = \ - -DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ - -I$(srcdir)/events \ - -I$(srcdir)/event-factories \ - $(DISABLE_DEPRECATED) \ - $(AM_CPPFLAGS) - -almanah_CFLAGS = \ - $(STANDARD_CFLAGS) \ - $(EVO_CFLAGS) \ - $(ENCRYPTION_CFLAGS) \ - $(SPELL_CHECKING_CFLAGS) \ - $(WARN_CFLAGS) \ - $(AM_CFLAGS) - -almanah_LDADD = \ - $(STANDARD_LIBS) \ - $(EVO_LIBS) \ - $(ENCRYPTION_LIBS) \ - $(SPELL_CHECKING_LIBS) \ - $(AM_LDADD) - - -# Marshalling -ALMANAH_MARSHAL_FILES = \ - almanah-marshal.c \ - almanah-marshal.h - - -# Enums -ALMANAH_ENUM_FILES = \ - event-factory-builtins.h \ - event-factory-builtins.c - -CLEANFILES = \ - $(ALMANAH_MARSHAL_FILES) \ - $(ALMANAH_ENUM_FILES) - -EXTRA_DIST = almanah-marshal.list -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ - fi; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p \ - || test -f $$p1 \ - ; then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n;h' \ - -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' \ - `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files - -clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list -widgets/$(am__dirstamp): - @$(MKDIR_P) widgets - @: > widgets/$(am__dirstamp) -widgets/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) widgets/$(DEPDIR) - @: > widgets/$(DEPDIR)/$(am__dirstamp) -widgets/almanah-calendar.$(OBJEXT): widgets/$(am__dirstamp) \ - widgets/$(DEPDIR)/$(am__dirstamp) -widgets/almanah-calendar-button.$(OBJEXT): widgets/$(am__dirstamp) \ - widgets/$(DEPDIR)/$(am__dirstamp) -widgets/almanah-calendar-window.$(OBJEXT): widgets/$(am__dirstamp) \ - widgets/$(DEPDIR)/$(am__dirstamp) -widgets/almanah-eggwrapbox.$(OBJEXT): widgets/$(am__dirstamp) \ - widgets/$(DEPDIR)/$(am__dirstamp) -widgets/almanah-eggwrapbox-enums.$(OBJEXT): widgets/$(am__dirstamp) \ - widgets/$(DEPDIR)/$(am__dirstamp) -widgets/almanah-entry-tags-area.$(OBJEXT): widgets/$(am__dirstamp) \ - widgets/$(DEPDIR)/$(am__dirstamp) -widgets/almanah-hyperlink-tag.$(OBJEXT): widgets/$(am__dirstamp) \ - widgets/$(DEPDIR)/$(am__dirstamp) -widgets/almanah-tag-accessible.$(OBJEXT): widgets/$(am__dirstamp) \ - widgets/$(DEPDIR)/$(am__dirstamp) -widgets/almanah-tag.$(OBJEXT): widgets/$(am__dirstamp) \ - widgets/$(DEPDIR)/$(am__dirstamp) -widgets/almanah-tag-entry.$(OBJEXT): widgets/$(am__dirstamp) \ - widgets/$(DEPDIR)/$(am__dirstamp) -event-factories/$(am__dirstamp): - @$(MKDIR_P) event-factories - @: > event-factories/$(am__dirstamp) -event-factories/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) event-factories/$(DEPDIR) - @: > event-factories/$(DEPDIR)/$(am__dirstamp) -event-factories/almanah-calendar.$(OBJEXT): \ - event-factories/$(am__dirstamp) \ - event-factories/$(DEPDIR)/$(am__dirstamp) -event-factories/almanah-calendar-client.$(OBJEXT): \ - event-factories/$(am__dirstamp) \ - event-factories/$(DEPDIR)/$(am__dirstamp) -event-factories/almanah-calendar-sources.$(OBJEXT): \ - event-factories/$(am__dirstamp) \ - event-factories/$(DEPDIR)/$(am__dirstamp) -event-factories/almanah-e-cell-renderer-color.$(OBJEXT): \ - event-factories/$(am__dirstamp) \ - event-factories/$(DEPDIR)/$(am__dirstamp) -event-factories/almanah-e-source-selector.$(OBJEXT): \ - event-factories/$(am__dirstamp) \ - event-factories/$(DEPDIR)/$(am__dirstamp) -events/$(am__dirstamp): - @$(MKDIR_P) events - @: > events/$(am__dirstamp) -events/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) events/$(DEPDIR) - @: > events/$(DEPDIR)/$(am__dirstamp) -events/almanah-calendar-appointment.$(OBJEXT): events/$(am__dirstamp) \ - events/$(DEPDIR)/$(am__dirstamp) -events/almanah-calendar-task.$(OBJEXT): events/$(am__dirstamp) \ - events/$(DEPDIR)/$(am__dirstamp) - -almanah$(EXEEXT): $(almanah_OBJECTS) $(almanah_DEPENDENCIES) $(EXTRA_almanah_DEPENDENCIES) - @rm -f almanah$(EXEEXT) - $(AM_V_CCLD)$(almanah_LINK) $(almanah_OBJECTS) $(almanah_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -rm -f event-factories/*.$(OBJEXT) - -rm -f events/*.$(OBJEXT) - -rm -f widgets/*.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/almanah-almanah-marshal.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/almanah-application.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/almanah-date-entry-dialog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/almanah-entry.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/almanah-event-factory-builtins.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/almanah-event-factory.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/almanah-event-manager.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/almanah-event.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/almanah-export-operation.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/almanah-import-export-dialog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/almanah-import-operation.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/almanah-interface.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/almanah-main-window.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/almanah-main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/almanah-preferences-dialog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/almanah-printing.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/almanah-search-dialog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/almanah-storage-manager.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/almanah-uri-entry-dialog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@event-factories/$(DEPDIR)/almanah-calendar-client.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@event-factories/$(DEPDIR)/almanah-calendar-sources.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@event-factories/$(DEPDIR)/almanah-calendar.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@event-factories/$(DEPDIR)/almanah-e-cell-renderer-color.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@event-factories/$(DEPDIR)/almanah-e-source-selector.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@events/$(DEPDIR)/almanah-calendar-appointment.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@events/$(DEPDIR)/almanah-calendar-task.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@widgets/$(DEPDIR)/almanah-calendar-button.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@widgets/$(DEPDIR)/almanah-calendar-window.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@widgets/$(DEPDIR)/almanah-calendar.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@widgets/$(DEPDIR)/almanah-eggwrapbox-enums.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@widgets/$(DEPDIR)/almanah-eggwrapbox.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@widgets/$(DEPDIR)/almanah-entry-tags-area.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@widgets/$(DEPDIR)/almanah-hyperlink-tag.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@widgets/$(DEPDIR)/almanah-tag-accessible.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@widgets/$(DEPDIR)/almanah-tag-entry.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@widgets/$(DEPDIR)/almanah-tag.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - -almanah-almanah-marshal.o: almanah-marshal.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-almanah-marshal.o -MD -MP -MF $(DEPDIR)/almanah-almanah-marshal.Tpo -c -o almanah-almanah-marshal.o `test -f 'almanah-marshal.c' || echo '$(srcdir)/'`almanah-marshal.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-almanah-marshal.Tpo $(DEPDIR)/almanah-almanah-marshal.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='almanah-marshal.c' object='almanah-almanah-marshal.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-almanah-marshal.o `test -f 'almanah-marshal.c' || echo '$(srcdir)/'`almanah-marshal.c - -almanah-almanah-marshal.obj: almanah-marshal.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-almanah-marshal.obj -MD -MP -MF $(DEPDIR)/almanah-almanah-marshal.Tpo -c -o almanah-almanah-marshal.obj `if test -f 'almanah-marshal.c'; then $(CYGPATH_W) 'almanah-marshal.c'; else $(CYGPATH_W) '$(srcdir)/almanah-marshal.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-almanah-marshal.Tpo $(DEPDIR)/almanah-almanah-marshal.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='almanah-marshal.c' object='almanah-almanah-marshal.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-almanah-marshal.obj `if test -f 'almanah-marshal.c'; then $(CYGPATH_W) 'almanah-marshal.c'; else $(CYGPATH_W) '$(srcdir)/almanah-marshal.c'; fi` - -almanah-event-factory-builtins.o: event-factory-builtins.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-event-factory-builtins.o -MD -MP -MF $(DEPDIR)/almanah-event-factory-builtins.Tpo -c -o almanah-event-factory-builtins.o `test -f 'event-factory-builtins.c' || echo '$(srcdir)/'`event-factory-builtins.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-event-factory-builtins.Tpo $(DEPDIR)/almanah-event-factory-builtins.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='event-factory-builtins.c' object='almanah-event-factory-builtins.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-event-factory-builtins.o `test -f 'event-factory-builtins.c' || echo '$(srcdir)/'`event-factory-builtins.c - -almanah-event-factory-builtins.obj: event-factory-builtins.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-event-factory-builtins.obj -MD -MP -MF $(DEPDIR)/almanah-event-factory-builtins.Tpo -c -o almanah-event-factory-builtins.obj `if test -f 'event-factory-builtins.c'; then $(CYGPATH_W) 'event-factory-builtins.c'; else $(CYGPATH_W) '$(srcdir)/event-factory-builtins.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-event-factory-builtins.Tpo $(DEPDIR)/almanah-event-factory-builtins.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='event-factory-builtins.c' object='almanah-event-factory-builtins.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-event-factory-builtins.obj `if test -f 'event-factory-builtins.c'; then $(CYGPATH_W) 'event-factory-builtins.c'; else $(CYGPATH_W) '$(srcdir)/event-factory-builtins.c'; fi` - -almanah-main.o: main.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-main.o -MD -MP -MF $(DEPDIR)/almanah-main.Tpo -c -o almanah-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-main.Tpo $(DEPDIR)/almanah-main.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='main.c' object='almanah-main.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c - -almanah-main.obj: main.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-main.obj -MD -MP -MF $(DEPDIR)/almanah-main.Tpo -c -o almanah-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-main.Tpo $(DEPDIR)/almanah-main.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='main.c' object='almanah-main.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` - -almanah-application.o: application.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-application.o -MD -MP -MF $(DEPDIR)/almanah-application.Tpo -c -o almanah-application.o `test -f 'application.c' || echo '$(srcdir)/'`application.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-application.Tpo $(DEPDIR)/almanah-application.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='application.c' object='almanah-application.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-application.o `test -f 'application.c' || echo '$(srcdir)/'`application.c - -almanah-application.obj: application.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-application.obj -MD -MP -MF $(DEPDIR)/almanah-application.Tpo -c -o almanah-application.obj `if test -f 'application.c'; then $(CYGPATH_W) 'application.c'; else $(CYGPATH_W) '$(srcdir)/application.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-application.Tpo $(DEPDIR)/almanah-application.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='application.c' object='almanah-application.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-application.obj `if test -f 'application.c'; then $(CYGPATH_W) 'application.c'; else $(CYGPATH_W) '$(srcdir)/application.c'; fi` - -almanah-interface.o: interface.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-interface.o -MD -MP -MF $(DEPDIR)/almanah-interface.Tpo -c -o almanah-interface.o `test -f 'interface.c' || echo '$(srcdir)/'`interface.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-interface.Tpo $(DEPDIR)/almanah-interface.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='interface.c' object='almanah-interface.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-interface.o `test -f 'interface.c' || echo '$(srcdir)/'`interface.c - -almanah-interface.obj: interface.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-interface.obj -MD -MP -MF $(DEPDIR)/almanah-interface.Tpo -c -o almanah-interface.obj `if test -f 'interface.c'; then $(CYGPATH_W) 'interface.c'; else $(CYGPATH_W) '$(srcdir)/interface.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-interface.Tpo $(DEPDIR)/almanah-interface.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='interface.c' object='almanah-interface.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-interface.obj `if test -f 'interface.c'; then $(CYGPATH_W) 'interface.c'; else $(CYGPATH_W) '$(srcdir)/interface.c'; fi` - -almanah-main-window.o: main-window.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-main-window.o -MD -MP -MF $(DEPDIR)/almanah-main-window.Tpo -c -o almanah-main-window.o `test -f 'main-window.c' || echo '$(srcdir)/'`main-window.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-main-window.Tpo $(DEPDIR)/almanah-main-window.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='main-window.c' object='almanah-main-window.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-main-window.o `test -f 'main-window.c' || echo '$(srcdir)/'`main-window.c - -almanah-main-window.obj: main-window.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-main-window.obj -MD -MP -MF $(DEPDIR)/almanah-main-window.Tpo -c -o almanah-main-window.obj `if test -f 'main-window.c'; then $(CYGPATH_W) 'main-window.c'; else $(CYGPATH_W) '$(srcdir)/main-window.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-main-window.Tpo $(DEPDIR)/almanah-main-window.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='main-window.c' object='almanah-main-window.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-main-window.obj `if test -f 'main-window.c'; then $(CYGPATH_W) 'main-window.c'; else $(CYGPATH_W) '$(srcdir)/main-window.c'; fi` - -almanah-storage-manager.o: storage-manager.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-storage-manager.o -MD -MP -MF $(DEPDIR)/almanah-storage-manager.Tpo -c -o almanah-storage-manager.o `test -f 'storage-manager.c' || echo '$(srcdir)/'`storage-manager.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-storage-manager.Tpo $(DEPDIR)/almanah-storage-manager.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='storage-manager.c' object='almanah-storage-manager.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-storage-manager.o `test -f 'storage-manager.c' || echo '$(srcdir)/'`storage-manager.c - -almanah-storage-manager.obj: storage-manager.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-storage-manager.obj -MD -MP -MF $(DEPDIR)/almanah-storage-manager.Tpo -c -o almanah-storage-manager.obj `if test -f 'storage-manager.c'; then $(CYGPATH_W) 'storage-manager.c'; else $(CYGPATH_W) '$(srcdir)/storage-manager.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-storage-manager.Tpo $(DEPDIR)/almanah-storage-manager.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='storage-manager.c' object='almanah-storage-manager.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-storage-manager.obj `if test -f 'storage-manager.c'; then $(CYGPATH_W) 'storage-manager.c'; else $(CYGPATH_W) '$(srcdir)/storage-manager.c'; fi` - -almanah-search-dialog.o: search-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-search-dialog.o -MD -MP -MF $(DEPDIR)/almanah-search-dialog.Tpo -c -o almanah-search-dialog.o `test -f 'search-dialog.c' || echo '$(srcdir)/'`search-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-search-dialog.Tpo $(DEPDIR)/almanah-search-dialog.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='search-dialog.c' object='almanah-search-dialog.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-search-dialog.o `test -f 'search-dialog.c' || echo '$(srcdir)/'`search-dialog.c - -almanah-search-dialog.obj: search-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-search-dialog.obj -MD -MP -MF $(DEPDIR)/almanah-search-dialog.Tpo -c -o almanah-search-dialog.obj `if test -f 'search-dialog.c'; then $(CYGPATH_W) 'search-dialog.c'; else $(CYGPATH_W) '$(srcdir)/search-dialog.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-search-dialog.Tpo $(DEPDIR)/almanah-search-dialog.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='search-dialog.c' object='almanah-search-dialog.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-search-dialog.obj `if test -f 'search-dialog.c'; then $(CYGPATH_W) 'search-dialog.c'; else $(CYGPATH_W) '$(srcdir)/search-dialog.c'; fi` - -almanah-printing.o: printing.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-printing.o -MD -MP -MF $(DEPDIR)/almanah-printing.Tpo -c -o almanah-printing.o `test -f 'printing.c' || echo '$(srcdir)/'`printing.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-printing.Tpo $(DEPDIR)/almanah-printing.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='printing.c' object='almanah-printing.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-printing.o `test -f 'printing.c' || echo '$(srcdir)/'`printing.c - -almanah-printing.obj: printing.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-printing.obj -MD -MP -MF $(DEPDIR)/almanah-printing.Tpo -c -o almanah-printing.obj `if test -f 'printing.c'; then $(CYGPATH_W) 'printing.c'; else $(CYGPATH_W) '$(srcdir)/printing.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-printing.Tpo $(DEPDIR)/almanah-printing.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='printing.c' object='almanah-printing.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-printing.obj `if test -f 'printing.c'; then $(CYGPATH_W) 'printing.c'; else $(CYGPATH_W) '$(srcdir)/printing.c'; fi` - -almanah-entry.o: entry.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-entry.o -MD -MP -MF $(DEPDIR)/almanah-entry.Tpo -c -o almanah-entry.o `test -f 'entry.c' || echo '$(srcdir)/'`entry.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-entry.Tpo $(DEPDIR)/almanah-entry.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='entry.c' object='almanah-entry.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-entry.o `test -f 'entry.c' || echo '$(srcdir)/'`entry.c - -almanah-entry.obj: entry.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-entry.obj -MD -MP -MF $(DEPDIR)/almanah-entry.Tpo -c -o almanah-entry.obj `if test -f 'entry.c'; then $(CYGPATH_W) 'entry.c'; else $(CYGPATH_W) '$(srcdir)/entry.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-entry.Tpo $(DEPDIR)/almanah-entry.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='entry.c' object='almanah-entry.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-entry.obj `if test -f 'entry.c'; then $(CYGPATH_W) 'entry.c'; else $(CYGPATH_W) '$(srcdir)/entry.c'; fi` - -almanah-event.o: event.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-event.o -MD -MP -MF $(DEPDIR)/almanah-event.Tpo -c -o almanah-event.o `test -f 'event.c' || echo '$(srcdir)/'`event.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-event.Tpo $(DEPDIR)/almanah-event.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='event.c' object='almanah-event.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-event.o `test -f 'event.c' || echo '$(srcdir)/'`event.c - -almanah-event.obj: event.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-event.obj -MD -MP -MF $(DEPDIR)/almanah-event.Tpo -c -o almanah-event.obj `if test -f 'event.c'; then $(CYGPATH_W) 'event.c'; else $(CYGPATH_W) '$(srcdir)/event.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-event.Tpo $(DEPDIR)/almanah-event.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='event.c' object='almanah-event.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-event.obj `if test -f 'event.c'; then $(CYGPATH_W) 'event.c'; else $(CYGPATH_W) '$(srcdir)/event.c'; fi` - -almanah-event-factory.o: event-factory.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-event-factory.o -MD -MP -MF $(DEPDIR)/almanah-event-factory.Tpo -c -o almanah-event-factory.o `test -f 'event-factory.c' || echo '$(srcdir)/'`event-factory.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-event-factory.Tpo $(DEPDIR)/almanah-event-factory.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='event-factory.c' object='almanah-event-factory.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-event-factory.o `test -f 'event-factory.c' || echo '$(srcdir)/'`event-factory.c - -almanah-event-factory.obj: event-factory.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-event-factory.obj -MD -MP -MF $(DEPDIR)/almanah-event-factory.Tpo -c -o almanah-event-factory.obj `if test -f 'event-factory.c'; then $(CYGPATH_W) 'event-factory.c'; else $(CYGPATH_W) '$(srcdir)/event-factory.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-event-factory.Tpo $(DEPDIR)/almanah-event-factory.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='event-factory.c' object='almanah-event-factory.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-event-factory.obj `if test -f 'event-factory.c'; then $(CYGPATH_W) 'event-factory.c'; else $(CYGPATH_W) '$(srcdir)/event-factory.c'; fi` - -almanah-event-manager.o: event-manager.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-event-manager.o -MD -MP -MF $(DEPDIR)/almanah-event-manager.Tpo -c -o almanah-event-manager.o `test -f 'event-manager.c' || echo '$(srcdir)/'`event-manager.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-event-manager.Tpo $(DEPDIR)/almanah-event-manager.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='event-manager.c' object='almanah-event-manager.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-event-manager.o `test -f 'event-manager.c' || echo '$(srcdir)/'`event-manager.c - -almanah-event-manager.obj: event-manager.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-event-manager.obj -MD -MP -MF $(DEPDIR)/almanah-event-manager.Tpo -c -o almanah-event-manager.obj `if test -f 'event-manager.c'; then $(CYGPATH_W) 'event-manager.c'; else $(CYGPATH_W) '$(srcdir)/event-manager.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-event-manager.Tpo $(DEPDIR)/almanah-event-manager.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='event-manager.c' object='almanah-event-manager.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-event-manager.obj `if test -f 'event-manager.c'; then $(CYGPATH_W) 'event-manager.c'; else $(CYGPATH_W) '$(srcdir)/event-manager.c'; fi` - -almanah-date-entry-dialog.o: date-entry-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-date-entry-dialog.o -MD -MP -MF $(DEPDIR)/almanah-date-entry-dialog.Tpo -c -o almanah-date-entry-dialog.o `test -f 'date-entry-dialog.c' || echo '$(srcdir)/'`date-entry-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-date-entry-dialog.Tpo $(DEPDIR)/almanah-date-entry-dialog.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='date-entry-dialog.c' object='almanah-date-entry-dialog.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-date-entry-dialog.o `test -f 'date-entry-dialog.c' || echo '$(srcdir)/'`date-entry-dialog.c - -almanah-date-entry-dialog.obj: date-entry-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-date-entry-dialog.obj -MD -MP -MF $(DEPDIR)/almanah-date-entry-dialog.Tpo -c -o almanah-date-entry-dialog.obj `if test -f 'date-entry-dialog.c'; then $(CYGPATH_W) 'date-entry-dialog.c'; else $(CYGPATH_W) '$(srcdir)/date-entry-dialog.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-date-entry-dialog.Tpo $(DEPDIR)/almanah-date-entry-dialog.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='date-entry-dialog.c' object='almanah-date-entry-dialog.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-date-entry-dialog.obj `if test -f 'date-entry-dialog.c'; then $(CYGPATH_W) 'date-entry-dialog.c'; else $(CYGPATH_W) '$(srcdir)/date-entry-dialog.c'; fi` - -almanah-import-export-dialog.o: import-export-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-import-export-dialog.o -MD -MP -MF $(DEPDIR)/almanah-import-export-dialog.Tpo -c -o almanah-import-export-dialog.o `test -f 'import-export-dialog.c' || echo '$(srcdir)/'`import-export-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-import-export-dialog.Tpo $(DEPDIR)/almanah-import-export-dialog.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='import-export-dialog.c' object='almanah-import-export-dialog.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-import-export-dialog.o `test -f 'import-export-dialog.c' || echo '$(srcdir)/'`import-export-dialog.c - -almanah-import-export-dialog.obj: import-export-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-import-export-dialog.obj -MD -MP -MF $(DEPDIR)/almanah-import-export-dialog.Tpo -c -o almanah-import-export-dialog.obj `if test -f 'import-export-dialog.c'; then $(CYGPATH_W) 'import-export-dialog.c'; else $(CYGPATH_W) '$(srcdir)/import-export-dialog.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-import-export-dialog.Tpo $(DEPDIR)/almanah-import-export-dialog.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='import-export-dialog.c' object='almanah-import-export-dialog.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-import-export-dialog.obj `if test -f 'import-export-dialog.c'; then $(CYGPATH_W) 'import-export-dialog.c'; else $(CYGPATH_W) '$(srcdir)/import-export-dialog.c'; fi` - -almanah-import-operation.o: import-operation.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-import-operation.o -MD -MP -MF $(DEPDIR)/almanah-import-operation.Tpo -c -o almanah-import-operation.o `test -f 'import-operation.c' || echo '$(srcdir)/'`import-operation.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-import-operation.Tpo $(DEPDIR)/almanah-import-operation.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='import-operation.c' object='almanah-import-operation.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-import-operation.o `test -f 'import-operation.c' || echo '$(srcdir)/'`import-operation.c - -almanah-import-operation.obj: import-operation.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-import-operation.obj -MD -MP -MF $(DEPDIR)/almanah-import-operation.Tpo -c -o almanah-import-operation.obj `if test -f 'import-operation.c'; then $(CYGPATH_W) 'import-operation.c'; else $(CYGPATH_W) '$(srcdir)/import-operation.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-import-operation.Tpo $(DEPDIR)/almanah-import-operation.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='import-operation.c' object='almanah-import-operation.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-import-operation.obj `if test -f 'import-operation.c'; then $(CYGPATH_W) 'import-operation.c'; else $(CYGPATH_W) '$(srcdir)/import-operation.c'; fi` - -almanah-export-operation.o: export-operation.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-export-operation.o -MD -MP -MF $(DEPDIR)/almanah-export-operation.Tpo -c -o almanah-export-operation.o `test -f 'export-operation.c' || echo '$(srcdir)/'`export-operation.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-export-operation.Tpo $(DEPDIR)/almanah-export-operation.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='export-operation.c' object='almanah-export-operation.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-export-operation.o `test -f 'export-operation.c' || echo '$(srcdir)/'`export-operation.c - -almanah-export-operation.obj: export-operation.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-export-operation.obj -MD -MP -MF $(DEPDIR)/almanah-export-operation.Tpo -c -o almanah-export-operation.obj `if test -f 'export-operation.c'; then $(CYGPATH_W) 'export-operation.c'; else $(CYGPATH_W) '$(srcdir)/export-operation.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-export-operation.Tpo $(DEPDIR)/almanah-export-operation.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='export-operation.c' object='almanah-export-operation.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-export-operation.obj `if test -f 'export-operation.c'; then $(CYGPATH_W) 'export-operation.c'; else $(CYGPATH_W) '$(srcdir)/export-operation.c'; fi` - -almanah-uri-entry-dialog.o: uri-entry-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-uri-entry-dialog.o -MD -MP -MF $(DEPDIR)/almanah-uri-entry-dialog.Tpo -c -o almanah-uri-entry-dialog.o `test -f 'uri-entry-dialog.c' || echo '$(srcdir)/'`uri-entry-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-uri-entry-dialog.Tpo $(DEPDIR)/almanah-uri-entry-dialog.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='uri-entry-dialog.c' object='almanah-uri-entry-dialog.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-uri-entry-dialog.o `test -f 'uri-entry-dialog.c' || echo '$(srcdir)/'`uri-entry-dialog.c - -almanah-uri-entry-dialog.obj: uri-entry-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-uri-entry-dialog.obj -MD -MP -MF $(DEPDIR)/almanah-uri-entry-dialog.Tpo -c -o almanah-uri-entry-dialog.obj `if test -f 'uri-entry-dialog.c'; then $(CYGPATH_W) 'uri-entry-dialog.c'; else $(CYGPATH_W) '$(srcdir)/uri-entry-dialog.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-uri-entry-dialog.Tpo $(DEPDIR)/almanah-uri-entry-dialog.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='uri-entry-dialog.c' object='almanah-uri-entry-dialog.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-uri-entry-dialog.obj `if test -f 'uri-entry-dialog.c'; then $(CYGPATH_W) 'uri-entry-dialog.c'; else $(CYGPATH_W) '$(srcdir)/uri-entry-dialog.c'; fi` - -widgets/almanah-calendar.o: widgets/calendar.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT widgets/almanah-calendar.o -MD -MP -MF widgets/$(DEPDIR)/almanah-calendar.Tpo -c -o widgets/almanah-calendar.o `test -f 'widgets/calendar.c' || echo '$(srcdir)/'`widgets/calendar.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) widgets/$(DEPDIR)/almanah-calendar.Tpo widgets/$(DEPDIR)/almanah-calendar.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='widgets/calendar.c' object='widgets/almanah-calendar.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o widgets/almanah-calendar.o `test -f 'widgets/calendar.c' || echo '$(srcdir)/'`widgets/calendar.c - -widgets/almanah-calendar.obj: widgets/calendar.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT widgets/almanah-calendar.obj -MD -MP -MF widgets/$(DEPDIR)/almanah-calendar.Tpo -c -o widgets/almanah-calendar.obj `if test -f 'widgets/calendar.c'; then $(CYGPATH_W) 'widgets/calendar.c'; else $(CYGPATH_W) '$(srcdir)/widgets/calendar.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) widgets/$(DEPDIR)/almanah-calendar.Tpo widgets/$(DEPDIR)/almanah-calendar.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='widgets/calendar.c' object='widgets/almanah-calendar.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o widgets/almanah-calendar.obj `if test -f 'widgets/calendar.c'; then $(CYGPATH_W) 'widgets/calendar.c'; else $(CYGPATH_W) '$(srcdir)/widgets/calendar.c'; fi` - -widgets/almanah-calendar-button.o: widgets/calendar-button.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT widgets/almanah-calendar-button.o -MD -MP -MF widgets/$(DEPDIR)/almanah-calendar-button.Tpo -c -o widgets/almanah-calendar-button.o `test -f 'widgets/calendar-button.c' || echo '$(srcdir)/'`widgets/calendar-button.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) widgets/$(DEPDIR)/almanah-calendar-button.Tpo widgets/$(DEPDIR)/almanah-calendar-button.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='widgets/calendar-button.c' object='widgets/almanah-calendar-button.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o widgets/almanah-calendar-button.o `test -f 'widgets/calendar-button.c' || echo '$(srcdir)/'`widgets/calendar-button.c - -widgets/almanah-calendar-button.obj: widgets/calendar-button.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT widgets/almanah-calendar-button.obj -MD -MP -MF widgets/$(DEPDIR)/almanah-calendar-button.Tpo -c -o widgets/almanah-calendar-button.obj `if test -f 'widgets/calendar-button.c'; then $(CYGPATH_W) 'widgets/calendar-button.c'; else $(CYGPATH_W) '$(srcdir)/widgets/calendar-button.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) widgets/$(DEPDIR)/almanah-calendar-button.Tpo widgets/$(DEPDIR)/almanah-calendar-button.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='widgets/calendar-button.c' object='widgets/almanah-calendar-button.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o widgets/almanah-calendar-button.obj `if test -f 'widgets/calendar-button.c'; then $(CYGPATH_W) 'widgets/calendar-button.c'; else $(CYGPATH_W) '$(srcdir)/widgets/calendar-button.c'; fi` - -widgets/almanah-calendar-window.o: widgets/calendar-window.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT widgets/almanah-calendar-window.o -MD -MP -MF widgets/$(DEPDIR)/almanah-calendar-window.Tpo -c -o widgets/almanah-calendar-window.o `test -f 'widgets/calendar-window.c' || echo '$(srcdir)/'`widgets/calendar-window.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) widgets/$(DEPDIR)/almanah-calendar-window.Tpo widgets/$(DEPDIR)/almanah-calendar-window.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='widgets/calendar-window.c' object='widgets/almanah-calendar-window.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o widgets/almanah-calendar-window.o `test -f 'widgets/calendar-window.c' || echo '$(srcdir)/'`widgets/calendar-window.c - -widgets/almanah-calendar-window.obj: widgets/calendar-window.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT widgets/almanah-calendar-window.obj -MD -MP -MF widgets/$(DEPDIR)/almanah-calendar-window.Tpo -c -o widgets/almanah-calendar-window.obj `if test -f 'widgets/calendar-window.c'; then $(CYGPATH_W) 'widgets/calendar-window.c'; else $(CYGPATH_W) '$(srcdir)/widgets/calendar-window.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) widgets/$(DEPDIR)/almanah-calendar-window.Tpo widgets/$(DEPDIR)/almanah-calendar-window.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='widgets/calendar-window.c' object='widgets/almanah-calendar-window.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o widgets/almanah-calendar-window.obj `if test -f 'widgets/calendar-window.c'; then $(CYGPATH_W) 'widgets/calendar-window.c'; else $(CYGPATH_W) '$(srcdir)/widgets/calendar-window.c'; fi` - -widgets/almanah-eggwrapbox.o: widgets/eggwrapbox.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT widgets/almanah-eggwrapbox.o -MD -MP -MF widgets/$(DEPDIR)/almanah-eggwrapbox.Tpo -c -o widgets/almanah-eggwrapbox.o `test -f 'widgets/eggwrapbox.c' || echo '$(srcdir)/'`widgets/eggwrapbox.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) widgets/$(DEPDIR)/almanah-eggwrapbox.Tpo widgets/$(DEPDIR)/almanah-eggwrapbox.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='widgets/eggwrapbox.c' object='widgets/almanah-eggwrapbox.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o widgets/almanah-eggwrapbox.o `test -f 'widgets/eggwrapbox.c' || echo '$(srcdir)/'`widgets/eggwrapbox.c - -widgets/almanah-eggwrapbox.obj: widgets/eggwrapbox.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT widgets/almanah-eggwrapbox.obj -MD -MP -MF widgets/$(DEPDIR)/almanah-eggwrapbox.Tpo -c -o widgets/almanah-eggwrapbox.obj `if test -f 'widgets/eggwrapbox.c'; then $(CYGPATH_W) 'widgets/eggwrapbox.c'; else $(CYGPATH_W) '$(srcdir)/widgets/eggwrapbox.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) widgets/$(DEPDIR)/almanah-eggwrapbox.Tpo widgets/$(DEPDIR)/almanah-eggwrapbox.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='widgets/eggwrapbox.c' object='widgets/almanah-eggwrapbox.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o widgets/almanah-eggwrapbox.obj `if test -f 'widgets/eggwrapbox.c'; then $(CYGPATH_W) 'widgets/eggwrapbox.c'; else $(CYGPATH_W) '$(srcdir)/widgets/eggwrapbox.c'; fi` - -widgets/almanah-eggwrapbox-enums.o: widgets/eggwrapbox-enums.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT widgets/almanah-eggwrapbox-enums.o -MD -MP -MF widgets/$(DEPDIR)/almanah-eggwrapbox-enums.Tpo -c -o widgets/almanah-eggwrapbox-enums.o `test -f 'widgets/eggwrapbox-enums.c' || echo '$(srcdir)/'`widgets/eggwrapbox-enums.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) widgets/$(DEPDIR)/almanah-eggwrapbox-enums.Tpo widgets/$(DEPDIR)/almanah-eggwrapbox-enums.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='widgets/eggwrapbox-enums.c' object='widgets/almanah-eggwrapbox-enums.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o widgets/almanah-eggwrapbox-enums.o `test -f 'widgets/eggwrapbox-enums.c' || echo '$(srcdir)/'`widgets/eggwrapbox-enums.c - -widgets/almanah-eggwrapbox-enums.obj: widgets/eggwrapbox-enums.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT widgets/almanah-eggwrapbox-enums.obj -MD -MP -MF widgets/$(DEPDIR)/almanah-eggwrapbox-enums.Tpo -c -o widgets/almanah-eggwrapbox-enums.obj `if test -f 'widgets/eggwrapbox-enums.c'; then $(CYGPATH_W) 'widgets/eggwrapbox-enums.c'; else $(CYGPATH_W) '$(srcdir)/widgets/eggwrapbox-enums.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) widgets/$(DEPDIR)/almanah-eggwrapbox-enums.Tpo widgets/$(DEPDIR)/almanah-eggwrapbox-enums.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='widgets/eggwrapbox-enums.c' object='widgets/almanah-eggwrapbox-enums.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o widgets/almanah-eggwrapbox-enums.obj `if test -f 'widgets/eggwrapbox-enums.c'; then $(CYGPATH_W) 'widgets/eggwrapbox-enums.c'; else $(CYGPATH_W) '$(srcdir)/widgets/eggwrapbox-enums.c'; fi` - -widgets/almanah-entry-tags-area.o: widgets/entry-tags-area.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT widgets/almanah-entry-tags-area.o -MD -MP -MF widgets/$(DEPDIR)/almanah-entry-tags-area.Tpo -c -o widgets/almanah-entry-tags-area.o `test -f 'widgets/entry-tags-area.c' || echo '$(srcdir)/'`widgets/entry-tags-area.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) widgets/$(DEPDIR)/almanah-entry-tags-area.Tpo widgets/$(DEPDIR)/almanah-entry-tags-area.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='widgets/entry-tags-area.c' object='widgets/almanah-entry-tags-area.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o widgets/almanah-entry-tags-area.o `test -f 'widgets/entry-tags-area.c' || echo '$(srcdir)/'`widgets/entry-tags-area.c - -widgets/almanah-entry-tags-area.obj: widgets/entry-tags-area.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT widgets/almanah-entry-tags-area.obj -MD -MP -MF widgets/$(DEPDIR)/almanah-entry-tags-area.Tpo -c -o widgets/almanah-entry-tags-area.obj `if test -f 'widgets/entry-tags-area.c'; then $(CYGPATH_W) 'widgets/entry-tags-area.c'; else $(CYGPATH_W) '$(srcdir)/widgets/entry-tags-area.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) widgets/$(DEPDIR)/almanah-entry-tags-area.Tpo widgets/$(DEPDIR)/almanah-entry-tags-area.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='widgets/entry-tags-area.c' object='widgets/almanah-entry-tags-area.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o widgets/almanah-entry-tags-area.obj `if test -f 'widgets/entry-tags-area.c'; then $(CYGPATH_W) 'widgets/entry-tags-area.c'; else $(CYGPATH_W) '$(srcdir)/widgets/entry-tags-area.c'; fi` - -widgets/almanah-hyperlink-tag.o: widgets/hyperlink-tag.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT widgets/almanah-hyperlink-tag.o -MD -MP -MF widgets/$(DEPDIR)/almanah-hyperlink-tag.Tpo -c -o widgets/almanah-hyperlink-tag.o `test -f 'widgets/hyperlink-tag.c' || echo '$(srcdir)/'`widgets/hyperlink-tag.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) widgets/$(DEPDIR)/almanah-hyperlink-tag.Tpo widgets/$(DEPDIR)/almanah-hyperlink-tag.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='widgets/hyperlink-tag.c' object='widgets/almanah-hyperlink-tag.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o widgets/almanah-hyperlink-tag.o `test -f 'widgets/hyperlink-tag.c' || echo '$(srcdir)/'`widgets/hyperlink-tag.c - -widgets/almanah-hyperlink-tag.obj: widgets/hyperlink-tag.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT widgets/almanah-hyperlink-tag.obj -MD -MP -MF widgets/$(DEPDIR)/almanah-hyperlink-tag.Tpo -c -o widgets/almanah-hyperlink-tag.obj `if test -f 'widgets/hyperlink-tag.c'; then $(CYGPATH_W) 'widgets/hyperlink-tag.c'; else $(CYGPATH_W) '$(srcdir)/widgets/hyperlink-tag.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) widgets/$(DEPDIR)/almanah-hyperlink-tag.Tpo widgets/$(DEPDIR)/almanah-hyperlink-tag.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='widgets/hyperlink-tag.c' object='widgets/almanah-hyperlink-tag.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o widgets/almanah-hyperlink-tag.obj `if test -f 'widgets/hyperlink-tag.c'; then $(CYGPATH_W) 'widgets/hyperlink-tag.c'; else $(CYGPATH_W) '$(srcdir)/widgets/hyperlink-tag.c'; fi` - -widgets/almanah-tag-accessible.o: widgets/tag-accessible.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT widgets/almanah-tag-accessible.o -MD -MP -MF widgets/$(DEPDIR)/almanah-tag-accessible.Tpo -c -o widgets/almanah-tag-accessible.o `test -f 'widgets/tag-accessible.c' || echo '$(srcdir)/'`widgets/tag-accessible.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) widgets/$(DEPDIR)/almanah-tag-accessible.Tpo widgets/$(DEPDIR)/almanah-tag-accessible.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='widgets/tag-accessible.c' object='widgets/almanah-tag-accessible.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o widgets/almanah-tag-accessible.o `test -f 'widgets/tag-accessible.c' || echo '$(srcdir)/'`widgets/tag-accessible.c - -widgets/almanah-tag-accessible.obj: widgets/tag-accessible.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT widgets/almanah-tag-accessible.obj -MD -MP -MF widgets/$(DEPDIR)/almanah-tag-accessible.Tpo -c -o widgets/almanah-tag-accessible.obj `if test -f 'widgets/tag-accessible.c'; then $(CYGPATH_W) 'widgets/tag-accessible.c'; else $(CYGPATH_W) '$(srcdir)/widgets/tag-accessible.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) widgets/$(DEPDIR)/almanah-tag-accessible.Tpo widgets/$(DEPDIR)/almanah-tag-accessible.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='widgets/tag-accessible.c' object='widgets/almanah-tag-accessible.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o widgets/almanah-tag-accessible.obj `if test -f 'widgets/tag-accessible.c'; then $(CYGPATH_W) 'widgets/tag-accessible.c'; else $(CYGPATH_W) '$(srcdir)/widgets/tag-accessible.c'; fi` - -widgets/almanah-tag.o: widgets/tag.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT widgets/almanah-tag.o -MD -MP -MF widgets/$(DEPDIR)/almanah-tag.Tpo -c -o widgets/almanah-tag.o `test -f 'widgets/tag.c' || echo '$(srcdir)/'`widgets/tag.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) widgets/$(DEPDIR)/almanah-tag.Tpo widgets/$(DEPDIR)/almanah-tag.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='widgets/tag.c' object='widgets/almanah-tag.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o widgets/almanah-tag.o `test -f 'widgets/tag.c' || echo '$(srcdir)/'`widgets/tag.c - -widgets/almanah-tag.obj: widgets/tag.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT widgets/almanah-tag.obj -MD -MP -MF widgets/$(DEPDIR)/almanah-tag.Tpo -c -o widgets/almanah-tag.obj `if test -f 'widgets/tag.c'; then $(CYGPATH_W) 'widgets/tag.c'; else $(CYGPATH_W) '$(srcdir)/widgets/tag.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) widgets/$(DEPDIR)/almanah-tag.Tpo widgets/$(DEPDIR)/almanah-tag.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='widgets/tag.c' object='widgets/almanah-tag.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o widgets/almanah-tag.obj `if test -f 'widgets/tag.c'; then $(CYGPATH_W) 'widgets/tag.c'; else $(CYGPATH_W) '$(srcdir)/widgets/tag.c'; fi` - -widgets/almanah-tag-entry.o: widgets/tag-entry.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT widgets/almanah-tag-entry.o -MD -MP -MF widgets/$(DEPDIR)/almanah-tag-entry.Tpo -c -o widgets/almanah-tag-entry.o `test -f 'widgets/tag-entry.c' || echo '$(srcdir)/'`widgets/tag-entry.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) widgets/$(DEPDIR)/almanah-tag-entry.Tpo widgets/$(DEPDIR)/almanah-tag-entry.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='widgets/tag-entry.c' object='widgets/almanah-tag-entry.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o widgets/almanah-tag-entry.o `test -f 'widgets/tag-entry.c' || echo '$(srcdir)/'`widgets/tag-entry.c - -widgets/almanah-tag-entry.obj: widgets/tag-entry.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT widgets/almanah-tag-entry.obj -MD -MP -MF widgets/$(DEPDIR)/almanah-tag-entry.Tpo -c -o widgets/almanah-tag-entry.obj `if test -f 'widgets/tag-entry.c'; then $(CYGPATH_W) 'widgets/tag-entry.c'; else $(CYGPATH_W) '$(srcdir)/widgets/tag-entry.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) widgets/$(DEPDIR)/almanah-tag-entry.Tpo widgets/$(DEPDIR)/almanah-tag-entry.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='widgets/tag-entry.c' object='widgets/almanah-tag-entry.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o widgets/almanah-tag-entry.obj `if test -f 'widgets/tag-entry.c'; then $(CYGPATH_W) 'widgets/tag-entry.c'; else $(CYGPATH_W) '$(srcdir)/widgets/tag-entry.c'; fi` - -event-factories/almanah-calendar.o: event-factories/calendar.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT event-factories/almanah-calendar.o -MD -MP -MF event-factories/$(DEPDIR)/almanah-calendar.Tpo -c -o event-factories/almanah-calendar.o `test -f 'event-factories/calendar.c' || echo '$(srcdir)/'`event-factories/calendar.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) event-factories/$(DEPDIR)/almanah-calendar.Tpo event-factories/$(DEPDIR)/almanah-calendar.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='event-factories/calendar.c' object='event-factories/almanah-calendar.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o event-factories/almanah-calendar.o `test -f 'event-factories/calendar.c' || echo '$(srcdir)/'`event-factories/calendar.c - -event-factories/almanah-calendar.obj: event-factories/calendar.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT event-factories/almanah-calendar.obj -MD -MP -MF event-factories/$(DEPDIR)/almanah-calendar.Tpo -c -o event-factories/almanah-calendar.obj `if test -f 'event-factories/calendar.c'; then $(CYGPATH_W) 'event-factories/calendar.c'; else $(CYGPATH_W) '$(srcdir)/event-factories/calendar.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) event-factories/$(DEPDIR)/almanah-calendar.Tpo event-factories/$(DEPDIR)/almanah-calendar.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='event-factories/calendar.c' object='event-factories/almanah-calendar.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o event-factories/almanah-calendar.obj `if test -f 'event-factories/calendar.c'; then $(CYGPATH_W) 'event-factories/calendar.c'; else $(CYGPATH_W) '$(srcdir)/event-factories/calendar.c'; fi` - -event-factories/almanah-calendar-client.o: event-factories/calendar-client.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT event-factories/almanah-calendar-client.o -MD -MP -MF event-factories/$(DEPDIR)/almanah-calendar-client.Tpo -c -o event-factories/almanah-calendar-client.o `test -f 'event-factories/calendar-client.c' || echo '$(srcdir)/'`event-factories/calendar-client.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) event-factories/$(DEPDIR)/almanah-calendar-client.Tpo event-factories/$(DEPDIR)/almanah-calendar-client.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='event-factories/calendar-client.c' object='event-factories/almanah-calendar-client.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o event-factories/almanah-calendar-client.o `test -f 'event-factories/calendar-client.c' || echo '$(srcdir)/'`event-factories/calendar-client.c - -event-factories/almanah-calendar-client.obj: event-factories/calendar-client.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT event-factories/almanah-calendar-client.obj -MD -MP -MF event-factories/$(DEPDIR)/almanah-calendar-client.Tpo -c -o event-factories/almanah-calendar-client.obj `if test -f 'event-factories/calendar-client.c'; then $(CYGPATH_W) 'event-factories/calendar-client.c'; else $(CYGPATH_W) '$(srcdir)/event-factories/calendar-client.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) event-factories/$(DEPDIR)/almanah-calendar-client.Tpo event-factories/$(DEPDIR)/almanah-calendar-client.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='event-factories/calendar-client.c' object='event-factories/almanah-calendar-client.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o event-factories/almanah-calendar-client.obj `if test -f 'event-factories/calendar-client.c'; then $(CYGPATH_W) 'event-factories/calendar-client.c'; else $(CYGPATH_W) '$(srcdir)/event-factories/calendar-client.c'; fi` - -event-factories/almanah-calendar-sources.o: event-factories/calendar-sources.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT event-factories/almanah-calendar-sources.o -MD -MP -MF event-factories/$(DEPDIR)/almanah-calendar-sources.Tpo -c -o event-factories/almanah-calendar-sources.o `test -f 'event-factories/calendar-sources.c' || echo '$(srcdir)/'`event-factories/calendar-sources.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) event-factories/$(DEPDIR)/almanah-calendar-sources.Tpo event-factories/$(DEPDIR)/almanah-calendar-sources.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='event-factories/calendar-sources.c' object='event-factories/almanah-calendar-sources.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o event-factories/almanah-calendar-sources.o `test -f 'event-factories/calendar-sources.c' || echo '$(srcdir)/'`event-factories/calendar-sources.c - -event-factories/almanah-calendar-sources.obj: event-factories/calendar-sources.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT event-factories/almanah-calendar-sources.obj -MD -MP -MF event-factories/$(DEPDIR)/almanah-calendar-sources.Tpo -c -o event-factories/almanah-calendar-sources.obj `if test -f 'event-factories/calendar-sources.c'; then $(CYGPATH_W) 'event-factories/calendar-sources.c'; else $(CYGPATH_W) '$(srcdir)/event-factories/calendar-sources.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) event-factories/$(DEPDIR)/almanah-calendar-sources.Tpo event-factories/$(DEPDIR)/almanah-calendar-sources.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='event-factories/calendar-sources.c' object='event-factories/almanah-calendar-sources.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o event-factories/almanah-calendar-sources.obj `if test -f 'event-factories/calendar-sources.c'; then $(CYGPATH_W) 'event-factories/calendar-sources.c'; else $(CYGPATH_W) '$(srcdir)/event-factories/calendar-sources.c'; fi` - -event-factories/almanah-e-cell-renderer-color.o: event-factories/e-cell-renderer-color.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT event-factories/almanah-e-cell-renderer-color.o -MD -MP -MF event-factories/$(DEPDIR)/almanah-e-cell-renderer-color.Tpo -c -o event-factories/almanah-e-cell-renderer-color.o `test -f 'event-factories/e-cell-renderer-color.c' || echo '$(srcdir)/'`event-factories/e-cell-renderer-color.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) event-factories/$(DEPDIR)/almanah-e-cell-renderer-color.Tpo event-factories/$(DEPDIR)/almanah-e-cell-renderer-color.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='event-factories/e-cell-renderer-color.c' object='event-factories/almanah-e-cell-renderer-color.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o event-factories/almanah-e-cell-renderer-color.o `test -f 'event-factories/e-cell-renderer-color.c' || echo '$(srcdir)/'`event-factories/e-cell-renderer-color.c - -event-factories/almanah-e-cell-renderer-color.obj: event-factories/e-cell-renderer-color.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT event-factories/almanah-e-cell-renderer-color.obj -MD -MP -MF event-factories/$(DEPDIR)/almanah-e-cell-renderer-color.Tpo -c -o event-factories/almanah-e-cell-renderer-color.obj `if test -f 'event-factories/e-cell-renderer-color.c'; then $(CYGPATH_W) 'event-factories/e-cell-renderer-color.c'; else $(CYGPATH_W) '$(srcdir)/event-factories/e-cell-renderer-color.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) event-factories/$(DEPDIR)/almanah-e-cell-renderer-color.Tpo event-factories/$(DEPDIR)/almanah-e-cell-renderer-color.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='event-factories/e-cell-renderer-color.c' object='event-factories/almanah-e-cell-renderer-color.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o event-factories/almanah-e-cell-renderer-color.obj `if test -f 'event-factories/e-cell-renderer-color.c'; then $(CYGPATH_W) 'event-factories/e-cell-renderer-color.c'; else $(CYGPATH_W) '$(srcdir)/event-factories/e-cell-renderer-color.c'; fi` - -event-factories/almanah-e-source-selector.o: event-factories/e-source-selector.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT event-factories/almanah-e-source-selector.o -MD -MP -MF event-factories/$(DEPDIR)/almanah-e-source-selector.Tpo -c -o event-factories/almanah-e-source-selector.o `test -f 'event-factories/e-source-selector.c' || echo '$(srcdir)/'`event-factories/e-source-selector.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) event-factories/$(DEPDIR)/almanah-e-source-selector.Tpo event-factories/$(DEPDIR)/almanah-e-source-selector.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='event-factories/e-source-selector.c' object='event-factories/almanah-e-source-selector.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o event-factories/almanah-e-source-selector.o `test -f 'event-factories/e-source-selector.c' || echo '$(srcdir)/'`event-factories/e-source-selector.c - -event-factories/almanah-e-source-selector.obj: event-factories/e-source-selector.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT event-factories/almanah-e-source-selector.obj -MD -MP -MF event-factories/$(DEPDIR)/almanah-e-source-selector.Tpo -c -o event-factories/almanah-e-source-selector.obj `if test -f 'event-factories/e-source-selector.c'; then $(CYGPATH_W) 'event-factories/e-source-selector.c'; else $(CYGPATH_W) '$(srcdir)/event-factories/e-source-selector.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) event-factories/$(DEPDIR)/almanah-e-source-selector.Tpo event-factories/$(DEPDIR)/almanah-e-source-selector.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='event-factories/e-source-selector.c' object='event-factories/almanah-e-source-selector.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o event-factories/almanah-e-source-selector.obj `if test -f 'event-factories/e-source-selector.c'; then $(CYGPATH_W) 'event-factories/e-source-selector.c'; else $(CYGPATH_W) '$(srcdir)/event-factories/e-source-selector.c'; fi` - -events/almanah-calendar-appointment.o: events/calendar-appointment.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT events/almanah-calendar-appointment.o -MD -MP -MF events/$(DEPDIR)/almanah-calendar-appointment.Tpo -c -o events/almanah-calendar-appointment.o `test -f 'events/calendar-appointment.c' || echo '$(srcdir)/'`events/calendar-appointment.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) events/$(DEPDIR)/almanah-calendar-appointment.Tpo events/$(DEPDIR)/almanah-calendar-appointment.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='events/calendar-appointment.c' object='events/almanah-calendar-appointment.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o events/almanah-calendar-appointment.o `test -f 'events/calendar-appointment.c' || echo '$(srcdir)/'`events/calendar-appointment.c - -events/almanah-calendar-appointment.obj: events/calendar-appointment.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT events/almanah-calendar-appointment.obj -MD -MP -MF events/$(DEPDIR)/almanah-calendar-appointment.Tpo -c -o events/almanah-calendar-appointment.obj `if test -f 'events/calendar-appointment.c'; then $(CYGPATH_W) 'events/calendar-appointment.c'; else $(CYGPATH_W) '$(srcdir)/events/calendar-appointment.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) events/$(DEPDIR)/almanah-calendar-appointment.Tpo events/$(DEPDIR)/almanah-calendar-appointment.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='events/calendar-appointment.c' object='events/almanah-calendar-appointment.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o events/almanah-calendar-appointment.obj `if test -f 'events/calendar-appointment.c'; then $(CYGPATH_W) 'events/calendar-appointment.c'; else $(CYGPATH_W) '$(srcdir)/events/calendar-appointment.c'; fi` - -events/almanah-calendar-task.o: events/calendar-task.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT events/almanah-calendar-task.o -MD -MP -MF events/$(DEPDIR)/almanah-calendar-task.Tpo -c -o events/almanah-calendar-task.o `test -f 'events/calendar-task.c' || echo '$(srcdir)/'`events/calendar-task.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) events/$(DEPDIR)/almanah-calendar-task.Tpo events/$(DEPDIR)/almanah-calendar-task.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='events/calendar-task.c' object='events/almanah-calendar-task.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o events/almanah-calendar-task.o `test -f 'events/calendar-task.c' || echo '$(srcdir)/'`events/calendar-task.c - -events/almanah-calendar-task.obj: events/calendar-task.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT events/almanah-calendar-task.obj -MD -MP -MF events/$(DEPDIR)/almanah-calendar-task.Tpo -c -o events/almanah-calendar-task.obj `if test -f 'events/calendar-task.c'; then $(CYGPATH_W) 'events/calendar-task.c'; else $(CYGPATH_W) '$(srcdir)/events/calendar-task.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) events/$(DEPDIR)/almanah-calendar-task.Tpo events/$(DEPDIR)/almanah-calendar-task.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='events/calendar-task.c' object='events/almanah-calendar-task.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o events/almanah-calendar-task.obj `if test -f 'events/calendar-task.c'; then $(CYGPATH_W) 'events/calendar-task.c'; else $(CYGPATH_W) '$(srcdir)/events/calendar-task.c'; fi` - -almanah-preferences-dialog.o: preferences-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-preferences-dialog.o -MD -MP -MF $(DEPDIR)/almanah-preferences-dialog.Tpo -c -o almanah-preferences-dialog.o `test -f 'preferences-dialog.c' || echo '$(srcdir)/'`preferences-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-preferences-dialog.Tpo $(DEPDIR)/almanah-preferences-dialog.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='preferences-dialog.c' object='almanah-preferences-dialog.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-preferences-dialog.o `test -f 'preferences-dialog.c' || echo '$(srcdir)/'`preferences-dialog.c - -almanah-preferences-dialog.obj: preferences-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT almanah-preferences-dialog.obj -MD -MP -MF $(DEPDIR)/almanah-preferences-dialog.Tpo -c -o almanah-preferences-dialog.obj `if test -f 'preferences-dialog.c'; then $(CYGPATH_W) 'preferences-dialog.c'; else $(CYGPATH_W) '$(srcdir)/preferences-dialog.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/almanah-preferences-dialog.Tpo $(DEPDIR)/almanah-preferences-dialog.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='preferences-dialog.c' object='almanah-preferences-dialog.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o almanah-preferences-dialog.obj `if test -f 'preferences-dialog.c'; then $(CYGPATH_W) 'preferences-dialog.c'; else $(CYGPATH_W) '$(srcdir)/preferences-dialog.c'; fi` - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-am -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-am - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-am - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(PROGRAMS) -installdirs: - for dir in "$(DESTDIR)$(bindir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -rm -f event-factories/$(DEPDIR)/$(am__dirstamp) - -rm -f event-factories/$(am__dirstamp) - -rm -f events/$(DEPDIR)/$(am__dirstamp) - -rm -f events/$(am__dirstamp) - -rm -f widgets/$(DEPDIR)/$(am__dirstamp) - -rm -f widgets/$(am__dirstamp) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) event-factories/$(DEPDIR) events/$(DEPDIR) widgets/$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: install-binPROGRAMS - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) event-factories/$(DEPDIR) events/$(DEPDIR) widgets/$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-binPROGRAMS - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ - clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ - ctags ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am uninstall-binPROGRAMS - - -almanah-marshal.h: almanah-marshal.list - $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=almanah_marshal --header $< > $@ -almanah-marshal.c: almanah-marshal.list almanah-marshal.h - $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=almanah_marshal --header --body $< > $@ - -event-factory-builtins.h: event-factory.h Makefile - $(AM_V_GEN)(cd $(srcdir) && $(GLIB_MKENUMS) \ - --fhead "#ifndef __ALMANAH_EVENT_FACTORY_BUILTINS_H__\n#define __ALMANAH_EVENT_FACTORY_BUILTINS_H__\n\n#include \n\nG_BEGIN_DECLS\n" \ - --fprod "/* enumerations from \"@filename@\" */\n" \ - --vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define ALMANAH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ - --ftail "G_END_DECLS\n\n#endif /* __ALMANAH_EVENT_FACTORY_BUILTINS_H__ */" \ - event-factory.h) > $(@F) - -event-factory-builtins.c: event-factory.h Makefile event-factory-builtins.h - $(AM_V_GEN)(cd $(srcdir) && $(GLIB_MKENUMS) \ - --fhead "#include \"event-factory.h\"\n#include \"event-factory-builtins.h\"" \ - --fprod "\n/* enumerations from \"@filename@\" */" \ - --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ - --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ - --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ - event-factory.h) > $(@F) - --include $(top_srcdir)/git.mk - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru almanah-0.11.1/src/meson.build almanah-0.12.0/src/meson.build --- almanah-0.11.1/src/meson.build 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.12.0/src/meson.build 2019-10-07 13:45:09.000000000 +0000 @@ -0,0 +1,75 @@ +enum_headers = [ + 'event-factory.h', +] + +sources = [ + 'main.c', + 'application.c', + 'interface.c', + 'main-window.c', + 'storage-manager.c', + 'search-dialog.c', + 'preferences-dialog.c', + 'printing.c', + 'entry.c', + 'event.c', + 'event-factory.c', + 'event-manager.c', + 'date-entry-dialog.c', + 'import-export-dialog.c', + 'import-operation.c', + 'export-operation.c', + 'uri-entry-dialog.c', + 'widgets/calendar.c', + 'widgets/calendar-button.c', + 'widgets/eggwrapbox.c', + 'widgets/eggwrapbox-enums.c', + 'widgets/entry-tags-area.c', + 'widgets/hyperlink-tag.c', + 'widgets/tag-accessible.c', + 'widgets/tag.c', + 'widgets/tag-entry.c', + 'vfs.c', + config, +] + +if have_evolution + sources += [ + 'event-factories/calendar.c', + 'event-factories/calendar-client.c', + 'event-factories/calendar-sources.c', + 'event-factories/e-cell-renderer-color.c', + 'event-factories/e-source-selector.c', + 'events/calendar-appointment.c', + 'events/calendar-task.c', + ] +endif + +sources += gnome.compile_resources( + 'almanah-resources', + 'almanah.gresource.xml', + source_dir: [ + data_dir, + ], + c_name: 'almanah', + export: true, +) + +sources += gnome.mkenums_simple( + 'enums', + sources: enum_headers, +) + +inc = include_directories( + '..', + 'events', + 'event-factories', +) + +almanah = executable( + meson.project_name(), + sources, + dependencies: almanah_deps, + include_directories: inc, + install: true, +) diff -Nru almanah-0.11.1/src/preferences-dialog.c almanah-0.12.0/src/preferences-dialog.c --- almanah-0.11.1/src/preferences-dialog.c 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/src/preferences-dialog.c 2019-10-07 13:45:09.000000000 +0000 @@ -22,13 +22,11 @@ #include #include #include -#ifdef ENABLE_ENCRYPTION #define LIBCRYPTUI_API_SUBJECT_TO_CHANGE #include #include #include #include -#endif /* ENABLE_ENCRYPTION */ #include "preferences-dialog.h" #include "interface.h" @@ -37,19 +35,14 @@ static void get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec); static void set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec); static void almanah_preferences_dialog_dispose (GObject *object); -#ifdef ENABLE_ENCRYPTION static void pd_key_combo_changed_cb (GtkComboBox *combo_box, AlmanahPreferencesDialog *preferences_dialog); static void pd_new_key_button_clicked_cb (GtkButton *button, AlmanahPreferencesDialog *preferences_dialog); -#endif /* ENABLE_ENCRYPTION */ -static void pd_response_cb (GtkDialog *dialog, gint response_id, AlmanahPreferencesDialog *preferences_dialog); struct _AlmanahPreferencesDialogPrivate { GSettings *settings; -#ifdef ENABLE_ENCRYPTION CryptUIKeyset *keyset; CryptUIKeyStore *key_store; GtkComboBox *key_combo; -#endif /* ENABLE_ENCRYPTION */ #ifdef ENABLE_SPELL_CHECKING guint spell_checking_enabled_id; GtkCheckButton *spell_checking_enabled_check_button; @@ -86,9 +79,8 @@ { self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, ALMANAH_TYPE_PREFERENCES_DIALOG, AlmanahPreferencesDialogPrivate); - g_signal_connect (self, "response", G_CALLBACK (pd_response_cb), self); gtk_window_set_modal (GTK_WINDOW (self), FALSE); - gtk_window_set_title (GTK_WINDOW (self), _("Almanah Preferences")); + gtk_window_set_title (GTK_WINDOW (self), _("Preferences")); gtk_widget_set_size_request (GTK_WIDGET (self), 400, -1); gtk_window_set_resizable (GTK_WINDOW (self), TRUE); /* needs to be resizeable so long keys can be made visible in the list */ } @@ -98,7 +90,6 @@ { AlmanahPreferencesDialogPrivate *priv = ALMANAH_PREFERENCES_DIALOG (object)->priv; -#ifdef ENABLE_ENCRYPTION if (priv->keyset != NULL) { g_object_unref (priv->keyset); priv->keyset = NULL; @@ -108,7 +99,6 @@ g_object_unref (priv->key_store); priv->key_store = NULL; } -#endif /* ENABLE_ENCRYPTION */ if (priv->settings != NULL) g_object_unref (priv->settings); @@ -162,19 +152,15 @@ almanah_preferences_dialog_new (GSettings *settings) { GtkBuilder *builder; - GtkTable *table; -#ifdef ENABLE_ENCRYPTION + GtkGrid *grid; GtkWidget *label, *button; AtkObject *a11y_label, *a11y_key_combo; gchar *key; -#endif /* ENABLE_ENCRYPTION */ AlmanahPreferencesDialog *preferences_dialog; AlmanahPreferencesDialogPrivate *priv; GError *error = NULL; - const gchar *interface_filename = almanah_get_interface_filename (); const gchar *object_names[] = { "almanah_preferences_dialog", - "almanah_ui_manager", /* HACK: work around bgo#672789 */ NULL }; @@ -182,13 +168,13 @@ builder = gtk_builder_new (); - if (gtk_builder_add_objects_from_file (builder, interface_filename, (gchar**) object_names, &error) == FALSE) { + if (gtk_builder_add_objects_from_resource (builder, "/org/gnome/Almanah/ui/almanah.ui", (gchar**) object_names, &error) == 0) { /* Show an error */ GtkWidget *dialog = gtk_message_dialog_new (NULL, - GTK_DIALOG_MODAL, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, - _("UI file \"%s\" could not be loaded"), interface_filename); + GTK_DIALOG_MODAL, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + _("UI data could not be loaded")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", error->message); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -210,20 +196,23 @@ priv = ALMANAH_PREFERENCES_DIALOG (preferences_dialog)->priv; priv->settings = g_object_ref (settings); - table = GTK_TABLE (gtk_builder_get_object (builder, "almanah_pd_table")); + grid = GTK_GRID (gtk_builder_get_object (builder, "almanah_pd_grid")); + gtk_widget_set_halign (GTK_WIDGET (grid), GTK_ALIGN_CENTER); + gtk_widget_set_valign (GTK_WIDGET (grid), GTK_ALIGN_CENTER); -#ifdef ENABLE_ENCRYPTION /* Grab our child widgets */ label = gtk_label_new (_("Encryption key: ")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_table_attach (table, label, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0); + gtk_grid_attach (grid, label, 0, 0, 1, 1); priv->keyset = cryptui_keyset_new ("openpgp", FALSE); priv->key_store = cryptui_key_store_new (priv->keyset, FALSE, _("None (don't encrypt)")); cryptui_key_store_set_filter (priv->key_store, key_store_filter_cb, NULL); priv->key_combo = cryptui_key_combo_new (priv->key_store); + gtk_grid_attach (grid, GTK_WIDGET (priv->key_combo), 1, 0, 1, 1); - gtk_table_attach_defaults (table, GTK_WIDGET (priv->key_combo), 2, 3, 1, 2); + button = gtk_button_new_with_mnemonic (_("New _Key")); + gtk_grid_attach (grid, button, 2, 0, 1, 1); + g_signal_connect (button, "clicked", G_CALLBACK (pd_new_key_button_clicked_cb), preferences_dialog); /* Set up the accessibility relationships */ a11y_label = gtk_widget_get_accessible (GTK_WIDGET (label)); @@ -243,15 +232,10 @@ g_signal_connect (priv->key_combo, "changed", G_CALLBACK (pd_key_combo_changed_cb), preferences_dialog); - button = gtk_button_new_with_mnemonic (_("New _Key")); - gtk_table_attach (table, button, 3, 4, 1, 2, GTK_FILL, GTK_FILL, 0, 0); - g_signal_connect (button, "clicked", G_CALLBACK (pd_new_key_button_clicked_cb), preferences_dialog); -#endif /* ENABLE_ENCRYPTION */ - #ifdef ENABLE_SPELL_CHECKING /* Set up the "Enable spell checking" check button */ priv->spell_checking_enabled_check_button = GTK_CHECK_BUTTON (gtk_check_button_new_with_mnemonic (_("Enable _spell checking"))); - gtk_table_attach_defaults (table, GTK_WIDGET (priv->spell_checking_enabled_check_button), 1, 4, 2, 3); + gtk_grid_attach (grid, GTK_WIDGET (priv->spell_checking_enabled_check_button), 0, 2, 2, 1); g_settings_bind (priv->settings, "spell-checking-enabled", priv->spell_checking_enabled_check_button, "active", G_SETTINGS_BIND_DEFAULT); #endif /* ENABLE_SPELL_CHECKING */ @@ -261,7 +245,6 @@ return preferences_dialog; } -#ifdef ENABLE_ENCRYPTION static void pd_key_combo_changed_cb (GtkComboBox *combo_box, AlmanahPreferencesDialog *preferences_dialog) { @@ -303,10 +286,3 @@ g_error_free (error); } } -#endif /* ENABLE_ENCRYPTION */ - -static void -pd_response_cb (GtkDialog *dialog, gint response_id, AlmanahPreferencesDialog *preferences_dialog) -{ - gtk_widget_hide (GTK_WIDGET (dialog)); -} diff -Nru almanah-0.11.1/src/printing.c almanah-0.12.0/src/printing.c --- almanah-0.11.1/src/printing.c 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/src/printing.c 2019-10-07 13:45:09.000000000 +0000 @@ -86,20 +86,20 @@ if (bg_set) { - GdkColor *color = NULL; + GdkRGBA *color = NULL; if (bg) pango_attribute_destroy (bg); - g_object_get (tag, "background-gdk", &color, NULL); + g_object_get (tag, "background-rgba", &color, NULL); bg = pango_attr_background_new (color->red, color->green, color->blue); - gdk_color_free (color); + gdk_rgba_free (color); } if (fg_set) { - GdkColor *color = NULL; + GdkRGBA *color = NULL; if (fg) pango_attribute_destroy (fg); - g_object_get (tag, "foreground-gdk", &color, NULL); + g_object_get (tag, "foreground-rgba", &color, NULL); fg = pango_attr_foreground_new (color->red, color->green, color->blue); - gdk_color_free (color); + gdk_rgba_free (color); } if (style_set) @@ -440,29 +440,33 @@ { GtkWidget *start_calendar, *end_calendar, *line_spacing_spin_button; GtkLabel *start_label, *end_label, *line_spacing_label; - GtkTable *table; + GtkGrid *grid; GtkBox *vbox, *hbox; /* Start and end calendars */ start_calendar = almanah_calendar_new (almanah_operation->storage_manager); + gtk_widget_set_hexpand (start_calendar, TRUE); + gtk_widget_set_vexpand (start_calendar, TRUE); end_calendar = almanah_calendar_new (almanah_operation->storage_manager); + gtk_widget_set_hexpand (end_calendar, TRUE); + gtk_widget_set_vexpand (end_calendar, TRUE); g_object_set (G_OBJECT (start_calendar), "show-details", FALSE, NULL); g_object_set (G_OBJECT (end_calendar), "show-details", FALSE, NULL); start_label = GTK_LABEL (gtk_label_new (_("Start date:"))); - gtk_misc_set_alignment (GTK_MISC (start_label), 0.0, 0.5); + gtk_widget_set_halign (GTK_WIDGET (start_label), GTK_ALIGN_START); end_label = GTK_LABEL (gtk_label_new (_("End date:"))); - gtk_misc_set_alignment (GTK_MISC (end_label), 0.0, 0.5); + gtk_widget_set_halign (GTK_WIDGET (end_label), GTK_ALIGN_START); - table = GTK_TABLE (gtk_table_new (2, 2, FALSE)); - gtk_table_set_row_spacings (table, 6); - gtk_table_set_col_spacings (table, 6); - gtk_container_set_border_width (GTK_CONTAINER (table), 6); - gtk_table_attach (table, start_calendar, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); - gtk_table_attach (table, end_calendar, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); - gtk_table_attach (table, GTK_WIDGET (start_label), 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); - gtk_table_attach (table, GTK_WIDGET (end_label), 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); + grid = GTK_GRID (gtk_grid_new ()); + gtk_grid_set_row_spacing (grid, 6); + gtk_grid_set_column_spacing (grid, 6); + gtk_container_set_border_width (GTK_CONTAINER (grid), 6); + gtk_grid_attach (grid, GTK_WIDGET (start_label), 0, 0, 1, 1); + gtk_grid_attach (grid, start_calendar, 0, 1, 1, 1); + gtk_grid_attach (grid, GTK_WIDGET (end_label), 1, 0, 1, 1); + gtk_grid_attach (grid, end_calendar, 1, 1, 1, 1); almanah_operation->start_calendar = ALMANAH_CALENDAR (start_calendar); almanah_operation->end_calendar = ALMANAH_CALENDAR (end_calendar); @@ -478,7 +482,7 @@ gtk_box_pack_start (hbox, line_spacing_spin_button, TRUE, TRUE, 6); vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 12)); - gtk_box_pack_start (vbox, GTK_WIDGET (table), TRUE, TRUE, 6); + gtk_box_pack_start (vbox, GTK_WIDGET (grid), TRUE, TRUE, 6); gtk_box_pack_start (vbox, GTK_WIDGET (hbox), FALSE, TRUE, 6); gtk_widget_show_all (GTK_WIDGET (vbox)); diff -Nru almanah-0.11.1/src/search-dialog.c almanah-0.12.0/src/search-dialog.c --- almanah-0.11.1/src/search-dialog.c 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/src/search-dialog.c 2019-10-07 13:45:09.000000000 +0000 @@ -76,25 +76,23 @@ AlmanahSearchDialog *search_dialog; AlmanahSearchDialogPrivate *priv; GError *error = NULL; - const gchar *interface_filename = almanah_get_interface_filename (); const gchar *object_names[] = { "almanah_search_dialog", "almanah_sd_search_button_image", "almanah_sd_cancel_button_image", "almanah_sd_results_store", - "almanah_ui_manager", /* HACK: work around bgo#672789 */ NULL }; builder = gtk_builder_new (); - if (gtk_builder_add_objects_from_file (builder, interface_filename, (gchar**) object_names, &error) == FALSE) { + if (gtk_builder_add_objects_from_resource (builder, "/org/gnome/Almanah/ui/almanah.ui", (gchar**) object_names, &error) == 0) { /* Show an error */ GtkWidget *dialog = gtk_message_dialog_new (NULL, - GTK_DIALOG_MODAL, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, - _("UI file \"%s\" could not be loaded"), interface_filename); + GTK_DIALOG_MODAL, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + _("UI data could not be loaded")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", error->message); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); diff -Nru almanah-0.11.1/src/storage-manager.c almanah-0.12.0/src/storage-manager.c --- almanah-0.11.1/src/storage-manager.c 2014-09-24 17:33:27.000000000 +0000 +++ almanah-0.12.0/src/storage-manager.c 2019-10-07 13:45:09.000000000 +0000 @@ -28,15 +28,10 @@ #include #include #include -#ifdef ENABLE_ENCRYPTION -#include -#endif /* ENABLE_ENCRYPTION */ #include "entry.h" #include "storage-manager.h" -#include "almanah-marshal.h" - -#define ENCRYPTED_SUFFIX ".encrypted" +#include "vfs.h" static void almanah_storage_manager_finalize (GObject *object); static void almanah_storage_manager_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec); @@ -44,15 +39,14 @@ static gboolean simple_query (AlmanahStorageManager *self, const gchar *query, GError **error, ...); struct _AlmanahStorageManagerPrivate { - gchar *filename, *plain_filename; - gchar *encryption_key; + gchar *filename; sqlite3 *connection; - gboolean decrypted; + GSettings *settings; }; enum { PROP_FILENAME = 1, - PROP_ENCRYPTION_KEY, + PROP_SETTINGS }; enum { @@ -93,17 +87,17 @@ NULL, G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - g_object_class_install_property (gobject_class, PROP_ENCRYPTION_KEY, - g_param_spec_string ("encryption-key", - "Encryption key", "The identifier for the encryption key in the user's keyring.", - NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_object_class_install_property (gobject_class, PROP_SETTINGS, + g_param_spec_object ("settings", + "The application settings object", "The application settings object to retrieve encryption key.", + G_TYPE_SETTINGS, + G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE)); storage_manager_signals[SIGNAL_DISCONNECTED] = g_signal_new ("disconnected", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - almanah_marshal_VOID__STRING_STRING, + NULL, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); storage_manager_signals[SIGNAL_ENTRY_ADDED] = g_signal_new ("entry-added", G_TYPE_FROM_CLASS (klass), @@ -127,13 +121,13 @@ G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - almanah_marshal_VOID__OBJECT_STRING, + NULL, G_TYPE_NONE, 2, ALMANAH_TYPE_ENTRY, G_TYPE_STRING); storage_manager_signals[SIGNAL_ENTRY_TAG_REMOVED] = g_signal_new ("entry-tag-removed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - almanah_marshal_VOID__OBJECT_STRING, + NULL, G_TYPE_NONE, 2, ALMANAH_TYPE_ENTRY, G_TYPE_STRING); } @@ -142,39 +136,28 @@ { self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, ALMANAH_TYPE_STORAGE_MANAGER, AlmanahStorageManagerPrivate); self->priv->filename = NULL; - self->priv->plain_filename = NULL; - self->priv->encryption_key = NULL; - self->priv->decrypted = FALSE; } /** * almanah_storage_manager_new: * @filename: database filename to open - * @encryption_key: identifier for the encryption key to use in the user's keyring, or %NULL - * - * Creates a new #AlmanahStorageManager, connected to the given database @filename. + * @settings: the %GSettings used to retrieve encryption key * - * If @filename is for an encrypted database, it will automatically be changed to the canonical filename for the unencrypted database, even if that - * file doesn't exist, and even if Almanah was compiled without encryption support. Database filenames are always passed as the unencrypted filename. - * - * If @encryption_key is %NULL, encryption will be disabled. + * Creates a new #AlmanahStorageManager, connected to the given database @filename, using + * GSettings to retrieve the encryption key configured by the user in order to encrypt + * the database. * * Return value: the new #AlmanahStorageManager **/ AlmanahStorageManager * -almanah_storage_manager_new (const gchar *filename, const gchar *encryption_key) +almanah_storage_manager_new (const gchar *filename, GSettings *settings) { - gchar *new_filename = NULL; AlmanahStorageManager *sm; - if (g_str_has_suffix (filename, ENCRYPTED_SUFFIX) == TRUE) - filename = new_filename = g_strndup (filename, strlen (filename) - strlen (ENCRYPTED_SUFFIX)); - sm = g_object_new (ALMANAH_TYPE_STORAGE_MANAGER, "filename", filename, - "encryption-key", encryption_key, + "settings", settings, NULL); - g_free (new_filename); return sm; } @@ -185,8 +168,6 @@ AlmanahStorageManagerPrivate *priv = ALMANAH_STORAGE_MANAGER (object)->priv; g_free (priv->filename); - g_free (priv->plain_filename); - g_free (priv->encryption_key); /* Chain up to the parent class */ G_OBJECT_CLASS (almanah_storage_manager_parent_class)->finalize (object); @@ -201,8 +182,8 @@ case PROP_FILENAME: g_value_set_string (value, g_strdup (priv->filename)); break; - case PROP_ENCRYPTION_KEY: - g_value_set_string (value, priv->encryption_key); + case PROP_SETTINGS: + g_value_set_object (value, priv->settings); break; default: /* We don't have any other property... */ @@ -218,13 +199,12 @@ switch (property_id) { case PROP_FILENAME: - priv->plain_filename = g_strdup (g_value_get_string (value)); - priv->filename = g_strjoin (NULL, priv->plain_filename, ENCRYPTED_SUFFIX, NULL); + if (priv->filename) + g_free (priv->filename); + priv->filename = g_strdup (g_value_get_string (value)); break; - case PROP_ENCRYPTION_KEY: - g_free (priv->encryption_key); - priv->encryption_key = g_value_dup_string (value); - g_object_notify (object, "encryption-key"); + case PROP_SETTINGS: + g_set_object (&priv->settings, g_value_get_object (value)); break; default: /* We don't have any other property... */ @@ -255,380 +235,20 @@ simple_query (self, queries[i++], NULL); } -#ifdef ENABLE_ENCRYPTION -typedef struct { - AlmanahStorageManager *storage_manager; - GIOChannel *cipher_io_channel; - GIOChannel *plain_io_channel; - gpgme_data_t gpgme_cipher; - gpgme_data_t gpgme_plain; - gpgme_ctx_t context; -} CipherOperation; - -static gboolean -prepare_gpgme (AlmanahStorageManager *self, gboolean encrypting, CipherOperation *operation, GError **error) -{ - gpgme_error_t error_gpgme; - - /* Check for a minimum GPGME version (bgo#599598) */ - if (gpgme_check_version (MIN_GPGME_VERSION) == NULL) { - g_set_error (error, ALMANAH_STORAGE_MANAGER_ERROR, ALMANAH_STORAGE_MANAGER_ERROR_BAD_VERSION, - _("GPGME is not at least version %s"), - MIN_GPGME_VERSION); - return FALSE; - } - - /* Check OpenPGP's supported */ - error_gpgme = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP); - if (error_gpgme != GPG_ERR_NO_ERROR) { - g_set_error (error, ALMANAH_STORAGE_MANAGER_ERROR, ALMANAH_STORAGE_MANAGER_ERROR_UNSUPPORTED, - _("GPGME doesn't support OpenPGP: %s"), - gpgme_strerror (error_gpgme)); - return FALSE; - } - - /* Set up for the operation */ - error_gpgme = gpgme_new (&(operation->context)); - if (error_gpgme != GPG_ERR_NO_ERROR) { - g_set_error (error, ALMANAH_STORAGE_MANAGER_ERROR, ALMANAH_STORAGE_MANAGER_ERROR_CREATING_CONTEXT, - _("Error creating cipher context: %s"), - gpgme_strerror (error_gpgme)); - return FALSE; - } - - gpgme_set_protocol (operation->context, GPGME_PROTOCOL_OpenPGP); - gpgme_set_armor (operation->context, TRUE); - gpgme_set_textmode (operation->context, FALSE); - - return TRUE; -} - -static gboolean -open_db_files (AlmanahStorageManager *self, gboolean encrypting, CipherOperation *operation, GError **error) -{ - GError *io_error = NULL; - gpgme_error_t error_gpgme; - - /* Open the encrypted file */ - operation->cipher_io_channel = g_io_channel_new_file (self->priv->filename, encrypting ? "w" : "r", &io_error); - if (operation->cipher_io_channel == NULL) { - g_propagate_error (error, io_error); - return FALSE; - } - - /* Pass it to GPGME */ - error_gpgme = gpgme_data_new_from_fd (&(operation->gpgme_cipher), g_io_channel_unix_get_fd (operation->cipher_io_channel)); - if (error_gpgme != GPG_ERR_NO_ERROR) { - g_set_error (error, ALMANAH_STORAGE_MANAGER_ERROR, ALMANAH_STORAGE_MANAGER_ERROR_OPENING_FILE, - _("Error opening encrypted database file \"%s\": %s"), - self->priv->filename, gpgme_strerror (error_gpgme)); - return FALSE; - } - - /* Open/Create the plain file */ - operation->plain_io_channel = g_io_channel_new_file (self->priv->plain_filename, encrypting ? "r" : "w", &io_error); - if (operation->plain_io_channel == NULL) { - g_propagate_error (error, io_error); - return FALSE; - } - - /* Ensure the permissions are restricted to only the current user */ - fchmod (g_io_channel_unix_get_fd (operation->plain_io_channel), S_IRWXU); - - /* Pass it to GPGME */ - error_gpgme = gpgme_data_new_from_fd (&(operation->gpgme_plain), g_io_channel_unix_get_fd (operation->plain_io_channel)); - if (error_gpgme != GPG_ERR_NO_ERROR) { - g_set_error (error, ALMANAH_STORAGE_MANAGER_ERROR, ALMANAH_STORAGE_MANAGER_ERROR_OPENING_FILE, - _("Error opening plain database file \"%s\": %s"), - self->priv->plain_filename, gpgme_strerror (error_gpgme)); - return FALSE; - } - - return TRUE; -} - -static void -cipher_operation_free (CipherOperation *operation) -{ - gpgme_data_release (operation->gpgme_cipher); - gpgme_data_release (operation->gpgme_plain); - - if (operation->cipher_io_channel != NULL) { - g_io_channel_flush (operation->cipher_io_channel, NULL); - g_io_channel_unref (operation->cipher_io_channel); - } - - if (operation->plain_io_channel != NULL) { - g_io_channel_shutdown (operation->plain_io_channel, TRUE, NULL); - g_io_channel_unref (operation->plain_io_channel); - } - - /* We could free the operation before the context is even created (bgo#599598) */ - if (operation->context != NULL) { - gpgme_signers_clear (operation->context); - gpgme_release (operation->context); - } - - g_object_unref (operation->storage_manager); - g_free (operation); -} - -static gboolean -database_idle_cb (CipherOperation *operation) -{ - AlmanahStorageManager *self = operation->storage_manager; - gpgme_error_t error_gpgme; - - if (gpgme_wait (operation->context, &error_gpgme, FALSE) != NULL || error_gpgme != GPG_ERR_NO_ERROR) { - struct stat db_stat; - gchar *warning_message = NULL; - - /* Check to see if the encrypted file is 0B in size, which isn't good. Not much we can do about it except quit without deleting the - * plaintext database. */ - g_stat (self->priv->filename, &db_stat); - if (g_file_test (self->priv->filename, G_FILE_TEST_IS_REGULAR) == FALSE || db_stat.st_size == 0) { - warning_message = g_strdup (_("The encrypted database is empty. The plain database file has been left undeleted as backup.")); - } else if (g_unlink (self->priv->plain_filename) != 0) { - /* Delete the plain file */ - warning_message = g_strdup_printf (_("Could not delete plain database file \"%s\"."), self->priv->plain_filename); - } - - /* A slight assumption that we're disconnecting at this point (we're technically only encrypting), but a valid one. */ - g_signal_emit (self, storage_manager_signals[SIGNAL_DISCONNECTED], 0, - (error_gpgme == GPG_ERR_NO_ERROR) ? NULL: gpgme_strerror (error_gpgme), - warning_message); - g_free (warning_message); - - /* Finished! */ - cipher_operation_free (operation); - - return FALSE; - } - - return TRUE; -} - -static gboolean -decrypt_database (AlmanahStorageManager *self, GError **error) -{ - GError *preparation_error = NULL; - CipherOperation *operation; - gpgme_error_t error_gpgme; - - operation = g_new0 (CipherOperation, 1); - operation->storage_manager = g_object_ref (self); - - /* Set up */ - if (prepare_gpgme (self, FALSE, operation, &preparation_error) != TRUE || - open_db_files (self, FALSE, operation, &preparation_error) != TRUE) { - cipher_operation_free (operation); - g_propagate_error (error, preparation_error); - return FALSE; - } - - /* Decrypt and verify! */ - error_gpgme = gpgme_op_decrypt_verify (operation->context, operation->gpgme_cipher, operation->gpgme_plain); - if (error_gpgme != GPG_ERR_NO_ERROR) { - cipher_operation_free (operation); - g_set_error (error, ALMANAH_STORAGE_MANAGER_ERROR, ALMANAH_STORAGE_MANAGER_ERROR_DECRYPTING, - _("Error decrypting database: %s"), - gpgme_strerror (error_gpgme)); - return FALSE; - } - - /* Do this one synchronously */ - cipher_operation_free (operation); - - return TRUE; -} - -static gboolean -encrypt_database (AlmanahStorageManager *self, const gchar *encryption_key, GError **error) -{ - GError *preparation_error = NULL; - CipherOperation *operation; - gpgme_error_t error_gpgme; - gpgme_key_t gpgme_keys[2] = { NULL, }; - - operation = g_new0 (CipherOperation, 1); - operation->storage_manager = g_object_ref (self); - - /* Set up */ - if (prepare_gpgme (self, TRUE, operation, &preparation_error) != TRUE) { - cipher_operation_free (operation); - g_propagate_error (error, preparation_error); - return FALSE; - } - - /* Set up signing and the recipient */ - error_gpgme = gpgme_get_key (operation->context, encryption_key, &gpgme_keys[0], FALSE); - if (error_gpgme != GPG_ERR_NO_ERROR || gpgme_keys[0] == NULL) { - cipher_operation_free (operation); - g_set_error (error, ALMANAH_STORAGE_MANAGER_ERROR, ALMANAH_STORAGE_MANAGER_ERROR_GETTING_KEY, - _("Error getting encryption key: %s"), - gpgme_strerror (error_gpgme)); - return FALSE; - } - - gpgme_signers_add (operation->context, gpgme_keys[0]); - - if (open_db_files (self, TRUE, operation, &preparation_error) != TRUE) { - cipher_operation_free (operation); - g_propagate_error (error, preparation_error); - return FALSE; - } - - /* Encrypt and sign! */ - error_gpgme = gpgme_op_encrypt_sign_start (operation->context, gpgme_keys, 0, operation->gpgme_plain, operation->gpgme_cipher); - gpgme_key_unref (gpgme_keys[0]); - - if (error_gpgme != GPG_ERR_NO_ERROR) { - cipher_operation_free (operation); - - g_set_error (error, ALMANAH_STORAGE_MANAGER_ERROR, ALMANAH_STORAGE_MANAGER_ERROR_ENCRYPTING, - _("Error encrypting database: %s"), - gpgme_strerror (error_gpgme)); - return FALSE; - } - - /* The operation will be completed in the idle function */ - g_idle_add ((GSourceFunc) database_idle_cb, operation); - - return TRUE; -} - -static gchar * -get_encryption_key (AlmanahStorageManager *self) -{ - gchar **key_parts; - guint i; - gchar *encryption_key; - - encryption_key = g_strdup (self->priv->encryption_key); - if (encryption_key == NULL || encryption_key[0] == '\0') { - g_free (encryption_key); - return NULL; - } - - /* Key is generally in the form openpgp:FOOBARKEY, and GPGME doesn't like the openpgp: prefix, so it must be removed. */ - key_parts = g_strsplit (encryption_key, ":", 2); - g_free (encryption_key); - - for (i = 0; key_parts[i] != NULL; i++) { - if (strcmp (key_parts[i], "openpgp") != 0) - encryption_key = key_parts[i]; - else - g_free (key_parts[i]); - } - g_free (key_parts); - - return encryption_key; -} -#endif /* ENABLE_ENCRYPTION */ - -static gboolean -back_up_file (const gchar *filename, GError **error) -{ - GFile *original_file, *backup_file; - gchar *backup_filename; - gboolean retval = TRUE; - - /* Make a backup of the encrypted database file */ - original_file = g_file_new_for_path (filename); - backup_filename = g_strdup_printf ("%s~", filename); - backup_file = g_file_new_for_path (backup_filename); - g_free (backup_filename); - - if (g_file_copy (original_file, backup_file, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, error) == FALSE) { - retval = FALSE; - } - - /* Ensure the backup is only readable to the current user. */ - if (g_chmod (backup_filename, 0600) != 0 && errno != ENOENT) { - g_set_error (error, ALMANAH_STORAGE_MANAGER_ERROR, ALMANAH_STORAGE_MANAGER_ERROR_CREATING_CONTEXT, - _("Error changing database backup file permissions: %s"), - g_strerror (errno)); - retval = FALSE; - } - - g_object_unref (original_file); - g_object_unref (backup_file); - - return retval; -} - gboolean almanah_storage_manager_connect (AlmanahStorageManager *self, GError **error) { -#ifdef ENABLE_ENCRYPTION - struct stat encrypted_db_stat, plaintext_db_stat; - GError *child_error = NULL; - - g_stat (self->priv->filename, &encrypted_db_stat); - - if (g_chmod (self->priv->filename, 0600) != 0 && errno != ENOENT) { - g_set_error (error, ALMANAH_STORAGE_MANAGER_ERROR, ALMANAH_STORAGE_MANAGER_ERROR_CREATING_CONTEXT, - _("Error changing database file permissions: %s"), - g_strerror (errno)); - return FALSE; - } - - /* If we're decrypting, don't bother if the cipher file doesn't exist (i.e. the database hasn't yet been created), or is empty - * (i.e. corrupt). */ - if (g_file_test (self->priv->filename, G_FILE_TEST_IS_REGULAR) == TRUE && encrypted_db_stat.st_size > 0) { - /* Make a backup of the encrypted database file */ - back_up_file (self->priv->filename, &child_error); - if (child_error != NULL) { - /* Translators: the first parameter is a filename, the second is an error message. */ - g_warning (_("Error backing up file ‘%s’: %s"), self->priv->filename, child_error->message); - g_clear_error (&child_error); - } - - g_stat (self->priv->plain_filename, &plaintext_db_stat); - - /* Only decrypt the database if the plaintext database doesn't exist or is empty. If the plaintext database exists and is non-empty, - * don't decrypt — just use that database. */ - if (g_file_test (self->priv->plain_filename, G_FILE_TEST_IS_REGULAR) != TRUE || plaintext_db_stat.st_size == 0) { - /* Decrypt the database, or display an error if that fails (but not if it fails due to a missing encrypted DB file — just - * fall through and try to open the plain DB file in that case). */ - if (decrypt_database (self, &child_error) != TRUE) { - if (child_error->code != G_FILE_ERROR_NOENT) { - g_propagate_error (error, child_error); - return FALSE; - } - - g_error_free (child_error); - } - } - } - - self->priv->decrypted = TRUE; -#else - /* Make a backup of the plaintext database file */ - back_up_file (self->priv->plain_filename, &child_error); - if (child_error != NULL) { - /* Translators: the first parameter is a filename, the second is an error message. */ - g_warning (_("Error backing up file ‘%s’: %s"), self->priv->plain_filename, child_error->message); - g_clear_error (&child_error); - } - self->priv->decrypted = FALSE; -#endif /* ENABLE_ENCRYPTION */ + /* Our beautiful SQLite VFS */ + almanah_vfs_init(self->priv->settings); /* Open the plain database */ - if (sqlite3_open (self->priv->plain_filename, &(self->priv->connection)) != SQLITE_OK) { + if (sqlite3_open_v2 (self->priv->filename, &(self->priv->connection), SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, "almanah") != SQLITE_OK) { g_set_error (error, ALMANAH_STORAGE_MANAGER_ERROR, ALMANAH_STORAGE_MANAGER_ERROR_OPENING_FILE, _("Could not open database \"%s\". SQLite provided the following error message: %s"), self->priv->filename, sqlite3_errmsg (self->priv->connection)); return FALSE; } - if (g_chmod (self->priv->plain_filename, 0600) != 0 && errno != ENOENT) { - g_set_error (error, ALMANAH_STORAGE_MANAGER_ERROR, ALMANAH_STORAGE_MANAGER_ERROR_CREATING_CONTEXT, - _("Error changing database file permissions: %s"), - g_strerror (errno)); - return FALSE; - } - /* Can't hurt to create the tables now */ create_tables (self); @@ -636,54 +256,20 @@ } gboolean -almanah_storage_manager_disconnect (AlmanahStorageManager *self, GError **error) +almanah_storage_manager_disconnect (AlmanahStorageManager *self, __attribute__ ((unused)) GError **error) { -#ifdef ENABLE_ENCRYPTION - gchar *encryption_key; - GError *child_error = NULL; -#endif /* ENABLE_ENCRYPTION */ - - /* Close the DB connection */ - sqlite3_close (self->priv->connection); - -#ifdef ENABLE_ENCRYPTION - /* If the database wasn't encrypted before we opened it, we won't encrypt it when closing. In fact, we'll go so far as to delete the old - * encrypted database file. */ - if (self->priv->decrypted == FALSE) - goto delete_encrypted_db; - - /* Get the encryption key */ - encryption_key = get_encryption_key (self); - if (encryption_key == NULL) - goto delete_encrypted_db; - - /* Encrypt the plain DB file */ - if (encrypt_database (self, encryption_key, &child_error) != TRUE) { - g_signal_emit (self, storage_manager_signals[SIGNAL_DISCONNECTED], 0, NULL, child_error->message); - - if (g_error_matches (child_error, ALMANAH_STORAGE_MANAGER_ERROR, ALMANAH_STORAGE_MANAGER_ERROR_GETTING_KEY) == TRUE) - g_propagate_error (error, child_error); - else - g_error_free (child_error); + int sqlite_ret; - g_free (encryption_key); - return FALSE; - } + sqlite_ret = sqlite3_close (self->priv->connection); - g_free (encryption_key); -#else /* ENABLE_ENCRYPTION */ - g_signal_emit (self, storage_manager_signals[SIGNAL_DISCONNECTED], 0, NULL, NULL); -#endif /* !ENABLE_ENCRYPTION */ + if (sqlite_ret != SQLITE_OK) + g_signal_emit (self, storage_manager_signals[SIGNAL_DISCONNECTED], 0, NULL, "Something goes wrong closing the database"); + else + g_signal_emit (self, storage_manager_signals[SIGNAL_DISCONNECTED], 0, NULL, NULL); - return TRUE; + almanah_vfs_finish(); -#ifdef ENABLE_ENCRYPTION -delete_encrypted_db: - /* Delete the old encrypted database and return */ - g_unlink (self->priv->filename); - g_signal_emit (self, storage_manager_signals[SIGNAL_DISCONNECTED], 0, NULL, NULL); return TRUE; -#endif /* ENABLE_ENCRYPTION */ } static gboolean @@ -1353,9 +939,9 @@ } const gchar * -almanah_storage_manager_get_filename (AlmanahStorageManager *self, gboolean plain) +almanah_storage_manager_get_filename (AlmanahStorageManager *self) { - return (plain == TRUE) ? self->priv->plain_filename : self->priv->filename; + return self->priv->filename; } /** @@ -1488,14 +1074,14 @@ sqlite3_bind_int (statement, 3, g_date_get_day (&date)); while ((result = sqlite3_step (statement)) == SQLITE_ROW) { - tags = g_list_append (tags, g_strdup (sqlite3_column_text (statement, 0))); + tags = g_list_append (tags, g_strdup ((const gchar*) sqlite3_column_text (statement, 0))); } sqlite3_finalize (statement); if (result != SQLITE_DONE) { g_debug ("Error querying for tags from database: %s", sqlite3_errmsg (self->priv->connection)); - g_free (tags); + g_list_free_full (tags, (GDestroyNotify) g_free); tags = NULL; } diff -Nru almanah-0.11.1/src/storage-manager.h almanah-0.12.0/src/storage-manager.h --- almanah-0.11.1/src/storage-manager.h 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/src/storage-manager.h 2019-10-07 13:45:09.000000000 +0000 @@ -22,6 +22,7 @@ #include #include +#include #include "entry.h" @@ -68,7 +69,7 @@ GType almanah_storage_manager_get_type (void); GQuark almanah_storage_manager_error_quark (void); -AlmanahStorageManager *almanah_storage_manager_new (const gchar *filename, const gchar *encryption_key) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; +AlmanahStorageManager *almanah_storage_manager_new (const gchar *filename, GSettings *settings) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC; gboolean almanah_storage_manager_connect (AlmanahStorageManager *self, GError **error); gboolean almanah_storage_manager_disconnect (AlmanahStorageManager *self, GError **error); @@ -93,7 +94,7 @@ gboolean *almanah_storage_manager_get_month_marked_days (AlmanahStorageManager *self, GDateYear year, GDateMonth month, guint *num_days); gboolean *almanah_storage_manager_get_month_important_days (AlmanahStorageManager *self, GDateYear year, GDateMonth month, guint *num_days); -const gchar *almanah_storage_manager_get_filename (AlmanahStorageManager *self, gboolean plain); +const gchar *almanah_storage_manager_get_filename (AlmanahStorageManager *self); gboolean almanah_storage_manager_entry_add_tag (AlmanahStorageManager *self, AlmanahEntry *entry, const gchar *tag); gboolean almanah_storage_manager_entry_remove_tag (AlmanahStorageManager *self, AlmanahEntry *entry, const gchar *tag); diff -Nru almanah-0.11.1/src/ui/almanah.ui almanah-0.12.0/src/ui/almanah.ui --- almanah-0.11.1/src/ui/almanah.ui 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.12.0/src/ui/almanah.ui 2019-10-07 13:45:09.000000000 +0000 @@ -0,0 +1,854 @@ + + + + + + + + + + + + + + 12 + + + GTK_ORIENTATION_VERTICAL + 6 + + + 200 + True + False + + + + Calendar + + + + + True + + + + + GTK_ORIENTATION_HORIZONTAL + True + + + + True + True + Go to Today + + + False + + + + + True + True + Select Date… + + + False + + + + + False + + + + + + + + True + 640 + 480 + + + 6 + + + GTK_ORIENTATION_VERTICAL + 0 + + + + False + True + False + True + 6 + 6 + 0 + 0 + 0 + 0 + 6 + + + 0 + 0 + 1 + 1 + + + + + True + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + True + True + + + + 500 + True + True + GTK_WRAP_WORD_CHAR + center + False + True + 20 + 20 + + + + Entry editing area + + + + + + + 0 + 1 + 1 + 1 + + + + + True + True + + + + + + + 6 + + + Past events + + + + + + + + + False + True + + + + + + + False + True + + + + + + + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + 150 + + + + almanah_mw_event_store + True + False + + + + + + + Past Event List + + + + + + + + 1 + + + + + + + True + + + + 3 + + + + + + + + + + 4 + + + + + + + + + + + False + False + + + + + + + + + + + + + + + + gtk-find + + + + + + + + + + + + + + 5 + 400 + + + 6 + True + + + 6 + 6 + True + + + 6 + True + + + True + True + + + + + + Search entry + + + + + + + almanah_sd_search_button_image + Search + True + True + True + + + + + + + False + + + + + True + gtk-cancel + True + True + False + True + + + + + + + False + + + + + False + + + + + 12 + False + + + 6 + True + + + 6 + True + + + + 0 + True + + + + + + True + + + + + False + False + + + False + + + + + False + + + + + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + True + + + almanah_sd_results_store + False + True + + + + + + + Result List + + + + + + + + 4 + + + + + + + + + + 3 + + + + + + + + + True + + + + + + + True + + + + + + + True + + + View Entry + False + True + + + + + + True + gtk-close + True + + + + + + + + almanah_sd_close_button + + + + + 1 + False + + + + + 12 + 18 + 18 + + + + + + + + + 5 + + + 6 + + + 6 + 5 + + + True + + + + + + + False + + + + + 0 + e.g. "14/03/2009" or "14th March 2009". + + + + + + + + + False + + + + + + + + + True + gtk-cancel + + + + + True + gtk-ok + True + True + False + + + + + + + + almanah_ded_cancel_button + almanah_ded_ok_button + + + + + 5 + + + 6 + + + 6 + 5 + + + True + + + + + + + False + + + + + 0 + e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”. + + + + + + + + + False + + + + + + + + + True + gtk-cancel + + + + + True + gtk-ok + True + True + False + + + + + + + + almanah_ued_cancel_button + almanah_ued_ok_button + + + + + + + + + + + + + + 5 + + + 6 + + + 5 + 6 + + + 6 + + + 0 + + almanah_ied_mode_combo_box + True + + + + + + False + + + + + + almanah_ied_mode_store + + + + + + + 1 + + + + + + + False + + + + + 12 + + + True + almanah_ied_file_chooser + True + + + + + False + + + + + + + GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER + True + + + + + 12 + + + + + + False + + + + + + + + + True + gtk-cancel + + + + + True + + True + True + + + + + + + + almanah_ied_cancel_button + almanah_ied_import_export_button + + + + + + + + + + Successful Entries + + + Merged Entries + + + Failed Entries + + + + + + + + + + + + + + + + + almanah_ird_results_store + + + + 5 + + + 6 + + + 5 + 6 + + + + almanah_ird_view_store + + + + + + + 0 + + + + + False + + + + + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + almanah_ird_filtered_results_store + False + + + + + + + Import Results List + + + + + + + + 3 + + + + + + + + + + 5 + + + + + + + + + + + + + + + View Entry + False + + + + + + True + gtk-close + + + + + + + + almanah_ird_close_button + + + diff -Nru almanah-0.11.1/src/uri-entry-dialog.c almanah-0.12.0/src/uri-entry-dialog.c --- almanah-0.11.1/src/uri-entry-dialog.c 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/src/uri-entry-dialog.c 2019-10-07 13:45:09.000000000 +0000 @@ -110,22 +110,20 @@ AlmanahUriEntryDialog *uri_entry_dialog; AlmanahUriEntryDialogPrivate *priv; GError *error = NULL; - const gchar *interface_filename = almanah_get_interface_filename (); const gchar *object_names[] = { "almanah_uri_entry_dialog", - "almanah_ui_manager", /* HACK: work around bgo#672789 */ NULL }; builder = gtk_builder_new (); - if (gtk_builder_add_objects_from_file (builder, interface_filename, (gchar**) object_names, &error) == FALSE) { + if (gtk_builder_add_objects_from_resource (builder, "/org/gnome/Almanah/ui/almanah.ui", (gchar**) object_names, &error) == 0) { /* Show an error */ GtkWidget *dialog = gtk_message_dialog_new (NULL, - GTK_DIALOG_MODAL, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, - _("UI file \"%s\" could not be loaded"), interface_filename); + GTK_DIALOG_MODAL, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + _("UI data could not be loaded")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", error->message); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); diff -Nru almanah-0.11.1/src/vfs.c almanah-0.12.0/src/vfs.c --- almanah-0.11.1/src/vfs.c 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.12.0/src/vfs.c 2019-10-07 13:45:09.000000000 +0000 @@ -0,0 +1,1345 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ +/* + * Almanah + * Copyright (C) Alvaro Peña 2014 + * + * Almanah is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Almanah is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Almanah. If not, see . + */ + +/* + * This code is based in the code available in the SQlite web + * http://www.sqlite.org/vfs.html called test_demovfs.c. + * So, many thanks to the SQLite guys! + */ + +/* + * Some important things about this VFS: + * - Not locking allowed, so no more than one process using the same + * database. + * - See more documentation in the demovfs link. + */ + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define GCR_API_SUBJECT_TO_CHANGE +#include +#include +#include +#include +#include +#include + +#include + +#include "vfs.h" + +/* VFS singleton and not a sqlite3_vfs static struct + due GSettings is setup in initialization time */ +static sqlite3_vfs *almanah_vfs_singleton = NULL; + +#define ENCRYPTED_SUFFIX ".encrypted" + +/* +** Size of the write buffer used by journal files in bytes. +*/ +#ifndef SQLITE_DEMOVFS_BUFFERSZ +# define SQLITE_DEMOVFS_BUFFERSZ 8192 +#endif + +/* +** The maximum pathname length supported by this VFS. +*/ +#define MAXPATHNAME 512 + +/* +** When using this VFS, the sqlite3_file* handles that SQLite uses are +** actually pointers to instances of type DemoFile. +*/ + +typedef struct _AlmanahSQLiteVFS AlmanahSQLiteVFS; + +struct _AlmanahSQLiteVFS +{ + sqlite3_file base; /* Base class. Must be first. */ + int fd; /* File descriptor */ + + char *aBuffer; /* Pointer to malloc'd buffer */ + int nBuffer; /* Valid bytes of data in zBuffer */ + sqlite3_int64 iBufferOfst; /* Offset in file of zBuffer[0] */ + + gchar *plain_filename; + gchar *encrypted_filename; + + gboolean decrypted; + + guint8 *plain_buffer; + gsize plain_buffer_size; /* Reserved memory size */ + goffset plain_offset; + gsize plain_size; /* Data size (plain_size <= plain_buffer_size) */ + + GSettings *settings; +}; + +typedef struct _CipherOperation CipherOperation; +typedef struct _GpgmeNpmClosure GpgmeNpmClosure; + +struct _GpgmeNpmClosure { + guint8 *buffer; + gsize buffer_size; + goffset offset; + gsize size; +}; + +struct _CipherOperation { + GIOChannel *cipher_io_channel; + GIOChannel *plain_io_channel; + gpgme_data_t gpgme_cipher; + gpgme_data_t gpgme_plain; + gpgme_ctx_t context; + AlmanahSQLiteVFS *vfs; + struct gpgme_data_cbs *gpgme_cbs; + GpgmeNpmClosure *npm_closure; +}; + +enum { + ALMANAH_VFS_ERROR_DECRYPT = 1 +}; + +#define ALMANAH_VFS_ERROR almanah_vfs_error_quark () + +static GQuark +almanah_vfs_error_quark (void) +{ + return g_quark_from_static_string ("almanah-vfs-error-quark"); +} + +/* Some wrappers around the libgcr secure memory functionality which fall back + * to normal malloc() if secure memory fails. It will typically fail because + * rlimit_secmem is low (64KiB by default) which prevents unprivileged + * processes from allocating large amounts of secure memory. This typically + * means that we can’t keep the entire decrypted database in secure memory. + * + * Because keeping it in normal memory is better than leaving it on disk (even + * with the risk of normal memory being paged out at some point), do that + * instead of failing completely. + */ +static gpointer +maybe_secure_memory_try_realloc (gpointer memory, + gsize size) +{ + gpointer buffer = NULL; + + if (gcr_secure_memory_is_secure (memory)) + buffer = gcr_secure_memory_try_realloc (memory, size); + if (buffer == NULL) + buffer = g_try_realloc (memory, size); + + return buffer; +} + +static gpointer +maybe_secure_memory_realloc (gpointer memory, + gsize size) +{ + gpointer buffer = NULL; + + if (gcr_secure_memory_is_secure (memory)) + buffer = gcr_secure_memory_try_realloc (memory, size); + if (buffer == NULL) + buffer = g_realloc (memory, size); + + g_assert (buffer != NULL); + return buffer; +} + +static void +maybe_secure_memory_free (gpointer memory) +{ + if (gcr_secure_memory_is_secure (memory)) + gcr_secure_memory_free (memory); + else + g_free (memory); +} + +/* Callback based data buffer functions for GPGME */ +ssize_t _gpgme_read_cb (void *handle, void *buffer, size_t size); +ssize_t _gpgme_write_cb (void *handle, const void *buffer, size_t size); +off_t _gpgme_seek_cb (void *handle, off_t offset, int whence); + +ssize_t +_gpgme_read_cb (void *handle, void *buffer, size_t size) +{ + GpgmeNpmClosure *npm_closure = (GpgmeNpmClosure *) handle; + gsize read_size; + + read_size = npm_closure->size - npm_closure->offset; + if (!read_size) + return 0; + if (size < read_size) + read_size = size; + + memcpy (buffer, npm_closure->buffer + npm_closure->offset, read_size); + npm_closure->offset += read_size; + + return (ssize_t) read_size; +} + +ssize_t +_gpgme_write_cb (void *handle, const void *buffer, size_t size) +{ + GpgmeNpmClosure *npm_closure = (GpgmeNpmClosure *) handle; + gsize unused; + + unused = npm_closure->buffer_size - npm_closure->offset; + if (unused < size) { + gsize new_size; + gsize exponential_size; + gsize required_size; + gpointer new_buffer; + + exponential_size = npm_closure->size ? (2 * npm_closure->size) : 512; + required_size = npm_closure->offset + size; + + new_size = MAX (exponential_size, required_size); + new_buffer = maybe_secure_memory_try_realloc (npm_closure->buffer, new_size); + if (!new_buffer && (new_size > required_size)) { + new_size = required_size; + new_buffer = maybe_secure_memory_realloc (npm_closure->buffer, new_size); + } + + if (!new_buffer) { + errno = ENOMEM; + return -1; + } + + npm_closure->buffer = new_buffer; + npm_closure->buffer_size = new_size; + } + + memcpy (npm_closure->buffer + npm_closure->offset, buffer, size); + npm_closure->offset += (gsize) size; + npm_closure->size = MAX (npm_closure->size, (gsize) npm_closure->offset); + + return size; +} + +off_t +_gpgme_seek_cb (void *handle, off_t offset, int whence) +{ + GpgmeNpmClosure *npm_closure = (GpgmeNpmClosure *) handle; + + switch (whence) { + case SEEK_SET: + if (offset < 0 || (gsize) offset > npm_closure->size) { + errno = EINVAL; + return -1; + } + npm_closure->offset = (goffset) offset; + break; + case SEEK_CUR: + if ((offset > 0 && (npm_closure->size - npm_closure->offset) < (gsize) offset) + || (offset < 0 && npm_closure->offset < -offset)) { + errno = EINVAL; + return -1; + } + npm_closure->offset += offset; + break; + case SEEK_END: + if (offset > 0 || (gsize) -offset > npm_closure->size) { + errno = EINVAL; + return -1; + } + npm_closure->offset = npm_closure->size + offset; + break; + default: + errno = EINVAL; + return -1; + } + + return (off_t) npm_closure->offset; +} + +static gboolean +prepare_gpgme (CipherOperation *operation) +{ + gpgme_error_t error_gpgme; + + /* Check for a minimum GPGME version (bgo#599598) */ + if (gpgme_check_version (MIN_GPGME_VERSION) == NULL) { + g_critical (_("GPGME is not at least version %s"), MIN_GPGME_VERSION); + return FALSE; + } + + /* Check OpenPGP's supported */ + error_gpgme = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP); + if (error_gpgme != GPG_ERR_NO_ERROR) { + g_critical (_("GPGME doesn't support OpenPGP: %s"), gpgme_strerror (error_gpgme)); + return FALSE; + } + + /* Set up for the operation */ + error_gpgme = gpgme_new (&(operation->context)); + if (error_gpgme != GPG_ERR_NO_ERROR) { + g_critical (_("Error creating cipher context: %s"), gpgme_strerror (error_gpgme)); + return FALSE; + } + + gpgme_set_protocol (operation->context, GPGME_PROTOCOL_OpenPGP); + gpgme_set_armor (operation->context, TRUE); + gpgme_set_textmode (operation->context, FALSE); + + return TRUE; +} + +static gboolean +open_db_files (AlmanahSQLiteVFS *self, gboolean encrypting, CipherOperation *operation, gboolean use_memory, GError **error) +{ + GError *io_error = NULL; + gpgme_error_t error_gpgme; + + /* Open the encrypted file */ + operation->cipher_io_channel = g_io_channel_new_file (self->encrypted_filename, encrypting ? "w" : "r", &io_error); + if (operation->cipher_io_channel == NULL) { + g_critical (_("Can't create a new GIOChannel for the encrypted database: %s"), io_error->message); + g_propagate_error (error, io_error); + return FALSE; + } + + /* Pass it to GPGME */ + error_gpgme = gpgme_data_new_from_fd (&(operation->gpgme_cipher), g_io_channel_unix_get_fd (operation->cipher_io_channel)); + if (error_gpgme != GPG_ERR_NO_ERROR) { + g_critical (_("Error opening encrypted database file \"%s\": %s"), self->encrypted_filename, gpgme_strerror (error_gpgme)); + return FALSE; + } + + if (use_memory) { + /* Pass the non-pageable memory to GPGME as a Callback Base Data Buffer, + * see: http://www.gnupg.org/documentation/manuals/gpgme/Callback-Based-Data-Buffers.html + */ + operation->npm_closure = g_new0 (GpgmeNpmClosure, 1); + operation->gpgme_cbs = g_new0 (struct gpgme_data_cbs, 1); + operation->gpgme_cbs->read =_gpgme_read_cb; + operation->gpgme_cbs->write =_gpgme_write_cb; + operation->gpgme_cbs->seek =_gpgme_seek_cb; + error_gpgme = gpgme_data_new_from_cbs (&(operation->gpgme_plain), operation->gpgme_cbs, operation->npm_closure); + if (error_gpgme != GPG_ERR_NO_ERROR) { + g_set_error (error, 0, 0, + _("Error creating Callback base data buffer: %s"), + gpgme_strerror (error_gpgme)); + return FALSE; + } + } else { + /* Open the plain file */ + operation->plain_io_channel = g_io_channel_new_file (self->plain_filename, encrypting ? "r" : "w", &io_error); + if (operation->plain_io_channel == NULL) { + g_critical (_("Can't create a new GIOChannel for the plain database: %s"), io_error->message); + g_propagate_error (error, io_error); + return FALSE; + } + + /* Pass it to GPGME */ + error_gpgme = gpgme_data_new_from_fd (&(operation->gpgme_plain), g_io_channel_unix_get_fd (operation->plain_io_channel)); + if (error_gpgme != GPG_ERR_NO_ERROR) { + g_critical (_("Error opening plain database file \"%s\": %s"), self->plain_filename, gpgme_strerror (error_gpgme)); + return FALSE; + } + } + + return TRUE; +} + +static void +cipher_operation_free (CipherOperation *operation) +{ + gpgme_data_release (operation->gpgme_cipher); + gpgme_data_release (operation->gpgme_plain); + + if (operation->cipher_io_channel != NULL) { + g_io_channel_flush (operation->cipher_io_channel, NULL); + g_io_channel_unref (operation->cipher_io_channel); + } + + if (operation->plain_io_channel != NULL) { + g_io_channel_shutdown (operation->plain_io_channel, TRUE, NULL); + g_io_channel_unref (operation->plain_io_channel); + } + + /* We could free the operation before the context is even created (bgo#599598) */ + if (operation->context != NULL) { + gpgme_signers_clear (operation->context); + gpgme_release (operation->context); + } + + if (operation->npm_closure != NULL) + g_free (operation->npm_closure); + + g_free (operation); +} + +static gboolean +decrypt_database (AlmanahSQLiteVFS *self, GError **error) +{ + GError *preparation_error = NULL; + CipherOperation *operation; + gpgme_error_t error_gpgme; + + operation = g_new0 (CipherOperation, 1); + + /* Set up, decrypting to memory */ + if (prepare_gpgme (operation) != TRUE || open_db_files (self, FALSE, operation, TRUE, &preparation_error) != TRUE) { + cipher_operation_free (operation); + g_propagate_error (error, preparation_error); + return FALSE; + } + + /* Decrypt and verify! */ + error_gpgme = gpgme_op_decrypt_verify (operation->context, operation->gpgme_cipher, operation->gpgme_plain); + if (error_gpgme != GPG_ERR_NO_ERROR) { + cipher_operation_free (operation); + g_set_error (error, + ALMANAH_VFS_ERROR, + ALMANAH_VFS_ERROR_DECRYPT, + "%s: %s", gpgme_strsource (error_gpgme), gpgme_strerror (error_gpgme)); + return FALSE; + } + + /* Setup the database content in memory */ + self->plain_buffer = operation->npm_closure->buffer; + self->plain_offset = 0; + self->plain_size = operation->npm_closure->size; + + /* Do this one synchronously */ + cipher_operation_free (operation); + + return TRUE; +} + +static gboolean +encrypt_database (AlmanahSQLiteVFS *self, const gchar *encryption_key, gboolean from_memory, GError **error) +{ + GError *preparation_error = NULL; + CipherOperation *operation; + gpgme_error_t error_gpgme; + gpgme_key_t gpgme_keys[2] = { NULL, }; + + operation = g_new0 (CipherOperation, 1); + operation->vfs = self; + + /* Set up */ + if (prepare_gpgme (operation) != TRUE) { + cipher_operation_free (operation); + g_propagate_error (error, preparation_error); + return FALSE; + } + + /* Set up signing and the recipient */ + error_gpgme = gpgme_get_key (operation->context, encryption_key, &gpgme_keys[0], FALSE); + if (error_gpgme != GPG_ERR_NO_ERROR || gpgme_keys[0] == NULL) { + cipher_operation_free (operation); + g_critical (_("Error getting encryption key: %s"), gpgme_strerror (error_gpgme)); + return FALSE; + } + + gpgme_signers_add (operation->context, gpgme_keys[0]); + + if (open_db_files (self, TRUE, operation, from_memory, &preparation_error) != TRUE) { + cipher_operation_free (operation); + g_propagate_error (error, preparation_error); + return FALSE; + } + + if (from_memory) { + operation->npm_closure->buffer = self->plain_buffer; + operation->npm_closure->offset = 0; + operation->npm_closure->size = self->plain_size; + } + + /* Encrypt and sign! */ + error_gpgme = gpgme_op_encrypt_sign_start (operation->context, gpgme_keys, 0, operation->gpgme_plain, operation->gpgme_cipher); + gpgme_key_unref (gpgme_keys[0]); + + if (error_gpgme != GPG_ERR_NO_ERROR) { + cipher_operation_free (operation); + g_critical (_("Error encrypting database: %s"), gpgme_strerror (error_gpgme)); + return FALSE; + } + + gpgme_wait (operation->context, &error_gpgme, TRUE); + if (error_gpgme != GPG_ERR_NO_ERROR) { + g_critical (_("Error encrypting database: %s"), gpgme_strerror (error_gpgme)); + cipher_operation_free (operation); + return FALSE; + } + + cipher_operation_free (operation); + return TRUE; +} + +static gchar * +get_encryption_key (AlmanahSQLiteVFS *self) +{ + gchar *encryption_key; + gchar **key_parts; + guint i; + + encryption_key = g_settings_get_string (self->settings, "encryption-key"); + if (encryption_key == NULL || encryption_key[0] == '\0') { + g_free (encryption_key); + return NULL; + } + + /* Key is generally in the form openpgp:FOOBARKEY, and GPGME doesn't like the openpgp: prefix, so it must be removed. */ + key_parts = g_strsplit (encryption_key, ":", 2); + g_free (encryption_key); + + for (i = 0; key_parts[i] != NULL; i++) { + if (strcmp (key_parts[i], "openpgp") != 0) + encryption_key = strdup (key_parts[i]); + } + g_strfreev (key_parts); + + return encryption_key; +} + +static gboolean +back_up_file (const gchar *filename) +{ + GError *error = NULL; + GFile *original_file, *backup_file; + gchar *backup_filename; + gboolean retval = TRUE; + + /* Make a backup of the encrypted database file */ + original_file = g_file_new_for_path (filename); + backup_filename = g_strdup_printf ("%s~", filename); + backup_file = g_file_new_for_path (backup_filename); + + if (g_file_copy (original_file, backup_file, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, &error) == FALSE) { + /* Translators: The first and second params are file paths, the last param is an error message. */ + g_warning (_("Error copying the file from %s to %s: %s"), filename, backup_filename, error->message); + retval = FALSE; + } + + /* Ensure the backup is only readable to the current user. */ + if (g_chmod (backup_filename, 0600) != 0 && errno != ENOENT) { + g_warning (_("Error changing database backup file permissions: %s"), g_strerror (errno)); + retval = FALSE; + } + + g_free (backup_filename); + g_object_unref (original_file); + g_object_unref (backup_file); + + return retval; +} + +/* +** Write directly to the file passed as the first argument. Even if the +** file has a write-buffer (AlmanahSQLiteVFS.aBuffer), ignore it. +*/ +static int +almanah_vfs_direct_write (AlmanahSQLiteVFS *self, /* File handle */ + const void *buffer, /* Buffer containing data to write */ + int len, /* Size of data to write in bytes */ + sqlite_int64 offset /* File offset to write to */ + ) +{ + off_t ofst; + size_t nWrite; + + if (self->decrypted) { + if ((gsize) (offset + len) > self->plain_buffer_size) { + gsize new_size; + gsize exponential_size; + gsize required_size; + gpointer new_buffer = NULL; + + exponential_size = self->plain_size ? (2 * self->plain_size) : 512; + required_size = offset + len; + + new_size = MAX (exponential_size, required_size); + new_buffer = maybe_secure_memory_try_realloc (self->plain_buffer, new_size); + if (new_buffer == NULL && (new_size > required_size)) { + new_size = required_size; + new_buffer = maybe_secure_memory_realloc (self->plain_buffer, new_size); + } + + if (new_buffer == NULL) + return SQLITE_NOMEM; + + self->plain_buffer = new_buffer; + self->plain_buffer_size = new_size; + } + + memcpy (self->plain_buffer + offset, buffer, len); + self->plain_size = MAX(self->plain_size, (gsize) (offset + len)); + + return SQLITE_OK; + } else { + ofst = lseek (self->fd, offset, SEEK_SET); + if (ofst != offset) { + return SQLITE_IOERR_WRITE; + } + + nWrite = write (self->fd, buffer, len); + if (nWrite != (size_t) len){ + return SQLITE_IOERR_WRITE; + } + + return SQLITE_OK; + } +} + +/* +** Flush the contents of the AlmanahSQLiteVFS.aBuffer buffer to disk. This is a +** no-op if this particular file does not have a buffer (i.e. it is not +** a journal file) or if the buffer is currently empty. +*/ +static int +almanah_vfs_flush_buffer (AlmanahSQLiteVFS *p) +{ + int rc = SQLITE_OK; + + if (p->decrypted) + return rc; + + if (p->nBuffer) { + rc = almanah_vfs_direct_write(p, p->aBuffer, p->nBuffer, p->iBufferOfst); + p->nBuffer = 0; + } + + return rc; +} + +static int +almanah_vfs_close_simple_file (AlmanahSQLiteVFS *self) +{ + int rc; + GError *error = NULL; + + rc = almanah_vfs_flush_buffer (self); + if (rc != SQLITE_OK) + return rc; + sqlite3_free (self->aBuffer); + if (g_close (self->fd, &error) == FALSE) { + g_critical (_("Error closing file: %s"), error->message); + rc = SQLITE_IOERR; + } + + return rc; +} + +/* +** Close a file. +*/ +static int +almanah_vfs_io_close (sqlite3_file *pFile) +{ + AlmanahSQLiteVFS *self = (AlmanahSQLiteVFS*) pFile; + gchar *encryption_key; + GError *child_error = NULL; + int rc; + + encryption_key = get_encryption_key (self); + if (encryption_key == NULL) { + if (self->decrypted) { + /* Save the data from memory to plain file */ + GFile *plain_file; + GFileOutputStream *plain_output_stream; + gsize bytes_written; + + plain_file = g_file_new_for_path (self->plain_filename); + plain_output_stream = g_file_create (plain_file, + G_FILE_CREATE_PRIVATE & G_FILE_CREATE_REPLACE_DESTINATION, + NULL, + &child_error); + if (child_error != NULL) { + g_warning ("Error opening plain file %s: %s\n", self->plain_filename, child_error->message); + g_object_unref (plain_file); + return SQLITE_IOERR; + } + + if (g_output_stream_write_all (G_OUTPUT_STREAM (plain_output_stream), + self->plain_buffer, + self->plain_size, + &bytes_written, + NULL, + &child_error) == FALSE) { + g_warning ("Error writting data to plain file %s: %s\n", self->plain_filename, child_error->message); + g_object_unref (plain_file); + g_object_unref (plain_output_stream); + g_unlink (self->plain_filename); + return SQLITE_IOERR; + } + + if (bytes_written != self->plain_size) { + g_warning ("Error writting data to plain file %s: Not all the data has been written to the file\n", self->plain_filename); + g_object_unref (plain_file); + g_object_unref (plain_output_stream); + g_unlink (self->plain_filename); + return SQLITE_IOERR; + } + + if (g_output_stream_close (G_OUTPUT_STREAM (plain_output_stream), NULL, &child_error) == FALSE) { + g_warning ("Error closing the plain file %s: %s\n", self->plain_filename, child_error->message); + g_object_unref (plain_file); + g_object_unref (plain_output_stream); + g_unlink (self->plain_filename); + return SQLITE_IOERR; + } + + g_object_unref (plain_file); + g_object_unref (plain_output_stream); + g_unlink (self->encrypted_filename); + + rc = SQLITE_OK; + } else { + rc = almanah_vfs_close_simple_file (self); + } + } else { + /* SQLITE_OPEN_MAIN_JOURNAL */ + if (self->aBuffer != NULL) + rc = almanah_vfs_close_simple_file (self); + else { + gboolean from_memory; + + if (self->decrypted) + from_memory = TRUE; + else { + rc = almanah_vfs_close_simple_file (self); + if (rc != SQLITE_OK) { + g_critical ("Error closing plain file"); + return rc; + } + from_memory = FALSE; + } + + if (encrypt_database (self, encryption_key, from_memory, &child_error) != TRUE) { + if (child_error != NULL) + g_critical ("Error encrypting the database from the plain file %s: %s\n", self->plain_filename, child_error->message); + return SQLITE_IOERR; + } + + g_unlink (self->plain_filename); + + g_free (encryption_key); + rc = SQLITE_OK; + } + } + + if (self->plain_buffer) + maybe_secure_memory_free (self->plain_buffer); + + if (self->plain_filename) + g_free (self->plain_filename); + + if (self->encrypted_filename) + g_free (self->encrypted_filename); + + return rc; +} + +/* +** Read data from a file. +*/ +static int +almanah_vfs_io_read (sqlite3_file *pFile, void *buffer, int len, sqlite_int64 offset) +{ + AlmanahSQLiteVFS *self = (AlmanahSQLiteVFS*) pFile; + off_t ofst; + int nRead; + int rc; + + if (self->decrypted) { + if ((gsize) (offset + len) > self->plain_size) + return SQLITE_IOERR_SHORT_READ; + + memcpy (buffer, self->plain_buffer + offset, len); + + return SQLITE_OK; + } + + /* Flush any data in the write buffer to disk in case this operation + ** is trying to read data the file-region currently cached in the buffer. + ** It would be possible to detect this case and possibly save an + ** unnecessary write here, but in practice SQLite will rarely read from + ** a journal file when there is data cached in the write-buffer. + */ + rc = almanah_vfs_flush_buffer (self); + if (rc != SQLITE_OK) { + return rc; + } + + ofst = lseek (self->fd, offset, SEEK_SET); + if (ofst != offset) { + return SQLITE_IOERR_READ; + } + nRead = read (self->fd, buffer, len); + + if (nRead == len) { + return SQLITE_OK; + } else if (nRead >= 0) { + return SQLITE_IOERR_SHORT_READ; + } + + return SQLITE_IOERR_READ; +} + +/* +** Write data to a crash-file. +*/ +static int +almanah_vfs_io_write (sqlite3_file *pFile, const void *buffer, int len, sqlite_int64 offset) +{ + AlmanahSQLiteVFS *self = (AlmanahSQLiteVFS*)pFile; + + if (self->decrypted) + return almanah_vfs_direct_write (self, buffer, len, offset); + + if (self->aBuffer) { + char *z = (char *)buffer; /* Pointer to remaining data to write */ + int n = len; /* Number of bytes at z */ + sqlite3_int64 i = offset; /* File offset to write to */ + + while (n > 0) { + int nCopy; /* Number of bytes to copy into buffer */ + + /* If the buffer is full, or if this data is not being written directly + ** following the data already buffered, flush the buffer. Flushing + ** the buffer is a no-op if it is empty. + */ + if (self->nBuffer == SQLITE_DEMOVFS_BUFFERSZ || self->iBufferOfst+self->nBuffer != i) { + int rc = almanah_vfs_flush_buffer (self); + if (rc != SQLITE_OK) { + return rc; + } + } + assert (self->nBuffer==0 || self->iBufferOfst+self->nBuffer==i); + self->iBufferOfst = i - self->nBuffer; + + /* Copy as much data as possible into the buffer. */ + nCopy = SQLITE_DEMOVFS_BUFFERSZ - self->nBuffer; + if (nCopy > n) { + nCopy = n; + } + memcpy (&self->aBuffer[self->nBuffer], z, nCopy); + self->nBuffer += nCopy; + + n -= nCopy; + i += nCopy; + z += nCopy; + } + + return SQLITE_OK; + } else { + return almanah_vfs_direct_write (self, buffer, len, offset); + } +} + +/* +** Truncate a file. This is a no-op for this VFS (see header comments at +** the top of the file). +*/ +static int +almanah_vfs_io_truncate (__attribute__ ((unused)) sqlite3_file *pFile, + __attribute__ ((unused)) sqlite_int64 size) +{ +#if 0 + if (ftruncate ( ((AlmanahSQLiteVFS *) pFile)->fd, size)) + return SQLITE_IOERR_TRUNCATE; +#endif + return SQLITE_OK; +} + +/* +** Sync the contents of the file to the persistent media. +*/ +static int +almanah_vfs_io_sync (sqlite3_file *pFile, __attribute__ ((unused)) int flags) +{ + int rc; + AlmanahSQLiteVFS *self = (AlmanahSQLiteVFS*) pFile; + + if (self->decrypted) + return SQLITE_OK; + + rc = almanah_vfs_flush_buffer (self); + if (rc != SQLITE_OK) { + return rc; + } + + rc = fsync (self->fd); + return (rc == 0 ? SQLITE_OK : SQLITE_IOERR_FSYNC); +} + +/* +** Write the size of the file in bytes to *pSize. +*/ +static int +almanah_vfs_io_file_size (sqlite3_file *pFile, sqlite_int64 *pSize) +{ + AlmanahSQLiteVFS *self = (AlmanahSQLiteVFS*)pFile; + int rc; + struct stat sStat; + + if (self->decrypted) { + *pSize = self->plain_size; + return SQLITE_OK; + } + + /* Flush the contents of the buffer to disk. As with the flush in the + ** almanah_vfs_io_read() method, it would be possible to avoid this and save a write + ** here and there. But in practice this comes up so infrequently it is + ** not worth the trouble. + */ + rc = almanah_vfs_flush_buffer (self); + if (rc != SQLITE_OK) { + return rc; + } + + rc = fstat (self->fd, &sStat); + if (rc != 0) + return SQLITE_IOERR_FSTAT; + + *pSize = sStat.st_size; + + return SQLITE_OK; +} + +/* +** Locking functions. The xLock() and xUnlock() methods are both no-ops. +** The xCheckReservedLock() always indicates that no other process holds +** a reserved lock on the database file. This ensures that if a hot-journal +** file is found in the file-system it is rolled back. +*/ +static int +almanah_vfs_io_lock (__attribute__ ((unused)) sqlite3_file *pFile, + __attribute__ ((unused)) int eLock) +{ + return SQLITE_OK; +} +static int +almanah_vfs_io_unlock (__attribute__ ((unused)) sqlite3_file *pFile, + __attribute__ ((unused)) int eLock) +{ + return SQLITE_OK; +} +static int +almanah_vfs_io_reserved_lock (__attribute__ ((unused)) sqlite3_file *pFile, int *pResOut) +{ + *pResOut = 0; + return SQLITE_OK; +} + +/* +** No xFileControl() verbs are implemented by this VFS. +*/ +static int +almanah_vfs_io_file_control (__attribute__ ((unused)) sqlite3_file *pFile, + __attribute__ ((unused)) int op, + __attribute__ ((unused)) void *pArg) +{ + return SQLITE_OK; +} + +/* +** The xSectorSize() and xDeviceCharacteristics() methods. These two +** may return special values allowing SQLite to optimize file-system +** access to some extent. But it is also safe to simply return 0. +*/ +static int +almanah_vfs_io_sector_size (__attribute__ ((unused)) sqlite3_file *pFile) +{ + return 0; +} +static int +almanah_vfs_io_device_characteristis(__attribute__ ((unused)) sqlite3_file *pFile) +{ + return 0; +} + +/* +** Open a file handle. +*/ +static int +almanah_vfs_open (sqlite3_vfs *pVfs, + const char *zName, + sqlite3_file *pFile, + int flags, + int *pOutFlags) +{ + static const sqlite3_io_methods almanah_vfs_io = { + 1, + almanah_vfs_io_close, + almanah_vfs_io_read, + almanah_vfs_io_write, + almanah_vfs_io_truncate, + almanah_vfs_io_sync, + almanah_vfs_io_file_size, + almanah_vfs_io_lock, + almanah_vfs_io_unlock, + almanah_vfs_io_reserved_lock, + almanah_vfs_io_file_control, + almanah_vfs_io_sector_size, + almanah_vfs_io_device_characteristis + }; + + AlmanahSQLiteVFS *self = (AlmanahSQLiteVFS*) pFile; + int oflags = 0; + char *aBuf = NULL; + struct stat encrypted_db_stat, plaintext_db_stat; + GError *child_error = NULL; + + if (zName == 0) { + return SQLITE_IOERR; + } + + if (flags & SQLITE_OPEN_MAIN_JOURNAL) { + aBuf = (char *) sqlite3_malloc(SQLITE_DEMOVFS_BUFFERSZ); + if(!aBuf) { + return SQLITE_NOMEM; + } + } + + memset(self, 0, sizeof(AlmanahSQLiteVFS)); + + self->plain_filename = g_strdup (zName); + self->decrypted = FALSE; + + if (flags & SQLITE_OPEN_MAIN_DB) { + self->encrypted_filename = g_strdup_printf ("%s%s", self->plain_filename, ENCRYPTED_SUFFIX); + + if (g_chmod (self->encrypted_filename, 0600) != 0 && errno != ENOENT) { + return SQLITE_IOERR; + } + + g_stat (self->encrypted_filename, &encrypted_db_stat); + + /* If we're decrypting, don't bother if the cipher file doesn't exist (i.e. the database hasn't yet been created), or is empty + * (i.e. corrupt). */ + if (g_file_test (self->encrypted_filename, G_FILE_TEST_IS_REGULAR) == TRUE && encrypted_db_stat.st_size > 0) { + /* Make a backup of the encrypted database file */ + if (back_up_file (self->encrypted_filename) == FALSE) { + /* Translators: the first parameter is a filename. */ + g_warning (_("Error backing up file ‘%s’"), self->encrypted_filename); + g_clear_error (&child_error); + } + + g_stat (self->plain_filename, &plaintext_db_stat); + + /* Only decrypt the database if the plaintext database doesn't exist or is empty. If the plaintext database exists and is non-empty, + * don't decrypt — just use that database. */ + if (g_file_test (self->plain_filename, G_FILE_TEST_IS_REGULAR) != TRUE || plaintext_db_stat.st_size == 0) { + /* Decrypt the database, or display an error if that fails (but not if it fails due to a missing encrypted DB file — just + * fall through and try to open the plain DB file in that case). */ + if (decrypt_database (self, &child_error) != TRUE) { + if (child_error != NULL && child_error->code != G_FILE_ERROR_NOENT) { + g_warning (_("Error decrypting database: %s"), child_error->message); + g_free (self->plain_filename); + g_free (self->encrypted_filename); + return SQLITE_IOERR; + } + + g_error_free (child_error); + } else + self->decrypted = TRUE; + } + } else { + /* Make a backup of the plaintext database file */ + if (g_file_test (self->encrypted_filename, G_FILE_TEST_IS_REGULAR) == TRUE && back_up_file (self->plain_filename) != TRUE) { + /* Translators: the first parameter is a filename. */ + g_warning (_("Error backing up file ‘%s’"), self->plain_filename); + g_clear_error (&child_error); + } + } + } + + if (self->decrypted) { + sqlite3_free (aBuf); + *pOutFlags = 0; + } else { + if (flags & SQLITE_OPEN_EXCLUSIVE) oflags |= O_EXCL; + if (flags & SQLITE_OPEN_CREATE) oflags |= O_CREAT; + if (flags & SQLITE_OPEN_READONLY) oflags |= O_RDONLY; + if (flags & SQLITE_OPEN_READWRITE) oflags |= O_RDWR; + + self->fd = g_open (self->plain_filename, oflags, 0600); + if (self->fd < 0) { + sqlite3_free (aBuf); + if (self->plain_filename) + g_free (self->plain_filename); + if (self->encrypted_filename) + g_free (self->encrypted_filename); + return SQLITE_CANTOPEN; + } + + if (g_chmod (self->plain_filename, 0600) != 0 && errno != ENOENT) { + g_critical (_("Error changing database file permissions: %s"), g_strerror (errno)); + sqlite3_free (aBuf); + if (self->plain_filename) + g_free (self->plain_filename); + if (self->encrypted_filename) + g_free (self->encrypted_filename); + close (self->fd); + return SQLITE_IOERR; + } + + self->aBuffer = aBuf; + + if (pOutFlags) { + *pOutFlags = flags; + } + } + + self->settings = (GSettings *) pVfs->pAppData; + self->base.pMethods = &almanah_vfs_io; + + return SQLITE_OK; +} + +/* +** Delete the file identified by argument zPath. If the dirSync parameter +** is non-zero, then ensure the file-system modification to delete the +** file has been synced to disk before returning. +*/ +static int +almanah_vfs_delete (__attribute__ ((unused)) sqlite3_vfs *pVfs, const char *zPath, int dirSync) +{ + int rc; + + rc = unlink (zPath); + if (rc != 0 && errno == ENOENT) return SQLITE_OK; + + if( rc==0 && dirSync) { + int dfd; + int i; + char zDir[MAXPATHNAME + 1]; + + /* Figure out the directory name from the path of the file deleted. */ + sqlite3_snprintf (MAXPATHNAME, zDir, "%s", zPath); + zDir[MAXPATHNAME] = '\0'; + for (i = strlen(zDir); i > 1 && zDir[i] != '/'; i++); + zDir[i] = '\0'; + + /* Open a file-descriptor on the directory. Sync. Close. */ + dfd = g_open (zDir, O_RDONLY, 0); + if (dfd < 0) { + rc = -1; + } else { + rc = fsync (dfd); + g_close (dfd, NULL); + } + } + return (rc == 0 ? SQLITE_OK : SQLITE_IOERR_DELETE); +} + +#ifndef F_OK +# define F_OK 0 +#endif +#ifndef R_OK +# define R_OK 4 +#endif +#ifndef W_OK +# define W_OK 2 +#endif + +/* +** Query the file-system to see if the named file exists, is readable or +** is both readable and writable. +*/ +static int +almanah_vfs_access (__attribute__ ((unused)) sqlite3_vfs *pVfs, const char *zPath, int flags, int *pResOut) +{ + int rc; + int eAccess = F_OK; + + assert (flags == SQLITE_ACCESS_EXISTS /* access(zPath, F_OK) */ + || flags == SQLITE_ACCESS_READ /* access(zPath, R_OK) */ + || flags == SQLITE_ACCESS_READWRITE /* access(zPath, R_OK|W_OK) */ + ); + + if (flags == SQLITE_ACCESS_READWRITE) eAccess = R_OK|W_OK; + if (flags == SQLITE_ACCESS_READ) eAccess = R_OK; + + rc = access (zPath, eAccess); + *pResOut = (rc == 0); + + return SQLITE_OK; +} + +/* +** Argument zPath points to a nul-terminated string containing a file path. +** If zPath is an absolute path, then it is copied as is into the output +** buffer. Otherwise, if it is a relative path, then the equivalent full +** path is written to the output buffer. +** +** This function assumes that paths are UNIX style. Specifically, that: +** +** 1. Path components are separated by a '/'. and +** 2. Full paths begin with a '/' character. +*/ +static int +almanah_vfs_full_pathname (__attribute__ ((unused)) sqlite3_vfs *pVfs, const char *zPath, int nPathOut, char *zPathOut) +{ + char zDir[MAXPATHNAME+1]; + + if (zPath[0] == '/') { + zDir[0] = '\0'; + } else { + getcwd (zDir, sizeof (zDir)); + } + zDir[MAXPATHNAME] = '\0'; + + sqlite3_snprintf (nPathOut, zPathOut, "%s/%s", zDir, zPath); + zPathOut[nPathOut-1] = '\0'; + + return SQLITE_OK; +} + +/* +** The following four VFS methods: +** +** xDlOpen +** xDlError +** xDlSym +** xDlClose +** +** are supposed to implement the functionality needed by SQLite to load +** extensions compiled as shared objects. This simple VFS does not support +** this functionality, so the following functions are no-ops. +*/ +static void* +almanah_vfs_dl_open (__attribute__ ((unused)) sqlite3_vfs *pVfs, __attribute__ ((unused)) const char *zPath) +{ + return 0; +} + +static void +almanah_vfs_dl_error (__attribute__ ((unused)) sqlite3_vfs *pVfs, int nByte, char *zErrMsg) +{ + sqlite3_snprintf (nByte, zErrMsg, "Loadable extensions are not supported"); + zErrMsg[nByte-1] = '\0'; +} + +static void +(*almanah_vfs_dl_sym (__attribute__ ((unused)) sqlite3_vfs *pVfs, __attribute__ ((unused)) void *pH, __attribute__ ((unused)) const char *z)) (void) +{ + return 0; +} + +static void +almanah_vfs_dl_close (__attribute__ ((unused)) sqlite3_vfs *pVfs, __attribute__ ((unused)) void *pHandle) +{ + return; +} + +/* +** Parameter zByte points to a buffer nByte bytes in size. Populate this +** buffer with pseudo-random data. +*/ +static int +almanah_vfs_randomness (__attribute__ ((unused)) sqlite3_vfs *pVfs, __attribute__ ((unused)) int nByte, __attribute__ ((unused)) char *zByte) +{ + return SQLITE_OK; +} + +/* +** Sleep for at least nMicro microseconds. Return the (approximate) number +** of microseconds slept for. +*/ +static int +almanah_vfs_sleep (__attribute__ ((unused)) sqlite3_vfs *pVfs, int nMicro) +{ + sleep (nMicro / 1000000); + usleep (nMicro % 1000000); + return nMicro; +} + +/* +** Set *pTime to the current UTC time expressed as a Julian day. Return +** SQLITE_OK if successful, or an error code otherwise. +** +** http://en.wikipedia.org/wiki/Julian_day +** +** This implementation is not very good. The current time is rounded to +** an integer number of seconds. Also, assuming time_t is a signed 32-bit +** value, it will stop working some time in the year 2038 AD (the so-called +** "year 2038" problem that afflicts systems that store time this way). +*/ +static int +almanah_vfs_current_time (__attribute__ ((unused)) sqlite3_vfs *pVfs, double *pTime) +{ + time_t t = time (0); + *pTime = t / 86400.0 + 2440587.5; + return SQLITE_OK; +} + +/* +** This function returns a pointer to the VFS implemented in this file. +** To make the VFS available to SQLite: +** +** sqlite3_vfs_register(sqlite3_almanah_vfs(settings), 0); +*/ +static sqlite3_vfs * +sqlite3_almanah_vfs (GSettings *settings) +{ + if (almanah_vfs_singleton == NULL) { + almanah_vfs_singleton = (sqlite3_vfs *) g_new0(sqlite3_vfs, 1); + almanah_vfs_singleton->iVersion = 1; + almanah_vfs_singleton->szOsFile = sizeof(AlmanahSQLiteVFS); + almanah_vfs_singleton->mxPathname = MAXPATHNAME; + almanah_vfs_singleton->zName = "almanah"; + almanah_vfs_singleton->pAppData = settings; + almanah_vfs_singleton->xOpen = almanah_vfs_open; + almanah_vfs_singleton->xDelete = almanah_vfs_delete; + almanah_vfs_singleton->xAccess = almanah_vfs_access; + almanah_vfs_singleton->xFullPathname = almanah_vfs_full_pathname; + almanah_vfs_singleton->xDlOpen = almanah_vfs_dl_open; + almanah_vfs_singleton->xDlError = almanah_vfs_dl_error; + almanah_vfs_singleton->xDlSym = almanah_vfs_dl_sym; + almanah_vfs_singleton->xDlClose = almanah_vfs_dl_close; + almanah_vfs_singleton->xRandomness = almanah_vfs_randomness; + almanah_vfs_singleton->xSleep = almanah_vfs_sleep; + almanah_vfs_singleton->xCurrentTime = almanah_vfs_current_time; + } + + return almanah_vfs_singleton; +} + +int +almanah_vfs_init (GSettings *settings) +{ + return sqlite3_vfs_register (sqlite3_almanah_vfs (settings), 0); +} + +void +almanah_vfs_finish (void) +{ + if (almanah_vfs_singleton) + sqlite3_vfs_unregister (almanah_vfs_singleton); + + g_free (almanah_vfs_singleton); + almanah_vfs_singleton = NULL; +} diff -Nru almanah-0.11.1/src/vfs.h almanah-0.12.0/src/vfs.h --- almanah-0.11.1/src/vfs.h 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.12.0/src/vfs.h 2019-10-07 13:45:09.000000000 +0000 @@ -0,0 +1,23 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ +/* + * Almanah + * Copyright (C) Alvaro Peña 2014 + * + * Almanah is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Almanah is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Almanah. If not, see . + */ + +#include + +int almanah_vfs_init (GSettings *settings); +void almanah_vfs_finish (void); diff -Nru almanah-0.11.1/src/widgets/calendar-button.c almanah-0.12.0/src/widgets/calendar-button.c --- almanah-0.11.1/src/widgets/calendar-button.c 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/src/widgets/calendar-button.c 2019-10-07 13:45:09.000000000 +0000 @@ -22,7 +22,6 @@ #include "calendar-button.h" #include "calendar.h" -#include "calendar-window.h" #include "interface.h" /* This enum allows to know the reason why the calendar date has been changed */ @@ -36,6 +35,7 @@ enum { DAY_SELECTED_SIGNAL, + SELECT_DATE_CLICKED_SIGNAL, LAST_SIGNAL }; @@ -46,7 +46,6 @@ static guint calendar_button_signals[LAST_SIGNAL] = { 0 }; struct _AlmanahCalendarButtonPrivate { - GtkWidget *label; GtkWidget *dock; guchar user_event; AlmanahCalendar *calendar; @@ -59,13 +58,15 @@ static void almanah_calendar_button_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec); static void almanah_calendar_button_finalize (GObject *object); -static void almanah_calendar_button_dock_hiden (GtkWidget *dock, AlmanahCalendarButton *self); +static void almanah_calendar_button_dock_closed (GtkWidget *dock, AlmanahCalendarButton *self); static void almanah_calendar_button_toggled (GtkToggleButton *togglebutton); static void almanah_calendar_button_day_selected_cb (GtkCalendar *calendar, AlmanahCalendarButton *self); static void almanah_calendar_button_month_changed_cb (GtkCalendar *calendar, AlmanahCalendarButton *self); -static gboolean almanah_calendar_button_today_press_cb (GtkWidget *widget, GdkEvent *event, AlmanahCalendarButton *self); -static gboolean almanah_calendar_button_select_date_press_cb (GtkWidget *widget, GdkEvent *event, AlmanahCalendarButton *self); +static gboolean almanah_calendar_button_today_press_cb (GtkWidget *widget, GdkEvent *event, AlmanahCalendarButton *self); +static void almanah_calendar_button_today_clicked_cb (GtkButton *button, gpointer user_data); +static void almanah_calendar_button_select_date_clicked_cb (GtkButton *button, gpointer user_data); +static gboolean almanah_calendar_button_select_date_press_cb (GtkWidget *widget, GdkEvent *event, AlmanahCalendarButton *self); static void dock_position_func (AlmanahCalendarButton *self, gint *x, gint *y); @@ -104,16 +105,27 @@ NULL, NULL, NULL, G_TYPE_NONE, 0); + + /** + * AlmanahCalendarButton::select-date-clicked: + * @calendar_button: the object which received the signal. + * + * Emitted when the user clicks the "select date" button in the dock window. + */ + calendar_button_signals[SELECT_DATE_CLICKED_SIGNAL] = g_signal_new ("select-date-clicked", + G_OBJECT_CLASS_TYPE (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (AlmanahCalendarButtonClass, select_date_clicked), + NULL, NULL, + NULL, + G_TYPE_NONE, 0); } static void almanah_calendar_button_init (AlmanahCalendarButton *self) { - GtkWidget *arrow; - GtkBox *main_box; GtkBuilder *builder; GError *error = NULL; - const gchar *interface_filename = almanah_get_interface_filename (); const gchar *object_names[] = { "almanah_calendar_window", NULL @@ -124,20 +136,10 @@ gtk_button_set_focus_on_click (GTK_BUTTON (self), TRUE); - /* The button elements */ - self->priv->label = gtk_label_new (NULL); - - arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE); - - main_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6)); - gtk_box_pack_start (main_box, self->priv->label, TRUE, TRUE, 0); - gtk_box_pack_start (main_box, arrow, FALSE, TRUE, 0); - gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (main_box)); - /* Calendar dock window from the UI file */ builder = gtk_builder_new (); - if (gtk_builder_add_objects_from_file (builder, interface_filename, (gchar **) object_names, &error) == FALSE) { - g_warning (_("UI file \"%s\" could not be loaded: %s"), interface_filename, error->message); + if (gtk_builder_add_objects_from_resource (builder, "/org/gnome/Almanah/ui/almanah.ui", (gchar **) object_names, &error) == 0) { + g_warning (_("UI data could not be loaded: %s"), error->message); g_error_free (error); g_object_unref (builder); @@ -152,9 +154,9 @@ return; } - gtk_window_set_type_hint (GTK_WINDOW (self->priv->dock), GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU); + gtk_popover_set_relative_to (GTK_POPOVER (self->priv->dock), GTK_WIDGET (self)); - g_signal_connect (self->priv->dock, "hide", G_CALLBACK (almanah_calendar_button_dock_hiden), self); + g_signal_connect (self->priv->dock, "hide", G_CALLBACK (almanah_calendar_button_dock_closed), self); /* The calendar widget */ self->priv->calendar = ALMANAH_CALENDAR (gtk_builder_get_object (builder, "almanah_cw_calendar")); @@ -164,11 +166,13 @@ /* Today button */ self->priv->today_button = GTK_WIDGET (gtk_builder_get_object (builder, "almanah_cw_today_button")); + g_signal_connect (self->priv->today_button, "clicked", G_CALLBACK (almanah_calendar_button_today_clicked_cb), self); g_signal_connect (self->priv->today_button, "button-press-event", G_CALLBACK (almanah_calendar_button_today_press_cb), self); /* Select a day button */ /* @TODO: No the button press event, instead the 'activate' action funcion (if not, the select day window dosn't showed... */ self->priv->select_date_button = GTK_WIDGET (gtk_builder_get_object (builder, "almanah_cw_select_date_button")); + g_signal_connect (self->priv->select_date_button, "clicked", G_CALLBACK (almanah_calendar_button_select_date_clicked_cb), self); g_signal_connect (self->priv->select_date_button, "button-press-event", G_CALLBACK (almanah_calendar_button_select_date_press_cb), self); g_object_unref (builder); @@ -216,67 +220,8 @@ G_OBJECT_CLASS (almanah_calendar_button_parent_class)->finalize (object); } -/** - * Calculate the window position - */ -static void -dock_position_func (AlmanahCalendarButton *self, gint *x, gint *y) -{ - GdkScreen *screen; - GdkRectangle monitor; - GtkAllocation allocation; - GtkRequisition dock_req; - gint new_x, new_y, monitor_num; - AlmanahCalendarWindow *calendar_window = ALMANAH_CALENDAR_WINDOW (self->priv->dock); - - /* Get the screen and monitor geometry */ - screen = gtk_widget_get_screen (GTK_WIDGET (self)); - monitor_num = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (GTK_WIDGET (self))); - if (monitor_num < 0) - monitor_num = 0; - gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); - - /* Get the AlmanahCalendarButton position */ - gtk_widget_get_allocation (GTK_WIDGET (self), &allocation); - gdk_window_get_origin (gtk_widget_get_window (GTK_WIDGET (self)), &new_x, &new_y); - /* The dock window starting position is over the calendar button widget */ - new_x += allocation.x; - new_y += allocation.y; - - gtk_widget_get_preferred_size (GTK_WIDGET (calendar_window), &dock_req, NULL); - if (new_x + dock_req.width > monitor.x + monitor.width) { - /* Move the required pixels to the left if the dock don't showed complety - * in the screen - */ - new_x -= (new_x + dock_req.width) - (monitor.x + monitor.width); - } - - if ((new_y + allocation.height + dock_req.height) <= monitor.y + monitor.height) { - /*The dock window height isn't bigger than the monitor size */ - new_y += allocation.height; - } else if (new_y - dock_req.height >= monitor.y) { - /* If the dock window height can't showed complety in the monitor, - * and the dock height isn't to bigg to show on top the calendar button - * move it on top of the calendar button - */ - new_y -= dock_req.height; - } else if (monitor.y + monitor.height - (new_y + allocation.height) > new_y) { - /* in other case, we show under the calendar button if the space is enought */ - new_y += allocation.height; - } else { - /* we need to put the dock in somewhere... even the monitor is to small */ - new_y -= dock_req.height; - } - - /* Put the dock window in the correct screen */ - gtk_window_set_screen (GTK_WINDOW (calendar_window), screen); - - *x = new_x; - *y = new_y; -} - static void -almanah_calendar_button_dock_hiden (GtkWidget *dock, AlmanahCalendarButton *self) +almanah_calendar_button_dock_closed (GtkWidget *dock, AlmanahCalendarButton *self) { /* Reset the calendar user event and toggle off the button */ ALMANAH_CALENDAR_BUTTON (self)->priv->user_event = NONE_EVENT; @@ -286,32 +231,22 @@ static void almanah_calendar_button_toggled (GtkToggleButton *togglebutton) { - gint x, y; AlmanahCalendarButton *self; self = ALMANAH_CALENDAR_BUTTON (togglebutton); if (gtk_toggle_button_get_active (togglebutton)) { /* Show the dock */ - dock_position_func (self, &x, &y); - gtk_window_move (GTK_WINDOW (self->priv->dock), x, y); - almanah_calendar_window_popup (ALMANAH_CALENDAR_WINDOW (self->priv->dock)); + gtk_widget_show_all (GTK_WIDGET (self->priv->dock)); } } static void almanah_calendar_button_day_selected_cb (GtkCalendar *calendar, AlmanahCalendarButton *self) { - GDate calendar_date; - gchar calendar_string[100]; - - almanah_calendar_get_date (self->priv->calendar, &calendar_date); - /* Translators: This is a strftime()-format string for the date displayed at the top of the main window. */ - g_date_strftime (calendar_string, sizeof (calendar_string), _("%A, %e %B %Y"), &calendar_date); - gtk_label_set_text (GTK_LABEL (self->priv->label), calendar_string); if (self->priv->user_event < DAY_EVENT) { /* Only hide the dock window when the user has clicked in a calendar day */ self->priv->user_event = DAY_EVENT; - almanah_calendar_window_popdown (ALMANAH_CALENDAR_WINDOW (self->priv->dock)); + gtk_widget_hide (GTK_WIDGET (self->priv->dock)); } self->priv->user_event = NONE_EVENT; @@ -339,6 +274,14 @@ return FALSE; } +static void +almanah_calendar_button_today_clicked_cb (__attribute__ ((unused)) GtkButton *button, gpointer user_data) +{ + AlmanahCalendarButton *self = ALMANAH_CALENDAR_BUTTON (user_data); + + almanah_calendar_button_select_today (self); +} + static gboolean almanah_calendar_button_select_date_press_cb (GtkWidget *widget, GdkEvent *event, AlmanahCalendarButton *self) { @@ -347,6 +290,14 @@ return FALSE; } +static void +almanah_calendar_button_select_date_clicked_cb (__attribute__ ((unused)) GtkButton *button, gpointer user_data) +{ + AlmanahCalendarButton *self = ALMANAH_CALENDAR_BUTTON (user_data); + + g_signal_emit (self, calendar_button_signals[SELECT_DATE_CLICKED_SIGNAL], 0); +} + GtkWidget * almanah_calendar_button_new (AlmanahStorageManager *storage_manager) { @@ -370,28 +321,6 @@ } void -almanah_calendar_button_set_today_action (AlmanahCalendarButton *self, GtkAction *action) -{ - g_return_if_fail (ALMANAH_IS_CALENDAR_BUTTON (self)); - g_return_if_fail (GTK_IS_ACTION (action)); - - if (GTK_IS_BUTTON (self->priv->today_button)) { - gtk_activatable_set_related_action (GTK_ACTIVATABLE (self->priv->today_button), action); - } -} - -void -almanah_calendar_button_set_select_date_action (AlmanahCalendarButton *self, GtkAction *action) -{ - g_return_if_fail (ALMANAH_IS_CALENDAR_BUTTON (self)); - g_return_if_fail (GTK_IS_ACTION (action)); - - if (GTK_IS_BUTTON (self->priv->select_date_button)) { - gtk_activatable_set_related_action (GTK_ACTIVATABLE (self->priv->select_date_button), action); - } -} - -void almanah_calendar_button_select_date (AlmanahCalendarButton *self, GDate *date) { g_return_if_fail (ALMANAH_IS_CALENDAR_BUTTON (self)); @@ -414,5 +343,16 @@ { g_return_if_fail (ALMANAH_IS_CALENDAR_BUTTON (self)); - almanah_calendar_window_popdown (ALMANAH_CALENDAR_WINDOW (self->priv->dock)); + gtk_widget_hide (GTK_WIDGET (self->priv->dock)); +} + +void +almanah_calendar_button_select_today (AlmanahCalendarButton *self) +{ + GDate current_date; + + g_return_if_fail (ALMANAH_IS_CALENDAR_BUTTON (self)); + + g_date_set_time_t (¤t_date, time (NULL)); + almanah_calendar_button_select_date (self, ¤t_date); } diff -Nru almanah-0.11.1/src/widgets/calendar-button.h almanah-0.12.0/src/widgets/calendar-button.h --- almanah-0.11.1/src/widgets/calendar-button.h 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/src/widgets/calendar-button.h 2019-10-07 13:45:09.000000000 +0000 @@ -46,16 +46,16 @@ typedef struct { GtkToggleButtonClass parent; void (* day_selected) (AlmanahCalendarButton *self); + void (* select_date_clicked) (AlmanahCalendarButton *self); } AlmanahCalendarButtonClass; GType almanah_calendar_button_get_type (void) G_GNUC_CONST; GtkWidget *almanah_calendar_button_new (AlmanahStorageManager *storage_manager) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT; -void almanah_calendar_button_set_today_action (AlmanahCalendarButton *self, GtkAction *action); -void almanah_calendar_button_set_select_date_action (AlmanahCalendarButton *self, GtkAction *action); void almanah_calendar_button_set_storage_manager (AlmanahCalendarButton *self, AlmanahStorageManager *storage_manager); void almanah_calendar_button_select_date (AlmanahCalendarButton *self, GDate *date); void almanah_calendar_button_get_date (AlmanahCalendarButton *self, GDate *date); void almanah_calendar_button_popdown (AlmanahCalendarButton *self); +void almanah_calendar_button_select_today (AlmanahCalendarButton *self); G_END_DECLS diff -Nru almanah-0.11.1/src/widgets/calendar-window.c almanah-0.12.0/src/widgets/calendar-window.c --- almanah-0.11.1/src/widgets/calendar-window.c 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/src/widgets/calendar-window.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,165 +0,0 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* - * Almanah - * Copyright (C) Álvaro Peña 2012 - * - * Almanah is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Almanah is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Almanah. If not, see . - */ - -#include -#include - -#include "calendar-window.h" -#include "widgets/calendar.h" -#include "interface.h" - -static void show (GtkWidget *self); -static gboolean button_press_event (GtkWidget *self, GdkEventButton *event); -static gboolean key_press_event (GtkWidget *self, GdkEventKey *event); - -struct _AlmanahCalendarWindowPrivate { - GdkDevice *grab_pointer; -}; - -G_DEFINE_TYPE (AlmanahCalendarWindow, almanah_calendar_window, GTK_TYPE_WINDOW) -#define ALMANAH_CALENDAR_WINDOW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ALMANAH_TYPE_CALENDAR_WINDOW, AlmanahCalendarWindowPrivate)) - -static void -almanah_calendar_window_class_init (AlmanahCalendarWindowClass *klass) -{ - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - - g_type_class_add_private (klass, sizeof (AlmanahCalendarWindowPrivate)); - - widget_class->show = show; - widget_class->button_press_event = button_press_event; - widget_class->key_press_event = key_press_event; -} - -static void -almanah_calendar_window_init (AlmanahCalendarWindow *self) -{ - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, ALMANAH_TYPE_CALENDAR_WINDOW, AlmanahCalendarWindowPrivate); -} - -static void -show (GtkWidget *self) -{ - GdkDevice *device, *keyboard, *pointer; - GdkWindow *window; - - GTK_WIDGET_CLASS (almanah_calendar_window_parent_class)->show (self); - - window = gtk_widget_get_window (self); - - device = gtk_get_current_event_device (); - switch (gdk_device_get_source (device)) { - case GDK_SOURCE_KEYBOARD: - keyboard = device; - pointer = gdk_device_get_associated_device (device); - break; - case GDK_SOURCE_MOUSE: - case GDK_SOURCE_PEN: - case GDK_SOURCE_ERASER: - case GDK_SOURCE_CURSOR: - pointer = device; - keyboard = gdk_device_get_associated_device (device); - break; - default: - g_warning (_("Unknown input device")); - return; - } - - gtk_grab_add (self); - - gdk_device_grab (keyboard, window, - GDK_OWNERSHIP_WINDOW, TRUE, - GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK, - NULL, GDK_CURRENT_TIME); - - gdk_device_grab (pointer, window, - GDK_OWNERSHIP_WINDOW, TRUE, - GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | - GDK_POINTER_MOTION_MASK, - NULL, GDK_CURRENT_TIME); - - ALMANAH_CALENDAR_WINDOW_GET_PRIVATE(ALMANAH_CALENDAR_WINDOW (self))->grab_pointer = pointer; -} - -static gboolean -button_press_event (GtkWidget *self, GdkEventButton *event) -{ - GtkAllocation allocation; - gint window_x, window_y; - - if (event->type != GDK_BUTTON_PRESS) { - return TRUE; - } - - /* Take the dock window position and dimensions */ - gdk_window_get_position (gtk_widget_get_window (self), &window_x, &window_y); - gtk_widget_get_allocation (self, &allocation); - - /* Hide the dock when the user clicks out of the dock window */ - if (event->x_root < window_x || event->x_root > window_x + allocation.width || - event->y_root < window_y || event->y_root > window_y + allocation.height) { - almanah_calendar_window_popdown (ALMANAH_CALENDAR_WINDOW (self)); - } - - return FALSE; -} - -static gboolean -key_press_event (GtkWidget *self, GdkEventKey *event) -{ - if (event->keyval != GDK_KEY_Escape) { - return FALSE; - } - - almanah_calendar_window_popdown (ALMANAH_CALENDAR_WINDOW (self)); - - return TRUE; -} - -GtkWidget * -almanah_calendar_window_new (void) -{ - return GTK_WIDGET (g_object_new (ALMANAH_TYPE_CALENDAR_WINDOW, NULL)); -} - -void -almanah_calendar_window_popup (AlmanahCalendarWindow *self) -{ - g_return_if_fail (ALMANAH_IS_CALENDAR_WINDOW (self)); - - gtk_widget_show_all (GTK_WIDGET (self)); -} - -void -almanah_calendar_window_popdown (AlmanahCalendarWindow *self) -{ - GdkDevice *pointer, *keyboard; - - g_return_if_fail (ALMANAH_IS_CALENDAR_WINDOW (self)); - - pointer = self->priv->grab_pointer; - gdk_device_ungrab (pointer, GDK_CURRENT_TIME); - keyboard = gdk_device_get_associated_device (pointer); - if (keyboard) - gdk_device_ungrab (keyboard, GDK_CURRENT_TIME); - - gtk_grab_remove (GTK_WIDGET (self)); - - gtk_widget_hide (GTK_WIDGET (self)); -} diff -Nru almanah-0.11.1/src/widgets/calendar-window.h almanah-0.12.0/src/widgets/calendar-window.h --- almanah-0.11.1/src/widgets/calendar-window.h 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/src/widgets/calendar-window.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,59 +0,0 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* - * Almanah - * Copyright (C) Álvaro Peña 2012 - * - * Almanah is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Almanah is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Almanah. If not, see . - */ - -#ifndef ALMANAH_CALENDAR_WINDOW_H -#define ALMANAH_CALENDAR_WINDOW_H - -#include -#include - -#include "application.h" - -G_BEGIN_DECLS - -#define ALMANAH_TYPE_CALENDAR_WINDOW (almanah_calendar_window_get_type ()) -#define ALMANAH_CALENDAR_WINDOW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), ALMANAH_TYPE_CALENDAR_WINDOW, AlmanahCalendarWindow)) -#define ALMANAH_CALENDAR_WINDOW_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), ALMANAH_TYPE_CALENDAR_WINDOW, AlmanahCalendarWindowClass)) -#define ALMANAH_IS_CALENDAR_WINDOW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), ALMANAH_TYPE_CALENDAR_WINDOW)) -#define ALMANAH_IS_CALENDAR_WINDOW_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), ALMANAH_TYPE_CALENDAR_WINDOW)) -#define ALMANAH_CALENDAR_WINDOW_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), ALMANAH_TYPE_CALENDAR_WINDOW, AlmanahCalendarWindowClass)) - -typedef struct _AlmanahCalendarWindow AlmanahCalendarWindow; -typedef struct _AlmanahCalendarWindowClass AlmanahCalendarWindowClass; -typedef struct _AlmanahCalendarWindowPrivate AlmanahCalendarWindowPrivate; - -struct _AlmanahCalendarWindow{ - GtkWindow parent; - AlmanahCalendarWindowPrivate *priv; -}; - -struct _AlmanahCalendarWindowClass { - GtkWindowClass parent; -}; - -GType almanah_calendar_window_get_type (void) G_GNUC_CONST; - -GtkWidget *almanah_calendar_window_new (void) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT; - -void almanah_calendar_window_popup (AlmanahCalendarWindow *self); -void almanah_calendar_window_popdown (AlmanahCalendarWindow *self); - -G_END_DECLS - -#endif /* !ALMANAH_CALENDAR_WINDOW_H */ diff -Nru almanah-0.11.1/src/widgets/eggwrapbox.c almanah-0.12.0/src/widgets/eggwrapbox.c --- almanah-0.11.1/src/widgets/eggwrapbox.c 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/src/widgets/eggwrapbox.c 2019-10-07 13:45:09.000000000 +0000 @@ -38,9 +38,7 @@ * Unlike a GtkTable, the child widgets do not need to align in a grid. */ -#ifdef HAVE_CONFIG_H #include -#endif #include "eggwrapbox.h" #include "eggwrapbox-enums.h" diff -Nru almanah-0.11.1/src/widgets/tag.c almanah-0.12.0/src/widgets/tag.c --- almanah-0.11.1/src/widgets/tag.c 2014-09-24 17:24:12.000000000 +0000 +++ almanah-0.12.0/src/widgets/tag.c 2019-10-07 13:45:09.000000000 +0000 @@ -191,7 +191,7 @@ self->priv->layout = gtk_widget_create_pango_layout (GTK_WIDGET (self), self->priv->tag); style_context = gtk_widget_get_style_context (GTK_WIDGET (self)); - font_desc = (PangoFontDescription *) gtk_style_context_get_font (style_context, GTK_STATE_FLAG_NORMAL); + gtk_style_context_get (style_context, GTK_STATE_FLAG_NORMAL, "font", &font_desc, NULL); pango_font_description_set_size (font_desc, (pango_font_description_get_size (font_desc) * 0.8)); pango_font_description_set_weight (font_desc, PANGO_WEIGHT_BOLD); pango_layout_set_font_description (self->priv->layout, font_desc); diff -Nru almanah-0.11.1/tests/meson.build almanah-0.12.0/tests/meson.build --- almanah-0.11.1/tests/meson.build 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.12.0/tests/meson.build 2019-10-07 13:45:09.000000000 +0000 @@ -0,0 +1,15 @@ +cflags = [ + '-DALMANAH_TESTING', +] + +vfs_test = executable( + 'vfs-test', + sources: [ + '../src/vfs.c', + 'vfs.c', + config, + ], + dependencies: almanah_deps, + include_directories: include_directories('..'), + c_args: cflags, +) diff -Nru almanah-0.11.1/tests/vfs.c almanah-0.12.0/tests/vfs.c --- almanah-0.11.1/tests/vfs.c 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.12.0/tests/vfs.c 2019-10-07 13:45:09.000000000 +0000 @@ -0,0 +1,361 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ +/* + * Almanah + * Copyright (C) Alvaro Peña 2015 + * + * Almanah is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Almanah is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Almanah. If not, see . + */ + +#include + +#define G_SETTINGS_ENABLE_BACKEND +#include +#include +#include +#include +#include + +#include "../src/vfs.h" + +#define ALMANAH_TEST_VFS_DATABASE "almanah_tests.db" +#define ALMANAH_TEST_VFS_DATABASE_ENCRYPTED "almanah_tests.db.encrypted" + +struct AlmanahTestVfsFixture { + sqlite3 *db; + sqlite3_stmt *statement; + GSettings *settings; + gpgme_ctx_t gpgme_context; + gchar *key_fpr; + gchar *tmp_dir; + gchar *db_file; +}; + +static GSettings* +almanah_test_setup_memory_gsettings (void) +{ + GSettingsBackend *settings_backend; + GSettings *settings; + + settings_backend = g_settings_backend_get_default (); + g_object_unref (settings_backend); + settings_backend = g_memory_settings_backend_new (); + settings = g_settings_new_with_backend ("org.gnome.almanah", settings_backend); + + return settings; +} + +static void +almanah_test_vfs_plain_setup (struct AlmanahTestVfsFixture *fixture, __attribute__ ((unused)) gconstpointer user_data) +{ + GError *error = NULL; + + fixture->tmp_dir = g_dir_make_tmp ("almanah_XXXXXX", &error); + g_assert_no_error (error); + fixture->db_file = g_build_filename (fixture->tmp_dir, ALMANAH_TEST_VFS_DATABASE, NULL); + + fixture->settings = almanah_test_setup_memory_gsettings (); + g_settings_set_string (fixture->settings, "encryption-key" , ""); + + /* Initializing the VFS */ + almanah_vfs_init (fixture->settings); + + fixture->db = NULL; + fixture->statement = NULL; +} + +static void +almanah_test_vfs_enc_setup (struct AlmanahTestVfsFixture *fixture, __attribute__ ((unused)) gconstpointer user_data) +{ + GError *error = NULL; + gpgme_error_t gpgme_error; + gchar *encryption_key; + const char parms[] = + "\n" + "Key-Type: RSA\n" + "Key-Length: 2048\n" + "Key-Usage: sign\n" + "Subkey-Type: RSA\n" + "Subkey-Length: 2048\n" + "Subkey-Usage: encrypt\n" + "Name-Real: Almanah Test\n" + "Name-Email: almanah@gnome.org\n" + "Expire-Date: 0\n" + "%no-protection\n" + "%no-ask-passphrase\n" + "\n"; + gpgme_genkey_result_t gpgme_key_result = NULL; + + fixture->tmp_dir = g_dir_make_tmp ("almanah_XXXXXX", &error); + g_assert_no_error (error); + fixture->db_file = g_build_filename (fixture->tmp_dir, ALMANAH_TEST_VFS_DATABASE, NULL); + + fixture->settings = almanah_test_setup_memory_gsettings (); + + /* This is required to initialize GPGME */ + g_assert (gpgme_check_version (MIN_GPGME_VERSION)); + gpgme_error = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP); + g_assert_cmpint (gpgme_error, ==, GPG_ERR_NO_ERROR); + gpgme_error = gpgme_new (&fixture->gpgme_context); + g_assert_cmpint (gpgme_error, ==, GPG_ERR_NO_ERROR); + gpgme_set_protocol (fixture->gpgme_context, GPGME_PROTOCOL_OpenPGP); + gpgme_set_armor (fixture->gpgme_context, TRUE); + gpgme_set_textmode (fixture->gpgme_context, FALSE); + + /* Creating a testing encryption key */ + gpgme_error = gpgme_op_genkey (fixture->gpgme_context, parms, NULL, NULL); + g_assert_cmpint (gpgme_error, ==, GPG_ERR_NO_ERROR); + gpgme_key_result = gpgme_op_genkey_result (fixture->gpgme_context); + g_assert(gpgme_key_result); + + fixture->key_fpr = g_strdup(gpgme_key_result->fpr); + encryption_key = g_strdup_printf ("opengpg:%s", gpgme_key_result->fpr); + g_settings_set_string (fixture->settings, "encryption-key", encryption_key); + g_free (encryption_key); + + gpgme_signers_clear (fixture->gpgme_context); + + /* It's required to initialize the VFS before open a database with it */ + almanah_vfs_init (fixture->settings); + + fixture->db = NULL; + fixture->statement = NULL; +} + +static void +almanah_test_vfs_enc_teardown (struct AlmanahTestVfsFixture *fixture, __attribute__ ((unused)) gconstpointer user_data) +{ + + if (fixture->statement != NULL) + sqlite3_finalize (fixture->statement); + + if (fixture->db != NULL) + sqlite3_close (fixture->db); + + /* Removing the encryption key */ + if (fixture->gpgme_context) { + if (fixture->key_fpr) { + gpgme_key_t key; + gpgme_error_t gpgme_error; + + gpgme_error = gpgme_get_key (fixture->gpgme_context, fixture->key_fpr, &key, 1); + if (gpgme_error == GPG_ERR_NO_ERROR) + gpgme_op_delete (fixture->gpgme_context, key, 1); + g_free(fixture->key_fpr); + } + gpgme_release (fixture->gpgme_context); + } + + almanah_vfs_finish (); + + if (fixture->db_file) { + gchar *enc_file; + + /* Encrypted DB */ + enc_file = g_build_filename (fixture->tmp_dir, ALMANAH_TEST_VFS_DATABASE_ENCRYPTED, NULL); + g_unlink (enc_file); + g_free (enc_file); + + /* Backup encrypted DB */ + enc_file = g_build_filename (fixture->tmp_dir, ALMANAH_TEST_VFS_DATABASE_ENCRYPTED"~", NULL); + g_unlink (enc_file); + g_free (enc_file); + + g_unlink (fixture->db_file); + g_free (fixture->db_file); + } + if (fixture->tmp_dir) { + g_rmdir (fixture->tmp_dir); + g_free (fixture->tmp_dir); + } +} + +static void +almanah_test_vfs_plain_teardown (struct AlmanahTestVfsFixture *fixture, __attribute__ ((unused)) gconstpointer user_data) +{ + if (fixture->statement != NULL) + sqlite3_finalize (fixture->statement); + + if (fixture->db != NULL) + sqlite3_close (fixture->db); + + almanah_vfs_finish (); + + if (fixture->db_file) { + g_unlink (fixture->db_file); + g_free (fixture->db_file); + } + + if (fixture->tmp_dir) { + g_rmdir (fixture->tmp_dir); + g_free (fixture->tmp_dir); + } +} + +static void +almanah_test_vfs_encrypted (struct AlmanahTestVfsFixture *fixture, __attribute__ ((unused)) gconstpointer user_data) +{ + gint rc; + gchar *error_msg = 0; + const guchar *entry_content = NULL; + gchar *enc_file; + + /* Create the database */ + rc = sqlite3_open_v2 (fixture->db_file, &fixture->db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, "almanah"); + if (rc != SQLITE_OK) + g_test_message ("Error opening database: %s", sqlite3_errmsg (fixture->db)); + g_assert_cmpint (rc, ==, SQLITE_OK); + + /* Add a table and some data */ + rc = sqlite3_exec(fixture->db, "CREATE TABLE IF NOT EXISTS entries (year INTEGER, month INTEGER, day INTEGER, content TEXT, PRIMARY KEY (year, month, day));", NULL, 0, &error_msg); + if (rc != SQLITE_OK) { + g_test_message ("SQL error creating table entries: %s\n", error_msg); + sqlite3_free (error_msg); + } + g_assert_cmpint (rc, ==, SQLITE_OK); + + rc = sqlite3_exec(fixture->db, "INSERT INTO entries (year, month, day, content) VALUES (2015, 4, 19, 'Just a test');", NULL, 0, &error_msg); + if (rc != SQLITE_OK) { + g_test_message ("SQL error inserting an entry: %s\n", error_msg); + sqlite3_free (error_msg); + } + g_assert_cmpint (rc, ==, SQLITE_OK); + + /* Close the DB */ + sqlite3_close(fixture->db); + fixture->db = NULL; + + /* Ensure the encrypted file */ + enc_file = g_build_filename (fixture->tmp_dir, ALMANAH_TEST_VFS_DATABASE_ENCRYPTED, NULL); + g_assert (g_file_test (enc_file, G_FILE_TEST_IS_REGULAR)); + g_free (enc_file); + + /* Reopen the database */ + rc = sqlite3_open_v2 (fixture->db_file, &fixture->db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, "almanah"); + if (rc != SQLITE_OK) + g_test_message ("Error opening database: %s", sqlite3_errmsg (fixture->db)); + g_assert_cmpint (rc, ==, SQLITE_OK); + + /* Ensure the data */ + fixture->statement = NULL; + rc = sqlite3_prepare_v2 (fixture->db, "SELECT content FROM entries WHERE year=2015 AND month=4 AND day=19", -1, &fixture->statement, NULL); + if (rc != SQLITE_OK) + g_test_message ("Error quering for content: %s", sqlite3_errmsg (fixture->db)); + g_assert_cmpint (rc, ==, SQLITE_OK); + + rc = sqlite3_step (fixture->statement); + if (rc != SQLITE_ROW) + g_test_message ("Error steping for content: %s", sqlite3_errmsg (fixture->db)); + + entry_content = sqlite3_column_text (fixture->statement, 0); + g_assert_cmpstr ((gchar *) entry_content, ==, "Just a test"); + + sqlite3_finalize (fixture->statement); + fixture->statement = NULL; + sqlite3_close(fixture->db); + fixture->db = NULL; +} + +static void +almanah_test_vfs_plain_open (struct AlmanahTestVfsFixture *fixture, __attribute__ ((unused)) gconstpointer user_data) +{ + gint rc; + + rc = sqlite3_open_v2 (fixture->db_file, &fixture->db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, "almanah"); + if (rc != SQLITE_OK) + g_test_message ("Error opening database: %s", sqlite3_errmsg (fixture->db)); + g_assert_cmpint (rc, ==, SQLITE_OK); + + sqlite3_close(fixture->db); + fixture->db = NULL; +} + +static void +almanah_test_vfs_plain_data (struct AlmanahTestVfsFixture *fixture, __attribute__ ((unused)) gconstpointer user_data) +{ + gint rc; + gchar *error_msg = 0; + const guchar *entry_content = NULL; + + rc = sqlite3_open_v2 (fixture->db_file, &fixture->db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, "almanah"); + if (rc != SQLITE_OK) + g_test_message ("Error opening database: %s", sqlite3_errmsg (fixture->db)); + g_assert_cmpint (rc, ==, SQLITE_OK); + + rc = sqlite3_exec(fixture->db, "CREATE TABLE IF NOT EXISTS entries (year INTEGER, month INTEGER, day INTEGER, content TEXT, PRIMARY KEY (year, month, day));", NULL, 0, &error_msg); + if (rc != SQLITE_OK) { + g_test_message ("SQL error creating table entries: %s\n", error_msg); + sqlite3_free (error_msg); + } + g_assert_cmpint (rc, ==, SQLITE_OK); + + rc = sqlite3_exec(fixture->db, "INSERT INTO entries (year, month, day, content) VALUES (2015, 3, 7, 'Just a test');", NULL, 0, &error_msg); + if (rc != SQLITE_OK) { + g_test_message ("SQL error inserting an entry: %s\n", error_msg); + sqlite3_free (error_msg); + } + g_assert_cmpint (rc, ==, SQLITE_OK); + + sqlite3_close(fixture->db); + fixture->db = NULL; + + rc = sqlite3_open_v2 (fixture->db_file, &fixture->db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, "almanah"); + if (rc != SQLITE_OK) + g_test_message ("Error opening database: %s", sqlite3_errmsg (fixture->db)); + g_assert_cmpint (rc, ==, SQLITE_OK); + + fixture->statement = NULL; + rc = sqlite3_prepare_v2 (fixture->db, "SELECT content FROM entries WHERE year=2015 AND month=3 AND day=7", -1, &fixture->statement, NULL); + if (rc != SQLITE_OK) + g_test_message ("Error quering for content: %s", sqlite3_errmsg (fixture->db)); + g_assert_cmpint (rc, ==, SQLITE_OK); + + rc = sqlite3_step (fixture->statement); + if (rc != SQLITE_ROW) + g_test_message ("Error steping for content: %s", sqlite3_errmsg (fixture->db)); + + entry_content = sqlite3_column_text (fixture->statement, 0); + g_assert_cmpstr ((gchar *) entry_content, ==, "Just a test"); + + sqlite3_finalize (fixture->statement); + fixture->statement = NULL; + sqlite3_close(fixture->db); + fixture->db = NULL; +} + +int +main(int argc, char **argv) +{ + g_test_init (&argc, &argv, NULL); + + g_test_add ("/Almanah/vfs/plain", + struct AlmanahTestVfsFixture, + NULL, + almanah_test_vfs_plain_setup, + almanah_test_vfs_plain_open, + almanah_test_vfs_plain_teardown); + g_test_add ("/Almanah/vfs/data", + struct AlmanahTestVfsFixture, + NULL, + almanah_test_vfs_plain_setup, + almanah_test_vfs_plain_data, + almanah_test_vfs_plain_teardown); + g_test_add ("/Almanah/vfs/encrypted", + struct AlmanahTestVfsFixture, + NULL, + almanah_test_vfs_enc_setup, + almanah_test_vfs_encrypted, + almanah_test_vfs_enc_teardown); + + return g_test_run(); +}