diff -Nru xfconf-4.19.3/ChangeLog xfconf-4.20.0/ChangeLog
--- xfconf-4.19.3/ChangeLog 2024-10-18 14:13:06.000000000 +0800
+++ xfconf-4.20.0/ChangeLog 2024-12-15 17:33:41.000000000 +0800
@@ -1,3 +1,99 @@
+commit 078859af53858cddfa99c4b72070a70ed3eb6772
+Author: Alexander Schwinn <alexxcons@xfce.org>
+Date: Sun Dec 15 10:33:04 2024 +0100
+
+ Updates for release
+
+commit 0a51917b5904943bb7fed32d3974073c52c23a4f
+Author: Anonymous <noreply@xfce.org>
+Date: Mon Dec 9 12:53:44 2024 +0100
+
+ I18n: Update translation ro (100%).
+
+ 67 translated messages.
+
+ Transifex (https://explore.transifex.com/xfce/).
+
+commit 6e13d2576b3c46b6b9f0f6ee4ad1b7f146ca77ec
+Author: Alexander Schwinn <alexxcons@xfce.org>
+Date: Sun Dec 1 16:26:25 2024 +0100
+
+ Back to development
+
+commit 8f9d673b363100a7642a3730b99c03800de40e0b
+Author: Alexander Schwinn <alexxcons@xfce.org>
+Date: Sun Dec 1 16:24:54 2024 +0100
+
+ Updates for release
+
+commit 225d3c8979c4d2b3692603d58871b680ae3b23a1
+Author: correctmost <11866-correctmost@users.noreply.gitlab.xfce.org>
+Date: Tue Nov 26 14:20:24 2024 -0500
+
+ Fix FakeGdkRGBA and FakeGdkColor leaks
+
+commit 9c4ea6c1c4c5f67ef825a614faa06bb9f90d6e28
+Author: correctmost <11866-correctmost@users.noreply.gitlab.xfce.org>
+Date: Tue Nov 26 15:16:20 2024 -0500
+
+ tests: Fix D-Bus error reporting when xfconfd is not auto-started
+
+ Completes: 54df98d3fd
+
+commit 508d6e6c3b38a98de58d977ca66d29d463841749
+Author: Anonymous <noreply@xfce.org>
+Date: Thu Nov 21 00:53:33 2024 +0100
+
+ I18n: Update translation pl (100%).
+
+ 67 translated messages.
+
+ Transifex (https://explore.transifex.com/xfce/).
+
+commit 48ee66a2b78ffb599f8108503ab4d8f544b40683
+Author: Anonymous <noreply@xfce.org>
+Date: Sat Nov 16 12:53:01 2024 +0100
+
+ I18n: Update translation gl (100%).
+
+ 67 translated messages.
+
+ Transifex (https://explore.transifex.com/xfce/).
+
+commit 621ce5ad7bb7553da11876d93137b8b9a4ed791c
+Author: Anonymous <noreply@xfce.org>
+Date: Mon Nov 4 00:59:02 2024 +0100
+
+ I18n: Update translation cs (100%).
+
+ 67 translated messages.
+
+ Transifex (https://explore.transifex.com/xfce/).
+
+commit 37a1bac17f74f11efa339b2e087c0fc2806cfd20
+Author: Alexander Schwinn <alexxcons@xfce.org>
+Date: Fri Nov 1 22:31:22 2024 +0100
+
+ Back to development
+
+commit 7125e2fb4c8c7503ff5d7bb5f868731b2b1a0130
+Author: Alexander Schwinn <alexxcons@xfce.org>
+Date: Fri Nov 1 21:40:21 2024 +0100
+
+ Updates for release
+
+commit 263f1e930f6d11a8e0b33b71bccd36f9040db89e
+Author: Veronika Kerm <veronika.kerm@gmail.com>
+Date: Tue Oct 22 16:17:53 2024 +0000
+
+ xfconf-query: print array property values when -lv
+
+commit 490ccadb25037cf80bd68cc1df4ac3082de5dd51
+Author: Gaël Bonithon <gael@xfce.org>
+Date: Fri Oct 18 08:18:34 2024 +0200
+
+ Back to development
+
commit 10e420b0b73917e2afb1e9b73a843d679333df85
Author: Gaël Bonithon <gael@xfce.org>
Date: Fri Oct 18 08:09:56 2024 +0200
diff -Nru xfconf-4.19.3/Makefile.in xfconf-4.20.0/Makefile.in
--- xfconf-4.19.3/Makefile.in 2024-10-18 14:11:58.000000000 +0800
+++ xfconf-4.20.0/Makefile.in 2024-12-15 17:33:36.000000000 +0800
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.17 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2024 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -69,8 +69,6 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-am__rm_f = rm -f $(am__rm_f_notfound)
-am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -177,8 +175,8 @@
top_distdir = $(distdir)
am__remove_distdir = \
if test -d "$(distdir)"; then \
- find "$(distdir)" -type d ! -perm -700 -exec chmod u+rwx {} ';' \
- ; rm -rf "$(distdir)" \
+ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -rf "$(distdir)" \
|| { sleep 5 && rm -rf "$(distdir)"; }; \
else :; fi
am__post_remove_distdir = $(am__remove_distdir)
@@ -207,7 +205,7 @@
dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
done; \
reldir="$$dir2"
-GZIP_ENV = -9
+GZIP_ENV = --best
DIST_ARCHIVES = $(distdir).tar.bz2
DIST_TARGETS = dist-bzip2
# Exists only to be overridden by the user if desired.
@@ -215,9 +213,7 @@
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-distcleancheck_listfiles = \
- find . \( -type f -a \! \
- \( -name .nfs* -o -name .smb* -o -name .__afs* \) \) -print
+distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -370,10 +366,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
-am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -470,12 +464,12 @@
@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- $(AM_V_at)rm -f stamp-h1
- $(AM_V_GEN)cd $(top_builddir) && $(SHELL) ./config.status config.h
+ @rm -f stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status config.h
$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- $(AM_V_GEN)($(am__cd) $(top_srcdir) && $(AUTOHEADER))
- $(AM_V_at)rm -f stamp-h1
- $(AM_V_at)touch $@
+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+ rm -f stamp-h1
+ touch $@
distclean-hdr:
-rm -f config.h stamp-h1
@@ -599,7 +593,7 @@
distdir-am: $(DISTFILES)
$(am__remove_distdir)
- $(AM_V_at)$(MKDIR_P) "$(distdir)"
+ test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -712,7 +706,7 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- eval GZIP= gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
@@ -722,7 +716,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- eval GZIP= gzip -dc $(distdir).shar.gz | unshar ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
*.tar.zst*) \
@@ -822,8 +816,8 @@
clean-generic:
distclean-generic:
- -$(am__rm_f) $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -932,10 +926,3 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-
-# Tell GNU make to disable its built-in pattern rules.
-%:: %,v
-%:: RCS/%,v
-%:: RCS/%
-%:: s.%
-%:: SCCS/s.%
diff -Nru xfconf-4.19.3/NEWS xfconf-4.20.0/NEWS
--- xfconf-4.19.3/NEWS 2024-10-18 14:09:42.000000000 +0800
+++ xfconf-4.20.0/NEWS 2024-12-15 17:32:57.000000000 +0800
@@ -1,3 +1,21 @@
+4.20.0 (2024-12-15)
+======
+
+- Translation Updates:
+ Romanian
+
+4.19.5 (2024-12-01)
+======
+- Fix FakeGdkRGBA and FakeGdkColor leaks
+- tests: Fix D-Bus error reporting when xfconfd is not auto-started
+- Translation Updates:
+ Czech, Galician, Polish
+
+4.19.4 (2024-11-01)
+======
+- xfconf-query: print array property values when -lv
+
+
4.19.3 (2024-10-18)
======
- Safer/better way to find GdkColor/GdkRGBA GTypes in the unified API
diff -Nru xfconf-4.19.3/aclocal.m4 xfconf-4.20.0/aclocal.m4
--- xfconf-4.19.3/aclocal.m4 2024-10-18 14:11:40.000000000 +0800
+++ xfconf-4.20.0/aclocal.m4 2024-12-15 17:33:36.000000000 +0800
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.17 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
-# Copyright (C) 1996-2024 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,13 +14,13 @@
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.72],,
-[m4_warning([this file was generated for autoconf 2.72.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],,
+[m4_warning([this file was generated for autoconf 2.71.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2024 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@
# 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.17'
+[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.17], [],
+m4_if([$1], [1.16.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@
# 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.17])dnl
+[AM_AUTOMAKE_VERSION([1.16.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2024 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2024 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -141,7 +141,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2024 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -273,7 +273,7 @@
# 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 thus:
+ # 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
@@ -332,7 +332,7 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2024 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -400,7 +400,7 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2024 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -534,7 +534,7 @@
fi
AC_SUBST([CSCOPE])
-AC_REQUIRE([_AM_SILENT_RULES])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.
@@ -542,9 +542,47 @@
[m4_provide_if([_AM_COMPILER_EXEEXT],
[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-AC_REQUIRE([_AM_PROG_RM_F])
-AC_REQUIRE([_AM_PROG_XARGS_N])
+# 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!
+
+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: <http://austingroupbugs.net/view.php?id=542>
+
+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.
+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: <https://www.gnu.org/software/coreutils/>.
+
+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.
+
+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.
@@ -577,7 +615,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2024 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -598,7 +636,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2024 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -620,7 +658,7 @@
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2024 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -655,7 +693,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2024 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -698,7 +736,7 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2024 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -732,7 +770,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2024 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -761,7 +799,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2024 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -808,23 +846,7 @@
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2022-2024 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_RM_F
-# ---------------
-# Check whether 'rm -f' without any arguments works.
-# https://bugs.gnu.org/10828
-AC_DEFUN([_AM_PROG_RM_F],
-[am__rm_f_notfound=
-AS_IF([(rm -f && rm -fr && rm -rf) 2>/dev/null], [], [am__rm_f_notfound='""'])
-AC_SUBST(am__rm_f_notfound)
-])
-
-# Copyright (C) 2001-2024 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -843,169 +865,16 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2024 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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_SLEEP_FRACTIONAL_SECONDS
-# ----------------------------
-AC_DEFUN([_AM_SLEEP_FRACTIONAL_SECONDS], [dnl
-AC_CACHE_CHECK([whether sleep supports fractional seconds],
- am_cv_sleep_fractional_seconds, [dnl
-AS_IF([sleep 0.001 2>/dev/null], [am_cv_sleep_fractional_seconds=yes],
- [am_cv_sleep_fractional_seconds=no])
-])])
-
-# _AM_FILESYSTEM_TIMESTAMP_RESOLUTION
-# -----------------------------------
-# Determine the filesystem's resolution for file modification
-# timestamps. The coarsest we know of is FAT, with a resolution
-# of only two seconds, even with the most recent "exFAT" extensions.
-# The finest (e.g. ext4 with large inodes, XFS, ZFS) is one
-# nanosecond, matching clock_gettime. However, it is probably not
-# possible to delay execution of a shell script for less than one
-# millisecond, due to process creation overhead and scheduling
-# granularity, so we don't check for anything finer than that. (See below.)
-AC_DEFUN([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION], [dnl
-AC_REQUIRE([_AM_SLEEP_FRACTIONAL_SECONDS])
-AC_CACHE_CHECK([filesystem timestamp resolution],
- am_cv_filesystem_timestamp_resolution, [dnl
-# Default to the worst case.
-am_cv_filesystem_timestamp_resolution=2
-
-# Only try to go finer than 1 sec if sleep can do it.
-# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work,
-# - 1 sec is not much of a win compared to 2 sec, and
-# - it takes 2 seconds to perform the test whether 1 sec works.
-#
-# Instead, just use the default 2s on platforms that have 1s resolution,
-# accept the extra 1s delay when using $sleep in the Automake tests, in
-# exchange for not incurring the 2s delay for running the test for all
-# packages.
-#
-am_try_resolutions=
-if test "$am_cv_sleep_fractional_seconds" = yes; then
- # Even a millisecond often causes a bunch of false positives,
- # so just try a hundredth of a second. The time saved between .001 and
- # .01 is not terribly consequential.
- am_try_resolutions="0.01 0.1 $am_try_resolutions"
-fi
-
-# In order to catch current-generation FAT out, we must *modify* files
-# that already exist; the *creation* timestamp is finer. Use names
-# that make ls -t sort them differently when they have equal
-# timestamps than when they have distinct timestamps, keeping
-# in mind that ls -t prints the *newest* file first.
-rm -f conftest.ts?
-: > conftest.ts1
-: > conftest.ts2
-: > conftest.ts3
-
-# Make sure ls -t actually works. Do 'set' in a subshell so we don't
-# clobber the current shell's arguments. (Outer-level square brackets
-# are removed by m4; they're present so that m4 does not expand
-# <dollar><star>; be careful, easy to get confused.)
-if (
- set X `[ls -t conftest.ts[12]]` &&
- {
- test "$[]*" != "X conftest.ts1 conftest.ts2" ||
- test "$[]*" != "X conftest.ts2 conftest.ts1";
- }
-); then :; else
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- _AS_ECHO_UNQUOTED(
- ["Bad output from ls -t: \"`[ls -t conftest.ts[12]]`\""],
- [AS_MESSAGE_LOG_FD])
- AC_MSG_FAILURE([ls -t produces unexpected output.
-Make sure there is not a broken ls alias in your environment.])
-fi
-
-for am_try_res in $am_try_resolutions; do
- # Any one fine-grained sleep might happen to cross the boundary
- # between two values of a coarser actual resolution, but if we do
- # two fine-grained sleeps in a row, at least one of them will fall
- # entirely within a coarse interval.
- echo alpha > conftest.ts1
- sleep $am_try_res
- echo beta > conftest.ts2
- sleep $am_try_res
- echo gamma > conftest.ts3
-
- # We assume that 'ls -t' will make use of high-resolution
- # timestamps if the operating system supports them at all.
- if (set X `ls -t conftest.ts?` &&
- test "$[]2" = conftest.ts3 &&
- test "$[]3" = conftest.ts2 &&
- test "$[]4" = conftest.ts1); then
- #
- # Ok, ls -t worked. If we're at a resolution of 1 second, we're done,
- # because we don't need to test make.
- make_ok=true
- if test $am_try_res != 1; then
- # But if we've succeeded so far with a subsecond resolution, we
- # have one more thing to check: make. It can happen that
- # everything else supports the subsecond mtimes, but make doesn't;
- # notably on macOS, which ships make 3.81 from 2006 (the last one
- # released under GPLv2). https://bugs.gnu.org/68808
- #
- # We test $MAKE if it is defined in the environment, else "make".
- # It might get overridden later, but our hope is that in practice
- # it does not matter: it is the system "make" which is (by far)
- # the most likely to be broken, whereas if the user overrides it,
- # probably they did so with a better, or at least not worse, make.
- # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html
- #
- # Create a Makefile (real tab character here):
- rm -f conftest.mk
- echo 'conftest.ts1: conftest.ts2' >conftest.mk
- echo ' touch conftest.ts2' >>conftest.mk
- #
- # Now, running
- # touch conftest.ts1; touch conftest.ts2; make
- # should touch ts1 because ts2 is newer. This could happen by luck,
- # but most often, it will fail if make's support is insufficient. So
- # test for several consecutive successes.
- #
- # (We reuse conftest.ts[12] because we still want to modify existing
- # files, not create new ones, per above.)
- n=0
- make=${MAKE-make}
- until test $n -eq 3; do
- echo one > conftest.ts1
- sleep $am_try_res
- echo two > conftest.ts2 # ts2 should now be newer than ts1
- if $make -f conftest.mk | grep 'up to date' >/dev/null; then
- make_ok=false
- break # out of $n loop
- fi
- n=`expr $n + 1`
- done
- fi
- #
- if $make_ok; then
- # Everything we know to check worked out, so call this resolution good.
- am_cv_filesystem_timestamp_resolution=$am_try_res
- break # out of $am_try_res loop
- fi
- # Otherwise, we'll go on to check the next resolution.
- fi
-done
-rm -f conftest.ts?
-# (end _am_filesystem_timestamp_resolution)
-])])
-
# AM_SANITY_CHECK
# ---------------
AC_DEFUN([AM_SANITY_CHECK],
-[AC_REQUIRE([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION])
-# This check should not be cached, as it may vary across builds of
-# different projects.
-AC_MSG_CHECKING([whether build environment is sane])
+[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='
@@ -1024,40 +893,49 @@
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
-am_build_env_is_sane=no
-am_has_slept=no
-rm -f conftest.file
-for am_try in 1 2; do
- echo "timestamp, slept: $am_has_slept" > conftest.file
- if (
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$[]*" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- test "$[]2" = conftest.file
- ); then
- am_build_env_is_sane=yes
- break
- fi
- # Just in case.
- sleep "$am_cv_filesystem_timestamp_resolution"
- am_has_slept=yes
-done
-
-AC_MSG_RESULT([$am_build_env_is_sane])
-if test "$am_build_env_is_sane" = no; then
- AC_MSG_ERROR([newly created file is older than distributed files!
+if (
+ am_has_slept=no
+ for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$[*]" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+ alias in your environment])
+ fi
+ if test "$[2]" = conftest.file || test $am_try -eq 2; then
+ break
+ fi
+ # Just in case.
+ sleep 1
+ am_has_slept=yes
+ done
+ test "$[2]" = conftest.file
+ )
+then
+ # Ok.
+ :
+else
+ AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
-
+AC_MSG_RESULT([yes])
# If we didn't sleep, we still need to ensure time stamps of config.status and
# generated files are strictly newer.
am_sleep_pid=
-AS_IF([test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1],, [dnl
- ( sleep "$am_cv_filesystem_timestamp_resolution" ) &
+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
@@ -1068,18 +946,18 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2024 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 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
-# ----------------
-# Enable less verbose build rules support.
-AC_DEFUN([_AM_SILENT_RULES],
-[AM_DEFAULT_VERBOSITY=1
-AC_ARG_ENABLE([silent-rules], [dnl
+# 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")])
@@ -1087,6 +965,11 @@
[--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.
@@ -1105,21 +988,6 @@
else
am_cv_make_support_nested_variables=no
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
-dnl Delay evaluation of AM_DEFAULT_VERBOSITY to the end to allow multiple calls
-dnl to AM_SILENT_RULES to change the default value.
-AC_CONFIG_COMMANDS_PRE([dnl
-case $enable_silent_rules in @%:@ (((
- yes) AM_DEFAULT_VERBOSITY=0;;
- no) AM_DEFAULT_VERBOSITY=1;;
-esac
if test $am_cv_make_support_nested_variables = yes; then
dnl Using '$V' instead of '$(V)' breaks IRIX make.
AM_V='$(V)'
@@ -1128,18 +996,17 @@
AM_V=$AM_DEFAULT_VERBOSITY
AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
fi
-])dnl
+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
])
-# AM_SILENT_RULES([DEFAULT])
-# --------------------------
-# Set the default verbosity level to DEFAULT ("yes" being less verbose, "no" or
-# empty being verbose).
-AC_DEFUN([AM_SILENT_RULES],
-[AC_REQUIRE([_AM_SILENT_RULES])
-AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1])])
-
-# Copyright (C) 2001-2024 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1167,7 +1034,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2024 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1186,7 +1053,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2024 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1232,19 +1099,15 @@
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 x$am_uid = xunknown; then
- AC_MSG_WARN([ancient id detected; assuming current UID is ok, but dist-ustar might not work])
- elif test $am_uid -le $am_max_uid; then
- AC_MSG_RESULT([yes])
+ if test $am_uid -le $am_max_uid; then
+ AC_MSG_RESULT([yes])
else
- AC_MSG_RESULT([no])
- _am_tools=none
+ AC_MSG_RESULT([no])
+ _am_tools=none
fi
AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
- if test x$gm_gid = xunknown; then
- AC_MSG_WARN([ancient id detected; assuming current GID is ok, but dist-ustar might not work])
- elif test $am_gid -le $am_max_gid; then
- AC_MSG_RESULT([yes])
+ if test $am_gid -le $am_max_gid; then
+ AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
_am_tools=none
@@ -1321,26 +1184,6 @@
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
-# Copyright (C) 2022-2024 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_XARGS_N
-# ----------------
-# Check whether 'xargs -n' works. It should work everywhere, so the fallback
-# is not optimized at all as we never expect to use it.
-AC_DEFUN([_AM_PROG_XARGS_N],
-[AC_CACHE_CHECK([xargs -n works], am_cv_xargs_n_works, [dnl
-AS_IF([test "`echo 1 2 3 | xargs -n2 echo`" = "1 2
-3"], [am_cv_xargs_n_works=yes], [am_cv_xargs_n_works=no])])
-AS_IF([test "$am_cv_xargs_n_works" = yes], [am__xargs_n='xargs -n'], [dnl
- am__xargs_n='am__xargs_n () { shift; sed "s/ /\\n/g" | while read am__xargs_n_arg; do "$@" "$am__xargs_n_arg"; done; }'
-])dnl
-AC_SUBST(am__xargs_n)
-])
-
# pkg.m4 - Macros to locate and use pkg-config. -*- Autoconf -*-
# serial 12 (pkg-config-0.29.2)
diff -Nru xfconf-4.19.3/common/Makefile.in xfconf-4.20.0/common/Makefile.in
--- xfconf-4.19.3/common/Makefile.in 2024-10-18 14:11:59.000000000 +0800
+++ xfconf-4.20.0/common/Makefile.in 2024-12-15 17:33:36.000000000 +0800
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.17 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2024 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -70,8 +70,6 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-am__rm_f = rm -f $(am__rm_f_notfound)
-am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -361,10 +359,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
-am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -515,13 +511,15 @@
$(am__aclocal_m4_deps):
clean-noinstLTLIBRARIES:
- -$(am__rm_f) $(noinst_LTLIBRARIES)
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
@list='$(noinst_LTLIBRARIES)'; \
locs=`for p in $$list; do echo $$p; done | \
sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
sort -u`; \
- echo rm -f $${locs}; \
- $(am__rm_f) $${locs}
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
libxfconf-common.la: $(libxfconf_common_la_OBJECTS) $(libxfconf_common_la_DEPENDENCIES) $(EXTRA_libxfconf_common_la_DEPENDENCIES)
$(AM_V_CCLD)$(libxfconf_common_la_LINK) $(libxfconf_common_la_OBJECTS) $(libxfconf_common_la_LIBADD) $(LIBS)
@@ -545,7 +543,7 @@
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
- @: >>$@
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
am--depfiles: $(am__depfiles_remade)
@@ -723,24 +721,24 @@
mostlyclean-generic:
clean-generic:
- -$(am__rm_f) $(CLEANFILES)
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
- -$(am__rm_f) $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
- -$(am__rm_f) $(DISTCLEANFILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
- -$(am__rm_f) $(BUILT_SOURCES)
+ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
clean: clean-am
clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
mostlyclean-am
distclean: distclean-am
- -rm -f ./$(DEPDIR)/libxfconf_common_la-xfconf-errors.Plo
+ -rm -f ./$(DEPDIR)/libxfconf_common_la-xfconf-errors.Plo
-rm -f ./$(DEPDIR)/libxfconf_common_la-xfconf-marshal.Plo
-rm -f ./$(DEPDIR)/libxfconf_dbus_la-xfconf-gdbus-bindings.Plo
-rm -f ./$(DEPDIR)/libxfconf_gvaluefuncs_la-xfconf-gvaluefuncs.Plo
@@ -789,7 +787,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -f ./$(DEPDIR)/libxfconf_common_la-xfconf-errors.Plo
+ -rm -f ./$(DEPDIR)/libxfconf_common_la-xfconf-errors.Plo
-rm -f ./$(DEPDIR)/libxfconf_common_la-xfconf-marshal.Plo
-rm -f ./$(DEPDIR)/libxfconf_dbus_la-xfconf-gdbus-bindings.Plo
-rm -f ./$(DEPDIR)/libxfconf_gvaluefuncs_la-xfconf-gvaluefuncs.Plo
@@ -861,10 +859,3 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-
-# Tell GNU make to disable its built-in pattern rules.
-%:: %,v
-%:: RCS/%,v
-%:: RCS/%
-%:: s.%
-%:: SCCS/s.%
diff -Nru xfconf-4.19.3/compile xfconf-4.20.0/compile
--- xfconf-4.19.3/compile 2024-10-18 14:11:58.000000000 +0800
+++ xfconf-4.20.0/compile 2024-12-15 17:33:36.000000000 +0800
@@ -1,9 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2024-06-19.01; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2024 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -143,7 +143,7 @@
# configure might choose to run compile as 'compile cc -o foo foo.c'.
eat=1
case $2 in
- *.o | *.lo | *.[oO][bB][jJ])
+ *.o | *.[oO][bB][jJ])
func_file_conv "$2"
set x "$@" -Fo"$file"
shift
@@ -248,17 +248,14 @@
right script to run: please start by reading the file 'INSTALL'.
Report bugs to <bug-automake@gnu.org>.
-GNU Automake home page: <https://www.gnu.org/software/automake/>.
-General help using GNU software: <https://www.gnu.org/gethelp/>.
EOF
exit $?
;;
-v | --v*)
- echo "compile (GNU Automake) $scriptversion"
+ echo "compile $scriptversion"
exit $?
;;
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
- clang-cl | *[/\\]clang-cl | clang-cl.exe | *[/\\]clang-cl.exe | \
icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
diff -Nru xfconf-4.19.3/completions/Makefile.in xfconf-4.20.0/completions/Makefile.in
--- xfconf-4.19.3/completions/Makefile.in 2024-10-18 14:11:59.000000000 +0800
+++ xfconf-4.20.0/completions/Makefile.in 2024-12-15 17:33:36.000000000 +0800
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.17 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2024 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -70,8 +70,6 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-am__rm_f = rm -f $(am__rm_f_notfound)
-am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -152,9 +150,10 @@
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__uninstall_files_from_dir = { \
- { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
}
am__installdirs = "$(DESTDIR)$(bashcompletiondir)"
DATA = $(dist_bashcompletion_DATA)
@@ -313,10 +312,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
-am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -489,8 +486,8 @@
clean-generic:
distclean-generic:
- -$(am__rm_f) $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -582,10 +579,3 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-
-# Tell GNU make to disable its built-in pattern rules.
-%:: %,v
-%:: RCS/%,v
-%:: RCS/%
-%:: s.%
-%:: SCCS/s.%
diff -Nru xfconf-4.19.3/config.guess xfconf-4.20.0/config.guess
--- xfconf-4.19.3/config.guess 2024-10-18 14:11:58.000000000 +0800
+++ xfconf-4.20.0/config.guess 2024-12-15 17:33:36.000000000 +0800
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2024 Free Software Foundation, Inc.
+# Copyright 1992-2022 Free Software Foundation, Inc.
# shellcheck disable=SC2006,SC2268 # see below for rationale
-timestamp='2024-01-01'
+timestamp='2022-01-09'
# 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
@@ -47,7 +47,7 @@
usage="\
Usage: $0 [OPTION]
-Output the configuration name of the system '$me' is run on.
+Output the configuration name of the system \`$me' is run on.
Options:
-h, --help print this help, then exit
@@ -60,13 +60,13 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2024 Free Software Foundation, Inc.
+Copyright 1992-2022 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
help="
-Try '$me --help' for more information."
+Try \`$me --help' for more information."
# Parse command line
while test $# -gt 0 ; do
@@ -102,8 +102,8 @@
# temporary files to be created and, as you can see below, it is a
# headache to deal with in a portable fashion.
-# Historically, 'CC_FOR_BUILD' used to be named 'HOST_CC'. We still
-# use 'HOST_CC' if defined, but it is deprecated.
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
# Portable tmp directory creation inspired by the Autoconf team.
@@ -155,9 +155,6 @@
set_cc_for_build
cat <<-EOF > "$dummy.c"
- #if defined(__ANDROID__)
- LIBC=android
- #else
#include <features.h>
#if defined(__UCLIBC__)
LIBC=uclibc
@@ -165,8 +162,6 @@
LIBC=dietlibc
#elif defined(__GLIBC__)
LIBC=gnu
- #elif defined(__LLVM_LIBC__)
- LIBC=llvm
#else
#include <stdarg.h>
/* First heuristic to detect musl libc. */
@@ -174,7 +169,6 @@
LIBC=musl
#endif
#endif
- #endif
EOF
cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
eval "$cc_set_libc"
@@ -465,7 +459,7 @@
UNAME_RELEASE=`uname -v`
;;
esac
- # Japanese Language versions have a version number like '4.1.3-JL'.
+ # Japanese Language versions have a version number like `4.1.3-JL'.
SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'`
GUESS=sparc-sun-sunos$SUN_REL
;;
@@ -910,7 +904,7 @@
fi
;;
*:FreeBSD:*:*)
- UNAME_PROCESSOR=`uname -p`
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
case $UNAME_PROCESSOR in
amd64)
UNAME_PROCESSOR=x86_64 ;;
@@ -972,37 +966,11 @@
GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC
;;
- x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*)
- GUESS="$UNAME_MACHINE-pc-managarm-mlibc"
- ;;
- *:[Mm]anagarm:*:*)
- GUESS="$UNAME_MACHINE-unknown-managarm-mlibc"
- ;;
*:Minix:*:*)
GUESS=$UNAME_MACHINE-unknown-minix
;;
aarch64:Linux:*:*)
- set_cc_for_build
- CPU=$UNAME_MACHINE
- LIBCABI=$LIBC
- if test "$CC_FOR_BUILD" != no_compiler_found; then
- ABI=64
- sed 's/^ //' << EOF > "$dummy.c"
- #ifdef __ARM_EABI__
- #ifdef __ARM_PCS_VFP
- ABI=eabihf
- #else
- ABI=eabi
- #endif
- #endif
-EOF
- cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'`
- eval "$cc_set_abi"
- case $ABI in
- eabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;;
- esac
- fi
- GUESS=$CPU-unknown-linux-$LIBCABI
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
;;
aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be
@@ -1068,16 +1036,7 @@
k1om:Linux:*:*)
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
;;
- kvx:Linux:*:*)
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
- ;;
- kvx:cos:*:*)
- GUESS=$UNAME_MACHINE-unknown-cos
- ;;
- kvx:mbr:*:*)
- GUESS=$UNAME_MACHINE-unknown-mbr
- ;;
- loongarch32:Linux:*:* | loongarch64:Linux:*:*)
+ loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
;;
m32r*:Linux:*:*)
@@ -1192,27 +1151,16 @@
;;
x86_64:Linux:*:*)
set_cc_for_build
- CPU=$UNAME_MACHINE
LIBCABI=$LIBC
if test "$CC_FOR_BUILD" != no_compiler_found; then
- ABI=64
- sed 's/^ //' << EOF > "$dummy.c"
- #ifdef __i386__
- ABI=x86
- #else
- #ifdef __ILP32__
- ABI=x32
- #endif
- #endif
-EOF
- cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'`
- eval "$cc_set_abi"
- case $ABI in
- x86) CPU=i686 ;;
- x32) LIBCABI=${LIBC}x32 ;;
- esac
+ if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_X32 >/dev/null
+ then
+ LIBCABI=${LIBC}x32
+ fi
fi
- GUESS=$CPU-pc-linux-$LIBCABI
+ GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI
;;
xtensa*:Linux:*:*)
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
@@ -1232,7 +1180,7 @@
GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION
;;
i*86:OS/2:*:*)
- # If we were able to find 'uname', then EMX Unix compatibility
+ # If we were able to find `uname', then EMX Unix compatibility
# is probably installed.
GUESS=$UNAME_MACHINE-pc-os2-emx
;;
@@ -1373,7 +1321,7 @@
GUESS=ns32k-sni-sysv
fi
;;
- PENTIUM:*:4.0*:*) # Unisys 'ClearPath HMP IX 4000' SVR4/MP effort
+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
# says <Richard.M.Bartel@ccMail.Census.GOV>
GUESS=i586-unisys-sysv4
;;
@@ -1419,11 +1367,8 @@
BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
GUESS=i586-pc-haiku
;;
- ppc:Haiku:*:*) # Haiku running on Apple PowerPC
- GUESS=powerpc-apple-haiku
- ;;
- *:Haiku:*:*) # Haiku modern gcc (not bound by BeOS compat)
- GUESS=$UNAME_MACHINE-unknown-haiku
+ x86_64:Haiku:*:*)
+ GUESS=x86_64-unknown-haiku
;;
SX-4:SUPER-UX:*:*)
GUESS=sx4-nec-superux$UNAME_RELEASE
@@ -1595,9 +1540,6 @@
*:Unleashed:*:*)
GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
;;
- *:Ironclad:*:*)
- GUESS=$UNAME_MACHINE-unknown-ironclad
- ;;
esac
# Do we have a guess based on uname results?
diff -Nru xfconf-4.19.3/config.h.in xfconf-4.20.0/config.h.in
--- xfconf-4.19.3/config.h.in 2024-10-18 14:11:53.000000000 +0800
+++ xfconf-4.20.0/config.h.in 2024-12-15 17:33:36.000000000 +0800
@@ -1,39 +1,39 @@
/* config.h.in. Generated from configure.ac by autoheader. */
-/* The normal alignment of 'gboolean', in bytes. */
+/* The normal alignment of `gboolean', in bytes. */
#undef ALIGNOF_GBOOLEAN
-/* The normal alignment of 'gchar', in bytes. */
+/* The normal alignment of `gchar', in bytes. */
#undef ALIGNOF_GCHAR
-/* The normal alignment of 'gdouble', in bytes. */
+/* The normal alignment of `gdouble', in bytes. */
#undef ALIGNOF_GDOUBLE
-/* The normal alignment of 'gfloat', in bytes. */
+/* The normal alignment of `gfloat', in bytes. */
#undef ALIGNOF_GFLOAT
-/* The normal alignment of 'gint16', in bytes. */
+/* The normal alignment of `gint16', in bytes. */
#undef ALIGNOF_GINT16
-/* The normal alignment of 'gint32', in bytes. */
+/* The normal alignment of `gint32', in bytes. */
#undef ALIGNOF_GINT32
-/* The normal alignment of 'gint64', in bytes. */
+/* The normal alignment of `gint64', in bytes. */
#undef ALIGNOF_GINT64
-/* The normal alignment of 'gpointer', in bytes. */
+/* The normal alignment of `gpointer', in bytes. */
#undef ALIGNOF_GPOINTER
-/* The normal alignment of 'guchar', in bytes. */
+/* The normal alignment of `guchar', in bytes. */
#undef ALIGNOF_GUCHAR
-/* The normal alignment of 'guint16', in bytes. */
+/* The normal alignment of `guint16', in bytes. */
#undef ALIGNOF_GUINT16
-/* The normal alignment of 'guint32', in bytes. */
+/* The normal alignment of `guint32', in bytes. */
#undef ALIGNOF_GUINT32
-/* The normal alignment of 'guint64', in bytes. */
+/* The normal alignment of `guint64', in bytes. */
#undef ALIGNOF_GUINT64
/* Define if the perchannel-xml backend should be built */
@@ -82,10 +82,10 @@
/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
-/* Define to 1 if you have the 'fdatasync' function. */
+/* Define to 1 if you have the `fdatasync' function. */
#undef HAVE_FDATASYNC
-/* Define to 1 if you have the 'fsync' function. */
+/* Define to 1 if you have the `fsync' function. */
#undef HAVE_FSYNC
/* Define if the GNU gettext() function is already present or preinstalled. */
@@ -103,7 +103,7 @@
/* Define to 1 if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H
-/* Define to 1 if you have the 'setlocale' function. */
+/* Define to 1 if you have the `setlocale' function. */
#undef HAVE_SETLOCALE
/* Define to 1 if you have the <signal.h> header file. */
@@ -163,7 +163,7 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-/* Define to 1 if all of the C89 standard headers exist (not just the ones
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
required in a freestanding environment). This macro is provided for
backward compatibility; new code need not use it. */
#undef STDC_HEADERS
diff -Nru xfconf-4.19.3/config.sub xfconf-4.20.0/config.sub
--- xfconf-4.19.3/config.sub 2024-10-18 14:11:58.000000000 +0800
+++ xfconf-4.20.0/config.sub 2024-12-15 17:33:36.000000000 +0800
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2024 Free Software Foundation, Inc.
+# Copyright 1992-2022 Free Software Foundation, Inc.
# shellcheck disable=SC2006,SC2268 # see below for rationale
-timestamp='2024-01-01'
+timestamp='2022-01-03'
# 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
@@ -76,13 +76,13 @@
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2024 Free Software Foundation, Inc.
+Copyright 1992-2022 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
help="
-Try '$me --help' for more information."
+Try \`$me --help' for more information."
# Parse command line
while test $# -gt 0 ; do
@@ -130,7 +130,7 @@
# Separate into logical components for further validation
case $1 in
*-*-*-*-*)
- echo "Invalid configuration '$1': more than four components" >&2
+ echo Invalid configuration \`"$1"\': more than four components >&2
exit 1
;;
*-*-*-*)
@@ -145,8 +145,7 @@
nto-qnx* | linux-* | uclinux-uclibc* \
| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
- | storm-chaos* | os2-emx* | rtmk-nova* | managarm-* \
- | windows-* )
+ | storm-chaos* | os2-emx* | rtmk-nova*)
basic_machine=$field1
basic_os=$maybe_os
;;
@@ -944,7 +943,7 @@
EOF
IFS=$saved_IFS
;;
- # We use 'pc' rather than 'unknown'
+ # We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
i*86 | x86_64)
@@ -1076,7 +1075,7 @@
pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
cpu=i586
;;
- pentiumpro-* | p6-* | 6x86-* | athlon-* | athlon_*-*)
+ pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
cpu=i686
;;
pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
@@ -1181,7 +1180,7 @@
case $cpu in
1750a | 580 \
| a29k \
- | aarch64 | aarch64_be | aarch64c | arm64ec \
+ | aarch64 | aarch64_be \
| abacus \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
@@ -1200,29 +1199,50 @@
| d10v | d30v | dlx | dsp16xx \
| e2k | elxsi | epiphany \
| f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
- | javascript \
| h8300 | h8500 \
| hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| hexagon \
| i370 | i*86 | i860 | i960 | ia16 | ia64 \
| ip2k | iq2000 \
| k1om \
- | kvx \
| le32 | le64 \
| lm32 \
- | loongarch32 | loongarch64 \
+ | loongarch32 | loongarch64 | loongarchx32 \
| m32c | m32r | m32rle \
| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
| m88110 | m88k | maxq | mb | mcore | mep | metag \
| microblaze | microblazeel \
- | mips* \
+ | mips | mipsbe | mipseb | mipsel | mipsle \
+ | mips16 \
+ | mips64 | mips64eb | mips64el \
+ | mips64octeon | mips64octeonel \
+ | mips64orion | mips64orionel \
+ | mips64r5900 | mips64r5900el \
+ | mips64vr | mips64vrel \
+ | mips64vr4100 | mips64vr4100el \
+ | mips64vr4300 | mips64vr4300el \
+ | mips64vr5000 | mips64vr5000el \
+ | mips64vr5900 | mips64vr5900el \
+ | mipsisa32 | mipsisa32el \
+ | mipsisa32r2 | mipsisa32r2el \
+ | mipsisa32r3 | mipsisa32r3el \
+ | mipsisa32r5 | mipsisa32r5el \
+ | mipsisa32r6 | mipsisa32r6el \
+ | mipsisa64 | mipsisa64el \
+ | mipsisa64r2 | mipsisa64r2el \
+ | mipsisa64r3 | mipsisa64r3el \
+ | mipsisa64r5 | mipsisa64r5el \
+ | mipsisa64r6 | mipsisa64r6el \
+ | mipsisa64sb1 | mipsisa64sb1el \
+ | mipsisa64sr71k | mipsisa64sr71kel \
+ | mipsr5900 | mipsr5900el \
+ | mipstx39 | mipstx39el \
| mmix \
| mn10200 | mn10300 \
| moxie \
| mt \
| msp430 \
- | nanomips* \
| nds32 | nds32le | nds32be \
| nfp \
| nios | nios2 | nios2eb | nios2el \
@@ -1254,7 +1274,6 @@
| ubicom32 \
| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
| vax \
- | vc4 \
| visium \
| w65 \
| wasm32 | wasm64 \
@@ -1266,7 +1285,7 @@
;;
*)
- echo "Invalid configuration '$1': machine '$cpu-$vendor' not recognized" 1>&2
+ echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
exit 1
;;
esac
@@ -1287,12 +1306,11 @@
# Decode manufacturer-specific aliases for certain operating systems.
-if test x"$basic_os" != x
+if test x$basic_os != x
then
# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just
# set os.
-obj=
case $basic_os in
gnu/linux*)
kernel=linux
@@ -1323,10 +1341,6 @@
kernel=linux
os=`echo "$basic_os" | sed -e 's|linux|gnu|'`
;;
- managarm*)
- kernel=managarm
- os=`echo "$basic_os" | sed -e 's|managarm|mlibc|'`
- ;;
*)
kernel=
os=$basic_os
@@ -1492,16 +1506,10 @@
os=eabi
;;
*)
- os=
- obj=elf
+ os=elf
;;
esac
;;
- aout* | coff* | elf* | pe*)
- # These are machine code file formats, not OSes
- obj=$os
- os=
- ;;
*)
# No normalization, but not necessarily accepted, that comes below.
;;
@@ -1520,15 +1528,12 @@
# system, and we'll never get to this point.
kernel=
-obj=
case $cpu-$vendor in
score-*)
- os=
- obj=elf
+ os=elf
;;
spu-*)
- os=
- obj=elf
+ os=elf
;;
*-acorn)
os=riscix1.2
@@ -1538,35 +1543,28 @@
os=gnu
;;
arm*-semi)
- os=
- obj=aout
+ os=aout
;;
c4x-* | tic4x-*)
- os=
- obj=coff
+ os=coff
;;
c8051-*)
- os=
- obj=elf
+ os=elf
;;
clipper-intergraph)
os=clix
;;
hexagon-*)
- os=
- obj=elf
+ os=elf
;;
tic54x-*)
- os=
- obj=coff
+ os=coff
;;
tic55x-*)
- os=
- obj=coff
+ os=coff
;;
tic6x-*)
- os=
- obj=coff
+ os=coff
;;
# This must come before the *-dec entry.
pdp10-*)
@@ -1588,24 +1586,19 @@
os=sunos3
;;
m68*-cisco)
- os=
- obj=aout
+ os=aout
;;
mep-*)
- os=
- obj=elf
+ os=elf
;;
mips*-cisco)
- os=
- obj=elf
+ os=elf
;;
- mips*-*|nanomips*-*)
- os=
- obj=elf
+ mips*-*)
+ os=elf
;;
or32-*)
- os=
- obj=coff
+ os=coff
;;
*-tti) # must be before sparc entry or we get the wrong os.
os=sysv3
@@ -1614,8 +1607,7 @@
os=sunos4.1.1
;;
pru-*)
- os=
- obj=elf
+ os=elf
;;
*-be)
os=beos
@@ -1696,12 +1688,10 @@
os=uxpv
;;
*-rom68k)
- os=
- obj=coff
+ os=coff
;;
*-*bug)
- os=
- obj=coff
+ os=coff
;;
*-apple)
os=macos
@@ -1719,11 +1709,10 @@
fi
-# Now, validate our (potentially fixed-up) individual pieces (OS, OBJ).
-
+# Now, validate our (potentially fixed-up) OS.
case $os in
# Sometimes we do "kernel-libc", so those need to count as OSes.
- llvm* | musl* | newlib* | relibc* | uclibc*)
+ musl* | newlib* | relibc* | uclibc*)
;;
# Likewise for "kernel-abi"
eabi* | gnueabi*)
@@ -1731,9 +1720,6 @@
# VxWorks passes extra cpu info in the 4th filed.
simlinux | simwindows | spe)
;;
- # See `case $cpu-$os` validation below
- ghcjs)
- ;;
# Now accept the basic system types.
# The portable systems comes first.
# Each alternative MUST end in a * to match a version number.
@@ -1742,7 +1728,7 @@
| hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
| sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \
| hiux* | abug | nacl* | netware* | windows* \
- | os9* | macos* | osx* | ios* | tvos* | watchos* \
+ | os9* | macos* | osx* | ios* \
| mpw* | magic* | mmixware* | mon960* | lnews* \
| amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
| aos* | aros* | cloudabi* | sortix* | twizzler* \
@@ -1751,11 +1737,11 @@
| mirbsd* | netbsd* | dicos* | openedition* | ose* \
| bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \
| ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
- | bosx* | nextstep* | cxux* | oabi* \
- | ptx* | ecoff* | winnt* | domain* | vsta* \
+ | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
+ | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
| udi* | lites* | ieee* | go32* | aux* | hcos* \
| chorusrdb* | cegcc* | glidix* | serenity* \
- | cygwin* | msys* | moss* | proelf* | rtems* \
+ | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
| midipix* | mingw32* | mingw64* | mint* \
| uxpv* | beos* | mpeix* | udk* | moxiebox* \
| interix* | uwin* | mks* | rhapsody* | darwin* \
@@ -1768,116 +1754,49 @@
| onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
| midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
| nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
- | fiwix* | mlibc* | cos* | mbr* | ironclad* )
+ | fiwix* )
;;
# This one is extra strict with allowed versions
sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
# Don't forget version if it is 3.2v4 or newer.
;;
- # This refers to builds using the UEFI calling convention
- # (which depends on the architecture) and PE file format.
- # Note that this is both a different calling convention and
- # different file format than that of GNU-EFI
- # (x86_64-w64-mingw32).
- uefi)
- ;;
none)
;;
- kernel* | msvc* )
- # Restricted further below
- ;;
- '')
- if test x"$obj" = x
- then
- echo "Invalid configuration '$1': Blank OS only allowed with explicit machine code file format" 1>&2
- fi
- ;;
*)
- echo "Invalid configuration '$1': OS '$os' not recognized" 1>&2
- exit 1
- ;;
-esac
-
-case $obj in
- aout* | coff* | elf* | pe*)
- ;;
- '')
- # empty is fine
- ;;
- *)
- echo "Invalid configuration '$1': Machine code format '$obj' not recognized" 1>&2
- exit 1
- ;;
-esac
-
-# Here we handle the constraint that a (synthetic) cpu and os are
-# valid only in combination with each other and nowhere else.
-case $cpu-$os in
- # The "javascript-unknown-ghcjs" triple is used by GHC; we
- # accept it here in order to tolerate that, but reject any
- # variations.
- javascript-ghcjs)
- ;;
- javascript-* | *-ghcjs)
- echo "Invalid configuration '$1': cpu '$cpu' is not valid with os '$os$obj'" 1>&2
+ echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2
exit 1
;;
esac
# As a final step for OS-related things, validate the OS-kernel combination
# (given a valid OS), if there is a kernel.
-case $kernel-$os-$obj in
- linux-gnu*- | linux-android*- | linux-dietlibc*- | linux-llvm*- \
- | linux-mlibc*- | linux-musl*- | linux-newlib*- \
- | linux-relibc*- | linux-uclibc*- )
- ;;
- uclinux-uclibc*- )
- ;;
- managarm-mlibc*- | managarm-kernel*- )
+case $kernel-$os in
+ linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \
+ | linux-musl* | linux-relibc* | linux-uclibc* )
;;
- windows*-msvc*-)
+ uclinux-uclibc* )
;;
- -dietlibc*- | -llvm*- | -mlibc*- | -musl*- | -newlib*- | -relibc*- \
- | -uclibc*- )
+ -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* )
# These are just libc implementations, not actual OSes, and thus
# require a kernel.
- echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2
- exit 1
- ;;
- -kernel*- )
- echo "Invalid configuration '$1': '$os' needs explicit kernel." 1>&2
- exit 1
- ;;
- *-kernel*- )
- echo "Invalid configuration '$1': '$kernel' does not support '$os'." 1>&2
+ echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2
exit 1
;;
- *-msvc*- )
- echo "Invalid configuration '$1': '$os' needs 'windows'." 1>&2
- exit 1
- ;;
- kfreebsd*-gnu*- | kopensolaris*-gnu*-)
+ kfreebsd*-gnu* | kopensolaris*-gnu*)
;;
- vxworks-simlinux- | vxworks-simwindows- | vxworks-spe-)
+ vxworks-simlinux | vxworks-simwindows | vxworks-spe)
;;
- nto-qnx*-)
- ;;
- os2-emx-)
+ nto-qnx*)
;;
- *-eabi*- | *-gnueabi*-)
+ os2-emx)
;;
- none--*)
- # None (no kernel, i.e. freestanding / bare metal),
- # can be paired with an machine code file format
+ *-eabi* | *-gnueabi*)
;;
- -*-)
+ -*)
# Blank kernel with real OS is always fine.
;;
- --*)
- # Blank kernel and OS with real machine code file format is always fine.
- ;;
- *-*-*)
- echo "Invalid configuration '$1': Kernel '$kernel' not known to work with OS '$os'." 1>&2
+ *-*)
+ echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2
exit 1
;;
esac
@@ -1960,7 +1879,7 @@
;;
esac
-echo "$cpu-$vendor${kernel:+-$kernel}${os:+-$os}${obj:+-$obj}"
+echo "$cpu-$vendor-${kernel:+$kernel-}$os"
exit
# Local variables:
diff -Nru xfconf-4.19.3/configure xfconf-4.20.0/configure
--- xfconf-4.19.3/configure 2024-10-18 14:11:48.000000000 +0800
+++ xfconf-4.20.0/configure 2024-12-15 17:33:36.000000000 +0800
@@ -1,14 +1,14 @@
#! /bin/sh
# From configure.ac .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.72 for xfconf 4.19.3.
+# Generated by GNU Autoconf 2.71 for xfconf 4.20.0.
#
# Report bugs to <https://gitlab.xfce.org/xfce/xfconf>.
#
# Copyright (c) 2007-2024 The Xfce development team
#
#
-# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation,
+# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
# Inc.
#
#
@@ -20,6 +20,7 @@
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
+as_nop=:
if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
then :
emulate sh
@@ -28,13 +29,12 @@
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
-else case e in #(
- e) case `(set -o) 2>/dev/null` in #(
+else $as_nop
+ case `(set -o) 2>/dev/null` in #(
*posix*) :
set -o posix ;; #(
*) :
;;
-esac ;;
esac
fi
@@ -106,7 +106,7 @@
;;
esac
-# We did not find ourselves, most probably we were run as 'sh COMMAND'
+# We did not find ourselves, most probably we were run as `sh COMMAND'
# in which case we are not to be found in the path.
if test "x$as_myself" = x; then
as_myself=$0
@@ -136,14 +136,15 @@
esac
exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed 'exec'.
+# out after a failed `exec'.
printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
exit 255
fi
# We don't want this to propagate to other subprocesses.
{ _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
- as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+ as_bourne_compatible="as_nop=:
+if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
then :
emulate sh
NULLCMD=:
@@ -151,13 +152,12 @@
# is contrary to our usage. Disable this feature.
alias -g '\${1+\"\$@\"}'='\"\$@\"'
setopt NO_GLOB_SUBST
-else case e in #(
- e) case \`(set -o) 2>/dev/null\` in #(
+else \$as_nop
+ case \`(set -o) 2>/dev/null\` in #(
*posix*) :
set -o posix ;; #(
*) :
;;
-esac ;;
esac
fi
"
@@ -175,9 +175,8 @@
if ( set x; as_fn_ret_success y && test x = \"\$1\" )
then :
-else case e in #(
- e) exitcode=1; echo positional parameters were not saved. ;;
-esac
+else \$as_nop
+ exitcode=1; echo positional parameters were not saved.
fi
test x\$exitcode = x0 || exit 1
blah=\$(echo \$(echo blah))
@@ -199,15 +198,14 @@
if (eval "$as_required") 2>/dev/null
then :
as_have_required=yes
-else case e in #(
- e) as_have_required=no ;;
-esac
+else $as_nop
+ as_have_required=no
fi
if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
then :
-else case e in #(
- e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+else $as_nop
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
as_found=false
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
@@ -240,13 +238,12 @@
if $as_found
then :
-else case e in #(
- e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+else $as_nop
+ if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
then :
CONFIG_SHELL=$SHELL as_have_required=yes
-fi ;;
-esac
+fi
fi
@@ -268,7 +265,7 @@
esac
exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed 'exec'.
+# out after a failed `exec'.
printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
exit 255
fi
@@ -288,8 +285,7 @@
$0: the script under such a shell if you do have one."
fi
exit 1
-fi ;;
-esac
+fi
fi
fi
SHELL=${CONFIG_SHELL-/bin/sh}
@@ -328,6 +324,14 @@
as_fn_set_status $1
exit $1
} # as_fn_exit
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+ return $?
+}
+as_nop=as_fn_nop
# as_fn_mkdir_p
# -------------
@@ -396,12 +400,11 @@
{
eval $1+=\$2
}'
-else case e in #(
- e) as_fn_append ()
+else $as_nop
+ as_fn_append ()
{
eval $1=\$$1\$2
- } ;;
-esac
+ }
fi # as_fn_append
# as_fn_arith ARG...
@@ -415,14 +418,21 @@
{
as_val=$(( $* ))
}'
-else case e in #(
- e) as_fn_arith ()
+else $as_nop
+ as_fn_arith ()
{
as_val=`expr "$@" || test $? -eq 1`
- } ;;
-esac
+ }
fi # as_fn_arith
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+ return $?
+}
+as_nop=as_fn_nop
# as_fn_error STATUS ERROR [LINENO LOG_FD]
# ----------------------------------------
@@ -496,8 +506,6 @@
/[$]LINENO/=
' <$as_myself |
sed '
- t clear
- :clear
s/[$]LINENO.*/&-/
t lineno
b
@@ -546,6 +554,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
+
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
rm -f conf$$.dir/conf$$.file
@@ -557,9 +566,9 @@
if ln -s conf$$.file conf$$ 2>/dev/null; then
as_ln_s='ln -s'
# ... but there are two gotchas:
- # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable.
- # In both cases, we have to default to 'cp -pR'.
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
@@ -584,12 +593,10 @@
as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
-as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
# Sed expression to map a string onto a valid variable name.
-as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-as_tr_sh="eval sed '$as_sed_sh'" # deprecated
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
SHELL=${CONFIG_SHELL-/bin/sh}
@@ -617,8 +624,8 @@
# Identity of this package.
PACKAGE_NAME='xfconf'
PACKAGE_TARNAME='xfconf'
-PACKAGE_VERSION='4.19.3'
-PACKAGE_STRING='xfconf 4.19.3'
+PACKAGE_VERSION='4.20.0'
+PACKAGE_STRING='xfconf 4.20.0'
PACKAGE_BUGREPORT='https://gitlab.xfce.org/xfce/xfconf'
PACKAGE_URL=''
@@ -810,8 +817,6 @@
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
-am__xargs_n
-am__rm_f_notfound
AM_BACKSLASH
AM_DEFAULT_VERBOSITY
AM_DEFAULT_V
@@ -891,10 +896,8 @@
enable_dependency_tracking
enable_static
enable_shared
-enable_pic
with_pic
enable_fast_install
-enable_aix_soname
with_aix_soname
with_gnu_ld
with_sysroot
@@ -1042,7 +1045,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid feature name: '$ac_useropt'"
+ as_fn_error $? "invalid feature name: \`$ac_useropt'"
ac_useropt_orig=$ac_useropt
ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1068,7 +1071,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid feature name: '$ac_useropt'"
+ as_fn_error $? "invalid feature name: \`$ac_useropt'"
ac_useropt_orig=$ac_useropt
ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1281,7 +1284,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid package name: '$ac_useropt'"
+ as_fn_error $? "invalid package name: \`$ac_useropt'"
ac_useropt_orig=$ac_useropt
ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1297,7 +1300,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid package name: '$ac_useropt'"
+ as_fn_error $? "invalid package name: \`$ac_useropt'"
ac_useropt_orig=$ac_useropt
ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1327,8 +1330,8 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) as_fn_error $? "unrecognized option: '$ac_option'
-Try '$0 --help' for more information"
+ -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
;;
*=*)
@@ -1336,7 +1339,7 @@
# Reject names that are not valid shell variable names.
case $ac_envvar in #(
'' | [0-9]* | *[!_$as_cr_alnum]* )
- as_fn_error $? "invalid variable name: '$ac_envvar'" ;;
+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
@@ -1386,7 +1389,7 @@
as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
done
-# There might be people who depend on the old broken behavior: '$host'
+# There might be people who depend on the old broken behavior: `$host'
# used to hold the argument of --host etc.
# FIXME: To remove some day.
build=$build_alias
@@ -1454,7 +1457,7 @@
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
fi
-ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work"
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
pwd)`
@@ -1482,7 +1485,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 xfconf 4.19.3 to adapt to many kinds of systems.
+\`configure' configures xfconf 4.20.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1496,11 +1499,11 @@
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
- -q, --quiet, --silent do not print 'checking ...' messages
+ -q, --quiet, --silent do not print \`checking ...' messages
--cache-file=FILE cache test results in FILE [disabled]
- -C, --config-cache alias for '--cache-file=config.cache'
+ -C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files
- --srcdir=DIR find the sources in DIR [configure dir or '..']
+ --srcdir=DIR find the sources in DIR [configure dir or \`..']
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
@@ -1508,10 +1511,10 @@
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
[PREFIX]
-By default, 'make install' will install all the files in
-'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc. You can specify
-an installation prefix other than '$ac_default_prefix' using '--prefix',
-for instance '--prefix=\$HOME'.
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
For better control, use the options below.
@@ -1553,7 +1556,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xfconf 4.19.3:";;
+ short | recursive ) echo "Configuration of xfconf 4.20.0:";;
esac
cat <<\_ACEOF
@@ -1572,13 +1575,8 @@
speeds up one-time build
--enable-static[=PKGS] build static libraries [default=no]
--enable-shared[=PKGS] build shared libraries [default=yes]
- --enable-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
- both]
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
- --enable-aix-soname=aix|svr4|both
- shared library versioning (aka "SONAME") variant to
- provide on AIX, [default=aix].
--disable-libtool-lock avoid locking (might break parallel builds)
--disable-nls do not use Native Language Support
--disable-rpath do not hardcode runtime library paths
@@ -1608,6 +1606,11 @@
--with-helper-path-prefix=PATH
Path prefix under which helper executables will be
installed (default: $libdir)
+ --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
+ both]
+ --with-aix-soname=aix|svr4|both
+ shared library versioning (aka "SONAME") variant to
+ provide on AIX, [default=aix].
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-sysroot[=DIR] Search for dependent libraries within DIR (or the
compiler's sysroot if not specified).
@@ -1646,7 +1649,7 @@
GTKDOC_DEPS_LIBS
linker flags for GTKDOC_DEPS, overriding pkg-config
-Use these variables to override the choices made by 'configure' or to help
+Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
Report bugs to <https://gitlab.xfce.org/xfce/xfconf>.
@@ -1713,10 +1716,10 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xfconf configure 4.19.3
-generated by GNU Autoconf 2.72
+xfconf configure 4.20.0
+generated by GNU Autoconf 2.71
-Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
@@ -1757,12 +1760,11 @@
} && test -s conftest.$ac_objext
then :
ac_retval=0
-else case e in #(
- e) printf "%s\n" "$as_me: failed program was:" >&5
+else $as_nop
+ printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_retval=1 ;;
-esac
+ ac_retval=1
fi
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
@@ -1800,12 +1802,11 @@
}
then :
ac_retval=0
-else case e in #(
- e) printf "%s\n" "$as_me: failed program was:" >&5
+else $as_nop
+ printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_retval=1 ;;
-esac
+ ac_retval=1
fi
# Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
# created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
@@ -1829,8 +1830,8 @@
if eval test \${$3+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else $as_nop
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$4
#include <$2>
@@ -1838,12 +1839,10 @@
if ac_fn_c_try_compile "$LINENO"
then :
eval "$3=yes"
-else case e in #(
- e) eval "$3=no" ;;
-esac
+else $as_nop
+ eval "$3=no"
fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
eval ac_res=\$$3
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -1863,15 +1862,15 @@
if eval test \${$3+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else $as_nop
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define $2 innocuous_$2
/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $2 (void); below. */
+ which can conflict with char $2 (); below. */
#include <limits.h>
#undef $2
@@ -1882,7 +1881,7 @@
#ifdef __cplusplus
extern "C"
#endif
-char $2 (void);
+char $2 ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
@@ -1901,13 +1900,11 @@
if ac_fn_c_try_link "$LINENO"
then :
eval "$3=yes"
-else case e in #(
- e) eval "$3=no" ;;
-esac
+else $as_nop
+ eval "$3=no"
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
- conftest$ac_exeext conftest.$ac_ext ;;
-esac
+ conftest$ac_exeext conftest.$ac_ext
fi
eval ac_res=\$$3
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -1943,12 +1940,11 @@
}
then :
ac_retval=0
-else case e in #(
- e) printf "%s\n" "$as_me: failed program was:" >&5
+else $as_nop
+ printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_retval=1 ;;
-esac
+ ac_retval=1
fi
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
as_fn_set_status $ac_retval
@@ -1985,13 +1981,12 @@
test $ac_status = 0; }; }
then :
ac_retval=0
-else case e in #(
- e) printf "%s\n" "$as_me: program exited with status $ac_status" >&5
+else $as_nop
+ printf "%s\n" "$as_me: program exited with status $ac_status" >&5
printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_retval=$ac_status ;;
-esac
+ ac_retval=$ac_status
fi
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
@@ -2044,19 +2039,18 @@
if ac_fn_c_try_compile "$LINENO"
then :
ac_hi=$ac_mid; break
-else case e in #(
- e) as_fn_arith $ac_mid + 1 && ac_lo=$as_val
+else $as_nop
+ as_fn_arith $ac_mid + 1 && ac_lo=$as_val
if test $ac_lo -le $ac_mid; then
ac_lo= ac_hi=
break
fi
- as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val ;;
-esac
+ as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
done
-else case e in #(
- e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else $as_nop
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$4
int
@@ -2091,23 +2085,20 @@
if ac_fn_c_try_compile "$LINENO"
then :
ac_lo=$ac_mid; break
-else case e in #(
- e) as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
+else $as_nop
+ as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
if test $ac_mid -le $ac_hi; then
ac_lo= ac_hi=
break
fi
- as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val ;;
-esac
+ as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
done
-else case e in #(
- e) ac_lo= ac_hi= ;;
-esac
+else $as_nop
+ ac_lo= ac_hi=
fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
# Binary search between lo and hi bounds.
@@ -2130,9 +2121,8 @@
if ac_fn_c_try_compile "$LINENO"
then :
ac_hi=$ac_mid
-else case e in #(
- e) as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val ;;
-esac
+else $as_nop
+ as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
done
@@ -2180,9 +2170,8 @@
if ac_fn_c_try_run "$LINENO"
then :
echo >>conftest.val; read $3 <conftest.val; ac_retval=0
-else case e in #(
- e) ac_retval=1 ;;
-esac
+else $as_nop
+ ac_retval=1
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -2217,8 +2206,8 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xfconf $as_me 4.19.3, which was
-generated by GNU Autoconf 2.72. Invocation command line was
+It was created by xfconf $as_me 4.20.0, which was
+generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -2464,10 +2453,10 @@
printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file" \
- || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+ || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "failed to load site script $ac_site_file
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
fi
done
@@ -2503,7 +2492,9 @@
/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */
struct buf { int x; };
struct buf * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (char **p, int i)
+static char *e (p, i)
+ char **p;
+ int i;
{
return p[i];
}
@@ -2517,21 +2508,6 @@
return s;
}
-/* C89 style stringification. */
-#define noexpand_stringify(a) #a
-const char *stringified = noexpand_stringify(arbitrary+token=sequence);
-
-/* C89 style token pasting. Exercises some of the corner cases that
- e.g. old MSVC gets wrong, but not very hard. */
-#define noexpand_concat(a,b) a##b
-#define expand_concat(a,b) noexpand_concat(a,b)
-extern int vA;
-extern int vbee;
-#define aye A
-#define bee B
-int *pvA = &expand_concat(v,aye);
-int *pvbee = &noexpand_concat(v,bee);
-
/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
function prototypes and stuff, but not \xHH hex character constants.
These do not provoke an error unfortunately, instead are silently treated
@@ -2559,19 +2535,16 @@
# Test code for whether the C compiler supports C99 (global declarations)
ac_c_conftest_c99_globals='
-/* Does the compiler advertise C99 conformance? */
+// Does the compiler advertise C99 conformance?
#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
# error "Compiler does not advertise C99 conformance"
#endif
-// See if C++-style comments work.
-
#include <stdbool.h>
extern int puts (const char *);
extern int printf (const char *, ...);
extern int dprintf (int, const char *, ...);
extern void *malloc (size_t);
-extern void free (void *);
// Check varargs macros. These examples are taken from C99 6.10.3.5.
// dprintf is used instead of fprintf to avoid needing to declare
@@ -2621,6 +2594,7 @@
static inline int
test_restrict (ccp restrict text)
{
+ // See if C++-style comments work.
// Iterate through items via the restricted pointer.
// Also check for declarations in for loops.
for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i)
@@ -2686,8 +2660,6 @@
ia->datasize = 10;
for (int i = 0; i < ia->datasize; ++i)
ia->data[i] = i * 1.234;
- // Work around memory leak warnings.
- free (ia);
// Check named initializers.
struct named_init ni = {
@@ -2709,7 +2681,7 @@
# Test code for whether the C compiler supports C11 (global declarations)
ac_c_conftest_c11_globals='
-/* Does the compiler advertise C11 conformance? */
+// Does the compiler advertise C11 conformance?
#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
# error "Compiler does not advertise C11 conformance"
#endif
@@ -2902,9 +2874,8 @@
if $as_found
then :
-else case e in #(
- e) as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 ;;
-esac
+else $as_nop
+ as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5
fi
@@ -2932,12 +2903,12 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5
-printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5
-printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
*)
@@ -2946,18 +2917,18 @@
ac_old_val_w=`echo x $ac_old_val`
ac_new_val_w=`echo x $ac_new_val`
if test "$ac_old_val_w" != "$ac_new_val_w"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5
-printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
ac_cache_corrupted=:
else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5
-printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
eval $ac_var=\$ac_old_val
fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: '$ac_old_val'" >&5
-printf "%s\n" "$as_me: former value: '$ac_old_val'" >&2;}
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: '$ac_new_val'" >&5
-printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
+printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
+printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
# Pass precious variables to config.status.
@@ -2973,11 +2944,11 @@
fi
done
if $ac_cache_corrupted; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
- as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file'
+ as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file'
and start over" "$LINENO" 5
fi
## -------------------- ##
@@ -2995,7 +2966,7 @@
-am__api_version='1.17'
+am__api_version='1.16'
@@ -3019,8 +2990,8 @@
if test ${ac_cv_path_install+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+else $as_nop
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
@@ -3074,8 +3045,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
- ;;
-esac
+
fi
if test ${ac_cv_path_install+y}; then
INSTALL=$ac_cv_path_install
@@ -3098,165 +3068,6 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether sleep supports fractional seconds" >&5
-printf %s "checking whether sleep supports fractional seconds... " >&6; }
-if test ${am_cv_sleep_fractional_seconds+y}
-then :
- printf %s "(cached) " >&6
-else case e in #(
- e) if sleep 0.001 2>/dev/null
-then :
- am_cv_sleep_fractional_seconds=yes
-else case e in #(
- e) am_cv_sleep_fractional_seconds=no ;;
-esac
-fi
- ;;
-esac
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_sleep_fractional_seconds" >&5
-printf "%s\n" "$am_cv_sleep_fractional_seconds" >&6; }
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking filesystem timestamp resolution" >&5
-printf %s "checking filesystem timestamp resolution... " >&6; }
-if test ${am_cv_filesystem_timestamp_resolution+y}
-then :
- printf %s "(cached) " >&6
-else case e in #(
- e) # Default to the worst case.
-am_cv_filesystem_timestamp_resolution=2
-
-# Only try to go finer than 1 sec if sleep can do it.
-# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work,
-# - 1 sec is not much of a win compared to 2 sec, and
-# - it takes 2 seconds to perform the test whether 1 sec works.
-#
-# Instead, just use the default 2s on platforms that have 1s resolution,
-# accept the extra 1s delay when using $sleep in the Automake tests, in
-# exchange for not incurring the 2s delay for running the test for all
-# packages.
-#
-am_try_resolutions=
-if test "$am_cv_sleep_fractional_seconds" = yes; then
- # Even a millisecond often causes a bunch of false positives,
- # so just try a hundredth of a second. The time saved between .001 and
- # .01 is not terribly consequential.
- am_try_resolutions="0.01 0.1 $am_try_resolutions"
-fi
-
-# In order to catch current-generation FAT out, we must *modify* files
-# that already exist; the *creation* timestamp is finer. Use names
-# that make ls -t sort them differently when they have equal
-# timestamps than when they have distinct timestamps, keeping
-# in mind that ls -t prints the *newest* file first.
-rm -f conftest.ts?
-: > conftest.ts1
-: > conftest.ts2
-: > conftest.ts3
-
-# Make sure ls -t actually works. Do 'set' in a subshell so we don't
-# clobber the current shell's arguments. (Outer-level square brackets
-# are removed by m4; they're present so that m4 does not expand
-# <dollar><star>; be careful, easy to get confused.)
-if (
- set X `ls -t conftest.ts[12]` &&
- {
- test "$*" != "X conftest.ts1 conftest.ts2" ||
- test "$*" != "X conftest.ts2 conftest.ts1";
- }
-); then :; else
- # 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".
- printf "%s\n" ""Bad output from ls -t: \"`ls -t conftest.ts[12]`\""" >&5
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
-as_fn_error $? "ls -t produces unexpected output.
-Make sure there is not a broken ls alias in your environment.
-See 'config.log' for more details" "$LINENO" 5; }
-fi
-
-for am_try_res in $am_try_resolutions; do
- # Any one fine-grained sleep might happen to cross the boundary
- # between two values of a coarser actual resolution, but if we do
- # two fine-grained sleeps in a row, at least one of them will fall
- # entirely within a coarse interval.
- echo alpha > conftest.ts1
- sleep $am_try_res
- echo beta > conftest.ts2
- sleep $am_try_res
- echo gamma > conftest.ts3
-
- # We assume that 'ls -t' will make use of high-resolution
- # timestamps if the operating system supports them at all.
- if (set X `ls -t conftest.ts?` &&
- test "$2" = conftest.ts3 &&
- test "$3" = conftest.ts2 &&
- test "$4" = conftest.ts1); then
- #
- # Ok, ls -t worked. If we're at a resolution of 1 second, we're done,
- # because we don't need to test make.
- make_ok=true
- if test $am_try_res != 1; then
- # But if we've succeeded so far with a subsecond resolution, we
- # have one more thing to check: make. It can happen that
- # everything else supports the subsecond mtimes, but make doesn't;
- # notably on macOS, which ships make 3.81 from 2006 (the last one
- # released under GPLv2). https://bugs.gnu.org/68808
- #
- # We test $MAKE if it is defined in the environment, else "make".
- # It might get overridden later, but our hope is that in practice
- # it does not matter: it is the system "make" which is (by far)
- # the most likely to be broken, whereas if the user overrides it,
- # probably they did so with a better, or at least not worse, make.
- # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html
- #
- # Create a Makefile (real tab character here):
- rm -f conftest.mk
- echo 'conftest.ts1: conftest.ts2' >conftest.mk
- echo ' touch conftest.ts2' >>conftest.mk
- #
- # Now, running
- # touch conftest.ts1; touch conftest.ts2; make
- # should touch ts1 because ts2 is newer. This could happen by luck,
- # but most often, it will fail if make's support is insufficient. So
- # test for several consecutive successes.
- #
- # (We reuse conftest.ts[12] because we still want to modify existing
- # files, not create new ones, per above.)
- n=0
- make=${MAKE-make}
- until test $n -eq 3; do
- echo one > conftest.ts1
- sleep $am_try_res
- echo two > conftest.ts2 # ts2 should now be newer than ts1
- if $make -f conftest.mk | grep 'up to date' >/dev/null; then
- make_ok=false
- break # out of $n loop
- fi
- n=`expr $n + 1`
- done
- fi
- #
- if $make_ok; then
- # Everything we know to check worked out, so call this resolution good.
- am_cv_filesystem_timestamp_resolution=$am_try_res
- break # out of $am_try_res loop
- fi
- # Otherwise, we'll go on to check the next resolution.
- fi
-done
-rm -f conftest.ts?
-# (end _am_filesystem_timestamp_resolution)
- ;;
-esac
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_filesystem_timestamp_resolution" >&5
-printf "%s\n" "$am_cv_filesystem_timestamp_resolution" >&6; }
-
-# This check should not be cached, as it may vary across builds of
-# different projects.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
printf %s "checking whether build environment is sane... " >&6; }
# Reject unsafe characters in $srcdir or the absolute working directory
@@ -3277,45 +3088,49 @@
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
-am_build_env_is_sane=no
-am_has_slept=no
-rm -f conftest.file
-for am_try in 1 2; do
- echo "timestamp, slept: $am_has_slept" > conftest.file
- if (
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- test "$2" = conftest.file
- ); then
- am_build_env_is_sane=yes
- break
- fi
- # Just in case.
- sleep "$am_cv_filesystem_timestamp_resolution"
- am_has_slept=yes
-done
+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
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_build_env_is_sane" >&5
-printf "%s\n" "$am_build_env_is_sane" >&6; }
-if test "$am_build_env_is_sane" = no; then
- as_fn_error $? "newly created file is older than distributed files!
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
+ alias in your environment" "$LINENO" 5
+ fi
+ if test "$2" = conftest.file || test $am_try -eq 2; then
+ break
+ fi
+ # Just in case.
+ sleep 1
+ am_has_slept=yes
+ done
+ test "$2" = conftest.file
+ )
+then
+ # Ok.
+ :
+else
+ as_fn_error $? "newly created file is older than distributed files!
Check your system clock" "$LINENO" 5
fi
-
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
# If we didn't sleep, we still need to ensure time stamps of config.status and
# generated files are strictly newer.
am_sleep_pid=
-if test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1
-then :
-
-else case e in #(
- e) ( sleep "$am_cv_filesystem_timestamp_resolution" ) &
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+ ( sleep 1 ) &
am_sleep_pid=$!
- ;;
-esac
fi
rm -f conftest.file
@@ -3326,7 +3141,7 @@
test "$program_suffix" != NONE &&
program_transform_name="s&\$&$program_suffix&;$program_transform_name"
# Double any \ or $.
-# By default was 's,x,x', remove it if useless.
+# By default was `s,x,x', remove it if useless.
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"`
@@ -3369,8 +3184,8 @@
if test ${ac_cv_prog_STRIP+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$STRIP"; then
+else $as_nop
+ if test -n "$STRIP"; then
ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3392,8 +3207,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
@@ -3415,8 +3229,8 @@
if test ${ac_cv_prog_ac_ct_STRIP+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$ac_ct_STRIP"; then
+else $as_nop
+ if test -n "$ac_ct_STRIP"; then
ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3438,8 +3252,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
@@ -3475,8 +3288,8 @@
if test ${ac_cv_path_mkdir+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+else $as_nop
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
do
IFS=$as_save_IFS
@@ -3490,7 +3303,7 @@
as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue
case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #(
'mkdir ('*'coreutils) '* | \
- *'BusyBox '* | \
+ 'BusyBox '* | \
'mkdir (fileutils) '4.1*)
ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext
break 3;;
@@ -3499,17 +3312,18 @@
done
done
IFS=$as_save_IFS
- ;;
-esac
+
fi
test -d ./--version && rmdir ./--version
if test ${ac_cv_path_mkdir+y}; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
- # As a last resort, use plain mkdir -p,
- # in the hope it doesn't have the bugs of ancient mkdir.
- MKDIR_P='mkdir -p'
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for MKDIR_P within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ MKDIR_P="$ac_install_sh -d"
fi
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
@@ -3524,8 +3338,8 @@
if test ${ac_cv_prog_AWK+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$AWK"; then
+else $as_nop
+ if test -n "$AWK"; then
ac_cv_prog_AWK="$AWK" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3547,8 +3361,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
@@ -3570,8 +3383,8 @@
if eval test \${ac_cv_prog_make_${ac_make}_set+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) cat >conftest.make <<\_ACEOF
+else $as_nop
+ cat >conftest.make <<\_ACEOF
SHELL = /bin/sh
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
@@ -3583,8 +3396,7 @@
*)
eval ac_cv_prog_make_${ac_make}_set=no;;
esac
-rm -f conftest.make ;;
-esac
+rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -3605,21 +3417,25 @@
fi
rmdir .tst 2>/dev/null
-AM_DEFAULT_VERBOSITY=1
# Check whether --enable-silent-rules was given.
if test ${enable_silent_rules+y}
then :
enableval=$enable_silent_rules;
fi
+case $enable_silent_rules in # (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=1;;
+esac
am_make=${MAKE-make}
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
printf %s "checking whether $am_make supports nested variables... " >&6; }
if test ${am_cv_make_support_nested_variables+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if printf "%s\n" 'TRUE=$(BAR$(V))
+else $as_nop
+ if printf "%s\n" 'TRUE=$(BAR$(V))
BAR0=false
BAR1=true
V=1
@@ -3629,49 +3445,18 @@
am_cv_make_support_nested_variables=yes
else
am_cv_make_support_nested_variables=no
-fi ;;
-esac
+fi
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
-AM_BACKSLASH='\'
-
-am__rm_f_notfound=
-if (rm -f && rm -fr && rm -rf) 2>/dev/null
-then :
-
-else case e in #(
- e) am__rm_f_notfound='""' ;;
-esac
-fi
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking xargs -n works" >&5
-printf %s "checking xargs -n works... " >&6; }
-if test ${am_cv_xargs_n_works+y}
-then :
- printf %s "(cached) " >&6
-else case e in #(
- e) if test "`echo 1 2 3 | xargs -n2 echo`" = "1 2
-3"
-then :
- am_cv_xargs_n_works=yes
-else case e in #(
- e) am_cv_xargs_n_works=no ;;
-esac
-fi ;;
-esac
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_xargs_n_works" >&5
-printf "%s\n" "$am_cv_xargs_n_works" >&6; }
-if test "$am_cv_xargs_n_works" = yes
-then :
- am__xargs_n='xargs -n'
-else case e in #(
- e) am__xargs_n='am__xargs_n () { shift; sed "s/ /\\n/g" | while read am__xargs_n_arg; do "" "$am__xargs_n_arg"; done; }'
- ;;
-esac
+if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
fi
+AM_BACKSLASH='\'
if test "`cd $srcdir && pwd`" != "`pwd`"; then
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -3695,7 +3480,7 @@
# Define the identity of the package.
PACKAGE='xfconf'
- VERSION='4.19.3'
+ VERSION='4.20.0'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -3749,24 +3534,18 @@
am_gid=`id -g || echo unknown`
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5
printf %s "checking whether UID '$am_uid' is supported by ustar format... " >&6; }
- if test x$am_uid = xunknown; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current UID is ok, but dist-ustar might not work" >&5
-printf "%s\n" "$as_me: WARNING: ancient id detected; assuming current UID is ok, but dist-ustar might not work" >&2;}
- elif test $am_uid -le $am_max_uid; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ if test $am_uid -le $am_max_uid; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- _am_tools=none
+ _am_tools=none
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5
printf %s "checking whether GID '$am_gid' is supported by ustar format... " >&6; }
- if test x$gm_gid = xunknown; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ancient id detected; assuming current GID is ok, but dist-ustar might not work" >&5
-printf "%s\n" "$as_me: WARNING: ancient id detected; assuming current GID is ok, but dist-ustar might not work" >&2;}
- elif test $am_gid -le $am_max_gid; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ if test $am_gid -le $am_max_gid; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -3853,9 +3632,8 @@
if test ${am_cv_prog_tar_ustar+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) am_cv_prog_tar_ustar=$_am_tool ;;
-esac
+else $as_nop
+ am_cv_prog_tar_ustar=$_am_tool
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
@@ -3880,9 +3658,47 @@
+# 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!
+
+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: <http://austingroupbugs.net/view.php?id=542>
+
+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.
+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: <https://www.gnu.org/software/coreutils/>.
+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.
+
+END
+ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+ fi
+fi
ac_config_headers="$ac_config_headers config.h"
@@ -3893,9 +3709,8 @@
if test ${enable_maintainer_mode+y}
then :
enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-else case e in #(
- e) USE_MAINTAINER_MODE=no ;;
-esac
+else $as_nop
+ USE_MAINTAINER_MODE=no
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
@@ -3911,17 +3726,55 @@
MAINT=$MAINTAINER_MODE_TRUE
+# Check whether --enable-silent-rules was given.
+if test ${enable_silent_rules+y}
+then :
+ enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=0;;
+esac
+am_make=${MAKE-make}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+printf %s "checking whether $am_make supports nested variables... " >&6; }
+if test ${am_cv_make_support_nested_variables+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ if printf "%s\n" 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+ @$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+else
+ am_cv_make_support_nested_variables=no
+fi
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
-AM_DEFAULT_VERBOSITY=0
# Check whether --with-helper-path-prefix was given.
if test ${with_helper_path_prefix+y}
then :
withval=$with_helper_path_prefix; HELPER_PATH_PREFIX="$withval"
-else case e in #(
- e) HELPER_PATH_PREFIX="$libdir" ;;
-esac
+else $as_nop
+ HELPER_PATH_PREFIX="$libdir"
fi
@@ -3949,8 +3802,8 @@
if test ${ac_cv_prog_CC+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$CC"; then
+else $as_nop
+ if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3972,8 +3825,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -3995,8 +3847,8 @@
if test ${ac_cv_prog_ac_ct_CC+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$ac_ct_CC"; then
+else $as_nop
+ if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4018,8 +3870,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
@@ -4054,8 +3905,8 @@
if test ${ac_cv_prog_CC+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$CC"; then
+else $as_nop
+ if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4077,8 +3928,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -4100,8 +3950,8 @@
if test ${ac_cv_prog_CC+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$CC"; then
+else $as_nop
+ if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
ac_prog_rejected=no
@@ -4140,8 +3990,7 @@
ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@"
fi
fi
-fi ;;
-esac
+fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -4165,8 +4014,8 @@
if test ${ac_cv_prog_CC+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$CC"; then
+else $as_nop
+ if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4188,8 +4037,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -4215,8 +4063,8 @@
if test ${ac_cv_prog_ac_ct_CC+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$ac_ct_CC"; then
+else $as_nop
+ if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4238,8 +4086,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
@@ -4277,8 +4124,8 @@
if test ${ac_cv_prog_CC+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$CC"; then
+else $as_nop
+ if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4300,8 +4147,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -4323,8 +4169,8 @@
if test ${ac_cv_prog_ac_ct_CC+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$ac_ct_CC"; then
+else $as_nop
+ if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4346,8 +4192,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
@@ -4376,10 +4221,10 @@
fi
-test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "no acceptable C compiler found in \$PATH
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
# Provide some information about the compiler.
printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4451,8 +4296,8 @@
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
then :
- # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'.
-# So ignore a value of 'no', otherwise this would lead to 'EXEEXT = no'
+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
# so that the user can short-circuit this test for compilers unknown to
# Autoconf.
@@ -4472,7 +4317,7 @@
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
# We set ac_cv_exeext here because the later test for it is not
- # safe: cross compilers may not add the suffix if given an '-o'
+ # safe: cross compilers may not add the suffix if given an `-o'
# argument, so we may need to know it at that point already.
# Even if this section looks crufty: it has the advantage of
# actually working.
@@ -4483,9 +4328,8 @@
done
test "$ac_cv_exeext" = no && ac_cv_exeext=
-else case e in #(
- e) ac_file='' ;;
-esac
+else $as_nop
+ ac_file=''
fi
if test -z "$ac_file"
then :
@@ -4494,14 +4338,13 @@
printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "C compiler cannot create executables
-See 'config.log' for more details" "$LINENO" 5; }
-else case e in #(
- e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; } ;;
-esac
+See \`config.log' for more details" "$LINENO" 5; }
+else $as_nop
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
printf %s "checking for C compiler default output file name... " >&6; }
@@ -4525,10 +4368,10 @@
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
then :
- # If both 'conftest.exe' and 'conftest' are 'present' (well, observable)
-# catch 'conftest.exe'. For instance with Cygwin, 'ls conftest' will
-# work properly (i.e., refer to 'conftest.exe'), while it won't with
-# 'rm'.
+ # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
@@ -4538,12 +4381,11 @@
* ) break;;
esac
done
-else case e in #(
- e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+else $as_nop
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See 'config.log' for more details" "$LINENO" 5; } ;;
-esac
+See \`config.log' for more details" "$LINENO" 5; }
fi
rm -f conftest conftest$ac_cv_exeext
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -4559,8 +4401,6 @@
main (void)
{
FILE *f = fopen ("conftest.out", "w");
- if (!f)
- return 1;
return ferror (f) || fclose (f) != 0;
;
@@ -4600,27 +4440,26 @@
if test "$cross_compiling" = maybe; then
cross_compiling=yes
else
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "cannot run C compiled programs.
-If you meant to cross compile, use '--host'.
-See 'config.log' for more details" "$LINENO" 5; }
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
fi
fi
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
printf "%s\n" "$cross_compiling" >&6; }
-rm -f conftest.$ac_ext conftest$ac_cv_exeext \
- conftest.o conftest.obj conftest.out
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
ac_clean_files=$ac_clean_files_save
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
printf %s "checking for suffix of object files... " >&6; }
if test ${ac_cv_objext+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else $as_nop
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -4652,18 +4491,16 @@
break;;
esac
done
-else case e in #(
- e) printf "%s\n" "$as_me: failed program was:" >&5
+else $as_nop
+ printf "%s\n" "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot compute suffix of object files: cannot compile
-See 'config.log' for more details" "$LINENO" 5; } ;;
-esac
+See \`config.log' for more details" "$LINENO" 5; }
fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext ;;
-esac
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
printf "%s\n" "$ac_cv_objext" >&6; }
@@ -4674,8 +4511,8 @@
if test ${ac_cv_c_compiler_gnu+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else $as_nop
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -4692,14 +4529,12 @@
if ac_fn_c_try_compile "$LINENO"
then :
ac_compiler_gnu=yes
-else case e in #(
- e) ac_compiler_gnu=no ;;
-esac
+else $as_nop
+ ac_compiler_gnu=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
@@ -4717,8 +4552,8 @@
if test ${ac_cv_prog_cc_g+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) ac_save_c_werror_flag=$ac_c_werror_flag
+else $as_nop
+ ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
ac_cv_prog_cc_g=no
CFLAGS="-g"
@@ -4736,8 +4571,8 @@
if ac_fn_c_try_compile "$LINENO"
then :
ac_cv_prog_cc_g=yes
-else case e in #(
- e) CFLAGS=""
+else $as_nop
+ CFLAGS=""
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -4752,8 +4587,8 @@
if ac_fn_c_try_compile "$LINENO"
then :
-else case e in #(
- e) ac_c_werror_flag=$ac_save_c_werror_flag
+else $as_nop
+ ac_c_werror_flag=$ac_save_c_werror_flag
CFLAGS="-g"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -4770,15 +4605,12 @@
then :
ac_cv_prog_cc_g=yes
fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
- ac_c_werror_flag=$ac_save_c_werror_flag ;;
-esac
+ ac_c_werror_flag=$ac_save_c_werror_flag
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
@@ -4805,8 +4637,8 @@
if test ${ac_cv_prog_cc_c11+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) ac_cv_prog_cc_c11=no
+else $as_nop
+ ac_cv_prog_cc_c11=no
ac_save_CC=$CC
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -4823,28 +4655,25 @@
test "x$ac_cv_prog_cc_c11" != "xno" && break
done
rm -f conftest.$ac_ext
-CC=$ac_save_CC ;;
-esac
+CC=$ac_save_CC
fi
if test "x$ac_cv_prog_cc_c11" = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
printf "%s\n" "unsupported" >&6; }
-else case e in #(
- e) if test "x$ac_cv_prog_cc_c11" = x
+else $as_nop
+ if test "x$ac_cv_prog_cc_c11" = x
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
printf "%s\n" "none needed" >&6; }
-else case e in #(
- e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+else $as_nop
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
- CC="$CC $ac_cv_prog_cc_c11" ;;
-esac
+ CC="$CC $ac_cv_prog_cc_c11"
fi
ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
- ac_prog_cc_stdc=c11 ;;
-esac
+ ac_prog_cc_stdc=c11
fi
fi
if test x$ac_prog_cc_stdc = xno
@@ -4854,8 +4683,8 @@
if test ${ac_cv_prog_cc_c99+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) ac_cv_prog_cc_c99=no
+else $as_nop
+ ac_cv_prog_cc_c99=no
ac_save_CC=$CC
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -4872,28 +4701,25 @@
test "x$ac_cv_prog_cc_c99" != "xno" && break
done
rm -f conftest.$ac_ext
-CC=$ac_save_CC ;;
-esac
+CC=$ac_save_CC
fi
if test "x$ac_cv_prog_cc_c99" = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
printf "%s\n" "unsupported" >&6; }
-else case e in #(
- e) if test "x$ac_cv_prog_cc_c99" = x
+else $as_nop
+ if test "x$ac_cv_prog_cc_c99" = x
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
printf "%s\n" "none needed" >&6; }
-else case e in #(
- e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+else $as_nop
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
- CC="$CC $ac_cv_prog_cc_c99" ;;
-esac
+ CC="$CC $ac_cv_prog_cc_c99"
fi
ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
- ac_prog_cc_stdc=c99 ;;
-esac
+ ac_prog_cc_stdc=c99
fi
fi
if test x$ac_prog_cc_stdc = xno
@@ -4903,8 +4729,8 @@
if test ${ac_cv_prog_cc_c89+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) ac_cv_prog_cc_c89=no
+else $as_nop
+ ac_cv_prog_cc_c89=no
ac_save_CC=$CC
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -4921,28 +4747,25 @@
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
rm -f conftest.$ac_ext
-CC=$ac_save_CC ;;
-esac
+CC=$ac_save_CC
fi
if test "x$ac_cv_prog_cc_c89" = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
printf "%s\n" "unsupported" >&6; }
-else case e in #(
- e) if test "x$ac_cv_prog_cc_c89" = x
+else $as_nop
+ if test "x$ac_cv_prog_cc_c89" = x
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
printf "%s\n" "none needed" >&6; }
-else case e in #(
- e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+else $as_nop
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
- CC="$CC $ac_cv_prog_cc_c89" ;;
-esac
+ CC="$CC $ac_cv_prog_cc_c89"
fi
ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
- ac_prog_cc_stdc=c89 ;;
-esac
+ ac_prog_cc_stdc=c89
fi
fi
@@ -4963,8 +4786,8 @@
if test ${am_cv_prog_cc_c_o+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else $as_nop
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -4994,8 +4817,7 @@
fi
done
rm -f core conftest*
- unset am_i ;;
-esac
+ unset am_i
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
printf "%s\n" "$am_cv_prog_cc_c_o" >&6; }
@@ -5085,8 +4907,8 @@
if test ${am_cv_CC_dependencies_compiler_type+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+else $as_nop
+ 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
@@ -5173,7 +4995,7 @@
# 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 thus:
+ # 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
@@ -5190,8 +5012,7 @@
else
am_cv_CC_dependencies_compiler_type=none
fi
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; }
@@ -5217,8 +5038,8 @@
if eval test \${ac_cv_prog_make_${ac_make}_set+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) cat >conftest.make <<\_ACEOF
+else $as_nop
+ cat >conftest.make <<\_ACEOF
SHELL = /bin/sh
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
@@ -5230,8 +5051,7 @@
*)
eval ac_cv_prog_make_${ac_make}_set=no;;
esac
-rm -f conftest.make ;;
-esac
+rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -5259,8 +5079,8 @@
if test ${ac_cv_path_SED+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+else $as_nop
+ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
for ac_i in 1 2 3 4 5 6 7; do
ac_script="$ac_script$as_nl$ac_script"
done
@@ -5285,10 +5105,9 @@
as_fn_executable_p "$ac_path_SED" || continue
# Check for GNU ac_path_SED and select it if it is found.
# Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in #(
+case `"$ac_path_SED" --version 2>&1` in
*GNU*)
ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-#(
*)
ac_count=0
printf %s 0123456789 >"conftest.in"
@@ -5323,8 +5142,7 @@
else
ac_cv_path_SED=$SED
fi
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
printf "%s\n" "$ac_cv_path_SED" >&6; }
@@ -5341,8 +5159,8 @@
-macro_version='2.5.3-dirty'
-macro_revision='2.5.3'
+macro_version='2.4.7'
+macro_revision='2.4.7'
@@ -5370,16 +5188,15 @@
if test ${ac_cv_build+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) ac_build_alias=$build_alias
+else $as_nop
+ ac_build_alias=$build_alias
test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"`
test "x$ac_build_alias" = x &&
as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
printf "%s\n" "$ac_cv_build" >&6; }
@@ -5406,15 +5223,14 @@
if test ${ac_cv_host+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test "x$host_alias" = x; then
+else $as_nop
+ if test "x$host_alias" = x; then
ac_cv_host=$ac_cv_build
else
ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` ||
as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5
fi
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
printf "%s\n" "$ac_cv_host" >&6; }
@@ -5510,8 +5326,8 @@
if test ${ac_cv_path_SED+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+else $as_nop
+ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
for ac_i in 1 2 3 4 5 6 7; do
ac_script="$ac_script$as_nl$ac_script"
done
@@ -5536,10 +5352,9 @@
as_fn_executable_p "$ac_path_SED" || continue
# Check for GNU ac_path_SED and select it if it is found.
# Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in #(
+case `"$ac_path_SED" --version 2>&1` in
*GNU*)
ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-#(
*)
ac_count=0
printf %s 0123456789 >"conftest.in"
@@ -5574,8 +5389,7 @@
else
ac_cv_path_SED=$SED
fi
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
printf "%s\n" "$ac_cv_path_SED" >&6; }
@@ -5600,8 +5414,8 @@
if test ${ac_cv_path_GREP+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -z "$GREP"; then
+else $as_nop
+ if test -z "$GREP"; then
ac_path_GREP_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5620,10 +5434,9 @@
as_fn_executable_p "$ac_path_GREP" || continue
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in #(
+case `"$ac_path_GREP" --version 2>&1` in
*GNU*)
ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-#(
*)
ac_count=0
printf %s 0123456789 >"conftest.in"
@@ -5658,8 +5471,7 @@
else
ac_cv_path_GREP=$GREP
fi
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
printf "%s\n" "$ac_cv_path_GREP" >&6; }
@@ -5671,8 +5483,8 @@
if test ${ac_cv_path_EGREP+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+else $as_nop
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
then ac_cv_path_EGREP="$GREP -E"
else
if test -z "$EGREP"; then
@@ -5694,10 +5506,9 @@
as_fn_executable_p "$ac_path_EGREP" || continue
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in #(
+case `"$ac_path_EGREP" --version 2>&1` in
*GNU*)
ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-#(
*)
ac_count=0
printf %s 0123456789 >"conftest.in"
@@ -5733,23 +5544,20 @@
ac_cv_path_EGREP=$EGREP
fi
- fi ;;
-esac
+ fi
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
printf "%s\n" "$ac_cv_path_EGREP" >&6; }
EGREP="$ac_cv_path_EGREP"
- EGREP_TRADITIONAL=$EGREP
- ac_cv_path_EGREP_TRADITIONAL=$EGREP
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
printf %s "checking for fgrep... " >&6; }
if test ${ac_cv_path_FGREP+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+else $as_nop
+ if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
then ac_cv_path_FGREP="$GREP -F"
else
if test -z "$FGREP"; then
@@ -5771,10 +5579,9 @@
as_fn_executable_p "$ac_path_FGREP" || continue
# Check for GNU ac_path_FGREP and select it if it is found.
# Check for GNU $ac_path_FGREP
-case `"$ac_path_FGREP" --version 2>&1` in #(
+case `"$ac_path_FGREP" --version 2>&1` in
*GNU*)
ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
-#(
*)
ac_count=0
printf %s 0123456789 >"conftest.in"
@@ -5810,8 +5617,7 @@
ac_cv_path_FGREP=$FGREP
fi
- fi ;;
-esac
+ fi
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
printf "%s\n" "$ac_cv_path_FGREP" >&6; }
@@ -5842,9 +5648,8 @@
if test ${with_gnu_ld+y}
then :
withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
-else case e in #(
- e) with_gnu_ld=no ;;
-esac
+else $as_nop
+ with_gnu_ld=no
fi
ac_prog=ld
@@ -5853,7 +5658,7 @@
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
printf %s "checking for ld used by $CC... " >&6; }
case $host in
- *-*-mingw* | *-*-windows*)
+ *-*-mingw*)
# gcc leaves a trailing carriage return, which upsets mingw
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
*)
@@ -5889,8 +5694,8 @@
if test ${lt_cv_path_LD+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -z "$LD"; then
+else $as_nop
+ if test -z "$LD"; then
lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH; do
IFS=$lt_save_ifs
@@ -5913,8 +5718,7 @@
IFS=$lt_save_ifs
else
lt_cv_path_LD=$LD # Let the user override the test with a path.
-fi ;;
-esac
+fi
fi
LD=$lt_cv_path_LD
@@ -5931,8 +5735,8 @@
if test ${lt_cv_prog_gnu_ld+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) # I'd rather use --version here, but apparently some GNU lds only accept -v.
+else $as_nop
+ # I'd rather use --version here, but apparently some GNU lds only accept -v.
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
@@ -5940,7 +5744,6 @@
*)
lt_cv_prog_gnu_ld=no
;;
-esac ;;
esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
@@ -5960,8 +5763,8 @@
if test ${lt_cv_path_NM+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$NM"; then
+else $as_nop
+ if test -n "$NM"; then
# Let the user override the test.
lt_cv_path_NM=$NM
else
@@ -5982,7 +5785,7 @@
# Tru64's nm complains that /dev/null is an invalid object file
# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
case $build_os in
- mingw* | windows*) lt_bad_file=conftest.nm/nofile ;;
+ mingw*) lt_bad_file=conftest.nm/nofile ;;
*) lt_bad_file=/dev/null ;;
esac
case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in
@@ -6008,8 +5811,7 @@
IFS=$lt_save_ifs
done
: ${lt_cv_path_NM=no}
-fi ;;
-esac
+fi
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
printf "%s\n" "$lt_cv_path_NM" >&6; }
@@ -6030,8 +5832,8 @@
if test ${ac_cv_prog_DUMPBIN+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$DUMPBIN"; then
+else $as_nop
+ if test -n "$DUMPBIN"; then
ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -6053,8 +5855,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
DUMPBIN=$ac_cv_prog_DUMPBIN
if test -n "$DUMPBIN"; then
@@ -6080,8 +5881,8 @@
if test ${ac_cv_prog_ac_ct_DUMPBIN+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$ac_ct_DUMPBIN"; then
+else $as_nop
+ if test -n "$ac_ct_DUMPBIN"; then
ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -6103,8 +5904,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
if test -n "$ac_ct_DUMPBIN"; then
@@ -6158,8 +5958,8 @@
if test ${lt_cv_nm_interface+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) lt_cv_nm_interface="BSD nm"
+else $as_nop
+ lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
(eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
@@ -6172,8 +5972,7 @@
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
fi
- rm -f conftest* ;;
-esac
+ rm -f conftest*
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
printf "%s\n" "$lt_cv_nm_interface" >&6; }
@@ -6184,8 +5983,8 @@
if test ${lt_cv_sys_max_cmd_len+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) i=0
+else $as_nop
+ i=0
teststring=ABCD
case $build_os in
@@ -6204,7 +6003,7 @@
lt_cv_sys_max_cmd_len=-1;
;;
- cygwin* | mingw* | windows* | cegcc*)
+ cygwin* | mingw* | cegcc*)
# On Win9x/ME, this test blows up -- it succeeds, but takes
# about 5 minutes as the teststring grows exponentially.
# Worse, since 9x/ME are not pre-emptively multitasking,
@@ -6226,7 +6025,7 @@
lt_cv_sys_max_cmd_len=8192;
;;
- darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*)
+ bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*)
# This has been around since 386BSD, at least. Likely further.
if test -x /sbin/sysctl; then
lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -6307,8 +6106,7 @@
fi
;;
esac
- ;;
-esac
+
fi
if test -n "$lt_cv_sys_max_cmd_len"; then
@@ -6365,11 +6163,11 @@
if test ${lt_cv_to_host_file_cmd+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) case $host in
+else $as_nop
+ case $host in
*-*-mingw* )
case $build in
- *-*-mingw* | *-*-windows* ) # actually msys
+ *-*-mingw* ) # actually msys
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
;;
*-*-cygwin* )
@@ -6382,7 +6180,7 @@
;;
*-*-cygwin* )
case $build in
- *-*-mingw* | *-*-windows* ) # actually msys
+ *-*-mingw* ) # actually msys
lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
;;
*-*-cygwin* )
@@ -6397,8 +6195,7 @@
lt_cv_to_host_file_cmd=func_convert_file_noop
;;
esac
- ;;
-esac
+
fi
to_host_file_cmd=$lt_cv_to_host_file_cmd
@@ -6414,20 +6211,19 @@
if test ${lt_cv_to_tool_file_cmd+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) #assume ordinary cross tools, or native build.
+else $as_nop
+ #assume ordinary cross tools, or native build.
lt_cv_to_tool_file_cmd=func_convert_file_noop
case $host in
- *-*-mingw* | *-*-windows* )
+ *-*-mingw* )
case $build in
- *-*-mingw* | *-*-windows* ) # actually msys
+ *-*-mingw* ) # actually msys
lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
;;
esac
;;
esac
- ;;
-esac
+
fi
to_tool_file_cmd=$lt_cv_to_tool_file_cmd
@@ -6443,9 +6239,8 @@
if test ${lt_cv_ld_reload_flag+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) lt_cv_ld_reload_flag='-r' ;;
-esac
+else $as_nop
+ lt_cv_ld_reload_flag='-r'
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
printf "%s\n" "$lt_cv_ld_reload_flag" >&6; }
@@ -6456,7 +6251,7 @@
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
- cygwin* | mingw* | windows* | pw32* | cegcc*)
+ cygwin* | mingw* | pw32* | cegcc*)
if test yes != "$GCC"; then
reload_cmds=false
fi
@@ -6478,15 +6273,16 @@
-# Extract the first word of "file", so it can be a program name with args.
-set dummy file; ac_word=$2
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}file", so it can be a program name with args.
+set dummy ${ac_tool_prefix}file; ac_word=$2
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_prog_FILECMD+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$FILECMD"; then
+else $as_nop
+ if test -n "$FILECMD"; then
ac_cv_prog_FILECMD="$FILECMD" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -6500,7 +6296,7 @@
esac
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_prog_FILECMD="file"
+ ac_cv_prog_FILECMD="${ac_tool_prefix}file"
printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -6508,9 +6304,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_prog_FILECMD" && ac_cv_prog_FILECMD=":"
-fi ;;
-esac
+fi
fi
FILECMD=$ac_cv_prog_FILECMD
if test -n "$FILECMD"; then
@@ -6522,6 +6316,65 @@
fi
+fi
+if test -z "$ac_cv_prog_FILECMD"; then
+ ac_ct_FILECMD=$FILECMD
+ # Extract the first word of "file", so it can be a program name with args.
+set dummy file; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_FILECMD+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ if test -n "$ac_ct_FILECMD"; then
+ ac_cv_prog_ac_ct_FILECMD="$ac_ct_FILECMD" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_FILECMD="file"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_FILECMD=$ac_cv_prog_ac_ct_FILECMD
+if test -n "$ac_ct_FILECMD"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FILECMD" >&5
+printf "%s\n" "$ac_ct_FILECMD" >&6; }
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+ if test "x$ac_ct_FILECMD" = x; then
+ FILECMD=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ FILECMD=$ac_ct_FILECMD
+ fi
+else
+ FILECMD="$ac_cv_prog_FILECMD"
+fi
+
@@ -6536,8 +6389,8 @@
if test ${ac_cv_prog_OBJDUMP+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$OBJDUMP"; then
+else $as_nop
+ if test -n "$OBJDUMP"; then
ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -6559,8 +6412,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
OBJDUMP=$ac_cv_prog_OBJDUMP
if test -n "$OBJDUMP"; then
@@ -6582,8 +6434,8 @@
if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$ac_ct_OBJDUMP"; then
+else $as_nop
+ if test -n "$ac_ct_OBJDUMP"; then
ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -6605,8 +6457,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
if test -n "$ac_ct_OBJDUMP"; then
@@ -6647,8 +6498,8 @@
if test ${lt_cv_deplibs_check_method+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) lt_cv_file_magic_cmd='$MAGIC_CMD'
+else $as_nop
+ lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file=
lt_cv_deplibs_check_method='unknown'
# Need to set the preceding variable on all platforms that support
@@ -6656,6 +6507,7 @@
# 'none' -- dependencies not supported.
# 'unknown' -- same as none, but documents that we really don't know.
# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
# 'file_magic [[regex]]' -- check by looking for files in library path
# that responds to the $file_magic_cmd with a given extended regex.
# If you have 'file' or equivalent on your system and you're not sure
@@ -6682,7 +6534,7 @@
lt_cv_file_magic_cmd='func_win32_libid'
;;
-mingw* | windows* | pw32*)
+mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
@@ -6691,7 +6543,7 @@
lt_cv_file_magic_cmd='func_win32_libid'
else
# Keep this pattern in sync with the one in func_win32_libid.
- lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|pe-aarch64)'
+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
lt_cv_file_magic_cmd='$OBJDUMP -f'
fi
;;
@@ -6764,7 +6616,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
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
@@ -6782,7 +6634,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-openbsd*)
+openbsd* | bitrig*)
if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
else
@@ -6840,8 +6692,7 @@
lt_cv_deplibs_check_method=pass_all
;;
esac
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
printf "%s\n" "$lt_cv_deplibs_check_method" >&6; }
@@ -6850,7 +6701,7 @@
want_nocaseglob=no
if test "$build" = "$host"; then
case $host_os in
- mingw* | windows* | pw32*)
+ mingw* | pw32*)
if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
want_nocaseglob=yes
else
@@ -6893,8 +6744,8 @@
if test ${ac_cv_prog_DLLTOOL+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$DLLTOOL"; then
+else $as_nop
+ if test -n "$DLLTOOL"; then
ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -6916,8 +6767,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
DLLTOOL=$ac_cv_prog_DLLTOOL
if test -n "$DLLTOOL"; then
@@ -6939,8 +6789,8 @@
if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$ac_ct_DLLTOOL"; then
+else $as_nop
+ if test -n "$ac_ct_DLLTOOL"; then
ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -6962,8 +6812,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
if test -n "$ac_ct_DLLTOOL"; then
@@ -7005,11 +6854,11 @@
if test ${lt_cv_sharedlib_from_linklib_cmd+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) lt_cv_sharedlib_from_linklib_cmd='unknown'
+else $as_nop
+ lt_cv_sharedlib_from_linklib_cmd='unknown'
case $host_os in
-cygwin* | mingw* | windows* | pw32* | cegcc*)
+cygwin* | mingw* | pw32* | cegcc*)
# two different shell functions defined in ltmain.sh;
# decide which one to use based on capabilities of $DLLTOOL
case `$DLLTOOL --help 2>&1` in
@@ -7026,8 +6875,7 @@
lt_cv_sharedlib_from_linklib_cmd=$ECHO
;;
esac
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
printf "%s\n" "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
@@ -7042,110 +6890,6 @@
if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_RANLIB+y}
-then :
- printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$RANLIB"; then
- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi ;;
-esac
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-printf "%s\n" "$RANLIB" >&6; }
-else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
- ac_ct_RANLIB=$RANLIB
- # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_RANLIB+y}
-then :
- printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$ac_ct_RANLIB"; then
- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_RANLIB="ranlib"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi ;;
-esac
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-printf "%s\n" "$ac_ct_RANLIB" >&6; }
-else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
- if test "x$ac_ct_RANLIB" = x; then
- RANLIB=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- RANLIB=$ac_ct_RANLIB
- fi
-else
- RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-if test -n "$ac_tool_prefix"; then
for ac_prog in ar
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
@@ -7155,8 +6899,8 @@
if test ${ac_cv_prog_AR+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$AR"; then
+else $as_nop
+ if test -n "$AR"; then
ac_cv_prog_AR="$AR" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -7178,8 +6922,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
AR=$ac_cv_prog_AR
if test -n "$AR"; then
@@ -7205,8 +6948,8 @@
if test ${ac_cv_prog_ac_ct_AR+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$ac_ct_AR"; then
+else $as_nop
+ if test -n "$ac_ct_AR"; then
ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -7228,8 +6971,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
ac_ct_AR=$ac_cv_prog_ac_ct_AR
if test -n "$ac_ct_AR"; then
@@ -7266,7 +7008,7 @@
# Use ARFLAGS variable as AR's operation code to sync the variable naming with
# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have
-# higher priority because that's what people were doing historically (setting
+# higher priority because thats what people were doing historically (setting
# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS
# variable obsoleted/removed.
@@ -7291,8 +7033,8 @@
if test ${lt_cv_ar_at_file+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) lt_cv_ar_at_file=no
+else $as_nop
+ lt_cv_ar_at_file=no
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -7329,8 +7071,7 @@
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
printf "%s\n" "$lt_cv_ar_at_file" >&6; }
@@ -7355,8 +7096,8 @@
if test ${ac_cv_prog_STRIP+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$STRIP"; then
+else $as_nop
+ if test -n "$STRIP"; then
ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -7378,8 +7119,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
@@ -7401,8 +7141,8 @@
if test ${ac_cv_prog_ac_ct_STRIP+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$ac_ct_STRIP"; then
+else $as_nop
+ if test -n "$ac_ct_STRIP"; then
ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -7424,8 +7164,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
@@ -7458,6 +7197,107 @@
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_RANLIB+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ if test -n "$RANLIB"; then
+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+printf "%s\n" "$RANLIB" >&6; }
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+ ac_ct_RANLIB=$RANLIB
+ # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_RANLIB+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ if test -n "$ac_ct_RANLIB"; then
+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_RANLIB="ranlib"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+printf "%s\n" "$ac_ct_RANLIB" >&6; }
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+ if test "x$ac_ct_RANLIB" = x; then
+ RANLIB=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ RANLIB=$ac_ct_RANLIB
+ fi
+else
+ RANLIB="$ac_cv_prog_RANLIB"
+fi
test -z "$RANLIB" && RANLIB=:
@@ -7472,8 +7312,15 @@
old_postuninstall_cmds=
if test -n "$RANLIB"; then
+ case $host_os in
+ bitrig* | openbsd*)
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+ ;;
+ *)
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+ ;;
+ esac
old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
fi
case $host_os in
@@ -7537,8 +7384,8 @@
if test ${lt_cv_sys_global_symbol_pipe+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e)
+else $as_nop
+
# These are sane defaults that work on at least a few old systems.
# [They come from Ultrix. What could be older than Ultrix?!! ;)]
@@ -7553,7 +7400,7 @@
aix*)
symcode='[BCDT]'
;;
-cygwin* | mingw* | windows* | pw32* | cegcc*)
+cygwin* | mingw* | pw32* | cegcc*)
symcode='[ABCDGISTW]'
;;
hpux*)
@@ -7568,7 +7415,7 @@
symcode='[BCDEGQRST]'
;;
solaris*)
- symcode='[BCDRT]'
+ symcode='[BDRT]'
;;
sco3.2v5*)
symcode='[DT]'
@@ -7632,7 +7479,7 @@
# Handle CRLF in mingw tool chain
opt_cr=
case $build_os in
-mingw* | windows*)
+mingw*)
opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
;;
esac
@@ -7683,7 +7530,7 @@
#ifdef __cplusplus
}
#endif
-int main(void){nm_test_var='a';nm_test_func();return(0);}
+int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -7693,11 +7540,8 @@
test $ac_status = 0; }; then
# Now try to grab the symbols.
nlist=conftest.nm
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
- (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
- ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && test -s "$nlist"; then
+ $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
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
@@ -7793,8 +7637,7 @@
lt_cv_sys_global_symbol_pipe=
fi
done
- ;;
-esac
+
fi
if test -z "$lt_cv_sys_global_symbol_pipe"; then
@@ -7858,9 +7701,8 @@
if test ${with_sysroot+y}
then :
withval=$with_sysroot;
-else case e in #(
- e) with_sysroot=no ;;
-esac
+else $as_nop
+ with_sysroot=no
fi
@@ -7868,9 +7710,7 @@
case $with_sysroot in #(
yes)
if test yes = "$GCC"; then
- # Trim trailing / since we'll always append absolute paths and we want
- # to avoid //, if only for less confusing output for the user.
- lt_sysroot=`$CC --print-sysroot 2>/dev/null | $SED 's:/\+$::'`
+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
fi
;; #(
/*)
@@ -7897,8 +7737,8 @@
if test ${ac_cv_path_lt_DD+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) printf 0123456789abcdef0123456789abcdef >conftest.i
+else $as_nop
+ printf 0123456789abcdef0123456789abcdef >conftest.i
cat conftest.i conftest.i >conftest2.i
: ${lt_DD:=$DD}
if test -z "$lt_DD"; then
@@ -7934,8 +7774,7 @@
ac_cv_path_lt_DD=$lt_DD
fi
-rm -f conftest.i conftest2.i conftest.out ;;
-esac
+rm -f conftest.i conftest2.i conftest.out
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
printf "%s\n" "$ac_cv_path_lt_DD" >&6; }
@@ -7946,8 +7785,8 @@
if test ${lt_cv_truncate_bin+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) printf 0123456789abcdef0123456789abcdef >conftest.i
+else $as_nop
+ printf 0123456789abcdef0123456789abcdef >conftest.i
cat conftest.i conftest.i >conftest2.i
lt_cv_truncate_bin=
if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
@@ -7955,8 +7794,7 @@
&& lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
fi
rm -f conftest.i conftest2.i conftest.out
-test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" ;;
-esac
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
printf "%s\n" "$lt_cv_truncate_bin" >&6; }
@@ -8087,7 +7925,7 @@
;;
x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out what ABI is being produced by ac_compile, and set linker
# options accordingly. Note that the listed cases only cover the
# situations where additional linker options are needed (such as when
@@ -8106,7 +7944,7 @@
x86_64-*kfreebsd*-gnu)
LD="${LD-ld} -m elf_i386_fbsd"
;;
- x86_64-*linux*|x86_64-gnu*)
+ x86_64-*linux*)
case `$FILECMD conftest.o` in
*x86-64*)
LD="${LD-ld} -m elf32_x86_64"
@@ -8135,7 +7973,7 @@
x86_64-*kfreebsd*-gnu)
LD="${LD-ld} -m elf_x86_64_fbsd"
;;
- x86_64-*linux*|x86_64-gnu*)
+ x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
powerpcle-*linux*)
@@ -8166,8 +8004,8 @@
if test ${lt_cv_cc_needs_belf+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) ac_ext=c
+else $as_nop
+ ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -8187,9 +8025,8 @@
if ac_fn_c_try_link "$LINENO"
then :
lt_cv_cc_needs_belf=yes
-else case e in #(
- e) lt_cv_cc_needs_belf=no ;;
-esac
+else $as_nop
+ lt_cv_cc_needs_belf=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
@@ -8198,8 +8035,7 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
@@ -8257,8 +8093,8 @@
if test ${ac_cv_prog_MANIFEST_TOOL+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$MANIFEST_TOOL"; then
+else $as_nop
+ if test -n "$MANIFEST_TOOL"; then
ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8280,8 +8116,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
if test -n "$MANIFEST_TOOL"; then
@@ -8303,8 +8138,8 @@
if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$ac_ct_MANIFEST_TOOL"; then
+else $as_nop
+ if test -n "$ac_ct_MANIFEST_TOOL"; then
ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8326,8 +8161,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
if test -n "$ac_ct_MANIFEST_TOOL"; then
@@ -8356,23 +8190,22 @@
test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
printf %s "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
-if test ${lt_cv_path_manifest_tool+y}
+if test ${lt_cv_path_mainfest_tool+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) lt_cv_path_manifest_tool=no
+else $as_nop
+ lt_cv_path_mainfest_tool=no
echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
$MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
cat conftest.err >&5
if $GREP 'Manifest Tool' conftest.out > /dev/null; then
- lt_cv_path_manifest_tool=yes
+ lt_cv_path_mainfest_tool=yes
fi
- rm -f conftest* ;;
-esac
+ rm -f conftest*
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_manifest_tool" >&5
-printf "%s\n" "$lt_cv_path_manifest_tool" >&6; }
-if test yes != "$lt_cv_path_manifest_tool"; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
+printf "%s\n" "$lt_cv_path_mainfest_tool" >&6; }
+if test yes != "$lt_cv_path_mainfest_tool"; then
MANIFEST_TOOL=:
fi
@@ -8391,8 +8224,8 @@
if test ${ac_cv_prog_DSYMUTIL+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$DSYMUTIL"; then
+else $as_nop
+ if test -n "$DSYMUTIL"; then
ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8414,8 +8247,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
DSYMUTIL=$ac_cv_prog_DSYMUTIL
if test -n "$DSYMUTIL"; then
@@ -8437,8 +8269,8 @@
if test ${ac_cv_prog_ac_ct_DSYMUTIL+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$ac_ct_DSYMUTIL"; then
+else $as_nop
+ if test -n "$ac_ct_DSYMUTIL"; then
ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8460,8 +8292,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
if test -n "$ac_ct_DSYMUTIL"; then
@@ -8495,8 +8326,8 @@
if test ${ac_cv_prog_NMEDIT+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$NMEDIT"; then
+else $as_nop
+ if test -n "$NMEDIT"; then
ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8518,8 +8349,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
NMEDIT=$ac_cv_prog_NMEDIT
if test -n "$NMEDIT"; then
@@ -8541,8 +8371,8 @@
if test ${ac_cv_prog_ac_ct_NMEDIT+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$ac_ct_NMEDIT"; then
+else $as_nop
+ if test -n "$ac_ct_NMEDIT"; then
ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8564,8 +8394,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
if test -n "$ac_ct_NMEDIT"; then
@@ -8599,8 +8428,8 @@
if test ${ac_cv_prog_LIPO+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$LIPO"; then
+else $as_nop
+ if test -n "$LIPO"; then
ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8622,8 +8451,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
LIPO=$ac_cv_prog_LIPO
if test -n "$LIPO"; then
@@ -8645,8 +8473,8 @@
if test ${ac_cv_prog_ac_ct_LIPO+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$ac_ct_LIPO"; then
+else $as_nop
+ if test -n "$ac_ct_LIPO"; then
ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8668,8 +8496,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
if test -n "$ac_ct_LIPO"; then
@@ -8703,8 +8530,8 @@
if test ${ac_cv_prog_OTOOL+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$OTOOL"; then
+else $as_nop
+ if test -n "$OTOOL"; then
ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8726,8 +8553,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
OTOOL=$ac_cv_prog_OTOOL
if test -n "$OTOOL"; then
@@ -8749,8 +8575,8 @@
if test ${ac_cv_prog_ac_ct_OTOOL+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$ac_ct_OTOOL"; then
+else $as_nop
+ if test -n "$ac_ct_OTOOL"; then
ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8772,8 +8598,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
if test -n "$ac_ct_OTOOL"; then
@@ -8807,8 +8632,8 @@
if test ${ac_cv_prog_OTOOL64+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$OTOOL64"; then
+else $as_nop
+ if test -n "$OTOOL64"; then
ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8830,8 +8655,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
OTOOL64=$ac_cv_prog_OTOOL64
if test -n "$OTOOL64"; then
@@ -8853,8 +8677,8 @@
if test ${ac_cv_prog_ac_ct_OTOOL64+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$ac_ct_OTOOL64"; then
+else $as_nop
+ if test -n "$ac_ct_OTOOL64"; then
ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8876,8 +8700,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
if test -n "$ac_ct_OTOOL64"; then
@@ -8934,8 +8757,8 @@
if test ${lt_cv_apple_cc_single_mod+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) lt_cv_apple_cc_single_mod=no
+else $as_nop
+ lt_cv_apple_cc_single_mod=no
if test -z "$LT_MULTI_MODULE"; then
# By default we will add the -single_module flag. You can override
# by either setting the environment variable LT_MULTI_MODULE
@@ -8961,58 +8784,18 @@
fi
rm -rf libconftest.dylib*
rm -f conftest.*
- fi ;;
-esac
+ fi
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; }
- # Feature test to disable chained fixups since it is not
- # compatible with '-undefined dynamic_lookup'
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -no_fixup_chains linker flag" >&5
-printf %s "checking for -no_fixup_chains linker flag... " >&6; }
-if test ${lt_cv_support_no_fixup_chains+y}
-then :
- printf %s "(cached) " >&6
-else case e in #(
- e) save_LDFLAGS=$LDFLAGS
- LDFLAGS="$LDFLAGS -Wl,-no_fixup_chains"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main (void)
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
- lt_cv_support_no_fixup_chains=yes
-else case e in #(
- e) lt_cv_support_no_fixup_chains=no
- ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
- conftest$ac_exeext conftest.$ac_ext
- LDFLAGS=$save_LDFLAGS
-
- ;;
-esac
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_support_no_fixup_chains" >&5
-printf "%s\n" "$lt_cv_support_no_fixup_chains" >&6; }
-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
printf %s "checking for -exported_symbols_list linker flag... " >&6; }
if test ${lt_cv_ld_exported_symbols_list+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) lt_cv_ld_exported_symbols_list=no
+else $as_nop
+ lt_cv_ld_exported_symbols_list=no
save_LDFLAGS=$LDFLAGS
echo "_main" > conftest.sym
LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
@@ -9030,15 +8813,13 @@
if ac_fn_c_try_link "$LINENO"
then :
lt_cv_ld_exported_symbols_list=yes
-else case e in #(
- e) lt_cv_ld_exported_symbols_list=no ;;
-esac
+else $as_nop
+ lt_cv_ld_exported_symbols_list=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$save_LDFLAGS
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; }
@@ -9048,8 +8829,8 @@
if test ${lt_cv_ld_force_load+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) lt_cv_ld_force_load=no
+else $as_nop
+ lt_cv_ld_force_load=no
cat > conftest.c << _LT_EOF
int forced_loaded() { return 2;}
_LT_EOF
@@ -9060,7 +8841,7 @@
echo "$RANLIB libconftest.a" >&5
$RANLIB libconftest.a 2>&5
cat > conftest.c << _LT_EOF
-int main(void) { return 0;}
+int main() { return 0;}
_LT_EOF
echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
@@ -9074,8 +8855,7 @@
fi
rm -f conftest.err libconftest.a conftest conftest.c
rm -rf conftest.dSYM
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
printf "%s\n" "$lt_cv_ld_force_load" >&6; }
@@ -9089,11 +8869,7 @@
10.[012],*|,*powerpc*-darwin[5-8]*)
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
*)
- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup'
- if test yes = "$lt_cv_support_no_fixup_chains"; then
- as_fn_append _lt_dar_allow_undefined ' $wl-no_fixup_chains'
- fi
- ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
esac
;;
esac
@@ -9210,9 +8986,8 @@
IFS=$lt_save_ifs
;;
esac
-else case e in #(
- e) enable_static=no ;;
-esac
+else $as_nop
+ enable_static=no
fi
@@ -9250,9 +9025,8 @@
IFS=$lt_save_ifs
;;
esac
-else case e in #(
- e) enable_shared=yes ;;
-esac
+else $as_nop
+ enable_shared=yes
fi
@@ -9264,52 +9038,28 @@
- # Check whether --enable-pic was given.
-if test ${enable_pic+y}
-then :
- enableval=$enable_pic; lt_p=${PACKAGE-default}
- case $enableval in
- yes|no) pic_mode=$enableval ;;
- *)
- pic_mode=default
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
- for lt_pkg in $enableval; do
- IFS=$lt_save_ifs
- if test "X$lt_pkg" = "X$lt_p"; then
- pic_mode=yes
- fi
- done
- IFS=$lt_save_ifs
- ;;
- esac
-else case e in #(
- e) # Check whether --with-pic was given.
+
+# Check whether --with-pic was given.
if test ${with_pic+y}
then :
withval=$with_pic; lt_p=${PACKAGE-default}
- case $withval in
- yes|no) pic_mode=$withval ;;
- *)
- pic_mode=default
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
- for lt_pkg in $withval; do
- IFS=$lt_save_ifs
- if test "X$lt_pkg" = "X$lt_p"; then
- pic_mode=yes
- fi
- done
- IFS=$lt_save_ifs
- ;;
- esac
-else case e in #(
- e) pic_mode=default ;;
-esac
-fi
-
- ;;
-esac
+ case $withval in
+ yes|no) pic_mode=$withval ;;
+ *)
+ pic_mode=default
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+ for lt_pkg in $withval; do
+ IFS=$lt_save_ifs
+ if test "X$lt_pkg" = "X$lt_p"; then
+ pic_mode=yes
+ fi
+ done
+ IFS=$lt_save_ifs
+ ;;
+ esac
+else $as_nop
+ pic_mode=default
fi
@@ -9339,9 +9089,8 @@
IFS=$lt_save_ifs
;;
esac
-else case e in #(
- e) enable_fast_install=yes ;;
-esac
+else $as_nop
+ enable_fast_install=yes
fi
@@ -9356,46 +9105,29 @@
power*-*-aix[5-9]*,yes)
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
printf %s "checking which variant of shared library versioning to provide... " >&6; }
- # Check whether --enable-aix-soname was given.
-if test ${enable_aix_soname+y}
-then :
- enableval=$enable_aix_soname; case $enableval in
- aix|svr4|both)
- ;;
- *)
- as_fn_error $? "Unknown argument to --enable-aix-soname" "$LINENO" 5
- ;;
- esac
- lt_cv_with_aix_soname=$enable_aix_soname
-else case e in #(
- e) # Check whether --with-aix-soname was given.
+
+# Check whether --with-aix-soname was given.
if test ${with_aix_soname+y}
then :
withval=$with_aix_soname; case $withval in
- aix|svr4|both)
- ;;
- *)
- as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
- ;;
- esac
- lt_cv_with_aix_soname=$with_aix_soname
-else case e in #(
- e) if test ${lt_cv_with_aix_soname+y}
+ aix|svr4|both)
+ ;;
+ *)
+ as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+ ;;
+ esac
+ lt_cv_with_aix_soname=$with_aix_soname
+else $as_nop
+ if test ${lt_cv_with_aix_soname+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) lt_cv_with_aix_soname=aix ;;
-esac
-fi
- ;;
-esac
+else $as_nop
+ lt_cv_with_aix_soname=aix
fi
- enable_aix_soname=$lt_cv_with_aix_soname ;;
-esac
+ with_aix_soname=$lt_cv_with_aix_soname
fi
- with_aix_soname=$enable_aix_soname
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
printf "%s\n" "$with_aix_soname" >&6; }
if test aix != "$with_aix_soname"; then
@@ -9484,8 +9216,8 @@
if test ${lt_cv_objdir+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) rm -f .libs 2>/dev/null
+else $as_nop
+ rm -f .libs 2>/dev/null
mkdir .libs 2>/dev/null
if test -d .libs; then
lt_cv_objdir=.libs
@@ -9493,8 +9225,7 @@
# MS-DOS does not allow filenames that begin with a dot.
lt_cv_objdir=_libs
fi
-rmdir .libs 2>/dev/null ;;
-esac
+rmdir .libs 2>/dev/null
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
printf "%s\n" "$lt_cv_objdir" >&6; }
@@ -9555,8 +9286,8 @@
if test ${lt_cv_path_MAGIC_CMD+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) case $MAGIC_CMD in
+else $as_nop
+ case $MAGIC_CMD in
[\\/*] | ?:[\\/]*)
lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
;;
@@ -9599,7 +9330,6 @@
IFS=$lt_save_ifs
MAGIC_CMD=$lt_save_MAGIC_CMD
;;
-esac ;;
esac
fi
@@ -9623,8 +9353,8 @@
if test ${lt_cv_path_MAGIC_CMD+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) case $MAGIC_CMD in
+else $as_nop
+ case $MAGIC_CMD in
[\\/*] | ?:[\\/]*)
lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
;;
@@ -9667,7 +9397,6 @@
IFS=$lt_save_ifs
MAGIC_CMD=$lt_save_MAGIC_CMD
;;
-esac ;;
esac
fi
@@ -9711,7 +9440,7 @@
lt_simple_compile_test_code="int some_variable = 0;"
# Code to be used in simple link tests
-lt_simple_link_test_code='int main(void){return(0);}'
+lt_simple_link_test_code='int main(){return(0);}'
@@ -9767,8 +9496,8 @@
if test ${lt_cv_prog_compiler_rtti_exceptions+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) lt_cv_prog_compiler_rtti_exceptions=no
+else $as_nop
+ lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment
@@ -9796,8 +9525,7 @@
fi
fi
$RM conftest*
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
@@ -9853,7 +9581,7 @@
# PIC is the default for these OSes.
;;
- mingw* | windows* | cygwin* | pw32* | os2* | cegcc*)
+ mingw* | cygwin* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
@@ -9956,7 +9684,7 @@
esac
;;
- mingw* | windows* | cygwin* | pw32* | os2* | cegcc*)
+ mingw* | cygwin* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
@@ -9997,8 +9725,8 @@
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-static'
;;
- *flang* | ftn)
- # Flang compiler.
+ # 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'
@@ -10168,9 +9896,8 @@
if test ${lt_cv_prog_compiler_pic+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;;
-esac
+else $as_nop
+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; }
@@ -10185,8 +9912,8 @@
if test ${lt_cv_prog_compiler_pic_works+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) lt_cv_prog_compiler_pic_works=no
+else $as_nop
+ lt_cv_prog_compiler_pic_works=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment
@@ -10214,8 +9941,7 @@
fi
fi
$RM conftest*
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
@@ -10251,8 +9977,8 @@
if test ${lt_cv_prog_compiler_static_works+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) lt_cv_prog_compiler_static_works=no
+else $as_nop
+ lt_cv_prog_compiler_static_works=no
save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -10273,8 +9999,7 @@
fi
$RM -r conftest*
LDFLAGS=$save_LDFLAGS
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
@@ -10296,8 +10021,8 @@
if test ${lt_cv_prog_compiler_c_o+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) lt_cv_prog_compiler_c_o=no
+else $as_nop
+ lt_cv_prog_compiler_c_o=no
$RM -r conftest 2>/dev/null
mkdir conftest
cd conftest
@@ -10337,8 +10062,7 @@
cd ..
$RM -r conftest
$RM conftest*
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
@@ -10353,8 +10077,8 @@
if test ${lt_cv_prog_compiler_c_o+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) lt_cv_prog_compiler_c_o=no
+else $as_nop
+ lt_cv_prog_compiler_c_o=no
$RM -r conftest 2>/dev/null
mkdir conftest
cd conftest
@@ -10394,8 +10118,7 @@
cd ..
$RM -r conftest
$RM conftest*
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
@@ -10474,7 +10197,7 @@
extract_expsyms_cmds=
case $host_os in
- cygwin* | mingw* | windows* | pw32* | cegcc*)
+ cygwin* | mingw* | pw32* | cegcc*)
# FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++ or Intel C++ Compiler.
@@ -10486,9 +10209,12 @@
# we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)
with_gnu_ld=yes
;;
- openbsd*)
+ openbsd* | bitrig*)
with_gnu_ld=no
;;
+ linux* | k*bsd*-gnu | gnu*)
+ link_all_deplibs=no
+ ;;
esac
ld_shlibs=yes
@@ -10589,7 +10315,7 @@
fi
;;
- cygwin* | mingw* | windows* | pw32* | cegcc*)
+ cygwin* | mingw* | pw32* | cegcc*)
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -10645,7 +10371,7 @@
cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
emximp -o $lib $output_objdir/$libname.def'
- old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
enable_shared_with_static_runtimes=yes
file_list_spec='@'
;;
@@ -10724,6 +10450,7 @@
case $cc_basename in
tcc*)
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
export_dynamic_flag_spec='-rdynamic'
;;
xlf* | bgf* | bgxlf* | mpixlf*)
@@ -10744,7 +10471,7 @@
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -10990,8 +10717,8 @@
if test ${lt_cv_aix_libpath_+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else $as_nop
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -11023,8 +10750,7 @@
if test -z "$lt_cv_aix_libpath_"; then
lt_cv_aix_libpath_=/usr/lib:/lib
fi
- ;;
-esac
+
fi
aix_libpath=$lt_cv_aix_libpath_
@@ -11046,8 +10772,8 @@
if test ${lt_cv_aix_libpath_+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else $as_nop
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -11079,8 +10805,7 @@
if test -z "$lt_cv_aix_libpath_"; then
lt_cv_aix_libpath_=/usr/lib:/lib
fi
- ;;
-esac
+
fi
aix_libpath=$lt_cv_aix_libpath_
@@ -11136,7 +10861,7 @@
export_dynamic_flag_spec=-rdynamic
;;
- cygwin* | mingw* | windows* | pw32* | cegcc*)
+ cygwin* | mingw* | pw32* | cegcc*)
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++ or Intel C++ Compiler.
# hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -11153,14 +10878,14 @@
# Tell ltmain to make .dll files, not .so files.
shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
- archive_cmds='$CC -Fe $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then
cp "$export_symbols" "$output_objdir/$soname.def";
echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
else
$SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
fi~
- $CC -Fe $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
linknames='
# The linker will not automatically build a static lib if we build a DLL.
# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
@@ -11331,8 +11056,8 @@
if test ${lt_cv_prog_compiler__b+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) lt_cv_prog_compiler__b=no
+else $as_nop
+ lt_cv_prog_compiler__b=no
save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -b"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -11353,8 +11078,7 @@
fi
$RM -r conftest*
LDFLAGS=$save_LDFLAGS
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
printf "%s\n" "$lt_cv_prog_compiler__b" >&6; }
@@ -11402,8 +11126,8 @@
if test ${lt_cv_irix_exported_symbol+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) save_LDFLAGS=$LDFLAGS
+else $as_nop
+ save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -11412,20 +11136,19 @@
if ac_fn_c_try_link "$LINENO"
then :
lt_cv_irix_exported_symbol=yes
-else case e in #(
- e) lt_cv_irix_exported_symbol=no ;;
-esac
+else $as_nop
+ lt_cv_irix_exported_symbol=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
- LDFLAGS=$save_LDFLAGS ;;
-esac
+ LDFLAGS=$save_LDFLAGS
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
printf "%s\n" "$lt_cv_irix_exported_symbol" >&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'
@@ -11443,11 +11166,12 @@
# Fabrice Bellard et al's Tiny C Compiler
ld_shlibs=yes
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -11469,7 +11193,7 @@
*nto* | *qnx*)
;;
- openbsd*)
+ openbsd* | bitrig*)
if test -f /usr/libexec/ld.so; then
hardcode_direct=yes
hardcode_shlibpath_var=no
@@ -11512,7 +11236,7 @@
cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
emximp -o $lib $output_objdir/$libname.def'
- old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
enable_shared_with_static_runtimes=yes
file_list_spec='@'
;;
@@ -11745,8 +11469,8 @@
if test ${lt_cv_archive_cmds_need_lc+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) $RM conftest*
+else $as_nop
+ $RM conftest*
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -11782,8 +11506,7 @@
cat conftest.err 1>&5
fi
$RM conftest*
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
printf "%s\n" "$lt_cv_archive_cmds_need_lc" >&6; }
@@ -11954,7 +11677,7 @@
*) lt_awk_arg='/^libraries:/' ;;
esac
case $host_os in
- mingw* | windows* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
+ mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
*) lt_sed_strip_eq='s|=/|/|g' ;;
esac
lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
@@ -12012,7 +11735,7 @@
# AWK program above erroneously prepends '/' to C:/dos/paths
# for these hosts.
case $host_os in
- mingw* | windows* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
$SED 's|/\([A-Za-z]:\)|\1|g'` ;;
esac
sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
@@ -12086,7 +11809,7 @@
# Unfortunately, runtime linking may impact performance, so we do
# not want this to be the default eventually. Also, we use the
# versioned .so libs for executables only if there is the -brtl
- # linker flag in LDFLAGS as well, or --enable-aix-soname=svr4 only.
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
# To allow for filename-based versioning support, we need to create
# libNAME.so.V as an archive file, containing:
# *) an Import File, referring to the versioned filename of the
@@ -12180,7 +11903,7 @@
# libtool to hard-code these into programs
;;
-cygwin* | mingw* | windows* | pw32* | cegcc*)
+cygwin* | mingw* | pw32* | cegcc*)
version_type=windows
shrext_cmds=.dll
need_version=no
@@ -12191,19 +11914,6 @@
# gcc
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- # If user builds GCC with mulitlibs enabled,
- # it should just install on $(libdir)
- # not on $(libdir)/../bin or 32 bits dlls would override 64 bit ones.
- if test yes = $multilib; then
- postinstall_cmds='base_file=`basename \$file`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- $install_prog $dir/$dlname $destdir/$dlname~
- chmod a+x $destdir/$dlname~
- if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
- eval '\''$striplib $destdir/$dlname'\'' || exit \$?;
- fi'
- else
postinstall_cmds='base_file=`basename \$file`~
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
@@ -12213,7 +11923,6 @@
if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
fi'
- fi
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$RM \$dlpath'
@@ -12226,7 +11935,7 @@
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
;;
- mingw* | windows* | cegcc*)
+ mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
;;
@@ -12245,7 +11954,7 @@
library_names_spec='$libname.dll.lib'
case $build_os in
- mingw* | windows*)
+ mingw*)
sys_lib_search_path_spec=
lt_save_ifs=$IFS
IFS=';'
@@ -12352,28 +12061,7 @@
need_version=yes
;;
esac
- case $host_cpu in
- powerpc64)
- # On FreeBSD bi-arch platforms, a different variable is used for 32-bit
- # binaries. See <https://man.freebsd.org/cgi/man.cgi?query=ld.so>.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-int test_pointer_size[sizeof (void *) - 5];
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
shlibpath_var=LD_LIBRARY_PATH
-else case e in #(
- e) shlibpath_var=LD_32_LIBRARY_PATH ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
- ;;
- *)
- shlibpath_var=LD_LIBRARY_PATH
- ;;
- esac
case $host_os in
freebsd2.*)
shlibpath_overrides_runpath=yes
@@ -12514,7 +12202,7 @@
version_type=none # Android doesn't support versioned libraries.
need_lib_prefix=no
need_version=no
- library_names_spec='$libname$release$shared_ext $libname$shared_ext'
+ library_names_spec='$libname$release$shared_ext'
soname_spec='$libname$release$shared_ext'
finish_cmds=
shlibpath_var=LD_LIBRARY_PATH
@@ -12526,9 +12214,8 @@
hardcode_into_libs=yes
dynamic_linker='Android linker'
- # -rpath works at least for libraries that are not overridden by
- # libraries installed in system locations.
- hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+ # Don't embed -rpath directories since the linker doesn't support them.
+ hardcode_libdir_flag_spec='-L$libdir'
;;
# This must be glibc/ELF.
@@ -12546,8 +12233,8 @@
if test ${lt_cv_shlibpath_overrides_runpath+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) lt_cv_shlibpath_overrides_runpath=no
+else $as_nop
+ lt_cv_shlibpath_overrides_runpath=no
save_LDFLAGS=$LDFLAGS
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
@@ -12574,8 +12261,7 @@
conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
- ;;
-esac
+
fi
shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
@@ -12585,7 +12271,7 @@
# before this can be enabled.
hardcode_into_libs=yes
- # Ideally, we could use ldconfig to report *all* directories which are
+ # Ideally, we could use ldconfig to report *all* directores which are
# searched for libraries, however this is still not possible. Aside from not
# being certain /sbin/ldconfig is available, command
# 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
@@ -12605,6 +12291,18 @@
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
@@ -12642,7 +12340,7 @@
dynamic_linker='ldqnx.so'
;;
-openbsd*)
+openbsd* | bitrig*)
version_type=sunos
sys_lib_dlsearch_path_spec=/usr/lib
need_lib_prefix=no
@@ -12983,7 +12681,7 @@
lt_cv_dlopen_self=yes
;;
- mingw* | windows* | pw32* | cegcc*)
+ mingw* | pw32* | cegcc*)
lt_cv_dlopen=LoadLibrary
lt_cv_dlopen_libs=
;;
@@ -13000,22 +12698,16 @@
if test ${ac_cv_lib_dl_dlopen+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+ ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply.
- The 'extern "C"' is for builds by C++ compilers;
- although this is not generally supported in C code supporting it here
- has little cost and some practical benefit (sr 110532). */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen (void);
+ builtin and then its argument prototype would still apply. */
+char dlopen ();
int
main (void)
{
@@ -13027,27 +12719,24 @@
if ac_fn_c_try_link "$LINENO"
then :
ac_cv_lib_dl_dlopen=yes
-else case e in #(
- e) ac_cv_lib_dl_dlopen=no ;;
-esac
+else $as_nop
+ ac_cv_lib_dl_dlopen=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
if test "x$ac_cv_lib_dl_dlopen" = xyes
then :
lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
-else case e in #(
- e)
+else $as_nop
+
lt_cv_dlopen=dyld
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
- ;;
-esac
+
fi
;;
@@ -13065,28 +12754,22 @@
if test "x$ac_cv_func_shl_load" = xyes
then :
lt_cv_dlopen=shl_load
-else case e in #(
- e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+else $as_nop
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
printf %s "checking for shl_load in -ldld... " >&6; }
if test ${ac_cv_lib_dld_shl_load+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+ ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply.
- The 'extern "C"' is for builds by C++ compilers;
- although this is not generally supported in C code supporting it here
- has little cost and some practical benefit (sr 110532). */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load (void);
+ builtin and then its argument prototype would still apply. */
+char shl_load ();
int
main (void)
{
@@ -13098,47 +12781,39 @@
if ac_fn_c_try_link "$LINENO"
then :
ac_cv_lib_dld_shl_load=yes
-else case e in #(
- e) ac_cv_lib_dld_shl_load=no ;;
-esac
+else $as_nop
+ ac_cv_lib_dld_shl_load=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; }
if test "x$ac_cv_lib_dld_shl_load" = xyes
then :
lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
-else case e in #(
- e) ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+else $as_nop
+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
if test "x$ac_cv_func_dlopen" = xyes
then :
lt_cv_dlopen=dlopen
-else case e in #(
- e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+else $as_nop
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
printf %s "checking for dlopen in -ldl... " >&6; }
if test ${ac_cv_lib_dl_dlopen+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+ ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply.
- The 'extern "C"' is for builds by C++ compilers;
- although this is not generally supported in C code supporting it here
- has little cost and some practical benefit (sr 110532). */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen (void);
+ builtin and then its argument prototype would still apply. */
+char dlopen ();
int
main (void)
{
@@ -13150,42 +12825,34 @@
if ac_fn_c_try_link "$LINENO"
then :
ac_cv_lib_dl_dlopen=yes
-else case e in #(
- e) ac_cv_lib_dl_dlopen=no ;;
-esac
+else $as_nop
+ ac_cv_lib_dl_dlopen=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
if test "x$ac_cv_lib_dl_dlopen" = xyes
then :
lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
-else case e in #(
- e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+else $as_nop
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
printf %s "checking for dlopen in -lsvld... " >&6; }
if test ${ac_cv_lib_svld_dlopen+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+ ac_check_lib_save_LIBS=$LIBS
LIBS="-lsvld $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply.
- The 'extern "C"' is for builds by C++ compilers;
- although this is not generally supported in C code supporting it here
- has little cost and some practical benefit (sr 110532). */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen (void);
+ builtin and then its argument prototype would still apply. */
+char dlopen ();
int
main (void)
{
@@ -13197,42 +12864,34 @@
if ac_fn_c_try_link "$LINENO"
then :
ac_cv_lib_svld_dlopen=yes
-else case e in #(
- e) ac_cv_lib_svld_dlopen=no ;;
-esac
+else $as_nop
+ ac_cv_lib_svld_dlopen=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; }
if test "x$ac_cv_lib_svld_dlopen" = xyes
then :
lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
-else case e in #(
- e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+else $as_nop
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
printf %s "checking for dld_link in -ldld... " >&6; }
if test ${ac_cv_lib_dld_dld_link+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) ac_check_lib_save_LIBS=$LIBS
+else $as_nop
+ ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply.
- The 'extern "C"' is for builds by C++ compilers;
- although this is not generally supported in C code supporting it here
- has little cost and some practical benefit (sr 110532). */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link (void);
+ builtin and then its argument prototype would still apply. */
+char dld_link ();
int
main (void)
{
@@ -13244,14 +12903,12 @@
if ac_fn_c_try_link "$LINENO"
then :
ac_cv_lib_dld_dld_link=yes
-else case e in #(
- e) ac_cv_lib_dld_dld_link=no ;;
-esac
+else $as_nop
+ ac_cv_lib_dld_dld_link=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; }
@@ -13260,24 +12917,19 @@
lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
fi
- ;;
-esac
+
fi
- ;;
-esac
+
fi
- ;;
-esac
+
fi
- ;;
-esac
+
fi
- ;;
-esac
+
fi
;;
@@ -13305,8 +12957,8 @@
if test ${lt_cv_dlopen_self+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test yes = "$cross_compiling"; then :
+else $as_nop
+ if test yes = "$cross_compiling"; then :
lt_cv_dlopen_self=cross
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -13356,11 +13008,11 @@
/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord (void) __attribute__((visibility("default")));
+int fnord () __attribute__((visibility("default")));
#endif
-int fnord (void) { return 42; }
-int main (void)
+int fnord () { return 42; }
+int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
int status = $lt_dlunknown;
@@ -13400,8 +13052,7 @@
fi
rm -fr conftest*
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
printf "%s\n" "$lt_cv_dlopen_self" >&6; }
@@ -13413,8 +13064,8 @@
if test ${lt_cv_dlopen_self_static+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test yes = "$cross_compiling"; then :
+else $as_nop
+ if test yes = "$cross_compiling"; then :
lt_cv_dlopen_self_static=cross
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -13464,11 +13115,11 @@
/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord (void) __attribute__((visibility("default")));
+int fnord () __attribute__((visibility("default")));
#endif
-int fnord (void) { return 42; }
-int main (void)
+int fnord () { return 42; }
+int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
int status = $lt_dlunknown;
@@ -13508,8 +13159,7 @@
fi
rm -fr conftest*
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
printf "%s\n" "$lt_cv_dlopen_self_static" >&6; }
@@ -13769,7 +13419,7 @@
fi
-XFCONF_VERSION=4.19.3
+XFCONF_VERSION=4.20.0
LIBXFCONF_VERSION_API=0
LIBXFCONF_VERINFO=3:0:0
@@ -13788,9 +13438,8 @@
if test ${enable_nls+y}
then :
enableval=$enable_nls; USE_NLS=$enableval
-else case e in #(
- e) USE_NLS=yes ;;
-esac
+else $as_nop
+ USE_NLS=yes
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
@@ -13838,8 +13487,8 @@
if test ${ac_cv_path_MSGFMT+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) case "$MSGFMT" in
+else $as_nop
+ case "$MSGFMT" in
[\\/]* | ?:[\\/]*)
ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
;;
@@ -13862,7 +13511,6 @@
IFS="$ac_save_IFS"
test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
;;
-esac ;;
esac
fi
MSGFMT="$ac_cv_path_MSGFMT"
@@ -13881,8 +13529,8 @@
if test ${ac_cv_path_GMSGFMT+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) case $GMSGFMT in
+else $as_nop
+ case $GMSGFMT in
[\\/]* | ?:[\\/]*)
ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
;;
@@ -13908,7 +13556,6 @@
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
;;
-esac ;;
esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
@@ -13968,8 +13615,8 @@
if test ${ac_cv_path_XGETTEXT+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) case "$XGETTEXT" in
+else $as_nop
+ case "$XGETTEXT" in
[\\/]* | ?:[\\/]*)
ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
;;
@@ -13992,7 +13639,6 @@
IFS="$ac_save_IFS"
test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
;;
-esac ;;
esac
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
@@ -14047,8 +13693,8 @@
if test ${ac_cv_path_MSGMERGE+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) case "$MSGMERGE" in
+else $as_nop
+ case "$MSGMERGE" in
[\\/]* | ?:[\\/]*)
ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
;;
@@ -14070,7 +13716,6 @@
IFS="$ac_save_IFS"
test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
;;
-esac ;;
esac
fi
MSGMERGE="$ac_cv_path_MSGMERGE"
@@ -14114,9 +13759,8 @@
if test ${with_gnu_ld+y}
then :
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else case e in #(
- e) with_gnu_ld=no ;;
-esac
+else $as_nop
+ with_gnu_ld=no
fi
# Prepare PATH_SEPARATOR.
@@ -14174,8 +13818,8 @@
if test ${acl_cv_path_LD+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -z "$LD"; then
+else $as_nop
+ if test -z "$LD"; then
acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
for ac_dir in $PATH; do
IFS="$acl_save_ifs"
@@ -14198,8 +13842,7 @@
IFS="$acl_save_ifs"
else
acl_cv_path_LD="$LD" # Let the user override the test with a path.
-fi ;;
-esac
+fi
fi
LD="$acl_cv_path_LD"
@@ -14216,8 +13859,8 @@
if test ${acl_cv_prog_gnu_ld+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) # I'd rather use --version here, but apparently some GNU lds only accept -v.
+else $as_nop
+ # I'd rather use --version here, but apparently some GNU lds only accept -v.
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
acl_cv_prog_gnu_ld=yes
@@ -14225,7 +13868,6 @@
*)
acl_cv_prog_gnu_ld=no
;;
-esac ;;
esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
@@ -14241,15 +13883,14 @@
if test ${acl_cv_rpath+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e)
+else $as_nop
+
CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
. ./conftest.sh
rm -f ./conftest.sh
acl_cv_rpath=done
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
printf "%s\n" "$acl_cv_rpath" >&6; }
@@ -14266,9 +13907,8 @@
if test ${enable_rpath+y}
then :
enableval=$enable_rpath; :
-else case e in #(
- e) enable_rpath=yes ;;
-esac
+else $as_nop
+ enable_rpath=yes
fi
@@ -14287,8 +13927,8 @@
if test ${ac_cv_prog_CPP+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) # Double quotes because $CC needs to be expanded
+else $as_nop
+ # Double quotes because $CC needs to be expanded
for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp
do
ac_preproc_ok=false
@@ -14306,10 +13946,9 @@
if ac_fn_c_try_cpp "$LINENO"
then :
-else case e in #(
- e) # Broken: fails on valid input.
-continue ;;
-esac
+else $as_nop
+ # Broken: fails on valid input.
+continue
fi
rm -f conftest.err conftest.i conftest.$ac_ext
@@ -14323,16 +13962,15 @@
then :
# Broken: success on invalid input.
continue
-else case e in #(
- e) # Passes both tests.
+else $as_nop
+ # Passes both tests.
ac_preproc_ok=:
-break ;;
-esac
+break
fi
rm -f conftest.err conftest.i conftest.$ac_ext
done
-# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
rm -f conftest.i conftest.err conftest.$ac_ext
if $ac_preproc_ok
then :
@@ -14341,8 +13979,7 @@
done
ac_cv_prog_CPP=$CPP
- ;;
-esac
+
fi
CPP=$ac_cv_prog_CPP
else
@@ -14365,10 +14002,9 @@
if ac_fn_c_try_cpp "$LINENO"
then :
-else case e in #(
- e) # Broken: fails on valid input.
-continue ;;
-esac
+else $as_nop
+ # Broken: fails on valid input.
+continue
fi
rm -f conftest.err conftest.i conftest.$ac_ext
@@ -14382,26 +14018,24 @@
then :
# Broken: success on invalid input.
continue
-else case e in #(
- e) # Passes both tests.
+else $as_nop
+ # Passes both tests.
ac_preproc_ok=:
-break ;;
-esac
+break
fi
rm -f conftest.err conftest.i conftest.$ac_ext
done
-# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
rm -f conftest.i conftest.err conftest.$ac_ext
if $ac_preproc_ok
then :
-else case e in #(
- e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+else $as_nop
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See 'config.log' for more details" "$LINENO" 5; } ;;
-esac
+See \`config.log' for more details" "$LINENO" 5; }
fi
ac_ext=c
@@ -14411,140 +14045,6 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep -e" >&5
-printf %s "checking for egrep -e... " >&6; }
-if test ${ac_cv_path_EGREP_TRADITIONAL+y}
-then :
- printf %s "(cached) " >&6
-else case e in #(
- e) if test -z "$EGREP_TRADITIONAL"; then
- ac_path_EGREP_TRADITIONAL_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
- IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- for ac_prog in grep ggrep
- do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_EGREP_TRADITIONAL="$as_dir$ac_prog$ac_exec_ext"
- as_fn_executable_p "$ac_path_EGREP_TRADITIONAL" || continue
-# Check for GNU ac_path_EGREP_TRADITIONAL and select it if it is found.
- # Check for GNU $ac_path_EGREP_TRADITIONAL
-case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in #(
-*GNU*)
- ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" ac_path_EGREP_TRADITIONAL_found=:;;
-#(
-*)
- ac_count=0
- printf %s 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl"
- "$ac_path_EGREP_TRADITIONAL" -E 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- as_fn_arith $ac_count + 1 && ac_count=$as_val
- if test $ac_count -gt ${ac_path_EGREP_TRADITIONAL_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL"
- ac_path_EGREP_TRADITIONAL_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
- $ac_path_EGREP_TRADITIONAL_found && break 3
- done
- done
- done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_EGREP_TRADITIONAL"; then
- :
- fi
-else
- ac_cv_path_EGREP_TRADITIONAL=$EGREP_TRADITIONAL
-fi
-
- if test "$ac_cv_path_EGREP_TRADITIONAL"
-then :
- ac_cv_path_EGREP_TRADITIONAL="$ac_cv_path_EGREP_TRADITIONAL -E"
-else case e in #(
- e) if test -z "$EGREP_TRADITIONAL"; then
- ac_path_EGREP_TRADITIONAL_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
- IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- for ac_prog in egrep
- do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_EGREP_TRADITIONAL="$as_dir$ac_prog$ac_exec_ext"
- as_fn_executable_p "$ac_path_EGREP_TRADITIONAL" || continue
-# Check for GNU ac_path_EGREP_TRADITIONAL and select it if it is found.
- # Check for GNU $ac_path_EGREP_TRADITIONAL
-case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in #(
-*GNU*)
- ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" ac_path_EGREP_TRADITIONAL_found=:;;
-#(
-*)
- ac_count=0
- printf %s 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl"
- "$ac_path_EGREP_TRADITIONAL" 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- as_fn_arith $ac_count + 1 && ac_count=$as_val
- if test $ac_count -gt ${ac_path_EGREP_TRADITIONAL_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL"
- ac_path_EGREP_TRADITIONAL_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
- $ac_path_EGREP_TRADITIONAL_found && break 3
- done
- done
- done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_EGREP_TRADITIONAL"; then
- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- fi
-else
- ac_cv_path_EGREP_TRADITIONAL=$EGREP_TRADITIONAL
-fi
- ;;
-esac
-fi ;;
-esac
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP_TRADITIONAL" >&5
-printf "%s\n" "$ac_cv_path_EGREP_TRADITIONAL" >&6; }
- EGREP_TRADITIONAL=$ac_cv_path_EGREP_TRADITIONAL
-
acl_libdirstem=lib
@@ -14556,8 +14056,8 @@
if test ${gl_cv_solaris_64bit+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else $as_nop
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef _LP64
@@ -14566,17 +14066,15 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP_TRADITIONAL "sixtyfour bits" >/dev/null 2>&1
+ $EGREP "sixtyfour bits" >/dev/null 2>&1
then :
gl_cv_solaris_64bit=yes
-else case e in #(
- e) gl_cv_solaris_64bit=no ;;
-esac
+else $as_nop
+ gl_cv_solaris_64bit=no
fi
rm -rf conftest*
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
printf "%s\n" "$gl_cv_solaris_64bit" >&6; }
@@ -15108,8 +14606,8 @@
if test ${gt_cv_func_CFPreferencesCopyAppValue+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) gt_save_LIBS="$LIBS"
+else $as_nop
+ gt_save_LIBS="$LIBS"
LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -15125,14 +14623,12 @@
if ac_fn_c_try_link "$LINENO"
then :
gt_cv_func_CFPreferencesCopyAppValue=yes
-else case e in #(
- e) gt_cv_func_CFPreferencesCopyAppValue=no ;;
-esac
+else $as_nop
+ gt_cv_func_CFPreferencesCopyAppValue=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
- LIBS="$gt_save_LIBS" ;;
-esac
+ LIBS="$gt_save_LIBS"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
printf "%s\n" "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
@@ -15146,8 +14642,8 @@
if test ${gt_cv_func_CFLocaleCopyCurrent+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) gt_save_LIBS="$LIBS"
+else $as_nop
+ gt_save_LIBS="$LIBS"
LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -15163,14 +14659,12 @@
if ac_fn_c_try_link "$LINENO"
then :
gt_cv_func_CFLocaleCopyCurrent=yes
-else case e in #(
- e) gt_cv_func_CFLocaleCopyCurrent=no ;;
-esac
+else $as_nop
+ gt_cv_func_CFLocaleCopyCurrent=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
- LIBS="$gt_save_LIBS" ;;
-esac
+ LIBS="$gt_save_LIBS"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
printf "%s\n" "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
@@ -15226,8 +14720,8 @@
if eval test \${$gt_func_gnugettext_libc+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else $as_nop
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <libintl.h>
@@ -15254,13 +14748,11 @@
if ac_fn_c_try_link "$LINENO"
then :
eval "$gt_func_gnugettext_libc=yes"
-else case e in #(
- e) eval "$gt_func_gnugettext_libc=no" ;;
-esac
+else $as_nop
+ eval "$gt_func_gnugettext_libc=no"
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
- conftest$ac_exeext conftest.$ac_ext ;;
-esac
+ conftest$ac_exeext conftest.$ac_ext
fi
eval ac_res=\$$gt_func_gnugettext_libc
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -15302,8 +14794,8 @@
if test ${am_cv_func_iconv+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e)
+else $as_nop
+
am_cv_func_iconv="no, consider installing GNU libiconv"
am_cv_lib_iconv=no
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15356,8 +14848,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$am_save_LIBS"
fi
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
printf "%s\n" "$am_cv_func_iconv" >&6; }
@@ -15367,8 +14858,8 @@
if test ${am_cv_func_iconv_works+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e)
+else $as_nop
+
am_save_LIBS="$LIBS"
if test $am_cv_lib_iconv = yes; then
LIBS="$LIBS $LIBICONV"
@@ -15381,8 +14872,8 @@
aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
*) am_cv_func_iconv_works="guessing yes" ;;
esac
-else case e in #(
- e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else $as_nop
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <iconv.h>
@@ -15498,15 +14989,13 @@
am_cv_func_iconv_works=yes
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
test "$am_cv_func_iconv_works" = no || break
done
LIBS="$am_save_LIBS"
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
printf "%s\n" "$am_cv_func_iconv_works" >&6; }
@@ -16003,8 +15492,8 @@
if eval test \${$gt_func_gnugettext_libintl+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) gt_save_CPPFLAGS="$CPPFLAGS"
+else $as_nop
+ gt_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $INCINTL"
gt_save_LIBS="$LIBS"
LIBS="$LIBS $LIBINTL"
@@ -16039,9 +15528,8 @@
if ac_fn_c_try_link "$LINENO"
then :
eval "$gt_func_gnugettext_libintl=yes"
-else case e in #(
- e) eval "$gt_func_gnugettext_libintl=no" ;;
-esac
+else $as_nop
+ eval "$gt_func_gnugettext_libintl=no"
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
@@ -16086,8 +15574,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
CPPFLAGS="$gt_save_CPPFLAGS"
- LIBS="$gt_save_LIBS" ;;
-esac
+ LIBS="$gt_save_LIBS"
fi
eval ac_res=\$$gt_func_gnugettext_libintl
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -16221,8 +15708,8 @@
if test ${ac_cv_path_PKG_CONFIG+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) case $PKG_CONFIG in
+else $as_nop
+ case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
;;
@@ -16247,7 +15734,6 @@
IFS=$as_save_IFS
;;
-esac ;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
@@ -16270,8 +15756,8 @@
if test ${ac_cv_path_ac_pt_PKG_CONFIG+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) case $ac_pt_PKG_CONFIG in
+else $as_nop
+ case $ac_pt_PKG_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
;;
@@ -16296,7 +15782,6 @@
IFS=$as_save_IFS
;;
-esac ;;
esac
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
@@ -16404,8 +15889,8 @@
if test ${ac_cv_path_PKG_CONFIG+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) case $PKG_CONFIG in
+else $as_nop
+ case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
;;
@@ -16430,7 +15915,6 @@
IFS=$as_save_IFS
;;
-esac ;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
@@ -16453,8 +15937,8 @@
if test ${ac_cv_path_ac_pt_PKG_CONFIG+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) case $ac_pt_PKG_CONFIG in
+else $as_nop
+ case $ac_pt_PKG_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
;;
@@ -16479,7 +15963,6 @@
IFS=$as_save_IFS
;;
-esac ;;
esac
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
@@ -16631,8 +16114,8 @@
if test ${ac_cv_path_PKG_CONFIG+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) case $PKG_CONFIG in
+else $as_nop
+ case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
;;
@@ -16657,7 +16140,6 @@
IFS=$as_save_IFS
;;
-esac ;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
@@ -16680,8 +16162,8 @@
if test ${ac_cv_path_ac_pt_PKG_CONFIG+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) case $ac_pt_PKG_CONFIG in
+else $as_nop
+ case $ac_pt_PKG_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
;;
@@ -16706,7 +16188,6 @@
IFS=$as_save_IFS
;;
-esac ;;
esac
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
@@ -16846,8 +16327,8 @@
if test ${ac_cv_path_PKG_CONFIG+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) case $PKG_CONFIG in
+else $as_nop
+ case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
;;
@@ -16872,7 +16353,6 @@
IFS=$as_save_IFS
;;
-esac ;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
@@ -16895,8 +16375,8 @@
if test ${ac_cv_path_ac_pt_PKG_CONFIG+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) case $ac_pt_PKG_CONFIG in
+else $as_nop
+ case $ac_pt_PKG_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
;;
@@ -16921,7 +16401,6 @@
IFS=$as_save_IFS
;;
-esac ;;
esac
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
@@ -17061,8 +16540,8 @@
if test ${ac_cv_path_PKG_CONFIG+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) case $PKG_CONFIG in
+else $as_nop
+ case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
;;
@@ -17087,7 +16566,6 @@
IFS=$as_save_IFS
;;
-esac ;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
@@ -17110,8 +16588,8 @@
if test ${ac_cv_path_ac_pt_PKG_CONFIG+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) case $ac_pt_PKG_CONFIG in
+else $as_nop
+ case $ac_pt_PKG_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
;;
@@ -17136,7 +16614,6 @@
IFS=$as_save_IFS
;;
-esac ;;
esac
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
@@ -17276,8 +16753,8 @@
if test ${ac_cv_path_PKG_CONFIG+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) case $PKG_CONFIG in
+else $as_nop
+ case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
;;
@@ -17302,7 +16779,6 @@
IFS=$as_save_IFS
;;
-esac ;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
@@ -17325,8 +16801,8 @@
if test ${ac_cv_path_ac_pt_PKG_CONFIG+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) case $ac_pt_PKG_CONFIG in
+else $as_nop
+ case $ac_pt_PKG_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
;;
@@ -17351,7 +16827,6 @@
IFS=$as_save_IFS
;;
-esac ;;
esac
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
@@ -17479,8 +16954,8 @@
if test ${ac_cv_path_PERL+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) case $PERL in
+else $as_nop
+ case $PERL in
[\\/]* | ?:[\\/]*)
ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
;;
@@ -17505,7 +16980,6 @@
IFS=$as_save_IFS
;;
-esac ;;
esac
fi
PERL=$ac_cv_path_PERL
@@ -17535,25 +17009,23 @@
if test ${ac_cv_alignof_guchar+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_guchar" "#include <glib.h>
+else $as_nop
+ if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_guchar" "#include <glib.h>
typedef struct { char x; guchar y; } ac__type_alignof_;"
then :
-else case e in #(
- e) if test "$ac_cv_type_guchar" = yes; then
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+else $as_nop
+ if test "$ac_cv_type_guchar" = yes; then
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "cannot compute alignment of guchar
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
else
ac_cv_alignof_guchar=0
- fi ;;
-esac
+ fi
fi
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_guchar" >&5
printf "%s\n" "$ac_cv_alignof_guchar" >&6; }
@@ -17578,25 +17050,23 @@
if test ${ac_cv_alignof_gchar+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_gchar" "#include <glib.h>
+else $as_nop
+ if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_gchar" "#include <glib.h>
typedef struct { char x; gchar y; } ac__type_alignof_;"
then :
-else case e in #(
- e) if test "$ac_cv_type_gchar" = yes; then
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+else $as_nop
+ if test "$ac_cv_type_gchar" = yes; then
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "cannot compute alignment of gchar
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
else
ac_cv_alignof_gchar=0
- fi ;;
-esac
+ fi
fi
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_gchar" >&5
printf "%s\n" "$ac_cv_alignof_gchar" >&6; }
@@ -17621,25 +17091,23 @@
if test ${ac_cv_alignof_guint16+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_guint16" "#include <glib.h>
+else $as_nop
+ if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_guint16" "#include <glib.h>
typedef struct { char x; guint16 y; } ac__type_alignof_;"
then :
-else case e in #(
- e) if test "$ac_cv_type_guint16" = yes; then
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+else $as_nop
+ if test "$ac_cv_type_guint16" = yes; then
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "cannot compute alignment of guint16
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
else
ac_cv_alignof_guint16=0
- fi ;;
-esac
+ fi
fi
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_guint16" >&5
printf "%s\n" "$ac_cv_alignof_guint16" >&6; }
@@ -17664,25 +17132,23 @@
if test ${ac_cv_alignof_gint16+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_gint16" "#include <glib.h>
+else $as_nop
+ if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_gint16" "#include <glib.h>
typedef struct { char x; gint16 y; } ac__type_alignof_;"
then :
-else case e in #(
- e) if test "$ac_cv_type_gint16" = yes; then
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+else $as_nop
+ if test "$ac_cv_type_gint16" = yes; then
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "cannot compute alignment of gint16
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
else
ac_cv_alignof_gint16=0
- fi ;;
-esac
+ fi
fi
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_gint16" >&5
printf "%s\n" "$ac_cv_alignof_gint16" >&6; }
@@ -17707,25 +17173,23 @@
if test ${ac_cv_alignof_guint32+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_guint32" "#include <glib.h>
+else $as_nop
+ if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_guint32" "#include <glib.h>
typedef struct { char x; guint32 y; } ac__type_alignof_;"
then :
-else case e in #(
- e) if test "$ac_cv_type_guint32" = yes; then
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+else $as_nop
+ if test "$ac_cv_type_guint32" = yes; then
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "cannot compute alignment of guint32
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
else
ac_cv_alignof_guint32=0
- fi ;;
-esac
+ fi
fi
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_guint32" >&5
printf "%s\n" "$ac_cv_alignof_guint32" >&6; }
@@ -17750,25 +17214,23 @@
if test ${ac_cv_alignof_gint32+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_gint32" "#include <glib.h>
+else $as_nop
+ if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_gint32" "#include <glib.h>
typedef struct { char x; gint32 y; } ac__type_alignof_;"
then :
-else case e in #(
- e) if test "$ac_cv_type_gint32" = yes; then
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+else $as_nop
+ if test "$ac_cv_type_gint32" = yes; then
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "cannot compute alignment of gint32
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
else
ac_cv_alignof_gint32=0
- fi ;;
-esac
+ fi
fi
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_gint32" >&5
printf "%s\n" "$ac_cv_alignof_gint32" >&6; }
@@ -17793,25 +17255,23 @@
if test ${ac_cv_alignof_guint64+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_guint64" "#include <glib.h>
+else $as_nop
+ if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_guint64" "#include <glib.h>
typedef struct { char x; guint64 y; } ac__type_alignof_;"
then :
-else case e in #(
- e) if test "$ac_cv_type_guint64" = yes; then
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+else $as_nop
+ if test "$ac_cv_type_guint64" = yes; then
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "cannot compute alignment of guint64
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
else
ac_cv_alignof_guint64=0
- fi ;;
-esac
+ fi
fi
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_guint64" >&5
printf "%s\n" "$ac_cv_alignof_guint64" >&6; }
@@ -17836,25 +17296,23 @@
if test ${ac_cv_alignof_gint64+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_gint64" "#include <glib.h>
+else $as_nop
+ if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_gint64" "#include <glib.h>
typedef struct { char x; gint64 y; } ac__type_alignof_;"
then :
-else case e in #(
- e) if test "$ac_cv_type_gint64" = yes; then
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+else $as_nop
+ if test "$ac_cv_type_gint64" = yes; then
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "cannot compute alignment of gint64
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
else
ac_cv_alignof_gint64=0
- fi ;;
-esac
+ fi
fi
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_gint64" >&5
printf "%s\n" "$ac_cv_alignof_gint64" >&6; }
@@ -17879,25 +17337,23 @@
if test ${ac_cv_alignof_gfloat+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_gfloat" "#include <glib.h>
+else $as_nop
+ if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_gfloat" "#include <glib.h>
typedef struct { char x; gfloat y; } ac__type_alignof_;"
then :
-else case e in #(
- e) if test "$ac_cv_type_gfloat" = yes; then
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+else $as_nop
+ if test "$ac_cv_type_gfloat" = yes; then
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "cannot compute alignment of gfloat
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
else
ac_cv_alignof_gfloat=0
- fi ;;
-esac
+ fi
fi
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_gfloat" >&5
printf "%s\n" "$ac_cv_alignof_gfloat" >&6; }
@@ -17922,25 +17378,23 @@
if test ${ac_cv_alignof_gdouble+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_gdouble" "#include <glib.h>
+else $as_nop
+ if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_gdouble" "#include <glib.h>
typedef struct { char x; gdouble y; } ac__type_alignof_;"
then :
-else case e in #(
- e) if test "$ac_cv_type_gdouble" = yes; then
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+else $as_nop
+ if test "$ac_cv_type_gdouble" = yes; then
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "cannot compute alignment of gdouble
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
else
ac_cv_alignof_gdouble=0
- fi ;;
-esac
+ fi
fi
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_gdouble" >&5
printf "%s\n" "$ac_cv_alignof_gdouble" >&6; }
@@ -17965,25 +17419,23 @@
if test ${ac_cv_alignof_gboolean+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_gboolean" "#include <glib.h>
+else $as_nop
+ if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_gboolean" "#include <glib.h>
typedef struct { char x; gboolean y; } ac__type_alignof_;"
then :
-else case e in #(
- e) if test "$ac_cv_type_gboolean" = yes; then
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+else $as_nop
+ if test "$ac_cv_type_gboolean" = yes; then
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "cannot compute alignment of gboolean
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
else
ac_cv_alignof_gboolean=0
- fi ;;
-esac
+ fi
fi
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_gboolean" >&5
printf "%s\n" "$ac_cv_alignof_gboolean" >&6; }
@@ -18008,25 +17460,23 @@
if test ${ac_cv_alignof_gpointer+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_gpointer" "#include <glib.h>
+else $as_nop
+ if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_gpointer" "#include <glib.h>
typedef struct { char x; gpointer y; } ac__type_alignof_;"
then :
-else case e in #(
- e) if test "$ac_cv_type_gpointer" = yes; then
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+else $as_nop
+ if test "$ac_cv_type_gpointer" = yes; then
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "cannot compute alignment of gpointer
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
else
ac_cv_alignof_gpointer=0
- fi ;;
-esac
+ fi
fi
- ;;
-esac
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_gpointer" >&5
printf "%s\n" "$ac_cv_alignof_gpointer" >&6; }
@@ -18075,8 +17525,8 @@
if test ${ac_cv_prog_GTKDOC_CHECK+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$GTKDOC_CHECK"; then
+else $as_nop
+ if test -n "$GTKDOC_CHECK"; then
ac_cv_prog_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -18098,8 +17548,7 @@
done
IFS=$as_save_IFS
-fi ;;
-esac
+fi
fi
GTKDOC_CHECK=$ac_cv_prog_GTKDOC_CHECK
if test -n "$GTKDOC_CHECK"; then
@@ -18118,8 +17567,8 @@
if test ${ac_cv_path_GTKDOC_CHECK_PATH+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) case $GTKDOC_CHECK_PATH in
+else $as_nop
+ case $GTKDOC_CHECK_PATH in
[\\/]* | ?:[\\/]*)
ac_cv_path_GTKDOC_CHECK_PATH="$GTKDOC_CHECK_PATH" # Let the user override the test with a path.
;;
@@ -18144,7 +17593,6 @@
IFS=$as_save_IFS
;;
-esac ;;
esac
fi
GTKDOC_CHECK_PATH=$ac_cv_path_GTKDOC_CHECK_PATH
@@ -18166,8 +17614,8 @@
if test ${ac_cv_path_GTKDOC_REBASE+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) case $GTKDOC_REBASE in
+else $as_nop
+ case $GTKDOC_REBASE in
[\\/]* | ?:[\\/]*)
ac_cv_path_GTKDOC_REBASE="$GTKDOC_REBASE" # Let the user override the test with a path.
;;
@@ -18192,7 +17640,6 @@
IFS=$as_save_IFS
;;
-esac ;;
esac
fi
GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
@@ -18216,8 +17663,8 @@
if test ${ac_cv_path_GTKDOC_MKPDF+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) case $GTKDOC_MKPDF in
+else $as_nop
+ case $GTKDOC_MKPDF in
[\\/]* | ?:[\\/]*)
ac_cv_path_GTKDOC_MKPDF="$GTKDOC_MKPDF" # Let the user override the test with a path.
;;
@@ -18242,7 +17689,6 @@
IFS=$as_save_IFS
;;
-esac ;;
esac
fi
GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
@@ -18261,9 +17707,8 @@
if test ${with_html_dir+y}
then :
withval=$with_html_dir;
-else case e in #(
- e) with_html_dir='${datadir}/gtk-doc/html' ;;
-esac
+else $as_nop
+ with_html_dir='${datadir}/gtk-doc/html'
fi
HTML_DIR="$with_html_dir"
@@ -18273,9 +17718,8 @@
if test ${enable_gtk_doc+y}
then :
enableval=$enable_gtk_doc;
-else case e in #(
- e) enable_gtk_doc=no ;;
-esac
+else $as_nop
+ enable_gtk_doc=no
fi
@@ -18369,18 +17813,16 @@
if test ${enable_gtk_doc_html+y}
then :
enableval=$enable_gtk_doc_html;
-else case e in #(
- e) enable_gtk_doc_html=yes ;;
-esac
+else $as_nop
+ enable_gtk_doc_html=yes
fi
# Check whether --enable-gtk-doc-pdf was given.
if test ${enable_gtk_doc_pdf+y}
then :
enableval=$enable_gtk_doc_pdf;
-else case e in #(
- e) enable_gtk_doc_pdf=no ;;
-esac
+else $as_nop
+ enable_gtk_doc_pdf=no
fi
@@ -18463,9 +17905,8 @@
if test ${enable_gsettings_backend+y}
then :
enableval=$enable_gsettings_backend; ac_gsettings_backend=$enableval
-else case e in #(
- e) ac_gsettings_backend=yes ;;
-esac
+else $as_nop
+ ac_gsettings_backend=yes
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build the GSettings backend module" >&5
@@ -18504,8 +17945,8 @@
if test ${ac_cv_path_PKG_CONFIG+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) case $PKG_CONFIG in
+else $as_nop
+ case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
;;
@@ -18530,7 +17971,6 @@
IFS=$as_save_IFS
;;
-esac ;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
@@ -18553,8 +17993,8 @@
if test ${ac_cv_path_ac_pt_PKG_CONFIG+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) case $ac_pt_PKG_CONFIG in
+else $as_nop
+ case $ac_pt_PKG_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
;;
@@ -18579,7 +18019,6 @@
IFS=$as_save_IFS
;;
-esac ;;
esac
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
@@ -18708,9 +18147,8 @@
if test ${enable_introspection+y}
then :
enableval=$enable_introspection;
-else case e in #(
- e) enable_introspection=auto ;;
-esac
+else $as_nop
+ enable_introspection=auto
fi
@@ -18810,21 +18248,19 @@
if test ${enable_vala+y}
then :
enableval=$enable_vala;
-else case e in #(
- e)
+else $as_nop
+
if test "x" = "x"
then :
enable_vala=auto
-else case e in #(
- e)
+else $as_nop
+
enable_vala=
- ;;
-esac
+
fi
- ;;
-esac
+
fi
@@ -18860,22 +18296,20 @@
vapigen_pkg_name=vapigen
-else case e in #(
- e)
+else $as_nop
+
vapigen_pkg_name=vapigen-
- ;;
-esac
+
fi
if test "x" = "x"
then :
vapigen_pkg="$vapigen_pkg_name"
-else case e in #(
- e)
+else $as_nop
+
vapigen_pkg="$vapigen_pkg_name >= "
- ;;
-esac
+
fi
@@ -18894,8 +18328,8 @@
if test ${ac_cv_path_PKG_CONFIG+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) case $PKG_CONFIG in
+else $as_nop
+ case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
;;
@@ -18920,7 +18354,6 @@
IFS=$as_save_IFS
;;
-esac ;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
@@ -18943,8 +18376,8 @@
if test ${ac_cv_path_ac_pt_PKG_CONFIG+y}
then :
printf %s "(cached) " >&6
-else case e in #(
- e) case $ac_pt_PKG_CONFIG in
+else $as_nop
+ case $ac_pt_PKG_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
;;
@@ -18969,7 +18402,6 @@
IFS=$as_save_IFS
;;
-esac ;;
esac
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
@@ -19055,11 +18487,10 @@
VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir $vapigen_pkg_name`
-else case e in #(
- e)
+else $as_nop
+
VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned $vapigen_pkg_name`
- ;;
-esac
+
fi
;; #(
*) :
@@ -19088,9 +18519,8 @@
if test ${enable_debug+y}
then :
enableval=$enable_debug; enable_debug=$enableval
-else case e in #(
- e) enable_debug=minimum ;;
-esac
+else $as_nop
+ enable_debug=minimum
fi
@@ -19167,9 +18597,8 @@
if ac_fn_c_try_compile "$LINENO"
then :
flag_supported=yes
-else case e in #(
- e) flag_supported=no ;;
-esac
+else $as_nop
+ flag_supported=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
CFLAGS="$saved_CFLAGS"
@@ -19194,9 +18623,8 @@
if ac_fn_c_try_compile "$LINENO"
then :
flag_supported=yes
-else case e in #(
- e) flag_supported=no ;;
-esac
+else $as_nop
+ flag_supported=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
CFLAGS="$saved_CFLAGS"
@@ -19229,9 +18657,8 @@
if ac_fn_c_try_compile "$LINENO"
then :
flag_supported=yes
-else case e in #(
- e) flag_supported=no ;;
-esac
+else $as_nop
+ flag_supported=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
CFLAGS="$saved_CFLAGS"
@@ -19262,9 +18689,8 @@
if test ${enable_visibility+y}
then :
enableval=$enable_visibility; enable_visibility=$enableval
-else case e in #(
- e) enable_visibility=yes ;;
-esac
+else $as_nop
+ enable_visibility=yes
fi
have_gnuc_visibility=no
@@ -19282,9 +18708,8 @@
if ac_fn_c_try_compile "$LINENO"
then :
flag_supported=yes
-else case e in #(
- e) flag_supported=no ;;
-esac
+else $as_nop
+ flag_supported=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
CFLAGS="$saved_CFLAGS"
@@ -19323,12 +18748,11 @@
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
-else case e in #(
- e)
+else $as_nop
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- ;;
-esac
+
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
CFLAGS="$saved_CFLAGS"
@@ -19350,9 +18774,8 @@
if ac_fn_c_try_compile "$LINENO"
then :
flag_supported=yes
-else case e in #(
- e) flag_supported=no ;;
-esac
+else $as_nop
+ flag_supported=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
CFLAGS="$saved_CFLAGS"
@@ -19378,9 +18801,8 @@
if ac_fn_c_try_compile "$LINENO"
then :
flag_supported=yes
-else case e in #(
- e) flag_supported=no ;;
-esac
+else $as_nop
+ flag_supported=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
CFLAGS="$saved_CFLAGS"
@@ -19421,9 +18843,8 @@
if test ${enable_linker_opts+y}
then :
enableval=$enable_linker_opts; enable_linker_opts=$enableval
-else case e in #(
- e) enable_linker_opts=yes ;;
-esac
+else $as_nop
+ enable_linker_opts=yes
fi
@@ -19484,9 +18905,8 @@
if test ${with_bash_completion_dir+y}
then :
withval=$with_bash_completion_dir;
-else case e in #(
- e) with_bash_completion_dir=yes ;;
-esac
+else $as_nop
+ with_bash_completion_dir=yes
fi
if test "x$with_bash_completion_dir" = xyes
@@ -19500,15 +18920,13 @@
bash_completion_dir="${bash_completion_dir#"$bash_completion_prefix"}"
bash_completion_dir="${bash_completion_dir#/}"
BASH_COMPLETION_DIR='${prefix}'/"$bash_completion_dir"
-else case e in #(
- e) BASH_COMPLETION_DIR='${datadir}/bash-completion/completions' ;;
-esac
+else $as_nop
+ BASH_COMPLETION_DIR='${datadir}/bash-completion/completions'
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BASH_COMPLETION_DIR" >&5
printf "%s\n" "$BASH_COMPLETION_DIR" >&6; }
-else case e in #(
- e) BASH_COMPLETION_DIR="$with_bash_completion_dir" ;;
-esac
+else $as_nop
+ BASH_COMPLETION_DIR="$with_bash_completion_dir"
fi
if test "x$with_bash_completion_dir" != xno; then
@@ -19532,8 +18950,8 @@
# config.status only pays attention to the cache file if you give it
# the --recheck option to rerun configure.
#
-# 'ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* 'ac_cv_foo' will be assigned the
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
# following values.
_ACEOF
@@ -19563,14 +18981,14 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
- # 'set' does not quote correctly, so add quotes: double-quote
+ # `set' does not quote correctly, so add quotes: double-quote
# substitution turns \\\\ into \\, and sed turns \\ into \.
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
;; #(
*)
- # 'set' quotes correctly as required by POSIX, so do not add quotes.
+ # `set' quotes correctly as required by POSIX, so do not add quotes.
sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
;;
esac |
@@ -19639,18 +19057,6 @@
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5
printf "%s\n" "done" >&6; }
-case $enable_silent_rules in # (((
- yes) AM_DEFAULT_VERBOSITY=0;;
- no) AM_DEFAULT_VERBOSITY=1;;
-esac
-if test $am_cv_make_support_nested_variables = yes; then
- AM_V='$(V)'
- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
- AM_V=$AM_DEFAULT_VERBOSITY
- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-
if test -n "$EXEEXT"; then
am__EXEEXT_TRUE=
am__EXEEXT_FALSE='#'
@@ -19752,6 +19158,7 @@
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
+as_nop=:
if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
then :
emulate sh
@@ -19760,13 +19167,12 @@
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
-else case e in #(
- e) case `(set -o) 2>/dev/null` in #(
+else $as_nop
+ case `(set -o) 2>/dev/null` in #(
*posix*) :
set -o posix ;; #(
*) :
;;
-esac ;;
esac
fi
@@ -19838,7 +19244,7 @@
;;
esac
-# We did not find ourselves, most probably we were run as 'sh COMMAND'
+# We did not find ourselves, most probably we were run as `sh COMMAND'
# in which case we are not to be found in the path.
if test "x$as_myself" = x; then
as_myself=$0
@@ -19867,6 +19273,7 @@
} # as_fn_error
+
# as_fn_set_status STATUS
# -----------------------
# Set $? to STATUS, without forking.
@@ -19906,12 +19313,11 @@
{
eval $1+=\$2
}'
-else case e in #(
- e) as_fn_append ()
+else $as_nop
+ as_fn_append ()
{
eval $1=\$$1\$2
- } ;;
-esac
+ }
fi # as_fn_append
# as_fn_arith ARG...
@@ -19925,12 +19331,11 @@
{
as_val=$(( $* ))
}'
-else case e in #(
- e) as_fn_arith ()
+else $as_nop
+ as_fn_arith ()
{
as_val=`expr "$@" || test $? -eq 1`
- } ;;
-esac
+ }
fi # as_fn_arith
@@ -20013,9 +19418,9 @@
if ln -s conf$$.file conf$$ 2>/dev/null; then
as_ln_s='ln -s'
# ... but there are two gotchas:
- # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable.
- # In both cases, we have to default to 'cp -pR'.
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
@@ -20096,12 +19501,10 @@
as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
-as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
# Sed expression to map a string onto a valid variable name.
-as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-as_tr_sh="eval sed '$as_sed_sh'" # deprecated
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
exec 6>&1
@@ -20116,8 +19519,8 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xfconf $as_me 4.19.3, which was
-generated by GNU Autoconf 2.72. Invocation command line was
+This file was extended by xfconf $as_me 4.20.0, which was
+generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -20149,7 +19552,7 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
-'$as_me' instantiates files and other configuration actions
+\`$as_me' instantiates files and other configuration actions
from templates according to the current configuration. Unless the files
and actions are specified as TAGs, all are instantiated by default.
@@ -20184,11 +19587,11 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-xfconf config.status 4.19.3
-configured by $0, generated by GNU Autoconf 2.72,
+xfconf config.status 4.20.0
+configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -20250,8 +19653,8 @@
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
- as_fn_error $? "ambiguous option: '$1'
-Try '$0 --help' for more information.";;
+ as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
--help | --hel | -h )
printf "%s\n" "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
@@ -20259,8 +19662,8 @@
ac_cs_silent=: ;;
# This is an error.
- -*) as_fn_error $? "unrecognized option: '$1'
-Try '$0 --help' for more information." ;;
+ -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
*) as_fn_append ac_config_targets " $1"
ac_need_defaults=false ;;
@@ -20631,7 +20034,7 @@
"gsettings-backend/Makefile") CONFIG_FILES="$CONFIG_FILES gsettings-backend/Makefile" ;;
"completions/Makefile") CONFIG_FILES="$CONFIG_FILES completions/Makefile" ;;
- *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;;
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
done
@@ -20651,7 +20054,7 @@
# creating and moving files from /tmp can sometimes cause problems.
# Hook for its removal unless debugging.
# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to '$tmp'.
+# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
tmp= ac_tmp=
@@ -20675,7 +20078,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with './config.status config.h'.
+# This happens for instance with `./config.status config.h'.
if test -n "$CONFIG_FILES"; then
@@ -20833,13 +20236,13 @@
# Set up the scripts for CONFIG_HEADERS section.
# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with './config.status Makefile'.
+# This happens for instance with `./config.status Makefile'.
if test -n "$CONFIG_HEADERS"; then
cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
BEGIN {
_ACEOF
-# Transform confdefs.h into an awk script 'defines.awk', embedded as
+# Transform confdefs.h into an awk script `defines.awk', embedded as
# here-document in config.status, that substitutes the proper values into
# config.h.in to produce config.h.
@@ -20949,7 +20352,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;;
+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -20971,19 +20374,19 @@
-) ac_f="$ac_tmp/stdin";;
*) # Look for the file first in the build tree, then in the source tree
# (if the path is not absolute). The absolute path cannot be DOS-style,
- # because $ac_f cannot contain ':'.
+ # because $ac_f cannot contain `:'.
test -f "$ac_f" ||
case $ac_f in
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;;
+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
esac
case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
done
- # Let's still pretend it is 'configure' which instantiates (i.e., don't
+ # Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
configure_input='Generated from '`
@@ -21116,7 +20519,7 @@
esac
_ACEOF
-# Neutralize VPATH when '$srcdir' = '.'.
+# Neutralize VPATH when `$srcdir' = `.'.
# Shell code in configure.ac might set extrasub.
# FIXME: do we really want to maintain this feature?
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -21147,9 +20550,9 @@
{ ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
"$ac_tmp/out"`; test -z "$ac_out"; } &&
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined" >&2;}
rm -f "$ac_tmp/stdin"
@@ -21304,15 +20707,15 @@
(exit $ac_status); } || am_rc=$?
done
if test $am_rc -ne 0; then
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "Something went wrong bootstrapping makefile fragments
for automatic dependency tracking. If GNU make was not used, consider
re-running the configure script with MAKE=\"gmake\" (or whatever is
necessary). You can also 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).
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
fi
{ am_dirpart=; unset am_dirpart;}
{ am_filepart=; unset am_filepart;}
@@ -21341,13 +20744,13 @@
# Provide generalized library-building support services.
# Written by Gordon Matzigkeit, 1996
-# Copyright (C) 2024 Free Software Foundation, Inc.
+# Copyright (C) 2014 Free Software Foundation, Inc.
# This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# GNU Libtool is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 2 of of the License, or
# (at your option) any later version.
#
# As a special exception to the GNU General Public License, if you
@@ -21728,7 +21131,7 @@
# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e. impossible to change by setting \$shlibpath_var if the
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
# library is relocated.
hardcode_direct_absolute=$hardcode_direct_absolute
diff -Nru xfconf-4.19.3/configure.ac xfconf-4.20.0/configure.ac
--- xfconf-4.19.3/configure.ac 2024-10-18 14:09:38.000000000 +0800
+++ xfconf-4.20.0/configure.ac 2024-12-15 17:32:55.000000000 +0800
@@ -9,7 +9,7 @@
dnl version info
m4_define([libxfconf_verinfo], [3:0:0])
m4_define([libxfconf_version_api], [0])
-XDT_VERSION_INIT([4.19.3])
+XDT_VERSION_INIT([4.20.0])
dnl minimum required versions
m4_define([glib_min_version], [2.72.0])
diff -Nru xfconf-4.19.3/debian/changelog xfconf-4.20.0/debian/changelog
--- xfconf-4.19.3/debian/changelog 2024-10-30 18:00:00.000000000 +0800
+++ xfconf-4.20.0/debian/changelog 2024-12-16 18:00:00.000000000 +0800
@@ -1,3 +1,9 @@
+xfconf (4.20.0-ok1) huanghe; urgency=medium
+
+ * New upstream version 4.20.0
+
+ -- rtlhq <nobelxyz@163.com> Mon, 16 Dec 2024 10:00:00 +0000
+
xfconf (4.19.3-ok1) huanghe; urgency=medium
* New upstream version 4.19.3.
diff -Nru xfconf-4.19.3/debian/control xfconf-4.20.0/debian/control
--- xfconf-4.19.3/debian/control 2024-10-30 18:00:00.000000000 +0800
+++ xfconf-4.20.0/debian/control 2024-12-16 18:00:00.000000000 +0800
@@ -4,13 +4,15 @@
Maintainer: openKylin Xfce SIG <xfce@lists.openkylin.top>
Build-Depends: debhelper-compat (= 13),
gettext,
+ gir1.2-gobject-2.0-dev,
+ gir1.2-gio-2.0-dev,
gobject-introspection,
gtk-doc-tools,
libgirepository1.0-dev,
libxfce4util-dev (>= 4.17.3),
xfce4-dev-tools (>= 4.19)
Rules-Requires-Root: no
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
Homepage: https://docs.xfce.org/xfce/xfconf/start
Vcs-Git: https://gitee.com/openkylin/xfconf.git
Vcs-Browser: https://gitee.com/openkylin/xfconf
@@ -22,8 +24,10 @@
Depends: gir1.2-xfconf-0 (= ${binary:Version}),
libglib2.0-dev,
libxfconf-0-3 (= ${binary:Version}),
- pkg-config,
- ${misc:Depends}
+ pkgconf,
+ ${misc:Depends},
+ ${gir:Depends}
+Provides: ${gir:Provides}
Description: Development files for libxfconf
This package contains the development files libxfconf which are
the main part of the Xfce4 configuration system. If you want to
diff -Nru xfconf-4.19.3/debian/xfconf.install xfconf-4.20.0/debian/xfconf.install
--- xfconf-4.19.3/debian/xfconf.install 2024-10-30 18:00:00.000000000 +0800
+++ xfconf-4.20.0/debian/xfconf.install 2024-12-16 18:00:00.000000000 +0800
@@ -3,3 +3,4 @@
usr/share/dbus-1
usr/share/locale
usr/share/bash-completion
+usr/lib/systemd/user/xfconfd.service
diff -Nru xfconf-4.19.3/depcomp xfconf-4.20.0/depcomp
--- xfconf-4.19.3/depcomp 2024-10-18 14:12:08.000000000 +0800
+++ xfconf-4.20.0/depcomp 2024-12-15 17:33:37.000000000 +0800
@@ -1,9 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2024-06-19.01; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2024 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -47,13 +47,11 @@
libtool Whether libtool is used (yes/no).
Report bugs to <bug-automake@gnu.org>.
-GNU Automake home page: <https://www.gnu.org/software/automake/>.
-General help using GNU software: <https://www.gnu.org/gethelp/>.
EOF
exit $?
;;
-v | --v*)
- echo "depcomp (GNU Automake) $scriptversion"
+ echo "depcomp $scriptversion"
exit $?
;;
esac
@@ -115,6 +113,7 @@
# These definitions help.
upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
alpha=${upper}${lower}
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
@@ -129,7 +128,7 @@
rm -f "$tmpdepfile"
-# Avoid interference from the environment.
+# Avoid interferences from the environment.
gccflag= dashmflag=
# Some modes work just like other modes, but use different flags. We
@@ -199,8 +198,8 @@
;;
gcc)
-## Note that this doesn't just cater to obsolete pre-3.x GCC compilers.
-## but also to in-use compilers like IBM xlc/xlC and the HP C compiler.
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
## (see the conditional assignment to $gccflag above).
## There are various ways to get dependency output from gcc. Here's
## why we pick this rather obscure method:
diff -Nru xfconf-4.19.3/docs/Makefile.in xfconf-4.20.0/docs/Makefile.in
--- xfconf-4.19.3/docs/Makefile.in 2024-10-18 14:12:00.000000000 +0800
+++ xfconf-4.20.0/docs/Makefile.in 2024-12-15 17:33:36.000000000 +0800
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.17 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2024 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -69,8 +69,6 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-am__rm_f = rm -f $(am__rm_f_notfound)
-am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -340,10 +338,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
-am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -613,8 +609,8 @@
clean-generic:
distclean-generic:
- -$(am__rm_f) $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -706,10 +702,3 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-
-# Tell GNU make to disable its built-in pattern rules.
-%:: %,v
-%:: RCS/%,v
-%:: RCS/%
-%:: s.%
-%:: SCCS/s.%
diff -Nru xfconf-4.19.3/docs/reference/Makefile.in xfconf-4.20.0/docs/reference/Makefile.in
--- xfconf-4.19.3/docs/reference/Makefile.in 2024-10-18 14:12:00.000000000 +0800
+++ xfconf-4.20.0/docs/reference/Makefile.in 2024-12-15 17:33:36.000000000 +0800
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.17 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2024 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -93,8 +93,6 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-am__rm_f = rm -f $(am__rm_f_notfound)
-am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -306,10 +304,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
-am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -594,11 +590,11 @@
mostlyclean-generic:
clean-generic:
- -$(am__rm_f) $(CLEANFILES)
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
- -$(am__rm_f) $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -890,10 +886,3 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-
-# Tell GNU make to disable its built-in pattern rules.
-%:: %,v
-%:: RCS/%,v
-%:: RCS/%
-%:: s.%
-%:: SCCS/s.%
Binary files /tmp/tmpq1url3_r/R6yOoIllpw/xfconf-4.19.3/docs/reference/html/home.png and /tmp/tmpq1url3_r/QC2llBz1gH/xfconf-4.20.0/docs/reference/html/home.png differ
diff -Nru xfconf-4.19.3/docs/reference/html/index.html xfconf-4.20.0/docs/reference/html/index.html
--- xfconf-4.19.3/docs/reference/html/index.html 2024-10-18 14:14:56.000000000 +0800
+++ xfconf-4.20.0/docs/reference/html/index.html 2024-12-15 17:33:45.000000000 +0800
@@ -15,7 +15,7 @@
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">xfconf Reference Manual</p></th></tr></table></div>
<div><p class="releaseinfo">
- For xfconf 4.19.3.
+ For xfconf 4.19.4.
The latest version of this documentation can be found on-line at
<a class="ulink" href="https://developer.xfce.org/xfconf/index.html" target="_top">https://developer.xfce.org/xfconf/</a>.
</p></div>
Binary files /tmp/tmpq1url3_r/R6yOoIllpw/xfconf-4.19.3/docs/reference/html/left-insensitive.png and /tmp/tmpq1url3_r/QC2llBz1gH/xfconf-4.20.0/docs/reference/html/left-insensitive.png differ
Binary files /tmp/tmpq1url3_r/R6yOoIllpw/xfconf-4.19.3/docs/reference/html/left.png and /tmp/tmpq1url3_r/QC2llBz1gH/xfconf-4.20.0/docs/reference/html/left.png differ
Binary files /tmp/tmpq1url3_r/R6yOoIllpw/xfconf-4.19.3/docs/reference/html/right-insensitive.png and /tmp/tmpq1url3_r/QC2llBz1gH/xfconf-4.20.0/docs/reference/html/right-insensitive.png differ
Binary files /tmp/tmpq1url3_r/R6yOoIllpw/xfconf-4.19.3/docs/reference/html/right.png and /tmp/tmpq1url3_r/QC2llBz1gH/xfconf-4.20.0/docs/reference/html/right.png differ
Binary files /tmp/tmpq1url3_r/R6yOoIllpw/xfconf-4.19.3/docs/reference/html/up-insensitive.png and /tmp/tmpq1url3_r/QC2llBz1gH/xfconf-4.20.0/docs/reference/html/up-insensitive.png differ
Binary files /tmp/tmpq1url3_r/R6yOoIllpw/xfconf-4.19.3/docs/reference/html/up.png and /tmp/tmpq1url3_r/QC2llBz1gH/xfconf-4.20.0/docs/reference/html/up.png differ
diff -Nru xfconf-4.19.3/docs/reference/html/xfconf-Xfconf-GObject-Binding.html xfconf-4.20.0/docs/reference/html/xfconf-Xfconf-GObject-Binding.html
--- xfconf-4.19.3/docs/reference/html/xfconf-Xfconf-GObject-Binding.html 2024-10-18 14:14:56.000000000 +0800
+++ xfconf-4.20.0/docs/reference/html/xfconf-Xfconf-GObject-Binding.html 2024-12-15 17:33:45.000000000 +0800
@@ -123,7 +123,7 @@
<em class="parameter"><code>object_property</code></em>
will be determined automatically. If the two
types do not match, a conversion will be attempted.</p>
-<p>If you are binding a <a href="/usr/share/gtk-doc/html/gdk3/gdk3-Colors.html#GdkColor"><span class="type">GdkColor</span></a> or <a href="/usr/share/gtk-doc/html/gdk3/gdk3-RGBA-Colors.html#GdkRGBA"><span class="type">GdkRGBA</span></a> property, pass <span class="type">G_TYPE_PTR_ARRAY</span>
+<p>If you are binding a <span class="type">GdkColor</span> or <span class="type">GdkRGBA</span> property, pass <span class="type">G_TYPE_PTR_ARRAY</span>
for <em class="parameter"><code>xfconf_property_type</code></em>
.</p>
<div class="refsect3">
@@ -186,7 +186,7 @@
instead.</p>
</div>
<p>Binds an Xfconf property to a <span class="type">GObject</span> property of type
-GDK_TYPE_COLOR (aka a <a href="/usr/share/gtk-doc/html/gdk3/gdk3-Colors.html#GdkColor"><span class="type">GdkColor</span></a> struct). If the property
+GDK_TYPE_COLOR (aka a <span class="type">GdkColor</span> struct). If the property
is changed via either the <span class="type">GObject</span> or Xfconf, the corresponding
property will also be updated. The binding is initialized from the
Xfconf property, i.e. the initial value of the <span class="type">GObject</span> property is
@@ -250,7 +250,7 @@
instead.</p>
</div>
<p>Binds an Xfconf property to a <span class="type">GObject</span> property of type
-GDK_TYPE_RGBA (aka a <a href="/usr/share/gtk-doc/html/gdk3/gdk3-RGBA-Colors.html#GdkRGBA"><span class="type">GdkRGBA</span></a> struct). If the property
+GDK_TYPE_RGBA (aka a <span class="type">GdkRGBA</span> struct). If the property
is changed via either the <span class="type">GObject</span> or Xfconf, the corresponding
property will also be updated. The binding is initialized from the
Xfconf property, i.e. the initial value of the <span class="type">GObject</span> property is
diff -Nru xfconf-4.19.3/docs/spec/Makefile.in xfconf-4.20.0/docs/spec/Makefile.in
--- xfconf-4.19.3/docs/spec/Makefile.in 2024-10-18 14:12:00.000000000 +0800
+++ xfconf-4.20.0/docs/spec/Makefile.in 2024-12-15 17:33:36.000000000 +0800
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.17 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2024 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -69,8 +69,6 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-am__rm_f = rm -f $(am__rm_f_notfound)
-am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -282,10 +280,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
-am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -438,8 +434,8 @@
clean-generic:
distclean-generic:
- -$(am__rm_f) $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -530,10 +526,3 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-
-# Tell GNU make to disable its built-in pattern rules.
-%:: %,v
-%:: RCS/%,v
-%:: RCS/%
-%:: s.%
-%:: SCCS/s.%
diff -Nru xfconf-4.19.3/gsettings-backend/Makefile.in xfconf-4.20.0/gsettings-backend/Makefile.in
--- xfconf-4.19.3/gsettings-backend/Makefile.in 2024-10-18 14:12:01.000000000 +0800
+++ xfconf-4.20.0/gsettings-backend/Makefile.in 2024-12-15 17:33:36.000000000 +0800
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.17 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2024 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -70,8 +70,6 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-am__rm_f = rm -f $(am__rm_f_notfound)
-am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -131,9 +129,10 @@
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__uninstall_files_from_dir = { \
- { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
}
am__installdirs = "$(DESTDIR)$(giomoduledir)"
LTLIBRARIES = $(giomodule_LTLIBRARIES)
@@ -368,10 +367,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
-am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -497,13 +494,15 @@
done
clean-giomoduleLTLIBRARIES:
- -$(am__rm_f) $(giomodule_LTLIBRARIES)
+ -test -z "$(giomodule_LTLIBRARIES)" || rm -f $(giomodule_LTLIBRARIES)
@list='$(giomodule_LTLIBRARIES)'; \
locs=`for p in $$list; do echo $$p; done | \
sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
sort -u`; \
- echo rm -f $${locs}; \
- $(am__rm_f) $${locs}
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
libxfconfgsettingsbackend.la: $(libxfconfgsettingsbackend_la_OBJECTS) $(libxfconfgsettingsbackend_la_DEPENDENCIES) $(EXTRA_libxfconfgsettingsbackend_la_DEPENDENCIES)
$(AM_V_CCLD)$(libxfconfgsettingsbackend_la_LINK) -rpath $(giomoduledir) $(libxfconfgsettingsbackend_la_OBJECTS) $(libxfconfgsettingsbackend_la_LIBADD) $(LIBS)
@@ -519,7 +518,7 @@
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
- @: >>$@
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
am--depfiles: $(am__depfiles_remade)
@@ -682,8 +681,8 @@
clean-generic:
distclean-generic:
- -$(am__rm_f) $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -694,7 +693,7 @@
mostlyclean-am
distclean: distclean-am
- -rm -f ./$(DEPDIR)/libxfconfgsettingsbackend_la-xfconf-giomodule.Plo
+ -rm -f ./$(DEPDIR)/libxfconfgsettingsbackend_la-xfconf-giomodule.Plo
-rm -f ./$(DEPDIR)/libxfconfgsettingsbackend_la-xfconf-gsettings-backend.Plo
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -741,7 +740,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -f ./$(DEPDIR)/libxfconfgsettingsbackend_la-xfconf-giomodule.Plo
+ -rm -f ./$(DEPDIR)/libxfconfgsettingsbackend_la-xfconf-giomodule.Plo
-rm -f ./$(DEPDIR)/libxfconfgsettingsbackend_la-xfconf-gsettings-backend.Plo
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -784,10 +783,3 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-
-# Tell GNU make to disable its built-in pattern rules.
-%:: %,v
-%:: RCS/%,v
-%:: RCS/%
-%:: s.%
-%:: SCCS/s.%
diff -Nru xfconf-4.19.3/install-sh xfconf-4.20.0/install-sh
--- xfconf-4.19.3/install-sh 2024-10-18 14:11:58.000000000 +0800
+++ xfconf-4.20.0/install-sh 2024-12-15 17:33:36.000000000 +0800
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2024-06-19.01; # UTC
+scriptversion=2020-11-14.01; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -124,9 +124,9 @@
If -S is not specified, no backups are attempted.
-Report bugs to <bug-automake@gnu.org>.
-GNU Automake home page: <https://www.gnu.org/software/automake/>.
-General help using GNU software: <https://www.gnu.org/gethelp/>."
+Email bug reports to bug-automake@gnu.org.
+Automake home page: https://www.gnu.org/software/automake/
+"
while test $# -ne 0; do
case $1 in
@@ -170,7 +170,7 @@
-T) is_target_a_directory=never;;
- --version) echo "$0 (GNU Automake) $scriptversion"; exit $?;;
+ --version) echo "$0 $scriptversion"; exit $?;;
--) shift
break;;
@@ -345,7 +345,7 @@
' 0
# Because "mkdir -p" follows existing symlinks and we likely work
- # directly in world-writable /tmp, make sure that the '$tmpdir'
+ # directly in world-writeable /tmp, make sure that the '$tmpdir'
# directory is successfully created first before we actually test
# 'mkdir -p'.
if (umask $mkdir_umask &&
@@ -353,7 +353,7 @@
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
then
if test -z "$dir_arg" || {
- # Check for POSIX incompatibility with -m.
+ # Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
diff -Nru xfconf-4.19.3/ltmain.sh xfconf-4.20.0/ltmain.sh
--- xfconf-4.19.3/ltmain.sh 2024-10-18 14:11:09.000000000 +0800
+++ xfconf-4.20.0/ltmain.sh 2024-12-15 17:33:35.000000000 +0800
@@ -2,11 +2,11 @@
## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
## by inline-source v2019-02-19.15
-# libtool (GNU libtool) 2.5.3-dirty
+# libtool (GNU libtool) 2.4.7
# Provide generalized library-building support services.
# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-# Copyright (C) 1996-2019, 2021-2024 Free Software Foundation, Inc.
+# Copyright (C) 1996-2019, 2021-2022 Free Software Foundation, Inc.
# This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -31,8 +31,8 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION=2.5.3-dirty
-package_revision=2.5.3
+VERSION="2.4.7 Debian-2.4.7-7build1"
+package_revision=2.4.7
## ------ ##
@@ -72,11 +72,11 @@
# This is free software. There is NO warranty; not even for
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
#
-# Copyright (C) 2004-2019, 2021, 2023-2024 Bootstrap Authors
+# Copyright (C) 2004-2019, 2021 Bootstrap Authors
#
# This file is dual licensed under the terms of the MIT license
-# <https://opensource.org/licenses/MIT>, and GPL version 2 or later
-# <https://www.gnu.org/licenses/gpl-2.0.html>. You must apply one of
+# <https://opensource.org/license/MIT>, and GPL version 2 or later
+# <http://www.gnu.org/licenses/gpl-2.0.html>. You must apply one of
# these licenses when using or redistributing this software or any of
# the files within it. See the URLs above, or the file `LICENSE`
# included in the Bootstrap distribution for the full license texts.
@@ -143,7 +143,7 @@
'
IFS="$sp $nl"
-# There are apparently some systems that use ';' as a PATH separator!
+# There are apparently some retarded systems that use ';' as a PATH separator!
if test "${PATH_SEPARATOR+set}" != set; then
PATH_SEPARATOR=:
(PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
@@ -430,7 +430,7 @@
# putting '$debug_cmd' at the start of all your functions, you can get
# bash to show function call trace with:
#
-# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
+# debug_cmd='echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
debug_cmd=${debug_cmd-":"}
exit_cmd=:
@@ -572,27 +572,15 @@
# ---------------------
# Append VALUE onto the existing contents of VAR.
- # We should try to minimise forks, especially on Windows where they are
- # unreasonably slow, so skip the feature probes when bash or zsh are
- # being used:
- if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then
- : ${_G_HAVE_ARITH_OP="yes"}
- : ${_G_HAVE_XSI_OPS="yes"}
- # The += operator was introduced in bash 3.1
- case $BASH_VERSION in
- [12].* | 3.0 | 3.0*) ;;
- *)
- : ${_G_HAVE_PLUSEQ_OP="yes"}
- ;;
- esac
- fi
-
# _G_HAVE_PLUSEQ_OP
# Can be empty, in which case the shell is probed, "yes" if += is
# useable or anything else if it does not work.
- test -z "$_G_HAVE_PLUSEQ_OP" \
- && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
- && _G_HAVE_PLUSEQ_OP=yes
+ if test -z "$_G_HAVE_PLUSEQ_OP" && \
+ __PLUSEQ_TEST="a" && \
+ __PLUSEQ_TEST+=" b" 2>/dev/null && \
+ test "a b" = "$__PLUSEQ_TEST"; then
+ _G_HAVE_PLUSEQ_OP=yes
+ fi
if test yes = "$_G_HAVE_PLUSEQ_OP"
then
@@ -1536,11 +1524,11 @@
# This is free software. There is NO warranty; not even for
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
#
-# Copyright (C) 2010-2019, 2021, 2023-2024 Bootstrap Authors
+# Copyright (C) 2010-2019, 2021 Bootstrap Authors
#
# This file is dual licensed under the terms of the MIT license
-# <https://opensource.org/licenses/MIT>, and GPL version 2 or later
-# <https://www.gnu.org/licenses/gpl-2.0.html>. You must apply one of
+# <https://opensource.org/license/MIT>, and GPL version 2 or later
+# <http://www.gnu.org/licenses/gpl-2.0.html>. You must apply one of
# these licenses when using or redistributing this software or any of
# the files within it. See the URLs above, or the file `LICENSE`
# included in the Bootstrap distribution for the full license texts.
@@ -1706,6 +1694,8 @@
{
$debug_cmd
+ _G_rc_run_hooks=false
+
case " $hookable_fns " in
*" $1 "*) ;;
*) func_fatal_error "'$1' does not support hook functions." ;;
@@ -2215,7 +2205,7 @@
# End:
# Set a version string.
-scriptversion='(GNU libtool) 2.5.3-dirty'
+scriptversion='(GNU libtool) 2.4.7'
# func_echo ARG...
@@ -2306,13 +2296,13 @@
compiler: $LTCC
compiler flags: $LTCFLAGS
linker: $LD (gnu? $with_gnu_ld)
- version: $progname (GNU libtool) 2.5.3-dirty
+ version: $progname $scriptversion Debian-2.4.7-7build1
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
Report bugs to <bug-libtool@gnu.org>.
-GNU libtool home page: <https://www.gnu.org/s/libtool/>.
-General help using GNU software: <https://www.gnu.org/gethelp/>."
+GNU libtool home page: <http://www.gnu.org/s/libtool/>.
+General help using GNU software: <http://www.gnu.org/gethelp/>."
exit 0
}
@@ -2510,6 +2500,8 @@
_G_rc_lt_options_prep=:
+ _G_rc_lt_options_prep=:
+
# Shorthand for --mode=foo, only valid as the first argument
case $1 in
clean|clea|cle|cl)
@@ -2668,10 +2660,10 @@
# preserve --debug
test : = "$debug_cmd" || func_append preserve_args " --debug"
- case $host_os in
+ case $host in
# Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
# see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
- cygwin* | mingw* | windows* | pw32* | cegcc* | solaris2* | os2*)
+ *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
# don't eliminate duplications in $postdeps and $predeps
opt_duplicate_compiler_generated_deps=:
;;
@@ -3003,7 +2995,7 @@
# func_convert_core_file_wine_to_w32 ARG
# Helper function used by file name conversion functions when $build is *nix,
-# and $host is mingw, windows, cygwin, or some other w32 environment. Relies on a
+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
# correctly configured wine environment available, with the winepath program
# in $build's $PATH.
#
@@ -3035,10 +3027,9 @@
# func_convert_core_path_wine_to_w32 ARG
# Helper function used by path conversion functions when $build is *nix, and
-# $host is mingw, windows, cygwin, or some other w32 environment. Relies on a
-# correctly configured wine environment available, with the winepath program
-# in $build's $PATH. Assumes ARG has no leading or trailing path separator
-# characters.
+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
+# configured wine environment available, with the winepath program in $build's
+# $PATH. Assumes ARG has no leading or trailing path separator characters.
#
# ARG is path to be converted from $build format to win32.
# Result is available in $func_convert_core_path_wine_to_w32_result.
@@ -3693,7 +3684,7 @@
# On Cygwin there's no "real" PIC flag so we must build both object types
case $host_os in
- cygwin* | mingw* | windows* | pw32* | os2* | cegcc*)
+ cygwin* | mingw* | pw32* | os2* | cegcc*)
pic_mode=default
;;
esac
@@ -4570,7 +4561,7 @@
'exit $?'
tstripme=$stripme
case $host_os in
- cygwin* | mingw* | windows* | pw32* | cegcc*)
+ cygwin* | mingw* | pw32* | cegcc*)
case $realname in
*.dll.a)
tstripme=
@@ -4683,7 +4674,7 @@
# Do a test to see if this is really a libtool program.
case $host in
- *cygwin* | *mingw* | *windows*)
+ *cygwin* | *mingw*)
if func_ltwrapper_executable_p "$file"; then
func_ltwrapper_scriptname "$file"
wrapper=$func_ltwrapper_scriptname_result
@@ -4911,7 +4902,7 @@
$RM $export_symbols
eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
case $host in
- *cygwin* | *mingw* | *windows* | *cegcc* )
+ *cygwin* | *mingw* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
;;
@@ -4923,7 +4914,7 @@
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
- *cygwin* | *mingw* | *windows* | *cegcc* )
+ *cygwin* | *mingw* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
;;
@@ -4937,7 +4928,7 @@
func_basename "$dlprefile"
name=$func_basename_result
case $host in
- *cygwin* | *mingw* | *windows* | *cegcc* )
+ *cygwin* | *mingw* | *cegcc* )
# if an import library, we need to obtain dlname
if func_win32_import_lib_p "$dlprefile"; then
func_tr_sh "$dlprefile"
@@ -4963,16 +4954,8 @@
eval '$ECHO ": $name " >> "$nlist"'
fi
func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
- case $host in
- i[3456]86-*-mingw32*)
- eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
- $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
- ;;
- *)
- eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
- $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/__nm_//' >> '$nlist'"
- ;;
- esac
+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
}
else # not an import lib
$opt_dry_run || {
@@ -5120,7 +5103,7 @@
# Transform the symbol file into the correct name.
symfileobj=$output_objdir/${my_outputname}S.$objext
case $host in
- *cygwin* | *mingw* | *windows* | *cegcc* )
+ *cygwin* | *mingw* | *cegcc* )
if test -f "$output_objdir/$my_outputname.def"; then
compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
@@ -5196,7 +5179,7 @@
*ar\ archive*) # could be an import, or static
# Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
- $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|pe-aarch64)' >/dev/null; then
+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
case $nm_interface in
"MS dumpbin")
if func_cygming_ms_implib_p "$1" ||
@@ -5463,7 +5446,7 @@
#
# Emit a libtool wrapper script on stdout.
# Don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw/windows
+# incorporate the script contents within a cygwin/mingw
# wrapper executable. Must ONLY be called from within
# func_mode_link because it depends on a number of variables
# set therein.
@@ -5471,7 +5454,7 @@
# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
# variable will take. If 'yes', then the emitted script
# will assume that the directory where it is stored is
-# the $objdir directory. This is a cygwin/mingw/windows-specific
+# the $objdir directory. This is a cygwin/mingw-specific
# behavior.
func_emit_wrapper ()
{
@@ -5596,7 +5579,7 @@
"
case $host in
# Backslashes separate directories on plain windows
- *-*-mingw* | *-*-windows* | *-*-os2* | *-cegcc*)
+ *-*-mingw | *-*-os2* | *-cegcc*)
$ECHO "\
if test -n \"\$lt_option_debug\"; then
\$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2
@@ -5664,7 +5647,7 @@
file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
done
- # Usually 'no', except on cygwin/mingw/windows when embedded into
+ # Usually 'no', except on cygwin/mingw when embedded into
# the cwrapper.
WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
@@ -5796,7 +5779,7 @@
#endif
#include <stdio.h>
#include <stdlib.h>
-#if defined _WIN32 && !defined __GNUC__
+#ifdef _MSC_VER
# include <direct.h>
# include <process.h>
# include <io.h>
@@ -5821,7 +5804,7 @@
/* declarations of non-ANSI functions */
#if defined __MINGW32__
# ifdef __STRICT_ANSI__
-_CRTIMP int __cdecl _putenv (const char *);
+int _putenv (const char *);
# endif
#elif defined __CYGWIN__
# ifdef __STRICT_ANSI__
@@ -6019,7 +6002,7 @@
{
EOF
case $host in
- *mingw* | *windows* | *cygwin* )
+ *mingw* | *cygwin* )
# make stdout use "unix" line endings
echo " setmode(1,_O_BINARY);"
;;
@@ -6038,7 +6021,7 @@
{
/* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
namespace, but it is not one of the ones we know about and
- have already dealt with, above (including dump-script), then
+ have already dealt with, above (inluding dump-script), then
report an error. Otherwise, targets might begin to believe
they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
namespace. The first time any user complains about this, we'll
@@ -6122,7 +6105,7 @@
EOF
case $host_os in
- mingw* | windows*)
+ mingw*)
cat <<"EOF"
{
char* p;
@@ -6164,7 +6147,7 @@
EOF
case $host_os in
- mingw* | windows*)
+ mingw*)
cat <<"EOF"
/* execv doesn't actually work on mingw as expected on unix */
newargz = prepare_spawn (newargz);
@@ -6583,7 +6566,7 @@
EOF
case $host_os in
- mingw* | windows*)
+ mingw*)
cat <<"EOF"
/* Prepares an argument vector before calling spawn().
@@ -6758,7 +6741,7 @@
$debug_cmd
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
# It is impossible to link a dll without this setting, and
# we shouldn't force the makefile maintainer to figure out
# what system we are compiling for in order to pass an extra
@@ -6822,12 +6805,10 @@
xrpath=
perm_rpath=
temp_rpath=
- temp_rpath_tail=
thread_safe=no
vinfo=
vinfo_number=no
weak_libs=
- rpath_arg=
single_module=$wl-single_module
func_infer_tag $base_compile
@@ -7090,7 +7071,7 @@
case $arg in
[\\/]* | [A-Za-z]:[\\/]*) ;;
*)
- func_fatal_error "argument to -rpath is not absolute: $arg"
+ func_fatal_error "only absolute run-paths are allowed"
;;
esac
if test rpath = "$prev"; then
@@ -7266,7 +7247,7 @@
;;
esac
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$dir:"*) ;;
@@ -7286,7 +7267,7 @@
-l*)
if test X-lc = "X$arg" || test X-lm = "X$arg"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
# These systems don't actually have a C or math library (as such)
continue
;;
@@ -7294,7 +7275,7 @@
# These systems don't actually have a C library (as such)
test X-lc = "X$arg" && continue
;;
- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd*)
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*)
# Do not include libc due to us having libc/libc_r.
test X-lc = "X$arg" && continue
;;
@@ -7314,7 +7295,7 @@
esac
elif test X-lc_r = "X$arg"; then
case $host in
- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd*)
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*)
# Do not include libc_r directly, use -pthread flag.
continue
;;
@@ -7358,7 +7339,7 @@
continue
;;
-mt|-mthreads|-kthread|-Kthread|-pthreads|--thread-safe \
- |-threads|-fopenmp|-fopenmp=*|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
func_append compiler_flags " $arg"
func_append compile_command " $arg"
func_append finalize_command " $arg"
@@ -7381,7 +7362,7 @@
-no-install)
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
# The PATH hackery in wrapper scripts is required on Windows
# and Darwin in order for the loader to find any dlls it needs.
func_warning "'-no-install' is ignored for $host"
@@ -7441,7 +7422,7 @@
dir=$lt_sysroot$func_stripname_result
;;
*)
- func_fatal_error "argument ($arg) to '-R' is not an absolute path: $dir"
+ func_fatal_error "only absolute run-paths are allowed"
;;
esac
case "$xrpath " in
@@ -7566,29 +7547,15 @@
# -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
# -specs=* GCC specs files
# -stdlib=* select c++ std lib with clang
- # -fdiagnostics-color* simply affects output
- # -frecord-gcc-switches used to verify flags were respected
# -fsanitize=* Clang/GCC memory and address sanitizer
- # -fno-sanitize* Clang/GCC memory and address sanitizer
- # -shared-libsan Link with shared sanitizer runtimes (Clang)
- # -static-libsan Link with static sanitizer runtimes (Clang)
- # -no-canonical-prefixes Do not expand any symbolic links
# -fuse-ld=* Linker select flags for GCC
# -static-* direct GCC to link specific libraries statically
# -fcilkplus Cilk Plus language extension features for C/C++
- # -rtlib=* select c runtime lib with clang
- # --unwindlib=* select unwinder library with clang
- # -f{file|debug|macro|profile}-prefix-map=* needed for lto linking
# -Wa,* Pass flags directly to the assembler
- # -Werror, -Werror=* Report (specified) warnings as errors
-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*|-no-canonical-prefixes| \
- -stdlib=*|-rtlib=*|--unwindlib=*| \
- -specs=*|-fsanitize=*|-fno-sanitize*|-shared-libsan|-static-libsan| \
- -ffile-prefix-map=*|-fdebug-prefix-map=*|-fmacro-prefix-map=*|-fprofile-prefix-map=*| \
- -fdiagnostics-color*|-frecord-gcc-switches| \
- -fuse-ld=*|-static-*|-fcilkplus|-Wa,*|-Werror|-Werror=*)
+ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+ -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus|-Wa,*)
func_quote_arg pretty "$arg"
arg=$func_quote_arg_result
func_append compile_command " $arg"
@@ -7746,20 +7713,8 @@
# Now actually substitute the argument into the commands.
if test -n "$arg"; then
- if test -n "$rpath_arg"; then
- func_append finalize_rpath " ${arg##*,}"
- unset rpath_arg
- else
- case $arg in
- -Wl,-rpath,*)
- func_append finalize_rpath " ${arg##*,}";;
- -Wl,-rpath)
- rpath_arg=1;;
- *)
- func_append compile_command " $arg"
- func_append finalize_command " $arg"
- esac
- fi
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
fi
done # argument parsing loop
@@ -7893,7 +7848,10 @@
case $pass in
dlopen) libs=$dlfiles ;;
dlpreopen) libs=$dlprefiles ;;
- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+ link)
+ libs="$deplibs %DEPLIBS%"
+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+ ;;
esac
fi
if test lib,dlpreopen = "$linkmode,$pass"; then
@@ -7930,7 +7888,7 @@
found=false
case $deplib in
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
- |-threads|-fopenmp|-fopenmp=*|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
if test prog,link = "$linkmode,$pass"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
@@ -8107,15 +8065,18 @@
;;
esac
if $valid_a_lib; then
- func_warning "Linking the shared library $output against the static library $deplib is not portable!"
+ echo
+ $ECHO "*** Warning: Linking the shared library $output against the"
+ $ECHO "*** static library $deplib is not portable!"
deplibs="$deplib $deplibs"
else
- func_warning "Trying to link with static lib archive $deplib."
- func_warning "I have the capability to make that library automatically link in when"
- func_warning "you link to this library. But I can only do this if you have a"
- func_warning "shared version of the library, which you do not appear to have"
- func_warning "because the file extensions .$libext of this argument makes me believe"
- func_warning "that it is just a static archive that I should not use here."
+ echo
+ $ECHO "*** Warning: Trying to link with static lib archive $deplib."
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have"
+ echo "*** because the file extensions .$libext of this argument makes me believe"
+ echo "*** that it is just a static archive that I should not use here."
fi
;;
esac
@@ -8209,19 +8170,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
@@ -8310,7 +8271,7 @@
fi
case $host in
# special handling for platforms with PE-DLLs.
- *cygwin* | *mingw* | *windows* | *cegcc* )
+ *cygwin* | *mingw* | *cegcc* )
# Linker will automatically link against shared library if both
# static and shared are present. Therefore, ensure we extract
# symbols from the import library if a shared library is present
@@ -8410,10 +8371,7 @@
# Make sure the rpath contains only unique directories.
case $temp_rpath: in
*"$absdir:"*) ;;
- *) case $absdir in
- "$progdir/"*) func_append temp_rpath "$absdir:" ;;
- *) func_append temp_rpath_tail "$absdir:" ;;
- esac
+ *) func_append temp_rpath "$absdir:" ;;
esac
fi
@@ -8425,9 +8383,7 @@
*)
case "$compile_rpath " in
*" $absdir "*) ;;
- *) case $absdir in
- "$progdir/"*) func_append compile_rpath " $absdir" ;;
- esac
+ *) func_append compile_rpath " $absdir" ;;
esac
;;
esac
@@ -8458,8 +8414,8 @@
fi
if test -n "$library_names" &&
{ test no = "$use_static_libs" || test -z "$old_library"; }; then
- case $host_os in
- cygwin* | mingw* | windows* | cegcc* | os2*)
+ case $host in
+ *cygwin* | *mingw* | *cegcc* | *os2*)
# No point in relinking DLLs because paths are not encoded
func_append notinst_deplibs " $lib"
need_relink=no
@@ -8485,11 +8441,11 @@
if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
echo
if test prog = "$linkmode"; then
- func_warning "Linking the executable $output against the loadable module"
+ $ECHO "*** Warning: Linking the executable $output against the loadable module"
else
- func_warning "Linking the shared library $output against the loadable module"
+ $ECHO "*** Warning: Linking the shared library $output against the loadable module"
fi
- func_warning "$linklib is not portable!"
+ $ECHO "*** $linklib is not portable!"
fi
if test lib = "$linkmode" &&
test yes = "$hardcode_into_libs"; then
@@ -8501,9 +8457,7 @@
*)
case "$compile_rpath " in
*" $absdir "*) ;;
- *) case $absdir in
- "$progdir/"*) func_append compile_rpath " $absdir" ;;
- esac
+ *) func_append compile_rpath " $absdir" ;;
esac
;;
esac
@@ -8530,8 +8484,8 @@
soname=$dlname
elif test -n "$soname_spec"; then
# bleh windows
- case $host_os in
- cygwin* | mingw* | windows* | cegcc* | os2*)
+ case $host in
+ *cygwin* | mingw* | *cegcc* | *os2*)
func_arith $current - $age
major=$func_arith_result
versuffix=-$major
@@ -8586,10 +8540,11 @@
if /usr/bin/file -L $add 2> /dev/null |
$GREP ": [^:]* bundle" >/dev/null; then
if test "X$dlopenmodule" != "X$lib"; then
- func_warning "lib $linklib is a module, not a shared library"
+ $ECHO "*** Warning: lib $linklib is a module, not a shared library"
if test -z "$old_library"; then
- func_warning "And there doesn't seem to be a static archive available"
- func_warning "The link will probably fail, sorry"
+ echo
+ echo "*** And there doesn't seem to be a static archive available"
+ echo "*** The link will probably fail, sorry"
else
add=$dir/$old_library
fi
@@ -8672,7 +8627,7 @@
test no = "$hardcode_direct_absolute"; then
add=$libdir/$linklib
elif test yes = "$hardcode_minus_L"; then
- add_dir=-L$lt_sysroot$libdir
+ add_dir=-L$libdir
add=-l$name
elif test yes = "$hardcode_shlibpath_var"; then
case :$finalize_shlibpath: in
@@ -8689,7 +8644,7 @@
fi
else
# We cannot seem to hardcode it, guess we'll fake it.
- add_dir=-L$lt_sysroot$libdir
+ add_dir=-L$libdir
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
case $libdir in
@@ -8729,19 +8684,21 @@
# Just print a warning and add the library to dependency_libs so
# that the program can be linked against the static library.
- func_warning "This system cannot link to static lib archive $lib."
- func_warning "I have the capability to make that library automatically link in when"
- func_warning "you link to this library. But I can only do this if you have a"
- func_warning "shared version of the library, which you do not appear to have."
+ echo
+ $ECHO "*** Warning: This system cannot link to static lib archive $lib."
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have."
if test yes = "$module"; then
- func_warning "But as you try to build a module library, libtool will still create "
- func_warning "a static module, that should work as long as the dlopening application"
- func_warning "is linked with the -dlopen flag to resolve symbols at runtime."
+ echo "*** But as you try to build a module library, libtool will still create "
+ echo "*** a static module, that should work as long as the dlopening application"
+ echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
if test -z "$global_symbol_pipe"; then
- func_warning "However, this would only work if libtool was able to extract symbol"
- func_warning "lists from a program, using 'nm' or equivalent, but libtool could"
- func_warning "not find such a program. So, this module is probably useless."
- func_warning "'nm' from GNU binutils and a full rebuild may help."
+ echo
+ echo "*** However, this would only work if libtool was able to extract symbol"
+ echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
+ echo "*** not find such a program. So, this module is probably useless."
+ echo "*** 'nm' from GNU binutils and a full rebuild may help."
fi
if test no = "$build_old_libs"; then
build_libtool_libs=module
@@ -8864,8 +8821,6 @@
fi # link_all_deplibs != no
fi # linkmode = lib
done # for deplib in $libs
-
- func_append temp_rpath "$temp_rpath_tail"
if test link = "$pass"; then
if test prog = "$linkmode"; then
compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
@@ -8903,46 +8858,42 @@
# Add libraries to $var in reverse order
eval tmp_libs=\"\$$var\"
new_libs=
- # FIXME: Pedantically, this is the right thing to do, so
- # that some nasty dependency loop isn't accidentally
- # broken: new_libs="$deplib $new_libs"
for deplib in $tmp_libs; do
- if $opt_preserve_dup_deps; then
- new_libs="$deplib $new_libs"
- else
- # Pragmatically, this seems to cause very few problems in
- # practice:
- case $deplib in
- -L*) new_libs="$deplib $new_libs" ;;
- -R*) ;;
+ # FIXME: Pedantically, this is the right thing to do, so
+ # that some nasty dependency loop isn't accidentally
+ # broken:
+ #new_libs="$deplib $new_libs"
+ # Pragmatically, this seems to cause very few problems in
+ # practice:
+ case $deplib in
+ -L*) new_libs="$deplib $new_libs" ;;
+ -R*) ;;
+ *)
+ # And here is the reason: when a library appears more
+ # than once as an explicit dependence of a library, or
+ # is implicitly linked in more than once by the
+ # compiler, it is considered special, and multiple
+ # occurrences thereof are not removed. Compare this
+ # with having the same library being listed as a
+ # dependency of multiple other libraries: in this case,
+ # we know (pedantically, we assume) the library does not
+ # need to be listed more than once, so we keep only the
+ # last copy. This is not always right, but it is rare
+ # enough that we require users that really mean to play
+ # such unportable linking tricks to link the library
+ # using -Wl,-lname, so that libtool does not consider it
+ # for duplicate removal.
+ case " $specialdeplibs " in
+ *" $deplib "*) new_libs="$deplib $new_libs" ;;
*)
- # And here is the reason: when a library appears more
- # than once as an explicit dependence of a library, or
- # is implicitly linked in more than once by the
- # compiler, it is considered special, and multiple
- # occurrences thereof are not removed. Compare this
- # with having the same library being listed as a
- # dependency of multiple other libraries: in this case,
- # we know (pedantically, we assume) the library does not
- # need to be listed more than once, so we keep only the
- # last copy. This is not always right, but it is rare
- # enough that we require users that really mean to play
- # such unportable linking tricks to link the library
- # using -Wl,-lname, so that libtool does not consider it
- # for duplicate removal. And if not possible for portability
- # reasons, then --preserve-dup-deps should be used.
- case " $specialdeplibs " in
- *" $deplib "*) new_libs="$deplib $new_libs" ;;
- *)
- case " $new_libs " in
- *" $deplib "*) ;;
- *) new_libs="$deplib $new_libs" ;;
- esac
- ;;
- esac
- ;;
+ case " $new_libs " in
+ *" $deplib "*) ;;
+ *) new_libs="$deplib $new_libs" ;;
+ esac
+ ;;
esac
- fi
+ ;;
+ esac
done
tmp_libs=
for deplib in $new_libs; do
@@ -9074,7 +9025,9 @@
if test pass_all != "$deplibs_check_method"; then
func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs"
else
- func_warning "Linking the shared library $output against the non-libtool objects $objs is not portable!"
+ echo
+ $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
+ $ECHO "*** objects $objs is not portable!"
func_append libobjs " $objs"
fi
fi
@@ -9135,13 +9088,13 @@
#
case $version_type in
# correct linux to gnu/linux during the next big refactor
- darwin|freebsd-elf|linux|midnightbsd-elf|osf|qnx|windows|none)
+ darwin|freebsd-elf|linux|midnightbsd-elf|osf|windows|none)
func_arith $number_major + $number_minor
current=$func_arith_result
age=$number_minor
revision=$number_revision
;;
- freebsd-aout|sco|sunos)
+ freebsd-aout|qnx|sunos)
current=$number_major
revision=$number_minor
age=0
@@ -9153,6 +9106,9 @@
revision=$number_minor
lt_irix_increment=no
;;
+ *)
+ func_fatal_configuration "$modename: unknown library version type '$version_type'"
+ ;;
esac
;;
no)
@@ -9288,9 +9244,8 @@
;;
qnx)
- func_arith $current - $age
- major=.$func_arith_result
- versuffix=$major.$age.$revision
+ major=.$current
+ versuffix=.$current
;;
sco)
@@ -9443,7 +9398,7 @@
if test yes = "$build_libtool_libs"; then
if test -n "$rpath"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
# these systems don't actually have a c library (as such)!
;;
*-*-rhapsody* | *-*-darwin1.[012])
@@ -9494,6 +9449,108 @@
# implementing what was already the behavior.
newdeplibs=$deplibs
;;
+ test_compile)
+ # This code stresses the "libraries are programs" paradigm to its
+ # limits. Maybe even breaks it. We compile a program, linking it
+ # against the deplibs as a proxy for the library. Then we can check
+ # whether they linked in statically or dynamically with ldd.
+ $opt_dry_run || $RM conftest.c
+ cat > conftest.c <<EOF
+ int main() { return 0; }
+EOF
+ $opt_dry_run || $RM conftest
+ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+ ldd_output=`ldd conftest`
+ for i in $deplibs; do
+ case $i in
+ -l*)
+ func_stripname -l '' "$i"
+ name=$func_stripname_result
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+ case " $predeps $postdeps " in
+ *" $i "*)
+ func_append newdeplibs " $i"
+ i=
+ ;;
+ esac
+ fi
+ if test -n "$i"; then
+ libname=`eval "\\$ECHO \"$libname_spec\""`
+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+ set dummy $deplib_matches; shift
+ deplib_match=$1
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
+ func_append newdeplibs " $i"
+ else
+ droppeddeps=yes
+ echo
+ $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which I believe you do not have"
+ echo "*** because a test_compile did reveal that the linker did not use it for"
+ echo "*** its dynamic dependency list that programs get resolved with at runtime."
+ fi
+ fi
+ ;;
+ *)
+ func_append newdeplibs " $i"
+ ;;
+ esac
+ done
+ else
+ # Error occurred in the first compile. Let's try to salvage
+ # the situation: Compile a separate program for each library.
+ for i in $deplibs; do
+ case $i in
+ -l*)
+ func_stripname -l '' "$i"
+ name=$func_stripname_result
+ $opt_dry_run || $RM conftest
+ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+ ldd_output=`ldd conftest`
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+ case " $predeps $postdeps " in
+ *" $i "*)
+ func_append newdeplibs " $i"
+ i=
+ ;;
+ esac
+ fi
+ if test -n "$i"; then
+ libname=`eval "\\$ECHO \"$libname_spec\""`
+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+ set dummy $deplib_matches; shift
+ deplib_match=$1
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
+ func_append newdeplibs " $i"
+ else
+ droppeddeps=yes
+ echo
+ $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have"
+ echo "*** because a test_compile did reveal that the linker did not use this one"
+ echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+ fi
+ fi
+ else
+ droppeddeps=yes
+ echo
+ $ECHO "*** Warning! Library $i is needed by this library but I was not able to"
+ echo "*** make it link in! You will probably need to install it or some"
+ echo "*** library that it depends on before this library will be fully"
+ echo "*** functional. Installing it before continuing would be even better."
+ fi
+ ;;
+ *)
+ func_append newdeplibs " $i"
+ ;;
+ esac
+ done
+ fi
+ ;;
file_magic*)
set dummy $deplibs_check_method; shift
file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
@@ -9557,16 +9614,17 @@
fi
if test -n "$a_deplib"; then
droppeddeps=yes
- func_warning "Linker path does not have real file for library $a_deplib."
- func_warning "I have the capability to make that library automatically link in when"
- func_warning "you link to this library. But I can only do this if you have a"
- func_warning "shared version of the library, which you do not appear to have"
- func_warning "because I did check the linker path looking for a file starting"
+ echo
+ $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have"
+ echo "*** because I did check the linker path looking for a file starting"
if test -z "$potlib"; then
- func_warning "with $libname but no candidates were found. (...for file magic test)"
+ $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
else
- func_warning "with $libname and none of the candidates passed a file format test"
- func_warning "using a file magic. Last file checked: $potlib"
+ $ECHO "*** with $libname and none of the candidates passed a file format test"
+ $ECHO "*** using a file magic. Last file checked: $potlib"
fi
fi
;;
@@ -9610,16 +9668,17 @@
fi
if test -n "$a_deplib"; then
droppeddeps=yes
- func_warning "Linker path does not have real file for library $a_deplib."
- func_warning "I have the capability to make that library automatically link in when"
- func_warning "you link to this library. But I can only do this if you have a"
- func_warning "shared version of the library, which you do not appear to have"
- func_warning "because I did check the linker path looking for a file starting"
+ echo
+ $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have"
+ echo "*** because I did check the linker path looking for a file starting"
if test -z "$potlib"; then
- func_warning "with $libname but no candidates were found. (...for regex pattern test)"
+ $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
else
- func_warning "with $libname and none of the candidates passed a file format test"
- func_warning "using a regex pattern. Last file checked: $potlib"
+ $ECHO "*** with $libname and none of the candidates passed a file format test"
+ $ECHO "*** using a regex pattern. Last file checked: $potlib"
fi
fi
;;
@@ -9643,11 +9702,11 @@
*[!\ \ ]*)
echo
if test none = "$deplibs_check_method"; then
- func_warning "Inter-library dependencies are not supported in this platform."
+ echo "*** Warning: inter-library dependencies are not supported in this platform."
else
- func_warning "Inter-library dependencies are not known to be supported."
+ echo "*** Warning: inter-library dependencies are not known to be supported."
fi
- func_warning "All declared inter-library dependencies are being dropped."
+ echo "*** All declared inter-library dependencies are being dropped."
droppeddeps=yes
;;
esac
@@ -9668,15 +9727,17 @@
if test yes = "$droppeddeps"; then
if test yes = "$module"; then
- func_warning "libtool could not satisfy all declared inter-library"
- func_warning "dependencies of module $libname. Therefore, libtool will create"
- func_warning "a static module, that should work as long as the dlopening"
- func_warning "application is linked with the -dlopen flag."
+ echo
+ echo "*** Warning: libtool could not satisfy all declared inter-library"
+ $ECHO "*** dependencies of module $libname. Therefore, libtool will create"
+ echo "*** a static module, that should work as long as the dlopening"
+ echo "*** application is linked with the -dlopen flag."
if test -z "$global_symbol_pipe"; then
- func_warning "However, this would only work if libtool was able to extract symbol"
- func_warning "lists from a program, using 'nm' or equivalent, but libtool could"
- func_warning "not find such a program. So, this module is probably useless."
- func_warning "'nm' from GNU binutils and a full rebuild may help."
+ echo
+ echo "*** However, this would only work if libtool was able to extract symbol"
+ echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
+ echo "*** not find such a program. So, this module is probably useless."
+ echo "*** 'nm' from GNU binutils and a full rebuild may help."
fi
if test no = "$build_old_libs"; then
oldlibs=$output_objdir/$libname.$libext
@@ -9851,7 +9912,7 @@
orig_export_symbols=
case $host_os in
- cygwin* | mingw* | windows* | cegcc*)
+ cygwin* | mingw* | cegcc*)
if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
# exporting using user supplied symfile
func_dll_def_p "$export_symbols" || {
@@ -10521,7 +10582,7 @@
esac
fi
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$libdir:"*) ;;
@@ -10599,7 +10660,7 @@
# Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
wrappers_required=false
;;
- *cygwin* | *mingw* | *windows* )
+ *cygwin* | *mingw* )
test yes = "$build_libtool_libs" || wrappers_required=false
;;
*)
@@ -10753,7 +10814,7 @@
*) exeext= ;;
esac
case $host in
- *cygwin* | *mingw* | windows* )
+ *cygwin* | *mingw* )
func_dirname_and_basename "$output" "" "."
output_name=$func_basename_result
output_path=$func_dirname_result
@@ -11087,7 +11148,7 @@
# tests/bindir.at for full details.
tdlname=$dlname
case $host,$output,$installed,$module,$dlname in
- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *windows*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
# If a -bindir argument was supplied, place the dll there.
if test -n "$bindir"; then
func_relative_path "$install_libdir" "$bindir"
diff -Nru xfconf-4.19.3/m4/libtool.m4 xfconf-4.20.0/m4/libtool.m4
--- xfconf-4.19.3/m4/libtool.m4 2024-10-18 14:11:10.000000000 +0800
+++ xfconf-4.20.0/m4/libtool.m4 2024-12-15 17:33:35.000000000 +0800
@@ -1,6 +1,6 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
#
-# Copyright (C) 1996-2001, 2003-2019, 2021-2024 Free Software
+# Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software
# Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
@@ -9,13 +9,13 @@
# modifications, as long as this notice is preserved.
m4_define([_LT_COPYING], [dnl
-# Copyright (C) 2024 Free Software Foundation, Inc.
+# Copyright (C) 2014 Free Software Foundation, Inc.
# This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# GNU Libtool is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 2 of of the License, or
# (at your option) any later version.
#
# As a special exception to the GNU General Public License, if you
@@ -32,7 +32,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
])
-# serial 62 LT_INIT
+# serial 59 LT_INIT
# LT_PREREQ(VERSION)
@@ -60,7 +60,7 @@
# LT_INIT([OPTIONS])
# ------------------
AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.64])dnl We use AC_PATH_PROGS_FEATURE_CHECK
+[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK
AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
AC_BEFORE([$0], [LT_LANG])dnl
AC_BEFORE([$0], [LT_OUTPUT])dnl
@@ -616,7 +616,7 @@
# LT_OUTPUT
# ---------
# This macro allows early generation of the libtool script (before
-# AC_OUTPUT is called), in case it is used in configure for compilation
+# AC_OUTPUT is called), incase it is used in configure for compilation
# tests.
AC_DEFUN([LT_OUTPUT],
[: ${CONFIG_LT=./config.lt}
@@ -651,9 +651,9 @@
m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
configured by $[0], generated by m4_PACKAGE_STRING.
-Copyright (C) 2024 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
This config.lt script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
+gives unlimited permision to copy, distribute and modify it."
while test 0 != $[#]
do
@@ -974,7 +974,6 @@
$RM -r conftest*
])# _LT_LINKER_BOILERPLATE
-
# _LT_REQUIRED_DARWIN_CHECKS
# -------------------------
m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
@@ -1025,21 +1024,6 @@
rm -f conftest.*
fi])
- # Feature test to disable chained fixups since it is not
- # compatible with '-undefined dynamic_lookup'
- AC_CACHE_CHECK([for -no_fixup_chains linker flag],
- [lt_cv_support_no_fixup_chains],
- [ save_LDFLAGS=$LDFLAGS
- LDFLAGS="$LDFLAGS -Wl,-no_fixup_chains"
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([],[])],
- lt_cv_support_no_fixup_chains=yes,
- lt_cv_support_no_fixup_chains=no
- )
- LDFLAGS=$save_LDFLAGS
- ]
- )
-
AC_CACHE_CHECK([for -exported_symbols_list linker flag],
[lt_cv_ld_exported_symbols_list],
[lt_cv_ld_exported_symbols_list=no
@@ -1064,7 +1048,7 @@
echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
$RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
cat > conftest.c << _LT_EOF
-int main(void) { return 0;}
+int main() { return 0;}
_LT_EOF
echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
@@ -1089,11 +1073,7 @@
10.[[012]],*|,*powerpc*-darwin[[5-8]]*)
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
*)
- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup'
- if test yes = "$lt_cv_support_no_fixup_chains"; then
- AS_VAR_APPEND([_lt_dar_allow_undefined], [' $wl-no_fixup_chains'])
- fi
- ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
esac
;;
esac
@@ -1275,9 +1255,7 @@
case $with_sysroot in #(
yes)
if test yes = "$GCC"; then
- # Trim trailing / since we'll always append absolute paths and we want
- # to avoid //, if only for less confusing output for the user.
- lt_sysroot=`$CC --print-sysroot 2>/dev/null | $SED 's:/\+$::'`
+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
fi
;; #(
/*)
@@ -1389,7 +1367,7 @@
;;
x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out what ABI is being produced by ac_compile, and set linker
# options accordingly. Note that the listed cases only cover the
# situations where additional linker options are needed (such as when
@@ -1404,7 +1382,7 @@
x86_64-*kfreebsd*-gnu)
LD="${LD-ld} -m elf_i386_fbsd"
;;
- x86_64-*linux*|x86_64-gnu*)
+ x86_64-*linux*)
case `$FILECMD conftest.o` in
*x86-64*)
LD="${LD-ld} -m elf32_x86_64"
@@ -1433,7 +1411,7 @@
x86_64-*kfreebsd*-gnu)
LD="${LD-ld} -m elf_x86_64_fbsd"
;;
- x86_64-*linux*|x86_64-gnu*)
+ x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
powerpcle-*linux*)
@@ -1516,7 +1494,7 @@
# Use ARFLAGS variable as AR's operation code to sync the variable naming with
# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have
-# higher priority because that's what people were doing historically (setting
+# higher priority because thats what people were doing historically (setting
# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS
# variable obsoleted/removed.
@@ -1566,7 +1544,7 @@
test -z "$STRIP" && STRIP=:
_LT_DECL([], [STRIP], [1], [A symbol stripping program])
-AC_REQUIRE([AC_PROG_RANLIB])
+AC_CHECK_TOOL(RANLIB, ranlib, :)
test -z "$RANLIB" && RANLIB=:
_LT_DECL([], [RANLIB], [1],
[Commands used to install an old-style archive])
@@ -1577,8 +1555,15 @@
old_postuninstall_cmds=
if test -n "$RANLIB"; then
+ case $host_os in
+ bitrig* | openbsd*)
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+ ;;
+ *)
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+ ;;
+ esac
old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
fi
case $host_os in
@@ -1717,7 +1702,7 @@
lt_cv_sys_max_cmd_len=-1;
;;
- cygwin* | mingw* | windows* | cegcc*)
+ cygwin* | mingw* | cegcc*)
# On Win9x/ME, this test blows up -- it succeeds, but takes
# about 5 minutes as the teststring grows exponentially.
# Worse, since 9x/ME are not pre-emptively multitasking,
@@ -1739,7 +1724,7 @@
lt_cv_sys_max_cmd_len=8192;
;;
- darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*)
+ bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*)
# This has been around since 386BSD, at least. Likely further.
if test -x /sbin/sysctl; then
lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -1899,11 +1884,11 @@
/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord (void) __attribute__((visibility("default")));
+int fnord () __attribute__((visibility("default")));
#endif
-int fnord (void) { return 42; }
-int main (void)
+int fnord () { return 42; }
+int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
int status = $lt_dlunknown;
@@ -1960,7 +1945,7 @@
lt_cv_dlopen_self=yes
;;
- mingw* | windows* | pw32* | cegcc*)
+ mingw* | pw32* | cegcc*)
lt_cv_dlopen=LoadLibrary
lt_cv_dlopen_libs=
;;
@@ -2328,7 +2313,7 @@
*) lt_awk_arg='/^libraries:/' ;;
esac
case $host_os in
- mingw* | windows* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;;
+ mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;;
*) lt_sed_strip_eq='s|=/|/|g' ;;
esac
lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
@@ -2386,7 +2371,7 @@
# AWK program above erroneously prepends '/' to C:/dos/paths
# for these hosts.
case $host_os in
- mingw* | windows* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
$SED 's|/\([[A-Za-z]]:\)|\1|g'` ;;
esac
sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
@@ -2461,7 +2446,7 @@
# Unfortunately, runtime linking may impact performance, so we do
# not want this to be the default eventually. Also, we use the
# versioned .so libs for executables only if there is the -brtl
- # linker flag in LDFLAGS as well, or --enable-aix-soname=svr4 only.
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
# To allow for filename-based versioning support, we need to create
# libNAME.so.V as an archive file, containing:
# *) an Import File, referring to the versioned filename of the
@@ -2555,7 +2540,7 @@
# libtool to hard-code these into programs
;;
-cygwin* | mingw* | windows* | pw32* | cegcc*)
+cygwin* | mingw* | pw32* | cegcc*)
version_type=windows
shrext_cmds=.dll
need_version=no
@@ -2566,19 +2551,6 @@
# gcc
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- # If user builds GCC with mulitlibs enabled,
- # it should just install on $(libdir)
- # not on $(libdir)/../bin or 32 bits dlls would override 64 bit ones.
- if test yes = $multilib; then
- postinstall_cmds='base_file=`basename \$file`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- $install_prog $dir/$dlname $destdir/$dlname~
- chmod a+x $destdir/$dlname~
- if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
- eval '\''$striplib $destdir/$dlname'\'' || exit \$?;
- fi'
- else
postinstall_cmds='base_file=`basename \$file`~
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
@@ -2588,7 +2560,6 @@
if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
fi'
- fi
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$RM \$dlpath'
@@ -2601,7 +2572,7 @@
m4_if([$1], [],[
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
;;
- mingw* | windows* | cegcc*)
+ mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
;;
@@ -2620,7 +2591,7 @@
library_names_spec='$libname.dll.lib'
case $build_os in
- mingw* | windows*)
+ mingw*)
sys_lib_search_path_spec=
lt_save_ifs=$IFS
IFS=';'
@@ -2727,21 +2698,7 @@
need_version=yes
;;
esac
- case $host_cpu in
- powerpc64)
- # On FreeBSD bi-arch platforms, a different variable is used for 32-bit
- # binaries. See <https://man.freebsd.org/cgi/man.cgi?query=ld.so>.
- AC_COMPILE_IFELSE(
- [AC_LANG_SOURCE(
- [[int test_pointer_size[sizeof (void *) - 5];
- ]])],
- [shlibpath_var=LD_LIBRARY_PATH],
- [shlibpath_var=LD_32_LIBRARY_PATH])
- ;;
- *)
- shlibpath_var=LD_LIBRARY_PATH
- ;;
- esac
+ shlibpath_var=LD_LIBRARY_PATH
case $host_os in
freebsd2.*)
shlibpath_overrides_runpath=yes
@@ -2882,7 +2839,7 @@
version_type=none # Android doesn't support versioned libraries.
need_lib_prefix=no
need_version=no
- library_names_spec='$libname$release$shared_ext $libname$shared_ext'
+ library_names_spec='$libname$release$shared_ext'
soname_spec='$libname$release$shared_ext'
finish_cmds=
shlibpath_var=LD_LIBRARY_PATH
@@ -2894,9 +2851,8 @@
hardcode_into_libs=yes
dynamic_linker='Android linker'
- # -rpath works at least for libraries that are not overridden by
- # libraries installed in system locations.
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ # Don't embed -rpath directories since the linker doesn't support them.
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
;;
# This must be glibc/ELF.
@@ -2930,7 +2886,7 @@
# before this can be enabled.
hardcode_into_libs=yes
- # Ideally, we could use ldconfig to report *all* directories which are
+ # Ideally, we could use ldconfig to report *all* directores which are
# searched for libraries, however this is still not possible. Aside from not
# being certain /sbin/ldconfig is available, command
# 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
@@ -2950,6 +2906,18 @@
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
@@ -2987,7 +2955,7 @@
dynamic_linker='ldqnx.so'
;;
-openbsd*)
+openbsd* | bitrig*)
version_type=sunos
sys_lib_dlsearch_path_spec=/usr/lib
need_lib_prefix=no
@@ -3319,7 +3287,7 @@
# Check if gcc -print-prog-name=ld gives a path.
AC_MSG_CHECKING([for ld used by $CC])
case $host in
- *-*-mingw* | *-*-windows*)
+ *-*-mingw*)
# gcc leaves a trailing carriage return, which upsets mingw
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
*)
@@ -3428,7 +3396,7 @@
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
- cygwin* | mingw* | windows* | pw32* | cegcc*)
+ cygwin* | mingw* | pw32* | cegcc*)
if test yes != "$GCC"; then
reload_cmds=false
fi
@@ -3500,6 +3468,7 @@
# 'none' -- dependencies not supported.
# 'unknown' -- same as none, but documents that we really don't know.
# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
# 'file_magic [[regex]]' -- check by looking for files in library path
# that responds to the $file_magic_cmd with a given extended regex.
# If you have 'file' or equivalent on your system and you're not sure
@@ -3526,7 +3495,7 @@
lt_cv_file_magic_cmd='func_win32_libid'
;;
-mingw* | windows* | pw32*)
+mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
@@ -3535,7 +3504,7 @@
lt_cv_file_magic_cmd='func_win32_libid'
else
# Keep this pattern in sync with the one in func_win32_libid.
- lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|pe-aarch64)'
+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
lt_cv_file_magic_cmd='$OBJDUMP -f'
fi
;;
@@ -3608,7 +3577,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
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
@@ -3626,7 +3595,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-openbsd*)
+openbsd* | bitrig*)
if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
else
@@ -3690,7 +3659,7 @@
want_nocaseglob=no
if test "$build" = "$host"; then
case $host_os in
- mingw* | windows* | pw32*)
+ mingw* | pw32*)
if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
want_nocaseglob=yes
else
@@ -3742,7 +3711,7 @@
# Tru64's nm complains that /dev/null is an invalid object file
# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
case $build_os in
- mingw* | windows*) lt_bad_file=conftest.nm/nofile ;;
+ mingw*) lt_bad_file=conftest.nm/nofile ;;
*) lt_bad_file=/dev/null ;;
esac
case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in
@@ -3833,7 +3802,7 @@
[lt_cv_sharedlib_from_linklib_cmd='unknown'
case $host_os in
-cygwin* | mingw* | windows* | pw32* | cegcc*)
+cygwin* | mingw* | pw32* | cegcc*)
# two different shell functions defined in ltmain.sh;
# decide which one to use based on capabilities of $DLLTOOL
case `$DLLTOOL --help 2>&1` in
@@ -3865,16 +3834,16 @@
m4_defun([_LT_PATH_MANIFEST_TOOL],
[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_manifest_tool],
- [lt_cv_path_manifest_tool=no
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+ [lt_cv_path_mainfest_tool=no
echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
$MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
cat conftest.err >&AS_MESSAGE_LOG_FD
if $GREP 'Manifest Tool' conftest.out > /dev/null; then
- lt_cv_path_manifest_tool=yes
+ lt_cv_path_mainfest_tool=yes
fi
rm -f conftest*])
-if test yes != "$lt_cv_path_manifest_tool"; then
+if test yes != "$lt_cv_path_mainfest_tool"; then
MANIFEST_TOOL=:
fi
_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
@@ -3903,7 +3872,7 @@
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
LIBM=
case $host in
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-mingw* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
# These system don't have libm, or don't need it
;;
*-ncr-sysv4.3*)
@@ -3978,7 +3947,7 @@
aix*)
symcode='[[BCDT]]'
;;
-cygwin* | mingw* | windows* | pw32* | cegcc*)
+cygwin* | mingw* | pw32* | cegcc*)
symcode='[[ABCDGISTW]]'
;;
hpux*)
@@ -3993,7 +3962,7 @@
symcode='[[BCDEGQRST]]'
;;
solaris*)
- symcode='[[BCDRT]]'
+ symcode='[[BDRT]]'
;;
sco3.2v5*)
symcode='[[DT]]'
@@ -4057,7 +4026,7 @@
# Handle CRLF in mingw tool chain
opt_cr=
case $build_os in
-mingw* | windows*)
+mingw*)
opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
;;
esac
@@ -4108,13 +4077,14 @@
#ifdef __cplusplus
}
#endif
-int main(void){nm_test_var='a';nm_test_func();return(0);}
+int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
if AC_TRY_EVAL(ac_compile); then
# Now try to grab the symbols.
nlist=conftest.nm
- if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+ $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
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
@@ -4284,7 +4254,7 @@
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
- mingw* | windows* | cygwin* | os2* | pw32* | cegcc*)
+ mingw* | cygwin* | os2* | pw32* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
@@ -4360,7 +4330,7 @@
;;
esac
;;
- mingw* | windows* | cygwin* | os2* | pw32* | cegcc*)
+ mingw* | cygwin* | os2* | pw32* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
m4_if([$1], [GCJ], [],
@@ -4486,7 +4456,7 @@
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4608,7 +4578,7 @@
# PIC is the default for these OSes.
;;
- mingw* | windows* | cygwin* | pw32* | os2* | cegcc*)
+ mingw* | cygwin* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
@@ -4712,7 +4682,7 @@
esac
;;
- mingw* | windows* | cygwin* | pw32* | os2* | cegcc*)
+ mingw* | cygwin* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
m4_if([$1], [GCJ], [],
@@ -4754,8 +4724,8 @@
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
- *flang* | ftn)
- # Flang compiler.
+ # 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'
@@ -4993,7 +4963,7 @@
pw32*)
_LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
;;
- cygwin* | mingw* | windows* | cegcc*)
+ cygwin* | mingw* | cegcc*)
case $cc_basename in
cl* | icl*)
_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
@@ -5004,6 +4974,9 @@
;;
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'
;;
@@ -5051,7 +5024,7 @@
extract_expsyms_cmds=
case $host_os in
- cygwin* | mingw* | windows* | pw32* | cegcc*)
+ cygwin* | mingw* | pw32* | cegcc*)
# FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++ or Intel C++ Compiler.
@@ -5063,9 +5036,12 @@
# we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)
with_gnu_ld=yes
;;
- openbsd*)
+ 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
@@ -5166,7 +5142,7 @@
fi
;;
- cygwin* | mingw* | windows* | pw32* | cegcc*)
+ cygwin* | mingw* | pw32* | cegcc*)
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -5222,7 +5198,7 @@
cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
emximp -o $lib $output_objdir/$libname.def'
- _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
_LT_TAGVAR(file_list_spec, $1)='@'
;;
@@ -5301,6 +5277,7 @@
case $cc_basename in
tcc*)
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
;;
xlf* | bgf* | bgxlf* | mpixlf*)
@@ -5321,7 +5298,7 @@
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -5623,7 +5600,7 @@
_LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
- cygwin* | mingw* | windows* | pw32* | cegcc*)
+ cygwin* | mingw* | pw32* | cegcc*)
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++ or Intel C++ Compiler.
# hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -5640,14 +5617,14 @@
# Tell ltmain to make .dll files, not .so files.
shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
- _LT_TAGVAR(archive_cmds, $1)='$CC -Fe $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
cp "$export_symbols" "$output_objdir/$soname.def";
echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
else
$SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
fi~
- $CC -Fe $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
linknames='
# The linker will not automatically build a static lib if we build a DLL.
# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
@@ -5842,6 +5819,7 @@
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'
@@ -5859,11 +5837,12 @@
# Fabrice Bellard et al's Tiny C Compiler
_LT_TAGVAR(ld_shlibs, $1)=yes
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
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
@@ -5885,7 +5864,7 @@
*nto* | *qnx*)
;;
- openbsd*)
+ openbsd* | bitrig*)
if test -f /usr/libexec/ld.so; then
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -5928,7 +5907,7 @@
cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
emximp -o $lib $output_objdir/$libname.def'
- _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
_LT_TAGVAR(file_list_spec, $1)='@'
;;
@@ -6222,7 +6201,7 @@
_LT_TAGDECL([], [hardcode_direct_absolute], [0],
[Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
DIR into the resulting binary and the resulting library dependency is
- "absolute", i.e. impossible to change by setting $shlibpath_var if the
+ "absolute", i.e impossible to change by setting $shlibpath_var if the
library is relocated])
_LT_TAGDECL([], [hardcode_minus_L], [0],
[Set to "yes" if using the -LDIR flag during linking hardcodes DIR
@@ -6280,7 +6259,7 @@
lt_simple_compile_test_code="int some_variable = 0;"
# Code to be used in simple link tests
-lt_simple_link_test_code='int main(void){return(0);}'
+lt_simple_link_test_code='int main(){return(0);}'
_LT_TAG_COMPILER
# Save the default compiler, since it gets overwritten when the other
@@ -6469,7 +6448,8 @@
wlarc='$wl'
# ancient GNU ld didn't support --whole-archive et. al.
- if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+ if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+ $GREP 'no-whole-archive' > /dev/null; then
_LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
else
_LT_TAGVAR(whole_archive_flag_spec, $1)=
@@ -6489,7 +6469,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
@@ -6698,7 +6678,7 @@
esac
;;
- cygwin* | mingw* | windows* | pw32* | cegcc*)
+ cygwin* | mingw* | pw32* | cegcc*)
case $GXX,$cc_basename in
,cl* | no,cl* | ,icl* | no,icl*)
# Native MSVC or ICC
@@ -6797,7 +6777,7 @@
cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
emximp -o $lib $output_objdir/$libname.def'
- _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
_LT_TAGVAR(file_list_spec, $1)='@'
;;
@@ -6865,7 +6845,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
@@ -6930,7 +6910,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
@@ -7178,7 +7158,7 @@
_LT_TAGVAR(ld_shlibs, $1)=yes
;;
- openbsd*)
+ openbsd* | bitrig*)
if test -f /usr/libexec/ld.so; then
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -7269,7 +7249,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
@@ -7353,7 +7333,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.
@@ -7364,7 +7344,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'
@@ -7602,11 +7582,10 @@
case $prev$p in
-L* | -R* | -l*)
- # Some compilers place space between "-{L,R,l}" and the path.
+ # Some compilers place space between "-{L,R}" and the path.
# Remove the space.
- if test x-L = x"$p" ||
- test x-R = x"$p" ||
- test x-l = x"$p"; then
+ if test x-L = "$p" ||
+ test x-R = "$p"; then
prev=$p
continue
fi
@@ -8264,7 +8243,7 @@
# ----------------
# Check for a file(cmd) program that can be used to detect file type and magic
m4_defun([_LT_DECL_FILECMD],
-[AC_CHECK_PROG([FILECMD], [file], [file], [:])
+[AC_CHECK_TOOL([FILECMD], [file], [:])
_LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types])
])# _LD_DECL_FILECMD
@@ -8280,6 +8259,73 @@
_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
[Sed that helps us avoid accidentally triggering echo(1) options like -n])
])# _LT_DECL_SED
+
+m4_ifndef([AC_PROG_SED], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into #
+# GNU Autoconf as AC_PROG_SED. When it is available in #
+# a released version of Autoconf we should remove this #
+# macro and use it instead. #
+############################################################
+
+m4_defun([AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for lt_ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+ fi
+ done
+ done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+ test ! -f "$lt_ac_sed" && continue
+ cat /dev/null > conftest.in
+ lt_ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+ # Check for GNU sed and select it if it is found.
+ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+ lt_cv_path_SED=$lt_ac_sed
+ break
+ fi
+ while true; do
+ cat conftest.in conftest.in >conftest.tmp
+ mv conftest.tmp conftest.in
+ cp conftest.in conftest.nl
+ echo >>conftest.nl
+ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+ cmp -s conftest.out conftest.nl || break
+ # 10000 chars as input seems more than enough
+ test 10 -lt "$lt_ac_count" && break
+ lt_ac_count=`expr $lt_ac_count + 1`
+ if test "$lt_ac_count" -gt "$lt_ac_max"; then
+ lt_ac_max=$lt_ac_count
+ lt_cv_path_SED=$lt_ac_sed
+ fi
+ done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])#AC_PROG_SED
+])#m4_ifndef
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
dnl aclocal-1.4 backwards compatibility:
dnl AC_DEFUN([LT_AC_PROG_SED], [])
@@ -8326,7 +8372,7 @@
[case $host in
*-*-mingw* )
case $build in
- *-*-mingw* | *-*-windows* ) # actually msys
+ *-*-mingw* ) # actually msys
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
;;
*-*-cygwin* )
@@ -8339,7 +8385,7 @@
;;
*-*-cygwin* )
case $build in
- *-*-mingw* | *-*-windows* ) # actually msys
+ *-*-mingw* ) # actually msys
lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
;;
*-*-cygwin* )
@@ -8365,9 +8411,9 @@
[#assume ordinary cross tools, or native build.
lt_cv_to_tool_file_cmd=func_convert_file_noop
case $host in
- *-*-mingw* | *-*-windows* )
+ *-*-mingw* )
case $build in
- *-*-mingw* | *-*-windows* ) # actually msys
+ *-*-mingw* ) # actually msys
lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
;;
esac
diff -Nru xfconf-4.19.3/m4/ltoptions.m4 xfconf-4.20.0/m4/ltoptions.m4
--- xfconf-4.19.3/m4/ltoptions.m4 2024-10-18 14:11:10.000000000 +0800
+++ xfconf-4.20.0/m4/ltoptions.m4 2024-12-15 17:33:35.000000000 +0800
@@ -1,6 +1,6 @@
# Helper functions for option handling. -*- Autoconf -*-
#
-# Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2024 Free
+# Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2022 Free
# Software Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
@@ -8,7 +8,7 @@
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
-# serial 10 ltoptions.m4
+# serial 8 ltoptions.m4
# This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -128,7 +128,7 @@
[enable_win32_dll=yes
case $host in
-*-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-cegcc*)
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
AC_CHECK_TOOL(AS, as, false)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
AC_CHECK_TOOL(OBJDUMP, objdump, false)
@@ -323,39 +323,29 @@
# _LT_WITH_AIX_SONAME([DEFAULT])
# ----------------------------------
-# implement the --enable-aix-soname configure option, and support the
-# `aix-soname=aix' and `aix-soname=both' and `aix-soname=svr4' LT_INIT options.
-# DEFAULT is either `aix', `both', or `svr4'. If omitted, it defaults to `aix'.
+# implement the --with-aix-soname flag, and support the `aix-soname=aix'
+# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
+# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'.
m4_define([_LT_WITH_AIX_SONAME],
[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
shared_archive_member_spec=
case $host,$enable_shared in
power*-*-aix[[5-9]]*,yes)
AC_MSG_CHECKING([which variant of shared library versioning to provide])
- AC_ARG_ENABLE([aix-soname],
- [AS_HELP_STRING([--enable-aix-soname=aix|svr4|both],
+ AC_ARG_WITH([aix-soname],
+ [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
[shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
- [case $enableval in
- aix|svr4|both)
- ;;
- *)
- AC_MSG_ERROR([Unknown argument to --enable-aix-soname])
- ;;
- esac
- lt_cv_with_aix_soname=$enable_aix_soname],
- [_AC_ENABLE_IF([with], [aix-soname],
- [case $withval in
- aix|svr4|both)
- ;;
- *)
- AC_MSG_ERROR([Unknown argument to --with-aix-soname])
- ;;
- esac
- lt_cv_with_aix_soname=$with_aix_soname],
- [AC_CACHE_VAL([lt_cv_with_aix_soname],
- [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)])
- enable_aix_soname=$lt_cv_with_aix_soname])
- with_aix_soname=$enable_aix_soname
+ [case $withval in
+ aix|svr4|both)
+ ;;
+ *)
+ AC_MSG_ERROR([Unknown argument to --with-aix-soname])
+ ;;
+ esac
+ lt_cv_with_aix_soname=$with_aix_soname],
+ [AC_CACHE_VAL([lt_cv_with_aix_soname],
+ [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
+ with_aix_soname=$lt_cv_with_aix_soname])
AC_MSG_RESULT([$with_aix_soname])
if test aix != "$with_aix_soname"; then
# For the AIX way of multilib, we name the shared archive member
@@ -386,50 +376,30 @@
# _LT_WITH_PIC([MODE])
# --------------------
-# implement the --enable-pic flag, and support the 'pic-only' and 'no-pic'
+# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
# LT_INIT options.
# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'.
m4_define([_LT_WITH_PIC],
-[AC_ARG_ENABLE([pic],
- [AS_HELP_STRING([--enable-pic@<:@=PKGS@:>@],
+[AC_ARG_WITH([pic],
+ [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
[lt_p=${PACKAGE-default}
- case $enableval in
- yes|no) pic_mode=$enableval ;;
- *)
- pic_mode=default
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
- for lt_pkg in $enableval; do
- IFS=$lt_save_ifs
- if test "X$lt_pkg" = "X$lt_p"; then
- pic_mode=yes
- fi
- done
- IFS=$lt_save_ifs
- ;;
- esac],
- [dnl Continue to support --with-pic and --without-pic, for backward
- dnl compatibility.
- _AC_ENABLE_IF([with], [pic],
- [lt_p=${PACKAGE-default}
- case $withval in
- yes|no) pic_mode=$withval ;;
- *)
- pic_mode=default
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
- for lt_pkg in $withval; do
- IFS=$lt_save_ifs
- if test "X$lt_pkg" = "X$lt_p"; then
- pic_mode=yes
- fi
- done
- IFS=$lt_save_ifs
- ;;
- esac],
- [pic_mode=m4_default([$1], [default])])]
- )
+ case $withval in
+ yes|no) pic_mode=$withval ;;
+ *)
+ pic_mode=default
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+ for lt_pkg in $withval; do
+ IFS=$lt_save_ifs
+ if test "X$lt_pkg" = "X$lt_p"; then
+ pic_mode=yes
+ fi
+ done
+ IFS=$lt_save_ifs
+ ;;
+ esac],
+ [pic_mode=m4_default([$1], [default])])
_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
])# _LT_WITH_PIC
diff -Nru xfconf-4.19.3/m4/ltsugar.m4 xfconf-4.20.0/m4/ltsugar.m4
--- xfconf-4.19.3/m4/ltsugar.m4 2024-10-18 14:11:10.000000000 +0800
+++ xfconf-4.20.0/m4/ltsugar.m4 2024-12-15 17:33:35.000000000 +0800
@@ -1,6 +1,6 @@
# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
#
-# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2024 Free Software
+# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2022 Free Software
# Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
diff -Nru xfconf-4.19.3/m4/ltversion.m4 xfconf-4.20.0/m4/ltversion.m4
--- xfconf-4.19.3/m4/ltversion.m4 2024-10-18 14:11:11.000000000 +0800
+++ xfconf-4.20.0/m4/ltversion.m4 2024-12-15 17:33:35.000000000 +0800
@@ -1,6 +1,6 @@
# ltversion.m4 -- version numbers -*- Autoconf -*-
#
-# Copyright (C) 2004, 2011-2019, 2021-2024 Free Software Foundation,
+# Copyright (C) 2004, 2011-2019, 2021-2022 Free Software Foundation,
# Inc.
# Written by Scott James Remnant, 2004
#
@@ -10,15 +10,15 @@
# @configure_input@
-# serial 4392 ltversion.m4
+# serial 4245 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.5.3-dirty])
-m4_define([LT_PACKAGE_REVISION], [2.5.3])
+m4_define([LT_PACKAGE_VERSION], [2.4.7])
+m4_define([LT_PACKAGE_REVISION], [2.4.7])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.5.3-dirty'
-macro_revision='2.5.3'
+[macro_version='2.4.7'
+macro_revision='2.4.7'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
diff -Nru xfconf-4.19.3/m4/lt~obsolete.m4 xfconf-4.20.0/m4/lt~obsolete.m4
--- xfconf-4.19.3/m4/lt~obsolete.m4 2024-10-18 14:11:11.000000000 +0800
+++ xfconf-4.20.0/m4/lt~obsolete.m4 2024-12-15 17:33:35.000000000 +0800
@@ -1,6 +1,6 @@
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
#
-# Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2024 Free
+# Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2022 Free
# Software Foundation, Inc.
# Written by Scott James Remnant, 2004.
#
diff -Nru xfconf-4.19.3/missing xfconf-4.20.0/missing
--- xfconf-4.19.3/missing 2024-10-18 14:11:58.000000000 +0800
+++ xfconf-4.20.0/missing 2024-12-15 17:33:36.000000000 +0800
@@ -1,11 +1,9 @@
#! /bin/sh
-# Common wrapper for a few potentially missing GNU and other programs.
+# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2024-06-07.14; # UTC
+scriptversion=2018-03-07.03; # UTC
-# shellcheck disable=SC2006,SC2268 # we must support pre-POSIX shells
-
-# Copyright (C) 1996-2024 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -56,20 +54,18 @@
-v, --version output version information and exit
Supported PROGRAM values:
-aclocal autoconf autogen autoheader autom4te automake autoreconf
-bison flex help2man lex makeinfo perl yacc
+ aclocal autoconf autoheader autom4te automake makeinfo
+ bison yacc flex lex help2man
Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
'g' are ignored when checking the name.
-Report bugs to <bug-automake@gnu.org>.
-GNU Automake home page: <https://www.gnu.org/software/automake/>.
-General help using GNU software: <https://www.gnu.org/gethelp/>."
+Send bug reports to <bug-automake@gnu.org>."
exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing (GNU Automake) $scriptversion"
+ echo "missing $scriptversion (GNU Automake)"
exit $?
;;
@@ -112,7 +108,7 @@
program_details ()
{
case $1 in
- aclocal|automake|autoreconf)
+ aclocal|automake)
echo "The '$1' program is part of the GNU Automake package:"
echo "<$gnu_software_URL/automake>"
echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
@@ -127,9 +123,6 @@
echo "<$gnu_software_URL/m4/>"
echo "<$perl_URL>"
;;
- *)
- :
- ;;
esac
}
@@ -144,55 +137,48 @@
printf '%s\n' "'$1' is $msg."
configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
- autoheader_deps="'acconfig.h'"
- automake_deps="'Makefile.am'"
- aclocal_deps="'acinclude.m4'"
case $normalized_program in
- aclocal*)
- echo "You should only need it if you modified $aclocal_deps or"
- echo "$configure_deps."
- ;;
autoconf*)
- echo "You should only need it if you modified $configure_deps."
- ;;
- autogen*)
- echo "You should only need it if you modified a '.def' or '.tpl' file."
- echo "You may want to install the GNU AutoGen package:"
- echo "<$gnu_software_URL/autogen/>"
+ echo "You should only need it if you modified 'configure.ac',"
+ echo "or m4 files included by it."
+ program_details 'autoconf'
;;
autoheader*)
- echo "You should only need it if you modified $autoheader_deps or"
+ echo "You should only need it if you modified 'acconfig.h' or"
echo "$configure_deps."
+ program_details 'autoheader'
;;
automake*)
- echo "You should only need it if you modified $automake_deps or"
+ echo "You should only need it if you modified 'Makefile.am' or"
+ echo "$configure_deps."
+ program_details 'automake'
+ ;;
+ aclocal*)
+ echo "You should only need it if you modified 'acinclude.m4' or"
echo "$configure_deps."
+ program_details 'aclocal'
;;
- autom4te*)
+ autom4te*)
echo "You might have modified some maintainer files that require"
echo "the 'autom4te' program to be rebuilt."
- ;;
- autoreconf*)
- echo "You should only need it if you modified $aclocal_deps or"
- echo "$automake_deps or $autoheader_deps or $automake_deps or"
- echo "$configure_deps."
+ program_details 'autom4te'
;;
bison*|yacc*)
echo "You should only need it if you modified a '.y' file."
echo "You may want to install the GNU Bison package:"
echo "<$gnu_software_URL/bison/>"
;;
+ lex*|flex*)
+ echo "You should only need it if you modified a '.l' file."
+ echo "You may want to install the Fast Lexical Analyzer package:"
+ echo "<$flex_URL>"
+ ;;
help2man*)
echo "You should only need it if you modified a dependency" \
"of a man page."
echo "You may want to install the GNU Help2man package:"
echo "<$gnu_software_URL/help2man/>"
;;
- lex*|flex*)
- echo "You should only need it if you modified a '.l' file."
- echo "You may want to install the Fast Lexical Analyzer package:"
- echo "<$flex_URL>"
- ;;
makeinfo*)
echo "You should only need it if you modified a '.texi' file, or"
echo "any other file indirectly affecting the aspect of the manual."
@@ -203,12 +189,6 @@
echo "want to install GNU make:"
echo "<$gnu_software_URL/make/>"
;;
- perl*)
- echo "You should only need it to run GNU Autoconf, GNU Automake, "
- echo " assorted other tools, or if you modified a Perl source file."
- echo "You may want to install the Perl 5 language interpreter:"
- echo "<$perl_URL>"
- ;;
*)
echo "You might have modified some files without having the proper"
echo "tools for further handling them. Check the 'README' file, it"
@@ -217,7 +197,6 @@
echo "case some other package contains this missing '$1' program."
;;
esac
- program_details "$normalized_program"
}
give_advice "$1" | sed -e '1s/^/WARNING: /' \
Binary files /tmp/tmpq1url3_r/R6yOoIllpw/xfconf-4.19.3/po/cs.gmo and /tmp/tmpq1url3_r/QC2llBz1gH/xfconf-4.20.0/po/cs.gmo differ
diff -Nru xfconf-4.19.3/po/cs.po xfconf-4.20.0/po/cs.po
--- xfconf-4.19.3/po/cs.po 2023-04-13 01:13:52.000000000 +0800
+++ xfconf-4.20.0/po/cs.po 2024-11-05 00:36:03.000000000 +0800
@@ -1,18 +1,18 @@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR Xfce
+# This file is distributed under the same license as the xfconf.master package.
#
# Translators:
# Alois Nešpor <info@aloisnespor.info>, 2014
-# Michal Várady <miko.vaji@gmail.com>, 2014,2017
+# Michal Várady <miko.vaji@gmail.com>, 2014,2017,2024
# Pavel Borecki <pavel.borecki@gmail.com>, 2018-2019
msgid ""
msgstr ""
"Project-Id-Version: Xfconf\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-06 12:53+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.xfce.org/\n"
+"POT-Creation-Date: 2023-05-30 00:55+0200\n"
"PO-Revision-Date: 2013-07-02 20:48+0000\n"
-"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018-2019\n"
+"Last-Translator: Michal Várady <miko.vaji@gmail.com>, 2014,2017,2024\n"
"Language-Team: Czech (http://app.transifex.com/xfce/xfconf/language/cs/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,321 +20,308 @@
"Language: cs\n"
"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
-#: ../xfconf/xfconf-cache.c:987
-#, c-format
+#: xfconf/xfconf-cache.c:987
msgid "Failed to make ResetProperty DBus call"
msgstr "Volání DBus ResetProperty se nezdařilo"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:276
+#: xfconfd/xfconf-backend-perchannel-xml.c:276
#, c-format
msgid "Unable to create configuration directory \"%s\""
msgstr "Nedaří se vytvořit složku s nastaveními „%s“"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:321
-#: ../xfconfd/xfconf-daemon.c:167
+#: xfconfd/xfconf-backend-perchannel-xml.c:321 xfconfd/xfconf-daemon.c:167
#, c-format
msgid "Permission denied while modifying property \"%s\" on channel \"%s\""
msgstr "Přístup při změně vlastnosti „%s“ na kanálu „%s“ byl zamítnut"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:386
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:468
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:633
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:653 ../xfconf-query/main.c:335
+#: xfconfd/xfconf-backend-perchannel-xml.c:386
+#: xfconfd/xfconf-backend-perchannel-xml.c:468
+#: xfconfd/xfconf-backend-perchannel-xml.c:633
+#: xfconfd/xfconf-backend-perchannel-xml.c:653 xfconf-query/main.c:335
#, c-format
msgid "Property \"%s\" does not exist on channel \"%s\""
msgstr "Vlastnost „%s“ na kanálu „%s“ neexistuje"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:600
+#: xfconfd/xfconf-backend-perchannel-xml.c:600
#, c-format
msgid "Unable to remove channel \"%s\": %s"
msgstr "Nelze vyjmout kanál „%s“: %s"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:1297
+#: xfconfd/xfconf-backend-perchannel-xml.c:1297
#, c-format
msgid "Invalid type for <property>: \"%s\""
msgstr "Neplatný typ pro <property>: „%s“"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:1313
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:1389
+#: xfconfd/xfconf-backend-perchannel-xml.c:1313
+#: xfconfd/xfconf-backend-perchannel-xml.c:1389
#, c-format
msgid "Unable to parse value of type \"%s\" from \"%s\""
msgstr "Nelze zpracovat hodnoty typu „%s“ z „%s“"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:1369
-#, c-format
+#: xfconfd/xfconf-backend-perchannel-xml.c:1369
msgid "The type attribute of <value> cannot be an array"
msgstr "Typ atributu <hodnota> nemůže být pole"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:1378
+#: xfconfd/xfconf-backend-perchannel-xml.c:1378
#, c-format
msgid "Invalid type for <value>: \"%s\""
msgstr "Neplatný typ pro <value>: „%s“"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:1654
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:1904
+#: xfconfd/xfconf-backend-perchannel-xml.c:1654
+#: xfconfd/xfconf-backend-perchannel-xml.c:1904
#, c-format
msgid "Channel \"%s\" does not exist"
msgstr "Kanál „%s“ neexistuje"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:1966
+#: xfconfd/xfconf-backend-perchannel-xml.c:1966
#, c-format
msgid "Unable to write channel \"%s\": %s"
msgstr "Nelze zapsat kanál „%s“: %s"
-#: ../xfconfd/xfconf-backend-factory.c:77
+#: xfconfd/xfconf-backend-factory.c:77
#, c-format
msgid "Unable to find Xfconf backend of type \"%s\""
msgstr "Nedaří se nalézt podpůrnou vrstvu služby Xfconf typu „%s“"
-#: ../xfconfd/xfconf-backend.c:127
-#, c-format
+#: xfconfd/xfconf-backend.c:127
msgid "Property names must start with a '/' character"
msgstr "Je třeba, aby názvy vlastností začínaly na znak „/“ (dopředné lomítko)"
-#: ../xfconfd/xfconf-backend.c:136
-#, c-format
+#: xfconfd/xfconf-backend.c:136
msgid "The root element ('/') is not a valid property name"
msgstr "Kořenový element ('/') není platným názvem vlastnosti"
-#: ../xfconfd/xfconf-backend.c:151
-#, c-format
+#: xfconfd/xfconf-backend.c:151
msgid ""
"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
"'-', ':', '.', ',', '[', ']', '{', '}', '<' and '>', as well as '/' as a "
"separator"
msgstr "Názvy vlastností mohou obsahovat pouze znaky ASCII A-Z, a-z, 0-9, '_', '-', ':', '.', ',', '[', ']', '{', '}', '<' a '>', a znak '/' jako oddělovač"
-#: ../xfconfd/xfconf-backend.c:160
-#, c-format
+#: xfconfd/xfconf-backend.c:160
msgid "Property names cannot have two or more consecutive '/' characters"
msgstr "Názvy vlastností nemohou obsahovat dva nebo více po sobě jdoucích znaků '/"
-#: ../xfconfd/xfconf-backend.c:171
-#, c-format
+#: xfconfd/xfconf-backend.c:171
msgid "Property names cannot end with a '/' character"
msgstr "Názvy vlastností nemohou končit znakem „/“"
-#: ../xfconfd/xfconf-backend.c:188
-#, c-format
+#: xfconfd/xfconf-backend.c:188
msgid "Channel name cannot be an empty string"
msgstr "Název kanálu nemůže být prázdný řetězec"
-#: ../xfconfd/xfconf-backend.c:203
-#, c-format
+#: xfconfd/xfconf-backend.c:203
msgid ""
"Channel names can only include the ASCII characters A-Z, a-z, 0-9, '{', '}',"
" '|', ']', '[', ':', ',', '.', '_', and '-'"
msgstr "Názvy kanálů mohou obsahovat pouze znaky kódování ASCII A-Z, a-z, 0-9, '{', '}', '|', ']', '[', ':', ',', '.', '_', a '-'"
-#: ../xfconfd/xfconf-backend.c:425
-#, c-format
+#: xfconfd/xfconf-backend.c:425
msgid ""
"The property name can only be empty or \"/\" if a recursive reset was "
"specified"
msgstr "Název vlastnosti může být prázdný, nebo „/“ pouze pokud byl specifikován rekurzivní reset"
-#: ../xfconfd/main.c:152
+#: xfconfd/main.c:152
msgid "Prints the xfconfd version."
msgstr "Zobrazí verzi xfconfd."
-#: ../xfconfd/main.c:154
+#: xfconfd/main.c:154
msgid ""
"Configuration backends to use. The first backend specified is opened "
"read/write; the others, read-only."
msgstr "Konfigurovat backendy pro použití. První zadaný backend je otevřen pro čtení a zápis, ostatní pouze pro čtení."
-#: ../xfconfd/main.c:157
+#: xfconfd/main.c:157
msgid "Fork into background after starting; only useful for testing purposes"
msgstr "Po spuštění přenést proces na pozadí; tato volba je užitečná pouze pro testování"
-#: ../xfconfd/main.c:176
+#: xfconfd/main.c:176
msgid "Xfce Configuration Daemon"
msgstr "Proces služby nastavení Xfce"
-#: ../xfconfd/main.c:181
+#: xfconfd/main.c:181
msgid "Xfce configuration daemon"
msgstr "Proces služby nastavení Xfce"
-#: ../xfconfd/main.c:183
+#: xfconfd/main.c:183
msgid "Report bugs to http://bugs.xfce.org/\n"
msgstr "Chyby hlaste na http://bugs.xfce.org/\n"
-#: ../xfconfd/main.c:186
+#: xfconfd/main.c:186
#, c-format
msgid "Error parsing options: %s\n"
msgstr "Chyba při zpracování voleb: %s\n"
-#: ../xfconfd/xfconf-daemon.c:222
+#: xfconfd/xfconf-daemon.c:222
#, c-format
msgid "GType transformation failed \"%s\""
msgstr "Transformace GType se nezdařila „%s“"
-#: ../xfconfd/xfconf-daemon.c:482
-#, c-format
+#: xfconfd/xfconf-daemon.c:482
msgid "No backends could be started"
msgstr "Nemohly být spuštěny žádné backendy "
-#: ../xfconf-query/main.c:84 ../xfconf-query/main.c:89
+#: xfconf-query/main.c:84 xfconf-query/main.c:89
msgid "set"
msgstr "nastavit"
-#: ../xfconf-query/main.c:94
+#: xfconf-query/main.c:94
msgid "reset"
msgstr "obnovit"
-#: ../xfconf-query/main.c:170
+#: xfconf-query/main.c:170
msgid "Version information"
msgstr "Informace o verzi"
-#: ../xfconf-query/main.c:174
+#: xfconf-query/main.c:174
msgid "The channel to query/modify"
msgstr "Kanál pro zaslání dotazu nebo modifikaci"
-#: ../xfconf-query/main.c:178
+#: xfconf-query/main.c:178
msgid "The property to query/modify"
msgstr "Vlastnost pro zaslání dotazu nebo modifikaci"
-#: ../xfconf-query/main.c:182
+#: xfconf-query/main.c:182
msgid "The new value to set for the property"
msgstr "Nová hodnota pro nastavení vlastnosti"
-#: ../xfconf-query/main.c:186
+#: xfconf-query/main.c:186
msgid "List properties (or channels if -c is not specified)"
msgstr "Seznam vlastností (nebo kanálů, pokud není zadán parametr -c)"
-#: ../xfconf-query/main.c:190
+#: xfconf-query/main.c:190
msgid "Print property and value in combination with -l or -m"
-msgstr ""
+msgstr "Vypíše vlastnost a hodnotu v kombinaci s -l nebo -m"
-#: ../xfconf-query/main.c:194
+#: xfconf-query/main.c:194
msgid "Create a new property if it does not already exist"
msgstr "Vytvoří novou vlastnost, pokud již neexistuje"
-#: ../xfconf-query/main.c:198
+#: xfconf-query/main.c:198
msgid "Specify the property value type"
msgstr "Specifikovat typ hodnoty vlastnosti"
-#: ../xfconf-query/main.c:202
+#: xfconf-query/main.c:202
msgid "Reset property"
msgstr "Resetovat vlastnost"
-#: ../xfconf-query/main.c:206
+#: xfconf-query/main.c:206
msgid "Recursive (use with -r)"
msgstr "Rekurzivně (použijte s parametrem -r)"
-#: ../xfconf-query/main.c:210
+#: xfconf-query/main.c:210
msgid "Force array even if only one element"
msgstr "Vynutit pole pouze v případě jednoho prvku"
-#: ../xfconf-query/main.c:214
+#: xfconf-query/main.c:214
msgid "Invert an existing boolean property"
msgstr "Invertovat existující hodnotu typu boolean"
-#: ../xfconf-query/main.c:218
+#: xfconf-query/main.c:218
msgid "Monitor a channel for property changes"
msgstr "Sledovat změny vlastností kanálu"
-#: ../xfconf-query/main.c:234
+#: xfconf-query/main.c:234
msgid "- Xfconf commandline utility"
msgstr "- Nástroj příkazového řádku Xfconf"
-#: ../xfconf-query/main.c:239
+#: xfconf-query/main.c:239
#, c-format
msgid "Option parsing failed: %s"
msgstr "Zpracování přepínačů se nezdařilo: %s"
-#: ../xfconf-query/main.c:249
+#: xfconf-query/main.c:249
msgid "The Xfce development team. All rights reserved."
msgstr "Tým vývojářů prostředí Xfce. Všechna práva vyhrazena."
-#: ../xfconf-query/main.c:250
+#: xfconf-query/main.c:250
#, c-format
msgid "Please report bugs to <%s>."
msgstr "Chyby prosíme hlaste na <%s>."
-#: ../xfconf-query/main.c:259
+#: xfconf-query/main.c:259
msgid "No property specified"
msgstr "Nespecifikována žádná vlastnost"
-#: ../xfconf-query/main.c:265
+#: xfconf-query/main.c:265
msgid "--create and --reset options can not be used together"
msgstr "přepínače --create a --reset není možné použít najednou"
-#: ../xfconf-query/main.c:271
+#: xfconf-query/main.c:271
msgid "--create and --reset options can not be used together with --list"
msgstr "přepínače --create a --reset není možné použít s přepínačem --list"
-#: ../xfconf-query/main.c:277
+#: xfconf-query/main.c:277
#, c-format
msgid "Failed to init libxfconf: %s"
msgstr "Inicializace konfigurátoru libxfconf se nezdařila: %s"
-#: ../xfconf-query/main.c:288
+#: xfconf-query/main.c:288
msgid "Channels:"
msgstr "Kanály:"
-#: ../xfconf-query/main.c:313
+#: xfconf-query/main.c:313
#, c-format
msgid "Start monitoring channel \"%s\":"
msgstr "Zahájit sledování kanálu „%s“:"
-#: ../xfconf-query/main.c:351 ../xfconf-query/main.c:462
-#: ../xfconf-query/main.c:535
+#: xfconf-query/main.c:351 xfconf-query/main.c:462 xfconf-query/main.c:535
msgid "Failed to set property"
msgstr "Nastavení vlastnosti se nezdařilo"
-#: ../xfconf-query/main.c:355
+#: xfconf-query/main.c:355
msgid "--toggle only works with boolean values"
msgstr "přepínač --toggle pracuje pouze s hodnotami typu boolean"
-#: ../xfconf-query/main.c:364 ../xfconf-query/main.c:383
+#: xfconf-query/main.c:364 xfconf-query/main.c:383
msgid "(unknown)"
msgstr "(neznámý)"
-#: ../xfconf-query/main.c:373
+#: xfconf-query/main.c:373
#, c-format
msgid "Value is an array with %d items:"
msgstr "Hodnota je pole (počet položek: %d):"
-#: ../xfconf-query/main.c:397
+#: xfconf-query/main.c:397
#, c-format
msgid ""
"Property \"%s\" does not exist on channel \"%s\". If a new property should "
"be created, use the --create option"
msgstr "Vlastnost „%s“ na kanálu „%s“ neexistuje. Pokud chcete vytvořit novou vlastnost, použijte volbu --create"
-#: ../xfconf-query/main.c:406
+#: xfconf-query/main.c:406
msgid "When creating a new property, the value type must be specified"
msgstr "Při vytváření nové vlastnosti je nutné specifikovat typ hodnoty"
-#: ../xfconf-query/main.c:417
+#: xfconf-query/main.c:417
msgid "Failed to get the existing type for the value"
msgstr "Získání typu pro hodnotu se nezdařilo"
-#: ../xfconf-query/main.c:436
+#: xfconf-query/main.c:436
msgid "Unable to determine the type of the value"
msgstr "Nelze určit typ hodnoty"
-#: ../xfconf-query/main.c:443
+#: xfconf-query/main.c:443
msgid "A value type must be specified to change an array into a single value"
msgstr "Pro změnu pole na hodnotu je nutné určit typ hodnoty"
-#: ../xfconf-query/main.c:454 ../xfconf-query/main.c:519
+#: xfconf-query/main.c:454 xfconf-query/main.c:519
#, c-format
msgid "Unable to convert \"%s\" to type \"%s\""
msgstr "Nedaří se převést „%s“ na typ „%s“"
-#: ../xfconf-query/main.c:488
+#: xfconf-query/main.c:488
#, c-format
msgid "There are %d new values, but only %d types could be determined"
msgstr "Existuje %d nových hodnot, ale je možné určit pouze %d typů"
-#: ../xfconf-query/main.c:510
+#: xfconf-query/main.c:510
#, c-format
msgid "Unable to determine type of value at index %d"
msgstr "Nelze určit typ hodnoty na indexu %d"
-#: ../xfconf-query/main.c:563
+#: xfconf-query/main.c:563
#, c-format
msgid "Channel \"%s\" contains no properties"
msgstr "Kanál „%s“ neobsahuje žádné vlastnosti"
Binary files /tmp/tmpq1url3_r/R6yOoIllpw/xfconf-4.19.3/po/gl.gmo and /tmp/tmpq1url3_r/QC2llBz1gH/xfconf-4.20.0/po/gl.gmo differ
diff -Nru xfconf-4.19.3/po/gl.po xfconf-4.20.0/po/gl.po
--- xfconf-4.19.3/po/gl.po 2023-04-13 01:13:52.000000000 +0800
+++ xfconf-4.20.0/po/gl.po 2024-12-01 23:24:37.000000000 +0800
@@ -1,19 +1,19 @@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR Xfce
+# This file is distributed under the same license as the xfconf.master package.
#
# Translators:
# Daniel Muñiz Fontoira <dani@damufo.eu>, 2019
-# Daniel Muñiz Fontoira <dani@damufo.eu>, 2021
+# Daniel Muñiz Fontoira <dani@damufo.eu>, 2021,2024
# Leandro Regueiro <leandro DOT regueiro AT gmail DOT com>, 2009
# Xosé, 2015,2018
msgid ""
msgstr ""
"Project-Id-Version: Xfconf\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-06 12:53+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.xfce.org/\n"
+"POT-Creation-Date: 2023-05-30 00:55+0200\n"
"PO-Revision-Date: 2013-07-02 20:48+0000\n"
-"Last-Translator: Daniel Muñiz Fontoira <dani@damufo.eu>, 2021\n"
+"Last-Translator: Daniel Muñiz Fontoira <dani@damufo.eu>, 2021,2024\n"
"Language-Team: Galician (http://app.transifex.com/xfce/xfconf/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,321 +21,308 @@
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../xfconf/xfconf-cache.c:987
-#, c-format
+#: xfconf/xfconf-cache.c:987
msgid "Failed to make ResetProperty DBus call"
msgstr "Produciuse un fallo ao chamar a ResetProperty de DBus"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:276
+#: xfconfd/xfconf-backend-perchannel-xml.c:276
#, c-format
msgid "Unable to create configuration directory \"%s\""
msgstr "Non se puido crear o cartafol de configuración «%s»"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:321
-#: ../xfconfd/xfconf-daemon.c:167
+#: xfconfd/xfconf-backend-perchannel-xml.c:321 xfconfd/xfconf-daemon.c:167
#, c-format
msgid "Permission denied while modifying property \"%s\" on channel \"%s\""
msgstr "Denegouse o permiso para modificar a propiedade «%s» da canle «%s»"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:386
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:468
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:633
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:653 ../xfconf-query/main.c:335
+#: xfconfd/xfconf-backend-perchannel-xml.c:386
+#: xfconfd/xfconf-backend-perchannel-xml.c:468
+#: xfconfd/xfconf-backend-perchannel-xml.c:633
+#: xfconfd/xfconf-backend-perchannel-xml.c:653 xfconf-query/main.c:335
#, c-format
msgid "Property \"%s\" does not exist on channel \"%s\""
msgstr "A propiedade «%s» non existe na canle «%s»"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:600
+#: xfconfd/xfconf-backend-perchannel-xml.c:600
#, c-format
msgid "Unable to remove channel \"%s\": %s"
msgstr "Non é posíbel eliminar a canle «%s»: %s"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:1297
+#: xfconfd/xfconf-backend-perchannel-xml.c:1297
#, c-format
msgid "Invalid type for <property>: \"%s\""
msgstr "<property> ten un tipo incorrecto: «%s»"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:1313
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:1389
+#: xfconfd/xfconf-backend-perchannel-xml.c:1313
+#: xfconfd/xfconf-backend-perchannel-xml.c:1389
#, c-format
msgid "Unable to parse value of type \"%s\" from \"%s\""
msgstr "Non se puido analizar o valor de tipo «%s» de «%s»"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:1369
-#, c-format
+#: xfconfd/xfconf-backend-perchannel-xml.c:1369
msgid "The type attribute of <value> cannot be an array"
msgstr "O atributo de tipo de <value> non pode ser unha matriz"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:1378
+#: xfconfd/xfconf-backend-perchannel-xml.c:1378
#, c-format
msgid "Invalid type for <value>: \"%s\""
msgstr "<value> ten un tipo incorrecto: «%s»"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:1654
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:1904
+#: xfconfd/xfconf-backend-perchannel-xml.c:1654
+#: xfconfd/xfconf-backend-perchannel-xml.c:1904
#, c-format
msgid "Channel \"%s\" does not exist"
msgstr "A canle «%s» non existe"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:1966
+#: xfconfd/xfconf-backend-perchannel-xml.c:1966
#, c-format
msgid "Unable to write channel \"%s\": %s"
msgstr "Non é posíbel escribir na canle «%s»: %s"
-#: ../xfconfd/xfconf-backend-factory.c:77
+#: xfconfd/xfconf-backend-factory.c:77
#, c-format
msgid "Unable to find Xfconf backend of type \"%s\""
msgstr "Non se puido atopar a infraestrutura de Xfconf de tipo «%s»"
-#: ../xfconfd/xfconf-backend.c:127
-#, c-format
+#: xfconfd/xfconf-backend.c:127
msgid "Property names must start with a '/' character"
msgstr "Os nomes das propiedades deben comezar cun caracter '/'"
-#: ../xfconfd/xfconf-backend.c:136
-#, c-format
+#: xfconfd/xfconf-backend.c:136
msgid "The root element ('/') is not a valid property name"
msgstr "O elemento raíz ('/') non é un nome de propiedade válido"
-#: ../xfconfd/xfconf-backend.c:151
-#, c-format
+#: xfconfd/xfconf-backend.c:151
msgid ""
"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
"'-', ':', '.', ',', '[', ']', '{', '}', '<' and '>', as well as '/' as a "
"separator"
msgstr "Os nomes de propiedades só poden incluír os caracteres ASCII A-Z, a-z, 0-9, '_', '-', ':', '.', ',', '[', ']', '{', '}', '<' e '>', así como '/' como separador"
-#: ../xfconfd/xfconf-backend.c:160
-#, c-format
+#: xfconfd/xfconf-backend.c:160
msgid "Property names cannot have two or more consecutive '/' characters"
msgstr "Os nomes das propiedades non poden ter dous ou máis caracteres '/' seguidos"
-#: ../xfconfd/xfconf-backend.c:171
-#, c-format
+#: xfconfd/xfconf-backend.c:171
msgid "Property names cannot end with a '/' character"
msgstr "Os nomes de propiedades non poden rematar co caracter '/'"
-#: ../xfconfd/xfconf-backend.c:188
-#, c-format
+#: xfconfd/xfconf-backend.c:188
msgid "Channel name cannot be an empty string"
msgstr "O nome da canle non pode estar baleiro"
-#: ../xfconfd/xfconf-backend.c:203
-#, c-format
+#: xfconfd/xfconf-backend.c:203
msgid ""
"Channel names can only include the ASCII characters A-Z, a-z, 0-9, '{', '}',"
" '|', ']', '[', ':', ',', '.', '_', and '-'"
msgstr "Os nomes das canles só poden incluír os caracteres ASCII A-Z, a-z, 0-9, '{', '}', '|', ']', '[', ':', ',', '.', '_', e '-'"
-#: ../xfconfd/xfconf-backend.c:425
-#, c-format
+#: xfconfd/xfconf-backend.c:425
msgid ""
"The property name can only be empty or \"/\" if a recursive reset was "
"specified"
-msgstr "O nome da propiedade só pode estar baleiro ou ser \"/\" se se especificou un restablecemento recursivo"
+msgstr "O nome da propiedade só pode estar baleiro ou ser «/» se se especificou un restabelecemento recursivo"
-#: ../xfconfd/main.c:152
+#: xfconfd/main.c:152
msgid "Prints the xfconfd version."
msgstr "Amosa a versión de xfconfd."
-#: ../xfconfd/main.c:154
+#: xfconfd/main.c:154
msgid ""
"Configuration backends to use. The first backend specified is opened "
"read/write; the others, read-only."
msgstr "Infraestruturas de configuración a usar. O primeiro motor especificado ábrese en modo lectura/escritura; os outros en só lectura."
-#: ../xfconfd/main.c:157
+#: xfconfd/main.c:157
msgid "Fork into background after starting; only useful for testing purposes"
msgstr "Facer fork ao segundo plano despois de iniciar: só é útil para facer probas"
-#: ../xfconfd/main.c:176
+#: xfconfd/main.c:176
msgid "Xfce Configuration Daemon"
msgstr "Daemon de configuración de Xfce"
-#: ../xfconfd/main.c:181
+#: xfconfd/main.c:181
msgid "Xfce configuration daemon"
msgstr "Daemon de configuración de Xfce"
-#: ../xfconfd/main.c:183
+#: xfconfd/main.c:183
msgid "Report bugs to http://bugs.xfce.org/\n"
msgstr "Comunique os fallos en http://bugs.xfce.org/\n"
-#: ../xfconfd/main.c:186
+#: xfconfd/main.c:186
#, c-format
msgid "Error parsing options: %s\n"
msgstr "Produciuse un fallo ao analizar as opcións: %s\n"
-#: ../xfconfd/xfconf-daemon.c:222
+#: xfconfd/xfconf-daemon.c:222
#, c-format
msgid "GType transformation failed \"%s\""
msgstr "Fallou a transformación de GType «%s»"
-#: ../xfconfd/xfconf-daemon.c:482
-#, c-format
+#: xfconfd/xfconf-daemon.c:482
msgid "No backends could be started"
msgstr "Non se puido iniciar ningunha infraestrutura"
-#: ../xfconf-query/main.c:84 ../xfconf-query/main.c:89
+#: xfconf-query/main.c:84 xfconf-query/main.c:89
msgid "set"
msgstr "definir"
-#: ../xfconf-query/main.c:94
+#: xfconf-query/main.c:94
msgid "reset"
msgstr "restaurar"
-#: ../xfconf-query/main.c:170
+#: xfconf-query/main.c:170
msgid "Version information"
msgstr "Información da versión"
-#: ../xfconf-query/main.c:174
+#: xfconf-query/main.c:174
msgid "The channel to query/modify"
msgstr "A canle a consultar/modificar"
-#: ../xfconf-query/main.c:178
+#: xfconf-query/main.c:178
msgid "The property to query/modify"
msgstr "A propiedade a consultar/modificar"
-#: ../xfconf-query/main.c:182
+#: xfconf-query/main.c:182
msgid "The new value to set for the property"
msgstr "O novo valor definido para a propiedade"
-#: ../xfconf-query/main.c:186
+#: xfconf-query/main.c:186
msgid "List properties (or channels if -c is not specified)"
msgstr "Listar as propiedades (ou as canles se non se especifica -c)"
-#: ../xfconf-query/main.c:190
+#: xfconf-query/main.c:190
msgid "Print property and value in combination with -l or -m"
msgstr "Imprimir a propiedade e o valor en combinación con -l ou -m"
-#: ../xfconf-query/main.c:194
+#: xfconf-query/main.c:194
msgid "Create a new property if it does not already exist"
msgstr "Crear unha nova propiedade se esta non existe"
-#: ../xfconf-query/main.c:198
+#: xfconf-query/main.c:198
msgid "Specify the property value type"
msgstr "Especifique o valor do tipo da propiedade"
-#: ../xfconf-query/main.c:202
+#: xfconf-query/main.c:202
msgid "Reset property"
msgstr "Restablecer a propiedade"
-#: ../xfconf-query/main.c:206
+#: xfconf-query/main.c:206
msgid "Recursive (use with -r)"
msgstr "Recursivo (usar con -r)"
-#: ../xfconf-query/main.c:210
+#: xfconf-query/main.c:210
msgid "Force array even if only one element"
msgstr "Forzar que sexa unha matriz incluso se só ten un elemento"
-#: ../xfconf-query/main.c:214
+#: xfconf-query/main.c:214
msgid "Invert an existing boolean property"
msgstr "Inverter unha propiedade booleana existente"
-#: ../xfconf-query/main.c:218
+#: xfconf-query/main.c:218
msgid "Monitor a channel for property changes"
msgstr "Monitorizar os cambios nas propiedades dunha canle"
-#: ../xfconf-query/main.c:234
+#: xfconf-query/main.c:234
msgid "- Xfconf commandline utility"
msgstr "- Utilidade de liña de ordes de Xfconf"
-#: ../xfconf-query/main.c:239
+#: xfconf-query/main.c:239
#, c-format
msgid "Option parsing failed: %s"
msgstr "Produciuse un fallo ao analizar a opción: %s"
-#: ../xfconf-query/main.c:249
+#: xfconf-query/main.c:249
msgid "The Xfce development team. All rights reserved."
msgstr "O equipo de desenvolvemento de Xfce. Todos os dereitos reservados."
-#: ../xfconf-query/main.c:250
+#: xfconf-query/main.c:250
#, c-format
msgid "Please report bugs to <%s>."
msgstr "Comunique os fallos a <%s>."
-#: ../xfconf-query/main.c:259
+#: xfconf-query/main.c:259
msgid "No property specified"
msgstr "Non se especificou ningunha propiedade"
-#: ../xfconf-query/main.c:265
+#: xfconf-query/main.c:265
msgid "--create and --reset options can not be used together"
msgstr "As opcións --create e --reset non se poden usar xuntas"
-#: ../xfconf-query/main.c:271
+#: xfconf-query/main.c:271
msgid "--create and --reset options can not be used together with --list"
msgstr "As opcións --create e --reset non se poden usar con --list"
-#: ../xfconf-query/main.c:277
+#: xfconf-query/main.c:277
#, c-format
msgid "Failed to init libxfconf: %s"
msgstr "Produciuse un fallo ao iniciar libxfconf: %s"
-#: ../xfconf-query/main.c:288
+#: xfconf-query/main.c:288
msgid "Channels:"
msgstr "Canles:"
-#: ../xfconf-query/main.c:313
+#: xfconf-query/main.c:313
#, c-format
msgid "Start monitoring channel \"%s\":"
msgstr "Iniciar a canle de monitorización «%s»:"
-#: ../xfconf-query/main.c:351 ../xfconf-query/main.c:462
-#: ../xfconf-query/main.c:535
+#: xfconf-query/main.c:351 xfconf-query/main.c:462 xfconf-query/main.c:535
msgid "Failed to set property"
msgstr "Produciuse un fallo ao definir a propiedade"
-#: ../xfconf-query/main.c:355
+#: xfconf-query/main.c:355
msgid "--toggle only works with boolean values"
msgstr "--toggle só funciona con valores booleanos"
-#: ../xfconf-query/main.c:364 ../xfconf-query/main.c:383
+#: xfconf-query/main.c:364 xfconf-query/main.c:383
msgid "(unknown)"
msgstr "(descoñecido)"
-#: ../xfconf-query/main.c:373
+#: xfconf-query/main.c:373
#, c-format
msgid "Value is an array with %d items:"
msgstr "O valor é unha matriz con %d elementos:"
-#: ../xfconf-query/main.c:397
+#: xfconf-query/main.c:397
#, c-format
msgid ""
"Property \"%s\" does not exist on channel \"%s\". If a new property should "
"be created, use the --create option"
msgstr "A propiedade «%s» non existe na canle «%s». Se se debe crearse unha nova propiedade use a opción --create"
-#: ../xfconf-query/main.c:406
+#: xfconf-query/main.c:406
msgid "When creating a new property, the value type must be specified"
msgstr "Cando se crea unha nova propiedade débese especificar o tipo do valor"
-#: ../xfconf-query/main.c:417
+#: xfconf-query/main.c:417
msgid "Failed to get the existing type for the value"
msgstr "Non se puido obter o tipo do valor"
-#: ../xfconf-query/main.c:436
+#: xfconf-query/main.c:436
msgid "Unable to determine the type of the value"
msgstr "Non se puido determinar o tipo do valor"
-#: ../xfconf-query/main.c:443
+#: xfconf-query/main.c:443
msgid "A value type must be specified to change an array into a single value"
msgstr "Débese especificar un tipo de valor para converter unha matriz nun valor único"
-#: ../xfconf-query/main.c:454 ../xfconf-query/main.c:519
+#: xfconf-query/main.c:454 xfconf-query/main.c:519
#, c-format
msgid "Unable to convert \"%s\" to type \"%s\""
msgstr "Non se puido converter «%s» ao tipo «%s»"
-#: ../xfconf-query/main.c:488
+#: xfconf-query/main.c:488
#, c-format
msgid "There are %d new values, but only %d types could be determined"
msgstr "Hai %d valores novos, pero só se poden determinar %d tipos"
-#: ../xfconf-query/main.c:510
+#: xfconf-query/main.c:510
#, c-format
msgid "Unable to determine type of value at index %d"
msgstr "Non se puido determinar o tipo do valor da posición %d"
-#: ../xfconf-query/main.c:563
+#: xfconf-query/main.c:563
#, c-format
msgid "Channel \"%s\" contains no properties"
msgstr "A canle «%s» non contén propiedades"
Binary files /tmp/tmpq1url3_r/R6yOoIllpw/xfconf-4.19.3/po/pl.gmo and /tmp/tmpq1url3_r/QC2llBz1gH/xfconf-4.20.0/po/pl.gmo differ
diff -Nru xfconf-4.19.3/po/pl.po xfconf-4.20.0/po/pl.po
--- xfconf-4.19.3/po/pl.po 2024-10-12 19:58:54.000000000 +0800
+++ xfconf-4.20.0/po/pl.po 2024-12-01 23:24:37.000000000 +0800
@@ -156,7 +156,7 @@
#: xfconfd/xfconf-daemon.c:222
#, c-format
msgid "GType transformation failed \"%s\""
-msgstr "Transformacja GType nie powiodła się \"%s\""
+msgstr "Transformacja GType nie powiodła się „%s”"
#: xfconfd/xfconf-daemon.c:482
msgid "No backends could be started"
Binary files /tmp/tmpq1url3_r/R6yOoIllpw/xfconf-4.19.3/po/ro.gmo and /tmp/tmpq1url3_r/QC2llBz1gH/xfconf-4.20.0/po/ro.gmo differ
diff -Nru xfconf-4.19.3/po/ro.po xfconf-4.20.0/po/ro.po
--- xfconf-4.19.3/po/ro.po 2023-04-13 01:13:52.000000000 +0800
+++ xfconf-4.20.0/po/ro.po 2024-12-15 17:32:42.000000000 +0800
@@ -1,17 +1,19 @@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR Xfce
+# This file is distributed under the same license as the xfconf.master package.
#
# Translators:
+# Dumitru Moldovan <dumol@gnome.org>, 2015
+# Marius Ghita, 2023
# Marius Ghita, 2023
# Dumitru Moldovan <dumol@gnome.org>, 2015
msgid ""
msgstr ""
"Project-Id-Version: Xfconf\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-06 12:53+0200\n"
+"Report-Msgid-Bugs-To: https://gitlab.xfce.org/\n"
+"POT-Creation-Date: 2023-05-30 00:55+0200\n"
"PO-Revision-Date: 2013-07-02 20:48+0000\n"
-"Last-Translator: Marius Ghita, 2023\n"
+"Last-Translator: Dumitru Moldovan <dumol@gnome.org>, 2015\n"
"Language-Team: Romanian (http://app.transifex.com/xfce/xfconf/language/ro/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,321 +21,308 @@
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-#: ../xfconf/xfconf-cache.c:987
-#, c-format
+#: xfconf/xfconf-cache.c:987
msgid "Failed to make ResetProperty DBus call"
-msgstr "Nu s-a putut face un apel DBus de tip ResetProperty"
+msgstr "Efectuarea apelului DBus ResetProperty a eșuat"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:276
+#: xfconfd/xfconf-backend-perchannel-xml.c:276
#, c-format
msgid "Unable to create configuration directory \"%s\""
-msgstr "Nu s-a putut crea directorul cu preferințe „%s”"
+msgstr "Nu s-a putut crea directorul de configurare „%s”"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:321
-#: ../xfconfd/xfconf-daemon.c:167
+#: xfconfd/xfconf-backend-perchannel-xml.c:321 xfconfd/xfconf-daemon.c:167
#, c-format
msgid "Permission denied while modifying property \"%s\" on channel \"%s\""
msgstr "Drepturi insuficiente pentru modificarea proprietății „%s” în canalul „%s”"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:386
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:468
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:633
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:653 ../xfconf-query/main.c:335
+#: xfconfd/xfconf-backend-perchannel-xml.c:386
+#: xfconfd/xfconf-backend-perchannel-xml.c:468
+#: xfconfd/xfconf-backend-perchannel-xml.c:633
+#: xfconfd/xfconf-backend-perchannel-xml.c:653 xfconf-query/main.c:335
#, c-format
msgid "Property \"%s\" does not exist on channel \"%s\""
msgstr "Proprietatea „%s” nu există în canalul „%s”"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:600
+#: xfconfd/xfconf-backend-perchannel-xml.c:600
#, c-format
msgid "Unable to remove channel \"%s\": %s"
msgstr "Nu s-a putut șterge canalul „%s”: %s"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:1297
+#: xfconfd/xfconf-backend-perchannel-xml.c:1297
#, c-format
msgid "Invalid type for <property>: \"%s\""
-msgstr "Tip incorect pentru <property>: „%s”"
+msgstr "Tip incorect pentru <proprietate>: „%s”"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:1313
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:1389
+#: xfconfd/xfconf-backend-perchannel-xml.c:1313
+#: xfconfd/xfconf-backend-perchannel-xml.c:1389
#, c-format
msgid "Unable to parse value of type \"%s\" from \"%s\""
-msgstr "Nu s-a putut prelucra valoarea de tip „%s” pentru „%s”"
+msgstr "Nu s-a putut analiza valoarea de tip „%s” pentru „%s”"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:1369
-#, c-format
+#: xfconfd/xfconf-backend-perchannel-xml.c:1369
msgid "The type attribute of <value> cannot be an array"
-msgstr "Atributul tip pentru <value> nu poate fi o matrice"
+msgstr "Atributul de tip al <valorii> nu poate fi o matrice"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:1378
+#: xfconfd/xfconf-backend-perchannel-xml.c:1378
#, c-format
msgid "Invalid type for <value>: \"%s\""
-msgstr "Tip incorect pentru <value>: „%s”"
+msgstr "Tip incorect pentru <valoare>: „%s”"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:1654
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:1904
+#: xfconfd/xfconf-backend-perchannel-xml.c:1654
+#: xfconfd/xfconf-backend-perchannel-xml.c:1904
#, c-format
msgid "Channel \"%s\" does not exist"
msgstr "Canalul „%s” nu există"
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:1966
+#: xfconfd/xfconf-backend-perchannel-xml.c:1966
#, c-format
msgid "Unable to write channel \"%s\": %s"
msgstr "Nu s-a putut scrie canalul „%s”: %s"
-#: ../xfconfd/xfconf-backend-factory.c:77
+#: xfconfd/xfconf-backend-factory.c:77
#, c-format
msgid "Unable to find Xfconf backend of type \"%s\""
-msgstr "Nu s-a putut găsi un backend de tip „%s” pentru Xfconf"
+msgstr "Nu s-a putut găsi motorul Xfconf de tip „%s”"
-#: ../xfconfd/xfconf-backend.c:127
-#, c-format
+#: xfconfd/xfconf-backend.c:127
msgid "Property names must start with a '/' character"
msgstr "Numele proprietăților trebuie să înceapă cu caracterul „/”"
-#: ../xfconfd/xfconf-backend.c:136
-#, c-format
+#: xfconfd/xfconf-backend.c:136
msgid "The root element ('/') is not a valid property name"
msgstr "Elementul rădăcină („/”) nu este un nume valid de proprietate"
-#: ../xfconfd/xfconf-backend.c:151
-#, c-format
+#: xfconfd/xfconf-backend.c:151
msgid ""
"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
"'-', ':', '.', ',', '[', ']', '{', '}', '<' and '>', as well as '/' as a "
"separator"
msgstr "Numele proprietăților pot include doar aceste caractere ASCII: A-Z, a-z, 0-9, „_”, „-”, „:”, „.”, „,”, „[”, „]”, „{”, „}”, „<” și „>”, precum și „/” ca separator"
-#: ../xfconfd/xfconf-backend.c:160
-#, c-format
+#: xfconfd/xfconf-backend.c:160
msgid "Property names cannot have two or more consecutive '/' characters"
msgstr "Numele de proprietăți nu pot avea două sau mai multe caractere „/” consecutive"
-#: ../xfconfd/xfconf-backend.c:171
-#, c-format
+#: xfconfd/xfconf-backend.c:171
msgid "Property names cannot end with a '/' character"
msgstr "Numele de proprietăți nu se pot termina cu un caracter „/”"
-#: ../xfconfd/xfconf-backend.c:188
-#, c-format
+#: xfconfd/xfconf-backend.c:188
msgid "Channel name cannot be an empty string"
msgstr "Numele unui canal nu poate fi un șir gol"
-#: ../xfconfd/xfconf-backend.c:203
-#, c-format
+#: xfconfd/xfconf-backend.c:203
msgid ""
"Channel names can only include the ASCII characters A-Z, a-z, 0-9, '{', '}',"
" '|', ']', '[', ':', ',', '.', '_', and '-'"
msgstr "Numele canalelor pot include doar aceste caractere ASCII: A-Z, a-z, 0-9, „{”, „}”, „|”, „]”, „[”, „:”, „,”, „.”, „_” și „-”."
-#: ../xfconfd/xfconf-backend.c:425
-#, c-format
+#: xfconfd/xfconf-backend.c:425
msgid ""
"The property name can only be empty or \"/\" if a recursive reset was "
"specified"
msgstr "Numele proprietății poate fi gol ori „/” doar dacă s-a specificat o reinițializare recursivă"
-#: ../xfconfd/main.c:152
+#: xfconfd/main.c:152
msgid "Prints the xfconfd version."
-msgstr "Arată versiunea xfconfd."
+msgstr "Afișează versiunea xfconfd."
-#: ../xfconfd/main.c:154
+#: xfconfd/main.c:154
msgid ""
"Configuration backends to use. The first backend specified is opened "
"read/write; the others, read-only."
-msgstr "Backend-uri de configurare ce pot fi utilizate. Primul backend specificat este deschis pentru citire și scriere, iar celelalte doar pentru citire."
+msgstr "Motoare de configurare ce pot fi utilizate. Primul motor specificat este deschis pentru citire și scriere, iar celelalte doar pentru citire."
-#: ../xfconfd/main.c:157
+#: xfconfd/main.c:157
msgid "Fork into background after starting; only useful for testing purposes"
-msgstr "Fork în fundal după pornire (opțiune utilă doar pentru testare)"
+msgstr "Se bifurcă în fundal după pornire (opțiune utilă doar pentru testare)"
-#: ../xfconfd/main.c:176
+#: xfconfd/main.c:176
msgid "Xfce Configuration Daemon"
-msgstr "Demonul preferințelor Xfce"
+msgstr "Demonul de configurare Xfce"
-#: ../xfconfd/main.c:181
+#: xfconfd/main.c:181
msgid "Xfce configuration daemon"
-msgstr "Demonul preferințelor Xfce"
+msgstr "Demonul de configurare Xfce"
-#: ../xfconfd/main.c:183
+#: xfconfd/main.c:183
msgid "Report bugs to http://bugs.xfce.org/\n"
msgstr "Raportați problemele la http://bugs.xfce.org\n"
-#: ../xfconfd/main.c:186
+#: xfconfd/main.c:186
#, c-format
msgid "Error parsing options: %s\n"
-msgstr "Eroare la prelucrarea opțiunilor: %s\n"
+msgstr "Eroare la analizarea opțiunilor: %s\n"
-#: ../xfconfd/xfconf-daemon.c:222
+#: xfconfd/xfconf-daemon.c:222
#, c-format
msgid "GType transformation failed \"%s\""
-msgstr ""
+msgstr "Transformarea GType a eșuat „%s”"
-#: ../xfconfd/xfconf-daemon.c:482
-#, c-format
+#: xfconfd/xfconf-daemon.c:482
msgid "No backends could be started"
-msgstr "Nu s-a putut inițializa niciun backend"
+msgstr "Nu s-a putut inițializa niciun motor"
-#: ../xfconf-query/main.c:84 ../xfconf-query/main.c:89
+#: xfconf-query/main.c:84 xfconf-query/main.c:89
msgid "set"
msgstr "definire"
-#: ../xfconf-query/main.c:94
+#: xfconf-query/main.c:94
msgid "reset"
msgstr "reinițializare"
-#: ../xfconf-query/main.c:170
+#: xfconf-query/main.c:170
msgid "Version information"
msgstr "Detalii despre versiune"
-#: ../xfconf-query/main.c:174
+#: xfconf-query/main.c:174
msgid "The channel to query/modify"
msgstr "Canalul de interogat/modificat"
-#: ../xfconf-query/main.c:178
+#: xfconf-query/main.c:178
msgid "The property to query/modify"
msgstr "Proprietatea de interogat/modificat"
-#: ../xfconf-query/main.c:182
+#: xfconf-query/main.c:182
msgid "The new value to set for the property"
msgstr "Noua valoare de definit pentru proprietate"
-#: ../xfconf-query/main.c:186
+#: xfconf-query/main.c:186
msgid "List properties (or channels if -c is not specified)"
-msgstr "Arată proprietățile (ori canalele, dacă se specifică -c)"
+msgstr "Afișează proprietățile (ori canalele, dacă se specifică „-c”)"
-#: ../xfconf-query/main.c:190
+#: xfconf-query/main.c:190
msgid "Print property and value in combination with -l or -m"
-msgstr ""
+msgstr "Afișează proprietatea și valoarea în combinație cu opțiunile „-l” sau „-m”"
-#: ../xfconf-query/main.c:194
+#: xfconf-query/main.c:194
msgid "Create a new property if it does not already exist"
msgstr "Creează o nouă proprietate dacă aceasta nu există deja"
-#: ../xfconf-query/main.c:198
+#: xfconf-query/main.c:198
msgid "Specify the property value type"
msgstr "Specifică tipul de valoare a proprietății"
-#: ../xfconf-query/main.c:202
+#: xfconf-query/main.c:202
msgid "Reset property"
msgstr "Reinițializează proprietatea"
-#: ../xfconf-query/main.c:206
+#: xfconf-query/main.c:206
msgid "Recursive (use with -r)"
msgstr "Recursiv (utilizați împreună cu „-r”)"
-#: ../xfconf-query/main.c:210
+#: xfconf-query/main.c:210
msgid "Force array even if only one element"
msgstr "Forțează utilizarea unei matrici, chiar și pentru un singur element"
-#: ../xfconf-query/main.c:214
+#: xfconf-query/main.c:214
msgid "Invert an existing boolean property"
msgstr "Inversează o proprietate booleană existentă"
-#: ../xfconf-query/main.c:218
+#: xfconf-query/main.c:218
msgid "Monitor a channel for property changes"
msgstr "Monitorizează un canal pentru schimbarea proprietăților"
-#: ../xfconf-query/main.c:234
+#: xfconf-query/main.c:234
msgid "- Xfconf commandline utility"
-msgstr "- utilitar Xfconf în linie de comandă"
+msgstr "- utilitar Xfconf în linia de comandă"
-#: ../xfconf-query/main.c:239
+#: xfconf-query/main.c:239
#, c-format
msgid "Option parsing failed: %s"
-msgstr "Prelucrarea opțiunii a eșuat: %s"
+msgstr "Analizarea opțiunii a eșuat: %s"
-#: ../xfconf-query/main.c:249
+#: xfconf-query/main.c:249
msgid "The Xfce development team. All rights reserved."
msgstr "Echipa de dezvoltare Xfce. Toate drepturile sunt rezervate."
-#: ../xfconf-query/main.c:250
+#: xfconf-query/main.c:250
#, c-format
msgid "Please report bugs to <%s>."
msgstr "Raportați problemele la <%s>."
-#: ../xfconf-query/main.c:259
+#: xfconf-query/main.c:259
msgid "No property specified"
msgstr "Nu s-a specificat o proprietate"
-#: ../xfconf-query/main.c:265
+#: xfconf-query/main.c:265
msgid "--create and --reset options can not be used together"
-msgstr "Opțiunile --create și --reset nu pot fi utilizate împreună"
+msgstr "Opțiunile „--create” și „--reset” nu pot fi utilizate împreună"
-#: ../xfconf-query/main.c:271
+#: xfconf-query/main.c:271
msgid "--create and --reset options can not be used together with --list"
-msgstr "Opțiunile --create și --reset nu pot fi utilizate împreună cu --list"
+msgstr "Opțiunile „--create” și „--reset” nu pot fi utilizate împreună cu opțiunea „--list”"
-#: ../xfconf-query/main.c:277
+#: xfconf-query/main.c:277
#, c-format
msgid "Failed to init libxfconf: %s"
msgstr "Nu s-a putut inițializa libxfconf: %s"
-#: ../xfconf-query/main.c:288
+#: xfconf-query/main.c:288
msgid "Channels:"
msgstr "Canale:"
-#: ../xfconf-query/main.c:313
+#: xfconf-query/main.c:313
#, c-format
msgid "Start monitoring channel \"%s\":"
msgstr "Se începe monitorizarea canalului „%s”:"
-#: ../xfconf-query/main.c:351 ../xfconf-query/main.c:462
-#: ../xfconf-query/main.c:535
+#: xfconf-query/main.c:351 xfconf-query/main.c:462 xfconf-query/main.c:535
msgid "Failed to set property"
msgstr "Nu s-a putut defini proprietatea"
-#: ../xfconf-query/main.c:355
+#: xfconf-query/main.c:355
msgid "--toggle only works with boolean values"
-msgstr "--toggle funcționează doar cu valori booleene"
+msgstr "Opțiunea „--toggle” funcționează doar cu valori booleene"
-#: ../xfconf-query/main.c:364 ../xfconf-query/main.c:383
+#: xfconf-query/main.c:364 xfconf-query/main.c:383
msgid "(unknown)"
msgstr "(nu se cunoaște)"
-#: ../xfconf-query/main.c:373
+#: xfconf-query/main.c:373
#, c-format
msgid "Value is an array with %d items:"
msgstr "Valoarea este o matrice cu %d elemente:"
-#: ../xfconf-query/main.c:397
+#: xfconf-query/main.c:397
#, c-format
msgid ""
"Property \"%s\" does not exist on channel \"%s\". If a new property should "
"be created, use the --create option"
msgstr "Proprietatea „%s” nu există în canalul „%s”. Dacă trebuie creată o nouă proprietate, utilizați opțiunea „--create”"
-#: ../xfconf-query/main.c:406
+#: xfconf-query/main.c:406
msgid "When creating a new property, the value type must be specified"
msgstr "Când creați o nouă proprietate, trebuie specificat tipul valorii."
-#: ../xfconf-query/main.c:417
+#: xfconf-query/main.c:417
msgid "Failed to get the existing type for the value"
msgstr "Nu s-a putut obține tipul existent al valorii."
-#: ../xfconf-query/main.c:436
+#: xfconf-query/main.c:436
msgid "Unable to determine the type of the value"
msgstr "Nu s-a putut determina tipul valorii."
-#: ../xfconf-query/main.c:443
+#: xfconf-query/main.c:443
msgid "A value type must be specified to change an array into a single value"
msgstr "Trebuie specificat un tip de valoare pentru a înlocui o matrice cu o valoare unică."
-#: ../xfconf-query/main.c:454 ../xfconf-query/main.c:519
+#: xfconf-query/main.c:454 xfconf-query/main.c:519
#, c-format
msgid "Unable to convert \"%s\" to type \"%s\""
msgstr "Nu s-a putut converti „%s” în tipul „%s”"
-#: ../xfconf-query/main.c:488
+#: xfconf-query/main.c:488
#, c-format
msgid "There are %d new values, but only %d types could be determined"
-msgstr "Există valori noi în număr de %d, dar s-au putut determina tipuri în număr doar de %d"
+msgstr "Există %d valori noi, dar numai %d tipuri au putut fi determinate"
-#: ../xfconf-query/main.c:510
+#: xfconf-query/main.c:510
#, c-format
msgid "Unable to determine type of value at index %d"
msgstr "Nu s-a putut determina tipul valorii la indexul %d"
-#: ../xfconf-query/main.c:563
+#: xfconf-query/main.c:563
#, c-format
msgid "Channel \"%s\" contains no properties"
msgstr "Canalul „%s” nu conține nicio proprietate"
diff -Nru xfconf-4.19.3/po/xfconf.pot xfconf-4.20.0/po/xfconf.pot
--- xfconf-4.19.3/po/xfconf.pot 2024-10-18 14:14:25.000000000 +0800
+++ xfconf-4.20.0/po/xfconf.pot 2024-11-02 04:40:44.000000000 +0800
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: xfconf 4.19.3\n"
+"Project-Id-Version: xfconf 4.19.4\n"
"Report-Msgid-Bugs-To: https://gitlab.xfce.org/xfce/xfconf\n"
-"POT-Creation-Date: 2024-10-18 08:14+0200\n"
+"POT-Creation-Date: 2024-11-01 20:40+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,7 @@
#: xfconf/xfconf-cache.c:806 xfconfd/xfconf-backend-perchannel-xml.c:392
#: xfconfd/xfconf-backend-perchannel-xml.c:477
#: xfconfd/xfconf-backend-perchannel-xml.c:641
-#: xfconfd/xfconf-backend-perchannel-xml.c:663 xfconf-query/main.c:312
+#: xfconfd/xfconf-backend-perchannel-xml.c:663 xfconf-query/main.c:323
#, c-format
msgid "Property \"%s\" does not exist on channel \"%s\""
msgstr ""
@@ -167,158 +167,158 @@
msgid "reset"
msgstr ""
-#: xfconf-query/main.c:165
+#: xfconf-query/main.c:176
msgid "Version information"
msgstr ""
-#: xfconf-query/main.c:168
+#: xfconf-query/main.c:179
msgid "The channel to query/modify"
msgstr ""
-#: xfconf-query/main.c:171
+#: xfconf-query/main.c:182
msgid "The property to query/modify"
msgstr ""
-#: xfconf-query/main.c:174
+#: xfconf-query/main.c:185
msgid "The new value to set for the property"
msgstr ""
-#: xfconf-query/main.c:177
+#: xfconf-query/main.c:188
msgid "List properties (or channels if -c is not specified)"
msgstr ""
-#: xfconf-query/main.c:180
+#: xfconf-query/main.c:191
msgid "Print property and value in combination with -l or -m"
msgstr ""
-#: xfconf-query/main.c:183
+#: xfconf-query/main.c:194
msgid "Create a new property if it does not already exist"
msgstr ""
-#: xfconf-query/main.c:186
+#: xfconf-query/main.c:197
msgid "Specify the property value type"
msgstr ""
-#: xfconf-query/main.c:189
+#: xfconf-query/main.c:200
msgid "Reset property"
msgstr ""
-#: xfconf-query/main.c:192
+#: xfconf-query/main.c:203
msgid "Recursive (use with -r)"
msgstr ""
-#: xfconf-query/main.c:195
+#: xfconf-query/main.c:206
msgid "Force array even if only one element"
msgstr ""
-#: xfconf-query/main.c:198
+#: xfconf-query/main.c:209
msgid "Invert an existing boolean property"
msgstr ""
-#: xfconf-query/main.c:206
+#: xfconf-query/main.c:217
msgid "Monitor a channel for property changes"
msgstr ""
-#: xfconf-query/main.c:222
+#: xfconf-query/main.c:233
msgid "- Xfconf commandline utility"
msgstr ""
-#: xfconf-query/main.c:226
+#: xfconf-query/main.c:237
#, c-format
msgid "Option parsing failed: %s"
msgstr ""
-#: xfconf-query/main.c:237
+#: xfconf-query/main.c:248
msgid "The Xfce development team. All rights reserved."
msgstr ""
-#: xfconf-query/main.c:238
+#: xfconf-query/main.c:249
#, c-format
msgid "Please report bugs to <%s>."
msgstr ""
-#: xfconf-query/main.c:246
+#: xfconf-query/main.c:257
msgid "No property specified"
msgstr ""
-#: xfconf-query/main.c:251
+#: xfconf-query/main.c:262
msgid "--create and --reset options can not be used together"
msgstr ""
-#: xfconf-query/main.c:256
+#: xfconf-query/main.c:267
msgid "--create and --reset options can not be used together with --list"
msgstr ""
-#: xfconf-query/main.c:261
+#: xfconf-query/main.c:272
#, c-format
msgid "Failed to init libxfconf: %s"
msgstr ""
-#: xfconf-query/main.c:271
+#: xfconf-query/main.c:282
msgid "Channels:"
msgstr ""
-#: xfconf-query/main.c:295
+#: xfconf-query/main.c:306
#, c-format
msgid "Start monitoring channel \"%s\":"
msgstr ""
-#: xfconf-query/main.c:324 xfconf-query/main.c:422 xfconf-query/main.c:486
+#: xfconf-query/main.c:335 xfconf-query/main.c:433 xfconf-query/main.c:497
msgid "Failed to set property"
msgstr ""
-#: xfconf-query/main.c:327
+#: xfconf-query/main.c:338
msgid "--toggle only works with boolean values"
msgstr ""
-#: xfconf-query/main.c:335 xfconf-query/main.c:350
+#: xfconf-query/main.c:346 xfconf-query/main.c:361
msgid "(unknown)"
msgstr ""
-#: xfconf-query/main.c:342
+#: xfconf-query/main.c:353
#, c-format
msgid "Value is an array with %d items:"
msgstr ""
-#: xfconf-query/main.c:362
+#: xfconf-query/main.c:373
#, c-format
msgid ""
"Property \"%s\" does not exist on channel \"%s\". If a new property should "
"be created, use the --create option"
msgstr ""
-#: xfconf-query/main.c:370
+#: xfconf-query/main.c:381
msgid "When creating a new property, the value type must be specified"
msgstr ""
-#: xfconf-query/main.c:379
+#: xfconf-query/main.c:390
msgid "Failed to get the existing type for the value"
msgstr ""
-#: xfconf-query/main.c:398
+#: xfconf-query/main.c:409
msgid "Unable to determine the type of the value"
msgstr ""
-#: xfconf-query/main.c:404
+#: xfconf-query/main.c:415
msgid "A value type must be specified to change an array into a single value"
msgstr ""
-#: xfconf-query/main.c:415 xfconf-query/main.c:470
+#: xfconf-query/main.c:426 xfconf-query/main.c:481
#, c-format
msgid "Unable to convert \"%s\" to type \"%s\""
msgstr ""
-#: xfconf-query/main.c:442
+#: xfconf-query/main.c:453
#, c-format
msgid "There are %d new values, but only %d types could be determined"
msgstr ""
-#: xfconf-query/main.c:462
+#: xfconf-query/main.c:473
#, c-format
msgid "Unable to determine type of value at index %d"
msgstr ""
-#: xfconf-query/main.c:511
+#: xfconf-query/main.c:522
#, c-format
msgid "Channel \"%s\" contains no properties"
msgstr ""
diff -Nru xfconf-4.19.3/test-driver xfconf-4.20.0/test-driver
--- xfconf-4.19.3/test-driver 2024-10-18 14:12:07.000000000 +0800
+++ xfconf-4.20.0/test-driver 2024-12-15 17:33:37.000000000 +0800
@@ -1,9 +1,9 @@
#! /bin/sh
# test-driver - basic testsuite driver script.
-scriptversion=2024-06-19.01; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 2011-2024 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -44,16 +44,11 @@
Usage:
test-driver --test-name NAME --log-file PATH --trs-file PATH
[--expect-failure {yes|no}] [--color-tests {yes|no}]
- [--collect-skipped-logs {yes|no}]
[--enable-hard-errors {yes|no}] [--]
TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
The '--test-name', '--log-file' and '--trs-file' options are mandatory.
See the GNU Automake documentation for information.
-
-Report bugs to <bug-automake@gnu.org>.
-GNU Automake home page: <https://www.gnu.org/software/automake/>.
-General help using GNU software: <https://www.gnu.org/gethelp/>.
END
}
@@ -62,17 +57,15 @@
trs_file= # Where to save the metadata of the test run.
expect_failure=no
color_tests=no
-collect_skipped_logs=yes
enable_hard_errors=yes
while test $# -gt 0; do
case $1 in
--help) print_usage; exit $?;;
- --version) echo "test-driver (GNU Automake) $scriptversion"; exit $?;;
+ --version) echo "test-driver $scriptversion"; exit $?;;
--test-name) test_name=$2; shift;;
--log-file) log_file=$2; shift;;
--trs-file) trs_file=$2; shift;;
--color-tests) color_tests=$2; shift;;
- --collect-skipped-logs) collect_skipped_logs=$2; shift;;
--expect-failure) expect_failure=$2; shift;;
--enable-hard-errors) enable_hard_errors=$2; shift;;
--) shift; break;;
@@ -128,7 +121,7 @@
case $tweaked_estatus:$expect_failure in
0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
0:*) col=$grn res=PASS recheck=no gcopy=no;;
- 77:*) col=$blu res=SKIP recheck=no gcopy=$collect_skipped_logs;;
+ 77:*) col=$blu res=SKIP recheck=no gcopy=yes;;
99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;;
*:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;;
*:*) col=$red res=FAIL recheck=yes gcopy=yes;;
diff -Nru xfconf-4.19.3/tests/Makefile.in xfconf-4.20.0/tests/Makefile.in
--- xfconf-4.19.3/tests/Makefile.in 2024-10-18 14:12:01.000000000 +0800
+++ xfconf-4.20.0/tests/Makefile.in 2024-12-15 17:33:36.000000000 +0800
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.17 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2024 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -69,8 +69,6 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-am__rm_f = rm -f $(am__rm_f_notfound)
-am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -340,10 +338,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
-am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -624,8 +620,8 @@
clean-generic:
distclean-generic:
- -$(am__rm_f) $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -717,10 +713,3 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-
-# Tell GNU make to disable its built-in pattern rules.
-%:: %,v
-%:: RCS/%,v
-%:: RCS/%
-%:: s.%
-%:: SCCS/s.%
diff -Nru xfconf-4.19.3/tests/get-properties/Makefile.in xfconf-4.20.0/tests/get-properties/Makefile.in
--- xfconf-4.19.3/tests/get-properties/Makefile.in 2024-10-18 14:12:02.000000000 +0800
+++ xfconf-4.20.0/tests/get-properties/Makefile.in 2024-12-15 17:33:36.000000000 +0800
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.17 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2024 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -84,8 +84,6 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-am__rm_f = rm -f $(am__rm_f_notfound)
-am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -264,9 +262,10 @@
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__uninstall_files_from_dir = { \
- { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
}
am__recheck_rx = ^[ ]*:recheck:[ ]*
am__global_test_result_rx = ^[ ]*:global-test-result:[ ]*
@@ -354,7 +353,6 @@
# Default flags passed to test drivers.
am__common_driver_flags = \
--color-tests "$$am__color_tests" \
- $$am__collect_skipped_logs \
--enable-hard-errors "$$am__enable_hard_errors" \
--expect-failure "$$am__expect_failure"
# To be inserted before the command running the test. Creates the
@@ -379,11 +377,6 @@
elif test -f "$$f"; then dir=; \
else dir="$(srcdir)/"; fi; \
tst=$$dir$$f; log='$@'; \
-if test -n '$(IGNORE_SKIPPED_LOGS)'; then \
- am__collect_skipped_logs='--collect-skipped-logs no'; \
-else \
- am__collect_skipped_logs=''; \
-fi; \
if test -n '$(DISABLE_HARD_ERRORS)'; then \
am__enable_hard_errors=no; \
else \
@@ -587,10 +580,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
-am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -683,8 +674,13 @@
$(am__aclocal_m4_deps):
clean-checkPROGRAMS:
- $(am__rm_f) $(check_PROGRAMS)
- test -z "$(EXEEXT)" || $(am__rm_f) $(check_PROGRAMS:$(EXEEXT)=)
+ @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+ echo " rm -f" $$list; \
+ rm -f $$list || exit $$?; \
+ test -n "$(EXEEXT)" || exit 0; \
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
t-get-arrayv$(EXEEXT): $(t_get_arrayv_OBJECTS) $(t_get_arrayv_DEPENDENCIES) $(EXTRA_t_get_arrayv_DEPENDENCIES)
@rm -f t-get-arrayv$(EXEEXT)
@@ -730,7 +726,7 @@
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
- @: >>$@
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
am--depfiles: $(am__depfiles_remade)
@@ -829,6 +825,7 @@
am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
am--force-recheck:
@:
+
$(TEST_SUITE_LOG): $(TEST_LOGS)
@$(am__set_TESTS_bases); \
am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
@@ -904,37 +901,10 @@
result_count $$1 "XPASS:" $$xpass "$$red"; \
result_count $$1 "ERROR:" $$error "$$mgn"; \
}; \
- output_system_information () \
- { \
- echo; \
- { uname -a | $(AWK) '{ \
- printf "System information (uname -a):"; \
- for (i = 1; i < NF; ++i) \
- { \
- if (i != 2) \
- printf " %s", $$i; \
- } \
- printf "\n"; \
-}'; } 2>&1; \
- if test -r /etc/os-release; then \
- echo "Distribution information (/etc/os-release):"; \
- sed 8q /etc/os-release; \
- elif test -r /etc/issue; then \
- echo "Distribution information (/etc/issue):"; \
- cat /etc/issue; \
- fi; \
- }; \
- please_report () \
- { \
-echo "Some test(s) failed. Please report this to $(PACKAGE_BUGREPORT),"; \
-echo "together with the test-suite.log file (gzipped) and your system"; \
-echo "information. Thanks."; \
- }; \
{ \
echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \
$(am__rst_title); \
create_testsuite_report --no-color; \
- output_system_information; \
echo; \
echo ".. contents:: :depth: 2"; \
echo; \
@@ -954,25 +924,26 @@
create_testsuite_report --maybe-color; \
echo "$$col$$br$$std"; \
if $$success; then :; else \
- echo "$${col}See $(subdir)/$(TEST_SUITE_LOG) for debugging.$${std}";\
+ echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \
if test -n "$(PACKAGE_BUGREPORT)"; then \
- please_report | sed -e "s/^/$${col}/" -e s/'$$'/"$${std}"/; \
+ echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
fi; \
echo "$$col$$br$$std"; \
fi; \
$$success || exit 1
check-TESTS: $(check_PROGRAMS)
- @$(am__rm_f) $(RECHECK_LOGS)
- @$(am__rm_f) $(RECHECK_LOGS:.log=.trs)
- @$(am__rm_f) $(TEST_SUITE_LOG)
+ @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
+ @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+ @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
log_list=`for i in $$bases; do echo $$i.log; done`; \
- log_list=`echo $$log_list`; \
+ trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+ log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
exit $$?;
recheck: all $(check_PROGRAMS)
- @$(am__rm_f) $(TEST_SUITE_LOG)
+ @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
bases=`for i in $$bases; do echo $$i; done \
| $(am__list_recheck_tests)` || exit 1; \
@@ -1104,15 +1075,15 @@
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
mostlyclean-generic:
- -$(am__rm_f) $(TEST_LOGS)
- -$(am__rm_f) $(TEST_LOGS:.log=.trs)
- -$(am__rm_f) $(TEST_SUITE_LOG)
+ -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+ -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+ -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
clean-generic:
distclean-generic:
- -$(am__rm_f) $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -1123,7 +1094,7 @@
mostlyclean-am
distclean: distclean-am
- -rm -f ./$(DEPDIR)/t-get-arrayv.Po
+ -rm -f ./$(DEPDIR)/t-get-arrayv.Po
-rm -f ./$(DEPDIR)/t-get-boolean.Po
-rm -f ./$(DEPDIR)/t-get-double.Po
-rm -f ./$(DEPDIR)/t-get-int.Po
@@ -1175,7 +1146,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -f ./$(DEPDIR)/t-get-arrayv.Po
+ -rm -f ./$(DEPDIR)/t-get-arrayv.Po
-rm -f ./$(DEPDIR)/t-get-boolean.Po
-rm -f ./$(DEPDIR)/t-get-double.Po
-rm -f ./$(DEPDIR)/t-get-int.Po
@@ -1224,10 +1195,3 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-
-# Tell GNU make to disable its built-in pattern rules.
-%:: %,v
-%:: RCS/%,v
-%:: RCS/%
-%:: s.%
-%:: SCCS/s.%
diff -Nru xfconf-4.19.3/tests/has-properties/Makefile.in xfconf-4.20.0/tests/has-properties/Makefile.in
--- xfconf-4.19.3/tests/has-properties/Makefile.in 2024-10-18 14:12:03.000000000 +0800
+++ xfconf-4.20.0/tests/has-properties/Makefile.in 2024-12-15 17:33:36.000000000 +0800
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.17 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2024 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -84,8 +84,6 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-am__rm_f = rm -f $(am__rm_f_notfound)
-am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -264,9 +262,10 @@
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__uninstall_files_from_dir = { \
- { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
}
am__recheck_rx = ^[ ]*:recheck:[ ]*
am__global_test_result_rx = ^[ ]*:global-test-result:[ ]*
@@ -354,7 +353,6 @@
# Default flags passed to test drivers.
am__common_driver_flags = \
--color-tests "$$am__color_tests" \
- $$am__collect_skipped_logs \
--enable-hard-errors "$$am__enable_hard_errors" \
--expect-failure "$$am__expect_failure"
# To be inserted before the command running the test. Creates the
@@ -379,11 +377,6 @@
elif test -f "$$f"; then dir=; \
else dir="$(srcdir)/"; fi; \
tst=$$dir$$f; log='$@'; \
-if test -n '$(IGNORE_SKIPPED_LOGS)'; then \
- am__collect_skipped_logs='--collect-skipped-logs no'; \
-else \
- am__collect_skipped_logs=''; \
-fi; \
if test -n '$(DISABLE_HARD_ERRORS)'; then \
am__enable_hard_errors=no; \
else \
@@ -587,10 +580,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
-am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -683,8 +674,13 @@
$(am__aclocal_m4_deps):
clean-checkPROGRAMS:
- $(am__rm_f) $(check_PROGRAMS)
- test -z "$(EXEEXT)" || $(am__rm_f) $(check_PROGRAMS:$(EXEEXT)=)
+ @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+ echo " rm -f" $$list; \
+ rm -f $$list || exit $$?; \
+ test -n "$(EXEEXT)" || exit 0; \
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
t-has-arrayv$(EXEEXT): $(t_has_arrayv_OBJECTS) $(t_has_arrayv_DEPENDENCIES) $(EXTRA_t_has_arrayv_DEPENDENCIES)
@rm -f t-has-arrayv$(EXEEXT)
@@ -729,7 +725,7 @@
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
- @: >>$@
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
am--depfiles: $(am__depfiles_remade)
@@ -828,6 +824,7 @@
am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
am--force-recheck:
@:
+
$(TEST_SUITE_LOG): $(TEST_LOGS)
@$(am__set_TESTS_bases); \
am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
@@ -903,37 +900,10 @@
result_count $$1 "XPASS:" $$xpass "$$red"; \
result_count $$1 "ERROR:" $$error "$$mgn"; \
}; \
- output_system_information () \
- { \
- echo; \
- { uname -a | $(AWK) '{ \
- printf "System information (uname -a):"; \
- for (i = 1; i < NF; ++i) \
- { \
- if (i != 2) \
- printf " %s", $$i; \
- } \
- printf "\n"; \
-}'; } 2>&1; \
- if test -r /etc/os-release; then \
- echo "Distribution information (/etc/os-release):"; \
- sed 8q /etc/os-release; \
- elif test -r /etc/issue; then \
- echo "Distribution information (/etc/issue):"; \
- cat /etc/issue; \
- fi; \
- }; \
- please_report () \
- { \
-echo "Some test(s) failed. Please report this to $(PACKAGE_BUGREPORT),"; \
-echo "together with the test-suite.log file (gzipped) and your system"; \
-echo "information. Thanks."; \
- }; \
{ \
echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \
$(am__rst_title); \
create_testsuite_report --no-color; \
- output_system_information; \
echo; \
echo ".. contents:: :depth: 2"; \
echo; \
@@ -953,25 +923,26 @@
create_testsuite_report --maybe-color; \
echo "$$col$$br$$std"; \
if $$success; then :; else \
- echo "$${col}See $(subdir)/$(TEST_SUITE_LOG) for debugging.$${std}";\
+ echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \
if test -n "$(PACKAGE_BUGREPORT)"; then \
- please_report | sed -e "s/^/$${col}/" -e s/'$$'/"$${std}"/; \
+ echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
fi; \
echo "$$col$$br$$std"; \
fi; \
$$success || exit 1
check-TESTS: $(check_PROGRAMS)
- @$(am__rm_f) $(RECHECK_LOGS)
- @$(am__rm_f) $(RECHECK_LOGS:.log=.trs)
- @$(am__rm_f) $(TEST_SUITE_LOG)
+ @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
+ @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+ @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
log_list=`for i in $$bases; do echo $$i.log; done`; \
- log_list=`echo $$log_list`; \
+ trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+ log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
exit $$?;
recheck: all $(check_PROGRAMS)
- @$(am__rm_f) $(TEST_SUITE_LOG)
+ @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
bases=`for i in $$bases; do echo $$i; done \
| $(am__list_recheck_tests)` || exit 1; \
@@ -1103,15 +1074,15 @@
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
mostlyclean-generic:
- -$(am__rm_f) $(TEST_LOGS)
- -$(am__rm_f) $(TEST_LOGS:.log=.trs)
- -$(am__rm_f) $(TEST_SUITE_LOG)
+ -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+ -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+ -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
clean-generic:
distclean-generic:
- -$(am__rm_f) $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -1122,7 +1093,7 @@
mostlyclean-am
distclean: distclean-am
- -rm -f ./$(DEPDIR)/t-has-arrayv.Po
+ -rm -f ./$(DEPDIR)/t-has-arrayv.Po
-rm -f ./$(DEPDIR)/t-has-boolean.Po
-rm -f ./$(DEPDIR)/t-has-double.Po
-rm -f ./$(DEPDIR)/t-has-string.Po
@@ -1173,7 +1144,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -f ./$(DEPDIR)/t-has-arrayv.Po
+ -rm -f ./$(DEPDIR)/t-has-arrayv.Po
-rm -f ./$(DEPDIR)/t-has-boolean.Po
-rm -f ./$(DEPDIR)/t-has-double.Po
-rm -f ./$(DEPDIR)/t-has-string.Po
@@ -1222,10 +1193,3 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-
-# Tell GNU make to disable its built-in pattern rules.
-%:: %,v
-%:: RCS/%,v
-%:: RCS/%
-%:: s.%
-%:: SCCS/s.%
diff -Nru xfconf-4.19.3/tests/object-bindings/Makefile.in xfconf-4.20.0/tests/object-bindings/Makefile.in
--- xfconf-4.19.3/tests/object-bindings/Makefile.in 2024-10-18 14:12:03.000000000 +0800
+++ xfconf-4.20.0/tests/object-bindings/Makefile.in 2024-12-15 17:33:36.000000000 +0800
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.17 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2024 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -84,8 +84,6 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-am__rm_f = rm -f $(am__rm_f_notfound)
-am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -234,9 +232,10 @@
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__uninstall_files_from_dir = { \
- { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
}
am__recheck_rx = ^[ ]*:recheck:[ ]*
am__global_test_result_rx = ^[ ]*:global-test-result:[ ]*
@@ -324,7 +323,6 @@
# Default flags passed to test drivers.
am__common_driver_flags = \
--color-tests "$$am__color_tests" \
- $$am__collect_skipped_logs \
--enable-hard-errors "$$am__enable_hard_errors" \
--expect-failure "$$am__expect_failure"
# To be inserted before the command running the test. Creates the
@@ -349,11 +347,6 @@
elif test -f "$$f"; then dir=; \
else dir="$(srcdir)/"; fi; \
tst=$$dir$$f; log='$@'; \
-if test -n '$(IGNORE_SKIPPED_LOGS)'; then \
- am__collect_skipped_logs='--collect-skipped-logs no'; \
-else \
- am__collect_skipped_logs=''; \
-fi; \
if test -n '$(DISABLE_HARD_ERRORS)'; then \
am__enable_hard_errors=no; \
else \
@@ -557,10 +550,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
-am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -647,8 +638,13 @@
$(am__aclocal_m4_deps):
clean-checkPROGRAMS:
- $(am__rm_f) $(check_PROGRAMS)
- test -z "$(EXEEXT)" || $(am__rm_f) $(check_PROGRAMS:$(EXEEXT)=)
+ @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+ echo " rm -f" $$list; \
+ rm -f $$list || exit $$?; \
+ test -n "$(EXEEXT)" || exit 0; \
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
t-object-bindings$(EXEEXT): $(t_object_bindings_OBJECTS) $(t_object_bindings_DEPENDENCIES) $(EXTRA_t_object_bindings_DEPENDENCIES)
@rm -f t-object-bindings$(EXEEXT)
@@ -664,7 +660,7 @@
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
- @: >>$@
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
am--depfiles: $(am__depfiles_remade)
@@ -763,6 +759,7 @@
am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
am--force-recheck:
@:
+
$(TEST_SUITE_LOG): $(TEST_LOGS)
@$(am__set_TESTS_bases); \
am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
@@ -838,37 +835,10 @@
result_count $$1 "XPASS:" $$xpass "$$red"; \
result_count $$1 "ERROR:" $$error "$$mgn"; \
}; \
- output_system_information () \
- { \
- echo; \
- { uname -a | $(AWK) '{ \
- printf "System information (uname -a):"; \
- for (i = 1; i < NF; ++i) \
- { \
- if (i != 2) \
- printf " %s", $$i; \
- } \
- printf "\n"; \
-}'; } 2>&1; \
- if test -r /etc/os-release; then \
- echo "Distribution information (/etc/os-release):"; \
- sed 8q /etc/os-release; \
- elif test -r /etc/issue; then \
- echo "Distribution information (/etc/issue):"; \
- cat /etc/issue; \
- fi; \
- }; \
- please_report () \
- { \
-echo "Some test(s) failed. Please report this to $(PACKAGE_BUGREPORT),"; \
-echo "together with the test-suite.log file (gzipped) and your system"; \
-echo "information. Thanks."; \
- }; \
{ \
echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \
$(am__rst_title); \
create_testsuite_report --no-color; \
- output_system_information; \
echo; \
echo ".. contents:: :depth: 2"; \
echo; \
@@ -888,25 +858,26 @@
create_testsuite_report --maybe-color; \
echo "$$col$$br$$std"; \
if $$success; then :; else \
- echo "$${col}See $(subdir)/$(TEST_SUITE_LOG) for debugging.$${std}";\
+ echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \
if test -n "$(PACKAGE_BUGREPORT)"; then \
- please_report | sed -e "s/^/$${col}/" -e s/'$$'/"$${std}"/; \
+ echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
fi; \
echo "$$col$$br$$std"; \
fi; \
$$success || exit 1
check-TESTS: $(check_PROGRAMS)
- @$(am__rm_f) $(RECHECK_LOGS)
- @$(am__rm_f) $(RECHECK_LOGS:.log=.trs)
- @$(am__rm_f) $(TEST_SUITE_LOG)
+ @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
+ @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+ @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
log_list=`for i in $$bases; do echo $$i.log; done`; \
- log_list=`echo $$log_list`; \
+ trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+ log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
exit $$?;
recheck: all $(check_PROGRAMS)
- @$(am__rm_f) $(TEST_SUITE_LOG)
+ @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
bases=`for i in $$bases; do echo $$i; done \
| $(am__list_recheck_tests)` || exit 1; \
@@ -996,15 +967,15 @@
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
mostlyclean-generic:
- -$(am__rm_f) $(TEST_LOGS)
- -$(am__rm_f) $(TEST_LOGS:.log=.trs)
- -$(am__rm_f) $(TEST_SUITE_LOG)
+ -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+ -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+ -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
clean-generic:
distclean-generic:
- -$(am__rm_f) $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -1015,7 +986,7 @@
mostlyclean-am
distclean: distclean-am
- -rm -f ./$(DEPDIR)/t-object-bindings.Po
+ -rm -f ./$(DEPDIR)/t-object-bindings.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -1061,7 +1032,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -f ./$(DEPDIR)/t-object-bindings.Po
+ -rm -f ./$(DEPDIR)/t-object-bindings.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -1104,10 +1075,3 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-
-# Tell GNU make to disable its built-in pattern rules.
-%:: %,v
-%:: RCS/%,v
-%:: RCS/%
-%:: s.%
-%:: SCCS/s.%
diff -Nru xfconf-4.19.3/tests/others/Makefile.in xfconf-4.20.0/tests/others/Makefile.in
--- xfconf-4.19.3/tests/others/Makefile.in 2024-10-18 14:12:04.000000000 +0800
+++ xfconf-4.20.0/tests/others/Makefile.in 2024-12-15 17:33:37.000000000 +0800
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.17 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2024 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -84,8 +84,6 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-am__rm_f = rm -f $(am__rm_f_notfound)
-am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -234,9 +232,10 @@
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__uninstall_files_from_dir = { \
- { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
}
am__recheck_rx = ^[ ]*:recheck:[ ]*
am__global_test_result_rx = ^[ ]*:global-test-result:[ ]*
@@ -324,7 +323,6 @@
# Default flags passed to test drivers.
am__common_driver_flags = \
--color-tests "$$am__color_tests" \
- $$am__collect_skipped_logs \
--enable-hard-errors "$$am__enable_hard_errors" \
--expect-failure "$$am__expect_failure"
# To be inserted before the command running the test. Creates the
@@ -349,11 +347,6 @@
elif test -f "$$f"; then dir=; \
else dir="$(srcdir)/"; fi; \
tst=$$dir$$f; log='$@'; \
-if test -n '$(IGNORE_SKIPPED_LOGS)'; then \
- am__collect_skipped_logs='--collect-skipped-logs no'; \
-else \
- am__collect_skipped_logs=''; \
-fi; \
if test -n '$(DISABLE_HARD_ERRORS)'; then \
am__enable_hard_errors=no; \
else \
@@ -557,10 +550,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
-am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -647,8 +638,13 @@
$(am__aclocal_m4_deps):
clean-checkPROGRAMS:
- $(am__rm_f) $(check_PROGRAMS)
- test -z "$(EXEEXT)" || $(am__rm_f) $(check_PROGRAMS:$(EXEEXT)=)
+ @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+ echo " rm -f" $$list; \
+ rm -f $$list || exit $$?; \
+ test -n "$(EXEEXT)" || exit 0; \
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
t-issue-16$(EXEEXT): $(t_issue_16_OBJECTS) $(t_issue_16_DEPENDENCIES) $(EXTRA_t_issue_16_DEPENDENCIES)
@rm -f t-issue-16$(EXEEXT)
@@ -664,7 +660,7 @@
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
- @: >>$@
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
am--depfiles: $(am__depfiles_remade)
@@ -763,6 +759,7 @@
am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
am--force-recheck:
@:
+
$(TEST_SUITE_LOG): $(TEST_LOGS)
@$(am__set_TESTS_bases); \
am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
@@ -838,37 +835,10 @@
result_count $$1 "XPASS:" $$xpass "$$red"; \
result_count $$1 "ERROR:" $$error "$$mgn"; \
}; \
- output_system_information () \
- { \
- echo; \
- { uname -a | $(AWK) '{ \
- printf "System information (uname -a):"; \
- for (i = 1; i < NF; ++i) \
- { \
- if (i != 2) \
- printf " %s", $$i; \
- } \
- printf "\n"; \
-}'; } 2>&1; \
- if test -r /etc/os-release; then \
- echo "Distribution information (/etc/os-release):"; \
- sed 8q /etc/os-release; \
- elif test -r /etc/issue; then \
- echo "Distribution information (/etc/issue):"; \
- cat /etc/issue; \
- fi; \
- }; \
- please_report () \
- { \
-echo "Some test(s) failed. Please report this to $(PACKAGE_BUGREPORT),"; \
-echo "together with the test-suite.log file (gzipped) and your system"; \
-echo "information. Thanks."; \
- }; \
{ \
echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \
$(am__rst_title); \
create_testsuite_report --no-color; \
- output_system_information; \
echo; \
echo ".. contents:: :depth: 2"; \
echo; \
@@ -888,25 +858,26 @@
create_testsuite_report --maybe-color; \
echo "$$col$$br$$std"; \
if $$success; then :; else \
- echo "$${col}See $(subdir)/$(TEST_SUITE_LOG) for debugging.$${std}";\
+ echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \
if test -n "$(PACKAGE_BUGREPORT)"; then \
- please_report | sed -e "s/^/$${col}/" -e s/'$$'/"$${std}"/; \
+ echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
fi; \
echo "$$col$$br$$std"; \
fi; \
$$success || exit 1
check-TESTS: $(check_PROGRAMS)
- @$(am__rm_f) $(RECHECK_LOGS)
- @$(am__rm_f) $(RECHECK_LOGS:.log=.trs)
- @$(am__rm_f) $(TEST_SUITE_LOG)
+ @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
+ @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+ @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
log_list=`for i in $$bases; do echo $$i.log; done`; \
- log_list=`echo $$log_list`; \
+ trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+ log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
exit $$?;
recheck: all $(check_PROGRAMS)
- @$(am__rm_f) $(TEST_SUITE_LOG)
+ @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
bases=`for i in $$bases; do echo $$i; done \
| $(am__list_recheck_tests)` || exit 1; \
@@ -996,15 +967,15 @@
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
mostlyclean-generic:
- -$(am__rm_f) $(TEST_LOGS)
- -$(am__rm_f) $(TEST_LOGS:.log=.trs)
- -$(am__rm_f) $(TEST_SUITE_LOG)
+ -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+ -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+ -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
clean-generic:
distclean-generic:
- -$(am__rm_f) $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -1015,7 +986,7 @@
mostlyclean-am
distclean: distclean-am
- -rm -f ./$(DEPDIR)/t-issue-16.Po
+ -rm -f ./$(DEPDIR)/t-issue-16.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -1061,7 +1032,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -f ./$(DEPDIR)/t-issue-16.Po
+ -rm -f ./$(DEPDIR)/t-issue-16.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -1104,10 +1075,3 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-
-# Tell GNU make to disable its built-in pattern rules.
-%:: %,v
-%:: RCS/%,v
-%:: RCS/%
-%:: s.%
-%:: SCCS/s.%
diff -Nru xfconf-4.19.3/tests/property-changed-signal/Makefile.in xfconf-4.20.0/tests/property-changed-signal/Makefile.in
--- xfconf-4.19.3/tests/property-changed-signal/Makefile.in 2024-10-18 14:12:04.000000000 +0800
+++ xfconf-4.20.0/tests/property-changed-signal/Makefile.in 2024-12-15 17:33:37.000000000 +0800
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.17 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2024 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -84,8 +84,6 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-am__rm_f = rm -f $(am__rm_f_notfound)
-am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -245,9 +243,10 @@
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__uninstall_files_from_dir = { \
- { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
}
am__recheck_rx = ^[ ]*:recheck:[ ]*
am__global_test_result_rx = ^[ ]*:global-test-result:[ ]*
@@ -335,7 +334,6 @@
# Default flags passed to test drivers.
am__common_driver_flags = \
--color-tests "$$am__color_tests" \
- $$am__collect_skipped_logs \
--enable-hard-errors "$$am__enable_hard_errors" \
--expect-failure "$$am__expect_failure"
# To be inserted before the command running the test. Creates the
@@ -360,11 +358,6 @@
elif test -f "$$f"; then dir=; \
else dir="$(srcdir)/"; fi; \
tst=$$dir$$f; log='$@'; \
-if test -n '$(IGNORE_SKIPPED_LOGS)'; then \
- am__collect_skipped_logs='--collect-skipped-logs no'; \
-else \
- am__collect_skipped_logs=''; \
-fi; \
if test -n '$(DISABLE_HARD_ERRORS)'; then \
am__enable_hard_errors=no; \
else \
@@ -568,10 +561,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
-am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -659,8 +650,13 @@
$(am__aclocal_m4_deps):
clean-checkPROGRAMS:
- $(am__rm_f) $(check_PROGRAMS)
- test -z "$(EXEEXT)" || $(am__rm_f) $(check_PROGRAMS:$(EXEEXT)=)
+ @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+ echo " rm -f" $$list; \
+ rm -f $$list || exit $$?; \
+ test -n "$(EXEEXT)" || exit 0; \
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
t-string-changed-signal$(EXEEXT): $(t_string_changed_signal_OBJECTS) $(t_string_changed_signal_DEPENDENCIES) $(EXTRA_t_string_changed_signal_DEPENDENCIES)
@rm -f t-string-changed-signal$(EXEEXT)
@@ -681,7 +677,7 @@
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
- @: >>$@
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
am--depfiles: $(am__depfiles_remade)
@@ -780,6 +776,7 @@
am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
am--force-recheck:
@:
+
$(TEST_SUITE_LOG): $(TEST_LOGS)
@$(am__set_TESTS_bases); \
am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
@@ -855,37 +852,10 @@
result_count $$1 "XPASS:" $$xpass "$$red"; \
result_count $$1 "ERROR:" $$error "$$mgn"; \
}; \
- output_system_information () \
- { \
- echo; \
- { uname -a | $(AWK) '{ \
- printf "System information (uname -a):"; \
- for (i = 1; i < NF; ++i) \
- { \
- if (i != 2) \
- printf " %s", $$i; \
- } \
- printf "\n"; \
-}'; } 2>&1; \
- if test -r /etc/os-release; then \
- echo "Distribution information (/etc/os-release):"; \
- sed 8q /etc/os-release; \
- elif test -r /etc/issue; then \
- echo "Distribution information (/etc/issue):"; \
- cat /etc/issue; \
- fi; \
- }; \
- please_report () \
- { \
-echo "Some test(s) failed. Please report this to $(PACKAGE_BUGREPORT),"; \
-echo "together with the test-suite.log file (gzipped) and your system"; \
-echo "information. Thanks."; \
- }; \
{ \
echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \
$(am__rst_title); \
create_testsuite_report --no-color; \
- output_system_information; \
echo; \
echo ".. contents:: :depth: 2"; \
echo; \
@@ -905,25 +875,26 @@
create_testsuite_report --maybe-color; \
echo "$$col$$br$$std"; \
if $$success; then :; else \
- echo "$${col}See $(subdir)/$(TEST_SUITE_LOG) for debugging.$${std}";\
+ echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \
if test -n "$(PACKAGE_BUGREPORT)"; then \
- please_report | sed -e "s/^/$${col}/" -e s/'$$'/"$${std}"/; \
+ echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
fi; \
echo "$$col$$br$$std"; \
fi; \
$$success || exit 1
check-TESTS: $(check_PROGRAMS)
- @$(am__rm_f) $(RECHECK_LOGS)
- @$(am__rm_f) $(RECHECK_LOGS:.log=.trs)
- @$(am__rm_f) $(TEST_SUITE_LOG)
+ @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
+ @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+ @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
log_list=`for i in $$bases; do echo $$i.log; done`; \
- log_list=`echo $$log_list`; \
+ trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+ log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
exit $$?;
recheck: all $(check_PROGRAMS)
- @$(am__rm_f) $(TEST_SUITE_LOG)
+ @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
bases=`for i in $$bases; do echo $$i; done \
| $(am__list_recheck_tests)` || exit 1; \
@@ -1020,15 +991,15 @@
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
mostlyclean-generic:
- -$(am__rm_f) $(TEST_LOGS)
- -$(am__rm_f) $(TEST_LOGS:.log=.trs)
- -$(am__rm_f) $(TEST_SUITE_LOG)
+ -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+ -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+ -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
clean-generic:
distclean-generic:
- -$(am__rm_f) $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -1039,7 +1010,7 @@
mostlyclean-am
distclean: distclean-am
- -rm -f ./$(DEPDIR)/t-string-changed-signal-detailed.Po
+ -rm -f ./$(DEPDIR)/t-string-changed-signal-detailed.Po
-rm -f ./$(DEPDIR)/t-string-changed-signal.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -1086,7 +1057,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -f ./$(DEPDIR)/t-string-changed-signal-detailed.Po
+ -rm -f ./$(DEPDIR)/t-string-changed-signal-detailed.Po
-rm -f ./$(DEPDIR)/t-string-changed-signal.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -1130,10 +1101,3 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-
-# Tell GNU make to disable its built-in pattern rules.
-%:: %,v
-%:: RCS/%,v
-%:: RCS/%
-%:: s.%
-%:: SCCS/s.%
diff -Nru xfconf-4.19.3/tests/reset-properties/Makefile.in xfconf-4.20.0/tests/reset-properties/Makefile.in
--- xfconf-4.19.3/tests/reset-properties/Makefile.in 2024-10-18 14:12:05.000000000 +0800
+++ xfconf-4.20.0/tests/reset-properties/Makefile.in 2024-12-15 17:33:37.000000000 +0800
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.17 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2024 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -84,8 +84,6 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-am__rm_f = rm -f $(am__rm_f_notfound)
-am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -265,9 +263,10 @@
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__uninstall_files_from_dir = { \
- { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
}
am__recheck_rx = ^[ ]*:recheck:[ ]*
am__global_test_result_rx = ^[ ]*:global-test-result:[ ]*
@@ -355,7 +354,6 @@
# Default flags passed to test drivers.
am__common_driver_flags = \
--color-tests "$$am__color_tests" \
- $$am__collect_skipped_logs \
--enable-hard-errors "$$am__enable_hard_errors" \
--expect-failure "$$am__expect_failure"
# To be inserted before the command running the test. Creates the
@@ -380,11 +378,6 @@
elif test -f "$$f"; then dir=; \
else dir="$(srcdir)/"; fi; \
tst=$$dir$$f; log='$@'; \
-if test -n '$(IGNORE_SKIPPED_LOGS)'; then \
- am__collect_skipped_logs='--collect-skipped-logs no'; \
-else \
- am__collect_skipped_logs=''; \
-fi; \
if test -n '$(DISABLE_HARD_ERRORS)'; then \
am__enable_hard_errors=no; \
else \
@@ -588,10 +581,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
-am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -684,8 +675,13 @@
$(am__aclocal_m4_deps):
clean-checkPROGRAMS:
- $(am__rm_f) $(check_PROGRAMS)
- test -z "$(EXEEXT)" || $(am__rm_f) $(check_PROGRAMS:$(EXEEXT)=)
+ @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+ echo " rm -f" $$list; \
+ rm -f $$list || exit $$?; \
+ test -n "$(EXEEXT)" || exit 0; \
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
t-reset-arrayv$(EXEEXT): $(t_reset_arrayv_OBJECTS) $(t_reset_arrayv_DEPENDENCIES) $(EXTRA_t_reset_arrayv_DEPENDENCIES)
@rm -f t-reset-arrayv$(EXEEXT)
@@ -731,7 +727,7 @@
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
- @: >>$@
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
am--depfiles: $(am__depfiles_remade)
@@ -830,6 +826,7 @@
am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
am--force-recheck:
@:
+
$(TEST_SUITE_LOG): $(TEST_LOGS)
@$(am__set_TESTS_bases); \
am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
@@ -905,37 +902,10 @@
result_count $$1 "XPASS:" $$xpass "$$red"; \
result_count $$1 "ERROR:" $$error "$$mgn"; \
}; \
- output_system_information () \
- { \
- echo; \
- { uname -a | $(AWK) '{ \
- printf "System information (uname -a):"; \
- for (i = 1; i < NF; ++i) \
- { \
- if (i != 2) \
- printf " %s", $$i; \
- } \
- printf "\n"; \
-}'; } 2>&1; \
- if test -r /etc/os-release; then \
- echo "Distribution information (/etc/os-release):"; \
- sed 8q /etc/os-release; \
- elif test -r /etc/issue; then \
- echo "Distribution information (/etc/issue):"; \
- cat /etc/issue; \
- fi; \
- }; \
- please_report () \
- { \
-echo "Some test(s) failed. Please report this to $(PACKAGE_BUGREPORT),"; \
-echo "together with the test-suite.log file (gzipped) and your system"; \
-echo "information. Thanks."; \
- }; \
{ \
echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \
$(am__rst_title); \
create_testsuite_report --no-color; \
- output_system_information; \
echo; \
echo ".. contents:: :depth: 2"; \
echo; \
@@ -955,25 +925,26 @@
create_testsuite_report --maybe-color; \
echo "$$col$$br$$std"; \
if $$success; then :; else \
- echo "$${col}See $(subdir)/$(TEST_SUITE_LOG) for debugging.$${std}";\
+ echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \
if test -n "$(PACKAGE_BUGREPORT)"; then \
- please_report | sed -e "s/^/$${col}/" -e s/'$$'/"$${std}"/; \
+ echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
fi; \
echo "$$col$$br$$std"; \
fi; \
$$success || exit 1
check-TESTS: $(check_PROGRAMS)
- @$(am__rm_f) $(RECHECK_LOGS)
- @$(am__rm_f) $(RECHECK_LOGS:.log=.trs)
- @$(am__rm_f) $(TEST_SUITE_LOG)
+ @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
+ @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+ @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
log_list=`for i in $$bases; do echo $$i.log; done`; \
- log_list=`echo $$log_list`; \
+ trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+ log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
exit $$?;
recheck: all $(check_PROGRAMS)
- @$(am__rm_f) $(TEST_SUITE_LOG)
+ @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
bases=`for i in $$bases; do echo $$i; done \
| $(am__list_recheck_tests)` || exit 1; \
@@ -1105,15 +1076,15 @@
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
mostlyclean-generic:
- -$(am__rm_f) $(TEST_LOGS)
- -$(am__rm_f) $(TEST_LOGS:.log=.trs)
- -$(am__rm_f) $(TEST_SUITE_LOG)
+ -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+ -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+ -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
clean-generic:
distclean-generic:
- -$(am__rm_f) $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -1124,7 +1095,7 @@
mostlyclean-am
distclean: distclean-am
- -rm -f ./$(DEPDIR)/t-reset-arrayv.Po
+ -rm -f ./$(DEPDIR)/t-reset-arrayv.Po
-rm -f ./$(DEPDIR)/t-reset-boolean.Po
-rm -f ./$(DEPDIR)/t-reset-double.Po
-rm -f ./$(DEPDIR)/t-reset-int.Po
@@ -1176,7 +1147,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -f ./$(DEPDIR)/t-reset-arrayv.Po
+ -rm -f ./$(DEPDIR)/t-reset-arrayv.Po
-rm -f ./$(DEPDIR)/t-reset-boolean.Po
-rm -f ./$(DEPDIR)/t-reset-double.Po
-rm -f ./$(DEPDIR)/t-reset-int.Po
@@ -1225,10 +1196,3 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-
-# Tell GNU make to disable its built-in pattern rules.
-%:: %,v
-%:: RCS/%,v
-%:: RCS/%
-%:: s.%
-%:: SCCS/s.%
diff -Nru xfconf-4.19.3/tests/set-properties/Makefile.in xfconf-4.20.0/tests/set-properties/Makefile.in
--- xfconf-4.19.3/tests/set-properties/Makefile.in 2024-10-18 14:12:05.000000000 +0800
+++ xfconf-4.20.0/tests/set-properties/Makefile.in 2024-12-15 17:33:37.000000000 +0800
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.17 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2024 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -84,8 +84,6 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-am__rm_f = rm -f $(am__rm_f_notfound)
-am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -264,9 +262,10 @@
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__uninstall_files_from_dir = { \
- { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
}
am__recheck_rx = ^[ ]*:recheck:[ ]*
am__global_test_result_rx = ^[ ]*:global-test-result:[ ]*
@@ -354,7 +353,6 @@
# Default flags passed to test drivers.
am__common_driver_flags = \
--color-tests "$$am__color_tests" \
- $$am__collect_skipped_logs \
--enable-hard-errors "$$am__enable_hard_errors" \
--expect-failure "$$am__expect_failure"
# To be inserted before the command running the test. Creates the
@@ -379,11 +377,6 @@
elif test -f "$$f"; then dir=; \
else dir="$(srcdir)/"; fi; \
tst=$$dir$$f; log='$@'; \
-if test -n '$(IGNORE_SKIPPED_LOGS)'; then \
- am__collect_skipped_logs='--collect-skipped-logs no'; \
-else \
- am__collect_skipped_logs=''; \
-fi; \
if test -n '$(DISABLE_HARD_ERRORS)'; then \
am__enable_hard_errors=no; \
else \
@@ -587,10 +580,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
-am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -683,8 +674,13 @@
$(am__aclocal_m4_deps):
clean-checkPROGRAMS:
- $(am__rm_f) $(check_PROGRAMS)
- test -z "$(EXEEXT)" || $(am__rm_f) $(check_PROGRAMS:$(EXEEXT)=)
+ @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+ echo " rm -f" $$list; \
+ rm -f $$list || exit $$?; \
+ test -n "$(EXEEXT)" || exit 0; \
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
t-set-arrayv$(EXEEXT): $(t_set_arrayv_OBJECTS) $(t_set_arrayv_DEPENDENCIES) $(EXTRA_t_set_arrayv_DEPENDENCIES)
@rm -f t-set-arrayv$(EXEEXT)
@@ -730,7 +726,7 @@
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
- @: >>$@
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
am--depfiles: $(am__depfiles_remade)
@@ -829,6 +825,7 @@
am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
am--force-recheck:
@:
+
$(TEST_SUITE_LOG): $(TEST_LOGS)
@$(am__set_TESTS_bases); \
am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
@@ -904,37 +901,10 @@
result_count $$1 "XPASS:" $$xpass "$$red"; \
result_count $$1 "ERROR:" $$error "$$mgn"; \
}; \
- output_system_information () \
- { \
- echo; \
- { uname -a | $(AWK) '{ \
- printf "System information (uname -a):"; \
- for (i = 1; i < NF; ++i) \
- { \
- if (i != 2) \
- printf " %s", $$i; \
- } \
- printf "\n"; \
-}'; } 2>&1; \
- if test -r /etc/os-release; then \
- echo "Distribution information (/etc/os-release):"; \
- sed 8q /etc/os-release; \
- elif test -r /etc/issue; then \
- echo "Distribution information (/etc/issue):"; \
- cat /etc/issue; \
- fi; \
- }; \
- please_report () \
- { \
-echo "Some test(s) failed. Please report this to $(PACKAGE_BUGREPORT),"; \
-echo "together with the test-suite.log file (gzipped) and your system"; \
-echo "information. Thanks."; \
- }; \
{ \
echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \
$(am__rst_title); \
create_testsuite_report --no-color; \
- output_system_information; \
echo; \
echo ".. contents:: :depth: 2"; \
echo; \
@@ -954,25 +924,26 @@
create_testsuite_report --maybe-color; \
echo "$$col$$br$$std"; \
if $$success; then :; else \
- echo "$${col}See $(subdir)/$(TEST_SUITE_LOG) for debugging.$${std}";\
+ echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \
if test -n "$(PACKAGE_BUGREPORT)"; then \
- please_report | sed -e "s/^/$${col}/" -e s/'$$'/"$${std}"/; \
+ echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
fi; \
echo "$$col$$br$$std"; \
fi; \
$$success || exit 1
check-TESTS: $(check_PROGRAMS)
- @$(am__rm_f) $(RECHECK_LOGS)
- @$(am__rm_f) $(RECHECK_LOGS:.log=.trs)
- @$(am__rm_f) $(TEST_SUITE_LOG)
+ @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
+ @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+ @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
log_list=`for i in $$bases; do echo $$i.log; done`; \
- log_list=`echo $$log_list`; \
+ trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+ log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
exit $$?;
recheck: all $(check_PROGRAMS)
- @$(am__rm_f) $(TEST_SUITE_LOG)
+ @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
bases=`for i in $$bases; do echo $$i; done \
| $(am__list_recheck_tests)` || exit 1; \
@@ -1104,15 +1075,15 @@
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
mostlyclean-generic:
- -$(am__rm_f) $(TEST_LOGS)
- -$(am__rm_f) $(TEST_LOGS:.log=.trs)
- -$(am__rm_f) $(TEST_SUITE_LOG)
+ -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+ -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+ -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
clean-generic:
distclean-generic:
- -$(am__rm_f) $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -1123,7 +1094,7 @@
mostlyclean-am
distclean: distclean-am
- -rm -f ./$(DEPDIR)/t-set-arrayv.Po
+ -rm -f ./$(DEPDIR)/t-set-arrayv.Po
-rm -f ./$(DEPDIR)/t-set-boolean.Po
-rm -f ./$(DEPDIR)/t-set-double.Po
-rm -f ./$(DEPDIR)/t-set-int.Po
@@ -1175,7 +1146,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -f ./$(DEPDIR)/t-set-arrayv.Po
+ -rm -f ./$(DEPDIR)/t-set-arrayv.Po
-rm -f ./$(DEPDIR)/t-set-boolean.Po
-rm -f ./$(DEPDIR)/t-set-double.Po
-rm -f ./$(DEPDIR)/t-set-int.Po
@@ -1224,10 +1195,3 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-
-# Tell GNU make to disable its built-in pattern rules.
-%:: %,v
-%:: RCS/%,v
-%:: RCS/%
-%:: s.%
-%:: SCCS/s.%
diff -Nru xfconf-4.19.3/tests/tests-common.h xfconf-4.20.0/tests/tests-common.h
--- xfconf-4.19.3/tests/tests-common.h 2024-09-20 03:21:48.000000000 +0800
+++ xfconf-4.20.0/tests/tests-common.h 2024-12-01 23:24:37.000000000 +0800
@@ -115,8 +115,8 @@
g_critical("xfconfd is not running and can not be autostarted");
GError *dbus_error = NULL;
- if (g_dbus_message_to_gerror(msg, &dbus_error)) {
- g_critical("D-Bus error: %s", error->message);
+ if (g_dbus_message_to_gerror(ret, &dbus_error)) {
+ g_critical("D-Bus error: %s", dbus_error->message);
g_error_free(dbus_error);
}
diff -Nru xfconf-4.19.3/tests/tests-end/Makefile.in xfconf-4.20.0/tests/tests-end/Makefile.in
--- xfconf-4.19.3/tests/tests-end/Makefile.in 2024-10-18 14:12:06.000000000 +0800
+++ xfconf-4.20.0/tests/tests-end/Makefile.in 2024-12-15 17:33:37.000000000 +0800
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.17 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2024 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -84,8 +84,6 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-am__rm_f = rm -f $(am__rm_f_notfound)
-am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -234,9 +232,10 @@
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__uninstall_files_from_dir = { \
- { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
}
am__recheck_rx = ^[ ]*:recheck:[ ]*
am__global_test_result_rx = ^[ ]*:global-test-result:[ ]*
@@ -324,7 +323,6 @@
# Default flags passed to test drivers.
am__common_driver_flags = \
--color-tests "$$am__color_tests" \
- $$am__collect_skipped_logs \
--enable-hard-errors "$$am__enable_hard_errors" \
--expect-failure "$$am__expect_failure"
# To be inserted before the command running the test. Creates the
@@ -349,11 +347,6 @@
elif test -f "$$f"; then dir=; \
else dir="$(srcdir)/"; fi; \
tst=$$dir$$f; log='$@'; \
-if test -n '$(IGNORE_SKIPPED_LOGS)'; then \
- am__collect_skipped_logs='--collect-skipped-logs no'; \
-else \
- am__collect_skipped_logs=''; \
-fi; \
if test -n '$(DISABLE_HARD_ERRORS)'; then \
am__enable_hard_errors=no; \
else \
@@ -557,10 +550,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
-am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -647,8 +638,13 @@
$(am__aclocal_m4_deps):
clean-checkPROGRAMS:
- $(am__rm_f) $(check_PROGRAMS)
- test -z "$(EXEEXT)" || $(am__rm_f) $(check_PROGRAMS:$(EXEEXT)=)
+ @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+ echo " rm -f" $$list; \
+ rm -f $$list || exit $$?; \
+ test -n "$(EXEEXT)" || exit 0; \
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
t-tests-end$(EXEEXT): $(t_tests_end_OBJECTS) $(t_tests_end_DEPENDENCIES) $(EXTRA_t_tests_end_DEPENDENCIES)
@rm -f t-tests-end$(EXEEXT)
@@ -664,7 +660,7 @@
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
- @: >>$@
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
am--depfiles: $(am__depfiles_remade)
@@ -763,6 +759,7 @@
am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
am--force-recheck:
@:
+
$(TEST_SUITE_LOG): $(TEST_LOGS)
@$(am__set_TESTS_bases); \
am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
@@ -838,37 +835,10 @@
result_count $$1 "XPASS:" $$xpass "$$red"; \
result_count $$1 "ERROR:" $$error "$$mgn"; \
}; \
- output_system_information () \
- { \
- echo; \
- { uname -a | $(AWK) '{ \
- printf "System information (uname -a):"; \
- for (i = 1; i < NF; ++i) \
- { \
- if (i != 2) \
- printf " %s", $$i; \
- } \
- printf "\n"; \
-}'; } 2>&1; \
- if test -r /etc/os-release; then \
- echo "Distribution information (/etc/os-release):"; \
- sed 8q /etc/os-release; \
- elif test -r /etc/issue; then \
- echo "Distribution information (/etc/issue):"; \
- cat /etc/issue; \
- fi; \
- }; \
- please_report () \
- { \
-echo "Some test(s) failed. Please report this to $(PACKAGE_BUGREPORT),"; \
-echo "together with the test-suite.log file (gzipped) and your system"; \
-echo "information. Thanks."; \
- }; \
{ \
echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \
$(am__rst_title); \
create_testsuite_report --no-color; \
- output_system_information; \
echo; \
echo ".. contents:: :depth: 2"; \
echo; \
@@ -888,25 +858,26 @@
create_testsuite_report --maybe-color; \
echo "$$col$$br$$std"; \
if $$success; then :; else \
- echo "$${col}See $(subdir)/$(TEST_SUITE_LOG) for debugging.$${std}";\
+ echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \
if test -n "$(PACKAGE_BUGREPORT)"; then \
- please_report | sed -e "s/^/$${col}/" -e s/'$$'/"$${std}"/; \
+ echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
fi; \
echo "$$col$$br$$std"; \
fi; \
$$success || exit 1
check-TESTS: $(check_PROGRAMS)
- @$(am__rm_f) $(RECHECK_LOGS)
- @$(am__rm_f) $(RECHECK_LOGS:.log=.trs)
- @$(am__rm_f) $(TEST_SUITE_LOG)
+ @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
+ @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+ @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
log_list=`for i in $$bases; do echo $$i.log; done`; \
- log_list=`echo $$log_list`; \
+ trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+ log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
exit $$?;
recheck: all $(check_PROGRAMS)
- @$(am__rm_f) $(TEST_SUITE_LOG)
+ @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
bases=`for i in $$bases; do echo $$i; done \
| $(am__list_recheck_tests)` || exit 1; \
@@ -996,15 +967,15 @@
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
mostlyclean-generic:
- -$(am__rm_f) $(TEST_LOGS)
- -$(am__rm_f) $(TEST_LOGS:.log=.trs)
- -$(am__rm_f) $(TEST_SUITE_LOG)
+ -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+ -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+ -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
clean-generic:
distclean-generic:
- -$(am__rm_f) $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -1015,7 +986,7 @@
mostlyclean-am
distclean: distclean-am
- -rm -f ./$(DEPDIR)/t-tests-end.Po
+ -rm -f ./$(DEPDIR)/t-tests-end.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -1061,7 +1032,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -f ./$(DEPDIR)/t-tests-end.Po
+ -rm -f ./$(DEPDIR)/t-tests-end.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -1104,10 +1075,3 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-
-# Tell GNU make to disable its built-in pattern rules.
-%:: %,v
-%:: RCS/%,v
-%:: RCS/%
-%:: s.%
-%:: SCCS/s.%
diff -Nru xfconf-4.19.3/xfconf/Makefile.in xfconf-4.20.0/xfconf/Makefile.in
--- xfconf-4.19.3/xfconf/Makefile.in 2024-10-18 14:12:08.000000000 +0800
+++ xfconf-4.20.0/xfconf/Makefile.in 2024-12-15 17:33:37.000000000 +0800
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.17 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2024 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -72,8 +72,6 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-am__rm_f = rm -f $(am__rm_f_notfound)
-am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -135,9 +133,10 @@
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__uninstall_files_from_dir = { \
- { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
}
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" \
"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(typelibdir)" \
@@ -339,7 +338,6 @@
# Default flags passed to test drivers.
am__common_driver_flags = \
--color-tests "$$am__color_tests" \
- $$am__collect_skipped_logs \
--enable-hard-errors "$$am__enable_hard_errors" \
--expect-failure "$$am__expect_failure"
# To be inserted before the command running the test. Creates the
@@ -364,11 +362,6 @@
elif test -f "$$f"; then dir=; \
else dir="$(srcdir)/"; fi; \
tst=$$dir$$f; log='$@'; \
-if test -n '$(IGNORE_SKIPPED_LOGS)'; then \
- am__collect_skipped_logs='--collect-skipped-logs no'; \
-else \
- am__collect_skipped_logs=''; \
-fi; \
if test -n '$(DISABLE_HARD_ERRORS)'; then \
am__enable_hard_errors=no; \
else \
@@ -570,10 +563,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
-am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -766,19 +757,21 @@
done
clean-libLTLIBRARIES:
- -$(am__rm_f) $(lib_LTLIBRARIES)
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
@list='$(lib_LTLIBRARIES)'; \
locs=`for p in $$list; do echo $$p; done | \
sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
sort -u`; \
- echo rm -f $${locs}; \
- $(am__rm_f) $${locs}
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
$(top_builddir)/common/$(am__dirstamp):
@$(MKDIR_P) $(top_builddir)/common
- @: >>$(top_builddir)/common/$(am__dirstamp)
+ @: > $(top_builddir)/common/$(am__dirstamp)
$(top_builddir)/common/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) $(top_builddir)/common/$(DEPDIR)
- @: >>$(top_builddir)/common/$(DEPDIR)/$(am__dirstamp)
+ @: > $(top_builddir)/common/$(DEPDIR)/$(am__dirstamp)
$(top_builddir)/common/libxfconf_0_la-xfconf-types.lo: \
$(top_builddir)/common/$(am__dirstamp) \
$(top_builddir)/common/$(DEPDIR)/$(am__dirstamp)
@@ -802,7 +795,7 @@
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
- @: >>$@
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
am--depfiles: $(am__depfiles_remade)
@@ -1042,6 +1035,7 @@
am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
am--force-recheck:
@:
+
$(TEST_SUITE_LOG): $(TEST_LOGS)
@$(am__set_TESTS_bases); \
am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
@@ -1117,37 +1111,10 @@
result_count $$1 "XPASS:" $$xpass "$$red"; \
result_count $$1 "ERROR:" $$error "$$mgn"; \
}; \
- output_system_information () \
- { \
- echo; \
- { uname -a | $(AWK) '{ \
- printf "System information (uname -a):"; \
- for (i = 1; i < NF; ++i) \
- { \
- if (i != 2) \
- printf " %s", $$i; \
- } \
- printf "\n"; \
-}'; } 2>&1; \
- if test -r /etc/os-release; then \
- echo "Distribution information (/etc/os-release):"; \
- sed 8q /etc/os-release; \
- elif test -r /etc/issue; then \
- echo "Distribution information (/etc/issue):"; \
- cat /etc/issue; \
- fi; \
- }; \
- please_report () \
- { \
-echo "Some test(s) failed. Please report this to $(PACKAGE_BUGREPORT),"; \
-echo "together with the test-suite.log file (gzipped) and your system"; \
-echo "information. Thanks."; \
- }; \
{ \
echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \
$(am__rst_title); \
create_testsuite_report --no-color; \
- output_system_information; \
echo; \
echo ".. contents:: :depth: 2"; \
echo; \
@@ -1167,25 +1134,26 @@
create_testsuite_report --maybe-color; \
echo "$$col$$br$$std"; \
if $$success; then :; else \
- echo "$${col}See $(subdir)/$(TEST_SUITE_LOG) for debugging.$${std}";\
+ echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \
if test -n "$(PACKAGE_BUGREPORT)"; then \
- please_report | sed -e "s/^/$${col}/" -e s/'$$'/"$${std}"/; \
+ echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
fi; \
echo "$$col$$br$$std"; \
fi; \
$$success || exit 1
check-TESTS:
- @$(am__rm_f) $(RECHECK_LOGS)
- @$(am__rm_f) $(RECHECK_LOGS:.log=.trs)
- @$(am__rm_f) $(TEST_SUITE_LOG)
+ @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
+ @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+ @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
log_list=`for i in $$bases; do echo $$i.log; done`; \
- log_list=`echo $$log_list`; \
+ trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+ log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
exit $$?;
recheck: all
- @$(am__rm_f) $(TEST_SUITE_LOG)
+ @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
bases=`for i in $$bases; do echo $$i; done \
| $(am__list_recheck_tests)` || exit 1; \
@@ -1280,18 +1248,18 @@
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
mostlyclean-generic:
- -$(am__rm_f) $(TEST_LOGS)
- -$(am__rm_f) $(TEST_LOGS:.log=.trs)
- -$(am__rm_f) $(TEST_SUITE_LOG)
+ -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+ -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+ -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
clean-generic:
distclean-generic:
- -$(am__rm_f) $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
- -$(am__rm_f) $(DISTCLEANFILES)
- -$(am__rm_f) $(top_builddir)/common/$(DEPDIR)/$(am__dirstamp)
- -$(am__rm_f) $(top_builddir)/common/$(am__dirstamp)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+ -test -z "$(top_builddir)/common/$(DEPDIR)/$(am__dirstamp)" || rm -f $(top_builddir)/common/$(DEPDIR)/$(am__dirstamp)
+ -test -z "$(top_builddir)/common/$(am__dirstamp)" || rm -f $(top_builddir)/common/$(am__dirstamp)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -1302,7 +1270,7 @@
mostlyclean-am
distclean: distclean-am
- -rm -f $(top_builddir)/common/$(DEPDIR)/libxfconf_0_la-xfconf-types.Plo
+ -rm -f $(top_builddir)/common/$(DEPDIR)/libxfconf_0_la-xfconf-types.Plo
-rm -f ./$(DEPDIR)/libxfconf_0_la-xfconf-binding.Plo
-rm -f ./$(DEPDIR)/libxfconf_0_la-xfconf-cache.Plo
-rm -f ./$(DEPDIR)/libxfconf_0_la-xfconf-channel.Plo
@@ -1353,7 +1321,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -f $(top_builddir)/common/$(DEPDIR)/libxfconf_0_la-xfconf-types.Plo
+ -rm -f $(top_builddir)/common/$(DEPDIR)/libxfconf_0_la-xfconf-types.Plo
-rm -f ./$(DEPDIR)/libxfconf_0_la-xfconf-binding.Plo
-rm -f ./$(DEPDIR)/libxfconf_0_la-xfconf-cache.Plo
-rm -f ./$(DEPDIR)/libxfconf_0_la-xfconf-channel.Plo
@@ -1416,10 +1384,3 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-
-# Tell GNU make to disable its built-in pattern rules.
-%:: %,v
-%:: RCS/%,v
-%:: RCS/%
-%:: s.%
-%:: SCCS/s.%
diff -Nru xfconf-4.19.3/xfconf/xfconf-binding.c xfconf-4.20.0/xfconf/xfconf-binding.c
--- xfconf-4.19.3/xfconf/xfconf-binding.c 2024-10-16 16:28:17.000000000 +0800
+++ xfconf-4.20.0/xfconf/xfconf-binding.c 2024-12-01 23:24:37.000000000 +0800
@@ -138,6 +138,7 @@
XFCONF_TYPE_UINT16, &alpha,
G_TYPE_INVALID);
g_signal_handler_unblock(G_OBJECT(binding->channel), binding->channel_handler);
+ g_slice_free(FakeGdkColor, color);
}
static void
@@ -159,6 +160,7 @@
G_TYPE_DOUBLE, &color->alpha,
G_TYPE_INVALID);
g_signal_handler_unblock(G_OBJECT(binding->channel), binding->channel_handler);
+ g_slice_free(FakeGdkRGBA, color);
}
static void
diff -Nru xfconf-4.19.3/xfconf-query/Makefile.in xfconf-4.20.0/xfconf-query/Makefile.in
--- xfconf-4.19.3/xfconf-query/Makefile.in 2024-10-18 14:12:06.000000000 +0800
+++ xfconf-4.20.0/xfconf-query/Makefile.in 2024-12-15 17:33:37.000000000 +0800
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.17 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2024 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -70,8 +70,6 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-am__rm_f = rm -f $(am__rm_f_notfound)
-am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -339,10 +337,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
-am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -483,11 +479,16 @@
`; \
test -n "$$list" || exit 0; \
echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(bindir)" && $(am__rm_f) $$files
+ cd "$(DESTDIR)$(bindir)" && rm -f $$files
clean-binPROGRAMS:
- $(am__rm_f) $(bin_PROGRAMS)
- test -z "$(EXEEXT)" || $(am__rm_f) $(bin_PROGRAMS:$(EXEEXT)=)
+ @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+ echo " rm -f" $$list; \
+ rm -f $$list || exit $$?; \
+ test -n "$(EXEEXT)" || exit 0; \
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
xfconf-query$(EXEEXT): $(xfconf_query_OBJECTS) $(xfconf_query_DEPENDENCIES) $(EXTRA_xfconf_query_DEPENDENCIES)
@rm -f xfconf-query$(EXEEXT)
@@ -503,7 +504,7 @@
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
- @: >>$@
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
am--depfiles: $(am__depfiles_remade)
@@ -666,8 +667,8 @@
clean-generic:
distclean-generic:
- -$(am__rm_f) $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -677,7 +678,7 @@
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
- -rm -f ./$(DEPDIR)/xfconf_query-main.Po
+ -rm -f ./$(DEPDIR)/xfconf_query-main.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -723,7 +724,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -f ./$(DEPDIR)/xfconf_query-main.Po
+ -rm -f ./$(DEPDIR)/xfconf_query-main.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -764,10 +765,3 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-
-# Tell GNU make to disable its built-in pattern rules.
-%:: %,v
-%:: RCS/%,v
-%:: RCS/%
-%:: s.%
-%:: SCCS/s.%
diff -Nru xfconf-4.19.3/xfconf-query/main.c xfconf-4.20.0/xfconf-query/main.c
--- xfconf-4.19.3/xfconf-query/main.c 2024-09-18 23:01:20.000000000 +0800
+++ xfconf-4.20.0/xfconf-query/main.c 2024-11-02 04:39:36.000000000 +0800
@@ -122,7 +122,18 @@
if (G_TYPE_PTR_ARRAY != G_VALUE_TYPE(property_value)) {
string = _xfconf_string_from_gvalue(property_value);
} else {
- string = g_strdup("<<UNSUPPORTED>>");
+ GPtrArray *arr = g_value_get_boxed(property_value);
+ gchar **strv = g_new0(gchar *, arr->len + 1);
+ gchar *str;
+
+ for (guint i = 0; i < arr->len; ++i) {
+ GValue *item_value = g_ptr_array_index(arr, i);
+ strv[i] = _xfconf_string_from_gvalue(item_value);
+ }
+ str = g_strjoinv(",", strv);
+ string = g_strdup_printf("[%s]", str);
+ g_free(str);
+ g_strfreev(strv);
}
g_print(format, (gchar *)li->data, string);
diff -Nru xfconf-4.19.3/xfconfd/Makefile.in xfconf-4.20.0/xfconfd/Makefile.in
--- xfconf-4.19.3/xfconfd/Makefile.in 2024-10-18 14:12:09.000000000 +0800
+++ xfconf-4.20.0/xfconfd/Makefile.in 2024-12-15 17:33:37.000000000 +0800
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.17 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2024 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -71,8 +71,6 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-am__rm_f = rm -f $(am__rm_f_notfound)
-am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -222,9 +220,10 @@
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__uninstall_files_from_dir = { \
- { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
}
DATA = $(service_DATA) $(systemd_user_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
@@ -398,10 +397,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
-am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -570,17 +567,22 @@
`; \
test -n "$$list" || exit 0; \
echo " ( cd '$(DESTDIR)$(xfconfddir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(xfconfddir)" && $(am__rm_f) $$files
+ cd "$(DESTDIR)$(xfconfddir)" && rm -f $$files
clean-xfconfdPROGRAMS:
- $(am__rm_f) $(xfconfd_PROGRAMS)
- test -z "$(EXEEXT)" || $(am__rm_f) $(xfconfd_PROGRAMS:$(EXEEXT)=)
+ @list='$(xfconfd_PROGRAMS)'; test -n "$$list" || exit 0; \
+ echo " rm -f" $$list; \
+ rm -f $$list || exit $$?; \
+ test -n "$(EXEEXT)" || exit 0; \
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
$(top_builddir)/common/$(am__dirstamp):
@$(MKDIR_P) $(top_builddir)/common
- @: >>$(top_builddir)/common/$(am__dirstamp)
+ @: > $(top_builddir)/common/$(am__dirstamp)
$(top_builddir)/common/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) $(top_builddir)/common/$(DEPDIR)
- @: >>$(top_builddir)/common/$(DEPDIR)/$(am__dirstamp)
+ @: > $(top_builddir)/common/$(DEPDIR)/$(am__dirstamp)
$(top_builddir)/common/xfconfd-xfconf-types.$(OBJEXT): \
$(top_builddir)/common/$(am__dirstamp) \
$(top_builddir)/common/$(DEPDIR)/$(am__dirstamp)
@@ -607,7 +609,7 @@
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
- @: >>$@
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
am--depfiles: $(am__depfiles_remade)
@@ -911,13 +913,13 @@
mostlyclean-generic:
clean-generic:
- -$(am__rm_f) $(CLEANFILES)
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
- -$(am__rm_f) $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
- -$(am__rm_f) $(top_builddir)/common/$(DEPDIR)/$(am__dirstamp)
- -$(am__rm_f) $(top_builddir)/common/$(am__dirstamp)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -test -z "$(top_builddir)/common/$(DEPDIR)/$(am__dirstamp)" || rm -f $(top_builddir)/common/$(DEPDIR)/$(am__dirstamp)
+ -test -z "$(top_builddir)/common/$(am__dirstamp)" || rm -f $(top_builddir)/common/$(am__dirstamp)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -928,7 +930,7 @@
mostlyclean-am
distclean: distclean-am
- -rm -f $(top_builddir)/common/$(DEPDIR)/xfconfd-xfconf-types.Po
+ -rm -f $(top_builddir)/common/$(DEPDIR)/xfconfd-xfconf-types.Po
-rm -f ./$(DEPDIR)/xfconfd-main.Po
-rm -f ./$(DEPDIR)/xfconfd-xfconf-backend-factory.Po
-rm -f ./$(DEPDIR)/xfconfd-xfconf-backend-perchannel-xml.Po
@@ -982,7 +984,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -f $(top_builddir)/common/$(DEPDIR)/xfconfd-xfconf-types.Po
+ -rm -f $(top_builddir)/common/$(DEPDIR)/xfconfd-xfconf-types.Po
-rm -f ./$(DEPDIR)/xfconfd-main.Po
-rm -f ./$(DEPDIR)/xfconfd-xfconf-backend-factory.Po
-rm -f ./$(DEPDIR)/xfconfd-xfconf-backend-perchannel-xml.Po
@@ -1045,10 +1047,3 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-
-# Tell GNU make to disable its built-in pattern rules.
-%:: %,v
-%:: RCS/%,v
-%:: RCS/%
-%:: s.%
-%:: SCCS/s.%