diff -Nru gnome-online-accounts-3.30.1/config.h.in gnome-online-accounts-3.31.90/config.h.in --- gnome-online-accounts-3.30.1/config.h.in 2019-01-17 10:27:11.000000000 +0000 +++ gnome-online-accounts-3.31.90/config.h.in 2019-02-09 21:16:16.000000000 +0000 @@ -121,18 +121,6 @@ /* Path to the template file */ #undef GOA_TEMPLATE_FILE -/* Todoist OAuth 2.0 client id */ -#undef GOA_TODOIST_CLIENT_ID - -/* Todoist client secret */ -#undef GOA_TODOIST_CLIENT_SECRET - -/* Enable Todoist data provider */ -#undef GOA_TODOIST_ENABLED - -/* ProviderType and extension point name */ -#undef GOA_TODOIST_NAME - /* Windows Live OAuth 2.0 client id */ #undef GOA_WINDOWS_LIVE_CLIENT_ID diff -Nru gnome-online-accounts-3.30.1/configure gnome-online-accounts-3.31.90/configure --- gnome-online-accounts-3.30.1/configure 2019-01-17 10:27:10.000000000 +0000 +++ gnome-online-accounts-3.31.90/configure 2019-02-09 21:16:16.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GNOME Online Accounts 3.30.1. +# Generated by GNU Autoconf 2.69 for GNOME Online Accounts 3.31.90. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='GNOME Online Accounts' PACKAGE_TARNAME='gnome-online-accounts' -PACKAGE_VERSION='3.30.1' -PACKAGE_STRING='GNOME Online Accounts 3.30.1' +PACKAGE_VERSION='3.31.90' +PACKAGE_STRING='GNOME Online Accounts 3.31.90' PACKAGE_BUGREPORT='https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues' PACKAGE_URL='https://wiki.gnome.org/Projects/GnomeOnlineAccounts' @@ -890,9 +890,6 @@ enable_owncloud enable_facebook with_facebook_client_id -enable_todoist -with_todoist_client_id -with_todoist_client_secret enable_windows_live with_windows_live_client_id enable_pocket @@ -1479,7 +1476,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GNOME Online Accounts 3.30.1 to adapt to many kinds of systems. +\`configure' configures GNOME Online Accounts 3.31.90 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1550,7 +1547,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNOME Online Accounts 3.30.1:";; + short | recursive ) echo "Configuration of GNOME Online Accounts 3.31.90:";; esac cat <<\_ACEOF @@ -1596,7 +1593,6 @@ --enable-media-server Enable Media Server provider --enable-owncloud Enable ownCloud provider --enable-facebook Enable Facebook provider - --enable-todoist Enable Todoist provider --enable-windows-live Enable Windows Live provider --enable-pocket Enable Pocket provider --enable-kerberos Enable kerberos support @@ -1628,10 +1624,6 @@ Google OAuth 2.0 client secret --with-facebook-client-id Facebook OAuth 2.0 client id - --with-todoist-client-id - Todoist OAuth 2.0 client id - --with-todoist-client-secret - Todoist client secret --with-windows-live-client-id Windows Live OAuth 2.0 client id --with-pocket-client-id Pocket OAuth 2.0 client id @@ -1758,7 +1750,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNOME Online Accounts configure 3.30.1 +GNOME Online Accounts configure 3.31.90 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2036,7 +2028,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNOME Online Accounts $as_me 3.30.1, which was +It was created by GNOME Online Accounts $as_me 3.31.90, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2901,7 +2893,7 @@ # Define the identity of the package. PACKAGE='gnome-online-accounts' - VERSION='3.30.1' + VERSION='3.31.90' cat >>confdefs.h <<_ACEOF @@ -14904,8 +14896,8 @@ GOA_MAJOR_VERSION=3 -GOA_MINOR_VERSION=30 -GOA_MICRO_VERSION=1 +GOA_MINOR_VERSION=31 +GOA_MICRO_VERSION=90 @@ -14927,10 +14919,10 @@ $as_echo "#define GOA_MAJOR_VERSION 3" >>confdefs.h -$as_echo "#define GOA_MINOR_VERSION 30" >>confdefs.h +$as_echo "#define GOA_MINOR_VERSION 31" >>confdefs.h -$as_echo "#define GOA_MICRO_VERSION 1" >>confdefs.h +$as_echo "#define GOA_MICRO_VERSION 90" >>confdefs.h # Initialization @@ -16986,51 +16978,6 @@ fi -# Todoist - -$as_echo "#define GOA_TODOIST_NAME \"todoist\"" >>confdefs.h - -# Check whether --enable-todoist was given. -if test "${enable_todoist+set}" = set; then : - enableval=$enable_todoist; -else - enable_todoist=no -fi - - -# Check whether --with-todoist-client-id was given. -if test "${with_todoist_client_id+set}" = set; then : - withval=$with_todoist_client_id; -fi - - -# Check whether --with-todoist-client-secret was given. -if test "${with_todoist_client_secret+set}" = set; then : - withval=$with_todoist_client_secret; -fi - -if test "$with_todoist_client_id" = ""; then - with_todoist_client_id="2e41575c1dd74f98ad7cfb178e1ba3dd" -fi -if test "$with_todoist_client_secret" = ""; then - with_todoist_client_secret="3e59831ffdd64633918d19aa0a1efd2b" -fi - -cat >>confdefs.h <<_ACEOF -#define GOA_TODOIST_CLIENT_ID "$with_todoist_client_id" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define GOA_TODOIST_CLIENT_SECRET "$with_todoist_client_secret" -_ACEOF - -if test "$enable_todoist" != "no"; then - -$as_echo "#define GOA_TODOIST_ENABLED 1" >>confdefs.h - -fi - # Windows Live $as_echo "#define GOA_WINDOWS_LIVE_NAME \"windows_live\"" >>confdefs.h @@ -19501,7 +19448,7 @@ # Generate # -ac_config_files="$ac_config_files Makefile data/Makefile data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/24x24/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/96x96/Makefile data/icons/256x256/Makefile src/Makefile src/goa/Makefile src/goa/goa-1.0.pc src/goabackend/Makefile src/goabackend/goa-backend-1.0.pc src/goaidentity/Makefile src/daemon/Makefile src/examples/Makefile po/Makefile.in doc/Makefile doc/version.xml" +ac_config_files="$ac_config_files Makefile data/Makefile data/icons/Makefile data/icons/scalable/Makefile data/icons/symbolic/Makefile src/Makefile src/goa/Makefile src/goa/goa-1.0.pc src/goabackend/Makefile src/goabackend/goa-backend-1.0.pc src/goaidentity/Makefile src/daemon/Makefile src/examples/Makefile po/Makefile.in doc/Makefile doc/version.xml" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -20085,7 +20032,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNOME Online Accounts $as_me 3.30.1, which was +This file was extended by GNOME Online Accounts $as_me 3.31.90, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20152,7 +20099,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GNOME Online Accounts config.status 3.30.1 +GNOME Online Accounts config.status 3.31.90 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -20584,13 +20531,8 @@ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "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/24x24/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/24x24/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/96x96/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/96x96/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/icons/symbolic/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/symbolic/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/goa/Makefile") CONFIG_FILES="$CONFIG_FILES src/goa/Makefile" ;; "src/goa/goa-1.0.pc") CONFIG_FILES="$CONFIG_FILES src/goa/goa-1.0.pc" ;; @@ -22050,7 +21992,6 @@ ownCloud provider: ${enable_owncloud} Kerberos provider: ${enable_kerberos} Facebook provider: ${enable_facebook} (OAuth 2.0, id:${with_facebook_client_id}) - Todoist provider: ${enable_todoist} (OAuth 2.0, id:${with_todoist_client_id} secret:${with_todoist_client_secret}) Windows Live provider: ${enable_windows_live} (OAuth 2.0, id:${with_windows_live_client_id}) Pocket provider: ${enable_pocket} (id:${with_pocket_client_id}) Last.fm provider: ${enable_lastfm} (id:${with_lastfm_client_id} secret:${with_lastfm_client_secret}) diff -Nru gnome-online-accounts-3.30.1/configure.ac gnome-online-accounts-3.31.90/configure.ac --- gnome-online-accounts-3.30.1/configure.ac 2019-01-17 10:08:27.000000000 +0000 +++ gnome-online-accounts-3.31.90/configure.ac 2019-02-09 09:22:41.000000000 +0000 @@ -1,6 +1,6 @@ m4_define([goa_major_version], [3]) -m4_define([goa_minor_version], [30]) -m4_define([goa_micro_version], [1]) +m4_define([goa_minor_version], [31]) +m4_define([goa_micro_version], [90]) m4_define([goa_nano_version], [0]) m4_define([goa_base_version], @@ -285,32 +285,6 @@ AC_DEFINE(GOA_FACEBOOK_ENABLED, 1, [Enable Facebook data provider]) fi -# Todoist -AC_DEFINE(GOA_TODOIST_NAME, ["todoist"], [ProviderType and extension point name]) -AC_ARG_ENABLE([todoist], - [AS_HELP_STRING([--enable-todoist], [Enable Todoist provider])], - [], - [enable_todoist=no]) -AC_ARG_WITH(todoist-client-id, - [AS_HELP_STRING([--with-todoist-client-id], [Todoist OAuth 2.0 client id])], - [], - []) -AC_ARG_WITH(todoist-client-secret, - [AS_HELP_STRING([--with-todoist-client-secret], [Todoist client secret])], - [], - []) -if test "$with_todoist_client_id" = ""; then - with_todoist_client_id="2e41575c1dd74f98ad7cfb178e1ba3dd" -fi -if test "$with_todoist_client_secret" = ""; then - with_todoist_client_secret="3e59831ffdd64633918d19aa0a1efd2b" -fi -AC_DEFINE_UNQUOTED(GOA_TODOIST_CLIENT_ID, ["$with_todoist_client_id"], [Todoist OAuth 2.0 client id]) -AC_DEFINE_UNQUOTED(GOA_TODOIST_CLIENT_SECRET, ["$with_todoist_client_secret"], [Todoist client secret]) -if test "$enable_todoist" != "no"; then - AC_DEFINE(GOA_TODOIST_ENABLED, 1, [Enable Todoist data provider]) -fi - # Windows Live AC_DEFINE(GOA_WINDOWS_LIVE_NAME, ["windows_live"], [ProviderType and extension point name]) AC_ARG_ENABLE([windows-live], @@ -522,13 +496,8 @@ Makefile data/Makefile data/icons/Makefile -data/icons/16x16/Makefile -data/icons/22x22/Makefile -data/icons/24x24/Makefile -data/icons/32x32/Makefile -data/icons/48x48/Makefile -data/icons/96x96/Makefile -data/icons/256x256/Makefile +data/icons/scalable/Makefile +data/icons/symbolic/Makefile src/Makefile src/goa/Makefile src/goa/goa-1.0.pc @@ -574,7 +543,6 @@ ownCloud provider: ${enable_owncloud} Kerberos provider: ${enable_kerberos} Facebook provider: ${enable_facebook} (OAuth 2.0, id:${with_facebook_client_id}) - Todoist provider: ${enable_todoist} (OAuth 2.0, id:${with_todoist_client_id} secret:${with_todoist_client_secret}) Windows Live provider: ${enable_windows_live} (OAuth 2.0, id:${with_windows_live_client_id}) Pocket provider: ${enable_pocket} (id:${with_pocket_client_id}) Last.fm provider: ${enable_lastfm} (id:${with_lastfm_client_id} secret:${with_lastfm_client_secret}) diff -Nru gnome-online-accounts-3.30.1/data/dbus-interfaces.xml gnome-online-accounts-3.31.90/data/dbus-interfaces.xml --- gnome-online-accounts-3.30.1/data/dbus-interfaces.xml 2019-01-17 10:08:27.000000000 +0000 +++ gnome-online-accounts-3.31.90/data/dbus-interfaces.xml 2019-01-17 11:54:47.000000000 +0000 @@ -256,7 +256,9 @@ Note that the #org.gnomeOnlineAccounts.Todo interface is added or removed from the account asynchronously. --> - + + + + install in $(datadir) -dnl Catalog extension: .mo after installation, .gmo in source tree -dnl 2) GNU gettext has been found in the system's C library. -dnl Catalog format: GNU --> install in $(datadir) -dnl Catalog extension: .mo after installation, .gmo in source tree -dnl 3) No internationalization, always use English msgid. -dnl Catalog format: none -dnl Catalog extension: none -dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur. -dnl The use of .gmo is historical (it was needed to avoid overwriting the -dnl GNU format catalogs when building on a platform with an X/Open gettext), -dnl but we keep it in order not to force irrelevant filename changes on the -dnl maintainers. -dnl -AC_DEFUN([AM_GNU_GETTEXT], -[ - dnl Argument checking. - ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , - [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT -])])])])]) - ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old], - [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])]) - ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , - [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT -])])])]) - define([gt_included_intl], - ifelse([$1], [external], - ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]), - [yes])) - define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], [])) - gt_NEEDS_INIT - AM_GNU_GETTEXT_NEED([$2]) - - AC_REQUIRE([AM_PO_SUBDIRS])dnl - ifelse(gt_included_intl, yes, [ - AC_REQUIRE([AM_INTL_SUBDIR])dnl - ]) - - dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - - dnl Sometimes libintl requires libiconv, so first search for libiconv. - dnl Ideally we would do this search only after the - dnl if test "$USE_NLS" = "yes"; then - dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then - dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT - dnl the configure script would need to contain the same shell code - dnl again, outside any 'if'. There are two solutions: - dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. - dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE. - dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not - dnl documented, we avoid it. - ifelse(gt_included_intl, yes, , [ - AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) - ]) - - dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation. - gt_INTL_MACOSX - - dnl Set USE_NLS. - AC_REQUIRE([AM_NLS]) - - ifelse(gt_included_intl, yes, [ - BUILD_INCLUDED_LIBINTL=no - USE_INCLUDED_LIBINTL=no - ]) - LIBINTL= - LTLIBINTL= - POSUB= - - dnl Add a version number to the cache macros. - case " $gt_needs " in - *" need-formatstring-macros "*) gt_api_version=3 ;; - *" need-ngettext "*) gt_api_version=2 ;; - *) gt_api_version=1 ;; - esac - gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc" - gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl" - - dnl If we use NLS figure out what method - if test "$USE_NLS" = "yes"; then - gt_use_preinstalled_gnugettext=no - ifelse(gt_included_intl, yes, [ - AC_MSG_CHECKING([whether included gettext is requested]) - AC_ARG_WITH([included-gettext], - [ --with-included-gettext use the GNU gettext library included here], - nls_cv_force_use_gnu_gettext=$withval, - nls_cv_force_use_gnu_gettext=no) - AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext]) - - nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" - if test "$nls_cv_force_use_gnu_gettext" != "yes"; then - ]) - dnl User does not insist on using GNU NLS library. Figure out what - dnl to use. If GNU gettext is available we use this. Else we have - dnl to fall back to GNU NLS library. - - if test $gt_api_version -ge 3; then - gt_revision_test_code=' -#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) -#endif -changequote(,)dnl -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -changequote([,])dnl -' - else - gt_revision_test_code= - fi - if test $gt_api_version -ge 2; then - gt_expression_test_code=' + * ngettext ("", "", 0)' - else - gt_expression_test_code= - fi - - AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc], - [AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[ -#include -#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -extern int _nl_msg_cat_cntr; -extern int *_nl_domain_bindings; -#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings) -#else -#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 -#endif -$gt_revision_test_code - ]], - [[ -bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION - ]])], - [eval "$gt_func_gnugettext_libc=yes"], - [eval "$gt_func_gnugettext_libc=no"])]) - - if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then - dnl Sometimes libintl requires libiconv, so first search for libiconv. - ifelse(gt_included_intl, yes, , [ - AM_ICONV_LINK - ]) - dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL - dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv]) - dnl because that would add "-liconv" to LIBINTL and LTLIBINTL - dnl even if libiconv doesn't exist. - AC_LIB_LINKFLAGS_BODY([intl]) - AC_CACHE_CHECK([for GNU gettext in libintl], - [$gt_func_gnugettext_libintl], - [gt_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $INCINTL" - gt_save_LIBS="$LIBS" - LIBS="$LIBS $LIBINTL" - dnl Now see whether libintl exists and does not depend on libiconv. - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[ -#include -#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -extern int _nl_msg_cat_cntr; -extern -#ifdef __cplusplus -"C" -#endif -const char *_nl_expand_alias (const char *); -#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias ("")) -#else -#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 -#endif -$gt_revision_test_code - ]], - [[ -bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION - ]])], - [eval "$gt_func_gnugettext_libintl=yes"], - [eval "$gt_func_gnugettext_libintl=no"]) - dnl Now see whether libintl exists and depends on libiconv. - if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then - LIBS="$LIBS $LIBICONV" - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[ -#include -#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -extern int _nl_msg_cat_cntr; -extern -#ifdef __cplusplus -"C" -#endif -const char *_nl_expand_alias (const char *); -#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias ("")) -#else -#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 -#endif -$gt_revision_test_code - ]], - [[ -bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION - ]])], - [LIBINTL="$LIBINTL $LIBICONV" - LTLIBINTL="$LTLIBINTL $LTLIBICONV" - eval "$gt_func_gnugettext_libintl=yes" - ]) - fi - CPPFLAGS="$gt_save_CPPFLAGS" - LIBS="$gt_save_LIBS"]) - fi - - dnl If an already present or preinstalled GNU gettext() is found, - dnl use it. But if this macro is used in GNU gettext, and GNU - dnl gettext is already preinstalled in libintl, we update this - dnl libintl. (Cf. the install rule in intl/Makefile.in.) - if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ - || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ - && test "$PACKAGE" != gettext-runtime \ - && test "$PACKAGE" != gettext-tools; }; then - gt_use_preinstalled_gnugettext=yes - else - dnl Reset the values set by searching for libintl. - LIBINTL= - LTLIBINTL= - INCINTL= - fi - - ifelse(gt_included_intl, yes, [ - if test "$gt_use_preinstalled_gnugettext" != "yes"; then - dnl GNU gettext is not found in the C library. - dnl Fall back on included GNU gettext library. - nls_cv_use_gnu_gettext=yes - fi - fi - - if test "$nls_cv_use_gnu_gettext" = "yes"; then - dnl Mark actions used to generate GNU NLS library. - BUILD_INCLUDED_LIBINTL=yes - USE_INCLUDED_LIBINTL=yes - LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD" - LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD" - LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` - fi - - CATOBJEXT= - if test "$gt_use_preinstalled_gnugettext" = "yes" \ - || test "$nls_cv_use_gnu_gettext" = "yes"; then - dnl Mark actions to use GNU gettext tools. - CATOBJEXT=.gmo - fi - ]) - - if test -n "$INTL_MACOSX_LIBS"; then - if test "$gt_use_preinstalled_gnugettext" = "yes" \ - || test "$nls_cv_use_gnu_gettext" = "yes"; then - dnl Some extra flags are needed during linking. - LIBINTL="$LIBINTL $INTL_MACOSX_LIBS" - LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS" - fi - fi - - if test "$gt_use_preinstalled_gnugettext" = "yes" \ - || test "$nls_cv_use_gnu_gettext" = "yes"; then - AC_DEFINE([ENABLE_NLS], [1], - [Define to 1 if translation of program messages to the user's native language - is requested.]) - else - USE_NLS=no - fi - fi - - AC_MSG_CHECKING([whether to use NLS]) - AC_MSG_RESULT([$USE_NLS]) - if test "$USE_NLS" = "yes"; then - AC_MSG_CHECKING([where the gettext function comes from]) - if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then - gt_source="external libintl" - else - gt_source="libc" - fi - else - gt_source="included intl directory" - fi - AC_MSG_RESULT([$gt_source]) - fi - - if test "$USE_NLS" = "yes"; then - - if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then - AC_MSG_CHECKING([how to link with libintl]) - AC_MSG_RESULT([$LIBINTL]) - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) - fi - - dnl For backward compatibility. Some packages may be using this. - AC_DEFINE([HAVE_GETTEXT], [1], - [Define if the GNU gettext() function is already present or preinstalled.]) - AC_DEFINE([HAVE_DCGETTEXT], [1], - [Define if the GNU dcgettext() function is already present or preinstalled.]) - fi - - dnl We need to process the po/ directory. - POSUB=po - fi - - ifelse(gt_included_intl, yes, [ - dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL - dnl to 'yes' because some of the testsuite requires it. - if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then - BUILD_INCLUDED_LIBINTL=yes - fi - - dnl Make all variables we use known to autoconf. - AC_SUBST([BUILD_INCLUDED_LIBINTL]) - AC_SUBST([USE_INCLUDED_LIBINTL]) - AC_SUBST([CATOBJEXT]) - - dnl For backward compatibility. Some configure.ins may be using this. - nls_cv_header_intl= - nls_cv_header_libgt= - - dnl For backward compatibility. Some Makefiles may be using this. - DATADIRNAME=share - AC_SUBST([DATADIRNAME]) - - dnl For backward compatibility. Some Makefiles may be using this. - INSTOBJEXT=.mo - AC_SUBST([INSTOBJEXT]) - - dnl For backward compatibility. Some Makefiles may be using this. - GENCAT=gencat - AC_SUBST([GENCAT]) - - dnl For backward compatibility. Some Makefiles may be using this. - INTLOBJS= - if test "$USE_INCLUDED_LIBINTL" = yes; then - INTLOBJS="\$(GETTOBJS)" - fi - AC_SUBST([INTLOBJS]) - - dnl Enable libtool support if the surrounding package wishes it. - INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix - AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX]) - ]) - - dnl For backward compatibility. Some Makefiles may be using this. - INTLLIBS="$LIBINTL" - AC_SUBST([INTLLIBS]) - - dnl Make all documented variables known to autoconf. - AC_SUBST([LIBINTL]) - AC_SUBST([LTLIBINTL]) - AC_SUBST([POSUB]) -]) - - -dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized. -m4_define([gt_NEEDS_INIT], -[ - m4_divert_text([DEFAULTS], [gt_needs=]) - m4_define([gt_NEEDS_INIT], []) -]) - - -dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL]) -AC_DEFUN([AM_GNU_GETTEXT_NEED], -[ - m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"]) -]) - - -dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) -AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) - - -dnl Usage: AM_GNU_GETTEXT_REQUIRE_VERSION([gettext-version]) -AC_DEFUN([AM_GNU_GETTEXT_REQUIRE_VERSION], []) diff -Nru gnome-online-accounts-3.30.1/m4/gsettings.m4 gnome-online-accounts-3.31.90/m4/gsettings.m4 --- gnome-online-accounts-3.30.1/m4/gsettings.m4 2019-01-17 10:26:52.000000000 +0000 +++ gnome-online-accounts-3.31.90/m4/gsettings.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,86 +0,0 @@ -# Increment this whenever this file is changed. -#serial 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])]) -] -) diff -Nru gnome-online-accounts-3.30.1/m4/gtk-doc.m4 gnome-online-accounts-3.31.90/m4/gtk-doc.m4 --- gnome-online-accounts-3.30.1/m4/gtk-doc.m4 2019-01-17 10:26:55.000000000 +0000 +++ gnome-online-accounts-3.31.90/m4/gtk-doc.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,113 +0,0 @@ -# -*- mode: autoconf -*- -# -# gtk-doc.m4 - configure macro to check for gtk-doc -# Copyright (C) 2003 James Henstridge -# 2007-2017 Stefan Sauer -# -# 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 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, the above copyright owner gives unlimited -# permission to copy, distribute and modify the configure scripts that -# are the output of Autoconf when processing the Macro. You need not -# follow the terms of the GNU General Public License when using or -# distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. - -# serial 2 - -dnl Usage: -dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) -AC_DEFUN([GTK_DOC_CHECK], -[ - AC_REQUIRE([PKG_PROG_PKG_CONFIG]) - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - - ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"]) - AC_MSG_CHECKING([for gtk-doc]) - PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no]) - AC_MSG_RESULT($have_gtk_doc) - - if test "$have_gtk_doc" = "no"; then - AC_MSG_WARN([ - You will not be able to create source packages with 'make dist' - because $gtk_doc_requires is not found.]) - fi - - dnl check for tools we added during development - dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that - dnl may not be writable by the user. Currently, automake requires that the - dnl test name must end in '.test'. - dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638 - AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test]) - AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check]) - AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) - AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) - - dnl for overriding the documentation installation directory - AC_ARG_WITH([html-dir], - AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, - [with_html_dir='${datadir}/gtk-doc/html']) - HTML_DIR="$with_html_dir" - AC_SUBST([HTML_DIR]) - - dnl enable/disable documentation building - AC_ARG_ENABLE([gtk-doc], - AS_HELP_STRING([--enable-gtk-doc], - [use gtk-doc to build documentation [[default=no]]]),, - [enable_gtk_doc=no]) - - AC_MSG_CHECKING([whether to build gtk-doc documentation]) - AC_MSG_RESULT($enable_gtk_doc) - - if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then - AC_MSG_ERROR([ - You must have $gtk_doc_requires installed to build documentation for - $PACKAGE_NAME. Please install gtk-doc or disable building the - documentation by adding '--disable-gtk-doc' to '[$]0'.]) - fi - - dnl don't check for glib if we build glib - if test "x$PACKAGE_NAME" != "xglib"; then - dnl don't fail if someone does not have glib - PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:]) - fi - - dnl enable/disable output formats - AC_ARG_ENABLE([gtk-doc-html], - AS_HELP_STRING([--enable-gtk-doc-html], - [build documentation in html format [[default=yes]]]),, - [enable_gtk_doc_html=yes]) - AC_ARG_ENABLE([gtk-doc-pdf], - AS_HELP_STRING([--enable-gtk-doc-pdf], - [build documentation in pdf format [[default=no]]]),, - [enable_gtk_doc_pdf=no]) - - if test -z "$GTKDOC_MKPDF"; then - enable_gtk_doc_pdf=no - fi - - if test -z "$AM_DEFAULT_VERBOSITY"; then - AM_DEFAULT_VERBOSITY=1 - fi - AC_SUBST([AM_DEFAULT_VERBOSITY]) - - AM_CONDITIONAL([HAVE_GTK_DOC], [test x$have_gtk_doc = xyes]) - AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) - AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) - AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) - AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) - AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) -]) diff -Nru gnome-online-accounts-3.30.1/m4/iconv.m4 gnome-online-accounts-3.31.90/m4/iconv.m4 --- gnome-online-accounts-3.30.1/m4/iconv.m4 2019-01-17 10:26:52.000000000 +0000 +++ gnome-online-accounts-3.31.90/m4/iconv.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,271 +0,0 @@ -# iconv.m4 serial 19 (gettext-0.18.2) -dnl Copyright (C) 2000-2002, 2007-2014, 2016 Free Software Foundation, 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 From Bruno Haible. - -AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], -[ - dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - - dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV - dnl accordingly. - AC_LIB_LINKFLAGS_BODY([iconv]) -]) - -AC_DEFUN([AM_ICONV_LINK], -[ - dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and - dnl those with the standalone portable GNU libiconv installed). - AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - - dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV - dnl accordingly. - AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) - - dnl Add $INCICONV to CPPFLAGS before performing the following checks, - dnl because if the user has installed libiconv and not disabled its use - dnl via --without-libiconv-prefix, he wants to use it. The first - dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed. - am_save_CPPFLAGS="$CPPFLAGS" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) - - AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [ - am_cv_func_iconv="no, consider installing GNU libiconv" - am_cv_lib_iconv=no - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[ -#include -#include - ]], - [[iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);]])], - [am_cv_func_iconv=yes]) - if test "$am_cv_func_iconv" != yes; then - am_save_LIBS="$LIBS" - LIBS="$LIBS $LIBICONV" - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[ -#include -#include - ]], - [[iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);]])], - [am_cv_lib_iconv=yes] - [am_cv_func_iconv=yes]) - LIBS="$am_save_LIBS" - fi - ]) - if test "$am_cv_func_iconv" = yes; then - AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [ - dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11, - dnl Solaris 10. - am_save_LIBS="$LIBS" - if test $am_cv_lib_iconv = yes; then - LIBS="$LIBS $LIBICONV" - fi - am_cv_func_iconv_works=no - for ac_iconv_const in '' 'const'; do - AC_RUN_IFELSE( - [AC_LANG_PROGRAM( - [[ -#include -#include - -#ifndef ICONV_CONST -# define ICONV_CONST $ac_iconv_const -#endif - ]], - [[int result = 0; - /* Test against AIX 5.1 bug: Failures are not distinguishable from successful - returns. */ - { - iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); - if (cd_utf8_to_88591 != (iconv_t)(-1)) - { - static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */ - char buf[10]; - ICONV_CONST char *inptr = input; - size_t inbytesleft = strlen (input); - char *outptr = buf; - size_t outbytesleft = sizeof (buf); - size_t res = iconv (cd_utf8_to_88591, - &inptr, &inbytesleft, - &outptr, &outbytesleft); - if (res == 0) - result |= 1; - iconv_close (cd_utf8_to_88591); - } - } - /* Test against Solaris 10 bug: Failures are not distinguishable from - successful returns. */ - { - iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); - if (cd_ascii_to_88591 != (iconv_t)(-1)) - { - static ICONV_CONST char input[] = "\263"; - char buf[10]; - ICONV_CONST char *inptr = input; - size_t inbytesleft = strlen (input); - char *outptr = buf; - size_t outbytesleft = sizeof (buf); - size_t res = iconv (cd_ascii_to_88591, - &inptr, &inbytesleft, - &outptr, &outbytesleft); - if (res == 0) - result |= 2; - iconv_close (cd_ascii_to_88591); - } - } - /* Test against AIX 6.1..7.1 bug: Buffer overrun. */ - { - iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); - if (cd_88591_to_utf8 != (iconv_t)(-1)) - { - static ICONV_CONST char input[] = "\304"; - static char buf[2] = { (char)0xDE, (char)0xAD }; - ICONV_CONST char *inptr = input; - size_t inbytesleft = 1; - char *outptr = buf; - size_t outbytesleft = 1; - size_t res = iconv (cd_88591_to_utf8, - &inptr, &inbytesleft, - &outptr, &outbytesleft); - if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) - result |= 4; - iconv_close (cd_88591_to_utf8); - } - } -#if 0 /* This bug could be worked around by the caller. */ - /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ - { - iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); - if (cd_88591_to_utf8 != (iconv_t)(-1)) - { - static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; - char buf[50]; - ICONV_CONST char *inptr = input; - size_t inbytesleft = strlen (input); - char *outptr = buf; - size_t outbytesleft = sizeof (buf); - size_t res = iconv (cd_88591_to_utf8, - &inptr, &inbytesleft, - &outptr, &outbytesleft); - if ((int)res > 0) - result |= 8; - iconv_close (cd_88591_to_utf8); - } - } -#endif - /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is - provided. */ - if (/* Try standardized names. */ - iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) - /* Try IRIX, OSF/1 names. */ - && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) - /* Try AIX names. */ - && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) - /* Try HP-UX names. */ - && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) - result |= 16; - return result; -]])], - [am_cv_func_iconv_works=yes], , - [case "$host_os" in - aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; - *) am_cv_func_iconv_works="guessing yes" ;; - esac]) - test "$am_cv_func_iconv_works" = no || break - done - LIBS="$am_save_LIBS" - ]) - case "$am_cv_func_iconv_works" in - *no) am_func_iconv=no am_cv_lib_iconv=no ;; - *) am_func_iconv=yes ;; - esac - else - am_func_iconv=no am_cv_lib_iconv=no - fi - if test "$am_func_iconv" = yes; then - AC_DEFINE([HAVE_ICONV], [1], - [Define if you have the iconv() function and it works.]) - fi - if test "$am_cv_lib_iconv" = yes; then - AC_MSG_CHECKING([how to link with libiconv]) - AC_MSG_RESULT([$LIBICONV]) - else - dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV - dnl either. - CPPFLAGS="$am_save_CPPFLAGS" - LIBICONV= - LTLIBICONV= - fi - AC_SUBST([LIBICONV]) - AC_SUBST([LTLIBICONV]) -]) - -dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to -dnl avoid warnings like -dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required". -dnl This is tricky because of the way 'aclocal' is implemented: -dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN. -dnl Otherwise aclocal's initial scan pass would miss the macro definition. -dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions. -dnl Otherwise aclocal would emit many "Use of uninitialized value $1" -dnl warnings. -m4_define([gl_iconv_AC_DEFUN], - m4_version_prereq([2.64], - [[AC_DEFUN_ONCE( - [$1], [$2])]], - [m4_ifdef([gl_00GNULIB], - [[AC_DEFUN_ONCE( - [$1], [$2])]], - [[AC_DEFUN( - [$1], [$2])]])])) -gl_iconv_AC_DEFUN([AM_ICONV], -[ - AM_ICONV_LINK - if test "$am_cv_func_iconv" = yes; then - AC_MSG_CHECKING([for iconv declaration]) - AC_CACHE_VAL([am_cv_proto_iconv], [ - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[ -#include -#include -extern -#ifdef __cplusplus -"C" -#endif -#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -#else -size_t iconv(); -#endif - ]], - [[]])], - [am_cv_proto_iconv_arg1=""], - [am_cv_proto_iconv_arg1="const"]) - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) - am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - AC_MSG_RESULT([ - $am_cv_proto_iconv]) - AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1], - [Define as const if the declaration of iconv() needs const.]) - dnl Also substitute ICONV_CONST in the gnulib generated . - m4_ifdef([gl_ICONV_H_DEFAULTS], - [AC_REQUIRE([gl_ICONV_H_DEFAULTS]) - if test -n "$am_cv_proto_iconv_arg1"; then - ICONV_CONST="const" - fi - ]) - fi -]) diff -Nru gnome-online-accounts-3.30.1/m4/intlmacosx.m4 gnome-online-accounts-3.31.90/m4/intlmacosx.m4 --- gnome-online-accounts-3.30.1/m4/intlmacosx.m4 2019-01-17 10:26:52.000000000 +0000 +++ gnome-online-accounts-3.31.90/m4/intlmacosx.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ -# intlmacosx.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 2004-2014, 2016 Free Software Foundation, 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 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 is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Checks for special options needed on Mac OS X. -dnl Defines INTL_MACOSX_LIBS. -AC_DEFUN([gt_INTL_MACOSX], -[ - dnl Check for API introduced in Mac OS X 10.2. - AC_CACHE_CHECK([for CFPreferencesCopyAppValue], - [gt_cv_func_CFPreferencesCopyAppValue], - [gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include ]], - [[CFPreferencesCopyAppValue(NULL, NULL)]])], - [gt_cv_func_CFPreferencesCopyAppValue=yes], - [gt_cv_func_CFPreferencesCopyAppValue=no]) - LIBS="$gt_save_LIBS"]) - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then - AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], - [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) - fi - dnl Check for API introduced in Mac OS X 10.3. - AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], - [gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include ]], - [[CFLocaleCopyCurrent();]])], - [gt_cv_func_CFLocaleCopyCurrent=yes], - [gt_cv_func_CFLocaleCopyCurrent=no]) - LIBS="$gt_save_LIBS"]) - if test $gt_cv_func_CFLocaleCopyCurrent = yes; then - AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], - [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) - fi - INTL_MACOSX_LIBS= - if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" - fi - AC_SUBST([INTL_MACOSX_LIBS]) -]) diff -Nru gnome-online-accounts-3.30.1/m4/introspection.m4 gnome-online-accounts-3.31.90/m4/introspection.m4 --- gnome-online-accounts-3.30.1/m4/introspection.m4 2019-01-17 10:26:52.000000000 +0000 +++ gnome-online-accounts-3.31.90/m4/introspection.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,96 +0,0 @@ -dnl -*- mode: autoconf -*- -dnl Copyright 2009 Johan Dahlin -dnl -dnl This file is free software; the author(s) gives unlimited -dnl permission to copy and/or distribute it, with or without -dnl modifications, as long as this notice is preserved. -dnl - -# serial 1 - -m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], -[ - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([LT_INIT],[$0])dnl setup libtool first - - dnl enable/disable introspection - m4_if([$2], [require], - [dnl - enable_introspection=yes - ],[dnl - AC_ARG_ENABLE(introspection, - AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], - [Enable introspection for this build]),, - [enable_introspection=auto]) - ])dnl - - AC_MSG_CHECKING([for gobject-introspection]) - - dnl presence/version checking - AS_CASE([$enable_introspection], - [no], [dnl - found_introspection="no (disabled, use --enable-introspection to enable)" - ],dnl - [yes],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0],, - AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], - found_introspection=yes, - AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) - ],dnl - [auto],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) - dnl Canonicalize enable_introspection - enable_introspection=$found_introspection - ],dnl - [dnl - AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) - ])dnl - - AC_MSG_RESULT([$found_introspection]) - - INTROSPECTION_SCANNER= - INTROSPECTION_COMPILER= - INTROSPECTION_GENERATE= - INTROSPECTION_GIRDIR= - INTROSPECTION_TYPELIBDIR= - if test "x$found_introspection" = "xyes"; then - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection - fi - AC_SUBST(INTROSPECTION_SCANNER) - AC_SUBST(INTROSPECTION_COMPILER) - AC_SUBST(INTROSPECTION_GENERATE) - AC_SUBST(INTROSPECTION_GIRDIR) - AC_SUBST(INTROSPECTION_TYPELIBDIR) - AC_SUBST(INTROSPECTION_CFLAGS) - AC_SUBST(INTROSPECTION_LIBS) - AC_SUBST(INTROSPECTION_MAKEFILE) - - AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") -]) - - -dnl Usage: -dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) - -AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) -]) - -dnl Usage: -dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) - - -AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) -]) diff -Nru gnome-online-accounts-3.30.1/m4/lib-ld.m4 gnome-online-accounts-3.31.90/m4/lib-ld.m4 --- gnome-online-accounts-3.30.1/m4/lib-ld.m4 2019-01-17 10:26:52.000000000 +0000 +++ gnome-online-accounts-3.31.90/m4/lib-ld.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,119 +0,0 @@ -# lib-ld.m4 serial 6 -dnl Copyright (C) 1996-2003, 2009-2016 Free Software Foundation, 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 Subroutines of libtool.m4, -dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid -dnl collision with libtool.m4. - -dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no. -AC_DEFUN([AC_LIB_PROG_LD_GNU], -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld], -[# I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 /dev/null 2>&1 \ - && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ - || PATH_SEPARATOR=';' - } -fi - -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([acl_cv_path_LD], -[if test -z "$LD"; then - acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$acl_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - acl_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 `"$acl_cv_path_LD" -v 2>&1 = 1.10 to complain if config.rpath is missing. - m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])]) - AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS - AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld - AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host - AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir - AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [ - CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ - ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh - . ./conftest.sh - rm -f ./conftest.sh - acl_cv_rpath=done - ]) - wl="$acl_cv_wl" - acl_libext="$acl_cv_libext" - acl_shlibext="$acl_cv_shlibext" - acl_libname_spec="$acl_cv_libname_spec" - acl_library_names_spec="$acl_cv_library_names_spec" - acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - acl_hardcode_direct="$acl_cv_hardcode_direct" - acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" - dnl Determine whether the user wants rpath handling at all. - AC_ARG_ENABLE([rpath], - [ --disable-rpath do not hardcode runtime library paths], - :, enable_rpath=yes) -]) - -dnl AC_LIB_FROMPACKAGE(name, package) -dnl declares that libname comes from the given package. The configure file -dnl will then not have a --with-libname-prefix option but a -dnl --with-package-prefix option. Several libraries can come from the same -dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar -dnl macro call that searches for libname. -AC_DEFUN([AC_LIB_FROMPACKAGE], -[ - pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) - define([acl_frompackage_]NAME, [$2]) - popdef([NAME]) - pushdef([PACK],[$2]) - pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) - define([acl_libsinpackage_]PACKUP, - m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1]) - popdef([PACKUP]) - popdef([PACK]) -]) - -dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. -dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found -dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. -AC_DEFUN([AC_LIB_LINKFLAGS_BODY], -[ - AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) - pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])]) - pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) - pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])]) - dnl Autoconf >= 2.61 supports dots in --with options. - pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_ARG_WITH(P_A_C_K[-prefix], -[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib - --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/$acl_libdirstem" - if test "$acl_libdirstem2" != "$acl_libdirstem" \ - && ! test -d "$withval/$acl_libdirstem"; then - additional_libdir="$withval/$acl_libdirstem2" - fi - fi - fi -]) - dnl Search the library and its dependencies in $additional_libdir and - dnl $LDFLAGS. Using breadth-first-seach. - LIB[]NAME= - LTLIB[]NAME= - INC[]NAME= - LIB[]NAME[]_PREFIX= - dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been - dnl computed. So it has to be reset here. - HAVE_LIB[]NAME= - rpathdirs= - ltrpathdirs= - names_already_handled= - names_next_round='$1 $2' - while test -n "$names_next_round"; do - names_this_round="$names_next_round" - names_next_round= - for name in $names_this_round; do - already_handled= - for n in $names_already_handled; do - if test "$n" = "$name"; then - already_handled=yes - break - fi - done - if test -z "$already_handled"; then - names_already_handled="$names_already_handled $name" - dnl See if it was already located by an earlier AC_LIB_LINKFLAGS - dnl or AC_LIB_HAVE_LINKFLAGS call. - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` - eval value=\"\$HAVE_LIB$uppername\" - if test -n "$value"; then - if test "$value" = yes; then - eval value=\"\$LIB$uppername\" - test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" - eval value=\"\$LTLIB$uppername\" - test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" - else - dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined - dnl that this library doesn't exist. So just drop it. - : - fi - else - dnl Search the library lib$name in $additional_libdir and $LDFLAGS - dnl and the already constructed $LIBNAME/$LTLIBNAME. - found_dir= - found_la= - found_so= - found_a= - eval libname=\"$acl_libname_spec\" # typically: libname=lib$name - if test -n "$acl_shlibext"; then - shrext=".$acl_shlibext" # typically: shrext=.so - else - shrext= - fi - if test $use_additional = yes; then - dir="$additional_libdir" - dnl The same code as in the loop below: - dnl First look for a shared library. - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" - else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi - fi - fi - dnl Then look for a static library. - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" - fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" - fi - fi - fi - if test "X$found_dir" = "X"; then - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - case "$x" in - -L*) - dir=`echo "X$x" | sed -e 's/^X-L//'` - dnl First look for a shared library. - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" - else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi - fi - fi - dnl Then look for a static library. - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" - fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" - fi - fi - ;; - esac - if test "X$found_dir" != "X"; then - break - fi - done - fi - if test "X$found_dir" != "X"; then - dnl Found the library. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" - if test "X$found_so" != "X"; then - dnl Linking with a shared library. We attempt to hardcode its - dnl directory into the executable's runpath, unless it's the - dnl standard /usr/lib. - if test "$enable_rpath" = no \ - || test "X$found_dir" = "X/usr/$acl_libdirstem" \ - || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then - dnl No hardcoding is needed. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $found_dir" - fi - dnl The hardcoding into $LIBNAME is system dependent. - if test "$acl_hardcode_direct" = yes; then - dnl Using DIR/libNAME.so during linking hardcodes DIR into the - dnl resulting binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $found_dir" - fi - else - dnl Rely on "-L$found_dir". - dnl But don't add it if it's already contained in the LDFLAGS - dnl or the already constructed $LIBNAME - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" - fi - if test "$acl_hardcode_minus_L" != no; then - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH - dnl here, because this doesn't fit in flags passed to the - dnl compiler. So give up. No hardcoding. This affects only - dnl very old systems. - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - fi - fi - fi - fi - else - if test "X$found_a" != "X"; then - dnl Linking with a static library. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" - else - dnl We shouldn't come here, but anyway it's good to have a - dnl fallback. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" - fi - fi - dnl Assume the include files are nearby. - additional_includedir= - case "$found_dir" in - */$acl_libdirstem | */$acl_libdirstem/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` - if test "$name" = '$1'; then - LIB[]NAME[]_PREFIX="$basedir" - fi - additional_includedir="$basedir/include" - ;; - */$acl_libdirstem2 | */$acl_libdirstem2/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` - if test "$name" = '$1'; then - LIB[]NAME[]_PREFIX="$basedir" - fi - additional_includedir="$basedir/include" - ;; - esac - if test "X$additional_includedir" != "X"; then - dnl Potentially add $additional_includedir to $INCNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's /usr/local/include and we are using GCC on Linux, - dnl 3. if it's already present in $CPPFLAGS or the already - dnl constructed $INCNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - for x in $CPPFLAGS $INC[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $INCNAME. - INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" - fi - fi - fi - fi - fi - dnl Look for dependencies. - if test -n "$found_la"; then - dnl Read the .la file. It defines the variables - dnl dlname, library_names, old_library, dependency_libs, current, - dnl age, revision, installed, dlopen, dlpreopen, libdir. - save_libdir="$libdir" - case "$found_la" in - */* | *\\*) . "$found_la" ;; - *) . "./$found_la" ;; - esac - libdir="$save_libdir" - dnl We use only dependency_libs. - for dep in $dependency_libs; do - case "$dep" in - -L*) - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's /usr/local/lib and we are using GCC on Linux, - dnl 3. if it's already present in $LDFLAGS or the already - dnl constructed $LIBNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ - && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then - haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ - || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LIBNAME. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" - fi - fi - haveit= - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LTLIBNAME. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" - fi - fi - fi - fi - ;; - -R*) - dir=`echo "X$dep" | sed -e 's/^X-R//'` - if test "$enable_rpath" != no; then - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $dir" - fi - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $dir" - fi - fi - ;; - -l*) - dnl Handle this in the next round. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` - ;; - *.la) - dnl Handle this in the next round. Throw away the .la's - dnl directory; it is already contained in a preceding -L - dnl option. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` - ;; - *) - dnl Most likely an immediate library name. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" - ;; - esac - done - fi - else - dnl Didn't find the library; assume it is in the system directories - dnl known to the linker and runtime loader. (All the system - dnl directories known to the linker should also be known to the - dnl runtime loader, otherwise the system is severely misconfigured.) - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" - fi - fi - fi - done - done - if test "X$rpathdirs" != "X"; then - if test -n "$acl_hardcode_libdir_separator"; then - dnl Weird platform: only the last -rpath option counts, the user must - dnl pass all path elements in one option. We can arrange that for a - dnl single library, but not when more than one $LIBNAMEs are used. - alldirs= - for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" - done - dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl. - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - else - dnl The -rpath options are cumulative. - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - done - fi - fi - if test "X$ltrpathdirs" != "X"; then - dnl When using libtool, the option that works for both libraries and - dnl executables is -R. The -R options are cumulative. - for found_dir in $ltrpathdirs; do - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" - done - fi - popdef([P_A_C_K]) - popdef([PACKLIBS]) - popdef([PACKUP]) - popdef([PACK]) - popdef([NAME]) -]) - -dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, -dnl unless already present in VAR. -dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes -dnl contains two or three consecutive elements that belong together. -AC_DEFUN([AC_LIB_APPENDTOVAR], -[ - for element in [$2]; do - haveit= - for x in $[$1]; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - [$1]="${[$1]}${[$1]:+ }$element" - fi - done -]) - -dnl For those cases where a variable contains several -L and -l options -dnl referring to unknown libraries and directories, this macro determines the -dnl necessary additional linker options for the runtime path. -dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL]) -dnl sets LDADDVAR to linker options needed together with LIBSVALUE. -dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed, -dnl otherwise linking without libtool is assumed. -AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], -[ - AC_REQUIRE([AC_LIB_RPATH]) - AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - $1= - if test "$enable_rpath" != no; then - if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then - dnl Use an explicit option to hardcode directories into the resulting - dnl binary. - rpathdirs= - next= - for opt in $2; do - if test -n "$next"; then - dir="$next" - dnl No need to hardcode the standard /usr/lib. - if test "X$dir" != "X/usr/$acl_libdirstem" \ - && test "X$dir" != "X/usr/$acl_libdirstem2"; then - rpathdirs="$rpathdirs $dir" - fi - next= - else - case $opt in - -L) next=yes ;; - -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` - dnl No need to hardcode the standard /usr/lib. - if test "X$dir" != "X/usr/$acl_libdirstem" \ - && test "X$dir" != "X/usr/$acl_libdirstem2"; then - rpathdirs="$rpathdirs $dir" - fi - next= ;; - *) next= ;; - esac - fi - done - if test "X$rpathdirs" != "X"; then - if test -n ""$3""; then - dnl libtool is used for linking. Use -R options. - for dir in $rpathdirs; do - $1="${$1}${$1:+ }-R$dir" - done - else - dnl The linker is used for linking directly. - if test -n "$acl_hardcode_libdir_separator"; then - dnl Weird platform: only the last -rpath option counts, the user - dnl must pass all path elements in one option. - alldirs= - for dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir" - done - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - $1="$flag" - else - dnl The -rpath options are cumulative. - for dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$dir" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - $1="${$1}${$1:+ }$flag" - done - fi - fi - fi - fi - fi - AC_SUBST([$1]) -]) diff -Nru gnome-online-accounts-3.30.1/m4/lib-prefix.m4 gnome-online-accounts-3.31.90/m4/lib-prefix.m4 --- gnome-online-accounts-3.30.1/m4/lib-prefix.m4 2019-01-17 10:26:52.000000000 +0000 +++ gnome-online-accounts-3.31.90/m4/lib-prefix.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,224 +0,0 @@ -# lib-prefix.m4 serial 7 (gettext-0.18) -dnl Copyright (C) 2001-2005, 2008-2016 Free Software Foundation, 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 From Bruno Haible. - -dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and -dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't -dnl require excessive bracketing. -ifdef([AC_HELP_STRING], -[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], -[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) - -dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed -dnl to access previously installed libraries. The basic assumption is that -dnl a user will want packages to use other packages he previously installed -dnl with the same --prefix option. -dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate -dnl libraries, but is otherwise very convenient. -AC_DEFUN([AC_LIB_PREFIX], -[ - AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_LIB_ARG_WITH([lib-prefix], -[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib - --without-lib-prefix don't search for libraries in includedir and libdir], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/$acl_libdirstem" - fi - fi -]) - if test $use_additional = yes; then - dnl Potentially add $additional_includedir to $CPPFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's already present in $CPPFLAGS, - dnl 3. if it's /usr/local/include and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - for x in $CPPFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $CPPFLAGS. - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" - fi - fi - fi - fi - dnl Potentially add $additional_libdir to $LDFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's already present in $LDFLAGS, - dnl 3. if it's /usr/local/lib and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then - haveit= - for x in $LDFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LDFLAGS. - LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" - fi - fi - fi - fi - fi -]) - -dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, -dnl acl_final_exec_prefix, containing the values to which $prefix and -dnl $exec_prefix will expand at the end of the configure script. -AC_DEFUN([AC_LIB_PREPARE_PREFIX], -[ - dnl Unfortunately, prefix and exec_prefix get only finally determined - dnl at the end of configure. - if test "X$prefix" = "XNONE"; then - acl_final_prefix="$ac_default_prefix" - else - acl_final_prefix="$prefix" - fi - if test "X$exec_prefix" = "XNONE"; then - acl_final_exec_prefix='${prefix}' - else - acl_final_exec_prefix="$exec_prefix" - fi - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" - prefix="$acl_save_prefix" -]) - -dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the -dnl variables prefix and exec_prefix bound to the values they will have -dnl at the end of the configure script. -AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], -[ - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - $1 - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" -]) - -dnl AC_LIB_PREPARE_MULTILIB creates -dnl - a variable acl_libdirstem, containing the basename of the libdir, either -dnl "lib" or "lib64" or "lib/64", -dnl - a variable acl_libdirstem2, as a secondary possible value for -dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or -dnl "lib/amd64". -AC_DEFUN([AC_LIB_PREPARE_MULTILIB], -[ - dnl There is no formal standard regarding lib and lib64. - dnl On glibc systems, the current practice is that on a system supporting - dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under - dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine - dnl the compiler's default mode by looking at the compiler's library search - dnl path. If at least one of its elements ends in /lib64 or points to a - dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI. - dnl Otherwise we use the default, namely "lib". - dnl On Solaris systems, the current practice is that on a system supporting - dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under - dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or - dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib. - AC_REQUIRE([AC_CANONICAL_HOST]) - acl_libdirstem=lib - acl_libdirstem2= - case "$host_os" in - solaris*) - dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment - dnl . - dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link." - dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the - dnl symlink is missing, so we set acl_libdirstem2 too. - AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit], - [AC_EGREP_CPP([sixtyfour bits], [ -#ifdef _LP64 -sixtyfour bits -#endif - ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no]) - ]) - if test $gl_cv_solaris_64bit = yes; then - acl_libdirstem=lib/64 - case "$host_cpu" in - sparc*) acl_libdirstem2=lib/sparcv9 ;; - i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; - esac - fi - ;; - *) - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - */../ | */.. ) - # Better ignore directories of this form. They are misleading. - ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; - esac - fi - done - IFS="$acl_save_IFS" - fi - ;; - esac - test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" -]) diff -Nru gnome-online-accounts-3.30.1/m4/libtool.m4 gnome-online-accounts-3.31.90/m4/libtool.m4 --- gnome-online-accounts-3.30.1/m4/libtool.m4 2019-01-17 10:27:04.000000000 +0000 +++ gnome-online-accounts-3.31.90/m4/libtool.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,8372 +0,0 @@ -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# -# Copyright (C) 1996-2001, 2003-2015 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) 2014 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 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 this program. If not, see . -]) - -# serial 58 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.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK -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_PREPARE_CC_BASENAME -# ----------------------- -m4_defun([_LT_PREPARE_CC_BASENAME], [ -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -func_cc_basename () -{ - for cc_temp in @S|@*""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac - done - func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` -} -])# _LT_PREPARE_CC_BASENAME - - -# _LT_CC_BASENAME(CC) -# ------------------- -# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME, -# but that macro is also expanded into generated libtool script, which -# arranges for $SED and $ECHO to be set by different means. -m4_defun([_LT_CC_BASENAME], -[m4_require([_LT_PREPARE_CC_BASENAME])dnl -AC_REQUIRE([_LT_DECL_SED])dnl -AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl -func_cc_basename $1 -cc_basename=$func_cc_basename_result -]) - - -# _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 -m4_require([_LT_CMD_TRUNCATE])dnl - -_LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options that 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 set != "${COLLECT_NAMES+set}"; 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 - - -## ------------------------------------- ## -## Accumulate code for creating libtool. ## -## ------------------------------------- ## - -# 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], [[!?.]$], [], [.]) -)]) - - - -## ------------------------ ## -## FIXME: Eliminate VARNAME ## -## ------------------------ ## - - -# _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\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes - ;; - *) - 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\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes - ;; - *) - 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 0 = "$lt_write_fail" && 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 yes = "$silent" && - 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 that 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 -# Generated automatically by $as_me ($PACKAGE) $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. - -# Provide generalized library-building support services. -# Written by Gordon Matzigkeit, 1996 - -_LT_COPYING -_LT_LIBTOOL_TAGS - -# Configured defaults for sys_lib_dlsearch_path munging. -: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} - -# ### BEGIN LIBTOOL CONFIG -_LT_LIBTOOL_CONFIG_VARS -_LT_LIBTOOL_TAG_VARS -# ### END LIBTOOL CONFIG - -_LT_EOF - - cat <<'_LT_EOF' >> "$cfgfile" - -# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE - -_LT_PREPARE_MUNGE_PATH_LIST -_LT_PREPARE_CC_BASENAME - -# ### END FUNCTIONS SHARED WITH CONFIGURE - -_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 set != "${COLLECT_NAMES+set}"; 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) - - 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' - 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 0 = "$_lt_result"; 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 0 = "$_lt_result" && $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 yes = "$lt_cv_apple_cc_single_mod"; then - _lt_dar_single_mod='$single_module' - fi - if test yes = "$lt_cv_ld_exported_symbols_list"; 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 no = "$lt_cv_ld_force_load"; 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 yes = "$lt_cv_ld_force_load"; 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*|nagfor*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; - esac - if test yes = "$_lt_dar_can_shared"; 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 yes != "$lt_cv_apple_cc_single_mod"; 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 set = "${lt_cv_aix_libpath+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 that will find a shell with a builtin -# printf (that 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], -[AS_HELP_STRING([--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 yes = "$GCC"; 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 where 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 no = "$enable_libtool_lock" || 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 what ABI is being produced by ac_compile, and set mode - # options accordingly. - 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 what ABI is being produced by ac_compile, and set linker - # options accordingly. - echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - if test yes = "$lt_cv_prog_gnu_ld"; 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* - ;; - -mips64*-*linux*) - # Find out what ABI is being produced by ac_compile, and set linker - # options accordingly. - echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - emul=elf - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - emul="${emul}32" - ;; - *64-bit*) - emul="${emul}64" - ;; - esac - case `/usr/bin/file conftest.$ac_objext` in - *MSB*) - emul="${emul}btsmip" - ;; - *LSB*) - emul="${emul}ltsmip" - ;; - esac - case `/usr/bin/file conftest.$ac_objext` in - *N32*) - emul="${emul}n32" - ;; - esac - LD="${LD-ld} -m $emul" - fi - rm -rf conftest* - ;; - -x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ -s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out what ABI is being produced by ac_compile, and set linker - # options accordingly. Note that the listed cases only cover the - # situations where additional linker options are needed (such as when - # doing 32-bit compilation for a host where ld defaults to 64-bit, or - # vice versa); the common cases where no linker options are needed do - # not appear in the list. - 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*) - case `/usr/bin/file conftest.o` in - *x86-64*) - LD="${LD-ld} -m elf32_x86_64" - ;; - *) - LD="${LD-ld} -m elf_i386" - ;; - esac - ;; - 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 yes != "$lt_cv_cc_needs_belf"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS=$SAVE_CFLAGS - fi - ;; -*-*solaris*) - # Find out what ABI is being produced by ac_compile, and set linker - # options accordingly. - 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*|x86_64-*-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 0 -eq "$ac_status"; then - # Ensure the archiver fails upon bogus file names. - rm -f conftest.$ac_objext libconftest.a - AC_TRY_EVAL([lt_ar_try]) - if test 0 -ne "$ac_status"; then - lt_cv_ar_at_file=@ - fi - fi - rm -f conftest.* libconftest.a - ]) - ]) - -if test no = "$lt_cv_ar_at_file"; 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 - bitrig* | 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" ## exclude from sc_useless_quotes_in_assignment - # 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 yes = "[$]$2"; 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 yes = "[$]$2"; 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; - ;; - - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) - # 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" && \ - test undefined != "$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 17 != "$i" # 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 yes = "$cross_compiling"; 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 -fvisibility=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 yes != "$enable_dlopen"; 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 - ]) - ;; - - tpf*) - # Don't try to run any link tests for TPF. We know it's impossible - # because TPF is a cross-compiler, and we know how we open DSOs. - lt_cv_dlopen=dlopen - lt_cv_dlopen_libs= - lt_cv_dlopen_self=no - ;; - - *) - 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 no = "$lt_cv_dlopen"; then - enable_dlopen=no - else - enable_dlopen=yes - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS=$CPPFLAGS - test yes = "$ac_cv_header_dlfcn_h" && 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 yes = "$lt_cv_dlopen_self"; 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 no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; 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 no = "$hard_links"; 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 where 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 yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then - - # We can hardcode non-existent directories. - if test no != "$_LT_TAGVAR(hardcode_direct, $1)" && - # 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 no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" && - test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; 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 relink = "$_LT_TAGVAR(hardcode_action, $1)" || - test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then - # Fast installation is not supported - enable_fast_install=no -elif test yes = "$shlibpath_overrides_runpath" || - test no = "$enable_shared"; 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_PREPARE_MUNGE_PATH_LIST -# --------------------------- -# Make sure func_munge_path_list() is defined correctly. -m4_defun([_LT_PREPARE_MUNGE_PATH_LIST], -[[# func_munge_path_list VARIABLE PATH -# ----------------------------------- -# VARIABLE is name of variable containing _space_ separated list of -# directories to be munged by the contents of PATH, which is string -# having a format: -# "DIR[:DIR]:" -# string "DIR[ DIR]" will be prepended to VARIABLE -# ":DIR[:DIR]" -# string "DIR[ DIR]" will be appended to VARIABLE -# "DIRP[:DIRP]::[DIRA:]DIRA" -# string "DIRP[ DIRP]" will be prepended to VARIABLE and string -# "DIRA[ DIRA]" will be appended to VARIABLE -# "DIR[:DIR]" -# VARIABLE will be replaced by "DIR[ DIR]" -func_munge_path_list () -{ - case x@S|@2 in - x) - ;; - *:) - eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\" - ;; - x:*) - eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\" - ;; - *::*) - eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" - eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\" - ;; - *) - eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\" - ;; - esac -} -]])# _LT_PREPARE_PATH_LIST - - -# _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 -m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl -AC_MSG_CHECKING([dynamic linker characteristics]) -m4_if([$1], - [], [ -if test yes = "$GCC"; 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` - # ...but if some path component already ends with the multilib dir we assume - # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). - case "$lt_multi_os_dir; $lt_search_path_spec " in - "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) - lt_multi_os_dir= - ;; - esac - 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" - elif test -n "$lt_multi_os_dir"; then - 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 - -AC_ARG_VAR([LT_SYS_LIBRARY_PATH], -[User-defined run-time library search path.]) - -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 ia64 = "$host_cpu"; 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 - # Using Import Files as archive members, it is possible to support - # filename-based versioning of shared library archives on AIX. While - # this would work for both with and without runtime linking, it will - # prevent static linking of such archives. So we do filename-based - # shared library versioning with .so extension only, which is used - # when both runtime linking and shared linking is enabled. - # Unfortunately, runtime linking may impact performance, so we do - # not want this to be the default eventually. Also, we use the - # versioned .so libs for executables only if there is the -brtl - # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. - # To allow for filename-based versioning support, we need to create - # libNAME.so.V as an archive file, containing: - # *) an Import File, referring to the versioned filename of the - # archive as well as the shared archive member, telling the - # bitwidth (32 or 64) of that shared object, and providing the - # list of exported symbols of that shared object, eventually - # decorated with the 'weak' keyword - # *) the shared object with the F_LOADONLY flag set, to really avoid - # it being seen by the linker. - # At run time we better use the real file rather than another symlink, - # but for link time we create the symlink libNAME.so -> libNAME.so.V - - case $with_aix_soname,$aix_use_runtimelinking in - # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - aix,yes) # traditional libtool - dynamic_linker='AIX unversionable lib.so' - # 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' - ;; - aix,no) # traditional AIX only - dynamic_linker='AIX lib.a[(]lib.so.V[)]' - # 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' - ;; - svr4,*) # full svr4 only - dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]" - library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' - # We do not specify a path in Import Files, so LIBPATH fires. - shlibpath_overrides_runpath=yes - ;; - *,yes) # both, prefer svr4 - dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]" - library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' - # unpreferred sharedlib libNAME.a needs extra handling - postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' - postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' - # We do not specify a path in Import Files, so LIBPATH fires. - shlibpath_overrides_runpath=yes - ;; - *,no) # both, prefer aix - dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]" - library_names_spec='$libname$release.a $libname.a' - soname_spec='$libname$release$shared_ext$major' - # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling - postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' - postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' - ;; - esac - 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%'\''`; $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$major $libname$shared_ext' - soname_spec='$libname$release$shared_ext$major' - 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 - ;; - -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=no - 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 32 = "$HPUX_IA64_MODE"; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - sys_lib_dlsearch_path_spec=/usr/lib/hpux32 - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - sys_lib_dlsearch_path_spec=/usr/lib/hpux64 - fi - ;; - 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 yes = "$lt_cv_prog_gnu_ld"; 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 - ;; - -linux*android*) - version_type=none # Android doesn't support versioned libraries. - need_lib_prefix=no - need_version=no - library_names_spec='$libname$release$shared_ext' - soname_spec='$libname$release$shared_ext' - finish_cmds= - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - - # 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 - - dynamic_linker='Android linker' - # Don't embed -rpath directories since the linker doesn't support them. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - ;; - -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | 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" - - # Ideally, we could use ldconfig to report *all* directores which are - # searched for libraries, however this is still not possible. Aside from not - # being certain /sbin/ldconfig is available, command - # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, - # even though it is searched at run-time. Try to do the best guess by - # appending ld.so.conf contents (and includes) 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* | bitrig*) - version_type=sunos - sys_lib_dlsearch_path_spec=/usr/lib - need_lib_prefix=no - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then - need_version=no - else - need_version=yes - fi - 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 - shlibpath_overrides_runpath=yes - ;; - -os2*) - libname_spec='$name' - version_type=windows - shrext_cmds=.dll - need_version=no - need_lib_prefix=no - # OS/2 can only load a DLL with a base name of 8 characters or less. - soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; - v=$($ECHO $release$versuffix | tr -d .-); - n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); - $ECHO $n$v`$shared_ext' - library_names_spec='${libname}_dll.$libext' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=BEGINLIBPATH - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - 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' - ;; - -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 yes = "$with_gnu_ld"; 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=sco - 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 yes = "$with_gnu_ld"; 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 no = "$dynamic_linker" && can_build_shared=no - -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test yes = "$GCC"; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - -if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then - sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec -fi - -if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then - sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec -fi - -# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... -configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec - -# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code -func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" - -# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool -configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH - -_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], [configure_time_dlsearch_path], [2], - [Detected run-time system search path for libraries]) -_LT_DECL([], [configure_time_lt_sys_library_path], [2], - [Explicit LT_SYS_LIBRARY_PATH set during ./configure time]) -])# _LT_SYS_DYNAMIC_LINKER - - -# _LT_PATH_TOOL_PREFIX(TOOL) -# -------------------------- -# find a file program that 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 that 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 no = "$withval" || with_gnu_ld=yes], - [with_gnu_ld=no])dnl - -ac_prog=ld -if test yes = "$GCC"; 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 yes = "$with_gnu_ld"; 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 conftest.i -cat conftest.i conftest.i >conftest2.i -: ${lt_DD:=$DD} -AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd], -[if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then - cmp -s conftest.i conftest.out \ - && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: -fi]) -rm -f conftest.i conftest2.i conftest.out]) -])# _LT_PATH_DD - - -# _LT_CMD_TRUNCATE -# ---------------- -# find command to truncate a binary pipe -m4_defun([_LT_CMD_TRUNCATE], -[m4_require([_LT_PATH_DD]) -AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin], -[printf 0123456789abcdef0123456789abcdef >conftest.i -cat conftest.i conftest.i >conftest2.i -lt_cv_truncate_bin= -if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then - cmp -s conftest.i conftest.out \ - && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" -fi -rm -f conftest.i conftest2.i conftest.out -test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"]) -_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1], - [Command to truncate a binary pipe]) -])# _LT_CMD_TRUNCATE - - -# _LT_CHECK_MAGIC_METHOD -# ---------------------- -# how to check for library dependencies -# -- PORTME fill in with the dynamic library characteristics -m4_defun([_LT_CHECK_MAGIC_METHOD], -[m4_require([_LT_DECL_EGREP]) -m4_require([_LT_DECL_OBJDUMP]) -AC_CACHE_CHECK([how to recognize dependent libraries], -lt_cv_deplibs_check_method, -[lt_cv_file_magic_cmd='$MAGIC_CMD' -lt_cv_file_magic_test_file= -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 -# that 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. - if ( file / ) >/dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else - # 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 - ;; - -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 | 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* | bitrig*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; 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 - ;; -os2*) - 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 - # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty - case $build_os in - mingw*) lt_bad_file=conftest.nm/nofile ;; - *) lt_bad_file=/dev/null ;; - esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in - *$lt_bad_file* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break 2 - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break 2 - ;; - *) - 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 no != "$lt_cv_path_NM"; 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 -headers /dev/null 2>&1 | sed '1q'` in - *COFF*) - DUMPBIN="$DUMPBIN -symbols -headers" - ;; - *) - 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 one 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 yes != "$lt_cv_path_mainfest_tool"; then - MANIFEST_TOOL=: -fi -_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl -])# _LT_PATH_MANIFEST_TOOL - - -# _LT_DLL_DEF_P([FILE]) -# --------------------- -# True iff FILE is a Windows DLL '.def' file. -# Keep in sync with func_dll_def_p in the libtool script -AC_DEFUN([_LT_DLL_DEF_P], -[dnl - test DEF = "`$SED -n dnl - -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace - -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments - -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl - -e q dnl Only consider the first "real" line - $1`" dnl -])# _LT_DLL_DEF_P - - -# 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 yes = "$GCC"; 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 ia64 = "$host_cpu"; 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 - -if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" - # Adjust the below global symbol transforms to fixup imported variables. - lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" - lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" - lt_c_name_lib_hook="\ - -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ - -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" -else - # Disable hooks by default. - lt_cv_sys_global_symbol_to_import= - lt_cdecl_hook= - lt_c_name_hook= - lt_c_name_lib_hook= -fi - -# 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"\ -$lt_cdecl_hook\ -" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ -" -e 's/^$symcode$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"\ -$lt_c_name_hook\ -" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ -" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" - -# Transform an extracted symbol line into symbol name with lib prefix and -# symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ -$lt_c_name_lib_hook\ -" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ -" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ -" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/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, - # D for any global variable and I for any imported 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};"\ -" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ -" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ -" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ -" \$ 0!~/External *\|/{next};"\ -" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ -" {if(hide[section]) next};"\ -" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ -" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ -" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print f,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 can'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* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$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 yes = "$pipe_works"; 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_import], [lt_cv_sys_global_symbol_to_import], [1], - [Transform the output of nm into a list of symbols to manually relocate]) -_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_interface], [lt_cv_nm_interface], [1], - [The name lister interface]) -_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 yes = "$GXX"; 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 ia64 = "$host_cpu"; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - - 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']) - case $host_os in - os2*) - _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' - ;; - esac - ;; - 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 ia64 = "$host_cpu"; 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 ia64 != "$host_cpu"; 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 | 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 yes = "$GCC"; 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 ia64 = "$host_cpu"; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - - 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']) - case $host_os in - os2*) - _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' - ;; - esac - ;; - - 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 ia64 = "$host_cpu"; 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 - ;; - - 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' - case $cc_basename in - 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' - ;; - esac - ;; - - 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']) - case $host_os in - os2*) - _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' - ;; - esac - ;; - - 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 | 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' - ;; - tcc*) - # Fabrice Bellard et al's Tiny 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)='-static' - ;; - 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 that 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 GNU nm, but means don't demangle to AIX nm. - # Without the "-l" option, or with the "-B" option, AIX nm treats - # weak defined symbols like other global defined symbols, whereas - # GNU nm marks them as "W". - # While the 'weak' keyword is ignored in the Export File, we need - # it in the Import File for the 'aix-soname' feature, so we have - # to replace the "-B" option with "-P" for AIX nm. - 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) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' - else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | 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 yes != "$GCC"; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd* | bitrig*) - 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 yes = "$with_gnu_ld"; 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 yes = "$lt_use_gnu_ld_interface"; 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 | $SED -e 's/([^)]\+)\s\+//' 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 ia64 != "$host_cpu"; 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, use it as - # is; otherwise, prepend EXPORTS... - _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); 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 - ;; - - os2*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - shrext_cmds=.dll - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ - emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ - $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ - emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ - prefix_cmds="$SED"~ - if test EXPORTS = "`$SED 1q $export_symbols`"; then - prefix_cmds="$prefix_cmds -e 1d"; - fi~ - prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ - cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ - $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ - emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' - _LT_TAGVAR(enable_shared_with_static_runtimes, $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 linux-dietlibc = "$host_os"; 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 no = "$tmp_diet" - 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' ;; - nagfor*) # NAGFOR 5.3 - tmp_sharedflag='-Wl,-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 yes = "$supports_anon_versioning"; 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 - tcc*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' - ;; - 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 yes = "$supports_anon_versioning"; 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 cannot -*** 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 no = "$_LT_TAGVAR(ld_shlibs, $1)"; 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 yes = "$GCC" && 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 ia64 = "$host_cpu"; 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 GNU nm, but means don't demangle to AIX nm. - # Without the "-l" option, or with the "-B" option, AIX nm treats - # weak defined symbols like other global defined symbols, whereas - # GNU nm marks them as "W". - # While the 'weak' keyword is ignored in the Export File, we need - # it in the Import File for the 'aix-soname' feature, so we have - # to replace the "-B" option with "-P" for AIX nm. - 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) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' - else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | 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 - # have runtime linking enabled, and use it for executables. - # For shared libraries, we enable/disable runtime linking - # depending on the kind of the shared library created - - # when "with_aix_soname,aix_use_runtimelinking" is: - # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables - # "aix,yes" lib.so shared, rtl:yes, for executables - # lib.a static archive - # "both,no" lib.so.V(shr.o) shared, rtl:yes - # lib.a(lib.so.V) shared, rtl:no, for executables - # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables - # lib.a(lib.so.V) shared, rtl:no - # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables - # lib.a static archive - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then - aix_use_runtimelinking=yes - break - fi - done - if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then - # With aix-soname=svr4, we create the lib.so.V shared archives only, - # so we don't have lib.a shared libs to link our executables. - # We have to force runtime linking in this case. - aix_use_runtimelinking=yes - LDFLAGS="$LDFLAGS -Wl,-brtl" - fi - ;; - 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,' - case $with_aix_soname,$aix_use_runtimelinking in - aix,*) ;; # traditional, no import file - svr4,* | *,yes) # use import file - # The Import File defines what to hardcode. - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=no - ;; - esac - - if test yes = "$GCC"; 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 yes = "$aix_use_runtimelinking"; then - shared_flag="$shared_flag "'$wl-G' - fi - # Need to ensure runtime linking is disabled for the traditional - # shared library, or the linker may eventually find shared libraries - # /with/ Import File - we do not want to mix them. - shared_flag_aix='-shared' - shared_flag_svr4='-shared $wl-G' - else - # not using gcc - if test ia64 = "$host_cpu"; 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 yes = "$aix_use_runtimelinking"; then - shared_flag='$wl-G' - else - shared_flag='$wl-bM:SRE' - fi - shared_flag_aix='$wl-bM:SRE' - shared_flag_svr4='$wl-G' - 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,yes = "$with_aix_soname,$aix_use_runtimelinking"; 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 -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag - else - if test ia64 = "$host_cpu"; 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 yes = "$with_gnu_ld"; 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 - _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' - # -brtl affects multiple linker settings, -berok does not and is overridden later - compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' - if test svr4 != "$with_aix_soname"; then - # This is similar to how AIX traditionally builds its shared libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' - fi - if test aix != "$with_aix_soname"; then - _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' - else - # used by -dlpreopen to get the symbols - _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' - fi - _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' - 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,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then - cp "$export_symbols" "$output_objdir/$soname.def"; - echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; - else - $SED -e '\''s/^/-link -EXPORT:/'\'' < $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 yes = "$GCC"; 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 "x$output_objdir/$soname" = "x$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 "x$output_objdir/$soname" = "x$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 yes,no = "$GCC,$with_gnu_ld"; 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 no = "$with_gnu_ld"; 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 yes,no = "$GCC,$with_gnu_ld"; 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 no = "$with_gnu_ld"; 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 yes = "$GCC"; 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 yes = "$lt_cv_irix_exported_symbol"; 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 - ;; - - linux*) - case $cc_basename in - tcc*) - # Fabrice Bellard et al's Tiny C Compiler - _LT_TAGVAR(ld_shlibs, $1)=yes - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - 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* | bitrig*) - 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__`"; 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 - _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' - 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 - shrext_cmds=.dll - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ - emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ - $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ - emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ - prefix_cmds="$SED"~ - if test EXPORTS = "`$SED 1q $export_symbols`"; then - prefix_cmds="$prefix_cmds -e 1d"; - fi~ - prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ - cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ - $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ - emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - - osf3*) - if test yes = "$GCC"; 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 yes = "$GCC"; 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 yes = "$GCC"; 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 yes = "$GCC"; 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 sequent = "$host_vendor"; 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 yes = "$GCC"; 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 CANNOT 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 yes = "$GCC"; 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 sni = "$host_vendor"; 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 no = "$_LT_TAGVAR(ld_shlibs, $1)" && 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 yes,yes = "$GCC,$enable_shared"; 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 - -## 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... -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 what 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 no = "$can_build_shared" && 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 yes = "$enable_shared" && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - - aix[[4-9]]*) - if test ia64 != "$host_cpu"; then - case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in - yes,aix,yes) ;; # shared object as lib.so file only - yes,svr4,*) ;; # shared object as lib.so archive member only - yes,*) enable_static=no ;; # shared object in lib.a archive as well - esac - 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 yes = "$enable_shared" || 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 no != "$CXX" && - ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || - (test g++ != "$CXX"))); 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 yes != "$_lt_caught_CXX_error"; 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 yes = "$GXX"; 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 yes = "$GXX"; 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 yes = "$with_gnu_ld"; 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 ia64 = "$host_cpu"; 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 - # have runtime linking enabled, and use it for executables. - # For shared libraries, we enable/disable runtime linking - # depending on the kind of the shared library created - - # when "with_aix_soname,aix_use_runtimelinking" is: - # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables - # "aix,yes" lib.so shared, rtl:yes, for executables - # lib.a static archive - # "both,no" lib.so.V(shr.o) shared, rtl:yes - # lib.a(lib.so.V) shared, rtl:no, for executables - # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables - # lib.a(lib.so.V) shared, rtl:no - # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables - # lib.a static archive - 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 - if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then - # With aix-soname=svr4, we create the lib.so.V shared archives only, - # so we don't have lib.a shared libs to link our executables. - # We have to force runtime linking in this case. - aix_use_runtimelinking=yes - LDFLAGS="$LDFLAGS -Wl,-brtl" - fi - ;; - 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,' - case $with_aix_soname,$aix_use_runtimelinking in - aix,*) ;; # no import file - svr4,* | *,yes) # use import file - # The Import File defines what to hardcode. - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=no - ;; - esac - - if test yes = "$GXX"; 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 yes = "$aix_use_runtimelinking"; then - shared_flag=$shared_flag' $wl-G' - fi - # Need to ensure runtime linking is disabled for the traditional - # shared library, or the linker may eventually find shared libraries - # /with/ Import File - we do not want to mix them. - shared_flag_aix='-shared' - shared_flag_svr4='-shared $wl-G' - else - # not using gcc - if test ia64 = "$host_cpu"; 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 yes = "$aix_use_runtimelinking"; then - shared_flag='$wl-G' - else - shared_flag='$wl-bM:SRE' - fi - shared_flag_aix='$wl-bM:SRE' - shared_flag_svr4='$wl-G' - 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,yes = "$with_aix_soname,$aix_use_runtimelinking"; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - # The "-G" linker flag allows undefined symbols. - _LT_TAGVAR(no_undefined_flag, $1)='-bernotok' - # 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 -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag - else - if test ia64 = "$host_cpu"; 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 yes = "$with_gnu_ld"; 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 - _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' - # -brtl affects multiple linker settings, -berok does not and is overridden later - compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' - if test svr4 != "$with_aix_soname"; then - # This is similar to how AIX traditionally builds its shared - # libraries. Need -bnortl late, we may have -brtl in LDFLAGS. - _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' - fi - if test aix != "$with_aix_soname"; then - _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' - else - # used by -dlpreopen to get the symbols - _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' - fi - _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' - 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,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then - cp "$export_symbols" "$output_objdir/$soname.def"; - echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; - else - $SED -e '\''s/^/-link -EXPORT:/'\'' < $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, use it as - # is; otherwise, prepend EXPORTS... - _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); 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) - ;; - - os2*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - shrext_cmds=.dll - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ - emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ - $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ - emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ - prefix_cmds="$SED"~ - if test EXPORTS = "`$SED 1q $export_symbols`"; then - prefix_cmds="$prefix_cmds -e 1d"; - fi~ - prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ - cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ - $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ - emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - - 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 - ;; - - 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 "x$output_objdir/$soname" = "x$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 yes = "$GXX"; 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 "x$output_objdir/$soname" = "x$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 no = "$with_gnu_ld"; 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 yes = "$GXX"; then - if test no = "$with_gnu_ld"; 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 yes = "$GXX"; then - if test no = "$with_gnu_ld"; 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 | 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 yes = "$supports_anon_versioning"; 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 - ;; - - openbsd* | bitrig*) - 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__`"; 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 yes,no = "$GXX,$with_gnu_ld"; 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 yes,no = "$GXX,$with_gnu_ld"; 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 $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 $wl-h $wl$soname -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 $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 $wl-h $wl$soname -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 CANNOT 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 no = "$_LT_TAGVAR(ld_shlibs, $1)" && 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 yes != "$_lt_caught_CXX_error" - -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 @S|@2 in - .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;; - *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@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 x-L = "$p" || - test x-R = "$p"; 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 no = "$pre_test_object_deps_done"; 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 no = "$pre_test_object_deps_done"; 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)= - ;; -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 no = "$F77"; 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 yes != "$_lt_disable_F77"; 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 no = "$can_build_shared" && 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 yes = "$enable_shared" && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[[4-9]]*) - if test ia64 != "$host_cpu"; then - case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in - yes,aix,yes) ;; # shared object as lib.so file only - yes,svr4,*) ;; # shared object as lib.so archive member only - yes,*) enable_static=no ;; # shared object in lib.a archive as well - esac - 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 yes = "$enable_shared" || 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 yes != "$_lt_disable_F77" - -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 no = "$FC"; 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 yes != "$_lt_disable_FC"; 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 no = "$can_build_shared" && 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 yes = "$enable_shared" && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[[4-9]]*) - if test ia64 != "$host_cpu"; then - case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in - yes,aix,yes) ;; # shared object as lib.so file only - yes,svr4,*) ;; # shared object as lib.so archive member only - yes,*) enable_static=no ;; # shared object in lib.a archive as well - esac - 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 yes = "$enable_shared" || 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 yes != "$_lt_disable_FC" - -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 - -## 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... -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 - -## 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... -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 set = "${GCJFLAGS+set}" || 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 10 -lt "$lt_ac_count" && 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], -[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_PATH_CONVERSION_FUNCTIONS -# ----------------------------- -# Determine what 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 diff -Nru gnome-online-accounts-3.30.1/m4/lt~obsolete.m4 gnome-online-accounts-3.31.90/m4/lt~obsolete.m4 --- gnome-online-accounts-3.30.1/m4/lt~obsolete.m4 2019-01-17 10:27:04.000000000 +0000 +++ gnome-online-accounts-3.31.90/m4/lt~obsolete.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,99 +0,0 @@ -# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- -# -# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 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])]) diff -Nru gnome-online-accounts-3.30.1/m4/ltoptions.m4 gnome-online-accounts-3.31.90/m4/ltoptions.m4 --- gnome-online-accounts-3.30.1/m4/ltoptions.m4 2019-01-17 10:27:04.000000000 +0000 +++ gnome-online-accounts-3.31.90/m4/ltoptions.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,437 +0,0 @@ -# Helper functions for option handling. -*- Autoconf -*- -# -# Copyright (C) 2004-2005, 2007-2009, 2011-2015 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 8 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_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4], - [_LT_WITH_AIX_SONAME([aix])]) - ]) -])# _LT_SET_OPTIONS - - -## --------------------------------- ## -## Macros to handle LT_INIT 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_AIX_SONAME([DEFAULT]) -# ---------------------------------- -# implement the --with-aix-soname flag, and support the `aix-soname=aix' -# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT -# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'. -m4_define([_LT_WITH_AIX_SONAME], -[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl -shared_archive_member_spec= -case $host,$enable_shared in -power*-*-aix[[5-9]]*,yes) - AC_MSG_CHECKING([which variant of shared library versioning to provide]) - AC_ARG_WITH([aix-soname], - [AS_HELP_STRING([--with-aix-soname=aix|svr4|both], - [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])], - [case $withval in - aix|svr4|both) - ;; - *) - AC_MSG_ERROR([Unknown argument to --with-aix-soname]) - ;; - esac - lt_cv_with_aix_soname=$with_aix_soname], - [AC_CACHE_VAL([lt_cv_with_aix_soname], - [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT) - with_aix_soname=$lt_cv_with_aix_soname]) - AC_MSG_RESULT([$with_aix_soname]) - if test aix != "$with_aix_soname"; then - # For the AIX way of multilib, we name the shared archive member - # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', - # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. - # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, - # the AIX toolchain works better with OBJECT_MODE set (default 32). - if test 64 = "${OBJECT_MODE-32}"; then - shared_archive_member_spec=shr_64 - else - shared_archive_member_spec=shr - fi - fi - ;; -*) - with_aix_soname=aix - ;; -esac - -_LT_DECL([], [shared_archive_member_spec], [0], - [Shared archive member basename, for filename based shared library versioning on AIX])dnl -])# _LT_WITH_AIX_SONAME - -LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])]) -LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])]) -LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])]) - - -# _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=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], []) - -## ----------------- ## -## LTDL_INIT Options ## -## ----------------- ## - -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])]) diff -Nru gnome-online-accounts-3.30.1/m4/ltsugar.m4 gnome-online-accounts-3.31.90/m4/ltsugar.m4 --- gnome-online-accounts-3.30.1/m4/ltsugar.m4 2019-01-17 10:27:04.000000000 +0000 +++ gnome-online-accounts-3.31.90/m4/ltsugar.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,124 +0,0 @@ -# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- -# -# Copyright (C) 2004-2005, 2007-2008, 2011-2015 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 -]) diff -Nru gnome-online-accounts-3.30.1/m4/ltversion.m4 gnome-online-accounts-3.31.90/m4/ltversion.m4 --- gnome-online-accounts-3.30.1/m4/ltversion.m4 2019-01-17 10:27:04.000000000 +0000 +++ gnome-online-accounts-3.31.90/m4/ltversion.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -# ltversion.m4 -- version numbers -*- Autoconf -*- -# -# Copyright (C) 2004, 2011-2015 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 4179 ltversion.m4 -# This file is part of GNU Libtool - -m4_define([LT_PACKAGE_VERSION], [2.4.6]) -m4_define([LT_PACKAGE_REVISION], [2.4.6]) - -AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.6' -macro_revision='2.4.6' -_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) -_LT_DECL(, macro_revision, 0) -]) diff -Nru gnome-online-accounts-3.30.1/m4/nls.m4 gnome-online-accounts-3.31.90/m4/nls.m4 --- gnome-online-accounts-3.30.1/m4/nls.m4 2019-01-17 10:26:52.000000000 +0000 +++ gnome-online-accounts-3.31.90/m4/nls.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -# nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software -dnl Foundation, 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 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 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]) -]) diff -Nru gnome-online-accounts-3.30.1/m4/pkg.m4 gnome-online-accounts-3.31.90/m4/pkg.m4 --- gnome-online-accounts-3.30.1/m4/pkg.m4 2019-01-17 10:26:52.000000000 +0000 +++ gnome-online-accounts-3.31.90/m4/pkg.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,343 +0,0 @@ -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 11 (pkg-config-0.29.1) - -dnl Copyright © 2004 Scott James Remnant . -dnl Copyright © 2012-2015 Dan Nicholson -dnl -dnl This program is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 2 of the License, or -dnl (at your option) any later version. -dnl -dnl This program is distributed in the hope that it will be useful, but -dnl WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with this program; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -dnl 02111-1307, USA. -dnl -dnl As a special exception to the GNU General Public License, if you -dnl distribute this file as part of a program that contains a -dnl configuration script generated by Autoconf, you may include it under -dnl the same distribution terms that you use for the rest of that -dnl program. - -dnl PKG_PREREQ(MIN-VERSION) -dnl ----------------------- -dnl Since: 0.29 -dnl -dnl Verify that the version of the pkg-config macros are at least -dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's -dnl installed version of pkg-config, this checks the developer's version -dnl of pkg.m4 when generating configure. -dnl -dnl To ensure that this macro is defined, also add: -dnl m4_ifndef([PKG_PREREQ], -dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) -dnl -dnl See the "Since" comment for each macro you use to see what version -dnl of the macros you require. -m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29.1]) -m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, - [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) -])dnl PKG_PREREQ - -dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) -dnl ---------------------------------- -dnl Since: 0.16 -dnl -dnl Search for the pkg-config tool and set the PKG_CONFIG variable to -dnl first found in the path. Checks that the version of pkg-config found -dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is -dnl used since that's the first version where most current features of -dnl pkg-config existed. -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 -])dnl PKG_PROG_PKG_CONFIG - -dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -dnl ------------------------------------------------------------------- -dnl Since: 0.18 -dnl -dnl Check to see whether a particular set of modules exists. Similar to -dnl PKG_CHECK_MODULES(), but does not set variables or print errors. -dnl -dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -dnl only at the first occurence in configure.ac, so if the first place -dnl it's called might be skipped (such as if it is within an "if", you -dnl 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]) - -dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -dnl --------------------------------------------- -dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting -dnl pkg_failed based on the result. -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 -])dnl _PKG_CONFIG - -dnl _PKG_SHORT_ERRORS_SUPPORTED -dnl --------------------------- -dnl Internal check to see if pkg-config supports short errors. -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 -])dnl _PKG_SHORT_ERRORS_SUPPORTED - - -dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -dnl [ACTION-IF-NOT-FOUND]) -dnl -------------------------------------------------------------- -dnl Since: 0.4.0 -dnl -dnl Note that if there is a possibility the first call to -dnl PKG_CHECK_MODULES might not happen, you should be sure to include an -dnl 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 -])dnl PKG_CHECK_MODULES - - -dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -dnl [ACTION-IF-NOT-FOUND]) -dnl --------------------------------------------------------------------- -dnl Since: 0.29 -dnl -dnl Checks for existence of MODULES and gathers its build flags with -dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags -dnl and VARIABLE-PREFIX_LIBS from --libs. -dnl -dnl Note that if there is a possibility the first call to -dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to -dnl include an explicit call to PKG_PROG_PKG_CONFIG in your -dnl configure.ac. -AC_DEFUN([PKG_CHECK_MODULES_STATIC], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -_save_PKG_CONFIG=$PKG_CONFIG -PKG_CONFIG="$PKG_CONFIG --static" -PKG_CHECK_MODULES($@) -PKG_CONFIG=$_save_PKG_CONFIG[]dnl -])dnl PKG_CHECK_MODULES_STATIC - - -dnl PKG_INSTALLDIR([DIRECTORY]) -dnl ------------------------- -dnl Since: 0.27 -dnl -dnl Substitutes the variable pkgconfigdir as the location where a module -dnl should install pkg-config .pc files. By default the directory is -dnl $libdir/pkgconfig, but the default can be changed by passing -dnl DIRECTORY. The user can override through the --with-pkgconfigdir -dnl 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 - - -dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) -dnl -------------------------------- -dnl Since: 0.27 -dnl -dnl Substitutes the variable noarch_pkgconfigdir as the location where a -dnl module should install arch-independent pkg-config .pc files. By -dnl default the directory is $datadir/pkgconfig, but the default can be -dnl changed by passing DIRECTORY. The user can override through the -dnl --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 - - -dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -dnl ------------------------------------------- -dnl Since: 0.28 -dnl -dnl 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 -])dnl PKG_CHECK_VAR - -dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, -dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], -dnl [DESCRIPTION], [DEFAULT]) -dnl ------------------------------------------ -dnl -dnl Prepare a "--with-" configure option using the lowercase -dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and -dnl PKG_CHECK_MODULES in a single macro. -AC_DEFUN([PKG_WITH_MODULES], -[ -m4_pushdef([with_arg], m4_tolower([$1])) - -m4_pushdef([description], - [m4_default([$5], [build with ]with_arg[ support])]) - -m4_pushdef([def_arg], [m4_default([$6], [auto])]) -m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes]) -m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no]) - -m4_case(def_arg, - [yes],[m4_pushdef([with_without], [--without-]with_arg)], - [m4_pushdef([with_without],[--with-]with_arg)]) - -AC_ARG_WITH(with_arg, - AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),, - [AS_TR_SH([with_]with_arg)=def_arg]) - -AS_CASE([$AS_TR_SH([with_]with_arg)], - [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)], - [auto],[PKG_CHECK_MODULES([$1],[$2], - [m4_n([def_action_if_found]) $3], - [m4_n([def_action_if_not_found]) $4])]) - -m4_popdef([with_arg]) -m4_popdef([description]) -m4_popdef([def_arg]) - -])dnl PKG_WITH_MODULES - -dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, -dnl [DESCRIPTION], [DEFAULT]) -dnl ----------------------------------------------- -dnl -dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES -dnl check._[VARIABLE-PREFIX] is exported as make variable. -AC_DEFUN([PKG_HAVE_WITH_MODULES], -[ -PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) - -AM_CONDITIONAL([HAVE_][$1], - [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) -])dnl PKG_HAVE_WITH_MODULES - -dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, -dnl [DESCRIPTION], [DEFAULT]) -dnl ------------------------------------------------------ -dnl -dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after -dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make -dnl and preprocessor variable. -AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], -[ -PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) - -AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], - [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) -])dnl PKG_HAVE_DEFINE_WITH_MODULES diff -Nru gnome-online-accounts-3.30.1/m4/po.m4 gnome-online-accounts-3.31.90/m4/po.m4 --- gnome-online-accounts-3.30.1/m4/po.m4 2019-01-17 10:26:52.000000000 +0000 +++ gnome-online-accounts-3.31.90/m4/po.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,453 +0,0 @@ -# po.m4 serial 24 (gettext-0.19) -dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, 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 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 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.60]) - -dnl Checks for all prerequisites of the po subdirectory. -AC_DEFUN([AM_PO_SUBDIRS], -[ - AC_REQUIRE([AC_PROG_MAKE_SET])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AC_PROG_MKDIR_P])dnl - AC_REQUIRE([AC_PROG_SED])dnl - AC_REQUIRE([AM_NLS])dnl - - dnl Release version of the gettext macros. This is used to ensure that - dnl the gettext macros and po/Makefile.in.in are in sync. - AC_SUBST([GETTEXT_MACRO_VERSION], [0.19]) - - dnl Perform the following tests also if --disable-nls has been given, - dnl because they are needed for "make dist" to work. - - dnl Search for GNU msgfmt in the PATH. - dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. - dnl The second test excludes FreeBSD msgfmt. - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && - (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], - :) - AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT]) - - dnl Test whether it is GNU msgfmt >= 0.15. -changequote(,)dnl - case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;; - *) MSGFMT_015=$MSGFMT ;; - esac -changequote([,])dnl - AC_SUBST([MSGFMT_015]) -changequote(,)dnl - case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;; - *) GMSGFMT_015=$GMSGFMT ;; - esac -changequote([,])dnl - AC_SUBST([GMSGFMT_015]) - - dnl Search for GNU xgettext 0.12 or newer in the PATH. - dnl The first test excludes Solaris xgettext and early GNU xgettext versions. - dnl The second test excludes FreeBSD xgettext. - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && - (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], - :) - dnl Remove leftover from FreeBSD xgettext call. - rm -f messages.po - - dnl Test whether it is GNU xgettext >= 0.15. -changequote(,)dnl - case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;; - *) XGETTEXT_015=$XGETTEXT ;; - esac -changequote([,])dnl - AC_SUBST([XGETTEXT_015]) - - dnl Search for GNU msgmerge 0.11 or newer in the PATH. - AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, - [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :) - - dnl Installation directories. - dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we - dnl have to define it here, so that it can be used in po/Makefile. - test -n "$localedir" || localedir='${datadir}/locale' - AC_SUBST([localedir]) - - dnl Support for AM_XGETTEXT_OPTION. - test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= - AC_SUBST([XGETTEXT_EXTRA_OPTIONS]) - - AC_CONFIG_COMMANDS([po-directories], [[ - for ac_file in $CONFIG_FILES; do - # Support "outfile[:infile[:infile...]]" - case "$ac_file" in - *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - esac - # PO directories have a Makefile.in generated from Makefile.in.in. - case "$ac_file" in */Makefile.in) - # Adjust a relative srcdir. - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` - # In autoconf-2.13 it is called $ac_given_srcdir. - # In autoconf-2.50 it is called $srcdir. - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" - case "$ac_given_srcdir" in - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; - /*) top_srcdir="$ac_given_srcdir" ;; - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - # Treat a directory as a PO directory if and only if it has a - # POTFILES.in file. This allows packages to have multiple PO - # directories under different names or in different locations. - if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then - rm -f "$ac_dir/POTFILES" - test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" - gt_tab=`printf '\t'` - cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" - POMAKEFILEDEPS="POTFILES.in" - # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend - # on $ac_dir but don't depend on user-specified configuration - # parameters. - if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then - # The LINGUAS file contains the set of available languages. - if test -n "$OBSOLETE_ALL_LINGUAS"; then - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" - fi - ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` - # Hide the ALL_LINGUAS assignment from automake < 1.5. - eval 'ALL_LINGUAS''=$ALL_LINGUAS_' - POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" - else - # The set of available languages was given in configure.in. - # Hide the ALL_LINGUAS assignment from automake < 1.5. - eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' - fi - # Compute POFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) - # Compute UPDATEPOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) - # Compute DUMMYPOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) - # Compute GMOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) - case "$ac_given_srcdir" in - .) srcdirpre= ;; - *) srcdirpre='$(srcdir)/' ;; - esac - POFILES= - UPDATEPOFILES= - DUMMYPOFILES= - GMOFILES= - for lang in $ALL_LINGUAS; do - POFILES="$POFILES $srcdirpre$lang.po" - UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" - DUMMYPOFILES="$DUMMYPOFILES $lang.nop" - GMOFILES="$GMOFILES $srcdirpre$lang.gmo" - done - # CATALOGS depends on both $ac_dir and the user's LINGUAS - # environment variable. - INST_LINGUAS= - if test -n "$ALL_LINGUAS"; then - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "$LINGUAS"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - INST_LINGUAS="$INST_LINGUAS $presentlang" - fi - done - fi - CATALOGS= - if test -n "$INST_LINGUAS"; then - for lang in $INST_LINGUAS; do - CATALOGS="$CATALOGS $lang.gmo" - done - fi - test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" - sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" - for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do - if test -f "$f"; then - case "$f" in - *.orig | *.bak | *~) ;; - *) cat "$f" >> "$ac_dir/Makefile" ;; - esac - fi - done - fi - ;; - esac - done]], - [# Capture the value of obsolete ALL_LINGUAS because we need it to compute - # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it - # from automake < 1.5. - eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' - # Capture the value of LINGUAS because we need it to compute CATALOGS. - LINGUAS="${LINGUAS-%UNSET%}" - ]) -]) - -dnl Postprocesses a Makefile in a directory containing PO files. -AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE], -[ - # When this code is run, in config.status, two variables have already been - # set: - # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in, - # - LINGUAS is the value of the environment variable LINGUAS at configure - # time. - -changequote(,)dnl - # Adjust a relative srcdir. - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` - # In autoconf-2.13 it is called $ac_given_srcdir. - # In autoconf-2.50 it is called $srcdir. - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" - case "$ac_given_srcdir" in - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; - /*) top_srcdir="$ac_given_srcdir" ;; - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - - # Find a way to echo strings without interpreting backslash. - if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then - gt_echo='echo' - else - if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then - gt_echo='printf %s\n' - else - echo_func () { - cat < "$ac_file.tmp" - tab=`printf '\t'` - if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then - # Add dependencies that cannot be formulated as a simple suffix rule. - for lang in $ALL_LINGUAS; do - frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` - cat >> "$ac_file.tmp" < /dev/null; then - # Add dependencies that cannot be formulated as a simple suffix rule. - for lang in $ALL_LINGUAS; do - frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` - cat >> "$ac_file.tmp" <> "$ac_file.tmp" <, 1996. - -AC_PREREQ([2.50]) - -# Search path for a program which passes the given test. - -dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -AC_DEFUN([AM_PATH_PROG_WITH_TEST], -[ -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which - # contains only /bin. Note that ksh looks also at the FPATH variable, - # so we have to set that as well for the test. - 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 - -# Find out how to test for executable files. Don't use a zero-byte file, -# as systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - ac_executable_p="test -x" -else - ac_executable_p="test -f" -fi -rm -f conf$$.file - -# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL([ac_cv_path_$1], -[case "[$]$1" in - [[\\/]]* | ?:[[\\/]]*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in ifelse([$5], , $PATH, [$5]); do - IFS="$ac_save_IFS" - test -z "$ac_dir" && ac_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then - echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext" - break 2 - fi - fi - done - done - IFS="$ac_save_IFS" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$][$1]) -else - AC_MSG_RESULT([no]) -fi -AC_SUBST([$1])dnl -]) diff -Nru gnome-online-accounts-3.30.1/m4/vapigen.m4 gnome-online-accounts-3.31.90/m4/vapigen.m4 --- gnome-online-accounts-3.30.1/m4/vapigen.m4 2016-09-14 19:29:55.000000000 +0000 +++ gnome-online-accounts-3.31.90/m4/vapigen.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,101 +0,0 @@ -dnl vapigen.m4 -dnl -dnl Copyright 2012 Evan Nemerson -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -# VAPIGEN_CHECK([VERSION], [API_VERSION], [FOUND_INTROSPECTION], [DEFAULT]) -# -------------------------------------- -# Check vapigen existence and version -# -# See http://live.gnome.org/Vala/UpstreamGuide for detailed documentation -AC_DEFUN([VAPIGEN_CHECK], -[ - AS_IF([test "x$3" != "xyes"], [ - m4_provide_if([GOBJECT_INTROSPECTION_CHECK], [], [ - m4_provide_if([GOBJECT_INTROSPECTION_REQUIRE], [], [ - AC_MSG_ERROR([[You must call GOBJECT_INTROSPECTION_CHECK or GOBJECT_INTROSPECTION_REQUIRE before using VAPIGEN_CHECK unless using the FOUND_INTROSPECTION argument is "yes"]]) - ]) - ]) - ]) - - AC_ARG_ENABLE([vala], - [AS_HELP_STRING([--enable-vala[=@<:@no/auto/yes@:>@]],[build Vala bindings @<:@default=]ifelse($4,,auto,$4)[@:>@])],,[ - AS_IF([test "x$4" = "x"], [ - enable_vala=auto - ], [ - enable_vala=$4 - ]) - ]) - - AS_CASE([$enable_vala], [no], [enable_vala=no], - [yes], [ - AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [ - AC_MSG_ERROR([Vala bindings require GObject Introspection]) - ]) - ], [auto], [ - AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [ - enable_vala=no - ]) - ], [ - AC_MSG_ERROR([Invalid argument passed to --enable-vala, should be one of @<:@no/auto/yes@:>@]) - ]) - - AS_IF([test "x$2" = "x"], [ - vapigen_pkg_name=vapigen - ], [ - vapigen_pkg_name=vapigen-$2 - ]) - AS_IF([test "x$1" = "x"], [ - vapigen_pkg="$vapigen_pkg_name" - ], [ - vapigen_pkg="$vapigen_pkg_name >= $1" - ]) - - PKG_PROG_PKG_CONFIG - - PKG_CHECK_EXISTS([$vapigen_pkg], [ - AS_IF([test "$enable_vala" = "auto"], [ - enable_vala=yes - ]) - ], [ - AS_CASE([$enable_vala], [yes], [ - AC_MSG_ERROR([$vapigen_pkg not found]) - ], [auto], [ - enable_vala=no - ]) - ]) - - AC_MSG_CHECKING([for vapigen]) - - AS_CASE([$enable_vala], - [yes], [ - VAPIGEN=`$PKG_CONFIG --variable=vapigen $vapigen_pkg_name` - VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir $vapigen_pkg_name`/vala/Makefile.vapigen - AS_IF([test "x$2" = "x"], [ - VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir $vapigen_pkg_name` - ], [ - VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned $vapigen_pkg_name` - ]) - ]) - - AC_MSG_RESULT([$enable_vala]) - - AC_SUBST([VAPIGEN]) - AC_SUBST([VAPIGEN_VAPIDIR]) - AC_SUBST([VAPIGEN_MAKEFILE]) - - AM_CONDITIONAL(ENABLE_VAPIGEN, test "x$enable_vala" = "xyes") -]) diff -Nru gnome-online-accounts-3.30.1/NEWS gnome-online-accounts-3.31.90/NEWS --- gnome-online-accounts-3.30.1/NEWS 2019-01-17 10:25:52.000000000 +0000 +++ gnome-online-accounts-3.31.90/NEWS 2019-02-09 09:24:44.000000000 +0000 @@ -1,11 +1,29 @@ -Overview of changes in 3.30.1 -============================= +Overview of changes in 3.31.90 +============================== * Bugs fixed: + !17 icons: Replace PNGs with SVGs and add symbolics + !19 google: Only request the email field when getting the user's identity 796095 alarm: Refresh Kerberos tickets after a suspended system is resumed * Updated translations: - Basque + Afrikaans + French + Japanese + Kabyle + + +Overview of changes in 3.31.3 +============================= + +* Remove Todoist + +* Bugs fixed: + !14 build: Don't define _POSIX_PTHREAD_SEMANTICS and _REENTRANT + !15 identity: Port away from deprecated g_type_class_add_private + 764157 Port to GTask from GSimpleAsyncResult + +* Updated translations: Belarusian Esperanto Estonian Binary files /tmp/tmpOF9Z7O/tiVsTCcCtl/gnome-online-accounts-3.30.1/po/af.gmo and /tmp/tmpOF9Z7O/8j3UbjNw9P/gnome-online-accounts-3.31.90/po/af.gmo differ diff -Nru gnome-online-accounts-3.30.1/po/af.po gnome-online-accounts-3.31.90/po/af.po --- gnome-online-accounts-3.30.1/po/af.po 2016-03-04 09:23:00.000000000 +0000 +++ gnome-online-accounts-3.31.90/po/af.po 2019-01-31 07:49:52.000000000 +0000 @@ -4,9 +4,9 @@ msgid "" msgstr "" "Project-Id-Version: gnome-online-accounts gnome-3-10\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" -"online-accounts&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-09-27 13:14+0000\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-online-accounts/" +"issues\n" +"POT-Creation-Date: 2019-01-17 11:24+0000\n" "PO-Revision-Date: 2013-09-27 15:56+0200\n" "Last-Translator: F Wolff \n" "Language-Team: translate-discuss-af@lists.sourceforge.net\n" @@ -18,330 +18,289 @@ "X-Generator: Virtaal 0.7.1\n" "X-Project-Style: gnome\n" -#. TODO: more specific -#: ../src/daemon/goadaemon.c:788 ../src/daemon/goadaemon.c:1034 -#, c-format -msgid "Failed to find a provider for: %s" -msgstr "Kon nie 'n verskaffer vind vir %s nie" - -#. TODO: more specific -#: ../src/daemon/goadaemon.c:1022 -msgid "ProviderType property is not set for account" +#: data/org.gnome.online-accounts.gschema.xml:6 +msgid "List of providers that are allowed to be loaded" msgstr "" -#. TODO: more specific -#: ../src/goabackend/goaewsclient.c:234 ../src/goabackend/goahttpclient.c:175 -#, c-format -msgid "Code: %u - Unexpected response from server" +#: data/org.gnome.online-accounts.gschema.xml:7 +msgid "" +"A list of strings representing the providers that are allowed to be loaded " +"(default: 'all'). This is only evaluated on startup." msgstr "" #. TODO: more specific -#: ../src/goabackend/goaewsclient.c:250 +#: src/daemon/goadaemon.c:1196 src/daemon/goadaemon.c:1480 #, c-format -msgid "Failed to parse autodiscover response XML" +msgid "Failed to find a provider for: %s" +msgstr "Kon nie 'n verskaffer vind vir %s nie" + +#: src/daemon/goadaemon.c:1423 +msgid "IsLocked property is set for account" msgstr "" #. TODO: more specific -#: ../src/goabackend/goaewsclient.c:260 -#, c-format -msgid "Failed to find Autodiscover element" +#: src/daemon/goadaemon.c:1468 +msgid "ProviderType property is not set for account" msgstr "" #. TODO: more specific -#: ../src/goabackend/goaewsclient.c:274 -#, c-format -msgid "Failed to find Response element" +#: src/goabackend/goaewsclient.c:238 +msgid "Failed to parse autodiscover response XML" msgstr "" #. TODO: more specific -#: ../src/goabackend/goaewsclient.c:288 +#. Translators: the parameter is an XML element name. +#: src/goabackend/goaewsclient.c:249 src/goabackend/goaewsclient.c:264 +#: src/goabackend/goaewsclient.c:279 #, c-format -msgid "Failed to find Account element" +msgid "Failed to find “%s” element" msgstr "" #. TODO: more specific -#: ../src/goabackend/goaewsclient.c:305 -#, c-format +#: src/goabackend/goaewsclient.c:300 msgid "Failed to find ASUrl and OABUrl in autodiscover response" msgstr "" -#: ../src/goabackend/goaexchangeprovider.c:79 +#: src/goabackend/goaexchangeprovider.c:51 msgid "Microsoft Exchange" msgstr "Microsoft Exchange" -#. TODO: more specific -#: ../src/goabackend/goaexchangeprovider.c:317 -#: ../src/goabackend/goaexchangeprovider.c:1026 -#: ../src/goabackend/goaowncloudprovider.c:403 -#: ../src/goabackend/goaowncloudprovider.c:1188 -#, c-format -msgid "Did not find password with identity `%s' in credentials" -msgstr "" - #. Translators: the first %s is the username #. * (eg., debarshi.ray@gmail.com or rishi), and the #. * (%s, %d) is the error domain and code. #. -#: ../src/goabackend/goaexchangeprovider.c:345 -#: ../src/goabackend/goaowncloudprovider.c:426 +#: src/goabackend/goaexchangeprovider.c:248 +#: src/goabackend/goalastfmprovider.c:287 +#: src/goabackend/goaowncloudprovider.c:291 #, c-format -msgid "Invalid password with username `%s' (%s, %d): " +msgid "Invalid password with username “%s” (%s, %d): " msgstr "" -#: ../src/goabackend/goaexchangeprovider.c:499 -#: ../src/goabackend/goaimapsmtpprovider.c:697 +#: src/goabackend/goaexchangeprovider.c:396 +#: src/goabackend/goaimapsmtpprovider.c:647 msgid "_E-mail" msgstr "_E-pos" -#: ../src/goabackend/goaexchangeprovider.c:500 -#: ../src/goabackend/goaimapsmtpprovider.c:717 -#: ../src/goabackend/goaimapsmtpprovider.c:737 -#: ../src/goabackend/goaowncloudprovider.c:655 +#: src/goabackend/goaexchangeprovider.c:397 +#: src/goabackend/goaimapsmtpprovider.c:667 +#: src/goabackend/goaimapsmtpprovider.c:687 +#: src/goabackend/goalastfmprovider.c:429 +#: src/goabackend/goaowncloudprovider.c:530 msgid "_Password" msgstr "_Wagwoord" -#: ../src/goabackend/goaexchangeprovider.c:503 +#: src/goabackend/goaexchangeprovider.c:400 msgid "_Custom" msgstr "_Pasgemaak" -#: ../src/goabackend/goaexchangeprovider.c:514 -#: ../src/goabackend/goaimapsmtpprovider.c:716 -#: ../src/goabackend/goaimapsmtpprovider.c:736 -#: ../src/goabackend/goakerberosprovider.c:1129 -#: ../src/goabackend/goaowncloudprovider.c:654 +#: src/goabackend/goaexchangeprovider.c:411 +#: src/goabackend/goaimapsmtpprovider.c:666 +#: src/goabackend/goaimapsmtpprovider.c:686 +#: src/goabackend/goalastfmprovider.c:428 +#: src/goabackend/goaowncloudprovider.c:529 msgid "User_name" msgstr "Gebruiker_naam" -#: ../src/goabackend/goaexchangeprovider.c:515 -#: ../src/goabackend/goaowncloudprovider.c:653 +#: src/goabackend/goaexchangeprovider.c:412 +#: src/goabackend/goaowncloudprovider.c:528 msgid "_Server" msgstr "_Bediener" -#: ../src/goabackend/goaexchangeprovider.c:545 -#: ../src/goabackend/goaimapsmtpprovider.c:769 -#: ../src/goabackend/goakerberosprovider.c:1154 -#: ../src/goabackend/goaowncloudprovider.c:684 +#. -- +#: src/goabackend/goaexchangeprovider.c:422 +#: src/goabackend/goaimapsmtpprovider.c:699 +#: src/goabackend/goakerberosprovider.c:563 +#: src/goabackend/goalastfmprovider.c:437 +#: src/goabackend/goaowncloudprovider.c:544 +#: src/goabackend/goatelepathyprovider.c:651 +msgid "_Cancel" +msgstr "" + +#: src/goabackend/goaexchangeprovider.c:423 +#: src/goabackend/goakerberosprovider.c:564 +#: src/goabackend/goalastfmprovider.c:438 +#: src/goabackend/goaowncloudprovider.c:545 +#, fuzzy +#| msgid "Connecting…" +msgid "C_onnect" +msgstr "Koppel tans…" + +#: src/goabackend/goaexchangeprovider.c:439 +#: src/goabackend/goaimapsmtpprovider.c:715 +#: src/goabackend/goakerberosprovider.c:579 +#: src/goabackend/goalastfmprovider.c:454 +#: src/goabackend/goaowncloudprovider.c:560 msgid "Connecting…" msgstr "Koppel tans…" -#: ../src/goabackend/goaexchangeprovider.c:650 -#: ../src/goabackend/goaexchangeprovider.c:845 -#: ../src/goabackend/goaimapsmtpprovider.c:929 -#: ../src/goabackend/goaimapsmtpprovider.c:964 -#: ../src/goabackend/goaimapsmtpprovider.c:1052 -#: ../src/goabackend/goaimapsmtpprovider.c:1308 -#: ../src/goabackend/goaimapsmtpprovider.c:1381 -#: ../src/goabackend/goakerberosprovider.c:1545 -#: ../src/goabackend/goaoauth2provider.c:1133 -#: ../src/goabackend/goaoauthprovider.c:1041 -#: ../src/goabackend/goaowncloudprovider.c:795 -#: ../src/goabackend/goaowncloudprovider.c:1008 -#: ../src/goabackend/goatelepathyprovider.c:467 -#: ../src/goabackend/goatelepathyprovider.c:516 -#: ../src/goabackend/goatelepathyprovider.c:690 -#, c-format +#: src/goabackend/goaexchangeprovider.c:539 +#: src/goabackend/goaexchangeprovider.c:733 +#: src/goabackend/goaimapsmtpprovider.c:865 +#: src/goabackend/goaimapsmtpprovider.c:900 +#: src/goabackend/goaimapsmtpprovider.c:992 +#: src/goabackend/goaimapsmtpprovider.c:1249 +#: src/goabackend/goaimapsmtpprovider.c:1325 +#: src/goabackend/goakerberosprovider.c:896 +#: src/goabackend/goalastfmprovider.c:652 +#: src/goabackend/goalastfmprovider.c:820 +#: src/goabackend/goamediaserverprovider.c:420 +#: src/goabackend/goaoauth2provider.c:995 src/goabackend/goaoauthprovider.c:859 +#: src/goabackend/goaowncloudprovider.c:663 +#: src/goabackend/goaowncloudprovider.c:883 +#: src/goabackend/goatelepathyprovider.c:475 +#: src/goabackend/goatelepathyprovider.c:514 +#: src/goabackend/goatelepathyprovider.c:682 msgid "Dialog was dismissed" msgstr "" -#: ../src/goabackend/goaexchangeprovider.c:688 -#: ../src/goabackend/goaexchangeprovider.c:873 -#: ../src/goabackend/goaimapsmtpprovider.c:994 -#: ../src/goabackend/goaimapsmtpprovider.c:1085 -#: ../src/goabackend/goaimapsmtpprovider.c:1332 -#: ../src/goabackend/goaimapsmtpprovider.c:1406 -#: ../src/goabackend/goaowncloudprovider.c:837 -#: ../src/goabackend/goaowncloudprovider.c:1029 +#: src/goabackend/goaexchangeprovider.c:577 +#: src/goabackend/goaexchangeprovider.c:761 +#: src/goabackend/goaimapsmtpprovider.c:933 +#: src/goabackend/goaimapsmtpprovider.c:1030 +#: src/goabackend/goaimapsmtpprovider.c:1276 +#: src/goabackend/goaimapsmtpprovider.c:1353 +#: src/goabackend/goalastfmprovider.c:686 +#: src/goabackend/goalastfmprovider.c:839 +#: src/goabackend/goaowncloudprovider.c:708 +#: src/goabackend/goaowncloudprovider.c:910 #, c-format msgid "Dialog was dismissed (%s, %d): " msgstr "" -#: ../src/goabackend/goaexchangeprovider.c:701 -#: ../src/goabackend/goaimapsmtpprovider.c:1007 -#: ../src/goabackend/goaimapsmtpprovider.c:1098 -#: ../src/goabackend/goaowncloudprovider.c:850 +#: src/goabackend/goaexchangeprovider.c:590 +#: src/goabackend/goaimapsmtpprovider.c:946 +#: src/goabackend/goaimapsmtpprovider.c:1043 +#: src/goabackend/goaowncloudprovider.c:721 msgid "_Ignore" msgstr "_Ignoreer" -#: ../src/goabackend/goaexchangeprovider.c:706 -#: ../src/goabackend/goaexchangeprovider.c:892 -#: ../src/goabackend/goaimapsmtpprovider.c:1012 -#: ../src/goabackend/goaimapsmtpprovider.c:1103 -#: ../src/goabackend/goaimapsmtpprovider.c:1351 -#: ../src/goabackend/goaimapsmtpprovider.c:1425 -#: ../src/goabackend/goakerberosprovider.c:1655 -#: ../src/goabackend/goaowncloudprovider.c:855 -#: ../src/goabackend/goaowncloudprovider.c:1048 +#: src/goabackend/goaexchangeprovider.c:595 +#: src/goabackend/goaexchangeprovider.c:780 +#: src/goabackend/goaimapsmtpprovider.c:951 +#: src/goabackend/goaimapsmtpprovider.c:1048 +#: src/goabackend/goaimapsmtpprovider.c:1295 +#: src/goabackend/goaimapsmtpprovider.c:1372 +#: src/goabackend/goakerberosprovider.c:981 +#: src/goabackend/goalastfmprovider.c:698 +#: src/goabackend/goalastfmprovider.c:856 +#: src/goabackend/goaowncloudprovider.c:726 +#: src/goabackend/goaowncloudprovider.c:929 msgid "_Try Again" msgstr "_Probeer weer" -#: ../src/goabackend/goaexchangeprovider.c:711 -#: ../src/goabackend/goaexchangeprovider.c:885 +#: src/goabackend/goaexchangeprovider.c:600 +#: src/goabackend/goaexchangeprovider.c:773 msgid "Error connecting to Microsoft Exchange server" msgstr "Kon nie koppel aan die Microsoft Exchange-bediener nie" -#: ../src/goabackend/goaexchangeprovider.c:945 -#: ../src/goabackend/goafacebookprovider.c:415 -#: ../src/goabackend/goaflickrprovider.c:425 -#: ../src/goabackend/goagoogleprovider.c:547 -#: ../src/goabackend/goakerberosprovider.c:1726 -#: ../src/goabackend/goaowncloudprovider.c:1102 -#: ../src/goabackend/goatelepathyprovider.c:895 -#: ../src/goabackend/goawindowsliveprovider.c:430 -msgid "Use for" -msgstr "Gebruik vir" - -#: ../src/goabackend/goaexchangeprovider.c:947 -#: ../src/goabackend/goagoogleprovider.c:549 -msgid "_Mail" -msgstr "_Pos" - -#: ../src/goabackend/goaexchangeprovider.c:952 -#: ../src/goabackend/goagoogleprovider.c:554 -#: ../src/goabackend/goaowncloudprovider.c:1104 -msgid "Cale_ndar" -msgstr "Kale_nder" - -#: ../src/goabackend/goaexchangeprovider.c:957 -#: ../src/goabackend/goagoogleprovider.c:559 -#: ../src/goabackend/goaowncloudprovider.c:1109 -msgid "_Contacts" -msgstr "_Kontakte" - -#: ../src/goabackend/goafacebookprovider.c:82 +#: src/goabackend/goafacebookprovider.c:56 msgid "Facebook" msgstr "Facebook" -#. Translators: the %d is a HTTP status code and the %s is a textual description of it -#: ../src/goabackend/goafacebookprovider.c:211 -#: ../src/goabackend/goagoogleprovider.c:210 -#: ../src/goabackend/goatwitterprovider.c:166 -#: ../src/goabackend/goawindowsliveprovider.c:195 -#: ../src/goabackend/goayahooprovider.c:187 -#, c-format -msgid "Expected status 200 when requesting guid, instead got status %d (%s)" -msgstr "" - -#: ../src/goabackend/goafacebookprovider.c:230 -#: ../src/goabackend/goafacebookprovider.c:242 -#: ../src/goabackend/goafacebookprovider.c:252 -#: ../src/goabackend/goaflickrprovider.c:208 -#: ../src/goabackend/goaflickrprovider.c:220 -#: ../src/goabackend/goaflickrprovider.c:230 -#: ../src/goabackend/goaflickrprovider.c:240 -#: ../src/goabackend/goaflickrprovider.c:250 -#: ../src/goabackend/goagoogleprovider.c:229 -#: ../src/goabackend/goagoogleprovider.c:241 -#: ../src/goabackend/goaoauth2provider.c:682 -#: ../src/goabackend/goaoauth2provider.c:712 -#: ../src/goabackend/goaoauth2provider.c:724 -#: ../src/goabackend/goatwitterprovider.c:185 -#: ../src/goabackend/goatwitterprovider.c:197 -#: ../src/goabackend/goatwitterprovider.c:207 -#: ../src/goabackend/goawindowsliveprovider.c:214 -#: ../src/goabackend/goawindowsliveprovider.c:226 -#: ../src/goabackend/goawindowsliveprovider.c:238 -#: ../src/goabackend/goayahooprovider.c:206 -#: ../src/goabackend/goayahooprovider.c:218 -#: ../src/goabackend/goayahooprovider.c:229 -#: ../src/goabackend/goayahooprovider.c:275 -#: ../src/goabackend/goayahooprovider.c:287 -#: ../src/goabackend/goayahooprovider.c:298 +#: src/goabackend/goafacebookprovider.c:183 +#: src/goabackend/goaflickrprovider.c:155 +#: src/goabackend/goafoursquareprovider.c:154 +#: src/goabackend/goagoogleprovider.c:191 +#: src/goabackend/goatodoistprovider.c:193 +#: src/goabackend/goawindowsliveprovider.c:159 #, c-format +msgid "" +"Expected status 200 when requesting your identity, instead got status %d (%s)" +msgstr "" + +#. TODO: more specific +#: src/goabackend/goafacebookprovider.c:202 +#: src/goabackend/goafacebookprovider.c:213 +#: src/goabackend/goafacebookprovider.c:219 +#: src/goabackend/goaflickrprovider.c:174 +#: src/goabackend/goaflickrprovider.c:185 +#: src/goabackend/goaflickrprovider.c:196 +#: src/goabackend/goaflickrprovider.c:205 +#: src/goabackend/goaflickrprovider.c:218 +#: src/goabackend/goafoursquareprovider.c:173 +#: src/goabackend/goafoursquareprovider.c:184 +#: src/goabackend/goafoursquareprovider.c:195 +#: src/goabackend/goafoursquareprovider.c:206 +#: src/goabackend/goafoursquareprovider.c:215 +#: src/goabackend/goafoursquareprovider.c:228 +#: src/goabackend/goagoogleprovider.c:210 +#: src/goabackend/goagoogleprovider.c:221 +#: src/goabackend/goalastfmprovider.c:212 +#: src/goabackend/goalastfmprovider.c:221 +#: src/goabackend/goalastfmprovider.c:230 +#: src/goabackend/goalastfmprovider.c:238 +#: src/goabackend/goalastfmprovider.c:244 +#: src/goabackend/goalastfmprovider.c:512 +#: src/goabackend/goalastfmprovider.c:521 +#: src/goabackend/goalastfmprovider.c:538 +#: src/goabackend/goalastfmprovider.c:544 +#: src/goabackend/goaoauth2provider.c:656 +#: src/goabackend/goaoauth2provider.c:686 +#: src/goabackend/goaoauth2provider.c:697 +#: src/goabackend/goatodoistprovider.c:212 +#: src/goabackend/goatodoistprovider.c:223 +#: src/goabackend/goatodoistprovider.c:234 src/goabackend/goautils.c:313 +#: src/goabackend/goawindowsliveprovider.c:178 +#: src/goabackend/goawindowsliveprovider.c:189 +#: src/goabackend/goawindowsliveprovider.c:198 +#: src/goabackend/goawindowsliveprovider.c:211 msgid "Could not parse response" msgstr "Kon nie antwoord ontleed nie" -#: ../src/goabackend/goafacebookprovider.c:417 -#: ../src/goabackend/goagoogleprovider.c:564 -#: ../src/goabackend/goatelepathyprovider.c:897 -#: ../src/goabackend/goawindowsliveprovider.c:432 -msgid "C_hat" -msgstr "_Gesels" - -#: ../src/goabackend/goaflickrprovider.c:83 +#: src/goabackend/goaflickrprovider.c:56 msgid "Flickr" msgstr "Flickr" -#: ../src/goabackend/goaflickrprovider.c:189 -#, c-format -msgid "Expected status 200 when requesting user id, instead got status %d (%s)" -msgstr "" - -#: ../src/goabackend/goaflickrprovider.c:328 -#: ../src/goabackend/goayahooprovider.c:350 +#: src/goabackend/goaflickrprovider.c:271 msgid "Your system time is invalid. Check your date and time settings." msgstr "" "Die stelsel se tyd is ongeldig. Kontroleer die instellings vir datum en tyd." -#: ../src/goabackend/goaflickrprovider.c:427 -msgid "_Photos" -msgstr "_Foto's" +#: src/goabackend/goafoursquareprovider.c:57 +msgid "Foursquare" +msgstr "" -#: ../src/goabackend/goagoogleprovider.c:82 +#: src/goabackend/goagoogleprovider.c:56 msgid "Google" msgstr "Google" -#: ../src/goabackend/goagoogleprovider.c:569 -#: ../src/goabackend/goaowncloudprovider.c:1114 -#: ../src/goabackend/goawindowsliveprovider.c:437 -msgid "_Documents" -msgstr "_Dokumente" - #. TODO: more specific -#: ../src/goabackend/goaimapauthlogin.c:99 -#: ../src/goabackend/goasmtpauthplain.c:146 -#, c-format +#: src/goabackend/goaimapauthlogin.c:84 src/goabackend/goasmtpauth.c:155 msgid "Service not available" msgstr "Diens nie beskikbaar nie" #. TODO: more specific -#: ../src/goabackend/goaimapauthlogin.c:120 -#: ../src/goabackend/goasmtpauthplain.c:115 -#, c-format +#: src/goabackend/goaimapauthlogin.c:104 src/goabackend/goalastfmprovider.c:529 +#: src/goabackend/goasmtpauth.c:108 src/goabackend/goautils.c:878 msgid "Authentication failed" msgstr "" -#: ../src/goabackend/goaimapauthlogin.c:145 -#: ../src/goabackend/goasmtpauthplain.c:646 -#, c-format +#: src/goabackend/goaimapauthlogin.c:129 msgid "Server does not support PLAIN" msgstr "Bediener ondersteun nie PLAIN nie" -#: ../src/goabackend/goaimapauthlogin.c:199 -#: ../src/goabackend/goasmtpauthplain.c:751 -#, c-format +#: src/goabackend/goaimapauthlogin.c:181 src/goabackend/goasmtpauth.c:606 msgid "Server does not support STARTTLS" msgstr "Bediener ondersteun nie STARTTLS nie" -#: ../src/goabackend/goaimapsmtpprovider.c:82 +#: src/goabackend/goaimapsmtpprovider.c:53 msgid "IMAP and SMTP" msgstr "IMAP en SMTP" -#: ../src/goabackend/goaimapsmtpprovider.c:362 -#, c-format -msgid "Did not find imap-password with identity `%s' in credentials" -msgstr "" - -#. Translators: the first %s is the IMAP +#. Translators: the first %s is a field name. The +#. * second %s is the IMAP #. * username (eg., rishi), and the (%s, %d) #. * is the error domain and code. #. -#: ../src/goabackend/goaimapsmtpprovider.c:391 -#, c-format -msgid "Invalid imap-password with username `%s' (%s, %d): " -msgstr "" - -#: ../src/goabackend/goaimapsmtpprovider.c:415 -#, c-format -msgid "Did not find smtp-password with identity `%s' in credentials" -msgstr "" - -#. Translators: the first %s is the SMTP +#. Translators: the first %s is a field name. The +#. * second %s is the SMTP #. * username (eg., rishi), and the (%s, %d) #. * is the error domain and code. #. -#: ../src/goabackend/goaimapsmtpprovider.c:446 +#: src/goabackend/goaimapsmtpprovider.c:327 +#: src/goabackend/goaimapsmtpprovider.c:378 #, c-format -msgid "Invalid smtp-password with username `%s' (%s, %d): " +msgid "Invalid %s with username “%s” (%s, %d): " msgstr "" #. Translators: the following four strings are used to show a @@ -350,461 +309,567 @@ #. * STARTTLS after connecting #. * SSL on a dedicated port #. -#: ../src/goabackend/goaimapsmtpprovider.c:632 +#: src/goabackend/goaimapsmtpprovider.c:564 msgid "_Encryption" msgstr "_Enkripsie" -#: ../src/goabackend/goaimapsmtpprovider.c:635 +#: src/goabackend/goaimapsmtpprovider.c:567 msgid "None" msgstr "Geen" -#: ../src/goabackend/goaimapsmtpprovider.c:638 +#: src/goabackend/goaimapsmtpprovider.c:570 msgid "STARTTLS after connecting" msgstr "" -#: ../src/goabackend/goaimapsmtpprovider.c:641 +#: src/goabackend/goaimapsmtpprovider.c:573 msgid "SSL on a dedicated port" msgstr "SSL op toegewyde poort" -#: ../src/goabackend/goaimapsmtpprovider.c:698 +#: src/goabackend/goaimapsmtpprovider.c:648 msgid "_Name" msgstr "_Naam" -#: ../src/goabackend/goaimapsmtpprovider.c:715 +#: src/goabackend/goaimapsmtpprovider.c:665 msgid "IMAP _Server" msgstr "IMAP-_bediener" -#: ../src/goabackend/goaimapsmtpprovider.c:735 +#: src/goabackend/goaimapsmtpprovider.c:685 msgid "SMTP _Server" msgstr "SMTP-_bediener" -#: ../src/goabackend/goaimapsmtpprovider.c:1017 -#: ../src/goabackend/goaimapsmtpprovider.c:1344 +#: src/goabackend/goaimapsmtpprovider.c:700 +#: src/goabackend/goaimapsmtpprovider.c:972 +#: src/goabackend/goaimapsmtpprovider.c:1305 +msgid "_Forward" +msgstr "" + +#: src/goabackend/goaimapsmtpprovider.c:956 +#: src/goabackend/goaimapsmtpprovider.c:1288 msgid "Error connecting to IMAP server" msgstr "Fout met die koppeling aan die IMAP-bediener" -#: ../src/goabackend/goaimapsmtpprovider.c:1108 -#: ../src/goabackend/goaimapsmtpprovider.c:1418 +#: src/goabackend/goaimapsmtpprovider.c:1053 +#: src/goabackend/goaimapsmtpprovider.c:1365 msgid "Error connecting to SMTP server" msgstr "Fout met die koppeling aan die SMTP-bediener" -#: ../src/goabackend/goaimapsmtpprovider.c:1517 +#: src/goabackend/goaimapsmtpprovider.c:1476 msgid "E-mail" msgstr "E-pos" -#: ../src/goabackend/goaimapsmtpprovider.c:1521 +#: src/goabackend/goaimapsmtpprovider.c:1480 msgid "Name" msgstr "Naam" -#: ../src/goabackend/goaimapsmtpprovider.c:1531 -#: ../src/goabackend/goaimapsmtpprovider.c:1534 +#: src/goabackend/goaimapsmtpprovider.c:1490 +#: src/goabackend/goaimapsmtpprovider.c:1494 msgid "IMAP" msgstr "IMAP" -#: ../src/goabackend/goaimapsmtpprovider.c:1545 -#: ../src/goabackend/goaimapsmtpprovider.c:1548 +#: src/goabackend/goaimapsmtpprovider.c:1505 +#: src/goabackend/goaimapsmtpprovider.c:1509 msgid "SMTP" msgstr "SMTP" -#: ../src/goabackend/goakerberosprovider.c:87 +#: src/goabackend/goakerberosprovider.c:100 msgid "Enterprise Login (Kerberos)" msgstr "Ondernemingaanmelding (Kerberos)" -#: ../src/goabackend/goakerberosprovider.c:455 -msgid "Identity service returned invalid key" -msgstr "Identiteitsdiens het net ongeldige sleutel geantwoord" +#: src/goabackend/goakerberosprovider.c:220 +msgid "Ticketing is disabled for account" +msgstr "" -#: ../src/goabackend/goakerberosprovider.c:728 +#: src/goabackend/goakerberosprovider.c:245 #, c-format -msgid "Could not find saved credentials for principal `%s' in keyring" +msgid "Could not find saved credentials for principal “%s” in keyring" msgstr "" -#: ../src/goabackend/goakerberosprovider.c:738 +#: src/goabackend/goakerberosprovider.c:258 #, c-format -msgid "Did not find password for principal `%s' in credentials" +msgid "Did not find password for principal “%s” in credentials" msgstr "" -#: ../src/goabackend/goakerberosprovider.c:1121 -msgid "_Domain" -msgstr "_Domein" +#: src/goabackend/goakerberosprovider.c:558 +msgid "_Principal" +msgstr "" -#: ../src/goabackend/goakerberosprovider.c:1122 -msgid "Enterprise domain or realm name" +#: src/goabackend/goakerberosprovider.c:744 +msgid "Operation was cancelled" msgstr "" -#: ../src/goabackend/goakerberosprovider.c:1354 -#: ../src/goaidentity/goaidentityservice.c:1085 +#: src/goabackend/goakerberosprovider.c:794 +#: src/goaidentity/goaidentityservice.c:1072 msgid "Log In to Realm" msgstr "" -#: ../src/goabackend/goakerberosprovider.c:1355 +#: src/goabackend/goakerberosprovider.c:795 msgid "Please enter your password below." msgstr "Tik u wagwoord onder in." -#: ../src/goabackend/goakerberosprovider.c:1356 +#: src/goabackend/goakerberosprovider.c:796 msgid "Remember this password" msgstr "Onthou dié wagwoord" -#: ../src/goabackend/goakerberosprovider.c:1495 -#, c-format -msgid "The domain is not valid" -msgstr "Die domein is nie geldig nie" - -#: ../src/goabackend/goakerberosprovider.c:1650 +#: src/goabackend/goakerberosprovider.c:976 msgid "Error connecting to enterprise identity server" msgstr "" -#: ../src/goabackend/goakerberosprovider.c:1728 -msgid "Network _Resources" -msgstr "Netwe_rkhulpbronne" +#: src/goabackend/goakerberosprovider.c:1315 +msgid "Identity service returned invalid key" +msgstr "Identiteitsdiens het net ongeldige sleutel geantwoord" + +#: src/goabackend/goalastfmprovider.c:65 +msgid "Last.fm" +msgstr "" + +#: src/goabackend/goalastfmprovider.c:700 +#: src/goabackend/goalastfmprovider.c:850 +#, fuzzy +#| msgid "Error connecting to IMAP server" +msgid "Error connecting to Last.fm" +msgstr "Fout met die koppeling aan die IMAP-bediener" + +#: src/goabackend/goamediaserverprovider.c:63 +#, fuzzy +#| msgid "IMAP _Server" +msgid "Media Server" +msgstr "IMAP-_bediener" + +#: src/goabackend/goamediaserverprovider.c:316 +msgid "" +"Personal content can be added to your applications through a media server " +"account." +msgstr "" + +#: src/goabackend/goamediaserverprovider.c:329 +msgid "Available Media Servers" +msgstr "" + +#: src/goabackend/goamediaserverprovider.c:360 +msgid "No media servers found" +msgstr "" #. Translators: the %d is a HTTP status code and the %s is a textual description of it -#: ../src/goabackend/goaoauth2provider.c:658 -#: ../src/goabackend/goaoauthprovider.c:586 +#: src/goabackend/goaoauth2provider.c:632 src/goabackend/goaoauthprovider.c:542 #, c-format msgid "" "Expected status 200 when requesting access token, instead got status %d (%s)" msgstr "" -#: ../src/goabackend/goaoauth2provider.c:916 -#: ../src/goabackend/goaoauth2provider.c:956 -#, c-format -msgid "Authorization response was \"%s\"" +#: src/goabackend/goaoauth2provider.c:814 +msgid "Authorization response: " msgstr "" -#. Translators: The verb "Paste" is used when asking the user to paste a string from a web browser window -#: ../src/goabackend/goaoauth2provider.c:1059 +#: src/goabackend/goaoauth2provider.c:884 #, c-format -msgid "" -"Paste authorization code obtained from the authorization " -"page:" +msgid "Authorization response: %s" msgstr "" -#: ../src/goabackend/goaoauth2provider.c:1159 -#: ../src/goabackend/goaoauthprovider.c:1072 +#: src/goabackend/goaoauth2provider.c:1021 +#: src/goabackend/goaoauthprovider.c:890 msgid "Error getting an Access Token: " msgstr "" -#: ../src/goabackend/goaoauth2provider.c:1174 -#: ../src/goabackend/goaoauthprovider.c:1085 +#: src/goabackend/goaoauth2provider.c:1036 +#: src/goabackend/goaoauthprovider.c:903 msgid "Error getting identity: " msgstr "" -#: ../src/goabackend/goaoauth2provider.c:1386 -#: ../src/goabackend/goaoauthprovider.c:1391 +#: src/goabackend/goaoauth2provider.c:1254 +#: src/goabackend/goaoauthprovider.c:1192 #, c-format -msgid "Was asked to login as %s, but logged in as %s" +msgid "Was asked to log in as %s, but logged in as %s" msgstr "" -#: ../src/goabackend/goaoauth2provider.c:1545 -#, c-format +#: src/goabackend/goaoauth2provider.c:1406 msgid "Credentials do not contain access_token" msgstr "" -#: ../src/goabackend/goaoauth2provider.c:1584 -#: ../src/goabackend/goaoauthprovider.c:1619 +#: src/goabackend/goaoauth2provider.c:1445 +#: src/goabackend/goaoauthprovider.c:1407 #, c-format msgid "Failed to refresh access token (%s, %d): " msgstr "" -#: ../src/goabackend/goaoauthprovider.c:609 -#, c-format +#: src/goabackend/goaoauthprovider.c:565 msgid "Missing access_token or access_token_secret headers in response" msgstr "" -#: ../src/goabackend/goaoauthprovider.c:911 +#: src/goabackend/goaoauthprovider.c:773 msgid "Error getting a Request Token: " msgstr "" #. Translators: the %d is a HTTP status code and the %s is a textual description of it -#: ../src/goabackend/goaoauthprovider.c:944 +#: src/goabackend/goaoauthprovider.c:804 #, c-format msgid "" "Expected status 200 for getting a Request Token, instead got status %d (%s)" msgstr "" -#: ../src/goabackend/goaoauthprovider.c:961 -#, c-format +#: src/goabackend/goaoauthprovider.c:821 msgid "Missing request_token or request_token_secret headers in response" msgstr "" -#. Translators: The verb "Paste" is used when asking the user to paste a string from a web browser window -#: ../src/goabackend/goaoauthprovider.c:978 -#, c-format -msgid "Paste token obtained from the authorization page:" -msgstr "" - -#: ../src/goabackend/goaoauthprovider.c:1575 -#, c-format +#: src/goabackend/goaoauthprovider.c:1363 msgid "Credentials do not contain access_token or access_token_secret" msgstr "" -#: ../src/goabackend/goaowncloudprovider.c:87 -msgid "ownCloud" -msgstr "ownCloud" +#: src/goabackend/goaowncloudprovider.c:60 +msgid "Nextcloud" +msgstr "" -#: ../src/goabackend/goaowncloudprovider.c:860 -#: ../src/goabackend/goaowncloudprovider.c:1041 +#: src/goabackend/goaowncloudprovider.c:731 +#: src/goabackend/goaowncloudprovider.c:922 msgid "Error connecting to ownCloud server" msgstr "Fout met die koppeling aan die ownCloud-bediener" -#: ../src/goabackend/goaowncloudprovider.c:1119 +#: src/goabackend/goapocketprovider.c:74 +msgid "Pocket" +msgstr "" + +#. TODO: more specific +#: src/goabackend/goapocketprovider.c:249 +msgid "No username or access_token" +msgstr "" + +#: src/goabackend/goaprovider.c:114 +msgid "_Mail" +msgstr "_Pos" + +#: src/goabackend/goaprovider.c:119 +msgid "Cale_ndar" +msgstr "Kale_nder" + +#: src/goabackend/goaprovider.c:124 +msgid "_Contacts" +msgstr "_Kontakte" + +#: src/goabackend/goaprovider.c:129 src/goabackend/goatelepathyprovider.c:951 +msgid "C_hat" +msgstr "_Gesels" + +#: src/goabackend/goaprovider.c:134 +msgid "_Documents" +msgstr "_Dokumente" + +#: src/goabackend/goaprovider.c:139 +msgid "M_usic" +msgstr "" + +#: src/goabackend/goaprovider.c:144 +msgid "_Photos" +msgstr "_Foto's" + +#: src/goabackend/goaprovider.c:149 msgid "_Files" msgstr "_Lêers" -#: ../src/goabackend/goaprovider.c:688 -#, c-format -msgid "ensure_credentials_sync is not implemented on type %s" +#: src/goabackend/goaprovider.c:154 +msgid "Network _Resources" +msgstr "Netwe_rkhulpbronne" + +#: src/goabackend/goaprovider.c:159 +msgid "_Read Later" msgstr "" -#. TODO: more specific -#: ../src/goabackend/goasmtpauthplain.c:161 -#, c-format -msgid "TLS not available" -msgstr "TLS nie beskikbaar nie" +#: src/goabackend/goaprovider.c:164 +msgid "Prin_ters" +msgstr "" -#. TODO: more specific -#: ../src/goabackend/goasmtpauthplain.c:227 -#, c-format -msgid "org.gnome.OnlineAccounts.Mail is not available" +#: src/goabackend/goaprovider.c:169 +msgid "_Maps" msgstr "" -#. TODO: more specific -#: ../src/goabackend/goasmtpauthplain.c:237 -#, c-format -msgid "Failed to parse email address" +#: src/goabackend/goaprovider.c:174 +msgid "T_o Do" msgstr "" -#. TODO: more specific -#: ../src/goabackend/goasmtpauthplain.c:249 -#, c-format -msgid "Cannot do SMTP PLAIN without a domain" +#. Translators: This is a label for a series of +#. * options switches. For example: “Use for Mail”. +#: src/goabackend/goaprovider.c:588 src/goabackend/goatelepathyprovider.c:949 +msgid "Use for" +msgstr "Gebruik vir" + +#: src/goabackend/goaprovider.c:843 +msgid "Account is disabled" msgstr "" -#. TODO: more specific -#: ../src/goabackend/goasmtpauthplain.c:287 -#, c-format -msgid "Did not find smtp-password in credentials" +#: src/goabackend/goaprovider.c:856 +msgid "Unknown error" msgstr "" -#. TODO: more specific -#: ../src/goabackend/goasmtpauthplain.c:298 +#: src/goabackend/goaprovider.c:875 #, c-format -msgid "Cannot do SMTP PLAIN without a password" +msgid "ensure_credentials_sync is not implemented on type %s" msgstr "" -#: ../src/goabackend/goatelepathyprovider.c:184 -#, c-format -msgid "Telepathy chat account not found" +#. TODO: more specific +#: src/goabackend/goasmtpauth.c:170 +msgid "TLS not available" +msgstr "TLS nie beskikbaar nie" + +#: src/goabackend/goasmtpauth.c:476 +msgid "Unknown authentication mechanism" msgstr "" -#: ../src/goabackend/goatelepathyprovider.c:373 -#, c-format -msgid "Failed to initialize a GOA client" +#: src/goabackend/goatelepathyprovider.c:172 +msgid "Telepathy chat account not found" msgstr "" -#: ../src/goabackend/goatelepathyprovider.c:416 +#: src/goabackend/goatelepathyprovider.c:434 #, c-format msgid "Failed to create a user interface for %s" msgstr "" -#: ../src/goabackend/goatelepathyprovider.c:543 +#: src/goabackend/goatelepathyprovider.c:540 msgid "Connection Settings" msgstr "Verbindinginstellings" -#: ../src/goabackend/goatelepathyprovider.c:652 +#: src/goabackend/goatelepathyprovider.c:646 msgid "Personal Details" msgstr "Persoonlike besonderhede" -#: ../src/goabackend/goatelepathyprovider.c:861 +#: src/goabackend/goatelepathyprovider.c:652 +msgid "_OK" +msgstr "" + +#: src/goabackend/goatelepathyprovider.c:898 msgid "Cannot save the connection parameters" msgstr "" -#: ../src/goabackend/goatelepathyprovider.c:873 +#: src/goabackend/goatelepathyprovider.c:911 msgid "Cannot save your personal information on the server" msgstr "" #. Connection Settings button -#: ../src/goabackend/goatelepathyprovider.c:902 +#: src/goabackend/goatelepathyprovider.c:956 msgid "_Connection Settings" msgstr "_Verbindinginstellings" #. Edit Personal Information button -#: ../src/goabackend/goatelepathyprovider.c:906 +#: src/goabackend/goatelepathyprovider.c:960 msgid "_Personal Details" msgstr "_Persoonlike besonderhede" -#: ../src/goabackend/goatwitterprovider.c:81 -msgid "Twitter" -msgstr "Twitter" +#: src/goabackend/goatodoistprovider.c:58 +msgid "Todoist" +msgstr "" + +#: src/goabackend/goautils.c:96 +msgid "Error logging into the account" +msgstr "" + +#: src/goabackend/goautils.c:140 +msgid "Credentials have expired" +msgstr "" + +#: src/goabackend/goautils.c:144 +msgid "Sign in to enable this account." +msgstr "" + +#: src/goabackend/goautils.c:148 +msgid "_Sign In" +msgstr "" -#: ../src/goabackend/goautils.c:120 +#: src/goabackend/goautils.c:280 #, c-format msgid "A %s account already exists for %s" msgstr "'n %s-rekening bestaan reeds vir %s" -#. Translators: the %s is the name of the provider. eg., Google. -#: ../src/goabackend/goautils.c:142 -#, c-format -msgid "%s account" +#. Translators: this is the title of the "Add Account" and "Refresh +#. * Account" dialogs. The %s is the name of the provider. eg., +#. * 'Google'. +#. +#: src/goabackend/goautils.c:333 +#, fuzzy, c-format +#| msgid "%s account" +msgid "%s Account" msgstr "%s-rekening" #. TODO: more specific -#: ../src/goabackend/goautils.c:186 +#: src/goabackend/goautils.c:387 msgid "Failed to delete credentials from the keyring" msgstr "" #. TODO: more specific -#: ../src/goabackend/goautils.c:238 +#: src/goabackend/goautils.c:435 msgid "Failed to retrieve credentials from the keyring" msgstr "" #. TODO: more specific -#: ../src/goabackend/goautils.c:248 +#: src/goabackend/goautils.c:445 msgid "No credentials found in the keyring" msgstr "" -#: ../src/goabackend/goautils.c:261 +#: src/goabackend/goautils.c:458 msgid "Error parsing result obtained from the keyring: " msgstr "" #. Translators: The %s is the type of the provider, e.g. 'google' or 'yahoo' -#: ../src/goabackend/goautils.c:304 +#: src/goabackend/goautils.c:499 #, c-format msgid "GOA %s credentials for identity %s" msgstr "" #. TODO: more specific -#: ../src/goabackend/goautils.c:321 +#: src/goabackend/goautils.c:516 msgid "Failed to store credentials in the keyring" msgstr "" -#: ../src/goabackend/goautils.c:542 +#: src/goabackend/goautils.c:865 +msgid "Cannot resolve hostname" +msgstr "" + +#: src/goabackend/goautils.c:869 +msgid "Cannot resolve proxy hostname" +msgstr "" + +#: src/goabackend/goautils.c:874 +msgid "Cannot find WebDAV endpoint" +msgstr "" + +#: src/goabackend/goautils.c:883 +#, c-format +msgid "Code: %u — Unexpected response from server" +msgstr "" + +#: src/goabackend/goautils.c:899 msgid "The signing certificate authority is not known." msgstr "" -#: ../src/goabackend/goautils.c:546 +#: src/goabackend/goautils.c:903 msgid "" "The certificate does not match the expected identity of the site that it was " "retrieved from." msgstr "" -#: ../src/goabackend/goautils.c:551 -msgid "The certificate's activation time is still in the future." +#: src/goabackend/goautils.c:908 +msgid "The certificate’s activation time is still in the future." msgstr "" -#: ../src/goabackend/goautils.c:555 +#: src/goabackend/goautils.c:912 msgid "The certificate has expired." msgstr "" -#: ../src/goabackend/goautils.c:559 +#: src/goabackend/goautils.c:916 msgid "The certificate has been revoked." msgstr "" -#: ../src/goabackend/goautils.c:563 -msgid "The certificate's algorithm is considered insecure." +#: src/goabackend/goautils.c:920 +msgid "The certificate’s algorithm is considered insecure." msgstr "" -#: ../src/goabackend/goautils.c:567 +#: src/goabackend/goautils.c:926 msgid "Invalid certificate." msgstr "" +#. TODO: more specific +#: src/goabackend/goautils.c:961 +#, c-format +msgid "Did not find %s with identity “%s” in credentials" +msgstr "" + #. translators: %s here is the address of the web page -#: ../src/goabackend/goawebview.c:74 +#: src/goabackend/goawebview.c:94 #, c-format msgid "Loading “%s”…" msgstr "Laai tans “%s”…" -#: ../src/goabackend/goawindowsliveprovider.c:84 -msgid "Windows Live" -msgstr "Windows Live" - -#: ../src/goabackend/goayahooprovider.c:81 -msgid "Yahoo" -msgstr "Yahoo" - -#: ../src/goabackend/goayahooprovider.c:255 -#, c-format -msgid "Expected status 200 when requesting name, instead got status %d (%s)" -msgstr "" - -#: ../src/goaidentity/goaalarm.c:245 -msgid "Time" -msgstr "Tyd" - -#: ../src/goaidentity/goaalarm.c:246 -msgid "Time to fire" -msgstr "" - -#: ../src/goaidentity/goaidentityservice.c:378 -msgid "initial secret passed before secret key exchange" -msgstr "" +#: src/goabackend/goawindowsliveprovider.c:56 +#, fuzzy +#| msgid "Microsoft Exchange" +msgid "Microsoft" +msgstr "Microsoft Exchange" -#: ../src/goaidentity/goaidentityservice.c:570 +#: src/goaidentity/goaidentityservice.c:568 msgid "Initial secret key is invalid" msgstr "" -#: ../src/goaidentity/goaidentityservice.c:1090 +#: src/goaidentity/goaidentityservice.c:1077 #, c-format msgid "The network realm %s needs some information to sign you in." msgstr "" -#: ../src/goaidentity/goakerberosidentity.c:269 -#: ../src/goaidentity/goakerberosidentity.c:278 -#: ../src/goaidentity/goakerberosidentity.c:606 -msgid "Could not find identity in credential cache: %k" +#: src/goaidentity/goakerberosidentity.c:275 +#: src/goaidentity/goakerberosidentity.c:283 +#: src/goaidentity/goakerberosidentity.c:707 +msgid "Could not find identity in credential cache: " msgstr "" -#: ../src/goaidentity/goakerberosidentity.c:619 -msgid "Could not find identity credentials in cache: %k" +#: src/goaidentity/goakerberosidentity.c:720 +msgid "Could not find identity credentials in cache: " msgstr "" -#: ../src/goaidentity/goakerberosidentity.c:657 -msgid "Could not sift through identity credentials in cache: %k" +#: src/goaidentity/goakerberosidentity.c:771 +msgid "Could not sift through identity credentials in cache: " msgstr "" -#: ../src/goaidentity/goakerberosidentity.c:674 -msgid "Could not finish up sifting through identity credentials in cache: %k" +#: src/goaidentity/goakerberosidentity.c:788 +msgid "Could not finish up sifting through identity credentials in cache: " msgstr "" -#: ../src/goaidentity/goakerberosidentity.c:1012 -#, c-format +#: src/goaidentity/goakerberosidentity.c:1103 msgid "No associated identification found" msgstr "" -#: ../src/goaidentity/goakerberosidentity.c:1093 -msgid "Could not create credential cache: %k" +#: src/goaidentity/goakerberosidentity.c:1186 +msgid "Could not create credential cache: " msgstr "" -#: ../src/goaidentity/goakerberosidentity.c:1127 -msgid "Could not initialize credentials cache: %k" +#: src/goaidentity/goakerberosidentity.c:1220 +msgid "Could not initialize credentials cache: " msgstr "" -#: ../src/goaidentity/goakerberosidentity.c:1146 -msgid "Could not store new credentials in credentials cache: %k" +#: src/goaidentity/goakerberosidentity.c:1236 +msgid "Could not store new credentials in credentials cache: " msgstr "" -#: ../src/goaidentity/goakerberosidentity.c:1423 -#, c-format +#: src/goaidentity/goakerberosidentity.c:1534 msgid "Could not renew identity: Not signed in" msgstr "" -#: ../src/goaidentity/goakerberosidentity.c:1435 -msgid "Could not renew identity: %k" -msgstr "" +#: src/goaidentity/goakerberosidentity.c:1546 +#, fuzzy +#| msgid "Could not parse response" +msgid "Could not renew identity: " +msgstr "Kon nie antwoord ontleed nie" -#: ../src/goaidentity/goakerberosidentity.c:1452 -msgid "Could not get new credentials to renew identity %s: %k" +#: src/goaidentity/goakerberosidentity.c:1562 +#, c-format +msgid "Could not get new credentials to renew identity %s: " msgstr "" -#: ../src/goaidentity/goakerberosidentity.c:1492 -msgid "Could not erase identity: %k" -msgstr "" +#: src/goaidentity/goakerberosidentity.c:1604 +#, fuzzy +#| msgid "Could not parse response" +msgid "Could not erase identity: " +msgstr "Kon nie antwoord ontleed nie" -#: ../src/goaidentity/goakerberosidentitymanager.c:747 +#: src/goaidentity/goakerberosidentitymanager.c:749 msgid "Could not find identity" msgstr "" -#: ../src/goaidentity/goakerberosidentitymanager.c:824 +#: src/goaidentity/goakerberosidentitymanager.c:845 msgid "Could not create credential cache for identity" msgstr "" + +#~ msgid "_Domain" +#~ msgstr "_Domein" + +#~ msgid "The domain is not valid" +#~ msgstr "Die domein is nie geldig nie" + +#~ msgid "ownCloud" +#~ msgstr "ownCloud" + +#~ msgid "Twitter" +#~ msgstr "Twitter" + +#~ msgid "Windows Live" +#~ msgstr "Windows Live" + +#~ msgid "Yahoo" +#~ msgstr "Yahoo" + +#~ msgid "Time" +#~ msgstr "Tyd" Binary files /tmp/tmpOF9Z7O/tiVsTCcCtl/gnome-online-accounts-3.30.1/po/eu.gmo and /tmp/tmpOF9Z7O/8j3UbjNw9P/gnome-online-accounts-3.31.90/po/eu.gmo differ diff -Nru gnome-online-accounts-3.30.1/po/eu.po gnome-online-accounts-3.31.90/po/eu.po --- gnome-online-accounts-3.30.1/po/eu.po 2019-01-17 10:08:27.000000000 +0000 +++ gnome-online-accounts-3.31.90/po/eu.po 2019-01-17 11:54:47.000000000 +0000 @@ -3,15 +3,15 @@ # This file is distributed under the same license as the gnome-online-accounts package. # # Julen Ruiz Aizpuru , 2011. -# Iñaki Larrañaga Murgoitio , 2012, 2013, 2014, 2015, 2016, 2017, 2018. +# Iñaki Larrañaga Murgoitio , 2012, 2013, 2014, 2015, 2016, 2017. # Asier Sarasua Garmendia , 2013. msgid "" msgstr "" "Project-Id-Version: gnome-online-accounts master\n" -"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-online-accounts/iss" -"ues\n" -"POT-Creation-Date: 2018-09-01 08:54+0000\n" -"PO-Revision-Date: 2018-11-24 19:21+0100\n" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"online-accounts&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2017-08-08 16:41+0000\n" +"PO-Revision-Date: 2017-08-27 15:42+0200\n" "Last-Translator: Iñaki Larrañaga Murgoitio \n" "Language-Team: Basque \n" "Language: eu\n" @@ -19,58 +19,48 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 1.5\n" "X-Project-Style: gnome\n" -#: data/org.gnome.online-accounts.gschema.xml:6 -msgid "List of providers that are allowed to be loaded" -msgstr "Kargatzeko baimendutako hornitzaileen zerrenda" - -#: data/org.gnome.online-accounts.gschema.xml:7 -msgid "" -"A list of strings representing the providers that are allowed to be loaded " -"(default: 'all'). This is only evaluated on startup." -msgstr "" -"Kateen zerrenda bat, kargatzea baimenduta dauden hornitzaileen adierazle. " -"Lehenetsian: 'all' (denak). Abioan soilik egiten da." - #. TODO: more specific -#: src/daemon/goadaemon.c:1131 src/daemon/goadaemon.c:1415 +#: ../src/daemon/goadaemon.c:1172 ../src/daemon/goadaemon.c:1456 #, c-format msgid "Failed to find a provider for: %s" msgstr "Huts egin du honentzako hornitzailea bilatzean: %s" -#: src/daemon/goadaemon.c:1358 +#: ../src/daemon/goadaemon.c:1399 msgid "IsLocked property is set for account" msgstr "IsLocked propietatea kontuarentzako ezarri da" #. TODO: more specific -#: src/daemon/goadaemon.c:1403 +#: ../src/daemon/goadaemon.c:1444 msgid "ProviderType property is not set for account" msgstr "Ez da kontuaren ProviderType propietatea ezarri" #. TODO: more specific -#: src/goabackend/goaewsclient.c:238 +#: ../src/goabackend/goaewsclient.c:238 +#, c-format msgid "Failed to parse autodiscover response XML" msgstr "" "Huts egin du autodiscover (automatikoki ezagutu) XML erantzuna analizatzean" #. TODO: more specific #. Translators: the parameter is an XML element name. -#: src/goabackend/goaewsclient.c:249 src/goabackend/goaewsclient.c:264 -#: src/goabackend/goaewsclient.c:279 +#: ../src/goabackend/goaewsclient.c:249 ../src/goabackend/goaewsclient.c:264 +#: ../src/goabackend/goaewsclient.c:279 #, c-format msgid "Failed to find “%s” element" msgstr "Huts egin du “%s“ elementua bilatzean" #. TODO: more specific -#: src/goabackend/goaewsclient.c:300 +#: ../src/goabackend/goaewsclient.c:300 +#, c-format msgid "Failed to find ASUrl and OABUrl in autodiscover response" msgstr "" "Huts egin du ASUrl eta OABUrl bilatzean Autodiscover (automatikoki ezagutu) " "erantzunean" -#: src/goabackend/goaexchangeprovider.c:51 +#: ../src/goabackend/goaexchangeprovider.c:51 msgid "Microsoft Exchange" msgstr "Microsoft Exchange" @@ -78,134 +68,141 @@ #. * (eg., debarshi.ray@gmail.com or rishi), and the #. * (%s, %d) is the error domain and code. #. -#: src/goabackend/goaexchangeprovider.c:248 -#: src/goabackend/goalastfmprovider.c:287 -#: src/goabackend/goaowncloudprovider.c:291 +#: ../src/goabackend/goaexchangeprovider.c:248 +#: ../src/goabackend/goalastfmprovider.c:287 +#: ../src/goabackend/goaowncloudprovider.c:299 #, c-format msgid "Invalid password with username “%s” (%s, %d): " msgstr "“%s“ erabiltzaile-izenaren baliogabeko pasahitza (%s, %d): " -#: src/goabackend/goaexchangeprovider.c:396 -#: src/goabackend/goaimapsmtpprovider.c:647 +#: ../src/goabackend/goaexchangeprovider.c:396 +#: ../src/goabackend/goaimapsmtpprovider.c:686 msgid "_E-mail" msgstr "_Helb. elek." -#: src/goabackend/goaexchangeprovider.c:397 -#: src/goabackend/goaimapsmtpprovider.c:667 -#: src/goabackend/goaimapsmtpprovider.c:687 -#: src/goabackend/goalastfmprovider.c:429 -#: src/goabackend/goaowncloudprovider.c:530 +#: ../src/goabackend/goaexchangeprovider.c:397 +#: ../src/goabackend/goaimapsmtpprovider.c:706 +#: ../src/goabackend/goaimapsmtpprovider.c:726 +#: ../src/goabackend/goalastfmprovider.c:429 +#: ../src/goabackend/goaowncloudprovider.c:538 msgid "_Password" msgstr "_Pasahitza" -#: src/goabackend/goaexchangeprovider.c:400 +#: ../src/goabackend/goaexchangeprovider.c:400 msgid "_Custom" msgstr "_Pertsonalizatu" -#: src/goabackend/goaexchangeprovider.c:411 -#: src/goabackend/goaimapsmtpprovider.c:666 -#: src/goabackend/goaimapsmtpprovider.c:686 -#: src/goabackend/goalastfmprovider.c:428 -#: src/goabackend/goaowncloudprovider.c:529 +#: ../src/goabackend/goaexchangeprovider.c:411 +#: ../src/goabackend/goaimapsmtpprovider.c:705 +#: ../src/goabackend/goaimapsmtpprovider.c:725 +#: ../src/goabackend/goakerberosprovider.c:739 +#: ../src/goabackend/goalastfmprovider.c:428 +#: ../src/goabackend/goaowncloudprovider.c:537 msgid "User_name" msgstr "_Erabiltzaile-izena" -#: src/goabackend/goaexchangeprovider.c:412 -#: src/goabackend/goaowncloudprovider.c:528 +#: ../src/goabackend/goaexchangeprovider.c:412 +#: ../src/goabackend/goaowncloudprovider.c:536 msgid "_Server" msgstr "_Zerbitzaria" #. -- -#: src/goabackend/goaexchangeprovider.c:422 -#: src/goabackend/goaimapsmtpprovider.c:699 -#: src/goabackend/goakerberosprovider.c:563 -#: src/goabackend/goalastfmprovider.c:437 -#: src/goabackend/goaowncloudprovider.c:544 +#: ../src/goabackend/goaexchangeprovider.c:422 +#: ../src/goabackend/goaimapsmtpprovider.c:738 +#: ../src/goabackend/goakerberosprovider.c:744 +#: ../src/goabackend/goalastfmprovider.c:437 +#: ../src/goabackend/goaowncloudprovider.c:552 +#: ../src/goabackend/goatelepathyprovider.c:651 msgid "_Cancel" msgstr "_Utzi" -#: src/goabackend/goaexchangeprovider.c:423 -#: src/goabackend/goakerberosprovider.c:564 -#: src/goabackend/goalastfmprovider.c:438 -#: src/goabackend/goaowncloudprovider.c:545 +#: ../src/goabackend/goaexchangeprovider.c:423 +#: ../src/goabackend/goakerberosprovider.c:745 +#: ../src/goabackend/goalastfmprovider.c:438 +#: ../src/goabackend/goaowncloudprovider.c:553 msgid "C_onnect" msgstr "_Konektatu" -#: src/goabackend/goaexchangeprovider.c:439 -#: src/goabackend/goaimapsmtpprovider.c:715 -#: src/goabackend/goakerberosprovider.c:579 -#: src/goabackend/goalastfmprovider.c:454 -#: src/goabackend/goaowncloudprovider.c:560 +#: ../src/goabackend/goaexchangeprovider.c:439 +#: ../src/goabackend/goaimapsmtpprovider.c:754 +#: ../src/goabackend/goakerberosprovider.c:761 +#: ../src/goabackend/goalastfmprovider.c:454 +#: ../src/goabackend/goaowncloudprovider.c:568 msgid "Connecting…" msgstr "Konektatzen..." -#: src/goabackend/goaexchangeprovider.c:539 -#: src/goabackend/goaexchangeprovider.c:733 -#: src/goabackend/goaimapsmtpprovider.c:865 -#: src/goabackend/goaimapsmtpprovider.c:900 -#: src/goabackend/goaimapsmtpprovider.c:992 -#: src/goabackend/goaimapsmtpprovider.c:1249 -#: src/goabackend/goaimapsmtpprovider.c:1325 -#: src/goabackend/goakerberosprovider.c:896 -#: src/goabackend/goalastfmprovider.c:652 -#: src/goabackend/goalastfmprovider.c:820 -#: src/goabackend/goamediaserverprovider.c:420 -#: src/goabackend/goaoauth2provider.c:995 src/goabackend/goaoauthprovider.c:859 -#: src/goabackend/goaowncloudprovider.c:663 -#: src/goabackend/goaowncloudprovider.c:883 +#: ../src/goabackend/goaexchangeprovider.c:539 +#: ../src/goabackend/goaexchangeprovider.c:733 +#: ../src/goabackend/goaimapsmtpprovider.c:916 +#: ../src/goabackend/goaimapsmtpprovider.c:951 +#: ../src/goabackend/goaimapsmtpprovider.c:1043 +#: ../src/goabackend/goaimapsmtpprovider.c:1312 +#: ../src/goabackend/goaimapsmtpprovider.c:1388 +#: ../src/goabackend/goakerberosprovider.c:1155 +#: ../src/goabackend/goalastfmprovider.c:652 +#: ../src/goabackend/goalastfmprovider.c:820 +#: ../src/goabackend/goamediaserverprovider.c:420 +#: ../src/goabackend/goaoauth2provider.c:1062 +#: ../src/goabackend/goaoauthprovider.c:859 +#: ../src/goabackend/goaowncloudprovider.c:671 +#: ../src/goabackend/goaowncloudprovider.c:888 +#: ../src/goabackend/goatelepathyprovider.c:475 +#: ../src/goabackend/goatelepathyprovider.c:514 +#: ../src/goabackend/goatelepathyprovider.c:682 +#, c-format msgid "Dialog was dismissed" msgstr "Elkarrizketa-koadroa itxi egin da" -#: src/goabackend/goaexchangeprovider.c:577 -#: src/goabackend/goaexchangeprovider.c:761 -#: src/goabackend/goaimapsmtpprovider.c:933 -#: src/goabackend/goaimapsmtpprovider.c:1030 -#: src/goabackend/goaimapsmtpprovider.c:1276 -#: src/goabackend/goaimapsmtpprovider.c:1353 -#: src/goabackend/goalastfmprovider.c:686 -#: src/goabackend/goalastfmprovider.c:839 -#: src/goabackend/goaowncloudprovider.c:708 -#: src/goabackend/goaowncloudprovider.c:910 +#: ../src/goabackend/goaexchangeprovider.c:577 +#: ../src/goabackend/goaexchangeprovider.c:761 +#: ../src/goabackend/goaimapsmtpprovider.c:984 +#: ../src/goabackend/goaimapsmtpprovider.c:1081 +#: ../src/goabackend/goaimapsmtpprovider.c:1339 +#: ../src/goabackend/goaimapsmtpprovider.c:1416 +#: ../src/goabackend/goalastfmprovider.c:686 +#: ../src/goabackend/goalastfmprovider.c:839 +#: ../src/goabackend/goaowncloudprovider.c:713 +#: ../src/goabackend/goaowncloudprovider.c:912 #, c-format msgid "Dialog was dismissed (%s, %d): " msgstr "Elkarrizketa-koadroa galdu egin da (%s, %d): " -#: src/goabackend/goaexchangeprovider.c:590 -#: src/goabackend/goaimapsmtpprovider.c:946 -#: src/goabackend/goaimapsmtpprovider.c:1043 -#: src/goabackend/goaowncloudprovider.c:721 +#: ../src/goabackend/goaexchangeprovider.c:590 +#: ../src/goabackend/goaimapsmtpprovider.c:997 +#: ../src/goabackend/goaimapsmtpprovider.c:1094 +#: ../src/goabackend/goaowncloudprovider.c:726 msgid "_Ignore" msgstr "_Ez ikusi egin" -#: src/goabackend/goaexchangeprovider.c:595 -#: src/goabackend/goaexchangeprovider.c:780 -#: src/goabackend/goaimapsmtpprovider.c:951 -#: src/goabackend/goaimapsmtpprovider.c:1048 -#: src/goabackend/goaimapsmtpprovider.c:1295 -#: src/goabackend/goaimapsmtpprovider.c:1372 -#: src/goabackend/goakerberosprovider.c:981 -#: src/goabackend/goalastfmprovider.c:698 -#: src/goabackend/goalastfmprovider.c:856 -#: src/goabackend/goaowncloudprovider.c:726 -#: src/goabackend/goaowncloudprovider.c:929 +#: ../src/goabackend/goaexchangeprovider.c:595 +#: ../src/goabackend/goaexchangeprovider.c:780 +#: ../src/goabackend/goaimapsmtpprovider.c:1002 +#: ../src/goabackend/goaimapsmtpprovider.c:1099 +#: ../src/goabackend/goaimapsmtpprovider.c:1358 +#: ../src/goabackend/goaimapsmtpprovider.c:1435 +#: ../src/goabackend/goakerberosprovider.c:1262 +#: ../src/goabackend/goalastfmprovider.c:698 +#: ../src/goabackend/goalastfmprovider.c:856 +#: ../src/goabackend/goaowncloudprovider.c:731 +#: ../src/goabackend/goaowncloudprovider.c:931 msgid "_Try Again" msgstr "_Saiatu berriro" -#: src/goabackend/goaexchangeprovider.c:600 -#: src/goabackend/goaexchangeprovider.c:773 +#: ../src/goabackend/goaexchangeprovider.c:600 +#: ../src/goabackend/goaexchangeprovider.c:773 msgid "Error connecting to Microsoft Exchange server" msgstr "Errorea Microsoft Exchange zerbitzariarekin konektatzean" -#: src/goabackend/goafacebookprovider.c:56 +#: ../src/goabackend/goafacebookprovider.c:56 msgid "Facebook" msgstr "Facebook" -#: src/goabackend/goafacebookprovider.c:183 -#: src/goabackend/goaflickrprovider.c:155 -#: src/goabackend/goafoursquareprovider.c:154 -#: src/goabackend/goagoogleprovider.c:183 -#: src/goabackend/goatodoistprovider.c:193 -#: src/goabackend/goawindowsliveprovider.c:159 +#: ../src/goabackend/goafacebookprovider.c:183 +#: ../src/goabackend/goaflickrprovider.c:155 +#: ../src/goabackend/goafoursquareprovider.c:154 +#: ../src/goabackend/goagoogleprovider.c:191 +#: ../src/goabackend/goatodoistprovider.c:193 +#: ../src/goabackend/goawindowsliveprovider.c:159 #, c-format msgid "" "Expected status 200 when requesting your identity, instead got status %d (%s)" @@ -214,80 +211,86 @@ "jaso da" #. TODO: more specific -#: src/goabackend/goafacebookprovider.c:202 -#: src/goabackend/goafacebookprovider.c:213 -#: src/goabackend/goafacebookprovider.c:219 -#: src/goabackend/goaflickrprovider.c:174 -#: src/goabackend/goaflickrprovider.c:185 -#: src/goabackend/goaflickrprovider.c:196 -#: src/goabackend/goaflickrprovider.c:205 -#: src/goabackend/goaflickrprovider.c:218 -#: src/goabackend/goafoursquareprovider.c:173 -#: src/goabackend/goafoursquareprovider.c:184 -#: src/goabackend/goafoursquareprovider.c:195 -#: src/goabackend/goafoursquareprovider.c:206 -#: src/goabackend/goafoursquareprovider.c:215 -#: src/goabackend/goafoursquareprovider.c:228 -#: src/goabackend/goagoogleprovider.c:202 -#: src/goabackend/goagoogleprovider.c:213 -#: src/goabackend/goalastfmprovider.c:212 -#: src/goabackend/goalastfmprovider.c:221 -#: src/goabackend/goalastfmprovider.c:230 -#: src/goabackend/goalastfmprovider.c:238 -#: src/goabackend/goalastfmprovider.c:244 -#: src/goabackend/goalastfmprovider.c:512 -#: src/goabackend/goalastfmprovider.c:521 -#: src/goabackend/goalastfmprovider.c:538 -#: src/goabackend/goalastfmprovider.c:544 -#: src/goabackend/goaoauth2provider.c:656 -#: src/goabackend/goaoauth2provider.c:686 -#: src/goabackend/goaoauth2provider.c:697 -#: src/goabackend/goatodoistprovider.c:212 -#: src/goabackend/goatodoistprovider.c:223 -#: src/goabackend/goatodoistprovider.c:234 src/goabackend/goautils.c:273 -#: src/goabackend/goawindowsliveprovider.c:178 -#: src/goabackend/goawindowsliveprovider.c:189 -#: src/goabackend/goawindowsliveprovider.c:198 -#: src/goabackend/goawindowsliveprovider.c:211 +#: ../src/goabackend/goafacebookprovider.c:202 +#: ../src/goabackend/goafacebookprovider.c:213 +#: ../src/goabackend/goafacebookprovider.c:219 +#: ../src/goabackend/goaflickrprovider.c:174 +#: ../src/goabackend/goaflickrprovider.c:185 +#: ../src/goabackend/goaflickrprovider.c:196 +#: ../src/goabackend/goaflickrprovider.c:205 +#: ../src/goabackend/goaflickrprovider.c:218 +#: ../src/goabackend/goafoursquareprovider.c:173 +#: ../src/goabackend/goafoursquareprovider.c:184 +#: ../src/goabackend/goafoursquareprovider.c:195 +#: ../src/goabackend/goafoursquareprovider.c:206 +#: ../src/goabackend/goafoursquareprovider.c:215 +#: ../src/goabackend/goafoursquareprovider.c:228 +#: ../src/goabackend/goagoogleprovider.c:210 +#: ../src/goabackend/goagoogleprovider.c:221 +#: ../src/goabackend/goalastfmprovider.c:212 +#: ../src/goabackend/goalastfmprovider.c:221 +#: ../src/goabackend/goalastfmprovider.c:230 +#: ../src/goabackend/goalastfmprovider.c:238 +#: ../src/goabackend/goalastfmprovider.c:244 +#: ../src/goabackend/goalastfmprovider.c:512 +#: ../src/goabackend/goalastfmprovider.c:521 +#: ../src/goabackend/goalastfmprovider.c:538 +#: ../src/goabackend/goalastfmprovider.c:544 +#: ../src/goabackend/goaoauth2provider.c:716 +#: ../src/goabackend/goaoauth2provider.c:746 +#: ../src/goabackend/goaoauth2provider.c:757 +#: ../src/goabackend/goatodoistprovider.c:212 +#: ../src/goabackend/goatodoistprovider.c:223 +#: ../src/goabackend/goatodoistprovider.c:234 ../src/goabackend/goautils.c:313 +#: ../src/goabackend/goawindowsliveprovider.c:178 +#: ../src/goabackend/goawindowsliveprovider.c:189 +#: ../src/goabackend/goawindowsliveprovider.c:198 +#: ../src/goabackend/goawindowsliveprovider.c:211 +#, c-format msgid "Could not parse response" msgstr "Ezin izan da erantzuna aztertu" -#: src/goabackend/goaflickrprovider.c:56 +#: ../src/goabackend/goaflickrprovider.c:56 msgid "Flickr" msgstr "Flickr" -#: src/goabackend/goaflickrprovider.c:271 +#: ../src/goabackend/goaflickrprovider.c:293 msgid "Your system time is invalid. Check your date and time settings." msgstr "Sistemaren ordua baliogabea da. Egiaztatu data eta orduaren ezarpenak." -#: src/goabackend/goafoursquareprovider.c:57 +#: ../src/goabackend/goafoursquareprovider.c:57 msgid "Foursquare" msgstr "Foursquare" -#: src/goabackend/goagoogleprovider.c:56 +#: ../src/goabackend/goagoogleprovider.c:56 msgid "Google" msgstr "Google" #. TODO: more specific -#: src/goabackend/goaimapauthlogin.c:84 src/goabackend/goasmtpauth.c:155 +#: ../src/goabackend/goaimapauthlogin.c:89 ../src/goabackend/goasmtpauth.c:155 +#, c-format msgid "Service not available" msgstr "Zerbitzua ez dago erabilgarri" #. TODO: more specific -#: src/goabackend/goaimapauthlogin.c:104 src/goabackend/goalastfmprovider.c:529 -#: src/goabackend/goasmtpauth.c:108 src/goabackend/goautils.c:838 +#: ../src/goabackend/goaimapauthlogin.c:109 +#: ../src/goabackend/goalastfmprovider.c:529 +#: ../src/goabackend/goasmtpauth.c:108 ../src/goabackend/goautils.c:883 +#, c-format msgid "Authentication failed" msgstr "Autentifikazioak huts egin du" -#: src/goabackend/goaimapauthlogin.c:129 +#: ../src/goabackend/goaimapauthlogin.c:134 +#, c-format msgid "Server does not support PLAIN" msgstr "Zerbitzariak ez du PLAIN onartzen" -#: src/goabackend/goaimapauthlogin.c:181 src/goabackend/goasmtpauth.c:606 +#: ../src/goabackend/goaimapauthlogin.c:186 ../src/goabackend/goasmtpauth.c:606 +#, c-format msgid "Server does not support STARTTLS" msgstr "Zerbitzariak ez du STARTTLS onartzen" -#: src/goabackend/goaimapsmtpprovider.c:53 +#: ../src/goabackend/goaimapsmtpprovider.c:61 msgid "IMAP and SMTP" msgstr "IMAP eta SMTP" @@ -301,8 +304,8 @@ #. * username (eg., rishi), and the (%s, %d) #. * is the error domain and code. #. -#: src/goabackend/goaimapsmtpprovider.c:327 -#: src/goabackend/goaimapsmtpprovider.c:378 +#: ../src/goabackend/goaimapsmtpprovider.c:364 +#: ../src/goabackend/goaimapsmtpprovider.c:415 #, c-format msgid "Invalid %s with username “%s” (%s, %d): " msgstr "“%s“ eremu baliogabea “%s“ erabiltzailearekin (%s, %d): " @@ -313,130 +316,137 @@ #. * STARTTLS after connecting #. * SSL on a dedicated port #. -#: src/goabackend/goaimapsmtpprovider.c:564 +#: ../src/goabackend/goaimapsmtpprovider.c:603 msgid "_Encryption" msgstr "_Zifraketa" -#: src/goabackend/goaimapsmtpprovider.c:567 +#: ../src/goabackend/goaimapsmtpprovider.c:606 msgid "None" msgstr "Bat ere ez" -#: src/goabackend/goaimapsmtpprovider.c:570 +#: ../src/goabackend/goaimapsmtpprovider.c:609 msgid "STARTTLS after connecting" msgstr "STARTTLS konektatu ostean" -#: src/goabackend/goaimapsmtpprovider.c:573 +#: ../src/goabackend/goaimapsmtpprovider.c:612 msgid "SSL on a dedicated port" msgstr "SSL ataka dedikatu batean" -#: src/goabackend/goaimapsmtpprovider.c:648 +#: ../src/goabackend/goaimapsmtpprovider.c:687 msgid "_Name" msgstr "_Izena" -#: src/goabackend/goaimapsmtpprovider.c:665 +#: ../src/goabackend/goaimapsmtpprovider.c:704 msgid "IMAP _Server" msgstr "IMAP _zerbitzaria" -#: src/goabackend/goaimapsmtpprovider.c:685 +#: ../src/goabackend/goaimapsmtpprovider.c:724 msgid "SMTP _Server" msgstr "_SMTP zerbitzaria" -#: src/goabackend/goaimapsmtpprovider.c:700 -#: src/goabackend/goaimapsmtpprovider.c:972 -#: src/goabackend/goaimapsmtpprovider.c:1305 +#: ../src/goabackend/goaimapsmtpprovider.c:739 +#: ../src/goabackend/goaimapsmtpprovider.c:1023 +#: ../src/goabackend/goaimapsmtpprovider.c:1368 msgid "_Forward" msgstr "_Birbidali" -#: src/goabackend/goaimapsmtpprovider.c:956 -#: src/goabackend/goaimapsmtpprovider.c:1288 +#: ../src/goabackend/goaimapsmtpprovider.c:1007 +#: ../src/goabackend/goaimapsmtpprovider.c:1351 msgid "Error connecting to IMAP server" msgstr "Errorea IMAP zerbitzariarekin konektatzean" -#: src/goabackend/goaimapsmtpprovider.c:1053 -#: src/goabackend/goaimapsmtpprovider.c:1365 +#: ../src/goabackend/goaimapsmtpprovider.c:1104 +#: ../src/goabackend/goaimapsmtpprovider.c:1428 msgid "Error connecting to SMTP server" msgstr "Errorea SMTP zerbitzariarekin konektatzean" -#: src/goabackend/goaimapsmtpprovider.c:1476 +#: ../src/goabackend/goaimapsmtpprovider.c:1541 msgid "E-mail" msgstr "Helb. elek." -#: src/goabackend/goaimapsmtpprovider.c:1480 +#: ../src/goabackend/goaimapsmtpprovider.c:1545 msgid "Name" msgstr "Izena" -#: src/goabackend/goaimapsmtpprovider.c:1490 -#: src/goabackend/goaimapsmtpprovider.c:1494 +#: ../src/goabackend/goaimapsmtpprovider.c:1555 +#: ../src/goabackend/goaimapsmtpprovider.c:1559 msgid "IMAP" msgstr "IMAP" -#: src/goabackend/goaimapsmtpprovider.c:1505 -#: src/goabackend/goaimapsmtpprovider.c:1509 +#: ../src/goabackend/goaimapsmtpprovider.c:1570 +#: ../src/goabackend/goaimapsmtpprovider.c:1574 msgid "SMTP" msgstr "SMTP" -#: src/goabackend/goakerberosprovider.c:100 +#: ../src/goabackend/goakerberosprovider.c:102 msgid "Enterprise Login (Kerberos)" msgstr "Enpresako saio-hasiera (Kerberos)" -#: src/goabackend/goakerberosprovider.c:220 +#: ../src/goabackend/goakerberosprovider.c:300 +#, c-format msgid "Ticketing is disabled for account" msgstr "Kontuaren tiketa sortzea desgaituta dago" -#: src/goabackend/goakerberosprovider.c:245 +#: ../src/goabackend/goakerberosprovider.c:325 #, c-format msgid "Could not find saved credentials for principal “%s” in keyring" msgstr "" "Ezin izan da gordetako “%s“ nagusiaren kredentzialik aurkitu gako-sortan" -#: src/goabackend/goakerberosprovider.c:258 +#: ../src/goabackend/goakerberosprovider.c:338 #, c-format msgid "Did not find password for principal “%s” in credentials" msgstr "Ez da “%s“ nagusiaren pasahitzik aurkitu kredentzialetan" -#: src/goabackend/goakerberosprovider.c:558 -msgid "_Principal" -msgstr "_Nagusia" - -#: src/goabackend/goakerberosprovider.c:744 -msgid "Operation was cancelled" -msgstr "Eragiketa bertan behera utzi da" +#: ../src/goabackend/goakerberosprovider.c:731 +msgid "_Domain" +msgstr "_Domeinua" + +#: ../src/goabackend/goakerberosprovider.c:732 +msgid "Enterprise domain or realm name" +msgstr "Enpresaren domeinuaren izena" -#: src/goabackend/goakerberosprovider.c:794 -#: src/goaidentity/goaidentityservice.c:1069 +#: ../src/goabackend/goakerberosprovider.c:974 +#: ../src/goaidentity/goaidentityservice.c:1084 msgid "Log In to Realm" msgstr "Hasi saioa domeinuan" -#: src/goabackend/goakerberosprovider.c:795 +#: ../src/goabackend/goakerberosprovider.c:975 msgid "Please enter your password below." msgstr "Sartu zure pasahitza behean." -#: src/goabackend/goakerberosprovider.c:796 +#: ../src/goabackend/goakerberosprovider.c:976 msgid "Remember this password" msgstr "Gogoratu pasahitz hau" -#: src/goabackend/goakerberosprovider.c:976 +#: ../src/goabackend/goakerberosprovider.c:1110 +#, c-format +msgid "The domain is not valid" +msgstr "Domeinua ez da baliozkoa" + +#: ../src/goabackend/goakerberosprovider.c:1257 msgid "Error connecting to enterprise identity server" msgstr "Errorea enpresaren identitate zerbitzuarekin konektatzean " -#: src/goabackend/goakerberosprovider.c:1315 +#: ../src/goabackend/goakerberosprovider.c:1604 +#, c-format msgid "Identity service returned invalid key" msgstr "Identitatearen zerbitzuak baliogabeko gakoa itzuli du" -#: src/goabackend/goalastfmprovider.c:65 +#: ../src/goabackend/goalastfmprovider.c:65 msgid "Last.fm" msgstr "Last.fm" -#: src/goabackend/goalastfmprovider.c:700 -#: src/goabackend/goalastfmprovider.c:850 +#: ../src/goabackend/goalastfmprovider.c:700 +#: ../src/goabackend/goalastfmprovider.c:850 msgid "Error connecting to Last.fm" msgstr "Errorea Last.fm-rekin konektatzean" -#: src/goabackend/goamediaserverprovider.c:63 +#: ../src/goabackend/goamediaserverprovider.c:63 msgid "Media Server" msgstr "Multimediaren zerbitzaria" -#: src/goabackend/goamediaserverprovider.c:316 +#: ../src/goabackend/goamediaserverprovider.c:316 msgid "" "Personal content can be added to your applications through a media server " "account." @@ -444,16 +454,17 @@ "Eduki pertsonala gehi iezaiokezu aplikazioei multimediaren zerbitzariaren " "kontua erabiliz." -#: src/goabackend/goamediaserverprovider.c:329 +#: ../src/goabackend/goamediaserverprovider.c:329 msgid "Available Media Servers" msgstr "Multimediaren zerbitzari erabilgarriak" -#: src/goabackend/goamediaserverprovider.c:360 +#: ../src/goabackend/goamediaserverprovider.c:360 msgid "No media servers found" msgstr "Ez da multimediaren zerbitzaririk aurkitu" #. Translators: the %d is a HTTP status code and the %s is a textual description of it -#: src/goabackend/goaoauth2provider.c:632 src/goabackend/goaoauthprovider.c:542 +#: ../src/goabackend/goaoauth2provider.c:692 +#: ../src/goabackend/goaoauthprovider.c:542 #, c-format msgid "" "Expected status 200 when requesting access token, instead got status %d (%s)" @@ -461,52 +472,54 @@ "'200' egoera espero zen atzipen-tokena eskatzean, horren ordez '%d' egoera " "jaso da (%s)" -#: src/goabackend/goaoauth2provider.c:814 +#: ../src/goabackend/goaoauth2provider.c:874 msgid "Authorization response: " msgstr "Baimenaren erantzuna: " -#: src/goabackend/goaoauth2provider.c:884 +#: ../src/goabackend/goaoauth2provider.c:944 #, c-format msgid "Authorization response: %s" msgstr "Baimenaren erantzuna: %s" -#: src/goabackend/goaoauth2provider.c:1021 -#: src/goabackend/goaoauthprovider.c:890 +#: ../src/goabackend/goaoauth2provider.c:1088 +#: ../src/goabackend/goaoauthprovider.c:890 msgid "Error getting an Access Token: " msgstr "Errorea atzipen-tokena lortzean: " -#: src/goabackend/goaoauth2provider.c:1036 -#: src/goabackend/goaoauthprovider.c:903 +#: ../src/goabackend/goaoauth2provider.c:1103 +#: ../src/goabackend/goaoauthprovider.c:903 msgid "Error getting identity: " msgstr "Errorea identitatea lortzean: " -#: src/goabackend/goaoauth2provider.c:1254 -#: src/goabackend/goaoauthprovider.c:1192 +#: ../src/goabackend/goaoauth2provider.c:1321 +#: ../src/goabackend/goaoauthprovider.c:1192 #, c-format msgid "Was asked to log in as %s, but logged in as %s" msgstr "'%s' gisa saioa hasteko eskatu da, baina '%s' gisa hasi da saioa" -#: src/goabackend/goaoauth2provider.c:1406 +#: ../src/goabackend/goaoauth2provider.c:1473 +#, c-format msgid "Credentials do not contain access_token" msgstr "Kredentzialek ez daukate 'access_token'" -#: src/goabackend/goaoauth2provider.c:1445 -#: src/goabackend/goaoauthprovider.c:1407 +#: ../src/goabackend/goaoauth2provider.c:1512 +#: ../src/goabackend/goaoauthprovider.c:1407 #, c-format msgid "Failed to refresh access token (%s, %d): " msgstr "Huts egin du atzipen-tokena freskatzean (%s, %d): " -#: src/goabackend/goaoauthprovider.c:565 +#: ../src/goabackend/goaoauthprovider.c:565 +#, c-format msgid "Missing access_token or access_token_secret headers in response" msgstr "" "'access_token' edo 'access_token_secret' goiburuak falta dira erantzunean" -#: src/goabackend/goaoauthprovider.c:773 +#: ../src/goabackend/goaoauthprovider.c:773 msgid "Error getting a Request Token: " msgstr "Errorea eskaera-tokena lortzean: " #. Translators: the %d is a HTTP status code and the %s is a textual description of it -#: src/goabackend/goaoauthprovider.c:804 +#: ../src/goabackend/goaoauthprovider.c:804 #, c-format msgid "" "Expected status 200 for getting a Request Token, instead got status %d (%s)" @@ -514,135 +527,183 @@ "'200' egoera espero zen eskaera-tokena lortzeko, horren ordez '%d' egoera " "jaso da (%s)" -#: src/goabackend/goaoauthprovider.c:821 +#: ../src/goabackend/goaoauthprovider.c:821 +#, c-format msgid "Missing request_token or request_token_secret headers in response" msgstr "" "'request_token' edo 'request_token_secret' goiburuak falta dira erantzunean" -#: src/goabackend/goaoauthprovider.c:1363 +#: ../src/goabackend/goaoauthprovider.c:1363 +#, c-format msgid "Credentials do not contain access_token or access_token_secret" msgstr "Kredentzialek ez daukate 'access_token' edo 'access_token_secret'" -#: src/goabackend/goaowncloudprovider.c:60 +#: ../src/goabackend/goaowncloudprovider.c:68 msgid "Nextcloud" msgstr "Nextcloud" -#: src/goabackend/goaowncloudprovider.c:731 -#: src/goabackend/goaowncloudprovider.c:922 +#: ../src/goabackend/goaowncloudprovider.c:736 +#: ../src/goabackend/goaowncloudprovider.c:924 msgid "Error connecting to ownCloud server" msgstr "Errorea owncloud zerbitzariarekin konektatzean" -#: src/goabackend/goapocketprovider.c:74 +#: ../src/goabackend/goapocketprovider.c:74 msgid "Pocket" msgstr "Pocket" #. TODO: more specific -#: src/goabackend/goapocketprovider.c:249 +#: ../src/goabackend/goapocketprovider.c:249 +#, c-format msgid "No username or access_token" msgstr "Ez dago erabiltzaile-izenaren edo sarbidetzaren tokenik" -#: src/goabackend/goaprovider.c:110 +#: ../src/goabackend/goaprovider.c:119 msgid "_Mail" msgstr "_Posta" -#: src/goabackend/goaprovider.c:115 +#: ../src/goabackend/goaprovider.c:124 msgid "Cale_ndar" msgstr "_Egutegia" -#: src/goabackend/goaprovider.c:120 +#: ../src/goabackend/goaprovider.c:129 msgid "_Contacts" msgstr "_Kontaktuak" -#: src/goabackend/goaprovider.c:125 +#: ../src/goabackend/goaprovider.c:134 +#: ../src/goabackend/goatelepathyprovider.c:951 msgid "C_hat" msgstr "_Berriketa" -#: src/goabackend/goaprovider.c:130 +#: ../src/goabackend/goaprovider.c:139 msgid "_Documents" msgstr "_Dokumentuak" -#: src/goabackend/goaprovider.c:135 +#: ../src/goabackend/goaprovider.c:144 msgid "M_usic" msgstr "M_usika" -#: src/goabackend/goaprovider.c:140 +#: ../src/goabackend/goaprovider.c:149 msgid "_Photos" msgstr "_Argazkiak" -#: src/goabackend/goaprovider.c:145 +#: ../src/goabackend/goaprovider.c:154 msgid "_Files" msgstr "_Fitxategiak" -#: src/goabackend/goaprovider.c:150 +#: ../src/goabackend/goaprovider.c:159 msgid "Network _Resources" msgstr "Sareko _baliabideak" -#: src/goabackend/goaprovider.c:155 +#: ../src/goabackend/goaprovider.c:164 msgid "_Read Later" msgstr "_Irakurri geroago" -#: src/goabackend/goaprovider.c:160 +#: ../src/goabackend/goaprovider.c:169 msgid "Prin_ters" msgstr "_Inprimagailuak" -#: src/goabackend/goaprovider.c:165 +#: ../src/goabackend/goaprovider.c:174 msgid "_Maps" msgstr "_Mapak" -#: src/goabackend/goaprovider.c:170 +#: ../src/goabackend/goaprovider.c:179 msgid "T_o Do" msgstr "__Egiteko" #. Translators: This is a label for a series of #. * options switches. For example: “Use for Mail”. -#: src/goabackend/goaprovider.c:568 +#: ../src/goabackend/goaprovider.c:613 +#: ../src/goabackend/goatelepathyprovider.c:949 msgid "Use for" msgstr "Erabili honentzako" -#: src/goabackend/goaprovider.c:823 +#: ../src/goabackend/goaprovider.c:868 msgid "Account is disabled" msgstr "Kontua desgaituta dago" -#: src/goabackend/goaprovider.c:836 +#: ../src/goabackend/goaprovider.c:881 msgid "Unknown error" msgstr "Errore ezezaguna" -#: src/goabackend/goaprovider.c:855 +#: ../src/goabackend/goaprovider.c:900 #, c-format msgid "ensure_credentials_sync is not implemented on type %s" msgstr "'ensure_credentials_sync' ez dago inplementatuta %s motan" #. TODO: more specific -#: src/goabackend/goasmtpauth.c:170 +#: ../src/goabackend/goasmtpauth.c:170 +#, c-format msgid "TLS not available" msgstr "TLS ez dago erabilgarri" -#: src/goabackend/goasmtpauth.c:476 +#: ../src/goabackend/goasmtpauth.c:476 +#, c-format msgid "Unknown authentication mechanism" msgstr "Autentifikazioaren protokoloa ezezaguna" +#: ../src/goabackend/goatelepathyprovider.c:172 +#, c-format +msgid "Telepathy chat account not found" +msgstr "Ez da Telepathy berriketako kontua aurkitu" + +#: ../src/goabackend/goatelepathyprovider.c:434 +#, c-format +msgid "Failed to create a user interface for %s" +msgstr "Huts egin du erabiltzailearen interfazea sortzean '%s'(r)entzako" + +#: ../src/goabackend/goatelepathyprovider.c:540 +msgid "Connection Settings" +msgstr "Konexioaren ezarpenak" + +#: ../src/goabackend/goatelepathyprovider.c:646 +msgid "Personal Details" +msgstr "Xehetasun pertsonalak" + +#: ../src/goabackend/goatelepathyprovider.c:652 +msgid "_OK" +msgstr "_Ados" + +#: ../src/goabackend/goatelepathyprovider.c:898 +msgid "Cannot save the connection parameters" +msgstr "Ezin dira konexioaren parametroak gorde" + +#: ../src/goabackend/goatelepathyprovider.c:911 +msgid "Cannot save your personal information on the server" +msgstr "Ezin da zure informazio pertsonala zerbitzarian gorde" + +#. Connection Settings button +#: ../src/goabackend/goatelepathyprovider.c:956 +msgid "_Connection Settings" +msgstr "_Konexioaren ezarpenak" + +#. Edit Personal Information button +#: ../src/goabackend/goatelepathyprovider.c:960 +msgid "_Personal Details" +msgstr "_Xehetasun pertsonalak" + # Todoist == egitekoen zerrenda kudeatzen duen webgunea. -#: src/goabackend/goatodoistprovider.c:58 +#: ../src/goabackend/goatodoistprovider.c:58 msgid "Todoist" msgstr "Todoist" -#: src/goabackend/goautils.c:92 +#: ../src/goabackend/goautils.c:96 msgid "Error logging into the account" msgstr "Errorea kontuan saioa hastean" -#: src/goabackend/goautils.c:136 +#: ../src/goabackend/goautils.c:140 +#| msgid "Credentials have expired." msgid "Credentials have expired" msgstr "Kredentzialak iraungi dira" -#: src/goabackend/goautils.c:140 +#: ../src/goabackend/goautils.c:144 msgid "Sign in to enable this account." msgstr "Hasi saioa kontu hau gaitzeko." -#: src/goabackend/goautils.c:144 +#: ../src/goabackend/goautils.c:148 msgid "_Sign In" msgstr "_Hasi saioa" -#: src/goabackend/goautils.c:240 +#: ../src/goabackend/goautils.c:280 #, c-format msgid "A %s account already exists for %s" msgstr "%2$s(r)en %1$s kontua badago lehendik ere" @@ -651,63 +712,64 @@ #. * Account" dialogs. The %s is the name of the provider. eg., #. * 'Google'. #. -#: src/goabackend/goautils.c:293 +#: ../src/goabackend/goautils.c:333 #, c-format +#| msgid "%s account" msgid "%s Account" msgstr "%s kontua" #. TODO: more specific -#: src/goabackend/goautils.c:347 +#: ../src/goabackend/goautils.c:387 msgid "Failed to delete credentials from the keyring" msgstr "Huts egin du kredentzialak gako-sortatik ezabatzean" #. TODO: more specific -#: src/goabackend/goautils.c:395 +#: ../src/goabackend/goautils.c:435 msgid "Failed to retrieve credentials from the keyring" msgstr "Huts egin du kredentzialak gako-sortatik eskuratzean" #. TODO: more specific -#: src/goabackend/goautils.c:405 +#: ../src/goabackend/goautils.c:445 msgid "No credentials found in the keyring" msgstr "Ez da kredentzialik aurkitu gako-sortan" -#: src/goabackend/goautils.c:418 +#: ../src/goabackend/goautils.c:458 msgid "Error parsing result obtained from the keyring: " msgstr "Errorea gako-sortatik eskuratutako erantzuna analizatzean: " #. Translators: The %s is the type of the provider, e.g. 'google' or 'yahoo' -#: src/goabackend/goautils.c:459 +#: ../src/goabackend/goautils.c:499 #, c-format msgid "GOA %s credentials for identity %s" msgstr "GOA %s kredentzialak %s identitatearentzako" #. TODO: more specific -#: src/goabackend/goautils.c:476 +#: ../src/goabackend/goautils.c:516 msgid "Failed to store credentials in the keyring" msgstr "Huts egin du kredentzialak gako-sortan gordetzean" -#: src/goabackend/goautils.c:825 +#: ../src/goabackend/goautils.c:870 msgid "Cannot resolve hostname" msgstr "Ezin da ostalari-izena ebatzi" -#: src/goabackend/goautils.c:829 +#: ../src/goabackend/goautils.c:874 msgid "Cannot resolve proxy hostname" msgstr "Ezin da proxyaren ostalari-izena ebatzi" -#: src/goabackend/goautils.c:834 +#: ../src/goabackend/goautils.c:879 msgid "Cannot find WebDAV endpoint" msgstr "Ezin da WebDAV-en amaiera aurkitu" -#: src/goabackend/goautils.c:843 +#: ../src/goabackend/goautils.c:888 #, c-format msgid "Code: %u — Unexpected response from server" msgstr "Kodea: %u - Zerbitzariaren ustekabeko erantzuna" -#: src/goabackend/goautils.c:859 +#: ../src/goabackend/goautils.c:904 msgid "The signing certificate authority is not known." msgstr "Sinaduraren ziurtagiri-emailea ezezaguna da." -#: src/goabackend/goautils.c:863 +#: ../src/goabackend/goautils.c:908 msgid "" "The certificate does not match the expected identity of the site that it was " "retrieved from." @@ -715,157 +777,113 @@ "Ziurtagiria ez dator bat eskuratu den guneko (eta espero zen) " "identitatearekin." -#: src/goabackend/goautils.c:868 +#: ../src/goabackend/goautils.c:913 msgid "The certificate’s activation time is still in the future." msgstr "Ziurtagiria aktibatzeko data oraindik etorkizunekoa da." -#: src/goabackend/goautils.c:872 +#: ../src/goabackend/goautils.c:917 msgid "The certificate has expired." msgstr "Ziurtagiria iraungi da." -#: src/goabackend/goautils.c:876 +#: ../src/goabackend/goautils.c:921 msgid "The certificate has been revoked." msgstr "Ziurtagiria errebokatu da." -#: src/goabackend/goautils.c:880 +#: ../src/goabackend/goautils.c:925 msgid "The certificate’s algorithm is considered insecure." msgstr "Ziurtagiriaren algoritmoa ez da segurutzat jotzen." -#: src/goabackend/goautils.c:886 +#: ../src/goabackend/goautils.c:929 msgid "Invalid certificate." msgstr "Baliogabeko ziurtagiria." #. TODO: more specific -#: src/goabackend/goautils.c:921 +#: ../src/goabackend/goautils.c:964 #, c-format msgid "Did not find %s with identity “%s” in credentials" msgstr "Ez du “%2$s“ identitateko “%1$s“ eremurik aurkitu kredentzialetan" #. translators: %s here is the address of the web page -#: src/goabackend/goawebview.c:94 +#: ../src/goabackend/goawebview.c:95 #, c-format msgid "Loading “%s”…" msgstr "'%s' kargatzen..." -#: src/goabackend/goawindowsliveprovider.c:56 +#: ../src/goabackend/goawindowsliveprovider.c:56 +#| msgid "Microsoft Account" msgid "Microsoft" msgstr "Microsoft" -#: src/goaidentity/goaidentityservice.c:568 +#: ../src/goaidentity/goaidentityservice.c:569 msgid "Initial secret key is invalid" msgstr "Hasierako ezkutuko gakoa baliogabea" -#: src/goaidentity/goaidentityservice.c:1074 +#: ../src/goaidentity/goaidentityservice.c:1089 #, c-format msgid "The network realm %s needs some information to sign you in." msgstr "Sareko %s domeinuak zenbait informazio behar ditu zu bertan sartzeko." -#: src/goaidentity/goakerberosidentity.c:275 -#: src/goaidentity/goakerberosidentity.c:283 -#: src/goaidentity/goakerberosidentity.c:707 -#| msgid "Could not find identity in credential cache: %k" -msgid "Could not find identity in credential cache: " -msgstr "Ezin izan da identitatea aurkitu kredentzialaren cachean: " - -#: src/goaidentity/goakerberosidentity.c:720 -#| msgid "Could not find identity credentials in cache: %k" -msgid "Could not find identity credentials in cache: " -msgstr "Ezin izan da identitatearen kredentzialik aurkitu cachean: " - -#: src/goaidentity/goakerberosidentity.c:771 -#| msgid "Could not sift through identity credentials in cache: %k" -msgid "Could not sift through identity credentials in cache: " -msgstr "Ezin izan dira cacheko identitate-kredentzialak iragazi: " - -#: src/goaidentity/goakerberosidentity.c:788 -#| msgid "" -#| "Could not finish up sifting through identity credentials in cache: %k" -msgid "Could not finish up sifting through identity credentials in cache: " -msgstr "Ezin izan da cacheko identitate-kredentzialen iragazketa bukatu: " +#: ../src/goaidentity/goakerberosidentity.c:276 +#: ../src/goaidentity/goakerberosidentity.c:285 +#: ../src/goaidentity/goakerberosidentity.c:713 +msgid "Could not find identity in credential cache: %k" +msgstr "Ezin izan da identitatea aurkitu kredentzialaren cachean: %s" + +#: ../src/goaidentity/goakerberosidentity.c:727 +msgid "Could not find identity credentials in cache: %k" +msgstr "Ezin izan da identitatearen kredentzialik aurkitu cachean: %s" + +#: ../src/goaidentity/goakerberosidentity.c:779 +msgid "Could not sift through identity credentials in cache: %k" +msgstr "Ezin izan dira cacheko identitate-kredentzialak iragazi: %k" + +#: ../src/goaidentity/goakerberosidentity.c:797 +msgid "Could not finish up sifting through identity credentials in cache: %k" +msgstr "Ezin izan da cacheko identitate-kredentzialen iragazketa bukatu: %k" -#: src/goaidentity/goakerberosidentity.c:1103 +#: ../src/goaidentity/goakerberosidentity.c:1111 +#, c-format msgid "No associated identification found" msgstr "Ez da esleitutako identifikaziorik aurkitu" -#: src/goaidentity/goakerberosidentity.c:1186 -#| msgid "Could not create credential cache: %k" -msgid "Could not create credential cache: " -msgstr "Ezin izan da kredentzialaren cache-rik sortu: " - -#: src/goaidentity/goakerberosidentity.c:1220 -#| msgid "Could not initialize credentials cache: %k" -msgid "Could not initialize credentials cache: " -msgstr "Ezin izan da kredentzialaren cache-a hasieratu: " - -#: src/goaidentity/goakerberosidentity.c:1236 -#| msgid "Could not store new credentials in credentials cache: %k" -msgid "Could not store new credentials in credentials cache: " -msgstr "Ezin izan da kredentzial berririk gorde kredentzialen cache-an: " +#: ../src/goaidentity/goakerberosidentity.c:1194 +msgid "Could not create credential cache: %k" +msgstr "Ezin izan da kredentzialaren cache-rik sortu: %k" + +#: ../src/goaidentity/goakerberosidentity.c:1228 +msgid "Could not initialize credentials cache: %k" +msgstr "Ezin izan da kredentzialaren cache-a hasieratu: %s" + +#: ../src/goaidentity/goakerberosidentity.c:1245 +msgid "Could not store new credentials in credentials cache: %k" +msgstr "Ezin izan da kredentzial berririk gorde kredentzialen cache-an: %k" -#: src/goaidentity/goakerberosidentity.c:1534 +#: ../src/goaidentity/goakerberosidentity.c:1540 +#, c-format msgid "Could not renew identity: Not signed in" msgstr "Ezin izan da identitatea berritu: ez da sinatu" -#: src/goaidentity/goakerberosidentity.c:1546 -#| msgid "Could not renew identity: %k" -msgid "Could not renew identity: " -msgstr "Ezin izan da identitatea berritu: " - -#: src/goaidentity/goakerberosidentity.c:1562 -#, c-format -#| msgid "Could not get new credentials to renew identity %s: %k" -msgid "Could not get new credentials to renew identity %s: " -msgstr "Ezin izan da kredentzial berririk lortu '%s' identitatea berritzeko: " - -#: src/goaidentity/goakerberosidentity.c:1604 -#| msgid "Could not erase identity: %k" -msgid "Could not erase identity: " -msgstr "Ezin izan da identitatea ezabatu: " +#: ../src/goaidentity/goakerberosidentity.c:1552 +msgid "Could not renew identity: %k" +msgstr "Ezin izan da identitatea berritu: %k" + +#: ../src/goaidentity/goakerberosidentity.c:1569 +msgid "Could not get new credentials to renew identity %s: %k" +msgstr "" +"Ezin izan da kredentzial berririk lortu '%s' identitatea berritzeko: %k" + +#: ../src/goaidentity/goakerberosidentity.c:1611 +msgid "Could not erase identity: %k" +msgstr "Ezin izan da identitatea ezabatu: %k" -#: src/goaidentity/goakerberosidentitymanager.c:749 +#: ../src/goaidentity/goakerberosidentitymanager.c:750 msgid "Could not find identity" msgstr "Ezin izan da identitatea aurkitu" -#: src/goaidentity/goakerberosidentitymanager.c:845 +#: ../src/goaidentity/goakerberosidentitymanager.c:842 msgid "Could not create credential cache for identity" msgstr "Ezin izan da kredentzialaren cache-a sortu identitatearentzako" -#~ msgid "_Domain" -#~ msgstr "_Domeinua" - -#~ msgid "Enterprise domain or realm name" -#~ msgstr "Enpresaren domeinuaren izena" - -#~ msgid "The domain is not valid" -#~ msgstr "Domeinua ez da baliozkoa" - -#~ msgid "Telepathy chat account not found" -#~ msgstr "Ez da Telepathy berriketako kontua aurkitu" - -#~ msgid "Failed to create a user interface for %s" -#~ msgstr "Huts egin du erabiltzailearen interfazea sortzean '%s'(r)entzako" - -#~ msgid "Connection Settings" -#~ msgstr "Konexioaren ezarpenak" - -#~ msgid "Personal Details" -#~ msgstr "Xehetasun pertsonalak" - -#~ msgid "_OK" -#~ msgstr "_Ados" - -#~ msgid "Cannot save the connection parameters" -#~ msgstr "Ezin dira konexioaren parametroak gorde" - -#~ msgid "Cannot save your personal information on the server" -#~ msgstr "Ezin da zure informazio pertsonala zerbitzarian gorde" - -#~ msgid "_Connection Settings" -#~ msgstr "_Konexioaren ezarpenak" - -#~ msgid "_Personal Details" -#~ msgstr "_Xehetasun pertsonalak" - #~ msgid "org.gnome.OnlineAccounts.Mail is not available" #~ msgstr "org.gnome.OnlineAccounts.Mail ez dago erabilgarri" Binary files /tmp/tmpOF9Z7O/tiVsTCcCtl/gnome-online-accounts-3.30.1/po/fr.gmo and /tmp/tmpOF9Z7O/8j3UbjNw9P/gnome-online-accounts-3.31.90/po/fr.gmo differ diff -Nru gnome-online-accounts-3.30.1/po/fr.po gnome-online-accounts-3.31.90/po/fr.po --- gnome-online-accounts-3.30.1/po/fr.po 2018-06-06 06:27:55.000000000 +0000 +++ gnome-online-accounts-3.31.90/po/fr.po 2019-01-31 07:49:52.000000000 +0000 @@ -5,22 +5,23 @@ # Bruno Brouard , 2012. # Alain Lojewski , 2012. # Christophe Fergeau -# Charles Monzat , 2017. +# Charles Monzat , 2017-2018. # msgid "" msgstr "" "Project-Id-Version: gnome-online-accounts master\n" -"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" -"online-accounts&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2018-01-22 12:36+0000\n" -"PO-Revision-Date: 2018-03-12 09:39+0100\n" -"Last-Translator: Claude Paroz \n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-online-accounts/" +"issues\n" +"POT-Creation-Date: 2018-09-01 08:54+0000\n" +"PO-Revision-Date: 2018-11-14 10:39+0100\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: Gtranslator 3.30.0\n" #: data/org.gnome.online-accounts.gschema.xml:6 msgid "List of providers that are allowed to be loaded" @@ -31,21 +32,21 @@ "A list of strings representing the providers that are allowed to be loaded " "(default: 'all'). This is only evaluated on startup." msgstr "" -"Une liste de chaînes représentant les fournisseurs autorisés à être " -"chargés (par défaut : « all » (tous)). Ceci n’est évalué qu’au démarrage." +"Une liste de chaînes représentant les fournisseurs autorisés à être chargés " +"(par défaut : « all » (tous)). Ceci n’est évalué qu’au démarrage." #. TODO: more specific -#: src/daemon/goadaemon.c:1196 src/daemon/goadaemon.c:1480 +#: src/daemon/goadaemon.c:1131 src/daemon/goadaemon.c:1415 #, c-format msgid "Failed to find a provider for: %s" msgstr "Impossible de trouver un fournisseur pour : %s" -#: src/daemon/goadaemon.c:1423 +#: src/daemon/goadaemon.c:1358 msgid "IsLocked property is set for account" msgstr "La propriété IsLocked est définie pour ce compte" #. TODO: more specific -#: src/daemon/goadaemon.c:1468 +#: src/daemon/goadaemon.c:1403 msgid "ProviderType property is not set for account" msgstr "La propriété ProviderType n’est pas définie pour ce compte" @@ -80,7 +81,7 @@ #: src/goabackend/goaowncloudprovider.c:291 #, c-format msgid "Invalid password with username “%s” (%s, %d): " -msgstr "Mot de passe invalide pour l’utilisateur « %s » (%s, %d) : " +msgstr "Mot de passe non valide pour l’utilisateur « %s » (%s, %d) : " #: src/goabackend/goaexchangeprovider.c:396 #: src/goabackend/goaimapsmtpprovider.c:647 @@ -118,7 +119,6 @@ #: src/goabackend/goakerberosprovider.c:563 #: src/goabackend/goalastfmprovider.c:437 #: src/goabackend/goaowncloudprovider.c:544 -#: src/goabackend/goatelepathyprovider.c:651 msgid "_Cancel" msgstr "_Annuler" @@ -151,9 +151,6 @@ #: src/goabackend/goaoauth2provider.c:995 src/goabackend/goaoauthprovider.c:859 #: src/goabackend/goaowncloudprovider.c:663 #: src/goabackend/goaowncloudprovider.c:883 -#: src/goabackend/goatelepathyprovider.c:475 -#: src/goabackend/goatelepathyprovider.c:514 -#: src/goabackend/goatelepathyprovider.c:682 msgid "Dialog was dismissed" msgstr "Le dialogue a été rejeté" @@ -204,7 +201,7 @@ #: src/goabackend/goafacebookprovider.c:183 #: src/goabackend/goaflickrprovider.c:155 #: src/goabackend/goafoursquareprovider.c:154 -#: src/goabackend/goagoogleprovider.c:191 +#: src/goabackend/goagoogleprovider.c:183 #: src/goabackend/goatodoistprovider.c:193 #: src/goabackend/goawindowsliveprovider.c:159 #, c-format @@ -229,8 +226,8 @@ #: src/goabackend/goafoursquareprovider.c:206 #: src/goabackend/goafoursquareprovider.c:215 #: src/goabackend/goafoursquareprovider.c:228 -#: src/goabackend/goagoogleprovider.c:210 -#: src/goabackend/goagoogleprovider.c:221 +#: src/goabackend/goagoogleprovider.c:202 +#: src/goabackend/goagoogleprovider.c:213 #: src/goabackend/goalastfmprovider.c:212 #: src/goabackend/goalastfmprovider.c:221 #: src/goabackend/goalastfmprovider.c:230 @@ -245,7 +242,7 @@ #: src/goabackend/goaoauth2provider.c:697 #: src/goabackend/goatodoistprovider.c:212 #: src/goabackend/goatodoistprovider.c:223 -#: src/goabackend/goatodoistprovider.c:234 src/goabackend/goautils.c:313 +#: src/goabackend/goatodoistprovider.c:234 src/goabackend/goautils.c:273 #: src/goabackend/goawindowsliveprovider.c:178 #: src/goabackend/goawindowsliveprovider.c:189 #: src/goabackend/goawindowsliveprovider.c:198 @@ -278,7 +275,7 @@ #. TODO: more specific #: src/goabackend/goaimapauthlogin.c:104 src/goabackend/goalastfmprovider.c:529 -#: src/goabackend/goasmtpauth.c:108 src/goabackend/goautils.c:878 +#: src/goabackend/goasmtpauth.c:108 src/goabackend/goautils.c:838 msgid "Authentication failed" msgstr "Échec d’authentification" @@ -308,7 +305,7 @@ #: src/goabackend/goaimapsmtpprovider.c:378 #, c-format msgid "Invalid %s with username “%s” (%s, %d): " -msgstr "%s invalide pour l’utilisateur « %s » (%s, %d) : " +msgstr "%s non valide pour l’utilisateur « %s » (%s, %d) : " #. Translators: the following four strings are used to show a #. * combo box similar to the one in the evolution module. @@ -409,7 +406,7 @@ msgstr "L’opération a été annulée" #: src/goabackend/goakerberosprovider.c:794 -#: src/goaidentity/goaidentityservice.c:1072 +#: src/goaidentity/goaidentityservice.c:1069 msgid "Log In to Realm" msgstr "Connexion au nom de domaine" @@ -474,7 +471,7 @@ #: src/goabackend/goaoauth2provider.c:884 #, c-format msgid "Authorization response: %s" -msgstr "Réponse d’autorisation : %s" +msgstr "Réponse d’autorisation : %s" #: src/goabackend/goaoauth2provider.c:1021 #: src/goabackend/goaoauthprovider.c:890 @@ -550,73 +547,73 @@ msgid "No username or access_token" msgstr "Pas de nom d’utilisateur ou de jeton d’accès" -#: src/goabackend/goaprovider.c:114 +#: src/goabackend/goaprovider.c:110 msgid "_Mail" msgstr "Cou_rriel" -#: src/goabackend/goaprovider.c:119 +#: src/goabackend/goaprovider.c:115 msgid "Cale_ndar" msgstr "Age_nda" -#: src/goabackend/goaprovider.c:124 +#: src/goabackend/goaprovider.c:120 msgid "_Contacts" msgstr "_Contacts" -#: src/goabackend/goaprovider.c:129 src/goabackend/goatelepathyprovider.c:951 +#: src/goabackend/goaprovider.c:125 msgid "C_hat" msgstr "D_iscussion" -#: src/goabackend/goaprovider.c:134 +#: src/goabackend/goaprovider.c:130 msgid "_Documents" msgstr "_Documents" -#: src/goabackend/goaprovider.c:139 +#: src/goabackend/goaprovider.c:135 msgid "M_usic" msgstr "M_usique" -#: src/goabackend/goaprovider.c:144 +#: src/goabackend/goaprovider.c:140 msgid "_Photos" msgstr "_Photos" -#: src/goabackend/goaprovider.c:149 +#: src/goabackend/goaprovider.c:145 msgid "_Files" msgstr "_Fichiers" -#: src/goabackend/goaprovider.c:154 +#: src/goabackend/goaprovider.c:150 msgid "Network _Resources" msgstr "_Ressources du réseau" -#: src/goabackend/goaprovider.c:159 +#: src/goabackend/goaprovider.c:155 msgid "_Read Later" msgstr "_Lire plus tard" -#: src/goabackend/goaprovider.c:164 +#: src/goabackend/goaprovider.c:160 msgid "Prin_ters" msgstr "Impriman_te " -#: src/goabackend/goaprovider.c:169 +#: src/goabackend/goaprovider.c:165 msgid "_Maps" msgstr "_Cartes" -#: src/goabackend/goaprovider.c:174 +#: src/goabackend/goaprovider.c:170 msgid "T_o Do" msgstr "T_âches" #. Translators: This is a label for a series of #. * options switches. For example: “Use for Mail”. -#: src/goabackend/goaprovider.c:588 src/goabackend/goatelepathyprovider.c:949 +#: src/goabackend/goaprovider.c:568 msgid "Use for" msgstr "Utiliser pour" -#: src/goabackend/goaprovider.c:843 +#: src/goabackend/goaprovider.c:823 msgid "Account is disabled" msgstr "Le compte est désactivé" -#: src/goabackend/goaprovider.c:856 +#: src/goabackend/goaprovider.c:836 msgid "Unknown error" msgstr "Erreur inconnue" -#: src/goabackend/goaprovider.c:875 +#: src/goabackend/goaprovider.c:855 #, c-format msgid "ensure_credentials_sync is not implemented on type %s" msgstr "ensure_credentials_sync n’est pas implémenté pour le type %s" @@ -630,66 +627,27 @@ msgid "Unknown authentication mechanism" msgstr "Méthode d’authentification inconnue" -#: src/goabackend/goatelepathyprovider.c:172 -msgid "Telepathy chat account not found" -msgstr "Aucun compte de discussion Telepathy trouvé" - -#: src/goabackend/goatelepathyprovider.c:434 -#, c-format -msgid "Failed to create a user interface for %s" -msgstr "Impossible de créer une interface utilisateur pour %s" - -#: src/goabackend/goatelepathyprovider.c:540 -msgid "Connection Settings" -msgstr "Paramètres de connexion" - -#: src/goabackend/goatelepathyprovider.c:646 -msgid "Personal Details" -msgstr "Informations personnelles" - -#: src/goabackend/goatelepathyprovider.c:652 -msgid "_OK" -msgstr "_Valider" - -#: src/goabackend/goatelepathyprovider.c:898 -msgid "Cannot save the connection parameters" -msgstr "Impossible d’enregistrer les paramètres de connexion" - -#: src/goabackend/goatelepathyprovider.c:911 -msgid "Cannot save your personal information on the server" -msgstr "Impossible d’enregistrer vos informations personnelles sur le serveur" - -#. Connection Settings button -#: src/goabackend/goatelepathyprovider.c:956 -msgid "_Connection Settings" -msgstr "_Paramètres de connexion" - -#. Edit Personal Information button -#: src/goabackend/goatelepathyprovider.c:960 -msgid "_Personal Details" -msgstr "_Informations personnelles" - #: src/goabackend/goatodoistprovider.c:58 msgid "Todoist" msgstr "Todoist" -#: src/goabackend/goautils.c:96 +#: src/goabackend/goautils.c:92 msgid "Error logging into the account" msgstr "Erreur à la connexion au compte" -#: src/goabackend/goautils.c:140 +#: src/goabackend/goautils.c:136 msgid "Credentials have expired" msgstr "Les données d’authentification ont expiré" -#: src/goabackend/goautils.c:144 +#: src/goabackend/goautils.c:140 msgid "Sign in to enable this account." -msgstr "Identifiez vous pour activer ce compte" +msgstr "Identifiez-vous pour activer ce compte" -#: src/goabackend/goautils.c:148 +#: src/goabackend/goautils.c:144 msgid "_Sign In" msgstr "_S’identifier" -#: src/goabackend/goautils.c:280 +#: src/goabackend/goautils.c:240 #, c-format msgid "A %s account already exists for %s" msgstr "Un compte %s existe déjà pour %s" @@ -698,69 +656,69 @@ #. * Account" dialogs. The %s is the name of the provider. eg., #. * 'Google'. #. -#: src/goabackend/goautils.c:333 +#: src/goabackend/goautils.c:293 #, c-format msgid "%s Account" msgstr "Compte %s" #. TODO: more specific -#: src/goabackend/goautils.c:387 +#: src/goabackend/goautils.c:347 msgid "Failed to delete credentials from the keyring" msgstr "" "Échec de suppression des données d’authentification du trousseau de clés" #. TODO: more specific -#: src/goabackend/goautils.c:435 +#: src/goabackend/goautils.c:395 msgid "Failed to retrieve credentials from the keyring" msgstr "" "Échec lors de la récupération des données d’authentification depuis le " "trousseau de clés" #. TODO: more specific -#: src/goabackend/goautils.c:445 +#: src/goabackend/goautils.c:405 msgid "No credentials found in the keyring" msgstr "Aucune donnée d’authentification trouvée dans le trousseau de clés" -#: src/goabackend/goautils.c:458 +#: src/goabackend/goautils.c:418 msgid "Error parsing result obtained from the keyring: " msgstr "" "Erreur lors de l’analyse du résultat obtenu à partir du trousseau de clés : " #. Translators: The %s is the type of the provider, e.g. 'google' or 'yahoo' -#: src/goabackend/goautils.c:499 +#: src/goabackend/goautils.c:459 #, c-format msgid "GOA %s credentials for identity %s" msgstr "Données d’authentification GOA %s pour l’identité %s" #. TODO: more specific -#: src/goabackend/goautils.c:516 +#: src/goabackend/goautils.c:476 msgid "Failed to store credentials in the keyring" msgstr "" "Échec lors du stockage des données d’authentification dans le trousseau de " "clés" -#: src/goabackend/goautils.c:865 +#: src/goabackend/goautils.c:825 msgid "Cannot resolve hostname" msgstr "Impossible de résoudre le nom de domaine" -#: src/goabackend/goautils.c:869 +#: src/goabackend/goautils.c:829 msgid "Cannot resolve proxy hostname" msgstr "Impossible de résoudre le nom de domaine du serveur mandataire" -#: src/goabackend/goautils.c:874 +#: src/goabackend/goautils.c:834 msgid "Cannot find WebDAV endpoint" msgstr "Impossible de trouver le point de sortie WebDAV" -#: src/goabackend/goautils.c:883 +#: src/goabackend/goautils.c:843 #, c-format msgid "Code: %u — Unexpected response from server" msgstr "Code : %u — Réponse inattendue du serveur" -#: src/goabackend/goautils.c:899 +#: src/goabackend/goautils.c:859 msgid "The signing certificate authority is not known." msgstr "L’autorité de certificat de signature est inconnue." -#: src/goabackend/goautils.c:903 +#: src/goabackend/goautils.c:863 msgid "" "The certificate does not match the expected identity of the site that it was " "retrieved from." @@ -768,28 +726,28 @@ "Le certificat ne correspond pas à l’identité attendue pour le site d’où il " "provient." -#: src/goabackend/goautils.c:908 +#: src/goabackend/goautils.c:868 msgid "The certificate’s activation time is still in the future." msgstr "La date d’activation du certificat est toujours dans l’avenir." -#: src/goabackend/goautils.c:912 +#: src/goabackend/goautils.c:872 msgid "The certificate has expired." msgstr "Le certificat a expiré." -#: src/goabackend/goautils.c:916 +#: src/goabackend/goautils.c:876 msgid "The certificate has been revoked." msgstr "Le certificat a été révoqué." -#: src/goabackend/goautils.c:920 +#: src/goabackend/goautils.c:880 msgid "The certificate’s algorithm is considered insecure." msgstr "L’algorithme du certificat n’est pas considéré comme sûr." -#: src/goabackend/goautils.c:926 +#: src/goabackend/goautils.c:886 msgid "Invalid certificate." msgstr "Certificat non valide." #. TODO: more specific -#: src/goabackend/goautils.c:961 +#: src/goabackend/goautils.c:921 #, c-format msgid "Did not find %s with identity “%s” in credentials" msgstr "" @@ -809,7 +767,7 @@ msgid "Initial secret key is invalid" msgstr "La clé secrète initiale n’est pas valide" -#: src/goaidentity/goaidentityservice.c:1077 +#: src/goaidentity/goaidentityservice.c:1074 #, c-format msgid "The network realm %s needs some information to sign you in." msgstr "" @@ -872,8 +830,8 @@ #, c-format msgid "Could not get new credentials to renew identity %s: " msgstr "" -"Impossible d’obtenir de nouvelles données d’authentification pour " -"renouveller l’identité %s : " +"Impossible d’obtenir de nouvelles données d’authentification pour renouveler " +"l’identité %s : " #: src/goaidentity/goakerberosidentity.c:1604 msgid "Could not erase identity: " @@ -887,3 +845,31 @@ msgid "Could not create credential cache for identity" msgstr "" "Impossible de créer le cache de la donnée d’authentification pour l’identité" + +#~ msgid "Telepathy chat account not found" +#~ msgstr "Aucun compte de discussion Telepathy trouvé" + +#~ msgid "Failed to create a user interface for %s" +#~ msgstr "Impossible de créer une interface utilisateur pour %s" + +#~ msgid "Connection Settings" +#~ msgstr "Paramètres de connexion" + +#~ msgid "Personal Details" +#~ msgstr "Informations personnelles" + +#~ msgid "_OK" +#~ msgstr "_Valider" + +#~ msgid "Cannot save the connection parameters" +#~ msgstr "Impossible d’enregistrer les paramètres de connexion" + +#~ msgid "Cannot save your personal information on the server" +#~ msgstr "" +#~ "Impossible d’enregistrer vos informations personnelles sur le serveur" + +#~ msgid "_Connection Settings" +#~ msgstr "_Paramètres de connexion" + +#~ msgid "_Personal Details" +#~ msgstr "_Informations personnelles" diff -Nru gnome-online-accounts-3.30.1/po/gnome-online-accounts.pot gnome-online-accounts-3.31.90/po/gnome-online-accounts.pot --- gnome-online-accounts-3.30.1/po/gnome-online-accounts.pot 2019-01-17 10:28:13.000000000 +0000 +++ gnome-online-accounts-3.31.90/po/gnome-online-accounts.pot 2019-02-09 21:18:22.000000000 +0000 @@ -6,10 +6,10 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: gnome-online-accounts 3.30.1\n" +"Project-Id-Version: gnome-online-accounts 3.31.90\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-online-accounts/" "issues\n" -"POT-Creation-Date: 2019-01-17 11:28+0100\n" +"POT-Creation-Date: 2019-02-09 22:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -44,20 +44,20 @@ msgstr "" #. TODO: more specific -#: src/goabackend/goaewsclient.c:238 +#: src/goabackend/goaewsclient.c:258 msgid "Failed to parse autodiscover response XML" msgstr "" #. TODO: more specific #. Translators: the parameter is an XML element name. -#: src/goabackend/goaewsclient.c:249 src/goabackend/goaewsclient.c:264 -#: src/goabackend/goaewsclient.c:279 +#: src/goabackend/goaewsclient.c:269 src/goabackend/goaewsclient.c:284 +#: src/goabackend/goaewsclient.c:299 #, c-format msgid "Failed to find “%s” element" msgstr "" #. TODO: more specific -#: src/goabackend/goaewsclient.c:300 +#: src/goabackend/goaewsclient.c:320 msgid "Failed to find ASUrl and OABUrl in autodiscover response" msgstr "" @@ -194,8 +194,7 @@ #: src/goabackend/goafacebookprovider.c:183 #: src/goabackend/goaflickrprovider.c:155 #: src/goabackend/goafoursquareprovider.c:154 -#: src/goabackend/goagoogleprovider.c:183 -#: src/goabackend/goatodoistprovider.c:193 +#: src/goabackend/goagoogleprovider.c:184 #: src/goabackend/goawindowsliveprovider.c:159 #, c-format msgid "" @@ -217,8 +216,8 @@ #: src/goabackend/goafoursquareprovider.c:206 #: src/goabackend/goafoursquareprovider.c:215 #: src/goabackend/goafoursquareprovider.c:228 -#: src/goabackend/goagoogleprovider.c:202 -#: src/goabackend/goagoogleprovider.c:213 +#: src/goabackend/goagoogleprovider.c:203 +#: src/goabackend/goagoogleprovider.c:214 #: src/goabackend/goalastfmprovider.c:212 #: src/goabackend/goalastfmprovider.c:221 #: src/goabackend/goalastfmprovider.c:230 @@ -230,10 +229,7 @@ #: src/goabackend/goalastfmprovider.c:544 #: src/goabackend/goaoauth2provider.c:656 #: src/goabackend/goaoauth2provider.c:686 -#: src/goabackend/goaoauth2provider.c:697 -#: src/goabackend/goatodoistprovider.c:212 -#: src/goabackend/goatodoistprovider.c:223 -#: src/goabackend/goatodoistprovider.c:234 src/goabackend/goautils.c:273 +#: src/goabackend/goaoauth2provider.c:697 src/goabackend/goautils.c:273 #: src/goabackend/goawindowsliveprovider.c:178 #: src/goabackend/goawindowsliveprovider.c:189 #: src/goabackend/goawindowsliveprovider.c:198 @@ -391,7 +387,7 @@ msgstr "" #: src/goabackend/goakerberosprovider.c:794 -#: src/goaidentity/goaidentityservice.c:1069 +#: src/goaidentity/goaidentityservice.c:1070 msgid "Log In to Realm" msgstr "" @@ -521,73 +517,73 @@ msgid "No username or access_token" msgstr "" -#: src/goabackend/goaprovider.c:110 +#: src/goabackend/goaprovider.c:109 msgid "_Mail" msgstr "" -#: src/goabackend/goaprovider.c:115 +#: src/goabackend/goaprovider.c:114 msgid "Cale_ndar" msgstr "" -#: src/goabackend/goaprovider.c:120 +#: src/goabackend/goaprovider.c:119 msgid "_Contacts" msgstr "" -#: src/goabackend/goaprovider.c:125 +#: src/goabackend/goaprovider.c:124 msgid "C_hat" msgstr "" -#: src/goabackend/goaprovider.c:130 +#: src/goabackend/goaprovider.c:129 msgid "_Documents" msgstr "" -#: src/goabackend/goaprovider.c:135 +#: src/goabackend/goaprovider.c:134 msgid "M_usic" msgstr "" -#: src/goabackend/goaprovider.c:140 +#: src/goabackend/goaprovider.c:139 msgid "_Photos" msgstr "" -#: src/goabackend/goaprovider.c:145 +#: src/goabackend/goaprovider.c:144 msgid "_Files" msgstr "" -#: src/goabackend/goaprovider.c:150 +#: src/goabackend/goaprovider.c:149 msgid "Network _Resources" msgstr "" -#: src/goabackend/goaprovider.c:155 +#: src/goabackend/goaprovider.c:154 msgid "_Read Later" msgstr "" -#: src/goabackend/goaprovider.c:160 +#: src/goabackend/goaprovider.c:159 msgid "Prin_ters" msgstr "" -#: src/goabackend/goaprovider.c:165 +#: src/goabackend/goaprovider.c:164 msgid "_Maps" msgstr "" -#: src/goabackend/goaprovider.c:170 +#: src/goabackend/goaprovider.c:169 msgid "T_o Do" msgstr "" #. Translators: This is a label for a series of #. * options switches. For example: “Use for Mail”. -#: src/goabackend/goaprovider.c:568 +#: src/goabackend/goaprovider.c:567 msgid "Use for" msgstr "" -#: src/goabackend/goaprovider.c:823 +#: src/goabackend/goaprovider.c:822 msgid "Account is disabled" msgstr "" -#: src/goabackend/goaprovider.c:836 +#: src/goabackend/goaprovider.c:835 msgid "Unknown error" msgstr "" -#: src/goabackend/goaprovider.c:855 +#: src/goabackend/goaprovider.c:854 #, c-format msgid "ensure_credentials_sync is not implemented on type %s" msgstr "" @@ -601,10 +597,6 @@ msgid "Unknown authentication mechanism" msgstr "" -#: src/goabackend/goatodoistprovider.c:58 -msgid "Todoist" -msgstr "" - #: src/goabackend/goautils.c:92 msgid "Error logging into the account" msgstr "" @@ -728,70 +720,70 @@ msgid "Microsoft" msgstr "" -#: src/goaidentity/goaidentityservice.c:568 +#: src/goaidentity/goaidentityservice.c:569 msgid "Initial secret key is invalid" msgstr "" -#: src/goaidentity/goaidentityservice.c:1074 +#: src/goaidentity/goaidentityservice.c:1075 #, c-format msgid "The network realm %s needs some information to sign you in." msgstr "" -#: src/goaidentity/goakerberosidentity.c:275 -#: src/goaidentity/goakerberosidentity.c:283 -#: src/goaidentity/goakerberosidentity.c:707 +#: src/goaidentity/goakerberosidentity.c:274 +#: src/goaidentity/goakerberosidentity.c:282 +#: src/goaidentity/goakerberosidentity.c:706 msgid "Could not find identity in credential cache: " msgstr "" -#: src/goaidentity/goakerberosidentity.c:720 +#: src/goaidentity/goakerberosidentity.c:719 msgid "Could not find identity credentials in cache: " msgstr "" -#: src/goaidentity/goakerberosidentity.c:771 +#: src/goaidentity/goakerberosidentity.c:770 msgid "Could not sift through identity credentials in cache: " msgstr "" -#: src/goaidentity/goakerberosidentity.c:788 +#: src/goaidentity/goakerberosidentity.c:787 msgid "Could not finish up sifting through identity credentials in cache: " msgstr "" -#: src/goaidentity/goakerberosidentity.c:1103 +#: src/goaidentity/goakerberosidentity.c:1102 msgid "No associated identification found" msgstr "" -#: src/goaidentity/goakerberosidentity.c:1186 +#: src/goaidentity/goakerberosidentity.c:1185 msgid "Could not create credential cache: " msgstr "" -#: src/goaidentity/goakerberosidentity.c:1220 +#: src/goaidentity/goakerberosidentity.c:1219 msgid "Could not initialize credentials cache: " msgstr "" -#: src/goaidentity/goakerberosidentity.c:1236 +#: src/goaidentity/goakerberosidentity.c:1235 msgid "Could not store new credentials in credentials cache: " msgstr "" -#: src/goaidentity/goakerberosidentity.c:1534 +#: src/goaidentity/goakerberosidentity.c:1533 msgid "Could not renew identity: Not signed in" msgstr "" -#: src/goaidentity/goakerberosidentity.c:1546 +#: src/goaidentity/goakerberosidentity.c:1545 msgid "Could not renew identity: " msgstr "" -#: src/goaidentity/goakerberosidentity.c:1562 +#: src/goaidentity/goakerberosidentity.c:1561 #, c-format msgid "Could not get new credentials to renew identity %s: " msgstr "" -#: src/goaidentity/goakerberosidentity.c:1604 +#: src/goaidentity/goakerberosidentity.c:1603 msgid "Could not erase identity: " msgstr "" -#: src/goaidentity/goakerberosidentitymanager.c:749 +#: src/goaidentity/goakerberosidentitymanager.c:750 msgid "Could not find identity" msgstr "" -#: src/goaidentity/goakerberosidentitymanager.c:845 +#: src/goaidentity/goakerberosidentitymanager.c:846 msgid "Could not create credential cache for identity" msgstr "" Binary files /tmp/tmpOF9Z7O/tiVsTCcCtl/gnome-online-accounts-3.30.1/po/ja.gmo and /tmp/tmpOF9Z7O/8j3UbjNw9P/gnome-online-accounts-3.31.90/po/ja.gmo differ diff -Nru gnome-online-accounts-3.30.1/po/ja.po gnome-online-accounts-3.31.90/po/ja.po --- gnome-online-accounts-3.30.1/po/ja.po 2016-09-14 19:29:55.000000000 +0000 +++ gnome-online-accounts-3.31.90/po/ja.po 2019-01-31 07:49:52.000000000 +0000 @@ -2,7 +2,7 @@ # Copyright (C) 2011,2012 gnome-online-accounts's COPYRIGHT HOLDER # This file is distributed under the same license as the gnome-online-accounts package. # Takeshi AIHANA , 2011. -# Hajime Taira , 2012. +# Hajime Taira , 2012, 2016. # Shuuji Takahashi , 2012. # Noriko Mizumoto , 2012. # Takayuki KUSANO , 2012. @@ -14,10 +14,10 @@ msgid "" msgstr "" "Project-Id-Version: gnome-online-accounts master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" -"online-accounts&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-04-11 15:52+0000\n" -"PO-Revision-Date: 2016-03-28 16:34+0900\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-online-accounts/" +"issues\n" +"POT-Creation-Date: 2018-11-23 11:50+0000\n" +"PO-Revision-Date: 2019-01-30 20:08+0900\n" "Last-Translator: Hajime Taira \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -27,42 +27,50 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 1.8.6\n" +#: data/org.gnome.online-accounts.gschema.xml:6 +msgid "List of providers that are allowed to be loaded" +msgstr "" + +#: data/org.gnome.online-accounts.gschema.xml:7 +msgid "" +"A list of strings representing the providers that are allowed to be loaded " +"(default: 'all'). This is only evaluated on startup." +msgstr "" + #. TODO: more specific -#: ../src/daemon/goadaemon.c:842 ../src/daemon/goadaemon.c:1100 +#: src/daemon/goadaemon.c:1131 src/daemon/goadaemon.c:1415 #, c-format msgid "Failed to find a provider for: %s" msgstr "次のプロバイダーが見つかりません: %s" -#: ../src/daemon/goadaemon.c:1028 +#: src/daemon/goadaemon.c:1358 msgid "IsLocked property is set for account" msgstr "IsLocked プロパティーがアカウントに設定されています" #. TODO: more specific -#: ../src/daemon/goadaemon.c:1088 +#: src/daemon/goadaemon.c:1403 msgid "ProviderType property is not set for account" msgstr "ProviderType プロパティーがアカウントに設定されていません" #. TODO: more specific -#: ../src/goabackend/goaewsclient.c:250 -#, c-format +#: src/goabackend/goaewsclient.c:238 msgid "Failed to parse autodiscover response XML" msgstr "自動検出の応答 XML の解析に失敗しました" #. TODO: more specific #. Translators: the parameter is an XML element name. -#: ../src/goabackend/goaewsclient.c:261 ../src/goabackend/goaewsclient.c:276 -#: ../src/goabackend/goaewsclient.c:291 +#: src/goabackend/goaewsclient.c:249 src/goabackend/goaewsclient.c:264 +#: src/goabackend/goaewsclient.c:279 #, c-format -msgid "Failed to find ‘%s’ element" -msgstr "‘%s’エレメントの検出に失敗しました" +msgid "Failed to find “%s” element" +msgstr "“%s”エレメントの検出に失敗しました" #. TODO: more specific -#: ../src/goabackend/goaewsclient.c:312 -#, c-format +#: src/goabackend/goaewsclient.c:300 msgid "Failed to find ASUrl and OABUrl in autodiscover response" msgstr "自動検出の応答内での ASUrl と OABUrl の検出に失敗しました" -#: ../src/goabackend/goaexchangeprovider.c:74 +#: src/goabackend/goaexchangeprovider.c:51 msgid "Microsoft Exchange" msgstr "Microsoft Exchange" @@ -70,140 +78,133 @@ #. * (eg., debarshi.ray@gmail.com or rishi), and the #. * (%s, %d) is the error domain and code. #. -#: ../src/goabackend/goaexchangeprovider.c:283 -#: ../src/goabackend/goalastfmprovider.c:280 -#: ../src/goabackend/goaowncloudprovider.c:314 +#: src/goabackend/goaexchangeprovider.c:248 +#: src/goabackend/goalastfmprovider.c:287 +#: src/goabackend/goaowncloudprovider.c:291 #, c-format -msgid "Invalid password with username ‘%s’ (%s, %d): " -msgstr "ユーザー名‘%s’のパスワードが不正です (%s, %d):" +msgid "Invalid password with username “%s” (%s, %d): " +msgstr "ユーザー名“%s”のパスワードが不正です (%s, %d):" -#: ../src/goabackend/goaexchangeprovider.c:436 -#: ../src/goabackend/goaimapsmtpprovider.c:686 +#: src/goabackend/goaexchangeprovider.c:396 +#: src/goabackend/goaimapsmtpprovider.c:647 msgid "_E-mail" msgstr "メール(_E)" -#: ../src/goabackend/goaexchangeprovider.c:437 -#: ../src/goabackend/goaimapsmtpprovider.c:706 -#: ../src/goabackend/goaimapsmtpprovider.c:726 -#: ../src/goabackend/goalastfmprovider.c:420 -#: ../src/goabackend/goaowncloudprovider.c:560 +#: src/goabackend/goaexchangeprovider.c:397 +#: src/goabackend/goaimapsmtpprovider.c:667 +#: src/goabackend/goaimapsmtpprovider.c:687 +#: src/goabackend/goalastfmprovider.c:429 +#: src/goabackend/goaowncloudprovider.c:530 msgid "_Password" msgstr "パスワード(_P)" -#: ../src/goabackend/goaexchangeprovider.c:440 +#: src/goabackend/goaexchangeprovider.c:400 msgid "_Custom" msgstr "カスタム(_C)" -#: ../src/goabackend/goaexchangeprovider.c:451 -#: ../src/goabackend/goaimapsmtpprovider.c:705 -#: ../src/goabackend/goaimapsmtpprovider.c:725 -#: ../src/goabackend/goakerberosprovider.c:734 -#: ../src/goabackend/goalastfmprovider.c:419 -#: ../src/goabackend/goaowncloudprovider.c:559 +#: src/goabackend/goaexchangeprovider.c:411 +#: src/goabackend/goaimapsmtpprovider.c:666 +#: src/goabackend/goaimapsmtpprovider.c:686 +#: src/goabackend/goalastfmprovider.c:428 +#: src/goabackend/goaowncloudprovider.c:529 msgid "User_name" msgstr "ユーザー名(_N)" -#: ../src/goabackend/goaexchangeprovider.c:452 -#: ../src/goabackend/goaowncloudprovider.c:558 +#: src/goabackend/goaexchangeprovider.c:412 +#: src/goabackend/goaowncloudprovider.c:528 msgid "_Server" msgstr "サーバー(_S)" #. -- -#: ../src/goabackend/goaexchangeprovider.c:462 -#: ../src/goabackend/goaimapsmtpprovider.c:738 -#: ../src/goabackend/goakerberosprovider.c:739 -#: ../src/goabackend/goalastfmprovider.c:428 -#: ../src/goabackend/goaowncloudprovider.c:569 -#: ../src/goabackend/goatelepathyprovider.c:650 +#: src/goabackend/goaexchangeprovider.c:422 +#: src/goabackend/goaimapsmtpprovider.c:699 +#: src/goabackend/goakerberosprovider.c:563 +#: src/goabackend/goalastfmprovider.c:437 +#: src/goabackend/goaowncloudprovider.c:544 msgid "_Cancel" msgstr "キャンセル(_C)" -#: ../src/goabackend/goaexchangeprovider.c:463 -#: ../src/goabackend/goakerberosprovider.c:740 -#: ../src/goabackend/goalastfmprovider.c:429 -#: ../src/goabackend/goaowncloudprovider.c:570 +#: src/goabackend/goaexchangeprovider.c:423 +#: src/goabackend/goakerberosprovider.c:564 +#: src/goabackend/goalastfmprovider.c:438 +#: src/goabackend/goaowncloudprovider.c:545 msgid "C_onnect" msgstr "接続(_O)" -#: ../src/goabackend/goaexchangeprovider.c:479 -#: ../src/goabackend/goaimapsmtpprovider.c:754 -#: ../src/goabackend/goakerberosprovider.c:756 -#: ../src/goabackend/goalastfmprovider.c:445 -#: ../src/goabackend/goaowncloudprovider.c:585 +#: src/goabackend/goaexchangeprovider.c:439 +#: src/goabackend/goaimapsmtpprovider.c:715 +#: src/goabackend/goakerberosprovider.c:579 +#: src/goabackend/goalastfmprovider.c:454 +#: src/goabackend/goaowncloudprovider.c:560 msgid "Connecting…" msgstr "接続中…" -#: ../src/goabackend/goaexchangeprovider.c:584 -#: ../src/goabackend/goaexchangeprovider.c:779 -#: ../src/goabackend/goaimapsmtpprovider.c:916 -#: ../src/goabackend/goaimapsmtpprovider.c:951 -#: ../src/goabackend/goaimapsmtpprovider.c:1039 -#: ../src/goabackend/goaimapsmtpprovider.c:1302 -#: ../src/goabackend/goaimapsmtpprovider.c:1375 -#: ../src/goabackend/goakerberosprovider.c:1155 -#: ../src/goabackend/goalastfmprovider.c:640 -#: ../src/goabackend/goalastfmprovider.c:806 -#: ../src/goabackend/goamediaserverprovider.c:459 -#: ../src/goabackend/goaoauth2provider.c:1033 -#: ../src/goabackend/goaoauthprovider.c:862 -#: ../src/goabackend/goaowncloudprovider.c:696 -#: ../src/goabackend/goaowncloudprovider.c:910 -#: ../src/goabackend/goatelepathyprovider.c:460 -#: ../src/goabackend/goatelepathyprovider.c:509 -#: ../src/goabackend/goatelepathyprovider.c:684 -#, c-format +#: src/goabackend/goaexchangeprovider.c:539 +#: src/goabackend/goaexchangeprovider.c:733 +#: src/goabackend/goaimapsmtpprovider.c:865 +#: src/goabackend/goaimapsmtpprovider.c:900 +#: src/goabackend/goaimapsmtpprovider.c:992 +#: src/goabackend/goaimapsmtpprovider.c:1249 +#: src/goabackend/goaimapsmtpprovider.c:1325 +#: src/goabackend/goakerberosprovider.c:896 +#: src/goabackend/goalastfmprovider.c:652 +#: src/goabackend/goalastfmprovider.c:820 +#: src/goabackend/goamediaserverprovider.c:420 +#: src/goabackend/goaoauth2provider.c:995 src/goabackend/goaoauthprovider.c:859 +#: src/goabackend/goaowncloudprovider.c:663 +#: src/goabackend/goaowncloudprovider.c:883 msgid "Dialog was dismissed" msgstr "ダイアログが閉じられました" -#: ../src/goabackend/goaexchangeprovider.c:622 -#: ../src/goabackend/goaexchangeprovider.c:807 -#: ../src/goabackend/goaimapsmtpprovider.c:981 -#: ../src/goabackend/goaimapsmtpprovider.c:1074 -#: ../src/goabackend/goaimapsmtpprovider.c:1326 -#: ../src/goabackend/goaimapsmtpprovider.c:1400 -#: ../src/goabackend/goalastfmprovider.c:674 -#: ../src/goabackend/goalastfmprovider.c:825 -#: ../src/goabackend/goaowncloudprovider.c:738 -#: ../src/goabackend/goaowncloudprovider.c:931 +#: src/goabackend/goaexchangeprovider.c:577 +#: src/goabackend/goaexchangeprovider.c:761 +#: src/goabackend/goaimapsmtpprovider.c:933 +#: src/goabackend/goaimapsmtpprovider.c:1030 +#: src/goabackend/goaimapsmtpprovider.c:1276 +#: src/goabackend/goaimapsmtpprovider.c:1353 +#: src/goabackend/goalastfmprovider.c:686 +#: src/goabackend/goalastfmprovider.c:839 +#: src/goabackend/goaowncloudprovider.c:708 +#: src/goabackend/goaowncloudprovider.c:910 #, c-format msgid "Dialog was dismissed (%s, %d): " msgstr "ダイアログが閉じられました (%s, %d): " -#: ../src/goabackend/goaexchangeprovider.c:635 -#: ../src/goabackend/goaimapsmtpprovider.c:994 -#: ../src/goabackend/goaimapsmtpprovider.c:1087 -#: ../src/goabackend/goaowncloudprovider.c:751 +#: src/goabackend/goaexchangeprovider.c:590 +#: src/goabackend/goaimapsmtpprovider.c:946 +#: src/goabackend/goaimapsmtpprovider.c:1043 +#: src/goabackend/goaowncloudprovider.c:721 msgid "_Ignore" msgstr "無視する(_I)" -#: ../src/goabackend/goaexchangeprovider.c:640 -#: ../src/goabackend/goaexchangeprovider.c:826 -#: ../src/goabackend/goaimapsmtpprovider.c:999 -#: ../src/goabackend/goaimapsmtpprovider.c:1092 -#: ../src/goabackend/goaimapsmtpprovider.c:1345 -#: ../src/goabackend/goaimapsmtpprovider.c:1419 -#: ../src/goabackend/goakerberosprovider.c:1262 -#: ../src/goabackend/goalastfmprovider.c:686 -#: ../src/goabackend/goalastfmprovider.c:842 -#: ../src/goabackend/goaowncloudprovider.c:756 -#: ../src/goabackend/goaowncloudprovider.c:950 +#: src/goabackend/goaexchangeprovider.c:595 +#: src/goabackend/goaexchangeprovider.c:780 +#: src/goabackend/goaimapsmtpprovider.c:951 +#: src/goabackend/goaimapsmtpprovider.c:1048 +#: src/goabackend/goaimapsmtpprovider.c:1295 +#: src/goabackend/goaimapsmtpprovider.c:1372 +#: src/goabackend/goakerberosprovider.c:981 +#: src/goabackend/goalastfmprovider.c:698 +#: src/goabackend/goalastfmprovider.c:856 +#: src/goabackend/goaowncloudprovider.c:726 +#: src/goabackend/goaowncloudprovider.c:929 msgid "_Try Again" msgstr "やり直す(_T)" -#: ../src/goabackend/goaexchangeprovider.c:645 -#: ../src/goabackend/goaexchangeprovider.c:819 +#: src/goabackend/goaexchangeprovider.c:600 +#: src/goabackend/goaexchangeprovider.c:773 msgid "Error connecting to Microsoft Exchange server" msgstr "Microsoft Exchange サーバーへの接続に失敗しました" -#: ../src/goabackend/goafacebookprovider.c:77 +#: src/goabackend/goafacebookprovider.c:56 msgid "Facebook" msgstr "Facebook" -#: ../src/goabackend/goafacebookprovider.c:216 -#: ../src/goabackend/goaflickrprovider.c:184 -#: ../src/goabackend/goafoursquareprovider.c:190 -#: ../src/goabackend/goagoogleprovider.c:226 -#: ../src/goabackend/goawindowsliveprovider.c:196 +#: src/goabackend/goafacebookprovider.c:183 +#: src/goabackend/goaflickrprovider.c:155 +#: src/goabackend/goafoursquareprovider.c:154 +#: src/goabackend/goagoogleprovider.c:183 +#: src/goabackend/goawindowsliveprovider.c:159 #, c-format msgid "" "Expected status 200 when requesting your identity, instead got status %d (%s)" @@ -212,83 +213,79 @@ "け取ったステータスは %d (%s) でした" #. TODO: more specific -#: ../src/goabackend/goafacebookprovider.c:235 -#: ../src/goabackend/goafacebookprovider.c:247 -#: ../src/goabackend/goafacebookprovider.c:260 -#: ../src/goabackend/goaflickrprovider.c:203 -#: ../src/goabackend/goaflickrprovider.c:215 -#: ../src/goabackend/goaflickrprovider.c:225 -#: ../src/goabackend/goaflickrprovider.c:235 -#: ../src/goabackend/goaflickrprovider.c:245 -#: ../src/goabackend/goafoursquareprovider.c:209 -#: ../src/goabackend/goafoursquareprovider.c:221 -#: ../src/goabackend/goafoursquareprovider.c:232 -#: ../src/goabackend/goafoursquareprovider.c:243 -#: ../src/goabackend/goafoursquareprovider.c:254 -#: ../src/goabackend/goafoursquareprovider.c:265 -#: ../src/goabackend/goagoogleprovider.c:245 -#: ../src/goabackend/goagoogleprovider.c:257 -#: ../src/goabackend/goalastfmprovider.c:211 -#: ../src/goabackend/goalastfmprovider.c:220 -#: ../src/goabackend/goalastfmprovider.c:230 -#: ../src/goabackend/goalastfmprovider.c:237 -#: ../src/goabackend/goalastfmprovider.c:503 -#: ../src/goabackend/goalastfmprovider.c:512 -#: ../src/goabackend/goalastfmprovider.c:527 -#: ../src/goabackend/goalastfmprovider.c:534 -#: ../src/goabackend/goaoauth2provider.c:699 -#: ../src/goabackend/goaoauth2provider.c:729 -#: ../src/goabackend/goaoauth2provider.c:741 ../src/goabackend/goautils.c:153 -#: ../src/goabackend/goawindowsliveprovider.c:215 -#: ../src/goabackend/goawindowsliveprovider.c:227 -#: ../src/goabackend/goawindowsliveprovider.c:239 -#, c-format +#: src/goabackend/goafacebookprovider.c:202 +#: src/goabackend/goafacebookprovider.c:213 +#: src/goabackend/goafacebookprovider.c:219 +#: src/goabackend/goaflickrprovider.c:174 +#: src/goabackend/goaflickrprovider.c:185 +#: src/goabackend/goaflickrprovider.c:196 +#: src/goabackend/goaflickrprovider.c:205 +#: src/goabackend/goaflickrprovider.c:218 +#: src/goabackend/goafoursquareprovider.c:173 +#: src/goabackend/goafoursquareprovider.c:184 +#: src/goabackend/goafoursquareprovider.c:195 +#: src/goabackend/goafoursquareprovider.c:206 +#: src/goabackend/goafoursquareprovider.c:215 +#: src/goabackend/goafoursquareprovider.c:228 +#: src/goabackend/goagoogleprovider.c:202 +#: src/goabackend/goagoogleprovider.c:213 +#: src/goabackend/goalastfmprovider.c:212 +#: src/goabackend/goalastfmprovider.c:221 +#: src/goabackend/goalastfmprovider.c:230 +#: src/goabackend/goalastfmprovider.c:238 +#: src/goabackend/goalastfmprovider.c:244 +#: src/goabackend/goalastfmprovider.c:512 +#: src/goabackend/goalastfmprovider.c:521 +#: src/goabackend/goalastfmprovider.c:538 +#: src/goabackend/goalastfmprovider.c:544 +#: src/goabackend/goaoauth2provider.c:656 +#: src/goabackend/goaoauth2provider.c:686 +#: src/goabackend/goaoauth2provider.c:697 src/goabackend/goautils.c:273 +#: src/goabackend/goawindowsliveprovider.c:178 +#: src/goabackend/goawindowsliveprovider.c:189 +#: src/goabackend/goawindowsliveprovider.c:198 +#: src/goabackend/goawindowsliveprovider.c:211 msgid "Could not parse response" msgstr "応答を解析できませんでした" -#: ../src/goabackend/goaflickrprovider.c:78 +#: src/goabackend/goaflickrprovider.c:56 msgid "Flickr" msgstr "Flickr" -#: ../src/goabackend/goaflickrprovider.c:322 +#: src/goabackend/goaflickrprovider.c:271 msgid "Your system time is invalid. Check your date and time settings." msgstr "" "お使いのシステムの時刻が正しくありません。日付と時刻の設定を確認してくださ" "い。" -#: ../src/goabackend/goafoursquareprovider.c:78 +#: src/goabackend/goafoursquareprovider.c:57 msgid "Foursquare" msgstr "Foursquare" -#: ../src/goabackend/goagoogleprovider.c:77 +#: src/goabackend/goagoogleprovider.c:56 msgid "Google" msgstr "Google" #. TODO: more specific -#: ../src/goabackend/goaimapauthlogin.c:94 ../src/goabackend/goasmtpauth.c:160 -#, c-format +#: src/goabackend/goaimapauthlogin.c:84 src/goabackend/goasmtpauth.c:155 msgid "Service not available" msgstr "サービスは利用できません" #. TODO: more specific -#: ../src/goabackend/goaimapauthlogin.c:115 -#: ../src/goabackend/goalastfmprovider.c:520 -#: ../src/goabackend/goasmtpauth.c:113 ../src/goabackend/goautils.c:584 -#, c-format +#: src/goabackend/goaimapauthlogin.c:104 src/goabackend/goalastfmprovider.c:529 +#: src/goabackend/goasmtpauth.c:108 src/goabackend/goautils.c:838 msgid "Authentication failed" msgstr "認証失敗" -#: ../src/goabackend/goaimapauthlogin.c:140 -#, c-format +#: src/goabackend/goaimapauthlogin.c:129 msgid "Server does not support PLAIN" msgstr "サーバーが PLAIN をサポートしていません" -#: ../src/goabackend/goaimapauthlogin.c:194 ../src/goabackend/goasmtpauth.c:818 -#, c-format +#: src/goabackend/goaimapauthlogin.c:181 src/goabackend/goasmtpauth.c:606 msgid "Server does not support STARTTLS" msgstr "サーバーが STARTTLS をサポートしていません" -#: ../src/goabackend/goaimapsmtpprovider.c:61 +#: src/goabackend/goaimapsmtpprovider.c:53 msgid "IMAP and SMTP" msgstr "IMAP と SMTP" @@ -302,11 +299,11 @@ #. * username (eg., rishi), and the (%s, %d) #. * is the error domain and code. #. -#: ../src/goabackend/goaimapsmtpprovider.c:364 -#: ../src/goabackend/goaimapsmtpprovider.c:415 +#: src/goabackend/goaimapsmtpprovider.c:327 +#: src/goabackend/goaimapsmtpprovider.c:378 #, c-format -msgid "Invalid %s with username ‘%s’ (%s, %d): " -msgstr "ユーザー名‘%2$s’の %1$s が不正です (%3$s, %4$d): " +msgid "Invalid %s with username “%s” (%s, %d): " +msgstr "ユーザー名“%2$s”の %1$s が不正です (%3$s, %4$d): " #. Translators: the following four strings are used to show a #. * combo box similar to the one in the evolution module. @@ -314,136 +311,129 @@ #. * STARTTLS after connecting #. * SSL on a dedicated port #. -#: ../src/goabackend/goaimapsmtpprovider.c:603 +#: src/goabackend/goaimapsmtpprovider.c:564 msgid "_Encryption" msgstr "暗号化(_E)" -#: ../src/goabackend/goaimapsmtpprovider.c:606 +#: src/goabackend/goaimapsmtpprovider.c:567 msgid "None" msgstr "なし" -#: ../src/goabackend/goaimapsmtpprovider.c:609 +#: src/goabackend/goaimapsmtpprovider.c:570 msgid "STARTTLS after connecting" msgstr "接続後に STARTTLS" -#: ../src/goabackend/goaimapsmtpprovider.c:612 +#: src/goabackend/goaimapsmtpprovider.c:573 msgid "SSL on a dedicated port" msgstr "専用のポートで SSL" -#: ../src/goabackend/goaimapsmtpprovider.c:687 +#: src/goabackend/goaimapsmtpprovider.c:648 msgid "_Name" msgstr "名前(_N)" -#: ../src/goabackend/goaimapsmtpprovider.c:704 +#: src/goabackend/goaimapsmtpprovider.c:665 msgid "IMAP _Server" msgstr "IMAP サーバー(_S)" -#: ../src/goabackend/goaimapsmtpprovider.c:724 +#: src/goabackend/goaimapsmtpprovider.c:685 msgid "SMTP _Server" msgstr "SMTP サーバー(_S)" -#: ../src/goabackend/goaimapsmtpprovider.c:739 -#: ../src/goabackend/goaimapsmtpprovider.c:1020 -#: ../src/goabackend/goaimapsmtpprovider.c:1355 +#: src/goabackend/goaimapsmtpprovider.c:700 +#: src/goabackend/goaimapsmtpprovider.c:972 +#: src/goabackend/goaimapsmtpprovider.c:1305 msgid "_Forward" msgstr "次へ(_F)" -#: ../src/goabackend/goaimapsmtpprovider.c:1004 -#: ../src/goabackend/goaimapsmtpprovider.c:1338 +#: src/goabackend/goaimapsmtpprovider.c:956 +#: src/goabackend/goaimapsmtpprovider.c:1288 msgid "Error connecting to IMAP server" msgstr "IMAP サーバーへの接続に失敗しました" -#: ../src/goabackend/goaimapsmtpprovider.c:1097 -#: ../src/goabackend/goaimapsmtpprovider.c:1412 +#: src/goabackend/goaimapsmtpprovider.c:1053 +#: src/goabackend/goaimapsmtpprovider.c:1365 msgid "Error connecting to SMTP server" msgstr "SMTP サーバーへの接続に失敗しました" -#: ../src/goabackend/goaimapsmtpprovider.c:1510 +#: src/goabackend/goaimapsmtpprovider.c:1476 msgid "E-mail" msgstr "メール" -#: ../src/goabackend/goaimapsmtpprovider.c:1514 +#: src/goabackend/goaimapsmtpprovider.c:1480 msgid "Name" msgstr "名前" -#: ../src/goabackend/goaimapsmtpprovider.c:1524 -#: ../src/goabackend/goaimapsmtpprovider.c:1528 +#: src/goabackend/goaimapsmtpprovider.c:1490 +#: src/goabackend/goaimapsmtpprovider.c:1494 msgid "IMAP" msgstr "IMAP" -#: ../src/goabackend/goaimapsmtpprovider.c:1539 -#: ../src/goabackend/goaimapsmtpprovider.c:1543 +#: src/goabackend/goaimapsmtpprovider.c:1505 +#: src/goabackend/goaimapsmtpprovider.c:1509 msgid "SMTP" msgstr "SMTP" -#: ../src/goabackend/goakerberosprovider.c:99 +#: src/goabackend/goakerberosprovider.c:100 msgid "Enterprise Login (Kerberos)" msgstr "企業向けログイン (Kerberos)" -#: ../src/goabackend/goakerberosprovider.c:293 -#, c-format +#: src/goabackend/goakerberosprovider.c:220 msgid "Ticketing is disabled for account" msgstr "このアカウントのチケッティングは無効化されています" -#: ../src/goabackend/goakerberosprovider.c:318 +#: src/goabackend/goakerberosprovider.c:245 #, c-format -msgid "Could not find saved credentials for principal ‘%s’ in keyring" -msgstr "キーリングにユーザー‘%s’用に保存した証明書が見つかりませんでした" +msgid "Could not find saved credentials for principal “%s” in keyring" +msgstr "キーリングにユーザー“%s”用に保存した証明書が見つかりませんでした" -#: ../src/goabackend/goakerberosprovider.c:331 +#: src/goabackend/goakerberosprovider.c:258 #, c-format -msgid "Did not find password for principal ‘%s’ in credentials" -msgstr "証明書の中にユーザー‘%s’のパスワードが見つかりませんでした" +msgid "Did not find password for principal “%s” in credentials" +msgstr "証明書の中にユーザー“%s”のパスワードが見つかりませんでした" -#: ../src/goabackend/goakerberosprovider.c:726 -msgid "_Domain" -msgstr "ドメイン(_D)" +#: src/goabackend/goakerberosprovider.c:558 +msgid "_Principal" +msgstr "" -#: ../src/goabackend/goakerberosprovider.c:727 -msgid "Enterprise domain or realm name" -msgstr "企業ドメイン名またはレルム名" +#: src/goabackend/goakerberosprovider.c:744 +msgid "Operation was cancelled" +msgstr "" -#: ../src/goabackend/goakerberosprovider.c:963 -#: ../src/goaidentity/goaidentityservice.c:1126 +#: src/goabackend/goakerberosprovider.c:794 +#: src/goaidentity/goaidentityservice.c:1069 msgid "Log In to Realm" msgstr "レルムへのログイン" -#: ../src/goabackend/goakerberosprovider.c:964 +#: src/goabackend/goakerberosprovider.c:795 msgid "Please enter your password below." msgstr "以下にパスワードを入力してください。" -#: ../src/goabackend/goakerberosprovider.c:965 +#: src/goabackend/goakerberosprovider.c:796 msgid "Remember this password" msgstr "このパスワードを記憶する" -#: ../src/goabackend/goakerberosprovider.c:1107 -#, c-format -msgid "The domain is not valid" -msgstr "ドメインが正しくありません" - -#: ../src/goabackend/goakerberosprovider.c:1257 +#: src/goabackend/goakerberosprovider.c:976 msgid "Error connecting to enterprise identity server" msgstr "企業アイデンティティサーバーへの接続中にエラーが発生しました" -#: ../src/goabackend/goakerberosprovider.c:1522 -#, c-format +#: src/goabackend/goakerberosprovider.c:1315 msgid "Identity service returned invalid key" msgstr "アイデンティティサーバーより無効なキーが返されました" -#: ../src/goabackend/goalastfmprovider.c:64 +#: src/goabackend/goalastfmprovider.c:65 msgid "Last.fm" msgstr "Last.fm" -#: ../src/goabackend/goalastfmprovider.c:688 -#: ../src/goabackend/goalastfmprovider.c:836 +#: src/goabackend/goalastfmprovider.c:700 +#: src/goabackend/goalastfmprovider.c:850 msgid "Error connecting to Last.fm" msgstr "Last.fm への接続に失敗しました" -#: ../src/goabackend/goamediaserverprovider.c:77 +#: src/goabackend/goamediaserverprovider.c:63 msgid "Media Server" msgstr "メディアサーバー" -#: ../src/goabackend/goamediaserverprovider.c:355 +#: src/goabackend/goamediaserverprovider.c:316 msgid "" "Personal content can be added to your applications through a media server " "account." @@ -451,17 +441,16 @@ "メディアサーバーのアカウントを通じて個人のコンテンツをお使いのアプリケーショ" "ンに追加できます。" -#: ../src/goabackend/goamediaserverprovider.c:369 +#: src/goabackend/goamediaserverprovider.c:329 msgid "Available Media Servers" msgstr "利用できるメディアサーバー" -#: ../src/goabackend/goamediaserverprovider.c:399 +#: src/goabackend/goamediaserverprovider.c:360 msgid "No media servers found" msgstr "メディアサーバーが見つかりませんでした" #. Translators: the %d is a HTTP status code and the %s is a textual description of it -#: ../src/goabackend/goaoauth2provider.c:675 -#: ../src/goabackend/goaoauthprovider.c:559 +#: src/goabackend/goaoauth2provider.c:632 src/goabackend/goaoauthprovider.c:542 #, c-format msgid "" "Expected status 200 when requesting access token, instead got status %d (%s)" @@ -469,55 +458,53 @@ "token を要求した時に返されるステータスは 200 を期待していましたが、代わりに受" "け取ったステータスは %d (%s) でした" -#: ../src/goabackend/goaoauth2provider.c:841 +#: src/goabackend/goaoauth2provider.c:814 msgid "Authorization response: " msgstr "認証の応答:" -#: ../src/goabackend/goaoauth2provider.c:911 +#: src/goabackend/goaoauth2provider.c:884 #, c-format msgid "Authorization response: %s" msgstr "認証の応答: %s" -#: ../src/goabackend/goaoauth2provider.c:1059 -#: ../src/goabackend/goaoauthprovider.c:893 +#: src/goabackend/goaoauth2provider.c:1021 +#: src/goabackend/goaoauthprovider.c:890 msgid "Error getting an Access Token: " msgstr "アクセス用トークンの取得エラー: " -#: ../src/goabackend/goaoauth2provider.c:1074 -#: ../src/goabackend/goaoauthprovider.c:906 +#: src/goabackend/goaoauth2provider.c:1036 +#: src/goabackend/goaoauthprovider.c:903 msgid "Error getting identity: " msgstr "識別情報の取得中にエラー発生: " -#: ../src/goabackend/goaoauth2provider.c:1291 -#: ../src/goabackend/goaoauthprovider.c:1210 +#: src/goabackend/goaoauth2provider.c:1254 +#: src/goabackend/goaoauthprovider.c:1192 #, c-format msgid "Was asked to log in as %s, but logged in as %s" msgstr "%s でログインしたものの最終的に %s でのログインになりました" -#: ../src/goabackend/goaoauth2provider.c:1453 -#, c-format +#: src/goabackend/goaoauth2provider.c:1406 msgid "Credentials do not contain access_token" msgstr "証明書に access_token が含まれていません" -#: ../src/goabackend/goaoauth2provider.c:1492 -#: ../src/goabackend/goaoauthprovider.c:1438 +#: src/goabackend/goaoauth2provider.c:1445 +#: src/goabackend/goaoauthprovider.c:1407 #, c-format msgid "Failed to refresh access token (%s, %d): " msgstr "アクセス用トークン (%s, %d) の更新エラー: " -#: ../src/goabackend/goaoauthprovider.c:582 -#, c-format +#: src/goabackend/goaoauthprovider.c:565 msgid "Missing access_token or access_token_secret headers in response" msgstr "" "受信した応答の中に access_token または access_token_secret のヘッダーがありま" "せん" -#: ../src/goabackend/goaoauthprovider.c:774 +#: src/goabackend/goaoauthprovider.c:773 msgid "Error getting a Request Token: " msgstr "リクエスト用トークンの取得エラー: " #. Translators: the %d is a HTTP status code and the %s is a textual description of it -#: ../src/goabackend/goaoauthprovider.c:807 +#: src/goabackend/goaoauthprovider.c:804 #, c-format msgid "" "Expected status 200 for getting a Request Token, instead got status %d (%s)" @@ -525,362 +512,370 @@ "リクエスト用トークンの取得で 200 のステータスを期待していましたが、代わりに受" "け取ったのは %d (%s) でした" -#: ../src/goabackend/goaoauthprovider.c:824 -#, c-format +#: src/goabackend/goaoauthprovider.c:821 msgid "Missing request_token or request_token_secret headers in response" msgstr "" "受信した応答の中に request_token または request_token_secret のヘッダーがあり" "ません" -#: ../src/goabackend/goaoauthprovider.c:1394 -#, c-format +#: src/goabackend/goaoauthprovider.c:1363 msgid "Credentials do not contain access_token or access_token_secret" msgstr "証明書に access_token や access_token_secret が含まれていません" -#: ../src/goabackend/goaowncloudprovider.c:68 -msgid "ownCloud" -msgstr "ownCloud" +#: src/goabackend/goaowncloudprovider.c:60 +msgid "Nextcloud" +msgstr "Nextcloud" -#: ../src/goabackend/goaowncloudprovider.c:761 -#: ../src/goabackend/goaowncloudprovider.c:943 +#: src/goabackend/goaowncloudprovider.c:731 +#: src/goabackend/goaowncloudprovider.c:922 msgid "Error connecting to ownCloud server" msgstr "ownCloud サーバーへの接続に失敗しました" -#: ../src/goabackend/goapocketprovider.c:70 +#: src/goabackend/goapocketprovider.c:74 msgid "Pocket" msgstr "Pocket" #. TODO: more specific -#: ../src/goabackend/goapocketprovider.c:219 -#, c-format +#: src/goabackend/goapocketprovider.c:249 msgid "No username or access_token" msgstr "ユーザー名かアクセストークンがありません(_T)" -#: ../src/goabackend/goaprovider.c:479 +#: src/goabackend/goaprovider.c:109 msgid "_Mail" msgstr "メール(_M)" -#: ../src/goabackend/goaprovider.c:484 +#: src/goabackend/goaprovider.c:114 msgid "Cale_ndar" msgstr "カレンダー(_N)" -#: ../src/goabackend/goaprovider.c:489 +#: src/goabackend/goaprovider.c:119 msgid "_Contacts" msgstr "連絡先(_C)" -#: ../src/goabackend/goaprovider.c:494 +#: src/goabackend/goaprovider.c:124 msgid "C_hat" msgstr "チャット(_H)" -#: ../src/goabackend/goaprovider.c:499 +#: src/goabackend/goaprovider.c:129 msgid "_Documents" msgstr "ドキュメント(_D)" -#: ../src/goabackend/goaprovider.c:504 +#: src/goabackend/goaprovider.c:134 msgid "M_usic" msgstr "音楽(_U)" -#: ../src/goabackend/goaprovider.c:509 +#: src/goabackend/goaprovider.c:139 msgid "_Photos" msgstr "写真(_P)" -#: ../src/goabackend/goaprovider.c:514 +#: src/goabackend/goaprovider.c:144 msgid "_Files" msgstr "ファイル(_F)" -#: ../src/goabackend/goaprovider.c:519 +#: src/goabackend/goaprovider.c:149 msgid "Network _Resources" msgstr "ネットワークリソース(_R)" -#: ../src/goabackend/goaprovider.c:524 +#: src/goabackend/goaprovider.c:154 msgid "_Read Later" msgstr "あとで読む(_R)" -#: ../src/goabackend/goaprovider.c:529 +#: src/goabackend/goaprovider.c:159 msgid "Prin_ters" msgstr "プリンター(_T)" -#: ../src/goabackend/goaprovider.c:534 +#: src/goabackend/goaprovider.c:164 msgid "_Maps" msgstr "地図(_M)" +#: src/goabackend/goaprovider.c:169 +msgid "T_o Do" +msgstr "To Do(_O)" + #. Translators: This is a label for a series of #. * options switches. For example: “Use for Mail”. -#: ../src/goabackend/goaprovider.c:563 +#: src/goabackend/goaprovider.c:567 msgid "Use for" msgstr "用途" -#: ../src/goabackend/goaprovider.c:802 +#: src/goabackend/goaprovider.c:822 +msgid "Account is disabled" +msgstr "" + +#: src/goabackend/goaprovider.c:835 +msgid "Unknown error" +msgstr "" + +#: src/goabackend/goaprovider.c:854 #, c-format msgid "ensure_credentials_sync is not implemented on type %s" msgstr "%s では ensure_credentials_sync は未だ利用できません" #. TODO: more specific -#: ../src/goabackend/goasmtpauth.c:175 -#, c-format +#: src/goabackend/goasmtpauth.c:170 msgid "TLS not available" msgstr "TLS が利用できません" -#. TODO: more specific -#: ../src/goabackend/goasmtpauth.c:242 -#, c-format -msgid "org.gnome.OnlineAccounts.Mail is not available" -msgstr "org.gnome.OnlineAccounts.Mail が利用できません" - -#. TODO: more specific -#: ../src/goabackend/goasmtpauth.c:252 -#, c-format -msgid "Failed to parse email address" -msgstr "メールアドレスの解析に失敗しました" - -#. TODO: more specific -#: ../src/goabackend/goasmtpauth.c:261 -#, c-format -msgid "Cannot do SMTP authentication without a domain" -msgstr "ドメインなしで SMTP 認証はできません" - -#. TODO: more specific -#: ../src/goabackend/goasmtpauth.c:301 -#, c-format -msgid "Did not find smtp-password in credentials" -msgstr "資格情報に SMTP パスワードが見つかりませんでした" - -#. TODO: more specific -#: ../src/goabackend/goasmtpauth.c:312 -#, c-format -msgid "Cannot do SMTP authentication without a password" -msgstr "パスワードなしで SMTP 認証はできません" - -#: ../src/goabackend/goasmtpauth.c:674 -#, c-format +#: src/goabackend/goasmtpauth.c:476 msgid "Unknown authentication mechanism" msgstr "不明な認証メカニズム" -#: ../src/goabackend/goatelepathyprovider.c:181 -#, c-format -msgid "Telepathy chat account not found" -msgstr "Telepathy チャットアカウントが見つかりませんでした" - -#: ../src/goabackend/goatelepathyprovider.c:381 -#, c-format -msgid "Failed to initialize a GOA client" -msgstr "GOA クライアントの初期化に失敗しました" - -#: ../src/goabackend/goatelepathyprovider.c:421 -#, c-format -msgid "Failed to create a user interface for %s" -msgstr "%s のユーザーインターフェース作成に失敗しました" - -#: ../src/goabackend/goatelepathyprovider.c:536 -msgid "Connection Settings" -msgstr "接続設定" - -#: ../src/goabackend/goatelepathyprovider.c:645 -msgid "Personal Details" -msgstr "個人情報" - -#: ../src/goabackend/goatelepathyprovider.c:651 -msgid "_OK" -msgstr "_OK" - -#: ../src/goabackend/goatelepathyprovider.c:839 -msgid "Cannot save the connection parameters" -msgstr "接続パラメーターを保存できません" +#: src/goabackend/goautils.c:92 +msgid "Error logging into the account" +msgstr "" -#: ../src/goabackend/goatelepathyprovider.c:852 -msgid "Cannot save your personal information on the server" -msgstr "個人情報をサーバーに保存できません" +#: src/goabackend/goautils.c:136 +#, fuzzy +#| msgid "The certificate has expired." +msgid "Credentials have expired" +msgstr "証明書の有効期限が切れています。" -#. Connection Settings button -#: ../src/goabackend/goatelepathyprovider.c:878 -msgid "_Connection Settings" -msgstr "接続設定(_C)" +#: src/goabackend/goautils.c:140 +msgid "Sign in to enable this account." +msgstr "" -#. Edit Personal Information button -#: ../src/goabackend/goatelepathyprovider.c:882 -msgid "_Personal Details" -msgstr "個人情報(_P)" +#: src/goabackend/goautils.c:144 +msgid "_Sign In" +msgstr "サインイン(_S)" -#: ../src/goabackend/goautils.c:120 +#: src/goabackend/goautils.c:240 #, c-format msgid "A %s account already exists for %s" msgstr "%s アカウントは、すでに %s に使用されています。" -#. Translators: the %s is the name of the provider. eg., Google. -#: ../src/goabackend/goautils.c:170 +#. Translators: this is the title of the "Add Account" and "Refresh +#. * Account" dialogs. The %s is the name of the provider. eg., +#. * 'Google'. +#. +#: src/goabackend/goautils.c:293 #, c-format -msgid "%s account" +msgid "%s Account" msgstr "%s アカウント" #. TODO: more specific -#: ../src/goabackend/goautils.c:214 +#: src/goabackend/goautils.c:347 msgid "Failed to delete credentials from the keyring" msgstr "キーリングから証明書の削除に失敗しました" #. TODO: more specific -#: ../src/goabackend/goautils.c:266 +#: src/goabackend/goautils.c:395 msgid "Failed to retrieve credentials from the keyring" msgstr "キーリングから証明書の取得に失敗しました" #. TODO: more specific -#: ../src/goabackend/goautils.c:276 +#: src/goabackend/goautils.c:405 msgid "No credentials found in the keyring" msgstr "キーリングに証明書が見つかりませんでした" -#: ../src/goabackend/goautils.c:289 +#: src/goabackend/goautils.c:418 msgid "Error parsing result obtained from the keyring: " msgstr "キーリングから取得した結果の解析に失敗しました: " #. Translators: The %s is the type of the provider, e.g. 'google' or 'yahoo' -#: ../src/goabackend/goautils.c:332 +#: src/goabackend/goautils.c:459 #, c-format msgid "GOA %s credentials for identity %s" msgstr "GOA の %s は %s を正しく認識しました" #. TODO: more specific -#: ../src/goabackend/goautils.c:349 +#: src/goabackend/goautils.c:476 msgid "Failed to store credentials in the keyring" msgstr "キーリングへの証明書の保存に失敗しました" -#: ../src/goabackend/goautils.c:571 +#: src/goabackend/goautils.c:825 msgid "Cannot resolve hostname" msgstr "ホスト名を解決できませんでした" -#: ../src/goabackend/goautils.c:575 +#: src/goabackend/goautils.c:829 msgid "Cannot resolve proxy hostname" msgstr "プロキシのホスト名を解決できませんでした" -#: ../src/goabackend/goautils.c:580 +#: src/goabackend/goautils.c:834 msgid "Cannot find WebDAV endpoint" msgstr "WebDAV エンドポイントが見つかりませんでした" -#: ../src/goabackend/goautils.c:589 +#: src/goabackend/goautils.c:843 #, c-format msgid "Code: %u — Unexpected response from server" msgstr "コード: %u — サーバーからの予期しない応答" -#: ../src/goabackend/goautils.c:605 +#: src/goabackend/goautils.c:859 msgid "The signing certificate authority is not known." msgstr "署名している認証局が未知です。" -#: ../src/goabackend/goautils.c:609 +#: src/goabackend/goautils.c:863 msgid "" "The certificate does not match the expected identity of the site that it was " "retrieved from." msgstr "証明書が予期した取得サイトの識別情報と一致しません。" -#: ../src/goabackend/goautils.c:614 +#: src/goabackend/goautils.c:868 msgid "The certificate’s activation time is still in the future." msgstr "証明書の発効時刻が未来になっています。" -#: ../src/goabackend/goautils.c:618 +#: src/goabackend/goautils.c:872 msgid "The certificate has expired." msgstr "証明書の有効期限が切れています。" -#: ../src/goabackend/goautils.c:622 +#: src/goabackend/goautils.c:876 msgid "The certificate has been revoked." msgstr "証明書が失効しています。" -#: ../src/goabackend/goautils.c:626 +#: src/goabackend/goautils.c:880 msgid "The certificate’s algorithm is considered insecure." msgstr "証明書のアルゴリズムは安全ではないものと見なされています。" -#: ../src/goabackend/goautils.c:630 +#: src/goabackend/goautils.c:886 msgid "Invalid certificate." msgstr "不正な証明書です。" #. TODO: more specific -#: ../src/goabackend/goautils.c:665 +#: src/goabackend/goautils.c:921 #, c-format -msgid "Did not find %s with identity ‘%s’ in credentials" -msgstr "資格情報に識別子‘%2$s’の %1$s が見つかりませんでした。" +msgid "Did not find %s with identity “%s” in credentials" +msgstr "資格情報に識別子“%2$s”の %1$s が見つかりませんでした。" #. translators: %s here is the address of the web page -#: ../src/goabackend/goawebview.c:95 +#: src/goabackend/goawebview.c:94 #, c-format msgid "Loading “%s”…" msgstr "“%s”をロード中…" -#: ../src/goabackend/goawindowsliveprovider.c:78 -msgid "Microsoft Account" -msgstr "Microsoft アカウント" +#: src/goabackend/goawindowsliveprovider.c:56 +msgid "Microsoft" +msgstr "Microsoft" -#: ../src/goaidentity/goaidentityservice.c:378 -msgid "initial secret passed before secret key exchange" -msgstr "" -"シークレットキーの交換が行われる前に初期設定のシークレットが渡されました" - -#: ../src/goaidentity/goaidentityservice.c:574 +#: src/goaidentity/goaidentityservice.c:568 msgid "Initial secret key is invalid" msgstr "初期設定のシークレットキーが無効です" -#: ../src/goaidentity/goaidentityservice.c:1131 +#: src/goaidentity/goaidentityservice.c:1074 #, c-format msgid "The network realm %s needs some information to sign you in." msgstr "" "ネットワークレルム %s にサインインを行うには、 何らかの情報を与える必要があり" "ます。" -#: ../src/goaidentity/goakerberosidentity.c:276 -#: ../src/goaidentity/goakerberosidentity.c:285 -#: ../src/goaidentity/goakerberosidentity.c:713 -msgid "Could not find identity in credential cache: %k" -msgstr "証明書キャッシュに識別情報が見つかりませんでした: %k" - -#: ../src/goaidentity/goakerberosidentity.c:727 -msgid "Could not find identity credentials in cache: %k" -msgstr "キャッシュに識別情報の証明書が見つかりませんでした: %k" - -#: ../src/goaidentity/goakerberosidentity.c:779 -msgid "Could not sift through identity credentials in cache: %k" -msgstr "キャッシュにある識別情報の証明書の選別ができませんでした: %k" - -#: ../src/goaidentity/goakerberosidentity.c:797 -msgid "Could not finish up sifting through identity credentials in cache: %k" -msgstr "キャッシュにある識別情報の証明書の選別を終了できませんでした: %k" +#: src/goaidentity/goakerberosidentity.c:275 +#: src/goaidentity/goakerberosidentity.c:283 +#: src/goaidentity/goakerberosidentity.c:707 +msgid "Could not find identity in credential cache: " +msgstr "証明書キャッシュに識別情報が見つかりませんでした: " + +#: src/goaidentity/goakerberosidentity.c:720 +msgid "Could not find identity credentials in cache: " +msgstr "キャッシュに識別情報の証明書が見つかりませんでした: " + +#: src/goaidentity/goakerberosidentity.c:771 +msgid "Could not sift through identity credentials in cache: " +msgstr "キャッシュにある識別情報の証明書の選別ができませんでした: " + +#: src/goaidentity/goakerberosidentity.c:788 +msgid "Could not finish up sifting through identity credentials in cache: " +msgstr "キャッシュにある識別情報の証明書の選別を終了できませんでした: " -#: ../src/goaidentity/goakerberosidentity.c:1111 -#, c-format +#: src/goaidentity/goakerberosidentity.c:1103 msgid "No associated identification found" msgstr "関連のある ID が見つかりませんでした" -#: ../src/goaidentity/goakerberosidentity.c:1194 -msgid "Could not create credential cache: %k" -msgstr "証明書キャッシュを作成できませんでした: %k" - -#: ../src/goaidentity/goakerberosidentity.c:1228 -msgid "Could not initialize credentials cache: %k" -msgstr "証明書用キャッシュを初期化できませんでした: %k" - -#: ../src/goaidentity/goakerberosidentity.c:1245 -msgid "Could not store new credentials in credentials cache: %k" -msgstr "証明書用キャッシュに新しい証明書を保存できませんでした: %k" +#: src/goaidentity/goakerberosidentity.c:1186 +msgid "Could not create credential cache: " +msgstr "証明書キャッシュを作成できませんでした: " + +#: src/goaidentity/goakerberosidentity.c:1220 +msgid "Could not initialize credentials cache: " +msgstr "証明書用キャッシュを初期化できませんでした: " + +#: src/goaidentity/goakerberosidentity.c:1236 +msgid "Could not store new credentials in credentials cache: " +msgstr "証明書用キャッシュに新しい証明書を保存できませんでした: " -#: ../src/goaidentity/goakerberosidentity.c:1540 -#, c-format +#: src/goaidentity/goakerberosidentity.c:1534 msgid "Could not renew identity: Not signed in" msgstr "識別情報を更新できませんでした: サインインしていません" -#: ../src/goaidentity/goakerberosidentity.c:1552 -msgid "Could not renew identity: %k" -msgstr "識別情報を更新できませんでした: %k" - -#: ../src/goaidentity/goakerberosidentity.c:1569 -msgid "Could not get new credentials to renew identity %s: %k" -msgstr "識別情報 %s の更新に必要な新しい証明書が取得できませんでした: %k" - -#: ../src/goaidentity/goakerberosidentity.c:1611 -msgid "Could not erase identity: %k" -msgstr "識別情報の消去ができませんでした: %k" +#: src/goaidentity/goakerberosidentity.c:1546 +msgid "Could not renew identity: " +msgstr "識別情報を更新できませんでした: " + +#: src/goaidentity/goakerberosidentity.c:1562 +#, c-format +msgid "Could not get new credentials to renew identity %s: " +msgstr "識別情報 %s の更新に必要な新しい証明書が取得できませんでした: " -#: ../src/goaidentity/goakerberosidentitymanager.c:749 +#: src/goaidentity/goakerberosidentity.c:1604 +msgid "Could not erase identity: " +msgstr "識別情報の消去ができませんでした: " + +#: src/goaidentity/goakerberosidentitymanager.c:749 msgid "Could not find identity" msgstr "識別情報が見つかりませんでした" -#: ../src/goaidentity/goakerberosidentitymanager.c:840 +#: src/goaidentity/goakerberosidentitymanager.c:845 msgid "Could not create credential cache for identity" msgstr "識別情報用の証明書キャッシュを作成できませんでした" +#~ msgid "_Domain" +#~ msgstr "ドメイン(_D)" + +#~ msgid "Enterprise domain or realm name" +#~ msgstr "企業ドメイン名またはレルム名" + +#~ msgid "The domain is not valid" +#~ msgstr "ドメインが正しくありません" + +#~ msgid "ownCloud" +#~ msgstr "ownCloud" + +#~ msgid "org.gnome.OnlineAccounts.Mail is not available" +#~ msgstr "org.gnome.OnlineAccounts.Mail が利用できません" + +#~ msgid "Failed to parse email address" +#~ msgstr "メールアドレスの解析に失敗しました" + +#~ msgid "Cannot do SMTP authentication without a domain" +#~ msgstr "ドメインなしで SMTP 認証はできません" + +#~ msgid "Did not find smtp-password in credentials" +#~ msgstr "資格情報に SMTP パスワードが見つかりませんでした" + +#~ msgid "Cannot do SMTP authentication without a password" +#~ msgstr "パスワードなしで SMTP 認証はできません" + +#~ msgid "Telepathy chat account not found" +#~ msgstr "Telepathy チャットアカウントが見つかりませんでした" + +#~ msgid "Failed to initialize a GOA client" +#~ msgstr "GOA クライアントの初期化に失敗しました" + +#~ msgid "Failed to create a user interface for %s" +#~ msgstr "%s のユーザーインターフェース作成に失敗しました" + +#~ msgid "Connection Settings" +#~ msgstr "接続設定" + +#~ msgid "Personal Details" +#~ msgstr "個人情報" + +#~ msgid "_OK" +#~ msgstr "_OK" + +#~ msgid "Cannot save the connection parameters" +#~ msgstr "接続パラメーターを保存できません" + +#~ msgid "Cannot save your personal information on the server" +#~ msgstr "個人情報をサーバーに保存できません" + +#~ msgid "_Connection Settings" +#~ msgstr "接続設定(_C)" + +#~ msgid "_Personal Details" +#~ msgstr "個人情報(_P)" + +#~ msgid "initial secret passed before secret key exchange" +#~ msgstr "" +#~ "シークレットキーの交換が行われる前に初期設定のシークレットが渡されました" + #~ msgid "Did not find password with identity ‘%s’ in credentials" #~ msgstr "資格情報に識別子‘%s’のパスワードが見つかりませんでした。" Binary files /tmp/tmpOF9Z7O/tiVsTCcCtl/gnome-online-accounts-3.30.1/po/kab.gmo and /tmp/tmpOF9Z7O/8j3UbjNw9P/gnome-online-accounts-3.31.90/po/kab.gmo differ diff -Nru gnome-online-accounts-3.30.1/po/kab.po gnome-online-accounts-3.31.90/po/kab.po --- gnome-online-accounts-3.30.1/po/kab.po 1970-01-01 00:00:00.000000000 +0000 +++ gnome-online-accounts-3.31.90/po/kab.po 2019-01-17 11:54:47.000000000 +0000 @@ -0,0 +1,797 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-online-accounts/" +"issues\n" +"POT-Creation-Date: 2018-12-12 15:40+0000\n" +"PO-Revision-Date: 2018-12-16 20:43+0100\n" +"Language: kab\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Last-Translator: \n" +"Language-Team: \n" +"X-Generator: Poedit 2.2\n" + +#: data/org.gnome.online-accounts.gschema.xml:6 +msgid "List of providers that are allowed to be loaded" +msgstr "Tabdart n imefkiyen i yettusirgen ad ttuɛebbin" + +#: data/org.gnome.online-accounts.gschema.xml:7 +msgid "" +"A list of strings representing the providers that are allowed to be loaded " +"(default: 'all'). This is only evaluated on startup." +msgstr "" + +#. TODO: more specific +#: src/daemon/goadaemon.c:1131 src/daemon/goadaemon.c:1415 +#, c-format +msgid "Failed to find a provider for: %s" +msgstr "D awezɣi tifin n imefki i : %s" + +#: src/daemon/goadaemon.c:1358 +msgid "IsLocked property is set for account" +msgstr "Ayla IsLocked yettuseɣwer i wemiḍan-agi" + +#. TODO: more specific +#: src/daemon/goadaemon.c:1403 +msgid "ProviderType property is not set for account" +msgstr "Ayla ProviderType ur yettuseɣwer ara i wemiḍan-agi" + +#. TODO: more specific +#: src/goabackend/goaewsclient.c:258 +msgid "Failed to parse autodiscover response XML" +msgstr "Anezri n tesleḍt n tririt XML autodiscover" + +#. TODO: more specific +#. Translators: the parameter is an XML element name. +#: src/goabackend/goaewsclient.c:269 src/goabackend/goaewsclient.c:284 +#: src/goabackend/goaewsclient.c:299 +#, c-format +msgid "Failed to find “%s” element" +msgstr "D awezɣi tifin n uferdis “%s”" + +#. TODO: more specific +#: src/goabackend/goaewsclient.c:320 +msgid "Failed to find ASUrl and OABUrl in autodiscover response" +msgstr "D awezɣi tifin n ASUrl akked OABUrl di tririt n autodiscover" + +#: src/goabackend/goaexchangeprovider.c:51 +msgid "Microsoft Exchange" +msgstr "Microsoft Exchange" + +#. Translators: the first %s is the username +#. * (eg., debarshi.ray@gmail.com or rishi), and the +#. * (%s, %d) is the error domain and code. +#. +#: src/goabackend/goaexchangeprovider.c:248 +#: src/goabackend/goalastfmprovider.c:287 +#: src/goabackend/goaowncloudprovider.c:291 +#, c-format +msgid "Invalid password with username “%s” (%s, %d): " +msgstr "Awal n uɛeddi d armeɣtu akked yisem n useqdac “%s” (%s, %d): " + +#: src/goabackend/goaexchangeprovider.c:396 +#: src/goabackend/goaimapsmtpprovider.c:647 +msgid "_E-mail" +msgstr "_E-mail" + +#: src/goabackend/goaexchangeprovider.c:397 +#: src/goabackend/goaimapsmtpprovider.c:667 +#: src/goabackend/goaimapsmtpprovider.c:687 +#: src/goabackend/goalastfmprovider.c:429 +#: src/goabackend/goaowncloudprovider.c:530 +msgid "_Password" +msgstr "A_wal n uɛeddi" + +#: src/goabackend/goaexchangeprovider.c:400 +msgid "_Custom" +msgstr "_Sagen" + +#: src/goabackend/goaexchangeprovider.c:411 +#: src/goabackend/goaimapsmtpprovider.c:666 +#: src/goabackend/goaimapsmtpprovider.c:686 +#: src/goabackend/goalastfmprovider.c:428 +#: src/goabackend/goaowncloudprovider.c:529 +msgid "User_name" +msgstr "I_sem n useqdac" + +#: src/goabackend/goaexchangeprovider.c:412 +#: src/goabackend/goaowncloudprovider.c:528 +msgid "_Server" +msgstr "A_qeddac" + +#. -- +#: src/goabackend/goaexchangeprovider.c:422 +#: src/goabackend/goaimapsmtpprovider.c:699 +#: src/goabackend/goakerberosprovider.c:563 +#: src/goabackend/goalastfmprovider.c:437 +#: src/goabackend/goaowncloudprovider.c:544 +msgid "_Cancel" +msgstr "Se_mmet" + +#: src/goabackend/goaexchangeprovider.c:423 +#: src/goabackend/goakerberosprovider.c:564 +#: src/goabackend/goalastfmprovider.c:438 +#: src/goabackend/goaowncloudprovider.c:545 +msgid "C_onnect" +msgstr "Tu_qqna" + +#: src/goabackend/goaexchangeprovider.c:439 +#: src/goabackend/goaimapsmtpprovider.c:715 +#: src/goabackend/goakerberosprovider.c:579 +#: src/goabackend/goalastfmprovider.c:454 +#: src/goabackend/goaowncloudprovider.c:560 +msgid "Connecting…" +msgstr "Tuqqna…" + +#: src/goabackend/goaexchangeprovider.c:539 +#: src/goabackend/goaexchangeprovider.c:733 +#: src/goabackend/goaimapsmtpprovider.c:865 +#: src/goabackend/goaimapsmtpprovider.c:900 +#: src/goabackend/goaimapsmtpprovider.c:992 +#: src/goabackend/goaimapsmtpprovider.c:1249 +#: src/goabackend/goaimapsmtpprovider.c:1325 +#: src/goabackend/goakerberosprovider.c:896 +#: src/goabackend/goalastfmprovider.c:652 +#: src/goabackend/goalastfmprovider.c:820 +#: src/goabackend/goamediaserverprovider.c:420 +#: src/goabackend/goaoauth2provider.c:995 src/goabackend/goaoauthprovider.c:859 +#: src/goabackend/goaowncloudprovider.c:663 +#: src/goabackend/goaowncloudprovider.c:883 +msgid "Dialog was dismissed" +msgstr "Adiwenni ur yettwaqbal ara" + +#: src/goabackend/goaexchangeprovider.c:577 +#: src/goabackend/goaexchangeprovider.c:761 +#: src/goabackend/goaimapsmtpprovider.c:933 +#: src/goabackend/goaimapsmtpprovider.c:1030 +#: src/goabackend/goaimapsmtpprovider.c:1276 +#: src/goabackend/goaimapsmtpprovider.c:1353 +#: src/goabackend/goalastfmprovider.c:686 +#: src/goabackend/goalastfmprovider.c:839 +#: src/goabackend/goaowncloudprovider.c:708 +#: src/goabackend/goaowncloudprovider.c:910 +#, c-format +msgid "Dialog was dismissed (%s, %d): " +msgstr "Adiwenni ur yettwaqbal ara (%s, %d) : " + +#: src/goabackend/goaexchangeprovider.c:590 +#: src/goabackend/goaimapsmtpprovider.c:946 +#: src/goabackend/goaimapsmtpprovider.c:1043 +#: src/goabackend/goaowncloudprovider.c:721 +msgid "_Ignore" +msgstr "_Ttu" + +#: src/goabackend/goaexchangeprovider.c:595 +#: src/goabackend/goaexchangeprovider.c:780 +#: src/goabackend/goaimapsmtpprovider.c:951 +#: src/goabackend/goaimapsmtpprovider.c:1048 +#: src/goabackend/goaimapsmtpprovider.c:1295 +#: src/goabackend/goaimapsmtpprovider.c:1372 +#: src/goabackend/goakerberosprovider.c:981 +#: src/goabackend/goalastfmprovider.c:698 +#: src/goabackend/goalastfmprovider.c:856 +#: src/goabackend/goaowncloudprovider.c:726 +#: src/goabackend/goaowncloudprovider.c:929 +msgid "_Try Again" +msgstr "_Eɛreḍ tikkelt-nniḍen" + +#: src/goabackend/goaexchangeprovider.c:600 +#: src/goabackend/goaexchangeprovider.c:773 +msgid "Error connecting to Microsoft Exchange server" +msgstr "Anezri di tuqqna ɣer uqeddac Microsoft Exchange" + +#: src/goabackend/goafacebookprovider.c:56 +msgid "Facebook" +msgstr "Facebook" + +#: src/goabackend/goafacebookprovider.c:183 +#: src/goabackend/goaflickrprovider.c:155 +#: src/goabackend/goafoursquareprovider.c:154 +#: src/goabackend/goagoogleprovider.c:183 +#: src/goabackend/goawindowsliveprovider.c:159 +#, c-format +msgid "" +"Expected status 200 when requesting your identity, instead got status %d (%s)" +msgstr "" +"Addad 200 yetturaǧǧu mi d-tella tuttra n tmagit-inek, deg wemkan-is neṭtef-d " +"addad %d (%s)" + +#. TODO: more specific +#: src/goabackend/goafacebookprovider.c:202 +#: src/goabackend/goafacebookprovider.c:213 +#: src/goabackend/goafacebookprovider.c:219 +#: src/goabackend/goaflickrprovider.c:174 +#: src/goabackend/goaflickrprovider.c:185 +#: src/goabackend/goaflickrprovider.c:196 +#: src/goabackend/goaflickrprovider.c:205 +#: src/goabackend/goaflickrprovider.c:218 +#: src/goabackend/goafoursquareprovider.c:173 +#: src/goabackend/goafoursquareprovider.c:184 +#: src/goabackend/goafoursquareprovider.c:195 +#: src/goabackend/goafoursquareprovider.c:206 +#: src/goabackend/goafoursquareprovider.c:215 +#: src/goabackend/goafoursquareprovider.c:228 +#: src/goabackend/goagoogleprovider.c:202 +#: src/goabackend/goagoogleprovider.c:213 +#: src/goabackend/goalastfmprovider.c:212 +#: src/goabackend/goalastfmprovider.c:221 +#: src/goabackend/goalastfmprovider.c:230 +#: src/goabackend/goalastfmprovider.c:238 +#: src/goabackend/goalastfmprovider.c:244 +#: src/goabackend/goalastfmprovider.c:512 +#: src/goabackend/goalastfmprovider.c:521 +#: src/goabackend/goalastfmprovider.c:538 +#: src/goabackend/goalastfmprovider.c:544 +#: src/goabackend/goaoauth2provider.c:656 +#: src/goabackend/goaoauth2provider.c:686 +#: src/goabackend/goaoauth2provider.c:697 src/goabackend/goautils.c:273 +#: src/goabackend/goawindowsliveprovider.c:178 +#: src/goabackend/goawindowsliveprovider.c:189 +#: src/goabackend/goawindowsliveprovider.c:198 +#: src/goabackend/goawindowsliveprovider.c:211 +msgid "Could not parse response" +msgstr "D awezɣi tasleḍt n tririt" + +#: src/goabackend/goaflickrprovider.c:56 +msgid "Flickr" +msgstr "Flickr" + +#: src/goabackend/goaflickrprovider.c:271 +msgid "Your system time is invalid. Check your date and time settings." +msgstr "Azemz n unagraw-inek d armeɣtu. Selken iɣewwaren n uzemz d usrag." + +#: src/goabackend/goafoursquareprovider.c:57 +msgid "Foursquare" +msgstr "Foursquare" + +#: src/goabackend/goagoogleprovider.c:56 +msgid "Google" +msgstr "Google" + +#. TODO: more specific +#: src/goabackend/goaimapauthlogin.c:84 src/goabackend/goasmtpauth.c:155 +msgid "Service not available" +msgstr "Ameẓlu ur yewjid ara" + +#. TODO: more specific +#: src/goabackend/goaimapauthlogin.c:104 src/goabackend/goalastfmprovider.c:529 +#: src/goabackend/goasmtpauth.c:108 src/goabackend/goautils.c:838 +msgid "Authentication failed" +msgstr "Anezri n usnekwu" + +#: src/goabackend/goaimapauthlogin.c:129 +msgid "Server does not support PLAIN" +msgstr "Aqeddac ur yezmir ara i PLAIN" + +#: src/goabackend/goaimapauthlogin.c:181 src/goabackend/goasmtpauth.c:606 +msgid "Server does not support STARTTLS" +msgstr "Aqeddac ur yezmir ara i STARTTLS" + +#: src/goabackend/goaimapsmtpprovider.c:53 +msgid "IMAP and SMTP" +msgstr "IMAP akked SMTP" + +#. Translators: the first %s is a field name. The +#. * second %s is the IMAP +#. * username (eg., rishi), and the (%s, %d) +#. * is the error domain and code. +#. +#. Translators: the first %s is a field name. The +#. * second %s is the SMTP +#. * username (eg., rishi), and the (%s, %d) +#. * is the error domain and code. +#. +#: src/goabackend/goaimapsmtpprovider.c:327 +#: src/goabackend/goaimapsmtpprovider.c:378 +#, c-format +msgid "Invalid %s with username “%s” (%s, %d): " +msgstr "" + +#. Translators: the following four strings are used to show a +#. * combo box similar to the one in the evolution module. +#. * Encryption: None +#. * STARTTLS after connecting +#. * SSL on a dedicated port +#. +#: src/goabackend/goaimapsmtpprovider.c:564 +msgid "_Encryption" +msgstr "A_wgelhen" + +#: src/goabackend/goaimapsmtpprovider.c:567 +msgid "None" +msgstr "Ulac" + +#: src/goabackend/goaimapsmtpprovider.c:570 +msgid "STARTTLS after connecting" +msgstr "STARTTLS mbaɛd tuqqna" + +#: src/goabackend/goaimapsmtpprovider.c:573 +msgid "SSL on a dedicated port" +msgstr "SSL ɣef tewwurt yettwaḥerran" + +#: src/goabackend/goaimapsmtpprovider.c:648 +msgid "_Name" +msgstr "I_sem" + +#: src/goabackend/goaimapsmtpprovider.c:665 +msgid "IMAP _Server" +msgstr "A_qeddac IMAP" + +#: src/goabackend/goaimapsmtpprovider.c:685 +msgid "SMTP _Server" +msgstr "A_qeddac SMTP" + +#: src/goabackend/goaimapsmtpprovider.c:700 +#: src/goabackend/goaimapsmtpprovider.c:972 +#: src/goabackend/goaimapsmtpprovider.c:1305 +msgid "_Forward" +msgstr "U_ḍfir" + +#: src/goabackend/goaimapsmtpprovider.c:956 +#: src/goabackend/goaimapsmtpprovider.c:1288 +msgid "Error connecting to IMAP server" +msgstr "Anezri di tuqqna ɣer uqeddac IMAP" + +#: src/goabackend/goaimapsmtpprovider.c:1053 +#: src/goabackend/goaimapsmtpprovider.c:1365 +msgid "Error connecting to SMTP server" +msgstr "Anezri di tuqqna ɣer uqeddac SMTP" + +#: src/goabackend/goaimapsmtpprovider.c:1476 +msgid "E-mail" +msgstr "Imayl" + +#: src/goabackend/goaimapsmtpprovider.c:1480 +msgid "Name" +msgstr "Isem" + +#: src/goabackend/goaimapsmtpprovider.c:1490 +#: src/goabackend/goaimapsmtpprovider.c:1494 +msgid "IMAP" +msgstr "IMAP" + +#: src/goabackend/goaimapsmtpprovider.c:1505 +#: src/goabackend/goaimapsmtpprovider.c:1509 +msgid "SMTP" +msgstr "SMTP" + +#: src/goabackend/goakerberosprovider.c:100 +msgid "Enterprise Login (Kerberos)" +msgstr "Tuqqna n teṛmist (Kerberos)" + +#: src/goabackend/goakerberosprovider.c:220 +msgid "Ticketing is disabled for account" +msgstr "" + +#: src/goabackend/goakerberosprovider.c:245 +#, c-format +msgid "Could not find saved credentials for principal “%s” in keyring" +msgstr "" + +#: src/goabackend/goakerberosprovider.c:258 +#, c-format +msgid "Did not find password for principal “%s” in credentials" +msgstr "" + +#: src/goabackend/goakerberosprovider.c:558 +msgid "_Principal" +msgstr "A_gejdan" + +#: src/goabackend/goakerberosprovider.c:744 +msgid "Operation was cancelled" +msgstr "Tamhelt tettusefsex" + +#: src/goabackend/goakerberosprovider.c:794 +#: src/goaidentity/goaidentityservice.c:1070 +msgid "Log In to Realm" +msgstr "Tuqqna ɣer wawal n taɣult" + +#: src/goabackend/goakerberosprovider.c:795 +msgid "Please enter your password below." +msgstr "Ttxil-k sekcem awal n uɛeddi inek uksar-agi." + +#: src/goabackend/goakerberosprovider.c:796 +msgid "Remember this password" +msgstr "Mekti awal-agi n uɛeddi" + +#: src/goabackend/goakerberosprovider.c:976 +msgid "Error connecting to enterprise identity server" +msgstr "Anezri di tuqqna ɣer uqeddac n tmagit n teṛmist" + +#: src/goabackend/goakerberosprovider.c:1315 +msgid "Identity service returned invalid key" +msgstr "Ameẓlu n tmagit yerra-d tasarut tarmeɣtut" + +#: src/goabackend/goalastfmprovider.c:65 +msgid "Last.fm" +msgstr "" + +#: src/goabackend/goalastfmprovider.c:700 +#: src/goabackend/goalastfmprovider.c:850 +msgid "Error connecting to Last.fm" +msgstr "" + +#: src/goabackend/goamediaserverprovider.c:63 +msgid "Media Server" +msgstr "Aqeddac agetmidya" + +#: src/goabackend/goamediaserverprovider.c:316 +msgid "" +"Personal content can be added to your applications through a media server " +"account." +msgstr "" +"Tzemreḍ ad ternuḍ agbur udmawan ɣer wesnas-inek s ttawil n umiḍan n uqeddac " +"n imidyaten." + +#: src/goabackend/goamediaserverprovider.c:329 +msgid "Available Media Servers" +msgstr "Iqeddacen imidyaten iwejden" + +#: src/goabackend/goamediaserverprovider.c:360 +msgid "No media servers found" +msgstr "Ur d-nufi ara aqeddac amidya" + +#. Translators: the %d is a HTTP status code and the %s is a textual description of it +#: src/goabackend/goaoauth2provider.c:632 src/goabackend/goaoauthprovider.c:542 +#, c-format +msgid "" +"Expected status 200 when requesting access token, instead got status %d (%s)" +msgstr "" +"Yetturaǧǧu waddad 200 mi d-tella tuttra n tiddest n wadduf, neṭṭef-d deg " +"wemkan-is addad %d (%s)" + +#: src/goabackend/goaoauth2provider.c:814 +msgid "Authorization response: " +msgstr "Tiririt ɣef usireg: " + +#: src/goabackend/goaoauth2provider.c:884 +#, c-format +msgid "Authorization response: %s" +msgstr "Tiririt ɣef usireg: %s" + +#: src/goabackend/goaoauth2provider.c:1021 +#: src/goabackend/goaoauthprovider.c:890 +msgid "Error getting an Access Token: " +msgstr "Anezri deg waggay n tiddest n wadduf: " + +#: src/goabackend/goaoauth2provider.c:1036 +#: src/goabackend/goaoauthprovider.c:903 +msgid "Error getting identity: " +msgstr "Anezri deg waggay n tmagit: " + +#: src/goabackend/goaoauth2provider.c:1254 +#: src/goabackend/goaoauthprovider.c:1192 +#, c-format +msgid "Was asked to log in as %s, but logged in as %s" +msgstr "Yella-d usuter i tuqqna d %s, maca tuqqna tella-d am %s" + +#: src/goabackend/goaoauth2provider.c:1406 +msgid "Credentials do not contain access_token" +msgstr "Isefka n usnekwu ur sɛin ara access_token" + +#: src/goabackend/goaoauth2provider.c:1445 +#: src/goabackend/goaoauthprovider.c:1407 +#, c-format +msgid "Failed to refresh access token (%s, %d): " +msgstr "Anezri deg uwennez n tiddest n unekcum (%s, %d) : " + +#: src/goabackend/goaoauthprovider.c:565 +msgid "Missing access_token or access_token_secret headers in response" +msgstr "Inixfan access_token neɣ access_token_secret xuṣṣent di tririt" + +#: src/goabackend/goaoauthprovider.c:773 +msgid "Error getting a Request Token: " +msgstr "Anezri deg waggay n tiddest n tuttra: " + +#. Translators: the %d is a HTTP status code and the %s is a textual description of it +#: src/goabackend/goaoauthprovider.c:804 +#, c-format +msgid "" +"Expected status 200 for getting a Request Token, instead got status %d (%s)" +msgstr "" +"Yetturaǧǧu waddad 200 mi d-tella tuṭṭfa n tiddest n tuttra, neṭṭef-d deg " +"wemkan-is addad %d (%s)" + +#: src/goabackend/goaoauthprovider.c:821 +msgid "Missing request_token or request_token_secret headers in response" +msgstr "Inixfan request_token neɣ request_token_secret xuṣṣent di tririt" + +#: src/goabackend/goaoauthprovider.c:1363 +msgid "Credentials do not contain access_token or access_token_secret" +msgstr "Isefka n usnekwu ur sɛin ara access_token neɣ access_token_secret" + +#: src/goabackend/goaowncloudprovider.c:60 +msgid "Nextcloud" +msgstr "" + +#: src/goabackend/goaowncloudprovider.c:731 +#: src/goabackend/goaowncloudprovider.c:922 +msgid "Error connecting to ownCloud server" +msgstr "Anezri di tuqqna ɣer uqeddac ownCloud" + +#: src/goabackend/goapocketprovider.c:74 +msgid "Pocket" +msgstr "Pocket" + +#. TODO: more specific +#: src/goabackend/goapocketprovider.c:249 +msgid "No username or access_token" +msgstr "Ulac isem n useqdac neɣ ti_ddest n unekcum" + +#: src/goabackend/goaprovider.c:109 +msgid "_Mail" +msgstr "I_mayl" + +#: src/goabackend/goaprovider.c:114 +msgid "Cale_ndar" +msgstr "Ta_fada" + +#: src/goabackend/goaprovider.c:119 +msgid "_Contacts" +msgstr "A_nermis" + +#: src/goabackend/goaprovider.c:124 +msgid "C_hat" +msgstr "A_meslay" + +#: src/goabackend/goaprovider.c:129 +msgid "_Documents" +msgstr "I_ttafttaren" + +#: src/goabackend/goaprovider.c:134 +msgid "M_usic" +msgstr "A_ẓawan" + +#: src/goabackend/goaprovider.c:139 +msgid "_Photos" +msgstr "Ti_wlafin" + +#: src/goabackend/goaprovider.c:144 +msgid "_Files" +msgstr "I_fuyla" + +#: src/goabackend/goaprovider.c:149 +msgid "Network _Resources" +msgstr "I_ɣbula n uẓeṭṭa" + +#: src/goabackend/goaprovider.c:154 +msgid "_Read Later" +msgstr "_Ɣer ar ḍeqqal" + +#: src/goabackend/goaprovider.c:159 +msgid "Prin_ters" +msgstr "Tisaggazin" + +#: src/goabackend/goaprovider.c:164 +msgid "_Maps" +msgstr "Ti_karḍiwin" + +#: src/goabackend/goaprovider.c:169 +msgid "T_o Do" +msgstr "" + +#. Translators: This is a label for a series of +#. * options switches. For example: “Use for Mail”. +#: src/goabackend/goaprovider.c:567 +msgid "Use for" +msgstr "Seqdec i" + +#: src/goabackend/goaprovider.c:822 +msgid "Account is disabled" +msgstr "Amiḍan yexsi" + +#: src/goabackend/goaprovider.c:835 +msgid "Unknown error" +msgstr "Tuccḍa tarussint" + +#: src/goabackend/goaprovider.c:854 +#, c-format +msgid "ensure_credentials_sync is not implemented on type %s" +msgstr "" + +#. TODO: more specific +#: src/goabackend/goasmtpauth.c:170 +msgid "TLS not available" +msgstr "TLS ur yewjid ara" + +#: src/goabackend/goasmtpauth.c:476 +msgid "Unknown authentication mechanism" +msgstr "Tarrayt n usnekwu ur tettwassen ara" + +#: src/goabackend/goautils.c:92 +msgid "Error logging into the account" +msgstr "Tuccḍa di tuqqna ɣer umiḍan" + +#: src/goabackend/goautils.c:136 +msgid "Credentials have expired" +msgstr "" + +#: src/goabackend/goautils.c:140 +msgid "Sign in to enable this account." +msgstr "Qqen iwakken ad tesremdeḍ amiḍan-agi" + +#: src/goabackend/goautils.c:144 +msgid "_Sign In" +msgstr "_Qqen" + +#: src/goabackend/goautils.c:240 +#, c-format +msgid "A %s account already exists for %s" +msgstr "Amiḍan %s yella yakan i %s" + +#. Translators: this is the title of the "Add Account" and "Refresh +#. * Account" dialogs. The %s is the name of the provider. eg., +#. * 'Google'. +#. +#: src/goabackend/goautils.c:293 +#, c-format +msgid "%s Account" +msgstr "" + +#. TODO: more specific +#: src/goabackend/goautils.c:347 +msgid "Failed to delete credentials from the keyring" +msgstr "Anezri di tukksa n isefka n usnekwu seg wezebg n tsura" + +#. TODO: more specific +#: src/goabackend/goautils.c:395 +msgid "Failed to retrieve credentials from the keyring" +msgstr "Anezri di tririt n isefka n usnekwu seg wezebg n tsura" + +#. TODO: more specific +#: src/goabackend/goautils.c:405 +msgid "No credentials found in the keyring" +msgstr "Ur d-nufi ara isallan n usnekwu deg wezebg n tsura" + +#: src/goabackend/goautils.c:418 +msgid "Error parsing result obtained from the keyring: " +msgstr "Anezri di tesleḍt n ugmuḍ i d-yeffɣen seg wezebg n tsura: " + +#. Translators: The %s is the type of the provider, e.g. 'google' or 'yahoo' +#: src/goabackend/goautils.c:459 +#, c-format +msgid "GOA %s credentials for identity %s" +msgstr "Isefka n usnekwu GOA %s i nekwa %s" + +#. TODO: more specific +#: src/goabackend/goautils.c:476 +msgid "Failed to store credentials in the keyring" +msgstr "Anezri deg wesekles n isefka n usnekwu deg wezebg n tsura" + +#: src/goabackend/goautils.c:825 +msgid "Cannot resolve hostname" +msgstr "D awezɣi ferru n yisem n usneftaɣ" + +#: src/goabackend/goautils.c:829 +msgid "Cannot resolve proxy hostname" +msgstr "D awezɣi ferru n yisem n usneftaɣ n upṛuksi" + +#: src/goabackend/goautils.c:834 +msgid "Cannot find WebDAV endpoint" +msgstr "" + +#: src/goabackend/goautils.c:843 +#, c-format +msgid "Code: %u — Unexpected response from server" +msgstr "Tangalt : %u — Tiririt ur netturaǧu ara sɣur aqeddac" + +#: src/goabackend/goautils.c:859 +msgid "The signing certificate authority is not known." +msgstr "Adabu n uselken n uzmal ur yettwassen ara." + +#: src/goabackend/goautils.c:863 +msgid "" +"The certificate does not match the expected identity of the site that it was " +"retrieved from." +msgstr "Aselkin ur inmeɣra ara akked tmagit yetturaǧun i wesmel seg i d-yekka." + +#: src/goabackend/goautils.c:868 +msgid "The certificate’s activation time is still in the future." +msgstr "Azemz n usermed n uselkin mazal-it deg yimal." + +#: src/goabackend/goautils.c:872 +msgid "The certificate has expired." +msgstr "Aselkin iɛedda-t wakud." + +#: src/goabackend/goautils.c:876 +msgid "The certificate has been revoked." +msgstr "Aselkin tettwakkes-as twuri-nes." + +#: src/goabackend/goautils.c:880 +msgid "The certificate’s algorithm is considered insecure." +msgstr "Awerzim n uselkin ittuneḥsab mačči d aɣelsan." + +#: src/goabackend/goautils.c:886 +msgid "Invalid certificate." +msgstr "Aselkin d armeɣtu." + +#. TODO: more specific +#: src/goabackend/goautils.c:921 +#, c-format +msgid "Did not find %s with identity “%s” in credentials" +msgstr "" + +#. translators: %s here is the address of the web page +#: src/goabackend/goawebview.c:94 +#, c-format +msgid "Loading “%s”…" +msgstr "Aɛebbi n « %s »…" + +#: src/goabackend/goawindowsliveprovider.c:56 +msgid "Microsoft" +msgstr "Microsoft" + +#: src/goaidentity/goaidentityservice.c:569 +msgid "Initial secret key is invalid" +msgstr "Tasarutt tuffirt n tazwara d armeɣtut" + +#: src/goaidentity/goaidentityservice.c:1075 +#, c-format +msgid "The network realm %s needs some information to sign you in." +msgstr "Awal n taɣult n uẓeṭṭa %s yeḥwaǧ kra n isallan iwakken ad k-yeqqen." + +#: src/goaidentity/goakerberosidentity.c:274 +#: src/goaidentity/goakerberosidentity.c:282 +#: src/goaidentity/goakerberosidentity.c:706 +msgid "Could not find identity in credential cache: " +msgstr "" + +#: src/goaidentity/goakerberosidentity.c:719 +msgid "Could not find identity credentials in cache: " +msgstr "" + +#: src/goaidentity/goakerberosidentity.c:770 +msgid "Could not sift through identity credentials in cache: " +msgstr "" + +#: src/goaidentity/goakerberosidentity.c:787 +msgid "Could not finish up sifting through identity credentials in cache: " +msgstr "" + +#: src/goaidentity/goakerberosidentity.c:1102 +msgid "No associated identification found" +msgstr "Ur d-nufi ara asenkwu yeduklen" + +#: src/goaidentity/goakerberosidentity.c:1185 +msgid "Could not create credential cache: " +msgstr "" + +#: src/goaidentity/goakerberosidentity.c:1219 +msgid "Could not initialize credentials cache: " +msgstr "" + +#: src/goaidentity/goakerberosidentity.c:1235 +msgid "Could not store new credentials in credentials cache: " +msgstr "" + +#: src/goaidentity/goakerberosidentity.c:1533 +msgid "Could not renew identity: Not signed in" +msgstr "" + +#: src/goaidentity/goakerberosidentity.c:1545 +msgid "Could not renew identity: " +msgstr "" + +#: src/goaidentity/goakerberosidentity.c:1561 +#, c-format +msgid "Could not get new credentials to renew identity %s: " +msgstr "" + +#: src/goaidentity/goakerberosidentity.c:1603 +msgid "Could not erase identity: " +msgstr "" + +#: src/goaidentity/goakerberosidentitymanager.c:750 +msgid "Could not find identity" +msgstr "Ur d-nufi ara tamagit" + +#: src/goaidentity/goakerberosidentitymanager.c:846 +msgid "Could not create credential cache for identity" +msgstr "D awezɣi asnulfu n tzarkatut n isefka n usnekwu i nekwa" diff -Nru gnome-online-accounts-3.30.1/po/LINGUAS gnome-online-accounts-3.31.90/po/LINGUAS --- gnome-online-accounts-3.30.1/po/LINGUAS 2019-01-17 10:08:27.000000000 +0000 +++ gnome-online-accounts-3.31.90/po/LINGUAS 2019-01-17 11:54:47.000000000 +0000 @@ -34,6 +34,7 @@ is it ja +kab kk km kn diff -Nru gnome-online-accounts-3.30.1/po/POTFILES.in gnome-online-accounts-3.31.90/po/POTFILES.in --- gnome-online-accounts-3.30.1/po/POTFILES.in 2019-01-17 10:08:27.000000000 +0000 +++ gnome-online-accounts-3.31.90/po/POTFILES.in 2019-01-17 11:54:47.000000000 +0000 @@ -19,7 +19,6 @@ src/goabackend/goapocketprovider.c src/goabackend/goaprovider.c src/goabackend/goasmtpauth.c -src/goabackend/goatodoistprovider.c src/goabackend/goautils.c src/goabackend/goawebview.c src/goabackend/goawindowsliveprovider.c diff -Nru gnome-online-accounts-3.30.1/README gnome-online-accounts-3.31.90/README --- gnome-online-accounts-3.30.1/README 2019-01-17 10:08:27.000000000 +0000 +++ gnome-online-accounts-3.31.90/README 2019-02-09 09:20:54.000000000 +0000 @@ -38,6 +38,7 @@ OAuth 2.0: https://developers.google.com/accounts/docs/OAuth2InstalledApp +https://developers.google.com/apis-explorer/ https://developers.google.com/oauthplayground/ Scopes: @@ -50,8 +51,9 @@ https://developers.google.com/talk/jep_extensions/oauth https://developers.google.com/cloud-print/docs/devguide -Sometimes the documentation does not mention the OAuth2 scopes that need to be -specified in the source code. In such cases, the following can be useful: +Sometimes the documentation is lacking. In such cases, the following can be +useful: +https://developers.google.com/apis-explorer/ https://developers.google.com/oauthplayground/ https://discovery-check.appspot.com/ @@ -71,12 +73,6 @@ http://www.slideshare.net/KuoE0/pocket-authentication-with-oauth-on-firefox-os -Todoist -------- - -OAuth 2.0: https://developer.todoist.com/ - - Windows Live ------------ diff -Nru gnome-online-accounts-3.30.1/src/daemon/Makefile.am gnome-online-accounts-3.31.90/src/daemon/Makefile.am --- gnome-online-accounts-3.30.1/src/daemon/Makefile.am 2019-01-17 10:08:27.000000000 +0000 +++ gnome-online-accounts-3.31.90/src/daemon/Makefile.am 2019-01-17 11:54:47.000000000 +0000 @@ -14,7 +14,6 @@ -DPACKAGE_LOCALSTATE_DIR=\""$(localstatedir)"\" \ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_LIB_DIR=\""$(libdir)"\" \ - -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ -DGOA_API_IS_SUBJECT_TO_CHANGE \ -DGOA_BACKEND_API_IS_SUBJECT_TO_CHANGE \ $(WARN_CFLAGS) \ diff -Nru gnome-online-accounts-3.30.1/src/daemon/Makefile.in gnome-online-accounts-3.31.90/src/daemon/Makefile.in --- gnome-online-accounts-3.30.1/src/daemon/Makefile.in 2019-01-17 10:27:12.000000000 +0000 +++ gnome-online-accounts-3.31.90/src/daemon/Makefile.in 2019-02-09 21:16:18.000000000 +0000 @@ -404,7 +404,6 @@ -DPACKAGE_LOCALSTATE_DIR=\""$(localstatedir)"\" \ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_LIB_DIR=\""$(libdir)"\" \ - -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ -DGOA_API_IS_SUBJECT_TO_CHANGE \ -DGOA_BACKEND_API_IS_SUBJECT_TO_CHANGE \ $(WARN_CFLAGS) \ diff -Nru gnome-online-accounts-3.30.1/src/examples/lastfm-shout.c gnome-online-accounts-3.31.90/src/examples/lastfm-shout.c --- gnome-online-accounts-3.30.1/src/examples/lastfm-shout.c 2019-01-17 10:08:27.000000000 +0000 +++ gnome-online-accounts-3.31.90/src/examples/lastfm-shout.c 2019-01-17 11:54:47.000000000 +0000 @@ -31,7 +31,7 @@ GError *error = NULL; GoaClient *client; GList *accounts, *l; - GoaAccount *account; + GoaAccount *account = NULL; GoaOAuth2Based *oauth2 = NULL; char *access_token = NULL; RestProxy *proxy; @@ -67,8 +67,10 @@ g_list_free_full (accounts, (GDestroyNotify) g_object_unref); - g_assert (account); - g_assert (oauth2); + if (account == NULL || oauth2 == NULL) { + g_print ("Last.fm account not found\n"); + return 1; + } if (!goa_oauth2_based_call_get_access_token_sync (oauth2, &access_token, NULL, NULL, &error)) { g_error ("Could not get access token %s\n", error->message); diff -Nru gnome-online-accounts-3.30.1/src/examples/Makefile.am gnome-online-accounts-3.31.90/src/examples/Makefile.am --- gnome-online-accounts-3.30.1/src/examples/Makefile.am 2019-01-17 10:08:27.000000000 +0000 +++ gnome-online-accounts-3.31.90/src/examples/Makefile.am 2019-01-17 11:54:47.000000000 +0000 @@ -11,7 +11,6 @@ -DPACKAGE_LOCALSTATE_DIR=\""$(localstatedir)"\" \ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_LIB_DIR=\""$(libdir)"\" \ - -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ $(WARN_CFLAGS) \ $(NULL) diff -Nru gnome-online-accounts-3.30.1/src/examples/Makefile.in gnome-online-accounts-3.31.90/src/examples/Makefile.in --- gnome-online-accounts-3.30.1/src/examples/Makefile.in 2019-01-17 10:27:12.000000000 +0000 +++ gnome-online-accounts-3.31.90/src/examples/Makefile.in 2019-02-09 21:16:18.000000000 +0000 @@ -445,7 +445,6 @@ -DPACKAGE_LOCALSTATE_DIR=\""$(localstatedir)"\" \ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_LIB_DIR=\""$(libdir)"\" \ - -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ $(WARN_CFLAGS) \ $(NULL) diff -Nru gnome-online-accounts-3.30.1/src/goa/goa-generated.c gnome-online-accounts-3.31.90/src/goa/goa-generated.c --- gnome-online-accounts-3.30.1/src/goa/goa-generated.c 2019-01-17 10:27:18.000000000 +0000 +++ gnome-online-accounts-3.31.90/src/goa/goa-generated.c 2019-02-09 21:16:26.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.56.4. DO NOT EDIT. + * Generated by gdbus-codegen 2.59.2 from dbus-interfaces.xml. DO NOT EDIT. * * The license of this code is the same as for the D-Bus interface description * it was derived from. @@ -39,7 +39,8 @@ { GDBusPropertyInfo parent_struct; const gchar *hyphen_name; - gboolean use_gvariant; + guint use_gvariant : 1; + guint emits_changed_signal : 1; } _ExtendedGDBusPropertyInfo; typedef struct @@ -188,9 +189,9 @@ FALSE }; -static const _ExtendedGDBusArgInfo * const _goa_account_method_info_ensure_credentials_OUT_ARG_pointers[] = +static const GDBusArgInfo * const _goa_account_method_info_ensure_credentials_OUT_ARG_pointers[] = { - &_goa_account_method_info_ensure_credentials_OUT_ARG_expires_in, + &_goa_account_method_info_ensure_credentials_OUT_ARG_expires_in.parent_struct, NULL }; @@ -207,10 +208,10 @@ FALSE }; -static const _ExtendedGDBusMethodInfo * const _goa_account_method_info_pointers[] = +static const GDBusMethodInfo * const _goa_account_method_info_pointers[] = { - &_goa_account_method_info_remove, - &_goa_account_method_info_ensure_credentials, + &_goa_account_method_info_remove.parent_struct, + &_goa_account_method_info_ensure_credentials.parent_struct, NULL }; @@ -224,7 +225,8 @@ NULL }, "provider-type", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_account_property_info_provider_name = @@ -237,7 +239,8 @@ NULL }, "provider-name", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_account_property_info_provider_icon = @@ -250,7 +253,8 @@ NULL }, "provider-icon", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_account_property_info_id = @@ -263,7 +267,8 @@ NULL }, "id", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_account_property_info_is_locked = @@ -276,7 +281,8 @@ NULL }, "is-locked", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_account_property_info_is_temporary = @@ -289,7 +295,8 @@ NULL }, "is-temporary", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_account_property_info_attention_needed = @@ -302,7 +309,8 @@ NULL }, "attention-needed", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_account_property_info_identity = @@ -315,7 +323,8 @@ NULL }, "identity", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_account_property_info_presentation_identity = @@ -328,7 +337,8 @@ NULL }, "presentation-identity", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_account_property_info_mail_disabled = @@ -341,7 +351,8 @@ NULL }, "mail-disabled", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_account_property_info_calendar_disabled = @@ -354,7 +365,8 @@ NULL }, "calendar-disabled", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_account_property_info_contacts_disabled = @@ -367,7 +379,8 @@ NULL }, "contacts-disabled", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_account_property_info_chat_disabled = @@ -380,7 +393,8 @@ NULL }, "chat-disabled", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_account_property_info_documents_disabled = @@ -393,7 +407,8 @@ NULL }, "documents-disabled", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_account_property_info_maps_disabled = @@ -406,7 +421,8 @@ NULL }, "maps-disabled", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_account_property_info_music_disabled = @@ -419,7 +435,8 @@ NULL }, "music-disabled", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_account_property_info_printers_disabled = @@ -432,7 +449,8 @@ NULL }, "printers-disabled", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_account_property_info_photos_disabled = @@ -445,7 +463,8 @@ NULL }, "photos-disabled", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_account_property_info_files_disabled = @@ -458,7 +477,8 @@ NULL }, "files-disabled", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_account_property_info_ticketing_disabled = @@ -471,7 +491,22 @@ NULL }, "ticketing-disabled", - FALSE + FALSE, + TRUE +}; + +static const GDBusAnnotationInfo _goa_account_property_todo_disabled_annotation_info_0 = +{ + -1, + (gchar *) "org.freedesktop.DBus.Deprecated", + (gchar *) "true", + NULL +}; + +static const GDBusAnnotationInfo * const _goa_account_property_todo_disabled_annotation_info_pointers[] = +{ + &_goa_account_property_todo_disabled_annotation_info_0, + NULL }; static const _ExtendedGDBusPropertyInfo _goa_account_property_info_todo_disabled = @@ -481,10 +516,11 @@ (gchar *) "TodoDisabled", (gchar *) "b", G_DBUS_PROPERTY_INFO_FLAGS_READABLE | G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE, - NULL + (GDBusAnnotationInfo **) &_goa_account_property_todo_disabled_annotation_info_pointers }, "todo-disabled", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_account_property_info_read_later_disabled = @@ -497,33 +533,34 @@ NULL }, "read-later-disabled", - FALSE + FALSE, + TRUE }; -static const _ExtendedGDBusPropertyInfo * const _goa_account_property_info_pointers[] = +static const GDBusPropertyInfo * const _goa_account_property_info_pointers[] = { - &_goa_account_property_info_provider_type, - &_goa_account_property_info_provider_name, - &_goa_account_property_info_provider_icon, - &_goa_account_property_info_id, - &_goa_account_property_info_is_locked, - &_goa_account_property_info_is_temporary, - &_goa_account_property_info_attention_needed, - &_goa_account_property_info_identity, - &_goa_account_property_info_presentation_identity, - &_goa_account_property_info_mail_disabled, - &_goa_account_property_info_calendar_disabled, - &_goa_account_property_info_contacts_disabled, - &_goa_account_property_info_chat_disabled, - &_goa_account_property_info_documents_disabled, - &_goa_account_property_info_maps_disabled, - &_goa_account_property_info_music_disabled, - &_goa_account_property_info_printers_disabled, - &_goa_account_property_info_photos_disabled, - &_goa_account_property_info_files_disabled, - &_goa_account_property_info_ticketing_disabled, - &_goa_account_property_info_todo_disabled, - &_goa_account_property_info_read_later_disabled, + &_goa_account_property_info_provider_type.parent_struct, + &_goa_account_property_info_provider_name.parent_struct, + &_goa_account_property_info_provider_icon.parent_struct, + &_goa_account_property_info_id.parent_struct, + &_goa_account_property_info_is_locked.parent_struct, + &_goa_account_property_info_is_temporary.parent_struct, + &_goa_account_property_info_attention_needed.parent_struct, + &_goa_account_property_info_identity.parent_struct, + &_goa_account_property_info_presentation_identity.parent_struct, + &_goa_account_property_info_mail_disabled.parent_struct, + &_goa_account_property_info_calendar_disabled.parent_struct, + &_goa_account_property_info_contacts_disabled.parent_struct, + &_goa_account_property_info_chat_disabled.parent_struct, + &_goa_account_property_info_documents_disabled.parent_struct, + &_goa_account_property_info_maps_disabled.parent_struct, + &_goa_account_property_info_music_disabled.parent_struct, + &_goa_account_property_info_printers_disabled.parent_struct, + &_goa_account_property_info_photos_disabled.parent_struct, + &_goa_account_property_info_files_disabled.parent_struct, + &_goa_account_property_info_ticketing_disabled.parent_struct, + &_goa_account_property_info_todo_disabled.parent_struct, + &_goa_account_property_info_read_later_disabled.parent_struct, NULL }; @@ -885,9 +922,11 @@ * Since the D-Bus property for this #GObject property is both readable and writable, it is meaningful to both read from it and write to it on both the service- and client-side. * * Since: 3.26.0 + * + * Deprecated: The D-Bus property has been deprecated. */ g_object_interface_install_property (iface, - g_param_spec_boolean ("todo-disabled", "TodoDisabled", "TodoDisabled", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_param_spec_boolean ("todo-disabled", "TodoDisabled", "TodoDisabled", FALSE, G_PARAM_DEPRECATED | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GoaAccount:read-later-disabled: * @@ -911,7 +950,7 @@ * * The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use goa_account_dup_provider_type() if on another thread. * - * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. + * Returns: (transfer none) (nullable): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. */ const gchar * goa_account_get_provider_type (GoaAccount *object) @@ -927,7 +966,7 @@ * * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side. * - * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). + * Returns: (transfer full) (nullable): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). */ gchar * goa_account_dup_provider_type (GoaAccount *object) @@ -962,7 +1001,7 @@ * * The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use goa_account_dup_provider_name() if on another thread. * - * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. + * Returns: (transfer none) (nullable): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. */ const gchar * goa_account_get_provider_name (GoaAccount *object) @@ -978,7 +1017,7 @@ * * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side. * - * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). + * Returns: (transfer full) (nullable): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). */ gchar * goa_account_dup_provider_name (GoaAccount *object) @@ -1013,7 +1052,7 @@ * * The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use goa_account_dup_provider_icon() if on another thread. * - * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. + * Returns: (transfer none) (nullable): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. */ const gchar * goa_account_get_provider_icon (GoaAccount *object) @@ -1029,7 +1068,7 @@ * * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side. * - * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). + * Returns: (transfer full) (nullable): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). */ gchar * goa_account_dup_provider_icon (GoaAccount *object) @@ -1064,7 +1103,7 @@ * * The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use goa_account_dup_id() if on another thread. * - * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. + * Returns: (transfer none) (nullable): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. */ const gchar * goa_account_get_id (GoaAccount *object) @@ -1080,7 +1119,7 @@ * * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side. * - * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). + * Returns: (transfer full) (nullable): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). */ gchar * goa_account_dup_id (GoaAccount *object) @@ -1212,7 +1251,7 @@ * * The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use goa_account_dup_identity() if on another thread. * - * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. + * Returns: (transfer none) (nullable): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. */ const gchar * goa_account_get_identity (GoaAccount *object) @@ -1228,7 +1267,7 @@ * * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side. * - * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). + * Returns: (transfer full) (nullable): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). */ gchar * goa_account_dup_identity (GoaAccount *object) @@ -1263,7 +1302,7 @@ * * The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use goa_account_dup_presentation_identity() if on another thread. * - * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. + * Returns: (transfer none) (nullable): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. */ const gchar * goa_account_get_presentation_identity (GoaAccount *object) @@ -1279,7 +1318,7 @@ * * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side. * - * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). + * Returns: (transfer full) (nullable): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). */ gchar * goa_account_dup_presentation_identity (GoaAccount *object) @@ -1680,6 +1719,8 @@ * Returns: The property value. * * Since: 3.26.0 + * + * Deprecated: The D-Bus property has been deprecated. */ gboolean goa_account_get_todo_disabled (GoaAccount *object) @@ -1697,6 +1738,8 @@ * Since this D-Bus property is both readable and writable, it is meaningful to use this function on both the client- and service-side. * * Since: 3.26.0 + * + * Deprecated: The D-Bus property has been deprecated. */ void goa_account_set_todo_disabled (GoaAccount *object, gboolean value) @@ -1864,7 +1907,7 @@ /** * goa_account_call_ensure_credentials_finish: * @proxy: A #GoaAccountProxy. - * @out_expires_in: (out): Return location for return parameter or %NULL to ignore. + * @out_expires_in: (out) (optional): Return location for return parameter or %NULL to ignore. * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to goa_account_call_ensure_credentials(). * @error: Return location for error or %NULL. * @@ -1894,7 +1937,7 @@ /** * goa_account_call_ensure_credentials_sync: * @proxy: A #GoaAccountProxy. - * @out_expires_in: (out): Return location for return parameter or %NULL to ignore. + * @out_expires_in: (out) (optional): Return location for return parameter or %NULL to ignore. * @cancellable: (nullable): A #GCancellable or %NULL. * @error: Return location for error or %NULL. * @@ -2017,7 +2060,7 @@ const _ExtendedGDBusPropertyInfo *info; GVariant *variant; g_assert (prop_id != 0 && prop_id - 1 < 22); - info = _goa_account_property_info_pointers[prop_id - 1]; + info = (const _ExtendedGDBusPropertyInfo *) _goa_account_property_info_pointers[prop_id - 1]; variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (object), info->parent_struct.name); if (info->use_gvariant) { @@ -2064,7 +2107,7 @@ const _ExtendedGDBusPropertyInfo *info; GVariant *variant; g_assert (prop_id != 0 && prop_id - 1 < 22); - info = _goa_account_property_info_pointers[prop_id - 1]; + info = (const _ExtendedGDBusPropertyInfo *) _goa_account_property_info_pointers[prop_id - 1]; variant = g_dbus_gvalue_to_gvariant (value, G_VARIANT_TYPE (info->parent_struct.signature)); g_dbus_proxy_call (G_DBUS_PROXY (object), "org.freedesktop.DBus.Properties.Set", @@ -3095,14 +3138,17 @@ const GValue *value, GParamSpec *pspec) { + const _ExtendedGDBusPropertyInfo *info; GoaAccountSkeleton *skeleton = GOA_ACCOUNT_SKELETON (object); g_assert (prop_id != 0 && prop_id - 1 < 22); + info = (const _ExtendedGDBusPropertyInfo *) _goa_account_property_info_pointers[prop_id - 1]; g_mutex_lock (&skeleton->priv->lock); g_object_freeze_notify (object); if (!_g_value_equal (value, &skeleton->priv->properties[prop_id - 1])) { - if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL) - _goa_account_schedule_emit_changed (skeleton, _goa_account_property_info_pointers[prop_id - 1], prop_id, &skeleton->priv->properties[prop_id - 1]); + if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL && + info->emits_changed_signal) + _goa_account_schedule_emit_changed (skeleton, info, prop_id, &skeleton->priv->properties[prop_id - 1]); g_value_copy (value, &skeleton->priv->properties[prop_id - 1]); g_object_notify_by_pspec (object, pspec); } @@ -3491,10 +3537,10 @@ FALSE }; -static const _ExtendedGDBusArgInfo * const _goa_oauth2_based_method_info_get_access_token_OUT_ARG_pointers[] = +static const GDBusArgInfo * const _goa_oauth2_based_method_info_get_access_token_OUT_ARG_pointers[] = { - &_goa_oauth2_based_method_info_get_access_token_OUT_ARG_access_token, - &_goa_oauth2_based_method_info_get_access_token_OUT_ARG_expires_in, + &_goa_oauth2_based_method_info_get_access_token_OUT_ARG_access_token.parent_struct, + &_goa_oauth2_based_method_info_get_access_token_OUT_ARG_expires_in.parent_struct, NULL }; @@ -3511,9 +3557,9 @@ FALSE }; -static const _ExtendedGDBusMethodInfo * const _goa_oauth2_based_method_info_pointers[] = +static const GDBusMethodInfo * const _goa_oauth2_based_method_info_pointers[] = { - &_goa_oauth2_based_method_info_get_access_token, + &_goa_oauth2_based_method_info_get_access_token.parent_struct, NULL }; @@ -3527,7 +3573,8 @@ NULL }, "client-id", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_oauth2_based_property_info_client_secret = @@ -3540,13 +3587,14 @@ NULL }, "client-secret", - FALSE + FALSE, + TRUE }; -static const _ExtendedGDBusPropertyInfo * const _goa_oauth2_based_property_info_pointers[] = +static const GDBusPropertyInfo * const _goa_oauth2_based_property_info_pointers[] = { - &_goa_oauth2_based_property_info_client_id, - &_goa_oauth2_based_property_info_client_secret, + &_goa_oauth2_based_property_info_client_id.parent_struct, + &_goa_oauth2_based_property_info_client_secret.parent_struct, NULL }; @@ -3673,7 +3721,7 @@ * * The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use goa_oauth2_based_dup_client_id() if on another thread. * - * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. + * Returns: (transfer none) (nullable): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. */ const gchar * goa_oauth2_based_get_client_id (GoaOAuth2Based *object) @@ -3689,7 +3737,7 @@ * * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side. * - * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). + * Returns: (transfer full) (nullable): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). */ gchar * goa_oauth2_based_dup_client_id (GoaOAuth2Based *object) @@ -3724,7 +3772,7 @@ * * The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use goa_oauth2_based_dup_client_secret() if on another thread. * - * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. + * Returns: (transfer none) (nullable): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. */ const gchar * goa_oauth2_based_get_client_secret (GoaOAuth2Based *object) @@ -3740,7 +3788,7 @@ * * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side. * - * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). + * Returns: (transfer full) (nullable): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). */ gchar * goa_oauth2_based_dup_client_secret (GoaOAuth2Based *object) @@ -3798,8 +3846,8 @@ /** * goa_oauth2_based_call_get_access_token_finish: * @proxy: A #GoaOAuth2BasedProxy. - * @out_access_token: (out): Return location for return parameter or %NULL to ignore. - * @out_expires_in: (out): Return location for return parameter or %NULL to ignore. + * @out_access_token: (out) (optional): Return location for return parameter or %NULL to ignore. + * @out_expires_in: (out) (optional): Return location for return parameter or %NULL to ignore. * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to goa_oauth2_based_call_get_access_token(). * @error: Return location for error or %NULL. * @@ -3831,8 +3879,8 @@ /** * goa_oauth2_based_call_get_access_token_sync: * @proxy: A #GoaOAuth2BasedProxy. - * @out_access_token: (out): Return location for return parameter or %NULL to ignore. - * @out_expires_in: (out): Return location for return parameter or %NULL to ignore. + * @out_access_token: (out) (optional): Return location for return parameter or %NULL to ignore. + * @out_expires_in: (out) (optional): Return location for return parameter or %NULL to ignore. * @cancellable: (nullable): A #GCancellable or %NULL. * @error: Return location for error or %NULL. * @@ -3942,7 +3990,7 @@ const _ExtendedGDBusPropertyInfo *info; GVariant *variant; g_assert (prop_id != 0 && prop_id - 1 < 2); - info = _goa_oauth2_based_property_info_pointers[prop_id - 1]; + info = (const _ExtendedGDBusPropertyInfo *) _goa_oauth2_based_property_info_pointers[prop_id - 1]; variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (object), info->parent_struct.name); if (info->use_gvariant) { @@ -3989,7 +4037,7 @@ const _ExtendedGDBusPropertyInfo *info; GVariant *variant; g_assert (prop_id != 0 && prop_id - 1 < 2); - info = _goa_oauth2_based_property_info_pointers[prop_id - 1]; + info = (const _ExtendedGDBusPropertyInfo *) _goa_oauth2_based_property_info_pointers[prop_id - 1]; variant = g_dbus_gvalue_to_gvariant (value, G_VARIANT_TYPE (info->parent_struct.signature)); g_dbus_proxy_call (G_DBUS_PROXY (object), "org.freedesktop.DBus.Properties.Set", @@ -4700,14 +4748,17 @@ const GValue *value, GParamSpec *pspec) { + const _ExtendedGDBusPropertyInfo *info; GoaOAuth2BasedSkeleton *skeleton = GOA_OAUTH2_BASED_SKELETON (object); g_assert (prop_id != 0 && prop_id - 1 < 2); + info = (const _ExtendedGDBusPropertyInfo *) _goa_oauth2_based_property_info_pointers[prop_id - 1]; g_mutex_lock (&skeleton->priv->lock); g_object_freeze_notify (object); if (!_g_value_equal (value, &skeleton->priv->properties[prop_id - 1])) { - if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL) - _goa_oauth2_based_schedule_emit_changed (skeleton, _goa_oauth2_based_property_info_pointers[prop_id - 1], prop_id, &skeleton->priv->properties[prop_id - 1]); + if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL && + info->emits_changed_signal) + _goa_oauth2_based_schedule_emit_changed (skeleton, info, prop_id, &skeleton->priv->properties[prop_id - 1]); g_value_copy (value, &skeleton->priv->properties[prop_id - 1]); g_object_notify_by_pspec (object, pspec); } @@ -4847,11 +4898,11 @@ FALSE }; -static const _ExtendedGDBusArgInfo * const _goa_oauth_based_method_info_get_access_token_OUT_ARG_pointers[] = +static const GDBusArgInfo * const _goa_oauth_based_method_info_get_access_token_OUT_ARG_pointers[] = { - &_goa_oauth_based_method_info_get_access_token_OUT_ARG_access_token, - &_goa_oauth_based_method_info_get_access_token_OUT_ARG_access_token_secret, - &_goa_oauth_based_method_info_get_access_token_OUT_ARG_expires_in, + &_goa_oauth_based_method_info_get_access_token_OUT_ARG_access_token.parent_struct, + &_goa_oauth_based_method_info_get_access_token_OUT_ARG_access_token_secret.parent_struct, + &_goa_oauth_based_method_info_get_access_token_OUT_ARG_expires_in.parent_struct, NULL }; @@ -4868,9 +4919,9 @@ FALSE }; -static const _ExtendedGDBusMethodInfo * const _goa_oauth_based_method_info_pointers[] = +static const GDBusMethodInfo * const _goa_oauth_based_method_info_pointers[] = { - &_goa_oauth_based_method_info_get_access_token, + &_goa_oauth_based_method_info_get_access_token.parent_struct, NULL }; @@ -4884,7 +4935,8 @@ NULL }, "consumer-key", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_oauth_based_property_info_consumer_secret = @@ -4897,13 +4949,14 @@ NULL }, "consumer-secret", - FALSE + FALSE, + TRUE }; -static const _ExtendedGDBusPropertyInfo * const _goa_oauth_based_property_info_pointers[] = +static const GDBusPropertyInfo * const _goa_oauth_based_property_info_pointers[] = { - &_goa_oauth_based_property_info_consumer_key, - &_goa_oauth_based_property_info_consumer_secret, + &_goa_oauth_based_property_info_consumer_key.parent_struct, + &_goa_oauth_based_property_info_consumer_secret.parent_struct, NULL }; @@ -5030,7 +5083,7 @@ * * The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use goa_oauth_based_dup_consumer_key() if on another thread. * - * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. + * Returns: (transfer none) (nullable): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. */ const gchar * goa_oauth_based_get_consumer_key (GoaOAuthBased *object) @@ -5046,7 +5099,7 @@ * * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side. * - * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). + * Returns: (transfer full) (nullable): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). */ gchar * goa_oauth_based_dup_consumer_key (GoaOAuthBased *object) @@ -5081,7 +5134,7 @@ * * The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use goa_oauth_based_dup_consumer_secret() if on another thread. * - * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. + * Returns: (transfer none) (nullable): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. */ const gchar * goa_oauth_based_get_consumer_secret (GoaOAuthBased *object) @@ -5097,7 +5150,7 @@ * * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side. * - * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). + * Returns: (transfer full) (nullable): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). */ gchar * goa_oauth_based_dup_consumer_secret (GoaOAuthBased *object) @@ -5155,9 +5208,9 @@ /** * goa_oauth_based_call_get_access_token_finish: * @proxy: A #GoaOAuthBasedProxy. - * @out_access_token: (out): Return location for return parameter or %NULL to ignore. - * @out_access_token_secret: (out): Return location for return parameter or %NULL to ignore. - * @out_expires_in: (out): Return location for return parameter or %NULL to ignore. + * @out_access_token: (out) (optional): Return location for return parameter or %NULL to ignore. + * @out_access_token_secret: (out) (optional): Return location for return parameter or %NULL to ignore. + * @out_expires_in: (out) (optional): Return location for return parameter or %NULL to ignore. * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to goa_oauth_based_call_get_access_token(). * @error: Return location for error or %NULL. * @@ -5191,9 +5244,9 @@ /** * goa_oauth_based_call_get_access_token_sync: * @proxy: A #GoaOAuthBasedProxy. - * @out_access_token: (out): Return location for return parameter or %NULL to ignore. - * @out_access_token_secret: (out): Return location for return parameter or %NULL to ignore. - * @out_expires_in: (out): Return location for return parameter or %NULL to ignore. + * @out_access_token: (out) (optional): Return location for return parameter or %NULL to ignore. + * @out_access_token_secret: (out) (optional): Return location for return parameter or %NULL to ignore. + * @out_expires_in: (out) (optional): Return location for return parameter or %NULL to ignore. * @cancellable: (nullable): A #GCancellable or %NULL. * @error: Return location for error or %NULL. * @@ -5308,7 +5361,7 @@ const _ExtendedGDBusPropertyInfo *info; GVariant *variant; g_assert (prop_id != 0 && prop_id - 1 < 2); - info = _goa_oauth_based_property_info_pointers[prop_id - 1]; + info = (const _ExtendedGDBusPropertyInfo *) _goa_oauth_based_property_info_pointers[prop_id - 1]; variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (object), info->parent_struct.name); if (info->use_gvariant) { @@ -5355,7 +5408,7 @@ const _ExtendedGDBusPropertyInfo *info; GVariant *variant; g_assert (prop_id != 0 && prop_id - 1 < 2); - info = _goa_oauth_based_property_info_pointers[prop_id - 1]; + info = (const _ExtendedGDBusPropertyInfo *) _goa_oauth_based_property_info_pointers[prop_id - 1]; variant = g_dbus_gvalue_to_gvariant (value, G_VARIANT_TYPE (info->parent_struct.signature)); g_dbus_proxy_call (G_DBUS_PROXY (object), "org.freedesktop.DBus.Properties.Set", @@ -6066,14 +6119,17 @@ const GValue *value, GParamSpec *pspec) { + const _ExtendedGDBusPropertyInfo *info; GoaOAuthBasedSkeleton *skeleton = GOA_OAUTH_BASED_SKELETON (object); g_assert (prop_id != 0 && prop_id - 1 < 2); + info = (const _ExtendedGDBusPropertyInfo *) _goa_oauth_based_property_info_pointers[prop_id - 1]; g_mutex_lock (&skeleton->priv->lock); g_object_freeze_notify (object); if (!_g_value_equal (value, &skeleton->priv->properties[prop_id - 1])) { - if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL) - _goa_oauth_based_schedule_emit_changed (skeleton, _goa_oauth_based_property_info_pointers[prop_id - 1], prop_id, &skeleton->priv->properties[prop_id - 1]); + if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL && + info->emits_changed_signal) + _goa_oauth_based_schedule_emit_changed (skeleton, info, prop_id, &skeleton->priv->properties[prop_id - 1]); g_value_copy (value, &skeleton->priv->properties[prop_id - 1]); g_object_notify_by_pspec (object, pspec); } @@ -6191,9 +6247,9 @@ FALSE }; -static const _ExtendedGDBusArgInfo * const _goa_password_based_method_info_get_password_IN_ARG_pointers[] = +static const GDBusArgInfo * const _goa_password_based_method_info_get_password_IN_ARG_pointers[] = { - &_goa_password_based_method_info_get_password_IN_ARG_id, + &_goa_password_based_method_info_get_password_IN_ARG_id.parent_struct, NULL }; @@ -6208,9 +6264,9 @@ FALSE }; -static const _ExtendedGDBusArgInfo * const _goa_password_based_method_info_get_password_OUT_ARG_pointers[] = +static const GDBusArgInfo * const _goa_password_based_method_info_get_password_OUT_ARG_pointers[] = { - &_goa_password_based_method_info_get_password_OUT_ARG_password, + &_goa_password_based_method_info_get_password_OUT_ARG_password.parent_struct, NULL }; @@ -6227,9 +6283,9 @@ FALSE }; -static const _ExtendedGDBusMethodInfo * const _goa_password_based_method_info_pointers[] = +static const GDBusMethodInfo * const _goa_password_based_method_info_pointers[] = { - &_goa_password_based_method_info_get_password, + &_goa_password_based_method_info_get_password.parent_struct, NULL }; @@ -6372,7 +6428,7 @@ /** * goa_password_based_call_get_password_finish: * @proxy: A #GoaPasswordBasedProxy. - * @out_password: (out): Return location for return parameter or %NULL to ignore. + * @out_password: (out) (optional): Return location for return parameter or %NULL to ignore. * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to goa_password_based_call_get_password(). * @error: Return location for error or %NULL. * @@ -6405,7 +6461,7 @@ * goa_password_based_call_get_password_sync: * @proxy: A #GoaPasswordBasedProxy. * @arg_id: Argument to pass with the method invocation. - * @out_password: (out): Return location for return parameter or %NULL to ignore. + * @out_password: (out) (optional): Return location for return parameter or %NULL to ignore. * @cancellable: (nullable): A #GCancellable or %NULL. * @error: Return location for error or %NULL. * @@ -7188,13 +7244,13 @@ FALSE }; -static const _ExtendedGDBusArgInfo * const _goa_manager_method_info_add_account_IN_ARG_pointers[] = +static const GDBusArgInfo * const _goa_manager_method_info_add_account_IN_ARG_pointers[] = { - &_goa_manager_method_info_add_account_IN_ARG_provider, - &_goa_manager_method_info_add_account_IN_ARG_identity, - &_goa_manager_method_info_add_account_IN_ARG_presentation_identity, - &_goa_manager_method_info_add_account_IN_ARG_credentials, - &_goa_manager_method_info_add_account_IN_ARG_details, + &_goa_manager_method_info_add_account_IN_ARG_provider.parent_struct, + &_goa_manager_method_info_add_account_IN_ARG_identity.parent_struct, + &_goa_manager_method_info_add_account_IN_ARG_presentation_identity.parent_struct, + &_goa_manager_method_info_add_account_IN_ARG_credentials.parent_struct, + &_goa_manager_method_info_add_account_IN_ARG_details.parent_struct, NULL }; @@ -7209,9 +7265,9 @@ FALSE }; -static const _ExtendedGDBusArgInfo * const _goa_manager_method_info_add_account_OUT_ARG_pointers[] = +static const GDBusArgInfo * const _goa_manager_method_info_add_account_OUT_ARG_pointers[] = { - &_goa_manager_method_info_add_account_OUT_ARG_account_object_path, + &_goa_manager_method_info_add_account_OUT_ARG_account_object_path.parent_struct, NULL }; @@ -7228,9 +7284,9 @@ FALSE }; -static const _ExtendedGDBusMethodInfo * const _goa_manager_method_info_pointers[] = +static const GDBusMethodInfo * const _goa_manager_method_info_pointers[] = { - &_goa_manager_method_info_add_account, + &_goa_manager_method_info_add_account.parent_struct, NULL }; @@ -7377,7 +7433,7 @@ /** * goa_manager_call_add_account_finish: * @proxy: A #GoaManagerProxy. - * @out_account_object_path: (out): Return location for return parameter or %NULL to ignore. + * @out_account_object_path: (out) (optional): Return location for return parameter or %NULL to ignore. * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to goa_manager_call_add_account(). * @error: Return location for error or %NULL. * @@ -7412,7 +7468,7 @@ * @arg_presentation_identity: Argument to pass with the method invocation. * @arg_credentials: Argument to pass with the method invocation. * @arg_details: Argument to pass with the method invocation. - * @out_account_object_path: (out): Return location for return parameter or %NULL to ignore. + * @out_account_object_path: (out) (optional): Return location for return parameter or %NULL to ignore. * @cancellable: (nullable): A #GCancellable or %NULL. * @error: Return location for error or %NULL. * @@ -8132,7 +8188,8 @@ NULL }, "email-address", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_mail_property_info_name = @@ -8145,7 +8202,8 @@ NULL }, "name", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_mail_property_info_imap_supported = @@ -8158,7 +8216,8 @@ NULL }, "imap-supported", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_mail_property_info_imap_accept_ssl_errors = @@ -8171,7 +8230,8 @@ NULL }, "imap-accept-ssl-errors", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_mail_property_info_imap_host = @@ -8184,7 +8244,8 @@ NULL }, "imap-host", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_mail_property_info_imap_use_ssl = @@ -8197,7 +8258,8 @@ NULL }, "imap-use-ssl", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_mail_property_info_imap_use_tls = @@ -8210,7 +8272,8 @@ NULL }, "imap-use-tls", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_mail_property_info_imap_user_name = @@ -8223,7 +8286,8 @@ NULL }, "imap-user-name", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_mail_property_info_smtp_supported = @@ -8236,7 +8300,8 @@ NULL }, "smtp-supported", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_mail_property_info_smtp_accept_ssl_errors = @@ -8249,7 +8314,8 @@ NULL }, "smtp-accept-ssl-errors", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_mail_property_info_smtp_host = @@ -8262,7 +8328,8 @@ NULL }, "smtp-host", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_mail_property_info_smtp_use_auth = @@ -8275,7 +8342,8 @@ NULL }, "smtp-use-auth", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_mail_property_info_smtp_auth_login = @@ -8288,7 +8356,8 @@ NULL }, "smtp-auth-login", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_mail_property_info_smtp_auth_plain = @@ -8301,7 +8370,8 @@ NULL }, "smtp-auth-plain", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_mail_property_info_smtp_auth_xoauth2 = @@ -8314,7 +8384,8 @@ NULL }, "smtp-auth-xoauth2", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_mail_property_info_smtp_use_ssl = @@ -8327,7 +8398,8 @@ NULL }, "smtp-use-ssl", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_mail_property_info_smtp_use_tls = @@ -8340,7 +8412,8 @@ NULL }, "smtp-use-tls", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_mail_property_info_smtp_user_name = @@ -8353,29 +8426,30 @@ NULL }, "smtp-user-name", - FALSE + FALSE, + TRUE }; -static const _ExtendedGDBusPropertyInfo * const _goa_mail_property_info_pointers[] = +static const GDBusPropertyInfo * const _goa_mail_property_info_pointers[] = { - &_goa_mail_property_info_email_address, - &_goa_mail_property_info_name, - &_goa_mail_property_info_imap_supported, - &_goa_mail_property_info_imap_accept_ssl_errors, - &_goa_mail_property_info_imap_host, - &_goa_mail_property_info_imap_use_ssl, - &_goa_mail_property_info_imap_use_tls, - &_goa_mail_property_info_imap_user_name, - &_goa_mail_property_info_smtp_supported, - &_goa_mail_property_info_smtp_accept_ssl_errors, - &_goa_mail_property_info_smtp_host, - &_goa_mail_property_info_smtp_use_auth, - &_goa_mail_property_info_smtp_auth_login, - &_goa_mail_property_info_smtp_auth_plain, - &_goa_mail_property_info_smtp_auth_xoauth2, - &_goa_mail_property_info_smtp_use_ssl, - &_goa_mail_property_info_smtp_use_tls, - &_goa_mail_property_info_smtp_user_name, + &_goa_mail_property_info_email_address.parent_struct, + &_goa_mail_property_info_name.parent_struct, + &_goa_mail_property_info_imap_supported.parent_struct, + &_goa_mail_property_info_imap_accept_ssl_errors.parent_struct, + &_goa_mail_property_info_imap_host.parent_struct, + &_goa_mail_property_info_imap_use_ssl.parent_struct, + &_goa_mail_property_info_imap_use_tls.parent_struct, + &_goa_mail_property_info_imap_user_name.parent_struct, + &_goa_mail_property_info_smtp_supported.parent_struct, + &_goa_mail_property_info_smtp_accept_ssl_errors.parent_struct, + &_goa_mail_property_info_smtp_host.parent_struct, + &_goa_mail_property_info_smtp_use_auth.parent_struct, + &_goa_mail_property_info_smtp_auth_login.parent_struct, + &_goa_mail_property_info_smtp_auth_plain.parent_struct, + &_goa_mail_property_info_smtp_auth_xoauth2.parent_struct, + &_goa_mail_property_info_smtp_use_ssl.parent_struct, + &_goa_mail_property_info_smtp_use_tls.parent_struct, + &_goa_mail_property_info_smtp_user_name.parent_struct, NULL }; @@ -8672,7 +8746,7 @@ * * The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use goa_mail_dup_email_address() if on another thread. * - * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. + * Returns: (transfer none) (nullable): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. */ const gchar * goa_mail_get_email_address (GoaMail *object) @@ -8688,7 +8762,7 @@ * * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side. * - * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). + * Returns: (transfer full) (nullable): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). */ gchar * goa_mail_dup_email_address (GoaMail *object) @@ -8723,7 +8797,7 @@ * * The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use goa_mail_dup_name() if on another thread. * - * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. + * Returns: (transfer none) (nullable): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. * * Since: 3.8.0 */ @@ -8741,7 +8815,7 @@ * * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side. * - * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). + * Returns: (transfer full) (nullable): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). * * Since: 3.8.0 */ @@ -8846,7 +8920,7 @@ * * The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use goa_mail_dup_imap_host() if on another thread. * - * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. + * Returns: (transfer none) (nullable): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. */ const gchar * goa_mail_get_imap_host (GoaMail *object) @@ -8862,7 +8936,7 @@ * * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side. * - * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). + * Returns: (transfer full) (nullable): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). */ gchar * goa_mail_dup_imap_host (GoaMail *object) @@ -8963,7 +9037,7 @@ * * The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use goa_mail_dup_imap_user_name() if on another thread. * - * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. + * Returns: (transfer none) (nullable): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. */ const gchar * goa_mail_get_imap_user_name (GoaMail *object) @@ -8979,7 +9053,7 @@ * * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side. * - * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). + * Returns: (transfer full) (nullable): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). */ gchar * goa_mail_dup_imap_user_name (GoaMail *object) @@ -9080,7 +9154,7 @@ * * The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use goa_mail_dup_smtp_host() if on another thread. * - * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. + * Returns: (transfer none) (nullable): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. */ const gchar * goa_mail_get_smtp_host (GoaMail *object) @@ -9096,7 +9170,7 @@ * * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side. * - * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). + * Returns: (transfer full) (nullable): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). */ gchar * goa_mail_dup_smtp_host (GoaMail *object) @@ -9337,7 +9411,7 @@ * * The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use goa_mail_dup_smtp_user_name() if on another thread. * - * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. + * Returns: (transfer none) (nullable): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. */ const gchar * goa_mail_get_smtp_user_name (GoaMail *object) @@ -9353,7 +9427,7 @@ * * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side. * - * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). + * Returns: (transfer full) (nullable): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). */ gchar * goa_mail_dup_smtp_user_name (GoaMail *object) @@ -9427,7 +9501,7 @@ const _ExtendedGDBusPropertyInfo *info; GVariant *variant; g_assert (prop_id != 0 && prop_id - 1 < 18); - info = _goa_mail_property_info_pointers[prop_id - 1]; + info = (const _ExtendedGDBusPropertyInfo *) _goa_mail_property_info_pointers[prop_id - 1]; variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (object), info->parent_struct.name); if (info->use_gvariant) { @@ -9474,7 +9548,7 @@ const _ExtendedGDBusPropertyInfo *info; GVariant *variant; g_assert (prop_id != 0 && prop_id - 1 < 18); - info = _goa_mail_property_info_pointers[prop_id - 1]; + info = (const _ExtendedGDBusPropertyInfo *) _goa_mail_property_info_pointers[prop_id - 1]; variant = g_dbus_gvalue_to_gvariant (value, G_VARIANT_TYPE (info->parent_struct.signature)); g_dbus_proxy_call (G_DBUS_PROXY (object), "org.freedesktop.DBus.Properties.Set", @@ -10441,14 +10515,17 @@ const GValue *value, GParamSpec *pspec) { + const _ExtendedGDBusPropertyInfo *info; GoaMailSkeleton *skeleton = GOA_MAIL_SKELETON (object); g_assert (prop_id != 0 && prop_id - 1 < 18); + info = (const _ExtendedGDBusPropertyInfo *) _goa_mail_property_info_pointers[prop_id - 1]; g_mutex_lock (&skeleton->priv->lock); g_object_freeze_notify (object); if (!_g_value_equal (value, &skeleton->priv->properties[prop_id - 1])) { - if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL) - _goa_mail_schedule_emit_changed (skeleton, _goa_mail_property_info_pointers[prop_id - 1], prop_id, &skeleton->priv->properties[prop_id - 1]); + if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL && + info->emits_changed_signal) + _goa_mail_schedule_emit_changed (skeleton, info, prop_id, &skeleton->priv->properties[prop_id - 1]); g_value_copy (value, &skeleton->priv->properties[prop_id - 1]); g_object_notify_by_pspec (object, pspec); } @@ -10773,7 +10850,8 @@ NULL }, "accept-ssl-errors", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_calendar_property_info_uri = @@ -10786,13 +10864,14 @@ NULL }, "uri", - FALSE + FALSE, + TRUE }; -static const _ExtendedGDBusPropertyInfo * const _goa_calendar_property_info_pointers[] = +static const GDBusPropertyInfo * const _goa_calendar_property_info_pointers[] = { - &_goa_calendar_property_info_accept_ssl_errors, - &_goa_calendar_property_info_uri, + &_goa_calendar_property_info_accept_ssl_errors.parent_struct, + &_goa_calendar_property_info_uri.parent_struct, NULL }; @@ -10934,7 +11013,7 @@ * * The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use goa_calendar_dup_uri() if on another thread. * - * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. + * Returns: (transfer none) (nullable): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. * * Since: 3.8.0 */ @@ -10952,7 +11031,7 @@ * * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side. * - * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). + * Returns: (transfer full) (nullable): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). * * Since: 3.8.0 */ @@ -11030,7 +11109,7 @@ const _ExtendedGDBusPropertyInfo *info; GVariant *variant; g_assert (prop_id != 0 && prop_id - 1 < 2); - info = _goa_calendar_property_info_pointers[prop_id - 1]; + info = (const _ExtendedGDBusPropertyInfo *) _goa_calendar_property_info_pointers[prop_id - 1]; variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (object), info->parent_struct.name); if (info->use_gvariant) { @@ -11077,7 +11156,7 @@ const _ExtendedGDBusPropertyInfo *info; GVariant *variant; g_assert (prop_id != 0 && prop_id - 1 < 2); - info = _goa_calendar_property_info_pointers[prop_id - 1]; + info = (const _ExtendedGDBusPropertyInfo *) _goa_calendar_property_info_pointers[prop_id - 1]; variant = g_dbus_gvalue_to_gvariant (value, G_VARIANT_TYPE (info->parent_struct.signature)); g_dbus_proxy_call (G_DBUS_PROXY (object), "org.freedesktop.DBus.Properties.Set", @@ -11788,14 +11867,17 @@ const GValue *value, GParamSpec *pspec) { + const _ExtendedGDBusPropertyInfo *info; GoaCalendarSkeleton *skeleton = GOA_CALENDAR_SKELETON (object); g_assert (prop_id != 0 && prop_id - 1 < 2); + info = (const _ExtendedGDBusPropertyInfo *) _goa_calendar_property_info_pointers[prop_id - 1]; g_mutex_lock (&skeleton->priv->lock); g_object_freeze_notify (object); if (!_g_value_equal (value, &skeleton->priv->properties[prop_id - 1])) { - if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL) - _goa_calendar_schedule_emit_changed (skeleton, _goa_calendar_property_info_pointers[prop_id - 1], prop_id, &skeleton->priv->properties[prop_id - 1]); + if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL && + info->emits_changed_signal) + _goa_calendar_schedule_emit_changed (skeleton, info, prop_id, &skeleton->priv->properties[prop_id - 1]); g_value_copy (value, &skeleton->priv->properties[prop_id - 1]); g_object_notify_by_pspec (object, pspec); } @@ -11912,7 +11994,8 @@ NULL }, "accept-ssl-errors", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_contacts_property_info_uri = @@ -11925,13 +12008,14 @@ NULL }, "uri", - FALSE + FALSE, + TRUE }; -static const _ExtendedGDBusPropertyInfo * const _goa_contacts_property_info_pointers[] = +static const GDBusPropertyInfo * const _goa_contacts_property_info_pointers[] = { - &_goa_contacts_property_info_accept_ssl_errors, - &_goa_contacts_property_info_uri, + &_goa_contacts_property_info_accept_ssl_errors.parent_struct, + &_goa_contacts_property_info_uri.parent_struct, NULL }; @@ -12073,7 +12157,7 @@ * * The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use goa_contacts_dup_uri() if on another thread. * - * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. + * Returns: (transfer none) (nullable): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. * * Since: 3.8.0 */ @@ -12091,7 +12175,7 @@ * * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side. * - * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). + * Returns: (transfer full) (nullable): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). * * Since: 3.8.0 */ @@ -12169,7 +12253,7 @@ const _ExtendedGDBusPropertyInfo *info; GVariant *variant; g_assert (prop_id != 0 && prop_id - 1 < 2); - info = _goa_contacts_property_info_pointers[prop_id - 1]; + info = (const _ExtendedGDBusPropertyInfo *) _goa_contacts_property_info_pointers[prop_id - 1]; variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (object), info->parent_struct.name); if (info->use_gvariant) { @@ -12216,7 +12300,7 @@ const _ExtendedGDBusPropertyInfo *info; GVariant *variant; g_assert (prop_id != 0 && prop_id - 1 < 2); - info = _goa_contacts_property_info_pointers[prop_id - 1]; + info = (const _ExtendedGDBusPropertyInfo *) _goa_contacts_property_info_pointers[prop_id - 1]; variant = g_dbus_gvalue_to_gvariant (value, G_VARIANT_TYPE (info->parent_struct.signature)); g_dbus_proxy_call (G_DBUS_PROXY (object), "org.freedesktop.DBus.Properties.Set", @@ -12927,14 +13011,17 @@ const GValue *value, GParamSpec *pspec) { + const _ExtendedGDBusPropertyInfo *info; GoaContactsSkeleton *skeleton = GOA_CONTACTS_SKELETON (object); g_assert (prop_id != 0 && prop_id - 1 < 2); + info = (const _ExtendedGDBusPropertyInfo *) _goa_contacts_property_info_pointers[prop_id - 1]; g_mutex_lock (&skeleton->priv->lock); g_object_freeze_notify (object); if (!_g_value_equal (value, &skeleton->priv->properties[prop_id - 1])) { - if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL) - _goa_contacts_schedule_emit_changed (skeleton, _goa_contacts_property_info_pointers[prop_id - 1], prop_id, &skeleton->priv->properties[prop_id - 1]); + if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL && + info->emits_changed_signal) + _goa_contacts_schedule_emit_changed (skeleton, info, prop_id, &skeleton->priv->properties[prop_id - 1]); g_value_copy (value, &skeleton->priv->properties[prop_id - 1]); g_object_notify_by_pspec (object, pspec); } @@ -16691,7 +16778,8 @@ NULL }, "accept-ssl-errors", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_files_property_info_uri = @@ -16704,13 +16792,14 @@ NULL }, "uri", - FALSE + FALSE, + TRUE }; -static const _ExtendedGDBusPropertyInfo * const _goa_files_property_info_pointers[] = +static const GDBusPropertyInfo * const _goa_files_property_info_pointers[] = { - &_goa_files_property_info_accept_ssl_errors, - &_goa_files_property_info_uri, + &_goa_files_property_info_accept_ssl_errors.parent_struct, + &_goa_files_property_info_uri.parent_struct, NULL }; @@ -16860,7 +16949,7 @@ * * The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use goa_files_dup_uri() if on another thread. * - * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. + * Returns: (transfer none) (nullable): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. * * Since: 3.8.0 */ @@ -16878,7 +16967,7 @@ * * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side. * - * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). + * Returns: (transfer full) (nullable): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). * * Since: 3.8.0 */ @@ -16960,7 +17049,7 @@ const _ExtendedGDBusPropertyInfo *info; GVariant *variant; g_assert (prop_id != 0 && prop_id - 1 < 2); - info = _goa_files_property_info_pointers[prop_id - 1]; + info = (const _ExtendedGDBusPropertyInfo *) _goa_files_property_info_pointers[prop_id - 1]; variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (object), info->parent_struct.name); if (info->use_gvariant) { @@ -17007,7 +17096,7 @@ const _ExtendedGDBusPropertyInfo *info; GVariant *variant; g_assert (prop_id != 0 && prop_id - 1 < 2); - info = _goa_files_property_info_pointers[prop_id - 1]; + info = (const _ExtendedGDBusPropertyInfo *) _goa_files_property_info_pointers[prop_id - 1]; variant = g_dbus_gvalue_to_gvariant (value, G_VARIANT_TYPE (info->parent_struct.signature)); g_dbus_proxy_call (G_DBUS_PROXY (object), "org.freedesktop.DBus.Properties.Set", @@ -17734,14 +17823,17 @@ const GValue *value, GParamSpec *pspec) { + const _ExtendedGDBusPropertyInfo *info; GoaFilesSkeleton *skeleton = GOA_FILES_SKELETON (object); g_assert (prop_id != 0 && prop_id - 1 < 2); + info = (const _ExtendedGDBusPropertyInfo *) _goa_files_property_info_pointers[prop_id - 1]; g_mutex_lock (&skeleton->priv->lock); g_object_freeze_notify (object); if (!_g_value_equal (value, &skeleton->priv->properties[prop_id - 1])) { - if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL) - _goa_files_schedule_emit_changed (skeleton, _goa_files_property_info_pointers[prop_id - 1], prop_id, &skeleton->priv->properties[prop_id - 1]); + if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL && + info->emits_changed_signal) + _goa_files_schedule_emit_changed (skeleton, info, prop_id, &skeleton->priv->properties[prop_id - 1]); g_value_copy (value, &skeleton->priv->properties[prop_id - 1]); g_object_notify_by_pspec (object, pspec); } @@ -17860,7 +17952,8 @@ NULL }, "accept-ssl-errors", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_exchange_property_info_host = @@ -17873,13 +17966,14 @@ NULL }, "host", - FALSE + FALSE, + TRUE }; -static const _ExtendedGDBusPropertyInfo * const _goa_exchange_property_info_pointers[] = +static const GDBusPropertyInfo * const _goa_exchange_property_info_pointers[] = { - &_goa_exchange_property_info_accept_ssl_errors, - &_goa_exchange_property_info_host, + &_goa_exchange_property_info_accept_ssl_errors.parent_struct, + &_goa_exchange_property_info_host.parent_struct, NULL }; @@ -18029,7 +18123,7 @@ * * The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use goa_exchange_dup_host() if on another thread. * - * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. + * Returns: (transfer none) (nullable): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. * * Since: 3.6.0 */ @@ -18047,7 +18141,7 @@ * * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side. * - * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). + * Returns: (transfer full) (nullable): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). * * Since: 3.6.0 */ @@ -18129,7 +18223,7 @@ const _ExtendedGDBusPropertyInfo *info; GVariant *variant; g_assert (prop_id != 0 && prop_id - 1 < 2); - info = _goa_exchange_property_info_pointers[prop_id - 1]; + info = (const _ExtendedGDBusPropertyInfo *) _goa_exchange_property_info_pointers[prop_id - 1]; variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (object), info->parent_struct.name); if (info->use_gvariant) { @@ -18176,7 +18270,7 @@ const _ExtendedGDBusPropertyInfo *info; GVariant *variant; g_assert (prop_id != 0 && prop_id - 1 < 2); - info = _goa_exchange_property_info_pointers[prop_id - 1]; + info = (const _ExtendedGDBusPropertyInfo *) _goa_exchange_property_info_pointers[prop_id - 1]; variant = g_dbus_gvalue_to_gvariant (value, G_VARIANT_TYPE (info->parent_struct.signature)); g_dbus_proxy_call (G_DBUS_PROXY (object), "org.freedesktop.DBus.Properties.Set", @@ -18903,14 +18997,17 @@ const GValue *value, GParamSpec *pspec) { + const _ExtendedGDBusPropertyInfo *info; GoaExchangeSkeleton *skeleton = GOA_EXCHANGE_SKELETON (object); g_assert (prop_id != 0 && prop_id - 1 < 2); + info = (const _ExtendedGDBusPropertyInfo *) _goa_exchange_property_info_pointers[prop_id - 1]; g_mutex_lock (&skeleton->priv->lock); g_object_freeze_notify (object); if (!_g_value_equal (value, &skeleton->priv->properties[prop_id - 1])) { - if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL) - _goa_exchange_schedule_emit_changed (skeleton, _goa_exchange_property_info_pointers[prop_id - 1], prop_id, &skeleton->priv->properties[prop_id - 1]); + if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL && + info->emits_changed_signal) + _goa_exchange_schedule_emit_changed (skeleton, info, prop_id, &skeleton->priv->properties[prop_id - 1]); g_value_copy (value, &skeleton->priv->properties[prop_id - 1]); g_object_notify_by_pspec (object, pspec); } @@ -19029,7 +19126,8 @@ NULL }, "dlna-supported", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_media_server_property_info_udn = @@ -19042,13 +19140,14 @@ NULL }, "udn", - FALSE + FALSE, + TRUE }; -static const _ExtendedGDBusPropertyInfo * const _goa_media_server_property_info_pointers[] = +static const GDBusPropertyInfo * const _goa_media_server_property_info_pointers[] = { - &_goa_media_server_property_info_dlna_supported, - &_goa_media_server_property_info_udn, + &_goa_media_server_property_info_dlna_supported.parent_struct, + &_goa_media_server_property_info_udn.parent_struct, NULL }; @@ -19198,7 +19297,7 @@ * * The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use goa_media_server_dup_udn() if on another thread. * - * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. + * Returns: (transfer none) (nullable): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. * * Since: 3.14 */ @@ -19216,7 +19315,7 @@ * * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side. * - * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). + * Returns: (transfer full) (nullable): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). * * Since: 3.14 */ @@ -19298,7 +19397,7 @@ const _ExtendedGDBusPropertyInfo *info; GVariant *variant; g_assert (prop_id != 0 && prop_id - 1 < 2); - info = _goa_media_server_property_info_pointers[prop_id - 1]; + info = (const _ExtendedGDBusPropertyInfo *) _goa_media_server_property_info_pointers[prop_id - 1]; variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (object), info->parent_struct.name); if (info->use_gvariant) { @@ -19345,7 +19444,7 @@ const _ExtendedGDBusPropertyInfo *info; GVariant *variant; g_assert (prop_id != 0 && prop_id - 1 < 2); - info = _goa_media_server_property_info_pointers[prop_id - 1]; + info = (const _ExtendedGDBusPropertyInfo *) _goa_media_server_property_info_pointers[prop_id - 1]; variant = g_dbus_gvalue_to_gvariant (value, G_VARIANT_TYPE (info->parent_struct.signature)); g_dbus_proxy_call (G_DBUS_PROXY (object), "org.freedesktop.DBus.Properties.Set", @@ -20072,14 +20171,17 @@ const GValue *value, GParamSpec *pspec) { + const _ExtendedGDBusPropertyInfo *info; GoaMediaServerSkeleton *skeleton = GOA_MEDIA_SERVER_SKELETON (object); g_assert (prop_id != 0 && prop_id - 1 < 2); + info = (const _ExtendedGDBusPropertyInfo *) _goa_media_server_property_info_pointers[prop_id - 1]; g_mutex_lock (&skeleton->priv->lock); g_object_freeze_notify (object); if (!_g_value_equal (value, &skeleton->priv->properties[prop_id - 1])) { - if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL) - _goa_media_server_schedule_emit_changed (skeleton, _goa_media_server_property_info_pointers[prop_id - 1], prop_id, &skeleton->priv->properties[prop_id - 1]); + if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL && + info->emits_changed_signal) + _goa_media_server_schedule_emit_changed (skeleton, info, prop_id, &skeleton->priv->properties[prop_id - 1]); g_value_copy (value, &skeleton->priv->properties[prop_id - 1]); g_object_notify_by_pspec (object, pspec); } @@ -20201,9 +20303,9 @@ FALSE }; -static const _ExtendedGDBusMethodInfo * const _goa_ticketing_method_info_pointers[] = +static const GDBusMethodInfo * const _goa_ticketing_method_info_pointers[] = { - &_goa_ticketing_method_info_get_ticket, + &_goa_ticketing_method_info_get_ticket.parent_struct, NULL }; @@ -20217,12 +20319,13 @@ NULL }, "details", - FALSE + FALSE, + TRUE }; -static const _ExtendedGDBusPropertyInfo * const _goa_ticketing_property_info_pointers[] = +static const GDBusPropertyInfo * const _goa_ticketing_property_info_pointers[] = { - &_goa_ticketing_property_info_details, + &_goa_ticketing_property_info_details.parent_struct, NULL }; @@ -20350,7 +20453,7 @@ * * The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use goa_ticketing_dup_details() if on another thread. * - * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. + * Returns: (transfer none) (nullable): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. * * Since: 3.18 */ @@ -20368,7 +20471,7 @@ * * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side. * - * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_variant_unref(). + * Returns: (transfer full) (nullable): The property value or %NULL if the property is not set. The returned value should be freed with g_variant_unref(). * * Since: 3.18 */ @@ -20568,7 +20671,7 @@ const _ExtendedGDBusPropertyInfo *info; GVariant *variant; g_assert (prop_id != 0 && prop_id - 1 < 1); - info = _goa_ticketing_property_info_pointers[prop_id - 1]; + info = (const _ExtendedGDBusPropertyInfo *) _goa_ticketing_property_info_pointers[prop_id - 1]; variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (object), info->parent_struct.name); if (info->use_gvariant) { @@ -20615,7 +20718,7 @@ const _ExtendedGDBusPropertyInfo *info; GVariant *variant; g_assert (prop_id != 0 && prop_id - 1 < 1); - info = _goa_ticketing_property_info_pointers[prop_id - 1]; + info = (const _ExtendedGDBusPropertyInfo *) _goa_ticketing_property_info_pointers[prop_id - 1]; variant = g_dbus_gvalue_to_gvariant (value, G_VARIANT_TYPE (info->parent_struct.signature)); g_dbus_proxy_call (G_DBUS_PROXY (object), "org.freedesktop.DBus.Properties.Set", @@ -21324,14 +21427,17 @@ const GValue *value, GParamSpec *pspec) { + const _ExtendedGDBusPropertyInfo *info; GoaTicketingSkeleton *skeleton = GOA_TICKETING_SKELETON (object); g_assert (prop_id != 0 && prop_id - 1 < 1); + info = (const _ExtendedGDBusPropertyInfo *) _goa_ticketing_property_info_pointers[prop_id - 1]; g_mutex_lock (&skeleton->priv->lock); g_object_freeze_notify (object); if (!_g_value_equal (value, &skeleton->priv->properties[prop_id - 1])) { - if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL) - _goa_ticketing_schedule_emit_changed (skeleton, _goa_ticketing_property_info_pointers[prop_id - 1], prop_id, &skeleton->priv->properties[prop_id - 1]); + if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL && + info->emits_changed_signal) + _goa_ticketing_schedule_emit_changed (skeleton, info, prop_id, &skeleton->priv->properties[prop_id - 1]); g_value_copy (value, &skeleton->priv->properties[prop_id - 1]); g_object_notify_by_pspec (object, pspec); } @@ -21427,6 +21533,20 @@ /* ---- Introspection data for org.gnome.OnlineAccounts.Todo ---- */ +static const GDBusAnnotationInfo _goa_todo_annotation_info_0 = +{ + -1, + (gchar *) "org.freedesktop.DBus.Deprecated", + (gchar *) "true", + NULL +}; + +static const GDBusAnnotationInfo * const _goa_todo_annotation_info_pointers[] = +{ + &_goa_todo_annotation_info_0, + NULL +}; + static const _ExtendedGDBusInterfaceInfo _goa_todo_interface_info = { { @@ -21435,7 +21555,7 @@ NULL, NULL, NULL, - NULL + (GDBusAnnotationInfo **) &_goa_todo_annotation_info_pointers }, "todo", }; @@ -21449,6 +21569,8 @@ * Returns: (transfer none): A #GDBusInterfaceInfo. Do not free. * * Since: 3.26.0 + * + * Deprecated: The D-Bus interface has been deprecated. */ GDBusInterfaceInfo * goa_todo_interface_info (void) @@ -21467,6 +21589,8 @@ * Returns: The last property id. * * Since: 3.26.0 + * + * Deprecated: The D-Bus interface has been deprecated. */ guint goa_todo_override_properties (GObjectClass *klass, guint property_id_begin) @@ -21482,6 +21606,8 @@ * Abstract interface type for the D-Bus interface org.gnome.OnlineAccounts.Todo. * * Since: 3.26.0 + * + * Deprecated: The D-Bus interface has been deprecated. */ /** @@ -21491,6 +21617,8 @@ * Virtual table for the D-Bus interface org.gnome.OnlineAccounts.Todo. * * Since: 3.26.0 + * + * Deprecated: The D-Bus interface has been deprecated. */ typedef GoaTodoIface GoaTodoInterface; @@ -21509,6 +21637,8 @@ * The #GoaTodoProxy structure contains only private data and should only be accessed using the provided API. * * Since: 3.26.0 + * + * Deprecated: The D-Bus interface has been deprecated. */ /** @@ -21518,6 +21648,8 @@ * Class structure for #GoaTodoProxy. * * Since: 3.26.0 + * + * Deprecated: The D-Bus interface has been deprecated. */ struct _GoaTodoProxyPrivate @@ -21686,6 +21818,8 @@ * See goa_todo_proxy_new_sync() for the synchronous, blocking version of this constructor. * * Since: 3.26.0 + * + * Deprecated: The D-Bus interface has been deprecated. */ void goa_todo_proxy_new ( @@ -21710,6 +21844,8 @@ * Returns: (transfer full) (type GoaTodoProxy): The constructed proxy object or %NULL if @error is set. * * Since: 3.26.0 + * + * Deprecated: The D-Bus interface has been deprecated. */ GoaTodo * goa_todo_proxy_new_finish ( @@ -21745,6 +21881,8 @@ * Returns: (transfer full) (type GoaTodoProxy): The constructed proxy object or %NULL if @error is set. * * Since: 3.26.0 + * + * Deprecated: The D-Bus interface has been deprecated. */ GoaTodo * goa_todo_proxy_new_sync ( @@ -21782,6 +21920,8 @@ * See goa_todo_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor. * * Since: 3.26.0 + * + * Deprecated: The D-Bus interface has been deprecated. */ void goa_todo_proxy_new_for_bus ( @@ -21806,6 +21946,8 @@ * Returns: (transfer full) (type GoaTodoProxy): The constructed proxy object or %NULL if @error is set. * * Since: 3.26.0 + * + * Deprecated: The D-Bus interface has been deprecated. */ GoaTodo * goa_todo_proxy_new_for_bus_finish ( @@ -21841,6 +21983,8 @@ * Returns: (transfer full) (type GoaTodoProxy): The constructed proxy object or %NULL if @error is set. * * Since: 3.26.0 + * + * Deprecated: The D-Bus interface has been deprecated. */ GoaTodo * goa_todo_proxy_new_for_bus_sync ( @@ -21868,6 +22012,8 @@ * The #GoaTodoSkeleton structure contains only private data and should only be accessed using the provided API. * * Since: 3.26.0 + * + * Deprecated: The D-Bus interface has been deprecated. */ /** @@ -21877,6 +22023,8 @@ * Class structure for #GoaTodoSkeleton. * * Since: 3.26.0 + * + * Deprecated: The D-Bus interface has been deprecated. */ struct _GoaTodoSkeletonPrivate @@ -22145,6 +22293,8 @@ * Returns: (transfer full) (type GoaTodoSkeleton): The skeleton object. * * Since: 3.26.0 + * + * Deprecated: The D-Bus interface has been deprecated. */ GoaTodo * goa_todo_skeleton_new (void) @@ -23671,7 +23821,7 @@ * * Connect to the #GObject::notify signal to get informed of property changes. */ - g_object_interface_install_property (iface, g_param_spec_object ("account", "account", "account", GOA_TYPE_ACCOUNT, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS)); + g_object_interface_install_property (iface, g_param_spec_object ("account", "account", "account", GOA_TYPE_ACCOUNT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GoaObject:oauth2-based: @@ -23680,7 +23830,7 @@ * * Connect to the #GObject::notify signal to get informed of property changes. */ - g_object_interface_install_property (iface, g_param_spec_object ("oauth2-based", "oauth2-based", "oauth2-based", GOA_TYPE_OAUTH2_BASED, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS)); + g_object_interface_install_property (iface, g_param_spec_object ("oauth2-based", "oauth2-based", "oauth2-based", GOA_TYPE_OAUTH2_BASED, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GoaObject:oauth-based: @@ -23689,7 +23839,7 @@ * * Connect to the #GObject::notify signal to get informed of property changes. */ - g_object_interface_install_property (iface, g_param_spec_object ("oauth-based", "oauth-based", "oauth-based", GOA_TYPE_OAUTH_BASED, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS)); + g_object_interface_install_property (iface, g_param_spec_object ("oauth-based", "oauth-based", "oauth-based", GOA_TYPE_OAUTH_BASED, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GoaObject:password-based: @@ -23700,7 +23850,7 @@ * * Since: 3.6.0 */ - g_object_interface_install_property (iface, g_param_spec_object ("password-based", "password-based", "password-based", GOA_TYPE_PASSWORD_BASED, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS)); + g_object_interface_install_property (iface, g_param_spec_object ("password-based", "password-based", "password-based", GOA_TYPE_PASSWORD_BASED, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GoaObject:manager: @@ -23709,7 +23859,7 @@ * * Connect to the #GObject::notify signal to get informed of property changes. */ - g_object_interface_install_property (iface, g_param_spec_object ("manager", "manager", "manager", GOA_TYPE_MANAGER, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS)); + g_object_interface_install_property (iface, g_param_spec_object ("manager", "manager", "manager", GOA_TYPE_MANAGER, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GoaObject:mail: @@ -23718,7 +23868,7 @@ * * Connect to the #GObject::notify signal to get informed of property changes. */ - g_object_interface_install_property (iface, g_param_spec_object ("mail", "mail", "mail", GOA_TYPE_MAIL, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS)); + g_object_interface_install_property (iface, g_param_spec_object ("mail", "mail", "mail", GOA_TYPE_MAIL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GoaObject:calendar: @@ -23727,7 +23877,7 @@ * * Connect to the #GObject::notify signal to get informed of property changes. */ - g_object_interface_install_property (iface, g_param_spec_object ("calendar", "calendar", "calendar", GOA_TYPE_CALENDAR, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS)); + g_object_interface_install_property (iface, g_param_spec_object ("calendar", "calendar", "calendar", GOA_TYPE_CALENDAR, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GoaObject:contacts: @@ -23736,7 +23886,7 @@ * * Connect to the #GObject::notify signal to get informed of property changes. */ - g_object_interface_install_property (iface, g_param_spec_object ("contacts", "contacts", "contacts", GOA_TYPE_CONTACTS, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS)); + g_object_interface_install_property (iface, g_param_spec_object ("contacts", "contacts", "contacts", GOA_TYPE_CONTACTS, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GoaObject:chat: @@ -23745,7 +23895,7 @@ * * Connect to the #GObject::notify signal to get informed of property changes. */ - g_object_interface_install_property (iface, g_param_spec_object ("chat", "chat", "chat", GOA_TYPE_CHAT, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS)); + g_object_interface_install_property (iface, g_param_spec_object ("chat", "chat", "chat", GOA_TYPE_CHAT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GoaObject:documents: @@ -23754,7 +23904,7 @@ * * Connect to the #GObject::notify signal to get informed of property changes. */ - g_object_interface_install_property (iface, g_param_spec_object ("documents", "documents", "documents", GOA_TYPE_DOCUMENTS, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS)); + g_object_interface_install_property (iface, g_param_spec_object ("documents", "documents", "documents", GOA_TYPE_DOCUMENTS, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GoaObject:maps: @@ -23765,7 +23915,7 @@ * * Since: 3.14.0 */ - g_object_interface_install_property (iface, g_param_spec_object ("maps", "maps", "maps", GOA_TYPE_MAPS, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS)); + g_object_interface_install_property (iface, g_param_spec_object ("maps", "maps", "maps", GOA_TYPE_MAPS, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GoaObject:music: @@ -23776,7 +23926,7 @@ * * Since: 3.18.0 */ - g_object_interface_install_property (iface, g_param_spec_object ("music", "music", "music", GOA_TYPE_MUSIC, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS)); + g_object_interface_install_property (iface, g_param_spec_object ("music", "music", "music", GOA_TYPE_MUSIC, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GoaObject:photos: @@ -23787,7 +23937,7 @@ * * Since: 3.8.0 */ - g_object_interface_install_property (iface, g_param_spec_object ("photos", "photos", "photos", GOA_TYPE_PHOTOS, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS)); + g_object_interface_install_property (iface, g_param_spec_object ("photos", "photos", "photos", GOA_TYPE_PHOTOS, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GoaObject:files: @@ -23798,7 +23948,7 @@ * * Since: 3.8.0 */ - g_object_interface_install_property (iface, g_param_spec_object ("files", "files", "files", GOA_TYPE_FILES, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS)); + g_object_interface_install_property (iface, g_param_spec_object ("files", "files", "files", GOA_TYPE_FILES, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GoaObject:exchange: @@ -23809,7 +23959,7 @@ * * Since: 3.6.0 */ - g_object_interface_install_property (iface, g_param_spec_object ("exchange", "exchange", "exchange", GOA_TYPE_EXCHANGE, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS)); + g_object_interface_install_property (iface, g_param_spec_object ("exchange", "exchange", "exchange", GOA_TYPE_EXCHANGE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GoaObject:media-server: @@ -23820,7 +23970,7 @@ * * Since: 3.14 */ - g_object_interface_install_property (iface, g_param_spec_object ("media-server", "media-server", "media-server", GOA_TYPE_MEDIA_SERVER, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS)); + g_object_interface_install_property (iface, g_param_spec_object ("media-server", "media-server", "media-server", GOA_TYPE_MEDIA_SERVER, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GoaObject:ticketing: @@ -23831,7 +23981,7 @@ * * Since: 3.6.0 */ - g_object_interface_install_property (iface, g_param_spec_object ("ticketing", "ticketing", "ticketing", GOA_TYPE_TICKETING, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS)); + g_object_interface_install_property (iface, g_param_spec_object ("ticketing", "ticketing", "ticketing", GOA_TYPE_TICKETING, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GoaObject:todo: @@ -23841,8 +23991,10 @@ * Connect to the #GObject::notify signal to get informed of property changes. * * Since: 3.26.0 + * + * Deprecated: The D-Bus interface has been deprecated. */ - g_object_interface_install_property (iface, g_param_spec_object ("todo", "todo", "todo", GOA_TYPE_TODO, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS)); + g_object_interface_install_property (iface, g_param_spec_object ("todo", "todo", "todo", GOA_TYPE_TODO, G_PARAM_DEPRECATED | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GoaObject:read-later: @@ -23853,7 +24005,7 @@ * * Since: 3.12.0 */ - g_object_interface_install_property (iface, g_param_spec_object ("read-later", "read-later", "read-later", GOA_TYPE_READ_LATER, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS)); + g_object_interface_install_property (iface, g_param_spec_object ("read-later", "read-later", "read-later", GOA_TYPE_READ_LATER, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GoaObject:printers: @@ -23864,7 +24016,7 @@ * * Since: 3.12.0 */ - g_object_interface_install_property (iface, g_param_spec_object ("printers", "printers", "printers", GOA_TYPE_PRINTERS, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS)); + g_object_interface_install_property (iface, g_param_spec_object ("printers", "printers", "printers", GOA_TYPE_PRINTERS, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); } @@ -23874,7 +24026,7 @@ * * Gets the #GoaAccount instance for the D-Bus interface org.gnome.OnlineAccounts.Account on @object, if any. * - * Returns: (transfer full): A #GoaAccount that must be freed with g_object_unref() or %NULL if @object does not implement the interface. + * Returns: (transfer full) (nullable): A #GoaAccount that must be freed with g_object_unref() or %NULL if @object does not implement the interface. */ GoaAccount *goa_object_get_account (GoaObject *object) { @@ -23891,7 +24043,7 @@ * * Gets the #GoaOAuth2Based instance for the D-Bus interface org.gnome.OnlineAccounts.OAuth2Based on @object, if any. * - * Returns: (transfer full): A #GoaOAuth2Based that must be freed with g_object_unref() or %NULL if @object does not implement the interface. + * Returns: (transfer full) (nullable): A #GoaOAuth2Based that must be freed with g_object_unref() or %NULL if @object does not implement the interface. */ GoaOAuth2Based *goa_object_get_oauth2_based (GoaObject *object) { @@ -23908,7 +24060,7 @@ * * Gets the #GoaOAuthBased instance for the D-Bus interface org.gnome.OnlineAccounts.OAuthBased on @object, if any. * - * Returns: (transfer full): A #GoaOAuthBased that must be freed with g_object_unref() or %NULL if @object does not implement the interface. + * Returns: (transfer full) (nullable): A #GoaOAuthBased that must be freed with g_object_unref() or %NULL if @object does not implement the interface. */ GoaOAuthBased *goa_object_get_oauth_based (GoaObject *object) { @@ -23925,7 +24077,7 @@ * * Gets the #GoaPasswordBased instance for the D-Bus interface org.gnome.OnlineAccounts.PasswordBased on @object, if any. * - * Returns: (transfer full): A #GoaPasswordBased that must be freed with g_object_unref() or %NULL if @object does not implement the interface. + * Returns: (transfer full) (nullable): A #GoaPasswordBased that must be freed with g_object_unref() or %NULL if @object does not implement the interface. * * Since: 3.6.0 */ @@ -23944,7 +24096,7 @@ * * Gets the #GoaManager instance for the D-Bus interface org.gnome.OnlineAccounts.Manager on @object, if any. * - * Returns: (transfer full): A #GoaManager that must be freed with g_object_unref() or %NULL if @object does not implement the interface. + * Returns: (transfer full) (nullable): A #GoaManager that must be freed with g_object_unref() or %NULL if @object does not implement the interface. */ GoaManager *goa_object_get_manager (GoaObject *object) { @@ -23961,7 +24113,7 @@ * * Gets the #GoaMail instance for the D-Bus interface org.gnome.OnlineAccounts.Mail on @object, if any. * - * Returns: (transfer full): A #GoaMail that must be freed with g_object_unref() or %NULL if @object does not implement the interface. + * Returns: (transfer full) (nullable): A #GoaMail that must be freed with g_object_unref() or %NULL if @object does not implement the interface. */ GoaMail *goa_object_get_mail (GoaObject *object) { @@ -23978,7 +24130,7 @@ * * Gets the #GoaCalendar instance for the D-Bus interface org.gnome.OnlineAccounts.Calendar on @object, if any. * - * Returns: (transfer full): A #GoaCalendar that must be freed with g_object_unref() or %NULL if @object does not implement the interface. + * Returns: (transfer full) (nullable): A #GoaCalendar that must be freed with g_object_unref() or %NULL if @object does not implement the interface. */ GoaCalendar *goa_object_get_calendar (GoaObject *object) { @@ -23995,7 +24147,7 @@ * * Gets the #GoaContacts instance for the D-Bus interface org.gnome.OnlineAccounts.Contacts on @object, if any. * - * Returns: (transfer full): A #GoaContacts that must be freed with g_object_unref() or %NULL if @object does not implement the interface. + * Returns: (transfer full) (nullable): A #GoaContacts that must be freed with g_object_unref() or %NULL if @object does not implement the interface. */ GoaContacts *goa_object_get_contacts (GoaObject *object) { @@ -24012,7 +24164,7 @@ * * Gets the #GoaChat instance for the D-Bus interface org.gnome.OnlineAccounts.Chat on @object, if any. * - * Returns: (transfer full): A #GoaChat that must be freed with g_object_unref() or %NULL if @object does not implement the interface. + * Returns: (transfer full) (nullable): A #GoaChat that must be freed with g_object_unref() or %NULL if @object does not implement the interface. */ GoaChat *goa_object_get_chat (GoaObject *object) { @@ -24029,7 +24181,7 @@ * * Gets the #GoaDocuments instance for the D-Bus interface org.gnome.OnlineAccounts.Documents on @object, if any. * - * Returns: (transfer full): A #GoaDocuments that must be freed with g_object_unref() or %NULL if @object does not implement the interface. + * Returns: (transfer full) (nullable): A #GoaDocuments that must be freed with g_object_unref() or %NULL if @object does not implement the interface. */ GoaDocuments *goa_object_get_documents (GoaObject *object) { @@ -24046,7 +24198,7 @@ * * Gets the #GoaMaps instance for the D-Bus interface org.gnome.OnlineAccounts.Maps on @object, if any. * - * Returns: (transfer full): A #GoaMaps that must be freed with g_object_unref() or %NULL if @object does not implement the interface. + * Returns: (transfer full) (nullable): A #GoaMaps that must be freed with g_object_unref() or %NULL if @object does not implement the interface. * * Since: 3.14.0 */ @@ -24065,7 +24217,7 @@ * * Gets the #GoaMusic instance for the D-Bus interface org.gnome.OnlineAccounts.Music on @object, if any. * - * Returns: (transfer full): A #GoaMusic that must be freed with g_object_unref() or %NULL if @object does not implement the interface. + * Returns: (transfer full) (nullable): A #GoaMusic that must be freed with g_object_unref() or %NULL if @object does not implement the interface. * * Since: 3.18.0 */ @@ -24084,7 +24236,7 @@ * * Gets the #GoaPhotos instance for the D-Bus interface org.gnome.OnlineAccounts.Photos on @object, if any. * - * Returns: (transfer full): A #GoaPhotos that must be freed with g_object_unref() or %NULL if @object does not implement the interface. + * Returns: (transfer full) (nullable): A #GoaPhotos that must be freed with g_object_unref() or %NULL if @object does not implement the interface. * * Since: 3.8.0 */ @@ -24103,7 +24255,7 @@ * * Gets the #GoaFiles instance for the D-Bus interface org.gnome.OnlineAccounts.Files on @object, if any. * - * Returns: (transfer full): A #GoaFiles that must be freed with g_object_unref() or %NULL if @object does not implement the interface. + * Returns: (transfer full) (nullable): A #GoaFiles that must be freed with g_object_unref() or %NULL if @object does not implement the interface. * * Since: 3.8.0 */ @@ -24122,7 +24274,7 @@ * * Gets the #GoaExchange instance for the D-Bus interface org.gnome.OnlineAccounts.Exchange on @object, if any. * - * Returns: (transfer full): A #GoaExchange that must be freed with g_object_unref() or %NULL if @object does not implement the interface. + * Returns: (transfer full) (nullable): A #GoaExchange that must be freed with g_object_unref() or %NULL if @object does not implement the interface. * * Since: 3.6.0 */ @@ -24141,7 +24293,7 @@ * * Gets the #GoaMediaServer instance for the D-Bus interface org.gnome.OnlineAccounts.MediaServer on @object, if any. * - * Returns: (transfer full): A #GoaMediaServer that must be freed with g_object_unref() or %NULL if @object does not implement the interface. + * Returns: (transfer full) (nullable): A #GoaMediaServer that must be freed with g_object_unref() or %NULL if @object does not implement the interface. * * Since: 3.14 */ @@ -24160,7 +24312,7 @@ * * Gets the #GoaTicketing instance for the D-Bus interface org.gnome.OnlineAccounts.Ticketing on @object, if any. * - * Returns: (transfer full): A #GoaTicketing that must be freed with g_object_unref() or %NULL if @object does not implement the interface. + * Returns: (transfer full) (nullable): A #GoaTicketing that must be freed with g_object_unref() or %NULL if @object does not implement the interface. * * Since: 3.6.0 */ @@ -24179,9 +24331,11 @@ * * Gets the #GoaTodo instance for the D-Bus interface org.gnome.OnlineAccounts.Todo on @object, if any. * - * Returns: (transfer full): A #GoaTodo that must be freed with g_object_unref() or %NULL if @object does not implement the interface. + * Returns: (transfer full) (nullable): A #GoaTodo that must be freed with g_object_unref() or %NULL if @object does not implement the interface. * * Since: 3.26.0 + * + * Deprecated: The D-Bus interface has been deprecated. */ GoaTodo *goa_object_get_todo (GoaObject *object) { @@ -24198,7 +24352,7 @@ * * Gets the #GoaReadLater instance for the D-Bus interface org.gnome.OnlineAccounts.ReadLater on @object, if any. * - * Returns: (transfer full): A #GoaReadLater that must be freed with g_object_unref() or %NULL if @object does not implement the interface. + * Returns: (transfer full) (nullable): A #GoaReadLater that must be freed with g_object_unref() or %NULL if @object does not implement the interface. * * Since: 3.12.0 */ @@ -24217,7 +24371,7 @@ * * Gets the #GoaPrinters instance for the D-Bus interface org.gnome.OnlineAccounts.Printers on @object, if any. * - * Returns: (transfer full): A #GoaPrinters that must be freed with g_object_unref() or %NULL if @object does not implement the interface. + * Returns: (transfer full) (nullable): A #GoaPrinters that must be freed with g_object_unref() or %NULL if @object does not implement the interface. * * Since: 3.12.0 */ @@ -24239,7 +24393,7 @@ * * It is not safe to use the returned object if you are on another thread than the one where the #GDBusObjectManagerClient or #GDBusObjectManagerServer for @object is running. * - * Returns: (transfer none): A #GoaAccount or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. + * Returns: (transfer none) (nullable): A #GoaAccount or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. */ GoaAccount *goa_object_peek_account (GoaObject *object) { @@ -24259,7 +24413,7 @@ * * It is not safe to use the returned object if you are on another thread than the one where the #GDBusObjectManagerClient or #GDBusObjectManagerServer for @object is running. * - * Returns: (transfer none): A #GoaOAuth2Based or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. + * Returns: (transfer none) (nullable): A #GoaOAuth2Based or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. */ GoaOAuth2Based *goa_object_peek_oauth2_based (GoaObject *object) { @@ -24279,7 +24433,7 @@ * * It is not safe to use the returned object if you are on another thread than the one where the #GDBusObjectManagerClient or #GDBusObjectManagerServer for @object is running. * - * Returns: (transfer none): A #GoaOAuthBased or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. + * Returns: (transfer none) (nullable): A #GoaOAuthBased or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. */ GoaOAuthBased *goa_object_peek_oauth_based (GoaObject *object) { @@ -24299,7 +24453,7 @@ * * It is not safe to use the returned object if you are on another thread than the one where the #GDBusObjectManagerClient or #GDBusObjectManagerServer for @object is running. * - * Returns: (transfer none): A #GoaPasswordBased or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. + * Returns: (transfer none) (nullable): A #GoaPasswordBased or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. * * Since: 3.6.0 */ @@ -24321,7 +24475,7 @@ * * It is not safe to use the returned object if you are on another thread than the one where the #GDBusObjectManagerClient or #GDBusObjectManagerServer for @object is running. * - * Returns: (transfer none): A #GoaManager or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. + * Returns: (transfer none) (nullable): A #GoaManager or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. */ GoaManager *goa_object_peek_manager (GoaObject *object) { @@ -24341,7 +24495,7 @@ * * It is not safe to use the returned object if you are on another thread than the one where the #GDBusObjectManagerClient or #GDBusObjectManagerServer for @object is running. * - * Returns: (transfer none): A #GoaMail or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. + * Returns: (transfer none) (nullable): A #GoaMail or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. */ GoaMail *goa_object_peek_mail (GoaObject *object) { @@ -24361,7 +24515,7 @@ * * It is not safe to use the returned object if you are on another thread than the one where the #GDBusObjectManagerClient or #GDBusObjectManagerServer for @object is running. * - * Returns: (transfer none): A #GoaCalendar or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. + * Returns: (transfer none) (nullable): A #GoaCalendar or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. */ GoaCalendar *goa_object_peek_calendar (GoaObject *object) { @@ -24381,7 +24535,7 @@ * * It is not safe to use the returned object if you are on another thread than the one where the #GDBusObjectManagerClient or #GDBusObjectManagerServer for @object is running. * - * Returns: (transfer none): A #GoaContacts or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. + * Returns: (transfer none) (nullable): A #GoaContacts or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. */ GoaContacts *goa_object_peek_contacts (GoaObject *object) { @@ -24401,7 +24555,7 @@ * * It is not safe to use the returned object if you are on another thread than the one where the #GDBusObjectManagerClient or #GDBusObjectManagerServer for @object is running. * - * Returns: (transfer none): A #GoaChat or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. + * Returns: (transfer none) (nullable): A #GoaChat or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. */ GoaChat *goa_object_peek_chat (GoaObject *object) { @@ -24421,7 +24575,7 @@ * * It is not safe to use the returned object if you are on another thread than the one where the #GDBusObjectManagerClient or #GDBusObjectManagerServer for @object is running. * - * Returns: (transfer none): A #GoaDocuments or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. + * Returns: (transfer none) (nullable): A #GoaDocuments or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. */ GoaDocuments *goa_object_peek_documents (GoaObject *object) { @@ -24441,7 +24595,7 @@ * * It is not safe to use the returned object if you are on another thread than the one where the #GDBusObjectManagerClient or #GDBusObjectManagerServer for @object is running. * - * Returns: (transfer none): A #GoaMaps or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. + * Returns: (transfer none) (nullable): A #GoaMaps or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. * * Since: 3.14.0 */ @@ -24463,7 +24617,7 @@ * * It is not safe to use the returned object if you are on another thread than the one where the #GDBusObjectManagerClient or #GDBusObjectManagerServer for @object is running. * - * Returns: (transfer none): A #GoaMusic or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. + * Returns: (transfer none) (nullable): A #GoaMusic or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. * * Since: 3.18.0 */ @@ -24485,7 +24639,7 @@ * * It is not safe to use the returned object if you are on another thread than the one where the #GDBusObjectManagerClient or #GDBusObjectManagerServer for @object is running. * - * Returns: (transfer none): A #GoaPhotos or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. + * Returns: (transfer none) (nullable): A #GoaPhotos or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. * * Since: 3.8.0 */ @@ -24507,7 +24661,7 @@ * * It is not safe to use the returned object if you are on another thread than the one where the #GDBusObjectManagerClient or #GDBusObjectManagerServer for @object is running. * - * Returns: (transfer none): A #GoaFiles or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. + * Returns: (transfer none) (nullable): A #GoaFiles or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. * * Since: 3.8.0 */ @@ -24529,7 +24683,7 @@ * * It is not safe to use the returned object if you are on another thread than the one where the #GDBusObjectManagerClient or #GDBusObjectManagerServer for @object is running. * - * Returns: (transfer none): A #GoaExchange or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. + * Returns: (transfer none) (nullable): A #GoaExchange or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. * * Since: 3.6.0 */ @@ -24551,7 +24705,7 @@ * * It is not safe to use the returned object if you are on another thread than the one where the #GDBusObjectManagerClient or #GDBusObjectManagerServer for @object is running. * - * Returns: (transfer none): A #GoaMediaServer or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. + * Returns: (transfer none) (nullable): A #GoaMediaServer or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. * * Since: 3.14 */ @@ -24573,7 +24727,7 @@ * * It is not safe to use the returned object if you are on another thread than the one where the #GDBusObjectManagerClient or #GDBusObjectManagerServer for @object is running. * - * Returns: (transfer none): A #GoaTicketing or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. + * Returns: (transfer none) (nullable): A #GoaTicketing or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. * * Since: 3.6.0 */ @@ -24595,9 +24749,11 @@ * * It is not safe to use the returned object if you are on another thread than the one where the #GDBusObjectManagerClient or #GDBusObjectManagerServer for @object is running. * - * Returns: (transfer none): A #GoaTodo or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. + * Returns: (transfer none) (nullable): A #GoaTodo or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. * * Since: 3.26.0 + * + * Deprecated: The D-Bus interface has been deprecated. */ GoaTodo *goa_object_peek_todo (GoaObject *object) { @@ -24617,7 +24773,7 @@ * * It is not safe to use the returned object if you are on another thread than the one where the #GDBusObjectManagerClient or #GDBusObjectManagerServer for @object is running. * - * Returns: (transfer none): A #GoaReadLater or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. + * Returns: (transfer none) (nullable): A #GoaReadLater or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. * * Since: 3.12.0 */ @@ -24639,7 +24795,7 @@ * * It is not safe to use the returned object if you are on another thread than the one where the #GDBusObjectManagerClient or #GDBusObjectManagerServer for @object is running. * - * Returns: (transfer none): A #GoaPrinters or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. + * Returns: (transfer none) (nullable): A #GoaPrinters or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. * * Since: 3.12.0 */ @@ -25576,6 +25732,8 @@ * Sets the #GoaTodo instance for the D-Bus interface org.gnome.OnlineAccounts.Todo on @object. * * Since: 3.26.0 + * + * Deprecated: The D-Bus interface has been deprecated. */ void goa_object_skeleton_set_todo (GoaObjectSkeleton *object, GoaTodo *interface_) { diff -Nru gnome-online-accounts-3.30.1/src/goa/goa-generated.h gnome-online-accounts-3.31.90/src/goa/goa-generated.h --- gnome-online-accounts-3.30.1/src/goa/goa-generated.h 2019-01-17 10:27:18.000000000 +0000 +++ gnome-online-accounts-3.31.90/src/goa/goa-generated.h 2019-02-09 21:16:26.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.56.4. DO NOT EDIT. + * Generated by gdbus-codegen 2.59.2 from dbus-interfaces.xml. DO NOT EDIT. * * The license of this code is the same as for the D-Bus interface description * it was derived from. @@ -206,8 +206,8 @@ gboolean goa_account_get_ticketing_disabled (GoaAccount *object); void goa_account_set_ticketing_disabled (GoaAccount *object, gboolean value); -gboolean goa_account_get_todo_disabled (GoaAccount *object); -void goa_account_set_todo_disabled (GoaAccount *object, gboolean value); +G_GNUC_DEPRECATED gboolean goa_account_get_todo_disabled (GoaAccount *object); +G_GNUC_DEPRECATED void goa_account_set_todo_disabled (GoaAccount *object, gboolean value); gboolean goa_account_get_read_later_disabled (GoaAccount *object); void goa_account_set_read_later_disabled (GoaAccount *object, gboolean value); @@ -2805,7 +2805,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (GoaTodoProxy, g_object_unref) #endif -void goa_todo_proxy_new ( +G_GNUC_DEPRECATED void goa_todo_proxy_new ( GDBusConnection *connection, GDBusProxyFlags flags, const gchar *name, @@ -2813,10 +2813,10 @@ GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GoaTodo *goa_todo_proxy_new_finish ( +G_GNUC_DEPRECATED GoaTodo *goa_todo_proxy_new_finish ( GAsyncResult *res, GError **error); -GoaTodo *goa_todo_proxy_new_sync ( +G_GNUC_DEPRECATED GoaTodo *goa_todo_proxy_new_sync ( GDBusConnection *connection, GDBusProxyFlags flags, const gchar *name, @@ -2824,7 +2824,7 @@ GCancellable *cancellable, GError **error); -void goa_todo_proxy_new_for_bus ( +G_GNUC_DEPRECATED void goa_todo_proxy_new_for_bus ( GBusType bus_type, GDBusProxyFlags flags, const gchar *name, @@ -2832,10 +2832,10 @@ GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -GoaTodo *goa_todo_proxy_new_for_bus_finish ( +G_GNUC_DEPRECATED GoaTodo *goa_todo_proxy_new_for_bus_finish ( GAsyncResult *res, GError **error); -GoaTodo *goa_todo_proxy_new_for_bus_sync ( +G_GNUC_DEPRECATED GoaTodo *goa_todo_proxy_new_for_bus_sync ( GBusType bus_type, GDBusProxyFlags flags, const gchar *name, @@ -2875,7 +2875,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (GoaTodoSkeleton, g_object_unref) #endif -GoaTodo *goa_todo_skeleton_new (void); +G_GNUC_DEPRECATED GoaTodo *goa_todo_skeleton_new (void); /* ------------------------------------------------------------------------ */ @@ -3167,7 +3167,7 @@ GoaExchange *goa_object_get_exchange (GoaObject *object); GoaMediaServer *goa_object_get_media_server (GoaObject *object); GoaTicketing *goa_object_get_ticketing (GoaObject *object); -GoaTodo *goa_object_get_todo (GoaObject *object); +G_GNUC_DEPRECATED GoaTodo *goa_object_get_todo (GoaObject *object); GoaReadLater *goa_object_get_read_later (GoaObject *object); GoaPrinters *goa_object_get_printers (GoaObject *object); GoaAccount *goa_object_peek_account (GoaObject *object); @@ -3187,7 +3187,7 @@ GoaExchange *goa_object_peek_exchange (GoaObject *object); GoaMediaServer *goa_object_peek_media_server (GoaObject *object); GoaTicketing *goa_object_peek_ticketing (GoaObject *object); -GoaTodo *goa_object_peek_todo (GoaObject *object); +G_GNUC_DEPRECATED GoaTodo *goa_object_peek_todo (GoaObject *object); GoaReadLater *goa_object_peek_read_later (GoaObject *object); GoaPrinters *goa_object_peek_printers (GoaObject *object); @@ -3269,7 +3269,7 @@ void goa_object_skeleton_set_exchange (GoaObjectSkeleton *object, GoaExchange *interface_); void goa_object_skeleton_set_media_server (GoaObjectSkeleton *object, GoaMediaServer *interface_); void goa_object_skeleton_set_ticketing (GoaObjectSkeleton *object, GoaTicketing *interface_); -void goa_object_skeleton_set_todo (GoaObjectSkeleton *object, GoaTodo *interface_); +G_GNUC_DEPRECATED void goa_object_skeleton_set_todo (GoaObjectSkeleton *object, GoaTodo *interface_); void goa_object_skeleton_set_read_later (GoaObjectSkeleton *object, GoaReadLater *interface_); void goa_object_skeleton_set_printers (GoaObjectSkeleton *object, GoaPrinters *interface_); diff -Nru gnome-online-accounts-3.30.1/src/goa/Makefile.am gnome-online-accounts-3.31.90/src/goa/Makefile.am --- gnome-online-accounts-3.30.1/src/goa/Makefile.am 2019-01-17 10:08:27.000000000 +0000 +++ gnome-online-accounts-3.31.90/src/goa/Makefile.am 2019-01-17 11:54:47.000000000 +0000 @@ -19,7 +19,6 @@ -DPACKAGE_LOCALSTATE_DIR=\""$(localstatedir)"\" \ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_LIB_DIR=\""$(libdir)"\" \ - -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ $(WARN_CFLAGS) \ $(NULL) diff -Nru gnome-online-accounts-3.30.1/src/goa/Makefile.in gnome-online-accounts-3.31.90/src/goa/Makefile.in --- gnome-online-accounts-3.30.1/src/goa/Makefile.in 2019-01-17 10:27:12.000000000 +0000 +++ gnome-online-accounts-3.31.90/src/goa/Makefile.in 2019-02-09 21:16:18.000000000 +0000 @@ -451,7 +451,6 @@ -DPACKAGE_LOCALSTATE_DIR=\""$(localstatedir)"\" \ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_LIB_DIR=\""$(libdir)"\" \ - -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ $(WARN_CFLAGS) \ $(NULL) diff -Nru gnome-online-accounts-3.30.1/src/goabackend/goabackendenums.h gnome-online-accounts-3.31.90/src/goabackend/goabackendenums.h --- gnome-online-accounts-3.30.1/src/goabackend/goabackendenums.h 2019-01-17 10:08:27.000000000 +0000 +++ gnome-online-accounts-3.31.90/src/goabackend/goabackendenums.h 2019-01-17 11:54:47.000000000 +0000 @@ -71,6 +71,7 @@ * @GOA_PROVIDER_FEATURE_PRINTERS: Network printing services (e.g. Google Cloud Print). * @GOA_PROVIDER_FEATURE_MAPS: Maps related services (e.g. Foursquare, Facebook). * @GOA_PROVIDER_FEATURE_MUSIC: Music related services (e.g. Vkontakte). + * @GOA_PROVIDER_FEATURE_TODO: Deprecated; currently unused. * @GOA_PROVIDER_FEATURE_INVALID: Used for error handling. No provider * should provide this feature. * diff -Nru gnome-online-accounts-3.30.1/src/goabackend/goaewsclient.c gnome-online-accounts-3.31.90/src/goabackend/goaewsclient.c --- gnome-online-accounts-3.30.1/src/goabackend/goaewsclient.c 2019-01-17 10:08:27.000000000 +0000 +++ gnome-online-accounts-3.31.90/src/goabackend/goaewsclient.c 2019-01-17 11:54:47.000000000 +0000 @@ -1,6 +1,6 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ /* - * Copyright © 2012 – 2017 Red Hat, Inc. + * Copyright © 2012 – 2018 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -64,7 +64,7 @@ typedef struct { GCancellable *cancellable; - GSimpleAsyncResult *res; + GError *error; SoupMessage *msgs[2]; SoupSession *session; gboolean accept_ssl_errors; @@ -79,26 +79,23 @@ gchar *username; } AutodiscoverAuthData; -static gboolean +static void ews_client_autodiscover_data_free (gpointer user_data) { AutodiscoverData *data = user_data; - g_simple_async_result_complete_in_idle (data->res); - if (data->cancellable_id > 0) { g_cancellable_disconnect (data->cancellable, data->cancellable_id); g_object_unref (data->cancellable); } + g_clear_error (&data->error); + /* soup_session_queue_message stole the references to data->msgs */ xmlOutputBufferClose (data->buf); - g_object_unref (data->res); g_object_unref (data->session); g_slice_free (AutodiscoverData, data); - - return G_SOURCE_REMOVE; } static void @@ -136,18 +133,24 @@ static void ews_client_request_started (SoupSession *session, SoupMessage *msg, SoupSocket *socket, gpointer user_data) { - AutodiscoverData *data = user_data; - GError *error; + AutodiscoverData *data; + GTask *task = G_TASK (user_data); GTlsCertificateFlags cert_flags; - error = NULL; + g_debug ("goa_ews_client_autodiscover(): request started (%p)", msg); + + data = (AutodiscoverData *) g_task_get_task_data (task); if (!data->accept_ssl_errors && soup_message_get_https_status (msg, NULL, &cert_flags) - && cert_flags != 0) + && cert_flags != 0 + && data->error == NULL) { - goa_utils_set_error_ssl (&error, cert_flags); - g_simple_async_result_take_error (data->res, error); + goa_utils_set_error_ssl (&data->error, cert_flags); + + /* The callback will be invoked after we have returned to the + * main loop. + */ soup_session_abort (data->session); } } @@ -155,7 +158,16 @@ static void ews_client_autodiscover_cancelled_cb (GCancellable *cancellable, gpointer user_data) { - AutodiscoverData *data = user_data; + AutodiscoverData *data; + GTask *task = G_TASK (user_data); + + g_debug ("goa_ews_client_autodiscover(): cancelled"); + + data = (AutodiscoverData *) g_task_get_task_data (task); + + /* The callback will be invoked after we have returned to the main + * loop. + */ soup_session_abort (data->session); } @@ -183,7 +195,8 @@ ews_client_autodiscover_response_cb (SoupSession *session, SoupMessage *msg, gpointer user_data) { GError *error = NULL; - AutodiscoverData *data = user_data; + AutodiscoverData *data; + GTask *task = G_TASK (user_data); gboolean op_res = FALSE; guint idx; guint status; @@ -191,6 +204,9 @@ xmlDoc *doc; xmlNode *node; + g_debug ("goa_ews_client_autodiscover(): response (%p, %u)", msg, msg->status_code); + + data = (AutodiscoverData *) g_task_get_task_data (task); size = sizeof (data->msgs) / sizeof (data->msgs[0]); for (idx = 0; idx < size; idx++) @@ -210,16 +226,20 @@ */ if (status == SOUP_STATUS_CANCELLED) { - /* If a previous autodiscover attempt for the same GAsyncResult + /* If we are being aborted by the GCancellable, then the + * GTask is responsible for setting the GError automatically. + * + * If a previous autodiscover attempt for the same GAsyncResult * was successful then no additional attempts are required and * we should use the result from the earlier attempt. */ - op_res = g_simple_async_result_get_op_res_gboolean (data->res); goto out; } else if (status != SOUP_STATUS_OK) { g_warning ("goa_ews_client_autodiscover() failed: %u — %s", msg->status_code, msg->reason_phrase); + g_return_if_fail (data->error == NULL); + goa_utils_set_error_soup (&error, msg); goto out; } @@ -305,7 +325,6 @@ * that it won't get lost when we hear from another autodiscover * attempt for the same GAsyncResult. */ - g_simple_async_result_set_op_res_gboolean (data->res, op_res); for (idx = 0; idx < size; idx++) { @@ -319,8 +338,9 @@ } out: - /* error == NULL, if we are being aborted by the GCancellable, an - * SSL error or another message that was successful. + /* op_res == FALSE, if we are being aborted by the GCancellable, an + * SSL error, another message that was successful or an error + * encountered while parsing this response. */ if (!op_res) { @@ -330,32 +350,24 @@ if (data->pending > 1) g_clear_error (&error); - if (error != NULL) - g_simple_async_result_take_error (data->res, error); + if (error != NULL && data->error == NULL) + { + g_propagate_error (&data->error, error); + error = NULL; + } } data->pending--; if (data->pending == 0) { - GMainContext *context; - GSource *source; - - /* The result of the GAsyncResult should already be set when we - * get here. If it wasn't explicitly set to TRUE then - * autodiscovery has failed and the default value of the - * GAsyncResult (which is FALSE) should be returned to the - * original caller. - */ - - source = g_idle_source_new (); - g_source_set_priority (source, G_PRIORITY_DEFAULT_IDLE); - g_source_set_callback (source, ews_client_autodiscover_data_free, data, NULL); - g_source_set_name (source, "[goa] ews_client_autodiscover_data_free"); - - context = g_main_context_get_thread_default (); - g_source_attach (source, context); - g_source_unref (source); + if (data->error != NULL) + g_task_return_error (task, g_steal_pointer (&data->error)); + else + g_task_return_boolean (task, TRUE); } + + g_clear_error (&error); + g_object_unref (task); } static xmlDoc * @@ -450,6 +462,7 @@ { AutodiscoverData *data; AutodiscoverAuthData *auth; + GTask *task = NULL; gchar *url1; gchar *url2; xmlDoc *doc; @@ -462,6 +475,12 @@ g_return_if_fail (server != NULL && server[0] != '\0'); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); + task = g_task_new (self, cancellable, callback, user_data); + g_task_set_source_tag (task, goa_ews_client_autodiscover); + + data = g_slice_new0 (AutodiscoverData); + g_task_set_task_data (task, data, ews_client_autodiscover_data_free); + doc = ews_client_create_autodiscover_xml (email); buf = xmlAllocOutputBuffer (NULL); xmlNodeDumpOutput (buf, doc, xmlDocGetRootElement (doc), 0, 1, NULL); @@ -477,9 +496,8 @@ * to time out. So run both queries in parallel and let the fastest * (successful) one win. */ - data = g_slice_new0 (AutodiscoverData); + data->buf = buf; - data->res = g_simple_async_result_new (G_OBJECT (self), callback, user_data, goa_ews_client_autodiscover); data->msgs[0] = ews_client_create_msg_for_url (url1, buf); data->msgs[1] = ews_client_create_msg_for_url (url2, buf); data->pending = sizeof (data->msgs) / sizeof (data->msgs[0]); @@ -491,11 +509,10 @@ if (cancellable != NULL) { data->cancellable = g_object_ref (cancellable); - data->cancellable_id = g_cancellable_connect (data->cancellable, + data->cancellable_id = g_cancellable_connect (cancellable, G_CALLBACK (ews_client_autodiscover_cancelled_cb), - data, + task, NULL); - g_simple_async_result_set_check_cancellable (data->res, data->cancellable); } auth = g_slice_new0 (AutodiscoverAuthData); @@ -508,31 +525,36 @@ ews_client_autodiscover_auth_data_free, 0); - g_signal_connect (data->session, "request-started", G_CALLBACK (ews_client_request_started), data); + g_signal_connect (data->session, "request-started", G_CALLBACK (ews_client_request_started), task); - soup_session_queue_message (data->session, data->msgs[0], ews_client_autodiscover_response_cb, data); - soup_session_queue_message (data->session, data->msgs[1], ews_client_autodiscover_response_cb, data); + soup_session_queue_message (data->session, + data->msgs[0], + ews_client_autodiscover_response_cb, + g_object_ref (task)); + soup_session_queue_message (data->session, + data->msgs[1], + ews_client_autodiscover_response_cb, + g_object_ref (task)); g_free (url2); g_free (url1); + g_object_unref (task); xmlFreeDoc (doc); } gboolean goa_ews_client_autodiscover_finish (GoaEwsClient *self, GAsyncResult *res, GError **error) { - GSimpleAsyncResult *simple; + GTask *task; - g_return_val_if_fail (g_simple_async_result_is_valid (res, G_OBJECT (self), goa_ews_client_autodiscover), - FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - simple = G_SIMPLE_ASYNC_RESULT (res); + g_return_val_if_fail (g_task_is_valid (res, self), FALSE); + task = G_TASK (res); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; + g_return_val_if_fail (g_task_get_source_tag (task) == goa_ews_client_autodiscover, FALSE); - return g_simple_async_result_get_op_res_gboolean (simple); + return g_task_propagate_boolean (task, error); } /* ---------------------------------------------------------------------------------------------------- */ diff -Nru gnome-online-accounts-3.30.1/src/goabackend/goagoogleprovider.c gnome-online-accounts-3.31.90/src/goabackend/goagoogleprovider.c --- gnome-online-accounts-3.30.1/src/goabackend/goagoogleprovider.c 2018-06-06 06:27:55.000000000 +0000 +++ gnome-online-accounts-3.31.90/src/goabackend/goagoogleprovider.c 2019-01-31 14:16:09.000000000 +0000 @@ -172,6 +172,7 @@ call = rest_proxy_new_call (proxy); rest_proxy_call_set_method (call, "GET"); rest_proxy_call_add_param (call, "access_token", access_token); + rest_proxy_call_add_param (call, "fields", "email"); if (!rest_proxy_call_sync (call, error)) goto out; diff -Nru gnome-online-accounts-3.30.1/src/goabackend/goahttpclient.c gnome-online-accounts-3.31.90/src/goabackend/goahttpclient.c --- gnome-online-accounts-3.30.1/src/goabackend/goahttpclient.c 2019-01-17 10:08:27.000000000 +0000 +++ gnome-online-accounts-3.31.90/src/goabackend/goahttpclient.c 2019-01-17 11:54:47.000000000 +0000 @@ -1,6 +1,6 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ /* - * Copyright © 2012 – 2017 Red Hat, Inc. + * Copyright © 2012 – 2018 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -56,6 +56,7 @@ typedef struct { GCancellable *cancellable; + GError *error; SoupMessage *msg; SoupSession *session; gboolean accept_ssl_errors; @@ -79,6 +80,8 @@ g_object_unref (data->cancellable); } + g_clear_error (&data->error); + /* soup_session_queue_message stole the references to data->msg */ g_object_unref (data->session); g_slice_free (CheckData, data); @@ -114,18 +117,22 @@ { CheckData *data; GTask *task = G_TASK (user_data); - GError *error; GTlsCertificateFlags cert_flags; - data = g_task_get_task_data (task); - error = NULL; + g_debug ("goa_http_client_check(): request started (%p)", msg); + + data = (CheckData *) g_task_get_task_data (task); if (!data->accept_ssl_errors && soup_message_get_https_status (msg, NULL, &cert_flags) - && cert_flags != 0) + && cert_flags != 0 + && data->error == NULL) { - goa_utils_set_error_ssl (&error, cert_flags); - g_task_return_error (task, error); + goa_utils_set_error_ssl (&data->error, cert_flags); + + /* The callback will be invoked after we have returned to the + * main loop. + */ soup_session_abort (data->session); } } @@ -135,68 +142,60 @@ { CheckData *data; GTask *task = G_TASK (user_data); - gboolean cancelled; - data = g_task_get_task_data (task); + g_debug ("goa_http_client_check(): cancelled"); - cancelled = g_task_return_error_if_cancelled (task); - soup_session_abort (data->session); + data = (CheckData *) g_task_get_task_data (task); - g_return_if_fail (cancelled); -} - -static gboolean -http_client_check_free_in_idle (gpointer user_data) -{ - GTask *task = G_TASK (user_data); - - g_object_unref (task); - return G_SOURCE_REMOVE; + /* The callback will be invoked after we have returned to the main + * loop. + */ + soup_session_abort (data->session); } static void http_client_check_response_cb (SoupSession *session, SoupMessage *msg, gpointer user_data) { - GError *error; - GMainContext *context; - GSource *source; + CheckData *data; + GCancellable *cancellable; GTask *task = G_TASK (user_data); - error = NULL; + g_debug ("goa_http_client_check(): response (%p, %u)", msg, msg->status_code); + + data = (CheckData *) g_task_get_task_data (task); + cancellable = g_task_get_cancellable (task); /* status == SOUP_STATUS_CANCELLED, if we are being aborted by the - * GCancellable or due to an SSL error. The GTask was already - * 'returned' by the respective callbacks. + * GCancellable or due to an SSL error. */ if (msg->status_code == SOUP_STATUS_CANCELLED) - goto out; + { + /* If we are being aborted by the GCancellable then there might + * or might not be an error. The GCancellable can be triggered + * from a different thread, so it depends on the exact ordering + * of events across threads. + */ + if (data->error == NULL) + g_cancellable_set_error_if_cancelled (cancellable, &data->error); + + goto out; + } else if (msg->status_code != SOUP_STATUS_OK) { g_warning ("goa_http_client_check() failed: %u — %s", msg->status_code, msg->reason_phrase); - goa_utils_set_error_soup (&error, msg); - g_task_return_error (task, error); + g_return_if_fail (data->error == NULL); + + goa_utils_set_error_soup (&data->error, msg); goto out; } - g_task_return_boolean (task, TRUE); - out: - /* We might be invoked from a GCancellable::cancelled - * handler, and unreffing the GTask will disconnect the - * handler. Since disconnecting from inside the handler will cause a - * deadlock [1], we use an idle handler to break them up. - * - * [1] https://bugzilla.gnome.org/show_bug.cgi?id=705395 - */ + if (data->error != NULL) + g_task_return_error (task, g_steal_pointer (&data->error)); + else + g_task_return_boolean (task, TRUE); - source = g_idle_source_new (); - g_source_set_priority (source, G_PRIORITY_DEFAULT_IDLE); - g_source_set_callback (source, http_client_check_free_in_idle, task, NULL); - g_source_set_name (source, "[goa] http_client_check_free_in_idle"); - - context = g_task_get_context (task); - g_source_attach (source, context); - g_source_unref (source); + g_object_unref (task); } void @@ -226,8 +225,7 @@ data = g_slice_new0 (CheckData); g_task_set_task_data (task, data, http_client_check_data_free); - data->session = soup_session_new_with_options (SOUP_SESSION_SSL_STRICT, FALSE, - NULL); + data->session = soup_session_new_with_options (SOUP_SESSION_SSL_STRICT, FALSE, NULL); logger = goa_soup_logger_new (SOUP_LOGGER_LOG_BODY, -1); soup_session_add_feature (data->session, SOUP_SESSION_FEATURE (logger)); diff -Nru gnome-online-accounts-3.30.1/src/goabackend/goaobjectskeletonutils.c gnome-online-accounts-3.31.90/src/goabackend/goaobjectskeletonutils.c --- gnome-online-accounts-3.30.1/src/goabackend/goaobjectskeletonutils.c 2019-01-17 10:08:27.000000000 +0000 +++ gnome-online-accounts-3.31.90/src/goabackend/goaobjectskeletonutils.c 2019-01-17 11:54:47.000000000 +0000 @@ -205,29 +205,6 @@ } void -goa_object_skeleton_attach_todo (GoaObjectSkeleton *object, - gboolean todo_enabled) -{ - GoaTodo *todo = NULL; - - todo = goa_object_get_todo (GOA_OBJECT (object)); - if (todo_enabled) - { - if (todo == NULL) - { - todo = goa_todo_skeleton_new (); - goa_object_skeleton_set_todo (object, todo); - } - } - else - { - if (todo != NULL) - goa_object_skeleton_set_todo (object, NULL); - } - g_clear_object (&todo); -} - -void goa_object_skeleton_attach_read_later (GoaObjectSkeleton *object, gboolean read_later_enabled) { diff -Nru gnome-online-accounts-3.30.1/src/goabackend/goaobjectskeletonutils.h gnome-online-accounts-3.31.90/src/goabackend/goaobjectskeletonutils.h --- gnome-online-accounts-3.30.1/src/goabackend/goaobjectskeletonutils.h 2019-01-17 10:08:27.000000000 +0000 +++ gnome-online-accounts-3.31.90/src/goabackend/goaobjectskeletonutils.h 2019-01-17 11:54:47.000000000 +0000 @@ -55,9 +55,6 @@ void goa_object_skeleton_attach_printers (GoaObjectSkeleton *object, gboolean printers_enabled); -void goa_object_skeleton_attach_todo (GoaObjectSkeleton *object, - gboolean todo_enabled); - void goa_object_skeleton_attach_read_later (GoaObjectSkeleton *object, gboolean read_later_enabled); diff -Nru gnome-online-accounts-3.30.1/src/goabackend/goaprovider.c gnome-online-accounts-3.31.90/src/goabackend/goaprovider.c --- gnome-online-accounts-3.30.1/src/goabackend/goaprovider.c 2019-01-17 10:08:27.000000000 +0000 +++ gnome-online-accounts-3.31.90/src/goabackend/goaprovider.c 2019-01-17 11:54:47.000000000 +0000 @@ -33,7 +33,6 @@ #include "goapocketprovider.h" #include "goamediaserverprovider.h" #include "goalastfmprovider.h" -#include "goatodoistprovider.h" #ifdef GOA_KERBEROS_ENABLED #include "goakerberosprovider.h" @@ -960,9 +959,6 @@ #ifdef GOA_LASTFM_ENABLED { GOA_LASTFM_NAME, goa_lastfm_provider_get_type }, #endif -#ifdef GOA_TODOIST_ENABLED - { GOA_TODOIST_NAME, goa_todoist_provider_get_type }, -#endif #ifdef GOA_IMAP_SMTP_ENABLED { GOA_IMAP_SMTP_NAME, goa_imap_smtp_provider_get_type }, #endif diff -Nru gnome-online-accounts-3.30.1/src/goabackend/goatodoistprovider.c gnome-online-accounts-3.31.90/src/goabackend/goatodoistprovider.c --- gnome-online-accounts-3.30.1/src/goabackend/goatodoistprovider.c 2019-01-17 10:08:27.000000000 +0000 +++ gnome-online-accounts-3.31.90/src/goabackend/goatodoistprovider.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,342 +0,0 @@ -/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -/* - * Copyright © 2017 Ekta Nandwani - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, see . - */ - -#include "config.h" -#include - -#include -#include - -#include "goaprovider.h" -#include "goaprovider-priv.h" -#include "goaoauth2provider.h" -#include "goaoauth2provider-priv.h" -#include "goatodoistprovider.h" -#include "goaobjectskeletonutils.h" -#include "goarestproxy.h" - - -struct _GoaTodoistProvider -{ - GoaOAuth2Provider parent_instance; -}; - -G_DEFINE_TYPE_WITH_CODE (GoaTodoistProvider, goa_todoist_provider, GOA_TYPE_OAUTH2_PROVIDER, - goa_provider_ensure_extension_points_registered (); - g_io_extension_point_implement (GOA_PROVIDER_EXTENSION_POINT_NAME, - g_define_type_id, - GOA_TODOIST_NAME, - 0)); - -/* ---------------------------------------------------------------------------------------------------- */ - -static const gchar * -get_provider_type (GoaProvider *provider) -{ - return GOA_TODOIST_NAME; -} - -static gchar * -get_provider_name (GoaProvider *provider, - GoaObject *object) -{ - return g_strdup (_("Todoist")); -} - -static GoaProviderGroup -get_provider_group (GoaProvider *provider) -{ - return GOA_PROVIDER_GROUP_BRANDED; -} - -static GoaProviderFeatures -get_provider_features (GoaProvider *provider) -{ - return GOA_PROVIDER_FEATURE_TODO; -} - -static const gchar * -get_authorization_uri (GoaOAuth2Provider *oauth2_provider) -{ - return "https://todoist.com/oauth/authorize"; -} - -static const gchar * -get_scope (GoaOAuth2Provider *oauth2_provider) -{ - return "data:read_write,data:delete,task:add,project:delete"; -} - -static const gchar * -get_redirect_uri (GoaOAuth2Provider *oauth2_provider) -{ - return "https://localhost"; -} - -static const gchar * -get_client_id (GoaOAuth2Provider *oauth2_provider) -{ - return GOA_TODOIST_CLIENT_ID; -} - -static const gchar * -get_client_secret (GoaOAuth2Provider *oauth2_provider) -{ - return GOA_TODOIST_CLIENT_SECRET; -} - -static const gchar * -get_token_uri (GoaOAuth2Provider *oauth2_provider) -{ - return "https://todoist.com/oauth/access_token"; -} - -static gchar * -build_authorization_uri (GoaOAuth2Provider *oauth2_provider, - const gchar *authorization_uri, - const gchar *escaped_redirect_uri, - const gchar *escaped_client_id, - const gchar *escaped_scope) -{ - gchar *state; - gchar *uri; - - state = g_uuid_string_random (); - uri = g_strdup_printf ("%s" - "?response_type=token" - "&client_id=%s" - "&scope=%s" - "&state=%s", - authorization_uri, - escaped_client_id, - escaped_scope, - state); - - g_free (state); - return uri; -} - -/* ---------------------------------------------------------------------------------------------------- */ - -static gboolean -is_identity_node (GoaOAuth2Provider *oauth2_provider, WebKitDOMHTMLInputElement *element) -{ - gboolean ret = FALSE; - gchar *element_type = NULL; - gchar *id = NULL; - gchar *name = NULL; - - g_object_get (element, "type", &element_type, NULL); - if (g_strcmp0 (element_type, "email") != 0) - goto out; - - id = webkit_dom_element_get_id (WEBKIT_DOM_ELEMENT (element)); - if (g_strcmp0 (id, "email") != 0) - goto out; - - ret = TRUE; - - out: - g_free (element_type); - g_free (id); - g_free (name); - return ret; -} - -/* ---------------------------------------------------------------------------------------------------- */ - -static gchar * -get_identity_sync (GoaOAuth2Provider *oauth2_provider, - const gchar *access_token, - gchar **out_presentation_identity, - GCancellable *cancellable, - GError **error) -{ - GError *identity_error = NULL; - RestProxy *proxy = NULL; - RestProxyCall *call = NULL; - JsonObject *json_object; - JsonObject *json_object_user; - JsonParser *parser = NULL; - gchar *email = NULL; - gchar *ret = NULL; - - proxy = goa_rest_proxy_new ("https://todoist.com/API/v7/sync", FALSE); - call = rest_proxy_new_call (proxy); - rest_proxy_call_set_method (call, "GET"); - rest_proxy_call_add_param (call, "token", access_token); - rest_proxy_call_add_param (call, "sync_token", "*"); - rest_proxy_call_add_param (call, "resource_types", "[\"user\"]"); - - if (!rest_proxy_call_sync (call, error)) - goto out; - if (rest_proxy_call_get_status_code (call) != 200) - { - g_set_error (error, - GOA_ERROR, - GOA_ERROR_FAILED, - _("Expected status 200 when requesting your identity, instead got status %d (%s)"), - rest_proxy_call_get_status_code (call), - rest_proxy_call_get_status_message (call)); - goto out; - } - - parser = json_parser_new (); - if (!json_parser_load_from_data (parser, - rest_proxy_call_get_payload (call), - rest_proxy_call_get_payload_length (call), - &identity_error)) - { - g_warning ("json_parser_load_from_data() failed: %s (%s, %d)", - identity_error->message, - g_quark_to_string (identity_error->domain), - identity_error->code); - g_set_error (error, - GOA_ERROR, - GOA_ERROR_FAILED, - _("Could not parse response")); - goto out; - } - - json_object = json_node_get_object (json_parser_get_root (parser)); - if (!json_object_has_member (json_object, "user")) - { - g_warning ("Did not find user in JSON data"); - g_set_error (error, - GOA_ERROR, - GOA_ERROR_FAILED, - _("Could not parse response")); - goto out; - } - - json_object_user = json_object_get_object_member (json_object, "user"); - if (!json_object_has_member (json_object_user, "email")) - { - g_warning ("Did not find user.email in JSON data"); - g_set_error (error, - GOA_ERROR, - GOA_ERROR_FAILED, - _("Could not parse response")); - goto out; - } - - email = g_strdup (json_object_get_string_member (json_object_user, "email")); - - ret = email; - email = NULL; - if (out_presentation_identity != NULL) - *out_presentation_identity = g_strdup (ret); - - out: - g_clear_object (&parser); - g_clear_error (&identity_error); - g_clear_object (&call); - g_clear_object (&proxy); - g_free (email); - return ret; -} - -/* ---------------------------------------------------------------------------------------------------- */ - -static gboolean -build_object (GoaProvider *provider, - GoaObjectSkeleton *object, - GKeyFile *key_file, - const gchar *group, - GDBusConnection *connection, - gboolean just_added, - GError **error) -{ - GoaAccount *account = NULL; - gboolean todo_enabled; - gboolean ret = FALSE; - - /* Chain up */ - if (!GOA_PROVIDER_CLASS (goa_todoist_provider_parent_class)->build_object (provider, - object, - key_file, - group, - connection, - just_added, - error)) - goto out; - - account = goa_object_get_account (GOA_OBJECT (object)); - - /* Todo */ - todo_enabled = g_key_file_get_boolean (key_file, group, "TodoEnabled", NULL); - goa_object_skeleton_attach_todo (object, todo_enabled); - - if (just_added) - { - goa_account_set_todo_disabled (account, !todo_enabled); - - g_signal_connect (account, - "notify::todo-disabled", - G_CALLBACK (goa_util_account_notify_property_cb), - (gpointer) "TodoEnabled"); - } - - ret = TRUE; - - out: - g_clear_object (&account); - return ret; -} - -/* ---------------------------------------------------------------------------------------------------- */ - -static void -add_account_key_values (GoaOAuth2Provider *oauth2_provider, - GVariantBuilder *builder) -{ - g_variant_builder_add (builder, "{ss}", "TodoEnabled", "true"); -} - -/* ---------------------------------------------------------------------------------------------------- */ - -static void -goa_todoist_provider_init (GoaTodoistProvider *self) -{ -} - -static void -goa_todoist_provider_class_init (GoaTodoistProviderClass *klass) -{ - GoaProviderClass *provider_class; - GoaOAuth2ProviderClass *oauth2_class; - - provider_class = GOA_PROVIDER_CLASS (klass); - provider_class->get_provider_type = get_provider_type; - provider_class->get_provider_name = get_provider_name; - provider_class->get_provider_group = get_provider_group; - provider_class->get_provider_features = get_provider_features; - provider_class->build_object = build_object; - - oauth2_class = GOA_OAUTH2_PROVIDER_CLASS (klass); - oauth2_class->get_authorization_uri = get_authorization_uri; - oauth2_class->build_authorization_uri = build_authorization_uri; - oauth2_class->get_redirect_uri = get_redirect_uri; - oauth2_class->get_client_id = get_client_id; - oauth2_class->get_token_uri = get_token_uri; - oauth2_class->get_client_secret = get_client_secret; - oauth2_class->get_scope = get_scope; - oauth2_class->get_identity_sync = get_identity_sync; - oauth2_class->is_identity_node = is_identity_node; - oauth2_class->add_account_key_values = add_account_key_values; -} diff -Nru gnome-online-accounts-3.30.1/src/goabackend/goatodoistprovider.h gnome-online-accounts-3.31.90/src/goabackend/goatodoistprovider.h --- gnome-online-accounts-3.30.1/src/goabackend/goatodoistprovider.h 2019-01-17 10:08:27.000000000 +0000 +++ gnome-online-accounts-3.31.90/src/goabackend/goatodoistprovider.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -/* - * Copyright © 2017 Ekta Nandwani - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, see . - */ - -#if !defined (__GOA_BACKEND_INSIDE_GOA_BACKEND_H__) && !defined (GOA_BACKEND_COMPILATION) -#error "Only can be included directly." -#endif - -#ifndef __GOA_TODOIST_PROVIDER_H__ -#define __GOA_TODOIST_PROVIDER_H__ - -#include - -#include "goaoauth2provider-priv.h" - -G_BEGIN_DECLS - -#define GOA_TYPE_TODOIST_PROVIDER (goa_todoist_provider_get_type ()) -G_DECLARE_FINAL_TYPE (GoaTodoistProvider, goa_todoist_provider, GOA, TODOIST_PROVIDER, GoaOAuth2Provider); - -G_END_DECLS - -#endif /* __GOA_TODOIST_PROVIDER_H__ */ \ No newline at end of file diff -Nru gnome-online-accounts-3.30.1/src/goabackend/Makefile.am gnome-online-accounts-3.31.90/src/goabackend/Makefile.am --- gnome-online-accounts-3.30.1/src/goabackend/Makefile.am 2019-01-17 10:08:27.000000000 +0000 +++ gnome-online-accounts-3.31.90/src/goabackend/Makefile.am 2019-01-17 11:54:47.000000000 +0000 @@ -20,7 +20,6 @@ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_LIB_DIR=\""$(libdir)"\" \ -DPACKAGE_WEB_EXTENSIONS_DIR=\""$(libdir)/goa-1.0/web-extensions"\" \ - -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ $(WARN_CFLAGS) \ $(NULL) @@ -95,7 +94,6 @@ goawindowsliveprovider.h goawindowsliveprovider.c \ goapocketprovider.h goapocketprovider.c \ goalastfmprovider.h goalastfmprovider.c \ - goatodoistprovider.h goatodoistprovider.c \ goaobjectskeletonutils.h goaobjectskeletonutils.c \ goautils.h goautils.c \ goawebview.h goawebview.c \ diff -Nru gnome-online-accounts-3.30.1/src/goabackend/Makefile.in gnome-online-accounts-3.31.90/src/goabackend/Makefile.in --- gnome-online-accounts-3.30.1/src/goabackend/Makefile.in 2019-01-17 10:27:12.000000000 +0000 +++ gnome-online-accounts-3.31.90/src/goabackend/Makefile.in 2019-02-09 21:16:18.000000000 +0000 @@ -185,10 +185,9 @@ goafoursquareprovider.h goafoursquareprovider.c \ goawindowsliveprovider.h goawindowsliveprovider.c \ goapocketprovider.h goapocketprovider.c goalastfmprovider.h \ - goalastfmprovider.c goatodoistprovider.h goatodoistprovider.c \ - goaobjectskeletonutils.h goaobjectskeletonutils.c goautils.h \ - goautils.c goawebview.h goawebview.c nautilus-floating-bar.h \ - nautilus-floating-bar.c \ + goalastfmprovider.c goaobjectskeletonutils.h \ + goaobjectskeletonutils.c goautils.h goautils.c goawebview.h \ + goawebview.c nautilus-floating-bar.h nautilus-floating-bar.c \ $(top_builddir)/src/goaidentity/org.gnome.Identity.c \ $(top_srcdir)/src/goaidentity/goaidentitymanagererror.c \ goakerberosprovider.h goakerberosprovider.c @@ -220,7 +219,6 @@ libgoa_backend_1_0_la-goawindowsliveprovider.lo \ libgoa_backend_1_0_la-goapocketprovider.lo \ libgoa_backend_1_0_la-goalastfmprovider.lo \ - libgoa_backend_1_0_la-goatodoistprovider.lo \ libgoa_backend_1_0_la-goaobjectskeletonutils.lo \ libgoa_backend_1_0_la-goautils.lo \ libgoa_backend_1_0_la-goawebview.lo \ @@ -534,7 +532,6 @@ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_LIB_DIR=\""$(libdir)"\" \ -DPACKAGE_WEB_EXTENSIONS_DIR=\""$(libdir)/goa-1.0/web-extensions"\" \ - -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ $(WARN_CFLAGS) \ $(NULL) @@ -582,10 +579,9 @@ goafoursquareprovider.h goafoursquareprovider.c \ goawindowsliveprovider.h goawindowsliveprovider.c \ goapocketprovider.h goapocketprovider.c goalastfmprovider.h \ - goalastfmprovider.c goatodoistprovider.h goatodoistprovider.c \ - goaobjectskeletonutils.h goaobjectskeletonutils.c goautils.h \ - goautils.c goawebview.h goawebview.c nautilus-floating-bar.h \ - nautilus-floating-bar.c \ + goalastfmprovider.c goaobjectskeletonutils.h \ + goaobjectskeletonutils.c goautils.h goautils.c goawebview.h \ + goawebview.c nautilus-floating-bar.h nautilus-floating-bar.c \ $(top_builddir)/src/goaidentity/org.gnome.Identity.c \ $(top_srcdir)/src/goaidentity/goaidentitymanagererror.c \ $(NULL) $(am__append_1) @@ -812,7 +808,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgoa_backend_1_0_la-goarestproxy.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgoa_backend_1_0_la-goasmtpauth.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgoa_backend_1_0_la-goasouplogger.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgoa_backend_1_0_la-goatodoistprovider.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgoa_backend_1_0_la-goautils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgoa_backend_1_0_la-goawebview.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgoa_backend_1_0_la-goawindowsliveprovider.Plo@am__quote@ @@ -1017,13 +1012,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgoa_backend_1_0_la_CFLAGS) $(CFLAGS) -c -o libgoa_backend_1_0_la-goalastfmprovider.lo `test -f 'goalastfmprovider.c' || echo '$(srcdir)/'`goalastfmprovider.c -libgoa_backend_1_0_la-goatodoistprovider.lo: goatodoistprovider.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgoa_backend_1_0_la_CFLAGS) $(CFLAGS) -MT libgoa_backend_1_0_la-goatodoistprovider.lo -MD -MP -MF $(DEPDIR)/libgoa_backend_1_0_la-goatodoistprovider.Tpo -c -o libgoa_backend_1_0_la-goatodoistprovider.lo `test -f 'goatodoistprovider.c' || echo '$(srcdir)/'`goatodoistprovider.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgoa_backend_1_0_la-goatodoistprovider.Tpo $(DEPDIR)/libgoa_backend_1_0_la-goatodoistprovider.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='goatodoistprovider.c' object='libgoa_backend_1_0_la-goatodoistprovider.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgoa_backend_1_0_la_CFLAGS) $(CFLAGS) -c -o libgoa_backend_1_0_la-goatodoistprovider.lo `test -f 'goatodoistprovider.c' || echo '$(srcdir)/'`goatodoistprovider.c - libgoa_backend_1_0_la-goaobjectskeletonutils.lo: goaobjectskeletonutils.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgoa_backend_1_0_la_CFLAGS) $(CFLAGS) -MT libgoa_backend_1_0_la-goaobjectskeletonutils.lo -MD -MP -MF $(DEPDIR)/libgoa_backend_1_0_la-goaobjectskeletonutils.Tpo -c -o libgoa_backend_1_0_la-goaobjectskeletonutils.lo `test -f 'goaobjectskeletonutils.c' || echo '$(srcdir)/'`goaobjectskeletonutils.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgoa_backend_1_0_la-goaobjectskeletonutils.Tpo $(DEPDIR)/libgoa_backend_1_0_la-goaobjectskeletonutils.Plo diff -Nru gnome-online-accounts-3.30.1/src/goaidentity/goaalarm.c gnome-online-accounts-3.31.90/src/goaidentity/goaalarm.c --- gnome-online-accounts-3.30.1/src/goaidentity/goaalarm.c 2019-01-17 10:22:48.000000000 +0000 +++ gnome-online-accounts-3.31.90/src/goaidentity/goaalarm.c 2019-01-31 07:49:52.000000000 +0000 @@ -73,7 +73,7 @@ static void clear_wakeup_source_pointer (GoaAlarm *self); static guint signals[NUMBER_OF_SIGNALS] = { 0 }; -G_DEFINE_TYPE (GoaAlarm, goa_alarm, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE (GoaAlarm, goa_alarm, G_TYPE_OBJECT); static void goa_alarm_dispose (GObject *object) @@ -152,8 +152,6 @@ object_class->get_property = goa_alarm_get_property; object_class->set_property = goa_alarm_set_property; - g_type_class_add_private (klass, sizeof (GoaAlarmPrivate)); - signals[FIRED] = g_signal_new ("fired", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, diff -Nru gnome-online-accounts-3.30.1/src/goaidentity/goaidentityservice.c gnome-online-accounts-3.31.90/src/goaidentity/goaidentityservice.c --- gnome-online-accounts-3.30.1/src/goaidentity/goaidentityservice.c 2019-01-17 10:08:27.000000000 +0000 +++ gnome-online-accounts-3.31.90/src/goaidentity/goaidentityservice.c 2019-01-17 11:54:47.000000000 +0000 @@ -66,6 +66,7 @@ G_DEFINE_TYPE_WITH_CODE (GoaIdentityService, goa_identity_service, GOA_IDENTITY_SERVICE_TYPE_MANAGER_SKELETON, + G_ADD_PRIVATE (GoaIdentityService) G_IMPLEMENT_INTERFACE (GOA_IDENTITY_SERVICE_TYPE_MANAGER, identity_service_manager_interface_init)); @@ -1704,8 +1705,6 @@ goa_identity_utils_register_error_domain (GOA_IDENTITY_ERROR, GOA_TYPE_IDENTITY_ERROR); goa_identity_utils_register_error_domain (GOA_IDENTITY_MANAGER_ERROR, GOA_TYPE_IDENTITY_MANAGER_ERROR); - - g_type_class_add_private (service_class, sizeof (GoaIdentityServicePrivate)); } GoaIdentityService * diff -Nru gnome-online-accounts-3.30.1/src/goaidentity/goakerberosidentity.c gnome-online-accounts-3.31.90/src/goaidentity/goakerberosidentity.c --- gnome-online-accounts-3.30.1/src/goaidentity/goakerberosidentity.c 2019-01-17 10:08:27.000000000 +0000 +++ gnome-online-accounts-3.31.90/src/goaidentity/goakerberosidentity.c 2019-01-17 11:54:47.000000000 +0000 @@ -103,6 +103,7 @@ G_DEFINE_TYPE_WITH_CODE (GoaKerberosIdentity, goa_kerberos_identity, G_TYPE_OBJECT, + G_ADD_PRIVATE (GoaKerberosIdentity) G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, initable_interface_init) G_IMPLEMENT_INTERFACE (GOA_TYPE_IDENTITY, @@ -186,8 +187,6 @@ object_class->finalize = goa_kerberos_identity_finalize; object_class->get_property = goa_kerberos_identity_get_property; - g_type_class_add_private (klass, sizeof (GoaKerberosIdentityPrivate)); - signals[EXPIRING] = g_signal_new ("expiring", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, diff -Nru gnome-online-accounts-3.30.1/src/goaidentity/goakerberosidentityinquiry.c gnome-online-accounts-3.31.90/src/goaidentity/goakerberosidentityinquiry.c --- gnome-online-accounts-3.30.1/src/goaidentity/goakerberosidentityinquiry.c 2019-01-17 10:20:36.000000000 +0000 +++ gnome-online-accounts-3.31.90/src/goaidentity/goakerberosidentityinquiry.c 2019-01-17 11:54:47.000000000 +0000 @@ -50,6 +50,7 @@ G_DEFINE_TYPE_WITH_CODE (GoaKerberosIdentityInquiry, goa_kerberos_identity_inquiry, G_TYPE_OBJECT, + G_ADD_PRIVATE (GoaKerberosIdentityInquiry) G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, initable_interface_init) G_IMPLEMENT_INTERFACE (GOA_TYPE_IDENTITY_INQUIRY, @@ -125,8 +126,6 @@ object_class->dispose = goa_kerberos_identity_inquiry_dispose; object_class->finalize = goa_kerberos_identity_inquiry_finalize; - - g_type_class_add_private (klass, sizeof (GoaKerberosIdentityInquiryPrivate)); } static void @@ -158,7 +157,7 @@ self = GOA_KERBEROS_IDENTITY_INQUIRY (object); /* FIXME: make these construct properties */ - self->priv->identity = g_object_ref (identity); + self->priv->identity = g_object_ref (GOA_IDENTITY (identity)); self->priv->name = g_strdup (name); self->priv->banner = g_strdup (banner); diff -Nru gnome-online-accounts-3.30.1/src/goaidentity/goakerberosidentitymanager.c gnome-online-accounts-3.31.90/src/goaidentity/goakerberosidentitymanager.c --- gnome-online-accounts-3.30.1/src/goaidentity/goakerberosidentitymanager.c 2019-01-17 10:08:27.000000000 +0000 +++ gnome-online-accounts-3.31.90/src/goaidentity/goakerberosidentitymanager.c 2019-01-17 11:54:47.000000000 +0000 @@ -80,7 +80,7 @@ GoaIdentity *identity; struct { - const char *identifier; + char *identifier; gconstpointer initial_password; char *preauth_source; GoaIdentitySignInFlags sign_in_flags; @@ -112,6 +112,7 @@ G_DEFINE_TYPE_WITH_CODE (GoaKerberosIdentityManager, goa_kerberos_identity_manager, G_TYPE_OBJECT, + G_ADD_PRIVATE (GoaKerberosIdentityManager) G_IMPLEMENT_INTERFACE (GOA_TYPE_IDENTITY_MANAGER, identity_manager_interface_init) G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, @@ -1664,8 +1665,6 @@ object_class->dispose = goa_kerberos_identity_manager_dispose; object_class->finalize = goa_kerberos_identity_manager_finalize; - - g_type_class_add_private (klass, sizeof (GoaKerberosIdentityManagerPrivate)); } GoaIdentityManager * diff -Nru gnome-online-accounts-3.30.1/src/goaidentity/Makefile.am gnome-online-accounts-3.31.90/src/goaidentity/Makefile.am --- gnome-online-accounts-3.30.1/src/goaidentity/Makefile.am 2019-01-17 10:08:27.000000000 +0000 +++ gnome-online-accounts-3.31.90/src/goaidentity/Makefile.am 2019-01-17 11:54:47.000000000 +0000 @@ -16,7 +16,6 @@ -DPACKAGE_LOCALSTATE_DIR=\""$(localstatedir)"\" \ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_LIB_DIR=\""$(libdir)"\" \ - -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ -DGOA_API_IS_SUBJECT_TO_CHANGE \ -DGOA_BACKEND_API_IS_SUBJECT_TO_CHANGE \ $(WARN_CFLAGS) \ diff -Nru gnome-online-accounts-3.30.1/src/goaidentity/Makefile.in gnome-online-accounts-3.31.90/src/goaidentity/Makefile.in --- gnome-online-accounts-3.30.1/src/goaidentity/Makefile.in 2019-01-17 10:27:12.000000000 +0000 +++ gnome-online-accounts-3.31.90/src/goaidentity/Makefile.in 2019-02-09 21:16:19.000000000 +0000 @@ -441,7 +441,6 @@ -DPACKAGE_LOCALSTATE_DIR=\""$(localstatedir)"\" \ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_LIB_DIR=\""$(libdir)"\" \ - -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ -DGOA_API_IS_SUBJECT_TO_CHANGE \ -DGOA_BACKEND_API_IS_SUBJECT_TO_CHANGE \ $(WARN_CFLAGS) \ diff -Nru gnome-online-accounts-3.30.1/src/goaidentity/org.gnome.Identity.c gnome-online-accounts-3.31.90/src/goaidentity/org.gnome.Identity.c --- gnome-online-accounts-3.30.1/src/goaidentity/org.gnome.Identity.c 2019-01-17 10:27:22.000000000 +0000 +++ gnome-online-accounts-3.31.90/src/goaidentity/org.gnome.Identity.c 2019-02-09 21:16:43.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.56.4. DO NOT EDIT. + * Generated by gdbus-codegen 2.59.2 from org.gnome.Identity.xml. DO NOT EDIT. * * The license of this code is the same as for the D-Bus interface description * it was derived from. @@ -39,7 +39,8 @@ { GDBusPropertyInfo parent_struct; const gchar *hyphen_name; - gboolean use_gvariant; + guint use_gvariant : 1; + guint emits_changed_signal : 1; } _ExtendedGDBusPropertyInfo; typedef struct @@ -186,10 +187,10 @@ FALSE }; -static const _ExtendedGDBusArgInfo * const _goa_identity_service_manager_method_info_exchange_secret_keys_IN_ARG_pointers[] = +static const GDBusArgInfo * const _goa_identity_service_manager_method_info_exchange_secret_keys_IN_ARG_pointers[] = { - &_goa_identity_service_manager_method_info_exchange_secret_keys_IN_ARG_identifier, - &_goa_identity_service_manager_method_info_exchange_secret_keys_IN_ARG_input_key, + &_goa_identity_service_manager_method_info_exchange_secret_keys_IN_ARG_identifier.parent_struct, + &_goa_identity_service_manager_method_info_exchange_secret_keys_IN_ARG_input_key.parent_struct, NULL }; @@ -204,9 +205,9 @@ FALSE }; -static const _ExtendedGDBusArgInfo * const _goa_identity_service_manager_method_info_exchange_secret_keys_OUT_ARG_pointers[] = +static const GDBusArgInfo * const _goa_identity_service_manager_method_info_exchange_secret_keys_OUT_ARG_pointers[] = { - &_goa_identity_service_manager_method_info_exchange_secret_keys_OUT_ARG_output_key, + &_goa_identity_service_manager_method_info_exchange_secret_keys_OUT_ARG_output_key.parent_struct, NULL }; @@ -245,10 +246,10 @@ FALSE }; -static const _ExtendedGDBusArgInfo * const _goa_identity_service_manager_method_info_sign_in_IN_ARG_pointers[] = +static const GDBusArgInfo * const _goa_identity_service_manager_method_info_sign_in_IN_ARG_pointers[] = { - &_goa_identity_service_manager_method_info_sign_in_IN_ARG_identifier, - &_goa_identity_service_manager_method_info_sign_in_IN_ARG_details, + &_goa_identity_service_manager_method_info_sign_in_IN_ARG_identifier.parent_struct, + &_goa_identity_service_manager_method_info_sign_in_IN_ARG_details.parent_struct, NULL }; @@ -263,9 +264,9 @@ FALSE }; -static const _ExtendedGDBusArgInfo * const _goa_identity_service_manager_method_info_sign_in_OUT_ARG_pointers[] = +static const GDBusArgInfo * const _goa_identity_service_manager_method_info_sign_in_OUT_ARG_pointers[] = { - &_goa_identity_service_manager_method_info_sign_in_OUT_ARG_identity_object_path, + &_goa_identity_service_manager_method_info_sign_in_OUT_ARG_identity_object_path.parent_struct, NULL }; @@ -293,9 +294,9 @@ FALSE }; -static const _ExtendedGDBusArgInfo * const _goa_identity_service_manager_method_info_sign_out_IN_ARG_pointers[] = +static const GDBusArgInfo * const _goa_identity_service_manager_method_info_sign_out_IN_ARG_pointers[] = { - &_goa_identity_service_manager_method_info_sign_out_IN_ARG_identity, + &_goa_identity_service_manager_method_info_sign_out_IN_ARG_identity.parent_struct, NULL }; @@ -312,11 +313,11 @@ FALSE }; -static const _ExtendedGDBusMethodInfo * const _goa_identity_service_manager_method_info_pointers[] = +static const GDBusMethodInfo * const _goa_identity_service_manager_method_info_pointers[] = { - &_goa_identity_service_manager_method_info_exchange_secret_keys, - &_goa_identity_service_manager_method_info_sign_in, - &_goa_identity_service_manager_method_info_sign_out, + &_goa_identity_service_manager_method_info_exchange_secret_keys.parent_struct, + &_goa_identity_service_manager_method_info_sign_in.parent_struct, + &_goa_identity_service_manager_method_info_sign_out.parent_struct, NULL }; @@ -500,7 +501,7 @@ /** * goa_identity_service_manager_call_exchange_secret_keys_finish: * @proxy: A #GoaIdentityServiceManagerProxy. - * @out_output_key: (out): Return location for return parameter or %NULL to ignore. + * @out_output_key: (out) (optional): Return location for return parameter or %NULL to ignore. * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to goa_identity_service_manager_call_exchange_secret_keys(). * @error: Return location for error or %NULL. * @@ -532,7 +533,7 @@ * @proxy: A #GoaIdentityServiceManagerProxy. * @arg_identifier: Argument to pass with the method invocation. * @arg_input_key: Argument to pass with the method invocation. - * @out_output_key: (out): Return location for return parameter or %NULL to ignore. + * @out_output_key: (out) (optional): Return location for return parameter or %NULL to ignore. * @cancellable: (nullable): A #GCancellable or %NULL. * @error: Return location for error or %NULL. * @@ -610,7 +611,7 @@ /** * goa_identity_service_manager_call_sign_in_finish: * @proxy: A #GoaIdentityServiceManagerProxy. - * @out_identity_object_path: (out): Return location for return parameter or %NULL to ignore. + * @out_identity_object_path: (out) (optional): Return location for return parameter or %NULL to ignore. * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to goa_identity_service_manager_call_sign_in(). * @error: Return location for error or %NULL. * @@ -642,7 +643,7 @@ * @proxy: A #GoaIdentityServiceManagerProxy. * @arg_identifier: Argument to pass with the method invocation. * @arg_details: Argument to pass with the method invocation. - * @out_identity_object_path: (out): Return location for return parameter or %NULL to ignore. + * @out_identity_object_path: (out) (optional): Return location for return parameter or %NULL to ignore. * @cancellable: (nullable): A #GCancellable or %NULL. * @error: Return location for error or %NULL. * @@ -1493,7 +1494,8 @@ NULL }, "identifier", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_identity_service_identity_property_info_expiration_timestamp = @@ -1506,7 +1508,8 @@ NULL }, "expiration-timestamp", - FALSE + FALSE, + TRUE }; static const _ExtendedGDBusPropertyInfo _goa_identity_service_identity_property_info_is_signed_in = @@ -1519,14 +1522,15 @@ NULL }, "is-signed-in", - FALSE + FALSE, + TRUE }; -static const _ExtendedGDBusPropertyInfo * const _goa_identity_service_identity_property_info_pointers[] = +static const GDBusPropertyInfo * const _goa_identity_service_identity_property_info_pointers[] = { - &_goa_identity_service_identity_property_info_identifier, - &_goa_identity_service_identity_property_info_expiration_timestamp, - &_goa_identity_service_identity_property_info_is_signed_in, + &_goa_identity_service_identity_property_info_identifier.parent_struct, + &_goa_identity_service_identity_property_info_expiration_timestamp.parent_struct, + &_goa_identity_service_identity_property_info_is_signed_in.parent_struct, NULL }; @@ -1640,7 +1644,7 @@ * * The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use goa_identity_service_identity_dup_identifier() if on another thread. * - * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. + * Returns: (transfer none) (nullable): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object. */ const gchar * goa_identity_service_identity_get_identifier (GoaIdentityServiceIdentity *object) @@ -1656,7 +1660,7 @@ * * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side. * - * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). + * Returns: (transfer full) (nullable): The property value or %NULL if the property is not set. The returned value should be freed with g_free(). */ gchar * goa_identity_service_identity_dup_identifier (GoaIdentityServiceIdentity *object) @@ -1792,7 +1796,7 @@ const _ExtendedGDBusPropertyInfo *info; GVariant *variant; g_assert (prop_id != 0 && prop_id - 1 < 3); - info = _goa_identity_service_identity_property_info_pointers[prop_id - 1]; + info = (const _ExtendedGDBusPropertyInfo *) _goa_identity_service_identity_property_info_pointers[prop_id - 1]; variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (object), info->parent_struct.name); if (info->use_gvariant) { @@ -1839,7 +1843,7 @@ const _ExtendedGDBusPropertyInfo *info; GVariant *variant; g_assert (prop_id != 0 && prop_id - 1 < 3); - info = _goa_identity_service_identity_property_info_pointers[prop_id - 1]; + info = (const _ExtendedGDBusPropertyInfo *) _goa_identity_service_identity_property_info_pointers[prop_id - 1]; variant = g_dbus_gvalue_to_gvariant (value, G_VARIANT_TYPE (info->parent_struct.signature)); g_dbus_proxy_call (G_DBUS_PROXY (object), "org.freedesktop.DBus.Properties.Set", @@ -2566,14 +2570,17 @@ const GValue *value, GParamSpec *pspec) { + const _ExtendedGDBusPropertyInfo *info; GoaIdentityServiceIdentitySkeleton *skeleton = GOA_IDENTITY_SERVICE_IDENTITY_SKELETON (object); g_assert (prop_id != 0 && prop_id - 1 < 3); + info = (const _ExtendedGDBusPropertyInfo *) _goa_identity_service_identity_property_info_pointers[prop_id - 1]; g_mutex_lock (&skeleton->priv->lock); g_object_freeze_notify (object); if (!_g_value_equal (value, &skeleton->priv->properties[prop_id - 1])) { - if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL) - _goa_identity_service_identity_schedule_emit_changed (skeleton, _goa_identity_service_identity_property_info_pointers[prop_id - 1], prop_id, &skeleton->priv->properties[prop_id - 1]); + if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL && + info->emits_changed_signal) + _goa_identity_service_identity_schedule_emit_changed (skeleton, info, prop_id, &skeleton->priv->properties[prop_id - 1]); g_value_copy (value, &skeleton->priv->properties[prop_id - 1]); g_object_notify_by_pspec (object, pspec); } @@ -2717,7 +2724,7 @@ * * Connect to the #GObject::notify signal to get informed of property changes. */ - g_object_interface_install_property (iface, g_param_spec_object ("manager", "manager", "manager", GOA_IDENTITY_SERVICE_TYPE_MANAGER, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS)); + g_object_interface_install_property (iface, g_param_spec_object ("manager", "manager", "manager", GOA_IDENTITY_SERVICE_TYPE_MANAGER, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** * GoaIdentityServiceObject:identity: @@ -2726,7 +2733,7 @@ * * Connect to the #GObject::notify signal to get informed of property changes. */ - g_object_interface_install_property (iface, g_param_spec_object ("identity", "identity", "identity", GOA_IDENTITY_SERVICE_TYPE_IDENTITY, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS)); + g_object_interface_install_property (iface, g_param_spec_object ("identity", "identity", "identity", GOA_IDENTITY_SERVICE_TYPE_IDENTITY, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); } @@ -2736,7 +2743,7 @@ * * Gets the #GoaIdentityServiceManager instance for the D-Bus interface org.gnome.Identity.Manager on @object, if any. * - * Returns: (transfer full): A #GoaIdentityServiceManager that must be freed with g_object_unref() or %NULL if @object does not implement the interface. + * Returns: (transfer full) (nullable): A #GoaIdentityServiceManager that must be freed with g_object_unref() or %NULL if @object does not implement the interface. */ GoaIdentityServiceManager *goa_identity_service_object_get_manager (GoaIdentityServiceObject *object) { @@ -2753,7 +2760,7 @@ * * Gets the #GoaIdentityServiceIdentity instance for the D-Bus interface org.gnome.Identity on @object, if any. * - * Returns: (transfer full): A #GoaIdentityServiceIdentity that must be freed with g_object_unref() or %NULL if @object does not implement the interface. + * Returns: (transfer full) (nullable): A #GoaIdentityServiceIdentity that must be freed with g_object_unref() or %NULL if @object does not implement the interface. */ GoaIdentityServiceIdentity *goa_identity_service_object_get_identity (GoaIdentityServiceObject *object) { @@ -2773,7 +2780,7 @@ * * It is not safe to use the returned object if you are on another thread than the one where the #GDBusObjectManagerClient or #GDBusObjectManagerServer for @object is running. * - * Returns: (transfer none): A #GoaIdentityServiceManager or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. + * Returns: (transfer none) (nullable): A #GoaIdentityServiceManager or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. */ GoaIdentityServiceManager *goa_identity_service_object_peek_manager (GoaIdentityServiceObject *object) { @@ -2793,7 +2800,7 @@ * * It is not safe to use the returned object if you are on another thread than the one where the #GDBusObjectManagerClient or #GDBusObjectManagerServer for @object is running. * - * Returns: (transfer none): A #GoaIdentityServiceIdentity or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. + * Returns: (transfer none) (nullable): A #GoaIdentityServiceIdentity or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object. */ GoaIdentityServiceIdentity *goa_identity_service_object_peek_identity (GoaIdentityServiceObject *object) { diff -Nru gnome-online-accounts-3.30.1/src/goaidentity/org.gnome.Identity.h gnome-online-accounts-3.31.90/src/goaidentity/org.gnome.Identity.h --- gnome-online-accounts-3.30.1/src/goaidentity/org.gnome.Identity.h 2019-01-17 10:27:22.000000000 +0000 +++ gnome-online-accounts-3.31.90/src/goaidentity/org.gnome.Identity.h 2019-02-09 21:16:43.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.56.4. DO NOT EDIT. + * Generated by gdbus-codegen 2.59.2 from org.gnome.Identity.xml. DO NOT EDIT. * * The license of this code is the same as for the D-Bus interface description * it was derived from.