diff -Nru xfwm4-4.16.0/aclocal.m4 xfwm4-4.16.1/aclocal.m4 --- xfwm4-4.16.0/aclocal.m4 2020-12-22 22:56:37.000000000 +0000 +++ xfwm4-4.16.1/aclocal.m4 2021-01-09 17:58:46.000000000 +0000 @@ -20,1831 +20,1688 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -# (This private macro should not be called outside this file.) -AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.16' -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.16.1], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -]) +dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) +# serial 42 IT_PROG_INTLTOOL +AC_DEFUN([IT_PROG_INTLTOOL], [ +AC_PREREQ([2.50])dnl +AC_REQUIRE([AM_NLS])dnl -# _AM_AUTOCONF_VERSION(VERSION) -# ----------------------------- -# aclocal traces this macro to find the Autoconf version. -# This is a private macro too. Using m4_define simplifies -# the logic in aclocal, which can simply ignore this definition. -m4_define([_AM_AUTOCONF_VERSION], []) +case "$am__api_version" in + 1.[01234]) + AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) + ;; + *) + ;; +esac -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.16.1])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +if test -n "$1"; then + AC_MSG_CHECKING([for intltool >= $1]) + AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) + test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || + AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) +fi -# AM_AUX_DIR_EXPAND -*- Autoconf -*- +AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) +AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) +AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) +if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then + AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) +fi -# Copyright (C) 2001-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi +AC_SUBST([AM_DEFAULT_VERBOSITY]) -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to -# '$srcdir', '$srcdir/..', or '$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is '.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' +AC_SUBST(INTLTOOL_V_MERGE) +AC_SUBST(INTLTOOL__v_MERGE_) +AC_SUBST(INTLTOOL__v_MERGE_0) -AC_DEFUN([AM_AUX_DIR_EXPAND], -[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl -# Expand $ac_aux_dir to an absolute path. -am_aux_dir=`cd "$ac_aux_dir" && pwd` -]) +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' +AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) +AC_SUBST(intltool__v_merge_options_) +AC_SUBST(intltool__v_merge_options_0) -# AM_CONDITIONAL -*- Autoconf -*- + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir' +fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -# Copyright (C) 1997-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +_IT_SUBST(INTLTOOL_DESKTOP_RULE) +_IT_SUBST(INTLTOOL_DIRECTORY_RULE) +_IT_SUBST(INTLTOOL_KEYS_RULE) +_IT_SUBST(INTLTOOL_PROP_RULE) +_IT_SUBST(INTLTOOL_OAF_RULE) +_IT_SUBST(INTLTOOL_PONG_RULE) +_IT_SUBST(INTLTOOL_SERVER_RULE) +_IT_SUBST(INTLTOOL_SHEET_RULE) +_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) +_IT_SUBST(INTLTOOL_UI_RULE) +_IT_SUBST(INTLTOOL_XAM_RULE) +_IT_SUBST(INTLTOOL_KBD_RULE) +_IT_SUBST(INTLTOOL_XML_RULE) +_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) +_IT_SUBST(INTLTOOL_CAVES_RULE) +_IT_SUBST(INTLTOOL_SCHEMAS_RULE) +_IT_SUBST(INTLTOOL_THEME_RULE) +_IT_SUBST(INTLTOOL_SERVICE_RULE) +_IT_SUBST(INTLTOOL_POLICY_RULE) -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ([2.52])dnl - m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE])dnl -AC_SUBST([$1_FALSE])dnl -_AM_SUBST_NOTMAKE([$1_TRUE])dnl -_AM_SUBST_NOTMAKE([$1_FALSE])dnl -m4_define([_AM_COND_VALUE_$1], [$2])dnl -if $2; then - $1_TRUE= - $1_FALSE='#' +# Check the gettext tools to make sure they are GNU +AC_PATH_PROG(XGETTEXT, xgettext) +AC_PATH_PROG(MSGMERGE, msgmerge) +AC_PATH_PROG(MSGFMT, msgfmt) +AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) +if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +fi +xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" +mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" +mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" +if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +fi + +AC_PATH_PROG(INTLTOOL_PERL, perl) +if test -z "$INTLTOOL_PERL"; then + AC_MSG_ERROR([perl not found]) +fi +AC_MSG_CHECKING([for perl >= 5.8.1]) +$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 +if test $? -ne 0; then + AC_MSG_ERROR([perl 5.8.1 is required for intltool]) else - $1_TRUE='#' - $1_FALSE= + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` + AC_MSG_RESULT([$IT_PERL_VERSION]) +fi +if test "x$2" != "xno-xml"; then + AC_MSG_CHECKING([for XML::Parser]) + if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then + AC_MSG_RESULT([ok]) + else + AC_MSG_ERROR([XML::Parser perl module is required for intltool]) + fi fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Substitute ALL_LINGUAS so we can use it in po/Makefile +AC_SUBST(ALL_LINGUAS) +IT_PO_SUBDIR([po]) -# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... +]) -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". -# We try a few techniques and use that to set a single cache variable. +# IT_PO_SUBDIR(DIRNAME) +# --------------------- +# All po subdirs have to be declared with this macro; the subdir "po" is +# declared by IT_PROG_INTLTOOL. # -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl - -m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], - [$1], [CXX], [depcc="$CXX" am_compiler_list=], - [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], - [$1], [UPC], [depcc="$UPC" am_compiler_list=], - [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) - -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named 'D' -- because '-MD' means "put the output - # in D". - rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - am__universal=false - m4_case([$1], [CC], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac], - [CXX], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac]) - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with - # Solaris 10 /bin/sh. - echo '/* dummy */' > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with '-c' and '-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle '-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs. - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # After this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested. - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok '-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi +AC_DEFUN([IT_PO_SUBDIR], +[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. +dnl +dnl The following CONFIG_COMMANDS should be executed at the very end +dnl of config.status. +AC_CONFIG_COMMANDS_PRE([ + AC_CONFIG_COMMANDS([$1/stamp-it], [ + if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then + AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) - - -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES. -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) - - -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE([dependency-tracking], [dnl -AS_HELP_STRING( - [--enable-dependency-tracking], - [do not reject slow dependency extractors]) -AS_HELP_STRING( - [--disable-dependency-tracking], - [speeds up one-time build])]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - am__nodep='_no' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -AC_SUBST([am__nodep])dnl -_AM_SUBST_NOTMAKE([am__nodep])dnl + rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" + >"$1/stamp-it.tmp" + [sed '/^#/d + s/^[[].*] *// + /^[ ]*$/d + '"s|^| $ac_top_srcdir/|" \ + "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" + ] + [sed '/^POTFILES =/,/[^\\]$/ { + /^POTFILES =/!d + r $1/POTFILES + } + ' "$1/Makefile.in" >"$1/Makefile"] + rm -f "$1/Makefile.tmp" + mv "$1/stamp-it.tmp" "$1/stamp-it" + ]) +])dnl ]) -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[{ - # Older Autoconf quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval - # if we detect the quoting. - # TODO: see whether this extra hack can be removed once we start - # requiring Autoconf 2.70 or later. - AS_CASE([$CONFIG_FILES], - [*\'*], [eval set x "$CONFIG_FILES"], - [*], [set x $CONFIG_FILES]) - shift - # Used to flag and report bootstrapping failures. - am_rc=0 - for am_mf - do - # Strip MF so we end up with the name of the file. - am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile which includes - # dependency-tracking related rules and includes. - # Grep'ing the whole file directly is not great: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ - || continue - am_dirpart=`AS_DIRNAME(["$am_mf"])` - am_filepart=`AS_BASENAME(["$am_mf"])` - AM_RUN_LOG([cd "$am_dirpart" \ - && sed -e '/# am--include-marker/d' "$am_filepart" \ - | $MAKE -f - am--depfiles]) || am_rc=$? - done - if test $am_rc -ne 0; then - AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the - '--disable-dependency-tracking' option to at least be able to build - the package (albeit without support for automatic dependency tracking).]) - fi - AS_UNSET([am_dirpart]) - AS_UNSET([am_filepart]) - AS_UNSET([am_mf]) - AS_UNSET([am_rc]) - rm -f conftest-deps.mk -} -])# _AM_OUTPUT_DEPENDENCY_COMMANDS - - -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking is enabled. -# This creates each '.Po' and '.Plo' makefile fragment that we'll need in -# order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) - -# Do all the work for Automake. -*- Autoconf -*- - -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# _IT_SUBST(VARIABLE) +# ------------------- +# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST # -# 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. +AC_DEFUN([_IT_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. +# deprecated macros +AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) +# A hint is needed for aclocal from Automake <= 1.9.4: +# AC_DEFUN([AC_PROG_INTLTOOL], ...) -dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. -m4_define([AC_PROG_CC], -m4_defn([AC_PROG_CC]) -[_AM_PROG_CC_C_O -]) -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.65])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi -fi +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 11 (pkg-config-0.29.1) -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) +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. -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[AC_DIAGNOSE([obsolete], - [$0: two- and three-arguments forms are deprecated.]) -m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if( - m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), - [ok:ok],, - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl +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 -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) - AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl +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]) -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) -AM_MISSING_PROG([AUTOCONF], [autoconf]) -AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) -AM_MISSING_PROG([AUTOHEADER], [autoheader]) -AM_MISSING_PROG([MAKEINFO], [makeinfo]) -AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -# For better backward compatibility. To be removed once Automake 1.9.x -# dies out for good. For more background, see: -# -# -AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target (and possibly the TAP driver). The -# system "awk" is bad on some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES([CC])], - [m4_define([AC_PROG_CC], - m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES([CXX])], - [m4_define([AC_PROG_CXX], - m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES([OBJC])], - [m4_define([AC_PROG_OBJC], - m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], - [_AM_DEPENDENCIES([OBJCXX])], - [m4_define([AC_PROG_OBJCXX], - m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl -]) -AC_REQUIRE([AM_SILENT_RULES])dnl -dnl The testsuite driver may need to know about EXEEXT, so add the -dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This -dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. -AC_CONFIG_COMMANDS_PRE(dnl -[m4_provide_if([_AM_COMPILER_EXEEXT], - [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl +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 -# POSIX will say in a future version that running "rm -f" with no argument -# is OK; and we want to be able to make that assumption in our Makefile -# recipes. So use an aggressive probe to check that the usage we want is -# actually supported "in the wild" to an acceptable degree. -# See automake bug#10828. -# To make any issue more visible, cause the running configure to be aborted -# by default if the 'rm' program in use doesn't match our expectations; the -# user can still override this though. -if rm -f && rm -fr && rm -rf; then : OK; else - cat >&2 <<'END' -Oops! +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]) -Your 'rm' program seems unable to run without file operands specified -on the command line, even when the '-f' option is present. This is contrary -to the behaviour of most rm programs out there, and not conforming with -the upcoming POSIX standard: +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 -Please tell bug-automake@gnu.org about your system, including the value -of your $PATH and any error possibly output before this message. This -can help us improve future automake versions. +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 -END - if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then - echo 'Configuration will proceed anyway, since you have set the' >&2 - echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 - echo >&2 - else - cat >&2 <<'END' -Aborting the configuration process, to ensure you take notice of the issue. -You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +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]) -If you want to complete the configuration process using your problematic -'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM -to "yes", and re-run configure. +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) -END - AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) - fi -fi -dnl The trailing newline in this macro's definition is deliberate, for -dnl backward compatibility and to allow trailing 'dnl'-style comments -dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. -]) +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.]) -dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not -dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further -dnl mangled by Autoconf and run in a shell conditional statement. -m4_define([_AC_COMPILER_EXEEXT], -m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) +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 -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_arg=$1 -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) +$$1_PKG_ERRORS -# Copyright (C) 2001-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi -AC_SUBST([install_sh])]) +_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. -# Copyright (C) 2003-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +_PKG_TEXT -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. +To get pkg-config, see .])[]dnl + ]) else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) - -# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- -# From Jim Meyering - -# Copyright (C) 1996-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])dnl PKG_CHECK_MODULES -# AM_MAINTAINER_MODE([DEFAULT-MODE]) -# ---------------------------------- -# Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless 'enable' is passed literally. -# For symmetry, 'disable' may be passed as well. Anyway, the user -# can override the default with the --enable/--disable switch. -AC_DEFUN([AM_MAINTAINER_MODE], -[m4_case(m4_default([$1], [disable]), - [enable], [m4_define([am_maintainer_other], [disable])], - [disable], [m4_define([am_maintainer_other], [enable])], - [m4_define([am_maintainer_other], [enable]) - m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode's default is 'disable' unless 'enable' is passed - AC_ARG_ENABLE([maintainer-mode], - [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], - am_maintainer_other[ make rules and dependencies not useful - (and sometimes confusing) to the casual installer])], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST([MAINT])dnl -] -) -# Check to see how 'make' treats includes. -*- Autoconf -*- +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 -# Copyright (C) 2001-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# AM_MAKE_INCLUDE() -# ----------------- -# Check whether make has an 'include' directive that can support all -# the idioms we need for our automatic dependency tracking code. -AC_DEFUN([AM_MAKE_INCLUDE], -[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) -cat > confinc.mk << 'END' -am__doit: - @echo this is the am__doit target >confinc.out -.PHONY: am__doit -END -am__include="#" -am__quote= -# BSD make does it like this. -echo '.include "confinc.mk" # ignored' > confmf.BSD -# Other make implementations (GNU, Solaris 10, AIX) do it like this. -echo 'include confinc.mk # ignored' > confmf.GNU -_am_result=no -for s in GNU BSD; do - AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) - AS_CASE([$?:`cat confinc.out 2>/dev/null`], - ['0:this is the am__doit target'], - [AS_CASE([$s], - [BSD], [am__include='.include' am__quote='"'], - [am__include='include' am__quote=''])]) - if test "$am__include" != "#"; then - _am_result="yes ($s style)" - break - fi -done -rm -f confinc.* confmf.* -AC_MSG_RESULT([${_am_result}]) -AC_SUBST([am__include])]) -AC_SUBST([am__quote])]) +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 -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +dnl 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 -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it is modern enough. -# If it is, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([missing])dnl -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi -# Use eval to expand $SHELL -if eval "$MISSING --is-lightweight"; then - am_missing_run="$MISSING " -else - am_missing_run= - AC_MSG_WARN(['missing' script is too old or missing]) -fi -]) +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 -# Helper functions for option handling. -*- Autoconf -*- +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])dnl PKG_CHECK_VAR -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) +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])) -# _AM_SET_OPTION(NAME) -# -------------------- -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) +m4_pushdef([description], + [m4_default([$5], [build with ]with_arg[ support])]) -# _AM_SET_OPTIONS(OPTIONS) -# ------------------------ -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +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_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +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]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +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 + +# Copyright (C) 2002-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# _AM_PROG_CC_C_O -# --------------- -# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC -# to automatically call this. -AC_DEFUN([_AM_PROG_CC_C_O], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -AC_LANG_PUSH([C])dnl -AC_CACHE_CHECK( - [whether $CC understands -c and -o together], - [am_cv_prog_cc_c_o], - [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) - # Make sure it works both with $CC and with simple cc. - # Following AC_PROG_CC_C_O, we do the test twice because some - # compilers refuse to overwrite an existing .o file with -o, - # though they will create one. - am_cv_prog_cc_c_o=yes - for am_i in 1 2; do - if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ - && test -f conftest2.$ac_objext; then - : OK - else - am_cv_prog_cc_c_o=no - break - fi - done - rm -f core conftest* - unset am_i]) -if test "$am_cv_prog_cc_c_o" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -AC_LANG_POP([C])]) - -# For backward compatibility. -AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.16' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.16.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) -# AM_RUN_LOG(COMMAND) -# ------------------- -# Run COMMAND, save the exit status in ac_status, and log it. -# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) -AC_DEFUN([AM_RUN_LOG], -[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD - ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - (exit $ac_status); }]) +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.16.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- +# AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[[\\\"\#\$\&\'\`$am_lf]]*) - AC_MSG_ERROR([unsafe absolute working directory name]);; -esac -case $srcdir in - *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; -esac - -# Do 'set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - am_has_slept=no - for am_try in 1 2; do - echo "timestamp, slept: $am_has_slept" > conftest.file - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is '.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken - alias in your environment]) - fi - if test "$[2]" = conftest.file || test $am_try -eq 2; then - break - fi - # Just in case. - sleep 1 - am_has_slept=yes - done - test "$[2]" = conftest.file - ) -then - # Ok. - : +AC_DEFUN([AM_AUX_DIR_EXPAND], +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` +]) + +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT([yes]) -# If we didn't sleep, we still need to ensure time stamps of config.status and -# generated files are strictly newer. -am_sleep_pid= -if grep 'slept: no' conftest.file >/dev/null 2>&1; then - ( sleep 1 ) & - am_sleep_pid=$! + $1_TRUE='#' + $1_FALSE= fi AC_CONFIG_COMMANDS_PRE( - [AC_MSG_CHECKING([that generated files are newer than configure]) - if test -n "$am_sleep_pid"; then - # Hide warnings about reused PIDs. - wait $am_sleep_pid 2>/dev/null - fi - AC_MSG_RESULT([done])]) -rm -f conftest.file -]) +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# AM_SILENT_RULES([DEFAULT]) -# -------------------------- -# Enable less verbose build rules; with the default set to DEFAULT -# ("yes" being less verbose, "no" or empty being verbose). -AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], [dnl -AS_HELP_STRING( - [--enable-silent-rules], - [less verbose build output (undo: "make V=1")]) -AS_HELP_STRING( - [--disable-silent-rules], - [verbose build output (undo: "make V=0")])dnl -]) -case $enable_silent_rules in @%:@ ((( - yes) AM_DEFAULT_VERBOSITY=0;; - no) AM_DEFAULT_VERBOSITY=1;; - *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; -esac -dnl -dnl A few 'make' implementations (e.g., NonStop OS and NextStep) -dnl do not support nested variable expansions. -dnl See automake bug#9928 and bug#10237. -am_make=${MAKE-make} -AC_CACHE_CHECK([whether $am_make supports nested variables], - [am_cv_make_support_nested_variables], - [if AS_ECHO([['TRUE=$(BAR$(V)) -BAR0=false -BAR1=true -V=1 -am__doit: - @$(TRUE) -.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then - am_cv_make_support_nested_variables=yes -else - am_cv_make_support_nested_variables=no -fi]) -if test $am_cv_make_support_nested_variables = yes; then - dnl Using '$V' instead of '$(V)' breaks IRIX make. - AM_V='$(V)' - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' + +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl + +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir else - AM_V=$AM_DEFAULT_VERBOSITY - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY + am_cv_$1_dependencies_compiler_type=none fi -AC_SUBST([AM_V])dnl -AM_SUBST_NOTMAKE([AM_V])dnl -AC_SUBST([AM_DEFAULT_V])dnl -AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl -AC_SUBST([AM_DEFAULT_VERBOSITY])dnl -AM_BACKSLASH='\' -AC_SUBST([AM_BACKSLASH])dnl -_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +]) + + +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl ]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor 'install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in "make install-strip", and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using 'strip' when the user -# run "make install-strip". However 'strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the 'STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl +]) -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Generate code to set up dependency tracking. -*- Autoconf -*- + +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[{ + # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + AS_CASE([$CONFIG_FILES], + [*\'*], [eval set x "$CONFIG_FILES"], + [*], [set x $CONFIG_FILES]) + shift + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf + do + # Strip MF so we end up with the name of the file. + am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`AS_DIRNAME(["$am_mf"])` + am_filepart=`AS_BASENAME(["$am_mf"])` + AM_RUN_LOG([cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles]) || am_rc=$? + done + if test $am_rc -ne 0; then + AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking).]) + fi + AS_UNSET([am_dirpart]) + AS_UNSET([am_filepart]) + AS_UNSET([am_mf]) + AS_UNSET([am_rc]) + rm -f conftest-deps.mk +} +])# _AM_OUTPUT_DEPENDENCY_COMMANDS -# AM_SUBST_NOTMAKE(VARIABLE) -# -------------------------- -# Public sister of _AM_SUBST_NOTMAKE. -AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -# Check how to create a tarball. -*- Autoconf -*- +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking is enabled. +# This creates each '.Po' and '.Plo' makefile fragment that we'll need in +# order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Do all the work for Automake. -*- Autoconf -*- + +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of 'v7', 'ustar', or 'pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -# -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. Yes, it's still used -# in the wild :-( We should find a proper way to deprecate it ... -AC_SUBST([AMTAR], ['$${TAR-tar}']) +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. -# We'll loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.65])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi - [m4_case([$1], - [ustar], - [# The POSIX 1988 'ustar' format is defined with fixed-size fields. - # There is notably a 21 bits limit for the UID and the GID. In fact, - # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 - # and bug#13588). - am_max_uid=2097151 # 2^21 - 1 - am_max_gid=$am_max_uid - # The $UID and $GID variables are not portable, so we need to resort - # to the POSIX-mandated id(1) utility. Errors in the 'id' calls - # below are definitely unexpected, so allow the users to see them - # (that is, avoid stderr redirection). - am_uid=`id -u || echo unknown` - am_gid=`id -g || echo unknown` - AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) - if test $am_uid -le $am_max_uid; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - _am_tools=none - fi - AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) - if test $am_gid -le $am_max_gid; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - _am_tools=none - fi], +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) - [pax], - [], +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - [m4_fatal([Unknown tar format])]) +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl - AC_MSG_CHECKING([how to create a $1 tar archive]) +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +]) +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl - # Go ahead even if we have the value already cached. We do so because we - # need to set the values for the 'am__tar' and 'am__untar' variables. - _am_tools=${am_cv_prog_tar_$1-$_am_tools} +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! - for _am_tool in $_am_tools; do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. - # tar/untar a dummy directory, and stop if the command works. - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi - done - rm -rf conftest.dir +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. - AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) - AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. -# Copyright (C) 1995-2002 Free Software Foundation, Inc. -# Copyright (C) 2001-2003,2004 Red Hat, Inc. -# -# This file is free software, distributed under the terms of the GNU -# General Public License. As a special exception to the GNU General -# Public License, this file may be distributed as part of a program -# that contains a configuration script generated by Autoconf, under -# the same distribution terms as the rest of that program. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# -# Macro to add for using GNU gettext. -# Ulrich Drepper , 1995, 1996 -# -# Modified to never use included libintl. -# Owen Taylor , 12/15/1998 -# -# Major rework to remove unused code -# Owen Taylor , 12/11/2002 -# -# Added better handling of ALL_LINGUAS from GNU gettext version -# written by Bruno Haible, Owen Taylor 5/30/3002 -# -# Modified to require ngettext -# Matthias Clasen 08/06/2004 +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +]) -# Increment this whenever this file is changed. -#serial 1 +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) -# We need this here as well, since someone might use autoconf-2.5x -# to configure GLib then an older version to configure a package -# using AM_GLIB_GNU_GETTEXT -AC_PREREQ(2.53) +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. -dnl -dnl We go to great lengths to make sure that aclocal won't -dnl try to pull in the installed version of these macros -dnl when running aclocal in the glib directory. -dnl -m4_copy([AC_DEFUN],[glib_DEFUN]) -m4_copy([AC_REQUIRE],[glib_REQUIRE]) -dnl -dnl At the end, if we're not within glib, we'll define the public -dnl definitions in terms of our private definitions. -dnl +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_arg=$1 +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# GLIB_LC_MESSAGES -#-------------------- -glib_DEFUN([GLIB_LC_MESSAGES], - [AC_CHECK_HEADERS([locale.h]) - if test $ac_cv_header_locale_h = yes; then - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your file defines LC_MESSAGES.]) - fi - fi]) +# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# GLIB_PATH_PROG_WITH_TEST -#---------------------------- -dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], -[# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +if test x"${install_sh+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi +AC_SUBST([install_sh])]) + +# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. else - AC_MSG_RESULT(no) + am__leading_dot=_ fi -AC_SUBST($1)dnl -]) +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) -dnl Checks for special options needed on Mac OS X. -dnl Defines INTL_MACOSX_LIBS. -dnl -dnl Copied from intlmacosx.m4 in gettext, GPL. -dnl Copyright (C) 2004-2013 Free Software Foundation, Inc. -glib_DEFUN([glib_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]) -]) +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering -# GLIB_WITH_NLS -#----------------- -glib_DEFUN([GLIB_WITH_NLS], - dnl NLS is obligatory - [USE_NLS=yes - AC_SUBST(USE_NLS) +# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - gt_cv_have_gettext=no +# AM_MAINTAINER_MODE([DEFAULT-MODE]) +# ---------------------------------- +# Control maintainer-specific portions of Makefiles. +# Default is to disable them, unless 'enable' is passed literally. +# For symmetry, 'disable' may be passed as well. Anyway, the user +# can override the default with the --enable/--disable switch. +AC_DEFUN([AM_MAINTAINER_MODE], +[m4_case(m4_default([$1], [disable]), + [enable], [m4_define([am_maintainer_other], [disable])], + [disable], [m4_define([am_maintainer_other], [enable])], + [m4_define([am_maintainer_other], [enable]) + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode's default is 'disable' unless 'enable' is passed + AC_ARG_ENABLE([maintainer-mode], + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], + am_maintainer_other[ make rules and dependencies not useful + (and sometimes confusing) to the casual installer])], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST([MAINT])dnl +] +) - CATOBJEXT=NONE - XGETTEXT=: - INTLLIBS= +# Check to see how 'make' treats includes. -*- Autoconf -*- - glib_gt_INTL_MACOSX +# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - AC_CHECK_HEADER(libintl.h, - [gt_cv_func_dgettext_libintl="no" - libintl_extra_libs="" +# AM_MAKE_INCLUDE() +# ----------------- +# Check whether make has an 'include' directive that can support all +# the idioms we need for our automatic dependency tracking code. +AC_DEFUN([AM_MAKE_INCLUDE], +[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) +cat > confinc.mk << 'END' +am__doit: + @echo this is the am__doit target >confinc.out +.PHONY: am__doit +END +am__include="#" +am__quote= +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) + AS_CASE([$?:`cat confinc.out 2>/dev/null`], + ['0:this is the am__doit target'], + [AS_CASE([$s], + [BSD], [am__include='.include' am__quote='"'], + [am__include='include' am__quote=''])]) + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +AC_MSG_RESULT([${_am_result}]) +AC_SUBST([am__include])]) +AC_SUBST([am__quote])]) - # - # First check in libc - # - AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, - [AC_TRY_LINK([ -#include -], - [return !ngettext ("","", 1)], - gt_cv_func_ngettext_libc=yes, - gt_cv_func_ngettext_libc=no) - ]) - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, - [AC_TRY_LINK([ -#include -], - [return !dgettext ("","")], - gt_cv_func_dgettext_libc=yes, - gt_cv_func_dgettext_libc=no) - ]) - fi - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CHECK_FUNCS(bind_textdomain_codeset) - fi +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- - # - # If we don't have everything we want, check in libintl - # - if test "$gt_cv_func_dgettext_libc" != "yes" \ - || test "$gt_cv_func_ngettext_libc" != "yes" \ - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - - AC_CHECK_LIB(intl, bindtextdomain, - [AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dgettext, - gt_cv_func_dgettext_libintl=yes)])]) +# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - AC_MSG_CHECKING([if -liconv is needed to use gettext]) - AC_MSG_RESULT([]) - AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dcgettext, - [gt_cv_func_dgettext_libintl=yes - libintl_extra_libs=-liconv], - :,-liconv)], - :,-liconv) - fi +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) - # - # If we found libintl, then check in it for bind_textdomain_codeset(); - # we'll prefer libc if neither have bind_textdomain_codeset(), - # and both have dgettext and ngettext - # - if test "$gt_cv_func_dgettext_libintl" = "yes" ; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $libintl_extra_libs" - unset ac_cv_func_bind_textdomain_codeset - AC_CHECK_FUNCS(bind_textdomain_codeset) - LIBS="$glib_save_LIBS" +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " +else + am_missing_run= + AC_MSG_WARN(['missing' script is too old or missing]) +fi +]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then - gt_cv_func_dgettext_libc=no - else - if test "$gt_cv_func_dgettext_libc" = "yes" \ - && test "$gt_cv_func_ngettext_libc" = "yes"; then - gt_cv_func_dgettext_libintl=no - fi - fi - fi - fi +# _AM_SET_OPTION(NAME) +# -------------------- +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) - if test "$gt_cv_func_dgettext_libc" = "yes" \ - || test "$gt_cv_func_dgettext_libintl" = "yes"; then - gt_cv_have_gettext=yes - fi - - if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs $INTL_MACOSX_LIBS" - fi - - if test "$gt_cv_have_gettext" = "yes"; then - AC_DEFINE(HAVE_GETTEXT,1, - [Define if the GNU gettext() function is already present or preinstalled.]) - GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - AC_CHECK_FUNCS(dcgettext) - MSGFMT_OPTS= - AC_MSG_CHECKING([if msgfmt accepts -c]) - GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ -msgid "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Project-Id-Version: test 1.0\n" -"PO-Revision-Date: 2007-02-15 12:01+0100\n" -"Last-Translator: test \n" -"Language-Team: C \n" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) - AC_SUBST(MSGFMT_OPTS) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], - [CATOBJEXT=.gmo - DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share and - dnl and CATOBJEXT=.gmo in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo - DATADIRNAME=lib]) - ;; - *-*-openbsd*) - CATOBJEXT=.mo - DATADIRNAME=share - ;; - *) - CATOBJEXT=.mo - DATADIRNAME=lib - ;; - esac]) - LIBS="$glib_save_LIBS" - INSTOBJEXT=.mo - else - gt_cv_have_gettext=no - fi - fi - ]) +# _AM_SET_OPTIONS(OPTIONS) +# ------------------------ +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - if test "$gt_cv_have_gettext" = "yes" ; then - AC_DEFINE(ENABLE_NLS, 1, - [always defined to indicate that i18n is enabled]) - fi +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is not GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi +# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) - # We need to process the po/ directory. - POSUB=po +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) - AC_OUTPUT_COMMANDS( - [case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac]) +# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.ac. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) - dnl Make all variables we use known to autoconf. - AC_SUBST(CATALOGS) - AC_SUBST(CATOBJEXT) - AC_SUBST(DATADIRNAME) - AC_SUBST(GMOFILES) - AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLLIBS) - AC_SUBST(PO_IN_DATADIR_TRUE) - AC_SUBST(PO_IN_DATADIR_FALSE) - AC_SUBST(POFILES) - AC_SUBST(POSUB) - ]) +# Check to make sure that the build environment is sane. -*- Autoconf -*- -# AM_GLIB_GNU_GETTEXT -# ------------------- -# Do checks necessary for use of gettext. If a suitable implementation -# of gettext is found in either in libintl or in the C library, -# it will set INTLLIBS to the libraries needed for use of gettext -# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable -# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() -# on various variables needed by the Makefile.in.in installed by -# glib-gettextize. -dnl -AU_DEFUN([GLIB_GNU_GETTEXT], - [AC_REQUIRE([AC_PROG_CC])dnl - - GLIB_LC_MESSAGES - GLIB_WITH_NLS +# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - if test "$gt_cv_have_gettext" = "yes"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; +esac - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done +# Do 'set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` fi - fi - - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but ($top_srcdir). - dnl Try to locate is. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then - dnl Generate list of files to be processed by xgettext which will - dnl be included in po/Makefile. - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - ], - [[$0: This macro is deprecated. You should use upstream gettext instead.]]) - -# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) -# ------------------------------- -# Define VARIABLE to the location where catalog files will -# be installed by po/Makefile. -glib_DEFUN([GLIB_DEFINE_LOCALEDIR], -[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl -glib_save_prefix="$prefix" -glib_save_exec_prefix="$exec_prefix" -glib_save_datarootdir="$datarootdir" -test "x$prefix" = xNONE && prefix=$ac_default_prefix -test "x$exec_prefix" = xNONE && exec_prefix=$prefix -datarootdir=`eval echo "${datarootdir}"` -if test "x$CATOBJEXT" = "x.mo" ; then - localedir=`eval echo "${libdir}/locale"` + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$[2]" = conftest.file + ) +then + # Ok. + : else - localedir=`eval echo "${datadir}/locale"` + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) fi -prefix="$glib_save_prefix" -exec_prefix="$glib_save_exec_prefix" -datarootdir="$glib_save_datarootdir" -AC_DEFINE_UNQUOTED($1, "$localedir", - [Define the location where the catalogs will be installed]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file ]) -dnl -dnl Now the definitions that aclocal will find -dnl -ifdef(glib_configure_ac,[],[ -AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) -AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) -])dnl +# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) -# -# Create a temporary file with TEST-FILE as its contents and pass the -# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with -# 0 and perform ACTION-IF-FAIL for any other exit status. -AC_DEFUN([GLIB_RUN_PROG], -[cat >conftest.foo <<_ACEOF -$2 -_ACEOF -if AC_RUN_LOG([$1 conftest.foo]); then - m4_ifval([$3], [$3], [:]) -m4_ifvaln([$4], [else $4])dnl -echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD -sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) +# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor 'install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in "make install-strip", and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) -dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 42 IT_PROG_INTLTOOL -AC_DEFUN([IT_PROG_INTLTOOL], [ -AC_PREREQ([2.50])dnl -AC_REQUIRE([AM_NLS])dnl +# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -case "$am__api_version" in - 1.[01234]) - AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) - ;; - *) - ;; -esac +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) -INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` -INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` -INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` -if test -n "$1"; then - AC_MSG_CHECKING([for intltool >= $1]) - AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) - test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) -fi +# AM_SUBST_NOTMAKE(VARIABLE) +# -------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) -AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) -AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) -if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) -fi +# Check how to create a tarball. -*- Autoconf -*- -if test -z "$AM_DEFAULT_VERBOSITY"; then - AM_DEFAULT_VERBOSITY=1 -fi -AC_SUBST([AM_DEFAULT_VERBOSITY]) +# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' -INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' -INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' -AC_SUBST(INTLTOOL_V_MERGE) -AC_SUBST(INTLTOOL__v_MERGE_) -AC_SUBST(INTLTOOL__v_MERGE_0) +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +# +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) -INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' -intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' -intltool__v_merge_options_0='-q' -AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) -AC_SUBST(intltool__v_merge_options_) -AC_SUBST(intltool__v_merge_options_0) +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' -else - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir' -fi - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], -_IT_SUBST(INTLTOOL_DESKTOP_RULE) -_IT_SUBST(INTLTOOL_DIRECTORY_RULE) -_IT_SUBST(INTLTOOL_KEYS_RULE) -_IT_SUBST(INTLTOOL_PROP_RULE) -_IT_SUBST(INTLTOOL_OAF_RULE) -_IT_SUBST(INTLTOOL_PONG_RULE) -_IT_SUBST(INTLTOOL_SERVER_RULE) -_IT_SUBST(INTLTOOL_SHEET_RULE) -_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) -_IT_SUBST(INTLTOOL_UI_RULE) -_IT_SUBST(INTLTOOL_XAM_RULE) -_IT_SUBST(INTLTOOL_KBD_RULE) -_IT_SUBST(INTLTOOL_XML_RULE) -_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) -_IT_SUBST(INTLTOOL_CAVES_RULE) -_IT_SUBST(INTLTOOL_SCHEMAS_RULE) -_IT_SUBST(INTLTOOL_THEME_RULE) -_IT_SUBST(INTLTOOL_SERVICE_RULE) -_IT_SUBST(INTLTOOL_POLICY_RULE) + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], -# Check the gettext tools to make sure they are GNU -AC_PATH_PROG(XGETTEXT, xgettext) -AC_PATH_PROG(MSGMERGE, msgmerge) -AC_PATH_PROG(MSGFMT, msgfmt) -AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) -if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -fi -xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" -mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" -mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" -if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -fi + [pax], + [], -AC_PATH_PROG(INTLTOOL_PERL, perl) -if test -z "$INTLTOOL_PERL"; then - AC_MSG_ERROR([perl not found]) -fi -AC_MSG_CHECKING([for perl >= 5.8.1]) -$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 -if test $? -ne 0; then - AC_MSG_ERROR([perl 5.8.1 is required for intltool]) -else - IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` - AC_MSG_RESULT([$IT_PERL_VERSION]) -fi -if test "x$2" != "xno-xml"; then - AC_MSG_CHECKING([for XML::Parser]) - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - AC_MSG_RESULT([ok]) - else - AC_MSG_ERROR([XML::Parser perl module is required for intltool]) - fi -fi + [m4_fatal([Unknown tar format])]) -# Substitute ALL_LINGUAS so we can use it in po/Makefile -AC_SUBST(ALL_LINGUAS) + AC_MSG_CHECKING([how to create a $1 tar archive]) -IT_PO_SUBDIR([po]) + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} -]) + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break -# IT_PO_SUBDIR(DIRNAME) -# --------------------- -# All po subdirs have to be declared with this macro; the subdir "po" is -# declared by IT_PROG_INTLTOOL. -# -AC_DEFUN([IT_PO_SUBDIR], -[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. -dnl -dnl The following CONFIG_COMMANDS should be executed at the very end -dnl of config.status. -AC_CONFIG_COMMANDS_PRE([ - AC_CONFIG_COMMANDS([$1/stamp-it], [ - if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then - AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break fi - rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" - >"$1/stamp-it.tmp" - [sed '/^#/d - s/^[[].*] *// - /^[ ]*$/d - '"s|^| $ac_top_srcdir/|" \ - "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" - ] - [sed '/^POTFILES =/,/[^\\]$/ { - /^POTFILES =/!d - r $1/POTFILES - } - ' "$1/Makefile.in" >"$1/Makefile"] - rm -f "$1/Makefile.tmp" - mv "$1/stamp-it.tmp" "$1/stamp-it" - ]) -])dnl -]) - -# _IT_SUBST(VARIABLE) -# ------------------- -# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST -# -AC_DEFUN([_IT_SUBST], -[ -AC_SUBST([$1]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) -] -) + done + rm -rf conftest.dir -# deprecated macros -AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) -# A hint is needed for aclocal from Automake <= 1.9.4: -# AC_DEFUN([AC_PROG_INTLTOOL], ...) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # @@ -2570,6 +2427,7 @@ 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. @@ -2881,8 +2739,8 @@ _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 cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cr libconftest.a conftest.o 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 @@ -3332,7 +3190,7 @@ m4_defun([_LT_PROG_AR], [AC_CHECK_TOOLS(AR, [ar], false) : ${AR=ar} -: ${AR_FLAGS=cr} +: ${AR_FLAGS=cru} _LT_DECL([], [AR], [1], [The archiver]) _LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) @@ -4706,6 +4564,9 @@ # 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 @@ -4714,7 +4575,7 @@ # 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="/lib /usr/lib $lt_ld_extra" + 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 @@ -4726,18 +4587,6 @@ dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -5397,7 +5246,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +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 @@ -5903,8 +5752,7 @@ if AC_TRY_EVAL(ac_compile); then # Now try to grab the symbols. nlist=conftest.nm - $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD - if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then + 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" @@ -6276,7 +6124,7 @@ ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -6544,12 +6392,6 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; - # flang / f18. f95 an alias for gfortran or flang on Debian - flang* | f18* | f95*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _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*) @@ -6794,9 +6636,6 @@ ;; esac ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -6859,9 +6698,6 @@ openbsd* | bitrig*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -7116,7 +6952,7 @@ fi ;; - netbsd* | netbsdelf*-gnu) + 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= @@ -7637,7 +7473,6 @@ 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 - _LT_TAGVAR(link_all_deplibs, $1)=no 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' @@ -7659,7 +7494,7 @@ esac ;; - netbsd* | netbsdelf*-gnu) + 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 @@ -8281,7 +8116,7 @@ # 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"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else GXX=no @@ -8656,7 +8491,7 @@ # 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"' + 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 @@ -8721,7 +8556,7 @@ # 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"' + 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 @@ -9060,7 +8895,7 @@ # 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"' + 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 @@ -9144,7 +8979,7 @@ # 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"' + 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. @@ -9155,7 +8990,7 @@ # 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"' + 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' @@ -10900,314 +10735,525 @@ m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) -# nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-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. +# Copyright (C) 1995-2002 Free Software Foundation, Inc. +# Copyright (C) 2001-2003,2004 Red Hat, Inc. +# +# This file is free software, distributed under the terms of the GNU +# General Public License. As a special exception to the GNU General +# Public License, this file may be distributed as part of a program +# that contains a configuration script generated by Autoconf, under +# the same distribution terms as the rest of that program. +# +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# +# Macro to add for using GNU gettext. +# Ulrich Drepper , 1995, 1996 +# +# Modified to never use included libintl. +# Owen Taylor , 12/15/1998 +# +# Major rework to remove unused code +# Owen Taylor , 12/11/2002 +# +# Added better handling of ALL_LINGUAS from GNU gettext version +# written by Bruno Haible, Owen Taylor 5/30/3002 +# +# Modified to require ngettext +# Matthias Clasen 08/06/2004 -AC_PREREQ([2.50]) +# Increment this whenever this file is changed. +#serial 1 -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]) -]) +# We need this here as well, since someone might use autoconf-2.5x +# to configure GLib then an older version to configure a package +# using AM_GLIB_GNU_GETTEXT +AC_PREREQ(2.53) -dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29.1) -dnl -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 We go to great lengths to make sure that aclocal won't +dnl try to pull in the installed version of these macros +dnl when running aclocal in the glib directory. dnl -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. +m4_copy([AC_DEFUN],[glib_DEFUN]) +m4_copy([AC_REQUIRE],[glib_REQUIRE]) 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 At the end, if we're not within glib, we'll define the public +dnl definitions in terms of our private definitions. 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 +# GLIB_LC_MESSAGES +#-------------------- +glib_DEFUN([GLIB_LC_MESSAGES], + [AC_CHECK_HEADERS([locale.h]) + if test $ac_cv_header_locale_h = yes; then + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your file defines LC_MESSAGES.]) + fi + fi]) -dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) -dnl ---------------------------------- -dnl Since: 0.16 +# GLIB_PATH_PROG_WITH_TEST +#---------------------------- +dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], +[# Extract the first word of "$2", so it can be a program name with args. +set dummy $2; ac_word=[$]2 +AC_MSG_CHECKING([for $ac_word]) +AC_CACHE_VAL(ac_cv_path_$1, +[case "[$]$1" in + /*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in ifelse([$5], , $PATH, [$5]); do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" +dnl If no 4th arg is given, leave the cache variable unset, +dnl so AC_PATH_PROGS will keep looking. +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +])dnl + ;; +esac])dnl +$1="$ac_cv_path_$1" +if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then + AC_MSG_RESULT([$]$1) +else + AC_MSG_RESULT(no) +fi +AC_SUBST($1)dnl +]) + +dnl Checks for special options needed on Mac OS X. +dnl Defines INTL_MACOSX_LIBS. 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]) +dnl Copied from intlmacosx.m4 in gettext, GPL. +dnl Copyright (C) 2004-2013 Free Software Foundation, Inc. +glib_DEFUN([glib_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]) +]) -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 +# GLIB_WITH_NLS +#----------------- +glib_DEFUN([GLIB_WITH_NLS], + dnl NLS is obligatory + [USE_NLS=yes + AC_SUBST(USE_NLS) -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]) + gt_cv_have_gettext=no -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 + CATOBJEXT=NONE + XGETTEXT=: + INTLLIBS= -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 + glib_gt_INTL_MACOSX + AC_CHECK_HEADER(libintl.h, + [gt_cv_func_dgettext_libintl="no" + libintl_extra_libs="" -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 + # + # First check in libc + # + AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, + [AC_TRY_LINK([ +#include +], + [return !ngettext ("","", 1)], + gt_cv_func_ngettext_libc=yes, + gt_cv_func_ngettext_libc=no) + ]) + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, + [AC_TRY_LINK([ +#include +], + [return !dgettext ("","")], + gt_cv_func_dgettext_libc=yes, + gt_cv_func_dgettext_libc=no) + ]) + fi + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + AC_CHECK_FUNCS(bind_textdomain_codeset) + fi -pkg_failed=no -AC_MSG_CHECKING([for $1]) + # + # If we don't have everything we want, check in libintl + # + if test "$gt_cv_func_dgettext_libc" != "yes" \ + || test "$gt_cv_func_ngettext_libc" != "yes" \ + || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then + + AC_CHECK_LIB(intl, bindtextdomain, + [AC_CHECK_LIB(intl, ngettext, + [AC_CHECK_LIB(intl, dgettext, + gt_cv_func_dgettext_libintl=yes)])]) -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + if test "$gt_cv_func_dgettext_libintl" != "yes" ; then + AC_MSG_CHECKING([if -liconv is needed to use gettext]) + AC_MSG_RESULT([]) + AC_CHECK_LIB(intl, ngettext, + [AC_CHECK_LIB(intl, dcgettext, + [gt_cv_func_dgettext_libintl=yes + libintl_extra_libs=-liconv], + :,-liconv)], + :,-liconv) + fi -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 we found libintl, then check in it for bind_textdomain_codeset(); + # we'll prefer libc if neither have bind_textdomain_codeset(), + # and both have dgettext and ngettext + # + if test "$gt_cv_func_dgettext_libintl" = "yes" ; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS -lintl $libintl_extra_libs" + unset ac_cv_func_bind_textdomain_codeset + AC_CHECK_FUNCS(bind_textdomain_codeset) + LIBS="$glib_save_LIBS" -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` + if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then + gt_cv_func_dgettext_libc=no + else + if test "$gt_cv_func_dgettext_libc" = "yes" \ + && test "$gt_cv_func_ngettext_libc" = "yes"; then + gt_cv_func_dgettext_libintl=no + fi + fi fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + fi + + if test "$gt_cv_func_dgettext_libc" = "yes" \ + || test "$gt_cv_func_dgettext_libintl" = "yes"; then + gt_cv_have_gettext=yes + fi + + if test "$gt_cv_func_dgettext_libintl" = "yes"; then + INTLLIBS="-lintl $libintl_extra_libs $INTL_MACOSX_LIBS" + fi + + if test "$gt_cv_have_gettext" = "yes"; then + AC_DEFINE(HAVE_GETTEXT,1, + [Define if the GNU gettext() function is already present or preinstalled.]) + GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl + if test "$MSGFMT" != "no"; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" + AC_CHECK_FUNCS(dcgettext) + MSGFMT_OPTS= + AC_MSG_CHECKING([if msgfmt accepts -c]) + GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: test 1.0\n" +"PO-Revision-Date: 2007-02-15 12:01+0100\n" +"Last-Translator: test \n" +"Language-Team: C \n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) + AC_SUBST(MSGFMT_OPTS) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr], + [CATOBJEXT=.gmo + DATADIRNAME=share], + [case $host in + *-*-solaris*) + dnl On Solaris, if bind_textdomain_codeset is in libc, + dnl GNU format message catalog is always supported, + dnl since both are added to the libc all together. + dnl Hence, we'd like to go with DATADIRNAME=share and + dnl and CATOBJEXT=.gmo in this case. + AC_CHECK_FUNC(bind_textdomain_codeset, + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo + DATADIRNAME=lib]) + ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; + *) + CATOBJEXT=.mo + DATADIRNAME=lib + ;; + esac]) + LIBS="$glib_save_LIBS" + INSTOBJEXT=.mo + else + gt_cv_have_gettext=no + fi + fi + ]) + + if test "$gt_cv_have_gettext" = "yes" ; then + AC_DEFINE(ENABLE_NLS, 1, + [always defined to indicate that i18n is enabled]) + fi + + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is not GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else + AC_MSG_RESULT( + [found xgettext program is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi + fi + + # We need to process the po/ directory. + POSUB=po + + AC_OUTPUT_COMMANDS( + [case "$CONFIG_FILES" in *po/Makefile.in*) + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile + esac]) + + dnl These rules are solely for the distribution goal. While doing this + dnl we only have to keep exactly one list of the available catalogs + dnl in configure.ac. + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: + dnl Make all variables we use known to autoconf. + AC_SUBST(CATALOGS) + AC_SUBST(CATOBJEXT) + AC_SUBST(DATADIRNAME) + AC_SUBST(GMOFILES) + AC_SUBST(INSTOBJEXT) + AC_SUBST(INTLLIBS) + AC_SUBST(PO_IN_DATADIR_TRUE) + AC_SUBST(PO_IN_DATADIR_FALSE) + AC_SUBST(POFILES) + AC_SUBST(POSUB) + ]) -$$1_PKG_ERRORS +# AM_GLIB_GNU_GETTEXT +# ------------------- +# Do checks necessary for use of gettext. If a suitable implementation +# of gettext is found in either in libintl or in the C library, +# it will set INTLLIBS to the libraries needed for use of gettext +# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable +# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() +# on various variables needed by the Makefile.in.in installed by +# glib-gettextize. +dnl +AU_DEFUN([GLIB_GNU_GETTEXT], + [AC_REQUIRE([AC_PROG_CC])dnl + + GLIB_LC_MESSAGES + GLIB_WITH_NLS -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. + if test "$gt_cv_have_gettext" = "yes"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + AC_MSG_CHECKING(for catalogs to be installed) + NEW_LINGUAS= + for presentlang in $ALL_LINGUAS; do + useit=no + if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then + desiredlanguages="$LINGUAS" + else + desiredlanguages="$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + NEW_LINGUAS="$NEW_LINGUAS $presentlang" + fi + done + LINGUAS=$NEW_LINGUAS + AC_MSG_RESULT($LINGUAS) + fi -_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. + dnl Construct list of names of catalog files to be constructed. + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi -_PKG_TEXT + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly + dnl find the mkinstalldirs script in another subdir but ($top_srcdir). + dnl Try to locate is. + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + AC_SUBST(MKINSTALLDIRS) -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 Generate list of files to be processed by xgettext which will + dnl be included in po/Makefile. + test -d po || mkdir po + if test "x$srcdir" != "x."; then + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then + posrcprefix="$srcdir/" + else + posrcprefix="../$srcdir/" + fi + else + posrcprefix="../" + fi + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES + ], + [[$0: This macro is deprecated. You should use upstream gettext instead.]]) +# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) +# ------------------------------- +# Define VARIABLE to the location where catalog files will +# be installed by po/Makefile. +glib_DEFUN([GLIB_DEFINE_LOCALEDIR], +[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl +glib_save_prefix="$prefix" +glib_save_exec_prefix="$exec_prefix" +glib_save_datarootdir="$datarootdir" +test "x$prefix" = xNONE && prefix=$ac_default_prefix +test "x$exec_prefix" = xNONE && exec_prefix=$prefix +datarootdir=`eval echo "${datarootdir}"` +if test "x$CATOBJEXT" = "x.mo" ; then + localedir=`eval echo "${libdir}/locale"` +else + localedir=`eval echo "${datadir}/locale"` +fi +prefix="$glib_save_prefix" +exec_prefix="$glib_save_exec_prefix" +datarootdir="$glib_save_datarootdir" +AC_DEFINE_UNQUOTED($1, "$localedir", + [Define the location where the catalogs will be installed]) +]) -dnl 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 Now the definitions that aclocal will find 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 - +ifdef(glib_configure_ac,[],[ +AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) +AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) +])dnl -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 +# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) +# +# Create a temporary file with TEST-FILE as its contents and pass the +# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with +# 0 and perform ACTION-IF-FAIL for any other exit status. +AC_DEFUN([GLIB_RUN_PROG], +[cat >conftest.foo <<_ACEOF +$2 +_ACEOF +if AC_RUN_LOG([$1 conftest.foo]); then + m4_ifval([$3], [$3], [:]) +m4_ifvaln([$4], [else $4])dnl +echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD +sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD +fi]) -dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) -dnl -------------------------------- -dnl Since: 0.27 +# 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 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 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 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 +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2003. -_PKG_CONFIG([$1], [variable="][$3]["], [$2]) -AS_VAR_COPY([$1], [pkg_cv_][$1]) +AC_PREREQ([2.50]) -AS_VAR_IF([$1], [""], [$5], [$4])dnl -])dnl PKG_CHECK_VAR +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]) +]) dnl Copyright (c) 2002-2015 dnl The Xfce development team. All rights reserved. diff -Nru xfwm4-4.16.0/ChangeLog xfwm4-4.16.1/ChangeLog --- xfwm4-4.16.0/ChangeLog 2020-12-22 22:56:47.000000000 +0000 +++ xfwm4-4.16.1/ChangeLog 2021-01-09 17:58:53.000000000 +0000 @@ -1,3 +1,309 @@ +commit 5f61a84ad14162917fc073b2a3b089f78419d0c0 +Author: Olivier Fourdan +Date: Sat Jan 9 18:55:35 2021 +0100 + + Release 4.16.1! + + Signed-off-by: Olivier Fourdan + +commit af761c98c3a006ef2cad5918a2fd602148a705f7 +Author: Olivier Fourdan +Date: Sat Jan 9 18:19:24 2021 +0100 + + log: Prefer stdout + + g_message() logs to stderr, while with debug enabled, stderr is + redirected to a file (or even /dev/null). + + Use either g_info() or g_print() instead. + + Signed-off-by: Olivier Fourdan + +commit 92648bdfdfecf7c64d3fdbf0e815b66e87dd2e6e +Author: Olivier Fourdan +Date: Sat Jan 9 17:34:50 2021 +0100 + + compositor: Do not prefer Xpresent for AMD/Radeon + + There is a bug in the amdgpu DDX which causes an image corruption when + Xpresent is used. + + We should not prefer Xpresent for those, as people upgrading from 4.14 + would possibly see this as a regression. + + Signed-off-by: Olivier Fourdan + Closes: https://gitlab.xfce.org/xfce/xfwm4/-/issues/490 + See-also: https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu/-/issues/10 + +commit d4505383d0a2272063317e2ecd9db6880f608df8 +Author: Olivier Fourdan +Date: Sat Jan 9 17:30:32 2021 +0100 + + I18n: Fix closing tag for Hungarian translation + + Signed-off-by: Olivier Fourdan + Closes: https://gitlab.xfce.org/xfce/xfwm4/-/issues/473 + +commit 9f602aa9ab71436e1fccfc854fd0e9b0cc37a06a +Author: Hsiu-Ming Chang +Date: Sat Jan 9 12:52:24 2021 +0100 + + I18n: Update translation zh_TW (97%). + + 171 translated messages, 5 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 5fd80d73d8776b28a6080b74f331eef16c3a2edc +Author: Xfce Bot +Date: Wed Jan 6 12:58:06 2021 +0100 + + I18n: Update translation ast (90%). + + 159 translated messages, 17 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit c49e58e6818dddca67d8aa93a16c48345025099d +Author: Olivier Fourdan +Date: Tue Jan 5 18:42:46 2021 +0100 + + events: Allow resizing regardless of modifiers + + xfwm4 expects no keyboard modifiers (other than the usual locks) in + button events to allow interactive resizing. + + There is no reason to be so picky, especially considering there is no + such check when moving windows. + + Relax the requirements for resizing and allow interactive resize with + the mouse regardless of the modifiers being pressed. + + Signed-off-by: Olivier Fourdan + Closes: https://gitlab.xfce.org/xfce/xfwm4/-/issues/487 + +commit c48119498da5d216440607b926145a9b9715de1c +Author: Olivier Fourdan +Date: Tue Jan 5 18:39:50 2021 +0100 + + netwm: Un-tile before fullscreen + + If a client switches to fullscreen, tiling would prevent the window from + being resized correctly, and the client window remains tiled even when + fullscreen. + + Make sure to first un-tile the client window when transitioning to + fullscreen. + + Signed-off-by: Olivier Fourdan + Closes: https://gitlab.xfce.org/xfce/xfwm4/-/issues/478 + +commit 63bece133a10b8e6c58328f83695cb9a9e4ebe54 +Author: Olivier Fourdan +Date: Tue Jan 5 18:38:01 2021 +0100 + + hints: Guard against XErrors with systray + + The systray window is an external window, any X request has the + potential for failure. + + Signed-off-by: Olivier Fourdan + +commit 35683211c1a84abdff1f357e0e8a24400f35e497 +Author: Olivier Fourdan +Date: Tue Jan 5 18:33:54 2021 +0100 + + compositor: Guard against more XErrors + + Protect against possible XErrors which could occur while adding a new + window to the compositor. + + Signed-off-by: Olivier Fourdan + Closes: https://gitlab.xfce.org/xfce/xfwm4/-/issues/486 + +commit 4253bc36c11423d7ed081cd15121b197830fdb61 +Author: Anonymous +Date: Tue Jan 5 00:48:59 2021 +0100 + + I18n: Update translation be@tarask (100%). + + 176 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 001b3677ef03b9b81dff16e523b5c82db79f5378 +Author: Michael Martins +Date: Mon Jan 4 00:49:34 2021 +0100 + + I18n: Update translation pt_BR (100%). + + 176 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit c51adbe81b3a94f304d3e352cd1c45484ee7df9b +Author: Πέτρος Σαμαράς +Date: Sun Jan 3 00:49:04 2021 +0100 + + I18n: Update translation el (98%). + + 173 translated messages, 3 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit d877f5cd924996d499dd1d3c0cfc0147840b731f +Author: Anonymous +Date: Sat Jan 2 12:50:46 2021 +0100 + + I18n: Update translation pl (100%). + + 176 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit dfcd0a3e87e24342589938d5df3dede39ef303dd +Author: Jiri Grönroos +Date: Fri Jan 1 12:53:55 2021 +0100 + + I18n: Update translation fi (97%). + + 172 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 7a8c7429a82d93a334b6a6ad33608e9c9daccc85 +Author: Anonymous +Date: Thu Dec 31 12:51:32 2020 +0100 + + I18n: Update translation ie (88%). + + 155 translated messages, 21 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit b70fc4b4952a70f141ca7214d5690db28a216188 +Author: Priit Jõerüüt +Date: Thu Dec 31 00:50:08 2020 +0100 + + I18n: Update translation et (92%). + + 163 translated messages, 13 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit ab33d9a35b6c38bf5b663cd4fe2c33f3d9795cc9 +Author: Michal Várady +Date: Thu Dec 31 00:50:08 2020 +0100 + + I18n: Update translation cs (100%). + + 176 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit dc95084039d3d678cb74b43b3493ffac662883ca +Author: Ivica Kolić +Date: Tue Dec 29 12:52:55 2020 +0100 + + I18n: Update translation hr (97%). + + 172 translated messages, 4 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 12b467255ef1b79ff061046c91ea84d0fb550e34 +Author: Źmicier Turok +Date: Tue Dec 29 12:52:55 2020 +0100 + + I18n: Update translation be (100%). + + 176 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 2d40a5baa7257338e62154bcefd565635eea0532 +Author: Xfce Bot +Date: Tue Dec 29 00:51:12 2020 +0100 + + I18n: Update translation hr (96%). + + 169 translated messages, 7 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 59377045bcb8af6a796cbb34d0ab1ce24d86b5fb +Author: Anonymous +Date: Mon Dec 28 12:50:52 2020 +0100 + + I18n: Update translation eu (91%). + + 161 translated messages, 15 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit c6adc4fa4c6de0aef6086dd6189375f9a4f3849d +Author: Elishai Eliyahu +Date: Sun Dec 27 00:49:53 2020 +0100 + + I18n: Update translation he (100%). + + 176 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit bfd7c46dce086555e3f82f65511fe2200406d239 +Author: sfan5 +Date: Thu Dec 24 18:29:34 2020 +0100 + + events: Protect against error from XGetWMHints() + +commit 38cef1a5788cc454a30239452754bdd749ec5d2c +Author: Anonymous +Date: Sat Dec 26 00:50:04 2020 +0100 + + I18n: Update translation hu (98%). + + 173 translated messages, 3 untranslated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 56d273ee48fffc7fed67ec7b22afd8e4b1c23c6e +Author: Olivier Fourdan +Date: Fri Dec 25 18:39:52 2020 +0100 + + compositor: Ignore XError when changing background picture + + If xfwm4 is compiled with support for the root pixmap in the compositor, + changing the background image may cause an XError if the external pixmap + is already freed. + + Guard against such XError. + + Signed-off-by: Olivier Fourdan + Closes: https://gitlab.xfce.org/xfce/xfwm4/-/issues/476 + +commit 59c38d24fc7826012f16011aae4926dfce6a9e7f +Author: Michal Várady +Date: Thu Dec 24 00:48:44 2020 +0100 + + I18n: Update translation cs (100%). + + 176 translated messages. + + Transifex (https://www.transifex.com/xfce/public/). + +commit 64c96c004d362fde25cf11cf3de43a43063aa4ee +Author: Simon Steinbeiss +Date: Tue Dec 22 23:59:34 2020 +0100 + + Back to development + +commit 3a36d626321dce5c271c64463eb55b806492f657 +Author: Simon Steinbeiss +Date: Tue Dec 22 23:57:44 2020 +0100 + + Updates for release + commit c697a54ada6d3c915106a061e18f3cf1135b1eef Author: Olivier Fourdan Date: Sun Dec 20 14:12:59 2020 +0100 diff -Nru xfwm4-4.16.0/common/Makefile.in xfwm4-4.16.1/common/Makefile.in --- xfwm4-4.16.0/common/Makefile.in 2020-12-22 22:56:39.000000000 +0000 +++ xfwm4-4.16.1/common/Makefile.in 2021-01-09 17:58:47.000000000 +0000 @@ -378,7 +378,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -Nru xfwm4-4.16.0/config.guess xfwm4-4.16.1/config.guess --- xfwm4-4.16.0/config.guess 2020-12-22 22:56:39.000000000 +0000 +++ xfwm4-4.16.1/config.guess 2021-01-09 17:58:47.000000000 +0000 @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2018-02-24' +timestamp='2018-03-08' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -1046,11 +1046,7 @@ echo "$UNAME_MACHINE"-dec-linux-"$LIBC" exit ;; x86_64:Linux:*:*) - if objdump -f /bin/sh | grep -q elf32-x86-64; then - echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32 - else - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" - fi + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" exit ;; xtensa*:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" @@ -1473,7 +1469,7 @@ exit 1 # Local variables: -# eval: (add-hook 'write-file-functions 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff -Nru xfwm4-4.16.0/config.sub xfwm4-4.16.1/config.sub --- xfwm4-4.16.0/config.sub 2020-12-22 22:56:39.000000000 +0000 +++ xfwm4-4.16.1/config.sub 2021-01-09 17:58:47.000000000 +0000 @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2018-02-22' +timestamp='2018-05-05' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -110,28 +110,48 @@ exit 1;; esac -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ - kopensolaris*-gnu* | cloudabi*-eabi* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - android-linux) - os=-linux-android - basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown - ;; - *) - basic_machine=`echo "$1" | sed 's/-[^-]*$//'` - if [ "$basic_machine" != "$1" ] - then os=`echo "$1" | sed 's/.*-/-/'` - else os=; fi - ;; +# Spilt fields of configuration type +IFS="-" read -r field1 field2 field3 field4 <. # @@ -595,8 +595,8 @@ # Identity of this package. PACKAGE_NAME='xfwm4' PACKAGE_TARNAME='xfwm4' -PACKAGE_VERSION='4.16.0' -PACKAGE_STRING='xfwm4 4.16.0' +PACKAGE_VERSION='4.16.1' +PACKAGE_STRING='xfwm4 4.16.1' PACKAGE_BUGREPORT='xfce4-dev@xfce.org' PACKAGE_URL='' @@ -857,7 +857,6 @@ docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -965,7 +964,6 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1218,15 +1216,6 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1364,7 +1353,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1477,7 +1466,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 xfwm4 4.16.0 to adapt to many kinds of systems. +\`configure' configures xfwm4 4.16.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1517,7 +1506,6 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1552,7 +1540,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xfwm4 4.16.0:";; + short | recursive ) echo "Configuration of xfwm4 4.16.1:";; esac cat <<\_ACEOF @@ -1717,7 +1705,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xfwm4 configure 4.16.0 +xfwm4 configure 4.16.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2091,7 +2079,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xfwm4 $as_me 4.16.0, which was +It was created by xfwm4 $as_me 4.16.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2954,7 +2942,7 @@ # Define the identity of the package. PACKAGE='xfwm4' - VERSION='4.16.0' + VERSION='4.16.1' cat >>confdefs.h <<_ACEOF @@ -7198,7 +7186,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +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 @@ -7560,7 +7548,7 @@ fi : ${AR=ar} -: ${AR_FLAGS=cr} +: ${AR_FLAGS=cru} @@ -8061,8 +8049,11 @@ test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm - $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5 - if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 + (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -9281,8 +9272,8 @@ _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cr libconftest.a conftest.o" >&5 - $AR cr libconftest.a conftest.o 2>&5 + echo "$AR cru libconftest.a conftest.o" >&5 + $AR cru libconftest.a conftest.o 2>&5 echo "$RANLIB libconftest.a" >&5 $RANLIB libconftest.a 2>&5 cat > conftest.c << _LT_EOF @@ -10139,12 +10130,6 @@ lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-static' ;; - # flang / f18. f95 an alias for gfortran or flang on Debian - flang* | f18* | f95*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fPIC' - lt_prog_compiler_static='-static' - ;; # icc used to be incompatible with GCC. # ICC 10 doesn't accept -KPIC any more. icc* | ifort*) @@ -10621,9 +10606,6 @@ openbsd* | bitrig*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - link_all_deplibs=no - ;; esac ld_shlibs=yes @@ -10878,7 +10860,7 @@ fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -11548,7 +11530,6 @@ if test yes = "$lt_cv_irix_exported_symbol"; then archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi - link_all_deplibs=no else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' @@ -11570,7 +11551,7 @@ esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -12665,6 +12646,9 @@ # 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 @@ -12673,7 +12657,7 @@ # 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="/lib /usr/lib $lt_ld_extra" + 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 @@ -12685,18 +12669,6 @@ dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -13948,7 +13920,7 @@ - ALL_LINGUAS="eo en_GB ca zh_CN nb tr en_CA en_AU fr eu gl be zh_TW th sr fi pl ast it he et pt_BR ka de sl pa zh_HK nl hy_AM ja hu nn si ar ko es kk ur sk am te hr sq pt cs is be@tarask uk hye bn ur_PK id vi da ug lv el sv ru ie lt ms fa_IR ro bg oc " + ALL_LINGUAS="am ar ast be be@tarask bg bn ca cs da de el en_AU en_CA en_GB eo es et eu fa_IR fi fr gl he hr hu hy_AM hye id ie is it ja ka kk ko lt lv ms nb nl nn oc pa pl pt_BR pt ro ru si sk sl sq sr sv te th tr ug uk ur_PK ur vi zh_CN zh_HK zh_TW" for ac_header in locale.h do : @@ -18693,8 +18665,8 @@ REVISION=unknown -if test x"c697a54ad" != x""; then - REVISION=c697a54ad +if test x"5f61a84ad" != x""; then + REVISION=5f61a84ad fi cat >>confdefs.h <<_ACEOF @@ -19259,7 +19231,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xfwm4 $as_me 4.16.0, which was +This file was extended by xfwm4 $as_me 4.16.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19325,7 +19297,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xfwm4 config.status 4.16.0 +xfwm4 config.status 4.16.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -20467,6 +20439,7 @@ 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. diff -Nru xfwm4-4.16.0/configure.ac xfwm4-4.16.1/configure.ac --- xfwm4-4.16.0/configure.ac 2020-12-22 22:56:34.000000000 +0000 +++ xfwm4-4.16.1/configure.ac 2021-01-09 17:58:43.000000000 +0000 @@ -10,8 +10,8 @@ m4_define([xfwm4_version_major], [4]) m4_define([xfwm4_version_minor], [16]) -m4_define([xfwm4_version_micro], [0]) -m4_define([xfwm4_version_build], [c697a54ad]) +m4_define([xfwm4_version_micro], [1]) +m4_define([xfwm4_version_build], [5f61a84ad]) m4_define([xfwm4_version_tag], []) m4_define([xfwm4_version], [xfwm4_version_major().xfwm4_version_minor().xfwm4_version_micro()ifelse(xfwm4_version_tag(), [git], [xfwm4_version_tag().xfwm4_version_build()], [xfwm4_version_tag()])]) @@ -84,7 +84,7 @@ AC_SUBST([MATH_LIBS]) dnl Check for i18n support -XDT_I18N([eo en_GB ca zh_CN nb tr en_CA en_AU fr eu gl be zh_TW th sr fi pl ast it he et pt_BR ka de sl pa zh_HK nl hy_AM ja hu nn si ar ko es kk ur sk am te hr sq pt cs is be@tarask uk hye bn ur_PK id vi da ug lv el sv ru ie lt ms fa_IR ro bg oc ]) +XDT_I18N([]) dnl Check for X11 window system XDT_CHECK_LIBX11_REQUIRE @@ -311,8 +311,8 @@ XDT_FEATURE_DEBUG([xfwm4_debug_default]) REVISION=unknown -if test x"c697a54ad" != x""; then - REVISION=c697a54ad +if test x"5f61a84ad" != x""; then + REVISION=5f61a84ad fi AC_DEFINE_UNQUOTED([REVISION], "$REVISION", [git id]) AC_SUBST([REVISION]) diff -Nru xfwm4-4.16.0/debian/changelog xfwm4-4.16.1/debian/changelog --- xfwm4-4.16.0/debian/changelog 2020-12-23 13:17:19.000000000 +0000 +++ xfwm4-4.16.1/debian/changelog 2021-01-10 11:27:20.000000000 +0000 @@ -1,3 +1,9 @@ +xfwm4 (4.16.1-1) unstable; urgency=medium + + * New upstream version 4.16.1 + + -- Yves-Alexis Perez Sun, 10 Jan 2021 12:27:20 +0100 + xfwm4 (4.16.0-1) unstable; urgency=medium * d/watch: use version 4 and follow latest branch diff -Nru xfwm4-4.16.0/defaults/Makefile.in xfwm4-4.16.1/defaults/Makefile.in --- xfwm4-4.16.0/defaults/Makefile.in 2020-12-22 22:56:39.000000000 +0000 +++ xfwm4-4.16.1/defaults/Makefile.in 2021-01-09 17:58:47.000000000 +0000 @@ -353,7 +353,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -Nru xfwm4-4.16.0/helper-dialog/Makefile.in xfwm4-4.16.1/helper-dialog/Makefile.in --- xfwm4-4.16.0/helper-dialog/Makefile.in 2020-12-22 22:56:39.000000000 +0000 +++ xfwm4-4.16.1/helper-dialog/Makefile.in 2021-01-09 17:58:47.000000000 +0000 @@ -383,7 +383,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -Nru xfwm4-4.16.0/icons/128x128/Makefile.in xfwm4-4.16.1/icons/128x128/Makefile.in --- xfwm4-4.16.0/icons/128x128/Makefile.in 2020-12-22 22:56:39.000000000 +0000 +++ xfwm4-4.16.1/icons/128x128/Makefile.in 2021-01-09 17:58:47.000000000 +0000 @@ -353,7 +353,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -Nru xfwm4-4.16.0/icons/16x16/Makefile.in xfwm4-4.16.1/icons/16x16/Makefile.in --- xfwm4-4.16.0/icons/16x16/Makefile.in 2020-12-22 22:56:39.000000000 +0000 +++ xfwm4-4.16.1/icons/16x16/Makefile.in 2021-01-09 17:58:47.000000000 +0000 @@ -353,7 +353,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -Nru xfwm4-4.16.0/icons/22x22/Makefile.in xfwm4-4.16.1/icons/22x22/Makefile.in --- xfwm4-4.16.0/icons/22x22/Makefile.in 2020-12-22 22:56:39.000000000 +0000 +++ xfwm4-4.16.1/icons/22x22/Makefile.in 2021-01-09 17:58:47.000000000 +0000 @@ -353,7 +353,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -Nru xfwm4-4.16.0/icons/48x48/Makefile.in xfwm4-4.16.1/icons/48x48/Makefile.in --- xfwm4-4.16.0/icons/48x48/Makefile.in 2020-12-22 22:56:39.000000000 +0000 +++ xfwm4-4.16.1/icons/48x48/Makefile.in 2021-01-09 17:58:47.000000000 +0000 @@ -353,7 +353,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -Nru xfwm4-4.16.0/icons/Makefile.in xfwm4-4.16.1/icons/Makefile.in --- xfwm4-4.16.0/icons/Makefile.in 2020-12-22 22:56:39.000000000 +0000 +++ xfwm4-4.16.1/icons/Makefile.in 2021-01-09 17:58:47.000000000 +0000 @@ -383,7 +383,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -Nru xfwm4-4.16.0/icons/scalable/Makefile.in xfwm4-4.16.1/icons/scalable/Makefile.in --- xfwm4-4.16.0/icons/scalable/Makefile.in 2020-12-22 22:56:39.000000000 +0000 +++ xfwm4-4.16.1/icons/scalable/Makefile.in 2021-01-09 17:58:47.000000000 +0000 @@ -354,7 +354,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -Nru xfwm4-4.16.0/ltmain.sh xfwm4-4.16.1/ltmain.sh --- xfwm4-4.16.0/ltmain.sh 2020-12-22 22:56:35.000000000 +0000 +++ xfwm4-4.16.1/ltmain.sh 2021-01-09 17:58:44.000000000 +0000 @@ -31,7 +31,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.6 Debian-2.4.6-14" +VERSION=2.4.6 package_revision=2.4.6 @@ -387,7 +387,7 @@ # putting '$debug_cmd' at the start of all your functions, you can get # bash to show function call trace with: # -# debug_cmd='echo "${FUNCNAME[0]} $*" >&2' bash your-script-name +# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name debug_cmd=${debug_cmd-":"} exit_cmd=: @@ -1370,7 +1370,7 @@ #! /bin/sh # Set a version string for this script. -scriptversion=2015-10-07.11; # UTC +scriptversion=2014-01-07.03; # UTC # A portable, pluggable option parser for Bourne shell. # Written by Gary V. Vaughan, 2010 @@ -1530,8 +1530,6 @@ { $debug_cmd - _G_rc_run_hooks=false - case " $hookable_fns " in *" $1 "*) ;; *) func_fatal_error "'$1' does not support hook funcions.n" ;; @@ -1540,16 +1538,16 @@ eval _G_hook_fns=\$$1_hooks; shift for _G_hook in $_G_hook_fns; do - if eval $_G_hook '"$@"'; then - # store returned options list back into positional - # parameters for next 'cmd' execution. - eval _G_hook_result=\$${_G_hook}_result - eval set dummy "$_G_hook_result"; shift - _G_rc_run_hooks=: - fi + eval $_G_hook '"$@"' + + # store returned options list back into positional + # parameters for next 'cmd' execution. + eval _G_hook_result=\$${_G_hook}_result + eval set dummy "$_G_hook_result"; shift done - $_G_rc_run_hooks && func_run_hooks_result=$_G_hook_result + func_quote_for_eval ${1+"$@"} + func_run_hooks_result=$func_quote_for_eval_result } @@ -1559,16 +1557,10 @@ ## --------------- ## # In order to add your own option parsing hooks, you must accept the -# full positional parameter list in your hook function, you may remove/edit -# any options that you action, and then pass back the remaining unprocessed +# full positional parameter list in your hook function, remove any +# options that you action, and then pass back the remaining unprocessed # options in '_result', escaped suitably for -# 'eval'. In this case you also must return $EXIT_SUCCESS to let the -# hook's caller know that it should pay attention to -# '_result'. Returning $EXIT_FAILURE signalizes that -# arguments are left untouched by the hook and therefore caller will ignore the -# result variable. -# -# Like this: +# 'eval'. Like this: # # my_options_prep () # { @@ -1578,11 +1570,9 @@ # usage_message=$usage_message' # -s, --silent don'\''t print informational messages # ' -# # No change in '$@' (ignored completely by this hook). There is -# # no need to do the equivalent (but slower) action: -# # func_quote_for_eval ${1+"$@"} -# # my_options_prep_result=$func_quote_for_eval_result -# false +# +# func_quote_for_eval ${1+"$@"} +# my_options_prep_result=$func_quote_for_eval_result # } # func_add_hook func_options_prep my_options_prep # @@ -1591,37 +1581,25 @@ # { # $debug_cmd # -# args_changed=false -# # # Note that for efficiency, we parse as many options as we can # # recognise in a loop before passing the remainder back to the # # caller on the first unrecognised argument we encounter. # while test $# -gt 0; do # opt=$1; shift # case $opt in -# --silent|-s) opt_silent=: -# args_changed=: -# ;; +# --silent|-s) opt_silent=: ;; # # Separate non-argument short options: # -s*) func_split_short_opt "$_G_opt" # set dummy "$func_split_short_opt_name" \ # "-$func_split_short_opt_arg" ${1+"$@"} # shift -# args_changed=: # ;; -# *) # Make sure the first unrecognised option "$_G_opt" -# # is added back to "$@", we could need that later -# # if $args_changed is true. -# set dummy "$_G_opt" ${1+"$@"}; shift; break ;; +# *) set dummy "$_G_opt" "$*"; shift; break ;; # esac # done # -# if $args_changed; then -# func_quote_for_eval ${1+"$@"} -# my_silent_option_result=$func_quote_for_eval_result -# fi -# -# $args_changed +# func_quote_for_eval ${1+"$@"} +# my_silent_option_result=$func_quote_for_eval_result # } # func_add_hook func_parse_options my_silent_option # @@ -1633,32 +1611,16 @@ # $opt_silent && $opt_verbose && func_fatal_help "\ # '--silent' and '--verbose' options are mutually exclusive." # -# false +# func_quote_for_eval ${1+"$@"} +# my_option_validation_result=$func_quote_for_eval_result # } # func_add_hook func_validate_options my_option_validation # -# You'll also need to manually amend $usage_message to reflect the extra +# You'll alse need to manually amend $usage_message to reflect the extra # options you parse. It's preferable to append if you can, so that # multiple option parsing hooks can be added safely. -# func_options_finish [ARG]... -# ---------------------------- -# Finishing the option parse loop (call 'func_options' hooks ATM). -func_options_finish () -{ - $debug_cmd - - _G_func_options_finish_exit=false - if func_run_hooks func_options ${1+"$@"}; then - func_options_finish_result=$func_run_hooks_result - _G_func_options_finish_exit=: - fi - - $_G_func_options_finish_exit -} - - # func_options [ARG]... # --------------------- # All the functions called inside func_options are hookable. See the @@ -1668,28 +1630,17 @@ { $debug_cmd - _G_rc_options=false - - for my_func in options_prep parse_options validate_options options_finish - do - if eval func_$my_func '${1+"$@"}'; then - eval _G_res_var='$'"func_${my_func}_result" - eval set dummy "$_G_res_var" ; shift - _G_rc_options=: - fi - done + func_options_prep ${1+"$@"} + eval func_parse_options \ + ${func_options_prep_result+"$func_options_prep_result"} + eval func_validate_options \ + ${func_parse_options_result+"$func_parse_options_result"} - # Save modified positional parameters for caller. As a top-level - # options-parser function we always need to set the 'func_options_result' - # variable (regardless the $_G_rc_options value). - if $_G_rc_options; then - func_options_result=$_G_res_var - else - func_quote_for_eval ${1+"$@"} - func_options_result=$func_quote_for_eval_result - fi + eval func_run_hooks func_options \ + ${func_validate_options_result+"$func_validate_options_result"} - $_G_rc_options + # save modified positional parameters for caller + func_options_result=$func_run_hooks_result } @@ -1698,9 +1649,9 @@ # All initialisations required before starting the option parse loop. # Note that when calling hook functions, we pass through the list of # positional parameters. If a hook function modifies that list, and -# needs to propagate that back to rest of this script, then the complete +# needs to propogate that back to rest of this script, then the complete # modified list must be put in 'func_run_hooks_result' before -# returning $EXIT_SUCCESS (otherwise $EXIT_FAILURE is returned). +# returning. func_hookable func_options_prep func_options_prep () { @@ -1710,14 +1661,10 @@ opt_verbose=false opt_warning_types= - _G_rc_options_prep=false - if func_run_hooks func_options_prep ${1+"$@"}; then - _G_rc_options_prep=: - # save modified positional parameters for caller - func_options_prep_result=$func_run_hooks_result - fi + func_run_hooks func_options_prep ${1+"$@"} - $_G_rc_options_prep + # save modified positional parameters for caller + func_options_prep_result=$func_run_hooks_result } @@ -1731,20 +1678,18 @@ func_parse_options_result= - _G_rc_parse_options=false # this just eases exit handling while test $# -gt 0; do # Defer to hook functions for initial option parsing, so they # get priority in the event of reusing an option name. - if func_run_hooks func_parse_options ${1+"$@"}; then - eval set dummy "$func_run_hooks_result"; shift - _G_rc_parse_options=: - fi + func_run_hooks func_parse_options ${1+"$@"} + + # Adjust func_parse_options positional parameters to match + eval set dummy "$func_run_hooks_result"; shift # Break out of the loop if we already parsed every option. test $# -gt 0 || break - _G_match_parse_options=: _G_opt=$1 shift case $_G_opt in @@ -1759,10 +1704,7 @@ ;; --warnings|--warning|-W) - if test $# = 0 && func_missing_arg $_G_opt; then - _G_rc_parse_options=: - break - fi + test $# = 0 && func_missing_arg $_G_opt && break case " $warning_categories $1" in *" $1 "*) # trailing space prevents matching last $1 above @@ -1815,25 +1757,15 @@ shift ;; - --) _G_rc_parse_options=: ; break ;; + --) break ;; -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; - *) set dummy "$_G_opt" ${1+"$@"}; shift - _G_match_parse_options=false - break - ;; + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; esac - - $_G_match_parse_options && _G_rc_parse_options=: done - - if $_G_rc_parse_options; then - # save modified positional parameters for caller - func_quote_for_eval ${1+"$@"} - func_parse_options_result=$func_quote_for_eval_result - fi - - $_G_rc_parse_options + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + func_parse_options_result=$func_quote_for_eval_result } @@ -1846,21 +1778,16 @@ { $debug_cmd - _G_rc_validate_options=false - # Display all warnings if -W was not given. test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" - if func_run_hooks func_validate_options ${1+"$@"}; then - # save modified positional parameters for caller - func_validate_options_result=$func_run_hooks_result - _G_rc_validate_options=: - fi + func_run_hooks func_validate_options ${1+"$@"} # Bail if the options were screwed! $exit_cmd $EXIT_FAILURE - $_G_rc_validate_options + # save modified positional parameters for caller + func_validate_options_result=$func_run_hooks_result } @@ -2141,12 +2068,12 @@ compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname $scriptversion Debian-2.4.6-14 + version: $progname (GNU libtool) 2.4.6 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` Report bugs to . -GNU libtool home page: . +GNU libtool home page: . General help using GNU software: ." exit 0 } @@ -2343,8 +2270,6 @@ nonopt= preserve_args= - _G_rc_lt_options_prep=: - # Shorthand for --mode=foo, only valid as the first argument case $1 in clean|clea|cle|cl) @@ -2368,18 +2293,11 @@ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) shift; set dummy --mode uninstall ${1+"$@"}; shift ;; - *) - _G_rc_lt_options_prep=false - ;; esac - if $_G_rc_lt_options_prep; then - # Pass back the list of options. - func_quote_for_eval ${1+"$@"} - libtool_options_prep_result=$func_quote_for_eval_result - fi - - $_G_rc_lt_options_prep + # Pass back the list of options. + func_quote_for_eval ${1+"$@"} + libtool_options_prep_result=$func_quote_for_eval_result } func_add_hook func_options_prep libtool_options_prep @@ -2391,12 +2309,9 @@ { $debug_cmd - _G_rc_lt_parse_options=false - # Perform our own loop to consume as many options as possible in # each iteration. while test $# -gt 0; do - _G_match_lt_parse_options=: _G_opt=$1 shift case $_G_opt in @@ -2471,22 +2386,15 @@ func_append preserve_args " $_G_opt" ;; - # An option not handled by this hook function: - *) set dummy "$_G_opt" ${1+"$@"} ; shift - _G_match_lt_parse_options=false - break - ;; + # An option not handled by this hook function: + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; esac - $_G_match_lt_parse_options && _G_rc_lt_parse_options=: done - if $_G_rc_lt_parse_options; then - # save modified positional parameters for caller - func_quote_for_eval ${1+"$@"} - libtool_parse_options_result=$func_quote_for_eval_result - fi - $_G_rc_lt_parse_options + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + libtool_parse_options_result=$func_quote_for_eval_result } func_add_hook func_parse_options libtool_parse_options @@ -7366,14 +7274,10 @@ # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization # -specs=* GCC specs files # -stdlib=* select c++ std lib with clang - # -fsanitize=* Clang/GCC memory and address sanitizer - # -fuse-ld=* Linker select flags for GCC - # -static-* direct GCC to link specific libraries statically - # -fcilkplus Cilk Plus language extension features for C/C++ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ - -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus) + -specs=*) func_quote_for_eval "$arg" arg=$func_quote_for_eval_result func_append compile_command " $arg" @@ -7666,10 +7570,7 @@ case $pass in dlopen) libs=$dlfiles ;; dlpreopen) libs=$dlprefiles ;; - link) - libs="$deplibs %DEPLIBS%" - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" - ;; + link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi if test lib,dlpreopen = "$linkmode,$pass"; then @@ -7988,19 +7889,19 @@ # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done elif test prog != "$linkmode" && test lib != "$linkmode"; then func_fatal_error "'$lib' is not a convenience library" fi + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done continue fi # $pass = conv @@ -8924,9 +8825,6 @@ revision=$number_minor lt_irix_increment=no ;; - *) - func_fatal_configuration "$modename: unknown library version type '$version_type'" - ;; esac ;; no) diff -Nru xfwm4-4.16.0/Makefile.in xfwm4-4.16.1/Makefile.in --- xfwm4-4.16.0/Makefile.in 2020-12-22 22:56:39.000000000 +0000 +++ xfwm4-4.16.1/Makefile.in 2021-01-09 17:58:47.000000000 +0000 @@ -406,7 +406,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -Nru xfwm4-4.16.0/NEWS xfwm4-4.16.1/NEWS --- xfwm4-4.16.0/NEWS 2020-12-22 22:56:29.000000000 +0000 +++ xfwm4-4.16.1/NEWS 2021-01-09 17:49:01.000000000 +0000 @@ -1,3 +1,14 @@ +4.16.1 +====== + +- Catch more XErrors (#476, #486) +- Untile window before switching to fullscreen (#478) +- Allow interactive resizing with any keyboard modifier (#487) +- Do not prefer Xpresent on AMD/Radeon (#490) +- Use g_info/g_print instead of g_message for some message +- I18n: Update translation: + ast, be, be@tarask, cs, el, et, eu, fi, he, hr, hu, ie, pl, pt_BR, zh_TW. + 4.16.0 ====== - common: Avoid zero refresh rate for monitor diff -Nru xfwm4-4.16.0/po/ast.po xfwm4-4.16.1/po/ast.po --- xfwm4-4.16.0/po/ast.po 2020-05-11 21:56:52.000000000 +0000 +++ xfwm4-4.16.1/po/ast.po 2021-01-09 16:28:40.000000000 +0000 @@ -3,16 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# enolp , 2014-2015 -# Ḷḷumex03 , 2014 -# Ḷḷumex03 , 2014 -# Ḷḷumex03 , 2014 +# enolp , 2014-2015,2020 +# Ḷḷumex03, 2014 +# Ḷḷumex03, 2014 +# Ḷḷumex03, 2014 msgid "" msgstr "" "Project-Id-Version: Xfwm4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 00:32+0200\n" -"PO-Revision-Date: 2019-10-20 16:46+0000\n" +"POT-Creation-Date: 2020-12-13 00:49+0100\n" +"PO-Revision-Date: 2021-01-06 11:09+0000\n" "Last-Translator: Xfce Bot \n" "Language-Team: Asturian (http://www.transifex.com/xfce/xfwm4/language/ast/)\n" "MIME-Version: 1.0\n" @@ -29,37 +29,37 @@ #: ../helper-dialog/helper-dialog.c:99 msgid "Warning" -msgstr "Avisu" +msgstr "Atención" #: ../settings-dialogs/tweaks-settings.c:55 msgid "None" msgstr "Dengún" -#: ../settings-dialogs/tweaks-settings.c:472 +#: ../settings-dialogs/tweaks-settings.c:482 msgid "Session manager socket" msgstr "Socket del xestor de sesión" -#: ../settings-dialogs/tweaks-settings.c:472 +#: ../settings-dialogs/tweaks-settings.c:482 #: ../settings-dialogs/workspace-settings.c:398 -#: ../settings-dialogs/xfwm4-settings.c:248 +#: ../settings-dialogs/xfwm4-settings.c:238 msgid "SOCKET ID" msgstr "ID de SOCKET" -#: ../settings-dialogs/tweaks-settings.c:473 +#: ../settings-dialogs/tweaks-settings.c:483 #: ../settings-dialogs/workspace-settings.c:399 -#: ../settings-dialogs/xfwm4-settings.c:250 +#: ../settings-dialogs/xfwm4-settings.c:240 msgid "Version information" -msgstr "Información de versión" +msgstr "Información de la versión" -#: ../settings-dialogs/tweaks-settings.c:491 +#: ../settings-dialogs/tweaks-settings.c:501 #: ../settings-dialogs/workspace-settings.c:416 -#: ../settings-dialogs/xfwm4-settings.c:907 +#: ../settings-dialogs/xfwm4-settings.c:871 msgid "." msgstr "." -#: ../settings-dialogs/tweaks-settings.c:495 +#: ../settings-dialogs/tweaks-settings.c:505 #: ../settings-dialogs/workspace-settings.c:420 -#: ../settings-dialogs/xfwm4-settings.c:911 +#: ../settings-dialogs/xfwm4-settings.c:875 #, c-format msgid "" "%s: %s\n" @@ -77,9 +77,9 @@ msgstr "Nome de la estaya de trabayu" #: ../settings-dialogs/workspace-settings.c:398 -#: ../settings-dialogs/xfwm4-settings.c:248 +#: ../settings-dialogs/xfwm4-settings.c:238 msgid "Settings manager socket" -msgstr "Socket del xestor de configuración" +msgstr "Socket del xestor d'axustes" #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1 #: ../settings-dialogs/xfwm4-dialog.glade.h:1 @@ -91,6 +91,14 @@ msgid "Configure window behavior and shortcuts" msgstr "Configura'l comportamientu de ventanes y atayos" +#: ../settings-dialogs/xfce-wm-settings.desktop.in.h:3 +msgid "" +"windows;management;settings;preferences;themes;styles;decorations;title " +"bar;font;buttons;menu;minimize;maximize;shade;roll up;layout;keyboard " +"shortcuts;focus;snapping;screen;workspaces;edges;corner;hide " +"content;move;resize;moving;resizing;double click;" +msgstr "" + #: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1 msgid "Window Manager Tweaks" @@ -101,6 +109,13 @@ msgid "Fine-tune window behaviour and effects" msgstr "Axuste finu de comportamientu y efeutos de ventanes" +#: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:3 +msgid "" +"windows;behavior;settings;preferences;cycling;cycle;switching;focus;raises;accessibility;key;dragging;move;moving;hide;frame;title" +" bar;maximized;tile;screen;edge;hot corner;snapping;mouse wheel;roll " +"up;workspaces;placement;compositor;compositing;enable;disable;shadows;decorations;opacity;resize;inactive;preview;compiz;transitions;" +msgstr "" + #: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1 msgid "Workspaces" @@ -111,10 +126,16 @@ msgid "Configure layout, names and margins" msgstr "Configurar distribución del tecláu, nome y márxenes" +#: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:3 +msgid "" +"workspaces;settings;preferences;virtual " +"desktops;number;windows;screen;margins;" +msgstr "" + #: ../settings-dialogs/xfwm4-dialog.glade.h:3 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3 msgid "_Help" -msgstr "A_yuda" +msgstr "_Ayuda" #. -------------------------------------------------------- #: ../settings-dialogs/xfwm4-dialog.glade.h:4 @@ -192,7 +213,7 @@ #: ../settings-dialogs/xfwm4-dialog.glade.h:22 msgid "_Reset to Defaults" -msgstr "_Reafitar valores" +msgstr "Re_afitar opciones predeterminaes" #: ../settings-dialogs/xfwm4-dialog.glade.h:23 msgid "_Keyboard" @@ -325,68 +346,72 @@ msgid "Ad_vanced" msgstr "A_vanzáu" -#: ../settings-dialogs/xfwm4-settings.c:227 +#: ../settings-dialogs/xfwm4-settings.c:216 msgid "Shade window" msgstr "Endolcar ventana" -#: ../settings-dialogs/xfwm4-settings.c:228 +#: ../settings-dialogs/xfwm4-settings.c:217 msgid "Hide window" msgstr "Anubrir ventana" -#: ../settings-dialogs/xfwm4-settings.c:229 +#: ../settings-dialogs/xfwm4-settings.c:218 msgid "Maximize window" msgstr "Maximizar ventana" -#: ../settings-dialogs/xfwm4-settings.c:230 +#: ../settings-dialogs/xfwm4-settings.c:219 msgid "Fill window" msgstr "Ocupar tola ventana" -#: ../settings-dialogs/xfwm4-settings.c:231 +#: ../settings-dialogs/xfwm4-settings.c:220 +msgid "Always on top" +msgstr "" + +#: ../settings-dialogs/xfwm4-settings.c:221 msgid "Nothing" -msgstr "Un res" +msgstr "Nada" -#: ../settings-dialogs/xfwm4-settings.c:236 +#: ../settings-dialogs/xfwm4-settings.c:226 msgid "Left" msgstr "Izquierda" -#: ../settings-dialogs/xfwm4-settings.c:237 +#: ../settings-dialogs/xfwm4-settings.c:227 msgid "Center" msgstr "Centru" -#: ../settings-dialogs/xfwm4-settings.c:238 +#: ../settings-dialogs/xfwm4-settings.c:228 msgid "Right" msgstr "Drecha" -#: ../settings-dialogs/xfwm4-settings.c:387 +#: ../settings-dialogs/xfwm4-settings.c:344 msgid "Theme" -msgstr "Tema" +msgstr "Estilu" -#: ../settings-dialogs/xfwm4-settings.c:542 +#: ../settings-dialogs/xfwm4-settings.c:499 msgid "Action" msgstr "Aición" -#: ../settings-dialogs/xfwm4-settings.c:547 +#: ../settings-dialogs/xfwm4-settings.c:506 msgid "Shortcut" -msgstr "Accesu direutu" +msgstr "Atayu" -#: ../settings-dialogs/xfwm4-settings.c:936 +#: ../settings-dialogs/xfwm4-settings.c:900 #, c-format msgid "Failed to initialize xfconf. Reason: %s" msgstr "Fallu al aniciar xfconf. Razón: %s" -#: ../settings-dialogs/xfwm4-settings.c:947 +#: ../settings-dialogs/xfwm4-settings.c:911 msgid "Could not create the settings dialog." -msgstr "Nun pudo criase'l diálogu de configuración." +msgstr "Nun pudo criase'l diálogu d'axustes." -#: ../settings-dialogs/xfwm4-settings.c:1946 +#: ../settings-dialogs/xfwm4-settings.c:1912 msgid "" "This will reset all shortcuts to their default values. Do you really want to" " do this?" -msgstr "Esto reafitará tolos accesos direutos a los sos valores por defeutu. ¿De xuru quies facer esto?" +msgstr "Esto va reafitar los valores de tolos atayos. ¿De xuru que quies facer esto?" -#: ../settings-dialogs/xfwm4-settings.c:1948 +#: ../settings-dialogs/xfwm4-settings.c:1914 msgid "Reset to Defaults" -msgstr "Reafitar valores predeterminaos" +msgstr "Reafitar opciones predeterminaes" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:5 msgid "" @@ -440,7 +465,7 @@ #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:18 msgid "Do _nothing" -msgstr "Nun facer un _res" +msgstr "_Nun facer nada" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20 msgid "Key used to _grab and move windows:" @@ -480,7 +505,7 @@ #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:29 msgid "_Accessibility" -msgstr "_Accesibilidá" +msgstr "_Acesibilidá" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30 msgid "Use the _mouse wheel on the desktop to switch workspaces" @@ -554,34 +579,42 @@ msgstr "Amosar somlobres baxo ventanes _normales" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51 +msgid "Zoom desktop with mouse wheel" +msgstr "" + +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:52 +msgid "Zoom pointer along with the desktop" +msgstr "" + +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:53 msgid "Opaci_ty of window decorations:" msgstr "Opaci_dá de la decoración de ventanes:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:52 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:54 msgid "Transparent" msgstr "Tresparente" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:53 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:55 msgid "Opaque" msgstr "Opacu" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:54 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:56 msgid "Opacity of _inactive windows:" msgstr "Opacidá de ventanes _inactives:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:55 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:57 msgid "Opacity of windows during _move:" msgstr "Opacidá de ventanes al des_plazase:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:56 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:58 msgid "Opacity of windows during resi_ze:" msgstr "Opacidá de ventanes durante _redimensionáu:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:57 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:59 msgid "Opacity of popup wi_ndows:" msgstr "Opacidá de los ventanos emerxentes:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:58 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:60 msgid "C_ompositor" msgstr "C_ompositor" @@ -611,7 +644,7 @@ msgstr "_Márxenes" #. TRANSLATORS: "(on %s)" is like "running on" the name of the other host -#: ../src/client.c:186 +#: ../src/client.c:207 #, c-format msgid "%s (on %s)" msgstr "%s (en %s)" @@ -621,34 +654,34 @@ msgid "Unsupported keyboard modifier '%s'" msgstr "" -#: ../src/main.c:695 -msgid "Fork to the background (not supported)" -msgstr "" - -#: ../src/main.c:697 +#: ../src/main.c:666 msgid "Set the compositor mode" msgstr "Afitar el mou compositor" -#: ../src/main.c:698 +#: ../src/main.c:668 msgid "Set the vblank mode" msgstr "" -#: ../src/main.c:707 +#: ../src/main.c:678 msgid "Replace the existing window manager" msgstr "Trocar el xestor de ventanes esistente" -#: ../src/main.c:708 +#: ../src/main.c:680 msgid "Print version information and exit" msgstr "Amuesa la información de la versión y cola" -#: ../src/main.c:752 +#: ../src/main.c:683 +msgid "Enable debug logging" +msgstr "" + +#: ../src/main.c:723 msgid "[ARGUMENTS...]" msgstr "[ARGUMENTOS...]" -#: ../src/main.c:759 +#: ../src/main.c:730 #, c-format msgid "Type \"%s --help\" for usage." -msgstr "Escribi «%s --help» pal usu." +msgstr "Teclexa «%s --help» pal usu." #: ../src/menu.c:51 msgid "Ma_ximize" @@ -709,7 +742,7 @@ #: ../src/menu.c:66 msgid "Context _Help" -msgstr "A_yuda contestual" +msgstr "_Ayuda contestual" #. -------------------------------------------------------- #: ../src/menu.c:68 @@ -740,7 +773,7 @@ #: ../src/menu.c:536 #, c-format msgid "%s: GtkMenu failed to grab the pointer\n" -msgstr "%s: GtkMenu falló al intentar consiguir el punteru\n" +msgstr "%s: GtkMenu falló al garrar el punteru\n" #: ../src/terminate.c:77 #, c-format diff -Nru xfwm4-4.16.0/po/be.po xfwm4-4.16.1/po/be.po --- xfwm4-4.16.0/po/be.po 2020-11-19 23:15:52.000000000 +0000 +++ xfwm4-4.16.1/po/be.po 2021-01-05 08:18:23.000000000 +0000 @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Zmicer Turok , 2018-2020 -# Zmicer Turok , 2018 +# Źmicier Turok , 2018-2020 +# Źmicier Turok , 2018 msgid "" msgstr "" "Project-Id-Version: Xfwm4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-01 00:49+0100\n" -"PO-Revision-Date: 2020-10-31 23:49+0000\n" -"Last-Translator: Xfce Bot \n" +"POT-Creation-Date: 2020-12-13 00:49+0100\n" +"PO-Revision-Date: 2020-12-29 07:55+0000\n" +"Last-Translator: Źmicier Turok \n" "Language-Team: Belarusian (http://www.transifex.com/xfce/xfwm4/language/be/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -33,31 +33,31 @@ msgid "None" msgstr "Няма" -#: ../settings-dialogs/tweaks-settings.c:477 +#: ../settings-dialogs/tweaks-settings.c:482 msgid "Session manager socket" msgstr "Сокет кіраўніка сеансаў" -#: ../settings-dialogs/tweaks-settings.c:477 +#: ../settings-dialogs/tweaks-settings.c:482 #: ../settings-dialogs/workspace-settings.c:398 -#: ../settings-dialogs/xfwm4-settings.c:240 +#: ../settings-dialogs/xfwm4-settings.c:238 msgid "SOCKET ID" msgstr "SOCKET ID" -#: ../settings-dialogs/tweaks-settings.c:478 +#: ../settings-dialogs/tweaks-settings.c:483 #: ../settings-dialogs/workspace-settings.c:399 -#: ../settings-dialogs/xfwm4-settings.c:242 +#: ../settings-dialogs/xfwm4-settings.c:240 msgid "Version information" msgstr "Інфармацыя пра версію" -#: ../settings-dialogs/tweaks-settings.c:496 +#: ../settings-dialogs/tweaks-settings.c:501 #: ../settings-dialogs/workspace-settings.c:416 -#: ../settings-dialogs/xfwm4-settings.c:874 +#: ../settings-dialogs/xfwm4-settings.c:871 msgid "." msgstr "." -#: ../settings-dialogs/tweaks-settings.c:500 +#: ../settings-dialogs/tweaks-settings.c:505 #: ../settings-dialogs/workspace-settings.c:420 -#: ../settings-dialogs/xfwm4-settings.c:878 +#: ../settings-dialogs/xfwm4-settings.c:875 #, c-format msgid "" "%s: %s\n" @@ -75,7 +75,7 @@ msgstr "Назва працоўнай прасторы" #: ../settings-dialogs/workspace-settings.c:398 -#: ../settings-dialogs/xfwm4-settings.c:240 +#: ../settings-dialogs/xfwm4-settings.c:238 msgid "Settings manager socket" msgstr "Сокет кіраўніка налад" @@ -344,66 +344,70 @@ msgid "Ad_vanced" msgstr "Да_датковыя" -#: ../settings-dialogs/xfwm4-settings.c:219 +#: ../settings-dialogs/xfwm4-settings.c:216 msgid "Shade window" msgstr "Згарнуць акно" -#: ../settings-dialogs/xfwm4-settings.c:220 +#: ../settings-dialogs/xfwm4-settings.c:217 msgid "Hide window" msgstr "Схаваць акно" -#: ../settings-dialogs/xfwm4-settings.c:221 +#: ../settings-dialogs/xfwm4-settings.c:218 msgid "Maximize window" msgstr "Разгарнуць акно" -#: ../settings-dialogs/xfwm4-settings.c:222 +#: ../settings-dialogs/xfwm4-settings.c:219 msgid "Fill window" msgstr "Запоўніць акно" -#: ../settings-dialogs/xfwm4-settings.c:223 +#: ../settings-dialogs/xfwm4-settings.c:220 +msgid "Always on top" +msgstr "Заўсёды наверсе" + +#: ../settings-dialogs/xfwm4-settings.c:221 msgid "Nothing" msgstr "Нічога" -#: ../settings-dialogs/xfwm4-settings.c:228 +#: ../settings-dialogs/xfwm4-settings.c:226 msgid "Left" msgstr "Налева" -#: ../settings-dialogs/xfwm4-settings.c:229 +#: ../settings-dialogs/xfwm4-settings.c:227 msgid "Center" msgstr "Цэнтр" -#: ../settings-dialogs/xfwm4-settings.c:230 +#: ../settings-dialogs/xfwm4-settings.c:228 msgid "Right" msgstr "Направа" -#: ../settings-dialogs/xfwm4-settings.c:346 +#: ../settings-dialogs/xfwm4-settings.c:344 msgid "Theme" msgstr "Тэма" -#: ../settings-dialogs/xfwm4-settings.c:501 +#: ../settings-dialogs/xfwm4-settings.c:499 msgid "Action" msgstr "Дзеянне" -#: ../settings-dialogs/xfwm4-settings.c:508 +#: ../settings-dialogs/xfwm4-settings.c:506 msgid "Shortcut" msgstr "Спалучэнне клавіш" -#: ../settings-dialogs/xfwm4-settings.c:903 +#: ../settings-dialogs/xfwm4-settings.c:900 #, c-format msgid "Failed to initialize xfconf. Reason: %s" msgstr "Не атрымалася ініцыялізаваць xfconf. Прычына: %s" -#: ../settings-dialogs/xfwm4-settings.c:914 +#: ../settings-dialogs/xfwm4-settings.c:911 msgid "Could not create the settings dialog." msgstr "Не атрымалася стварыць акно налад." -#: ../settings-dialogs/xfwm4-settings.c:1915 +#: ../settings-dialogs/xfwm4-settings.c:1912 msgid "" "This will reset all shortcuts to their default values. Do you really want to" " do this?" msgstr "Гэтае дзеянне скіне ўсе спалучэнні клавіш. Сапраўды зрабіць гэта?" -#: ../settings-dialogs/xfwm4-settings.c:1917 +#: ../settings-dialogs/xfwm4-settings.c:1914 msgid "Reset to Defaults" msgstr "Скінуць да прадвызначанага" @@ -573,38 +577,42 @@ msgstr "Адлюстроўваць цень ад _звычайных акон" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51 -msgid "Zoom pointer along with the desktop" -msgstr "" +msgid "Zoom desktop with mouse wheel" +msgstr "Маштабаванне працоўнага стала колам мышы" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:52 +msgid "Zoom pointer along with the desktop" +msgstr "Маштабаваць курсор разам з працоўным сталом" + +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:53 msgid "Opaci_ty of window decorations:" msgstr "Празрыс_тасць аздаблення акон:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:53 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:54 msgid "Transparent" msgstr "Празрыста" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:54 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:55 msgid "Opaque" msgstr "Непразрыста" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:55 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:56 msgid "Opacity of _inactive windows:" msgstr "Празрыстасць _неактыўных акон:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:56 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:57 msgid "Opacity of windows during _move:" msgstr "Празрыстасць акон падчас _перамяшчэння:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:57 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:58 msgid "Opacity of windows during resi_ze:" msgstr "Празрыстасць акон падчас змены па_мераў:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:58 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:59 msgid "Opacity of popup wi_ndows:" msgstr "Празрыстасць выплыўных _акон:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:59 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:60 msgid "C_ompositor" msgstr "Э_фекты" @@ -644,27 +652,31 @@ msgid "Unsupported keyboard modifier '%s'" msgstr "Непадтрымліваемы клавіятурны мадыфікатар '%s'" -#: ../src/main.c:722 +#: ../src/main.c:666 msgid "Set the compositor mode" msgstr "Прызначыць кампазітны рэжым" -#: ../src/main.c:724 +#: ../src/main.c:668 msgid "Set the vblank mode" msgstr "Прызначыць рэжым вертыкальнага сінхранізавання" -#: ../src/main.c:734 +#: ../src/main.c:678 msgid "Replace the existing window manager" msgstr "Замяніць бягучага кіраўніка акон" -#: ../src/main.c:736 +#: ../src/main.c:680 msgid "Print version information and exit" msgstr "Вывесці інфармацыю пра версію і выйсці" -#: ../src/main.c:780 +#: ../src/main.c:683 +msgid "Enable debug logging" +msgstr "Уключыць журнал адладкі" + +#: ../src/main.c:723 msgid "[ARGUMENTS...]" msgstr "[АРГУМЕНТЫ...]" -#: ../src/main.c:787 +#: ../src/main.c:730 #, c-format msgid "Type \"%s --help\" for usage." msgstr "Увядзіце \"%s --help\", каб праглядзець даведку." diff -Nru xfwm4-4.16.0/po/be@tarask.po xfwm4-4.16.1/po/be@tarask.po --- xfwm4-4.16.0/po/be@tarask.po 2020-11-19 23:15:52.000000000 +0000 +++ xfwm4-4.16.1/po/be@tarask.po 2021-01-05 08:18:23.000000000 +0000 @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Сяргей Снапкоўскі, 2020 +# Сяргей Снапкоўскі, 2020-2021 msgid "" msgstr "" "Project-Id-Version: Xfwm4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-01 00:49+0100\n" -"PO-Revision-Date: 2020-11-01 19:47+0000\n" +"POT-Creation-Date: 2020-12-13 00:49+0100\n" +"PO-Revision-Date: 2021-01-04 17:40+0000\n" "Last-Translator: Сяргей Снапкоўскі\n" "Language-Team: Belarusian (Tarask) (http://www.transifex.com/xfce/xfwm4/language/be@tarask/)\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgid "" "This window might be busy and is not responding.\n" "Do you want to terminate the application?" -msgstr "Вакно занята й ня адказвае.\nЗавяршыць?" +msgstr "Вакно занята й ня адказвае.\nСконьчыць?" #: ../helper-dialog/helper-dialog.c:99 msgid "Warning" @@ -32,31 +32,31 @@ msgid "None" msgstr "Няма" -#: ../settings-dialogs/tweaks-settings.c:477 +#: ../settings-dialogs/tweaks-settings.c:482 msgid "Session manager socket" msgstr "Сокэт кіраўніка сэансу" -#: ../settings-dialogs/tweaks-settings.c:477 +#: ../settings-dialogs/tweaks-settings.c:482 #: ../settings-dialogs/workspace-settings.c:398 -#: ../settings-dialogs/xfwm4-settings.c:240 +#: ../settings-dialogs/xfwm4-settings.c:238 msgid "SOCKET ID" msgstr "ID СОКЭТУ" -#: ../settings-dialogs/tweaks-settings.c:478 +#: ../settings-dialogs/tweaks-settings.c:483 #: ../settings-dialogs/workspace-settings.c:399 -#: ../settings-dialogs/xfwm4-settings.c:242 +#: ../settings-dialogs/xfwm4-settings.c:240 msgid "Version information" msgstr "Дадзеныя аб вэрсіі" -#: ../settings-dialogs/tweaks-settings.c:496 +#: ../settings-dialogs/tweaks-settings.c:501 #: ../settings-dialogs/workspace-settings.c:416 -#: ../settings-dialogs/xfwm4-settings.c:874 +#: ../settings-dialogs/xfwm4-settings.c:871 msgid "." msgstr "." -#: ../settings-dialogs/tweaks-settings.c:500 +#: ../settings-dialogs/tweaks-settings.c:505 #: ../settings-dialogs/workspace-settings.c:420 -#: ../settings-dialogs/xfwm4-settings.c:878 +#: ../settings-dialogs/xfwm4-settings.c:875 #, c-format msgid "" "%s: %s\n" @@ -74,7 +74,7 @@ msgstr "Назва прасторы" #: ../settings-dialogs/workspace-settings.c:398 -#: ../settings-dialogs/xfwm4-settings.c:240 +#: ../settings-dialogs/xfwm4-settings.c:238 msgid "Settings manager socket" msgstr "Сокэт кіраўніка наладаў" @@ -343,66 +343,70 @@ msgid "Ad_vanced" msgstr "_Адмысловыя" -#: ../settings-dialogs/xfwm4-settings.c:219 +#: ../settings-dialogs/xfwm4-settings.c:216 msgid "Shade window" msgstr "Згарнуць вакно" -#: ../settings-dialogs/xfwm4-settings.c:220 +#: ../settings-dialogs/xfwm4-settings.c:217 msgid "Hide window" msgstr "Утоіць вакно" -#: ../settings-dialogs/xfwm4-settings.c:221 +#: ../settings-dialogs/xfwm4-settings.c:218 msgid "Maximize window" msgstr "Разгарнуць вакно" -#: ../settings-dialogs/xfwm4-settings.c:222 +#: ../settings-dialogs/xfwm4-settings.c:219 msgid "Fill window" msgstr "Напоўніць вакно" -#: ../settings-dialogs/xfwm4-settings.c:223 +#: ../settings-dialogs/xfwm4-settings.c:220 +msgid "Always on top" +msgstr "Заўсёды _наверсе" + +#: ../settings-dialogs/xfwm4-settings.c:221 msgid "Nothing" msgstr "Нічога" -#: ../settings-dialogs/xfwm4-settings.c:228 +#: ../settings-dialogs/xfwm4-settings.c:226 msgid "Left" msgstr "Улева" -#: ../settings-dialogs/xfwm4-settings.c:229 +#: ../settings-dialogs/xfwm4-settings.c:227 msgid "Center" msgstr "Па цэнтры" -#: ../settings-dialogs/xfwm4-settings.c:230 +#: ../settings-dialogs/xfwm4-settings.c:228 msgid "Right" msgstr "Управа" -#: ../settings-dialogs/xfwm4-settings.c:346 +#: ../settings-dialogs/xfwm4-settings.c:344 msgid "Theme" msgstr "Тэма" -#: ../settings-dialogs/xfwm4-settings.c:501 +#: ../settings-dialogs/xfwm4-settings.c:499 msgid "Action" msgstr "Дзеяньне" -#: ../settings-dialogs/xfwm4-settings.c:508 +#: ../settings-dialogs/xfwm4-settings.c:506 msgid "Shortcut" msgstr "Скарот" -#: ../settings-dialogs/xfwm4-settings.c:903 +#: ../settings-dialogs/xfwm4-settings.c:900 #, c-format msgid "Failed to initialize xfconf. Reason: %s" msgstr "Немагчыма запусьціць xfconf. Прычына: %s" -#: ../settings-dialogs/xfwm4-settings.c:914 +#: ../settings-dialogs/xfwm4-settings.c:911 msgid "Could not create the settings dialog." msgstr "Не атрымалася стварыць вакно наладаў." -#: ../settings-dialogs/xfwm4-settings.c:1915 +#: ../settings-dialogs/xfwm4-settings.c:1912 msgid "" "This will reset all shortcuts to their default values. Do you really want to" " do this?" msgstr "Гэта вярне ўсе скароты да іх пачатковых значэньняў. Вярнуць?" -#: ../settings-dialogs/xfwm4-settings.c:1917 +#: ../settings-dialogs/xfwm4-settings.c:1914 msgid "Reset to Defaults" msgstr "Скінуць да прадвызначанага" @@ -572,38 +576,42 @@ msgstr "Адлюстроўваць цень ад _звычайных вокнаў" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51 +msgid "Zoom desktop with mouse wheel" +msgstr "Маштабаваць стол з дапамогай кола мышу" + +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:52 msgid "Zoom pointer along with the desktop" msgstr "Паказальнік маштабаваньня разам са стальніцай" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:52 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:53 msgid "Opaci_ty of window decorations:" msgstr "Непразрыстасьць _упрыгожваньняў вакна:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:53 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:54 msgid "Transparent" msgstr "Празрыста" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:54 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:55 msgid "Opaque" msgstr "Непразрыста" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:55 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:56 msgid "Opacity of _inactive windows:" msgstr "Непразрыстасьць _нядзейных вокнаў:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:56 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:57 msgid "Opacity of windows during _move:" msgstr "Непразрыстасьць _вокнаў пры руху:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:57 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:58 msgid "Opacity of windows during resi_ze:" msgstr "Непразрыстасьць вокнаў _пры зьмене памеру:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:58 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:59 msgid "Opacity of popup wi_ndows:" msgstr "Непразрыстасьць усплываючых _вокнаў:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:59 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:60 msgid "C_ompositor" msgstr "Э_фэкты" @@ -643,27 +651,31 @@ msgid "Unsupported keyboard modifier '%s'" msgstr "Няслушны клявіятурны мадыфікатар '%s'" -#: ../src/main.c:722 +#: ../src/main.c:666 msgid "Set the compositor mode" msgstr "Прызначыць рэжым эфэктаў" -#: ../src/main.c:724 +#: ../src/main.c:668 msgid "Set the vblank mode" msgstr "Прызначыць рэжым вэртыкальнага сынхранізаваньня" -#: ../src/main.c:734 +#: ../src/main.c:678 msgid "Replace the existing window manager" msgstr "Замяніць існы кіраўнік вокнаў" -#: ../src/main.c:736 +#: ../src/main.c:680 msgid "Print version information and exit" msgstr "Друкаваць дадзеныя аб вэрсыі й выйсьці" -#: ../src/main.c:780 +#: ../src/main.c:683 +msgid "Enable debug logging" +msgstr "Дазволіць адладачныя паведамленьні" + +#: ../src/main.c:723 msgid "[ARGUMENTS...]" msgstr "[АРГУМЭНТЫ...]" -#: ../src/main.c:787 +#: ../src/main.c:730 #, c-format msgid "Type \"%s --help\" for usage." msgstr "Увядзіце \"%s --help\" для выкарыстаньня." diff -Nru xfwm4-4.16.0/po/cs.po xfwm4-4.16.1/po/cs.po --- xfwm4-4.16.0/po/cs.po 2020-11-19 23:15:52.000000000 +0000 +++ xfwm4-4.16.1/po/cs.po 2021-01-05 08:18:23.000000000 +0000 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: Xfwm4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-01 00:49+0100\n" -"PO-Revision-Date: 2020-11-01 09:12+0000\n" +"POT-Creation-Date: 2020-12-13 00:49+0100\n" +"PO-Revision-Date: 2020-12-30 20:58+0000\n" "Last-Translator: Michal Várady \n" "Language-Team: Czech (http://www.transifex.com/xfce/xfwm4/language/cs/)\n" "MIME-Version: 1.0\n" @@ -37,36 +37,36 @@ msgid "None" msgstr "Nic" -#: ../settings-dialogs/tweaks-settings.c:477 +#: ../settings-dialogs/tweaks-settings.c:482 msgid "Session manager socket" msgstr "Soket správce relace" -#: ../settings-dialogs/tweaks-settings.c:477 +#: ../settings-dialogs/tweaks-settings.c:482 #: ../settings-dialogs/workspace-settings.c:398 -#: ../settings-dialogs/xfwm4-settings.c:240 +#: ../settings-dialogs/xfwm4-settings.c:238 msgid "SOCKET ID" msgstr "SOCKET ID" -#: ../settings-dialogs/tweaks-settings.c:478 +#: ../settings-dialogs/tweaks-settings.c:483 #: ../settings-dialogs/workspace-settings.c:399 -#: ../settings-dialogs/xfwm4-settings.c:242 +#: ../settings-dialogs/xfwm4-settings.c:240 msgid "Version information" msgstr "Informace o verzi" -#: ../settings-dialogs/tweaks-settings.c:496 +#: ../settings-dialogs/tweaks-settings.c:501 #: ../settings-dialogs/workspace-settings.c:416 -#: ../settings-dialogs/xfwm4-settings.c:874 +#: ../settings-dialogs/xfwm4-settings.c:871 msgid "." msgstr "." -#: ../settings-dialogs/tweaks-settings.c:500 +#: ../settings-dialogs/tweaks-settings.c:505 #: ../settings-dialogs/workspace-settings.c:420 -#: ../settings-dialogs/xfwm4-settings.c:878 +#: ../settings-dialogs/xfwm4-settings.c:875 #, c-format msgid "" "%s: %s\n" "Try %s --help to see a full list of available command line options.\n" -msgstr "%s: %s\nÚplný seznam voleb příkazové řádky získáte příkazem %s --help\n" +msgstr "%s: %s\nÚplný seznam voleb příkazového řádku získáte příkazem %s --help\n" #: ../settings-dialogs/workspace-settings.c:81 #: ../settings-dialogs/workspace-settings.c:96 @@ -79,7 +79,7 @@ msgstr "Název pracovní plochy" #: ../settings-dialogs/workspace-settings.c:398 -#: ../settings-dialogs/xfwm4-settings.c:240 +#: ../settings-dialogs/xfwm4-settings.c:238 msgid "Settings manager socket" msgstr "Soket správce nastavení" @@ -211,7 +211,7 @@ #: ../settings-dialogs/xfwm4-dialog.glade.h:21 msgid "Define shortcuts to perform _window manager actions:" -msgstr "Zadejte _klávesovou zkratku pro provedení akce správce oken:" +msgstr "Definujte _klávesové zkratky pro provedení akcí správce oken:" #: ../settings-dialogs/xfwm4-dialog.glade.h:22 msgid "_Reset to Defaults" @@ -348,66 +348,70 @@ msgid "Ad_vanced" msgstr "_Pokročilé" -#: ../settings-dialogs/xfwm4-settings.c:219 +#: ../settings-dialogs/xfwm4-settings.c:216 msgid "Shade window" msgstr "Zarolovat okno" -#: ../settings-dialogs/xfwm4-settings.c:220 +#: ../settings-dialogs/xfwm4-settings.c:217 msgid "Hide window" msgstr "Skrýt okno" -#: ../settings-dialogs/xfwm4-settings.c:221 +#: ../settings-dialogs/xfwm4-settings.c:218 msgid "Maximize window" msgstr "Maximalizovat okno" -#: ../settings-dialogs/xfwm4-settings.c:222 +#: ../settings-dialogs/xfwm4-settings.c:219 msgid "Fill window" msgstr "Vyplnit okno" -#: ../settings-dialogs/xfwm4-settings.c:223 +#: ../settings-dialogs/xfwm4-settings.c:220 +msgid "Always on top" +msgstr "Vždy nahoře" + +#: ../settings-dialogs/xfwm4-settings.c:221 msgid "Nothing" msgstr "Nic" -#: ../settings-dialogs/xfwm4-settings.c:228 +#: ../settings-dialogs/xfwm4-settings.c:226 msgid "Left" msgstr "Vlevo" -#: ../settings-dialogs/xfwm4-settings.c:229 +#: ../settings-dialogs/xfwm4-settings.c:227 msgid "Center" msgstr "Vystředit" -#: ../settings-dialogs/xfwm4-settings.c:230 +#: ../settings-dialogs/xfwm4-settings.c:228 msgid "Right" msgstr "Vpravo" -#: ../settings-dialogs/xfwm4-settings.c:346 +#: ../settings-dialogs/xfwm4-settings.c:344 msgid "Theme" msgstr "Motiv" -#: ../settings-dialogs/xfwm4-settings.c:501 +#: ../settings-dialogs/xfwm4-settings.c:499 msgid "Action" msgstr "Akce" -#: ../settings-dialogs/xfwm4-settings.c:508 +#: ../settings-dialogs/xfwm4-settings.c:506 msgid "Shortcut" msgstr "Klávesová zkratka" -#: ../settings-dialogs/xfwm4-settings.c:903 +#: ../settings-dialogs/xfwm4-settings.c:900 #, c-format msgid "Failed to initialize xfconf. Reason: %s" msgstr "Inicializace aplikace xfconf se nezdařila. Důvod: %s" -#: ../settings-dialogs/xfwm4-settings.c:914 +#: ../settings-dialogs/xfwm4-settings.c:911 msgid "Could not create the settings dialog." msgstr "Nelze vytvořit dialogové okno nastavení." -#: ../settings-dialogs/xfwm4-settings.c:1915 +#: ../settings-dialogs/xfwm4-settings.c:1912 msgid "" "This will reset all shortcuts to their default values. Do you really want to" " do this?" msgstr "Touto akcí nastavíte všechny klávesové zkratky na výchozí hodnoty. Chcete pokračovat?" -#: ../settings-dialogs/xfwm4-settings.c:1917 +#: ../settings-dialogs/xfwm4-settings.c:1914 msgid "Reset to Defaults" msgstr "Obnovit výchozí" @@ -577,38 +581,42 @@ msgstr "Zobrazovat stíny pod _běžnými okny" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51 +msgid "Zoom desktop with mouse wheel" +msgstr "Zvětšovat pracovní plochu kolečkem myši" + +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:52 msgid "Zoom pointer along with the desktop" msgstr "S pracovní plochou současně zvětšit ukazatel " -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:52 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:53 msgid "Opaci_ty of window decorations:" msgstr "Průhlednost _dekorací oken" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:53 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:54 msgid "Transparent" msgstr "Průhledné" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:54 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:55 msgid "Opaque" msgstr "Neprůhledné" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:55 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:56 msgid "Opacity of _inactive windows:" msgstr "Prů_hlednost neaktivních oken" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:56 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:57 msgid "Opacity of windows during _move:" msgstr "Průhl_ednost oken při přesunu" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:57 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:58 msgid "Opacity of windows during resi_ze:" msgstr "Průh_lednost oken při změně velikosti" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:58 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:59 msgid "Opacity of popup wi_ndows:" msgstr "Průhlednost _vyskakovacích oken:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:59 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:60 msgid "C_ompositor" msgstr "_Kompozitor" @@ -648,27 +656,31 @@ msgid "Unsupported keyboard modifier '%s'" msgstr "Nepodporovaný modifikátor klávesnice „%s“" -#: ../src/main.c:722 +#: ../src/main.c:666 msgid "Set the compositor mode" msgstr "Nastavit režim kompozitoru" -#: ../src/main.c:724 +#: ../src/main.c:668 msgid "Set the vblank mode" msgstr "Nastavit režim vblank" -#: ../src/main.c:734 +#: ../src/main.c:678 msgid "Replace the existing window manager" msgstr "Nahradit stávající správce oken" -#: ../src/main.c:736 +#: ../src/main.c:680 msgid "Print version information and exit" msgstr "Zobrazí informace o verzi a ukončí se" -#: ../src/main.c:780 +#: ../src/main.c:683 +msgid "Enable debug logging" +msgstr "Povolit ladicí protokolování" + +#: ../src/main.c:723 msgid "[ARGUMENTS...]" msgstr "[PARAMETRY...]" -#: ../src/main.c:787 +#: ../src/main.c:730 #, c-format msgid "Type \"%s --help\" for usage." msgstr "Informace o použití získáte příkazem „%s --help“." diff -Nru xfwm4-4.16.0/po/el.po xfwm4-4.16.1/po/el.po --- xfwm4-4.16.0/po/el.po 2020-11-19 23:15:52.000000000 +0000 +++ xfwm4-4.16.1/po/el.po 2021-01-05 08:18:23.000000000 +0000 @@ -12,14 +12,14 @@ # Stathis Kamperis , 2006 # Stavros Giannouris , 2005 # Γιώργος Στεφανάκης , 2013 -# Πέτρος Σαμαράς , 2018 +# Πέτρος Σαμαράς , 2018,2021 msgid "" msgstr "" "Project-Id-Version: Xfwm4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-01 00:49+0100\n" -"PO-Revision-Date: 2020-10-31 23:49+0000\n" -"Last-Translator: Xfce Bot \n" +"POT-Creation-Date: 2020-12-13 00:49+0100\n" +"PO-Revision-Date: 2021-01-02 18:02+0000\n" +"Last-Translator: Πέτρος Σαμαράς \n" "Language-Team: Greek (http://www.transifex.com/xfce/xfwm4/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -41,31 +41,31 @@ msgid "None" msgstr "Κανένα" -#: ../settings-dialogs/tweaks-settings.c:477 +#: ../settings-dialogs/tweaks-settings.c:482 msgid "Session manager socket" msgstr "Υποδοχή διαχειριστή συνδέσεων" -#: ../settings-dialogs/tweaks-settings.c:477 +#: ../settings-dialogs/tweaks-settings.c:482 #: ../settings-dialogs/workspace-settings.c:398 -#: ../settings-dialogs/xfwm4-settings.c:240 +#: ../settings-dialogs/xfwm4-settings.c:238 msgid "SOCKET ID" msgstr "ΤΑΥΤΟΤΗΤΑ ΥΠΟΔΟΧΕΑ" -#: ../settings-dialogs/tweaks-settings.c:478 +#: ../settings-dialogs/tweaks-settings.c:483 #: ../settings-dialogs/workspace-settings.c:399 -#: ../settings-dialogs/xfwm4-settings.c:242 +#: ../settings-dialogs/xfwm4-settings.c:240 msgid "Version information" msgstr "Πληροφορίες έκδοσης" -#: ../settings-dialogs/tweaks-settings.c:496 +#: ../settings-dialogs/tweaks-settings.c:501 #: ../settings-dialogs/workspace-settings.c:416 -#: ../settings-dialogs/xfwm4-settings.c:874 +#: ../settings-dialogs/xfwm4-settings.c:871 msgid "." msgstr "." -#: ../settings-dialogs/tweaks-settings.c:500 +#: ../settings-dialogs/tweaks-settings.c:505 #: ../settings-dialogs/workspace-settings.c:420 -#: ../settings-dialogs/xfwm4-settings.c:878 +#: ../settings-dialogs/xfwm4-settings.c:875 #, c-format msgid "" "%s: %s\n" @@ -83,7 +83,7 @@ msgstr "Ονόμα χώρου εργασίας" #: ../settings-dialogs/workspace-settings.c:398 -#: ../settings-dialogs/xfwm4-settings.c:240 +#: ../settings-dialogs/xfwm4-settings.c:238 msgid "Settings manager socket" msgstr "Υποδοχή διαχειριστή ρυθμίσεων" @@ -108,12 +108,12 @@ #: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1 msgid "Window Manager Tweaks" -msgstr "Προσαρμογή διαχειριστή παραθύρων" +msgstr "Ειδικές ρυθμίσεις διαχειριστή παραθύρων" #: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:2 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:2 msgid "Fine-tune window behaviour and effects" -msgstr "Ρύθμιση συμπεριφοράς παραθύρων και φαινόμενων" +msgstr "Ρύθμιση συμπεριφοράς παραθύρων και οπτικών εφέ" #: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:3 msgid "" @@ -240,12 +240,12 @@ #. Raise focus delay #: ../settings-dialogs/xfwm4-dialog.glade.h:28 msgid "Short" -msgstr "Αργά" +msgstr "Μικρή" #. Raise focus delay #: ../settings-dialogs/xfwm4-dialog.glade.h:30 msgid "Long" -msgstr "Γρήγορα" +msgstr "Μεγάλη" #: ../settings-dialogs/xfwm4-dialog.glade.h:31 msgid "Focus model" @@ -352,66 +352,70 @@ msgid "Ad_vanced" msgstr "Για πρ_οχωρημένους" -#: ../settings-dialogs/xfwm4-settings.c:219 +#: ../settings-dialogs/xfwm4-settings.c:216 msgid "Shade window" msgstr "Σκίαση παραθύρου" -#: ../settings-dialogs/xfwm4-settings.c:220 +#: ../settings-dialogs/xfwm4-settings.c:217 msgid "Hide window" msgstr "Απόκρυψη παραθύρου" -#: ../settings-dialogs/xfwm4-settings.c:221 +#: ../settings-dialogs/xfwm4-settings.c:218 msgid "Maximize window" msgstr "Μεγιστοποίηση παραθύρου" -#: ../settings-dialogs/xfwm4-settings.c:222 +#: ../settings-dialogs/xfwm4-settings.c:219 msgid "Fill window" msgstr "Μεγιστοποίηση παραθύρου" -#: ../settings-dialogs/xfwm4-settings.c:223 +#: ../settings-dialogs/xfwm4-settings.c:220 +msgid "Always on top" +msgstr "Μόνιμα πάνω από όλα" + +#: ../settings-dialogs/xfwm4-settings.c:221 msgid "Nothing" msgstr "Τίποτα" -#: ../settings-dialogs/xfwm4-settings.c:228 +#: ../settings-dialogs/xfwm4-settings.c:226 msgid "Left" msgstr "Αριστερά" -#: ../settings-dialogs/xfwm4-settings.c:229 +#: ../settings-dialogs/xfwm4-settings.c:227 msgid "Center" msgstr "Κέντρο" -#: ../settings-dialogs/xfwm4-settings.c:230 +#: ../settings-dialogs/xfwm4-settings.c:228 msgid "Right" msgstr "Δεξιά" -#: ../settings-dialogs/xfwm4-settings.c:346 +#: ../settings-dialogs/xfwm4-settings.c:344 msgid "Theme" msgstr "Θέμα" -#: ../settings-dialogs/xfwm4-settings.c:501 +#: ../settings-dialogs/xfwm4-settings.c:499 msgid "Action" msgstr "Ενέργεια" -#: ../settings-dialogs/xfwm4-settings.c:508 +#: ../settings-dialogs/xfwm4-settings.c:506 msgid "Shortcut" msgstr "Συντόμευση" -#: ../settings-dialogs/xfwm4-settings.c:903 +#: ../settings-dialogs/xfwm4-settings.c:900 #, c-format msgid "Failed to initialize xfconf. Reason: %s" -msgstr "Αποτυχία της αρχικοποίησης του xfconf. Ο λόγος: %s" +msgstr "Αποτυχία αρχικοποίησης του xfconf. Αίτιο: %s" -#: ../settings-dialogs/xfwm4-settings.c:914 +#: ../settings-dialogs/xfwm4-settings.c:911 msgid "Could not create the settings dialog." msgstr "Δεν ήταν δυνατή η δημιουργία του διαλόγου ρυθμίσεων." -#: ../settings-dialogs/xfwm4-settings.c:1915 +#: ../settings-dialogs/xfwm4-settings.c:1912 msgid "" "This will reset all shortcuts to their default values. Do you really want to" " do this?" msgstr "Αυτό θα επαναφέρει όλες τις συντομεύσεις στις προκαθορισμένες τιμές. Είστε σίγουροι ότι θέλετε αυτό;" -#: ../settings-dialogs/xfwm4-settings.c:1917 +#: ../settings-dialogs/xfwm4-settings.c:1914 msgid "Reset to Defaults" msgstr "Επαναφορά στις προκαθορισμένες" @@ -581,38 +585,42 @@ msgstr "Εμφάνιση σκιών στα κ_ανονικά παράθυρα" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51 -msgid "Zoom pointer along with the desktop" -msgstr "" +msgid "Zoom desktop with mouse wheel" +msgstr "Μεγέθυνση περιβάλλοντος με τη ροδέλα του ποντικιού" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:52 +msgid "Zoom pointer along with the desktop" +msgstr "Μεγέθυνση δείκτη ποντικιού μαζί με το περιβάλλον" + +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:53 msgid "Opaci_ty of window decorations:" msgstr "Δ_ιαφάνεια περιγραμμάτων παραθύρων:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:53 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:54 msgid "Transparent" msgstr "Διαφανές" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:54 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:55 msgid "Opaque" msgstr "Αδιαφανές" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:55 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:56 msgid "Opacity of _inactive windows:" msgstr "Διαφάνεια αν_ενεργών παραθύρων:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:56 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:57 msgid "Opacity of windows during _move:" msgstr "Διαφάνεια παραθύρων κατά τη μ_ετακίνηση:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:57 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:58 msgid "Opacity of windows during resi_ze:" msgstr "Διαφάνεια παραθύρων κατά τη αλλαγή μεγ_έθους:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:58 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:59 msgid "Opacity of popup wi_ndows:" msgstr "Διαφάνεια αναδυόμενων π_αραθύρων:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:59 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:60 msgid "C_ompositor" msgstr "Στ_οιχειοθέτης" @@ -652,27 +660,31 @@ msgid "Unsupported keyboard modifier '%s'" msgstr "Μη υποστηριζόμενος τροποποιητής πληκτρολογίου '%s'" -#: ../src/main.c:722 +#: ../src/main.c:666 msgid "Set the compositor mode" msgstr "Ρύθμιση της λειτουργίας σύνθεσης" -#: ../src/main.c:724 +#: ../src/main.c:668 msgid "Set the vblank mode" msgstr "Ορισμός vblank mode" -#: ../src/main.c:734 +#: ../src/main.c:678 msgid "Replace the existing window manager" msgstr "Αντικατάσταση του τρέχοντος διαχειριστή παραθύρων" -#: ../src/main.c:736 +#: ../src/main.c:680 msgid "Print version information and exit" msgstr "Εμφάνιση πληροφοριών έκδοσης και έξοδος" -#: ../src/main.c:780 +#: ../src/main.c:683 +msgid "Enable debug logging" +msgstr "Ενεργοποίηση καταγραφής αποσφαλμάτωσης" + +#: ../src/main.c:723 msgid "[ARGUMENTS...]" msgstr "[ΟΡΙΣΜΑΤΑ...]" -#: ../src/main.c:787 +#: ../src/main.c:730 #, c-format msgid "Type \"%s --help\" for usage." msgstr "Πληκτρολογήστε \"% s - help \" για χρήση." diff -Nru xfwm4-4.16.0/po/et.po xfwm4-4.16.1/po/et.po --- xfwm4-4.16.0/po/et.po 2020-11-19 23:15:52.000000000 +0000 +++ xfwm4-4.16.1/po/et.po 2021-01-05 08:18:23.000000000 +0000 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Xfwm4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-01 00:49+0100\n" -"PO-Revision-Date: 2020-11-04 20:45+0000\n" +"POT-Creation-Date: 2020-12-13 00:49+0100\n" +"PO-Revision-Date: 2020-12-30 16:34+0000\n" "Last-Translator: Priit Jõerüüt \n" "Language-Team: Estonian (http://www.transifex.com/xfce/xfwm4/language/et/)\n" "MIME-Version: 1.0\n" @@ -34,31 +34,31 @@ msgid "None" msgstr "Tühjus" -#: ../settings-dialogs/tweaks-settings.c:477 +#: ../settings-dialogs/tweaks-settings.c:482 msgid "Session manager socket" msgstr "Sessioonihalduri sokkel" -#: ../settings-dialogs/tweaks-settings.c:477 +#: ../settings-dialogs/tweaks-settings.c:482 #: ../settings-dialogs/workspace-settings.c:398 -#: ../settings-dialogs/xfwm4-settings.c:240 +#: ../settings-dialogs/xfwm4-settings.c:238 msgid "SOCKET ID" msgstr "SOKLI ID" -#: ../settings-dialogs/tweaks-settings.c:478 +#: ../settings-dialogs/tweaks-settings.c:483 #: ../settings-dialogs/workspace-settings.c:399 -#: ../settings-dialogs/xfwm4-settings.c:242 +#: ../settings-dialogs/xfwm4-settings.c:240 msgid "Version information" msgstr "Versiooniteave" -#: ../settings-dialogs/tweaks-settings.c:496 +#: ../settings-dialogs/tweaks-settings.c:501 #: ../settings-dialogs/workspace-settings.c:416 -#: ../settings-dialogs/xfwm4-settings.c:874 +#: ../settings-dialogs/xfwm4-settings.c:871 msgid "." msgstr "." -#: ../settings-dialogs/tweaks-settings.c:500 +#: ../settings-dialogs/tweaks-settings.c:505 #: ../settings-dialogs/workspace-settings.c:420 -#: ../settings-dialogs/xfwm4-settings.c:878 +#: ../settings-dialogs/xfwm4-settings.c:875 #, c-format msgid "" "%s: %s\n" @@ -76,7 +76,7 @@ msgstr "Tööruumi nimi" #: ../settings-dialogs/workspace-settings.c:398 -#: ../settings-dialogs/xfwm4-settings.c:240 +#: ../settings-dialogs/xfwm4-settings.c:238 msgid "Settings manager socket" msgstr "Seadistuste halduri sokkel" @@ -345,66 +345,70 @@ msgid "Ad_vanced" msgstr "Lis_aseadistused" -#: ../settings-dialogs/xfwm4-settings.c:219 +#: ../settings-dialogs/xfwm4-settings.c:216 msgid "Shade window" msgstr "Varja aken" -#: ../settings-dialogs/xfwm4-settings.c:220 +#: ../settings-dialogs/xfwm4-settings.c:217 msgid "Hide window" msgstr "Peida aken" -#: ../settings-dialogs/xfwm4-settings.c:221 +#: ../settings-dialogs/xfwm4-settings.c:218 msgid "Maximize window" msgstr "Maksimeeri aken" -#: ../settings-dialogs/xfwm4-settings.c:222 +#: ../settings-dialogs/xfwm4-settings.c:219 msgid "Fill window" msgstr "Sobita aken" -#: ../settings-dialogs/xfwm4-settings.c:223 +#: ../settings-dialogs/xfwm4-settings.c:220 +msgid "Always on top" +msgstr "Alati kõige pealmine" + +#: ../settings-dialogs/xfwm4-settings.c:221 msgid "Nothing" msgstr "Ei midagi" -#: ../settings-dialogs/xfwm4-settings.c:228 +#: ../settings-dialogs/xfwm4-settings.c:226 msgid "Left" msgstr "Vasakul" -#: ../settings-dialogs/xfwm4-settings.c:229 +#: ../settings-dialogs/xfwm4-settings.c:227 msgid "Center" msgstr "Keskel" -#: ../settings-dialogs/xfwm4-settings.c:230 +#: ../settings-dialogs/xfwm4-settings.c:228 msgid "Right" msgstr "Paremal" -#: ../settings-dialogs/xfwm4-settings.c:346 +#: ../settings-dialogs/xfwm4-settings.c:344 msgid "Theme" msgstr "Teema" -#: ../settings-dialogs/xfwm4-settings.c:501 +#: ../settings-dialogs/xfwm4-settings.c:499 msgid "Action" msgstr "Tegevus" -#: ../settings-dialogs/xfwm4-settings.c:508 +#: ../settings-dialogs/xfwm4-settings.c:506 msgid "Shortcut" msgstr "Kiirklahv" -#: ../settings-dialogs/xfwm4-settings.c:903 +#: ../settings-dialogs/xfwm4-settings.c:900 #, c-format msgid "Failed to initialize xfconf. Reason: %s" msgstr "Xfconf'i initsialiseerimine ebaõnnestus. Põhjus: %s" -#: ../settings-dialogs/xfwm4-settings.c:914 +#: ../settings-dialogs/xfwm4-settings.c:911 msgid "Could not create the settings dialog." msgstr "Seadistuste dialoogi loomine ei õnnestunud." -#: ../settings-dialogs/xfwm4-settings.c:1915 +#: ../settings-dialogs/xfwm4-settings.c:1912 msgid "" "This will reset all shortcuts to their default values. Do you really want to" " do this?" msgstr "See lähtestab kõik sinu poolt seadistatud otseteed vaikimisi väärtusteks. Kas sa kindlasti soovid seda teha?" -#: ../settings-dialogs/xfwm4-settings.c:1917 +#: ../settings-dialogs/xfwm4-settings.c:1914 msgid "Reset to Defaults" msgstr "Lähtesta vaikeseadetele" @@ -440,7 +444,7 @@ #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:13 msgid "Activate foc_us stealing prevention" -msgstr "" +msgstr "Võta kasutusele fook_use röövimise vältimine" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:14 msgid "Honor _standard ICCCM focus hint" @@ -480,7 +484,7 @@ #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24 msgid "Automatically _tile windows when moving toward the screen edge" -msgstr "" +msgstr "Paani aknad au_tomaatselt, kui liigutad nad ekraani serva" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:25 msgid "Use _edge resistance instead of window snapping" @@ -504,7 +508,7 @@ #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:30 msgid "Use the _mouse wheel on the desktop to switch workspaces" -msgstr "" +msgstr "Tööalade vahetamiseks kasuta töölaual hiireratast" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:31 msgid "" @@ -551,7 +555,7 @@ #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:45 msgid "_Enable display compositing" -msgstr "" +msgstr "_Lülita komposiitor sisse" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:46 msgid "Display _fullscreen overlay windows directly" @@ -567,47 +571,51 @@ #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:49 msgid "Show shadows under _dock windows" -msgstr "" +msgstr "Näita varju _dokitud akende taga" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:50 msgid "Show shadows under _regular windows" msgstr "Näita varje tavaliste akende taga" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51 -msgid "Zoom pointer along with the desktop" +msgid "Zoom desktop with mouse wheel" msgstr "" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:52 +msgid "Zoom pointer along with the desktop" +msgstr "" + +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:53 msgid "Opaci_ty of window decorations:" msgstr "Aknakaunistuste läbipais_tmatus:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:53 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:54 msgid "Transparent" msgstr "Läbipaistev" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:54 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:55 msgid "Opaque" msgstr "Läbipaistmatu" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:55 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:56 msgid "Opacity of _inactive windows:" msgstr "Mitteakt_iivsete akende läbipaistmatus:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:56 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:57 msgid "Opacity of windows during _move:" msgstr "Akende läbipaistmatus liiguta_mise ajal:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:57 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:58 msgid "Opacity of windows during resi_ze:" msgstr "Akende läbipaistmatus _suuruse muutmisel:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:58 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:59 msgid "Opacity of popup wi_ndows:" msgstr "Hüpikake_nde läbipaistmatus" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:59 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:60 msgid "C_ompositor" -msgstr "" +msgstr "K_omposiitor" #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:3 msgid "_Number of workspaces:" @@ -643,29 +651,33 @@ #: ../src/keyboard.c:144 ../src/settings.c:160 #, c-format msgid "Unsupported keyboard modifier '%s'" -msgstr "" +msgstr "Klaviatuuri muuteklahv „%s“ ei ole toetatud" -#: ../src/main.c:722 +#: ../src/main.c:666 msgid "Set the compositor mode" -msgstr "" +msgstr "Vali komposiitori režiim" -#: ../src/main.c:724 +#: ../src/main.c:668 msgid "Set the vblank mode" msgstr "" -#: ../src/main.c:734 +#: ../src/main.c:678 msgid "Replace the existing window manager" msgstr "Asenda olemasolev aknahaldur" -#: ../src/main.c:736 +#: ../src/main.c:680 msgid "Print version information and exit" msgstr "Versiooniteabe trükkimine ja väljumine" -#: ../src/main.c:780 +#: ../src/main.c:683 +msgid "Enable debug logging" +msgstr "Luba silumisteadete logimine" + +#: ../src/main.c:723 msgid "[ARGUMENTS...]" msgstr "[ARGUMENDID...]" -#: ../src/main.c:787 +#: ../src/main.c:730 #, c-format msgid "Type \"%s --help\" for usage." msgstr "Trüki „%s --help” kasutusjuhisteks." diff -Nru xfwm4-4.16.0/po/eu.po xfwm4-4.16.1/po/eu.po --- xfwm4-4.16.0/po/eu.po 2020-11-19 23:15:52.000000000 +0000 +++ xfwm4-4.16.1/po/eu.po 2021-01-05 08:18:23.000000000 +0000 @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# beriain, 2020 # Piarres Beobide , 2004,2006-2008 # Piarres Beobide , 2013 # Piarres Beobide , 2009 @@ -10,9 +11,9 @@ msgstr "" "Project-Id-Version: Xfwm4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-01 00:49+0100\n" -"PO-Revision-Date: 2020-10-31 23:49+0000\n" -"Last-Translator: Xfce Bot \n" +"POT-Creation-Date: 2020-12-13 00:49+0100\n" +"PO-Revision-Date: 2020-12-28 10:45+0000\n" +"Last-Translator: beriain\n" "Language-Team: Basque (http://www.transifex.com/xfce/xfwm4/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,31 +35,31 @@ msgid "None" msgstr "Batez" -#: ../settings-dialogs/tweaks-settings.c:477 +#: ../settings-dialogs/tweaks-settings.c:482 msgid "Session manager socket" msgstr "Saio kudeatzaile socketa" -#: ../settings-dialogs/tweaks-settings.c:477 +#: ../settings-dialogs/tweaks-settings.c:482 #: ../settings-dialogs/workspace-settings.c:398 -#: ../settings-dialogs/xfwm4-settings.c:240 +#: ../settings-dialogs/xfwm4-settings.c:238 msgid "SOCKET ID" msgstr "SOCKET IDa" -#: ../settings-dialogs/tweaks-settings.c:478 +#: ../settings-dialogs/tweaks-settings.c:483 #: ../settings-dialogs/workspace-settings.c:399 -#: ../settings-dialogs/xfwm4-settings.c:242 +#: ../settings-dialogs/xfwm4-settings.c:240 msgid "Version information" msgstr "Bertsio argibideak" -#: ../settings-dialogs/tweaks-settings.c:496 +#: ../settings-dialogs/tweaks-settings.c:501 #: ../settings-dialogs/workspace-settings.c:416 -#: ../settings-dialogs/xfwm4-settings.c:874 +#: ../settings-dialogs/xfwm4-settings.c:871 msgid "." msgstr "." -#: ../settings-dialogs/tweaks-settings.c:500 +#: ../settings-dialogs/tweaks-settings.c:505 #: ../settings-dialogs/workspace-settings.c:420 -#: ../settings-dialogs/xfwm4-settings.c:878 +#: ../settings-dialogs/xfwm4-settings.c:875 #, c-format msgid "" "%s: %s\n" @@ -76,7 +77,7 @@ msgstr "Idazmahai Izena" #: ../settings-dialogs/workspace-settings.c:398 -#: ../settings-dialogs/xfwm4-settings.c:240 +#: ../settings-dialogs/xfwm4-settings.c:238 msgid "Settings manager socket" msgstr "Ezarpena kudeatzaile socketa" @@ -96,7 +97,7 @@ "bar;font;buttons;menu;minimize;maximize;shade;roll up;layout;keyboard " "shortcuts;focus;snapping;screen;workspaces;edges;corner;hide " "content;move;resize;moving;resizing;double click;" -msgstr "" +msgstr "leihoen;kudeaketa;ezarpenak;hobespenak;itxurak;estiloak;apainketak;izenburu barra;letra;botoiak;menua;minimizatu;maximizatu;itzala;bildu;diseinua;teklatuaren laster-markak;fokua;snapping;pantaila;idazmahaiak;ertzak;izkina;edukia ezkutatu;mugitu;tamaina aldatu;mugitzen;tamaina mugitzen;klik bikoitza;" #: ../settings-dialogs/xfce-wmtweaks-settings.desktop.in.h:1 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:1 @@ -345,66 +346,70 @@ msgid "Ad_vanced" msgstr "Au_rreratua" -#: ../settings-dialogs/xfwm4-settings.c:219 +#: ../settings-dialogs/xfwm4-settings.c:216 msgid "Shade window" msgstr "Bildu leihoa" -#: ../settings-dialogs/xfwm4-settings.c:220 +#: ../settings-dialogs/xfwm4-settings.c:217 msgid "Hide window" msgstr "Ezkutatu leihoa" -#: ../settings-dialogs/xfwm4-settings.c:221 +#: ../settings-dialogs/xfwm4-settings.c:218 msgid "Maximize window" msgstr "Handitu leihoa" -#: ../settings-dialogs/xfwm4-settings.c:222 +#: ../settings-dialogs/xfwm4-settings.c:219 msgid "Fill window" msgstr "Bete leihoa" -#: ../settings-dialogs/xfwm4-settings.c:223 +#: ../settings-dialogs/xfwm4-settings.c:220 +msgid "Always on top" +msgstr "Beti goian" + +#: ../settings-dialogs/xfwm4-settings.c:221 msgid "Nothing" msgstr "Ezer ez" -#: ../settings-dialogs/xfwm4-settings.c:228 +#: ../settings-dialogs/xfwm4-settings.c:226 msgid "Left" msgstr "Ezkerra" -#: ../settings-dialogs/xfwm4-settings.c:229 +#: ../settings-dialogs/xfwm4-settings.c:227 msgid "Center" msgstr "Zentratua" -#: ../settings-dialogs/xfwm4-settings.c:230 +#: ../settings-dialogs/xfwm4-settings.c:228 msgid "Right" msgstr "Eskuina" -#: ../settings-dialogs/xfwm4-settings.c:346 +#: ../settings-dialogs/xfwm4-settings.c:344 msgid "Theme" msgstr "Gaia" -#: ../settings-dialogs/xfwm4-settings.c:501 +#: ../settings-dialogs/xfwm4-settings.c:499 msgid "Action" msgstr "Ekintza" -#: ../settings-dialogs/xfwm4-settings.c:508 +#: ../settings-dialogs/xfwm4-settings.c:506 msgid "Shortcut" msgstr "Laster-tekla" -#: ../settings-dialogs/xfwm4-settings.c:903 +#: ../settings-dialogs/xfwm4-settings.c:900 #, c-format msgid "Failed to initialize xfconf. Reason: %s" msgstr "Huts xfconf abiaraztean. Arrazoia: %s" -#: ../settings-dialogs/xfwm4-settings.c:914 +#: ../settings-dialogs/xfwm4-settings.c:911 msgid "Could not create the settings dialog." msgstr "Ezin da ezapen elkarrizketa sortu." -#: ../settings-dialogs/xfwm4-settings.c:1915 +#: ../settings-dialogs/xfwm4-settings.c:1912 msgid "" "This will reset all shortcuts to their default values. Do you really want to" " do this?" msgstr "Honek laster-tekla guztiak lehenetsitako balioetara ezarriko ditu. Ziur hau egin nahi duzula?" -#: ../settings-dialogs/xfwm4-settings.c:1917 +#: ../settings-dialogs/xfwm4-settings.c:1914 msgid "Reset to Defaults" msgstr "Be_rrezarri lehenespenetara" @@ -476,7 +481,7 @@ #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:23 msgid "Hide title of windows when maximized" -msgstr "" +msgstr "Leihoaren izenburua ezkutatu maximizatuta dagoenean" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:24 msgid "Automatically _tile windows when moving toward the screen edge" @@ -574,38 +579,42 @@ msgstr "Itzalak bistarazi leiho _arrunten azpian" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51 -msgid "Zoom pointer along with the desktop" +msgid "Zoom desktop with mouse wheel" msgstr "" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:52 +msgid "Zoom pointer along with the desktop" +msgstr "" + +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:53 msgid "Opaci_ty of window decorations:" msgstr "Leiho dekorazioaren opako_tasuna" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:53 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:54 msgid "Transparent" msgstr "Gardena" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:54 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:55 msgid "Opaque" msgstr "Opakoa" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:55 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:56 msgid "Opacity of _inactive windows:" msgstr "Leiho _inaktiboen opakotasuna" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:56 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:57 msgid "Opacity of windows during _move:" msgstr "_Mugitzerakoan leihoaren opakotasuna" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:57 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:58 msgid "Opacity of windows during resi_ze:" msgstr "Tamaina_z aldatzean leihoaren opakotasuna" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:58 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:59 msgid "Opacity of popup wi_ndows:" msgstr "Popup leihoen opakota_suna:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:59 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:60 msgid "C_ompositor" msgstr "S_ortzailea" @@ -645,27 +654,31 @@ msgid "Unsupported keyboard modifier '%s'" msgstr "" -#: ../src/main.c:722 +#: ../src/main.c:666 msgid "Set the compositor mode" msgstr "Ezarri konposizio modua" -#: ../src/main.c:724 +#: ../src/main.c:668 msgid "Set the vblank mode" msgstr "" -#: ../src/main.c:734 +#: ../src/main.c:678 msgid "Replace the existing window manager" msgstr "Ordeztu dagoen leiho kudeatzailea" -#: ../src/main.c:736 +#: ../src/main.c:680 msgid "Print version information and exit" msgstr "Bertsio argibideak inprimatu eta irten" -#: ../src/main.c:780 +#: ../src/main.c:683 +msgid "Enable debug logging" +msgstr "" + +#: ../src/main.c:723 msgid "[ARGUMENTS...]" msgstr "[ARGUMENTUAK...]" -#: ../src/main.c:787 +#: ../src/main.c:730 #, c-format msgid "Type \"%s --help\" for usage." msgstr "Idatzi \"%s --help\" erabilerarako." diff -Nru xfwm4-4.16.0/po/fi.po xfwm4-4.16.1/po/fi.po --- xfwm4-4.16.0/po/fi.po 2020-11-19 23:15:52.000000000 +0000 +++ xfwm4-4.16.1/po/fi.po 2021-01-05 08:18:23.000000000 +0000 @@ -4,7 +4,7 @@ # # Translators: # Ammuu5, 2019 -# Jiri Grönroos , 2013,2018-2019 +# Jiri Grönroos , 2013,2018-2019,2021 # Juhani Numminen , 2013 # Lasse Liehu , 2015 # Pasi Lallinaho , 2014-2015,2017 @@ -13,9 +13,9 @@ msgstr "" "Project-Id-Version: Xfwm4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-01 00:49+0100\n" -"PO-Revision-Date: 2020-10-31 23:49+0000\n" -"Last-Translator: Xfce Bot \n" +"POT-Creation-Date: 2020-12-13 00:49+0100\n" +"PO-Revision-Date: 2021-01-01 10:45+0000\n" +"Last-Translator: Jiri Grönroos \n" "Language-Team: Finnish (http://www.transifex.com/xfce/xfwm4/language/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,31 +37,31 @@ msgid "None" msgstr "Ei mitään" -#: ../settings-dialogs/tweaks-settings.c:477 +#: ../settings-dialogs/tweaks-settings.c:482 msgid "Session manager socket" msgstr "Istunnonhallinnan pistoke" -#: ../settings-dialogs/tweaks-settings.c:477 +#: ../settings-dialogs/tweaks-settings.c:482 #: ../settings-dialogs/workspace-settings.c:398 -#: ../settings-dialogs/xfwm4-settings.c:240 +#: ../settings-dialogs/xfwm4-settings.c:238 msgid "SOCKET ID" msgstr "PISTOKE" -#: ../settings-dialogs/tweaks-settings.c:478 +#: ../settings-dialogs/tweaks-settings.c:483 #: ../settings-dialogs/workspace-settings.c:399 -#: ../settings-dialogs/xfwm4-settings.c:242 +#: ../settings-dialogs/xfwm4-settings.c:240 msgid "Version information" msgstr "Versiotiedot" -#: ../settings-dialogs/tweaks-settings.c:496 +#: ../settings-dialogs/tweaks-settings.c:501 #: ../settings-dialogs/workspace-settings.c:416 -#: ../settings-dialogs/xfwm4-settings.c:874 +#: ../settings-dialogs/xfwm4-settings.c:871 msgid "." msgstr "." -#: ../settings-dialogs/tweaks-settings.c:500 +#: ../settings-dialogs/tweaks-settings.c:505 #: ../settings-dialogs/workspace-settings.c:420 -#: ../settings-dialogs/xfwm4-settings.c:878 +#: ../settings-dialogs/xfwm4-settings.c:875 #, c-format msgid "" "%s: %s\n" @@ -79,7 +79,7 @@ msgstr "Työtilan nimi" #: ../settings-dialogs/workspace-settings.c:398 -#: ../settings-dialogs/xfwm4-settings.c:240 +#: ../settings-dialogs/xfwm4-settings.c:238 msgid "Settings manager socket" msgstr "Asetustenhallinnan pistoke" @@ -348,66 +348,70 @@ msgid "Ad_vanced" msgstr "_Lisäasetukset" -#: ../settings-dialogs/xfwm4-settings.c:219 +#: ../settings-dialogs/xfwm4-settings.c:216 msgid "Shade window" msgstr "Varjosta ikkuna" -#: ../settings-dialogs/xfwm4-settings.c:220 +#: ../settings-dialogs/xfwm4-settings.c:217 msgid "Hide window" msgstr "Piilota ikkuna" -#: ../settings-dialogs/xfwm4-settings.c:221 +#: ../settings-dialogs/xfwm4-settings.c:218 msgid "Maximize window" msgstr "Suurenna ikkuna" -#: ../settings-dialogs/xfwm4-settings.c:222 +#: ../settings-dialogs/xfwm4-settings.c:219 msgid "Fill window" msgstr "Sovita ikkuna" -#: ../settings-dialogs/xfwm4-settings.c:223 +#: ../settings-dialogs/xfwm4-settings.c:220 +msgid "Always on top" +msgstr "Aina päällimmäisenä" + +#: ../settings-dialogs/xfwm4-settings.c:221 msgid "Nothing" msgstr "Ei mitään" -#: ../settings-dialogs/xfwm4-settings.c:228 +#: ../settings-dialogs/xfwm4-settings.c:226 msgid "Left" msgstr "Vasemmalle" -#: ../settings-dialogs/xfwm4-settings.c:229 +#: ../settings-dialogs/xfwm4-settings.c:227 msgid "Center" msgstr "Keskelle" -#: ../settings-dialogs/xfwm4-settings.c:230 +#: ../settings-dialogs/xfwm4-settings.c:228 msgid "Right" msgstr "Oikealle" -#: ../settings-dialogs/xfwm4-settings.c:346 +#: ../settings-dialogs/xfwm4-settings.c:344 msgid "Theme" msgstr "Teema" -#: ../settings-dialogs/xfwm4-settings.c:501 +#: ../settings-dialogs/xfwm4-settings.c:499 msgid "Action" msgstr "Toiminto" -#: ../settings-dialogs/xfwm4-settings.c:508 +#: ../settings-dialogs/xfwm4-settings.c:506 msgid "Shortcut" msgstr "Pikanäppäin" -#: ../settings-dialogs/xfwm4-settings.c:903 +#: ../settings-dialogs/xfwm4-settings.c:900 #, c-format msgid "Failed to initialize xfconf. Reason: %s" msgstr "Virhe alustaessa xfconfia: %s" -#: ../settings-dialogs/xfwm4-settings.c:914 +#: ../settings-dialogs/xfwm4-settings.c:911 msgid "Could not create the settings dialog." msgstr "Asetusdialogin luominen epäonnistui." -#: ../settings-dialogs/xfwm4-settings.c:1915 +#: ../settings-dialogs/xfwm4-settings.c:1912 msgid "" "This will reset all shortcuts to their default values. Do you really want to" " do this?" msgstr "Tämä palauttaa kaikki pikanäppäimet oletusarvoihinsa. Haluatko varmasti tehdä tämän?" -#: ../settings-dialogs/xfwm4-settings.c:1917 +#: ../settings-dialogs/xfwm4-settings.c:1914 msgid "Reset to Defaults" msgstr "Palauta oletukset" @@ -577,38 +581,42 @@ msgstr "Näytä varjot ta_vallisten ikkunoiden alla" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51 -msgid "Zoom pointer along with the desktop" -msgstr "" +msgid "Zoom desktop with mouse wheel" +msgstr "Zoomaa työpöytää hiiren rullalla" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:52 +msgid "Zoom pointer along with the desktop" +msgstr "Zoomaa osoitinta työpöydän lisäksi" + +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:53 msgid "Opaci_ty of window decorations:" msgstr "Ikkunoiden kehys_ten läpinäkyvyys:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:53 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:54 msgid "Transparent" msgstr "Läpinäkyvä" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:54 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:55 msgid "Opaque" msgstr "Läpinäkymätön" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:55 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:56 msgid "Opacity of _inactive windows:" msgstr "Epäaktii_visten ikkunoiden läpinäkyvyys:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:56 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:57 msgid "Opacity of windows during _move:" msgstr "Ikkunoiden läpinäkyvyys sii_rrettäessä:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:57 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:58 msgid "Opacity of windows during resi_ze:" msgstr "Ikkunoiden läpinäkyvyys kokoa m_uutettaessa:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:58 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:59 msgid "Opacity of popup wi_ndows:" msgstr "P_onnahdusikkunoiden läpinäkyvyys:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:59 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:60 msgid "C_ompositor" msgstr "K_omposoija" @@ -648,27 +656,31 @@ msgid "Unsupported keyboard modifier '%s'" msgstr "Näppäimistön muunnin '%s' ei ole tuettu" -#: ../src/main.c:722 +#: ../src/main.c:666 msgid "Set the compositor mode" msgstr "Aseta komposointitila" -#: ../src/main.c:724 +#: ../src/main.c:668 msgid "Set the vblank mode" msgstr "Aseta vblank-tila" -#: ../src/main.c:734 +#: ../src/main.c:678 msgid "Replace the existing window manager" msgstr "Korvaa nykyinen ikkunointiohjelma" -#: ../src/main.c:736 +#: ../src/main.c:680 msgid "Print version information and exit" msgstr "Tulosta versiotiedot ja poistu" -#: ../src/main.c:780 +#: ../src/main.c:683 +msgid "Enable debug logging" +msgstr "" + +#: ../src/main.c:723 msgid "[ARGUMENTS...]" msgstr "[VALITSIMET...]" -#: ../src/main.c:787 +#: ../src/main.c:730 #, c-format msgid "Type \"%s --help\" for usage." msgstr "Saat käyttöohjeita komennolla \"%s --help\"." diff -Nru xfwm4-4.16.0/po/he.po xfwm4-4.16.1/po/he.po --- xfwm4-4.16.0/po/he.po 2020-12-02 08:48:32.000000000 +0000 +++ xfwm4-4.16.1/po/he.po 2021-01-05 08:18:23.000000000 +0000 @@ -8,14 +8,14 @@ # Elishai Eliyahu , 2020 # GenghisKhan , 2014-2016 # Jonatan Perry , 2004 -# Omeritzics Games , 2020 +# Omer I.S. , 2020 # Yuval Tanny , 2004,2006 msgid "" msgstr "" "Project-Id-Version: Xfwm4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-22 00:48+0100\n" -"PO-Revision-Date: 2020-11-28 18:09+0000\n" +"POT-Creation-Date: 2020-12-13 00:49+0100\n" +"PO-Revision-Date: 2020-12-26 12:34+0000\n" "Last-Translator: Elishai Eliyahu \n" "Language-Team: Hebrew (http://www.transifex.com/xfce/xfwm4/language/he/)\n" "MIME-Version: 1.0\n" @@ -44,25 +44,25 @@ #: ../settings-dialogs/tweaks-settings.c:482 #: ../settings-dialogs/workspace-settings.c:398 -#: ../settings-dialogs/xfwm4-settings.c:240 +#: ../settings-dialogs/xfwm4-settings.c:238 msgid "SOCKET ID" msgstr "זהות שקע" #: ../settings-dialogs/tweaks-settings.c:483 #: ../settings-dialogs/workspace-settings.c:399 -#: ../settings-dialogs/xfwm4-settings.c:242 +#: ../settings-dialogs/xfwm4-settings.c:240 msgid "Version information" msgstr "מידע גרסה" #: ../settings-dialogs/tweaks-settings.c:501 #: ../settings-dialogs/workspace-settings.c:416 -#: ../settings-dialogs/xfwm4-settings.c:874 +#: ../settings-dialogs/xfwm4-settings.c:871 msgid "." msgstr "." #: ../settings-dialogs/tweaks-settings.c:505 #: ../settings-dialogs/workspace-settings.c:420 -#: ../settings-dialogs/xfwm4-settings.c:878 +#: ../settings-dialogs/xfwm4-settings.c:875 #, c-format msgid "" "%s: %s\n" @@ -80,7 +80,7 @@ msgstr "שם משטח עבודה" #: ../settings-dialogs/workspace-settings.c:398 -#: ../settings-dialogs/xfwm4-settings.c:240 +#: ../settings-dialogs/xfwm4-settings.c:238 msgid "Settings manager socket" msgstr "שקע מנהל הגדרות" @@ -349,66 +349,70 @@ msgid "Ad_vanced" msgstr "מ_תקדם" -#: ../settings-dialogs/xfwm4-settings.c:219 +#: ../settings-dialogs/xfwm4-settings.c:216 msgid "Shade window" msgstr "גלול חלון" -#: ../settings-dialogs/xfwm4-settings.c:220 +#: ../settings-dialogs/xfwm4-settings.c:217 msgid "Hide window" msgstr "הסתר חלון" -#: ../settings-dialogs/xfwm4-settings.c:221 +#: ../settings-dialogs/xfwm4-settings.c:218 msgid "Maximize window" msgstr "הגדל חלון" -#: ../settings-dialogs/xfwm4-settings.c:222 +#: ../settings-dialogs/xfwm4-settings.c:219 msgid "Fill window" msgstr "מלא חלון" -#: ../settings-dialogs/xfwm4-settings.c:223 +#: ../settings-dialogs/xfwm4-settings.c:220 +msgid "Always on top" +msgstr "תמיד למעלה" + +#: ../settings-dialogs/xfwm4-settings.c:221 msgid "Nothing" msgstr "כלום" -#: ../settings-dialogs/xfwm4-settings.c:228 +#: ../settings-dialogs/xfwm4-settings.c:226 msgid "Left" msgstr "שמאל" -#: ../settings-dialogs/xfwm4-settings.c:229 +#: ../settings-dialogs/xfwm4-settings.c:227 msgid "Center" msgstr "מרכז" -#: ../settings-dialogs/xfwm4-settings.c:230 +#: ../settings-dialogs/xfwm4-settings.c:228 msgid "Right" msgstr "ימין" -#: ../settings-dialogs/xfwm4-settings.c:346 +#: ../settings-dialogs/xfwm4-settings.c:344 msgid "Theme" msgstr "ערכת נושא" -#: ../settings-dialogs/xfwm4-settings.c:501 +#: ../settings-dialogs/xfwm4-settings.c:499 msgid "Action" msgstr "פעולה" -#: ../settings-dialogs/xfwm4-settings.c:508 +#: ../settings-dialogs/xfwm4-settings.c:506 msgid "Shortcut" msgstr "קיצור דרך" -#: ../settings-dialogs/xfwm4-settings.c:903 +#: ../settings-dialogs/xfwm4-settings.c:900 #, c-format msgid "Failed to initialize xfconf. Reason: %s" msgstr "נכשל אתחול xfconf. הסיבה: %s" -#: ../settings-dialogs/xfwm4-settings.c:914 +#: ../settings-dialogs/xfwm4-settings.c:911 msgid "Could not create the settings dialog." msgstr "לא יכול ליצור את דו־שיח ההגדרות." -#: ../settings-dialogs/xfwm4-settings.c:1915 +#: ../settings-dialogs/xfwm4-settings.c:1912 msgid "" "This will reset all shortcuts to their default values. Do you really want to" " do this?" msgstr "פעולה זו תאפס את כל הקיצורים לערכי ברירת המחדל שלהם. האם אתה באמת רוצה לעשות זאת?" -#: ../settings-dialogs/xfwm4-settings.c:1917 +#: ../settings-dialogs/xfwm4-settings.c:1914 msgid "Reset to Defaults" msgstr "אפס לברירות מחדל" @@ -653,27 +657,31 @@ msgid "Unsupported keyboard modifier '%s'" msgstr "מקש מגביל לא נתמך \"%s\"" -#: ../src/main.c:722 +#: ../src/main.c:666 msgid "Set the compositor mode" msgstr "קבע את מצב הסדרן" -#: ../src/main.c:724 +#: ../src/main.c:668 msgid "Set the vblank mode" msgstr "קבע את מצב vblank " -#: ../src/main.c:734 +#: ../src/main.c:678 msgid "Replace the existing window manager" msgstr "החלף את מנהל החלונות הקיים" -#: ../src/main.c:736 +#: ../src/main.c:680 msgid "Print version information and exit" msgstr "הדפס מידע גרסה וצא" -#: ../src/main.c:780 +#: ../src/main.c:683 +msgid "Enable debug logging" +msgstr "הפעל רישום ביומן של איתור באגים" + +#: ../src/main.c:723 msgid "[ARGUMENTS...]" msgstr "[ארגומנטים...]" -#: ../src/main.c:787 +#: ../src/main.c:730 #, c-format msgid "Type \"%s --help\" for usage." msgstr "הקלד \"%s --help\" לשימוש." diff -Nru xfwm4-4.16.0/po/hr.po xfwm4-4.16.1/po/hr.po --- xfwm4-4.16.0/po/hr.po 2020-11-19 23:15:52.000000000 +0000 +++ xfwm4-4.16.1/po/hr.po 2021-01-05 08:18:23.000000000 +0000 @@ -7,14 +7,14 @@ # Edin Veskovic , 2015 # Edin Veskovic , 2014 # Ivica Kolić , 2010 -# Ivica Kolić , 2013-2016 +# Ivica Kolić , 2013-2016,2020 msgid "" msgstr "" "Project-Id-Version: Xfwm4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-01 00:49+0100\n" -"PO-Revision-Date: 2020-10-31 23:49+0000\n" -"Last-Translator: Xfce Bot \n" +"POT-Creation-Date: 2020-12-13 00:49+0100\n" +"PO-Revision-Date: 2020-12-29 04:56+0000\n" +"Last-Translator: Ivica Kolić \n" "Language-Team: Croatian (http://www.transifex.com/xfce/xfwm4/language/hr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,31 +36,31 @@ msgid "None" msgstr "Ništa" -#: ../settings-dialogs/tweaks-settings.c:477 +#: ../settings-dialogs/tweaks-settings.c:482 msgid "Session manager socket" msgstr "Socket upravitelja sesijom" -#: ../settings-dialogs/tweaks-settings.c:477 +#: ../settings-dialogs/tweaks-settings.c:482 #: ../settings-dialogs/workspace-settings.c:398 -#: ../settings-dialogs/xfwm4-settings.c:240 +#: ../settings-dialogs/xfwm4-settings.c:238 msgid "SOCKET ID" msgstr "SOCKET ID" -#: ../settings-dialogs/tweaks-settings.c:478 +#: ../settings-dialogs/tweaks-settings.c:483 #: ../settings-dialogs/workspace-settings.c:399 -#: ../settings-dialogs/xfwm4-settings.c:242 +#: ../settings-dialogs/xfwm4-settings.c:240 msgid "Version information" msgstr "Informacija o verziji" -#: ../settings-dialogs/tweaks-settings.c:496 +#: ../settings-dialogs/tweaks-settings.c:501 #: ../settings-dialogs/workspace-settings.c:416 -#: ../settings-dialogs/xfwm4-settings.c:874 +#: ../settings-dialogs/xfwm4-settings.c:871 msgid "." msgstr "." -#: ../settings-dialogs/tweaks-settings.c:500 +#: ../settings-dialogs/tweaks-settings.c:505 #: ../settings-dialogs/workspace-settings.c:420 -#: ../settings-dialogs/xfwm4-settings.c:878 +#: ../settings-dialogs/xfwm4-settings.c:875 #, c-format msgid "" "%s: %s\n" @@ -78,9 +78,9 @@ msgstr "Ime radnog prostora" #: ../settings-dialogs/workspace-settings.c:398 -#: ../settings-dialogs/xfwm4-settings.c:240 +#: ../settings-dialogs/xfwm4-settings.c:238 msgid "Settings manager socket" -msgstr "" +msgstr "Socket upravitelja postavkama" #: ../settings-dialogs/xfce-wm-settings.desktop.in.h:1 #: ../settings-dialogs/xfwm4-dialog.glade.h:1 @@ -131,7 +131,7 @@ msgid "" "workspaces;settings;preferences;virtual " "desktops;number;windows;screen;margins;" -msgstr "" +msgstr "radne površine;postavke;osobitosti;virtualne radne površine;broj;prozori;zaslon;margine;" #: ../settings-dialogs/xfwm4-dialog.glade.h:3 #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:3 @@ -347,66 +347,70 @@ msgid "Ad_vanced" msgstr "Na_predno" -#: ../settings-dialogs/xfwm4-settings.c:219 +#: ../settings-dialogs/xfwm4-settings.c:216 msgid "Shade window" msgstr "Osjenči prozor" -#: ../settings-dialogs/xfwm4-settings.c:220 +#: ../settings-dialogs/xfwm4-settings.c:217 msgid "Hide window" msgstr "Sakrij prozor" -#: ../settings-dialogs/xfwm4-settings.c:221 +#: ../settings-dialogs/xfwm4-settings.c:218 msgid "Maximize window" msgstr "Maksimiziraj prozor" -#: ../settings-dialogs/xfwm4-settings.c:222 +#: ../settings-dialogs/xfwm4-settings.c:219 msgid "Fill window" msgstr "Ispuni prozor" -#: ../settings-dialogs/xfwm4-settings.c:223 +#: ../settings-dialogs/xfwm4-settings.c:220 +msgid "Always on top" +msgstr "Uvijek na vrhu" + +#: ../settings-dialogs/xfwm4-settings.c:221 msgid "Nothing" msgstr "Ništa" -#: ../settings-dialogs/xfwm4-settings.c:228 +#: ../settings-dialogs/xfwm4-settings.c:226 msgid "Left" msgstr "Lijevo" -#: ../settings-dialogs/xfwm4-settings.c:229 +#: ../settings-dialogs/xfwm4-settings.c:227 msgid "Center" msgstr "Centar" -#: ../settings-dialogs/xfwm4-settings.c:230 +#: ../settings-dialogs/xfwm4-settings.c:228 msgid "Right" msgstr "Desno" -#: ../settings-dialogs/xfwm4-settings.c:346 +#: ../settings-dialogs/xfwm4-settings.c:344 msgid "Theme" msgstr "Tema" -#: ../settings-dialogs/xfwm4-settings.c:501 +#: ../settings-dialogs/xfwm4-settings.c:499 msgid "Action" msgstr "Radnja" -#: ../settings-dialogs/xfwm4-settings.c:508 +#: ../settings-dialogs/xfwm4-settings.c:506 msgid "Shortcut" msgstr "Prečac" -#: ../settings-dialogs/xfwm4-settings.c:903 +#: ../settings-dialogs/xfwm4-settings.c:900 #, c-format msgid "Failed to initialize xfconf. Reason: %s" msgstr "Xfconf neuspješno inicijaliziran. Razlog: %s" -#: ../settings-dialogs/xfwm4-settings.c:914 +#: ../settings-dialogs/xfwm4-settings.c:911 msgid "Could not create the settings dialog." msgstr "Ne mogu napraviti dijalog postavki." -#: ../settings-dialogs/xfwm4-settings.c:1915 +#: ../settings-dialogs/xfwm4-settings.c:1912 msgid "" "This will reset all shortcuts to their default values. Do you really want to" " do this?" msgstr "Ovo će vratiti sve prečace na njihovu zadanu vrijednost.Želite li doista to učiniti?" -#: ../settings-dialogs/xfwm4-settings.c:1917 +#: ../settings-dialogs/xfwm4-settings.c:1914 msgid "Reset to Defaults" msgstr "Vrati na zadano" @@ -576,38 +580,42 @@ msgstr "Pokaži sjenu ispod _običnih prozora" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51 -msgid "Zoom pointer along with the desktop" +msgid "Zoom desktop with mouse wheel" msgstr "" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:52 +msgid "Zoom pointer along with the desktop" +msgstr "" + +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:53 msgid "Opaci_ty of window decorations:" msgstr "Neprozirno_st dekoracije prozora:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:53 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:54 msgid "Transparent" msgstr "Proziran" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:54 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:55 msgid "Opaque" msgstr "Neproziran" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:55 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:56 msgid "Opacity of _inactive windows:" msgstr "Neprozirnost _neaktivnih prozora:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:56 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:57 msgid "Opacity of windows during _move:" msgstr "Neprozirnost prozora tijekom _pomicanja:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:57 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:58 msgid "Opacity of windows during resi_ze:" msgstr "Neprozirnost prozora tijekom promije_ne veličine:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:58 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:59 msgid "Opacity of popup wi_ndows:" msgstr "Neprozirnost skočnih pro_zora:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:59 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:60 msgid "C_ompositor" msgstr "S_lagatelj" @@ -647,27 +655,31 @@ msgid "Unsupported keyboard modifier '%s'" msgstr "Nepodržana modifikatorska tipka '%s'" -#: ../src/main.c:722 +#: ../src/main.c:666 msgid "Set the compositor mode" msgstr "Postavi način slaganja" -#: ../src/main.c:724 +#: ../src/main.c:668 msgid "Set the vblank mode" msgstr "Postavi vblank način" -#: ../src/main.c:734 +#: ../src/main.c:678 msgid "Replace the existing window manager" msgstr "Zamjeni postojeći upravitelj prozora" -#: ../src/main.c:736 +#: ../src/main.c:680 msgid "Print version information and exit" msgstr "Ispiši informaciju o verziji i izađi" -#: ../src/main.c:780 +#: ../src/main.c:683 +msgid "Enable debug logging" +msgstr "Omogući poruke otklanjanja grešaka" + +#: ../src/main.c:723 msgid "[ARGUMENTS...]" msgstr "[ARGUMENTi...]" -#: ../src/main.c:787 +#: ../src/main.c:730 #, c-format msgid "Type \"%s --help\" for usage." msgstr "Upiši \"%s --help\" za uporabu." diff -Nru xfwm4-4.16.0/po/hu.po xfwm4-4.16.1/po/hu.po --- xfwm4-4.16.0/po/hu.po 2020-12-02 08:48:32.000000000 +0000 +++ xfwm4-4.16.1/po/hu.po 2021-01-09 16:30:26.000000000 +0000 @@ -16,8 +16,8 @@ msgstr "" "Project-Id-Version: Xfwm4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-01 00:49+0100\n" -"PO-Revision-Date: 2020-11-19 16:46+0000\n" +"POT-Creation-Date: 2020-12-13 00:49+0100\n" +"PO-Revision-Date: 2020-12-25 16:41+0000\n" "Last-Translator: Gábor P.\n" "Language-Team: Hungarian (http://www.transifex.com/xfce/xfwm4/language/hu/)\n" "MIME-Version: 1.0\n" @@ -40,31 +40,31 @@ msgid "None" msgstr "Nincs" -#: ../settings-dialogs/tweaks-settings.c:477 +#: ../settings-dialogs/tweaks-settings.c:482 msgid "Session manager socket" msgstr "Munkamenet-kezelő foglalat" -#: ../settings-dialogs/tweaks-settings.c:477 +#: ../settings-dialogs/tweaks-settings.c:482 #: ../settings-dialogs/workspace-settings.c:398 -#: ../settings-dialogs/xfwm4-settings.c:240 +#: ../settings-dialogs/xfwm4-settings.c:238 msgid "SOCKET ID" msgstr "FOGLALATAZONOSÍTÓ" -#: ../settings-dialogs/tweaks-settings.c:478 +#: ../settings-dialogs/tweaks-settings.c:483 #: ../settings-dialogs/workspace-settings.c:399 -#: ../settings-dialogs/xfwm4-settings.c:242 +#: ../settings-dialogs/xfwm4-settings.c:240 msgid "Version information" msgstr "Verzióinformációk" -#: ../settings-dialogs/tweaks-settings.c:496 +#: ../settings-dialogs/tweaks-settings.c:501 #: ../settings-dialogs/workspace-settings.c:416 -#: ../settings-dialogs/xfwm4-settings.c:874 +#: ../settings-dialogs/xfwm4-settings.c:871 msgid "." msgstr "." -#: ../settings-dialogs/tweaks-settings.c:500 +#: ../settings-dialogs/tweaks-settings.c:505 #: ../settings-dialogs/workspace-settings.c:420 -#: ../settings-dialogs/xfwm4-settings.c:878 +#: ../settings-dialogs/xfwm4-settings.c:875 #, c-format msgid "" "%s: %s\n" @@ -82,7 +82,7 @@ msgstr "Munkaterület neve" #: ../settings-dialogs/workspace-settings.c:398 -#: ../settings-dialogs/xfwm4-settings.c:240 +#: ../settings-dialogs/xfwm4-settings.c:238 msgid "Settings manager socket" msgstr "Beállításkezelő foglalat" @@ -325,7 +325,7 @@ #: ../settings-dialogs/xfwm4-dialog.glade.h:51 msgid "Wrap workspaces when reaching the screen edge" -msgstr "Váltás munkaterületek közt, ha a mutató eléri a képernyő szélét" +msgstr "Váltás munkaterületek közt, ha a mutató eléri a képernyő szélét" #: ../settings-dialogs/xfwm4-dialog.glade.h:52 msgid "When _moving" @@ -351,66 +351,70 @@ msgid "Ad_vanced" msgstr "Spe_ciális" -#: ../settings-dialogs/xfwm4-settings.c:219 +#: ../settings-dialogs/xfwm4-settings.c:216 msgid "Shade window" msgstr "Ablak felgördítése" -#: ../settings-dialogs/xfwm4-settings.c:220 +#: ../settings-dialogs/xfwm4-settings.c:217 msgid "Hide window" msgstr "Ablak elrejtése" -#: ../settings-dialogs/xfwm4-settings.c:221 +#: ../settings-dialogs/xfwm4-settings.c:218 msgid "Maximize window" msgstr "Ablak maximalizálása" -#: ../settings-dialogs/xfwm4-settings.c:222 +#: ../settings-dialogs/xfwm4-settings.c:219 msgid "Fill window" msgstr "Ablak kitöltése" -#: ../settings-dialogs/xfwm4-settings.c:223 +#: ../settings-dialogs/xfwm4-settings.c:220 +msgid "Always on top" +msgstr "Mindig felül" + +#: ../settings-dialogs/xfwm4-settings.c:221 msgid "Nothing" msgstr "Semmi" -#: ../settings-dialogs/xfwm4-settings.c:228 +#: ../settings-dialogs/xfwm4-settings.c:226 msgid "Left" msgstr "Balra" -#: ../settings-dialogs/xfwm4-settings.c:229 +#: ../settings-dialogs/xfwm4-settings.c:227 msgid "Center" msgstr "Középre" -#: ../settings-dialogs/xfwm4-settings.c:230 +#: ../settings-dialogs/xfwm4-settings.c:228 msgid "Right" msgstr "Jobbra" -#: ../settings-dialogs/xfwm4-settings.c:346 +#: ../settings-dialogs/xfwm4-settings.c:344 msgid "Theme" msgstr "Téma" -#: ../settings-dialogs/xfwm4-settings.c:501 +#: ../settings-dialogs/xfwm4-settings.c:499 msgid "Action" msgstr "Művelet" -#: ../settings-dialogs/xfwm4-settings.c:508 +#: ../settings-dialogs/xfwm4-settings.c:506 msgid "Shortcut" msgstr "Gyorsbillentyű" -#: ../settings-dialogs/xfwm4-settings.c:903 +#: ../settings-dialogs/xfwm4-settings.c:900 #, c-format msgid "Failed to initialize xfconf. Reason: %s" msgstr "Az xfconf előkészítése meghiúsult. Ok: %s" -#: ../settings-dialogs/xfwm4-settings.c:914 +#: ../settings-dialogs/xfwm4-settings.c:911 msgid "Could not create the settings dialog." msgstr "A beállítások ablak nem hozható létre." -#: ../settings-dialogs/xfwm4-settings.c:1915 +#: ../settings-dialogs/xfwm4-settings.c:1912 msgid "" "This will reset all shortcuts to their default values. Do you really want to" " do this?" msgstr "Ez minden gyorsbillentyűt visszaállít az alapértelmezett értékére. Valóban ezt szeretné?" -#: ../settings-dialogs/xfwm4-settings.c:1917 +#: ../settings-dialogs/xfwm4-settings.c:1914 msgid "Reset to Defaults" msgstr "Alapértelmezések visszaállítása" @@ -580,38 +584,42 @@ msgstr "Árnyékok megjelenítése _normál ablakok alatt" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51 +msgid "Zoom desktop with mouse wheel" +msgstr "Asztal nagyítása egérgörgővel" + +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:52 msgid "Zoom pointer along with the desktop" msgstr "Mutató nagyítása az asztallal együtt" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:52 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:53 msgid "Opaci_ty of window decorations:" msgstr "Ablakdekorá_ciók átlátszatlansága:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:53 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:54 msgid "Transparent" msgstr "Átlátszó" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:54 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:55 msgid "Opaque" msgstr "Átlátszatlan" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:55 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:56 msgid "Opacity of _inactive windows:" msgstr "_Inaktív ablakok átlátszatlansága:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:56 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:57 msgid "Opacity of windows during _move:" msgstr "Ablakok átlátszatlansága _mozgatáskor:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:57 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:58 msgid "Opacity of windows during resi_ze:" msgstr "Ablakok átlátszatlansága átmé_retezéskor:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:58 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:59 msgid "Opacity of popup wi_ndows:" msgstr "Felu_gró ablakok átlátszatlansága:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:59 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:60 msgid "C_ompositor" msgstr "K_ompozitálás" @@ -651,27 +659,31 @@ msgid "Unsupported keyboard modifier '%s'" msgstr "Nem támogatott billentyűzet módosító: „%s”" -#: ../src/main.c:722 +#: ../src/main.c:666 msgid "Set the compositor mode" msgstr "Kompozitáló mód beállítása" -#: ../src/main.c:724 +#: ../src/main.c:668 msgid "Set the vblank mode" msgstr "A vblank mód beállítása" -#: ../src/main.c:734 +#: ../src/main.c:678 msgid "Replace the existing window manager" msgstr "Meglévő ablakkezelő cseréje" -#: ../src/main.c:736 +#: ../src/main.c:680 msgid "Print version information and exit" msgstr "Verzióinformációk kiírása és kilépés" -#: ../src/main.c:780 +#: ../src/main.c:683 +msgid "Enable debug logging" +msgstr "Hibakeresési naplózás engedélyezése" + +#: ../src/main.c:723 msgid "[ARGUMENTS...]" msgstr "[ARGUMENTUMOK]…" -#: ../src/main.c:787 +#: ../src/main.c:730 #, c-format msgid "Type \"%s --help\" for usage." msgstr "Segítségért adja ki a „%s --help” parancsot." diff -Nru xfwm4-4.16.0/po/ie.po xfwm4-4.16.1/po/ie.po --- xfwm4-4.16.0/po/ie.po 2020-11-19 23:15:52.000000000 +0000 +++ xfwm4-4.16.1/po/ie.po 2021-01-05 08:18:23.000000000 +0000 @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Caarmi, 2020 msgid "" msgstr "" "Project-Id-Version: Xfwm4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-01 00:49+0100\n" -"PO-Revision-Date: 2020-10-31 23:49+0000\n" -"Last-Translator: Xfce Bot \n" +"POT-Creation-Date: 2020-12-13 00:49+0100\n" +"PO-Revision-Date: 2020-12-31 06:15+0000\n" +"Last-Translator: Caarmi\n" "Language-Team: Interlingue (http://www.transifex.com/xfce/xfwm4/language/ie/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,31 +32,31 @@ msgid "None" msgstr "Null" -#: ../settings-dialogs/tweaks-settings.c:477 +#: ../settings-dialogs/tweaks-settings.c:482 msgid "Session manager socket" msgstr "Socket del gerente de parametres" -#: ../settings-dialogs/tweaks-settings.c:477 +#: ../settings-dialogs/tweaks-settings.c:482 #: ../settings-dialogs/workspace-settings.c:398 -#: ../settings-dialogs/xfwm4-settings.c:240 +#: ../settings-dialogs/xfwm4-settings.c:238 msgid "SOCKET ID" msgstr "ID DE SOCKET" -#: ../settings-dialogs/tweaks-settings.c:478 +#: ../settings-dialogs/tweaks-settings.c:483 #: ../settings-dialogs/workspace-settings.c:399 -#: ../settings-dialogs/xfwm4-settings.c:242 +#: ../settings-dialogs/xfwm4-settings.c:240 msgid "Version information" msgstr "Information del version" -#: ../settings-dialogs/tweaks-settings.c:496 +#: ../settings-dialogs/tweaks-settings.c:501 #: ../settings-dialogs/workspace-settings.c:416 -#: ../settings-dialogs/xfwm4-settings.c:874 +#: ../settings-dialogs/xfwm4-settings.c:871 msgid "." msgstr "." -#: ../settings-dialogs/tweaks-settings.c:500 +#: ../settings-dialogs/tweaks-settings.c:505 #: ../settings-dialogs/workspace-settings.c:420 -#: ../settings-dialogs/xfwm4-settings.c:878 +#: ../settings-dialogs/xfwm4-settings.c:875 #, c-format msgid "" "%s: %s\n" @@ -73,7 +74,7 @@ msgstr "Nómine de labor-spacie" #: ../settings-dialogs/workspace-settings.c:398 -#: ../settings-dialogs/xfwm4-settings.c:240 +#: ../settings-dialogs/xfwm4-settings.c:238 msgid "Settings manager socket" msgstr "Socket del gerente de parametres" @@ -263,7 +264,7 @@ #: ../settings-dialogs/xfwm4-dialog.glade.h:37 msgid "Raise window when clicking _inside application window" -msgstr "" +msgstr "Levar li fenestre quande on fa un clic _intra it" #: ../settings-dialogs/xfwm4-dialog.glade.h:38 msgid "Raise on click" @@ -332,7 +333,7 @@ #: ../settings-dialogs/xfwm4-dialog.glade.h:55 msgid "The action to perform when the title-bar is double-clicked" -msgstr "" +msgstr "Li action por un duplic clic in li panel de titul" #: ../settings-dialogs/xfwm4-dialog.glade.h:56 msgid "Double click _action" @@ -342,66 +343,70 @@ msgid "Ad_vanced" msgstr "A_vancate" -#: ../settings-dialogs/xfwm4-settings.c:219 +#: ../settings-dialogs/xfwm4-settings.c:216 msgid "Shade window" msgstr "Involuer/devoluer un fenestre" -#: ../settings-dialogs/xfwm4-settings.c:220 +#: ../settings-dialogs/xfwm4-settings.c:217 msgid "Hide window" msgstr "Celar li fenestre" -#: ../settings-dialogs/xfwm4-settings.c:221 +#: ../settings-dialogs/xfwm4-settings.c:218 msgid "Maximize window" msgstr "Maximisar li fenestre" -#: ../settings-dialogs/xfwm4-settings.c:222 +#: ../settings-dialogs/xfwm4-settings.c:219 msgid "Fill window" msgstr "Augmentar li fenestre" -#: ../settings-dialogs/xfwm4-settings.c:223 +#: ../settings-dialogs/xfwm4-settings.c:220 +msgid "Always on top" +msgstr "Sempre in avan" + +#: ../settings-dialogs/xfwm4-settings.c:221 msgid "Nothing" msgstr "Necós" -#: ../settings-dialogs/xfwm4-settings.c:228 +#: ../settings-dialogs/xfwm4-settings.c:226 msgid "Left" msgstr "A levul" -#: ../settings-dialogs/xfwm4-settings.c:229 +#: ../settings-dialogs/xfwm4-settings.c:227 msgid "Center" msgstr "Al centre" -#: ../settings-dialogs/xfwm4-settings.c:230 +#: ../settings-dialogs/xfwm4-settings.c:228 msgid "Right" msgstr "A dextri" -#: ../settings-dialogs/xfwm4-settings.c:346 +#: ../settings-dialogs/xfwm4-settings.c:344 msgid "Theme" msgstr "Tema" -#: ../settings-dialogs/xfwm4-settings.c:501 +#: ../settings-dialogs/xfwm4-settings.c:499 msgid "Action" msgstr "Action" -#: ../settings-dialogs/xfwm4-settings.c:508 +#: ../settings-dialogs/xfwm4-settings.c:506 msgid "Shortcut" msgstr "Rapid-taste" -#: ../settings-dialogs/xfwm4-settings.c:903 +#: ../settings-dialogs/xfwm4-settings.c:900 #, c-format msgid "Failed to initialize xfconf. Reason: %s" msgstr "Ne successat inicialisar xfconf. Cause: %s" -#: ../settings-dialogs/xfwm4-settings.c:914 +#: ../settings-dialogs/xfwm4-settings.c:911 msgid "Could not create the settings dialog." msgstr "Ne posset crear li dialog de parametres." -#: ../settings-dialogs/xfwm4-settings.c:1915 +#: ../settings-dialogs/xfwm4-settings.c:1912 msgid "" "This will reset all shortcuts to their default values. Do you really want to" " do this?" msgstr "To va reverter omni rapid-tastes a su valores predefinit. Esque vu vole far to?" -#: ../settings-dialogs/xfwm4-settings.c:1917 +#: ../settings-dialogs/xfwm4-settings.c:1914 msgid "Reset to Defaults" msgstr "Reverter" @@ -409,11 +414,11 @@ msgid "" "S_kip windows that have \"skip pager\"\n" "or \"skip taskbar\" properties set" -msgstr "" +msgstr "Om_isser fenestres que have li proprietás\n«skip pager» o «skip taskbar»" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:7 msgid "_Include hidden (i.e. iconified) windows" -msgstr "" +msgstr "_Includer celat (iconificat) fenestres" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:8 msgid "Cycle _through windows on all workspaces" @@ -429,7 +434,7 @@ #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:11 msgid "Cycle through windows in a _list" -msgstr "" +msgstr "Ciclic alteration in un _liste de fenestres" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:12 msgid "C_ycling" @@ -461,7 +466,7 @@ #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:20 msgid "Key used to _grab and move windows:" -msgstr "" +msgstr "Taste por _tirar fenestres:" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:21 msgid "_Raise windows when any mouse button is pressed" @@ -571,38 +576,42 @@ msgstr "Monstrar ombres sub _regulari fenestres" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51 -msgid "Zoom pointer along with the desktop" -msgstr "" +msgid "Zoom desktop with mouse wheel" +msgstr "Scalar li pupitre per li rulette de mus" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:52 +msgid "Zoom pointer along with the desktop" +msgstr "Scalar li apuntator junt con li pupitre" + +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:53 msgid "Opaci_ty of window decorations:" msgstr "Opaci_tá del decorationes de fenestre:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:53 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:54 msgid "Transparent" msgstr "Transparent" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:54 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:55 msgid "Opaque" msgstr "Opac" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:55 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:56 msgid "Opacity of _inactive windows:" msgstr "Opac_itá de fenestres ínactiv:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:56 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:57 msgid "Opacity of windows during _move:" msgstr "Opacitá de fenestres essent mo_vent:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:57 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:58 msgid "Opacity of windows during resi_ze:" msgstr "Opacitá de fenestres essent redi_mensionat:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:58 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:59 msgid "Opacity of popup wi_ndows:" msgstr "Opacitá de fe_nestres popup:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:59 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:60 msgid "C_ompositor" msgstr "C_ompositor" @@ -642,27 +651,31 @@ msgid "Unsupported keyboard modifier '%s'" msgstr "Ínsupportat modificator de tastatura «%s»" -#: ../src/main.c:722 +#: ../src/main.c:666 msgid "Set the compositor mode" msgstr "Mode de compositor" -#: ../src/main.c:724 +#: ../src/main.c:668 msgid "Set the vblank mode" msgstr "Mode vblank" -#: ../src/main.c:734 +#: ../src/main.c:678 msgid "Replace the existing window manager" msgstr "Vicear li existent gerente de fenestres" -#: ../src/main.c:736 +#: ../src/main.c:680 msgid "Print version information and exit" msgstr "Monstrar li information del version, poy surtir" -#: ../src/main.c:780 +#: ../src/main.c:683 +msgid "Enable debug logging" +msgstr "" + +#: ../src/main.c:723 msgid "[ARGUMENTS...]" msgstr "[ARGUMENTES...]" -#: ../src/main.c:787 +#: ../src/main.c:730 #, c-format msgid "Type \"%s --help\" for usage." msgstr "Tippa '%s --help' por li usage." @@ -681,7 +694,7 @@ #: ../src/menu.c:54 msgid "Minimize _Other Windows" -msgstr "" +msgstr "Minimisar a_ltri fenestres" #: ../src/menu.c:55 msgid "S_how" diff -Nru xfwm4-4.16.0/po/pl.po xfwm4-4.16.1/po/pl.po --- xfwm4-4.16.0/po/pl.po 2020-11-19 23:15:52.000000000 +0000 +++ xfwm4-4.16.1/po/pl.po 2021-01-05 08:18:23.000000000 +0000 @@ -8,7 +8,7 @@ # Dawid Job , 2014-2015 # No Ne, 2020 # No Ne, 2020 -# No Ne, 2017,2019-2020 +# No Ne, 2017,2019-2021 # Paweł Pastuła , 2003 # Piotr Sokół , 2009,2011-2014 # Piotr Strębski , 2013,2015-2016 @@ -18,8 +18,8 @@ msgstr "" "Project-Id-Version: Xfwm4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-01 00:49+0100\n" -"PO-Revision-Date: 2020-11-01 06:05+0000\n" +"POT-Creation-Date: 2020-12-13 00:49+0100\n" +"PO-Revision-Date: 2021-01-02 11:02+0000\n" "Last-Translator: No Ne\n" "Language-Team: Polish (http://www.transifex.com/xfce/xfwm4/language/pl/)\n" "MIME-Version: 1.0\n" @@ -42,31 +42,31 @@ msgid "None" msgstr "Brak" -#: ../settings-dialogs/tweaks-settings.c:477 +#: ../settings-dialogs/tweaks-settings.c:482 msgid "Session manager socket" msgstr "Gniazdo menedżera sesji" -#: ../settings-dialogs/tweaks-settings.c:477 +#: ../settings-dialogs/tweaks-settings.c:482 #: ../settings-dialogs/workspace-settings.c:398 -#: ../settings-dialogs/xfwm4-settings.c:240 +#: ../settings-dialogs/xfwm4-settings.c:238 msgid "SOCKET ID" msgstr "ID_GNIAZDA" -#: ../settings-dialogs/tweaks-settings.c:478 +#: ../settings-dialogs/tweaks-settings.c:483 #: ../settings-dialogs/workspace-settings.c:399 -#: ../settings-dialogs/xfwm4-settings.c:242 +#: ../settings-dialogs/xfwm4-settings.c:240 msgid "Version information" msgstr "Wypisuje informacje o wersji i kończy" -#: ../settings-dialogs/tweaks-settings.c:496 +#: ../settings-dialogs/tweaks-settings.c:501 #: ../settings-dialogs/workspace-settings.c:416 -#: ../settings-dialogs/xfwm4-settings.c:874 +#: ../settings-dialogs/xfwm4-settings.c:871 msgid "." msgstr "." -#: ../settings-dialogs/tweaks-settings.c:500 +#: ../settings-dialogs/tweaks-settings.c:505 #: ../settings-dialogs/workspace-settings.c:420 -#: ../settings-dialogs/xfwm4-settings.c:878 +#: ../settings-dialogs/xfwm4-settings.c:875 #, c-format msgid "" "%s: %s\n" @@ -84,7 +84,7 @@ msgstr "Nazwa" #: ../settings-dialogs/workspace-settings.c:398 -#: ../settings-dialogs/xfwm4-settings.c:240 +#: ../settings-dialogs/xfwm4-settings.c:238 msgid "Settings manager socket" msgstr "Określa gniazdo menedżera ustawień" @@ -121,7 +121,7 @@ "windows;behavior;settings;preferences;cycling;cycle;switching;focus;raises;accessibility;key;dragging;move;moving;hide;frame;title" " bar;maximized;tile;screen;edge;hot corner;snapping;mouse wheel;roll " "up;workspaces;placement;compositor;compositing;enable;disable;shadows;decorations;opacity;resize;inactive;preview;compiz;transitions;" -msgstr "okna;zachowanie;ustawienia;preferencje;przełącz;przełączanie;skupienie;podnoszenie;ułatwienia dostępu;klawisz;przeciąganie;ruch;poruszanie;ukrywanie;obramowanie;pasek tytułu;zmaksymalizowane;kafelek;ekran;krawędź;gorący narożnik;przyciąganie;kółko myszy;zwijanie;obszary robocze;położenie;kompozytor;komponowanie;włączanie;wyłączanie;cienie;dekoracje;przezroczystość;zmiana rozmiaru;nieaktywne;podgląd;compiz;przejścia;" +msgstr "okna;zachowanie;ustawienia;preferencje;przechodzenie;przełączanie;skupienie;podnoszenie;ułatwienia dostępu;klawisz;przeciąganie;ruch;poruszanie;ukrywanie;obramowanie;pasek tytułu;zmaksymalizowane;kafelek;ekran;krawędź;gorący narożnik;przyciąganie;kółko myszy;zwijanie;obszary robocze;położenie;kompozytor;komponowanie;włączanie;wyłączanie;cienie;dekoracje;przezroczystość;zmiana rozmiaru;nieaktywne;podgląd;compiz;przejścia;" #: ../settings-dialogs/xfce-workspaces-settings.desktop.in.h:1 #: ../settings-dialogs/xfwm4-workspace-dialog.glade.h:1 @@ -353,66 +353,70 @@ msgid "Ad_vanced" msgstr "Z_aawansowane" -#: ../settings-dialogs/xfwm4-settings.c:219 +#: ../settings-dialogs/xfwm4-settings.c:216 msgid "Shade window" msgstr "Ukrycie lub wyświetlenie zawartości" -#: ../settings-dialogs/xfwm4-settings.c:220 +#: ../settings-dialogs/xfwm4-settings.c:217 msgid "Hide window" msgstr "Zminimalizowanie" -#: ../settings-dialogs/xfwm4-settings.c:221 +#: ../settings-dialogs/xfwm4-settings.c:218 msgid "Maximize window" msgstr "Zmaksymalizowanie" -#: ../settings-dialogs/xfwm4-settings.c:222 +#: ../settings-dialogs/xfwm4-settings.c:219 msgid "Fill window" msgstr "Wypełnienie" -#: ../settings-dialogs/xfwm4-settings.c:223 +#: ../settings-dialogs/xfwm4-settings.c:220 +msgid "Always on top" +msgstr "Utrzymuj na wierzchu" + +#: ../settings-dialogs/xfwm4-settings.c:221 msgid "Nothing" msgstr "Brak" -#: ../settings-dialogs/xfwm4-settings.c:228 +#: ../settings-dialogs/xfwm4-settings.c:226 msgid "Left" msgstr "Lewo" -#: ../settings-dialogs/xfwm4-settings.c:229 +#: ../settings-dialogs/xfwm4-settings.c:227 msgid "Center" msgstr "Środek" -#: ../settings-dialogs/xfwm4-settings.c:230 +#: ../settings-dialogs/xfwm4-settings.c:228 msgid "Right" msgstr "Prawo" -#: ../settings-dialogs/xfwm4-settings.c:346 +#: ../settings-dialogs/xfwm4-settings.c:344 msgid "Theme" msgstr "Styl" -#: ../settings-dialogs/xfwm4-settings.c:501 +#: ../settings-dialogs/xfwm4-settings.c:499 msgid "Action" msgstr "Czynność" -#: ../settings-dialogs/xfwm4-settings.c:508 +#: ../settings-dialogs/xfwm4-settings.c:506 msgid "Shortcut" msgstr "Skrót" -#: ../settings-dialogs/xfwm4-settings.c:903 +#: ../settings-dialogs/xfwm4-settings.c:900 #, c-format msgid "Failed to initialize xfconf. Reason: %s" msgstr "Nie udało się zainicjować programu xfconf. Przyczyna: %s" -#: ../settings-dialogs/xfwm4-settings.c:914 +#: ../settings-dialogs/xfwm4-settings.c:911 msgid "Could not create the settings dialog." msgstr "Nie można utworzyć okna ustawień." -#: ../settings-dialogs/xfwm4-settings.c:1915 +#: ../settings-dialogs/xfwm4-settings.c:1912 msgid "" "This will reset all shortcuts to their default values. Do you really want to" " do this?" msgstr "Przywrócić wartości domyślne wszystkich skrótów klawiszowych?" -#: ../settings-dialogs/xfwm4-settings.c:1917 +#: ../settings-dialogs/xfwm4-settings.c:1914 msgid "Reset to Defaults" msgstr "Przywracanie wartości domyślnych" @@ -567,7 +571,7 @@ #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:47 msgid "Show windows preview in place of icons when cycling" -msgstr "Pokaż podgląd okna w miejscu ikon w czasie najazdu" +msgstr "Pokazywanie podglądu okna w miejscu ikon w czasie przechodzenia" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:48 msgid "Show shadows under pop_up windows" @@ -582,38 +586,42 @@ msgstr "Cienie zwykłyc_h okien" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51 +msgid "Zoom desktop with mouse wheel" +msgstr "Powiększanie pulpitu kółkiem myszy" + +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:52 msgid "Zoom pointer along with the desktop" msgstr "Powiększanie kursora myszy wraz z pulpitem" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:52 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:53 msgid "Opaci_ty of window decorations:" msgstr "Przezroczystość deko_racji okien:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:53 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:54 msgid "Transparent" msgstr "Całkowita" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:54 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:55 msgid "Opaque" msgstr "Brak" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:55 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:56 msgid "Opacity of _inactive windows:" msgstr "Przezroczystość _nieaktywnych okien:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:56 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:57 msgid "Opacity of windows during _move:" msgstr "Przezroczystość okien podczas przemie_szczania:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:57 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:58 msgid "Opacity of windows during resi_ze:" msgstr "Przezroczystość okien podczas zmieniania rozmiar_u:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:58 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:59 msgid "Opacity of popup wi_ndows:" msgstr "Przezroczystość wyskakujących ok_ien:" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:59 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:60 msgid "C_ompositor" msgstr "_Kompozycje" @@ -653,27 +661,31 @@ msgid "Unsupported keyboard modifier '%s'" msgstr "Nieobsługiwany modyfikator klawiatury „%s”" -#: ../src/main.c:722 +#: ../src/main.c:666 msgid "Set the compositor mode" msgstr "Przełącza obsługę kompozycji" -#: ../src/main.c:724 +#: ../src/main.c:668 msgid "Set the vblank mode" msgstr "Ustaw tryb vblank" -#: ../src/main.c:734 +#: ../src/main.c:678 msgid "Replace the existing window manager" msgstr "Zastępuje bieżący menedżer okien" -#: ../src/main.c:736 +#: ../src/main.c:680 msgid "Print version information and exit" msgstr "Wypisuje informacje o wersji i kończy" -#: ../src/main.c:780 +#: ../src/main.c:683 +msgid "Enable debug logging" +msgstr "Włącza rejestrowanie diagnozowania błędów" + +#: ../src/main.c:723 msgid "[ARGUMENTS...]" msgstr "[PARAMETR...]" -#: ../src/main.c:787 +#: ../src/main.c:730 #, c-format msgid "Type \"%s --help\" for usage." msgstr "Proszę wprowadzić „%s --help”, aby wypisać komunikat pomocy." diff -Nru xfwm4-4.16.0/po/pt_BR.po xfwm4-4.16.1/po/pt_BR.po --- xfwm4-4.16.0/po/pt_BR.po 2020-12-17 16:59:47.000000000 +0000 +++ xfwm4-4.16.1/po/pt_BR.po 2021-01-05 08:18:23.000000000 +0000 @@ -19,8 +19,8 @@ "Project-Id-Version: Xfwm4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-12-13 00:49+0100\n" -"PO-Revision-Date: 2020-12-14 00:59+0000\n" -"Last-Translator: Lucas Wilm \n" +"PO-Revision-Date: 2021-01-03 18:51+0000\n" +"Last-Translator: Michael Martins \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/xfce/xfwm4/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -Nru xfwm4-4.16.0/po/zh_TW.po xfwm4-4.16.1/po/zh_TW.po --- xfwm4-4.16.0/po/zh_TW.po 2020-11-19 23:15:52.000000000 +0000 +++ xfwm4-4.16.1/po/zh_TW.po 2021-01-09 16:28:40.000000000 +0000 @@ -5,7 +5,7 @@ # Translators: # Ambrose Li , 2004 # Cheng-Chia Tseng , 2010,2014,2017-2018 -# Hsiu-Ming Chang , 2018-2019 +# Hsiu-Ming Chang , 2018-2019,2021 # Hydonsingore Cia , 2005 # umm , 2003 # Walter Cheuk , 2013-2015 @@ -13,9 +13,9 @@ msgstr "" "Project-Id-Version: Xfwm4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-01 00:49+0100\n" -"PO-Revision-Date: 2020-10-31 23:49+0000\n" -"Last-Translator: Xfce Bot \n" +"POT-Creation-Date: 2020-12-13 00:49+0100\n" +"PO-Revision-Date: 2021-01-09 06:28+0000\n" +"Last-Translator: Hsiu-Ming Chang \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/xfce/xfwm4/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,31 +37,31 @@ msgid "None" msgstr "無" -#: ../settings-dialogs/tweaks-settings.c:477 +#: ../settings-dialogs/tweaks-settings.c:482 msgid "Session manager socket" msgstr "工作階段管理程式 socket" -#: ../settings-dialogs/tweaks-settings.c:477 +#: ../settings-dialogs/tweaks-settings.c:482 #: ../settings-dialogs/workspace-settings.c:398 -#: ../settings-dialogs/xfwm4-settings.c:240 +#: ../settings-dialogs/xfwm4-settings.c:238 msgid "SOCKET ID" msgstr "SOCKET ID" -#: ../settings-dialogs/tweaks-settings.c:478 +#: ../settings-dialogs/tweaks-settings.c:483 #: ../settings-dialogs/workspace-settings.c:399 -#: ../settings-dialogs/xfwm4-settings.c:242 +#: ../settings-dialogs/xfwm4-settings.c:240 msgid "Version information" msgstr "版本資訊" -#: ../settings-dialogs/tweaks-settings.c:496 +#: ../settings-dialogs/tweaks-settings.c:501 #: ../settings-dialogs/workspace-settings.c:416 -#: ../settings-dialogs/xfwm4-settings.c:874 +#: ../settings-dialogs/xfwm4-settings.c:871 msgid "." msgstr "." -#: ../settings-dialogs/tweaks-settings.c:500 +#: ../settings-dialogs/tweaks-settings.c:505 #: ../settings-dialogs/workspace-settings.c:420 -#: ../settings-dialogs/xfwm4-settings.c:878 +#: ../settings-dialogs/xfwm4-settings.c:875 #, c-format msgid "" "%s: %s\n" @@ -79,7 +79,7 @@ msgstr "工作區名稱" #: ../settings-dialogs/workspace-settings.c:398 -#: ../settings-dialogs/xfwm4-settings.c:240 +#: ../settings-dialogs/xfwm4-settings.c:238 msgid "Settings manager socket" msgstr "設定值管理員 socket" @@ -348,66 +348,70 @@ msgid "Ad_vanced" msgstr "進階(_V)" -#: ../settings-dialogs/xfwm4-settings.c:219 +#: ../settings-dialogs/xfwm4-settings.c:216 msgid "Shade window" msgstr "捲起視窗" -#: ../settings-dialogs/xfwm4-settings.c:220 +#: ../settings-dialogs/xfwm4-settings.c:217 msgid "Hide window" msgstr "隱藏視窗" -#: ../settings-dialogs/xfwm4-settings.c:221 +#: ../settings-dialogs/xfwm4-settings.c:218 msgid "Maximize window" msgstr "最大化視窗" -#: ../settings-dialogs/xfwm4-settings.c:222 +#: ../settings-dialogs/xfwm4-settings.c:219 msgid "Fill window" msgstr "填滿視窗" -#: ../settings-dialogs/xfwm4-settings.c:223 +#: ../settings-dialogs/xfwm4-settings.c:220 +msgid "Always on top" +msgstr "總是置頂" + +#: ../settings-dialogs/xfwm4-settings.c:221 msgid "Nothing" msgstr "無" -#: ../settings-dialogs/xfwm4-settings.c:228 +#: ../settings-dialogs/xfwm4-settings.c:226 msgid "Left" msgstr "左" -#: ../settings-dialogs/xfwm4-settings.c:229 +#: ../settings-dialogs/xfwm4-settings.c:227 msgid "Center" msgstr "中" -#: ../settings-dialogs/xfwm4-settings.c:230 +#: ../settings-dialogs/xfwm4-settings.c:228 msgid "Right" msgstr "右" -#: ../settings-dialogs/xfwm4-settings.c:346 +#: ../settings-dialogs/xfwm4-settings.c:344 msgid "Theme" msgstr "主題" -#: ../settings-dialogs/xfwm4-settings.c:501 +#: ../settings-dialogs/xfwm4-settings.c:499 msgid "Action" msgstr "動作" -#: ../settings-dialogs/xfwm4-settings.c:508 +#: ../settings-dialogs/xfwm4-settings.c:506 msgid "Shortcut" msgstr "捷徑" -#: ../settings-dialogs/xfwm4-settings.c:903 +#: ../settings-dialogs/xfwm4-settings.c:900 #, c-format msgid "Failed to initialize xfconf. Reason: %s" msgstr "未能初始化 xfconf。原因：%s" -#: ../settings-dialogs/xfwm4-settings.c:914 +#: ../settings-dialogs/xfwm4-settings.c:911 msgid "Could not create the settings dialog." msgstr "無法建立設定值對話窗。" -#: ../settings-dialogs/xfwm4-settings.c:1915 +#: ../settings-dialogs/xfwm4-settings.c:1912 msgid "" "This will reset all shortcuts to their default values. Do you really want to" " do this?" msgstr "這會將所有捷徑重設為其預設值。您真的想要這麼做嗎？" -#: ../settings-dialogs/xfwm4-settings.c:1917 +#: ../settings-dialogs/xfwm4-settings.c:1914 msgid "Reset to Defaults" msgstr "重設為預設值" @@ -577,38 +581,42 @@ msgstr "在一般視窗下顯示陰影(_R)" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:51 -msgid "Zoom pointer along with the desktop" +msgid "Zoom desktop with mouse wheel" msgstr "" #: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:52 +msgid "Zoom pointer along with the desktop" +msgstr "" + +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:53 msgid "Opaci_ty of window decorations:" msgstr "視窗裝飾的不透明度(T)：" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:53 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:54 msgid "Transparent" msgstr "透明 " -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:54 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:55 msgid "Opaque" msgstr "不透明 " -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:55 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:56 msgid "Opacity of _inactive windows:" msgstr "非活動中視窗的不透明度(_I)：" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:56 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:57 msgid "Opacity of windows during _move:" msgstr "移動視窗時的不透明度(M)：" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:57 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:58 msgid "Opacity of windows during resi_ze:" msgstr "調整視窗大小時的不透明度(_Z)：" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:58 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:59 msgid "Opacity of popup wi_ndows:" msgstr "彈出式視窗的不透明度(_N)：" -#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:59 +#: ../settings-dialogs/xfwm4-tweaks-dialog.glade.h:60 msgid "C_ompositor" msgstr "合成器(_O)" @@ -648,27 +656,31 @@ msgid "Unsupported keyboard modifier '%s'" msgstr "未支援的鍵盤修飾鍵「%s」" -#: ../src/main.c:722 +#: ../src/main.c:666 msgid "Set the compositor mode" msgstr "設定合成器模式" -#: ../src/main.c:724 +#: ../src/main.c:668 msgid "Set the vblank mode" msgstr "設定 vblank 模式" -#: ../src/main.c:734 +#: ../src/main.c:678 msgid "Replace the existing window manager" msgstr "替換現存的視窗管理程式" -#: ../src/main.c:736 +#: ../src/main.c:680 msgid "Print version information and exit" msgstr "印出版本資訊並離開" -#: ../src/main.c:780 +#: ../src/main.c:683 +msgid "Enable debug logging" +msgstr "啟用除錯記錄" + +#: ../src/main.c:723 msgid "[ARGUMENTS...]" msgstr "[引數...]" -#: ../src/main.c:787 +#: ../src/main.c:730 #, c-format msgid "Type \"%s --help\" for usage." msgstr "輸入 \"%s --help\" 以瞭解用法。" diff -Nru xfwm4-4.16.0/settings-dialogs/Makefile.in xfwm4-4.16.1/settings-dialogs/Makefile.in --- xfwm4-4.16.0/settings-dialogs/Makefile.in 2020-12-22 22:56:39.000000000 +0000 +++ xfwm4-4.16.1/settings-dialogs/Makefile.in 2021-01-09 17:58:47.000000000 +0000 @@ -446,7 +446,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -Nru xfwm4-4.16.0/src/compositor.c xfwm4-4.16.1/src/compositor.c --- xfwm4-4.16.0/src/compositor.c 2020-12-17 16:59:47.000000000 +0000 +++ xfwm4-4.16.1/src/compositor.c 2021-01-09 17:01:31.000000000 +0000 @@ -230,14 +230,18 @@ int xws, yws, xbs, ybs; unsigned wws, hws, wbs, hbs; int boundingShaped, clipShaped; + int result; g_return_val_if_fail (display_info != NULL, FALSE); if (display_info->have_shape) { + myDisplayErrorTrapPush (display_info); XShapeQueryExtents (display_info->dpy, id, &boundingShaped, &xws, &yws, &wws, &hws, &clipShaped, &xbs, &ybs, &wbs, &hbs); - return (boundingShaped != 0); + result = myDisplayErrorTrapPop (display_info); + + return ((result == Success) && (boundingShaped != 0)); } return FALSE; } @@ -1113,7 +1117,12 @@ #if HAVE_PRESENT_EXTENSION const char *prefer_xpresent[] = { "Intel", - "AMD", + /* Cannot add AMD and Radeon until the fix for + * https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu/-/issues/10 + * is included in a release. + */ + /* "AMD", */ + /* "Radeon", */ NULL }; #endif /* HAVE_PRESENT_EXTENSION */ @@ -1138,7 +1147,7 @@ i++; if (prefer_xpresent[i]) { - g_message ("Prefer XPresent with %s", glRenderer); + g_info ("Prefer XPresent with %s", glRenderer); return FALSE; } } @@ -3273,6 +3282,7 @@ return; } + myDisplayErrorTrapPush (display_info); if (c == NULL) { /* We must be notified of property changes for transparency, even if the win is not managed */ @@ -3284,6 +3294,7 @@ { XShapeSelectInput (display_info->dpy, id, ShapeNotifyMask); } + myDisplayErrorTrapPopIgnored (display_info); new->c = c; new->screen_info = screen_info; @@ -3296,9 +3307,9 @@ if (new->attr.class != InputOnly) { - myDisplayErrorTrapPush (screen_info->display_info); + myDisplayErrorTrapPush (display_info); new->damage = XDamageCreate (display_info->dpy, id, XDamageReportNonEmpty); - if (myDisplayErrorTrapPop (screen_info->display_info) != Success) + if (myDisplayErrorTrapPop (display_info) != Success) { new->damage = None; } @@ -3774,8 +3785,11 @@ ScreenInfo *screen_info = myDisplayGetScreenFromRoot (display_info, ev->window); if ((screen_info) && (screen_info->compositor_active) && (screen_info->rootTile)) { + myDisplayErrorTrapPush (display_info); XClearArea (display_info->dpy, screen_info->output, 0, 0, 0, 0, TRUE); XRenderFreePicture (display_info->dpy, screen_info->rootTile); + myDisplayErrorTrapPopIgnored (display_info); + screen_info->rootTile = None; damage_screen (screen_info); diff -Nru xfwm4-4.16.0/src/events.c xfwm4-4.16.1/src/events.c --- xfwm4-4.16.0/src/events.c 2020-12-17 16:59:47.000000000 +0000 +++ xfwm4-4.16.1/src/events.c 2021-01-05 08:18:26.000000000 +0000 @@ -995,43 +995,35 @@ } } } - else if ((win == MYWINDOW_XWINDOW (c->corners[CORNER_TOP_LEFT])) - && (state == 0)) + else if (win == MYWINDOW_XWINDOW (c->corners[CORNER_TOP_LEFT])) { edgeButton (c, CORNER_TOP_LEFT, event); } - else if ((win == MYWINDOW_XWINDOW (c->corners[CORNER_TOP_RIGHT])) - && (state == 0)) + else if (win == MYWINDOW_XWINDOW (c->corners[CORNER_TOP_RIGHT])) { edgeButton (c, CORNER_TOP_RIGHT, event); } - else if ((win == MYWINDOW_XWINDOW (c->corners[CORNER_BOTTOM_LEFT])) - && (state == 0)) + else if (win == MYWINDOW_XWINDOW (c->corners[CORNER_BOTTOM_LEFT])) { edgeButton (c, CORNER_BOTTOM_LEFT, event); } - else if ((win == MYWINDOW_XWINDOW (c->corners[CORNER_BOTTOM_RIGHT])) - && (state == 0)) + else if (win == MYWINDOW_XWINDOW (c->corners[CORNER_BOTTOM_RIGHT])) { edgeButton (c, CORNER_BOTTOM_RIGHT, event); } - else if ((win == MYWINDOW_XWINDOW (c->sides[SIDE_BOTTOM])) - && (state == 0)) + else if (win == MYWINDOW_XWINDOW (c->sides[SIDE_BOTTOM])) { edgeButton (c, CORNER_COUNT + SIDE_BOTTOM, event); } - else if ((win == MYWINDOW_XWINDOW (c->sides[SIDE_TOP])) - && (state == 0)) + else if (win == MYWINDOW_XWINDOW (c->sides[SIDE_TOP])) { edgeButton (c, CORNER_COUNT + SIDE_TOP, event); } - else if ((win == MYWINDOW_XWINDOW (c->sides[SIDE_LEFT])) - && (state == 0)) + else if (win == MYWINDOW_XWINDOW (c->sides[SIDE_LEFT])) { edgeButton (c, CORNER_COUNT + SIDE_LEFT, event); } - else if ((win == MYWINDOW_XWINDOW (c->sides[SIDE_RIGHT])) - && (state == 0)) + else if (win == MYWINDOW_XWINDOW (c->sides[SIDE_RIGHT])) { edgeButton (c, CORNER_COUNT + SIDE_RIGHT, event); } @@ -1709,7 +1701,10 @@ XFree (c->wmhints); } + myDisplayErrorTrapPush (display_info); c->wmhints = XGetWMHints (display_info->dpy, c->window); + myDisplayErrorTrapPopIgnored (display_info); + if (c->wmhints) { if (c->wmhints->flags & WindowGroupHint) diff -Nru xfwm4-4.16.0/src/hints.c xfwm4-4.16.1/src/hints.c --- xfwm4-4.16.0/src/hints.c 2020-12-19 23:49:17.000000000 +0000 +++ xfwm4-4.16.1/src/hints.c 2021-01-05 08:18:26.000000000 +0000 @@ -1419,12 +1419,15 @@ TRACE ("entering"); + myDisplayErrorTrapPush (display_info); systray_win = XGetSelectionOwner (display_info->dpy, net_system_tray_selection); if (systray_win) { XSelectInput (display_info->dpy, systray_win, StructureNotifyMask); } + myDisplayErrorTrapPopIgnored (display_info); TRACE ("new systray window: 0x%lx", systray_win); + return systray_win; } #endif diff -Nru xfwm4-4.16.0/src/Makefile.in xfwm4-4.16.1/src/Makefile.in --- xfwm4-4.16.0/src/Makefile.in 2020-12-22 22:56:39.000000000 +0000 +++ xfwm4-4.16.1/src/Makefile.in 2021-01-09 17:58:47.000000000 +0000 @@ -422,7 +422,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -Nru xfwm4-4.16.0/src/netwm.c xfwm4-4.16.1/src/netwm.c --- xfwm4-4.16.0/src/netwm.c 2020-12-19 23:49:17.000000000 +0000 +++ xfwm4-4.16.1/src/netwm.c 2021-01-05 08:18:27.000000000 +0000 @@ -794,6 +794,7 @@ c->pre_fullscreen_geometry.height = c->height; c->pre_fullscreen_layer = c->win_layer; layer = WIN_LAYER_FULLSCREEN; + clientUntile (c); } else { diff -Nru xfwm4-4.16.0/src/screen.c xfwm4-4.16.1/src/screen.c --- xfwm4-4.16.0/src/screen.c 2020-08-27 22:00:35.000000000 +0000 +++ xfwm4-4.16.1/src/screen.c 2021-01-09 17:18:48.000000000 +0000 @@ -102,8 +102,8 @@ { if (!replace_wm) { - g_message ("Another Window Manager (%s) is already running on screen %s", wm_name, display_name); - g_message ("To replace the current window manager, try \"--replace\""); + g_print ("Another Window Manager (%s) is already running on screen %s\n", wm_name, display_name); + g_print ("To replace the current window manager, try \"--replace\"\n"); g_free (display_name); return FALSE; diff -Nru xfwm4-4.16.0/themes/daloa/Makefile.in xfwm4-4.16.1/themes/daloa/Makefile.in --- xfwm4-4.16.0/themes/daloa/Makefile.in 2020-12-22 22:56:39.000000000 +0000 +++ xfwm4-4.16.1/themes/daloa/Makefile.in 2021-01-09 17:58:47.000000000 +0000 @@ -353,7 +353,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -Nru xfwm4-4.16.0/themes/default/Makefile.in xfwm4-4.16.1/themes/default/Makefile.in --- xfwm4-4.16.0/themes/default/Makefile.in 2020-12-22 22:56:40.000000000 +0000 +++ xfwm4-4.16.1/themes/default/Makefile.in 2021-01-09 17:58:47.000000000 +0000 @@ -353,7 +353,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -Nru xfwm4-4.16.0/themes/default-hdpi/Makefile.in xfwm4-4.16.1/themes/default-hdpi/Makefile.in --- xfwm4-4.16.0/themes/default-hdpi/Makefile.in 2020-12-22 22:56:40.000000000 +0000 +++ xfwm4-4.16.1/themes/default-hdpi/Makefile.in 2021-01-09 17:58:47.000000000 +0000 @@ -353,7 +353,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -Nru xfwm4-4.16.0/themes/default-xhdpi/Makefile.in xfwm4-4.16.1/themes/default-xhdpi/Makefile.in --- xfwm4-4.16.0/themes/default-xhdpi/Makefile.in 2020-12-22 22:56:40.000000000 +0000 +++ xfwm4-4.16.1/themes/default-xhdpi/Makefile.in 2021-01-09 17:58:47.000000000 +0000 @@ -353,7 +353,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -Nru xfwm4-4.16.0/themes/kokodi/Makefile.in xfwm4-4.16.1/themes/kokodi/Makefile.in --- xfwm4-4.16.0/themes/kokodi/Makefile.in 2020-12-22 22:56:40.000000000 +0000 +++ xfwm4-4.16.1/themes/kokodi/Makefile.in 2021-01-09 17:58:47.000000000 +0000 @@ -353,7 +353,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -Nru xfwm4-4.16.0/themes/Makefile.in xfwm4-4.16.1/themes/Makefile.in --- xfwm4-4.16.0/themes/Makefile.in 2020-12-22 22:56:39.000000000 +0000 +++ xfwm4-4.16.1/themes/Makefile.in 2021-01-09 17:58:47.000000000 +0000 @@ -386,7 +386,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -Nru xfwm4-4.16.0/themes/moheli/Makefile.in xfwm4-4.16.1/themes/moheli/Makefile.in --- xfwm4-4.16.0/themes/moheli/Makefile.in 2020-12-22 22:56:40.000000000 +0000 +++ xfwm4-4.16.1/themes/moheli/Makefile.in 2021-01-09 17:58:47.000000000 +0000 @@ -353,7 +353,6 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ -runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@