[pulseaudio] 01/01: New upstream version 9.99.1
Felipe Sateler
fsateler at moszumanska.debian.org
Thu Jan 5 12:35:26 UTC 2017
This is an automated email from the git hooks/post-receive script.
fsateler pushed a commit to branch upstream
in repository pulseaudio.
commit a30a2467ee3991956fef573ab8f02869b6d5a546
Author: Felipe Sateler <fsateler at debian.org>
Date: Tue Jan 3 21:03:22 2017 -0300
New upstream version 9.99.1
---
.tarball-version | 2 +-
.version | 2 +-
LICENSE | 8 +-
Makefile.in | 8 +-
PROTOCOL | 12 +
aclocal.m4 | 211 +-
build-aux/config.guess | 165 +-
build-aux/config.sub | 56 +-
build-aux/install-sh | 23 +-
build-aux/ltmain.sh | 5511 ++++++++++++++---------
config.h.in | 3 +-
configure | 3831 ++++++++--------
configure.ac | 43 +-
doxygen/Makefile.in | 6 +-
m4/libtool.m4 | 2583 ++++++-----
m4/ltoptions.m4 | 127 +-
m4/ltsugar.m4 | 7 +-
m4/ltversion.m4 | 12 +-
m4/lt~obsolete.m4 | 7 +-
man/Makefile.in | 6 +-
man/default.pa.5 | 6 +-
man/pax11publish.1 | 2 +-
man/pulse-cli-syntax.5 | 4 +-
man/pulse-client.conf.5 | 6 +-
man/pulse-daemon.conf.5 | 10 +-
man/pulse-daemon.conf.5.xml.in | 2 +-
man/pulseaudio.1 | 6 +-
po/LINGUAS | 2 +
po/POTFILES.in | 1 +
po/{pl.po => be.po} | 1742 ++++---
po/de.po | 4960 ++++++++++----------
po/{de.po => gl.po} | 2142 ++++-----
po/hu.po | 570 +--
po/ko.po | 4 +-
po/oc.po | 2551 +++--------
po/pl.po | 505 ++-
po/sk.po | 413 +-
src/.gitignore | 2 +
src/Makefile.am | 53 +-
src/Makefile.in | 467 +-
src/daemon/daemon-conf.c | 2 +-
src/daemon/daemon.conf.in | 1 +
src/daemon/main.c | 19 +-
src/daemon/systemd/user/pulseaudio.service.in | 14 +
src/module-allow-passthrough-symdef.h | 29 +
src/module-xenpv-sink-symdef.h | 29 -
src/modules/alsa/alsa-mixer.c | 1 +
src/modules/alsa/alsa-sink.c | 15 +-
src/modules/alsa/alsa-source.c | 15 +-
src/modules/alsa/alsa-ucm.c | 37 +-
src/modules/alsa/alsa-ucm.h | 1 -
src/modules/alsa/alsa-util.c | 16 +-
src/modules/alsa/module-alsa-card.c | 65 +-
src/modules/bluetooth/backend-native.c | 12 +-
src/modules/bluetooth/bluez4-util.c | 135 +-
src/modules/bluetooth/bluez4-util.h | 34 +-
src/modules/bluetooth/bluez5-util.c | 125 +-
src/modules/bluetooth/bluez5-util.h | 4 +-
src/modules/bluetooth/module-bluetooth-policy.c | 215 +-
src/modules/bluetooth/module-bluez4-device.c | 194 +-
src/modules/bluetooth/module-bluez4-discover.c | 6 +-
src/modules/bluetooth/module-bluez5-device.c | 100 +-
src/modules/echo-cancel/module-echo-cancel.c | 5 +
src/modules/echo-cancel/webrtc.cc | 4 +-
src/modules/jack/module-jack-sink.c | 10 +-
src/modules/jack/module-jack-source.c | 11 +-
src/modules/macosx/module-coreaudio-device.c | 18 +-
src/modules/module-allow-passthrough.c | 312 ++
src/modules/module-card-restore.c | 68 +-
src/modules/module-combine-sink.c | 28 +-
src/modules/module-esound-sink.c | 7 +-
src/modules/module-ladspa-sink.c | 7 +-
src/modules/module-loopback.c | 173 +-
src/modules/module-null-sink.c | 6 +-
src/modules/module-null-source.c | 6 +-
src/modules/module-pipe-sink.c | 11 +-
src/modules/module-pipe-source.c | 6 +-
src/modules/module-sine-source.c | 6 +-
src/modules/module-solaris.c | 6 +-
src/modules/module-suspend-on-idle.c | 34 +-
src/modules/module-tunnel-sink-new.c | 6 +-
src/modules/module-tunnel-source-new.c | 6 +-
src/modules/module-tunnel.c | 6 +-
src/modules/module-waveout.c | 6 +-
src/modules/module-zeroconf-discover.c | 12 +-
src/modules/module-zeroconf-publish.c | 96 +-
src/modules/oss/module-oss.c | 7 +-
src/modules/raop/base64.c | 2 +-
src/modules/raop/base64.h | 4 +-
src/modules/raop/module-raop-sink.c | 7 +-
src/modules/raop/raop_client.c | 22 +-
src/modules/rtp/rtp.c | 66 +-
src/modules/rtp/rtp.h | 2 +
src/modules/stream-interaction.c | 13 +-
src/modules/xen/gntalloc.h | 88 -
src/modules/xen/gntdev.h | 156 -
src/modules/xen/module-xenpv-sink.c | 798 ----
src/pulse/context.c | 14 +-
src/pulse/format.c | 226 +-
src/pulse/internal.h | 6 +
src/pulse/json.c | 614 +++
src/pulse/json.h | 53 +
src/pulse/sample.c | 11 +-
src/pulse/stream.c | 15 +-
src/pulse/version.h | 6 +-
src/pulsecore/asyncmsgq.c | 7 +-
src/pulsecore/atomic.h | 2 +-
src/pulsecore/card.c | 114 +-
src/pulsecore/card.h | 14 +-
src/pulsecore/core-util.c | 57 +-
src/pulsecore/core-util.h | 17 +
src/pulsecore/core.h | 1 +
src/pulsecore/device-port.c | 7 +-
src/pulsecore/device-port.h | 3 +
src/pulsecore/filter/LICENSE.WEBKIT | 27 +
src/pulsecore/iochannel.c | 4 +-
src/pulsecore/macro.h | 25 +-
src/pulsecore/memblock.c | 5 +-
src/pulsecore/memblockq.c | 16 +-
src/pulsecore/memblockq.h | 5 +-
src/pulsecore/modargs.c | 54 +-
src/pulsecore/modargs.h | 27 +-
src/pulsecore/module.c | 16 +-
src/pulsecore/protocol-native.c | 290 +-
src/pulsecore/pstream.c | 35 +-
src/pulsecore/sample-util.c | 2 +-
src/pulsecore/shm.c | 17 +-
src/pulsecore/sink-input.c | 50 +-
src/pulsecore/sink-input.h | 25 +
src/pulsecore/sink.c | 73 +-
src/pulsecore/sink.h | 19 +-
src/pulsecore/source-output.c | 51 +-
src/pulsecore/source-output.h | 25 +
src/pulsecore/source.c | 57 +-
src/pulsecore/source.h | 16 +-
src/pulsecore/thread-mq.c | 40 +-
src/pulsecore/thread-mq.h | 4 +-
src/tests/alsa-time-test.c | 1 +
src/tests/core-util-test.c | 284 ++
src/tests/cpu-mix-test.c | 2 +-
src/tests/cpu-remap-test.c | 4 +-
src/tests/cpu-volume-test.c | 2 +-
src/tests/interpol-test.c | 2 +-
src/tests/json-test.c | 280 ++
src/tests/lfe-filter-test.c | 4 +-
src/tests/lo-test-util.c | 20 +-
src/tests/memblockq-test.c | 487 +-
src/tests/mix-test.c | 2 +-
src/tests/remix-test.c | 2 +-
src/tests/rtpoll-test.c | 4 +-
src/tests/sigbus-test.c | 13 +-
src/tests/stripnul.c | 5 +-
src/tests/utf8-test.c | 6 +-
src/utils/pacat.c | 97 +-
src/utils/padsp.c | 11 +-
src/utils/qpaeq | 8 +-
156 files changed, 17609 insertions(+), 14830 deletions(-)
diff --git a/.tarball-version b/.tarball-version
index dd98ee6..d5898af 100644
--- a/.tarball-version
+++ b/.tarball-version
@@ -1 +1 @@
-9.0
+9.99.1
diff --git a/.version b/.version
index dd98ee6..d5898af 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-9.0
+9.99.1
diff --git a/LICENSE b/LICENSE
index 6932317..1459b1d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
-All PulseAudio source files are licensed under the GNU Lesser General Public
-License. (see file LGPL for details)
+All PulseAudio source files, except as noted below, are licensed under the GNU
+Lesser General Public License. (see file LGPL for details)
However, the server side has optional GPL dependencies. These include the
libsamplerate and gdbm (core libraries), LIRC (lirc module) and FFTW (equalizer
@@ -35,6 +35,10 @@ src/pulsecore/filter/LICENSE.WEBKIT for details.
Additionally, a more permissive Sun license is used for code that performs
u-law, A-law and linear PCM conversions.
+The qpaeq program (src/utils/qpaeq) is licensed under the GNU Affero General
+Public License (version 3, or any later version at your discretion). See the
+file AGPL for details.
+
While we attempt to provide a summary here, it is the ultimate responsibility of
the packager to ensure the components they use in their build of PulseAudio
meets their license requirements.
diff --git a/Makefile.in b/Makefile.in
index 60489c2..54d37bf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -241,7 +241,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.in \
$(top_srcdir)/build-aux/missing \
$(top_srcdir)/src/pulse/version.h.in ABOUT-NLS NEWS README \
build-aux/compile build-aux/config.guess \
- build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
+ build-aux/config.rpath build-aux/config.sub \
build-aux/install-sh build-aux/ltmain.sh build-aux/missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
@@ -391,8 +391,6 @@ LIBCHECK_CFLAGS = @LIBCHECK_CFLAGS@
LIBCHECK_LIBS = @LIBCHECK_LIBS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBJSON_CFLAGS = @LIBJSON_CFLAGS@
-LIBJSON_LIBS = @LIBJSON_LIBS@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBPULSE_MAINLOOP_GLIB_VERSION_INFO = @LIBPULSE_MAINLOOP_GLIB_VERSION_INFO@
@@ -416,6 +414,7 @@ LN_S = @LN_S@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
M4 = @M4@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -502,8 +501,6 @@ WEBRTC_CFLAGS = @WEBRTC_CFLAGS@
WEBRTC_LIBS = @WEBRTC_LIBS@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
-XEN_CFLAGS = @XEN_CFLAGS@
-XEN_LIBS = @XEN_LIBS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
@@ -558,6 +555,7 @@ prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
pulseconfdir = @pulseconfdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/PROTOCOL b/PROTOCOL
index 5191397..546998b 100644
--- a/PROTOCOL
+++ b/PROTOCOL
@@ -408,6 +408,18 @@ By doing so, there's need to reference the pool's memfd file descriptor any
further -- just its ID. Thus both endpoints can then quickly and safely
close their memfd file descriptors.
+## v32, implemented by >= 10.0
+
+Enable memfd transport by default.
+
+This protocol bump was only created to mark 9.0 clients. Although they
+support memfd transport, such older clients has an iochannel bug that would
+break memfd audio if they're run in 32-bit mode over a 64-bit kernel. Thus
+influence these buggy libraries to use POSIX shared memory, by signalling
+memfd support only to 10.0+ clients.
+
+Check commit 451d1d676237c81 for further details.
+
#### If you just changed the protocol, read this
## module-tunnel depends on the sink/source/sink-input/source-input protocol
## internals, so if you changed these, you might have broken module-tunnel.
diff --git a/aclocal.m4 b/aclocal.m4
index def2c5d..6bf6efb 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -20,32 +20,63 @@ 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'.])])
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-#
-# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
+dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+dnl serial 11 (pkg-config-0.29)
+dnl
+dnl Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists at gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+ [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
@@ -67,18 +98,19 @@ if test -n "$PKG_CONFIG"; then
PKG_CONFIG=""
fi
fi[]dnl
-])# PKG_PROG_PKG_CONFIG
+])dnl PKG_PROG_PKG_CONFIG
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists. Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
AC_DEFUN([PKG_CHECK_EXISTS],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
if test -n "$PKG_CONFIG" && \
@@ -88,8 +120,10 @@ m4_ifvaln([$3], [else
$3])dnl
fi])
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
m4_define([_PKG_CONFIG],
[if test -n "$$1"; then
pkg_cv_[]$1="$$1"
@@ -101,10 +135,11 @@ m4_define([_PKG_CONFIG],
else
pkg_failed=untried
fi[]dnl
-])# _PKG_CONFIG
+])dnl _PKG_CONFIG
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -112,19 +147,17 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
else
_pkg_short_errors_supported=no
fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
AC_DEFUN([PKG_CHECK_MODULES],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
@@ -178,16 +211,40 @@ else
AC_MSG_RESULT([yes])
$3
fi[]dnl
-])# PKG_CHECK_MODULES
+])dnl PKG_CHECK_MODULES
+
+
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
-# PKG_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable pkgconfigdir as the location where a module
-# should install pkg-config .pc files. By default the directory is
-# $libdir/pkgconfig, but the default can be changed by passing
-# DIRECTORY. The user can override through the --with-pkgconfigdir
-# parameter.
+dnl PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
AC_DEFUN([PKG_INSTALLDIR],
[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
m4_pushdef([pkg_description],
@@ -198,16 +255,18 @@ AC_ARG_WITH([pkgconfigdir],
AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
m4_popdef([pkg_default])
m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
+])dnl PKG_INSTALLDIR
-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable noarch_pkgconfigdir as the location where a
-# module should install arch-independent pkg-config .pc files. By
-# default the directory is $datadir/pkgconfig, but the default can be
-# changed by passing DIRECTORY. The user can override through the
-# --with-noarch-pkgconfigdir parameter.
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
AC_DEFUN([PKG_NOARCH_INSTALLDIR],
[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
m4_pushdef([pkg_description],
@@ -218,13 +277,15 @@ AC_ARG_WITH([noarch-pkgconfigdir],
AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
m4_popdef([pkg_default])
m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR
+])dnl PKG_NOARCH_INSTALLDIR
-# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# -------------------------------------------
-# Retrieves the value of the pkg-config variable for the given module.
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------
+dnl Since: 0.28
+dnl
+dnl Retrieves the value of the pkg-config variable for the given module.
AC_DEFUN([PKG_CHECK_VAR],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
@@ -233,7 +294,7 @@ _PKG_CONFIG([$1], [variable="][$3]["], [$2])
AS_VAR_COPY([$1], [pkg_cv_][$1])
AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])# PKG_CHECK_VAR
+])dnl PKG_CHECK_VAR
# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
diff --git a/build-aux/config.guess b/build-aux/config.guess
index dbfb978..2e9ad7f 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2015 Free Software Foundation, Inc.
+# Copyright 1992-2016 Free Software Foundation, Inc.
-timestamp='2015-01-01'
+timestamp='2016-10-02'
# 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
@@ -27,7 +27,7 @@ timestamp='2015-01-01'
# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
#
# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
#
# Please send patches to <config-patches at gnu.org>.
@@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2016 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."
@@ -168,19 +168,29 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# Note: NetBSD doesn't particularly care about the vendor
# portion of the name. We always set it to "unknown".
sysctl="sysctl -n hw.machine_arch"
- UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
- /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+ UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+ /sbin/$sysctl 2>/dev/null || \
+ /usr/sbin/$sysctl 2>/dev/null || \
+ echo unknown)`
case "${UNAME_MACHINE_ARCH}" in
armeb) machine=armeb-unknown ;;
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
sh5el) machine=sh5le-unknown ;;
+ earmv*)
+ arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+ endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
+ machine=${arch}${endian}-unknown
+ ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
- # to ELF recently, or will in the future.
+ # to ELF recently (or will in the future) and ABI.
case "${UNAME_MACHINE_ARCH}" in
+ earm*)
+ os=netbsdelf
+ ;;
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -197,6 +207,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
os=netbsd
;;
esac
+ # Determine ABI tags.
+ case "${UNAME_MACHINE_ARCH}" in
+ earm*)
+ expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+ abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+ ;;
+ esac
# The OS release
# Debian GNU/NetBSD machines have a different userland, and
# thus, need a distinct triplet. However, they do not need
@@ -207,13 +224,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
release='-gnu'
;;
*)
- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
;;
esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}"
+ echo "${machine}-${os}${release}${abi}"
exit ;;
*:Bitrig:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@@ -223,6 +240,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
exit ;;
+ *:LibertyBSD:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+ echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
+ exit ;;
*:ekkoBSD:*:*)
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
exit ;;
@@ -235,6 +256,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:MirBSD:*:*)
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
exit ;;
+ *:Sortix:*:*)
+ echo ${UNAME_MACHINE}-unknown-sortix
+ exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
@@ -251,42 +275,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
case "$ALPHA_CPU_TYPE" in
"EV4 (21064)")
- UNAME_MACHINE="alpha" ;;
+ UNAME_MACHINE=alpha ;;
"EV4.5 (21064)")
- UNAME_MACHINE="alpha" ;;
+ UNAME_MACHINE=alpha ;;
"LCA4 (21066/21068)")
- UNAME_MACHINE="alpha" ;;
+ UNAME_MACHINE=alpha ;;
"EV5 (21164)")
- UNAME_MACHINE="alphaev5" ;;
+ UNAME_MACHINE=alphaev5 ;;
"EV5.6 (21164A)")
- UNAME_MACHINE="alphaev56" ;;
+ UNAME_MACHINE=alphaev56 ;;
"EV5.6 (21164PC)")
- UNAME_MACHINE="alphapca56" ;;
+ UNAME_MACHINE=alphapca56 ;;
"EV5.7 (21164PC)")
- UNAME_MACHINE="alphapca57" ;;
+ UNAME_MACHINE=alphapca57 ;;
"EV6 (21264)")
- UNAME_MACHINE="alphaev6" ;;
+ UNAME_MACHINE=alphaev6 ;;
"EV6.7 (21264A)")
- UNAME_MACHINE="alphaev67" ;;
+ UNAME_MACHINE=alphaev67 ;;
"EV6.8CB (21264C)")
- UNAME_MACHINE="alphaev68" ;;
+ UNAME_MACHINE=alphaev68 ;;
"EV6.8AL (21264B)")
- UNAME_MACHINE="alphaev68" ;;
+ UNAME_MACHINE=alphaev68 ;;
"EV6.8CX (21264D)")
- UNAME_MACHINE="alphaev68" ;;
+ UNAME_MACHINE=alphaev68 ;;
"EV6.9A (21264/EV69A)")
- UNAME_MACHINE="alphaev69" ;;
+ UNAME_MACHINE=alphaev69 ;;
"EV7 (21364)")
- UNAME_MACHINE="alphaev7" ;;
+ UNAME_MACHINE=alphaev7 ;;
"EV7.9 (21364A)")
- UNAME_MACHINE="alphaev79" ;;
+ UNAME_MACHINE=alphaev79 ;;
esac
# A Pn.n version is a patched version.
# A Vn.n version is a released version.
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
exitcode=$?
trap '' 0
@@ -359,16 +383,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
eval $set_cc_for_build
- SUN_ARCH="i386"
+ SUN_ARCH=i386
# If there is a compiler, see if it is configured for 64-bit objects.
# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
# This test works for both compilers.
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
grep IS_64BIT_ARCH >/dev/null
then
- SUN_ARCH="x86_64"
+ SUN_ARCH=x86_64
fi
fi
echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
@@ -393,7 +417,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
exit ;;
sun*:*:4.2BSD:*)
UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
- test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+ test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
case "`/bin/arch`" in
sun3)
echo m68k-sun-sunos${UNAME_RELEASE}
@@ -618,13 +642,13 @@ EOF
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
case "${sc_cpu_version}" in
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+ 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+ 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
532) # CPU_PA_RISC2_0
case "${sc_kernel_bits}" in
- 32) HP_ARCH="hppa2.0n" ;;
- 64) HP_ARCH="hppa2.0w" ;;
- '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
+ 32) HP_ARCH=hppa2.0n ;;
+ 64) HP_ARCH=hppa2.0w ;;
+ '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
esac ;;
esac
fi
@@ -663,11 +687,11 @@ EOF
exit (0);
}
EOF
- (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
test -z "$HP_ARCH" && HP_ARCH=hppa
fi ;;
esac
- if [ ${HP_ARCH} = "hppa2.0w" ]
+ if [ ${HP_ARCH} = hppa2.0w ]
then
eval $set_cc_for_build
@@ -680,12 +704,12 @@ EOF
# $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
# => hppa64-hp-hpux11.23
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+ if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
grep -q __LP64__
then
- HP_ARCH="hppa2.0w"
+ HP_ARCH=hppa2.0w
else
- HP_ARCH="hppa64"
+ HP_ARCH=hppa64
fi
fi
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -790,14 +814,14 @@ EOF
echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
5000:UNIX_System_V:4.*:*)
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
@@ -879,7 +903,7 @@ EOF
exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
@@ -902,7 +926,7 @@ EOF
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+ if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
arc:Linux:*:* | arceb:Linux:*:*)
@@ -933,6 +957,9 @@ EOF
crisv32:Linux:*:*)
echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
+ e2k:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
frv:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
@@ -945,6 +972,9 @@ EOF
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
+ k1om:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
m32r*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
@@ -970,6 +1000,9 @@ EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;;
+ mips64el:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
openrisc*:Linux:*:*)
echo or1k-unknown-linux-${LIBC}
exit ;;
@@ -1002,6 +1035,9 @@ EOF
ppcle:Linux:*:*)
echo powerpcle-unknown-linux-${LIBC}
exit ;;
+ riscv32:Linux:*:* | riscv64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
exit ;;
@@ -1021,7 +1057,7 @@ EOF
echo ${UNAME_MACHINE}-dec-linux-${LIBC}
exit ;;
x86_64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
exit ;;
xtensa*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -1100,7 +1136,7 @@ EOF
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i586.
# Note: whatever this is, it MUST be the same as what config.sub
- # prints for the "djgpp" host, or else GDB configury will decide that
+ # prints for the "djgpp" host, or else GDB configure will decide that
# this is a cross-build.
echo i586-pc-msdosdjgpp
exit ;;
@@ -1249,6 +1285,9 @@ EOF
SX-8R:SUPER-UX:*:*)
echo sx8r-nec-superux${UNAME_RELEASE}
exit ;;
+ SX-ACE:SUPER-UX:*:*)
+ echo sxace-nec-superux${UNAME_RELEASE}
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
@@ -1262,9 +1301,9 @@ EOF
UNAME_PROCESSOR=powerpc
fi
if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
grep IS_64BIT_ARCH >/dev/null
then
case $UNAME_PROCESSOR in
@@ -1286,7 +1325,7 @@ EOF
exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p`
- if test "$UNAME_PROCESSOR" = "x86"; then
+ if test "$UNAME_PROCESSOR" = x86; then
UNAME_PROCESSOR=i386
UNAME_MACHINE=pc
fi
@@ -1317,7 +1356,7 @@ EOF
# "uname -m" is not consistent, so use $cputype instead. 386
# is converted to i386 for consistency with other x86
# operating systems.
- if test "$cputype" = "386"; then
+ if test "$cputype" = 386; then
UNAME_MACHINE=i386
else
UNAME_MACHINE="$cputype"
@@ -1359,7 +1398,7 @@ EOF
echo i386-pc-xenix
exit ;;
i*86:skyos:*:*)
- echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
exit ;;
i*86:rdos:*:*)
echo ${UNAME_MACHINE}-pc-rdos
@@ -1370,23 +1409,25 @@ EOF
x86_64:VMkernel:*:*)
echo ${UNAME_MACHINE}-unknown-esx
exit ;;
+ amd64:Isilon\ OneFS:*:*)
+ echo x86_64-unknown-onefs
+ exit ;;
esac
cat >&2 <<EOF
$0: unable to guess system type
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
+This script (version $timestamp), has failed to recognize the
+operating system you are using. If your script is old, overwrite
+config.guess and config.sub with the latest versions from:
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
and
- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches at gnu.org> in order to provide the needed
-information to handle your system.
+If $0 has already been updated, send the following data and any
+information you think might be pertinent to config-patches at gnu.org to
+provide the necessary information to handle your system.
config.guess timestamp = $timestamp
diff --git a/build-aux/config.sub b/build-aux/config.sub
index 6467c95..dd2ca93 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -1,8 +1,8 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2015 Free Software Foundation, Inc.
+# Copyright 1992-2016 Free Software Foundation, Inc.
-timestamp='2015-01-01'
+timestamp='2016-11-04'
# 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
@@ -33,7 +33,7 @@ timestamp='2015-01-01'
# Otherwise, we print the canonical config type on stdout and succeed.
# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
@@ -53,8 +53,7 @@ timestamp='2015-01-01'
me=`echo "$0" | sed -e 's,.*/,,'`
usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
- $0 [OPTION] ALIAS
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
Canonicalize a configuration name.
@@ -68,7 +67,7 @@ Report bugs and patches to <config-patches at gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2016 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."
@@ -117,8 +116,8 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
- knetbsd*-gnu* | netbsd*-gnu* | \
- kopensolaris*-gnu* | \
+ knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
+ kopensolaris*-gnu* | cloudabi*-eabi* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -255,11 +254,12 @@ case $basic_machine in
| arc | arceb \
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
| avr | avr32 \
+ | ba \
| be32 | be64 \
| bfin \
| c4x | c8051 | clipper \
| d10v | d30v | dlx | dsp16xx \
- | epiphany \
+ | e2k | epiphany \
| fido | fr30 | frv | ft32 \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| hexagon \
@@ -301,11 +301,12 @@ case $basic_machine in
| open8 | or1k | or1knd | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
+ | pru \
| pyramid \
| riscv32 | riscv64 \
| rl78 | rx \
| score \
- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -376,12 +377,13 @@ case $basic_machine in
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
+ | ba-* \
| be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
| c8051-* | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
- | elxsi-* \
+ | e2k-* | elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
@@ -427,13 +429,15 @@ case $basic_machine in
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+ | pru-* \
| pyramid-* \
+ | riscv32-* | riscv64-* \
| rl78-* | romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
| tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tile*-* \
@@ -518,6 +522,9 @@ case $basic_machine in
basic_machine=i386-pc
os=-aros
;;
+ asmjs)
+ basic_machine=asmjs-unknown
+ ;;
aux)
basic_machine=m68k-apple
os=-aux
@@ -638,6 +645,14 @@ case $basic_machine in
basic_machine=m68k-bull
os=-sysv3
;;
+ e500v[12])
+ basic_machine=powerpc-unknown
+ os=$os"spe"
+ ;;
+ e500v[12]-*)
+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=$os"spe"
+ ;;
ebmon29k)
basic_machine=a29k-amd
os=-ebmon
@@ -1017,7 +1032,7 @@ case $basic_machine in
ppc-* | ppcbe-*)
basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- ppcle | powerpclittle | ppc-le | powerpc-little)
+ ppcle | powerpclittle)
basic_machine=powerpcle-unknown
;;
ppcle-* | powerpclittle-*)
@@ -1025,9 +1040,9 @@ case $basic_machine in
;;
ppc64) basic_machine=powerpc64-unknown
;;
- ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+ ppc64le | powerpc64little)
basic_machine=powerpc64le-unknown
;;
ppc64le-* | powerpc64little-*)
@@ -1373,18 +1388,18 @@ case $os in
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
| -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* \
+ | -aos* | -aros* | -cloudabi* | -sortix* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
- | -bitrig* | -openbsd* | -solidbsd* \
+ | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+ | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
@@ -1393,7 +1408,8 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+ | -onefs* | -tirtos* | -phoenix* | -fuchsia*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1525,6 +1541,8 @@ case $os in
;;
-nacl*)
;;
+ -ios)
+ ;;
-none)
;;
*)
diff --git a/build-aux/install-sh b/build-aux/install-sh
index 0b0fdcb..59990a1 100755
--- a/build-aux/install-sh
+++ b/build-aux/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2013-12-25.23; # UTC
+scriptversion=2014-09-12.12; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -324,34 +324,41 @@ do
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
;;
*)
+ # $RANDOM is not portable (e.g. dash); use it when possible to
+ # lower collision chance
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+ trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
+ # As "mkdir -p" follows symlinks and we work in /tmp possibly; so
+ # create the $tmpdir first (and fail if unsuccessful) to make sure
+ # that nobody tries to guess the $tmpdir name.
if (umask $mkdir_umask &&
- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+ $mkdirprog $mkdir_mode "$tmpdir" &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
then
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
- ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ test_tmpdir="$tmpdir/a"
+ ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
case $ls_ld_tmpdir in
d????-?r-*) different_mode=700;;
d????-?--*) different_mode=755;;
*) false;;
esac &&
- $mkdirprog -m$different_mode -p -- "$tmpdir" && {
- ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
}
}
then posix_mkdir=:
fi
- rmdir "$tmpdir/d" "$tmpdir"
+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
else
# Remove any dirs left behind by ancient mkdir implementations.
- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
fi
trap '' 0;;
esac;;
diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh
index 63ae69d..a736cf9 100644
--- a/build-aux/ltmain.sh
+++ b/build-aux/ltmain.sh
@@ -1,9 +1,12 @@
+#! /bin/sh
+## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
+## by inline-source v2014-01-03.01
-# libtool (GNU libtool) 2.4.2
+# libtool (GNU libtool) 2.4.6
+# Provide generalized library-building support services.
# Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2015 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.
@@ -23,881 +26,2112 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
-# or obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Usage: $progname [OPTION]... [MODE-ARG]...
-#
-# Provide generalized library-building support services.
-#
-# --config show all configuration variables
-# --debug enable verbose shell tracing
-# -n, --dry-run display commands without modifying any files
-# --features display basic configuration information and exit
-# --mode=MODE use operation mode MODE
-# --preserve-dup-deps don't remove duplicate dependency libraries
-# --quiet, --silent don't print informational messages
-# --no-quiet, --no-silent
-# print informational messages (default)
-# --no-warn don't display warning messages
-# --tag=TAG use configuration variables from tag TAG
-# -v, --verbose print more informational messages than default
-# --no-verbose don't print the extra informational messages
-# --version print version information
-# -h, --help, --help-all print short, long, or detailed help message
-#
-# MODE must be one of the following:
-#
-# clean remove files from the build directory
-# compile compile a source file into a libtool object
-# execute automatically set library path, then run a program
-# finish complete the installation of libtool libraries
-# install install libraries or executables
-# link create a library or an executable
-# uninstall remove libraries from an installed directory
-#
-# MODE-ARGS vary depending on the MODE. When passed as first option,
-# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
-# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
-#
-# When reporting a bug, please describe a test case to reproduce it and
-# include the following information:
-#
-# host-triplet: $host
-# shell: $SHELL
-# compiler: $LTCC
-# compiler flags: $LTCFLAGS
-# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.4.2
-# automake: $automake_version
-# autoconf: $autoconf_version
-#
-# Report bugs to <bug-libtool at gnu.org>.
-# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
-# General help using GNU software: <http://www.gnu.org/gethelp/>.
PROGRAM=libtool
PACKAGE=libtool
-VERSION=2.4.2
-TIMESTAMP=""
-package_revision=1.3337
+VERSION="2.4.6 Debian-2.4.6-2"
+package_revision=2.4.6
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Run './libtool --help' for help with using this script from the
+# command line.
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# After configure completes, it has a better idea of some of the
+# shell tools we need than the defaults used by the functions shared
+# with bootstrap, so set those here where they can still be over-
+# ridden by the user, but otherwise take precedence.
+
+: ${AUTOCONF="autoconf"}
+: ${AUTOMAKE="automake"}
+
+
+## -------------------------- ##
+## Source external libraries. ##
+## -------------------------- ##
+
+# Much of our low-level functionality needs to be sourced from external
+# libraries, which are installed to $pkgauxdir.
+
+# Set a version string for this script.
+scriptversion=2015-01-20.17; # UTC
+
+# General shell script boiler plate, and helper functions.
+# Written by Gary V. Vaughan, 2004
+
+# Copyright (C) 2004-2015 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.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# As a special exception to the GNU General Public License, if you distribute
+# this file as part of a program or library that is built using GNU Libtool,
+# you may include this file under the same distribution terms that you use
+# for the rest of that program.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary at gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Evaluate this file near the top of your script to gain access to
+# the functions and variables defined here:
+#
+# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh
+#
+# If you need to override any of the default environment variable
+# settings, do that before evaluating this file.
+
+
+## -------------------- ##
+## Shell normalisation. ##
+## -------------------- ##
+
+# Some shells need a little help to be as Bourne compatible as possible.
+# Before doing anything else, make sure all that help has been provided!
+
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac
fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
- eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-}
-# NLS nuisances: We save the old values to restore during execute mode.
-lt_user_locale=
-lt_safe_locale=
-for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+# NLS nuisances: We save the old values in case they are required later.
+_G_user_locale=
+_G_safe_locale=
+for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
do
- eval "if test \"\${$lt_var+set}\" = set; then
- save_$lt_var=\$$lt_var
- $lt_var=C
- export $lt_var
- lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
- lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+ eval "if test set = \"\${$_G_var+set}\"; then
+ save_$_G_var=\$$_G_var
+ $_G_var=C
+ export $_G_var
+ _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\"
+ _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
fi"
done
-LC_ALL=C
-LANGUAGE=C
-export LANGUAGE LC_ALL
-$lt_unset CDPATH
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# Make sure IFS has a sensible default
+sp=' '
+nl='
+'
+IFS="$sp $nl"
+
+# 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 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
+fi
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
+## ------------------------- ##
+## Locate command utilities. ##
+## ------------------------- ##
+
+
+# func_executable_p FILE
+# ----------------------
+# Check that FILE is an executable regular file.
+func_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+}
+
+
+# func_path_progs PROGS_LIST CHECK_FUNC [PATH]
+# --------------------------------------------
+# Search for either a program that responds to --version with output
+# containing "GNU", or else returned by CHECK_FUNC otherwise, by
+# trying all the directories in PATH with each of the elements of
+# PROGS_LIST.
+#
+# CHECK_FUNC should accept the path to a candidate program, and
+# set $func_check_prog_result if it truncates its output less than
+# $_G_path_prog_max characters.
+func_path_progs ()
+{
+ _G_progs_list=$1
+ _G_check_func=$2
+ _G_PATH=${3-"$PATH"}
+
+ _G_path_prog_max=0
+ _G_path_prog_found=false
+ _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
+ for _G_dir in $_G_PATH; do
+ IFS=$_G_save_IFS
+ test -z "$_G_dir" && _G_dir=.
+ for _G_prog_name in $_G_progs_list; do
+ for _exeext in '' .EXE; do
+ _G_path_prog=$_G_dir/$_G_prog_name$_exeext
+ func_executable_p "$_G_path_prog" || continue
+ case `"$_G_path_prog" --version 2>&1` in
+ *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;;
+ *) $_G_check_func $_G_path_prog
+ func_path_progs_result=$func_check_prog_result
+ ;;
+ esac
+ $_G_path_prog_found && break 3
+ done
+ done
+ done
+ IFS=$_G_save_IFS
+ test -z "$func_path_progs_result" && {
+ echo "no acceptable sed could be found in \$PATH" >&2
+ exit 1
+ }
+}
+
+
+# We want to be able to use the functions in this file before configure
+# has figured out where the best binaries are kept, which means we have
+# to search for them ourselves - except when the results are already set
+# where we skip the searches.
+
+# Unless the user overrides by setting SED, search the path for either GNU
+# sed, or the sed that truncates its output the least.
+test -z "$SED" && {
+ _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+ for _G_i in 1 2 3 4 5 6 7; do
+ _G_sed_script=$_G_sed_script$nl$_G_sed_script
+ done
+ echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed
+ _G_sed_script=
+
+ func_check_prog_sed ()
+ {
+ _G_path_prog=$1
+
+ _G_count=0
+ printf 0123456789 >conftest.in
+ while :
+ do
+ cat conftest.in conftest.in >conftest.tmp
+ mv conftest.tmp conftest.in
+ cp conftest.in conftest.nl
+ echo '' >> conftest.nl
+ "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
+ diff conftest.out conftest.nl >/dev/null 2>&1 || break
+ _G_count=`expr $_G_count + 1`
+ if test "$_G_count" -gt "$_G_path_prog_max"; then
+ # Best one so far, save it but keep looking for a better one
+ func_check_prog_result=$_G_path_prog
+ _G_path_prog_max=$_G_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test 10 -lt "$_G_count" && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out
+ }
+
+ func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
+ rm -f conftest.sed
+ SED=$func_path_progs_result
+}
+
+
+# Unless the user overrides by setting GREP, search the path for either GNU
+# grep, or the grep that truncates its output the least.
+test -z "$GREP" && {
+ func_check_prog_grep ()
+ {
+ _G_path_prog=$1
+
+ _G_count=0
+ _G_path_prog_max=0
+ printf 0123456789 >conftest.in
+ while :
+ do
+ cat conftest.in conftest.in >conftest.tmp
+ mv conftest.tmp conftest.in
+ cp conftest.in conftest.nl
+ echo 'GREP' >> conftest.nl
+ "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
+ diff conftest.out conftest.nl >/dev/null 2>&1 || break
+ _G_count=`expr $_G_count + 1`
+ if test "$_G_count" -gt "$_G_path_prog_max"; then
+ # Best one so far, save it but keep looking for a better one
+ func_check_prog_result=$_G_path_prog
+ _G_path_prog_max=$_G_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test 10 -lt "$_G_count" && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out
+ }
+
+ func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
+ GREP=$func_path_progs_result
+}
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# All uppercase variable names are used for environment variables. These
+# variables can be overridden by the user before calling a script that
+# uses them if a suitable command of that name is not already available
+# in the command search PATH.
: ${CP="cp -f"}
-test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+: ${ECHO="printf %s\n"}
+: ${EGREP="$GREP -E"}
+: ${FGREP="$GREP -F"}
+: ${LN_S="ln -s"}
: ${MAKE="make"}
: ${MKDIR="mkdir"}
: ${MV="mv -f"}
: ${RM="rm -f"}
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-: ${Xsed="$SED -e 1s/^X//"}
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
-EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake.
-
-exit_status=$EXIT_SUCCESS
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" $lt_nl"
-dirname="s,/[^/]*$,,"
-basename="s,^.*/,,"
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
-} # func_dirname may be replaced by extended shell implementation
+## -------------------- ##
+## Useful sed snippets. ##
+## -------------------- ##
+sed_dirname='s|/[^/]*$||'
+sed_basename='s|^.*/||'
-# func_basename file
-func_basename ()
-{
- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-} # func_basename may be replaced by extended shell implementation
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
+# Same as above, but do not quote variable references.
+sed_double_quote_subst='s/\(["`\\]\)/\\\1/g'
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-# dirname: Compute the dirname of FILE. If nonempty,
-# add APPEND to the result, otherwise set result
-# to NONDIR_REPLACEMENT.
-# value returned in "$func_dirname_result"
-# basename: Compute filename of FILE.
-# value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
- # Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-} # func_dirname_and_basename may be replaced by extended shell implementation
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g'
+# Sed substitution that converts a w32 file name or path
+# that contains forward slashes, into one that contains
+# (escaped) backslashes. A very naive implementation.
+sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
+# Re-'\' parameter expansions in output of sed_double_quote_subst that
+# were '\'-ed in input to the same. If an odd number of '\' preceded a
+# '$' in input to sed_double_quote_subst, that '$' was protected from
+# expansion. Since each input '\' is now two '\'s, look for any number
+# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'.
+_G_bs='\\'
+_G_bs2='\\\\'
+_G_bs4='\\\\\\\\'
+_G_dollar='\$'
+sed_double_backslash="\
+ s/$_G_bs4/&\\
+/g
+ s/^$_G_bs2$_G_dollar/$_G_bs&/
+ s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
+ s/\n//g"
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
- case ${2} in
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- esac
-} # func_stripname may be replaced by extended shell implementation
+## ----------------- ##
+## Global variables. ##
+## ----------------- ##
-# These SED scripts presuppose an absolute path with a trailing slash.
-pathcar='s,^/\([^/]*\).*$,\1,'
-pathcdr='s,^/[^/]*,,'
-removedotparts=':dotsl
- s@/\./@/@g
- t dotsl
- s,/\.$,/,'
-collapseslashes='s@/\{1,\}@/@g'
-finalslash='s,/*$,/,'
+# Except for the global variables explicitly listed below, the following
+# functions in the '^func_' namespace, and the '^require_' namespace
+# variables initialised in the 'Resource management' section, sourcing
+# this file will not pollute your global namespace with anything
+# else. There's no portable way to scope variables in Bourne shell
+# though, so actually running these functions will sometimes place
+# results into a variable named after the function, and often use
+# temporary variables in the '^_G_' namespace. If you are careful to
+# avoid using those namespaces casually in your sourcing script, things
+# should continue to work as you expect. And, of course, you can freely
+# overwrite any of the functions or variables defined here before
+# calling anything to customize them.
-# func_normal_abspath PATH
-# Remove doubled-up and trailing slashes, "." path components,
-# and cancel out any ".." path components in PATH after making
-# it an absolute path.
-# value returned in "$func_normal_abspath_result"
-func_normal_abspath ()
-{
- # Start from root dir and reassemble the path.
- func_normal_abspath_result=
- func_normal_abspath_tpath=$1
- func_normal_abspath_altnamespace=
- case $func_normal_abspath_tpath in
- "")
- # Empty path, that just means $cwd.
- func_stripname '' '/' "`pwd`"
- func_normal_abspath_result=$func_stripname_result
- return
- ;;
- # The next three entries are used to spot a run of precisely
- # two leading slashes without using negated character classes;
- # we take advantage of case's first-match behaviour.
- ///*)
- # Unusual form of absolute path, do nothing.
- ;;
- //*)
- # Not necessarily an ordinary path; POSIX reserves leading '//'
- # and for example Cygwin uses it to access remote file shares
- # over CIFS/SMB, so we conserve a leading double slash if found.
- func_normal_abspath_altnamespace=/
- ;;
- /*)
- # Absolute path, do nothing.
- ;;
- *)
- # Relative path, prepend $cwd.
- func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
- ;;
- esac
- # Cancel out all the simple stuff to save iterations. We also want
- # the path to end with a slash for ease of parsing, so make sure
- # there is one (and only one) here.
- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
- -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
- while :; do
- # Processed it all yet?
- if test "$func_normal_abspath_tpath" = / ; then
- # If we ascended to the root using ".." the result may be empty now.
- if test -z "$func_normal_abspath_result" ; then
- func_normal_abspath_result=/
- fi
- break
- fi
- func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
- -e "$pathcar"`
- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
- -e "$pathcdr"`
- # Figure out what to do with it
- case $func_normal_abspath_tcomponent in
- "")
- # Trailing empty path component, ignore it.
- ;;
- ..)
- # Parent dir; strip last assembled component from result.
- func_dirname "$func_normal_abspath_result"
- func_normal_abspath_result=$func_dirname_result
- ;;
- *)
- # Actual path component, append it.
- func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
- ;;
- esac
- done
- # Restore leading double-slash if one was found on entry.
- func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
-}
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake.
-# func_relative_path SRCDIR DSTDIR
-# generates a relative path from SRCDIR to DSTDIR, with a trailing
-# slash if non-empty, suitable for immediately appending a filename
-# without needing to append a separator.
-# value returned in "$func_relative_path_result"
-func_relative_path ()
-{
- func_relative_path_result=
- func_normal_abspath "$1"
- func_relative_path_tlibdir=$func_normal_abspath_result
- func_normal_abspath "$2"
- func_relative_path_tbindir=$func_normal_abspath_result
-
- # Ascend the tree starting from libdir
- while :; do
- # check if we have found a prefix of bindir
- case $func_relative_path_tbindir in
- $func_relative_path_tlibdir)
- # found an exact match
- func_relative_path_tcancelled=
- break
- ;;
- $func_relative_path_tlibdir*)
- # found a matching prefix
- func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
- func_relative_path_tcancelled=$func_stripname_result
- if test -z "$func_relative_path_result"; then
- func_relative_path_result=.
- fi
- break
- ;;
- *)
- func_dirname $func_relative_path_tlibdir
- func_relative_path_tlibdir=${func_dirname_result}
- if test "x$func_relative_path_tlibdir" = x ; then
- # Have to descend all the way to the root!
- func_relative_path_result=../$func_relative_path_result
- func_relative_path_tcancelled=$func_relative_path_tbindir
- break
- fi
- func_relative_path_result=../$func_relative_path_result
- ;;
- esac
- done
+# Allow overriding, eg assuming that you follow the convention of
+# 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=${debug_cmd-":"}
+exit_cmd=:
- # Now calculate path; take care to avoid doubling-up slashes.
- func_stripname '' '/' "$func_relative_path_result"
- func_relative_path_result=$func_stripname_result
- func_stripname '/' '/' "$func_relative_path_tcancelled"
- if test "x$func_stripname_result" != x ; then
- func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
- fi
+# By convention, finish your script with:
+#
+# exit $exit_status
+#
+# so that you can set exit_status to non-zero if you want to indicate
+# something went wrong during execution without actually bailing out at
+# the point of failure.
+exit_status=$EXIT_SUCCESS
- # Normalisation. If bindir is libdir, return empty string,
- # else relative path ending with a slash; either way, target
- # file name can be directly appended.
- if test ! -z "$func_relative_path_result"; then
- func_stripname './' '' "$func_relative_path_result/"
- func_relative_path_result=$func_stripname_result
- fi
-}
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath=$0
-# The name of this program:
-func_dirname_and_basename "$progpath"
-progname=$func_basename_result
+# The name of this program.
+progname=`$ECHO "$progpath" |$SED "$sed_basename"`
-# Make sure we have an absolute path for reexecution:
+# Make sure we have an absolute progpath for reexecution:
case $progpath in
[\\/]*|[A-Za-z]:\\*) ;;
*[\\/]*)
- progdir=$func_dirname_result
+ progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
progdir=`cd "$progdir" && pwd`
- progpath="$progdir/$progname"
+ progpath=$progdir/$progname
;;
*)
- save_IFS="$IFS"
+ _G_IFS=$IFS
IFS=${PATH_SEPARATOR-:}
for progdir in $PATH; do
- IFS="$save_IFS"
+ IFS=$_G_IFS
test -x "$progdir/$progname" && break
done
- IFS="$save_IFS"
+ IFS=$_G_IFS
test -n "$progdir" || progdir=`pwd`
- progpath="$progdir/$progname"
+ progpath=$progdir/$progname
;;
esac
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-# Sed substitution that turns a string into a regex matching for the
-# string literally.
-sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
+## ----------------- ##
+## Standard options. ##
+## ----------------- ##
-# Sed substitution that converts a w32 file name or path
-# which contains forward slashes, into one that contains
-# (escaped) backslashes. A very naive implementation.
-lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-
-# Re-`\' parameter expansions in output of double_quote_subst that were
-# `\'-ed in input to the same. If an odd number of `\' preceded a '$'
-# in input to double_quote_subst, that '$' was protected from expansion.
-# Since each input `\' is now two `\'s, look for any number of runs of
-# four `\'s followed by two `\'s and then a '$'. `\' that '$'.
-bs='\\'
-bs2='\\\\'
-bs4='\\\\\\\\'
-dollar='\$'
-sed_double_backslash="\
- s/$bs4/&\\
-/g
- s/^$bs2$dollar/$bs&/
- s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
- s/\n//g"
+# The following options affect the operation of the functions defined
+# below, and should be set appropriately depending on run-time para-
+# meters passed on the command line.
-# Standard options:
opt_dry_run=false
-opt_help=false
opt_quiet=false
opt_verbose=false
-opt_warning=:
-# func_echo arg...
-# Echo program name prefixed message, along with the current mode
-# name if it has been set yet.
-func_echo ()
-{
- $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
-}
+# Categories 'all' and 'none' are always available. Append any others
+# you will pass as the first argument to func_warning from your own
+# code.
+warning_categories=
-# func_verbose arg...
-# Echo program name prefixed message in verbose mode only.
-func_verbose ()
-{
- $opt_verbose && func_echo ${1+"$@"}
+# By default, display warnings according to 'opt_warning_types'. Set
+# 'warning_func' to ':' to elide all warnings, or func_fatal_error to
+# treat the next displayed warning as a fatal error.
+warning_func=func_warn_and_continue
- # A bug in bash halts the script if the last line of a function
- # fails when set -e is in force, so we need another command to
- # work around that:
- :
-}
+# Set to 'all' to display all warnings, 'none' to suppress all
+# warnings, or a space delimited list of some subset of
+# 'warning_categories' to display only the listed warnings.
+opt_warning_types=all
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
- $ECHO "$*"
-}
-# func_error arg...
-# Echo program name prefixed message to standard error.
-func_error ()
-{
- $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
-}
+## -------------------- ##
+## Resource management. ##
+## -------------------- ##
-# func_warning arg...
-# Echo program name prefixed warning message to standard error.
-func_warning ()
-{
- $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
+# This section contains definitions for functions that each ensure a
+# particular resource (a file, or a non-empty configuration variable for
+# example) is available, and if appropriate to extract default values
+# from pertinent package files. Call them using their associated
+# 'require_*' variable to ensure that they are executed, at most, once.
+#
+# It's entirely deliberate that calling these functions can set
+# variables that don't obey the namespace limitations obeyed by the rest
+# of this file, in order that that they be as useful as possible to
+# callers.
- # bash bug again:
- :
-}
-# func_fatal_error arg...
-# Echo program name prefixed message to standard error, and exit.
-func_fatal_error ()
+# require_term_colors
+# -------------------
+# Allow display of bold text on terminals that support it.
+require_term_colors=func_require_term_colors
+func_require_term_colors ()
{
- func_error ${1+"$@"}
- exit $EXIT_FAILURE
-}
+ $debug_cmd
+
+ test -t 1 && {
+ # COLORTERM and USE_ANSI_COLORS environment variables take
+ # precedence, because most terminfo databases neglect to describe
+ # whether color sequences are supported.
+ test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}
+
+ if test 1 = "$USE_ANSI_COLORS"; then
+ # Standard ANSI escape sequences
+ tc_reset='[0m'
+ tc_bold='[1m'; tc_standout='[7m'
+ tc_red='[31m'; tc_green='[32m'
+ tc_blue='[34m'; tc_cyan='[36m'
+ else
+ # Otherwise trust the terminfo database after all.
+ test -n "`tput sgr0 2>/dev/null`" && {
+ tc_reset=`tput sgr0`
+ test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`
+ tc_standout=$tc_bold
+ test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`
+ test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`
+ test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2`
+ test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4`
+ test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5`
+ }
+ fi
+ }
-# func_fatal_help arg...
-# Echo program name prefixed message to standard error, followed by
-# a help hint, and exit.
-func_fatal_help ()
-{
- func_error ${1+"$@"}
- func_fatal_error "$help"
+ require_term_colors=:
}
-help="Try \`$progname --help' for more information." ## default
-# func_grep expression filename
+## ----------------- ##
+## Function library. ##
+## ----------------- ##
+
+# This section contains a variety of useful functions to call in your
+# scripts. Take note of the portable wrappers for features provided by
+# some modern shells, which will fall back to slower equivalents on
+# less featureful shells.
+
+
+# func_append VAR VALUE
+# ---------------------
+# 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 yes = "$_G_HAVE_PLUSEQ_OP"
+then
+ # This is an XSI compatible shell, allowing a faster implementation...
+ eval 'func_append ()
+ {
+ $debug_cmd
+
+ eval "$1+=\$2"
+ }'
+else
+ # ...otherwise fall back to using expr, which is often a shell builtin.
+ func_append ()
+ {
+ $debug_cmd
+
+ eval "$1=\$$1\$2"
+ }
+fi
+
+
+# func_append_quoted VAR VALUE
+# ----------------------------
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+if test yes = "$_G_HAVE_PLUSEQ_OP"; then
+ eval 'func_append_quoted ()
+ {
+ $debug_cmd
+
+ func_quote_for_eval "$2"
+ eval "$1+=\\ \$func_quote_for_eval_result"
+ }'
+else
+ func_append_quoted ()
+ {
+ $debug_cmd
+
+ func_quote_for_eval "$2"
+ eval "$1=\$$1\\ \$func_quote_for_eval_result"
+ }
+fi
+
+
+# func_append_uniq VAR VALUE
+# --------------------------
+# Append unique VALUE onto the existing contents of VAR, assuming
+# entries are delimited by the first character of VALUE. For example:
+#
+# func_append_uniq options " --another-option option-argument"
+#
+# will only append to $options if " --another-option option-argument "
+# is not already present somewhere in $options already (note spaces at
+# each end implied by leading space in second argument).
+func_append_uniq ()
+{
+ $debug_cmd
+
+ eval _G_current_value='`$ECHO $'$1'`'
+ _G_delim=`expr "$2" : '\(.\)'`
+
+ case $_G_delim$_G_current_value$_G_delim in
+ *"$2$_G_delim"*) ;;
+ *) func_append "$@" ;;
+ esac
+}
+
+
+# func_arith TERM...
+# ------------------
+# Set func_arith_result to the result of evaluating TERMs.
+ test -z "$_G_HAVE_ARITH_OP" \
+ && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \
+ && _G_HAVE_ARITH_OP=yes
+
+if test yes = "$_G_HAVE_ARITH_OP"; then
+ eval 'func_arith ()
+ {
+ $debug_cmd
+
+ func_arith_result=$(( $* ))
+ }'
+else
+ func_arith ()
+ {
+ $debug_cmd
+
+ func_arith_result=`expr "$@"`
+ }
+fi
+
+
+# func_basename FILE
+# ------------------
+# Set func_basename_result to FILE with everything up to and including
+# the last / stripped.
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ # If this shell supports suffix pattern removal, then use it to avoid
+ # forking. Hide the definitions single quotes in case the shell chokes
+ # on unsupported syntax...
+ _b='func_basename_result=${1##*/}'
+ _d='case $1 in
+ */*) func_dirname_result=${1%/*}$2 ;;
+ * ) func_dirname_result=$3 ;;
+ esac'
+
+else
+ # ...otherwise fall back to using sed.
+ _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`'
+ _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"`
+ if test "X$func_dirname_result" = "X$1"; then
+ func_dirname_result=$3
+ else
+ func_append func_dirname_result "$2"
+ fi'
+fi
+
+eval 'func_basename ()
+{
+ $debug_cmd
+
+ '"$_b"'
+}'
+
+
+# func_dirname FILE APPEND NONDIR_REPLACEMENT
+# -------------------------------------------
+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+eval 'func_dirname ()
+{
+ $debug_cmd
+
+ '"$_d"'
+}'
+
+
+# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT
+# --------------------------------------------------------
+# Perform func_basename and func_dirname in a single function
+# call:
+# dirname: Compute the dirname of FILE. If nonempty,
+# add APPEND to the result, otherwise set result
+# to NONDIR_REPLACEMENT.
+# value returned in "$func_dirname_result"
+# basename: Compute filename of FILE.
+# value retuned in "$func_basename_result"
+# For efficiency, we do not delegate to the functions above but instead
+# duplicate the functionality here.
+eval 'func_dirname_and_basename ()
+{
+ $debug_cmd
+
+ '"$_b"'
+ '"$_d"'
+}'
+
+
+# func_echo ARG...
+# ----------------
+# Echo program name prefixed message.
+func_echo ()
+{
+ $debug_cmd
+
+ _G_message=$*
+
+ func_echo_IFS=$IFS
+ IFS=$nl
+ for _G_line in $_G_message; do
+ IFS=$func_echo_IFS
+ $ECHO "$progname: $_G_line"
+ done
+ IFS=$func_echo_IFS
+}
+
+
+# func_echo_all ARG...
+# --------------------
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+ $ECHO "$*"
+}
+
+
+# func_echo_infix_1 INFIX ARG...
+# ------------------------------
+# Echo program name, followed by INFIX on the first line, with any
+# additional lines not showing INFIX.
+func_echo_infix_1 ()
+{
+ $debug_cmd
+
+ $require_term_colors
+
+ _G_infix=$1; shift
+ _G_indent=$_G_infix
+ _G_prefix="$progname: $_G_infix: "
+ _G_message=$*
+
+ # Strip color escape sequences before counting printable length
+ for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
+ do
+ test -n "$_G_tc" && {
+ _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
+ _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
+ }
+ done
+ _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes
+
+ func_echo_infix_1_IFS=$IFS
+ IFS=$nl
+ for _G_line in $_G_message; do
+ IFS=$func_echo_infix_1_IFS
+ $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
+ _G_prefix=$_G_indent
+ done
+ IFS=$func_echo_infix_1_IFS
+}
+
+
+# func_error ARG...
+# -----------------
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+ $debug_cmd
+
+ $require_term_colors
+
+ func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2
+}
+
+
+# func_fatal_error ARG...
+# -----------------------
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+ $debug_cmd
+
+ func_error "$*"
+ exit $EXIT_FAILURE
+}
+
+
+# func_grep EXPRESSION FILENAME
+# -----------------------------
# Check whether EXPRESSION matches any line of FILENAME, without output.
func_grep ()
{
+ $debug_cmd
+
$GREP "$1" "$2" >/dev/null 2>&1
}
-# func_mkdir_p directory-path
+# func_len STRING
+# ---------------
+# Set func_len_result to the length of STRING. STRING may not
+# start with a hyphen.
+ test -z "$_G_HAVE_XSI_OPS" \
+ && (eval 'x=a/b/c;
+ test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+ && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ eval 'func_len ()
+ {
+ $debug_cmd
+
+ func_len_result=${#1}
+ }'
+else
+ func_len ()
+ {
+ $debug_cmd
+
+ func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+ }
+fi
+
+
+# func_mkdir_p DIRECTORY-PATH
+# ---------------------------
# Make sure the entire path to DIRECTORY-PATH is available.
func_mkdir_p ()
{
- my_directory_path="$1"
- my_dir_list=
+ $debug_cmd
+
+ _G_directory_path=$1
+ _G_dir_list=
- if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+ if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
- # Protect directory names starting with `-'
- case $my_directory_path in
- -*) my_directory_path="./$my_directory_path" ;;
+ # Protect directory names starting with '-'
+ case $_G_directory_path in
+ -*) _G_directory_path=./$_G_directory_path ;;
esac
# While some portion of DIR does not yet exist...
- while test ! -d "$my_directory_path"; do
+ while test ! -d "$_G_directory_path"; do
# ...make a list in topmost first order. Use a colon delimited
# list incase some portion of path contains whitespace.
- my_dir_list="$my_directory_path:$my_dir_list"
+ _G_dir_list=$_G_directory_path:$_G_dir_list
# If the last portion added has no slash in it, the list is done
- case $my_directory_path in */*) ;; *) break ;; esac
+ case $_G_directory_path in */*) ;; *) break ;; esac
# ...otherwise throw away the child directory and loop
- my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
+ _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
done
- my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
+ _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'`
- save_mkdir_p_IFS="$IFS"; IFS=':'
- for my_dir in $my_dir_list; do
- IFS="$save_mkdir_p_IFS"
- # mkdir can fail with a `File exist' error if two processes
+ func_mkdir_p_IFS=$IFS; IFS=:
+ for _G_dir in $_G_dir_list; do
+ IFS=$func_mkdir_p_IFS
+ # mkdir can fail with a 'File exist' error if two processes
# try to create one of the directories concurrently. Don't
# stop in that case!
- $MKDIR "$my_dir" 2>/dev/null || :
+ $MKDIR "$_G_dir" 2>/dev/null || :
done
- IFS="$save_mkdir_p_IFS"
+ IFS=$func_mkdir_p_IFS
# Bail out if we (or some other process) failed to create a directory.
- test -d "$my_directory_path" || \
- func_fatal_error "Failed to create \`$1'"
+ test -d "$_G_directory_path" || \
+ func_fatal_error "Failed to create '$1'"
fi
}
-# func_mktempdir [string]
+# func_mktempdir [BASENAME]
+# -------------------------
# Make a temporary directory that won't clash with other running
# libtool processes, and avoids race conditions if possible. If
-# given, STRING is the basename for that directory.
+# given, BASENAME is the basename for that directory.
func_mktempdir ()
{
- my_template="${TMPDIR-/tmp}/${1-$progname}"
+ $debug_cmd
+
+ _G_template=${TMPDIR-/tmp}/${1-$progname}
- if test "$opt_dry_run" = ":"; then
+ if test : = "$opt_dry_run"; then
# Return a directory name, but don't create it in dry-run mode
- my_tmpdir="${my_template}-$$"
+ _G_tmpdir=$_G_template-$$
else
# If mktemp works, use that first and foremost
- my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+ _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
- if test ! -d "$my_tmpdir"; then
+ if test ! -d "$_G_tmpdir"; then
# Failing that, at least try and use $RANDOM to avoid a race
- my_tmpdir="${my_template}-${RANDOM-0}$$"
+ _G_tmpdir=$_G_template-${RANDOM-0}$$
- save_mktempdir_umask=`umask`
+ func_mktempdir_umask=`umask`
umask 0077
- $MKDIR "$my_tmpdir"
- umask $save_mktempdir_umask
+ $MKDIR "$_G_tmpdir"
+ umask $func_mktempdir_umask
fi
# If we're not in dry-run mode, bomb out on failure
- test -d "$my_tmpdir" || \
- func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
+ test -d "$_G_tmpdir" || \
+ func_fatal_error "cannot create temporary directory '$_G_tmpdir'"
fi
- $ECHO "$my_tmpdir"
+ $ECHO "$_G_tmpdir"
}
-# func_quote_for_eval arg
-# Aesthetically quote ARG to be evaled later.
-# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
-# is double-quoted, suitable for a subsequent eval, whereas
-# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
-# which are still active within double quotes backslashified.
-func_quote_for_eval ()
+# func_normal_abspath PATH
+# ------------------------
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+func_normal_abspath ()
{
- case $1 in
- *[\\\`\"\$]*)
- func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
- *)
- func_quote_for_eval_unquoted_result="$1" ;;
- esac
+ $debug_cmd
- case $func_quote_for_eval_unquoted_result in
- # Double-quote args containing shell metacharacters to delay
- # word splitting, command substitution and and variable
- # expansion for a subsequent eval.
- # Many Bourne shells cannot handle close brackets correctly
- # in scan sets, so we specify it separately.
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
+ # These SED scripts presuppose an absolute path with a trailing slash.
+ _G_pathcar='s|^/\([^/]*\).*$|\1|'
+ _G_pathcdr='s|^/[^/]*||'
+ _G_removedotparts=':dotsl
+ s|/\./|/|g
+ t dotsl
+ s|/\.$|/|'
+ _G_collapseslashes='s|/\{1,\}|/|g'
+ _G_finalslash='s|/*$|/|'
+
+ # Start from root dir and reassemble the path.
+ func_normal_abspath_result=
+ func_normal_abspath_tpath=$1
+ func_normal_abspath_altnamespace=
+ case $func_normal_abspath_tpath in
+ "")
+ # Empty path, that just means $cwd.
+ func_stripname '' '/' "`pwd`"
+ func_normal_abspath_result=$func_stripname_result
+ return
+ ;;
+ # The next three entries are used to spot a run of precisely
+ # two leading slashes without using negated character classes;
+ # we take advantage of case's first-match behaviour.
+ ///*)
+ # Unusual form of absolute path, do nothing.
+ ;;
+ //*)
+ # Not necessarily an ordinary path; POSIX reserves leading '//'
+ # and for example Cygwin uses it to access remote file shares
+ # over CIFS/SMB, so we conserve a leading double slash if found.
+ func_normal_abspath_altnamespace=/
+ ;;
+ /*)
+ # Absolute path, do nothing.
;;
*)
- func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
+ # Relative path, prepend $cwd.
+ func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+ ;;
esac
+
+ # Cancel out all the simple stuff to save iterations. We also want
+ # the path to end with a slash for ease of parsing, so make sure
+ # there is one (and only one) here.
+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"`
+ while :; do
+ # Processed it all yet?
+ if test / = "$func_normal_abspath_tpath"; then
+ # If we ascended to the root using ".." the result may be empty now.
+ if test -z "$func_normal_abspath_result"; then
+ func_normal_abspath_result=/
+ fi
+ break
+ fi
+ func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$_G_pathcar"`
+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$_G_pathcdr"`
+ # Figure out what to do with it
+ case $func_normal_abspath_tcomponent in
+ "")
+ # Trailing empty path component, ignore it.
+ ;;
+ ..)
+ # Parent dir; strip last assembled component from result.
+ func_dirname "$func_normal_abspath_result"
+ func_normal_abspath_result=$func_dirname_result
+ ;;
+ *)
+ # Actual path component, append it.
+ func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent"
+ ;;
+ esac
+ done
+ # Restore leading double-slash if one was found on entry.
+ func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+}
+
+
+# func_notquiet ARG...
+# --------------------
+# Echo program name prefixed message only when not in quiet mode.
+func_notquiet ()
+{
+ $debug_cmd
+
+ $opt_quiet || func_echo ${1+"$@"}
+
+ # A bug in bash halts the script if the last line of a function
+ # fails when set -e is in force, so we need another command to
+ # work around that:
+ :
+}
+
+
+# func_relative_path SRCDIR DSTDIR
+# --------------------------------
+# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR.
+func_relative_path ()
+{
+ $debug_cmd
+
+ func_relative_path_result=
+ func_normal_abspath "$1"
+ func_relative_path_tlibdir=$func_normal_abspath_result
+ func_normal_abspath "$2"
+ func_relative_path_tbindir=$func_normal_abspath_result
+
+ # Ascend the tree starting from libdir
+ while :; do
+ # check if we have found a prefix of bindir
+ case $func_relative_path_tbindir in
+ $func_relative_path_tlibdir)
+ # found an exact match
+ func_relative_path_tcancelled=
+ break
+ ;;
+ $func_relative_path_tlibdir*)
+ # found a matching prefix
+ func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+ func_relative_path_tcancelled=$func_stripname_result
+ if test -z "$func_relative_path_result"; then
+ func_relative_path_result=.
+ fi
+ break
+ ;;
+ *)
+ func_dirname $func_relative_path_tlibdir
+ func_relative_path_tlibdir=$func_dirname_result
+ if test -z "$func_relative_path_tlibdir"; then
+ # Have to descend all the way to the root!
+ func_relative_path_result=../$func_relative_path_result
+ func_relative_path_tcancelled=$func_relative_path_tbindir
+ break
+ fi
+ func_relative_path_result=../$func_relative_path_result
+ ;;
+ esac
+ done
+
+ # Now calculate path; take care to avoid doubling-up slashes.
+ func_stripname '' '/' "$func_relative_path_result"
+ func_relative_path_result=$func_stripname_result
+ func_stripname '/' '/' "$func_relative_path_tcancelled"
+ if test -n "$func_stripname_result"; then
+ func_append func_relative_path_result "/$func_stripname_result"
+ fi
+
+ # Normalisation. If bindir is libdir, return '.' else relative path.
+ if test -n "$func_relative_path_result"; then
+ func_stripname './' '' "$func_relative_path_result"
+ func_relative_path_result=$func_stripname_result
+ fi
+
+ test -n "$func_relative_path_result" || func_relative_path_result=.
+
+ :
}
-# func_quote_for_expand arg
+# func_quote_for_eval ARG...
+# --------------------------
+# Aesthetically quote ARGs to be evaled later.
+# This function returns two values:
+# i) func_quote_for_eval_result
+# double-quoted, suitable for a subsequent eval
+# ii) func_quote_for_eval_unquoted_result
+# has all characters that are still active within double
+# quotes backslashified.
+func_quote_for_eval ()
+{
+ $debug_cmd
+
+ func_quote_for_eval_unquoted_result=
+ func_quote_for_eval_result=
+ while test 0 -lt $#; do
+ case $1 in
+ *[\\\`\"\$]*)
+ _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
+ *)
+ _G_unquoted_arg=$1 ;;
+ esac
+ if test -n "$func_quote_for_eval_unquoted_result"; then
+ func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
+ else
+ func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
+ fi
+
+ case $_G_unquoted_arg in
+ # Double-quote args containing shell metacharacters to delay
+ # word splitting, command substitution and variable expansion
+ # for a subsequent eval.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ _G_quoted_arg=\"$_G_unquoted_arg\"
+ ;;
+ *)
+ _G_quoted_arg=$_G_unquoted_arg
+ ;;
+ esac
+
+ if test -n "$func_quote_for_eval_result"; then
+ func_append func_quote_for_eval_result " $_G_quoted_arg"
+ else
+ func_append func_quote_for_eval_result "$_G_quoted_arg"
+ fi
+ shift
+ done
+}
+
+
+# func_quote_for_expand ARG
+# -------------------------
# Aesthetically quote ARG to be evaled later; same as above,
# but do not quote variable references.
func_quote_for_expand ()
{
+ $debug_cmd
+
case $1 in
*[\\\`\"]*)
- my_arg=`$ECHO "$1" | $SED \
- -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
+ _G_arg=`$ECHO "$1" | $SED \
+ -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
*)
- my_arg="$1" ;;
+ _G_arg=$1 ;;
esac
- case $my_arg in
+ case $_G_arg in
# Double-quote args containing shell metacharacters to delay
# word splitting and command substitution for a subsequent eval.
# Many Bourne shells cannot handle close brackets correctly
# in scan sets, so we specify it separately.
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- my_arg="\"$my_arg\""
+ _G_arg=\"$_G_arg\"
;;
esac
- func_quote_for_expand_result="$my_arg"
+ func_quote_for_expand_result=$_G_arg
+}
+
+
+# func_stripname PREFIX SUFFIX NAME
+# ---------------------------------
+# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ eval 'func_stripname ()
+ {
+ $debug_cmd
+
+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+ # positional parameters, so assign one to ordinary variable first.
+ func_stripname_result=$3
+ func_stripname_result=${func_stripname_result#"$1"}
+ func_stripname_result=${func_stripname_result%"$2"}
+ }'
+else
+ func_stripname ()
+ {
+ $debug_cmd
+
+ case $2 in
+ .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;;
+ *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;;
+ esac
+ }
+fi
+
+
+# func_show_eval CMD [FAIL_EXP]
+# -----------------------------
+# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is
+# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.
+func_show_eval ()
+{
+ $debug_cmd
+
+ _G_cmd=$1
+ _G_fail_exp=${2-':'}
+
+ func_quote_for_expand "$_G_cmd"
+ eval "func_notquiet $func_quote_for_expand_result"
+
+ $opt_dry_run || {
+ eval "$_G_cmd"
+ _G_status=$?
+ if test 0 -ne "$_G_status"; then
+ eval "(exit $_G_status); $_G_fail_exp"
+ fi
+ }
+}
+
+
+# func_show_eval_locale CMD [FAIL_EXP]
+# ------------------------------------
+# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is
+# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it. Use the saved locale for evaluation.
+func_show_eval_locale ()
+{
+ $debug_cmd
+
+ _G_cmd=$1
+ _G_fail_exp=${2-':'}
+
+ $opt_quiet || {
+ func_quote_for_expand "$_G_cmd"
+ eval "func_echo $func_quote_for_expand_result"
+ }
+
+ $opt_dry_run || {
+ eval "$_G_user_locale
+ $_G_cmd"
+ _G_status=$?
+ eval "$_G_safe_locale"
+ if test 0 -ne "$_G_status"; then
+ eval "(exit $_G_status); $_G_fail_exp"
+ fi
+ }
+}
+
+
+# func_tr_sh
+# ----------
+# Turn $1 into a string suitable for a shell variable name.
+# Result is stored in $func_tr_sh_result. All characters
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+# if $1 begins with a digit, a '_' is prepended as well.
+func_tr_sh ()
+{
+ $debug_cmd
+
+ case $1 in
+ [0-9]* | *[!a-zA-Z0-9_]*)
+ func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'`
+ ;;
+ * )
+ func_tr_sh_result=$1
+ ;;
+ esac
+}
+
+
+# func_verbose ARG...
+# -------------------
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+ $debug_cmd
+
+ $opt_verbose && func_echo "$*"
+
+ :
+}
+
+
+# func_warn_and_continue ARG...
+# -----------------------------
+# Echo program name prefixed warning message to standard error.
+func_warn_and_continue ()
+{
+ $debug_cmd
+
+ $require_term_colors
+
+ func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2
+}
+
+
+# func_warning CATEGORY ARG...
+# ----------------------------
+# Echo program name prefixed warning message to standard error. Warning
+# messages can be filtered according to CATEGORY, where this function
+# elides messages where CATEGORY is not listed in the global variable
+# 'opt_warning_types'.
+func_warning ()
+{
+ $debug_cmd
+
+ # CATEGORY must be in the warning_categories list!
+ case " $warning_categories " in
+ *" $1 "*) ;;
+ *) func_internal_error "invalid warning category '$1'" ;;
+ esac
+
+ _G_category=$1
+ shift
+
+ case " $opt_warning_types " in
+ *" $_G_category "*) $warning_func ${1+"$@"} ;;
+ esac
}
-# func_show_eval cmd [fail_exp]
-# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
-# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.
-func_show_eval ()
+# func_sort_ver VER1 VER2
+# -----------------------
+# 'sort -V' is not generally available.
+# Note this deviates from the version comparison in automake
+# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+# but this should suffice as we won't be specifying old
+# version formats or redundant trailing .0 in bootstrap.conf.
+# If we did want full compatibility then we should probably
+# use m4_version_compare from autoconf.
+func_sort_ver ()
+{
+ $debug_cmd
+
+ printf '%s\n%s\n' "$1" "$2" \
+ | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
+}
+
+# func_lt_ver PREV CURR
+# ---------------------
+# Return true if PREV and CURR are in the correct order according to
+# func_sort_ver, otherwise false. Use it like this:
+#
+# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..."
+func_lt_ver ()
+{
+ $debug_cmd
+
+ test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
+}
+
+
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
+#! /bin/sh
+
+# Set a version string for this script.
+scriptversion=2014-01-07.03; # UTC
+
+# A portable, pluggable option parser for Bourne shell.
+# Written by Gary V. Vaughan, 2010
+
+# Copyright (C) 2010-2015 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.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary at gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# This file is a library for parsing options in your shell scripts along
+# with assorted other useful supporting features that you can make use
+# of too.
+#
+# For the simplest scripts you might need only:
+#
+# #!/bin/sh
+# . relative/path/to/funclib.sh
+# . relative/path/to/options-parser
+# scriptversion=1.0
+# func_options ${1+"$@"}
+# eval set dummy "$func_options_result"; shift
+# ...rest of your script...
+#
+# In order for the '--version' option to work, you will need to have a
+# suitably formatted comment like the one at the top of this file
+# starting with '# Written by ' and ending with '# warranty; '.
+#
+# For '-h' and '--help' to work, you will also need a one line
+# description of your script's purpose in a comment directly above the
+# '# Written by ' line, like the one at the top of this file.
+#
+# The default options also support '--debug', which will turn on shell
+# execution tracing (see the comment above debug_cmd below for another
+# use), and '--verbose' and the func_verbose function to allow your script
+# to display verbose messages only when your user has specified
+# '--verbose'.
+#
+# After sourcing this file, you can plug processing for additional
+# options by amending the variables from the 'Configuration' section
+# below, and following the instructions in the 'Option parsing'
+# section further down.
+
+## -------------- ##
+## Configuration. ##
+## -------------- ##
+
+# You should override these variables in your script after sourcing this
+# file so that they reflect the customisations you have added to the
+# option parser.
+
+# The usage line for option parsing errors and the start of '-h' and
+# '--help' output messages. You can embed shell variables for delayed
+# expansion at the time the message is displayed, but you will need to
+# quote other shell meta-characters carefully to prevent them being
+# expanded when the contents are evaled.
+usage='$progpath [OPTION]...'
+
+# Short help message in response to '-h' and '--help'. Add to this or
+# override it after sourcing this library to reflect the full set of
+# options your script accepts.
+usage_message="\
+ --debug enable verbose shell tracing
+ -W, --warnings=CATEGORY
+ report the warnings falling in CATEGORY [all]
+ -v, --verbose verbosely report processing
+ --version print version information and exit
+ -h, --help print short or long help message and exit
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+long_help_message="
+Warning categories include:
+ 'all' show all warnings
+ 'none' turn off all the warnings
+ 'error' warnings are treated as fatal errors"
+
+# Help message printed before fatal option parsing errors.
+fatal_help="Try '\$progname --help' for more information."
+
+
+
+## ------------------------- ##
+## Hook function management. ##
+## ------------------------- ##
+
+# This section contains functions for adding, removing, and running hooks
+# to the main code. A hook is just a named list of of function, that can
+# be run in order later on.
+
+# func_hookable FUNC_NAME
+# -----------------------
+# Declare that FUNC_NAME will run hooks added with
+# 'func_add_hook FUNC_NAME ...'.
+func_hookable ()
+{
+ $debug_cmd
+
+ func_append hookable_fns " $1"
+}
+
+
+# func_add_hook FUNC_NAME HOOK_FUNC
+# ---------------------------------
+# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must
+# first have been declared "hookable" by a call to 'func_hookable'.
+func_add_hook ()
+{
+ $debug_cmd
+
+ case " $hookable_fns " in
+ *" $1 "*) ;;
+ *) func_fatal_error "'$1' does not accept hook functions." ;;
+ esac
+
+ eval func_append ${1}_hooks '" $2"'
+}
+
+
+# func_remove_hook FUNC_NAME HOOK_FUNC
+# ------------------------------------
+# Remove HOOK_FUNC from the list of functions called by FUNC_NAME.
+func_remove_hook ()
+{
+ $debug_cmd
+
+ eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
+}
+
+
+# func_run_hooks FUNC_NAME [ARG]...
+# ---------------------------------
+# Run all hook functions registered to FUNC_NAME.
+# It is assumed that the list of hook functions contains nothing more
+# than a whitespace-delimited list of legal shell function names, and
+# no effort is wasted trying to catch shell meta-characters or preserve
+# whitespace.
+func_run_hooks ()
+{
+ $debug_cmd
+
+ case " $hookable_fns " in
+ *" $1 "*) ;;
+ *) func_fatal_error "'$1' does not support hook funcions.n" ;;
+ esac
+
+ eval _G_hook_fns=\$$1_hooks; shift
+
+ for _G_hook in $_G_hook_fns; do
+ eval $_G_hook '"$@"'
+
+ # store returned options list back into positional
+ # parameters for next 'cmd' execution.
+ eval _G_hook_result=\$${_G_hook}_result
+ eval set dummy "$_G_hook_result"; shift
+ done
+
+ func_quote_for_eval ${1+"$@"}
+ func_run_hooks_result=$func_quote_for_eval_result
+}
+
+
+
+## --------------- ##
+## Option parsing. ##
+## --------------- ##
+
+# In order to add your own option parsing hooks, you must accept the
+# full positional parameter list in your hook function, remove any
+# options that you action, and then pass back the remaining unprocessed
+# options in '<hooked_function_name>_result', escaped suitably for
+# 'eval'. Like this:
+#
+# my_options_prep ()
+# {
+# $debug_cmd
+#
+# # Extend the existing usage message.
+# usage_message=$usage_message'
+# -s, --silent don'\''t print informational messages
+# '
+#
+# func_quote_for_eval ${1+"$@"}
+# my_options_prep_result=$func_quote_for_eval_result
+# }
+# func_add_hook func_options_prep my_options_prep
+#
+#
+# my_silent_option ()
+# {
+# $debug_cmd
+#
+# # Note that for efficiency, we parse as many options as we can
+# # recognise in a loop before passing the remainder back to the
+# # caller on the first unrecognised argument we encounter.
+# while test $# -gt 0; do
+# opt=$1; shift
+# case $opt in
+# --silent|-s) opt_silent=: ;;
+# # Separate non-argument short options:
+# -s*) func_split_short_opt "$_G_opt"
+# set dummy "$func_split_short_opt_name" \
+# "-$func_split_short_opt_arg" ${1+"$@"}
+# shift
+# ;;
+# *) set dummy "$_G_opt" "$*"; shift; break ;;
+# esac
+# done
+#
+# func_quote_for_eval ${1+"$@"}
+# my_silent_option_result=$func_quote_for_eval_result
+# }
+# func_add_hook func_parse_options my_silent_option
+#
+#
+# my_option_validation ()
+# {
+# $debug_cmd
+#
+# $opt_silent && $opt_verbose && func_fatal_help "\
+# '--silent' and '--verbose' options are mutually exclusive."
+#
+# func_quote_for_eval ${1+"$@"}
+# my_option_validation_result=$func_quote_for_eval_result
+# }
+# func_add_hook func_validate_options my_option_validation
+#
+# You'll alse need to manually amend $usage_message to reflect the extra
+# options you parse. It's preferable to append if you can, so that
+# multiple option parsing hooks can be added safely.
+
+
+# func_options [ARG]...
+# ---------------------
+# All the functions called inside func_options are hookable. See the
+# individual implementations for details.
+func_hookable func_options
+func_options ()
{
- my_cmd="$1"
- my_fail_exp="${2-:}"
+ $debug_cmd
- ${opt_silent-false} || {
- func_quote_for_expand "$my_cmd"
- eval "func_echo $func_quote_for_expand_result"
- }
+ func_options_prep ${1+"$@"}
+ eval func_parse_options \
+ ${func_options_prep_result+"$func_options_prep_result"}
+ eval func_validate_options \
+ ${func_parse_options_result+"$func_parse_options_result"}
- if ${opt_dry_run-false}; then :; else
- eval "$my_cmd"
- my_status=$?
- if test "$my_status" -eq 0; then :; else
- eval "(exit $my_status); $my_fail_exp"
- fi
- fi
+ eval func_run_hooks func_options \
+ ${func_validate_options_result+"$func_validate_options_result"}
+
+ # save modified positional parameters for caller
+ func_options_result=$func_run_hooks_result
}
-# func_show_eval_locale cmd [fail_exp]
-# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
-# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it. Use the saved locale for evaluation.
-func_show_eval_locale ()
+# func_options_prep [ARG]...
+# --------------------------
+# All initialisations required before starting the option parse loop.
+# Note that when calling hook functions, we pass through the list of
+# positional parameters. If a hook function modifies that list, and
+# needs to propogate that back to rest of this script, then the complete
+# modified list must be put in 'func_run_hooks_result' before
+# returning.
+func_hookable func_options_prep
+func_options_prep ()
{
- my_cmd="$1"
- my_fail_exp="${2-:}"
+ $debug_cmd
- ${opt_silent-false} || {
- func_quote_for_expand "$my_cmd"
- eval "func_echo $func_quote_for_expand_result"
- }
+ # Option defaults:
+ opt_verbose=false
+ opt_warning_types=
- if ${opt_dry_run-false}; then :; else
- eval "$lt_user_locale
- $my_cmd"
- my_status=$?
- eval "$lt_safe_locale"
- if test "$my_status" -eq 0; then :; else
- eval "(exit $my_status); $my_fail_exp"
- fi
- fi
+ func_run_hooks func_options_prep ${1+"$@"}
+
+ # save modified positional parameters for caller
+ func_options_prep_result=$func_run_hooks_result
}
-# func_tr_sh
-# Turn $1 into a string suitable for a shell variable name.
-# Result is stored in $func_tr_sh_result. All characters
-# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
-# if $1 begins with a digit, a '_' is prepended as well.
-func_tr_sh ()
+
+# func_parse_options [ARG]...
+# ---------------------------
+# The main option parsing loop.
+func_hookable func_parse_options
+func_parse_options ()
{
- case $1 in
- [0-9]* | *[!a-zA-Z0-9_]*)
- func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
- ;;
- * )
- func_tr_sh_result=$1
- ;;
- esac
+ $debug_cmd
+
+ func_parse_options_result=
+
+ # this just eases exit handling
+ while test $# -gt 0; do
+ # Defer to hook functions for initial option parsing, so they
+ # get priority in the event of reusing an option name.
+ func_run_hooks func_parse_options ${1+"$@"}
+
+ # Adjust func_parse_options positional parameters to match
+ eval set dummy "$func_run_hooks_result"; shift
+
+ # Break out of the loop if we already parsed every option.
+ test $# -gt 0 || break
+
+ _G_opt=$1
+ shift
+ case $_G_opt in
+ --debug|-x) debug_cmd='set -x'
+ func_echo "enabling shell trace mode"
+ $debug_cmd
+ ;;
+
+ --no-warnings|--no-warning|--no-warn)
+ set dummy --warnings none ${1+"$@"}
+ shift
+ ;;
+
+ --warnings|--warning|-W)
+ test $# = 0 && func_missing_arg $_G_opt && break
+ case " $warning_categories $1" in
+ *" $1 "*)
+ # trailing space prevents matching last $1 above
+ func_append_uniq opt_warning_types " $1"
+ ;;
+ *all)
+ opt_warning_types=$warning_categories
+ ;;
+ *none)
+ opt_warning_types=none
+ warning_func=:
+ ;;
+ *error)
+ opt_warning_types=$warning_categories
+ warning_func=func_fatal_error
+ ;;
+ *)
+ func_fatal_error \
+ "unsupported warning category: '$1'"
+ ;;
+ esac
+ shift
+ ;;
+
+ --verbose|-v) opt_verbose=: ;;
+ --version) func_version ;;
+ -\?|-h) func_usage ;;
+ --help) func_help ;;
+
+ # Separate optargs to long options (plugins may need this):
+ --*=*) func_split_equals "$_G_opt"
+ set dummy "$func_split_equals_lhs" \
+ "$func_split_equals_rhs" ${1+"$@"}
+ shift
+ ;;
+
+ # Separate optargs to short options:
+ -W*)
+ func_split_short_opt "$_G_opt"
+ set dummy "$func_split_short_opt_name" \
+ "$func_split_short_opt_arg" ${1+"$@"}
+ shift
+ ;;
+
+ # Separate non-argument short options:
+ -\?*|-h*|-v*|-x*)
+ func_split_short_opt "$_G_opt"
+ set dummy "$func_split_short_opt_name" \
+ "-$func_split_short_opt_arg" ${1+"$@"}
+ shift
+ ;;
+
+ --) break ;;
+ -*) func_fatal_help "unrecognised option: '$_G_opt'" ;;
+ *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+ esac
+ done
+
+ # save modified positional parameters for caller
+ func_quote_for_eval ${1+"$@"}
+ func_parse_options_result=$func_quote_for_eval_result
}
-# func_version
-# Echo version message to standard output and exit.
-func_version ()
+# func_validate_options [ARG]...
+# ------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+func_hookable func_validate_options
+func_validate_options ()
{
- $opt_debug
+ $debug_cmd
- $SED -n '/(C)/!b go
- :more
- /\./!{
- N
- s/\n# / /
- b more
- }
- :go
- /^# '$PROGRAM' (GNU /,/# warranty; / {
- s/^# //
- s/^# *$//
- s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
- p
- }' < "$progpath"
- exit $?
+ # Display all warnings if -W was not given.
+ test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
+
+ func_run_hooks func_validate_options ${1+"$@"}
+
+ # Bail if the options were screwed!
+ $exit_cmd $EXIT_FAILURE
+
+ # save modified positional parameters for caller
+ func_validate_options_result=$func_run_hooks_result
}
-# func_usage
-# Echo short help message to standard output and exit.
-func_usage ()
+
+
+## ----------------- ##
+## Helper functions. ##
+## ----------------- ##
+
+# This section contains the helper functions used by the rest of the
+# hookable option parser framework in ascii-betical order.
+
+
+# func_fatal_help ARG...
+# ----------------------
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
{
- $opt_debug
+ $debug_cmd
- $SED -n '/^# Usage:/,/^# *.*--help/ {
- s/^# //
- s/^# *$//
- s/\$progname/'$progname'/
- p
- }' < "$progpath"
- echo
- $ECHO "run \`$progname --help | more' for full usage"
- exit $?
+ eval \$ECHO \""Usage: $usage"\"
+ eval \$ECHO \""$fatal_help"\"
+ func_error ${1+"$@"}
+ exit $EXIT_FAILURE
}
-# func_help [NOEXIT]
-# Echo long help message to standard output and exit,
-# unless 'noexit' is passed as argument.
+
+# func_help
+# ---------
+# Echo long help message to standard output and exit.
func_help ()
{
- $opt_debug
-
- $SED -n '/^# Usage:/,/# Report bugs to/ {
- :print
- s/^# //
- s/^# *$//
- s*\$progname*'$progname'*
- s*\$host*'"$host"'*
- s*\$SHELL*'"$SHELL"'*
- s*\$LTCC*'"$LTCC"'*
- s*\$LTCFLAGS*'"$LTCFLAGS"'*
- s*\$LD*'"$LD"'*
- s/\$with_gnu_ld/'"$with_gnu_ld"'/
- s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
- s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
- p
- d
- }
- /^# .* home page:/b print
- /^# General help using/b print
- ' < "$progpath"
- ret=$?
- if test -z "$1"; then
- exit $ret
- fi
+ $debug_cmd
+
+ func_usage_message
+ $ECHO "$long_help_message"
+ exit 0
}
-# func_missing_arg argname
+
+# func_missing_arg ARGNAME
+# ------------------------
# Echo program name prefixed message to standard error and set global
# exit_cmd.
func_missing_arg ()
{
- $opt_debug
+ $debug_cmd
- func_error "missing argument for $1."
+ func_error "Missing argument for '$1'."
exit_cmd=exit
}
-# func_split_short_opt shortopt
+# func_split_equals STRING
+# ------------------------
+# Set func_split_equals_lhs and func_split_equals_rhs shell variables after
+# splitting STRING at the '=' sign.
+test -z "$_G_HAVE_XSI_OPS" \
+ && (eval 'x=a/b/c;
+ test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+ && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+ # This is an XSI compatible shell, allowing a faster implementation...
+ eval 'func_split_equals ()
+ {
+ $debug_cmd
+
+ func_split_equals_lhs=${1%%=*}
+ func_split_equals_rhs=${1#*=}
+ test "x$func_split_equals_lhs" = "x$1" \
+ && func_split_equals_rhs=
+ }'
+else
+ # ...otherwise fall back to using expr, which is often a shell builtin.
+ func_split_equals ()
+ {
+ $debug_cmd
+
+ func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'`
+ func_split_equals_rhs=
+ test "x$func_split_equals_lhs" = "x$1" \
+ || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'`
+ }
+fi #func_split_equals
+
+
+# func_split_short_opt SHORTOPT
+# -----------------------------
# Set func_split_short_opt_name and func_split_short_opt_arg shell
# variables after splitting SHORTOPT after the 2nd character.
-func_split_short_opt ()
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+ # This is an XSI compatible shell, allowing a faster implementation...
+ eval 'func_split_short_opt ()
+ {
+ $debug_cmd
+
+ func_split_short_opt_arg=${1#??}
+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
+ }'
+else
+ # ...otherwise fall back to using expr, which is often a shell builtin.
+ func_split_short_opt ()
+ {
+ $debug_cmd
+
+ func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'`
+ func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'`
+ }
+fi #func_split_short_opt
+
+
+# func_usage
+# ----------
+# Echo short help message to standard output and exit.
+func_usage ()
{
- my_sed_short_opt='1s/^\(..\).*$/\1/;q'
- my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
+ $debug_cmd
- func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
- func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
-} # func_split_short_opt may be replaced by extended shell implementation
+ func_usage_message
+ $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
+ exit 0
+}
-# func_split_long_opt longopt
-# Set func_split_long_opt_name and func_split_long_opt_arg shell
-# variables after splitting LONGOPT at the `=' sign.
-func_split_long_opt ()
+# func_usage_message
+# ------------------
+# Echo short help message to standard output.
+func_usage_message ()
{
- my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
- my_sed_long_arg='1s/^--[^=]*=//'
+ $debug_cmd
- func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
- func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
-} # func_split_long_opt may be replaced by extended shell implementation
+ eval \$ECHO \""Usage: $usage"\"
+ echo
+ $SED -n 's|^# ||
+ /^Written by/{
+ x;p;x
+ }
+ h
+ /^Written by/q' < "$progpath"
+ echo
+ eval \$ECHO \""$usage_message"\"
+}
-exit_cmd=:
+# func_version
+# ------------
+# Echo version message to standard output and exit.
+func_version ()
+{
+ $debug_cmd
+ printf '%s\n' "$progname $scriptversion"
+ $SED -n '
+ /(C)/!b go
+ :more
+ /\./!{
+ N
+ s|\n# | |
+ b more
+ }
+ :go
+ /^# Written by /,/# warranty; / {
+ s|^# ||
+ s|^# *$||
+ s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2|
+ p
+ }
+ /^# Written by / {
+ s|^# ||
+ p
+ }
+ /^warranty; /q' < "$progpath"
+ exit $?
+}
-magic="%%%MAGIC variable%%%"
-magic_exe="%%%MAGIC EXE variable%%%"
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
-# Global variables.
-nonopt=
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
+# Set a version string.
+scriptversion='(GNU libtool) 2.4.6'
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end. This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
+# func_echo ARG...
+# ----------------
+# Libtool also displays the current mode in messages, so override
+# funclib.sh func_echo with this custom definition.
+func_echo ()
{
- eval "${1}=\$${1}\${2}"
-} # func_append may be replaced by extended shell implementation
+ $debug_cmd
-# func_append_quoted var value
-# Quote VALUE and append to the end of shell variable VAR, separated
-# by a space.
-func_append_quoted ()
-{
- func_quote_for_eval "${2}"
- eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
-} # func_append_quoted may be replaced by extended shell implementation
+ _G_message=$*
+
+ func_echo_IFS=$IFS
+ IFS=$nl
+ for _G_line in $_G_message; do
+ IFS=$func_echo_IFS
+ $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
+ done
+ IFS=$func_echo_IFS
+}
-# func_arith arithmetic-term...
-func_arith ()
+# func_warning ARG...
+# -------------------
+# Libtool warnings are not categorized, so override funclib.sh
+# func_warning with this simpler definition.
+func_warning ()
{
- func_arith_result=`expr "${@}"`
-} # func_arith may be replaced by extended shell implementation
+ $debug_cmd
+
+ $warning_func ${1+"$@"}
+}
+
+## ---------------- ##
+## Options parsing. ##
+## ---------------- ##
+
+# Hook in the functions to make sure our own options are parsed during
+# the option parsing loop.
+
+usage='$progpath [OPTION]... [MODE-ARG]...'
+
+# Short help message in response to '-h'.
+usage_message="Options:
+ --config show all configuration variables
+ --debug enable verbose shell tracing
+ -n, --dry-run display commands without modifying any files
+ --features display basic configuration information and exit
+ --mode=MODE use operation mode MODE
+ --no-warnings equivalent to '-Wnone'
+ --preserve-dup-deps don't remove duplicate dependency libraries
+ --quiet, --silent don't print informational messages
+ --tag=TAG use configuration variables from tag TAG
+ -v, --verbose print more informational messages than default
+ --version print version information
+ -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all]
+ -h, --help, --help-all print short, long, or detailed help message
+"
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
+# Additional text appended to 'usage_message' in response to '--help'.
+func_help ()
{
- func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
-} # func_len may be replaced by extended shell implementation
+ $debug_cmd
+
+ func_usage_message
+ $ECHO "$long_help_message
+
+MODE must be one of the following:
+
+ clean remove files from the build directory
+ compile compile a source file into a libtool object
+ execute automatically set library path, then run a program
+ finish complete the installation of libtool libraries
+ install install libraries or executables
+ link create a library or an executable
+ uninstall remove libraries from an installed directory
+
+MODE-ARGS vary depending on the MODE. When passed as first option,
+'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that.
+Try '$progname --help --mode=MODE' for a more detailed description of MODE.
+
+When reporting a bug, please describe a test case to reproduce it and
+include the following information:
+
+ host-triplet: $host
+ shell: $SHELL
+ compiler: $LTCC
+ compiler flags: $LTCFLAGS
+ linker: $LD (gnu? $with_gnu_ld)
+ version: $progname $scriptversion Debian-2.4.6-2
+ automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
+ autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
+
+Report bugs to <bug-libtool at gnu.org>.
+GNU libtool home page: <http://www.gnu.org/s/libtool/>.
+General help using GNU software: <http://www.gnu.org/gethelp/>."
+ exit 0
+}
-# func_lo2o object
-func_lo2o ()
-{
- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-} # func_lo2o may be replaced by extended shell implementation
+# func_lo2o OBJECT-NAME
+# ---------------------
+# Transform OBJECT-NAME from a '.lo' suffix to the platform specific
+# object suffix.
+lo2o=s/\\.lo\$/.$objext/
+o2lo=s/\\.$objext\$/.lo/
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-} # func_xform may be replaced by extended shell implementation
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ eval 'func_lo2o ()
+ {
+ case $1 in
+ *.lo) func_lo2o_result=${1%.lo}.$objext ;;
+ * ) func_lo2o_result=$1 ;;
+ esac
+ }'
+
+ # func_xform LIBOBJ-OR-SOURCE
+ # ---------------------------
+ # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise)
+ # suffix to a '.lo' libtool-object suffix.
+ eval 'func_xform ()
+ {
+ func_xform_result=${1%.*}.lo
+ }'
+else
+ # ...otherwise fall back to using sed.
+ func_lo2o ()
+ {
+ func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"`
+ }
+
+ func_xform ()
+ {
+ func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'`
+ }
+fi
-# func_fatal_configuration arg...
+# func_fatal_configuration ARG...
+# -------------------------------
# Echo program name prefixed message to standard error, followed by
# a configuration failure hint, and exit.
func_fatal_configuration ()
{
- func_error ${1+"$@"}
- func_error "See the $PACKAGE documentation for more information."
- func_fatal_error "Fatal configuration error."
+ func__fatal_error ${1+"$@"} \
+ "See the $PACKAGE documentation for more information." \
+ "Fatal configuration error."
}
# func_config
+# -----------
# Display the configuration for all the tags in this script.
func_config ()
{
@@ -915,17 +2149,19 @@ func_config ()
exit $?
}
+
# func_features
+# -------------
# Display the features supported by this script.
func_features ()
{
echo "host: $host"
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
echo "enable shared libraries"
else
echo "disable shared libraries"
fi
- if test "$build_old_libs" = yes; then
+ if test yes = "$build_old_libs"; then
echo "enable static libraries"
else
echo "disable static libraries"
@@ -934,289 +2170,297 @@ func_features ()
exit $?
}
-# func_enable_tag tagname
+
+# func_enable_tag TAGNAME
+# -----------------------
# Verify that TAGNAME is valid, and either flag an error and exit, or
# enable the TAGNAME tag. We also add TAGNAME to the global $taglist
# variable here.
func_enable_tag ()
{
- # Global variable:
- tagname="$1"
+ # Global variable:
+ tagname=$1
- re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
- re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
- sed_extractcf="/$re_begincf/,/$re_endcf/p"
+ re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+ re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+ sed_extractcf=/$re_begincf/,/$re_endcf/p
- # Validate tagname.
- case $tagname in
- *[!-_A-Za-z0-9,/]*)
- func_fatal_error "invalid tag name: $tagname"
- ;;
- esac
+ # Validate tagname.
+ case $tagname in
+ *[!-_A-Za-z0-9,/]*)
+ func_fatal_error "invalid tag name: $tagname"
+ ;;
+ esac
- # Don't test for the "default" C tag, as we know it's
- # there but not specially marked.
- case $tagname in
- CC) ;;
+ # Don't test for the "default" C tag, as we know it's
+ # there but not specially marked.
+ case $tagname in
+ CC) ;;
*)
- if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
- taglist="$taglist $tagname"
-
- # Evaluate the configuration. Be careful to quote the path
- # and the sed script, to avoid splitting on whitespace, but
- # also don't use non-portable quotes within backquotes within
- # quotes we have to do it in 2 steps:
- extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
- eval "$extractedcf"
- else
- func_error "ignoring unknown tag $tagname"
- fi
- ;;
- esac
+ if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+ taglist="$taglist $tagname"
+
+ # Evaluate the configuration. Be careful to quote the path
+ # and the sed script, to avoid splitting on whitespace, but
+ # also don't use non-portable quotes within backquotes within
+ # quotes we have to do it in 2 steps:
+ extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+ eval "$extractedcf"
+ else
+ func_error "ignoring unknown tag $tagname"
+ fi
+ ;;
+ esac
}
+
# func_check_version_match
+# ------------------------
# Ensure that we are using m4 macros, and libtool script from the same
# release of libtool.
func_check_version_match ()
{
- if test "$package_revision" != "$macro_revision"; then
- if test "$VERSION" != "$macro_version"; then
- if test -z "$macro_version"; then
- cat >&2 <<_LT_EOF
+ if test "$package_revision" != "$macro_revision"; then
+ if test "$VERSION" != "$macro_version"; then
+ if test -z "$macro_version"; then
+ cat >&2 <<_LT_EOF
$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
$progname: definition of this LT_INIT comes from an older release.
$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
$progname: and run autoconf again.
_LT_EOF
- else
- cat >&2 <<_LT_EOF
+ else
+ cat >&2 <<_LT_EOF
$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
$progname: and run autoconf again.
_LT_EOF
- fi
- else
- cat >&2 <<_LT_EOF
+ fi
+ else
+ cat >&2 <<_LT_EOF
$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
$progname: but the definition of this LT_INIT comes from revision $macro_revision.
$progname: You should recreate aclocal.m4 with macros from revision $package_revision
$progname: of $PACKAGE $VERSION and run autoconf again.
_LT_EOF
- fi
+ fi
- exit $EXIT_MISMATCH
- fi
+ exit $EXIT_MISMATCH
+ fi
}
-# Shorthand for --mode=foo, only valid as the first argument
-case $1 in
-clean|clea|cle|cl)
- shift; set dummy --mode clean ${1+"$@"}; shift
- ;;
-compile|compil|compi|comp|com|co|c)
- shift; set dummy --mode compile ${1+"$@"}; shift
- ;;
-execute|execut|execu|exec|exe|ex|e)
- shift; set dummy --mode execute ${1+"$@"}; shift
- ;;
-finish|finis|fini|fin|fi|f)
- shift; set dummy --mode finish ${1+"$@"}; shift
- ;;
-install|instal|insta|inst|ins|in|i)
- shift; set dummy --mode install ${1+"$@"}; shift
- ;;
-link|lin|li|l)
- shift; set dummy --mode link ${1+"$@"}; shift
- ;;
-uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
- shift; set dummy --mode uninstall ${1+"$@"}; shift
- ;;
-esac
+# libtool_options_prep [ARG]...
+# -----------------------------
+# Preparation for options parsed by libtool.
+libtool_options_prep ()
+{
+ $debug_mode
+ # Option defaults:
+ opt_config=false
+ opt_dlopen=
+ opt_dry_run=false
+ opt_help=false
+ opt_mode=
+ opt_preserve_dup_deps=false
+ opt_quiet=false
+ nonopt=
+ preserve_args=
-# Option defaults:
-opt_debug=:
-opt_dry_run=false
-opt_config=false
-opt_preserve_dup_deps=false
-opt_features=false
-opt_finish=false
-opt_help=false
-opt_help_all=false
-opt_silent=:
-opt_warning=:
-opt_verbose=:
-opt_silent=false
-opt_verbose=false
+ # Shorthand for --mode=foo, only valid as the first argument
+ case $1 in
+ clean|clea|cle|cl)
+ shift; set dummy --mode clean ${1+"$@"}; shift
+ ;;
+ compile|compil|compi|comp|com|co|c)
+ shift; set dummy --mode compile ${1+"$@"}; shift
+ ;;
+ execute|execut|execu|exec|exe|ex|e)
+ shift; set dummy --mode execute ${1+"$@"}; shift
+ ;;
+ finish|finis|fini|fin|fi|f)
+ shift; set dummy --mode finish ${1+"$@"}; shift
+ ;;
+ install|instal|insta|inst|ins|in|i)
+ shift; set dummy --mode install ${1+"$@"}; shift
+ ;;
+ link|lin|li|l)
+ shift; set dummy --mode link ${1+"$@"}; shift
+ ;;
+ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+ shift; set dummy --mode uninstall ${1+"$@"}; shift
+ ;;
+ esac
+
+ # Pass back the list of options.
+ func_quote_for_eval ${1+"$@"}
+ libtool_options_prep_result=$func_quote_for_eval_result
+}
+func_add_hook func_options_prep libtool_options_prep
-# Parse options once, thoroughly. This comes as soon as possible in the
-# script to make things like `--version' happen as quickly as we can.
+# libtool_parse_options [ARG]...
+# ---------------------------------
+# Provide handling for libtool specific options.
+libtool_parse_options ()
{
- # this just eases exit handling
- while test $# -gt 0; do
- opt="$1"
- shift
- case $opt in
- --debug|-x) opt_debug='set -x'
- func_echo "enabling shell trace mode"
- $opt_debug
- ;;
- --dry-run|--dryrun|-n)
- opt_dry_run=:
- ;;
- --config)
- opt_config=:
-func_config
- ;;
- --dlopen|-dlopen)
- optarg="$1"
- opt_dlopen="${opt_dlopen+$opt_dlopen
-}$optarg"
- shift
- ;;
- --preserve-dup-deps)
- opt_preserve_dup_deps=:
- ;;
- --features)
- opt_features=:
-func_features
- ;;
- --finish)
- opt_finish=:
-set dummy --mode finish ${1+"$@"}; shift
- ;;
- --help)
- opt_help=:
- ;;
- --help-all)
- opt_help_all=:
-opt_help=': help-all'
- ;;
- --mode)
- test $# = 0 && func_missing_arg $opt && break
- optarg="$1"
- opt_mode="$optarg"
-case $optarg in
- # Valid mode arguments:
- clean|compile|execute|finish|install|link|relink|uninstall) ;;
-
- # Catch anything else as an error
- *) func_error "invalid argument for $opt"
- exit_cmd=exit
- break
- ;;
-esac
- shift
- ;;
- --no-silent|--no-quiet)
- opt_silent=false
-func_append preserve_args " $opt"
- ;;
- --no-warning|--no-warn)
- opt_warning=false
-func_append preserve_args " $opt"
- ;;
- --no-verbose)
- opt_verbose=false
-func_append preserve_args " $opt"
- ;;
- --silent|--quiet)
- opt_silent=:
-func_append preserve_args " $opt"
- opt_verbose=false
- ;;
- --verbose|-v)
- opt_verbose=:
-func_append preserve_args " $opt"
-opt_silent=false
- ;;
- --tag)
- test $# = 0 && func_missing_arg $opt && break
- optarg="$1"
- opt_tag="$optarg"
-func_append preserve_args " $opt $optarg"
-func_enable_tag "$optarg"
- shift
- ;;
-
- -\?|-h) func_usage ;;
- --help) func_help ;;
- --version) func_version ;;
-
- # Separate optargs to long options:
- --*=*)
- func_split_long_opt "$opt"
- set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
- shift
- ;;
-
- # Separate non-argument short options:
- -\?*|-h*|-n*|-v*)
- func_split_short_opt "$opt"
- set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
- shift
- ;;
-
- --) break ;;
- -*) func_fatal_help "unrecognized option \`$opt'" ;;
- *) set dummy "$opt" ${1+"$@"}; shift; break ;;
- esac
- done
+ $debug_cmd
- # Validate options:
+ # Perform our own loop to consume as many options as possible in
+ # each iteration.
+ while test $# -gt 0; do
+ _G_opt=$1
+ shift
+ case $_G_opt in
+ --dry-run|--dryrun|-n)
+ opt_dry_run=:
+ ;;
+
+ --config) func_config ;;
+
+ --dlopen|-dlopen)
+ opt_dlopen="${opt_dlopen+$opt_dlopen
+}$1"
+ shift
+ ;;
+
+ --preserve-dup-deps)
+ opt_preserve_dup_deps=: ;;
+
+ --features) func_features ;;
+
+ --finish) set dummy --mode finish ${1+"$@"}; shift ;;
+
+ --help) opt_help=: ;;
+
+ --help-all) opt_help=': help-all' ;;
+
+ --mode) test $# = 0 && func_missing_arg $_G_opt && break
+ opt_mode=$1
+ case $1 in
+ # Valid mode arguments:
+ clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+ # Catch anything else as an error
+ *) func_error "invalid argument for $_G_opt"
+ exit_cmd=exit
+ break
+ ;;
+ esac
+ shift
+ ;;
+
+ --no-silent|--no-quiet)
+ opt_quiet=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --no-warnings|--no-warning|--no-warn)
+ opt_warning=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --no-verbose)
+ opt_verbose=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --silent|--quiet)
+ opt_quiet=:
+ opt_verbose=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --tag) test $# = 0 && func_missing_arg $_G_opt && break
+ opt_tag=$1
+ func_append preserve_args " $_G_opt $1"
+ func_enable_tag "$1"
+ shift
+ ;;
+
+ --verbose|-v) opt_quiet=false
+ opt_verbose=:
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ # An option not handled by this hook function:
+ *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+ esac
+ done
- # save first non-option argument
- if test "$#" -gt 0; then
- nonopt="$opt"
- shift
- fi
- # preserve --debug
- test "$opt_debug" = : || func_append preserve_args " --debug"
+ # save modified positional parameters for caller
+ func_quote_for_eval ${1+"$@"}
+ libtool_parse_options_result=$func_quote_for_eval_result
+}
+func_add_hook func_parse_options libtool_parse_options
- case $host in
- *cygwin* | *mingw* | *pw32* | *cegcc*)
- # don't eliminate duplications in $postdeps and $predeps
- opt_duplicate_compiler_generated_deps=:
- ;;
- *)
- opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
- ;;
- esac
- $opt_help || {
- # Sanity checks first:
- func_check_version_match
- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
- func_fatal_configuration "not configured to build any kind of library"
+# libtool_validate_options [ARG]...
+# ---------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+libtool_validate_options ()
+{
+ # save first non-option argument
+ if test 0 -lt $#; then
+ nonopt=$1
+ shift
fi
- # Darwin sucks
- eval std_shrext=\"$shrext_cmds\"
+ # preserve --debug
+ test : = "$debug_cmd" || func_append preserve_args " --debug"
- # Only execute mode is allowed to have -dlopen flags.
- if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
- func_error "unrecognized option \`-dlopen'"
- $ECHO "$help" 1>&2
- exit $EXIT_FAILURE
- fi
+ 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* | *pw32* | *cegcc* | *solaris2* | *os2*)
+ # don't eliminate duplications in $postdeps and $predeps
+ opt_duplicate_compiler_generated_deps=:
+ ;;
+ *)
+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+ ;;
+ esac
- # Change the help message to a mode-specific one.
- generic_help="$help"
- help="Try \`$progname --help --mode=$opt_mode' for more information."
- }
+ $opt_help || {
+ # Sanity checks first:
+ func_check_version_match
+ test yes != "$build_libtool_libs" \
+ && test yes != "$build_old_libs" \
+ && func_fatal_configuration "not configured to build any kind of library"
- # Bail if the options were screwed
- $exit_cmd $EXIT_FAILURE
+ # Darwin sucks
+ eval std_shrext=\"$shrext_cmds\"
+
+ # Only execute mode is allowed to have -dlopen flags.
+ if test -n "$opt_dlopen" && test execute != "$opt_mode"; then
+ func_error "unrecognized option '-dlopen'"
+ $ECHO "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ # Change the help message to a mode-specific one.
+ generic_help=$help
+ help="Try '$progname --help --mode=$opt_mode' for more information."
+ }
+
+ # Pass back the unparsed argument list
+ func_quote_for_eval ${1+"$@"}
+ libtool_validate_options_result=$func_quote_for_eval_result
}
+func_add_hook func_validate_options libtool_validate_options
+
+# Process options as early as possible so that --help and --version
+# can return quickly.
+func_options ${1+"$@"}
+eval set dummy "$func_options_result"; shift
@@ -1224,24 +2468,52 @@ func_enable_tag "$optarg"
## Main. ##
## ----------- ##
+magic='%%%MAGIC variable%%%'
+magic_exe='%%%MAGIC EXE variable%%%'
+
+# Global variables.
+extracted_archives=
+extracted_serial=0
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end. This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+ eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
+# func_generated_by_libtool
+# True iff stdin has been generated by Libtool. This function is only
+# a basic sanity check; it will hardly flush out determined imposters.
+func_generated_by_libtool_p ()
+{
+ $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
# func_lalib_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
+# True iff FILE is a libtool '.la' library or '.lo' object file.
# This function is only a basic sanity check; it will hardly flush out
# determined imposters.
func_lalib_p ()
{
test -f "$1" &&
- $SED -e 4q "$1" 2>/dev/null \
- | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+ $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
}
# func_lalib_unsafe_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
+# True iff FILE is a libtool '.la' library or '.lo' object file.
# This function implements the same check as func_lalib_p without
# resorting to external programs. To this end, it redirects stdin and
# closes it afterwards, without saving the original file descriptor.
# As a safety measure, use it only where a negative result would be
-# fatal anyway. Works if `file' does not exist.
+# fatal anyway. Works if 'file' does not exist.
func_lalib_unsafe_p ()
{
lalib_p=no
@@ -1249,13 +2521,13 @@ func_lalib_unsafe_p ()
for lalib_p_l in 1 2 3 4
do
read lalib_p_line
- case "$lalib_p_line" in
+ case $lalib_p_line in
\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
esac
done
exec 0<&5 5<&-
fi
- test "$lalib_p" = yes
+ test yes = "$lalib_p"
}
# func_ltwrapper_script_p file
@@ -1264,7 +2536,8 @@ func_lalib_unsafe_p ()
# determined imposters.
func_ltwrapper_script_p ()
{
- func_lalib_p "$1"
+ test -f "$1" &&
+ $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
}
# func_ltwrapper_executable_p file
@@ -1289,7 +2562,7 @@ func_ltwrapper_scriptname ()
{
func_dirname_and_basename "$1" "" "."
func_stripname '' '.exe' "$func_basename_result"
- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+ func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper
}
# func_ltwrapper_p file
@@ -1308,11 +2581,13 @@ func_ltwrapper_p ()
# FAIL_CMD may read-access the current command in variable CMD!
func_execute_cmds ()
{
- $opt_debug
+ $debug_cmd
+
save_ifs=$IFS; IFS='~'
for cmd in $1; do
- IFS=$save_ifs
+ IFS=$sp$nl
eval cmd=\"$cmd\"
+ IFS=$save_ifs
func_show_eval "$cmd" "${2-:}"
done
IFS=$save_ifs
@@ -1324,10 +2599,11 @@ func_execute_cmds ()
# Note that it is not necessary on cygwin/mingw to append a dot to
# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
# behavior happens only for exec(3), not for open(2)! Also, sourcing
-# `FILE.' does not work on cygwin managed mounts.
+# 'FILE.' does not work on cygwin managed mounts.
func_source ()
{
- $opt_debug
+ $debug_cmd
+
case $1 in
*/* | *\\*) . "$1" ;;
*) . "./$1" ;;
@@ -1354,10 +2630,10 @@ func_resolve_sysroot ()
# store the result into func_replace_sysroot_result.
func_replace_sysroot ()
{
- case "$lt_sysroot:$1" in
+ case $lt_sysroot:$1 in
?*:"$lt_sysroot"*)
func_stripname "$lt_sysroot" '' "$1"
- func_replace_sysroot_result="=$func_stripname_result"
+ func_replace_sysroot_result='='$func_stripname_result
;;
*)
# Including no sysroot.
@@ -1374,7 +2650,8 @@ func_replace_sysroot ()
# arg is usually of the form 'gcc ...'
func_infer_tag ()
{
- $opt_debug
+ $debug_cmd
+
if test -n "$available_tags" && test -z "$tagname"; then
CC_quoted=
for arg in $CC; do
@@ -1393,7 +2670,7 @@ func_infer_tag ()
for z in $available_tags; do
if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
# Evaluate the configuration.
- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+ eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
CC_quoted=
for arg in $CC; do
# Double-quote args containing other shell metacharacters.
@@ -1418,7 +2695,7 @@ func_infer_tag ()
# line option must be used.
if test -z "$tagname"; then
func_echo "unable to infer tagged configuration"
- func_fatal_error "specify a tag with \`--tag'"
+ func_fatal_error "specify a tag with '--tag'"
# else
# func_verbose "using $tagname tagged configuration"
fi
@@ -1434,15 +2711,15 @@ func_infer_tag ()
# but don't create it if we're doing a dry run.
func_write_libtool_object ()
{
- write_libobj=${1}
- if test "$build_libtool_libs" = yes; then
- write_lobj=\'${2}\'
+ write_libobj=$1
+ if test yes = "$build_libtool_libs"; then
+ write_lobj=\'$2\'
else
write_lobj=none
fi
- if test "$build_old_libs" = yes; then
- write_oldobj=\'${3}\'
+ if test yes = "$build_old_libs"; then
+ write_oldobj=\'$3\'
else
write_oldobj=none
fi
@@ -1450,7 +2727,7 @@ func_write_libtool_object ()
$opt_dry_run || {
cat >${write_libobj}T <<EOF
# $write_libobj - a libtool object file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
@@ -1462,7 +2739,7 @@ pic_object=$write_lobj
non_pic_object=$write_oldobj
EOF
- $MV "${write_libobj}T" "${write_libobj}"
+ $MV "${write_libobj}T" "$write_libobj"
}
}
@@ -1482,8 +2759,9 @@ EOF
# be empty on error (or when ARG is empty)
func_convert_core_file_wine_to_w32 ()
{
- $opt_debug
- func_convert_core_file_wine_to_w32_result="$1"
+ $debug_cmd
+
+ func_convert_core_file_wine_to_w32_result=$1
if test -n "$1"; then
# Unfortunately, winepath does not exit with a non-zero error code, so we
# are forced to check the contents of stdout. On the other hand, if the
@@ -1491,9 +2769,9 @@ func_convert_core_file_wine_to_w32 ()
# *an error message* to stdout. So we must check for both error code of
# zero AND non-empty stdout, which explains the odd construction:
func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
- if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
+ if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then
func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
- $SED -e "$lt_sed_naive_backslashify"`
+ $SED -e "$sed_naive_backslashify"`
else
func_convert_core_file_wine_to_w32_result=
fi
@@ -1514,18 +2792,19 @@ func_convert_core_file_wine_to_w32 ()
# are convertible, then the result may be empty.
func_convert_core_path_wine_to_w32 ()
{
- $opt_debug
+ $debug_cmd
+
# unfortunately, winepath doesn't convert paths, only file names
- func_convert_core_path_wine_to_w32_result=""
+ func_convert_core_path_wine_to_w32_result=
if test -n "$1"; then
oldIFS=$IFS
IFS=:
for func_convert_core_path_wine_to_w32_f in $1; do
IFS=$oldIFS
func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
- if test -n "$func_convert_core_file_wine_to_w32_result" ; then
+ if test -n "$func_convert_core_file_wine_to_w32_result"; then
if test -z "$func_convert_core_path_wine_to_w32_result"; then
- func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
+ func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result
else
func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
fi
@@ -1554,7 +2833,8 @@ func_convert_core_path_wine_to_w32 ()
# environment variable; do not put it in $PATH.
func_cygpath ()
{
- $opt_debug
+ $debug_cmd
+
if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
if test "$?" -ne 0; then
@@ -1563,7 +2843,7 @@ func_cygpath ()
fi
else
func_cygpath_result=
- func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+ func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'"
fi
}
#end: func_cygpath
@@ -1574,10 +2854,11 @@ func_cygpath ()
# result in func_convert_core_msys_to_w32_result.
func_convert_core_msys_to_w32 ()
{
- $opt_debug
+ $debug_cmd
+
# awkward: cmd appends spaces to result
func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+ $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"`
}
#end: func_convert_core_msys_to_w32
@@ -1588,13 +2869,14 @@ func_convert_core_msys_to_w32 ()
# func_to_host_file_result to ARG1).
func_convert_file_check ()
{
- $opt_debug
- if test -z "$2" && test -n "$1" ; then
+ $debug_cmd
+
+ if test -z "$2" && test -n "$1"; then
func_error "Could not determine host file name corresponding to"
- func_error " \`$1'"
+ func_error " '$1'"
func_error "Continuing, but uninstalled executables may not work."
# Fallback:
- func_to_host_file_result="$1"
+ func_to_host_file_result=$1
fi
}
# end func_convert_file_check
@@ -1606,10 +2888,11 @@ func_convert_file_check ()
# func_to_host_file_result to a simplistic fallback value (see below).
func_convert_path_check ()
{
- $opt_debug
+ $debug_cmd
+
if test -z "$4" && test -n "$3"; then
func_error "Could not determine the host path corresponding to"
- func_error " \`$3'"
+ func_error " '$3'"
func_error "Continuing, but uninstalled executables may not work."
# Fallback. This is a deliberately simplistic "conversion" and
# should not be "improved". See libtool.info.
@@ -1618,7 +2901,7 @@ func_convert_path_check ()
func_to_host_path_result=`echo "$3" |
$SED -e "$lt_replace_pathsep_chars"`
else
- func_to_host_path_result="$3"
+ func_to_host_path_result=$3
fi
fi
}
@@ -1630,9 +2913,10 @@ func_convert_path_check ()
# and appending REPL if ORIG matches BACKPAT.
func_convert_path_front_back_pathsep ()
{
- $opt_debug
+ $debug_cmd
+
case $4 in
- $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+ $1 ) func_to_host_path_result=$3$func_to_host_path_result
;;
esac
case $4 in
@@ -1646,7 +2930,7 @@ func_convert_path_front_back_pathsep ()
##################################################
# $build to $host FILE NAME CONVERSION FUNCTIONS #
##################################################
-# invoked via `$to_host_file_cmd ARG'
+# invoked via '$to_host_file_cmd ARG'
#
# In each case, ARG is the path to be converted from $build to $host format.
# Result will be available in $func_to_host_file_result.
@@ -1657,7 +2941,8 @@ func_convert_path_front_back_pathsep ()
# in func_to_host_file_result.
func_to_host_file ()
{
- $opt_debug
+ $debug_cmd
+
$to_host_file_cmd "$1"
}
# end func_to_host_file
@@ -1669,7 +2954,8 @@ func_to_host_file ()
# in (the comma separated) LAZY, no conversion takes place.
func_to_tool_file ()
{
- $opt_debug
+ $debug_cmd
+
case ,$2, in
*,"$to_tool_file_cmd",*)
func_to_tool_file_result=$1
@@ -1687,7 +2973,7 @@ func_to_tool_file ()
# Copy ARG to func_to_host_file_result.
func_convert_file_noop ()
{
- func_to_host_file_result="$1"
+ func_to_host_file_result=$1
}
# end func_convert_file_noop
@@ -1698,11 +2984,12 @@ func_convert_file_noop ()
# func_to_host_file_result.
func_convert_file_msys_to_w32 ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
func_convert_core_msys_to_w32 "$1"
- func_to_host_file_result="$func_convert_core_msys_to_w32_result"
+ func_to_host_file_result=$func_convert_core_msys_to_w32_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -1714,8 +3001,9 @@ func_convert_file_msys_to_w32 ()
# func_to_host_file_result.
func_convert_file_cygwin_to_w32 ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
# because $build is cygwin, we call "the" cygpath in $PATH; no need to use
# LT_CYGPATH in this case.
@@ -1731,11 +3019,12 @@ func_convert_file_cygwin_to_w32 ()
# and a working winepath. Returns result in func_to_host_file_result.
func_convert_file_nix_to_w32 ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
func_convert_core_file_wine_to_w32 "$1"
- func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
+ func_to_host_file_result=$func_convert_core_file_wine_to_w32_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -1747,12 +3036,13 @@ func_convert_file_nix_to_w32 ()
# Returns result in func_to_host_file_result.
func_convert_file_msys_to_cygwin ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
func_convert_core_msys_to_w32 "$1"
func_cygpath -u "$func_convert_core_msys_to_w32_result"
- func_to_host_file_result="$func_cygpath_result"
+ func_to_host_file_result=$func_cygpath_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -1765,13 +3055,14 @@ func_convert_file_msys_to_cygwin ()
# in func_to_host_file_result.
func_convert_file_nix_to_cygwin ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
# convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
func_convert_core_file_wine_to_w32 "$1"
func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
- func_to_host_file_result="$func_cygpath_result"
+ func_to_host_file_result=$func_cygpath_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -1781,7 +3072,7 @@ func_convert_file_nix_to_cygwin ()
#############################################
# $build to $host PATH CONVERSION FUNCTIONS #
#############################################
-# invoked via `$to_host_path_cmd ARG'
+# invoked via '$to_host_path_cmd ARG'
#
# In each case, ARG is the path to be converted from $build to $host format.
# The result will be available in $func_to_host_path_result.
@@ -1805,10 +3096,11 @@ func_convert_file_nix_to_cygwin ()
to_host_path_cmd=
func_init_to_host_path_cmd ()
{
- $opt_debug
+ $debug_cmd
+
if test -z "$to_host_path_cmd"; then
func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
- to_host_path_cmd="func_convert_path_${func_stripname_result}"
+ to_host_path_cmd=func_convert_path_$func_stripname_result
fi
}
@@ -1818,7 +3110,8 @@ func_init_to_host_path_cmd ()
# in func_to_host_path_result.
func_to_host_path ()
{
- $opt_debug
+ $debug_cmd
+
func_init_to_host_path_cmd
$to_host_path_cmd "$1"
}
@@ -1829,7 +3122,7 @@ func_to_host_path ()
# Copy ARG to func_to_host_path_result.
func_convert_path_noop ()
{
- func_to_host_path_result="$1"
+ func_to_host_path_result=$1
}
# end func_convert_path_noop
@@ -1840,8 +3133,9 @@ func_convert_path_noop ()
# func_to_host_path_result.
func_convert_path_msys_to_w32 ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# Remove leading and trailing path separator characters from ARG. MSYS
# behavior is inconsistent here; cygpath turns them into '.;' and ';.';
@@ -1849,7 +3143,7 @@ func_convert_path_msys_to_w32 ()
func_stripname : : "$1"
func_to_host_path_tmp1=$func_stripname_result
func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
- func_to_host_path_result="$func_convert_core_msys_to_w32_result"
+ func_to_host_path_result=$func_convert_core_msys_to_w32_result
func_convert_path_check : ";" \
"$func_to_host_path_tmp1" "$func_to_host_path_result"
func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
@@ -1863,8 +3157,9 @@ func_convert_path_msys_to_w32 ()
# func_to_host_file_result.
func_convert_path_cygwin_to_w32 ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# See func_convert_path_msys_to_w32:
func_stripname : : "$1"
@@ -1883,14 +3178,15 @@ func_convert_path_cygwin_to_w32 ()
# a working winepath. Returns result in func_to_host_file_result.
func_convert_path_nix_to_w32 ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# See func_convert_path_msys_to_w32:
func_stripname : : "$1"
func_to_host_path_tmp1=$func_stripname_result
func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
- func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
+ func_to_host_path_result=$func_convert_core_path_wine_to_w32_result
func_convert_path_check : ";" \
"$func_to_host_path_tmp1" "$func_to_host_path_result"
func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
@@ -1904,15 +3200,16 @@ func_convert_path_nix_to_w32 ()
# Returns result in func_to_host_file_result.
func_convert_path_msys_to_cygwin ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# See func_convert_path_msys_to_w32:
func_stripname : : "$1"
func_to_host_path_tmp1=$func_stripname_result
func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
- func_to_host_path_result="$func_cygpath_result"
+ func_to_host_path_result=$func_cygpath_result
func_convert_path_check : : \
"$func_to_host_path_tmp1" "$func_to_host_path_result"
func_convert_path_front_back_pathsep ":*" "*:" : "$1"
@@ -1927,8 +3224,9 @@ func_convert_path_msys_to_cygwin ()
# func_to_host_file_result.
func_convert_path_nix_to_cygwin ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# Remove leading and trailing path separator characters from
# ARG. msys behavior is inconsistent here, cygpath turns them
@@ -1937,7 +3235,7 @@ func_convert_path_nix_to_cygwin ()
func_to_host_path_tmp1=$func_stripname_result
func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
- func_to_host_path_result="$func_cygpath_result"
+ func_to_host_path_result=$func_cygpath_result
func_convert_path_check : : \
"$func_to_host_path_tmp1" "$func_to_host_path_result"
func_convert_path_front_back_pathsep ":*" "*:" : "$1"
@@ -1946,13 +3244,31 @@ func_convert_path_nix_to_cygwin ()
# end func_convert_path_nix_to_cygwin
+# func_dll_def_p FILE
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with _LT_DLL_DEF_P in libtool.m4
+func_dll_def_p ()
+{
+ $debug_cmd
+
+ func_dll_def_p_tmp=`$SED -n \
+ -e 's/^[ ]*//' \
+ -e '/^\(;.*\)*$/d' \
+ -e 's/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p' \
+ -e q \
+ "$1"`
+ test DEF = "$func_dll_def_p_tmp"
+}
+
+
# func_mode_compile arg...
func_mode_compile ()
{
- $opt_debug
+ $debug_cmd
+
# Get the compilation command and the source file.
base_compile=
- srcfile="$nonopt" # always keep a non-empty value in "srcfile"
+ srcfile=$nonopt # always keep a non-empty value in "srcfile"
suppress_opt=yes
suppress_output=
arg_mode=normal
@@ -1965,12 +3281,12 @@ func_mode_compile ()
case $arg_mode in
arg )
# do not "continue". Instead, add this to base_compile
- lastarg="$arg"
+ lastarg=$arg
arg_mode=normal
;;
target )
- libobj="$arg"
+ libobj=$arg
arg_mode=normal
continue
;;
@@ -1980,7 +3296,7 @@ func_mode_compile ()
case $arg in
-o)
test -n "$libobj" && \
- func_fatal_error "you cannot specify \`-o' more than once"
+ func_fatal_error "you cannot specify '-o' more than once"
arg_mode=target
continue
;;
@@ -2009,12 +3325,12 @@ func_mode_compile ()
func_stripname '-Wc,' '' "$arg"
args=$func_stripname_result
lastarg=
- save_ifs="$IFS"; IFS=','
+ save_ifs=$IFS; IFS=,
for arg in $args; do
- IFS="$save_ifs"
+ IFS=$save_ifs
func_append_quoted lastarg "$arg"
done
- IFS="$save_ifs"
+ IFS=$save_ifs
func_stripname ' ' '' "$lastarg"
lastarg=$func_stripname_result
@@ -2027,8 +3343,8 @@ func_mode_compile ()
# Accept the current argument as the source file.
# The previous "srcfile" becomes the current argument.
#
- lastarg="$srcfile"
- srcfile="$arg"
+ lastarg=$srcfile
+ srcfile=$arg
;;
esac # case $arg
;;
@@ -2043,13 +3359,13 @@ func_mode_compile ()
func_fatal_error "you must specify an argument for -Xcompile"
;;
target)
- func_fatal_error "you must specify a target with \`-o'"
+ func_fatal_error "you must specify a target with '-o'"
;;
*)
# Get the name of the library object.
test -z "$libobj" && {
func_basename "$srcfile"
- libobj="$func_basename_result"
+ libobj=$func_basename_result
}
;;
esac
@@ -2069,7 +3385,7 @@ func_mode_compile ()
case $libobj in
*.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
*)
- func_fatal_error "cannot determine name of library object from \`$libobj'"
+ func_fatal_error "cannot determine name of library object from '$libobj'"
;;
esac
@@ -2078,8 +3394,8 @@ func_mode_compile ()
for arg in $later; do
case $arg in
-shared)
- test "$build_libtool_libs" != yes && \
- func_fatal_configuration "can not build a shared library"
+ test yes = "$build_libtool_libs" \
+ || func_fatal_configuration "cannot build a shared library"
build_old_libs=no
continue
;;
@@ -2105,17 +3421,17 @@ func_mode_compile ()
func_quote_for_eval "$libobj"
test "X$libobj" != "X$func_quote_for_eval_result" \
&& $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \
- && func_warning "libobj name \`$libobj' may not contain shell special characters."
+ && func_warning "libobj name '$libobj' may not contain shell special characters."
func_dirname_and_basename "$obj" "/" ""
- objname="$func_basename_result"
- xdir="$func_dirname_result"
- lobj=${xdir}$objdir/$objname
+ objname=$func_basename_result
+ xdir=$func_dirname_result
+ lobj=$xdir$objdir/$objname
test -z "$base_compile" && \
func_fatal_help "you must specify a compilation command"
# Delete any leftover library objects.
- if test "$build_old_libs" = yes; then
+ if test yes = "$build_old_libs"; then
removelist="$obj $lobj $libobj ${libobj}T"
else
removelist="$lobj $libobj ${libobj}T"
@@ -2127,16 +3443,16 @@ func_mode_compile ()
pic_mode=default
;;
esac
- if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+ if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then
# non-PIC code in shared libraries is not supported
pic_mode=default
fi
# Calculate the filename of the output object if compiler does
# not support -o with -c
- if test "$compiler_c_o" = no; then
- output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
- lockfile="$output_obj.lock"
+ if test no = "$compiler_c_o"; then
+ output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext
+ lockfile=$output_obj.lock
else
output_obj=
need_locks=no
@@ -2145,12 +3461,12 @@ func_mode_compile ()
# Lock this critical section if it is needed
# We use this script file to make the link, it avoids creating a new file
- if test "$need_locks" = yes; then
+ if test yes = "$need_locks"; then
until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
func_echo "Waiting for $lockfile to be removed"
sleep 2
done
- elif test "$need_locks" = warn; then
+ elif test warn = "$need_locks"; then
if test -f "$lockfile"; then
$ECHO "\
*** ERROR, $lockfile exists and contains:
@@ -2158,7 +3474,7 @@ func_mode_compile ()
This indicates that another process is trying to use the same
temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together. If you
+your compiler does not support '-c' and '-o' together. If you
repeat this compilation, it may succeed, by chance, but you had better
avoid parallel builds (make -j) in this platform, or get a better
compiler."
@@ -2180,11 +3496,11 @@ compiler."
qsrcfile=$func_quote_for_eval_result
# Only build a PIC object if we are building libtool libraries.
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
# Without this assignment, base_compile gets emptied.
fbsd_hideous_sh_bug=$base_compile
- if test "$pic_mode" != no; then
+ if test no != "$pic_mode"; then
command="$base_compile $qsrcfile $pic_flag"
else
# Don't build PIC code
@@ -2201,7 +3517,7 @@ compiler."
func_show_eval_locale "$command" \
'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
- if test "$need_locks" = warn &&
+ if test warn = "$need_locks" &&
test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
$ECHO "\
*** ERROR, $lockfile contains:
@@ -2212,7 +3528,7 @@ $srcfile
This indicates that another process is trying to use the same
temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together. If you
+your compiler does not support '-c' and '-o' together. If you
repeat this compilation, it may succeed, by chance, but you had better
avoid parallel builds (make -j) in this platform, or get a better
compiler."
@@ -2228,20 +3544,20 @@ compiler."
fi
# Allow error messages only from the first compilation.
- if test "$suppress_opt" = yes; then
+ if test yes = "$suppress_opt"; then
suppress_output=' >/dev/null 2>&1'
fi
fi
# Only build a position-dependent object if we build old libraries.
- if test "$build_old_libs" = yes; then
- if test "$pic_mode" != yes; then
+ if test yes = "$build_old_libs"; then
+ if test yes != "$pic_mode"; then
# Don't build PIC code
command="$base_compile $qsrcfile$pie_flag"
else
command="$base_compile $qsrcfile $pic_flag"
fi
- if test "$compiler_c_o" = yes; then
+ if test yes = "$compiler_c_o"; then
func_append command " -o $obj"
fi
@@ -2250,7 +3566,7 @@ compiler."
func_show_eval_locale "$command" \
'$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
- if test "$need_locks" = warn &&
+ if test warn = "$need_locks" &&
test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
$ECHO "\
*** ERROR, $lockfile contains:
@@ -2261,7 +3577,7 @@ $srcfile
This indicates that another process is trying to use the same
temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together. If you
+your compiler does not support '-c' and '-o' together. If you
repeat this compilation, it may succeed, by chance, but you had better
avoid parallel builds (make -j) in this platform, or get a better
compiler."
@@ -2281,7 +3597,7 @@ compiler."
func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
# Unlock the critical section if it was locked
- if test "$need_locks" != no; then
+ if test no != "$need_locks"; then
removelist=$lockfile
$RM "$lockfile"
fi
@@ -2291,7 +3607,7 @@ compiler."
}
$opt_help || {
- test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
+ test compile = "$opt_mode" && func_mode_compile ${1+"$@"}
}
func_mode_help ()
@@ -2311,7 +3627,7 @@ func_mode_help ()
Remove files from the build directory.
RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
+(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed
to RM.
If FILE is a libtool library, object or program, all the files associated
@@ -2330,16 +3646,16 @@ This mode accepts the following additional options:
-no-suppress do not suppress compiler output for multiple passes
-prefer-pic try to build PIC objects only
-prefer-non-pic try to build non-PIC objects only
- -shared do not build a \`.o' file suitable for static linking
- -static only build a \`.o' file suitable for static linking
+ -shared do not build a '.o' file suitable for static linking
+ -static only build a '.o' file suitable for static linking
-Wc,FLAG pass FLAG directly to the compiler
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+COMPILE-COMMAND is a command to be used in creating a 'standard' object file
from the given SOURCEFILE.
The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
+SOURCEFILE, then substituting the C source code suffix '.c' with the
+library object suffix, '.lo'."
;;
execute)
@@ -2352,7 +3668,7 @@ This mode accepts the following additional options:
-dlopen FILE add the directory containing FILE to the library path
-This mode sets the library path environment variable according to \`-dlopen'
+This mode sets the library path environment variable according to '-dlopen'
flags.
If any of the ARGS are libtool executable wrappers, then they are translated
@@ -2371,7 +3687,7 @@ Complete the installation of libtool libraries.
Each LIBDIR is a directory that contains libtool libraries.
The commands that this mode executes may require superuser privileges. Use
-the \`--dry-run' option if you just want to see what would be executed."
+the '--dry-run' option if you just want to see what would be executed."
;;
install)
@@ -2381,7 +3697,7 @@ the \`--dry-run' option if you just want to see what would be executed."
Install executables or libraries.
INSTALL-COMMAND is the installation command. The first component should be
-either the \`install' or \`cp' program.
+either the 'install' or 'cp' program.
The following components of INSTALL-COMMAND are treated specially:
@@ -2407,7 +3723,7 @@ The following components of LINK-COMMAND are treated specially:
-avoid-version do not add a version suffix if possible
-bindir BINDIR specify path to binaries directory (for systems where
libraries must be found in the PATH setting at runtime)
- -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
+ -dlopen FILE '-dlpreopen' FILE if it cannot be dlopened at runtime
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-export-symbols SYMFILE
@@ -2421,7 +3737,8 @@ The following components of LINK-COMMAND are treated specially:
-no-install link a not-installable executable
-no-undefined declare that a library does not refer to external symbols
-o OUTPUT-FILE create OUTPUT-FILE from the specified objects
- -objectlist FILE Use a list of object files found in FILE to specify objects
+ -objectlist FILE use a list of object files found in FILE to specify objects
+ -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes)
-precious-files-regex REGEX
don't remove output files matching REGEX
-release RELEASE specify package release information
@@ -2441,20 +3758,20 @@ The following components of LINK-COMMAND are treated specially:
-Xlinker FLAG pass linker-specific FLAG directly to the linker
-XCClinker FLAG pass link-specific FLAG to the compiler driver (CC)
-All other options (arguments beginning with \`-') are ignored.
+All other options (arguments beginning with '-') are ignored.
-Every other argument is treated as a filename. Files ending in \`.la' are
+Every other argument is treated as a filename. Files ending in '.la' are
treated as uninstalled libtool libraries, other files are standard or library
object files.
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
+If the OUTPUT-FILE ends in '.la', then a libtool library is created,
+only library objects ('.lo' files) may be specified, and '-rpath' is
required, except when creating a convenience library.
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
+If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created
+using 'ar' and 'ranlib', or on Windows using 'lib'.
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file
is created, otherwise an executable program is created."
;;
@@ -2465,7 +3782,7 @@ is created, otherwise an executable program is created."
Remove libraries from an installation directory.
RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
+(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed
to RM.
If FILE is a libtool library, all the files associated with it are deleted.
@@ -2473,17 +3790,17 @@ Otherwise, only FILE itself is deleted using RM."
;;
*)
- func_fatal_help "invalid operation mode \`$opt_mode'"
+ func_fatal_help "invalid operation mode '$opt_mode'"
;;
esac
echo
- $ECHO "Try \`$progname --help' for more information about other modes."
+ $ECHO "Try '$progname --help' for more information about other modes."
}
# Now that we've collected a possible --mode arg, show help if necessary
if $opt_help; then
- if test "$opt_help" = :; then
+ if test : = "$opt_help"; then
func_mode_help
else
{
@@ -2491,7 +3808,7 @@ if $opt_help; then
for opt_mode in compile link execute install finish uninstall clean; do
func_mode_help
done
- } | sed -n '1p; 2,$s/^Usage:/ or: /p'
+ } | $SED -n '1p; 2,$s/^Usage:/ or: /p'
{
func_help noexit
for opt_mode in compile link execute install finish uninstall clean; do
@@ -2499,7 +3816,7 @@ if $opt_help; then
func_mode_help
done
} |
- sed '1d
+ $SED '1d
/^When reporting/,/^Report/{
H
d
@@ -2516,16 +3833,17 @@ fi
# func_mode_execute arg...
func_mode_execute ()
{
- $opt_debug
+ $debug_cmd
+
# The first argument is the command name.
- cmd="$nonopt"
+ cmd=$nonopt
test -z "$cmd" && \
func_fatal_help "you must specify a COMMAND"
# Handle -dlopen flags immediately.
for file in $opt_dlopen; do
test -f "$file" \
- || func_fatal_help "\`$file' is not a file"
+ || func_fatal_help "'$file' is not a file"
dir=
case $file in
@@ -2535,7 +3853,7 @@ func_mode_execute ()
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
- || func_fatal_help "\`$lib' is not a valid libtool archive"
+ || func_fatal_help "'$lib' is not a valid libtool archive"
# Read the libtool library.
dlname=
@@ -2546,18 +3864,18 @@ func_mode_execute ()
if test -z "$dlname"; then
# Warn if it was a shared library.
test -n "$library_names" && \
- func_warning "\`$file' was not linked with \`-export-dynamic'"
+ func_warning "'$file' was not linked with '-export-dynamic'"
continue
fi
func_dirname "$file" "" "."
- dir="$func_dirname_result"
+ dir=$func_dirname_result
if test -f "$dir/$objdir/$dlname"; then
func_append dir "/$objdir"
else
if test ! -f "$dir/$dlname"; then
- func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+ func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'"
fi
fi
;;
@@ -2565,18 +3883,18 @@ func_mode_execute ()
*.lo)
# Just add the directory containing the .lo file.
func_dirname "$file" "" "."
- dir="$func_dirname_result"
+ dir=$func_dirname_result
;;
*)
- func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+ func_warning "'-dlopen' is ignored for non-libtool libraries and objects"
continue
;;
esac
# Get the absolute pathname.
absdir=`cd "$dir" && pwd`
- test -n "$absdir" && dir="$absdir"
+ test -n "$absdir" && dir=$absdir
# Now add the directory to shlibpath_var.
if eval "test -z \"\$$shlibpath_var\""; then
@@ -2588,7 +3906,7 @@ func_mode_execute ()
# This variable tells wrapper scripts just to set shlibpath_var
# rather than running their programs.
- libtool_execute_magic="$magic"
+ libtool_execute_magic=$magic
# Check if any of the arguments is a wrapper script.
args=
@@ -2601,12 +3919,12 @@ func_mode_execute ()
if func_ltwrapper_script_p "$file"; then
func_source "$file"
# Transform arg to wrapped name.
- file="$progdir/$program"
+ file=$progdir/$program
elif func_ltwrapper_executable_p "$file"; then
func_ltwrapper_scriptname "$file"
func_source "$func_ltwrapper_scriptname_result"
# Transform arg to wrapped name.
- file="$progdir/$program"
+ file=$progdir/$program
fi
;;
esac
@@ -2614,7 +3932,15 @@ func_mode_execute ()
func_append_quoted args "$file"
done
- if test "X$opt_dry_run" = Xfalse; then
+ if $opt_dry_run; then
+ # Display what would be done.
+ if test -n "$shlibpath_var"; then
+ eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+ echo "export $shlibpath_var"
+ fi
+ $ECHO "$cmd$args"
+ exit $EXIT_SUCCESS
+ else
if test -n "$shlibpath_var"; then
# Export the shlibpath_var.
eval "export $shlibpath_var"
@@ -2631,25 +3957,18 @@ func_mode_execute ()
done
# Now prepare to actually exec the command.
- exec_cmd="\$cmd$args"
- else
- # Display what would be done.
- if test -n "$shlibpath_var"; then
- eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
- echo "export $shlibpath_var"
- fi
- $ECHO "$cmd$args"
- exit $EXIT_SUCCESS
+ exec_cmd=\$cmd$args
fi
}
-test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
+test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
# func_mode_finish arg...
func_mode_finish ()
{
- $opt_debug
+ $debug_cmd
+
libs=
libdirs=
admincmds=
@@ -2663,11 +3982,11 @@ func_mode_finish ()
if func_lalib_unsafe_p "$opt"; then
func_append libs " $opt"
else
- func_warning "\`$opt' is not a valid libtool archive"
+ func_warning "'$opt' is not a valid libtool archive"
fi
else
- func_fatal_error "invalid argument \`$opt'"
+ func_fatal_error "invalid argument '$opt'"
fi
done
@@ -2682,12 +4001,12 @@ func_mode_finish ()
# Remove sysroot references
if $opt_dry_run; then
for lib in $libs; do
- echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
+ echo "removing references to $lt_sysroot and '=' prefixes from $lib"
done
else
tmpdir=`func_mktempdir`
for lib in $libs; do
- sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+ $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
> $tmpdir/tmp-la
mv -f $tmpdir/tmp-la $lib
done
@@ -2712,7 +4031,7 @@ func_mode_finish ()
fi
# Exit here if they wanted silent mode.
- $opt_silent && exit $EXIT_SUCCESS
+ $opt_quiet && exit $EXIT_SUCCESS
if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
echo "----------------------------------------------------------------------"
@@ -2723,27 +4042,27 @@ func_mode_finish ()
echo
echo "If you ever happen to want to link against installed libraries"
echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+ echo "specify the full pathname of the library, or use the '-LLIBDIR'"
echo "flag during linking and do at least one of the following:"
if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
+ echo " - add LIBDIR to the '$shlibpath_var' environment variable"
echo " during execution"
fi
if test -n "$runpath_var"; then
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
+ echo " - add LIBDIR to the '$runpath_var' environment variable"
echo " during linking"
fi
if test -n "$hardcode_libdir_flag_spec"; then
libdir=LIBDIR
eval flag=\"$hardcode_libdir_flag_spec\"
- $ECHO " - use the \`$flag' linker flag"
+ $ECHO " - use the '$flag' linker flag"
fi
if test -n "$admincmds"; then
$ECHO " - have your system administrator run these commands:$admincmds"
fi
if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+ echo " - have your system administrator add LIBDIR to '/etc/ld.so.conf'"
fi
echo
@@ -2762,18 +4081,20 @@ func_mode_finish ()
exit $EXIT_SUCCESS
}
-test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
+test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
# func_mode_install arg...
func_mode_install ()
{
- $opt_debug
+ $debug_cmd
+
# There may be an optional sh(1) argument at the beginning of
# install_prog (especially on Windows NT).
- if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+ if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
# Allow the use of GNU shtool's install command.
- case $nonopt in *shtool*) :;; *) false;; esac; then
+ case $nonopt in *shtool*) :;; *) false;; esac
+ then
# Aesthetically quote it.
func_quote_for_eval "$nonopt"
install_prog="$func_quote_for_eval_result "
@@ -2800,7 +4121,7 @@ func_mode_install ()
opts=
prev=
install_type=
- isdir=no
+ isdir=false
stripme=
no_mode=:
for arg
@@ -2813,7 +4134,7 @@ func_mode_install ()
fi
case $arg in
- -d) isdir=yes ;;
+ -d) isdir=: ;;
-f)
if $install_cp; then :; else
prev=$arg
@@ -2831,7 +4152,7 @@ func_mode_install ()
*)
# If the previous option needed an argument, then skip it.
if test -n "$prev"; then
- if test "x$prev" = x-m && test -n "$install_override_mode"; then
+ if test X-m = "X$prev" && test -n "$install_override_mode"; then
arg2=$install_override_mode
no_mode=false
fi
@@ -2856,7 +4177,7 @@ func_mode_install ()
func_fatal_help "you must specify an install program"
test -n "$prev" && \
- func_fatal_help "the \`$prev' option requires an argument"
+ func_fatal_help "the '$prev' option requires an argument"
if test -n "$install_override_mode" && $no_mode; then
if $install_cp; then :; else
@@ -2878,19 +4199,19 @@ func_mode_install ()
dest=$func_stripname_result
# Check to see that the destination is a directory.
- test -d "$dest" && isdir=yes
- if test "$isdir" = yes; then
- destdir="$dest"
+ test -d "$dest" && isdir=:
+ if $isdir; then
+ destdir=$dest
destname=
else
func_dirname_and_basename "$dest" "" "."
- destdir="$func_dirname_result"
- destname="$func_basename_result"
+ destdir=$func_dirname_result
+ destname=$func_basename_result
# Not a directory, so check to see that there is only one file specified.
set dummy $files; shift
test "$#" -gt 1 && \
- func_fatal_help "\`$dest' is not a directory"
+ func_fatal_help "'$dest' is not a directory"
fi
case $destdir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -2899,7 +4220,7 @@ func_mode_install ()
case $file in
*.lo) ;;
*)
- func_fatal_help "\`$destdir' must be an absolute directory name"
+ func_fatal_help "'$destdir' must be an absolute directory name"
;;
esac
done
@@ -2908,7 +4229,7 @@ func_mode_install ()
# This variable tells wrapper scripts just to set variables rather
# than running their programs.
- libtool_install_magic="$magic"
+ libtool_install_magic=$magic
staticlibs=
future_libdirs=
@@ -2928,7 +4249,7 @@ func_mode_install ()
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
- || func_fatal_help "\`$file' is not a valid libtool archive"
+ || func_fatal_help "'$file' is not a valid libtool archive"
library_names=
old_library=
@@ -2950,7 +4271,7 @@ func_mode_install ()
fi
func_dirname "$file" "/" ""
- dir="$func_dirname_result"
+ dir=$func_dirname_result
func_append dir "$objdir"
if test -n "$relink_command"; then
@@ -2964,7 +4285,7 @@ func_mode_install ()
# are installed into $libdir/../bin (currently, that works fine)
# but it's something to keep an eye on.
test "$inst_prefix_dir" = "$destdir" && \
- func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+ func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
@@ -2973,29 +4294,36 @@ func_mode_install ()
relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
fi
- func_warning "relinking \`$file'"
+ func_warning "relinking '$file'"
func_show_eval "$relink_command" \
- 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+ 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"'
fi
# See the names of the shared library.
set dummy $library_names; shift
if test -n "$1"; then
- realname="$1"
+ realname=$1
shift
- srcname="$realname"
- test -n "$relink_command" && srcname="$realname"T
+ srcname=$realname
+ test -n "$relink_command" && srcname=${realname}T
# Install the shared library and build the symlinks.
func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
'exit $?'
- tstripme="$stripme"
+ tstripme=$stripme
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
case $realname in
*.dll.a)
- tstripme=""
+ tstripme=
+ ;;
+ esac
+ ;;
+ os2*)
+ case $realname in
+ *_dll.a)
+ tstripme=
;;
esac
;;
@@ -3006,7 +4334,7 @@ func_mode_install ()
if test "$#" -gt 0; then
# Delete the old symlinks, and create new ones.
- # Try `ln -sf' first, because the `ln' binary might depend on
+ # Try 'ln -sf' first, because the 'ln' binary might depend on
# the symlink we replace! Solaris /bin/ln does not understand -f,
# so we also need to try rm && ln -s.
for linkname
@@ -3017,14 +4345,14 @@ func_mode_install ()
fi
# Do each command in the postinstall commands.
- lib="$destdir/$realname"
+ lib=$destdir/$realname
func_execute_cmds "$postinstall_cmds" 'exit $?'
fi
# Install the pseudo-library for information purposes.
func_basename "$file"
- name="$func_basename_result"
- instname="$dir/$name"i
+ name=$func_basename_result
+ instname=$dir/${name}i
func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
# Maybe install the static library, too.
@@ -3036,11 +4364,11 @@ func_mode_install ()
# Figure out destination file name, if it wasn't already specified.
if test -n "$destname"; then
- destfile="$destdir/$destname"
+ destfile=$destdir/$destname
else
func_basename "$file"
- destfile="$func_basename_result"
- destfile="$destdir/$destfile"
+ destfile=$func_basename_result
+ destfile=$destdir/$destfile
fi
# Deduce the name of the destination old-style object file.
@@ -3050,11 +4378,11 @@ func_mode_install ()
staticdest=$func_lo2o_result
;;
*.$objext)
- staticdest="$destfile"
+ staticdest=$destfile
destfile=
;;
*)
- func_fatal_help "cannot copy a libtool object to \`$destfile'"
+ func_fatal_help "cannot copy a libtool object to '$destfile'"
;;
esac
@@ -3063,7 +4391,7 @@ func_mode_install ()
func_show_eval "$install_prog $file $destfile" 'exit $?'
# Install the old object if enabled.
- if test "$build_old_libs" = yes; then
+ if test yes = "$build_old_libs"; then
# Deduce the name of the old-style object file.
func_lo2o "$file"
staticobj=$func_lo2o_result
@@ -3075,23 +4403,23 @@ func_mode_install ()
*)
# Figure out destination file name, if it wasn't already specified.
if test -n "$destname"; then
- destfile="$destdir/$destname"
+ destfile=$destdir/$destname
else
func_basename "$file"
- destfile="$func_basename_result"
- destfile="$destdir/$destfile"
+ destfile=$func_basename_result
+ destfile=$destdir/$destfile
fi
# If the file is missing, and there is a .exe on the end, strip it
# because it is most likely a libtool script we actually want to
# install
- stripped_ext=""
+ stripped_ext=
case $file in
*.exe)
if test ! -f "$file"; then
func_stripname '' '.exe' "$file"
file=$func_stripname_result
- stripped_ext=".exe"
+ stripped_ext=.exe
fi
;;
esac
@@ -3119,19 +4447,19 @@ func_mode_install ()
# Check the variables that should have been set.
test -z "$generated_by_libtool_version" && \
- func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+ func_fatal_error "invalid libtool wrapper script '$wrapper'"
- finalize=yes
+ finalize=:
for lib in $notinst_deplibs; do
# Check to see that each library is installed.
libdir=
if test -f "$lib"; then
func_source "$lib"
fi
- libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
+ libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'`
if test -n "$libdir" && test ! -f "$libfile"; then
- func_warning "\`$lib' has not been installed in \`$libdir'"
- finalize=no
+ func_warning "'$lib' has not been installed in '$libdir'"
+ finalize=false
fi
done
@@ -3139,29 +4467,29 @@ func_mode_install ()
func_source "$wrapper"
outputname=
- if test "$fast_install" = no && test -n "$relink_command"; then
+ if test no = "$fast_install" && test -n "$relink_command"; then
$opt_dry_run || {
- if test "$finalize" = yes; then
+ if $finalize; then
tmpdir=`func_mktempdir`
func_basename "$file$stripped_ext"
- file="$func_basename_result"
- outputname="$tmpdir/$file"
+ file=$func_basename_result
+ outputname=$tmpdir/$file
# Replace the output file specification.
relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
- $opt_silent || {
+ $opt_quiet || {
func_quote_for_expand "$relink_command"
eval "func_echo $func_quote_for_expand_result"
}
if eval "$relink_command"; then :
else
- func_error "error: relink \`$file' with the above command before installing it"
+ func_error "error: relink '$file' with the above command before installing it"
$opt_dry_run || ${RM}r "$tmpdir"
continue
fi
- file="$outputname"
+ file=$outputname
else
- func_warning "cannot relink \`$file'"
+ func_warning "cannot relink '$file'"
fi
}
else
@@ -3198,10 +4526,10 @@ func_mode_install ()
for file in $staticlibs; do
func_basename "$file"
- name="$func_basename_result"
+ name=$func_basename_result
# Set up the ranlib parameters.
- oldlib="$destdir/$name"
+ oldlib=$destdir/$name
func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
tool_oldlib=$func_to_tool_file_result
@@ -3216,18 +4544,18 @@ func_mode_install ()
done
test -n "$future_libdirs" && \
- func_warning "remember to run \`$progname --finish$future_libdirs'"
+ func_warning "remember to run '$progname --finish$future_libdirs'"
if test -n "$current_libdirs"; then
# Maybe just do a dry run.
$opt_dry_run && current_libdirs=" -n$current_libdirs"
- exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+ exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs'
else
exit $EXIT_SUCCESS
fi
}
-test "$opt_mode" = install && func_mode_install ${1+"$@"}
+test install = "$opt_mode" && func_mode_install ${1+"$@"}
# func_generate_dlsyms outputname originator pic_p
@@ -3235,16 +4563,17 @@ test "$opt_mode" = install && func_mode_install ${1+"$@"}
# a dlpreopen symbol table.
func_generate_dlsyms ()
{
- $opt_debug
- my_outputname="$1"
- my_originator="$2"
- my_pic_p="${3-no}"
- my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+ $debug_cmd
+
+ my_outputname=$1
+ my_originator=$2
+ my_pic_p=${3-false}
+ my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'`
my_dlsyms=
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
if test -n "$NM" && test -n "$global_symbol_pipe"; then
- my_dlsyms="${my_outputname}S.c"
+ my_dlsyms=${my_outputname}S.c
else
func_error "not configured to extract global symbols from dlpreopened files"
fi
@@ -3255,7 +4584,7 @@ func_generate_dlsyms ()
"") ;;
*.c)
# Discover the nlist of each of the dlfiles.
- nlist="$output_objdir/${my_outputname}.nm"
+ nlist=$output_objdir/$my_outputname.nm
func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
@@ -3263,34 +4592,36 @@ func_generate_dlsyms ()
func_verbose "creating $output_objdir/$my_dlsyms"
$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */
#ifdef __cplusplus
extern \"C\" {
#endif
-#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
#endif
/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
relocations are performed -- see ld's documentation on pseudo-relocs. */
# define LT_DLSYM_CONST
-#elif defined(__osf__)
+#elif defined __osf__
/* This system does not cope well with relocations in const data. */
# define LT_DLSYM_CONST
#else
# define LT_DLSYM_CONST const
#endif
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
/* External symbol declarations for the compiler. */\
"
- if test "$dlself" = yes; then
- func_verbose "generating symbol list for \`$output'"
+ if test yes = "$dlself"; then
+ func_verbose "generating symbol list for '$output'"
$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
@@ -3298,7 +4629,7 @@ extern \"C\" {
progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
for progfile in $progfiles; do
func_to_tool_file "$progfile" func_convert_file_msys_to_w32
- func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
+ func_verbose "extracting global C symbols from '$func_to_tool_file_result'"
$opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
done
@@ -3318,10 +4649,10 @@ extern \"C\" {
# Prepare the list of exported symbols
if test -z "$export_symbols"; then
- export_symbols="$output_objdir/$outputname.exp"
+ export_symbols=$output_objdir/$outputname.exp
$opt_dry_run || {
$RM $export_symbols
- eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+ eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
case $host in
*cygwin* | *mingw* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
@@ -3331,7 +4662,7 @@ extern \"C\" {
}
else
$opt_dry_run || {
- eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+ eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
@@ -3345,22 +4676,22 @@ extern \"C\" {
fi
for dlprefile in $dlprefiles; do
- func_verbose "extracting global C symbols from \`$dlprefile'"
+ func_verbose "extracting global C symbols from '$dlprefile'"
func_basename "$dlprefile"
- name="$func_basename_result"
+ name=$func_basename_result
case $host in
*cygwin* | *mingw* | *cegcc* )
# if an import library, we need to obtain dlname
if func_win32_import_lib_p "$dlprefile"; then
func_tr_sh "$dlprefile"
eval "curr_lafile=\$libfile_$func_tr_sh_result"
- dlprefile_dlbasename=""
+ dlprefile_dlbasename=
if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
# Use subshell, to avoid clobbering current variable values
dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
- if test -n "$dlprefile_dlname" ; then
+ if test -n "$dlprefile_dlname"; then
func_basename "$dlprefile_dlname"
- dlprefile_dlbasename="$func_basename_result"
+ dlprefile_dlbasename=$func_basename_result
else
# no lafile. user explicitly requested -dlpreopen <import library>.
$sharedlib_from_linklib_cmd "$dlprefile"
@@ -3368,7 +4699,7 @@ extern \"C\" {
fi
fi
$opt_dry_run || {
- if test -n "$dlprefile_dlbasename" ; then
+ if test -n "$dlprefile_dlbasename"; then
eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
else
func_warning "Could not compute DLL name from $name"
@@ -3424,6 +4755,11 @@ extern \"C\" {
echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
fi
+ func_show_eval '$RM "${nlist}I"'
+ if test -n "$global_symbol_to_import"; then
+ eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I'
+ fi
+
echo >> "$output_objdir/$my_dlsyms" "\
/* The mapping between symbol names and symbols. */
@@ -3432,11 +4768,30 @@ typedef struct {
void *address;
} lt_dlsymlist;
extern LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[];
+lt_${my_prefix}_LTX_preloaded_symbols[];\
+"
+
+ if test -s "$nlist"I; then
+ echo >> "$output_objdir/$my_dlsyms" "\
+static void lt_syminit(void)
+{
+ LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols;
+ for (; symbol->name; ++symbol)
+ {"
+ $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms"
+ echo >> "$output_objdir/$my_dlsyms" "\
+ }
+}"
+ fi
+ echo >> "$output_objdir/$my_dlsyms" "\
LT_DLSYM_CONST lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[] =
-{\
- { \"$my_originator\", (void *) 0 },"
+{ {\"$my_originator\", (void *) 0},"
+
+ if test -s "$nlist"I; then
+ echo >> "$output_objdir/$my_dlsyms" "\
+ {\"@INIT@\", (void *) <_syminit},"
+ fi
case $need_lib_prefix in
no)
@@ -3478,9 +4833,7 @@ static const void *lt_preloaded_setup() {
*-*-hpux*)
pic_flag_for_symtable=" $pic_flag" ;;
*)
- if test "X$my_pic_p" != Xno; then
- pic_flag_for_symtable=" $pic_flag"
- fi
+ $my_pic_p && pic_flag_for_symtable=" $pic_flag"
;;
esac
;;
@@ -3497,10 +4850,10 @@ static const void *lt_preloaded_setup() {
func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
# Clean up the generated files.
- func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+ func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"'
# Transform the symbol file into the correct name.
- symfileobj="$output_objdir/${my_outputname}S.$objext"
+ symfileobj=$output_objdir/${my_outputname}S.$objext
case $host in
*cygwin* | *mingw* | *cegcc* )
if test -f "$output_objdir/$my_outputname.def"; then
@@ -3518,7 +4871,7 @@ static const void *lt_preloaded_setup() {
esac
;;
*)
- func_fatal_error "unknown suffix for \`$my_dlsyms'"
+ func_fatal_error "unknown suffix for '$my_dlsyms'"
;;
esac
else
@@ -3532,6 +4885,32 @@ static const void *lt_preloaded_setup() {
fi
}
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+ $debug_cmd
+
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
+ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+ test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+ $debug_cmd
+
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+ test -n "$func_cygming_ms_implib_tmp"
+}
+
# func_win32_libid arg
# return the library type of file 'arg'
#
@@ -3541,8 +4920,9 @@ static const void *lt_preloaded_setup() {
# Despite the name, also deal with 64 bit binaries.
func_win32_libid ()
{
- $opt_debug
- win32_libid_type="unknown"
+ $debug_cmd
+
+ win32_libid_type=unknown
win32_fileres=`file -L $1 2>/dev/null`
case $win32_fileres in
*ar\ archive\ import\ library*) # definitely import
@@ -3552,16 +4932,29 @@ func_win32_libid ()
# Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
$EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
- $SED -n -e '
+ case $nm_interface in
+ "MS dumpbin")
+ if func_cygming_ms_implib_p "$1" ||
+ func_cygming_gnu_implib_p "$1"
+ then
+ win32_nmres=import
+ else
+ win32_nmres=
+ fi
+ ;;
+ *)
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+ $SED -n -e '
1,100{
/ I /{
- s,.*,import,
+ s|.*|import|
p
q
}
}'`
+ ;;
+ esac
case $win32_nmres in
import*) win32_libid_type="x86 archive import";;
*) win32_libid_type="x86 archive static";;
@@ -3593,7 +4986,8 @@ func_win32_libid ()
# $sharedlib_from_linklib_result
func_cygming_dll_for_implib ()
{
- $opt_debug
+ $debug_cmd
+
sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
}
@@ -3610,7 +5004,8 @@ func_cygming_dll_for_implib ()
# specified import library.
func_cygming_dll_for_implib_fallback_core ()
{
- $opt_debug
+ $debug_cmd
+
match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
$OBJDUMP -s --section "$1" "$2" 2>/dev/null |
$SED '/^Contents of section '"$match_literal"':/{
@@ -3646,8 +5041,8 @@ func_cygming_dll_for_implib_fallback_core ()
/./p' |
# we now have a list, one entry per line, of the stringified
# contents of the appropriate section of all members of the
- # archive which possess that section. Heuristic: eliminate
- # all those which have a first or second character that is
+ # archive that possess that section. Heuristic: eliminate
+ # all those that have a first or second character that is
# a '.' (that is, objdump's representation of an unprintable
# character.) This should work for all archives with less than
# 0x302f exports -- but will fail for DLLs whose name actually
@@ -3658,30 +5053,6 @@ func_cygming_dll_for_implib_fallback_core ()
$SED -e '/^\./d;/^.\./d;q'
}
-# func_cygming_gnu_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is a GNU/binutils-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_gnu_implib_p ()
-{
- $opt_debug
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
- test -n "$func_cygming_gnu_implib_tmp"
-}
-
-# func_cygming_ms_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is an MS-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_ms_implib_p ()
-{
- $opt_debug
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
- test -n "$func_cygming_ms_implib_tmp"
-}
-
# func_cygming_dll_for_implib_fallback ARG
# Platform-specific function to extract the
# name of the DLL associated with the specified
@@ -3695,16 +5066,17 @@ func_cygming_ms_implib_p ()
# $sharedlib_from_linklib_result
func_cygming_dll_for_implib_fallback ()
{
- $opt_debug
- if func_cygming_gnu_implib_p "$1" ; then
+ $debug_cmd
+
+ if func_cygming_gnu_implib_p "$1"; then
# binutils import library
sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
- elif func_cygming_ms_implib_p "$1" ; then
+ elif func_cygming_ms_implib_p "$1"; then
# ms-generated import library
sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
else
# unknown
- sharedlib_from_linklib_result=""
+ sharedlib_from_linklib_result=
fi
}
@@ -3712,10 +5084,11 @@ func_cygming_dll_for_implib_fallback ()
# func_extract_an_archive dir oldlib
func_extract_an_archive ()
{
- $opt_debug
- f_ex_an_ar_dir="$1"; shift
- f_ex_an_ar_oldlib="$1"
- if test "$lock_old_archive_extraction" = yes; then
+ $debug_cmd
+
+ f_ex_an_ar_dir=$1; shift
+ f_ex_an_ar_oldlib=$1
+ if test yes = "$lock_old_archive_extraction"; then
lockfile=$f_ex_an_ar_oldlib.lock
until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
func_echo "Waiting for $lockfile to be removed"
@@ -3724,7 +5097,7 @@ func_extract_an_archive ()
fi
func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
'stat=$?; rm -f "$lockfile"; exit $stat'
- if test "$lock_old_archive_extraction" = yes; then
+ if test yes = "$lock_old_archive_extraction"; then
$opt_dry_run || rm -f "$lockfile"
fi
if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
@@ -3738,22 +5111,23 @@ func_extract_an_archive ()
# func_extract_archives gentop oldlib ...
func_extract_archives ()
{
- $opt_debug
- my_gentop="$1"; shift
+ $debug_cmd
+
+ my_gentop=$1; shift
my_oldlibs=${1+"$@"}
- my_oldobjs=""
- my_xlib=""
- my_xabs=""
- my_xdir=""
+ my_oldobjs=
+ my_xlib=
+ my_xabs=
+ my_xdir=
for my_xlib in $my_oldlibs; do
# Extract the objects.
case $my_xlib in
- [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;;
*) my_xabs=`pwd`"/$my_xlib" ;;
esac
func_basename "$my_xlib"
- my_xlib="$func_basename_result"
+ my_xlib=$func_basename_result
my_xlib_u=$my_xlib
while :; do
case " $extracted_archives " in
@@ -3765,7 +5139,7 @@ func_extract_archives ()
esac
done
extracted_archives="$extracted_archives $my_xlib_u"
- my_xdir="$my_gentop/$my_xlib_u"
+ my_xdir=$my_gentop/$my_xlib_u
func_mkdir_p "$my_xdir"
@@ -3778,22 +5152,23 @@ func_extract_archives ()
cd $my_xdir || exit $?
darwin_archive=$my_xabs
darwin_curdir=`pwd`
- darwin_base_archive=`basename "$darwin_archive"`
+ func_basename "$darwin_archive"
+ darwin_base_archive=$func_basename_result
darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
if test -n "$darwin_arches"; then
darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
darwin_arch=
func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
- for darwin_arch in $darwin_arches ; do
- func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
- $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
- cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
- func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+ for darwin_arch in $darwin_arches; do
+ func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch"
+ $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive"
+ cd "unfat-$$/$darwin_base_archive-$darwin_arch"
+ func_extract_an_archive "`pwd`" "$darwin_base_archive"
cd "$darwin_curdir"
- $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+ $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
done # $darwin_arches
## Okay now we've a bunch of thin objects, gotta fatten them up :)
- darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u`
darwin_file=
darwin_files=
for darwin_file in $darwin_filelist; do
@@ -3815,7 +5190,7 @@ func_extract_archives ()
my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
done
- func_extract_archives_result="$my_oldobjs"
+ func_extract_archives_result=$my_oldobjs
}
@@ -3830,7 +5205,7 @@ func_extract_archives ()
#
# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
# variable will take. If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
+# will assume that the directory where it is stored is
# the $objdir directory. This is a cygwin/mingw-specific
# behavior.
func_emit_wrapper ()
@@ -3841,7 +5216,7 @@ func_emit_wrapper ()
#! $SHELL
# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
#
# The $output program cannot be directly executed until all the libtool
# libraries that it depends on are installed.
@@ -3898,9 +5273,9 @@ _LTECHO_EOF'
# Very basic option parsing. These options are (a) specific to
# the libtool wrapper, (b) are identical between the wrapper
-# /script/ and the wrapper /executable/ which is used only on
+# /script/ and the wrapper /executable/ that is used only on
# windows platforms, and (c) all begin with the string "--lt-"
-# (application programs are unlikely to have options which match
+# (application programs are unlikely to have options that match
# this pattern).
#
# There are only two supported options: --lt-debug and
@@ -3933,7 +5308,7 @@ func_parse_lt_options ()
# Print the debug banner immediately:
if test -n \"\$lt_option_debug\"; then
- echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+ echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
fi
}
@@ -3944,7 +5319,7 @@ func_lt_dump_args ()
lt_dump_args_N=1;
for lt_arg
do
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
+ \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\"
lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
done
}
@@ -3958,7 +5333,7 @@ func_exec_program_core ()
*-*-mingw | *-*-os2* | *-cegcc*)
$ECHO "\
if test -n \"\$lt_option_debug\"; then
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
+ \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2
func_lt_dump_args \${1+\"\$@\"} 1>&2
fi
exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
@@ -3968,7 +5343,7 @@ func_exec_program_core ()
*)
$ECHO "\
if test -n \"\$lt_option_debug\"; then
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
+ \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2
func_lt_dump_args \${1+\"\$@\"} 1>&2
fi
exec \"\$progdir/\$program\" \${1+\"\$@\"}
@@ -4043,13 +5418,13 @@ func_exec_program ()
test -n \"\$absdir\" && thisdir=\"\$absdir\"
"
- if test "$fast_install" = yes; then
+ if test yes = "$fast_install"; then
$ECHO "\
program=lt-'$outputname'$exeext
progdir=\"\$thisdir/$objdir\"
if test ! -f \"\$progdir/\$program\" ||
- { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\
test \"X\$file\" != \"X\$progdir/\$program\"; }; then
file=\"\$\$-\$program\"
@@ -4066,7 +5441,7 @@ func_exec_program ()
if test -n \"\$relink_command\"; then
if relink_command_output=\`eval \$relink_command 2>&1\`; then :
else
- $ECHO \"\$relink_command_output\" >&2
+ \$ECHO \"\$relink_command_output\" >&2
$RM \"\$progdir/\$file\"
exit 1
fi
@@ -4101,7 +5476,7 @@ func_exec_program ()
fi
# Export our shlibpath_var if we have one.
- if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+ if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
$ECHO "\
# Add our own library path to $shlibpath_var
$shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
@@ -4121,7 +5496,7 @@ func_exec_program ()
fi
else
# The program doesn't exist.
- \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+ \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2
\$ECHO \"This script is just a wrapper for \$program.\" 1>&2
\$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
exit 1
@@ -4140,7 +5515,7 @@ func_emit_cwrapperexe_src ()
cat <<EOF
/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
- Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+ Generated by $PROGRAM (GNU $PACKAGE) $VERSION
The $output program cannot be directly executed until all the libtool
libraries that it depends on are installed.
@@ -4175,47 +5550,45 @@ EOF
#include <fcntl.h>
#include <sys/stat.h>
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
/* declarations of non-ANSI functions */
-#if defined(__MINGW32__)
+#if defined __MINGW32__
# ifdef __STRICT_ANSI__
int _putenv (const char *);
# endif
-#elif defined(__CYGWIN__)
+#elif defined __CYGWIN__
# ifdef __STRICT_ANSI__
char *realpath (const char *, char *);
int putenv (char *);
int setenv (const char *, const char *, int);
# endif
-/* #elif defined (other platforms) ... */
+/* #elif defined other_platform || defined ... */
#endif
/* portability defines, excluding path handling macros */
-#if defined(_MSC_VER)
+#if defined _MSC_VER
# define setmode _setmode
# define stat _stat
# define chmod _chmod
# define getcwd _getcwd
# define putenv _putenv
# define S_IXUSR _S_IEXEC
-# ifndef _INTPTR_T_DEFINED
-# define _INTPTR_T_DEFINED
-# define intptr_t int
-# endif
-#elif defined(__MINGW32__)
+#elif defined __MINGW32__
# define setmode _setmode
# define stat _stat
# define chmod _chmod
# define getcwd _getcwd
# define putenv _putenv
-#elif defined(__CYGWIN__)
+#elif defined __CYGWIN__
# define HAVE_SETENV
# define FOPEN_WB "wb"
-/* #elif defined (other platforms) ... */
+/* #elif defined other platforms ... */
#endif
-#if defined(PATH_MAX)
+#if defined PATH_MAX
# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
+#elif defined MAXPATHLEN
# define LT_PATHMAX MAXPATHLEN
#else
# define LT_PATHMAX 1024
@@ -4234,8 +5607,8 @@ int setenv (const char *, const char *, int);
# define PATH_SEPARATOR ':'
#endif
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
- defined (__OS2__)
+#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \
+ defined __OS2__
# define HAVE_DOS_BASED_FILE_SYSTEM
# define FOPEN_WB "wb"
# ifndef DIR_SEPARATOR_2
@@ -4268,10 +5641,10 @@ int setenv (const char *, const char *, int);
#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
#define XFREE(stale) do { \
- if (stale) { free ((void *) stale); stale = 0; } \
+ if (stale) { free (stale); stale = 0; } \
} while (0)
-#if defined(LT_DEBUGWRAPPER)
+#if defined LT_DEBUGWRAPPER
static int lt_debug = 1;
#else
static int lt_debug = 0;
@@ -4300,11 +5673,16 @@ void lt_dump_script (FILE *f);
EOF
cat <<EOF
-volatile const char * MAGIC_EXE = "$magic_exe";
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
+# define externally_visible volatile
+#else
+# define externally_visible __attribute__((externally_visible)) volatile
+#endif
+externally_visible const char * MAGIC_EXE = "$magic_exe";
const char * LIB_PATH_VARNAME = "$shlibpath_var";
EOF
- if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+ if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
func_to_host_path "$temp_rpath"
cat <<EOF
const char * LIB_PATH_VALUE = "$func_to_host_path_result";
@@ -4328,7 +5706,7 @@ const char * EXE_PATH_VALUE = "";
EOF
fi
- if test "$fast_install" = yes; then
+ if test yes = "$fast_install"; then
cat <<EOF
const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
EOF
@@ -4357,12 +5735,12 @@ main (int argc, char *argv[])
char *actual_cwrapper_name;
char *target_name;
char *lt_argv_zero;
- intptr_t rval = 127;
+ int rval = 127;
int i;
program_name = (char *) xstrdup (base_name (argv[0]));
- newargz = XMALLOC (char *, argc + 1);
+ newargz = XMALLOC (char *, (size_t) argc + 1);
/* very simple arg parsing; don't want to rely on getopt
* also, copy all non cwrapper options to newargz, except
@@ -4371,10 +5749,10 @@ main (int argc, char *argv[])
newargc=0;
for (i = 1; i < argc; i++)
{
- if (strcmp (argv[i], dumpscript_opt) == 0)
+ if (STREQ (argv[i], dumpscript_opt))
{
EOF
- case "$host" in
+ case $host in
*mingw* | *cygwin* )
# make stdout use "unix" line endings
echo " setmode(1,_O_BINARY);"
@@ -4385,12 +5763,12 @@ EOF
lt_dump_script (stdout);
return 0;
}
- if (strcmp (argv[i], debug_opt) == 0)
+ if (STREQ (argv[i], debug_opt))
{
lt_debug = 1;
continue;
}
- if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
+ if (STREQ (argv[i], ltwrapper_option_prefix))
{
/* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
namespace, but it is not one of the ones we know about and
@@ -4413,7 +5791,7 @@ EOF
EOF
cat <<EOF
/* The GNU banner must be the first non-error debug message */
- lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $VERSION\n");
EOF
cat <<"EOF"
lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
@@ -4524,7 +5902,7 @@ EOF
cat <<"EOF"
/* execv doesn't actually work on mingw as expected on unix */
newargz = prepare_spawn (newargz);
- rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+ rval = (int) _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
if (rval == -1)
{
/* failed to start process */
@@ -4569,7 +5947,7 @@ base_name (const char *name)
{
const char *base;
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
/* Skip over the disk name in MSDOS pathnames. */
if (isalpha ((unsigned char) name[0]) && name[1] == ':')
name += 2;
@@ -4628,7 +6006,7 @@ find_executable (const char *wrapper)
const char *p_next;
/* static buffer for getcwd */
char tmp[LT_PATHMAX + 1];
- int tmp_len;
+ size_t tmp_len;
char *concat_name;
lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
@@ -4638,7 +6016,7 @@ find_executable (const char *wrapper)
return NULL;
/* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
{
concat_name = xstrdup (wrapper);
@@ -4656,7 +6034,7 @@ find_executable (const char *wrapper)
return concat_name;
XFREE (concat_name);
}
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
}
#endif
@@ -4679,7 +6057,7 @@ find_executable (const char *wrapper)
for (q = p; *q; q++)
if (IS_PATH_SEPARATOR (*q))
break;
- p_len = q - p;
+ p_len = (size_t) (q - p);
p_next = (*q == '\0' ? q : q + 1);
if (p_len == 0)
{
@@ -4798,7 +6176,7 @@ strendzap (char *str, const char *pat)
if (patlen <= len)
{
str += len - patlen;
- if (strcmp (str, pat) == 0)
+ if (STREQ (str, pat))
*str = '\0';
}
return str;
@@ -4863,7 +6241,7 @@ lt_setenv (const char *name, const char *value)
char *str = xstrdup (value);
setenv (name, str, 1);
#else
- int len = strlen (name) + 1 + strlen (value) + 1;
+ size_t len = strlen (name) + 1 + strlen (value) + 1;
char *str = XMALLOC (char, len);
sprintf (str, "%s=%s", name, value);
if (putenv (str) != EXIT_SUCCESS)
@@ -4880,8 +6258,8 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
char *new_value;
if (orig_value && *orig_value)
{
- int orig_value_len = strlen (orig_value);
- int add_len = strlen (add);
+ size_t orig_value_len = strlen (orig_value);
+ size_t add_len = strlen (add);
new_value = XMALLOC (char, add_len + orig_value_len + 1);
if (to_end)
{
@@ -4912,10 +6290,10 @@ lt_update_exe_path (const char *name, const char *value)
{
char *new_value = lt_extend_str (getenv (name), value, 0);
/* some systems can't cope with a ':'-terminated path #' */
- int len = strlen (new_value);
- while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+ size_t len = strlen (new_value);
+ while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
{
- new_value[len-1] = '\0';
+ new_value[--len] = '\0';
}
lt_setenv (name, new_value);
XFREE (new_value);
@@ -5082,27 +6460,47 @@ EOF
# True if ARG is an import lib, as indicated by $file_magic_cmd
func_win32_import_lib_p ()
{
- $opt_debug
+ $debug_cmd
+
case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
*import*) : ;;
*) false ;;
esac
}
+# func_suncc_cstd_abi
+# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!!
+# Several compiler flags select an ABI that is incompatible with the
+# Cstd library. Avoid specifying it if any are in CXXFLAGS.
+func_suncc_cstd_abi ()
+{
+ $debug_cmd
+
+ case " $compile_command " in
+ *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*)
+ suncc_use_cstd_abi=no
+ ;;
+ *)
+ suncc_use_cstd_abi=yes
+ ;;
+ esac
+}
+
# func_mode_link arg...
func_mode_link ()
{
- $opt_debug
+ $debug_cmd
+
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
# It is impossible to link a dll without this setting, and
# we shouldn't force the makefile maintainer to figure out
- # which system we are compiling for in order to pass an extra
+ # what system we are compiling for in order to pass an extra
# flag for every libtool invocation.
# allow_undefined=no
# FIXME: Unfortunately, there are problems with the above when trying
- # to make a dll which has undefined symbols, in which case not
+ # to make a dll that has undefined symbols, in which case not
# even a static library is built. For now, we need to specify
# -no-undefined on the libtool link line when we can be certain
# that all symbols are satisfied, otherwise we get a static library.
@@ -5146,10 +6544,11 @@ func_mode_link ()
module=no
no_install=no
objs=
+ os2dllname=
non_pic_objects=
precious_files_regex=
prefer_static_libs=no
- preload=no
+ preload=false
prev=
prevarg=
release=
@@ -5161,7 +6560,7 @@ func_mode_link ()
vinfo=
vinfo_number=no
weak_libs=
- single_module="${wl}-single_module"
+ single_module=$wl-single_module
func_infer_tag $base_compile
# We need to know -static, to get the right output filenames.
@@ -5169,15 +6568,15 @@ func_mode_link ()
do
case $arg in
-shared)
- test "$build_libtool_libs" != yes && \
- func_fatal_configuration "can not build a shared library"
+ test yes != "$build_libtool_libs" \
+ && func_fatal_configuration "cannot build a shared library"
build_old_libs=no
break
;;
-all-static | -static | -static-libtool-libs)
case $arg in
-all-static)
- if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
func_warning "complete static linking is impossible in this configuration"
fi
if test -n "$link_static_flag"; then
@@ -5210,7 +6609,7 @@ func_mode_link ()
# Go through the arguments, transforming them on the way.
while test "$#" -gt 0; do
- arg="$1"
+ arg=$1
shift
func_quote_for_eval "$arg"
qarg=$func_quote_for_eval_unquoted_result
@@ -5227,21 +6626,21 @@ func_mode_link ()
case $prev in
bindir)
- bindir="$arg"
+ bindir=$arg
prev=
continue
;;
dlfiles|dlprefiles)
- if test "$preload" = no; then
+ $preload || {
# Add the symbol object into the linking commands.
func_append compile_command " @SYMFILE@"
func_append finalize_command " @SYMFILE@"
- preload=yes
- fi
+ preload=:
+ }
case $arg in
*.la | *.lo) ;; # We handle these cases below.
force)
- if test "$dlself" = no; then
+ if test no = "$dlself"; then
dlself=needless
export_dynamic=yes
fi
@@ -5249,9 +6648,9 @@ func_mode_link ()
continue
;;
self)
- if test "$prev" = dlprefiles; then
+ if test dlprefiles = "$prev"; then
dlself=yes
- elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+ elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
dlself=yes
else
dlself=needless
@@ -5261,7 +6660,7 @@ func_mode_link ()
continue
;;
*)
- if test "$prev" = dlfiles; then
+ if test dlfiles = "$prev"; then
func_append dlfiles " $arg"
else
func_append dlprefiles " $arg"
@@ -5272,14 +6671,14 @@ func_mode_link ()
esac
;;
expsyms)
- export_symbols="$arg"
+ export_symbols=$arg
test -f "$arg" \
- || func_fatal_error "symbol file \`$arg' does not exist"
+ || func_fatal_error "symbol file '$arg' does not exist"
prev=
continue
;;
expsyms_regex)
- export_symbols_regex="$arg"
+ export_symbols_regex=$arg
prev=
continue
;;
@@ -5297,7 +6696,13 @@ func_mode_link ()
continue
;;
inst_prefix)
- inst_prefix_dir="$arg"
+ inst_prefix_dir=$arg
+ prev=
+ continue
+ ;;
+ mllvm)
+ # Clang does not use LLVM to link, so we can simply discard any
+ # '-mllvm $arg' options when doing the link step.
prev=
continue
;;
@@ -5321,21 +6726,21 @@ func_mode_link ()
if test -z "$pic_object" ||
test -z "$non_pic_object" ||
- test "$pic_object" = none &&
- test "$non_pic_object" = none; then
- func_fatal_error "cannot find name of object for \`$arg'"
+ test none = "$pic_object" &&
+ test none = "$non_pic_object"; then
+ func_fatal_error "cannot find name of object for '$arg'"
fi
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
- if test "$pic_object" != none; then
+ if test none != "$pic_object"; then
# Prepend the subdirectory the object is found in.
- pic_object="$xdir$pic_object"
+ pic_object=$xdir$pic_object
- if test "$prev" = dlfiles; then
- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+ if test dlfiles = "$prev"; then
+ if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
func_append dlfiles " $pic_object"
prev=
continue
@@ -5346,7 +6751,7 @@ func_mode_link ()
fi
# CHECK ME: I think I busted this. -Ossama
- if test "$prev" = dlprefiles; then
+ if test dlprefiles = "$prev"; then
# Preload the old-style object.
func_append dlprefiles " $pic_object"
prev=
@@ -5354,23 +6759,23 @@ func_mode_link ()
# A PIC object.
func_append libobjs " $pic_object"
- arg="$pic_object"
+ arg=$pic_object
fi
# Non-PIC object.
- if test "$non_pic_object" != none; then
+ if test none != "$non_pic_object"; then
# Prepend the subdirectory the object is found in.
- non_pic_object="$xdir$non_pic_object"
+ non_pic_object=$xdir$non_pic_object
# A standard non-PIC object
func_append non_pic_objects " $non_pic_object"
- if test -z "$pic_object" || test "$pic_object" = none ; then
- arg="$non_pic_object"
+ if test -z "$pic_object" || test none = "$pic_object"; then
+ arg=$non_pic_object
fi
else
# If the PIC object exists, use it instead.
# $xdir was prepended to $pic_object above.
- non_pic_object="$pic_object"
+ non_pic_object=$pic_object
func_append non_pic_objects " $non_pic_object"
fi
else
@@ -5378,7 +6783,7 @@ func_mode_link ()
if $opt_dry_run; then
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
func_lo2o "$arg"
pic_object=$xdir$objdir/$func_lo2o_result
@@ -5386,24 +6791,29 @@ func_mode_link ()
func_append libobjs " $pic_object"
func_append non_pic_objects " $non_pic_object"
else
- func_fatal_error "\`$arg' is not a valid libtool object"
+ func_fatal_error "'$arg' is not a valid libtool object"
fi
fi
done
else
- func_fatal_error "link input file \`$arg' does not exist"
+ func_fatal_error "link input file '$arg' does not exist"
fi
arg=$save_arg
prev=
continue
;;
+ os2dllname)
+ os2dllname=$arg
+ prev=
+ continue
+ ;;
precious_regex)
- precious_files_regex="$arg"
+ precious_files_regex=$arg
prev=
continue
;;
release)
- release="-$arg"
+ release=-$arg
prev=
continue
;;
@@ -5415,7 +6825,7 @@ func_mode_link ()
func_fatal_error "only absolute run-paths are allowed"
;;
esac
- if test "$prev" = rpath; then
+ if test rpath = "$prev"; then
case "$rpath " in
*" $arg "*) ;;
*) func_append rpath " $arg" ;;
@@ -5430,7 +6840,7 @@ func_mode_link ()
continue
;;
shrext)
- shrext_cmds="$arg"
+ shrext_cmds=$arg
prev=
continue
;;
@@ -5470,7 +6880,7 @@ func_mode_link ()
esac
fi # test -n "$prev"
- prevarg="$arg"
+ prevarg=$arg
case $arg in
-all-static)
@@ -5484,7 +6894,7 @@ func_mode_link ()
-allow-undefined)
# FIXME: remove this flag sometime in the future.
- func_fatal_error "\`-allow-undefined' must not be used because it is the default"
+ func_fatal_error "'-allow-undefined' must not be used because it is the default"
;;
-avoid-version)
@@ -5516,7 +6926,7 @@ func_mode_link ()
if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
func_fatal_error "more than one -exported-symbols argument is not allowed"
fi
- if test "X$arg" = "X-export-symbols"; then
+ if test X-export-symbols = "X$arg"; then
prev=expsyms
else
prev=expsyms_regex
@@ -5550,9 +6960,9 @@ func_mode_link ()
func_stripname "-L" '' "$arg"
if test -z "$func_stripname_result"; then
if test "$#" -gt 0; then
- func_fatal_error "require no space between \`-L' and \`$1'"
+ func_fatal_error "require no space between '-L' and '$1'"
else
- func_fatal_error "need path for \`-L' option"
+ func_fatal_error "need path for '-L' option"
fi
fi
func_resolve_sysroot "$func_stripname_result"
@@ -5563,8 +6973,8 @@ func_mode_link ()
*)
absdir=`cd "$dir" && pwd`
test -z "$absdir" && \
- func_fatal_error "cannot determine absolute directory name of \`$dir'"
- dir="$absdir"
+ func_fatal_error "cannot determine absolute directory name of '$dir'"
+ dir=$absdir
;;
esac
case "$deplibs " in
@@ -5599,7 +7009,7 @@ func_mode_link ()
;;
-l*)
- if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ if test X-lc = "X$arg" || test X-lm = "X$arg"; then
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
# These systems don't actually have a C or math library (as such)
@@ -5607,11 +7017,11 @@ func_mode_link ()
;;
*-*-os2*)
# These systems don't actually have a C library (as such)
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
# Do not include libc due to us having libc/libc_r.
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C and math libraries are in the System framework
@@ -5620,16 +7030,16 @@ func_mode_link ()
;;
*-*-sco3.2v5* | *-*-sco5v6*)
# Causes problems with __ctype
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
*-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
# Compiler inserts libc in the correct place for threads to work
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
esac
- elif test "X$arg" = "X-lc_r"; then
+ elif test X-lc_r = "X$arg"; then
case $host in
- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
# Do not include libc_r directly, use -pthread flag.
continue
;;
@@ -5639,6 +7049,11 @@ func_mode_link ()
continue
;;
+ -mllvm)
+ prev=mllvm
+ continue
+ ;;
+
-module)
module=yes
continue
@@ -5668,7 +7083,7 @@ func_mode_link ()
;;
-multi_module)
- single_module="${wl}-multi_module"
+ single_module=$wl-multi_module
continue
;;
@@ -5682,8 +7097,8 @@ func_mode_link ()
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
# The PATH hackery in wrapper scripts is required on Windows
# and Darwin in order for the loader to find any dlls it needs.
- func_warning "\`-no-install' is ignored for $host"
- func_warning "assuming \`-no-fast-install' instead"
+ func_warning "'-no-install' is ignored for $host"
+ func_warning "assuming '-no-fast-install' instead"
fast_install=no
;;
*) no_install=yes ;;
@@ -5701,6 +7116,11 @@ func_mode_link ()
continue
;;
+ -os2dllname)
+ prev=os2dllname
+ continue
+ ;;
+
-o) prev=output ;;
-precious-files-regex)
@@ -5788,14 +7208,14 @@ func_mode_link ()
func_stripname '-Wc,' '' "$arg"
args=$func_stripname_result
arg=
- save_ifs="$IFS"; IFS=','
+ save_ifs=$IFS; IFS=,
for flag in $args; do
- IFS="$save_ifs"
+ IFS=$save_ifs
func_quote_for_eval "$flag"
func_append arg " $func_quote_for_eval_result"
func_append compiler_flags " $func_quote_for_eval_result"
done
- IFS="$save_ifs"
+ IFS=$save_ifs
func_stripname ' ' '' "$arg"
arg=$func_stripname_result
;;
@@ -5804,15 +7224,15 @@ func_mode_link ()
func_stripname '-Wl,' '' "$arg"
args=$func_stripname_result
arg=
- save_ifs="$IFS"; IFS=','
+ save_ifs=$IFS; IFS=,
for flag in $args; do
- IFS="$save_ifs"
+ IFS=$save_ifs
func_quote_for_eval "$flag"
func_append arg " $wl$func_quote_for_eval_result"
func_append compiler_flags " $wl$func_quote_for_eval_result"
func_append linker_flags " $func_quote_for_eval_result"
done
- IFS="$save_ifs"
+ IFS=$save_ifs
func_stripname ' ' '' "$arg"
arg=$func_stripname_result
;;
@@ -5835,7 +7255,7 @@ func_mode_link ()
# -msg_* for osf cc
-msg_*)
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
;;
# Flags to be passed through unchanged, with rationale:
@@ -5847,25 +7267,49 @@ func_mode_link ()
# -m*, -t[45]*, -txscale* architecture-specific flags for GCC
# -F/path path to uninstalled frameworks, gcc on darwin
# -p, -pg, --coverage, -fprofile-* profiling flags for GCC
+ # -fstack-protector* stack protector flags for GCC
# @file GCC response files
# -tp=* Portland pgcc target processor selection
# --sysroot=* for sysroot support
- # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+ # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+ # -specs=* GCC specs files
+ # -stdlib=* select c++ std lib with clang
+ # -fsanitize=* Clang/GCC memory and address sanitizer
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
- -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
+ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+ -specs=*|-fsanitize=*)
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
func_append compile_command " $arg"
func_append finalize_command " $arg"
func_append compiler_flags " $arg"
continue
;;
+ -Z*)
+ if test os2 = "`expr $host : '.*\(os2\)'`"; then
+ # OS/2 uses -Zxxx to specify OS/2-specific options
+ compiler_flags="$compiler_flags $arg"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
+ case $arg in
+ -Zlinker | -Zstack)
+ prev=xcompiler
+ ;;
+ esac
+ continue
+ else
+ # Otherwise treat like 'Some other compiler flag' below
+ func_quote_for_eval "$arg"
+ arg=$func_quote_for_eval_result
+ fi
+ ;;
+
# Some other compiler flag.
-* | +*)
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
;;
*.$objext)
@@ -5886,21 +7330,21 @@ func_mode_link ()
if test -z "$pic_object" ||
test -z "$non_pic_object" ||
- test "$pic_object" = none &&
- test "$non_pic_object" = none; then
- func_fatal_error "cannot find name of object for \`$arg'"
+ test none = "$pic_object" &&
+ test none = "$non_pic_object"; then
+ func_fatal_error "cannot find name of object for '$arg'"
fi
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
- if test "$pic_object" != none; then
+ test none = "$pic_object" || {
# Prepend the subdirectory the object is found in.
- pic_object="$xdir$pic_object"
+ pic_object=$xdir$pic_object
- if test "$prev" = dlfiles; then
- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+ if test dlfiles = "$prev"; then
+ if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
func_append dlfiles " $pic_object"
prev=
continue
@@ -5911,7 +7355,7 @@ func_mode_link ()
fi
# CHECK ME: I think I busted this. -Ossama
- if test "$prev" = dlprefiles; then
+ if test dlprefiles = "$prev"; then
# Preload the old-style object.
func_append dlprefiles " $pic_object"
prev=
@@ -5919,23 +7363,23 @@ func_mode_link ()
# A PIC object.
func_append libobjs " $pic_object"
- arg="$pic_object"
- fi
+ arg=$pic_object
+ }
# Non-PIC object.
- if test "$non_pic_object" != none; then
+ if test none != "$non_pic_object"; then
# Prepend the subdirectory the object is found in.
- non_pic_object="$xdir$non_pic_object"
+ non_pic_object=$xdir$non_pic_object
# A standard non-PIC object
func_append non_pic_objects " $non_pic_object"
- if test -z "$pic_object" || test "$pic_object" = none ; then
- arg="$non_pic_object"
+ if test -z "$pic_object" || test none = "$pic_object"; then
+ arg=$non_pic_object
fi
else
# If the PIC object exists, use it instead.
# $xdir was prepended to $pic_object above.
- non_pic_object="$pic_object"
+ non_pic_object=$pic_object
func_append non_pic_objects " $non_pic_object"
fi
else
@@ -5943,7 +7387,7 @@ func_mode_link ()
if $opt_dry_run; then
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
func_lo2o "$arg"
pic_object=$xdir$objdir/$func_lo2o_result
@@ -5951,7 +7395,7 @@ func_mode_link ()
func_append libobjs " $pic_object"
func_append non_pic_objects " $non_pic_object"
else
- func_fatal_error "\`$arg' is not a valid libtool object"
+ func_fatal_error "'$arg' is not a valid libtool object"
fi
fi
;;
@@ -5967,11 +7411,11 @@ func_mode_link ()
# A libtool-controlled library.
func_resolve_sysroot "$arg"
- if test "$prev" = dlfiles; then
+ if test dlfiles = "$prev"; then
# This library was specified with -dlopen.
func_append dlfiles " $func_resolve_sysroot_result"
prev=
- elif test "$prev" = dlprefiles; then
+ elif test dlprefiles = "$prev"; then
# The library was specified with -dlpreopen.
func_append dlprefiles " $func_resolve_sysroot_result"
prev=
@@ -5986,7 +7430,7 @@ func_mode_link ()
# Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later.
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
;;
esac # arg
@@ -5998,9 +7442,9 @@ func_mode_link ()
done # argument parsing loop
test -n "$prev" && \
- func_fatal_help "the \`$prevarg' option requires an argument"
+ func_fatal_help "the '$prevarg' option requires an argument"
- if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+ if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then
eval arg=\"$export_dynamic_flag_spec\"
func_append compile_command " $arg"
func_append finalize_command " $arg"
@@ -6009,20 +7453,23 @@ func_mode_link ()
oldlibs=
# calculate the name of the file, without its directory
func_basename "$output"
- outputname="$func_basename_result"
- libobjs_save="$libobjs"
+ outputname=$func_basename_result
+ libobjs_save=$libobjs
if test -n "$shlibpath_var"; then
# get the directories listed in $shlibpath_var
- eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
+ eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\`
else
shlib_search_path=
fi
eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+ # Definition is injected by LT_CONFIG during libtool generation.
+ func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH"
+
func_dirname "$output" "/" ""
- output_objdir="$func_dirname_result$objdir"
+ output_objdir=$func_dirname_result$objdir
func_to_tool_file "$output_objdir/"
tool_output_objdir=$func_to_tool_file_result
# Create the object directory.
@@ -6045,7 +7492,7 @@ func_mode_link ()
# Find all interdependent deplibs by searching for libraries
# that are linked more than once (e.g. -la -lb -la)
for deplib in $deplibs; do
- if $opt_preserve_dup_deps ; then
+ if $opt_preserve_dup_deps; then
case "$libs " in
*" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
@@ -6053,7 +7500,7 @@ func_mode_link ()
func_append libs " $deplib"
done
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
libs="$predeps $libs $compiler_lib_search_path $postdeps"
# Compute libraries that are listed more than once in $predeps
@@ -6085,7 +7532,7 @@ func_mode_link ()
case $file in
*.la) ;;
*)
- func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
+ func_fatal_help "libraries can '-dlopen' only libtool libraries: $file"
;;
esac
done
@@ -6093,7 +7540,7 @@ func_mode_link ()
prog)
compile_deplibs=
finalize_deplibs=
- alldeplibs=no
+ alldeplibs=false
newdlfiles=
newdlprefiles=
passes="conv scan dlopen dlpreopen link"
@@ -6105,29 +7552,32 @@ func_mode_link ()
for pass in $passes; do
# The preopen pass in lib mode reverses $deplibs; put it back here
# so that -L comes before libs that need it for instance...
- if test "$linkmode,$pass" = "lib,link"; then
+ if test lib,link = "$linkmode,$pass"; then
## FIXME: Find the place where the list is rebuilt in the wrong
## order, and fix it there properly
tmp_deplibs=
for deplib in $deplibs; do
tmp_deplibs="$deplib $tmp_deplibs"
done
- deplibs="$tmp_deplibs"
+ deplibs=$tmp_deplibs
fi
- if test "$linkmode,$pass" = "lib,link" ||
- test "$linkmode,$pass" = "prog,scan"; then
- libs="$deplibs"
+ if test lib,link = "$linkmode,$pass" ||
+ test prog,scan = "$linkmode,$pass"; then
+ libs=$deplibs
deplibs=
fi
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
case $pass in
- dlopen) libs="$dlfiles" ;;
- dlpreopen) libs="$dlprefiles" ;;
- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+ dlopen) libs=$dlfiles ;;
+ dlpreopen) libs=$dlprefiles ;;
+ link)
+ libs="$deplibs %DEPLIBS%"
+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+ ;;
esac
fi
- if test "$linkmode,$pass" = "lib,dlpreopen"; then
+ if test lib,dlpreopen = "$linkmode,$pass"; then
# Collect and forward deplibs of preopened libtool libs
for lib in $dlprefiles; do
# Ignore non-libtool-libs
@@ -6148,26 +7598,26 @@ func_mode_link ()
esac
done
done
- libs="$dlprefiles"
+ libs=$dlprefiles
fi
- if test "$pass" = dlopen; then
+ if test dlopen = "$pass"; then
# Collect dlpreopened libraries
- save_deplibs="$deplibs"
+ save_deplibs=$deplibs
deplibs=
fi
for deplib in $libs; do
lib=
- found=no
+ found=false
case $deplib in
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
|-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
func_append compiler_flags " $deplib"
- if test "$linkmode" = lib ; then
+ if test lib = "$linkmode"; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
* ) func_append new_inherited_linker_flags " $deplib" ;;
@@ -6177,13 +7627,13 @@ func_mode_link ()
continue
;;
-l*)
- if test "$linkmode" != lib && test "$linkmode" != prog; then
- func_warning "\`-l' is ignored for archives/objects"
+ if test lib != "$linkmode" && test prog != "$linkmode"; then
+ func_warning "'-l' is ignored for archives/objects"
continue
fi
func_stripname '-l' '' "$deplib"
name=$func_stripname_result
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
else
searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
@@ -6191,31 +7641,22 @@ func_mode_link ()
for searchdir in $searchdirs; do
for search_ext in .la $std_shrext .so .a; do
# Search the libtool library
- lib="$searchdir/lib${name}${search_ext}"
+ lib=$searchdir/lib$name$search_ext
if test -f "$lib"; then
- if test "$search_ext" = ".la"; then
- found=yes
+ if test .la = "$search_ext"; then
+ found=:
else
- found=no
+ found=false
fi
break 2
fi
done
done
- if test "$found" != yes; then
- # deplib doesn't seem to be a libtool library
- if test "$linkmode,$pass" = "prog,link"; then
- compile_deplibs="$deplib $compile_deplibs"
- finalize_deplibs="$deplib $finalize_deplibs"
- else
- deplibs="$deplib $deplibs"
- test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
- fi
- continue
- else # deplib is a libtool library
+ if $found; then
+ # deplib is a libtool library
# If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
# We need to do some special things here, and not later.
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $deplib "*)
if func_lalib_p "$lib"; then
@@ -6223,19 +7664,19 @@ func_mode_link ()
old_library=
func_source "$lib"
for l in $old_library $library_names; do
- ll="$l"
+ ll=$l
done
- if test "X$ll" = "X$old_library" ; then # only static version available
- found=no
+ if test "X$ll" = "X$old_library"; then # only static version available
+ found=false
func_dirname "$lib" "" "."
- ladir="$func_dirname_result"
+ ladir=$func_dirname_result
lib=$ladir/$old_library
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
deplibs="$deplib $deplibs"
- test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
fi
continue
fi
@@ -6244,15 +7685,25 @@ func_mode_link ()
*) ;;
esac
fi
+ else
+ # deplib doesn't seem to be a libtool library
+ if test prog,link = "$linkmode,$pass"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ deplibs="$deplib $deplibs"
+ test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
+ fi
+ continue
fi
;; # -l
*.ltframework)
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
deplibs="$deplib $deplibs"
- if test "$linkmode" = lib ; then
+ if test lib = "$linkmode"; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
* ) func_append new_inherited_linker_flags " $deplib" ;;
@@ -6265,18 +7716,18 @@ func_mode_link ()
case $linkmode in
lib)
deplibs="$deplib $deplibs"
- test "$pass" = conv && continue
+ test conv = "$pass" && continue
newdependency_libs="$deplib $newdependency_libs"
func_stripname '-L' '' "$deplib"
func_resolve_sysroot "$func_stripname_result"
func_append newlib_search_path " $func_resolve_sysroot_result"
;;
prog)
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
deplibs="$deplib $deplibs"
continue
fi
- if test "$pass" = scan; then
+ if test scan = "$pass"; then
deplibs="$deplib $deplibs"
else
compile_deplibs="$deplib $compile_deplibs"
@@ -6287,13 +7738,13 @@ func_mode_link ()
func_append newlib_search_path " $func_resolve_sysroot_result"
;;
*)
- func_warning "\`-L' is ignored for archives/objects"
+ func_warning "'-L' is ignored for archives/objects"
;;
esac # linkmode
continue
;; # -L
-R*)
- if test "$pass" = link; then
+ if test link = "$pass"; then
func_stripname '-R' '' "$deplib"
func_resolve_sysroot "$func_stripname_result"
dir=$func_resolve_sysroot_result
@@ -6311,7 +7762,7 @@ func_mode_link ()
lib=$func_resolve_sysroot_result
;;
*.$libext)
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
deplibs="$deplib $deplibs"
continue
fi
@@ -6322,21 +7773,26 @@ func_mode_link ()
case " $dlpreconveniencelibs " in
*" $deplib "*) ;;
*)
- valid_a_lib=no
+ valid_a_lib=false
case $deplibs_check_method in
match_pattern*)
set dummy $deplibs_check_method; shift
match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
| $EGREP "$match_pattern_regex" > /dev/null; then
- valid_a_lib=yes
+ valid_a_lib=:
fi
;;
pass_all)
- valid_a_lib=yes
+ valid_a_lib=:
;;
esac
- if test "$valid_a_lib" != yes; then
+ if $valid_a_lib; then
+ echo
+ $ECHO "*** Warning: Linking the shared library $output against the"
+ $ECHO "*** static library $deplib is not portable!"
+ deplibs="$deplib $deplibs"
+ else
echo
$ECHO "*** Warning: Trying to link with static lib archive $deplib."
echo "*** I have the capability to make that library automatically link in when"
@@ -6344,18 +7800,13 @@ func_mode_link ()
echo "*** shared version of the library, which you do not appear to have"
echo "*** because the file extensions .$libext of this argument makes me believe"
echo "*** that it is just a static archive that I should not use here."
- else
- echo
- $ECHO "*** Warning: Linking the shared library $output against the"
- $ECHO "*** static library $deplib is not portable!"
- deplibs="$deplib $deplibs"
fi
;;
esac
continue
;;
prog)
- if test "$pass" != link; then
+ if test link != "$pass"; then
deplibs="$deplib $deplibs"
else
compile_deplibs="$deplib $compile_deplibs"
@@ -6366,10 +7817,10 @@ func_mode_link ()
esac # linkmode
;; # *.$libext
*.lo | *.$objext)
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
deplibs="$deplib $deplibs"
- elif test "$linkmode" = prog; then
- if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+ elif test prog = "$linkmode"; then
+ if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then
# If there is no dlopen support or we're linking statically,
# we need to preload.
func_append newdlprefiles " $deplib"
@@ -6382,22 +7833,20 @@ func_mode_link ()
continue
;;
%DEPLIBS%)
- alldeplibs=yes
+ alldeplibs=:
continue
;;
esac # case $deplib
- if test "$found" = yes || test -f "$lib"; then :
- else
- func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
- fi
+ $found || test -f "$lib" \
+ || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'"
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$lib" \
- || func_fatal_error "\`$lib' is not a valid libtool archive"
+ || func_fatal_error "'$lib' is not a valid libtool archive"
func_dirname "$lib" "" "."
- ladir="$func_dirname_result"
+ ladir=$func_dirname_result
dlname=
dlopen=
@@ -6427,36 +7876,36 @@ func_mode_link ()
done
fi
dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- if test "$linkmode,$pass" = "lib,link" ||
- test "$linkmode,$pass" = "prog,scan" ||
- { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+ if test lib,link = "$linkmode,$pass" ||
+ test prog,scan = "$linkmode,$pass" ||
+ { test prog != "$linkmode" && test lib != "$linkmode"; }; then
test -n "$dlopen" && func_append dlfiles " $dlopen"
test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
fi
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
# Only check for convenience libraries
deplibs="$lib $deplibs"
if test -z "$libdir"; then
if test -z "$old_library"; then
- func_fatal_error "cannot find name of link library for \`$lib'"
+ func_fatal_error "cannot find name of link library for '$lib'"
fi
# It is a libtool convenience library, so add in its objects.
func_append convenience " $ladir/$objdir/$old_library"
func_append old_convenience " $ladir/$objdir/$old_library"
- elif test "$linkmode" != prog && test "$linkmode" != lib; then
- func_fatal_error "\`$lib' is not a convenience library"
+ 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
@@ -6464,26 +7913,26 @@ func_mode_link ()
# Get the name of the library we link against.
linklib=
if test -n "$old_library" &&
- { test "$prefer_static_libs" = yes ||
- test "$prefer_static_libs,$installed" = "built,no"; }; then
+ { test yes = "$prefer_static_libs" ||
+ test built,no = "$prefer_static_libs,$installed"; }; then
linklib=$old_library
else
for l in $old_library $library_names; do
- linklib="$l"
+ linklib=$l
done
fi
if test -z "$linklib"; then
- func_fatal_error "cannot find name of link library for \`$lib'"
+ func_fatal_error "cannot find name of link library for '$lib'"
fi
# This library was specified with -dlopen.
- if test "$pass" = dlopen; then
- if test -z "$libdir"; then
- func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
- fi
+ if test dlopen = "$pass"; then
+ test -z "$libdir" \
+ && func_fatal_error "cannot -dlopen a convenience library: '$lib'"
if test -z "$dlname" ||
- test "$dlopen_support" != yes ||
- test "$build_libtool_libs" = no; then
+ test yes != "$dlopen_support" ||
+ test no = "$build_libtool_libs"
+ then
# If there is no dlname, no dlopen support or we're linking
# statically, we need to preload. We also need to preload any
# dependent libraries so libltdl's deplib preloader doesn't
@@ -6497,40 +7946,40 @@ func_mode_link ()
# We need an absolute path.
case $ladir in
- [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;;
*)
abs_ladir=`cd "$ladir" && pwd`
if test -z "$abs_ladir"; then
- func_warning "cannot determine absolute directory name of \`$ladir'"
+ func_warning "cannot determine absolute directory name of '$ladir'"
func_warning "passing it literally to the linker, although it might fail"
- abs_ladir="$ladir"
+ abs_ladir=$ladir
fi
;;
esac
func_basename "$lib"
- laname="$func_basename_result"
+ laname=$func_basename_result
# Find the relevant object directory and library name.
- if test "X$installed" = Xyes; then
+ if test yes = "$installed"; then
if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
- func_warning "library \`$lib' was moved."
- dir="$ladir"
- absdir="$abs_ladir"
- libdir="$abs_ladir"
+ func_warning "library '$lib' was moved."
+ dir=$ladir
+ absdir=$abs_ladir
+ libdir=$abs_ladir
else
- dir="$lt_sysroot$libdir"
- absdir="$lt_sysroot$libdir"
+ dir=$lt_sysroot$libdir
+ absdir=$lt_sysroot$libdir
fi
- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ test yes = "$hardcode_automatic" && avoidtemprpath=yes
else
if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
- dir="$ladir"
- absdir="$abs_ladir"
+ dir=$ladir
+ absdir=$abs_ladir
# Remove this search path later
func_append notinst_path " $abs_ladir"
else
- dir="$ladir/$objdir"
- absdir="$abs_ladir/$objdir"
+ dir=$ladir/$objdir
+ absdir=$abs_ladir/$objdir
# Remove this search path later
func_append notinst_path " $abs_ladir"
fi
@@ -6539,11 +7988,11 @@ func_mode_link ()
name=$func_stripname_result
# This library was specified with -dlpreopen.
- if test "$pass" = dlpreopen; then
- if test -z "$libdir" && test "$linkmode" = prog; then
- func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
+ if test dlpreopen = "$pass"; then
+ if test -z "$libdir" && test prog = "$linkmode"; then
+ func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'"
fi
- case "$host" in
+ case $host in
# special handling for platforms with PE-DLLs.
*cygwin* | *mingw* | *cegcc* )
# Linker will automatically link against shared library if both
@@ -6587,9 +8036,9 @@ func_mode_link ()
if test -z "$libdir"; then
# Link the convenience library
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
deplibs="$dir/$old_library $deplibs"
- elif test "$linkmode,$pass" = "prog,link"; then
+ elif test prog,link = "$linkmode,$pass"; then
compile_deplibs="$dir/$old_library $compile_deplibs"
finalize_deplibs="$dir/$old_library $finalize_deplibs"
else
@@ -6599,14 +8048,14 @@ func_mode_link ()
fi
- if test "$linkmode" = prog && test "$pass" != link; then
+ if test prog = "$linkmode" && test link != "$pass"; then
func_append newlib_search_path " $ladir"
deplibs="$lib $deplibs"
- linkalldeplibs=no
- if test "$link_all_deplibs" != no || test -z "$library_names" ||
- test "$build_libtool_libs" = no; then
- linkalldeplibs=yes
+ linkalldeplibs=false
+ if test no != "$link_all_deplibs" || test -z "$library_names" ||
+ test no = "$build_libtool_libs"; then
+ linkalldeplibs=:
fi
tmp_libs=
@@ -6618,14 +8067,14 @@ func_mode_link ()
;;
esac
# Need to link against all dependency_libs?
- if test "$linkalldeplibs" = yes; then
+ if $linkalldeplibs; then
deplibs="$deplib $deplibs"
else
# Need to hardcode shared library paths
# or/and link against static libraries
newdependency_libs="$deplib $newdependency_libs"
fi
- if $opt_preserve_dup_deps ; then
+ if $opt_preserve_dup_deps; then
case "$tmp_libs " in
*" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
@@ -6635,15 +8084,15 @@ func_mode_link ()
continue
fi # $linkmode = prog...
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
if test -n "$library_names" &&
- { { test "$prefer_static_libs" = no ||
- test "$prefer_static_libs,$installed" = "built,yes"; } ||
+ { { test no = "$prefer_static_libs" ||
+ test built,yes = "$prefer_static_libs,$installed"; } ||
test -z "$old_library"; }; then
# We need to hardcode the library path
- if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+ if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then
# Make sure the rpath contains only unique directories.
- case "$temp_rpath:" in
+ case $temp_rpath: in
*"$absdir:"*) ;;
*) func_append temp_rpath "$absdir:" ;;
esac
@@ -6672,9 +8121,9 @@ func_mode_link ()
esac
fi # $linkmode,$pass = prog,link...
- if test "$alldeplibs" = yes &&
- { test "$deplibs_check_method" = pass_all ||
- { test "$build_libtool_libs" = yes &&
+ if $alldeplibs &&
+ { test pass_all = "$deplibs_check_method" ||
+ { test yes = "$build_libtool_libs" &&
test -n "$library_names"; }; }; then
# We only need to search for static libraries
continue
@@ -6683,19 +8132,19 @@ func_mode_link ()
link_static=no # Whether the deplib will be linked statically
use_static_libs=$prefer_static_libs
- if test "$use_static_libs" = built && test "$installed" = yes; then
+ if test built = "$use_static_libs" && test yes = "$installed"; then
use_static_libs=no
fi
if test -n "$library_names" &&
- { test "$use_static_libs" = no || test -z "$old_library"; }; then
+ { test no = "$use_static_libs" || test -z "$old_library"; }; then
case $host in
- *cygwin* | *mingw* | *cegcc*)
+ *cygwin* | *mingw* | *cegcc* | *os2*)
# No point in relinking DLLs because paths are not encoded
func_append notinst_deplibs " $lib"
need_relink=no
;;
*)
- if test "$installed" = no; then
+ if test no = "$installed"; then
func_append notinst_deplibs " $lib"
need_relink=yes
fi
@@ -6705,24 +8154,24 @@ func_mode_link ()
# Warn about portability, can't link against -module's on some
# systems (darwin). Don't bleat about dlopened modules though!
- dlopenmodule=""
+ dlopenmodule=
for dlpremoduletest in $dlprefiles; do
if test "X$dlpremoduletest" = "X$lib"; then
- dlopenmodule="$dlpremoduletest"
+ dlopenmodule=$dlpremoduletest
break
fi
done
- if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+ if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
echo
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
$ECHO "*** Warning: Linking the executable $output against the loadable module"
else
$ECHO "*** Warning: Linking the shared library $output against the loadable module"
fi
$ECHO "*** $linklib is not portable!"
fi
- if test "$linkmode" = lib &&
- test "$hardcode_into_libs" = yes; then
+ if test lib = "$linkmode" &&
+ test yes = "$hardcode_into_libs"; then
# Hardcode the library path.
# Skip directories that are in the system default run-time
# search path.
@@ -6750,43 +8199,43 @@ func_mode_link ()
# figure out the soname
set dummy $library_names
shift
- realname="$1"
+ realname=$1
shift
libname=`eval "\\$ECHO \"$libname_spec\""`
# use dlname if we got it. it's perfectly good, no?
if test -n "$dlname"; then
- soname="$dlname"
+ soname=$dlname
elif test -n "$soname_spec"; then
# bleh windows
case $host in
- *cygwin* | mingw* | *cegcc*)
+ *cygwin* | mingw* | *cegcc* | *os2*)
func_arith $current - $age
major=$func_arith_result
- versuffix="-$major"
+ versuffix=-$major
;;
esac
eval soname=\"$soname_spec\"
else
- soname="$realname"
+ soname=$realname
fi
# Make a new name for the extract_expsyms_cmds to use
- soroot="$soname"
+ soroot=$soname
func_basename "$soroot"
- soname="$func_basename_result"
+ soname=$func_basename_result
func_stripname 'lib' '.dll' "$soname"
newlib=libimp-$func_stripname_result.a
# If the library has no export list, then create one now
if test -f "$output_objdir/$soname-def"; then :
else
- func_verbose "extracting exported symbol list from \`$soname'"
+ func_verbose "extracting exported symbol list from '$soname'"
func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
fi
# Create $newlib
if test -f "$output_objdir/$newlib"; then :; else
- func_verbose "generating import library for \`$soname'"
+ func_verbose "generating import library for '$soname'"
func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
fi
# make sure the library variables are pointing to the new library
@@ -6794,58 +8243,58 @@ func_mode_link ()
linklib=$newlib
fi # test -n "$old_archive_from_expsyms_cmds"
- if test "$linkmode" = prog || test "$opt_mode" != relink; then
+ if test prog = "$linkmode" || test relink != "$opt_mode"; then
add_shlibpath=
add_dir=
add=
lib_linked=yes
case $hardcode_action in
immediate | unsupported)
- if test "$hardcode_direct" = no; then
- add="$dir/$linklib"
+ if test no = "$hardcode_direct"; then
+ add=$dir/$linklib
case $host in
- *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
- *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+ *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;;
+ *-*-sysv4*uw2*) add_dir=-L$dir ;;
*-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
- *-*-unixware7*) add_dir="-L$dir" ;;
+ *-*-unixware7*) add_dir=-L$dir ;;
*-*-darwin* )
- # if the lib is a (non-dlopened) module then we can not
+ # if the lib is a (non-dlopened) module then we cannot
# link against it, someone is ignoring the earlier warnings
if /usr/bin/file -L $add 2> /dev/null |
- $GREP ": [^:]* bundle" >/dev/null ; then
+ $GREP ": [^:]* bundle" >/dev/null; then
if test "X$dlopenmodule" != "X$lib"; then
$ECHO "*** Warning: lib $linklib is a module, not a shared library"
- if test -z "$old_library" ; then
+ if test -z "$old_library"; then
echo
echo "*** And there doesn't seem to be a static archive available"
echo "*** The link will probably fail, sorry"
else
- add="$dir/$old_library"
+ add=$dir/$old_library
fi
elif test -n "$old_library"; then
- add="$dir/$old_library"
+ add=$dir/$old_library
fi
fi
esac
- elif test "$hardcode_minus_L" = no; then
+ elif test no = "$hardcode_minus_L"; then
case $host in
- *-*-sunos*) add_shlibpath="$dir" ;;
+ *-*-sunos*) add_shlibpath=$dir ;;
esac
- add_dir="-L$dir"
- add="-l$name"
- elif test "$hardcode_shlibpath_var" = no; then
- add_shlibpath="$dir"
- add="-l$name"
+ add_dir=-L$dir
+ add=-l$name
+ elif test no = "$hardcode_shlibpath_var"; then
+ add_shlibpath=$dir
+ add=-l$name
else
lib_linked=no
fi
;;
relink)
- if test "$hardcode_direct" = yes &&
- test "$hardcode_direct_absolute" = no; then
- add="$dir/$linklib"
- elif test "$hardcode_minus_L" = yes; then
- add_dir="-L$absdir"
+ if test yes = "$hardcode_direct" &&
+ test no = "$hardcode_direct_absolute"; then
+ add=$dir/$linklib
+ elif test yes = "$hardcode_minus_L"; then
+ add_dir=-L$absdir
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
case $libdir in
@@ -6854,10 +8303,10 @@ func_mode_link ()
;;
esac
fi
- add="-l$name"
- elif test "$hardcode_shlibpath_var" = yes; then
- add_shlibpath="$dir"
- add="-l$name"
+ add=-l$name
+ elif test yes = "$hardcode_shlibpath_var"; then
+ add_shlibpath=$dir
+ add=-l$name
else
lib_linked=no
fi
@@ -6865,7 +8314,7 @@ func_mode_link ()
*) lib_linked=no ;;
esac
- if test "$lib_linked" != yes; then
+ if test yes != "$lib_linked"; then
func_fatal_configuration "unsupported hardcode properties"
fi
@@ -6875,15 +8324,15 @@ func_mode_link ()
*) func_append compile_shlibpath "$add_shlibpath:" ;;
esac
fi
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
test -n "$add" && compile_deplibs="$add $compile_deplibs"
else
test -n "$add_dir" && deplibs="$add_dir $deplibs"
test -n "$add" && deplibs="$add $deplibs"
- if test "$hardcode_direct" != yes &&
- test "$hardcode_minus_L" != yes &&
- test "$hardcode_shlibpath_var" = yes; then
+ if test yes != "$hardcode_direct" &&
+ test yes != "$hardcode_minus_L" &&
+ test yes = "$hardcode_shlibpath_var"; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
*) func_append finalize_shlibpath "$libdir:" ;;
@@ -6892,33 +8341,33 @@ func_mode_link ()
fi
fi
- if test "$linkmode" = prog || test "$opt_mode" = relink; then
+ if test prog = "$linkmode" || test relink = "$opt_mode"; then
add_shlibpath=
add_dir=
add=
# Finalize command for both is simple: just hardcode it.
- if test "$hardcode_direct" = yes &&
- test "$hardcode_direct_absolute" = no; then
- add="$libdir/$linklib"
- elif test "$hardcode_minus_L" = yes; then
- add_dir="-L$libdir"
- add="-l$name"
- elif test "$hardcode_shlibpath_var" = yes; then
+ if test yes = "$hardcode_direct" &&
+ test no = "$hardcode_direct_absolute"; then
+ add=$libdir/$linklib
+ elif test yes = "$hardcode_minus_L"; then
+ add_dir=-L$libdir
+ add=-l$name
+ elif test yes = "$hardcode_shlibpath_var"; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
*) func_append finalize_shlibpath "$libdir:" ;;
esac
- add="-l$name"
- elif test "$hardcode_automatic" = yes; then
+ add=-l$name
+ elif test yes = "$hardcode_automatic"; then
if test -n "$inst_prefix_dir" &&
- test -f "$inst_prefix_dir$libdir/$linklib" ; then
- add="$inst_prefix_dir$libdir/$linklib"
+ test -f "$inst_prefix_dir$libdir/$linklib"; then
+ add=$inst_prefix_dir$libdir/$linklib
else
- add="$libdir/$linklib"
+ add=$libdir/$linklib
fi
else
# We cannot seem to hardcode it, guess we'll fake it.
- add_dir="-L$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
@@ -6927,10 +8376,10 @@ func_mode_link ()
;;
esac
fi
- add="-l$name"
+ add=-l$name
fi
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
else
@@ -6938,43 +8387,43 @@ func_mode_link ()
test -n "$add" && deplibs="$add $deplibs"
fi
fi
- elif test "$linkmode" = prog; then
+ elif test prog = "$linkmode"; then
# Here we assume that one of hardcode_direct or hardcode_minus_L
# is not unsupported. This is valid on all known static and
# shared platforms.
- if test "$hardcode_direct" != unsupported; then
- test -n "$old_library" && linklib="$old_library"
+ if test unsupported != "$hardcode_direct"; then
+ test -n "$old_library" && linklib=$old_library
compile_deplibs="$dir/$linklib $compile_deplibs"
finalize_deplibs="$dir/$linklib $finalize_deplibs"
else
compile_deplibs="-l$name -L$dir $compile_deplibs"
finalize_deplibs="-l$name -L$dir $finalize_deplibs"
fi
- elif test "$build_libtool_libs" = yes; then
+ elif test yes = "$build_libtool_libs"; then
# Not a shared library
- if test "$deplibs_check_method" != pass_all; then
+ if test pass_all != "$deplibs_check_method"; then
# We're trying link a shared library against a static one
# but the system doesn't support it.
# Just print a warning and add the library to dependency_libs so
# that the program can be linked against the static library.
echo
- $ECHO "*** Warning: This system can not link to static lib archive $lib."
+ $ECHO "*** 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 "$module" = yes; then
+ if test yes = "$module"; then
echo "*** But as you try to build a module library, libtool will still create "
echo "*** a static module, that should work as long as the dlopening application"
echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
if test -z "$global_symbol_pipe"; then
echo
echo "*** However, this would only work if libtool was able to extract symbol"
- echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ echo "*** 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."
+ echo "*** 'nm' from GNU binutils and a full rebuild may help."
fi
- if test "$build_old_libs" = no; then
+ if test no = "$build_old_libs"; then
build_libtool_libs=module
build_old_libs=yes
else
@@ -6987,11 +8436,11 @@ func_mode_link ()
fi
fi # link shared/static library?
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
if test -n "$dependency_libs" &&
- { test "$hardcode_into_libs" != yes ||
- test "$build_old_libs" = yes ||
- test "$link_static" = yes; }; then
+ { test yes != "$hardcode_into_libs" ||
+ test yes = "$build_old_libs" ||
+ test yes = "$link_static"; }; then
# Extract -R from dependency_libs
temp_deplibs=
for libdir in $dependency_libs; do
@@ -7005,12 +8454,12 @@ func_mode_link ()
*) func_append temp_deplibs " $libdir";;
esac
done
- dependency_libs="$temp_deplibs"
+ dependency_libs=$temp_deplibs
fi
func_append newlib_search_path " $absdir"
# Link against this library
- test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+ test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
# ... and its dependency_libs
tmp_libs=
for deplib in $dependency_libs; do
@@ -7020,7 +8469,7 @@ func_mode_link ()
func_resolve_sysroot "$func_stripname_result";;
*) func_resolve_sysroot "$deplib" ;;
esac
- if $opt_preserve_dup_deps ; then
+ if $opt_preserve_dup_deps; then
case "$tmp_libs " in
*" $func_resolve_sysroot_result "*)
func_append specialdeplibs " $func_resolve_sysroot_result" ;;
@@ -7029,12 +8478,12 @@ func_mode_link ()
func_append tmp_libs " $func_resolve_sysroot_result"
done
- if test "$link_all_deplibs" != no; then
+ if test no != "$link_all_deplibs"; then
# Add the search paths of all dependency libraries
for deplib in $dependency_libs; do
path=
case $deplib in
- -L*) path="$deplib" ;;
+ -L*) path=$deplib ;;
*.la)
func_resolve_sysroot "$deplib"
deplib=$func_resolve_sysroot_result
@@ -7042,12 +8491,12 @@ func_mode_link ()
dir=$func_dirname_result
# We need an absolute path.
case $dir in
- [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;;
*)
absdir=`cd "$dir" && pwd`
if test -z "$absdir"; then
- func_warning "cannot determine absolute directory name of \`$dir'"
- absdir="$dir"
+ func_warning "cannot determine absolute directory name of '$dir'"
+ absdir=$dir
fi
;;
esac
@@ -7055,35 +8504,35 @@ func_mode_link ()
case $host in
*-*-darwin*)
depdepl=
- eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
- if test -n "$deplibrary_names" ; then
- for tmp in $deplibrary_names ; do
+ eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+ if test -n "$deplibrary_names"; then
+ for tmp in $deplibrary_names; do
depdepl=$tmp
done
- if test -f "$absdir/$objdir/$depdepl" ; then
- depdepl="$absdir/$objdir/$depdepl"
- darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+ if test -f "$absdir/$objdir/$depdepl"; then
+ depdepl=$absdir/$objdir/$depdepl
+ darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
if test -z "$darwin_install_name"; then
- darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+ darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
fi
- func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
- func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
+ func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl"
+ func_append linker_flags " -dylib_file $darwin_install_name:$depdepl"
path=
fi
fi
;;
*)
- path="-L$absdir/$objdir"
+ path=-L$absdir/$objdir
;;
esac
else
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
test -z "$libdir" && \
- func_fatal_error "\`$deplib' is not a valid libtool archive"
+ func_fatal_error "'$deplib' is not a valid libtool archive"
test "$absdir" != "$libdir" && \
- func_warning "\`$deplib' seems to be moved"
+ func_warning "'$deplib' seems to be moved"
- path="-L$absdir"
+ path=-L$absdir
fi
;;
esac
@@ -7095,23 +8544,23 @@ func_mode_link ()
fi # link_all_deplibs != no
fi # linkmode = lib
done # for deplib in $libs
- if test "$pass" = link; then
- if test "$linkmode" = "prog"; then
+ if test link = "$pass"; then
+ if test prog = "$linkmode"; then
compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
else
compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
fi
fi
- dependency_libs="$newdependency_libs"
- if test "$pass" = dlpreopen; then
+ dependency_libs=$newdependency_libs
+ if test dlpreopen = "$pass"; then
# Link the dlpreopened libraries before other libraries
for deplib in $save_deplibs; do
deplibs="$deplib $deplibs"
done
fi
- if test "$pass" != dlopen; then
- if test "$pass" != conv; then
+ if test dlopen != "$pass"; then
+ test conv = "$pass" || {
# Make sure lib_search_path contains only unique directories.
lib_search_path=
for dir in $newlib_search_path; do
@@ -7121,12 +8570,12 @@ func_mode_link ()
esac
done
newlib_search_path=
- fi
+ }
- if test "$linkmode,$pass" != "prog,link"; then
- vars="deplibs"
- else
+ if test prog,link = "$linkmode,$pass"; then
vars="compile_deplibs finalize_deplibs"
+ else
+ vars=deplibs
fi
for var in $vars dependency_libs; do
# Add libraries to $var in reverse order
@@ -7184,62 +8633,93 @@ func_mode_link ()
eval $var=\"$tmp_libs\"
done # for var
fi
+
+ # Add Sun CC postdeps if required:
+ test CXX = "$tagname" && {
+ case $host_os in
+ linux*)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C++ 5.9
+ func_suncc_cstd_abi
+
+ if test no != "$suncc_use_cstd_abi"; then
+ func_append postdeps ' -library=Cstd -library=Crun'
+ fi
+ ;;
+ esac
+ ;;
+
+ solaris*)
+ func_cc_basename "$CC"
+ case $func_cc_basename_result in
+ CC* | sunCC*)
+ func_suncc_cstd_abi
+
+ if test no != "$suncc_use_cstd_abi"; then
+ func_append postdeps ' -library=Cstd -library=Crun'
+ fi
+ ;;
+ esac
+ ;;
+ esac
+ }
+
# Last step: remove runtime libs from dependency_libs
# (they stay in deplibs)
tmp_libs=
- for i in $dependency_libs ; do
+ for i in $dependency_libs; do
case " $predeps $postdeps $compiler_lib_search_path " in
*" $i "*)
- i=""
+ i=
;;
esac
- if test -n "$i" ; then
+ if test -n "$i"; then
func_append tmp_libs " $i"
fi
done
dependency_libs=$tmp_libs
done # for pass
- if test "$linkmode" = prog; then
- dlfiles="$newdlfiles"
+ if test prog = "$linkmode"; then
+ dlfiles=$newdlfiles
fi
- if test "$linkmode" = prog || test "$linkmode" = lib; then
- dlprefiles="$newdlprefiles"
+ if test prog = "$linkmode" || test lib = "$linkmode"; then
+ dlprefiles=$newdlprefiles
fi
case $linkmode in
oldlib)
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- func_warning "\`-dlopen' is ignored for archives"
+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+ func_warning "'-dlopen' is ignored for archives"
fi
case " $deplibs" in
*\ -l* | *\ -L*)
- func_warning "\`-l' and \`-L' are ignored for archives" ;;
+ func_warning "'-l' and '-L' are ignored for archives" ;;
esac
test -n "$rpath" && \
- func_warning "\`-rpath' is ignored for archives"
+ func_warning "'-rpath' is ignored for archives"
test -n "$xrpath" && \
- func_warning "\`-R' is ignored for archives"
+ func_warning "'-R' is ignored for archives"
test -n "$vinfo" && \
- func_warning "\`-version-info/-version-number' is ignored for archives"
+ func_warning "'-version-info/-version-number' is ignored for archives"
test -n "$release" && \
- func_warning "\`-release' is ignored for archives"
+ func_warning "'-release' is ignored for archives"
test -n "$export_symbols$export_symbols_regex" && \
- func_warning "\`-export-symbols' is ignored for archives"
+ func_warning "'-export-symbols' is ignored for archives"
# Now set the variables for building old libraries.
build_libtool_libs=no
- oldlibs="$output"
+ oldlibs=$output
func_append objs "$old_deplibs"
;;
lib)
- # Make sure we only generate libraries of the form `libNAME.la'.
+ # Make sure we only generate libraries of the form 'libNAME.la'.
case $outputname in
lib*)
func_stripname 'lib' '.la' "$outputname"
@@ -7248,10 +8728,10 @@ func_mode_link ()
eval libname=\"$libname_spec\"
;;
*)
- test "$module" = no && \
- func_fatal_help "libtool library \`$output' must begin with \`lib'"
+ test no = "$module" \
+ && func_fatal_help "libtool library '$output' must begin with 'lib'"
- if test "$need_lib_prefix" != no; then
+ if test no != "$need_lib_prefix"; then
# Add the "lib" prefix for modules if required
func_stripname '' '.la' "$outputname"
name=$func_stripname_result
@@ -7265,8 +8745,8 @@ func_mode_link ()
esac
if test -n "$objs"; then
- if test "$deplibs_check_method" != pass_all; then
- func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+ 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
echo
$ECHO "*** Warning: Linking the shared library $output against the non-libtool"
@@ -7275,21 +8755,21 @@ func_mode_link ()
fi
fi
- test "$dlself" != no && \
- func_warning "\`-dlopen self' is ignored for libtool libraries"
+ test no = "$dlself" \
+ || func_warning "'-dlopen self' is ignored for libtool libraries"
set dummy $rpath
shift
- test "$#" -gt 1 && \
- func_warning "ignoring multiple \`-rpath's for a libtool library"
+ test 1 -lt "$#" \
+ && func_warning "ignoring multiple '-rpath's for a libtool library"
- install_libdir="$1"
+ install_libdir=$1
oldlibs=
if test -z "$rpath"; then
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
# Building a libtool convenience library.
- # Some compilers have problems with a `.al' extension so
+ # Some compilers have problems with a '.al' extension so
# convenience libraries should have the same extension an
# archive normally would.
oldlibs="$output_objdir/$libname.$libext $oldlibs"
@@ -7298,20 +8778,20 @@ func_mode_link ()
fi
test -n "$vinfo" && \
- func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
+ func_warning "'-version-info/-version-number' is ignored for convenience libraries"
test -n "$release" && \
- func_warning "\`-release' is ignored for convenience libraries"
+ func_warning "'-release' is ignored for convenience libraries"
else
# Parse the version information argument.
- save_ifs="$IFS"; IFS=':'
+ save_ifs=$IFS; IFS=:
set dummy $vinfo 0 0 0
shift
- IFS="$save_ifs"
+ IFS=$save_ifs
test -n "$7" && \
- func_fatal_help "too many parameters to \`-version-info'"
+ func_fatal_help "too many parameters to '-version-info'"
# convert absolute version numbers to libtool ages
# this retains compatibility with .la files and attempts
@@ -7319,42 +8799,45 @@ func_mode_link ()
case $vinfo_number in
yes)
- number_major="$1"
- number_minor="$2"
- number_revision="$3"
+ number_major=$1
+ number_minor=$2
+ number_revision=$3
#
# There are really only two kinds -- those that
# use the current revision as the major version
# and those that subtract age and use age as
# a minor version. But, then there is irix
- # which has an extra 1 added just for fun
+ # that has an extra 1 added just for fun
#
case $version_type in
# correct linux to gnu/linux during the next big refactor
- darwin|linux|osf|windows|none)
+ darwin|freebsd-elf|linux|osf|windows|none)
func_arith $number_major + $number_minor
current=$func_arith_result
- age="$number_minor"
- revision="$number_revision"
+ age=$number_minor
+ revision=$number_revision
;;
- freebsd-aout|freebsd-elf|qnx|sunos)
- current="$number_major"
- revision="$number_minor"
- age="0"
+ freebsd-aout|qnx|sunos)
+ current=$number_major
+ revision=$number_minor
+ age=0
;;
irix|nonstopux)
func_arith $number_major + $number_minor
current=$func_arith_result
- age="$number_minor"
- revision="$number_minor"
+ age=$number_minor
+ revision=$number_minor
lt_irix_increment=no
;;
+ *)
+ func_fatal_configuration "$modename: unknown library version type '$version_type'"
+ ;;
esac
;;
no)
- current="$1"
- revision="$2"
- age="$3"
+ current=$1
+ revision=$2
+ age=$3
;;
esac
@@ -7362,30 +8845,30 @@ func_mode_link ()
case $current in
0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
- func_error "CURRENT \`$current' must be a nonnegative integer"
- func_fatal_error "\`$vinfo' is not valid version information"
+ func_error "CURRENT '$current' must be a nonnegative integer"
+ func_fatal_error "'$vinfo' is not valid version information"
;;
esac
case $revision in
0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
- func_error "REVISION \`$revision' must be a nonnegative integer"
- func_fatal_error "\`$vinfo' is not valid version information"
+ func_error "REVISION '$revision' must be a nonnegative integer"
+ func_fatal_error "'$vinfo' is not valid version information"
;;
esac
case $age in
0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
- func_error "AGE \`$age' must be a nonnegative integer"
- func_fatal_error "\`$vinfo' is not valid version information"
+ func_error "AGE '$age' must be a nonnegative integer"
+ func_fatal_error "'$vinfo' is not valid version information"
;;
esac
if test "$age" -gt "$current"; then
- func_error "AGE \`$age' is greater than the current interface number \`$current'"
- func_fatal_error "\`$vinfo' is not valid version information"
+ func_error "AGE '$age' is greater than the current interface number '$current'"
+ func_fatal_error "'$vinfo' is not valid version information"
fi
# Calculate the version variables.
@@ -7400,26 +8883,36 @@ func_mode_link ()
# verstring for coding it into the library header
func_arith $current - $age
major=.$func_arith_result
- versuffix="$major.$age.$revision"
+ versuffix=$major.$age.$revision
# Darwin ld doesn't like 0 for these options...
func_arith $current + 1
minor_current=$func_arith_result
- xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+ xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ # On Darwin other compilers
+ case $CC in
+ nagfor*)
+ verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
+ ;;
+ *)
+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ ;;
+ esac
;;
freebsd-aout)
- major=".$current"
- versuffix=".$current.$revision";
+ major=.$current
+ versuffix=.$current.$revision
;;
freebsd-elf)
- major=".$current"
- versuffix=".$current"
+ func_arith $current - $age
+ major=.$func_arith_result
+ versuffix=$major.$age.$revision
;;
irix | nonstopux)
- if test "X$lt_irix_increment" = "Xno"; then
+ if test no = "$lt_irix_increment"; then
func_arith $current - $age
else
func_arith $current - $age + 1
@@ -7430,69 +8923,74 @@ func_mode_link ()
nonstopux) verstring_prefix=nonstopux ;;
*) verstring_prefix=sgi ;;
esac
- verstring="$verstring_prefix$major.$revision"
+ verstring=$verstring_prefix$major.$revision
# Add in all the interfaces that we are compatible with.
loop=$revision
- while test "$loop" -ne 0; do
+ while test 0 -ne "$loop"; do
func_arith $revision - $loop
iface=$func_arith_result
func_arith $loop - 1
loop=$func_arith_result
- verstring="$verstring_prefix$major.$iface:$verstring"
+ verstring=$verstring_prefix$major.$iface:$verstring
done
- # Before this point, $major must not contain `.'.
+ # Before this point, $major must not contain '.'.
major=.$major
- versuffix="$major.$revision"
+ versuffix=$major.$revision
;;
linux) # correct to gnu/linux during the next big refactor
func_arith $current - $age
major=.$func_arith_result
- versuffix="$major.$age.$revision"
+ versuffix=$major.$age.$revision
;;
osf)
func_arith $current - $age
major=.$func_arith_result
- versuffix=".$current.$age.$revision"
- verstring="$current.$age.$revision"
+ versuffix=.$current.$age.$revision
+ verstring=$current.$age.$revision
# Add in all the interfaces that we are compatible with.
loop=$age
- while test "$loop" -ne 0; do
+ while test 0 -ne "$loop"; do
func_arith $current - $loop
iface=$func_arith_result
func_arith $loop - 1
loop=$func_arith_result
- verstring="$verstring:${iface}.0"
+ verstring=$verstring:$iface.0
done
# Make executables depend on our current version.
- func_append verstring ":${current}.0"
+ func_append verstring ":$current.0"
;;
qnx)
- major=".$current"
- versuffix=".$current"
+ major=.$current
+ versuffix=.$current
+ ;;
+
+ sco)
+ major=.$current
+ versuffix=.$current
;;
sunos)
- major=".$current"
- versuffix=".$current.$revision"
+ major=.$current
+ versuffix=.$current.$revision
;;
windows)
# Use '-' rather than '.', since we only want one
- # extension on DOS 8.3 filesystems.
+ # extension on DOS 8.3 file systems.
func_arith $current - $age
major=$func_arith_result
- versuffix="-$major"
+ versuffix=-$major
;;
*)
- func_fatal_configuration "unknown library version type \`$version_type'"
+ func_fatal_configuration "unknown library version type '$version_type'"
;;
esac
@@ -7506,42 +9004,45 @@ func_mode_link ()
verstring=
;;
*)
- verstring="0.0"
+ verstring=0.0
;;
esac
- if test "$need_version" = no; then
+ if test no = "$need_version"; then
versuffix=
else
- versuffix=".0.0"
+ versuffix=.0.0
fi
fi
# Remove version info from name if versioning should be avoided
- if test "$avoid_version" = yes && test "$need_version" = no; then
+ if test yes,no = "$avoid_version,$need_version"; then
major=
versuffix=
- verstring=""
+ verstring=
fi
# Check to see if the archive will have undefined symbols.
- if test "$allow_undefined" = yes; then
- if test "$allow_undefined_flag" = unsupported; then
- func_warning "undefined symbols not allowed in $host shared libraries"
- build_libtool_libs=no
- build_old_libs=yes
+ if test yes = "$allow_undefined"; then
+ if test unsupported = "$allow_undefined_flag"; then
+ if test yes = "$build_old_libs"; then
+ func_warning "undefined symbols not allowed in $host shared libraries; building static only"
+ build_libtool_libs=no
+ else
+ func_fatal_error "can't build $host shared library unless -no-undefined is specified"
+ fi
fi
else
# Don't allow undefined symbols.
- allow_undefined_flag="$no_undefined_flag"
+ allow_undefined_flag=$no_undefined_flag
fi
fi
- func_generate_dlsyms "$libname" "$libname" "yes"
+ func_generate_dlsyms "$libname" "$libname" :
func_append libobjs " $symfileobj"
- test "X$libobjs" = "X " && libobjs=
+ test " " = "$libobjs" && libobjs=
- if test "$opt_mode" != relink; then
+ if test relink != "$opt_mode"; then
# Remove our outputs, but don't remove object files since they
# may have been created when compiling PIC objects.
removelist=
@@ -7550,8 +9051,8 @@ func_mode_link ()
case $p in
*.$objext | *.gcno)
;;
- $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
- if test "X$precious_files_regex" != "X"; then
+ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*)
+ if test -n "$precious_files_regex"; then
if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
then
continue
@@ -7567,11 +9068,11 @@ func_mode_link ()
fi
# Now set the variables for building old libraries.
- if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+ if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then
func_append oldlibs " $output_objdir/$libname.$libext"
# Transform .lo files to .o files.
- oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
+ oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP`
fi
# Eliminate all temporary directories.
@@ -7592,13 +9093,13 @@ func_mode_link ()
*) func_append finalize_rpath " $libdir" ;;
esac
done
- if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+ if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then
dependency_libs="$temp_xrpath $dependency_libs"
fi
fi
# Make sure dlfiles contains only unique files that won't be dlpreopened
- old_dlfiles="$dlfiles"
+ old_dlfiles=$dlfiles
dlfiles=
for lib in $old_dlfiles; do
case " $dlprefiles $dlfiles " in
@@ -7608,7 +9109,7 @@ func_mode_link ()
done
# Make sure dlprefiles contains only unique files
- old_dlprefiles="$dlprefiles"
+ old_dlprefiles=$dlprefiles
dlprefiles=
for lib in $old_dlprefiles; do
case "$dlprefiles " in
@@ -7617,7 +9118,7 @@ func_mode_link ()
esac
done
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
if test -n "$rpath"; then
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
@@ -7641,7 +9142,7 @@ func_mode_link ()
;;
*)
# Add libc to deplibs on all other systems if necessary.
- if test "$build_libtool_need_lc" = "yes"; then
+ if test yes = "$build_libtool_need_lc"; then
func_append deplibs " -lc"
fi
;;
@@ -7657,9 +9158,9 @@ func_mode_link ()
# I'm not sure if I'm treating the release correctly. I think
# release should show up in the -l (ie -lgmp5) so we don't want to
# add it in twice. Is that correct?
- release=""
- versuffix=""
- major=""
+ release=
+ versuffix=
+ major=
newdeplibs=
droppeddeps=no
case $deplibs_check_method in
@@ -7688,20 +9189,20 @@ EOF
-l*)
func_stripname -l '' "$i"
name=$func_stripname_result
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $i "*)
func_append newdeplibs " $i"
- i=""
+ i=
;;
esac
fi
- if test -n "$i" ; then
+ 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
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
func_append newdeplibs " $i"
else
droppeddeps=yes
@@ -7731,20 +9232,20 @@ EOF
$opt_dry_run || $RM conftest
if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
ldd_output=`ldd conftest`
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $i "*)
func_append newdeplibs " $i"
- i=""
+ i=
;;
esac
fi
- if test -n "$i" ; then
+ 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
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
func_append newdeplibs " $i"
else
droppeddeps=yes
@@ -7781,24 +9282,24 @@ EOF
-l*)
func_stripname -l '' "$a_deplib"
name=$func_stripname_result
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $a_deplib "*)
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
;;
esac
fi
- if test -n "$a_deplib" ; then
+ if test -n "$a_deplib"; then
libname=`eval "\\$ECHO \"$libname_spec\""`
if test -n "$file_magic_glob"; then
libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
else
libnameglob=$libname
fi
- test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
+ test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob`
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
- if test "$want_nocaseglob" = yes; then
+ if test yes = "$want_nocaseglob"; then
shopt -s nocaseglob
potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
$nocaseglob
@@ -7816,25 +9317,25 @@ EOF
# We might still enter an endless loop, since a link
# loop can be closed while we follow links,
# but so what?
- potlib="$potent_lib"
+ potlib=$potent_lib
while test -h "$potlib" 2>/dev/null; do
- potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+ potliblink=`ls -ld $potlib | $SED 's/.* -> //'`
case $potliblink in
- [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
- *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
+ [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;;
+ *) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";;
esac
done
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
$SED -e 10q |
$EGREP "$file_magic_regex" > /dev/null; then
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
break 2
fi
done
done
fi
- if test -n "$a_deplib" ; then
+ if test -n "$a_deplib"; then
droppeddeps=yes
echo
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
@@ -7842,7 +9343,7 @@ EOF
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
+ if test -z "$potlib"; then
$ECHO "*** with $libname but no candidates were found. (...for file magic test)"
else
$ECHO "*** with $libname and none of the candidates passed a file format test"
@@ -7865,30 +9366,30 @@ EOF
-l*)
func_stripname -l '' "$a_deplib"
name=$func_stripname_result
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $a_deplib "*)
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
;;
esac
fi
- if test -n "$a_deplib" ; then
+ if test -n "$a_deplib"; then
libname=`eval "\\$ECHO \"$libname_spec\""`
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
for potent_lib in $potential_libs; do
- potlib="$potent_lib" # see symlink-check above in file_magic test
+ potlib=$potent_lib # see symlink-check above in file_magic test
if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
$EGREP "$match_pattern_regex" > /dev/null; then
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
break 2
fi
done
done
fi
- if test -n "$a_deplib" ; then
+ if test -n "$a_deplib"; then
droppeddeps=yes
echo
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
@@ -7896,7 +9397,7 @@ EOF
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
+ if test -z "$potlib"; then
$ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
else
$ECHO "*** with $libname and none of the candidates passed a file format test"
@@ -7912,18 +9413,18 @@ EOF
done # Gone through all deplibs.
;;
none | unknown | *)
- newdeplibs=""
+ newdeplibs=
tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- for i in $predeps $postdeps ; do
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+ for i in $predeps $postdeps; do
# can't use Xsed below, because $i might contain '/'
- tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
+ tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"`
done
fi
case $tmp_deplibs in
*[!\ \ ]*)
echo
- if test "X$deplibs_check_method" = "Xnone"; then
+ if test none = "$deplibs_check_method"; then
echo "*** Warning: inter-library dependencies are not supported in this platform."
else
echo "*** Warning: inter-library dependencies are not known to be supported."
@@ -7947,8 +9448,8 @@ EOF
;;
esac
- if test "$droppeddeps" = yes; then
- if test "$module" = yes; then
+ if test yes = "$droppeddeps"; then
+ if test yes = "$module"; then
echo
echo "*** Warning: libtool could not satisfy all declared inter-library"
$ECHO "*** dependencies of module $libname. Therefore, libtool will create"
@@ -7957,12 +9458,12 @@ EOF
if test -z "$global_symbol_pipe"; then
echo
echo "*** However, this would only work if libtool was able to extract symbol"
- echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ echo "*** 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."
+ echo "*** 'nm' from GNU binutils and a full rebuild may help."
fi
- if test "$build_old_libs" = no; then
- oldlibs="$output_objdir/$libname.$libext"
+ if test no = "$build_old_libs"; then
+ oldlibs=$output_objdir/$libname.$libext
build_libtool_libs=module
build_old_libs=yes
else
@@ -7973,14 +9474,14 @@ EOF
echo "*** automatically added whenever a program is linked with this library"
echo "*** or is declared to -dlopen it."
- if test "$allow_undefined" = no; then
+ if test no = "$allow_undefined"; then
echo
echo "*** Since this library must not contain undefined symbols,"
echo "*** because either the platform does not support them or"
echo "*** it was explicitly requested with -no-undefined,"
echo "*** libtool will only create a static version of it."
- if test "$build_old_libs" = no; then
- oldlibs="$output_objdir/$libname.$libext"
+ if test no = "$build_old_libs"; then
+ oldlibs=$output_objdir/$libname.$libext
build_libtool_libs=module
build_old_libs=yes
else
@@ -8026,7 +9527,7 @@ EOF
*) func_append new_libs " $deplib" ;;
esac
done
- deplibs="$new_libs"
+ deplibs=$new_libs
# All the library-specific variables (install_libdir is set above).
library_names=
@@ -8034,25 +9535,25 @@ EOF
dlname=
# Test again, we may have decided not to build it any more
- if test "$build_libtool_libs" = yes; then
- # Remove ${wl} instances when linking with ld.
+ if test yes = "$build_libtool_libs"; then
+ # Remove $wl instances when linking with ld.
# FIXME: should test the right _cmds variable.
case $archive_cmds in
*\$LD\ *) wl= ;;
esac
- if test "$hardcode_into_libs" = yes; then
+ if test yes = "$hardcode_into_libs"; then
# Hardcode the library paths
hardcode_libdirs=
dep_rpath=
- rpath="$finalize_rpath"
- test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
+ rpath=$finalize_rpath
+ test relink = "$opt_mode" || rpath=$compile_rpath$rpath
for libdir in $rpath; do
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
func_replace_sysroot "$libdir"
libdir=$func_replace_sysroot_result
if test -z "$hardcode_libdirs"; then
- hardcode_libdirs="$libdir"
+ hardcode_libdirs=$libdir
else
# Just accumulate the unique libdirs.
case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8077,7 +9578,7 @@ EOF
# Substitute the hardcoded libdirs into the rpath.
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
+ libdir=$hardcode_libdirs
eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
fi
if test -n "$runpath_var" && test -n "$perm_rpath"; then
@@ -8091,8 +9592,8 @@ EOF
test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
fi
- shlibpath="$finalize_shlibpath"
- test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+ shlibpath=$finalize_shlibpath
+ test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath
if test -n "$shlibpath"; then
eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
fi
@@ -8102,19 +9603,19 @@ EOF
eval library_names=\"$library_names_spec\"
set dummy $library_names
shift
- realname="$1"
+ realname=$1
shift
if test -n "$soname_spec"; then
eval soname=\"$soname_spec\"
else
- soname="$realname"
+ soname=$realname
fi
if test -z "$dlname"; then
dlname=$soname
fi
- lib="$output_objdir/$realname"
+ lib=$output_objdir/$realname
linknames=
for link
do
@@ -8128,7 +9629,7 @@ EOF
delfiles=
if test -n "$export_symbols" && test -n "$include_expsyms"; then
$opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
- export_symbols="$output_objdir/$libname.uexp"
+ export_symbols=$output_objdir/$libname.uexp
func_append delfiles " $export_symbols"
fi
@@ -8137,31 +9638,31 @@ EOF
cygwin* | mingw* | cegcc*)
if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
# exporting using user supplied symfile
- if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+ func_dll_def_p "$export_symbols" || {
# and it's NOT already a .def file. Must figure out
# which of the given symbols are data symbols and tag
# them as such. So, trigger use of export_symbols_cmds.
# export_symbols gets reassigned inside the "prepare
# the list of exported symbols" if statement, so the
# include_expsyms logic still works.
- orig_export_symbols="$export_symbols"
+ orig_export_symbols=$export_symbols
export_symbols=
always_export_symbols=yes
- fi
+ }
fi
;;
esac
# Prepare the list of exported symbols
if test -z "$export_symbols"; then
- if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
- func_verbose "generating symbol list for \`$libname.la'"
- export_symbols="$output_objdir/$libname.exp"
+ if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then
+ func_verbose "generating symbol list for '$libname.la'"
+ export_symbols=$output_objdir/$libname.exp
$opt_dry_run || $RM $export_symbols
cmds=$export_symbols_cmds
- save_ifs="$IFS"; IFS='~'
+ save_ifs=$IFS; IFS='~'
for cmd1 in $cmds; do
- IFS="$save_ifs"
+ IFS=$save_ifs
# Take the normal branch if the nm_file_list_spec branch
# doesn't work or if tool conversion is not needed.
case $nm_file_list_spec~$to_tool_file_cmd in
@@ -8175,7 +9676,7 @@ EOF
try_normal_branch=no
;;
esac
- if test "$try_normal_branch" = yes \
+ if test yes = "$try_normal_branch" \
&& { test "$len" -lt "$max_cmd_len" \
|| test "$max_cmd_len" -le -1; }
then
@@ -8186,7 +9687,7 @@ EOF
output_la=$func_basename_result
save_libobjs=$libobjs
save_output=$output
- output=${output_objdir}/${output_la}.nm
+ output=$output_objdir/$output_la.nm
func_to_tool_file "$output"
libobjs=$nm_file_list_spec$func_to_tool_file_result
func_append delfiles " $output"
@@ -8209,8 +9710,8 @@ EOF
break
fi
done
- IFS="$save_ifs"
- if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+ IFS=$save_ifs
+ if test -n "$export_symbols_regex" && test : != "$skipped_export"; then
func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
fi
@@ -8218,16 +9719,16 @@ EOF
fi
if test -n "$export_symbols" && test -n "$include_expsyms"; then
- tmp_export_symbols="$export_symbols"
- test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+ tmp_export_symbols=$export_symbols
+ test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
$opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
fi
- if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+ if test : != "$skipped_export" && test -n "$orig_export_symbols"; then
# The given exports_symbols file has to be filtered, so filter it.
- func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+ func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
# FIXME: $output_objdir/$libname.filter potentially contains lots of
- # 's' commands which not all seds can handle. GNU sed should be fine
+ # 's' commands, which not all seds can handle. GNU sed should be fine
# though. Also, the filter scales superlinearly with the number of
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
@@ -8246,11 +9747,11 @@ EOF
;;
esac
done
- deplibs="$tmp_deplibs"
+ deplibs=$tmp_deplibs
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec" &&
- test "$compiler_needs_object" = yes &&
+ test yes = "$compiler_needs_object" &&
test -z "$libobjs"; then
# extract the archives, so we have objects to list.
# TODO: could optimize this to just extract one archive.
@@ -8261,7 +9762,7 @@ EOF
eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
test "X$libobjs" = "X " && libobjs=
else
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $convenience
@@ -8270,18 +9771,18 @@ EOF
fi
fi
- if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then
eval flag=\"$thread_safe_flag_spec\"
func_append linker_flags " $flag"
fi
# Make a backup of the uninstalled library when relinking
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
fi
# Do each of the archive commands.
- if test "$module" = yes && test -n "$module_cmds" ; then
+ if test yes = "$module" && test -n "$module_cmds"; then
if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
eval test_cmds=\"$module_expsym_cmds\"
cmds=$module_expsym_cmds
@@ -8299,7 +9800,7 @@ EOF
fi
fi
- if test "X$skipped_export" != "X:" &&
+ if test : != "$skipped_export" &&
func_len " $test_cmds" &&
len=$func_len_result &&
test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
@@ -8332,8 +9833,8 @@ EOF
last_robj=
k=1
- if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
- output=${output_objdir}/${output_la}.lnkscript
+ if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
+ output=$output_objdir/$output_la.lnkscript
func_verbose "creating GNU ld script: $output"
echo 'INPUT (' > $output
for obj in $save_libobjs
@@ -8345,14 +9846,14 @@ EOF
func_append delfiles " $output"
func_to_tool_file "$output"
output=$func_to_tool_file_result
- elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
- output=${output_objdir}/${output_la}.lnk
+ elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
+ output=$output_objdir/$output_la.lnk
func_verbose "creating linker input file list: $output"
: > $output
set x $save_libobjs
shift
firstobj=
- if test "$compiler_needs_object" = yes; then
+ if test yes = "$compiler_needs_object"; then
firstobj="$1 "
shift
fi
@@ -8367,7 +9868,7 @@ EOF
else
if test -n "$save_libobjs"; then
func_verbose "creating reloadable object files..."
- output=$output_objdir/$output_la-${k}.$objext
+ output=$output_objdir/$output_la-$k.$objext
eval test_cmds=\"$reload_cmds\"
func_len " $test_cmds"
len0=$func_len_result
@@ -8379,13 +9880,13 @@ EOF
func_len " $obj"
func_arith $len + $func_len_result
len=$func_arith_result
- if test "X$objlist" = X ||
+ if test -z "$objlist" ||
test "$len" -lt "$max_cmd_len"; then
func_append objlist " $obj"
else
# The command $test_cmds is almost too long, add a
# command to the queue.
- if test "$k" -eq 1 ; then
+ if test 1 -eq "$k"; then
# The first file doesn't have a previous command to add.
reload_objs=$objlist
eval concat_cmds=\"$reload_cmds\"
@@ -8395,10 +9896,10 @@ EOF
reload_objs="$objlist $last_robj"
eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
fi
- last_robj=$output_objdir/$output_la-${k}.$objext
+ last_robj=$output_objdir/$output_la-$k.$objext
func_arith $k + 1
k=$func_arith_result
- output=$output_objdir/$output_la-${k}.$objext
+ output=$output_objdir/$output_la-$k.$objext
objlist=" $obj"
func_len " $last_robj"
func_arith $len0 + $func_len_result
@@ -8410,9 +9911,9 @@ EOF
# files will link in the last one created.
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
reload_objs="$objlist $last_robj"
- eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
+ eval concat_cmds=\"\$concat_cmds$reload_cmds\"
if test -n "$last_robj"; then
- eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
fi
func_append delfiles " $output"
@@ -8420,9 +9921,9 @@ EOF
output=
fi
- if ${skipped_export-false}; then
- func_verbose "generating symbol list for \`$libname.la'"
- export_symbols="$output_objdir/$libname.exp"
+ ${skipped_export-false} && {
+ func_verbose "generating symbol list for '$libname.la'"
+ export_symbols=$output_objdir/$libname.exp
$opt_dry_run || $RM $export_symbols
libobjs=$output
# Append the command to create the export file.
@@ -8431,16 +9932,16 @@ EOF
if test -n "$last_robj"; then
eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
fi
- fi
+ }
test -n "$save_libobjs" &&
func_verbose "creating a temporary reloadable object file: $output"
# Loop through the commands generated above and execute them.
- save_ifs="$IFS"; IFS='~'
+ save_ifs=$IFS; IFS='~'
for cmd in $concat_cmds; do
- IFS="$save_ifs"
- $opt_silent || {
+ IFS=$save_ifs
+ $opt_quiet || {
func_quote_for_expand "$cmd"
eval "func_echo $func_quote_for_expand_result"
}
@@ -8448,7 +9949,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
@@ -8457,7 +9958,7 @@ EOF
exit $lt_exit
}
done
- IFS="$save_ifs"
+ IFS=$save_ifs
if test -n "$export_symbols_regex" && ${skipped_export-false}; then
func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
@@ -8465,18 +9966,18 @@ EOF
fi
fi
- if ${skipped_export-false}; then
+ ${skipped_export-false} && {
if test -n "$export_symbols" && test -n "$include_expsyms"; then
- tmp_export_symbols="$export_symbols"
- test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+ tmp_export_symbols=$export_symbols
+ test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
$opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
fi
if test -n "$orig_export_symbols"; then
# The given exports_symbols file has to be filtered, so filter it.
- func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+ func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
# FIXME: $output_objdir/$libname.filter potentially contains lots of
- # 's' commands which not all seds can handle. GNU sed should be fine
+ # 's' commands, which not all seds can handle. GNU sed should be fine
# though. Also, the filter scales superlinearly with the number of
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
@@ -8485,7 +9986,7 @@ EOF
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
- fi
+ }
libobjs=$output
# Restore the value of output.
@@ -8499,7 +10000,7 @@ EOF
# value of $libobjs for piecewise linking.
# Do each of the archive commands.
- if test "$module" = yes && test -n "$module_cmds" ; then
+ if test yes = "$module" && test -n "$module_cmds"; then
if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
cmds=$module_expsym_cmds
else
@@ -8521,7 +10022,7 @@ EOF
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $dlprefiles
@@ -8529,11 +10030,12 @@ EOF
test "X$libobjs" = "X " && libobjs=
fi
- save_ifs="$IFS"; IFS='~'
+ save_ifs=$IFS; IFS='~'
for cmd in $cmds; do
- IFS="$save_ifs"
+ IFS=$sp$nl
eval cmd=\"$cmd\"
- $opt_silent || {
+ IFS=$save_ifs
+ $opt_quiet || {
func_quote_for_expand "$cmd"
eval "func_echo $func_quote_for_expand_result"
}
@@ -8541,7 +10043,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
@@ -8550,10 +10052,10 @@ EOF
exit $lt_exit
}
done
- IFS="$save_ifs"
+ IFS=$save_ifs
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
if test -n "$convenience"; then
@@ -8573,39 +10075,39 @@ EOF
done
# If -module or -export-dynamic was specified, set the dlname.
- if test "$module" = yes || test "$export_dynamic" = yes; then
+ if test yes = "$module" || test yes = "$export_dynamic"; then
# On all known operating systems, these are identical.
- dlname="$soname"
+ dlname=$soname
fi
fi
;;
obj)
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- func_warning "\`-dlopen' is ignored for objects"
+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+ func_warning "'-dlopen' is ignored for objects"
fi
case " $deplibs" in
*\ -l* | *\ -L*)
- func_warning "\`-l' and \`-L' are ignored for objects" ;;
+ func_warning "'-l' and '-L' are ignored for objects" ;;
esac
test -n "$rpath" && \
- func_warning "\`-rpath' is ignored for objects"
+ func_warning "'-rpath' is ignored for objects"
test -n "$xrpath" && \
- func_warning "\`-R' is ignored for objects"
+ func_warning "'-R' is ignored for objects"
test -n "$vinfo" && \
- func_warning "\`-version-info' is ignored for objects"
+ func_warning "'-version-info' is ignored for objects"
test -n "$release" && \
- func_warning "\`-release' is ignored for objects"
+ func_warning "'-release' is ignored for objects"
case $output in
*.lo)
test -n "$objs$old_deplibs" && \
- func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+ func_fatal_error "cannot build library object '$output' from non-libtool objects"
libobj=$output
func_lo2o "$libobj"
@@ -8613,7 +10115,7 @@ EOF
;;
*)
libobj=
- obj="$output"
+ obj=$output
;;
esac
@@ -8626,17 +10128,19 @@ EOF
# the extraction.
reload_conv_objs=
gentop=
- # reload_cmds runs $LD directly, so let us get rid of
- # -Wl from whole_archive_flag_spec and hope we can get by with
- # turning comma into space..
- wl=
-
+ # if reload_cmds runs $LD directly, get rid of -Wl from
+ # whole_archive_flag_spec and hope we can get by with turning comma
+ # into space.
+ case $reload_cmds in
+ *\$LD[\ \$]*) wl= ;;
+ esac
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
- reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+ test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+ reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
else
- gentop="$output_objdir/${obj}x"
+ gentop=$output_objdir/${obj}x
func_append generated " $gentop"
func_extract_archives $gentop $convenience
@@ -8645,12 +10149,12 @@ EOF
fi
# If we're not building shared, we need to use non_pic_objs
- test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+ test yes = "$build_libtool_libs" || libobjs=$non_pic_objects
# Create the old-style object.
- reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+ reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
- output="$obj"
+ output=$obj
func_execute_cmds "$reload_cmds" 'exit $?'
# Exit if we aren't doing a library object file.
@@ -8662,7 +10166,7 @@ EOF
exit $EXIT_SUCCESS
fi
- if test "$build_libtool_libs" != yes; then
+ test yes = "$build_libtool_libs" || {
if test -n "$gentop"; then
func_show_eval '${RM}r "$gentop"'
fi
@@ -8672,12 +10176,12 @@ EOF
# $show "echo timestamp > $libobj"
# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
exit $EXIT_SUCCESS
- fi
+ }
- if test -n "$pic_flag" || test "$pic_mode" != default; then
+ if test -n "$pic_flag" || test default != "$pic_mode"; then
# Only do commands if we really have different PIC objects.
reload_objs="$libobjs $reload_conv_objs"
- output="$libobj"
+ output=$libobj
func_execute_cmds "$reload_cmds" 'exit $?'
fi
@@ -8694,16 +10198,14 @@ EOF
output=$func_stripname_result.exe;;
esac
test -n "$vinfo" && \
- func_warning "\`-version-info' is ignored for programs"
+ func_warning "'-version-info' is ignored for programs"
test -n "$release" && \
- func_warning "\`-release' is ignored for programs"
+ func_warning "'-release' is ignored for programs"
- test "$preload" = yes \
- && test "$dlopen_support" = unknown \
- && test "$dlopen_self" = unknown \
- && test "$dlopen_self_static" = unknown && \
- func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
+ $preload \
+ && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \
+ && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support."
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
@@ -8717,11 +10219,11 @@ EOF
*-*-darwin*)
# Don't allow lazy linking, it breaks C++ global constructors
# But is supposedly fixed on 10.4 or later (yay!).
- if test "$tagname" = CXX ; then
+ if test CXX = "$tagname"; then
case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
10.[0123])
- func_append compile_command " ${wl}-bind_at_load"
- func_append finalize_command " ${wl}-bind_at_load"
+ func_append compile_command " $wl-bind_at_load"
+ func_append finalize_command " $wl-bind_at_load"
;;
esac
fi
@@ -8757,7 +10259,7 @@ EOF
*) func_append new_libs " $deplib" ;;
esac
done
- compile_deplibs="$new_libs"
+ compile_deplibs=$new_libs
func_append compile_command " $compile_deplibs"
@@ -8781,7 +10283,7 @@ EOF
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
if test -z "$hardcode_libdirs"; then
- hardcode_libdirs="$libdir"
+ hardcode_libdirs=$libdir
else
# Just accumulate the unique libdirs.
case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8804,7 +10306,7 @@ EOF
fi
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
- testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+ testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$libdir:"*) ;;
::) dllsearchpath=$libdir;;
@@ -8821,10 +10323,10 @@ EOF
# Substitute the hardcoded libdirs into the rpath.
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
+ libdir=$hardcode_libdirs
eval rpath=\" $hardcode_libdir_flag_spec\"
fi
- compile_rpath="$rpath"
+ compile_rpath=$rpath
rpath=
hardcode_libdirs=
@@ -8832,7 +10334,7 @@ EOF
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
if test -z "$hardcode_libdirs"; then
- hardcode_libdirs="$libdir"
+ hardcode_libdirs=$libdir
else
# Just accumulate the unique libdirs.
case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8857,45 +10359,43 @@ EOF
# Substitute the hardcoded libdirs into the rpath.
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
+ libdir=$hardcode_libdirs
eval rpath=\" $hardcode_libdir_flag_spec\"
fi
- finalize_rpath="$rpath"
+ finalize_rpath=$rpath
- if test -n "$libobjs" && test "$build_old_libs" = yes; then
+ if test -n "$libobjs" && test yes = "$build_old_libs"; then
# Transform all the library objects into standard objects.
compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
fi
- func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+ func_generate_dlsyms "$outputname" "@PROGRAM@" false
# template prelinking step
if test -n "$prelink_cmds"; then
func_execute_cmds "$prelink_cmds" 'exit $?'
fi
- wrappers_required=yes
+ wrappers_required=:
case $host in
*cegcc* | *mingw32ce*)
# Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
- wrappers_required=no
+ wrappers_required=false
;;
*cygwin* | *mingw* )
- if test "$build_libtool_libs" != yes; then
- wrappers_required=no
- fi
+ test yes = "$build_libtool_libs" || wrappers_required=false
;;
*)
- if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
- wrappers_required=no
+ if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
+ wrappers_required=false
fi
;;
esac
- if test "$wrappers_required" = no; then
+ $wrappers_required || {
# Replace the output file specification.
compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
- link_command="$compile_command$compile_rpath"
+ link_command=$compile_command$compile_rpath
# We have no uninstalled library dependencies, so finalize right now.
exit_status=0
@@ -8908,12 +10408,12 @@ EOF
fi
# Delete the generated files.
- if test -f "$output_objdir/${outputname}S.${objext}"; then
- func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+ if test -f "$output_objdir/${outputname}S.$objext"; then
+ func_show_eval '$RM "$output_objdir/${outputname}S.$objext"'
fi
exit $exit_status
- fi
+ }
if test -n "$compile_shlibpath$finalize_shlibpath"; then
compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
@@ -8943,9 +10443,9 @@ EOF
fi
fi
- if test "$no_install" = yes; then
+ if test yes = "$no_install"; then
# We don't need to create a wrapper script.
- link_command="$compile_var$compile_command$compile_rpath"
+ link_command=$compile_var$compile_command$compile_rpath
# Replace the output file specification.
link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
# Delete the old output file.
@@ -8962,27 +10462,28 @@ EOF
exit $EXIT_SUCCESS
fi
- if test "$hardcode_action" = relink; then
- # Fast installation is not supported
- link_command="$compile_var$compile_command$compile_rpath"
- relink_command="$finalize_var$finalize_command$finalize_rpath"
+ case $hardcode_action,$fast_install in
+ relink,*)
+ # Fast installation is not supported
+ link_command=$compile_var$compile_command$compile_rpath
+ relink_command=$finalize_var$finalize_command$finalize_rpath
- func_warning "this platform does not like uninstalled shared libraries"
- func_warning "\`$output' will be relinked during installation"
- else
- if test "$fast_install" != no; then
- link_command="$finalize_var$compile_command$finalize_rpath"
- if test "$fast_install" = yes; then
- relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
- else
- # fast_install is set to needless
- relink_command=
- fi
- else
- link_command="$compile_var$compile_command$compile_rpath"
- relink_command="$finalize_var$finalize_command$finalize_rpath"
- fi
- fi
+ func_warning "this platform does not like uninstalled shared libraries"
+ func_warning "'$output' will be relinked during installation"
+ ;;
+ *,yes)
+ link_command=$finalize_var$compile_command$finalize_rpath
+ relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+ ;;
+ *,no)
+ link_command=$compile_var$compile_command$compile_rpath
+ relink_command=$finalize_var$finalize_command$finalize_rpath
+ ;;
+ *,needless)
+ link_command=$finalize_var$compile_command$finalize_rpath
+ relink_command=
+ ;;
+ esac
# Replace the output file specification.
link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
@@ -9039,8 +10540,8 @@ EOF
func_dirname_and_basename "$output" "" "."
output_name=$func_basename_result
output_path=$func_dirname_result
- cwrappersource="$output_path/$objdir/lt-$output_name.c"
- cwrapper="$output_path/$output_name.exe"
+ cwrappersource=$output_path/$objdir/lt-$output_name.c
+ cwrapper=$output_path/$output_name.exe
$RM $cwrappersource $cwrapper
trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
@@ -9061,7 +10562,7 @@ EOF
trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
$opt_dry_run || {
# note: this script will not be executed, so do not chmod.
- if test "x$build" = "x$host" ; then
+ if test "x$build" = "x$host"; then
$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
else
func_emit_wrapper no > $func_ltwrapper_scriptname_result
@@ -9084,25 +10585,27 @@ EOF
# See if we need to build an old-fashioned archive.
for oldlib in $oldlibs; do
- if test "$build_libtool_libs" = convenience; then
- oldobjs="$libobjs_save $symfileobj"
- addlibs="$convenience"
- build_libtool_libs=no
- else
- if test "$build_libtool_libs" = module; then
- oldobjs="$libobjs_save"
+ case $build_libtool_libs in
+ convenience)
+ oldobjs="$libobjs_save $symfileobj"
+ addlibs=$convenience
build_libtool_libs=no
- else
+ ;;
+ module)
+ oldobjs=$libobjs_save
+ addlibs=$old_convenience
+ build_libtool_libs=no
+ ;;
+ *)
oldobjs="$old_deplibs $non_pic_objects"
- if test "$preload" = yes && test -f "$symfileobj"; then
- func_append oldobjs " $symfileobj"
- fi
- fi
- addlibs="$old_convenience"
- fi
+ $preload && test -f "$symfileobj" \
+ && func_append oldobjs " $symfileobj"
+ addlibs=$old_convenience
+ ;;
+ esac
if test -n "$addlibs"; then
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $addlibs
@@ -9110,13 +10613,13 @@ EOF
fi
# Do each command in the archive commands.
- if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+ if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then
cmds=$old_archive_from_new_cmds
else
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $dlprefiles
@@ -9137,7 +10640,7 @@ EOF
:
else
echo "copying selected object files to avoid basename conflicts..."
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_mkdir_p "$gentop"
save_oldobjs=$oldobjs
@@ -9146,7 +10649,7 @@ EOF
for obj in $save_oldobjs
do
func_basename "$obj"
- objbase="$func_basename_result"
+ objbase=$func_basename_result
case " $oldobjs " in
" ") oldobjs=$obj ;;
*[\ /]"$objbase "*)
@@ -9215,18 +10718,18 @@ EOF
else
# the above command should be used before it gets too long
oldobjs=$objlist
- if test "$obj" = "$last_oldobj" ; then
+ if test "$obj" = "$last_oldobj"; then
RANLIB=$save_RANLIB
fi
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+ eval concat_cmds=\"\$concat_cmds$old_archive_cmds\"
objlist=
len=$len0
fi
done
RANLIB=$save_RANLIB
oldobjs=$objlist
- if test "X$oldobjs" = "X" ; then
+ if test -z "$oldobjs"; then
eval cmds=\"\$concat_cmds\"
else
eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
@@ -9243,7 +10746,7 @@ EOF
case $output in
*.la)
old_library=
- test "$build_old_libs" = yes && old_library="$libname.$libext"
+ test yes = "$build_old_libs" && old_library=$libname.$libext
func_verbose "creating $output"
# Preserve any variables that may affect compiler behavior
@@ -9258,31 +10761,31 @@ EOF
fi
done
# Quote the link command for shipping.
- relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+ relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
- if test "$hardcode_automatic" = yes ; then
+ if test yes = "$hardcode_automatic"; then
relink_command=
fi
# Only create the output if not a dry run.
$opt_dry_run || {
for installed in no yes; do
- if test "$installed" = yes; then
+ if test yes = "$installed"; then
if test -z "$install_libdir"; then
break
fi
- output="$output_objdir/$outputname"i
+ output=$output_objdir/${outputname}i
# Replace all uninstalled libtool libraries with the installed ones
newdependency_libs=
for deplib in $dependency_libs; do
case $deplib in
*.la)
func_basename "$deplib"
- name="$func_basename_result"
+ name=$func_basename_result
func_resolve_sysroot "$deplib"
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
test -z "$libdir" && \
- func_fatal_error "\`$deplib' is not a valid libtool archive"
+ func_fatal_error "'$deplib' is not a valid libtool archive"
func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
;;
-L*)
@@ -9298,23 +10801,23 @@ EOF
*) func_append newdependency_libs " $deplib" ;;
esac
done
- dependency_libs="$newdependency_libs"
+ dependency_libs=$newdependency_libs
newdlfiles=
for lib in $dlfiles; do
case $lib in
*.la)
func_basename "$lib"
- name="$func_basename_result"
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ name=$func_basename_result
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
- func_fatal_error "\`$lib' is not a valid libtool archive"
+ func_fatal_error "'$lib' is not a valid libtool archive"
func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
;;
*) func_append newdlfiles " $lib" ;;
esac
done
- dlfiles="$newdlfiles"
+ dlfiles=$newdlfiles
newdlprefiles=
for lib in $dlprefiles; do
case $lib in
@@ -9324,34 +10827,34 @@ EOF
# didn't already link the preopened objects directly into
# the library:
func_basename "$lib"
- name="$func_basename_result"
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ name=$func_basename_result
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
- func_fatal_error "\`$lib' is not a valid libtool archive"
+ func_fatal_error "'$lib' is not a valid libtool archive"
func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
;;
esac
done
- dlprefiles="$newdlprefiles"
+ dlprefiles=$newdlprefiles
else
newdlfiles=
for lib in $dlfiles; do
case $lib in
- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
*) abs=`pwd`"/$lib" ;;
esac
func_append newdlfiles " $abs"
done
- dlfiles="$newdlfiles"
+ dlfiles=$newdlfiles
newdlprefiles=
for lib in $dlprefiles; do
case $lib in
- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
*) abs=`pwd`"/$lib" ;;
esac
func_append newdlprefiles " $abs"
done
- dlprefiles="$newdlprefiles"
+ dlprefiles=$newdlprefiles
fi
$RM $output
# place dlname in correct position for cygwin
@@ -9367,10 +10870,9 @@ EOF
case $host,$output,$installed,$module,$dlname in
*cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
# If a -bindir argument was supplied, place the dll there.
- if test "x$bindir" != x ;
- then
+ if test -n "$bindir"; then
func_relative_path "$install_libdir" "$bindir"
- tdlname=$func_relative_path_result$dlname
+ tdlname=$func_relative_path_result/$dlname
else
# Otherwise fall back on heuristic.
tdlname=../bin/$dlname
@@ -9379,7 +10881,7 @@ EOF
esac
$ECHO > $output "\
# $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
@@ -9393,7 +10895,7 @@ library_names='$library_names'
# The name of the static archive.
old_library='$old_library'
-# Linker flags that can not go in dependency_libs.
+# Linker flags that cannot go in dependency_libs.
inherited_linker_flags='$new_inherited_linker_flags'
# Libraries that this one depends upon.
@@ -9419,7 +10921,7 @@ dlpreopen='$dlprefiles'
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
- if test "$installed" = no && test "$need_relink" = yes; then
+ if test no,yes = "$installed,$need_relink"; then
$ECHO >> $output "\
relink_command=\"$relink_command\""
fi
@@ -9434,27 +10936,29 @@ relink_command=\"$relink_command\""
exit $EXIT_SUCCESS
}
-{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
- func_mode_link ${1+"$@"}
+if test link = "$opt_mode" || test relink = "$opt_mode"; then
+ func_mode_link ${1+"$@"}
+fi
# func_mode_uninstall arg...
func_mode_uninstall ()
{
- $opt_debug
- RM="$nonopt"
+ $debug_cmd
+
+ RM=$nonopt
files=
- rmforce=
+ rmforce=false
exit_status=0
# This variable tells wrapper scripts just to set variables rather
# than running their programs.
- libtool_install_magic="$magic"
+ libtool_install_magic=$magic
for arg
do
case $arg in
- -f) func_append RM " $arg"; rmforce=yes ;;
+ -f) func_append RM " $arg"; rmforce=: ;;
-*) func_append RM " $arg" ;;
*) func_append files " $arg" ;;
esac
@@ -9467,18 +10971,18 @@ func_mode_uninstall ()
for file in $files; do
func_dirname "$file" "" "."
- dir="$func_dirname_result"
- if test "X$dir" = X.; then
- odir="$objdir"
+ dir=$func_dirname_result
+ if test . = "$dir"; then
+ odir=$objdir
else
- odir="$dir/$objdir"
+ odir=$dir/$objdir
fi
func_basename "$file"
- name="$func_basename_result"
- test "$opt_mode" = uninstall && odir="$dir"
+ name=$func_basename_result
+ test uninstall = "$opt_mode" && odir=$dir
# Remember odir for removal later, being careful to avoid duplicates
- if test "$opt_mode" = clean; then
+ if test clean = "$opt_mode"; then
case " $rmdirs " in
*" $odir "*) ;;
*) func_append rmdirs " $odir" ;;
@@ -9493,11 +10997,11 @@ func_mode_uninstall ()
elif test -d "$file"; then
exit_status=1
continue
- elif test "$rmforce" = yes; then
+ elif $rmforce; then
continue
fi
- rmfiles="$file"
+ rmfiles=$file
case $name in
*.la)
@@ -9511,7 +11015,7 @@ func_mode_uninstall ()
done
test -n "$old_library" && func_append rmfiles " $odir/$old_library"
- case "$opt_mode" in
+ case $opt_mode in
clean)
case " $library_names " in
*" $dlname "*) ;;
@@ -9522,12 +11026,12 @@ func_mode_uninstall ()
uninstall)
if test -n "$library_names"; then
# Do each command in the postuninstall commands.
- func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+ func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1'
fi
if test -n "$old_library"; then
# Do each command in the old_postuninstall commands.
- func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+ func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1'
fi
# FIXME: should reinstall the best remaining shared library.
;;
@@ -9543,21 +11047,19 @@ func_mode_uninstall ()
func_source $dir/$name
# Add PIC object to the list of files to remove.
- if test -n "$pic_object" &&
- test "$pic_object" != none; then
+ if test -n "$pic_object" && test none != "$pic_object"; then
func_append rmfiles " $dir/$pic_object"
fi
# Add non-PIC object to the list of files to remove.
- if test -n "$non_pic_object" &&
- test "$non_pic_object" != none; then
+ if test -n "$non_pic_object" && test none != "$non_pic_object"; then
func_append rmfiles " $dir/$non_pic_object"
fi
fi
;;
*)
- if test "$opt_mode" = clean ; then
+ if test clean = "$opt_mode"; then
noexename=$name
case $file in
*.exe)
@@ -9584,12 +11086,12 @@ func_mode_uninstall ()
# note $name still contains .exe if it was in $file originally
# as does the version of $file that was added into $rmfiles
- func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
- if test "$fast_install" = yes && test -n "$relink_command"; then
+ func_append rmfiles " $odir/$name $odir/${name}S.$objext"
+ if test yes = "$fast_install" && test -n "$relink_command"; then
func_append rmfiles " $odir/lt-$name"
fi
- if test "X$noexename" != "X$name" ; then
- func_append rmfiles " $odir/lt-${noexename}.c"
+ if test "X$noexename" != "X$name"; then
+ func_append rmfiles " $odir/lt-$noexename.c"
fi
fi
fi
@@ -9598,7 +11100,7 @@ func_mode_uninstall ()
func_show_eval "$RM $rmfiles" 'exit_status=1'
done
- # Try to remove the ${objdir}s in the directories where we deleted files
+ # Try to remove the $objdir's in the directories where we deleted files
for dir in $rmdirs; do
if test -d "$dir"; then
func_show_eval "rmdir $dir >/dev/null 2>&1"
@@ -9608,16 +11110,17 @@ func_mode_uninstall ()
exit $exit_status
}
-{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
- func_mode_uninstall ${1+"$@"}
+if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
+ func_mode_uninstall ${1+"$@"}
+fi
test -z "$opt_mode" && {
- help="$generic_help"
+ help=$generic_help
func_fatal_help "you must specify a MODE"
}
test -z "$exec_cmd" && \
- func_fatal_help "invalid operation mode \`$opt_mode'"
+ func_fatal_help "invalid operation mode '$opt_mode'"
if test -n "$exec_cmd"; then
eval exec "$exec_cmd"
@@ -9628,7 +11131,7 @@ exit $exit_status
# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries. Given conflicting
+# where we disable both kinds of libraries. Given conflicting
# choices, we go for a static library, that is the most portable,
# since we can't tell whether shared libraries were disabled because
# the user asked for that or because the platform doesn't support
@@ -9651,5 +11154,3 @@ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
# mode:shell-script
# sh-indentation:2
# End:
-# vi:sw=2
-
diff --git a/config.h.in b/config.h.in
index 6a5ed73..a869113 100644
--- a/config.h.in
+++ b/config.h.in
@@ -570,8 +570,7 @@
/* Define INADDR_NONE if not found in <netinet/in.h> */
#undef INADDR_NONE
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* Build target is Darwin. */
diff --git a/configure b/configure
index cfafd00..84a2bb1 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for pulseaudio 9.0.
+# Generated by GNU Autoconf 2.69 for pulseaudio 9.99.1.
#
# Report bugs to <pulseaudio-discuss (at) lists (dot) freedesktop (dot) org>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='pulseaudio'
PACKAGE_TARNAME='pulseaudio'
-PACKAGE_VERSION='9.0'
-PACKAGE_STRING='pulseaudio 9.0'
+PACKAGE_VERSION='9.99.1'
+PACKAGE_STRING='pulseaudio 9.99.1'
PACKAGE_BUGREPORT='pulseaudio-discuss (at) lists (dot) freedesktop (dot) org'
PACKAGE_URL='http://pulseaudio.org/'
@@ -704,10 +704,6 @@ HAVE_GCOV_FALSE
HAVE_GCOV_TRUE
GCOV_LIBS
GCOV_CFLAGS
-HAVE_XEN_FALSE
-HAVE_XEN_TRUE
-XEN_LIBS
-XEN_CFLAGS
HAVE_SOXR_FALSE
HAVE_SOXR_TRUE
LIBSOXR_LIBS
@@ -824,8 +820,6 @@ LIBSAMPLERATE_LIBS
LIBSAMPLERATE_CFLAGS
LIBSNDFILE_LIBS
LIBSNDFILE_CFLAGS
-LIBJSON_LIBS
-LIBJSON_CFLAGS
HAVE_TESTS_FALSE
HAVE_TESTS_TRUE
LIBCHECK_LIBS
@@ -862,6 +856,7 @@ HAVE_AF_UNIX_TRUE
HAVE_SYS_RESOURCE_H
LIBLTDL
CXXCPP
+LT_SYS_LIBRARY_PATH
OTOOL64
OTOOL
LIPO
@@ -1037,6 +1032,7 @@ infodir
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -1073,6 +1069,7 @@ enable_static
enable_shared
with_pic
enable_fast_install
+with_aix_soname
with_sysroot
enable_libtool_lock
enable_largefile
@@ -1109,7 +1106,6 @@ enable_openssl
with_fftw
with_speex
with_soxr
-enable_xen
enable_gcov
enable_orc
enable_systemd_daemon
@@ -1151,13 +1147,12 @@ CPP
PKG_CONFIG
PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
+LT_SYS_LIBRARY_PATH
CXXCPP
X11_CFLAGS
X11_LIBS
LIBCHECK_CFLAGS
LIBCHECK_LIBS
-LIBJSON_CFLAGS
-LIBJSON_LIBS
LIBSNDFILE_CFLAGS
LIBSNDFILE_LIBS
LIBSAMPLERATE_CFLAGS
@@ -1244,6 +1239,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1496,6 +1492,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1633,7 +1638,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+ libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1746,7 +1751,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures pulseaudio 9.0 to adapt to many kinds of systems.
+\`configure' configures pulseaudio 9.99.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1786,6 +1791,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1816,7 +1822,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of pulseaudio 9.0:";;
+ short | recursive ) echo "Configuration of pulseaudio 9.99.1:";;
esac
cat <<\_ACEOF
@@ -1878,7 +1884,6 @@ Optional Features:
support
--disable-ipv6 Disable optional IPv6 support
--disable-openssl Disable OpenSSL support (used for Airtunes/RAOP)
- --disable-xen Disable optional Xen paravirtualized driver
--enable-gcov Enable optional gcov coverage analysis
--enable-orc use Orc if installed
--disable-systemd-daemon
@@ -1911,9 +1916,12 @@ Optional Packages:
--without-libintl-prefix don't search for libintl in includedir and 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).
+ --with-sysroot[=DIR] Search for dependent libraries within DIR (or the
+ compiler's sysroot if not specified).
--without-caps Omit support for dropping capabilities.
--with-database=auto|tdb|gdbm|simple
Choose database backend.
@@ -1964,6 +1972,8 @@ Some influential environment variables:
directories to add to pkg-config's search path
PKG_CONFIG_LIBDIR
path overriding pkg-config's built-in search path
+ LT_SYS_LIBRARY_PATH
+ User-defined run-time library search path.
CXXCPP C++ preprocessor
X11_CFLAGS C compiler flags for X11, overriding pkg-config
X11_LIBS linker flags for X11, overriding pkg-config
@@ -1971,10 +1981,6 @@ Some influential environment variables:
C compiler flags for LIBCHECK, overriding pkg-config
LIBCHECK_LIBS
linker flags for LIBCHECK, overriding pkg-config
- LIBJSON_CFLAGS
- C compiler flags for LIBJSON, overriding pkg-config
- LIBJSON_LIBS
- linker flags for LIBJSON, overriding pkg-config
LIBSNDFILE_CFLAGS
C compiler flags for LIBSNDFILE, overriding pkg-config
LIBSNDFILE_LIBS
@@ -2119,7 +2125,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-pulseaudio configure 9.0
+pulseaudio configure 9.99.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2892,7 +2898,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by pulseaudio $as_me 9.0, which was
+It was created by pulseaudio $as_me 9.99.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3847,7 +3853,7 @@ fi
# Define the identity of the package.
PACKAGE='pulseaudio'
- VERSION='9.0'
+ VERSION='9.99.1'
cat >>confdefs.h <<_ACEOF
@@ -4075,12 +4081,12 @@ PA_MAJORMINOR=`echo $VERSION | cut -d. -f1 | cut -d- -f1`.`echo $VERSION | cut -
PA_API_VERSION=12
-PA_PROTOCOL_VERSION=31
+PA_PROTOCOL_VERSION=32
# The stable ABI for client applications, for the version info x:y:z
# always will hold y=z
-LIBPULSE_VERSION_INFO=20:0:20
+LIBPULSE_VERSION_INFO=20:1:20
# A simplified, synchronous, ABI-stable interface for client
@@ -5708,7 +5714,7 @@ fi
- ax_cxx_compile_cxx11_required=true
+ ax_cxx_compile_cxx11_required=false
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -6340,323 +6346,7 @@ $as_echo "$ac_res" >&6; }
done
fi
- if test x$ac_success = xno; then
- for switch in -std=c++11 -std=c++0x +std=c++11 "-h std=c++11"; do
- cachevar=`$as_echo "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5
-$as_echo_n "checking whether $CXX supports C++11 features with $switch... " >&6; }
-if eval \${$cachevar+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS $switch"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-
-// If the compiler admits that it is not ready for C++11, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201103L
-
-#error "This is not a C++11 compiler"
-
-#else
-
-namespace cxx11
-{
-
- namespace test_static_assert
- {
-
- template <typename T>
- struct check
- {
- static_assert(sizeof(int) <= sizeof(T), "not big enough");
- };
-
- }
-
- namespace test_final_override
- {
-
- struct Base
- {
- virtual void f() {}
- };
-
- struct Derived : public Base
- {
- virtual void f() override {}
- };
-
- }
-
- namespace test_double_right_angle_brackets
- {
-
- template < typename T >
- struct check {};
-
- typedef check<void> single_type;
- typedef check<check<void>> double_type;
- typedef check<check<check<void>>> triple_type;
- typedef check<check<check<check<void>>>> quadruple_type;
-
- }
-
- namespace test_decltype
- {
-
- int
- f()
- {
- int a = 1;
- decltype(a) b = 2;
- return a + b;
- }
-
- }
-
- namespace test_type_deduction
- {
-
- template < typename T1, typename T2 >
- struct is_same
- {
- static const bool value = false;
- };
-
- template < typename T >
- struct is_same<T, T>
- {
- static const bool value = true;
- };
-
- template < typename T1, typename T2 >
- auto
- add(T1 a1, T2 a2) -> decltype(a1 + a2)
- {
- return a1 + a2;
- }
-
- int
- test(const int c, volatile int v)
- {
- static_assert(is_same<int, decltype(0)>::value == true, "");
- static_assert(is_same<int, decltype(c)>::value == false, "");
- static_assert(is_same<int, decltype(v)>::value == false, "");
- auto ac = c;
- auto av = v;
- auto sumi = ac + av + 'x';
- auto sumf = ac + av + 1.0;
- static_assert(is_same<int, decltype(ac)>::value == true, "");
- static_assert(is_same<int, decltype(av)>::value == true, "");
- static_assert(is_same<int, decltype(sumi)>::value == true, "");
- static_assert(is_same<int, decltype(sumf)>::value == false, "");
- static_assert(is_same<int, decltype(add(c, v))>::value == true, "");
- return (sumf > 0.0) ? sumi : add(c, v);
- }
-
- }
-
- namespace test_noexcept
- {
-
- int f() { return 0; }
- int g() noexcept { return 0; }
-
- static_assert(noexcept(f()) == false, "");
- static_assert(noexcept(g()) == true, "");
-
- }
-
- namespace test_constexpr
- {
-
- template < typename CharT >
- unsigned long constexpr
- strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
- {
- return *s ? strlen_c_r(s + 1, acc + 1) : acc;
- }
-
- template < typename CharT >
- unsigned long constexpr
- strlen_c(const CharT *const s) noexcept
- {
- return strlen_c_r(s, 0UL);
- }
-
- static_assert(strlen_c("") == 0UL, "");
- static_assert(strlen_c("1") == 1UL, "");
- static_assert(strlen_c("example") == 7UL, "");
- static_assert(strlen_c("another\0example") == 7UL, "");
-
- }
-
- namespace test_rvalue_references
- {
-
- template < int N >
- struct answer
- {
- static constexpr int value = N;
- };
- answer<1> f(int&) { return answer<1>(); }
- answer<2> f(const int&) { return answer<2>(); }
- answer<3> f(int&&) { return answer<3>(); }
-
- void
- test()
- {
- int i = 0;
- const int c = 0;
- static_assert(decltype(f(i))::value == 1, "");
- static_assert(decltype(f(c))::value == 2, "");
- static_assert(decltype(f(0))::value == 3, "");
- }
-
- }
-
- namespace test_uniform_initialization
- {
-
- struct test
- {
- static const int zero {};
- static const int one {1};
- };
-
- static_assert(test::zero == 0, "");
- static_assert(test::one == 1, "");
-
- }
-
- namespace test_lambdas
- {
-
- void
- test1()
- {
- auto lambda1 = [](){};
- auto lambda2 = lambda1;
- lambda1();
- lambda2();
- }
-
- int
- test2()
- {
- auto a = [](int i, int j){ return i + j; }(1, 2);
- auto b = []() -> int { return '0'; }();
- auto c = [=](){ return a + b; }();
- auto d = [&](){ return c; }();
- auto e = [a, &b](int x) mutable {
- const auto identity = [](int y){ return y; };
- for (auto i = 0; i < a; ++i)
- a += b--;
- return x + identity(a + b);
- }(0);
- return a + b + c + d + e;
- }
-
- int
- test3()
- {
- const auto nullary = [](){ return 0; };
- const auto unary = [](int x){ return x; };
- using nullary_t = decltype(nullary);
- using unary_t = decltype(unary);
- const auto higher1st = [](nullary_t f){ return f(); };
- const auto higher2nd = [unary](nullary_t f1){
- return [unary, f1](unary_t f2){ return f2(unary(f1())); };
- };
- return higher1st(nullary) + higher2nd(nullary)(unary);
- }
-
- }
-
- namespace test_variadic_templates
- {
-
- template <int...>
- struct sum;
-
- template <int N0, int... N1toN>
- struct sum<N0, N1toN...>
- {
- static constexpr auto value = N0 + sum<N1toN...>::value;
- };
-
- template <>
- struct sum<>
- {
- static constexpr auto value = 0;
- };
-
- static_assert(sum<>::value == 0, "");
- static_assert(sum<1>::value == 1, "");
- static_assert(sum<23>::value == 23, "");
- static_assert(sum<1, 2>::value == 3, "");
- static_assert(sum<5, 5, 11>::value == 21, "");
- static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
-
- }
-
- // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
- // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
- // because of this.
- namespace test_template_alias_sfinae
- {
-
- struct foo {};
-
- template<typename T>
- using member = typename T::member_type;
-
- template<typename T>
- void func(...) {}
-
- template<typename T>
- void func(member<T>*) {}
-
- void test();
-
- void test() { func<foo>(0); }
-
- }
-
-} // namespace cxx11
-
-#endif // __cplusplus >= 201103L
-
-
-
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- eval $cachevar=yes
-else
- eval $cachevar=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CXXFLAGS="$ac_save_CXXFLAGS"
-fi
-eval ac_res=\$$cachevar
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- if eval test x\$$cachevar = xyes; then
- CXXFLAGS="$CXXFLAGS $switch"
- ac_success=yes
- break
- fi
- done
- fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -10656,8 +10346,8 @@ esac
-macro_version='2.4.2'
-macro_revision='1.3337'
+macro_version='2.4.6'
+macro_revision='2.4.6'
@@ -10671,7 +10361,7 @@ macro_revision='1.3337'
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
# Backslashify metacharacters that are still active within
# double-quoted strings.
@@ -10720,7 +10410,7 @@ func_echo_all ()
$ECHO ""
}
-case "$ECHO" in
+case $ECHO in
printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
$as_echo "printf" >&6; } ;;
print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
@@ -10913,19 +10603,19 @@ test -z "$GREP" && GREP=grep
# Check whether --with-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then :
- withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+ withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
else
with_gnu_ld=no
fi
ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
# Check if gcc -print-prog-name=ld gives a path.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
+ # gcc leaves a trailing carriage return, which upsets mingw
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
*)
ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -10939,7 +10629,7 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
done
- test -z "$LD" && LD="$ac_prog"
+ test -z "$LD" && LD=$ac_prog
;;
"")
# If it fails, then pretend we aren't using GCC.
@@ -10950,7 +10640,7 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
with_gnu_ld=unknown
;;
esac
-elif test "$with_gnu_ld" = yes; then
+elif test yes = "$with_gnu_ld"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
$as_echo_n "checking for GNU ld... " >&6; }
else
@@ -10961,32 +10651,32 @@ if ${lt_cv_path_LD+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
+ lt_cv_path_LD=$ac_dir/$ac_prog
# Check to see if the program is GNU ld. I'd rather use --version,
# but apparently some variants of GNU ld only accept -v.
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break
+ test no != "$with_gnu_ld" && break
;;
*)
- test "$with_gnu_ld" != yes && break
+ test yes != "$with_gnu_ld" && break
;;
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ lt_cv_path_LD=$LD # Let the user override the test with a path.
fi
fi
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
if test -n "$LD"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
$as_echo "$LD" >&6; }
@@ -11029,33 +10719,38 @@ if ${lt_cv_path_NM+:} false; then :
else
if test -n "$NM"; then
# Let the user override the test.
- lt_cv_path_NM="$NM"
+ lt_cv_path_NM=$NM
else
- lt_nm_to_check="${ac_tool_prefix}nm"
+ lt_nm_to_check=${ac_tool_prefix}nm
if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
lt_nm_to_check="$lt_nm_to_check nm"
fi
for lt_tmp_nm in $lt_nm_to_check; do
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- tmp_nm="$ac_dir/$lt_tmp_nm"
- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+ tmp_nm=$ac_dir/$lt_tmp_nm
+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
# Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # Adding the 'sed 1q' prevents false positives on HP-UX, which says:
# nm: unknown option "B" ignored
# Tru64's nm complains that /dev/null is an invalid object file
- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
- */dev/null* | *'Invalid file or object type'*)
+ # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+ case $build_os in
+ mingw*) lt_bad_file=conftest.nm/nofile ;;
+ *) lt_bad_file=/dev/null ;;
+ esac
+ case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+ *$lt_bad_file* | *'Invalid file or object type'*)
lt_cv_path_NM="$tmp_nm -B"
- break
+ break 2
;;
*)
case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
*/dev/null*)
lt_cv_path_NM="$tmp_nm -p"
- break
+ break 2
;;
*)
lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
@@ -11066,15 +10761,15 @@ else
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
done
: ${lt_cv_path_NM=no}
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
$as_echo "$lt_cv_path_NM" >&6; }
-if test "$lt_cv_path_NM" != "no"; then
- NM="$lt_cv_path_NM"
+if test no != "$lt_cv_path_NM"; then
+ NM=$lt_cv_path_NM
else
# Didn't find any BSD compatible name lister, look for dumpbin.
if test -n "$DUMPBIN"; then :
@@ -11180,9 +10875,9 @@ esac
fi
fi
- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+ case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
*COFF*)
- DUMPBIN="$DUMPBIN -symbols"
+ DUMPBIN="$DUMPBIN -symbols -headers"
;;
*)
DUMPBIN=:
@@ -11190,8 +10885,8 @@ fi
esac
fi
- if test "$DUMPBIN" != ":"; then
- NM="$DUMPBIN"
+ if test : != "$DUMPBIN"; then
+ NM=$DUMPBIN
fi
fi
test -z "$NM" && NM=nm
@@ -11231,7 +10926,7 @@ if ${lt_cv_sys_max_cmd_len+:} false; then :
$as_echo_n "(cached) " >&6
else
i=0
- teststring="ABCD"
+ teststring=ABCD
case $build_os in
msdosdjgpp*)
@@ -11271,7 +10966,7 @@ else
lt_cv_sys_max_cmd_len=8192;
;;
- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
# This has been around since 386BSD, at least. Likely further.
if test -x /sbin/sysctl; then
lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -11321,22 +11016,23 @@ else
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len" && \
+ test undefined != "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
# Make teststring a little bigger before we do anything with it.
# a 1K string should be a reasonable start.
- for i in 1 2 3 4 5 6 7 8 ; do
+ for i in 1 2 3 4 5 6 7 8; do
teststring=$teststring$teststring
done
SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+ while { test X`env echo "$teststring$teststring" 2>/dev/null` \
= "X$teststring$teststring"; } >/dev/null 2>&1 &&
- test $i != 17 # 1/2 MB should be enough
+ test 17 != "$i" # 1/2 MB should be enough
do
i=`expr $i + 1`
teststring=$teststring$teststring
@@ -11354,7 +11050,7 @@ else
fi
-if test -n $lt_cv_sys_max_cmd_len ; then
+if test -n "$lt_cv_sys_max_cmd_len"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
else
@@ -11372,30 +11068,6 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
: ${MV="mv -f"}
: ${RM="rm -f"}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
- test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
- = c,a/b,b/c, \
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-$as_echo "$xsi_shell" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
- >/dev/null 2>&1 \
- && lt_shell_append=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-$as_echo "$lt_shell_append" >&6; }
-
-
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
lt_unset=unset
else
@@ -11518,13 +11190,13 @@ esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
- if test "$GCC" != yes; then
+ if test yes != "$GCC"; then
reload_cmds=false
fi
;;
darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+ if test yes = "$GCC"; then
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
else
reload_cmds='$LD$reload_flag -o $output$reload_objs'
fi
@@ -11649,13 +11321,13 @@ lt_cv_deplibs_check_method='unknown'
# Need to set the preceding variable on all platforms that support
# interlibrary dependencies.
# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
+# 'unknown' -- same as none, but documents that we really don't know.
# 'pass_all' -- all dependencies passed with no checks.
# 'test_compile' -- check by making test program.
# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
case $host_os in
aix[4-9]*)
@@ -11682,8 +11354,7 @@ mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+ if ( file / ) >/dev/null 2>&1; then
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else
@@ -11719,10 +11390,6 @@ freebsd* | dragonfly*)
fi
;;
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -11761,11 +11428,11 @@ irix5* | irix6* | nonstopux*)
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
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
@@ -11783,8 +11450,8 @@ newos6*)
lt_cv_deplibs_check_method=pass_all
;;
-openbsd*)
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+openbsd* | bitrig*)
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
else
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
@@ -11837,6 +11504,9 @@ sysv4 | sysv4.3*)
tpf*)
lt_cv_deplibs_check_method=pass_all
;;
+os2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
esac
fi
@@ -11991,8 +11661,8 @@ else
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
- # two different shell functions defined in ltmain.sh
- # decide which to use based on capabilities of $DLLTOOL
+ # two different shell functions defined in ltmain.sh;
+ # decide which one to use based on capabilities of $DLLTOOL
case `$DLLTOOL --help 2>&1` in
*--identify-strict*)
lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
@@ -12004,7 +11674,7 @@ cygwin* | mingw* | pw32* | cegcc*)
;;
*)
# fallback: assume linklib IS sharedlib
- lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+ lt_cv_sharedlib_from_linklib_cmd=$ECHO
;;
esac
@@ -12158,7 +11828,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- if test "$ac_status" -eq 0; then
+ if test 0 -eq "$ac_status"; then
# Ensure the archiver fails upon bogus file names.
rm -f conftest.$ac_objext libconftest.a
{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
@@ -12166,7 +11836,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- if test "$ac_status" -ne 0; then
+ if test 0 -ne "$ac_status"; then
lt_cv_ar_at_file=@
fi
fi
@@ -12179,7 +11849,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
$as_echo "$lt_cv_ar_at_file" >&6; }
-if test "x$lt_cv_ar_at_file" = xno; then
+if test no = "$lt_cv_ar_at_file"; then
archiver_list_spec=
else
archiver_list_spec=$lt_cv_ar_at_file
@@ -12396,7 +12066,7 @@ old_postuninstall_cmds=
if test -n "$RANLIB"; then
case $host_os in
- openbsd*)
+ bitrig* | openbsd*)
old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
;;
*)
@@ -12486,7 +12156,7 @@ cygwin* | mingw* | pw32* | cegcc*)
symcode='[ABCDGISTW]'
;;
hpux*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
symcode='[ABCDEGRST]'
fi
;;
@@ -12519,14 +12189,44 @@ case `$NM -V 2>&1` in
symcode='[ABCDGIRSTW]' ;;
esac
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ # Gets list of data symbols to import.
+ lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+ # Adjust the below global symbol transforms to fixup imported variables.
+ lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+ lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'"
+ lt_c_name_lib_hook="\
+ -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\
+ -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'"
+else
+ # Disable hooks by default.
+ lt_cv_sys_global_symbol_to_import=
+ lt_cdecl_hook=
+ lt_c_name_hook=
+ lt_c_name_lib_hook=
+fi
+
# Transform an extracted symbol line into a proper C declaration.
# Some systems (esp. on ia64) link data and code symbols differently,
# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'"
# Handle CRLF in mingw tool chain
opt_cr=
@@ -12544,21 +12244,24 @@ for ac_symprfx in "" "_"; do
# Write the raw and C identifiers.
if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- # Fake it for dumpbin and say T for any non-static function
- # and D for any global variable.
+ # Fake it for dumpbin and say T for any non-static function,
+ # D for any global variable and I for any imported variable.
# Also find C++ and __fastcall symbols from MSVC++,
# which start with @ or ?.
lt_cv_sys_global_symbol_pipe="$AWK '"\
" {last_section=section; section=\$ 3};"\
" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
" \$ 0!~/External *\|/{next};"\
" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
" {if(hide[section]) next};"\
-" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-" s[1]~/^[@?]/{print s[1], s[1]; next};"\
-" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
" ' prfx=^$ac_symprfx"
else
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
@@ -12606,11 +12309,11 @@ _LT_EOF
if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
cat <<_LT_EOF > conftest.$ac_ext
/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
relocations are performed -- see ld's documentation on pseudo-relocs. */
# define LT_DLSYM_CONST
-#elif defined(__osf__)
+#elif defined __osf__
/* This system does not cope well with relocations in const data. */
# define LT_DLSYM_CONST
#else
@@ -12636,7 +12339,7 @@ lt__PROGRAM__LTX_preloaded_symbols[] =
{
{ "@PROGRAM@", (void *) 0 },
_LT_EOF
- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+ $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
cat <<\_LT_EOF >> conftest.$ac_ext
{0, (void *) 0}
};
@@ -12656,13 +12359,13 @@ _LT_EOF
mv conftest.$ac_objext conftstm.$ac_objext
lt_globsym_save_LIBS=$LIBS
lt_globsym_save_CFLAGS=$CFLAGS
- LIBS="conftstm.$ac_objext"
+ LIBS=conftstm.$ac_objext
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
(eval $ac_link) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && test -s conftest${ac_exeext}; then
+ test $ac_status = 0; } && test -s conftest$ac_exeext; then
pipe_works=yes
fi
LIBS=$lt_globsym_save_LIBS
@@ -12683,7 +12386,7 @@ _LT_EOF
rm -rf conftest* conftst*
# Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
+ if test yes = "$pipe_works"; then
break
else
lt_cv_sys_global_symbol_pipe=
@@ -12736,6 +12439,16 @@ fi
+
+
+
+
+
+
+
+
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
$as_echo_n "checking for sysroot... " >&6; }
@@ -12748,9 +12461,9 @@ fi
lt_sysroot=
-case ${with_sysroot} in #(
+case $with_sysroot in #(
yes)
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
lt_sysroot=`$CC --print-sysroot 2>/dev/null`
fi
;; #(
@@ -12760,8 +12473,8 @@ case ${with_sysroot} in #(
no|'')
;; #(
*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
-$as_echo "${with_sysroot}" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+$as_echo "$with_sysroot" >&6; }
as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
;;
esac
@@ -12773,18 +12486,99 @@ $as_echo "${lt_sysroot:-no}" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+$as_echo_n "checking for a working dd... " >&6; }
+if ${ac_cv_path_lt_DD+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+if test -z "$lt_DD"; then
+ ac_path_lt_DD_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in dd; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
+ as_fn_executable_p "$ac_path_lt_DD" || continue
+if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+ cmp -s conftest.i conftest.out \
+ && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi
+ $ac_path_lt_DD_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_lt_DD"; then
+ :
+ fi
+else
+ ac_cv_path_lt_DD=$lt_DD
+fi
+
+rm -f conftest.i conftest2.i conftest.out
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+$as_echo "$ac_cv_path_lt_DD" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+$as_echo_n "checking how to truncate binary pipes... " >&6; }
+if ${lt_cv_truncate_bin+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ 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
+ cmp -s conftest.i conftest.out \
+ && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+$as_echo "$lt_cv_truncate_bin" >&6; }
+
+
+
+
+
+
+
+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+ for cc_temp in $*""; do
+ case $cc_temp in
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+ done
+ func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
# Check whether --enable-libtool-lock was given.
if test "${enable_libtool_lock+set}" = set; then :
enableval=$enable_libtool_lock;
fi
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
# libtool support.
case $host in
ia64-*-hpux*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set mode
+ # options accordingly.
echo 'int i;' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
@@ -12793,24 +12587,25 @@ ia64-*-hpux*)
test $ac_status = 0; }; then
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
- HPUX_IA64_MODE="32"
+ HPUX_IA64_MODE=32
;;
*ELF-64*)
- HPUX_IA64_MODE="64"
+ HPUX_IA64_MODE=64
;;
esac
fi
rm -rf conftest*
;;
*-*-irix6*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
echo '#line '$LINENO' "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- if test "$lt_cv_prog_gnu_ld" = yes; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
LD="${LD-ld} -melf32bsmip"
@@ -12839,9 +12634,50 @@ ia64-*-hpux*)
rm -rf conftest*
;;
+mips64*-*linux*)
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
+ echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ emul=elf
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ emul="${emul}32"
+ ;;
+ *64-bit*)
+ emul="${emul}64"
+ ;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *MSB*)
+ emul="${emul}btsmip"
+ ;;
+ *LSB*)
+ emul="${emul}ltsmip"
+ ;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *N32*)
+ emul="${emul}n32"
+ ;;
+ esac
+ LD="${LD-ld} -m $emul"
+ fi
+ rm -rf conftest*
+ ;;
+
x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly. Note that the listed cases only cover the
+ # situations where additional linker options are needed (such as when
+ # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+ # vice versa); the common cases where no linker options are needed do
+ # not appear in the list.
echo 'int i;' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
@@ -12855,7 +12691,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
+ case `/usr/bin/file conftest.o` in
+ *x86-64*)
+ LD="${LD-ld} -m elf32_x86_64"
+ ;;
+ *)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+ esac
;;
powerpc64le-*linux*)
LD="${LD-ld} -m elf32lppclinux"
@@ -12900,7 +12743,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
*-*-sco3.2v5*)
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
+ SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -belf"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
@@ -12940,13 +12783,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
$as_echo "$lt_cv_cc_needs_belf" >&6; }
- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ if test yes != "$lt_cv_cc_needs_belf"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
+ CFLAGS=$SAVE_CFLAGS
fi
;;
*-*solaris*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
echo 'int i;' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
@@ -12958,7 +12802,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
case $lt_cv_prog_gnu_ld in
yes*)
case $host in
- i?86-*-solaris*)
+ i?86-*-solaris*|x86_64-*-solaris*)
LD="${LD-ld} -m elf_x86_64"
;;
sparc*-*-solaris*)
@@ -12967,7 +12811,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
esac
# GNU ld 2.21 introduced _sol2 emulations. Use them if available.
if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
- LD="${LD-ld}_sol2"
+ LD=${LD-ld}_sol2
fi
;;
*)
@@ -12983,7 +12827,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
;;
esac
-need_locks="$enable_libtool_lock"
+need_locks=$enable_libtool_lock
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
@@ -13094,7 +12938,7 @@ else
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
$as_echo "$lt_cv_path_mainfest_tool" >&6; }
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
+if test yes != "$lt_cv_path_mainfest_tool"; then
MANIFEST_TOOL=:
fi
@@ -13597,7 +13441,7 @@ if ${lt_cv_apple_cc_single_mod+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
- if test -z "${LT_MULTI_MODULE}"; then
+ if test -z "$LT_MULTI_MODULE"; then
# By default we will add the -single_module flag. You can override
# by either setting the environment variable LT_MULTI_MODULE
# non-empty at configure time, or by adding -multi_module to the
@@ -13615,7 +13459,7 @@ else
cat conftest.err >&5
# Otherwise, if the output was created with a 0 exit code from
# the compiler, it worked.
- elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+ elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
lt_cv_apple_cc_single_mod=yes
else
cat conftest.err >&5
@@ -13654,7 +13498,7 @@ else
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
@@ -13683,7 +13527,7 @@ _LT_EOF
_lt_result=$?
if test -s conftest.err && $GREP force_load conftest.err; then
cat conftest.err >&5
- elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+ elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
lt_cv_ld_force_load=yes
else
cat conftest.err >&5
@@ -13696,32 +13540,32 @@ fi
$as_echo "$lt_cv_ld_force_load" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
darwin1.*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
darwin*) # darwin 5.x on
# if running on 10.5 or later, the deployment target defaults
# to the OS version, if on x86, and 10.4, the deployment
# target defaults to 10.4. Don't you love it?
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- 10.[012]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+ 10.[012][,.]*)
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
esac
;;
esac
- if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ if test yes = "$lt_cv_apple_cc_single_mod"; then
_lt_dar_single_mod='$single_module'
fi
- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ if test yes = "$lt_cv_ld_exported_symbols_list"; then
+ _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
else
- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
fi
- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+ if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
@@ -13729,6 +13573,41 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
;;
esac
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+# string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+# string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+# "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+# VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+ case x$2 in
+ x)
+ ;;
+ *:)
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+ ;;
+ x:*)
+ eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+ ;;
+ *::*)
+ eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+ eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+ ;;
+ *)
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+ ;;
+ esac
+}
+
for ac_header in dlfcn.h
do :
ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
@@ -13746,9 +13625,9 @@ done
func_stripname_cnf ()
{
- case ${2} in
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+ case $2 in
+ .*) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%\\\\$2\$%%"`;;
+ *) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%$2\$%%"`;;
esac
} # func_stripname_cnf
@@ -14067,14 +13946,14 @@ if test "${enable_static+set}" = set; then :
*)
enable_static=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_static=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac
else
@@ -14101,14 +13980,14 @@ if test "${enable_shared+set}" = set; then :
*)
enable_shared=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_shared=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac
else
@@ -14133,14 +14012,14 @@ if test "${with_pic+set}" = set; then :
*)
pic_mode=default
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for lt_pkg in $withval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$lt_pkg" = "X$lt_p"; then
pic_mode=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac
else
@@ -14148,8 +14027,6 @@ else
fi
-test -z "$pic_mode" && pic_mode=default
-
@@ -14165,20 +14042,72 @@ if test "${enable_fast_install+set}" = set; then :
*)
enable_fast_install=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_fast_install=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac
else
- enable_fast_install=yes
+ enable_fast_install=yes
+fi
+
+
+
+
+
+
+
+
+ shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[5-9]*,yes)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
+
+# Check whether --with-aix-soname was given.
+if test "${with_aix_soname+set}" = set; 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
+ if ${lt_cv_with_aix_soname+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_with_aix_soname=aix
+fi
+
+ with_aix_soname=$lt_cv_with_aix_soname
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+$as_echo "$with_aix_soname" >&6; }
+ if test aix != "$with_aix_soname"; then
+ # For the AIX way of multilib, we name the shared archive member
+ # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+ # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+ # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+ # the AIX toolchain works better with OBJECT_MODE set (default 32).
+ if test 64 = "${OBJECT_MODE-32}"; then
+ shared_archive_member_spec=shr_64
+ else
+ shared_archive_member_spec=shr
+ fi
+ fi
+ ;;
+*)
+ with_aix_soname=aix
+ ;;
+esac
@@ -14190,7 +14119,7 @@ fi
# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
+LIBTOOL_DEPS=$ltmain
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -14239,7 +14168,7 @@ test -z "$LN_S" && LN_S="ln -s"
-if test -n "${ZSH_VERSION+set}" ; then
+if test -n "${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
@@ -14278,7 +14207,7 @@ aix3*)
# AIX sometimes has problems with the GCC collect2 program. For some
# reason, if we set the COLLECT_NAMES environment variable, the problems
# vanish in a puff of smoke.
- if test "X${COLLECT_NAMES+set}" != Xset; then
+ if test set != "${COLLECT_NAMES+set}"; then
COLLECT_NAMES=
export COLLECT_NAMES
fi
@@ -14289,14 +14218,14 @@ esac
ofile=libtool
can_build_shared=yes
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# All known linkers require a '.a' archive for static linking (except MSVC,
# which needs '.lib').
libext=a
-with_gnu_ld="$lt_cv_prog_gnu_ld"
+with_gnu_ld=$lt_cv_prog_gnu_ld
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
+old_CC=$CC
+old_CFLAGS=$CFLAGS
# Set sane defaults for various variables
test -z "$CC" && CC=cc
@@ -14305,15 +14234,8 @@ test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
test -z "$LD" && LD=ld
test -z "$ac_objext" && ac_objext=o
-for cc_temp in $compiler""; do
- case $cc_temp in
- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
# Only perform the check for file, if the check method requires it
@@ -14328,22 +14250,22 @@ if ${lt_cv_path_MAGIC_CMD+:} false; then :
else
case $MAGIC_CMD in
[\\/*] | ?:[\\/]*)
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
;;
*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_MAGIC_CMD=$MAGIC_CMD
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/${ac_tool_prefix}file; then
- lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+ if test -f "$ac_dir/${ac_tool_prefix}file"; then
+ lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
:
@@ -14366,13 +14288,13 @@ _LT_EOF
break
fi
done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
+ IFS=$lt_save_ifs
+ MAGIC_CMD=$lt_save_MAGIC_CMD
;;
esac
fi
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if test -n "$MAGIC_CMD"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
$as_echo "$MAGIC_CMD" >&6; }
@@ -14394,22 +14316,22 @@ if ${lt_cv_path_MAGIC_CMD+:} false; then :
else
case $MAGIC_CMD in
[\\/*] | ?:[\\/]*)
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
;;
*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_MAGIC_CMD=$MAGIC_CMD
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/file; then
- lt_cv_path_MAGIC_CMD="$ac_dir/file"
+ if test -f "$ac_dir/file"; then
+ lt_cv_path_MAGIC_CMD=$ac_dir/"file"
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
:
@@ -14432,13 +14354,13 @@ _LT_EOF
break
fi
done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
+ IFS=$lt_save_ifs
+ MAGIC_CMD=$lt_save_MAGIC_CMD
;;
esac
fi
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if test -n "$MAGIC_CMD"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
$as_echo "$MAGIC_CMD" >&6; }
@@ -14459,7 +14381,7 @@ esac
# Use C for the default configuration in the libtool script
-lt_save_CC="$CC"
+lt_save_CC=$CC
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -14521,7 +14443,7 @@ if test -n "$compiler"; then
lt_prog_compiler_no_builtin_flag=
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
case $cc_basename in
nvcc*)
lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
@@ -14537,7 +14459,7 @@ else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="-fno-rtti -fno-exceptions"
+ lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
# Note that $ac_compile itself does not contain backslashes and begins
@@ -14567,7 +14489,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
else
:
@@ -14585,17 +14507,18 @@ lt_prog_compiler_pic=
lt_prog_compiler_static=
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_static='-static'
case $host_os in
aix*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
lt_prog_compiler_static='-Bstatic'
fi
+ lt_prog_compiler_pic='-fPIC'
;;
amigaos*)
@@ -14606,8 +14529,8 @@ lt_prog_compiler_static=
;;
m68k)
# FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
+ # adding the '-m68020' flag to GCC prevents building anything better,
+ # like '-m68040'.
lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
;;
esac
@@ -14623,6 +14546,11 @@ lt_prog_compiler_static=
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
lt_prog_compiler_pic='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
@@ -14693,7 +14621,7 @@ lt_prog_compiler_static=
case $host_os in
aix*)
lt_prog_compiler_wl='-Wl,'
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
lt_prog_compiler_static='-Bstatic'
else
@@ -14701,10 +14629,29 @@ lt_prog_compiler_static=
fi
;;
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ lt_prog_compiler_pic='-fno-common'
+ case $cc_basename in
+ nagfor*)
+ # NAG Fortran compiler
+ lt_prog_compiler_wl='-Wl,-Wl,,'
+ lt_prog_compiler_pic='-PIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+ esac
+ ;;
+
mingw* | cygwin* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static='$wl-static'
+ ;;
+ esac
;;
hpux9* | hpux10* | hpux11*)
@@ -14720,7 +14667,7 @@ lt_prog_compiler_static=
;;
esac
# Is there a better lt_prog_compiler_static that works with the bundled CC?
- lt_prog_compiler_static='${wl}-a ${wl}archive'
+ lt_prog_compiler_static='$wl-a ${wl}archive'
;;
irix5* | irix6* | nonstopux*)
@@ -14729,9 +14676,9 @@ lt_prog_compiler_static=
lt_prog_compiler_static='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
+ # old Intel for x86_64, which still supported -KPIC.
ecc*)
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
@@ -14756,6 +14703,12 @@ lt_prog_compiler_static=
lt_prog_compiler_pic='-PIC'
lt_prog_compiler_static='-Bstatic'
;;
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-fPIC'
+ lt_prog_compiler_static='-static'
+ ;;
pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
@@ -14853,7 +14806,7 @@ lt_prog_compiler_static=
;;
sysv4*MP*)
- if test -d /usr/nec ;then
+ if test -d /usr/nec; then
lt_prog_compiler_pic='-Kconform_pic'
lt_prog_compiler_static='-Bstatic'
fi
@@ -14882,7 +14835,7 @@ lt_prog_compiler_static=
fi
case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
+ # For platforms that do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
;;
@@ -14914,7 +14867,7 @@ else
lt_cv_prog_compiler_pic_works=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+ lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
# Note that $ac_compile itself does not contain backslashes and begins
@@ -14944,7 +14897,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+if test yes = "$lt_cv_prog_compiler_pic_works"; then
case $lt_prog_compiler_pic in
"" | " "*) ;;
*) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
@@ -14976,7 +14929,7 @@ if ${lt_cv_prog_compiler_static_works+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -14995,13 +14948,13 @@ else
fi
fi
$RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+if test yes = "$lt_cv_prog_compiler_static_works"; then
:
else
lt_prog_compiler_static=
@@ -15121,8 +15074,8 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
# do not overwrite the value of need_locks provided by the user
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
$as_echo_n "checking if we can lock with hard links... " >&6; }
@@ -15134,9 +15087,9 @@ $as_echo_n "checking if we can lock with hard links... " >&6; }
ln conftest.a conftest.b 2>/dev/null && hard_links=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
$as_echo "$hard_links" >&6; }
- if test "$hard_links" = no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ if test no = "$hard_links"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
need_locks=warn
fi
else
@@ -15179,9 +15132,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
# included in the symbol list
include_expsyms=
# exclude_expsyms can be an extended regexp of symbols to exclude
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
+ # it will be wrapped by ' (' and ')$', so one must not match beginning or
+ # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+ # as well as any symbol that contains 'd'.
exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
@@ -15196,7 +15149,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
- if test "$GCC" != yes; then
+ if test yes != "$GCC"; then
with_gnu_ld=no
fi
;;
@@ -15204,9 +15157,12 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
# we just hope/assume this is gcc and not c89 (= MSVC++)
with_gnu_ld=yes
;;
- openbsd*)
+ openbsd* | bitrig*)
with_gnu_ld=no
;;
+ linux* | k*bsd*-gnu | gnu*)
+ link_all_deplibs=no
+ ;;
esac
ld_shlibs=yes
@@ -15214,7 +15170,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
# On some targets, GNU ld is compatible enough with the native linker
# that we're better off using the native interface for both.
lt_use_gnu_ld_interface=no
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
case $host_os in
aix*)
# The AIX port of GNU ld has always aspired to compatibility
@@ -15236,24 +15192,24 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
esac
fi
- if test "$lt_use_gnu_ld_interface" = yes; then
+ if test yes = "$lt_use_gnu_ld_interface"; then
# If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
+ wlarc='$wl'
# Set some defaults for GNU ld with shared library support. These
# are reset later if shared libraries are not supported. Putting them
# here allows them to be overridden if necessary.
runpath_var=LD_RUN_PATH
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- export_dynamic_flag_spec='${wl}--export-dynamic'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+ export_dynamic_flag_spec='$wl--export-dynamic'
# ancient GNU ld didn't support --whole-archive et. al.
if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
else
whole_archive_flag_spec=
fi
supports_anon_versioning=no
- case `$LD -v 2>&1` in
+ case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
*GNU\ gold*) supports_anon_versioning=yes ;;
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -15266,7 +15222,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
case $host_os in
aix[3-9]*)
# On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
+ if test ia64 != "$host_cpu"; then
ld_shlibs=no
cat <<_LT_EOF 1>&2
@@ -15285,7 +15241,7 @@ _LT_EOF
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
archive_expsym_cmds=''
;;
m68k)
@@ -15301,7 +15257,7 @@ _LT_EOF
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
- archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
else
ld_shlibs=no
fi
@@ -15311,7 +15267,7 @@ _LT_EOF
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
- export_dynamic_flag_spec='${wl}--export-all-symbols'
+ export_dynamic_flag_spec='$wl--export-all-symbols'
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
@@ -15319,61 +15275,89 @@ _LT_EOF
exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file, use it as
+ # is; otherwise, prepend EXPORTS...
+ 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;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
ld_shlibs=no
fi
;;
haiku*)
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
link_all_deplibs=yes
;;
+ os2*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ allow_undefined_flag=unsupported
+ shrext_cmds=.dll
+ archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes=yes
+ ;;
+
interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- export_dynamic_flag_spec='${wl}-E'
+ hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+ export_dynamic_flag_spec='$wl-E'
# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
# Instead, shared libraries are loaded at an image base (0x10000000 by
# default) and relocated if they conflict, which is a slow very memory
# consuming and fragmenting process. To avoid this, we pick a random,
# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
# time. Moving up from 0x10000000 also allows more sbrk(2) space.
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
+ if test linux-dietlibc = "$host_os"; then
case $cc_basename in
diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
esac
fi
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
- && test "$tmp_diet" = no
+ && test no = "$tmp_diet"
then
tmp_addflag=' $pic_flag'
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group f77 and f90 compilers
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -15384,42 +15368,47 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
whole_archive_flag_spec=
tmp_sharedflag='--shared' ;;
+ nagfor*) # NAGFOR 5.3
+ tmp_sharedflag='-Wl,-shared' ;;
xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
tmp_sharedflag='-qmkshrobj'
tmp_addflag= ;;
nvcc*) # Cuda Compiler Driver 2.2
- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
compiler_needs_object=yes
;;
esac
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*) # Sun C 5.9
- whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
compiler_needs_object=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
tmp_sharedflag='-G' ;;
esac
- archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ if test yes = "$supports_anon_versioning"; then
archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
fi
case $cc_basename in
+ tcc*)
+ export_dynamic_flag_spec='-rdynamic'
+ ;;
xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ if test yes = "$supports_anon_versioning"; then
archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
fi
;;
esac
@@ -15428,13 +15417,13 @@ _LT_EOF
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=
else
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
fi
;;
@@ -15452,8 +15441,8 @@ _LT_EOF
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
else
ld_shlibs=no
fi
@@ -15465,7 +15454,7 @@ _LT_EOF
ld_shlibs=no
cat <<_LT_EOF 1>&2
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
*** reliably create shared libraries on SCO systems. Therefore, libtool
*** is disabling shared libraries support. We urge you to upgrade GNU
*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
@@ -15480,9 +15469,9 @@ _LT_EOF
# DT_RUNPATH tag from executables and libraries. But doing so
# requires that you compile everything twice, which is a pain.
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
else
ld_shlibs=no
fi
@@ -15499,15 +15488,15 @@ _LT_EOF
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
else
ld_shlibs=no
fi
;;
esac
- if test "$ld_shlibs" = no; then
+ if test no = "$ld_shlibs"; then
runpath_var=
hardcode_libdir_flag_spec=
export_dynamic_flag_spec=
@@ -15523,7 +15512,7 @@ _LT_EOF
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
@@ -15531,34 +15520,57 @@ _LT_EOF
;;
aix[4-9]*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
exp_sym_flag='-Bexport'
- no_entry_flag=""
+ no_entry_flag=
else
# If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global
- # defined symbols, whereas GNU nm marks them as "W".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
aix_use_runtimelinking=yes
break
fi
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -15577,13 +15589,21 @@ _LT_EOF
hardcode_direct_absolute=yes
hardcode_libdir_separator=':'
link_all_deplibs=yes
- file_list_spec='${wl}-f,'
+ file_list_spec='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # traditional, no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ hardcode_direct=no
+ hardcode_direct_absolute=no
+ ;;
+ esac
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
case $host_os in aix4.[012]|aix4.[012].*)
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
+ collect2name=`$CC -print-prog-name=collect2`
if test -f "$collect2name" &&
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
then
@@ -15602,35 +15622,42 @@ _LT_EOF
;;
esac
shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag="$shared_flag "'$wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag='$wl-G'
else
- shared_flag='${wl}-bM:SRE'
+ shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
- export_dynamic_flag_spec='${wl}-bexpall'
+ export_dynamic_flag_spec='$wl-bexpall'
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to export.
always_export_symbols=yes
- if test "$aix_use_runtimelinking" = yes; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
- if test "${lt_cv_aix_libpath+set}" = set; then
+ if test set = "${lt_cv_aix_libpath+set}"; then
aix_libpath=$lt_cv_aix_libpath
else
if ${lt_cv_aix_libpath_+:} false; then :
@@ -15665,7 +15692,7 @@ fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$lt_cv_aix_libpath_"; then
- lt_cv_aix_libpath_="/usr/lib:/lib"
+ lt_cv_aix_libpath_=/usr/lib:/lib
fi
fi
@@ -15673,17 +15700,17 @@ fi
aix_libpath=$lt_cv_aix_libpath_
fi
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
+ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
else
- if test "$host_cpu" = ia64; then
- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+ if test ia64 = "$host_cpu"; then
+ hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
allow_undefined_flag="-z nodefs"
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an
# empty executable.
- if test "${lt_cv_aix_libpath+set}" = set; then
+ if test set = "${lt_cv_aix_libpath+set}"; then
aix_libpath=$lt_cv_aix_libpath
else
if ${lt_cv_aix_libpath_+:} false; then :
@@ -15718,7 +15745,7 @@ fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$lt_cv_aix_libpath_"; then
- lt_cv_aix_libpath_="/usr/lib:/lib"
+ lt_cv_aix_libpath_=/usr/lib:/lib
fi
fi
@@ -15726,21 +15753,33 @@ fi
aix_libpath=$lt_cv_aix_libpath_
fi
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+ hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
- no_undefined_flag=' ${wl}-bernotok'
- allow_undefined_flag=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
+ no_undefined_flag=' $wl-bernotok'
+ allow_undefined_flag=' $wl-berok'
+ if test yes = "$with_gnu_ld"; then
# We only use this code for GNU lds that support --whole-archive.
- whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
else
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec='$convenience'
fi
archive_cmds_need_lc=yes
- # This is similar to how AIX traditionally builds its shared libraries.
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > [...]
+ else
+ # used by -dlpreopen to get the symbols
+ archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -15749,7 +15788,7 @@ fi
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
archive_expsym_cmds=''
;;
m68k)
@@ -15779,16 +15818,17 @@ fi
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
- archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- else
- sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- fi~
- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- linknames='
+ 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 -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
# The linker will not automatically build a static lib if we build a DLL.
# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
enable_shared_with_static_runtimes=yes
@@ -15797,18 +15837,18 @@ fi
# Don't use ranlib
old_postinstall_cmds='chmod 644 $oldlib'
postlink_cmds='lt_outputfile="@OUTPUT@"~
- lt_tool_outputfile="@TOOL_OUTPUT@"~
- case $lt_outputfile in
- *.exe|*.EXE) ;;
- *)
- lt_outputfile="$lt_outputfile.exe"
- lt_tool_outputfile="$lt_tool_outputfile.exe"
- ;;
- esac~
- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- $RM "$lt_outputfile.manifest";
- fi'
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile=$lt_outputfile.exe
+ lt_tool_outputfile=$lt_tool_outputfile.exe
+ ;;
+ esac~
+ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
;;
*)
# Assume MSVC wrapper
@@ -15817,7 +15857,7 @@ fi
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
# The linker will automatically build a .lib file if we build a DLL.
@@ -15836,24 +15876,24 @@ fi
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
- if test "$lt_cv_ld_force_load" = "yes"; then
- whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ if test yes = "$lt_cv_ld_force_load"; then
+ whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
else
whole_archive_flag_spec=''
fi
link_all_deplibs=yes
- allow_undefined_flag="$_lt_dar_allow_undefined"
+ allow_undefined_flag=$_lt_dar_allow_undefined
case $cc_basename in
- ifort*) _lt_dar_can_shared=yes ;;
+ ifort*|nagfor*) _lt_dar_can_shared=yes ;;
*) _lt_dar_can_shared=$GCC ;;
esac
- if test "$_lt_dar_can_shared" = "yes"; then
+ if test yes = "$_lt_dar_can_shared"; then
output_verbose_link_cmd=func_echo_all
- archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+ archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+ module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
else
ld_shlibs=no
@@ -15895,33 +15935,33 @@ fi
;;
hpux9*)
- if test "$GCC" = yes; then
- archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ if test yes = "$GCC"; then
+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
else
- archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
fi
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl+b $wl$libdir'
hardcode_libdir_separator=:
hardcode_direct=yes
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
hardcode_minus_L=yes
- export_dynamic_flag_spec='${wl}-E'
+ export_dynamic_flag_spec='$wl-E'
;;
hpux10*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes,no = "$GCC,$with_gnu_ld"; then
+ archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
fi
- if test "$with_gnu_ld" = no; then
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ hardcode_libdir_flag_spec='$wl+b $wl$libdir'
hardcode_libdir_separator=:
hardcode_direct=yes
hardcode_direct_absolute=yes
- export_dynamic_flag_spec='${wl}-E'
+ export_dynamic_flag_spec='$wl-E'
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
hardcode_minus_L=yes
@@ -15929,25 +15969,25 @@ fi
;;
hpux11*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ if test yes,no = "$GCC,$with_gnu_ld"; then
case $host_cpu in
hppa*64*)
- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
case $host_cpu in
hppa*64*)
- archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
@@ -15959,7 +15999,7 @@ if ${lt_cv_prog_compiler__b+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler__b=no
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -b"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -15978,14 +16018,14 @@ else
fi
fi
$RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
$as_echo "$lt_cv_prog_compiler__b" >&6; }
-if test x"$lt_cv_prog_compiler__b" = xyes; then
- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+if test yes = "$lt_cv_prog_compiler__b"; then
+ archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
fi
@@ -15993,8 +16033,8 @@ fi
;;
esac
fi
- if test "$with_gnu_ld" = no; then
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ hardcode_libdir_flag_spec='$wl+b $wl$libdir'
hardcode_libdir_separator=:
case $host_cpu in
@@ -16005,7 +16045,7 @@ fi
*)
hardcode_direct=yes
hardcode_direct_absolute=yes
- export_dynamic_flag_spec='${wl}-E'
+ export_dynamic_flag_spec='$wl-E'
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
@@ -16016,8 +16056,8 @@ fi
;;
irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GCC"; then
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
@@ -16027,8 +16067,8 @@ $as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >
if ${lt_cv_irix_exported_symbol+:} false; then :
$as_echo_n "(cached) " >&6
else
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int foo (void) { return 0; }
@@ -16040,25 +16080,36 @@ else
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
$as_echo "$lt_cv_irix_exported_symbol" >&6; }
- if test "$lt_cv_irix_exported_symbol" = yes; then
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+ 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'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
fi
archive_cmds_need_lc='no'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
hardcode_libdir_separator=:
inherit_rpath=yes
link_all_deplibs=yes
;;
- netbsd*)
+ linux*)
+ case $cc_basename in
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ ld_shlibs=yes
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+
+ 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
@@ -16072,7 +16123,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
newsos6)
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct=yes
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
hardcode_libdir_separator=:
hardcode_shlibpath_var=no
;;
@@ -16080,27 +16131,19 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
*nto* | *qnx*)
;;
- openbsd*)
+ openbsd* | bitrig*)
if test -f /usr/libexec/ld.so; then
hardcode_direct=yes
hardcode_shlibpath_var=no
hardcode_direct_absolute=yes
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- export_dynamic_flag_spec='${wl}-E'
+ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+ hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+ export_dynamic_flag_spec='$wl-E'
else
- case $host_os in
- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-R$libdir'
- ;;
- *)
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- ;;
- esac
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='$wl-rpath,$libdir'
fi
else
ld_shlibs=no
@@ -16111,33 +16154,53 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ shrext_cmds=.dll
+ archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes=yes
;;
osf3*)
- if test "$GCC" = yes; then
- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GCC"; then
+ allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+ archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
else
allow_undefined_flag=' -expect_unresolved \*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
fi
archive_cmds_need_lc='no'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
hardcode_libdir_separator=:
;;
osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ if test yes = "$GCC"; then
+ allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+ archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
else
allow_undefined_flag=' -expect_unresolved \*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+ $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
@@ -16148,24 +16211,24 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
solaris*)
no_undefined_flag=' -z defs'
- if test "$GCC" = yes; then
- wlarc='${wl}'
- archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ wlarc='$wl'
+ archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
wlarc=''
- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+ $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
;;
*)
- wlarc='${wl}'
- archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ wlarc='$wl'
+ archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
;;
esac
fi
@@ -16175,11 +16238,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
# The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but understands '-z linker_flag'. GCC discards it without '$wl',
# but is careful enough not to reorder.
# Supported since Solaris 2.6 (maybe 2.5.1?)
- if test "$GCC" = yes; then
- whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ if test yes = "$GCC"; then
+ whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
else
whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
fi
@@ -16189,10 +16252,10 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
;;
sunos4*)
- if test "x$host_vendor" = xsequent; then
+ if test sequent = "$host_vendor"; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
- archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
@@ -16241,43 +16304,43 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
;;
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
- no_undefined_flag='${wl}-z,text'
+ no_undefined_flag='$wl-z,text'
archive_cmds_need_lc=no
hardcode_shlibpath_var=no
runpath_var='LD_RUN_PATH'
- if test "$GCC" = yes; then
- archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
;;
sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
+ # Note: We CANNOT use -z defs as we might desire, because we do not
# link with -lc, and that would cause any symbols used from libc to
# always be unresolved, which means just about no library would
# ever link correctly. If we're not using GNU ld we use -z text
# though, which does catch some bad symbols but isn't as heavy-handed
# as -z defs.
- no_undefined_flag='${wl}-z,text'
- allow_undefined_flag='${wl}-z,nodefs'
+ no_undefined_flag='$wl-z,text'
+ allow_undefined_flag='$wl-z,nodefs'
archive_cmds_need_lc=no
hardcode_shlibpath_var=no
- hardcode_libdir_flag_spec='${wl}-R,$libdir'
+ hardcode_libdir_flag_spec='$wl-R,$libdir'
hardcode_libdir_separator=':'
link_all_deplibs=yes
- export_dynamic_flag_spec='${wl}-Bexport'
+ export_dynamic_flag_spec='$wl-Bexport'
runpath_var='LD_RUN_PATH'
- if test "$GCC" = yes; then
- archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
;;
@@ -16292,10 +16355,10 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
;;
esac
- if test x$host_vendor = xsni; then
+ if test sni = "$host_vendor"; then
case $host in
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- export_dynamic_flag_spec='${wl}-Blargedynsym'
+ export_dynamic_flag_spec='$wl-Blargedynsym'
;;
esac
fi
@@ -16303,7 +16366,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
$as_echo "$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
+test no = "$ld_shlibs" && can_build_shared=no
with_gnu_ld=$with_gnu_ld
@@ -16329,7 +16392,7 @@ x|xyes)
# Assume -lc should be added
archive_cmds_need_lc=yes
- if test "$enable_shared" = yes && test "$GCC" = yes; then
+ if test yes,yes = "$GCC,$enable_shared"; then
case $archive_cmds in
*'~'*)
# FIXME: we may have to deal with multi-command sequences.
@@ -16544,14 +16607,14 @@ esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
$as_echo_n "checking dynamic linker characteristics... " >&6; }
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
case $host_os in
- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
- *) lt_awk_arg="/^libraries:/" ;;
+ darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+ *) lt_awk_arg='/^libraries:/' ;;
esac
case $host_os in
- mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
- *) lt_sed_strip_eq="s,=/,/,g" ;;
+ mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
+ *) lt_sed_strip_eq='s|=/|/|g' ;;
esac
lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
case $lt_search_path_spec in
@@ -16567,28 +16630,35 @@ if test "$GCC" = yes; then
;;
esac
# Ok, now we have the path, separated by spaces, we can step through it
- # and add multilib dir if necessary.
+ # and add multilib dir if necessary...
lt_tmp_lt_search_path_spec=
- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ # ...but if some path component already ends with the multilib dir we assume
+ # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+ case "$lt_multi_os_dir; $lt_search_path_spec " in
+ "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+ lt_multi_os_dir=
+ ;;
+ esac
for lt_sys_path in $lt_search_path_spec; do
- if test -d "$lt_sys_path/$lt_multi_os_dir"; then
- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
- else
+ if test -d "$lt_sys_path$lt_multi_os_dir"; then
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+ elif test -n "$lt_multi_os_dir"; then
test -d "$lt_sys_path" && \
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
- lt_foo="";
- lt_count=0;
+BEGIN {RS = " "; FS = "/|\n";} {
+ lt_foo = "";
+ lt_count = 0;
for (lt_i = NF; lt_i > 0; lt_i--) {
if ($lt_i != "" && $lt_i != ".") {
if ($lt_i == "..") {
lt_count++;
} else {
if (lt_count == 0) {
- lt_foo="/" $lt_i lt_foo;
+ lt_foo = "/" $lt_i lt_foo;
} else {
lt_count--;
}
@@ -16602,7 +16672,7 @@ BEGIN {RS=" "; FS="/|\n";} {
# for these hosts.
case $host_os in
mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
- $SED 's,/\([A-Za-z]:\),\1,g'` ;;
+ $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
esac
sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
else
@@ -16611,7 +16681,7 @@ fi
library_names_spec=
libname_spec='lib$name'
soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
@@ -16628,14 +16698,16 @@ hardcode_into_libs=no
# flags to be left without arguments
need_version=unknown
+
+
case $host_os in
aix3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
shlibpath_var=LIBPATH
# AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
+ soname_spec='$libname$release$shared_ext$major'
;;
aix[4-9]*)
@@ -16643,41 +16715,91 @@ aix[4-9]*)
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
else
# With GCC up to 2.95.x, collect2 would create an import file
# for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
+ # the line '#! .'. This would cause the generated library to
+ # depend on '.', always an invalid library. This was fixed in
# development snapshots of GCC prior to 3.0.
case $host_os in
aix4 | aix4.[01] | aix4.[01].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes '
- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
:
else
can_build_shared=no
fi
;;
esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # Using Import Files as archive members, it is possible to support
+ # filename-based versioning of shared library archives on AIX. While
+ # this would work for both with and without runtime linking, it will
+ # prevent static linking of such archives. So we do filename-based
+ # shared library versioning with .so extension only, which is used
+ # when both runtime linking and shared linking is enabled.
+ # Unfortunately, runtime linking may impact performance, so we do
+ # not want this to be the default eventually. Also, we use the
+ # versioned .so libs for executables only if there is the -brtl
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+ # To allow for filename-based versioning support, we need to create
+ # libNAME.so.V as an archive file, containing:
+ # *) an Import File, referring to the versioned filename of the
+ # archive as well as the shared archive member, telling the
+ # bitwidth (32 or 64) of that shared object, and providing the
+ # list of exported symbols of that shared object, eventually
+ # decorated with the 'weak' keyword
+ # *) the shared object with the F_LOADONLY flag set, to really avoid
+ # it being seen by the linker.
+ # At run time we better use the real file rather than another symlink,
+ # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+ case $with_aix_soname,$aix_use_runtimelinking in
+ # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
# soname into executable. Probably we can add versioning support to
# collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
+ aix,yes) # traditional libtool
+ dynamic_linker='AIX unversionable lib.so'
# If using run time linking (on AIX 4.2 or later) use lib<name>.so
# instead of lib<name>.a to let people know that these are not
# typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ ;;
+ aix,no) # traditional AIX only
+ dynamic_linker='AIX lib.a(lib.so.V)'
# We preserve .a as extension for shared libraries through AIX4.2
# and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ ;;
+ svr4,*) # full svr4 only
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,yes) # both, prefer svr4
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # unpreferred sharedlib libNAME.a needs extra handling
+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,no) # both, prefer aix
+ dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+ ;;
+ esac
shlibpath_var=LIBPATH
fi
;;
@@ -16687,18 +16809,18 @@ amigaos*)
powerpc)
# Since July 2007 AmigaOS4 officially supports .so libraries.
# When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
;;
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
;;
esac
;;
beos*)
- library_names_spec='${libname}${shared_ext}'
+ library_names_spec='$libname$shared_ext'
dynamic_linker="$host_os ld.so"
shlibpath_var=LIBRARY_PATH
;;
@@ -16706,8 +16828,8 @@ beos*)
bsdi[45]*)
version_type=linux # correct to gnu/linux during the next big refactor
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -16719,7 +16841,7 @@ bsdi[45]*)
cygwin* | mingw* | pw32* | cegcc*)
version_type=windows
- shrext_cmds=".dll"
+ shrext_cmds=.dll
need_version=no
need_lib_prefix=no
@@ -16728,8 +16850,8 @@ cygwin* | mingw* | pw32* | cegcc*)
# gcc
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
$install_prog $dir/$dlname \$dldir/$dlname~
@@ -16745,17 +16867,17 @@ cygwin* | mingw* | pw32* | cegcc*)
case $host_os in
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
;;
esac
dynamic_linker='Win32 ld.exe'
@@ -16764,8 +16886,8 @@ cygwin* | mingw* | pw32* | cegcc*)
*,cl*)
# Native MSVC
libname_spec='$name'
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- library_names_spec='${libname}.dll.lib'
+ soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+ library_names_spec='$libname.dll.lib'
case $build_os in
mingw*)
@@ -16792,7 +16914,7 @@ cygwin* | mingw* | pw32* | cegcc*)
sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
;;
*)
- sys_lib_search_path_spec="$LIB"
+ sys_lib_search_path_spec=$LIB
if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
# It is most probably a Windows format PATH.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
@@ -16805,8 +16927,8 @@ cygwin* | mingw* | pw32* | cegcc*)
esac
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
$install_prog $dir/$dlname \$dldir/$dlname'
@@ -16819,7 +16941,7 @@ cygwin* | mingw* | pw32* | cegcc*)
*)
# Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
dynamic_linker='Win32 ld.exe'
;;
esac
@@ -16832,8 +16954,8 @@ darwin* | rhapsody*)
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
+ library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$major$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -16846,8 +16968,8 @@ dgux*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
- soname_spec='${libname}${release}${shared_ext}$major'
+ 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
;;
@@ -16865,12 +16987,13 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
need_version=no
need_lib_prefix=no
;;
freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
need_version=yes
;;
esac
@@ -16895,26 +17018,15 @@ freebsd* | dragonfly*)
esac
;;
-gnu*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
dynamic_linker="$host_os runtime_loader"
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
+ shlibpath_overrides_runpath=no
sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
hardcode_into_libs=yes
;;
@@ -16932,14 +17044,15 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ if test 32 = "$HPUX_IA64_MODE"; then
sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux32
else
sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux64
fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
shrext_cmds='.sl'
@@ -16947,8 +17060,8 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
@@ -16957,8 +17070,8 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
;;
esac
# HP-UX runs *really* slowly unless shared libraries are mode 555, ...
@@ -16971,8 +17084,8 @@ interix[3-9]*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -16983,7 +17096,7 @@ irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
*)
- if test "$lt_cv_prog_gnu_ld" = yes; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
version_type=linux # correct to gnu/linux during the next big refactor
else
version_type=irix
@@ -16991,8 +17104,8 @@ irix5* | irix6* | nonstopux*)
esac
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
case $host_os in
irix5* | nonstopux*)
libsuff= shlibsuff=
@@ -17011,8 +17124,8 @@ irix5* | irix6* | nonstopux*)
esac
shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+ sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
hardcode_into_libs=yes
;;
@@ -17021,13 +17134,33 @@ linux*oldld* | linux*aout* | linux*coff*)
dynamic_linker=no
;;
+linux*android*)
+ version_type=none # Android doesn't support versioned libraries.
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='$libname$release$shared_ext'
+ soname_spec='$libname$release$shared_ext'
+ finish_cmds=
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+ dynamic_linker='Android linker'
+ # Don't embed -rpath directories since the linker doesn't support them.
+ hardcode_libdir_flag_spec='-L$libdir'
+ ;;
+
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -17071,14 +17204,15 @@ fi
# before this can be enabled.
hardcode_into_libs=yes
- # Add ABI-specific directories to the system library path.
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
- # Append ld.so.conf contents to the search path
+ # Ideally, we could use ldconfig to report *all* directores which are
+ # searched for libraries, however this is still not possible. Aside from not
+ # being certain /sbin/ldconfig is available, command
+ # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+ # even though it is searched at run-time. Try to do the best guess by
+ # appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -17090,17 +17224,29 @@ fi
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
need_version=no
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='NetBSD ld.elf_so'
fi
shlibpath_var=LD_LIBRARY_PATH
@@ -17110,7 +17256,7 @@ netbsd*)
newsos6)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
;;
@@ -17119,58 +17265,68 @@ newsos6)
version_type=qnx
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
dynamic_linker='ldqnx.so'
;;
-openbsd*)
+openbsd* | bitrig*)
version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib
need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
- esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[89] | openbsd2.[89].*)
- shlibpath_overrides_runpath=no
- ;;
- *)
- shlibpath_overrides_runpath=yes
- ;;
- esac
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+ need_version=no
else
- shlibpath_overrides_runpath=yes
+ need_version=yes
fi
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
;;
os2*)
libname_spec='$name'
- shrext_cmds=".dll"
+ version_type=windows
+ shrext_cmds=.dll
+ need_version=no
need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
+ # OS/2 can only load a DLL with a base name of 8 characters or less.
+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+ v=$($ECHO $release$versuffix | tr -d .-);
+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+ $ECHO $n$v`$shared_ext'
+ library_names_spec='${libname}_dll.$libext'
dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
+ shlibpath_var=BEGINLIBPATH
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
;;
osf3* | osf4* | osf5*)
version_type=osf
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
rdos*)
@@ -17181,8 +17337,8 @@ solaris*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
@@ -17192,11 +17348,11 @@ solaris*)
sunos4*)
version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
need_lib_prefix=no
fi
need_version=yes
@@ -17204,8 +17360,8 @@ sunos4*)
sysv4 | sysv4.3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
case $host_vendor in
sni)
@@ -17226,24 +17382,24 @@ sysv4 | sysv4.3*)
;;
sysv4*MP*)
- if test -d /usr/nec ;then
+ if test -d /usr/nec; then
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
+ library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+ soname_spec='$libname$shared_ext.$major'
shlibpath_var=LD_LIBRARY_PATH
fi
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
+ version_type=sco
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
else
sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -17261,7 +17417,7 @@ tpf*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -17269,8 +17425,8 @@ tpf*)
uts4*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ 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
;;
@@ -17280,20 +17436,35 @@ uts4*)
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+ sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+ sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
+
@@ -17390,15 +17561,15 @@ $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
test -n "$runpath_var" ||
- test "X$hardcode_automatic" = "Xyes" ; then
+ test yes = "$hardcode_automatic"; then
# We can hardcode non-existent directories.
- if test "$hardcode_direct" != no &&
+ if test no != "$hardcode_direct" &&
# If the only mechanism to avoid hardcoding is shlibpath_var, we
# have to relink, otherwise we might link with an installed library
# when we should be linking with a yet-to-be-installed one
- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
- test "$hardcode_minus_L" != no; then
+ ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
+ test no != "$hardcode_minus_L"; then
# Linking always hardcodes the temporary library directory.
hardcode_action=relink
else
@@ -17413,12 +17584,12 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
$as_echo "$hardcode_action" >&6; }
-if test "$hardcode_action" = relink ||
- test "$inherit_rpath" = yes; then
+if test relink = "$hardcode_action" ||
+ test yes = "$inherit_rpath"; then
# Fast installation is not supported
enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+ test no = "$enable_shared"; then
# Fast installation is not necessary
enable_fast_install=needless
fi
@@ -17428,7 +17599,7 @@ fi
- if test "x$enable_dlopen" != xyes; then
+ if test yes != "$enable_dlopen"; then
enable_dlopen=unknown
enable_dlopen_self=unknown
enable_dlopen_self_static=unknown
@@ -17438,23 +17609,23 @@ else
case $host_os in
beos*)
- lt_cv_dlopen="load_add_on"
+ lt_cv_dlopen=load_add_on
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
;;
mingw* | pw32* | cegcc*)
- lt_cv_dlopen="LoadLibrary"
+ lt_cv_dlopen=LoadLibrary
lt_cv_dlopen_libs=
;;
cygwin*)
- lt_cv_dlopen="dlopen"
+ lt_cv_dlopen=dlopen
lt_cv_dlopen_libs=
;;
darwin*)
- # if libdl is installed we need to link against it
+ # if libdl is installed we need to link against it
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
if ${ac_cv_lib_dl_dlopen+:} false; then :
@@ -17492,10 +17663,10 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
else
- lt_cv_dlopen="dyld"
+ lt_cv_dlopen=dyld
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
@@ -17503,10 +17674,18 @@ fi
;;
+ tpf*)
+ # Don't try to run any link tests for TPF. We know it's impossible
+ # because TPF is a cross-compiler, and we know how we open DSOs.
+ lt_cv_dlopen=dlopen
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=no
+ ;;
+
*)
ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
if test "x$ac_cv_func_shl_load" = xyes; then :
- lt_cv_dlopen="shl_load"
+ lt_cv_dlopen=shl_load
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
$as_echo_n "checking for shl_load in -ldld... " >&6; }
@@ -17545,11 +17724,11 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
else
ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
if test "x$ac_cv_func_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen"
+ lt_cv_dlopen=dlopen
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
@@ -17588,7 +17767,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
$as_echo_n "checking for dlopen in -lsvld... " >&6; }
@@ -17627,7 +17806,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
$as_echo_n "checking for dld_link in -ldld... " >&6; }
@@ -17666,7 +17845,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+ lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
fi
@@ -17687,21 +17866,21 @@ fi
;;
esac
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
+ if test no = "$lt_cv_dlopen"; then
enable_dlopen=no
+ else
+ enable_dlopen=yes
fi
case $lt_cv_dlopen in
dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ save_CPPFLAGS=$CPPFLAGS
+ test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
- save_LIBS="$LIBS"
+ save_LIBS=$LIBS
LIBS="$lt_cv_dlopen_libs $LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
@@ -17709,7 +17888,7 @@ $as_echo_n "checking whether a program can dlopen itself... " >&6; }
if ${lt_cv_dlopen_self+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then :
+ if test yes = "$cross_compiling"; then :
lt_cv_dlopen_self=cross
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -17756,9 +17935,9 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* 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))
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
int fnord () __attribute__((visibility("default")));
#endif
@@ -17788,7 +17967,7 @@ _LT_EOF
(eval $ac_link) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -17808,14 +17987,14 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
$as_echo "$lt_cv_dlopen_self" >&6; }
- if test "x$lt_cv_dlopen_self" = xyes; then
+ if test yes = "$lt_cv_dlopen_self"; then
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
if ${lt_cv_dlopen_self_static+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then :
+ if test yes = "$cross_compiling"; then :
lt_cv_dlopen_self_static=cross
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -17862,9 +18041,9 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* 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))
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
int fnord () __attribute__((visibility("default")));
#endif
@@ -17894,7 +18073,7 @@ _LT_EOF
(eval $ac_link) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -17915,9 +18094,9 @@ fi
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
+ CPPFLAGS=$save_CPPFLAGS
+ LDFLAGS=$save_LDFLAGS
+ LIBS=$save_LIBS
;;
esac
@@ -17961,7 +18140,7 @@ else
# FIXME - insert some real tests, host_os isn't really good enough
case $host_os in
darwin*)
- if test -n "$STRIP" ; then
+ if test -n "$STRIP"; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -17989,7 +18168,7 @@ fi
- # Report which library types will actually be built
+ # Report what library types will actually be built
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
$as_echo_n "checking if libtool supports shared libraries... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
@@ -17997,13 +18176,13 @@ $as_echo "$can_build_shared" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
$as_echo_n "checking whether to build shared libraries... " >&6; }
- test "$can_build_shared" = "no" && enable_shared=no
+ test no = "$can_build_shared" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
case $host_os in
aix3*)
- test "$enable_shared" = yes && enable_static=no
+ test yes = "$enable_shared" && enable_static=no
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
@@ -18011,8 +18190,12 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
;;
aix[4-9]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -18022,7 +18205,7 @@ $as_echo "$enable_shared" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
$as_echo_n "checking whether to build static libraries... " >&6; }
# Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
+ test yes = "$enable_shared" || enable_static=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
$as_echo "$enable_static" >&6; }
@@ -18036,11 +18219,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-CC="$lt_save_CC"
+CC=$lt_save_CC
- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
+ if test -n "$CXX" && ( test no != "$CXX" &&
+ ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+ (test g++ != "$CXX"))); then
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -18219,7 +18402,7 @@ objext_CXX=$objext
# the CXX compiler isn't working. Some variables (like enable_shared)
# are currently assumed to apply to all compilers on this platform,
# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
+if test yes != "$_lt_caught_CXX_error"; then
# Code to be used in simple compile tests
lt_simple_compile_test_code="int some_variable = 0;"
@@ -18280,46 +18463,39 @@ $RM -r conftest*
CFLAGS=$CXXFLAGS
compiler=$CC
compiler_CXX=$CC
- for cc_temp in $compiler""; do
- case $cc_temp in
- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+ func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
if test -n "$compiler"; then
# We don't want -fno-exception when compiling C++ code, so set the
# no_builtin_flag separately
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
else
lt_prog_compiler_no_builtin_flag_CXX=
fi
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
# Set up default GNU C++ configuration
# Check whether --with-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then :
- withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+ withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
else
with_gnu_ld=no
fi
ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
# Check if gcc -print-prog-name=ld gives a path.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
+ # gcc leaves a trailing carriage return, which upsets mingw
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
*)
ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -18333,7 +18509,7 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
done
- test -z "$LD" && LD="$ac_prog"
+ test -z "$LD" && LD=$ac_prog
;;
"")
# If it fails, then pretend we aren't using GCC.
@@ -18344,7 +18520,7 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
with_gnu_ld=unknown
;;
esac
-elif test "$with_gnu_ld" = yes; then
+elif test yes = "$with_gnu_ld"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
$as_echo_n "checking for GNU ld... " >&6; }
else
@@ -18355,32 +18531,32 @@ if ${lt_cv_path_LD+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
+ lt_cv_path_LD=$ac_dir/$ac_prog
# Check to see if the program is GNU ld. I'd rather use --version,
# but apparently some variants of GNU ld only accept -v.
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break
+ test no != "$with_gnu_ld" && break
;;
*)
- test "$with_gnu_ld" != yes && break
+ test yes != "$with_gnu_ld" && break
;;
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ lt_cv_path_LD=$LD # Let the user override the test with a path.
fi
fi
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
if test -n "$LD"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
$as_echo "$LD" >&6; }
@@ -18416,22 +18592,22 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
- if test "$with_gnu_ld" = yes; then
- archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ if test yes = "$with_gnu_ld"; then
+ archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+ export_dynamic_flag_spec_CXX='$wl--export-dynamic'
# If archive_cmds runs LD, not CC, wlarc should be empty
# XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
# investigate it a little bit more. (MM)
- wlarc='${wl}'
+ wlarc='$wl'
# ancient GNU ld didn't support --whole-archive et. al.
if eval "`$CC -print-prog-name=ld` --help 2>&1" |
$GREP 'no-whole-archive' > /dev/null; then
- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
else
whole_archive_flag_spec_CXX=
fi
@@ -18468,18 +18644,30 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
ld_shlibs_CXX=no
;;
aix[4-9]*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
exp_sym_flag='-Bexport'
- no_entry_flag=""
+ no_entry_flag=
else
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
case $ld_flag in
@@ -18489,6 +18677,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
;;
esac
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -18507,13 +18702,21 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
hardcode_direct_absolute_CXX=yes
hardcode_libdir_separator_CXX=':'
link_all_deplibs_CXX=yes
- file_list_spec_CXX='${wl}-f,'
+ file_list_spec_CXX='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ hardcode_direct_CXX=no
+ hardcode_direct_absolute_CXX=no
+ ;;
+ esac
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
case $host_os in aix4.[012]|aix4.[012].*)
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
+ collect2name=`$CC -print-prog-name=collect2`
if test -f "$collect2name" &&
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
then
@@ -18531,36 +18734,44 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
fi
esac
shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag=$shared_flag' $wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag='$wl-G'
else
- shared_flag='${wl}-bM:SRE'
+ shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
- export_dynamic_flag_spec_CXX='${wl}-bexpall'
+ export_dynamic_flag_spec_CXX='$wl-bexpall'
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to
# export.
always_export_symbols_CXX=yes
- if test "$aix_use_runtimelinking" = yes; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
- allow_undefined_flag_CXX='-berok'
+ # The "-G" linker flag allows undefined symbols.
+ no_undefined_flag_CXX='-bernotok'
# Determine the default libpath from the value encoded in an empty
# executable.
- if test "${lt_cv_aix_libpath+set}" = set; then
+ if test set = "${lt_cv_aix_libpath+set}"; then
aix_libpath=$lt_cv_aix_libpath
else
if ${lt_cv_aix_libpath__CXX+:} false; then :
@@ -18595,7 +18806,7 @@ fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$lt_cv_aix_libpath__CXX"; then
- lt_cv_aix_libpath__CXX="/usr/lib:/lib"
+ lt_cv_aix_libpath__CXX=/usr/lib:/lib
fi
fi
@@ -18603,18 +18814,18 @@ fi
aix_libpath=$lt_cv_aix_libpath__CXX
fi
- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+ hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
else
- if test "$host_cpu" = ia64; then
- hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
+ if test ia64 = "$host_cpu"; then
+ hardcode_libdir_flag_spec_CXX='$wl-R $libdir:/usr/lib:/lib'
allow_undefined_flag_CXX="-z nodefs"
- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an
# empty executable.
- if test "${lt_cv_aix_libpath+set}" = set; then
+ if test set = "${lt_cv_aix_libpath+set}"; then
aix_libpath=$lt_cv_aix_libpath
else
if ${lt_cv_aix_libpath__CXX+:} false; then :
@@ -18649,7 +18860,7 @@ fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test -z "$lt_cv_aix_libpath__CXX"; then
- lt_cv_aix_libpath__CXX="/usr/lib:/lib"
+ lt_cv_aix_libpath__CXX=/usr/lib:/lib
fi
fi
@@ -18657,22 +18868,34 @@ fi
aix_libpath=$lt_cv_aix_libpath__CXX
fi
- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+ hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
- no_undefined_flag_CXX=' ${wl}-bernotok'
- allow_undefined_flag_CXX=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
+ no_undefined_flag_CXX=' $wl-bernotok'
+ allow_undefined_flag_CXX=' $wl-berok'
+ if test yes = "$with_gnu_ld"; then
# We only use this code for GNU lds that support --whole-archive.
- whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive'
else
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_CXX='$convenience'
fi
archive_cmds_need_lc_CXX=yes
- # This is similar to how AIX traditionally builds its shared
- # libraries.
- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ archive_expsym_cmds_CXX='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared
+ # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+ archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_sy [...]
+ else
+ # used by -dlpreopen to get the symbols
+ archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -18682,7 +18905,7 @@ fi
allow_undefined_flag_CXX=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
- archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
else
ld_shlibs_CXX=no
fi
@@ -18710,57 +18933,58 @@ fi
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
- archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- else
- $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- fi~
- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- linknames='
+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+ archive_expsym_cmds_CXX='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 -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
# The linker will not automatically build a static lib if we build a DLL.
# _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
enable_shared_with_static_runtimes_CXX=yes
# Don't use ranlib
old_postinstall_cmds_CXX='chmod 644 $oldlib'
postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
- lt_tool_outputfile="@TOOL_OUTPUT@"~
- case $lt_outputfile in
- *.exe|*.EXE) ;;
- *)
- lt_outputfile="$lt_outputfile.exe"
- lt_tool_outputfile="$lt_tool_outputfile.exe"
- ;;
- esac~
- func_to_tool_file "$lt_outputfile"~
- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- $RM "$lt_outputfile.manifest";
- fi'
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile=$lt_outputfile.exe
+ lt_tool_outputfile=$lt_tool_outputfile.exe
+ ;;
+ esac~
+ func_to_tool_file "$lt_outputfile"~
+ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
;;
*)
# g++
# _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_CXX='-L$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
+ export_dynamic_flag_spec_CXX='$wl--export-all-symbols'
allow_undefined_flag_CXX=unsupported
always_export_symbols_CXX=no
enable_shared_with_static_runtimes_CXX=yes
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file, use it as
+ # is; otherwise, prepend EXPORTS...
+ archive_expsym_cmds_CXX='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;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
ld_shlibs_CXX=no
fi
@@ -18774,27 +18998,27 @@ fi
hardcode_direct_CXX=no
hardcode_automatic_CXX=yes
hardcode_shlibpath_var_CXX=unsupported
- if test "$lt_cv_ld_force_load" = "yes"; then
- whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ if test yes = "$lt_cv_ld_force_load"; then
+ whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
else
whole_archive_flag_spec_CXX=''
fi
link_all_deplibs_CXX=yes
- allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+ allow_undefined_flag_CXX=$_lt_dar_allow_undefined
case $cc_basename in
- ifort*) _lt_dar_can_shared=yes ;;
+ ifort*|nagfor*) _lt_dar_can_shared=yes ;;
*) _lt_dar_can_shared=$GCC ;;
esac
- if test "$_lt_dar_can_shared" = "yes"; then
+ if test yes = "$_lt_dar_can_shared"; then
output_verbose_link_cmd=func_echo_all
- archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
- module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
- if test "$lt_cv_apple_cc_single_mod" != "yes"; then
- archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+ archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+ module_expsym_cmds_CXX="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+ if test yes != "$lt_cv_apple_cc_single_mod"; then
+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+ archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
fi
else
@@ -18803,6 +19027,34 @@ fi
;;
+ os2*)
+ hardcode_libdir_flag_spec_CXX='-L$libdir'
+ hardcode_minus_L_CXX=yes
+ allow_undefined_flag_CXX=unsupported
+ shrext_cmds=.dll
+ archive_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes_CXX=yes
+ ;;
+
dgux*)
case $cc_basename in
ec++*)
@@ -18837,18 +19089,15 @@ fi
ld_shlibs_CXX=yes
;;
- gnu*)
- ;;
-
haiku*)
- archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
link_all_deplibs_CXX=yes
;;
hpux9*)
- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir'
hardcode_libdir_separator_CXX=:
- export_dynamic_flag_spec_CXX='${wl}-E'
+ export_dynamic_flag_spec_CXX='$wl-E'
hardcode_direct_CXX=yes
hardcode_minus_L_CXX=yes # Not in the search PATH,
# but as the default
@@ -18860,7 +19109,7 @@ fi
ld_shlibs_CXX=no
;;
aCC*)
- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -18869,11 +19118,11 @@ fi
# 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 "$GXX" = yes; then
- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ if test yes = "$GXX"; then
+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
@@ -18883,15 +19132,15 @@ fi
;;
hpux10*|hpux11*)
- if test $with_gnu_ld = no; then
- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir'
hardcode_libdir_separator_CXX=:
case $host_cpu in
hppa*64*|ia64*)
;;
*)
- export_dynamic_flag_spec_CXX='${wl}-E'
+ export_dynamic_flag_spec_CXX='$wl-E'
;;
esac
fi
@@ -18917,13 +19166,13 @@ fi
aCC*)
case $host_cpu in
hppa*64*)
- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
ia64*)
- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
esac
# Commands to make compiler produce verbose output that lists
@@ -18934,20 +19183,20 @@ fi
# 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 "$GXX" = yes; then
- if test $with_gnu_ld = no; then
+ if test yes = "$GXX"; then
+ if test no = "$with_gnu_ld"; then
case $host_cpu in
hppa*64*)
- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
ia64*)
- archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
esac
fi
@@ -18962,22 +19211,22 @@ fi
interix[3-9]*)
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- export_dynamic_flag_spec_CXX='${wl}-E'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+ export_dynamic_flag_spec_CXX='$wl-E'
# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
# Instead, shared libraries are loaded at an image base (0x10000000 by
# default) and relocated if they conflict, which is a slow very memory
# consuming and fragmenting process. To avoid this, we pick a random,
# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
# time. Moving up from 0x10000000 also allows more sbrk(2) space.
- archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_expsym_cmds_CXX='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
irix5* | irix6*)
case $cc_basename in
CC*)
# SGI C++
- archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
@@ -18986,22 +19235,22 @@ fi
old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
;;
*)
- if test "$GXX" = yes; then
- if test "$with_gnu_ld" = no; then
- archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GXX"; then
+ if test no = "$with_gnu_ld"; then
+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
else
- archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
fi
fi
link_all_deplibs_CXX=yes
;;
esac
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
hardcode_libdir_separator_CXX=:
inherit_rpath_CXX=yes
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -19009,8 +19258,8 @@ fi
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
- archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -19019,10 +19268,10 @@ fi
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+ export_dynamic_flag_spec_CXX='$wl--export-dynamic'
# Archives containing C++ object files must be created using
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
@@ -19036,59 +19285,59 @@ fi
# earlier do not add the objects themselves.
case `$CC -V 2>&1` in
*"Version 7."*)
- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
*) # Version 8.0 or newer
tmp_idyn=
case $host_cpu in
ia64*) tmp_idyn=' -i_dynamic';;
esac
- archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
esac
archive_cmds_need_lc_CXX=no
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+ export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+ whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive'
;;
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
*pgCC\ [1-5].* | *pgcpp\ [1-5].*)
prelink_cmds_CXX='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
- compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
old_archive_cmds_CXX='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
- $RANLIB $oldlib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+ $RANLIB $oldlib'
archive_cmds_CXX='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
archive_expsym_cmds_CXX='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
*) # Version 6 and above use weak symbols
- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
esac
- hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ hardcode_libdir_flag_spec_CXX='$wl--rpath $wl$libdir'
+ export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+ whole_archive_flag_spec_CXX='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
;;
cxx*)
# Compaq C++
- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols'
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
@@ -19102,18 +19351,18 @@ fi
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
;;
xl* | mpixl* | bgxl*)
# IBM XL 8.0 on PPC, with GNU ld
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+ export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+ archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ if test yes = "$supports_anon_versioning"; then
archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
fi
;;
*)
@@ -19121,10 +19370,10 @@ fi
*Sun\ C*)
# Sun C++ 5.9
no_undefined_flag_CXX=' -zdefs'
- archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+ archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
hardcode_libdir_flag_spec_CXX='-R$libdir'
- whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
compiler_needs_object_CXX=yes
# Not sure whether something based on
@@ -19182,22 +19431,17 @@ fi
ld_shlibs_CXX=yes
;;
- openbsd2*)
- # C++ shared libraries are fairly broken
- ld_shlibs_CXX=no
- ;;
-
- openbsd*)
+ openbsd* | bitrig*)
if test -f /usr/libexec/ld.so; then
hardcode_direct_CXX=yes
hardcode_shlibpath_var_CXX=no
hardcode_direct_absolute_CXX=yes
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
- export_dynamic_flag_spec_CXX='${wl}-E'
- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+ export_dynamic_flag_spec_CXX='$wl-E'
+ whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
fi
output_verbose_link_cmd=func_echo_all
else
@@ -19213,9 +19457,9 @@ fi
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
hardcode_libdir_separator_CXX=:
# Archives containing C++ object files must be created using
@@ -19233,17 +19477,17 @@ fi
cxx*)
case $host in
osf3*)
- allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*'
+ archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
;;
*)
allow_undefined_flag_CXX=' -expect_unresolved \*'
- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
- $RM $lib.exp'
+ echo "-hidden">> $lib.exp~
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
+ $RM $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
;;
esac
@@ -19258,21 +19502,21 @@ fi
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+ if test yes,no = "$GXX,$with_gnu_ld"; then
+ allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*'
case $host in
osf3*)
- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds_CXX='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
;;
*)
- archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
;;
esac
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
hardcode_libdir_separator_CXX=:
# Commands to make compiler produce verbose output that lists
@@ -19318,9 +19562,9 @@ fi
# Sun C++ 4.2, 5.x and Centerline C++
archive_cmds_need_lc_CXX=yes
no_undefined_flag_CXX=' -zdefs'
- archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
hardcode_libdir_flag_spec_CXX='-R$libdir'
hardcode_shlibpath_var_CXX=no
@@ -19328,7 +19572,7 @@ fi
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
# The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'.
+ # but understands '-z linker_flag'.
# Supported since Solaris 2.6 (maybe 2.5.1?)
whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
;;
@@ -19345,30 +19589,30 @@ fi
;;
gcx*)
# Green Hills C++ Compiler
- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
;;
*)
# GNU C++ compiler with Solaris linker
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
+ if test yes,no = "$GXX,$with_gnu_ld"; then
+ no_undefined_flag_CXX=' $wl-z ${wl}defs'
if $CC --version | $GREP -v '^2\.7' > /dev/null; then
- archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
else
- # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ # g++ 2.7 appears to require '-G' NOT '-shared' on this
# platform.
- archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ archive_cmds_CXX='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
@@ -19376,11 +19620,11 @@ fi
output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
fi
- hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir'
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ whole_archive_flag_spec_CXX='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
;;
esac
fi
@@ -19389,52 +19633,52 @@ fi
;;
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
- no_undefined_flag_CXX='${wl}-z,text'
+ no_undefined_flag_CXX='$wl-z,text'
archive_cmds_need_lc_CXX=no
hardcode_shlibpath_var_CXX=no
runpath_var='LD_RUN_PATH'
case $cc_basename in
CC*)
- archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
;;
sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
+ # Note: We CANNOT use -z defs as we might desire, because we do not
# link with -lc, and that would cause any symbols used from libc to
# always be unresolved, which means just about no library would
# ever link correctly. If we're not using GNU ld we use -z text
# though, which does catch some bad symbols but isn't as heavy-handed
# as -z defs.
- no_undefined_flag_CXX='${wl}-z,text'
- allow_undefined_flag_CXX='${wl}-z,nodefs'
+ no_undefined_flag_CXX='$wl-z,text'
+ allow_undefined_flag_CXX='$wl-z,nodefs'
archive_cmds_need_lc_CXX=no
hardcode_shlibpath_var_CXX=no
- hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl-R,$libdir'
hardcode_libdir_separator_CXX=':'
link_all_deplibs_CXX=yes
- export_dynamic_flag_spec_CXX='${wl}-Bexport'
+ export_dynamic_flag_spec_CXX='$wl-Bexport'
runpath_var='LD_RUN_PATH'
case $cc_basename in
CC*)
- archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
- '"$old_archive_cmds_CXX"
+ '"$old_archive_cmds_CXX"
reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
- '"$reload_cmds_CXX"
+ '"$reload_cmds_CXX"
;;
*)
- archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
;;
@@ -19466,10 +19710,10 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
$as_echo "$ld_shlibs_CXX" >&6; }
- test "$ld_shlibs_CXX" = no && can_build_shared=no
+ test no = "$ld_shlibs_CXX" && can_build_shared=no
- GCC_CXX="$GXX"
- LD_CXX="$LD"
+ GCC_CXX=$GXX
+ LD_CXX=$LD
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
@@ -19513,13 +19757,13 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
pre_test_object_deps_done=no
for p in `eval "$output_verbose_link_cmd"`; do
- case ${prev}${p} in
+ case $prev$p in
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
# Remove the space.
- if test $p = "-L" ||
- test $p = "-R"; then
+ if test x-L = "$p" ||
+ test x-R = "$p"; then
prev=$p
continue
fi
@@ -19535,16 +19779,16 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
case $p in
=*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
esac
- if test "$pre_test_object_deps_done" = no; then
- case ${prev} in
+ if test no = "$pre_test_object_deps_done"; then
+ case $prev in
-L | -R)
# Internal compiler library paths should come after those
# provided the user. The postdeps already come after the
# user supplied libs so there is no need to process them.
if test -z "$compiler_lib_search_path_CXX"; then
- compiler_lib_search_path_CXX="${prev}${p}"
+ compiler_lib_search_path_CXX=$prev$p
else
- compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
+ compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} $prev$p"
fi
;;
# The "-l" case would never come before the object being
@@ -19552,9 +19796,9 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
esac
else
if test -z "$postdeps_CXX"; then
- postdeps_CXX="${prev}${p}"
+ postdeps_CXX=$prev$p
else
- postdeps_CXX="${postdeps_CXX} ${prev}${p}"
+ postdeps_CXX="${postdeps_CXX} $prev$p"
fi
fi
prev=
@@ -19569,15 +19813,15 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
continue
fi
- if test "$pre_test_object_deps_done" = no; then
+ if test no = "$pre_test_object_deps_done"; then
if test -z "$predep_objects_CXX"; then
- predep_objects_CXX="$p"
+ predep_objects_CXX=$p
else
predep_objects_CXX="$predep_objects_CXX $p"
fi
else
if test -z "$postdep_objects_CXX"; then
- postdep_objects_CXX="$p"
+ postdep_objects_CXX=$p
else
postdep_objects_CXX="$postdep_objects_CXX $p"
fi
@@ -19607,51 +19851,6 @@ interix[3-9]*)
postdep_objects_CXX=
postdeps_CXX=
;;
-
-linux*)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C++ 5.9
-
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- if test "$solaris_use_stlport4" != yes; then
- postdeps_CXX='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
-
-solaris*)
- case $cc_basename in
- CC* | sunCC*)
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- # Adding this requires a known-good setup of shared libraries for
- # Sun compiler versions before 5.6, else PIC objects from an old
- # archive will be linked into the output, leading to subtle bugs.
- if test "$solaris_use_stlport4" != yes; then
- postdeps_CXX='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
esac
@@ -19660,7 +19859,7 @@ case " $postdeps_CXX " in
esac
compiler_lib_search_dirs_CXX=
if test -n "${compiler_lib_search_path_CXX}"; then
- compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | $SED -e 's! -L! !g' -e 's!^ !!'`
fi
@@ -19699,17 +19898,18 @@ lt_prog_compiler_static_CXX=
# C++ specific cases for pic, static, wl, etc.
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-static'
case $host_os in
aix*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
lt_prog_compiler_static_CXX='-Bstatic'
fi
+ lt_prog_compiler_pic_CXX='-fPIC'
;;
amigaos*)
@@ -19720,8 +19920,8 @@ lt_prog_compiler_static_CXX=
;;
m68k)
# FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
+ # adding the '-m68020' flag to GCC prevents building anything better,
+ # like '-m68040'.
lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
;;
esac
@@ -19736,6 +19936,11 @@ lt_prog_compiler_static_CXX=
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static_CXX='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
# PIC is the default on this platform
@@ -19785,7 +19990,7 @@ lt_prog_compiler_static_CXX=
case $host_os in
aix[4-9]*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
lt_prog_compiler_static_CXX='-Bstatic'
else
@@ -19825,14 +20030,14 @@ lt_prog_compiler_static_CXX=
case $cc_basename in
CC*)
lt_prog_compiler_wl_CXX='-Wl,'
- lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
- if test "$host_cpu" != ia64; then
+ lt_prog_compiler_static_CXX='$wl-a ${wl}archive'
+ if test ia64 != "$host_cpu"; then
lt_prog_compiler_pic_CXX='+Z'
fi
;;
aCC*)
lt_prog_compiler_wl_CXX='-Wl,'
- lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+ lt_prog_compiler_static_CXX='$wl-a ${wl}archive'
case $host_cpu in
hppa*64*|ia64*)
# +Z the default
@@ -19861,7 +20066,7 @@ lt_prog_compiler_static_CXX=
;;
esac
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -19869,7 +20074,7 @@ lt_prog_compiler_static_CXX=
lt_prog_compiler_pic_CXX='-fPIC'
;;
ecpc* )
- # old Intel C++ for x86_64 which still supported -KPIC.
+ # old Intel C++ for x86_64, which still supported -KPIC.
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-static'
@@ -19925,7 +20130,7 @@ lt_prog_compiler_static_CXX=
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -20014,7 +20219,7 @@ lt_prog_compiler_static_CXX=
fi
case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
+ # For platforms that do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
;;
@@ -20046,7 +20251,7 @@ else
lt_cv_prog_compiler_pic_works_CXX=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+ lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" ## exclude from sc_useless_quotes_in_assignment
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
# Note that $ac_compile itself does not contain backslashes and begins
@@ -20076,7 +20281,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
-if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
+if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then
case $lt_prog_compiler_pic_CXX in
"" | " "*) ;;
*) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
@@ -20102,7 +20307,7 @@ if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works_CXX=no
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -20121,13 +20326,13 @@ else
fi
fi
$RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
-if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
+if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then
:
else
lt_prog_compiler_static_CXX=
@@ -20241,8 +20446,8 @@ $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o_CXX" && test no != "$need_locks"; then
# do not overwrite the value of need_locks provided by the user
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
$as_echo_n "checking if we can lock with hard links... " >&6; }
@@ -20254,9 +20459,9 @@ $as_echo_n "checking if we can lock with hard links... " >&6; }
ln conftest.a conftest.b 2>/dev/null && hard_links=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
$as_echo "$hard_links" >&6; }
- if test "$hard_links" = no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ if test no = "$hard_links"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
need_locks=warn
fi
else
@@ -20273,17 +20478,21 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
case $host_os in
aix[4-9]*)
# If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global defined
- # symbols, whereas GNU nm marks them as "W".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
;;
pw32*)
- export_symbols_cmds_CXX="$ltdll_cmds"
+ export_symbols_cmds_CXX=$ltdll_cmds
;;
cygwin* | mingw* | cegcc*)
case $cc_basename in
@@ -20296,6 +20505,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
;;
esac
;;
+ linux* | k*bsd*-gnu | gnu*)
+ link_all_deplibs_CXX=no
+ ;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -20303,7 +20515,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
$as_echo "$ld_shlibs_CXX" >&6; }
-test "$ld_shlibs_CXX" = no && can_build_shared=no
+test no = "$ld_shlibs_CXX" && can_build_shared=no
with_gnu_ld_CXX=$with_gnu_ld
@@ -20320,7 +20532,7 @@ x|xyes)
# Assume -lc should be added
archive_cmds_need_lc_CXX=yes
- if test "$enable_shared" = yes && test "$GCC" = yes; then
+ if test yes,yes = "$GCC,$enable_shared"; then
case $archive_cmds_CXX in
*'~'*)
# FIXME: we may have to deal with multi-command sequences.
@@ -20448,7 +20660,7 @@ $as_echo_n "checking dynamic linker characteristics... " >&6; }
library_names_spec=
libname_spec='lib$name'
soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
@@ -20465,14 +20677,16 @@ hardcode_into_libs=no
# flags to be left without arguments
need_version=unknown
+
+
case $host_os in
aix3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
shlibpath_var=LIBPATH
# AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
+ soname_spec='$libname$release$shared_ext$major'
;;
aix[4-9]*)
@@ -20480,41 +20694,91 @@ aix[4-9]*)
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
else
# With GCC up to 2.95.x, collect2 would create an import file
# for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
+ # the line '#! .'. This would cause the generated library to
+ # depend on '.', always an invalid library. This was fixed in
# development snapshots of GCC prior to 3.0.
case $host_os in
aix4 | aix4.[01] | aix4.[01].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes '
- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
:
else
can_build_shared=no
fi
;;
esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # Using Import Files as archive members, it is possible to support
+ # filename-based versioning of shared library archives on AIX. While
+ # this would work for both with and without runtime linking, it will
+ # prevent static linking of such archives. So we do filename-based
+ # shared library versioning with .so extension only, which is used
+ # when both runtime linking and shared linking is enabled.
+ # Unfortunately, runtime linking may impact performance, so we do
+ # not want this to be the default eventually. Also, we use the
+ # versioned .so libs for executables only if there is the -brtl
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+ # To allow for filename-based versioning support, we need to create
+ # libNAME.so.V as an archive file, containing:
+ # *) an Import File, referring to the versioned filename of the
+ # archive as well as the shared archive member, telling the
+ # bitwidth (32 or 64) of that shared object, and providing the
+ # list of exported symbols of that shared object, eventually
+ # decorated with the 'weak' keyword
+ # *) the shared object with the F_LOADONLY flag set, to really avoid
+ # it being seen by the linker.
+ # At run time we better use the real file rather than another symlink,
+ # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+ case $with_aix_soname,$aix_use_runtimelinking in
+ # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
# soname into executable. Probably we can add versioning support to
# collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
+ aix,yes) # traditional libtool
+ dynamic_linker='AIX unversionable lib.so'
# If using run time linking (on AIX 4.2 or later) use lib<name>.so
# instead of lib<name>.a to let people know that these are not
# typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ ;;
+ aix,no) # traditional AIX only
+ dynamic_linker='AIX lib.a(lib.so.V)'
# We preserve .a as extension for shared libraries through AIX4.2
# and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ ;;
+ svr4,*) # full svr4 only
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,yes) # both, prefer svr4
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # unpreferred sharedlib libNAME.a needs extra handling
+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,no) # both, prefer aix
+ dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+ ;;
+ esac
shlibpath_var=LIBPATH
fi
;;
@@ -20524,18 +20788,18 @@ amigaos*)
powerpc)
# Since July 2007 AmigaOS4 officially supports .so libraries.
# When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
;;
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
;;
esac
;;
beos*)
- library_names_spec='${libname}${shared_ext}'
+ library_names_spec='$libname$shared_ext'
dynamic_linker="$host_os ld.so"
shlibpath_var=LIBRARY_PATH
;;
@@ -20543,8 +20807,8 @@ beos*)
bsdi[45]*)
version_type=linux # correct to gnu/linux during the next big refactor
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -20556,7 +20820,7 @@ bsdi[45]*)
cygwin* | mingw* | pw32* | cegcc*)
version_type=windows
- shrext_cmds=".dll"
+ shrext_cmds=.dll
need_version=no
need_lib_prefix=no
@@ -20565,8 +20829,8 @@ cygwin* | mingw* | pw32* | cegcc*)
# gcc
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
$install_prog $dir/$dlname \$dldir/$dlname~
@@ -20582,16 +20846,16 @@ cygwin* | mingw* | pw32* | cegcc*)
case $host_os in
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
;;
esac
dynamic_linker='Win32 ld.exe'
@@ -20600,8 +20864,8 @@ cygwin* | mingw* | pw32* | cegcc*)
*,cl*)
# Native MSVC
libname_spec='$name'
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- library_names_spec='${libname}.dll.lib'
+ soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+ library_names_spec='$libname.dll.lib'
case $build_os in
mingw*)
@@ -20628,7 +20892,7 @@ cygwin* | mingw* | pw32* | cegcc*)
sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
;;
*)
- sys_lib_search_path_spec="$LIB"
+ sys_lib_search_path_spec=$LIB
if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
# It is most probably a Windows format PATH.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
@@ -20641,8 +20905,8 @@ cygwin* | mingw* | pw32* | cegcc*)
esac
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
$install_prog $dir/$dlname \$dldir/$dlname'
@@ -20655,7 +20919,7 @@ cygwin* | mingw* | pw32* | cegcc*)
*)
# Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
dynamic_linker='Win32 ld.exe'
;;
esac
@@ -20668,8 +20932,8 @@ darwin* | rhapsody*)
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
+ library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$major$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -20681,8 +20945,8 @@ dgux*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
- soname_spec='${libname}${release}${shared_ext}$major'
+ 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
;;
@@ -20700,12 +20964,13 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
need_version=no
need_lib_prefix=no
;;
freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
need_version=yes
;;
esac
@@ -20730,26 +20995,15 @@ freebsd* | dragonfly*)
esac
;;
-gnu*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
dynamic_linker="$host_os runtime_loader"
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
+ shlibpath_overrides_runpath=no
sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
hardcode_into_libs=yes
;;
@@ -20767,14 +21021,15 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ if test 32 = "$HPUX_IA64_MODE"; then
sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux32
else
sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux64
fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
shrext_cmds='.sl'
@@ -20782,8 +21037,8 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
@@ -20792,8 +21047,8 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
;;
esac
# HP-UX runs *really* slowly unless shared libraries are mode 555, ...
@@ -20806,8 +21061,8 @@ interix[3-9]*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -20818,7 +21073,7 @@ irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
*)
- if test "$lt_cv_prog_gnu_ld" = yes; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
version_type=linux # correct to gnu/linux during the next big refactor
else
version_type=irix
@@ -20826,8 +21081,8 @@ irix5* | irix6* | nonstopux*)
esac
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
case $host_os in
irix5* | nonstopux*)
libsuff= shlibsuff=
@@ -20846,8 +21101,8 @@ irix5* | irix6* | nonstopux*)
esac
shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+ sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
hardcode_into_libs=yes
;;
@@ -20856,13 +21111,33 @@ linux*oldld* | linux*aout* | linux*coff*)
dynamic_linker=no
;;
+linux*android*)
+ version_type=none # Android doesn't support versioned libraries.
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='$libname$release$shared_ext'
+ soname_spec='$libname$release$shared_ext'
+ finish_cmds=
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+ dynamic_linker='Android linker'
+ # Don't embed -rpath directories since the linker doesn't support them.
+ hardcode_libdir_flag_spec_CXX='-L$libdir'
+ ;;
+
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -20906,14 +21181,15 @@ fi
# before this can be enabled.
hardcode_into_libs=yes
- # Add ABI-specific directories to the system library path.
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
- # Append ld.so.conf contents to the search path
+ # Ideally, we could use ldconfig to report *all* directores which are
+ # searched for libraries, however this is still not possible. Aside from not
+ # being certain /sbin/ldconfig is available, command
+ # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+ # even though it is searched at run-time. Try to do the best guess by
+ # appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -20925,17 +21201,29 @@ fi
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
need_version=no
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='NetBSD ld.elf_so'
fi
shlibpath_var=LD_LIBRARY_PATH
@@ -20945,7 +21233,7 @@ netbsd*)
newsos6)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
;;
@@ -20954,58 +21242,68 @@ newsos6)
version_type=qnx
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
dynamic_linker='ldqnx.so'
;;
-openbsd*)
+openbsd* | bitrig*)
version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib
need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
- esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[89] | openbsd2.[89].*)
- shlibpath_overrides_runpath=no
- ;;
- *)
- shlibpath_overrides_runpath=yes
- ;;
- esac
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+ need_version=no
else
- shlibpath_overrides_runpath=yes
+ need_version=yes
fi
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
;;
os2*)
libname_spec='$name'
- shrext_cmds=".dll"
+ version_type=windows
+ shrext_cmds=.dll
+ need_version=no
need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
+ # OS/2 can only load a DLL with a base name of 8 characters or less.
+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+ v=$($ECHO $release$versuffix | tr -d .-);
+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+ $ECHO $n$v`$shared_ext'
+ library_names_spec='${libname}_dll.$libext'
dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
+ shlibpath_var=BEGINLIBPATH
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
;;
osf3* | osf4* | osf5*)
version_type=osf
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
rdos*)
@@ -21016,8 +21314,8 @@ solaris*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
@@ -21027,11 +21325,11 @@ solaris*)
sunos4*)
version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
need_lib_prefix=no
fi
need_version=yes
@@ -21039,8 +21337,8 @@ sunos4*)
sysv4 | sysv4.3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
case $host_vendor in
sni)
@@ -21061,24 +21359,24 @@ sysv4 | sysv4.3*)
;;
sysv4*MP*)
- if test -d /usr/nec ;then
+ if test -d /usr/nec; then
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
+ library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+ soname_spec='$libname$shared_ext.$major'
shlibpath_var=LD_LIBRARY_PATH
fi
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
+ version_type=sco
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
else
sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -21096,7 +21394,7 @@ tpf*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -21104,8 +21402,8 @@ tpf*)
uts4*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ 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
;;
@@ -21115,20 +21413,32 @@ uts4*)
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+ sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+ sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
@@ -21171,15 +21481,15 @@ $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" ||
test -n "$runpath_var_CXX" ||
- test "X$hardcode_automatic_CXX" = "Xyes" ; then
+ test yes = "$hardcode_automatic_CXX"; then
# We can hardcode non-existent directories.
- if test "$hardcode_direct_CXX" != no &&
+ if test no != "$hardcode_direct_CXX" &&
# If the only mechanism to avoid hardcoding is shlibpath_var, we
# have to relink, otherwise we might link with an installed library
# when we should be linking with a yet-to-be-installed one
- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
- test "$hardcode_minus_L_CXX" != no; then
+ ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" &&
+ test no != "$hardcode_minus_L_CXX"; then
# Linking always hardcodes the temporary library directory.
hardcode_action_CXX=relink
else
@@ -21194,12 +21504,12 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
$as_echo "$hardcode_action_CXX" >&6; }
-if test "$hardcode_action_CXX" = relink ||
- test "$inherit_rpath_CXX" = yes; then
+if test relink = "$hardcode_action_CXX" ||
+ test yes = "$inherit_rpath_CXX"; then
# Fast installation is not supported
enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+ test no = "$enable_shared"; then
# Fast installation is not necessary
enable_fast_install=needless
fi
@@ -21222,7 +21532,7 @@ fi
lt_cv_path_LD=$lt_save_path_LD
lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
+fi # test yes != "$_lt_caught_CXX_error"
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -24275,7 +24585,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -24321,7 +24631,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -24345,7 +24655,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -24390,7 +24700,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -24414,7 +24724,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -25053,12 +25363,12 @@ if test -n "$LIBCHECK_CFLAGS"; then
pkg_cv_LIBCHECK_CFLAGS="$LIBCHECK_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" check \""; } >&5
- ($PKG_CONFIG --exists --print-errors " check ") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" check >= 0.9.10 \""; } >&5
+ ($PKG_CONFIG --exists --print-errors " check >= 0.9.10 ") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LIBCHECK_CFLAGS=`$PKG_CONFIG --cflags " check " 2>/dev/null`
+ pkg_cv_LIBCHECK_CFLAGS=`$PKG_CONFIG --cflags " check >= 0.9.10 " 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -25070,12 +25380,12 @@ if test -n "$LIBCHECK_LIBS"; then
pkg_cv_LIBCHECK_LIBS="$LIBCHECK_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" check \""; } >&5
- ($PKG_CONFIG --exists --print-errors " check ") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" check >= 0.9.10 \""; } >&5
+ ($PKG_CONFIG --exists --print-errors " check >= 0.9.10 ") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LIBCHECK_LIBS=`$PKG_CONFIG --libs " check " 2>/dev/null`
+ pkg_cv_LIBCHECK_LIBS=`$PKG_CONFIG --libs " check >= 0.9.10 " 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -25096,9 +25406,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBCHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " check " 2>&1`
+ LIBCHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " check >= 0.9.10 " 2>&1`
else
- LIBCHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " check " 2>&1`
+ LIBCHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " check >= 0.9.10 " 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBCHECK_PKG_ERRORS" >&5
@@ -25120,7 +25430,7 @@ else
fi
if test "x$enable_tests" = "xyes" && test "x$HAVE_LIBCHECK" = "x0"; then :
- as_fn_error $? "*** check library not found" "$LINENO" 5
+ as_fn_error $? "*** check library not found or too old" "$LINENO" 5
fi
if test "x$HAVE_LIBCHECK" = x1; then
@@ -25132,100 +25442,6 @@ else
fi
-#### json parsing ####
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBJSON" >&5
-$as_echo_n "checking for LIBJSON... " >&6; }
-
-if test -n "$LIBJSON_CFLAGS"; then
- pkg_cv_LIBJSON_CFLAGS="$LIBJSON_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" json-c >= 0.11 \""; } >&5
- ($PKG_CONFIG --exists --print-errors " json-c >= 0.11 ") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_LIBJSON_CFLAGS=`$PKG_CONFIG --cflags " json-c >= 0.11 " 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$LIBJSON_LIBS"; then
- pkg_cv_LIBJSON_LIBS="$LIBJSON_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" json-c >= 0.11 \""; } >&5
- ($PKG_CONFIG --exists --print-errors " json-c >= 0.11 ") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_LIBJSON_LIBS=`$PKG_CONFIG --libs " json-c >= 0.11 " 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- LIBJSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " json-c >= 0.11 " 2>&1`
- else
- LIBJSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " json-c >= 0.11 " 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBJSON_PKG_ERRORS" >&5
-
- as_fn_error $? "Package requirements ( json-c >= 0.11 ) were not met:
-
-$LIBJSON_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables LIBJSON_CFLAGS
-and LIBJSON_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables LIBJSON_CFLAGS
-and LIBJSON_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
- LIBJSON_CFLAGS=$pkg_cv_LIBJSON_CFLAGS
- LIBJSON_LIBS=$pkg_cv_LIBJSON_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
#### Sound file ####
@@ -27841,139 +28057,6 @@ $as_echo "#define HAVE_SOXR 1" >>confdefs.h
fi
-#### Xen support (optional) ####
-
-# Check whether --enable-xen was given.
-if test "${enable_xen+set}" = set; then :
- enableval=$enable_xen;
-fi
-
-
-XEN_CFLAGS=
-XEN_LIBS=
-
-if test "x$enable_xen" != "xno"; then :
-
- HAVE_XEN=1
- ac_fn_c_check_header_mongrel "$LINENO" "xenctrl.h" "ac_cv_header_xenctrl_h" "$ac_includes_default"
-if test "x$ac_cv_header_xenctrl_h" = xyes; then :
-
-else
- HAVE_XEN=0
-fi
-
-
- ac_fn_c_check_header_mongrel "$LINENO" "xs.h" "ac_cv_header_xs_h" "$ac_includes_default"
-if test "x$ac_cv_header_xs_h" = xyes; then :
-
-else
- HAVE_XEN=0
-fi
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xc_interface_open in -lxenctrl" >&5
-$as_echo_n "checking for xc_interface_open in -lxenctrl... " >&6; }
-if ${ac_cv_lib_xenctrl_xc_interface_open+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lxenctrl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char xc_interface_open ();
-int
-main ()
-{
-return xc_interface_open ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_xenctrl_xc_interface_open=yes
-else
- ac_cv_lib_xenctrl_xc_interface_open=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xenctrl_xc_interface_open" >&5
-$as_echo "$ac_cv_lib_xenctrl_xc_interface_open" >&6; }
-if test "x$ac_cv_lib_xenctrl_xc_interface_open" = xyes; then :
- XEN_LIBS="$XEN_LIBS -lxenctrl"
-else
- HAVE_XEN=0
-fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xs_domain_open in -lxenstore" >&5
-$as_echo_n "checking for xs_domain_open in -lxenstore... " >&6; }
-if ${ac_cv_lib_xenstore_xs_domain_open+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lxenstore $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char xs_domain_open ();
-int
-main ()
-{
-return xs_domain_open ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_xenstore_xs_domain_open=yes
-else
- ac_cv_lib_xenstore_xs_domain_open=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xenstore_xs_domain_open" >&5
-$as_echo "$ac_cv_lib_xenstore_xs_domain_open" >&6; }
-if test "x$ac_cv_lib_xenstore_xs_domain_open" = xyes; then :
- XEN_LIBS="$XEN_LIBS -lxenstore"
-else
- HAVE_XEN=0
-fi
-
-
-else
- HAVE_XEN=0
-fi
-
-if test "x$enable_xen" = "xyes" && test "x$HAVE_XEN" = "x0"; then :
- as_fn_error $? "*** Xen development headers or libraries not found" "$LINENO" 5
-fi
-
-
-
- if test "x$HAVE_XEN" = x1; then
- HAVE_XEN_TRUE=
- HAVE_XEN_FALSE='#'
-else
- HAVE_XEN_TRUE='#'
- HAVE_XEN_FALSE=
-fi
-
#### gcov support (optional) #####
@@ -28840,6 +28923,10 @@ if test "${enable_webrtc_aec+set}" = set; then :
fi
+if test "x$enable_webrtc_aec" = "xyes" && test "$HAVE_CXX11" = "0"; then :
+ as_fn_error $? "*** webrtc-audio-processing needs C++11 support" "$LINENO" 5
+fi
+
if test "x$enable_webrtc_aec" != "xno"; then :
pkg_failed=no
@@ -29487,10 +29574,6 @@ if test -z "${HAVE_SOXR_TRUE}" && test -z "${HAVE_SOXR_FALSE}"; then
as_fn_error $? "conditional \"HAVE_SOXR\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${HAVE_XEN_TRUE}" && test -z "${HAVE_XEN_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_XEN\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${HAVE_GCOV_TRUE}" && test -z "${HAVE_GCOV_FALSE}"; then
as_fn_error $? "conditional \"HAVE_GCOV\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -29940,7 +30023,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by pulseaudio $as_me 9.0, which was
+This file was extended by pulseaudio $as_me 9.99.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -30007,7 +30090,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-pulseaudio config.status 9.0
+pulseaudio config.status 9.99.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -30152,6 +30235,7 @@ enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
@@ -30199,10 +30283,13 @@ compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`'
lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
@@ -30267,7 +30354,8 @@ finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
@@ -30373,9 +30461,12 @@ CFLAGS \
compiler \
lt_cv_sys_global_symbol_pipe \
lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_import \
lt_cv_sys_global_symbol_to_c_name_address \
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+lt_cv_nm_interface \
nm_file_list_spec \
+lt_cv_truncate_bin \
lt_prog_compiler_no_builtin_flag \
lt_prog_compiler_pic \
lt_prog_compiler_wl \
@@ -30441,7 +30532,7 @@ postdeps_CXX \
compiler_lib_search_path_CXX; do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -30468,7 +30559,8 @@ postinstall_cmds \
postuninstall_cmds \
finish_cmds \
sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec \
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path \
reload_cmds_CXX \
old_archive_cmds_CXX \
old_archive_from_new_cmds_CXX \
@@ -30482,7 +30574,7 @@ prelink_cmds_CXX \
postlink_cmds_CXX; do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -30491,19 +30583,16 @@ postlink_cmds_CXX; do
done
ac_aux_dir='$ac_aux_dir'
-xsi_shell='$xsi_shell'
-lt_shell_append='$lt_shell_append'
-# See if we are running on zsh, and set the options which allow our
+# See if we are running on zsh, and set the options that allow our
# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
+if test -n "\${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
PACKAGE='$PACKAGE'
VERSION='$VERSION'
- TIMESTAMP='$TIMESTAMP'
RM='$RM'
ofile='$ofile'
@@ -31360,55 +31449,52 @@ $as_echo X"$file" |
done ;;
"libtool":C)
- # See if we are running on zsh, and set the options which allow our
+ # See if we are running on zsh, and set the options that allow our
# commands through without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
+ if test -n "${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
- cfgfile="${ofile}T"
+ cfgfile=${ofile}T
trap "$RM \"$cfgfile\"; exit 1" 1 2 15
$RM "$cfgfile"
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# Generated automatically by $as_me ($PACKAGE) $VERSION
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of of the License, or
+# (at your option) any later version.
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the same
+# distribution terms that you use for the rest of that program.
#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# The names of the tagged configurations supported by this script.
-available_tags="CXX "
+available_tags='CXX '
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
# ### BEGIN LIBTOOL CONFIG
@@ -31437,6 +31523,9 @@ pic_mode=$pic_mode
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
+
# Shell to use when invoking shell scripts.
SHELL=$lt_SHELL
@@ -31548,18 +31637,27 @@ global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
# Transform the output of nm in a proper C declaration.
global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+# Transform the output of nm into a list of symbols to manually relocate.
+global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
+
# Transform the output of nm in a C name address pair.
global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
# Transform the output of nm in a C name address pair when lib prefix is needed.
global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+# The name lister interface.
+nm_interface=$lt_lt_cv_nm_interface
+
# Specify filename containing input files for \$NM.
nm_file_list_spec=$lt_nm_file_list_spec
-# The root where to search for dependent libraries,and in which our libraries should be installed.
+# The root where to search for dependent libraries,and where our libraries should be installed.
lt_sysroot=$lt_sysroot
+# Command to truncate a binary pipe.
+lt_truncate_bin=$lt_lt_cv_truncate_bin
+
# The name of the directory that contains temporary libtool files.
objdir=$objdir
@@ -31650,8 +31748,11 @@ hardcode_into_libs=$hardcode_into_libs
# Compile-time system search path for libraries.
sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
# Whether dlopen is supported.
dlopen_support=$enable_dlopen
@@ -31744,13 +31845,13 @@ hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
# Whether we need a single "-rpath" flag with a separated argument.
hardcode_libdir_separator=$lt_hardcode_libdir_separator
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
# DIR into the resulting binary.
hardcode_direct=$hardcode_direct
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# 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
@@ -31816,13 +31917,72 @@ compiler_lib_search_path=$lt_compiler_lib_search_path
_LT_EOF
+ cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+# string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+# string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+# "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+# VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+ case x$2 in
+ x)
+ ;;
+ *:)
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+ ;;
+ x:*)
+ eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+ ;;
+ *::*)
+ eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+ eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+ ;;
+ *)
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+ ;;
+ esac
+}
+
+
+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+ for cc_temp in $*""; do
+ case $cc_temp in
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+ done
+ func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
case $host_os in
aix3*)
cat <<\_LT_EOF >> "$cfgfile"
# AIX sometimes has problems with the GCC collect2 program. For some
# reason, if we set the COLLECT_NAMES environment variable, the problems
# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
+if test set != "${COLLECT_NAMES+set}"; then
COLLECT_NAMES=
export COLLECT_NAMES
fi
@@ -31831,7 +31991,7 @@ _LT_EOF
esac
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
# We use sed instead of cat because bash on DJGPP gets confused if
@@ -31841,165 +32001,6 @@ ltmain="$ac_aux_dir/ltmain.sh"
sed '$q' "$ltmain" >> "$cfgfile" \
|| (rm -f "$cfgfile"; exit 1)
- if test x"$xsi_shell" = xyes; then
- sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
-func_dirname ()\
-{\
-\ case ${1} in\
-\ */*) func_dirname_result="${1%/*}${2}" ;;\
-\ * ) func_dirname_result="${3}" ;;\
-\ esac\
-} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_basename ()$/,/^} # func_basename /c\
-func_basename ()\
-{\
-\ func_basename_result="${1##*/}"\
-} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
-func_dirname_and_basename ()\
-{\
-\ case ${1} in\
-\ */*) func_dirname_result="${1%/*}${2}" ;;\
-\ * ) func_dirname_result="${3}" ;;\
-\ esac\
-\ func_basename_result="${1##*/}"\
-} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
-func_stripname ()\
-{\
-\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
-\ # positional parameters, so assign one to ordinary parameter first.\
-\ func_stripname_result=${3}\
-\ func_stripname_result=${func_stripname_result#"${1}"}\
-\ func_stripname_result=${func_stripname_result%"${2}"}\
-} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
-func_split_long_opt ()\
-{\
-\ func_split_long_opt_name=${1%%=*}\
-\ func_split_long_opt_arg=${1#*=}\
-} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
-func_split_short_opt ()\
-{\
-\ func_split_short_opt_arg=${1#??}\
-\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
-} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
-func_lo2o ()\
-{\
-\ case ${1} in\
-\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
-\ *) func_lo2o_result=${1} ;;\
-\ esac\
-} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_xform ()$/,/^} # func_xform /c\
-func_xform ()\
-{\
- func_xform_result=${1%.*}.lo\
-} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_arith ()$/,/^} # func_arith /c\
-func_arith ()\
-{\
- func_arith_result=$(( $* ))\
-} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_len ()$/,/^} # func_len /c\
-func_len ()\
-{\
- func_len_result=${#1}\
-} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-fi
-
-if test x"$lt_shell_append" = xyes; then
- sed -e '/^func_append ()$/,/^} # func_append /c\
-func_append ()\
-{\
- eval "${1}+=\\${2}"\
-} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
-func_append_quoted ()\
-{\
-\ func_quote_for_eval "${2}"\
-\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
-} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- # Save a `func_append' function call where possible by direct use of '+='
- sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-else
- # Save a `func_append' function call even when '+=' is not available
- sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
-$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
-fi
-
-
mv -f "$cfgfile" "$ofile" ||
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
@@ -32086,13 +32087,13 @@ hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
# Whether we need a single "-rpath" flag with a separated argument.
hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
# DIR into the resulting binary.
hardcode_direct=$hardcode_direct_CXX
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# 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_CXX
@@ -32300,11 +32301,6 @@ if test "x$HAVE_LIRC" = "x1"; then :
else
ENABLE_LIRC=no
fi
-if test "x$HAVE_XEN" = "x1"; then :
- ENABLE_XEN=yes
-else
- ENABLE_XEN=no
-fi
if test "x$HAVE_DBUS" = "x1"; then :
ENABLE_DBUS=yes
else
@@ -32479,7 +32475,6 @@ echo "
Enable Jack: ${ENABLE_JACK}
Enable Async DNS: ${ENABLE_LIBASYNCNS}
Enable LIRC: ${ENABLE_LIRC}
- Enable Xen PV driver: ${ENABLE_XEN}
Enable D-Bus: ${ENABLE_DBUS}
Enable BlueZ 4: ${ENABLE_BLUEZ_4}
Enable BlueZ 5: ${ENABLE_BLUEZ_5}
diff --git a/configure.ac b/configure.ac
index 4edc8e0..65a9eba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,11 +40,11 @@ AC_SUBST(PA_MINOR, pa_minor)
AC_SUBST(PA_MAJORMINOR, pa_major.pa_minor)
AC_SUBST(PA_API_VERSION, 12)
-AC_SUBST(PA_PROTOCOL_VERSION, 31)
+AC_SUBST(PA_PROTOCOL_VERSION, 32)
# The stable ABI for client applications, for the version info x:y:z
# always will hold y=z
-AC_SUBST(LIBPULSE_VERSION_INFO, [20:0:20])
+AC_SUBST(LIBPULSE_VERSION_INFO, [20:1:20])
# A simplified, synchronous, ABI-stable interface for client
# applications, for the version info x:y:z always will hold y=z
@@ -84,7 +84,7 @@ AM_PROG_CC_C_O
# Only required if you want the WebRTC canceller -- no runtime dep on
# libstdc++ otherwise
AC_PROG_CXX
-AX_CXX_COMPILE_STDCXX_11
+AX_CXX_COMPILE_STDCXX_11([ext],[optional])
AC_PROG_GCC_TRADITIONAL
AC_USE_SYSTEM_EXTENSIONS
@@ -668,18 +668,14 @@ AC_ARG_ENABLE([tests],
AS_HELP_STRING([--disable-tests],[Disable unit tests]))
AS_IF([test "x$enable_tests" != "xno"],
- [PKG_CHECK_MODULES(LIBCHECK, [ check ], HAVE_LIBCHECK=1, HAVE_LIBCHECK=0)],
+ [PKG_CHECK_MODULES(LIBCHECK, [ check >= 0.9.10 ], HAVE_LIBCHECK=1, HAVE_LIBCHECK=0)],
HAVE_LIBCHECK=0)
AS_IF([test "x$enable_tests" = "xyes" && test "x$HAVE_LIBCHECK" = "x0"],
- [AC_MSG_ERROR([*** check library not found])])
+ [AC_MSG_ERROR([*** check library not found or too old])])
AM_CONDITIONAL([HAVE_TESTS], [test "x$HAVE_LIBCHECK" = x1])
-#### json parsing ####
-
-PKG_CHECK_MODULES(LIBJSON, [ json-c >= 0.11 ])
-
#### Sound file ####
PKG_CHECK_MODULES(LIBSNDFILE, [ sndfile >= 1.0.20 ])
@@ -1194,30 +1190,6 @@ AS_IF([test "x$with_soxr" = "xyes" && test "x$HAVE_SOXR" = "x0"],
AM_CONDITIONAL([HAVE_SOXR], [test "x$HAVE_SOXR" = "x1"])
AS_IF([test "x$HAVE_SOXR" = "x1"], AC_DEFINE([HAVE_SOXR], 1, [Have soxr]))
-#### Xen support (optional) ####
-
-AC_ARG_ENABLE([xen],
- AS_HELP_STRING([--disable-xen],[Disable optional Xen paravirtualized driver]))
-
-XEN_CFLAGS=
-XEN_LIBS=
-
-AS_IF([test "x$enable_xen" != "xno"],
- [
- HAVE_XEN=1
- AC_CHECK_HEADER(xenctrl.h, [], [HAVE_XEN=0])
- AC_CHECK_HEADER(xs.h, [], [HAVE_XEN=0])
- AC_CHECK_LIB(xenctrl, xc_interface_open, [XEN_LIBS="$XEN_LIBS -lxenctrl"], [HAVE_XEN=0])
- AC_CHECK_LIB(xenstore, xs_domain_open, [XEN_LIBS="$XEN_LIBS -lxenstore"], [HAVE_XEN=0])
- ],
- HAVE_XEN=0)
-
-AS_IF([test "x$enable_xen" = "xyes" && test "x$HAVE_XEN" = "x0"],
- [AC_MSG_ERROR([*** Xen development headers or libraries not found])])
-
-AC_SUBST(XEN_CFLAGS)
-AC_SUBST(XEN_LIBS)
-AM_CONDITIONAL([HAVE_XEN], [test "x$HAVE_XEN" = x1])
#### gcov support (optional) #####
@@ -1414,6 +1386,9 @@ fi
AC_ARG_ENABLE([webrtc-aec],
AS_HELP_STRING([--enable-webrtc-aec], [Enable the optional WebRTC-based echo canceller]))
+AS_IF([test "x$enable_webrtc_aec" = "xyes" && test "$HAVE_CXX11" = "0"],
+ [AC_MSG_ERROR([*** webrtc-audio-processing needs C++11 support])])
+
AS_IF([test "x$enable_webrtc_aec" != "xno"],
[PKG_CHECK_MODULES(WEBRTC, [ webrtc-audio-processing >= 0.2 ], [HAVE_WEBRTC=1], [HAVE_WEBRTC=0])],
[HAVE_WEBRTC=0])
@@ -1577,7 +1552,6 @@ AS_IF([test "x$HAVE_AVAHI" = "x1"], ENABLE_AVAHI=yes, ENABLE_AVAHI=no)
AS_IF([test "x$HAVE_JACK" = "x1"], ENABLE_JACK=yes, ENABLE_JACK=no)
AS_IF([test "x$HAVE_LIBASYNCNS" = "x1"], ENABLE_LIBASYNCNS=yes, ENABLE_LIBASYNCNS=no)
AS_IF([test "x$HAVE_LIRC" = "x1"], ENABLE_LIRC=yes, ENABLE_LIRC=no)
-AS_IF([test "x$HAVE_XEN" = "x1"], ENABLE_XEN=yes, ENABLE_XEN=no)
AS_IF([test "x$HAVE_DBUS" = "x1"], ENABLE_DBUS=yes, ENABLE_DBUS=no)
AS_IF([test "x$HAVE_UDEV" = "x1"], ENABLE_UDEV=yes, ENABLE_UDEV=no)
AS_IF([test "x$HAVE_SYSTEMD_DAEMON" = "x1"], ENABLE_SYSTEMD_DAEMON=yes, ENABLE_SYSTEMD_DAEMON=no)
@@ -1640,7 +1614,6 @@ echo "
Enable Jack: ${ENABLE_JACK}
Enable Async DNS: ${ENABLE_LIBASYNCNS}
Enable LIRC: ${ENABLE_LIRC}
- Enable Xen PV driver: ${ENABLE_XEN}
Enable D-Bus: ${ENABLE_DBUS}
Enable BlueZ 4: ${ENABLE_BLUEZ_4}
Enable BlueZ 5: ${ENABLE_BLUEZ_5}
diff --git a/doxygen/Makefile.in b/doxygen/Makefile.in
index e51d317..08762f9 100644
--- a/doxygen/Makefile.in
+++ b/doxygen/Makefile.in
@@ -255,8 +255,6 @@ LIBCHECK_CFLAGS = @LIBCHECK_CFLAGS@
LIBCHECK_LIBS = @LIBCHECK_LIBS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBJSON_CFLAGS = @LIBJSON_CFLAGS@
-LIBJSON_LIBS = @LIBJSON_LIBS@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBPULSE_MAINLOOP_GLIB_VERSION_INFO = @LIBPULSE_MAINLOOP_GLIB_VERSION_INFO@
@@ -280,6 +278,7 @@ LN_S = @LN_S@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
M4 = @M4@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -366,8 +365,6 @@ WEBRTC_CFLAGS = @WEBRTC_CFLAGS@
WEBRTC_LIBS = @WEBRTC_LIBS@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
-XEN_CFLAGS = @XEN_CFLAGS@
-XEN_LIBS = @XEN_LIBS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
@@ -422,6 +419,7 @@ prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
pulseconfdir = @pulseconfdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index f12cfdf..ee80844 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1,8 +1,6 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is free software; the Free Software Foundation gives
@@ -10,36 +8,30 @@
# modifications, as long as this notice is preserved.
m4_define([_LT_COPYING], [dnl
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of of the License, or
+# (at your option) any later version.
#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the same
+# distribution terms that you use for the rest of that program.
#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
])
-# serial 57 LT_INIT
+# serial 58 LT_INIT
# LT_PREREQ(VERSION)
@@ -67,7 +59,7 @@ esac
# LT_INIT([OPTIONS])
# ------------------
AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+[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
@@ -91,7 +83,7 @@ dnl Parse OPTIONS
_LT_SET_OPTIONS([$0], [$1])
# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
+LIBTOOL_DEPS=$ltmain
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -111,26 +103,43 @@ dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+# _LT_PREPARE_CC_BASENAME
+# -----------------------
+m4_defun([_LT_PREPARE_CC_BASENAME], [
+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+ for cc_temp in @S|@*""; do
+ case $cc_temp in
+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+ done
+ func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+])# _LT_PREPARE_CC_BASENAME
+
+
# _LT_CC_BASENAME(CC)
# -------------------
-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
+# but that macro is also expanded into generated libtool script, which
+# arranges for $SED and $ECHO to be set by different means.
m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
- case $cc_temp in
- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+[m4_require([_LT_PREPARE_CC_BASENAME])dnl
+AC_REQUIRE([_LT_DECL_SED])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+func_cc_basename $1
+cc_basename=$func_cc_basename_result
])
# _LT_FILEUTILS_DEFAULTS
# ----------------------
# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'.
m4_defun([_LT_FILEUTILS_DEFAULTS],
[: ${CP="cp -f"}
: ${MV="mv -f"}
@@ -177,15 +186,16 @@ m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
m4_require([_LT_CMD_OLD_ARCHIVE])dnl
m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
m4_require([_LT_WITH_SYSROOT])dnl
+m4_require([_LT_CMD_TRUNCATE])dnl
_LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options which allow our
+# See if we are running on zsh, and set the options that allow our
# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
+if test -n "\${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
])
-if test -n "${ZSH_VERSION+set}" ; then
+if test -n "${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
@@ -198,7 +208,7 @@ aix3*)
# AIX sometimes has problems with the GCC collect2 program. For some
# reason, if we set the COLLECT_NAMES environment variable, the problems
# vanish in a puff of smoke.
- if test "X${COLLECT_NAMES+set}" != Xset; then
+ if test set != "${COLLECT_NAMES+set}"; then
COLLECT_NAMES=
export COLLECT_NAMES
fi
@@ -209,14 +219,14 @@ esac
ofile=libtool
can_build_shared=yes
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# All known linkers require a '.a' archive for static linking (except MSVC,
# which needs '.lib').
libext=a
-with_gnu_ld="$lt_cv_prog_gnu_ld"
+with_gnu_ld=$lt_cv_prog_gnu_ld
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
+old_CC=$CC
+old_CFLAGS=$CFLAGS
# Set sane defaults for various variables
test -z "$CC" && CC=cc
@@ -269,14 +279,14 @@ no_glob_subst='s/\*/\\\*/g'
# _LT_PROG_LTMAIN
# ---------------
-# Note that this code is called both from `configure', and `config.status'
+# Note that this code is called both from 'configure', and 'config.status'
# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# 'config.status' has no value for ac_aux_dir unless we are using Automake,
# so we pass a copy along to make sure it has a sensible value anyway.
m4_defun([_LT_PROG_LTMAIN],
[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
])# _LT_PROG_LTMAIN
@@ -286,7 +296,7 @@ ltmain="$ac_aux_dir/ltmain.sh"
# So that we can recreate a full libtool script including additional
# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
+# in macros and then make a single call at the end using the 'libtool'
# label.
@@ -421,8 +431,8 @@ m4_define([_lt_decl_all_varnames],
# _LT_CONFIG_STATUS_DECLARE([VARNAME])
# ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'. VARNAME
+# Quote a variable value, and forward it to 'config.status' so that its
+# declaration there will have the same value as in 'configure'. VARNAME
# must have a single quote delimited value for this to work.
m4_define([_LT_CONFIG_STATUS_DECLARE],
[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
@@ -446,7 +456,7 @@ m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
# Output comment and list of tags supported by the script
m4_defun([_LT_LIBTOOL_TAGS],
[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags="_LT_TAGS"dnl
+available_tags='_LT_TAGS'dnl
])
@@ -474,7 +484,7 @@ m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
# _LT_LIBTOOL_CONFIG_VARS
# -----------------------
# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool'
# script. Tagged libtool config variables (even for the LIBTOOL CONFIG
# section) are produced by _LT_LIBTOOL_TAG_VARS.
m4_defun([_LT_LIBTOOL_CONFIG_VARS],
@@ -500,8 +510,8 @@ m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of
# variables for single and double quote escaping we saved from calls
# to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'. Finally, any additional code accumulated
+# into 'config.status', and then the shell code to quote escape them in
+# for loops in 'config.status'. Finally, any additional code accumulated
# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
m4_defun([_LT_CONFIG_COMMANDS],
[AC_PROVIDE_IFELSE([LT_OUTPUT],
@@ -547,7 +557,7 @@ for var in lt_decl_all_varnames([[ \
]], lt_decl_quote_varnames); do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -560,7 +570,7 @@ for var in lt_decl_all_varnames([[ \
]], lt_decl_dquote_varnames); do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -576,7 +586,7 @@ _LT_OUTPUT_LIBTOOL_INIT
# Generate a child script FILE with all initialization necessary to
# reuse the environment learned by the parent script, and make the
# file executable. If COMMENT is supplied, it is inserted after the
-# `#!' sequence but before initialization text begins. After this
+# '#!' sequence but before initialization text begins. After this
# macro, additional text can be appended to FILE to form the body of
# the child script. The macro ends with non-zero status if the
# file could not be fully written (such as if the disk is full).
@@ -598,7 +608,7 @@ AS_SHELL_SANITIZE
_AS_PREPARE
exec AS_MESSAGE_FD>&1
_ASEOF
-test $lt_write_fail = 0 && chmod +x $1[]dnl
+test 0 = "$lt_write_fail" && chmod +x $1[]dnl
m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
# LT_OUTPUT
@@ -621,7 +631,7 @@ exec AS_MESSAGE_LOG_FD>>config.log
} >&AS_MESSAGE_LOG_FD
lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
+'$as_me' creates a local libtool stub from the current configuration,
for use in further configure time tests before the real libtool is
generated.
@@ -643,7 +653,7 @@ Copyright (C) 2011 Free Software Foundation, Inc.
This config.lt script is free software; the Free Software Foundation
gives unlimited permision to copy, distribute and modify it."
-while test $[#] != 0
+while test 0 != $[#]
do
case $[1] in
--version | --v* | -V )
@@ -656,10 +666,10 @@ do
lt_cl_silent=: ;;
-*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
+Try '$[0] --help' for more information.]) ;;
*) AC_MSG_ERROR([unrecognized argument: $[1]
-Try \`$[0] --help' for more information.]) ;;
+Try '$[0] --help' for more information.]) ;;
esac
shift
done
@@ -685,7 +695,7 @@ chmod +x "$CONFIG_LT"
# open by configure. Here we exec the FD to /dev/null, effectively closing
# config.log, so it can be properly (re)opened and appended to by config.lt.
lt_cl_success=:
-test "$silent" = yes &&
+test yes = "$silent" &&
lt_config_lt_args="$lt_config_lt_args --quiet"
exec AS_MESSAGE_LOG_FD>/dev/null
$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
@@ -705,27 +715,30 @@ m4_defun([_LT_CONFIG],
_LT_CONFIG_SAVE_COMMANDS([
m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
m4_if(_LT_TAG, [C], [
- # See if we are running on zsh, and set the options which allow our
+ # See if we are running on zsh, and set the options that allow our
# commands through without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
+ if test -n "${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
- cfgfile="${ofile}T"
+ cfgfile=${ofile}T
trap "$RM \"$cfgfile\"; exit 1" 1 2 15
$RM "$cfgfile"
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# Generated automatically by $as_me ($PACKAGE) $VERSION
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
_LT_COPYING
_LT_LIBTOOL_TAGS
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
# ### BEGIN LIBTOOL CONFIG
_LT_LIBTOOL_CONFIG_VARS
_LT_LIBTOOL_TAG_VARS
@@ -733,13 +746,24 @@ _LT_LIBTOOL_TAG_VARS
_LT_EOF
+ cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_PREPARE_MUNGE_PATH_LIST
+_LT_PREPARE_CC_BASENAME
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
case $host_os in
aix3*)
cat <<\_LT_EOF >> "$cfgfile"
# AIX sometimes has problems with the GCC collect2 program. For some
# reason, if we set the COLLECT_NAMES environment variable, the problems
# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
+if test set != "${COLLECT_NAMES+set}"; then
COLLECT_NAMES=
export COLLECT_NAMES
fi
@@ -756,8 +780,6 @@ _LT_EOF
sed '$q' "$ltmain" >> "$cfgfile" \
|| (rm -f "$cfgfile"; exit 1)
- _LT_PROG_REPLACE_SHELLFNS
-
mv -f "$cfgfile" "$ofile" ||
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
@@ -775,7 +797,6 @@ _LT_EOF
[m4_if([$1], [], [
PACKAGE='$PACKAGE'
VERSION='$VERSION'
- TIMESTAMP='$TIMESTAMP'
RM='$RM'
ofile='$ofile'], [])
])dnl /_LT_CONFIG_SAVE_COMMANDS
@@ -974,7 +995,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
[lt_cv_apple_cc_single_mod=no
- if test -z "${LT_MULTI_MODULE}"; then
+ if test -z "$LT_MULTI_MODULE"; then
# By default we will add the -single_module flag. You can override
# by either setting the environment variable LT_MULTI_MODULE
# non-empty at configure time, or by adding -multi_module to the
@@ -992,7 +1013,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
cat conftest.err >&AS_MESSAGE_LOG_FD
# Otherwise, if the output was created with a 0 exit code from
# the compiler, it worked.
- elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+ elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
lt_cv_apple_cc_single_mod=yes
else
cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1010,7 +1031,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
[lt_cv_ld_exported_symbols_list=yes],
[lt_cv_ld_exported_symbols_list=no])
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
])
AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
@@ -1032,7 +1053,7 @@ _LT_EOF
_lt_result=$?
if test -s conftest.err && $GREP force_load conftest.err; then
cat conftest.err >&AS_MESSAGE_LOG_FD
- elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+ elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
lt_cv_ld_force_load=yes
else
cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1042,32 +1063,32 @@ _LT_EOF
])
case $host_os in
rhapsody* | darwin1.[[012]])
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
darwin1.*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
darwin*) # darwin 5.x on
# if running on 10.5 or later, the deployment target defaults
# to the OS version, if on x86, and 10.4, the deployment
# target defaults to 10.4. Don't you love it?
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- 10.[[012]]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+ 10.[[012]][[,.]]*)
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
esac
;;
esac
- if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ if test yes = "$lt_cv_apple_cc_single_mod"; then
_lt_dar_single_mod='$single_module'
fi
- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ if test yes = "$lt_cv_ld_exported_symbols_list"; then
+ _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
else
- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
fi
- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+ if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
@@ -1087,29 +1108,29 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_automatic, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- if test "$lt_cv_ld_force_load" = "yes"; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ if test yes = "$lt_cv_ld_force_load"; then
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
[FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes])
else
_LT_TAGVAR(whole_archive_flag_spec, $1)=''
fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+ _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
case $cc_basename in
- ifort*) _lt_dar_can_shared=yes ;;
+ ifort*|nagfor*) _lt_dar_can_shared=yes ;;
*) _lt_dar_can_shared=$GCC ;;
esac
- if test "$_lt_dar_can_shared" = "yes"; then
+ if test yes = "$_lt_dar_can_shared"; then
output_verbose_link_cmd=func_echo_all
- _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
- _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
m4_if([$1], [CXX],
-[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
- _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+[ if test yes != "$lt_cv_apple_cc_single_mod"; then
+ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
fi
],[])
else
@@ -1129,7 +1150,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
# Allow to override them for all tags through lt_cv_aix_libpath.
m4_defun([_LT_SYS_MODULE_PATH_AIX],
[m4_require([_LT_DECL_SED])dnl
-if test "${lt_cv_aix_libpath+set}" = set; then
+if test set = "${lt_cv_aix_libpath+set}"; then
aix_libpath=$lt_cv_aix_libpath
else
AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
@@ -1147,7 +1168,7 @@ else
_LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi],[])
if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
- _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib
fi
])
aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
@@ -1167,8 +1188,8 @@ m4_define([_LT_SHELL_INIT],
# -----------------------
# Find how we can fake an echo command that does not interpret backslash.
# In particular, with Autoconf 2.60 or later we add some code to the start
-# of the generated configure script which will find a shell with a builtin
-# printf (which we can use as an echo command).
+# of the generated configure script that will find a shell with a builtin
+# printf (that we can use as an echo command).
m4_defun([_LT_PROG_ECHO_BACKSLASH],
[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
@@ -1196,10 +1217,10 @@ fi
# Invoke $ECHO with all args, space-separated.
func_echo_all ()
{
- $ECHO "$*"
+ $ECHO "$*"
}
-case "$ECHO" in
+case $ECHO in
printf*) AC_MSG_RESULT([printf]) ;;
print*) AC_MSG_RESULT([print -r]) ;;
*) AC_MSG_RESULT([cat]) ;;
@@ -1225,16 +1246,17 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
AC_DEFUN([_LT_WITH_SYSROOT],
[AC_MSG_CHECKING([for sysroot])
AC_ARG_WITH([sysroot],
-[ --with-sysroot[=DIR] Search for dependent libraries within DIR
- (or the compiler's sysroot if not specified).],
+[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
+ [Search for dependent libraries within DIR (or the compiler's sysroot
+ if not specified).])],
[], [with_sysroot=no])
dnl lt_sysroot will always be passed unquoted. We quote it here
dnl in case the user passed a directory name.
lt_sysroot=
-case ${with_sysroot} in #(
+case $with_sysroot in #(
yes)
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
lt_sysroot=`$CC --print-sysroot 2>/dev/null`
fi
;; #(
@@ -1244,14 +1266,14 @@ case ${with_sysroot} in #(
no|'')
;; #(
*)
- AC_MSG_RESULT([${with_sysroot}])
+ AC_MSG_RESULT([$with_sysroot])
AC_MSG_ERROR([The sysroot must be an absolute path.])
;;
esac
AC_MSG_RESULT([${lt_sysroot:-no}])
_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-[dependent libraries, and in which our libraries should be installed.])])
+[dependent libraries, and where our libraries should be installed.])])
# _LT_ENABLE_LOCK
# ---------------
@@ -1259,31 +1281,33 @@ m4_defun([_LT_ENABLE_LOCK],
[AC_ARG_ENABLE([libtool-lock],
[AS_HELP_STRING([--disable-libtool-lock],
[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
# libtool support.
case $host in
ia64-*-hpux*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set mode
+ # options accordingly.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
- HPUX_IA64_MODE="32"
+ HPUX_IA64_MODE=32
;;
*ELF-64*)
- HPUX_IA64_MODE="64"
+ HPUX_IA64_MODE=64
;;
esac
fi
rm -rf conftest*
;;
*-*-irix6*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
- if test "$lt_cv_prog_gnu_ld" = yes; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
LD="${LD-ld} -melf32bsmip"
@@ -1312,9 +1336,46 @@ ia64-*-hpux*)
rm -rf conftest*
;;
+mips64*-*linux*)
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
+ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ emul=elf
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ emul="${emul}32"
+ ;;
+ *64-bit*)
+ emul="${emul}64"
+ ;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *MSB*)
+ emul="${emul}btsmip"
+ ;;
+ *LSB*)
+ emul="${emul}ltsmip"
+ ;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *N32*)
+ emul="${emul}n32"
+ ;;
+ esac
+ LD="${LD-ld} -m $emul"
+ fi
+ rm -rf conftest*
+ ;;
+
x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly. Note that the listed cases only cover the
+ # situations where additional linker options are needed (such as when
+ # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+ # vice versa); the common cases where no linker options are needed do
+ # not appear in the list.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.o` in
@@ -1324,7 +1385,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
+ case `/usr/bin/file conftest.o` in
+ *x86-64*)
+ LD="${LD-ld} -m elf32_x86_64"
+ ;;
+ *)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+ esac
;;
powerpc64le-*linux*)
LD="${LD-ld} -m elf32lppclinux"
@@ -1369,19 +1437,20 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
*-*-sco3.2v5*)
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
+ SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -belf"
AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
[AC_LANG_PUSH(C)
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
AC_LANG_POP])
- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ if test yes != "$lt_cv_cc_needs_belf"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
+ CFLAGS=$SAVE_CFLAGS
fi
;;
*-*solaris*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.o` in
@@ -1389,7 +1458,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
case $lt_cv_prog_gnu_ld in
yes*)
case $host in
- i?86-*-solaris*)
+ i?86-*-solaris*|x86_64-*-solaris*)
LD="${LD-ld} -m elf_x86_64"
;;
sparc*-*-solaris*)
@@ -1398,7 +1467,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
esac
# GNU ld 2.21 introduced _sol2 emulations. Use them if available.
if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
- LD="${LD-ld}_sol2"
+ LD=${LD-ld}_sol2
fi
;;
*)
@@ -1414,7 +1483,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
;;
esac
-need_locks="$enable_libtool_lock"
+need_locks=$enable_libtool_lock
])# _LT_ENABLE_LOCK
@@ -1433,11 +1502,11 @@ AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
[echo conftest.$ac_objext > conftest.lst
lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
AC_TRY_EVAL([lt_ar_try])
- if test "$ac_status" -eq 0; then
+ if test 0 -eq "$ac_status"; then
# Ensure the archiver fails upon bogus file names.
rm -f conftest.$ac_objext libconftest.a
AC_TRY_EVAL([lt_ar_try])
- if test "$ac_status" -ne 0; then
+ if test 0 -ne "$ac_status"; then
lt_cv_ar_at_file=@
fi
fi
@@ -1445,7 +1514,7 @@ AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
])
])
-if test "x$lt_cv_ar_at_file" = xno; then
+if test no = "$lt_cv_ar_at_file"; then
archiver_list_spec=
else
archiver_list_spec=$lt_cv_ar_at_file
@@ -1476,7 +1545,7 @@ old_postuninstall_cmds=
if test -n "$RANLIB"; then
case $host_os in
- openbsd*)
+ bitrig* | openbsd*)
old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
;;
*)
@@ -1512,7 +1581,7 @@ AC_CACHE_CHECK([$1], [$2],
[$2=no
m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$3"
+ lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
# Note that $ac_compile itself does not contain backslashes and begins
@@ -1539,7 +1608,7 @@ AC_CACHE_CHECK([$1], [$2],
$RM conftest*
])
-if test x"[$]$2" = xyes; then
+if test yes = "[$]$2"; then
m4_if([$5], , :, [$5])
else
m4_if([$6], , :, [$6])
@@ -1561,7 +1630,7 @@ AC_DEFUN([_LT_LINKER_OPTION],
m4_require([_LT_DECL_SED])dnl
AC_CACHE_CHECK([$1], [$2],
[$2=no
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $3"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -1580,10 +1649,10 @@ AC_CACHE_CHECK([$1], [$2],
fi
fi
$RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
])
-if test x"[$]$2" = xyes; then
+if test yes = "[$]$2"; then
m4_if([$4], , :, [$4])
else
m4_if([$5], , :, [$5])
@@ -1604,7 +1673,7 @@ AC_DEFUN([LT_CMD_MAX_LEN],
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
- teststring="ABCD"
+ teststring=ABCD
case $build_os in
msdosdjgpp*)
@@ -1644,7 +1713,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
lt_cv_sys_max_cmd_len=8192;
;;
- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
# This has been around since 386BSD, at least. Likely further.
if test -x /sbin/sysctl; then
lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -1694,22 +1763,23 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len" && \
+ test undefined != "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
# Make teststring a little bigger before we do anything with it.
# a 1K string should be a reasonable start.
- for i in 1 2 3 4 5 6 7 8 ; do
+ for i in 1 2 3 4 5 6 7 8; do
teststring=$teststring$teststring
done
SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+ while { test X`env echo "$teststring$teststring" 2>/dev/null` \
= "X$teststring$teststring"; } >/dev/null 2>&1 &&
- test $i != 17 # 1/2 MB should be enough
+ test 17 != "$i" # 1/2 MB should be enough
do
i=`expr $i + 1`
teststring=$teststring$teststring
@@ -1725,7 +1795,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
;;
esac
])
-if test -n $lt_cv_sys_max_cmd_len ; then
+if test -n "$lt_cv_sys_max_cmd_len"; then
AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
else
AC_MSG_RESULT(none)
@@ -1753,7 +1823,7 @@ m4_defun([_LT_HEADER_DLFCN],
# ----------------------------------------------------------------
m4_defun([_LT_TRY_DLOPEN_SELF],
[m4_require([_LT_HEADER_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
+if test yes = "$cross_compiling"; then :
[$4]
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -1800,9 +1870,9 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* 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))
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
int fnord () __attribute__((visibility("default")));
#endif
@@ -1828,7 +1898,7 @@ int main ()
return status;
}]
_LT_EOF
- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+ if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then
(./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -1849,7 +1919,7 @@ rm -fr conftest*
# ------------------
AC_DEFUN([LT_SYS_DLOPEN_SELF],
[m4_require([_LT_HEADER_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
+if test yes != "$enable_dlopen"; then
enable_dlopen=unknown
enable_dlopen_self=unknown
enable_dlopen_self_static=unknown
@@ -1859,44 +1929,52 @@ else
case $host_os in
beos*)
- lt_cv_dlopen="load_add_on"
+ lt_cv_dlopen=load_add_on
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
;;
mingw* | pw32* | cegcc*)
- lt_cv_dlopen="LoadLibrary"
+ lt_cv_dlopen=LoadLibrary
lt_cv_dlopen_libs=
;;
cygwin*)
- lt_cv_dlopen="dlopen"
+ lt_cv_dlopen=dlopen
lt_cv_dlopen_libs=
;;
darwin*)
- # if libdl is installed we need to link against it
+ # if libdl is installed we need to link against it
AC_CHECK_LIB([dl], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
- lt_cv_dlopen="dyld"
+ [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[
+ lt_cv_dlopen=dyld
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
])
;;
+ tpf*)
+ # Don't try to run any link tests for TPF. We know it's impossible
+ # because TPF is a cross-compiler, and we know how we open DSOs.
+ lt_cv_dlopen=dlopen
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=no
+ ;;
+
*)
AC_CHECK_FUNC([shl_load],
- [lt_cv_dlopen="shl_load"],
+ [lt_cv_dlopen=shl_load],
[AC_CHECK_LIB([dld], [shl_load],
- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+ [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld],
[AC_CHECK_FUNC([dlopen],
- [lt_cv_dlopen="dlopen"],
+ [lt_cv_dlopen=dlopen],
[AC_CHECK_LIB([dl], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+ [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],
[AC_CHECK_LIB([svld], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+ [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld],
[AC_CHECK_LIB([dld], [dld_link],
- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+ [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld])
])
])
])
@@ -1905,21 +1983,21 @@ else
;;
esac
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
+ if test no = "$lt_cv_dlopen"; then
enable_dlopen=no
+ else
+ enable_dlopen=yes
fi
case $lt_cv_dlopen in
dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ save_CPPFLAGS=$CPPFLAGS
+ test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
- save_LIBS="$LIBS"
+ save_LIBS=$LIBS
LIBS="$lt_cv_dlopen_libs $LIBS"
AC_CACHE_CHECK([whether a program can dlopen itself],
@@ -1929,7 +2007,7 @@ else
lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
])
- if test "x$lt_cv_dlopen_self" = xyes; then
+ if test yes = "$lt_cv_dlopen_self"; then
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
lt_cv_dlopen_self_static, [dnl
@@ -1939,9 +2017,9 @@ else
])
fi
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
+ CPPFLAGS=$save_CPPFLAGS
+ LDFLAGS=$save_LDFLAGS
+ LIBS=$save_LIBS
;;
esac
@@ -2033,8 +2111,8 @@ m4_defun([_LT_COMPILER_FILE_LOCKS],
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
_LT_COMPILER_C_O([$1])
-hard_links="nottested"
-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+hard_links=nottested
+if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then
# do not overwrite the value of need_locks provided by the user
AC_MSG_CHECKING([if we can lock with hard links])
hard_links=yes
@@ -2044,8 +2122,8 @@ if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" !=
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
AC_MSG_RESULT([$hard_links])
- if test "$hard_links" = no; then
- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+ if test no = "$hard_links"; then
+ AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe])
need_locks=warn
fi
else
@@ -2072,8 +2150,8 @@ objdir=$lt_cv_objdir
_LT_DECL([], [objdir], [0],
[The name of the directory that contains temporary libtool files])dnl
m4_pattern_allow([LT_OBJDIR])dnl
-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
- [Define to the sub-directory in which libtool stores uninstalled libraries.])
+AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/",
+ [Define to the sub-directory where libtool stores uninstalled libraries.])
])# _LT_CHECK_OBJDIR
@@ -2085,15 +2163,15 @@ m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
_LT_TAGVAR(hardcode_action, $1)=
if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
test -n "$_LT_TAGVAR(runpath_var, $1)" ||
- test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+ test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
# We can hardcode non-existent directories.
- if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
+ if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
# If the only mechanism to avoid hardcoding is shlibpath_var, we
# have to relink, otherwise we might link with an installed library
# when we should be linking with a yet-to-be-installed one
- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
- test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
+ ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" &&
+ test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then
# Linking always hardcodes the temporary library directory.
_LT_TAGVAR(hardcode_action, $1)=relink
else
@@ -2107,12 +2185,12 @@ else
fi
AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
- test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
+if test relink = "$_LT_TAGVAR(hardcode_action, $1)" ||
+ test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then
# Fast installation is not supported
enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+ test no = "$enable_shared"; then
# Fast installation is not necessary
enable_fast_install=needless
fi
@@ -2136,7 +2214,7 @@ else
# FIXME - insert some real tests, host_os isn't really good enough
case $host_os in
darwin*)
- if test -n "$STRIP" ; then
+ if test -n "$STRIP"; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
AC_MSG_RESULT([yes])
@@ -2154,6 +2232,47 @@ _LT_DECL([], [striplib], [1])
])# _LT_CMD_STRIPLIB
+# _LT_PREPARE_MUNGE_PATH_LIST
+# ---------------------------
+# Make sure func_munge_path_list() is defined correctly.
+m4_defun([_LT_PREPARE_MUNGE_PATH_LIST],
+[[# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+# string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+# string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+# "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+# VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+ case x at S|@2 in
+ x)
+ ;;
+ *:)
+ eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
+ ;;
+ x:*)
+ eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
+ ;;
+ *::*)
+ eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+ eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
+ ;;
+ *)
+ eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
+ ;;
+ esac
+}
+]])# _LT_PREPARE_PATH_LIST
+
+
# _LT_SYS_DYNAMIC_LINKER([TAG])
# -----------------------------
# PORTME Fill in your ld.so characteristics
@@ -2164,17 +2283,18 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_OBJDUMP])dnl
m4_require([_LT_DECL_SED])dnl
m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl
AC_MSG_CHECKING([dynamic linker characteristics])
m4_if([$1],
[], [
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
case $host_os in
- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
- *) lt_awk_arg="/^libraries:/" ;;
+ darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+ *) lt_awk_arg='/^libraries:/' ;;
esac
case $host_os in
- mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
- *) lt_sed_strip_eq="s,=/,/,g" ;;
+ mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;;
+ *) lt_sed_strip_eq='s|=/|/|g' ;;
esac
lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
case $lt_search_path_spec in
@@ -2190,28 +2310,35 @@ if test "$GCC" = yes; then
;;
esac
# Ok, now we have the path, separated by spaces, we can step through it
- # and add multilib dir if necessary.
+ # and add multilib dir if necessary...
lt_tmp_lt_search_path_spec=
- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ # ...but if some path component already ends with the multilib dir we assume
+ # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+ case "$lt_multi_os_dir; $lt_search_path_spec " in
+ "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+ lt_multi_os_dir=
+ ;;
+ esac
for lt_sys_path in $lt_search_path_spec; do
- if test -d "$lt_sys_path/$lt_multi_os_dir"; then
- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
- else
+ if test -d "$lt_sys_path$lt_multi_os_dir"; then
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+ elif test -n "$lt_multi_os_dir"; then
test -d "$lt_sys_path" && \
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
- lt_foo="";
- lt_count=0;
+BEGIN {RS = " "; FS = "/|\n";} {
+ lt_foo = "";
+ lt_count = 0;
for (lt_i = NF; lt_i > 0; lt_i--) {
if ($lt_i != "" && $lt_i != ".") {
if ($lt_i == "..") {
lt_count++;
} else {
if (lt_count == 0) {
- lt_foo="/" $lt_i lt_foo;
+ lt_foo = "/" $lt_i lt_foo;
} else {
lt_count--;
}
@@ -2225,7 +2352,7 @@ BEGIN {RS=" "; FS="/|\n";} {
# for these hosts.
case $host_os in
mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
- $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
+ $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;;
esac
sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
else
@@ -2234,7 +2361,7 @@ fi])
library_names_spec=
libname_spec='lib$name'
soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
@@ -2251,14 +2378,17 @@ hardcode_into_libs=no
# flags to be left without arguments
need_version=unknown
+AC_ARG_VAR([LT_SYS_LIBRARY_PATH],
+[User-defined run-time library search path.])
+
case $host_os in
aix3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
shlibpath_var=LIBPATH
# AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
+ soname_spec='$libname$release$shared_ext$major'
;;
aix[[4-9]]*)
@@ -2266,41 +2396,91 @@ aix[[4-9]]*)
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
else
# With GCC up to 2.95.x, collect2 would create an import file
# for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
+ # the line '#! .'. This would cause the generated library to
+ # depend on '.', always an invalid library. This was fixed in
# development snapshots of GCC prior to 3.0.
case $host_os in
aix4 | aix4.[[01]] | aix4.[[01]].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes '
- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
:
else
can_build_shared=no
fi
;;
esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # Using Import Files as archive members, it is possible to support
+ # filename-based versioning of shared library archives on AIX. While
+ # this would work for both with and without runtime linking, it will
+ # prevent static linking of such archives. So we do filename-based
+ # shared library versioning with .so extension only, which is used
+ # when both runtime linking and shared linking is enabled.
+ # Unfortunately, runtime linking may impact performance, so we do
+ # not want this to be the default eventually. Also, we use the
+ # versioned .so libs for executables only if there is the -brtl
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+ # To allow for filename-based versioning support, we need to create
+ # libNAME.so.V as an archive file, containing:
+ # *) an Import File, referring to the versioned filename of the
+ # archive as well as the shared archive member, telling the
+ # bitwidth (32 or 64) of that shared object, and providing the
+ # list of exported symbols of that shared object, eventually
+ # decorated with the 'weak' keyword
+ # *) the shared object with the F_LOADONLY flag set, to really avoid
+ # it being seen by the linker.
+ # At run time we better use the real file rather than another symlink,
+ # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+ case $with_aix_soname,$aix_use_runtimelinking in
+ # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
# soname into executable. Probably we can add versioning support to
# collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
+ aix,yes) # traditional libtool
+ dynamic_linker='AIX unversionable lib.so'
# If using run time linking (on AIX 4.2 or later) use lib<name>.so
# instead of lib<name>.a to let people know that these are not
# typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ ;;
+ aix,no) # traditional AIX only
+ dynamic_linker='AIX lib.a[(]lib.so.V[)]'
# We preserve .a as extension for shared libraries through AIX4.2
# and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ ;;
+ svr4,*) # full svr4 only
+ dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,yes) # both, prefer svr4
+ dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # unpreferred sharedlib libNAME.a needs extra handling
+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,no) # both, prefer aix
+ dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]"
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+ ;;
+ esac
shlibpath_var=LIBPATH
fi
;;
@@ -2310,18 +2490,18 @@ amigaos*)
powerpc)
# Since July 2007 AmigaOS4 officially supports .so libraries.
# When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
;;
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
;;
esac
;;
beos*)
- library_names_spec='${libname}${shared_ext}'
+ library_names_spec='$libname$shared_ext'
dynamic_linker="$host_os ld.so"
shlibpath_var=LIBRARY_PATH
;;
@@ -2329,8 +2509,8 @@ beos*)
bsdi[[45]]*)
version_type=linux # correct to gnu/linux during the next big refactor
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -2342,7 +2522,7 @@ bsdi[[45]]*)
cygwin* | mingw* | pw32* | cegcc*)
version_type=windows
- shrext_cmds=".dll"
+ shrext_cmds=.dll
need_version=no
need_lib_prefix=no
@@ -2351,8 +2531,8 @@ cygwin* | mingw* | pw32* | cegcc*)
# gcc
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
$install_prog $dir/$dlname \$dldir/$dlname~
@@ -2368,17 +2548,17 @@ cygwin* | mingw* | pw32* | cegcc*)
case $host_os in
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
m4_if([$1], [],[
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
;;
esac
dynamic_linker='Win32 ld.exe'
@@ -2387,8 +2567,8 @@ m4_if([$1], [],[
*,cl*)
# Native MSVC
libname_spec='$name'
- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- library_names_spec='${libname}.dll.lib'
+ soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+ library_names_spec='$libname.dll.lib'
case $build_os in
mingw*)
@@ -2415,7 +2595,7 @@ m4_if([$1], [],[
sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
;;
*)
- sys_lib_search_path_spec="$LIB"
+ sys_lib_search_path_spec=$LIB
if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
# It is most probably a Windows format PATH.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
@@ -2428,8 +2608,8 @@ m4_if([$1], [],[
esac
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
$install_prog $dir/$dlname \$dldir/$dlname'
@@ -2442,7 +2622,7 @@ m4_if([$1], [],[
*)
# Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
dynamic_linker='Win32 ld.exe'
;;
esac
@@ -2455,8 +2635,8 @@ darwin* | rhapsody*)
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
+ library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$major$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -2469,8 +2649,8 @@ dgux*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
- soname_spec='${libname}${release}${shared_ext}$major'
+ 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
;;
@@ -2488,12 +2668,13 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
need_version=no
need_lib_prefix=no
;;
freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
need_version=yes
;;
esac
@@ -2518,26 +2699,15 @@ freebsd* | dragonfly*)
esac
;;
-gnu*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
dynamic_linker="$host_os runtime_loader"
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
+ shlibpath_overrides_runpath=no
sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
hardcode_into_libs=yes
;;
@@ -2555,14 +2725,15 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ if test 32 = "$HPUX_IA64_MODE"; then
sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux32
else
sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux64
fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
shrext_cmds='.sl'
@@ -2570,8 +2741,8 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
@@ -2580,8 +2751,8 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
;;
esac
# HP-UX runs *really* slowly unless shared libraries are mode 555, ...
@@ -2594,8 +2765,8 @@ interix[[3-9]]*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -2606,7 +2777,7 @@ irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
*)
- if test "$lt_cv_prog_gnu_ld" = yes; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
version_type=linux # correct to gnu/linux during the next big refactor
else
version_type=irix
@@ -2614,8 +2785,8 @@ irix5* | irix6* | nonstopux*)
esac
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
case $host_os in
irix5* | nonstopux*)
libsuff= shlibsuff=
@@ -2634,8 +2805,8 @@ irix5* | irix6* | nonstopux*)
esac
shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+ sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
hardcode_into_libs=yes
;;
@@ -2644,13 +2815,33 @@ linux*oldld* | linux*aout* | linux*coff*)
dynamic_linker=no
;;
+linux*android*)
+ version_type=none # Android doesn't support versioned libraries.
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='$libname$release$shared_ext'
+ soname_spec='$libname$release$shared_ext'
+ finish_cmds=
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+ dynamic_linker='Android linker'
+ # Don't embed -rpath directories since the linker doesn't support them.
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ ;;
+
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -2675,14 +2866,15 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
# before this can be enabled.
hardcode_into_libs=yes
- # Add ABI-specific directories to the system library path.
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
- # Append ld.so.conf contents to the search path
+ # Ideally, we could use ldconfig to report *all* directores which are
+ # searched for libraries, however this is still not possible. Aside from not
+ # being certain /sbin/ldconfig is available, command
+ # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+ # even though it is searched at run-time. Try to do the best guess by
+ # appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -2694,17 +2886,29 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
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
need_version=no
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='NetBSD ld.elf_so'
fi
shlibpath_var=LD_LIBRARY_PATH
@@ -2714,7 +2918,7 @@ netbsd*)
newsos6)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
;;
@@ -2723,58 +2927,68 @@ newsos6)
version_type=qnx
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
dynamic_linker='ldqnx.so'
;;
-openbsd*)
+openbsd* | bitrig*)
version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib
need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
- esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[[89]] | openbsd2.[[89]].*)
- shlibpath_overrides_runpath=no
- ;;
- *)
- shlibpath_overrides_runpath=yes
- ;;
- esac
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+ need_version=no
else
- shlibpath_overrides_runpath=yes
+ need_version=yes
fi
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
;;
os2*)
libname_spec='$name'
- shrext_cmds=".dll"
+ version_type=windows
+ shrext_cmds=.dll
+ need_version=no
need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
+ # OS/2 can only load a DLL with a base name of 8 characters or less.
+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+ v=$($ECHO $release$versuffix | tr -d .-);
+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+ $ECHO $n$v`$shared_ext'
+ library_names_spec='${libname}_dll.$libext'
dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
+ shlibpath_var=BEGINLIBPATH
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
;;
osf3* | osf4* | osf5*)
version_type=osf
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
rdos*)
@@ -2785,8 +2999,8 @@ solaris*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
@@ -2796,11 +3010,11 @@ solaris*)
sunos4*)
version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
need_lib_prefix=no
fi
need_version=yes
@@ -2808,8 +3022,8 @@ sunos4*)
sysv4 | sysv4.3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
case $host_vendor in
sni)
@@ -2830,24 +3044,24 @@ sysv4 | sysv4.3*)
;;
sysv4*MP*)
- if test -d /usr/nec ;then
+ if test -d /usr/nec; then
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
+ library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+ soname_spec='$libname$shared_ext.$major'
shlibpath_var=LD_LIBRARY_PATH
fi
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
+ version_type=sco
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
else
sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -2865,7 +3079,7 @@ tpf*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -2873,8 +3087,8 @@ tpf*)
uts4*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ 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
;;
@@ -2883,20 +3097,30 @@ uts4*)
;;
esac
AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+ sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+ sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
_LT_DECL([], [variables_saved_for_relink], [1],
[Variables whose values should be saved in libtool wrapper scripts and
restored at link time])
@@ -2929,39 +3153,41 @@ _LT_DECL([], [hardcode_into_libs], [0],
[Whether we should hardcode library paths into libraries])
_LT_DECL([], [sys_lib_search_path_spec], [2],
[Compile-time system search path for libraries])
-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
- [Run-time system search path for libraries])
+_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2],
+ [Detected run-time system search path for libraries])
+_LT_DECL([], [configure_time_lt_sys_library_path], [2],
+ [Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
])# _LT_SYS_DYNAMIC_LINKER
# _LT_PATH_TOOL_PREFIX(TOOL)
# --------------------------
-# find a file program which can recognize shared library
+# find a file program that can recognize shared library
AC_DEFUN([_LT_PATH_TOOL_PREFIX],
[m4_require([_LT_DECL_EGREP])dnl
AC_MSG_CHECKING([for $1])
AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
[case $MAGIC_CMD in
[[\\/*] | ?:[\\/]*])
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
;;
*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_MAGIC_CMD=$MAGIC_CMD
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
dnl $ac_dummy forces splitting on constant user-supplied paths.
dnl POSIX.2 word splitting is done only on the output of word expansions,
dnl not every word. This closes a longstanding sh security hole.
ac_dummy="m4_if([$2], , $PATH, [$2])"
for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$1; then
- lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+ if test -f "$ac_dir/$1"; then
+ lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
:
@@ -2984,11 +3210,11 @@ _LT_EOF
break
fi
done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
+ IFS=$lt_save_ifs
+ MAGIC_CMD=$lt_save_MAGIC_CMD
;;
esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if test -n "$MAGIC_CMD"; then
AC_MSG_RESULT($MAGIC_CMD)
else
@@ -3006,7 +3232,7 @@ dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
# _LT_PATH_MAGIC
# --------------
-# find a file program which can recognize a shared library
+# find a file program that can recognize a shared library
m4_defun([_LT_PATH_MAGIC],
[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
if test -z "$lt_cv_path_MAGIC_CMD"; then
@@ -3033,16 +3259,16 @@ m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
AC_ARG_WITH([gnu-ld],
[AS_HELP_STRING([--with-gnu-ld],
[assume the C compiler uses GNU ld @<:@default=no@:>@])],
- [test "$withval" = no || with_gnu_ld=yes],
+ [test no = "$withval" || with_gnu_ld=yes],
[with_gnu_ld=no])dnl
ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
# Check if gcc -print-prog-name=ld gives a path.
AC_MSG_CHECKING([for ld used by $CC])
case $host in
*-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
+ # gcc leaves a trailing carriage return, which upsets mingw
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
*)
ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -3056,7 +3282,7 @@ if test "$GCC" = yes; then
while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
done
- test -z "$LD" && LD="$ac_prog"
+ test -z "$LD" && LD=$ac_prog
;;
"")
# If it fails, then pretend we aren't using GCC.
@@ -3067,37 +3293,37 @@ if test "$GCC" = yes; then
with_gnu_ld=unknown
;;
esac
-elif test "$with_gnu_ld" = yes; then
+elif test yes = "$with_gnu_ld"; then
AC_MSG_CHECKING([for GNU ld])
else
AC_MSG_CHECKING([for non-GNU ld])
fi
AC_CACHE_VAL(lt_cv_path_LD,
[if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
+ lt_cv_path_LD=$ac_dir/$ac_prog
# Check to see if the program is GNU ld. I'd rather use --version,
# but apparently some variants of GNU ld only accept -v.
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break
+ test no != "$with_gnu_ld" && break
;;
*)
- test "$with_gnu_ld" != yes && break
+ test yes != "$with_gnu_ld" && break
;;
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ lt_cv_path_LD=$LD # Let the user override the test with a path.
fi])
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
if test -n "$LD"; then
AC_MSG_RESULT($LD)
else
@@ -3151,13 +3377,13 @@ esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
- if test "$GCC" != yes; then
+ if test yes != "$GCC"; then
reload_cmds=false
fi
;;
darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+ if test yes = "$GCC"; then
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
else
reload_cmds='$LD$reload_flag -o $output$reload_objs'
fi
@@ -3168,6 +3394,43 @@ _LT_TAGDECL([], [reload_cmds], [2])dnl
])# _LT_CMD_RELOAD
+# _LT_PATH_DD
+# -----------
+# find a working dd
+m4_defun([_LT_PATH_DD],
+[AC_CACHE_CHECK([for a working dd], [ac_cv_path_lt_DD],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd],
+[if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+ cmp -s conftest.i conftest.out \
+ && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi])
+rm -f conftest.i conftest2.i conftest.out])
+])# _LT_PATH_DD
+
+
+# _LT_CMD_TRUNCATE
+# ----------------
+# find command to truncate a binary pipe
+m4_defun([_LT_CMD_TRUNCATE],
+[m4_require([_LT_PATH_DD])
+AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+ cmp -s conftest.i conftest.out \
+ && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"])
+_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1],
+ [Command to truncate a binary pipe])
+])# _LT_CMD_TRUNCATE
+
+
# _LT_CHECK_MAGIC_METHOD
# ----------------------
# how to check for library dependencies
@@ -3183,13 +3446,13 @@ lt_cv_deplibs_check_method='unknown'
# Need to set the preceding variable on all platforms that support
# interlibrary dependencies.
# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
+# 'unknown' -- same as none, but documents that we really don't know.
# 'pass_all' -- all dependencies passed with no checks.
# 'test_compile' -- check by making test program.
# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
case $host_os in
aix[[4-9]]*)
@@ -3216,8 +3479,7 @@ mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+ if ( file / ) >/dev/null 2>&1; then
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else
@@ -3253,10 +3515,6 @@ freebsd* | dragonfly*)
fi
;;
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3295,11 +3553,11 @@ irix5* | irix6* | nonstopux*)
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
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
@@ -3317,8 +3575,8 @@ newos6*)
lt_cv_deplibs_check_method=pass_all
;;
-openbsd*)
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+openbsd* | bitrig*)
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
else
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
@@ -3371,6 +3629,9 @@ sysv4 | sysv4.3*)
tpf*)
lt_cv_deplibs_check_method=pass_all
;;
+os2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
esac
])
@@ -3411,33 +3672,38 @@ AC_DEFUN([LT_PATH_NM],
AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
[if test -n "$NM"; then
# Let the user override the test.
- lt_cv_path_NM="$NM"
+ lt_cv_path_NM=$NM
else
- lt_nm_to_check="${ac_tool_prefix}nm"
+ lt_nm_to_check=${ac_tool_prefix}nm
if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
lt_nm_to_check="$lt_nm_to_check nm"
fi
for lt_tmp_nm in $lt_nm_to_check; do
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- tmp_nm="$ac_dir/$lt_tmp_nm"
- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+ tmp_nm=$ac_dir/$lt_tmp_nm
+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
# Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # Adding the 'sed 1q' prevents false positives on HP-UX, which says:
# nm: unknown option "B" ignored
# Tru64's nm complains that /dev/null is an invalid object file
- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
- */dev/null* | *'Invalid file or object type'*)
+ # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+ case $build_os in
+ mingw*) lt_bad_file=conftest.nm/nofile ;;
+ *) lt_bad_file=/dev/null ;;
+ esac
+ case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+ *$lt_bad_file* | *'Invalid file or object type'*)
lt_cv_path_NM="$tmp_nm -B"
- break
+ break 2
;;
*)
case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
*/dev/null*)
lt_cv_path_NM="$tmp_nm -p"
- break
+ break 2
;;
*)
lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
@@ -3448,21 +3714,21 @@ else
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
done
: ${lt_cv_path_NM=no}
fi])
-if test "$lt_cv_path_NM" != "no"; then
- NM="$lt_cv_path_NM"
+if test no != "$lt_cv_path_NM"; then
+ NM=$lt_cv_path_NM
else
# Didn't find any BSD compatible name lister, look for dumpbin.
if test -n "$DUMPBIN"; then :
# Let the user override the test.
else
AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+ case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
*COFF*)
- DUMPBIN="$DUMPBIN -symbols"
+ DUMPBIN="$DUMPBIN -symbols -headers"
;;
*)
DUMPBIN=:
@@ -3470,8 +3736,8 @@ else
esac
fi
AC_SUBST([DUMPBIN])
- if test "$DUMPBIN" != ":"; then
- NM="$DUMPBIN"
+ if test : != "$DUMPBIN"; then
+ NM=$DUMPBIN
fi
fi
test -z "$NM" && NM=nm
@@ -3517,8 +3783,8 @@ lt_cv_sharedlib_from_linklib_cmd,
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
- # two different shell functions defined in ltmain.sh
- # decide which to use based on capabilities of $DLLTOOL
+ # two different shell functions defined in ltmain.sh;
+ # decide which one to use based on capabilities of $DLLTOOL
case `$DLLTOOL --help 2>&1` in
*--identify-strict*)
lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
@@ -3530,7 +3796,7 @@ cygwin* | mingw* | pw32* | cegcc*)
;;
*)
# fallback: assume linklib IS sharedlib
- lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+ lt_cv_sharedlib_from_linklib_cmd=$ECHO
;;
esac
])
@@ -3557,13 +3823,28 @@ AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool
lt_cv_path_mainfest_tool=yes
fi
rm -f conftest*])
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
+if test yes != "$lt_cv_path_mainfest_tool"; then
MANIFEST_TOOL=:
fi
_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
])# _LT_PATH_MANIFEST_TOOL
+# _LT_DLL_DEF_P([FILE])
+# ---------------------
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with func_dll_def_p in the libtool script
+AC_DEFUN([_LT_DLL_DEF_P],
+[dnl
+ test DEF = "`$SED -n dnl
+ -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace
+ -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments
+ -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl
+ -e q dnl Only consider the first "real" line
+ $1`" dnl
+])# _LT_DLL_DEF_P
+
+
# LT_LIB_M
# --------
# check for math library
@@ -3575,11 +3856,11 @@ case $host in
# These system don't have libm, or don't need it
;;
*-ncr-sysv4.3*)
- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
;;
*)
- AC_CHECK_LIB(m, cos, LIBM="-lm")
+ AC_CHECK_LIB(m, cos, LIBM=-lm)
;;
esac
AC_SUBST([LIBM])
@@ -3598,7 +3879,7 @@ m4_defun([_LT_COMPILER_NO_RTTI],
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
case $cc_basename in
nvcc*)
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
@@ -3650,7 +3931,7 @@ cygwin* | mingw* | pw32* | cegcc*)
symcode='[[ABCDGISTW]]'
;;
hpux*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
symcode='[[ABCDEGRST]]'
fi
;;
@@ -3683,14 +3964,44 @@ case `$NM -V 2>&1` in
symcode='[[ABCDGIRSTW]]' ;;
esac
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ # Gets list of data symbols to import.
+ lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+ # Adjust the below global symbol transforms to fixup imported variables.
+ lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+ lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'"
+ lt_c_name_lib_hook="\
+ -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\
+ -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'"
+else
+ # Disable hooks by default.
+ lt_cv_sys_global_symbol_to_import=
+ lt_cdecl_hook=
+ lt_c_name_hook=
+ lt_c_name_lib_hook=
+fi
+
# Transform an extracted symbol line into a proper C declaration.
# Some systems (esp. on ia64) link data and code symbols differently,
# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'"
# Handle CRLF in mingw tool chain
opt_cr=
@@ -3708,21 +4019,24 @@ for ac_symprfx in "" "_"; do
# Write the raw and C identifiers.
if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- # Fake it for dumpbin and say T for any non-static function
- # and D for any global variable.
+ # Fake it for dumpbin and say T for any non-static function,
+ # D for any global variable and I for any imported variable.
# Also find C++ and __fastcall symbols from MSVC++,
# which start with @ or ?.
lt_cv_sys_global_symbol_pipe="$AWK ['"\
" {last_section=section; section=\$ 3};"\
" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
" \$ 0!~/External *\|/{next};"\
" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
" {if(hide[section]) next};"\
-" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-" s[1]~/^[@?]/{print s[1], s[1]; next};"\
-" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
" ' prfx=^$ac_symprfx]"
else
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
@@ -3762,11 +4076,11 @@ _LT_EOF
if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
cat <<_LT_EOF > conftest.$ac_ext
/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
relocations are performed -- see ld's documentation on pseudo-relocs. */
# define LT@&t at _DLSYM_CONST
-#elif defined(__osf__)
+#elif defined __osf__
/* This system does not cope well with relocations in const data. */
# define LT@&t at _DLSYM_CONST
#else
@@ -3792,7 +4106,7 @@ lt__PROGRAM__LTX_preloaded_symbols[[]] =
{
{ "@PROGRAM@", (void *) 0 },
_LT_EOF
- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+ $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
cat <<\_LT_EOF >> conftest.$ac_ext
{0, (void *) 0}
};
@@ -3812,9 +4126,9 @@ _LT_EOF
mv conftest.$ac_objext conftstm.$ac_objext
lt_globsym_save_LIBS=$LIBS
lt_globsym_save_CFLAGS=$CFLAGS
- LIBS="conftstm.$ac_objext"
+ LIBS=conftstm.$ac_objext
CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+ if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
pipe_works=yes
fi
LIBS=$lt_globsym_save_LIBS
@@ -3835,7 +4149,7 @@ _LT_EOF
rm -rf conftest* conftst*
# Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
+ if test yes = "$pipe_works"; then
break
else
lt_cv_sys_global_symbol_pipe=
@@ -3862,12 +4176,16 @@ _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
[Take the output of nm and produce a listing of raw symbols and C names])
_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
[Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1],
+ [Transform the output of nm into a list of symbols to manually relocate])
_LT_DECL([global_symbol_to_c_name_address],
[lt_cv_sys_global_symbol_to_c_name_address], [1],
[Transform the output of nm in a C name address pair])
_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
[lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
[Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([nm_interface], [lt_cv_nm_interface], [1],
+ [The name lister interface])
_LT_DECL([], [nm_file_list_spec], [1],
[Specify filename containing input files for $NM])
]) # _LT_CMD_GLOBAL_SYMBOLS
@@ -3883,17 +4201,18 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)=
m4_if([$1], [CXX], [
# C++ specific cases for pic, static, wl, etc.
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
case $host_os in
aix*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
fi
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
amigaos*)
@@ -3904,8 +4223,8 @@ m4_if([$1], [CXX], [
;;
m68k)
# FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
+ # adding the '-m68020' flag to GCC prevents building anything better,
+ # like '-m68040'.
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
esac
@@ -3921,6 +4240,11 @@ m4_if([$1], [CXX], [
# (--disable-auto-import) libraries
m4_if([$1], [GCJ], [],
[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ case $host_os in
+ os2*)
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
# PIC is the default on this platform
@@ -3970,7 +4294,7 @@ m4_if([$1], [CXX], [
case $host_os in
aix[[4-9]]*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
else
@@ -4011,14 +4335,14 @@ m4_if([$1], [CXX], [
case $cc_basename in
CC*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
- if test "$host_cpu" != ia64; then
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+ if test ia64 != "$host_cpu"; then
_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
fi
;;
aCC*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
case $host_cpu in
hppa*64*|ia64*)
# +Z the default
@@ -4047,7 +4371,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -4055,7 +4379,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
ecpc* )
- # old Intel C++ for x86_64 which still supported -KPIC.
+ # old Intel C++ for x86_64, which still supported -KPIC.
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
@@ -4111,7 +4435,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4200,17 +4524,18 @@ m4_if([$1], [CXX], [
fi
],
[
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
case $host_os in
aix*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
fi
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
amigaos*)
@@ -4221,8 +4546,8 @@ m4_if([$1], [CXX], [
;;
m68k)
# FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
+ # adding the '-m68020' flag to GCC prevents building anything better,
+ # like '-m68040'.
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
esac
@@ -4239,6 +4564,11 @@ m4_if([$1], [CXX], [
# (--disable-auto-import) libraries
m4_if([$1], [GCJ], [],
[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ case $host_os in
+ os2*)
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
@@ -4309,7 +4639,7 @@ m4_if([$1], [CXX], [
case $host_os in
aix*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
else
@@ -4317,11 +4647,30 @@ m4_if([$1], [CXX], [
fi
;;
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+ case $cc_basename in
+ nagfor*)
+ # NAG Fortran compiler
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+ esac
+ ;;
+
mingw* | cygwin* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
m4_if([$1], [GCJ], [],
[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ case $host_os in
+ os2*)
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+ ;;
+ esac
;;
hpux9* | hpux10* | hpux11*)
@@ -4337,7 +4686,7 @@ m4_if([$1], [CXX], [
;;
esac
# Is there a better lt_prog_compiler_static that works with the bundled CC?
- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
;;
irix5* | irix6* | nonstopux*)
@@ -4346,9 +4695,9 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
+ # old Intel for x86_64, which still supported -KPIC.
ecc*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -4373,6 +4722,12 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
@@ -4470,7 +4825,7 @@ m4_if([$1], [CXX], [
;;
sysv4*MP*)
- if test -d /usr/nec ;then
+ if test -d /usr/nec; then
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
fi
@@ -4499,7 +4854,7 @@ m4_if([$1], [CXX], [
fi
])
case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
+ # For platforms that do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -4565,17 +4920,21 @@ m4_if([$1], [CXX], [
case $host_os in
aix[[4-9]]*)
# If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global defined
- # symbols, whereas GNU nm marks them as "W".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
;;
pw32*)
- _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+ _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
;;
cygwin* | mingw* | cegcc*)
case $cc_basename in
@@ -4588,6 +4947,9 @@ m4_if([$1], [CXX], [
;;
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'
;;
@@ -4621,9 +4983,9 @@ m4_if([$1], [CXX], [
# included in the symbol list
_LT_TAGVAR(include_expsyms, $1)=
# exclude_expsyms can be an extended regexp of symbols to exclude
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
+ # it will be wrapped by ' (' and ')$', so one must not match beginning or
+ # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+ # as well as any symbol that contains 'd'.
_LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
@@ -4639,7 +5001,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
- if test "$GCC" != yes; then
+ if test yes != "$GCC"; then
with_gnu_ld=no
fi
;;
@@ -4647,9 +5009,12 @@ dnl Note also adjust exclude_expsyms for C++ above.
# we just hope/assume this is gcc and not c89 (= MSVC++)
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
@@ -4657,7 +5022,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
# On some targets, GNU ld is compatible enough with the native linker
# that we're better off using the native interface for both.
lt_use_gnu_ld_interface=no
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
case $host_os in
aix*)
# The AIX port of GNU ld has always aspired to compatibility
@@ -4679,24 +5044,24 @@ dnl Note also adjust exclude_expsyms for C++ above.
esac
fi
- if test "$lt_use_gnu_ld_interface" = yes; then
+ if test yes = "$lt_use_gnu_ld_interface"; then
# If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
+ wlarc='$wl'
# Set some defaults for GNU ld with shared library support. These
# are reset later if shared libraries are not supported. Putting them
# here allows them to be overridden if necessary.
runpath_var=LD_RUN_PATH
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
# ancient GNU ld didn't support --whole-archive et. al.
if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
else
_LT_TAGVAR(whole_archive_flag_spec, $1)=
fi
supports_anon_versioning=no
- case `$LD -v 2>&1` in
+ case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in
*GNU\ gold*) supports_anon_versioning=yes ;;
*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -4709,7 +5074,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
case $host_os in
aix[[3-9]]*)
# On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
+ if test ia64 != "$host_cpu"; then
_LT_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
@@ -4728,7 +5093,7 @@ _LT_EOF
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)=''
;;
m68k)
@@ -4744,7 +5109,7 @@ _LT_EOF
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -4754,7 +5119,7 @@ _LT_EOF
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(always_export_symbols, $1)=no
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -4762,61 +5127,89 @@ _LT_EOF
_LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file, use it as
+ # is; otherwise, prepend EXPORTS...
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
;;
haiku*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
+ os2*)
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ shrext_cmds=.dll
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+
interix[[3-9]]*)
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
# Instead, shared libraries are loaded at an image base (0x10000000 by
# default) and relocated if they conflict, which is a slow very memory
# consuming and fragmenting process. To avoid this, we pick a random,
# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
# time. Moving up from 0x10000000 also allows more sbrk(2) space.
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
+ if test linux-dietlibc = "$host_os"; then
case $cc_basename in
diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
esac
fi
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
- && test "$tmp_diet" = no
+ && test no = "$tmp_diet"
then
tmp_addflag=' $pic_flag'
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group f77 and f90 compilers
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -4827,42 +5220,47 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
_LT_TAGVAR(whole_archive_flag_spec, $1)=
tmp_sharedflag='--shared' ;;
+ nagfor*) # NAGFOR 5.3
+ tmp_sharedflag='-Wl,-shared' ;;
xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
tmp_sharedflag='-qmkshrobj'
tmp_addflag= ;;
nvcc*) # Cuda Compiler Driver 2.2
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
;;
esac
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*) # Sun C 5.9
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
tmp_sharedflag='-G' ;;
esac
- _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ if test yes = "$supports_anon_versioning"; then
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
fi
case $cc_basename in
+ tcc*)
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
+ ;;
xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
_LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ if test yes = "$supports_anon_versioning"; then
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
fi
;;
esac
@@ -4871,13 +5269,13 @@ _LT_EOF
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=
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
fi
;;
@@ -4895,8 +5293,8 @@ _LT_EOF
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -4908,7 +5306,7 @@ _LT_EOF
_LT_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
*** reliably create shared libraries on SCO systems. Therefore, libtool
*** is disabling shared libraries support. We urge you to upgrade GNU
*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
@@ -4923,9 +5321,9 @@ _LT_EOF
# DT_RUNPATH tag from executables and libraries. But doing so
# requires that you compile everything twice, which is a pain.
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -4942,15 +5340,15 @@ _LT_EOF
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
;;
esac
- if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
+ if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then
runpath_var=
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
_LT_TAGVAR(export_dynamic_flag_spec, $1)=
@@ -4966,7 +5364,7 @@ _LT_EOF
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
_LT_TAGVAR(hardcode_minus_L, $1)=yes
- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
_LT_TAGVAR(hardcode_direct, $1)=unsupported
@@ -4974,34 +5372,57 @@ _LT_EOF
;;
aix[[4-9]]*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
exp_sym_flag='-Bexport'
- no_entry_flag=""
+ no_entry_flag=
else
# If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global
- # defined symbols, whereas GNU nm marks them as "W".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
aix_use_runtimelinking=yes
break
fi
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -5020,13 +5441,21 @@ _LT_EOF
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+ _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # traditional, no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+ ;;
+ esac
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
case $host_os in aix4.[[012]]|aix4.[[012]].*)
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
+ collect2name=`$CC -print-prog-name=collect2`
if test -f "$collect2name" &&
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
then
@@ -5045,61 +5474,80 @@ _LT_EOF
;;
esac
shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag="$shared_flag "'$wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag='$wl-G'
else
- shared_flag='${wl}-bM:SRE'
+ shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to export.
_LT_TAGVAR(always_export_symbols, $1)=yes
- if test "$aix_use_runtimelinking" = yes; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
_LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
else
- if test "$host_cpu" = ia64; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ if test ia64 = "$host_cpu"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
_LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an
# empty executable.
_LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
+ _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+ if test yes = "$with_gnu_ld"; then
# We only use this code for GNU lds that support --whole-archive.
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
else
# Exported symbols can be pulled into shared objects from archives
_LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds its shared libraries.
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared libraries.
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 3 [...]
+ else
+ # used by -dlpreopen to get the symbols
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -5108,7 +5556,7 @@ _LT_EOF
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)=''
;;
m68k)
@@ -5138,16 +5586,17 @@ _LT_EOF
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
- _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- else
- sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- fi~
- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- linknames='
+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+ cp "$export_symbols" "$output_objdir/$soname.def";
+ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+ else
+ $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
# The linker will not automatically build a static lib if we build a DLL.
# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -5156,18 +5605,18 @@ _LT_EOF
# Don't use ranlib
_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
- lt_tool_outputfile="@TOOL_OUTPUT@"~
- case $lt_outputfile in
- *.exe|*.EXE) ;;
- *)
- lt_outputfile="$lt_outputfile.exe"
- lt_tool_outputfile="$lt_tool_outputfile.exe"
- ;;
- esac~
- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- $RM "$lt_outputfile.manifest";
- fi'
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile=$lt_outputfile.exe
+ lt_tool_outputfile=$lt_tool_outputfile.exe
+ ;;
+ esac~
+ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
;;
*)
# Assume MSVC wrapper
@@ -5176,7 +5625,7 @@ _LT_EOF
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
# The linker will automatically build a .lib file if we build a DLL.
@@ -5226,33 +5675,33 @@ _LT_EOF
;;
hpux9*)
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
else
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
fi
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(hardcode_direct, $1)=yes
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
_LT_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
;;
hpux10*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes,no = "$GCC,$with_gnu_ld"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
fi
- if test "$with_gnu_ld" = no; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
_LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5260,25 +5709,25 @@ _LT_EOF
;;
hpux11*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ if test yes,no = "$GCC,$with_gnu_ld"; then
case $host_cpu in
hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
case $host_cpu in
hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
m4_if($1, [], [
@@ -5286,14 +5735,14 @@ _LT_EOF
# (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
_LT_LINKER_OPTION([if $CC understands -b],
_LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
- [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
[_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
- [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
;;
esac
fi
- if test "$with_gnu_ld" = no; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
case $host_cpu in
@@ -5304,7 +5753,7 @@ _LT_EOF
*)
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
@@ -5315,16 +5764,16 @@ _LT_EOF
;;
irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
# This should be the same for all languages, so no per-tag cache variable.
AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
[lt_cv_irix_exported_symbol],
- [save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ [save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
AC_LINK_IFELSE(
[AC_LANG_SOURCE(
[AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
@@ -5337,22 +5786,33 @@ _LT_EOF
end]])])],
[lt_cv_irix_exported_symbol=yes],
[lt_cv_irix_exported_symbol=no])
- LDFLAGS="$save_LDFLAGS"])
- if test "$lt_cv_irix_exported_symbol" = yes; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+ LDFLAGS=$save_LDFLAGS])
+ if test yes = "$lt_cv_irix_exported_symbol"; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
fi
+ _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'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(inherit_rpath, $1)=yes
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd*)
+ linux*)
+ case $cc_basename in
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+
+ netbsd* | 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
@@ -5366,7 +5826,7 @@ _LT_EOF
newsos6)
_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@@ -5374,27 +5834,19 @@ _LT_EOF
*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
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
else
- case $host_os in
- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- ;;
- *)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- ;;
- esac
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
fi
else
_LT_TAGVAR(ld_shlibs, $1)=no
@@ -5405,33 +5857,53 @@ _LT_EOF
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_TAGVAR(hardcode_minus_L, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ shrext_cmds=.dll
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
;;
osf3*)
- if test "$GCC" = yes; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
else
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
;;
osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
else
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+ $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
# Both c and cxx compiler support -rpath directly
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -5442,24 +5914,24 @@ _LT_EOF
solaris*)
_LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
- if test "$GCC" = yes; then
- wlarc='${wl}'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ wlarc='$wl'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
wlarc=''
- _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+ $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
;;
*)
- wlarc='${wl}'
- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ wlarc='$wl'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
;;
esac
fi
@@ -5469,11 +5941,11 @@ _LT_EOF
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
# The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but understands '-z linker_flag'. GCC discards it without '$wl',
# but is careful enough not to reorder.
# Supported since Solaris 2.6 (maybe 2.5.1?)
- if test "$GCC" = yes; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
else
_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
fi
@@ -5483,10 +5955,10 @@ _LT_EOF
;;
sunos4*)
- if test "x$host_vendor" = xsequent; then
+ if test sequent = "$host_vendor"; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
else
_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
@@ -5535,43 +6007,43 @@ _LT_EOF
;;
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
runpath_var='LD_RUN_PATH'
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
;;
sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
+ # Note: We CANNOT use -z defs as we might desire, because we do not
# link with -lc, and that would cause any symbols used from libc to
# always be unresolved, which means just about no library would
# ever link correctly. If we're not using GNU ld we use -z text
# though, which does catch some bad symbols but isn't as heavy-handed
# as -z defs.
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+ _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
runpath_var='LD_RUN_PATH'
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
;;
@@ -5586,17 +6058,17 @@ _LT_EOF
;;
esac
- if test x$host_vendor = xsni; then
+ if test sni = "$host_vendor"; then
case $host in
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym'
;;
esac
fi
fi
])
AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
@@ -5613,7 +6085,7 @@ x|xyes)
# Assume -lc should be added
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- if test "$enable_shared" = yes && test "$GCC" = yes; then
+ if test yes,yes = "$GCC,$enable_shared"; then
case $_LT_TAGVAR(archive_cmds, $1) in
*'~'*)
# FIXME: we may have to deal with multi-command sequences.
@@ -5693,12 +6165,12 @@ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
_LT_TAGDECL([], [hardcode_libdir_separator], [1],
[Whether we need a single "-rpath" flag with a separated argument])
_LT_TAGDECL([], [hardcode_direct], [0],
- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+ [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
DIR into the resulting binary])
_LT_TAGDECL([], [hardcode_direct_absolute], [0],
- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+ [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
@@ -5739,10 +6211,10 @@ dnl [Compiler flag to generate thread safe objects])
# ------------------------
# Ensure that the configuration variables for a C compiler are suitably
# defined. These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
+# the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_C_CONFIG],
[m4_require([_LT_DECL_EGREP])dnl
-lt_save_CC="$CC"
+lt_save_CC=$CC
AC_LANG_PUSH(C)
# Source file extension for C test sources.
@@ -5782,18 +6254,18 @@ if test -n "$compiler"; then
LT_SYS_DLOPEN_SELF
_LT_CMD_STRIPLIB
- # Report which library types will actually be built
+ # Report what library types will actually be built
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
+ test no = "$can_build_shared" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
case $host_os in
aix3*)
- test "$enable_shared" = yes && enable_static=no
+ test yes = "$enable_shared" && enable_static=no
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
@@ -5801,8 +6273,12 @@ if test -n "$compiler"; then
;;
aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -5810,13 +6286,13 @@ if test -n "$compiler"; then
AC_MSG_CHECKING([whether to build static libraries])
# Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
+ test yes = "$enable_shared" || enable_static=yes
AC_MSG_RESULT([$enable_static])
_LT_CONFIG($1)
fi
AC_LANG_POP
-CC="$lt_save_CC"
+CC=$lt_save_CC
])# _LT_LANG_C_CONFIG
@@ -5824,14 +6300,14 @@ CC="$lt_save_CC"
# --------------------------
# Ensure that the configuration variables for a C++ compiler are suitably
# defined. These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
+# the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_CXX_CONFIG],
[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_EGREP])dnl
m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
+if test -n "$CXX" && ( test no != "$CXX" &&
+ ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+ (test g++ != "$CXX"))); then
AC_PROG_CXXCPP
else
_lt_caught_CXX_error=yes
@@ -5873,7 +6349,7 @@ _LT_TAGVAR(objext, $1)=$objext
# the CXX compiler isn't working. Some variables (like enable_shared)
# are currently assumed to apply to all compilers on this platform,
# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
+if test yes != "$_lt_caught_CXX_error"; then
# Code to be used in simple compile tests
lt_simple_compile_test_code="int some_variable = 0;"
@@ -5915,35 +6391,35 @@ if test "$_lt_caught_CXX_error" != yes; then
if test -n "$compiler"; then
# We don't want -fno-exception when compiling C++ code, so set the
# no_builtin_flag separately
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
else
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
fi
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
# Set up default GNU C++ configuration
LT_PATH_LD
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
- if test "$with_gnu_ld" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ if test yes = "$with_gnu_ld"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
# If archive_cmds runs LD, not CC, wlarc should be empty
# XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
# investigate it a little bit more. (MM)
- wlarc='${wl}'
+ wlarc='$wl'
# ancient GNU ld didn't support --whole-archive et. al.
if eval "`$CC -print-prog-name=ld` --help 2>&1" |
$GREP 'no-whole-archive' > /dev/null; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
else
_LT_TAGVAR(whole_archive_flag_spec, $1)=
fi
@@ -5979,18 +6455,30 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=no
;;
aix[[4-9]]*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
exp_sym_flag='-Bexport'
- no_entry_flag=""
+ no_entry_flag=
else
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do
case $ld_flag in
@@ -6000,6 +6488,13 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
esac
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -6018,13 +6513,21 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+ _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+ ;;
+ esac
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
case $host_os in aix4.[[012]]|aix4.[[012]].*)
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
+ collect2name=`$CC -print-prog-name=collect2`
if test -f "$collect2name" &&
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
then
@@ -6042,64 +6545,84 @@ if test "$_lt_caught_CXX_error" != yes; then
fi
esac
shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag=$shared_flag' $wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag='$wl-G'
else
- shared_flag='${wl}-bM:SRE'
+ shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to
# export.
_LT_TAGVAR(always_export_symbols, $1)=yes
- if test "$aix_use_runtimelinking" = yes; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+ # The "-G" linker flag allows undefined symbols.
+ _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
# Determine the default libpath from the value encoded in an empty
# executable.
_LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
else
- if test "$host_cpu" = ia64; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ if test ia64 = "$host_cpu"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
_LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an
# empty executable.
_LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
+ _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+ if test yes = "$with_gnu_ld"; then
# We only use this code for GNU lds that support --whole-archive.
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
else
# Exported symbols can be pulled into shared objects from archives
_LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds its shared
- # libraries.
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared
+ # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# [...]
+ else
+ # used by -dlpreopen to get the symbols
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -6109,7 +6632,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -6137,57 +6660,58 @@ if test "$_lt_caught_CXX_error" != yes; then
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
- _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- else
- $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- fi~
- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- linknames='
+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+ cp "$export_symbols" "$output_objdir/$soname.def";
+ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+ else
+ $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
# The linker will not automatically build a static lib if we build a DLL.
# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
# Don't use ranlib
_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
- lt_tool_outputfile="@TOOL_OUTPUT@"~
- case $lt_outputfile in
- *.exe|*.EXE) ;;
- *)
- lt_outputfile="$lt_outputfile.exe"
- lt_tool_outputfile="$lt_tool_outputfile.exe"
- ;;
- esac~
- func_to_tool_file "$lt_outputfile"~
- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- $RM "$lt_outputfile.manifest";
- fi'
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile=$lt_outputfile.exe
+ lt_tool_outputfile=$lt_tool_outputfile.exe
+ ;;
+ esac~
+ func_to_tool_file "$lt_outputfile"~
+ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
;;
*)
# g++
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(always_export_symbols, $1)=no
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file, use it as
+ # is; otherwise, prepend EXPORTS...
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -6198,6 +6722,34 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_DARWIN_LINKER_FEATURES($1)
;;
+ os2*)
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ shrext_cmds=.dll
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+
dgux*)
case $cc_basename in
ec++*)
@@ -6232,18 +6784,15 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=yes
;;
- gnu*)
- ;;
-
haiku*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
hpux9*)
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
# but as the default
@@ -6255,7 +6804,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=no
;;
aCC*)
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -6264,11 +6813,11 @@ if test "$_lt_caught_CXX_error" != yes; then
# 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 "$GXX" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ if test yes = "$GXX"; then
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
else
# FIXME: insert proper C++ library support
_LT_TAGVAR(ld_shlibs, $1)=no
@@ -6278,15 +6827,15 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
hpux10*|hpux11*)
- if test $with_gnu_ld = no; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
case $host_cpu in
hppa*64*|ia64*)
;;
*)
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
;;
esac
fi
@@ -6312,13 +6861,13 @@ if test "$_lt_caught_CXX_error" != yes; then
aCC*)
case $host_cpu in
hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
esac
# Commands to make compiler produce verbose output that lists
@@ -6329,20 +6878,20 @@ if test "$_lt_caught_CXX_error" != yes; then
# 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 "$GXX" = yes; then
- if test $with_gnu_ld = no; then
+ if test yes = "$GXX"; then
+ if test no = "$with_gnu_ld"; then
case $host_cpu in
hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
esac
fi
@@ -6357,22 +6906,22 @@ if test "$_lt_caught_CXX_error" != yes; then
interix[[3-9]]*)
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
# Instead, shared libraries are loaded at an image base (0x10000000 by
# default) and relocated if they conflict, which is a slow very memory
# consuming and fragmenting process. To avoid this, we pick a random,
# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
# time. Moving up from 0x10000000 also allows more sbrk(2) space.
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
irix5* | irix6*)
case $cc_basename in
CC*)
# SGI C++
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
@@ -6381,22 +6930,22 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
;;
*)
- if test "$GXX" = yes; then
- if test "$with_gnu_ld" = no; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GXX"; then
+ if test no = "$with_gnu_ld"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
fi
fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
esac
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -6404,8 +6953,8 @@ if test "$_lt_caught_CXX_error" != yes; then
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -6414,10 +6963,10 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
# Archives containing C++ object files must be created using
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
@@ -6431,59 +6980,59 @@ if test "$_lt_caught_CXX_error" != yes; then
# earlier do not add the objects themselves.
case `$CC -V 2>&1` in
*"Version 7."*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
*) # Version 8.0 or newer
tmp_idyn=
case $host_cpu in
ia64*) tmp_idyn=' -i_dynamic';;
esac
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
esac
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
;;
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
*pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
_LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
- compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
_LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
- $RANLIB $oldlib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+ $RANLIB $oldlib'
_LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
*) # Version 6 and above use weak symbols
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
esac
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
;;
cxx*)
# Compaq C++
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols'
runpath_var=LD_RUN_PATH
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -6497,18 +7046,18 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
;;
xl* | mpixl* | bgxl*)
# IBM XL 8.0 on PPC, with GNU ld
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ if test yes = "$supports_anon_versioning"; then
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
fi
;;
*)
@@ -6516,10 +7065,10 @@ if test "$_lt_caught_CXX_error" != yes; then
*Sun\ C*)
# Sun C++ 5.9
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
# Not sure whether something based on
@@ -6577,22 +7126,17 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=yes
;;
- openbsd2*)
- # C++ shared libraries are fairly broken
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- openbsd*)
+ openbsd* | bitrig*)
if test -f /usr/libexec/ld.so; then
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
fi
output_verbose_link_cmd=func_echo_all
else
@@ -6608,9 +7152,9 @@ if test "$_lt_caught_CXX_error" != yes; then
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
# Archives containing C++ object files must be created using
@@ -6628,17 +7172,17 @@ if test "$_lt_caught_CXX_error" != yes; then
cxx*)
case $host in
osf3*)
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
;;
*)
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
- $RM $lib.exp'
+ echo "-hidden">> $lib.exp~
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
+ $RM $lib.exp'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
;;
esac
@@ -6653,21 +7197,21 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ if test yes,no = "$GXX,$with_gnu_ld"; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
case $host in
osf3*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
;;
esac
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
# Commands to make compiler produce verbose output that lists
@@ -6713,9 +7257,9 @@ if test "$_lt_caught_CXX_error" != yes; then
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(archive_cmds_need_lc,$1)=yes
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -6723,7 +7267,7 @@ if test "$_lt_caught_CXX_error" != yes; then
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
# The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'.
+ # but understands '-z linker_flag'.
# Supported since Solaris 2.6 (maybe 2.5.1?)
_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
;;
@@ -6740,30 +7284,30 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
gcx*)
# Green Hills C++ Compiler
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
# The C++ compiler must be used to create the archive.
_LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
;;
*)
# GNU C++ compiler with Solaris linker
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+ if test yes,no = "$GXX,$with_gnu_ld"; then
+ _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
if $CC --version | $GREP -v '^2\.7' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
else
- # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ # g++ 2.7 appears to require '-G' NOT '-shared' on this
# platform.
- _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
@@ -6771,11 +7315,11 @@ if test "$_lt_caught_CXX_error" != yes; then
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'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
;;
esac
fi
@@ -6784,52 +7328,52 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
runpath_var='LD_RUN_PATH'
case $cc_basename in
CC*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
;;
sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
+ # Note: We CANNOT use -z defs as we might desire, because we do not
# link with -lc, and that would cause any symbols used from libc to
# always be unresolved, which means just about no library would
# ever link correctly. If we're not using GNU ld we use -z text
# though, which does catch some bad symbols but isn't as heavy-handed
# as -z defs.
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+ _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
runpath_var='LD_RUN_PATH'
case $cc_basename in
CC*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
- '"$_LT_TAGVAR(old_archive_cmds, $1)"
+ '"$_LT_TAGVAR(old_archive_cmds, $1)"
_LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
- '"$_LT_TAGVAR(reload_cmds, $1)"
+ '"$_LT_TAGVAR(reload_cmds, $1)"
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
;;
@@ -6860,10 +7404,10 @@ if test "$_lt_caught_CXX_error" != yes; then
esac
AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
- test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
- _LT_TAGVAR(GCC, $1)="$GXX"
- _LT_TAGVAR(LD, $1)="$LD"
+ _LT_TAGVAR(GCC, $1)=$GXX
+ _LT_TAGVAR(LD, $1)=$LD
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
@@ -6890,7 +7434,7 @@ if test "$_lt_caught_CXX_error" != yes; then
lt_cv_path_LD=$lt_save_path_LD
lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
+fi # test yes != "$_lt_caught_CXX_error"
AC_LANG_POP
])# _LT_LANG_CXX_CONFIG
@@ -6912,13 +7456,14 @@ AC_REQUIRE([_LT_DECL_SED])
AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
func_stripname_cnf ()
{
- case ${2} in
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+ case @S|@2 in
+ .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;;
+ *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;;
esac
} # func_stripname_cnf
])# _LT_FUNC_STRIPNAME_CNF
+
# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
# ---------------------------------
# Figure out "hidden" library dependencies from verbose
@@ -7002,13 +7547,13 @@ if AC_TRY_EVAL(ac_compile); then
pre_test_object_deps_done=no
for p in `eval "$output_verbose_link_cmd"`; do
- case ${prev}${p} in
+ case $prev$p in
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
# Remove the space.
- if test $p = "-L" ||
- test $p = "-R"; then
+ if test x-L = "$p" ||
+ test x-R = "$p"; then
prev=$p
continue
fi
@@ -7024,16 +7569,16 @@ if AC_TRY_EVAL(ac_compile); then
case $p in
=*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
esac
- if test "$pre_test_object_deps_done" = no; then
- case ${prev} in
+ if test no = "$pre_test_object_deps_done"; then
+ case $prev in
-L | -R)
# Internal compiler library paths should come after those
# provided the user. The postdeps already come after the
# user supplied libs so there is no need to process them.
if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
- _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+ _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p
else
- _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+ _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p"
fi
;;
# The "-l" case would never come before the object being
@@ -7041,9 +7586,9 @@ if AC_TRY_EVAL(ac_compile); then
esac
else
if test -z "$_LT_TAGVAR(postdeps, $1)"; then
- _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+ _LT_TAGVAR(postdeps, $1)=$prev$p
else
- _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+ _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p"
fi
fi
prev=
@@ -7058,15 +7603,15 @@ if AC_TRY_EVAL(ac_compile); then
continue
fi
- if test "$pre_test_object_deps_done" = no; then
+ if test no = "$pre_test_object_deps_done"; then
if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
- _LT_TAGVAR(predep_objects, $1)="$p"
+ _LT_TAGVAR(predep_objects, $1)=$p
else
_LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
fi
else
if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
- _LT_TAGVAR(postdep_objects, $1)="$p"
+ _LT_TAGVAR(postdep_objects, $1)=$p
else
_LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
fi
@@ -7097,51 +7642,6 @@ interix[[3-9]]*)
_LT_TAGVAR(postdep_objects,$1)=
_LT_TAGVAR(postdeps,$1)=
;;
-
-linux*)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C++ 5.9
-
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- if test "$solaris_use_stlport4" != yes; then
- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
-
-solaris*)
- case $cc_basename in
- CC* | sunCC*)
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- # Adding this requires a known-good setup of shared libraries for
- # Sun compiler versions before 5.6, else PIC objects from an old
- # archive will be linked into the output, leading to subtle bugs.
- if test "$solaris_use_stlport4" != yes; then
- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
esac
])
@@ -7150,7 +7650,7 @@ case " $_LT_TAGVAR(postdeps, $1) " in
esac
_LT_TAGVAR(compiler_lib_search_dirs, $1)=
if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'`
fi
_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
[The directories searched by this compiler when creating a shared library])
@@ -7170,10 +7670,10 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1],
# --------------------------
# Ensure that the configuration variables for a Fortran 77 compiler are
# suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_F77_CONFIG],
[AC_LANG_PUSH(Fortran 77)
-if test -z "$F77" || test "X$F77" = "Xno"; then
+if test -z "$F77" || test no = "$F77"; then
_lt_disable_F77=yes
fi
@@ -7210,7 +7710,7 @@ _LT_TAGVAR(objext, $1)=$objext
# the F77 compiler isn't working. Some variables (like enable_shared)
# are currently assumed to apply to all compilers on this platform,
# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
+if test yes != "$_lt_disable_F77"; then
# Code to be used in simple compile tests
lt_simple_compile_test_code="\
subroutine t
@@ -7232,7 +7732,7 @@ if test "$_lt_disable_F77" != yes; then
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
+ lt_save_CC=$CC
lt_save_GCC=$GCC
lt_save_CFLAGS=$CFLAGS
CC=${F77-"f77"}
@@ -7246,21 +7746,25 @@ if test "$_lt_disable_F77" != yes; then
AC_MSG_RESULT([$can_build_shared])
AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
+ test no = "$can_build_shared" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
case $host_os in
aix3*)
- test "$enable_shared" = yes && enable_static=no
+ test yes = "$enable_shared" && enable_static=no
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
fi
;;
aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -7268,11 +7772,11 @@ if test "$_lt_disable_F77" != yes; then
AC_MSG_CHECKING([whether to build static libraries])
# Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
+ test yes = "$enable_shared" || enable_static=yes
AC_MSG_RESULT([$enable_static])
- _LT_TAGVAR(GCC, $1)="$G77"
- _LT_TAGVAR(LD, $1)="$LD"
+ _LT_TAGVAR(GCC, $1)=$G77
+ _LT_TAGVAR(LD, $1)=$LD
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
@@ -7289,9 +7793,9 @@ if test "$_lt_disable_F77" != yes; then
fi # test -n "$compiler"
GCC=$lt_save_GCC
- CC="$lt_save_CC"
- CFLAGS="$lt_save_CFLAGS"
-fi # test "$_lt_disable_F77" != yes
+ CC=$lt_save_CC
+ CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_F77"
AC_LANG_POP
])# _LT_LANG_F77_CONFIG
@@ -7301,11 +7805,11 @@ AC_LANG_POP
# -------------------------
# Ensure that the configuration variables for a Fortran compiler are
# suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_FC_CONFIG],
[AC_LANG_PUSH(Fortran)
-if test -z "$FC" || test "X$FC" = "Xno"; then
+if test -z "$FC" || test no = "$FC"; then
_lt_disable_FC=yes
fi
@@ -7342,7 +7846,7 @@ _LT_TAGVAR(objext, $1)=$objext
# the FC compiler isn't working. Some variables (like enable_shared)
# are currently assumed to apply to all compilers on this platform,
# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
+if test yes != "$_lt_disable_FC"; then
# Code to be used in simple compile tests
lt_simple_compile_test_code="\
subroutine t
@@ -7364,7 +7868,7 @@ if test "$_lt_disable_FC" != yes; then
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
+ lt_save_CC=$CC
lt_save_GCC=$GCC
lt_save_CFLAGS=$CFLAGS
CC=${FC-"f95"}
@@ -7380,21 +7884,25 @@ if test "$_lt_disable_FC" != yes; then
AC_MSG_RESULT([$can_build_shared])
AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
+ test no = "$can_build_shared" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
case $host_os in
aix3*)
- test "$enable_shared" = yes && enable_static=no
+ test yes = "$enable_shared" && enable_static=no
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
fi
;;
aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -7402,11 +7910,11 @@ if test "$_lt_disable_FC" != yes; then
AC_MSG_CHECKING([whether to build static libraries])
# Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
+ test yes = "$enable_shared" || enable_static=yes
AC_MSG_RESULT([$enable_static])
- _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
- _LT_TAGVAR(LD, $1)="$LD"
+ _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu
+ _LT_TAGVAR(LD, $1)=$LD
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
@@ -7426,7 +7934,7 @@ if test "$_lt_disable_FC" != yes; then
GCC=$lt_save_GCC
CC=$lt_save_CC
CFLAGS=$lt_save_CFLAGS
-fi # test "$_lt_disable_FC" != yes
+fi # test yes != "$_lt_disable_FC"
AC_LANG_POP
])# _LT_LANG_FC_CONFIG
@@ -7436,7 +7944,7 @@ AC_LANG_POP
# --------------------------
# Ensure that the configuration variables for the GNU Java Compiler compiler
# are suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_GCJ_CONFIG],
[AC_REQUIRE([LT_PROG_GCJ])dnl
AC_LANG_SAVE
@@ -7470,7 +7978,7 @@ CC=${GCJ-"gcj"}
CFLAGS=$GCJFLAGS
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
+_LT_TAGVAR(LD, $1)=$LD
_LT_CC_BASENAME([$compiler])
# GCJ did not exist at the time GCC didn't implicitly link libc in.
@@ -7507,7 +8015,7 @@ CFLAGS=$lt_save_CFLAGS
# --------------------------
# Ensure that the configuration variables for the GNU Go compiler
# are suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_GO_CONFIG],
[AC_REQUIRE([LT_PROG_GO])dnl
AC_LANG_SAVE
@@ -7541,7 +8049,7 @@ CC=${GOC-"gccgo"}
CFLAGS=$GOFLAGS
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
+_LT_TAGVAR(LD, $1)=$LD
_LT_CC_BASENAME([$compiler])
# Go did not exist at the time GCC didn't implicitly link libc in.
@@ -7578,7 +8086,7 @@ CFLAGS=$lt_save_CFLAGS
# -------------------------
# Ensure that the configuration variables for the Windows resource compiler
# are suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_RC_CONFIG],
[AC_REQUIRE([LT_PROG_RC])dnl
AC_LANG_SAVE
@@ -7594,7 +8102,7 @@ _LT_TAGVAR(objext, $1)=$objext
lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
+lt_simple_link_test_code=$lt_simple_compile_test_code
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_TAG_COMPILER
@@ -7604,7 +8112,7 @@ _LT_COMPILER_BOILERPLATE
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
+lt_save_CC=$CC
lt_save_CFLAGS=$CFLAGS
lt_save_GCC=$GCC
GCC=
@@ -7633,7 +8141,7 @@ AC_DEFUN([LT_PROG_GCJ],
[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
[m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
[AC_CHECK_TOOL(GCJ, gcj,)
- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+ test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
AC_SUBST(GCJFLAGS)])])[]dnl
])
@@ -7744,7 +8252,7 @@ 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
+ test ! -f "$lt_ac_sed" && continue
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -7761,9 +8269,9 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
$lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
cmp -s conftest.out conftest.nl || break
# 10000 chars as input seems more than enough
- test $lt_ac_count -gt 10 && break
+ 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
+ if test "$lt_ac_count" -gt "$lt_ac_max"; then
lt_ac_max=$lt_ac_count
lt_cv_path_SED=$lt_ac_sed
fi
@@ -7787,27 +8295,7 @@ dnl AC_DEFUN([LT_AC_PROG_SED], [])
# Find out whether the shell is Bourne or XSI compatible,
# or has some other useful features.
m4_defun([_LT_CHECK_SHELL_FEATURES],
-[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
- test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
- = c,a/b,b/c, \
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
-AC_MSG_RESULT([$xsi_shell])
-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-
-AC_MSG_CHECKING([whether the shell understands "+="])
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
- >/dev/null 2>&1 \
- && lt_shell_append=yes
-AC_MSG_RESULT([$lt_shell_append])
-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
lt_unset=unset
else
lt_unset=false
@@ -7831,102 +8319,9 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
])# _LT_CHECK_SHELL_FEATURES
-# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
-# ------------------------------------------------------
-# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
-# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
-m4_defun([_LT_PROG_FUNCTION_REPLACE],
-[dnl {
-sed -e '/^$1 ()$/,/^} # $1 /c\
-$1 ()\
-{\
-m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
-} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-])
-
-
-# _LT_PROG_REPLACE_SHELLFNS
-# -------------------------
-# Replace existing portable implementations of several shell functions with
-# equivalent extended shell implementations where those features are available..
-m4_defun([_LT_PROG_REPLACE_SHELLFNS],
-[if test x"$xsi_shell" = xyes; then
- _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac])
-
- _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
- func_basename_result="${1##*/}"])
-
- _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
- func_basename_result="${1##*/}"])
-
- _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- # positional parameters, so assign one to ordinary parameter first.
- func_stripname_result=${3}
- func_stripname_result=${func_stripname_result#"${1}"}
- func_stripname_result=${func_stripname_result%"${2}"}])
-
- _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
- func_split_long_opt_name=${1%%=*}
- func_split_long_opt_arg=${1#*=}])
-
- _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
- func_split_short_opt_arg=${1#??}
- func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
-
- _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
- case ${1} in
- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- *) func_lo2o_result=${1} ;;
- esac])
-
- _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
-
- _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
-
- _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
-fi
-
-if test x"$lt_shell_append" = xyes; then
- _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
-
- _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
- func_quote_for_eval "${2}"
-dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
- eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
-
- # Save a `func_append' function call where possible by direct use of '+='
- sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-else
- # Save a `func_append' function call even when '+=' is not available
- sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
- AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
-fi
-])
-
# _LT_PATH_CONVERSION_FUNCTIONS
# -----------------------------
-# Determine which file name conversion functions should be used by
+# Determine what file name conversion functions should be used by
# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
# for certain cross-compile configurations and native mingw.
m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
index 5d9acd8..94b0829 100644
--- a/m4/ltoptions.m4
+++ b/m4/ltoptions.m4
@@ -1,14 +1,14 @@
# Helper functions for option handling. -*- Autoconf -*-
#
-# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
+# Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
# This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
-# serial 7 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])])
@@ -29,7 +29,7 @@ m4_define([_LT_SET_OPTION],
[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
_LT_MANGLE_DEFUN([$1], [$2]),
- [m4_warning([Unknown $1 option `$2'])])[]dnl
+ [m4_warning([Unknown $1 option '$2'])])[]dnl
])
@@ -75,13 +75,15 @@ m4_if([$1],[LT_INIT],[
dnl
dnl If no reference was made to various pairs of opposing options, then
dnl we run the default mode handler for the pair. For example, if neither
- dnl `shared' nor `disable-shared' was passed, we enable building of shared
+ dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
dnl archives by default:
_LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
_LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
_LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
_LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
- [_LT_ENABLE_FAST_INSTALL])
+ [_LT_ENABLE_FAST_INSTALL])
+ _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
+ [_LT_WITH_AIX_SONAME([aix])])
])
])# _LT_SET_OPTIONS
@@ -112,7 +114,7 @@ AU_DEFUN([AC_LIBTOOL_DLOPEN],
[_LT_SET_OPTION([LT_INIT], [dlopen])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.])
+put the 'dlopen' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
@@ -148,7 +150,7 @@ AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
_LT_SET_OPTION([LT_INIT], [win32-dll])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.])
+put the 'win32-dll' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
@@ -157,9 +159,9 @@ dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
# _LT_ENABLE_SHARED([DEFAULT])
# ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+# implement the --enable-shared flag, and supports the 'shared' and
+# 'disable-shared' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
m4_define([_LT_ENABLE_SHARED],
[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
AC_ARG_ENABLE([shared],
@@ -172,14 +174,14 @@ AC_ARG_ENABLE([shared],
*)
enable_shared=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_shared=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
[enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
@@ -211,9 +213,9 @@ dnl AC_DEFUN([AM_DISABLE_SHARED], [])
# _LT_ENABLE_STATIC([DEFAULT])
# ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+# implement the --enable-static flag, and support the 'static' and
+# 'disable-static' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
m4_define([_LT_ENABLE_STATIC],
[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
AC_ARG_ENABLE([static],
@@ -226,14 +228,14 @@ AC_ARG_ENABLE([static],
*)
enable_static=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_static=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
[enable_static=]_LT_ENABLE_STATIC_DEFAULT)
@@ -265,9 +267,9 @@ dnl AC_DEFUN([AM_DISABLE_STATIC], [])
# _LT_ENABLE_FAST_INSTALL([DEFAULT])
# ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+# implement the --enable-fast-install flag, and support the 'fast-install'
+# and 'disable-fast-install' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
m4_define([_LT_ENABLE_FAST_INSTALL],
[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
AC_ARG_ENABLE([fast-install],
@@ -280,14 +282,14 @@ AC_ARG_ENABLE([fast-install],
*)
enable_fast_install=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_fast_install=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
[enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
@@ -304,14 +306,14 @@ AU_DEFUN([AC_ENABLE_FAST_INSTALL],
[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.])
+the 'fast-install' option into LT_INIT's first parameter.])
])
AU_DEFUN([AC_DISABLE_FAST_INSTALL],
[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.])
+the 'disable-fast-install' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
@@ -319,11 +321,64 @@ dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+# _LT_WITH_AIX_SONAME([DEFAULT])
+# ----------------------------------
+# implement the --with-aix-soname flag, and support the `aix-soname=aix'
+# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
+# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'.
+m4_define([_LT_WITH_AIX_SONAME],
+[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
+shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[[5-9]]*,yes)
+ AC_MSG_CHECKING([which variant of shared library versioning to provide])
+ AC_ARG_WITH([aix-soname],
+ [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
+ [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
+ [case $withval in
+ aix|svr4|both)
+ ;;
+ *)
+ AC_MSG_ERROR([Unknown argument to --with-aix-soname])
+ ;;
+ esac
+ lt_cv_with_aix_soname=$with_aix_soname],
+ [AC_CACHE_VAL([lt_cv_with_aix_soname],
+ [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
+ with_aix_soname=$lt_cv_with_aix_soname])
+ AC_MSG_RESULT([$with_aix_soname])
+ if test aix != "$with_aix_soname"; then
+ # For the AIX way of multilib, we name the shared archive member
+ # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+ # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+ # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+ # the AIX toolchain works better with OBJECT_MODE set (default 32).
+ if test 64 = "${OBJECT_MODE-32}"; then
+ shared_archive_member_spec=shr_64
+ else
+ shared_archive_member_spec=shr
+ fi
+ fi
+ ;;
+*)
+ with_aix_soname=aix
+ ;;
+esac
+
+_LT_DECL([], [shared_archive_member_spec], [0],
+ [Shared archive member basename, for filename based shared library versioning on AIX])dnl
+])# _LT_WITH_AIX_SONAME
+
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
+
+
# _LT_WITH_PIC([MODE])
# --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# 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'.
+# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'.
m4_define([_LT_WITH_PIC],
[AC_ARG_WITH([pic],
[AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
@@ -334,19 +389,17 @@ m4_define([_LT_WITH_PIC],
*)
pic_mode=default
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for lt_pkg in $withval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$lt_pkg" = "X$lt_p"; then
pic_mode=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
- [pic_mode=default])
-
-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+ [pic_mode=m4_default([$1], [default])])
_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
])# _LT_WITH_PIC
@@ -359,7 +412,7 @@ AU_DEFUN([AC_LIBTOOL_PICMODE],
[_LT_SET_OPTION([LT_INIT], [pic-only])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.])
+put the 'pic-only' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4
index 9000a05..48bc934 100644
--- a/m4/ltsugar.m4
+++ b/m4/ltsugar.m4
@@ -1,6 +1,7 @@
# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
+# Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
# This file is free software; the Free Software Foundation gives
@@ -33,7 +34,7 @@ m4_define([_lt_join],
# ------------
# Manipulate m4 lists.
# These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
+# Autoconf-2.59, which quotes differently.
m4_define([lt_car], [[$1]])
m4_define([lt_cdr],
[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
@@ -44,7 +45,7 @@ m4_define([lt_unquote], $1)
# lt_append(MACRO-NAME, STRING, [SEPARATOR])
# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
# Note that neither SEPARATOR nor STRING are expanded; they are appended
# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
# No SEPARATOR is output if MACRO-NAME was previously undefined (different
diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
index 07a8602..fa04b52 100644
--- a/m4/ltversion.m4
+++ b/m4/ltversion.m4
@@ -1,6 +1,6 @@
# ltversion.m4 -- version numbers -*- Autoconf -*-
#
-# Copyright (C) 2004 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
# Written by Scott James Remnant, 2004
#
# This file is free software; the Free Software Foundation gives
@@ -9,15 +9,15 @@
# @configure_input@
-# serial 3337 ltversion.m4
+# serial 4179 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.4.2])
-m4_define([LT_PACKAGE_REVISION], [1.3337])
+m4_define([LT_PACKAGE_VERSION], [2.4.6])
+m4_define([LT_PACKAGE_REVISION], [2.4.6])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.2'
-macro_revision='1.3337'
+[macro_version='2.4.6'
+macro_revision='2.4.6'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4
index c573da9..c6b26f8 100644
--- a/m4/lt~obsolete.m4
+++ b/m4/lt~obsolete.m4
@@ -1,6 +1,7 @@
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
#
-# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
+# Foundation, Inc.
# Written by Scott James Remnant, 2004.
#
# This file is free software; the Free Software Foundation gives
@@ -11,7 +12,7 @@
# These exist entirely to fool aclocal when bootstrapping libtool.
#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
# which have later been changed to m4_define as they aren't part of the
# exported API, or moved to Autoconf or Automake where they belong.
#
@@ -25,7 +26,7 @@
# included after everything else. This provides aclocal with the
# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
#
# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
# Yes, that means every name once taken will need to remain here until
diff --git a/man/Makefile.in b/man/Makefile.in
index 648dc7a..1590fcd 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -302,8 +302,6 @@ LIBCHECK_CFLAGS = @LIBCHECK_CFLAGS@
LIBCHECK_LIBS = @LIBCHECK_LIBS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBJSON_CFLAGS = @LIBJSON_CFLAGS@
-LIBJSON_LIBS = @LIBJSON_LIBS@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBPULSE_MAINLOOP_GLIB_VERSION_INFO = @LIBPULSE_MAINLOOP_GLIB_VERSION_INFO@
@@ -327,6 +325,7 @@ LN_S = @LN_S@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
M4 = @M4@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -413,8 +412,6 @@ WEBRTC_CFLAGS = @WEBRTC_CFLAGS@
WEBRTC_LIBS = @WEBRTC_LIBS@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
-XEN_CFLAGS = @XEN_CFLAGS@
-XEN_LIBS = @XEN_LIBS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
@@ -469,6 +466,7 @@ prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
pulseconfdir = @pulseconfdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/man/default.pa.5 b/man/default.pa.5
index 37e3250..11438a5 100644
--- a/man/default.pa.5
+++ b/man/default.pa.5
@@ -4,12 +4,12 @@ default.pa \- PulseAudio Sound Server Startup Script
.SH SYNOPSIS
\fB\fI~/.config/pulse/default.pa\fB
-\fI/etc/pulse/default.pa\fB
+\fI/usr/local/etc/pulse/default.pa\fB
-\fI/etc/pulse/system.pa\fB
+\fI/usr/local/etc/pulse/system.pa\fB
\f1
.SH DESCRIPTION
-The PulseAudio sound server interprets a configuration script on startup, which is mainly used to define the set of modules to load. When PulseAudio runs in the per-user mode and \fI~/.config/pulse/default.pa\f1 exists, that file is used. When PulseAudio runs in the per-user mode and that file doesn't exist, \fI/etc/pulse/default.pa\f1 is used. When PulseAudio runs as a system service, \fI/etc/pulse/system.pa\f1 is used.
+The PulseAudio sound server interprets a configuration script on startup, which is mainly used to define the set of modules to load. When PulseAudio runs in the per-user mode and \fI~/.config/pulse/default.pa\f1 exists, that file is used. When PulseAudio runs in the per-user mode and that file doesn't exist, \fI/usr/local/etc/pulse/default.pa\f1 is used. When PulseAudio runs as a system service, \fI/usr/local/etc/pulse/system.pa\f1 is used.
The script should contain directives in the PulseAudio CLI language, as documented in \fBpulse-cli-syntax(5)\f1.
.SH AUTHORS
diff --git a/man/pax11publish.1 b/man/pax11publish.1
index e0e578d..ec241b9 100644
--- a/man/pax11publish.1
+++ b/man/pax11publish.1
@@ -32,7 +32,7 @@ Read the PulseAudio server credentials currently set on the X11 root window and
Similar to \fB-d\f1, however dumps them in a Bourne shell compatible format so they may be used together with the \fIeval\f1 shell command to set the $PULSE_SERVER, $PULSE_SINK, $PULSE_SOURCE environment variables. Also reads the authentication cookie from the root window and stores it in \fI~/.config/pulse/cookie\f1.
.TP
\fB-e\f1
-Export the currently locally used sound server, sink, source configuration to the X11 root window. This takes the data from the $PULSE_SERVER, $PULSE_SINK, $PULSE_SOURCE environment variables and combines them with the data from \fI~/.config/pulse/client.conf\f1 (or \fI/etc/pulse/client.conf\f1 if that file does not exist). If specific options are passed on the command line (\fB-S\f1, \fB-O\f1, \fB-I\f1, \fB-c\f1, see below), they take precedence. Also uploads the local authentication co [...]
+Export the currently locally used sound server, sink, source configuration to the X11 root window. This takes the data from the $PULSE_SERVER, $PULSE_SINK, $PULSE_SOURCE environment variables and combines them with the data from \fI~/.config/pulse/client.conf\f1 (or \fI/usr/local/etc/pulse/client.conf\f1 if that file does not exist). If specific options are passed on the command line (\fB-S\f1, \fB-O\f1, \fB-I\f1, \fB-c\f1, see below), they take precedence. Also uploads the local authent [...]
.TP
\fB-r\f1
Removes the configured PulseAudio configuration from the X11 root window.
diff --git a/man/pulse-cli-syntax.5 b/man/pulse-cli-syntax.5
index 9d4f7cc..4f1d444 100644
--- a/man/pulse-cli-syntax.5
+++ b/man/pulse-cli-syntax.5
@@ -4,9 +4,9 @@ pulse-cli-syntax \- PulseAudio Command Line Interface Syntax
.SH SYNOPSIS
\fB\fI~/.config/pulse/default.pa\fB
-\fI/etc/pulse/default.pa\fB
+\fI/usr/local/etc/pulse/default.pa\fB
-\fI/etc/pulse/system.pa\fB
+\fI/usr/local/etc/pulse/system.pa\fB
\f1
.SH DESCRIPTION
PulseAudio provides a simple command line language used by configuration scripts, the pacmd interactive shell, and the modules module-cli and module-cli-protocol-{unix,tcp}. Empty lines and lines beginning with a hashmark (#) are silently ignored. Several commands are supported.
diff --git a/man/pulse-client.conf.5 b/man/pulse-client.conf.5
index 5c4b515..7bddd74 100644
--- a/man/pulse-client.conf.5
+++ b/man/pulse-client.conf.5
@@ -6,12 +6,12 @@ pulse-client.conf \- PulseAudio client configuration file
\fI~/.config/pulse/client.conf.d/*.conf\fB
-\fI/etc/pulse/client.conf\fB
+\fI/usr/local/etc/pulse/client.conf\fB
-\fI/etc/pulse/client.conf.d/*.conf\fB
+\fI/usr/local/etc/pulse/client.conf.d/*.conf\fB
\f1
.SH DESCRIPTION
-The PulseAudio client library reads configuration directives from a configuration file on startup. If the per-user file \fI~/.config/pulse/client.conf\f1 exists, it is used, otherwise the system configuration file \fI/etc/pulse/client.conf\f1 is used. In addition to those main files, configuration directives can also be put in files under directories \fI~/.config/pulse/client.conf.d/\f1 and \fI/etc/pulse/client.conf.d/\f1. Those files have to have the .conf file name extension, but other [...]
+The PulseAudio client library reads configuration directives from a configuration file on startup. If the per-user file \fI~/.config/pulse/client.conf\f1 exists, it is used, otherwise the system configuration file \fI/usr/local/etc/pulse/client.conf\f1 is used. In addition to those main files, configuration directives can also be put in files under directories \fI~/.config/pulse/client.conf.d/\f1 and \fI/usr/local/etc/pulse/client.conf.d/\f1. Those files have to have the .conf file name [...]
The configuration file is a simple collection of variable declarations. If the configuration file parser encounters either ; or # it ignores the rest of the line until its end.
diff --git a/man/pulse-daemon.conf.5 b/man/pulse-daemon.conf.5
index f702e43..a3e3edf 100644
--- a/man/pulse-daemon.conf.5
+++ b/man/pulse-daemon.conf.5
@@ -6,12 +6,12 @@ pulse-daemon.conf \- PulseAudio daemon configuration file
\fI~/.config/pulse/daemon.conf.d/*.conf\fB
-\fI/etc/pulse/daemon.conf\fB
+\fI/usr/local/etc/pulse/daemon.conf\fB
-\fI/etc/pulse/daemon.conf.d/*.conf\fB
+\fI/usr/local/etc/pulse/daemon.conf.d/*.conf\fB
\f1
.SH DESCRIPTION
-The PulseAudio sound server reads configuration directives from a configuration file on startup. If the per-user file \fI~/.config/pulse/daemon.conf\f1 exists, it is used, otherwise the system configuration file \fI/etc/pulse/daemon.conf\f1 is used. In addition to those main files, configuration directives can also be put in files under directories \fI~/.config/pulse/daemon.conf.d/\f1 and \fI/etc/pulse/daemon.conf.d/\f1. Those files have to have the .conf file name extension, but otherwi [...]
+The PulseAudio sound server reads configuration directives from a configuration file on startup. If the per-user file \fI~/.config/pulse/daemon.conf\f1 exists, it is used, otherwise the system configuration file \fI/usr/local/etc/pulse/daemon.conf\f1 is used. In addition to those main files, configuration directives can also be put in files under directories \fI~/.config/pulse/daemon.conf.d/\f1 and \fI/usr/local/etc/pulse/daemon.conf.d/\f1. Those files have to have the .conf file name ex [...]
Please note that the server also reads a configuration script on startup. See \fBdefault.pa(5)\f1.
@@ -46,7 +46,7 @@ For the settings that take a boolean argument the values \fBtrue\f1, \fByes\f1,
.TP
\fBenable-shm=\f1 Enable data transfer via POSIX or memfd shared memory. Takes a boolean argument, defaults to \fByes\f1. The \fB--disable-shm\f1 command line argument takes precedence.
.TP
-\fBenable-memfd=\f1. Enable memfd shared memory. Takes a boolean argument, defaults to \fBno\f1.
+\fBenable-memfd=\f1. Enable memfd shared memory. Takes a boolean argument, defaults to \fByes\f1.
.TP
\fBshm-size-bytes=\f1 Sets the shared memory segment size for the daemon, in bytes. If left unspecified or is set to 0 it will default to some system-specific default, usually 64 MiB. Please note that usually there is no need to change this value, unless you are running an OS kernel that does not do memory overcommit.
.TP
@@ -71,7 +71,7 @@ For the settings that take a boolean argument the values \fBtrue\f1, \fByes\f1,
.TP
\fBdl-search-path=\f1 The path where to look for dynamic shared objects (DSOs/plugins). You may specify more than one path separated by colons. The default path depends on compile time settings. The \fB--dl-search-path\f1 command line option takes precedence.
.TP
-\fBdefault-script-file=\f1 The default configuration script file to load. Specify an empty string for not loading a default script file. The default behaviour is to load \fI~/.config/pulse/default.pa\f1, and if that file does not exist fall back to the system wide installed version \fI/etc/pulse/default.pa\f1. If run in system-wide mode the file \fI/etc/pulse/system.pa\f1 is used instead. If \fB-n\f1 is passed on the command line or \fBdefault-script-file=\f1 is disabled the default conf [...]
+\fBdefault-script-file=\f1 The default configuration script file to load. Specify an empty string for not loading a default script file. The default behaviour is to load \fI~/.config/pulse/default.pa\f1, and if that file does not exist fall back to the system wide installed version \fI/usr/local/etc/pulse/default.pa\f1. If run in system-wide mode the file \fI/usr/local/etc/pulse/system.pa\f1 is used instead. If \fB-n\f1 is passed on the command line or \fBdefault-script-file=\f1 is disab [...]
.TP
\fBload-default-script-file=\f1 Load the default configuration script file as specified in \fBdefault-script-file=\f1. Defaults to \fByes\f1.
.SH LOGGING
diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
index ed77158..ff5a293 100644
--- a/man/pulse-daemon.conf.5.xml.in
+++ b/man/pulse-daemon.conf.5.xml.in
@@ -196,7 +196,7 @@ License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
<option>
<p><opt>enable-memfd=</opt>. Enable memfd shared memory. Takes
- a boolean argument, defaults to <opt>no</opt>.</p>
+ a boolean argument, defaults to <opt>yes</opt>.</p>
</option>
<option>
diff --git a/man/pulseaudio.1 b/man/pulseaudio.1
index a66d7be..4ca5431 100644
--- a/man/pulseaudio.1
+++ b/man/pulseaudio.1
@@ -128,11 +128,11 @@ Open a command interpreter on STDIN/STDOUT after startup. This may be used to co
\fB-n\f1
Don't load default script file \fIdefault.pa\f1 (see below) on startup. Useful in conjunction with \fB-C\f1 or \fB--file\f1.
.SH FILES
-\fI~/.config/pulse/daemon.conf\f1, \fI/etc/pulse/daemon.conf\f1: configuration settings for the PulseAudio daemon. If the version in the user's home directory does not exist the global configuration file is loaded. See \fBpulse-daemon.conf(5)\f1 for more information.
+\fI~/.config/pulse/daemon.conf\f1, \fI/usr/local/etc/pulse/daemon.conf\f1: configuration settings for the PulseAudio daemon. If the version in the user's home directory does not exist the global configuration file is loaded. See \fBpulse-daemon.conf(5)\f1 for more information.
-\fI~/.config/pulse/default.pa\f1, \fI/etc/pulse/default.pa\f1: the default configuration script to execute when the PulseAudio daemon is started. If the version in the user's home directory does not exist the global configuration script is loaded. See \fBdefault.pa(5)\f1 for more information.
+\fI~/.config/pulse/default.pa\f1, \fI/usr/local/etc/pulse/default.pa\f1: the default configuration script to execute when the PulseAudio daemon is started. If the version in the user's home directory does not exist the global configuration script is loaded. See \fBdefault.pa(5)\f1 for more information.
-\fI~/.config/pulse/client.conf\f1, \fI/etc/pulse/client.conf\f1: configuration settings for PulseAudio client applications. If the version in the user's home directory does not exist the global configuration file is loaded. See \fBpulse-client.conf(5)\f1 for more information.
+\fI~/.config/pulse/client.conf\f1, \fI/usr/local/etc/pulse/client.conf\f1: configuration settings for PulseAudio client applications. If the version in the user's home directory does not exist the global configuration file is loaded. See \fBpulse-client.conf(5)\f1 for more information.
.SH SIGNALS
\fISIGINT, SIGTERM\f1: the PulseAudio daemon will shut down (Same as \fB--kill\f1).
diff --git a/po/LINGUAS b/po/LINGUAS
index 2e1efc2..fc7d827 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,4 +1,5 @@
as
+be
bn_IN
ca
cs
@@ -8,6 +9,7 @@ el
es
fi
fr
+gl
gu
he
hi
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0903741..e2d6d11 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -22,6 +22,7 @@ src/modules/gconf/module-gconf.c
src/modules/jack/module-jack-sink.c
src/modules/jack/module-jack-source.c
src/modules/macosx/module-coreaudio-device.c
+src/modules/module-allow-passthrough.c
src/modules/module-always-sink.c
src/modules/module-cli.c
src/modules/module-combine.c
diff --git a/po/pl.po b/po/be.po
similarity index 52%
copy from po/pl.po
copy to po/be.po
index 2065718..162c555 100644
--- a/po/pl.po
+++ b/po/be.po
@@ -1,20 +1,24 @@
-# translation of pl.po to Polish
-# Piotr Drąg <piotrdrag at gmail.com>, 2008, 2012, 2013, 2014, 2015, 2016.
+# Belarusian tanslation of PulseAudio
+# Copyright (C) 2016 PulseAudio's COPYRIGHT HOLDER
+# This file is distributed under the same license as the PulseAudio package.
+#
+# Viktar Vaŭčkievič <victorenator at gmail.com>, 2016.
#
msgid ""
msgstr ""
-"Project-Id-Version: pulseaudio\n"
+"Project-Id-Version: PulseAudio\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-16 13:50+0200\n"
-"PO-Revision-Date: 2016-05-16 13:51+0200\n"
-"Last-Translator: Piotr Drąg <piotrdrag at gmail.com>\n"
-"Language-Team: Polish <trans-pl at lists.fedoraproject.org>\n"
-"Language: pl\n"
+"POT-Creation-Date: 2016-07-16 14:23+0300\n"
+"PO-Revision-Date: 2016-07-19 11:06+0300\n"
+"Last-Translator: Viktar Vaŭčkievič <victorenator at gmail.com>\n"
+"Language-Team: Belarusian <>\n"
+"Language: be\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<"
+"=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Lokalize 2.0\n"
#: ../src/daemon/cmdline.c:113
#, c-format
@@ -88,644 +92,635 @@ msgid ""
"\n"
" -n Don't load default script file\n"
msgstr ""
-"%s [opcje]\n"
-"\n"
-"POLECENIA:\n"
-" -h, --help Wyświetla tę pomoc\n"
-" --version Wyświetla wersję\n"
-" --dump-conf Zrzuca domyślną konfigurację\n"
-" --dump-modules Zrzuca listę dostępnych modułów\n"
-" --dump-resample-methods Zrzuca dostępne metody resamplingu\n"
-" --cleanup-shm Czyści stare fragmenty pamięci\n"
-" współdzielonej\n"
-" --start Uruchamia usługi, jeśli nie jest\n"
-" uruchomiona\n"
-" -k --kill Niszczy uruchomioną usługę\n"
-" --check Sprawdza, czy usługa jest\n"
-" uruchomiona (zwraca tylko kod\n"
-" wyjścia)\n"
+"%s [параметры]\n"
"\n"
-"OPCJE:\n"
-" --system[=ZMIENNALOGICZNA] Uruchamia w trybie systemowym\n"
-" -D, --daemonize[=ZMIENNALOGICZNA] Tworzy usługę po uruchomieniu\n"
-" --fail[=ZMIENNALOGICZNA] Wyłącza, kiedy uruchomienie się nie\n"
-" powiedzie\n"
-" --high-priority[=ZMIENNALOGICZNA] Próbuje ustawić wysoki poziom nice\n"
-" (dostępne tylko jako root, na SUID\n"
-" lub z podniesionym RLIMIT_NICE)\n"
-" --realtime[=ZMIENNALOGICZNA] Próbuje ustawić szeregowanie w\n"
-" czasie rzeczywistym\n"
-" (dostępne tylko jako root, na SUID\n"
-" lub z podniesionym RLIMIT_RTPRIO)\n"
-" --disallow-module-loading[=ZMIENNALOGICZNA] Nie zezwala\n"
-" użytkownikowi modułu na żądanie\n"
-" wczytania/usunięcia modułu po\n"
-" uruchomieniu\n"
-" --disallow-exit[=ZMIENNALOGICZNA] Nie zezwala użytkownikowi na\n"
-" żądanie wyłączenia\n"
-" --exit-idle-time=SEKUNDY Niszczy usługę, kiedy jest zajęta i\n"
-" upłynął podany czas\n"
-" --scache-idle-time=SEKUNDY Usuwa automatycznie wczytane\n"
-" próbki, kiedy jest zajęty i upłynął\n"
-" podany czas\n"
-" --log-level[=POZIOM] Zwiększa lub ustawia poziom\n"
-" wyświetlanych informacji\n"
-" -v --verbose Zwiększa poziom wyświetlanych\n"
-" informacji\n"
-" --log-target={auto,syslog,stderr,file:ŚCIEŻKA,newfile:ŚCIEŻKA}\n"
-" Określa dziennik docelowy\n"
-" --log-meta[=ZMIENNALOGICZNA] Dołącza położenie kodu do\n"
-" komunikatów dziennika\n"
-" --log-time[=ZMIENNALOGICZNA] Dołącza czas w komunikatach\n"
-" dziennika\n"
-" --log-backtrace=RAMKI Dołącza błąd w komunikatach\n"
-" dziennika\n"
-" -p, --dl-search-path=ŚCIEŻKA Ustawia ścieżkę wyszukiwania dla\n"
-" dynamicznie współdzielonych\n"
-" obiektów (wtyczek)\n"
-" --resample-method=METODA Używa podanej metody resamplingu\n"
-" (zobacz --dump-resample-methods,\n"
-" aby poznać możliwe wartości)\n"
-" --use-pid-file[=ZMIENNALOGICZNA] Tworzy plik PID\n"
-" --no-cpu-limit[=ZMIENNALOGICZNA] Nie instaluje ograniczenia zasobów\n"
-" procesora na obsługujących je\n"
-" platformach.\n"
-" --disable-shm[=ZMIENNALOGICZNA] Wyłącza obsługę pamięci\n"
-" współdzielonej.\n"
-" --enable-memfd[=ZMIENNALOGICZNA] Włącza obsługę pamięci\n"
-" współdzielonej memfd.\n"
+"Каманды:\n"
+" -h, --help Паказаць гэту даведку.\n"
+" --version Паказаць версію.\n"
+" --dump-conf Вывесці агаданую канфігурацыю.\n"
+" --dump-modules Вывесці спіс даступных модуляў.\n"
+" --dump-resample-methods Вывесці спіс даступных метадаў\n"
+" перадыскрэтызацыі.\n"
+" --cleanup-shm Ачысціць выкарыстаныя сегменты\n"
+" сумеснай памяці.\n"
+" --start Запусціць фонавы сэрвіс, калі ён\n"
+" яшчэ не запушчаны.\n"
+" -k --kill Знішчыць запушчаны фонавы сэрвіс.\n"
+" --check Праверыць ці запушчаны фонавы сэрвіс\n"
+" (толькі код завяршэння).\n"
"\n"
-"SKRYPT STARTOWY:\n"
-" -L, --load=\"PARAMETRY MODUŁU\" Wczytuje podany moduł wtyczki z\n"
-" podanym parametrem\n"
-" -F, --file=NAZWAPLIKU Wykonuje podany skrypt\n"
-" -C Otwiera wiersz poleceń na\n"
-" uruchomionym TTY po uruchomieniu\n"
+"Параметры:\n"
+" --system[=BOOL] Агульнасістэмны рэжым.\n"
+" -D, --daemonize[=BOOL] Запусціць як фонавы сэрвіс.\n"
+" --fail[=BOOL] Выйсці пры памылцы запуску.\n"
+" --high-priority[=BOOL] Паспрабаваць павысіць прыярытэт\n"
+" (nice)\n"
+" (даступна толькі карыстальніку root,\n"
+" з уключаным SUID ці з павышаным\n"
+" RLIMIT_NICE).\n"
+" --realtime[=BOOL] Паспрабаваць уключыць планіроўшчык\n"
+" рэальнага часу\n"
+" (даступна толькі root,\n"
+" з уключаным SUID ці з павышаным\n"
+" RLIMIT_RTPRIO).\n"
+" --disallow-module-loading[=BOOL] Забараніць загрузку/выгрузку модуляў\n"
+" па запыту карыстальніка пасля\n"
+" запуску.\n"
+" --disallow-exit[=BOOL] Забараніць выхад па запыту\n"
+" карыстальніка.\n"
+" --exit-idle-time=СЕКУНДЫ Завяршыць работу пасля азначанага\n"
+" часу бяздзеяння.\n"
+" --scache-idle-time=СЕКУНДЫ Выгрузіць аўтаматычна загружаныя\n"
+" сэмплы пасля азначанага часу\n"
+" бяздзеяння.\n"
+" --log-level[=УЗРОВЕНЬ] Павялічыць або ўставіць узровень\n"
+" інфарматыўнасці.\n"
+" -v --verbose Павялічыць узровень інфарматыўнасці.\n"
+" --log-target={auto,syslog,stderr,file:PATH,newfile:PATH}\n"
+" Вызначыць журнал.\n"
+" --log-meta[=BOOL] Дадаць месца ў коду да паведамленняў"
+" журнала.\n"
+" --log-time[=BOOL] Дадаць час да паведамленняў журнала.\n"
+" --log-backtrace=FRAMES Дадаць стэк выклікаў да паведамленняў"
+" журнала.\n"
+" -p, --dl-search-path=ШЛЯХ Задаць шлях для пошуку дынамічных\n"
+" раздзяляльных абʼектаў (дадаткаў).\n"
+" --resample-method=МЕТАД Выкарыстоўваць азначаны метад\n"
+" перадыскрэтызацыі\n"
+" (Глядзіце --dump-resample-methods\n"
+" для магчымых значэнняў).\n"
+" --use-pid-file[=BOOL] Стварыць PID-файл.\n"
+" --no-cpu-limit[=BOOL] Не ўсталёўваць абмежаванні на"
+" выкарыстанне\n"
+" працэсара на платформах, якія\n"
+" падтрымліваюць гэта.\n"
+" --disable-shm[=BOOL] Адключыць падтрымку сумеснай памяці.\n"
+" --enable-memfd[=BOOL] Уключыць падтрымку memfd-сумеснай\n"
+" памяці.\n"
"\n"
-" -n Nie wczytuje domyślnego pliku\n"
-" skryptu\n"
+"Сцэнарыі запуску:\n"
+" -L, --load=\"МОДУЛЬ АРГУМЕНТЫ\" Загрузіць азначаны модуль з\n"
+" азначанымі аргументамі.\n"
+" -F, --file=НАЗВА_ФАЙЛА Выканаць азначаны сцэнарый.\n"
+" -C Адкрыць камандны радок у\n"
+" бягучым тэрмінале пасля запуску.\n"
+" -n Не загружаць агаданы файл сцэнарыю.\n"
#: ../src/daemon/cmdline.c:246
msgid "--daemonize expects boolean argument"
-msgstr "--daemonize oczekuje parametru zmiennej logicznej"
+msgstr "--daemonize чакае булевы аргумент"
#: ../src/daemon/cmdline.c:254
msgid "--fail expects boolean argument"
-msgstr "--fail oczekuje parametru zmiennej logicznej"
+msgstr "--fail чакае булевы аргумент"
#: ../src/daemon/cmdline.c:265
msgid ""
"--log-level expects log level argument (either numeric in range 0..4 or one "
"of debug, info, notice, warn, error)."
msgstr ""
-"--log-level oczekuje parametru poziomu dziennika (numeryczny w zakresie 0..4 "
-"lub jeden z debug, info, notice, warn, error)."
+"--log-level чакае значэнне ўзроўню інфарматыўнасці (лікавае ў дыяпазоне 0–4"
+" ці адно з debug, info, notice, warn, error)."
#: ../src/daemon/cmdline.c:277
msgid "--high-priority expects boolean argument"
-msgstr "--high-priority oczekuje parametru zmiennej logicznej"
+msgstr "--high-priority чакае булевы аргумент"
#: ../src/daemon/cmdline.c:285
msgid "--realtime expects boolean argument"
-msgstr "--realtime oczekuje parametru zmiennej logicznej"
+msgstr "--realtime чакае булевы аргумент"
#: ../src/daemon/cmdline.c:293
msgid "--disallow-module-loading expects boolean argument"
-msgstr "--disallow-module-loading oczekuje parametru zmiennej logicznej"
+msgstr "--disallow-module-loading чакае булевы аргумент"
#: ../src/daemon/cmdline.c:301
msgid "--disallow-exit expects boolean argument"
-msgstr "--disallow-exit oczekuje parametru zmiennej logicznej"
+msgstr "--disallow-exit чакае булевы аргумент"
#: ../src/daemon/cmdline.c:309
msgid "--use-pid-file expects boolean argument"
-msgstr "--use-pid-file oczekuje parametru zmiennej logicznej"
+msgstr "--use-pid-file чакае булевы аргумент"
#: ../src/daemon/cmdline.c:328
msgid ""
"Invalid log target: use either 'syslog', 'journal','stderr' or 'auto' or a "
"valid file name 'file:<path>', 'newfile:<path>'."
msgstr ""
-"Nieprawidłowy dziennik docelowy: należy użyć „syslog”, „journal”, „stderr”, "
-"„auto” lub prawidłowej nazwy pliku „file:<ścieżka>”, „newfile:<ścieżka>”."
+"Некарэктны журнал: патрабуецца або адно з «syslog», «journal»,"
+" «stderr», ці «auto», ці існуючы файл «file:<шлях>», «newfile:<шлях>»."
#: ../src/daemon/cmdline.c:330
msgid ""
"Invalid log target: use either 'syslog', 'stderr' or 'auto' or a valid file "
"name 'file:<path>', 'newfile:<path>'."
msgstr ""
-"Nieprawidłowy dziennik docelowy: należy użyć „syslog”, „stderr”, „auto” lub "
-"prawidłowej nazwy pliku „file:<ścieżka>”, „newfile:<ścieżka>”."
+"Некарэктны журнал: патрабуецца або адно з «syslog», «stderr», ці"
+" «auto», ці існуючы файл «file:<шлях>», «newfile:<шлях>»."
#: ../src/daemon/cmdline.c:338
msgid "--log-time expects boolean argument"
-msgstr "--log-time oczekuje parametru zmiennej logicznej"
+msgstr "--log-time чакае булевы аргумент"
#: ../src/daemon/cmdline.c:346
msgid "--log-meta expects boolean argument"
-msgstr "--log-meta oczekuje parametru zmiennej logicznej"
+msgstr "--log-meta чакае булевы аргумент"
#: ../src/daemon/cmdline.c:366
#, c-format
msgid "Invalid resample method '%s'."
-msgstr "Nieprawidłowa metoda resamplingu „%s”."
+msgstr "Некарэктны метад перадыскрэтызацыі «%s»."
#: ../src/daemon/cmdline.c:373
msgid "--system expects boolean argument"
-msgstr "--system oczekuje parametru zmiennej logicznej"
+msgstr "--system чакае булевы аргумент"
#: ../src/daemon/cmdline.c:381
msgid "--no-cpu-limit expects boolean argument"
-msgstr "--no-cpu-limit oczekuje parametru zmiennej logicznej"
+msgstr "--no-cpu-limit чакае булевы аргумент"
#: ../src/daemon/cmdline.c:389
msgid "--disable-shm expects boolean argument"
-msgstr "--disable-shm oczekuje parametru zmiennej logicznej"
+msgstr "--disable-shm чакае булевы аргумент"
#: ../src/daemon/cmdline.c:397
msgid "--enable-memfd expects boolean argument"
-msgstr "--enable-memfd oczekuje parametru zmiennej logicznej"
+msgstr "--enable-memfd чакае булевы аргумент"
#: ../src/daemon/daemon-conf.c:260
#, c-format
msgid "[%s:%u] Invalid log target '%s'."
-msgstr "[%s:%u] Nieprawidłowy dziennik docelowy „%s”."
+msgstr "[%s:%u] Некарэктны журнал «%s»."
#: ../src/daemon/daemon-conf.c:275
#, c-format
msgid "[%s:%u] Invalid log level '%s'."
-msgstr "[%s:%u] Nieprawidłowy poziom dziennika „%s”."
+msgstr "[%s:%u] Некарэктны ўзровень інфармавання «%s»."
#: ../src/daemon/daemon-conf.c:290
#, c-format
msgid "[%s:%u] Invalid resample method '%s'."
-msgstr "[%s:%u] Nieprawidłowa metoda resamplingu „%s”."
+msgstr "[%s:%u] Некарэктны метад перадыскрэтызацыі «%s»."
#: ../src/daemon/daemon-conf.c:312
#, c-format
msgid "[%s:%u] Invalid rlimit '%s'."
-msgstr "[%s:%u] Nieprawidłowy rlimit „%s”."
+msgstr "[%s:%u] Некарэктны rlimit «%s»."
#: ../src/daemon/daemon-conf.c:332
#, c-format
msgid "[%s:%u] Invalid sample format '%s'."
-msgstr "[%s:%u] Nieprawidłowy format próbki „%s”."
+msgstr "[%s:%u] Некарэктны фармат сэмлаў «%s»."
#: ../src/daemon/daemon-conf.c:349 ../src/daemon/daemon-conf.c:366
#, c-format
msgid "[%s:%u] Invalid sample rate '%s'."
-msgstr "[%s:%u] Nieprawidłowa częstotliwość próbki „%s”."
+msgstr "[%s:%u] Некарэктная частата дыскрэтызацыі «%s»."
#: ../src/daemon/daemon-conf.c:389
#, c-format
msgid "[%s:%u] Invalid sample channels '%s'."
-msgstr "[%s:%u] Nieprawidłowe kanały próbki „%s”."
+msgstr "[%s:%u] Некарэктная колькасць каналаў «%s»."
#: ../src/daemon/daemon-conf.c:406
#, c-format
msgid "[%s:%u] Invalid channel map '%s'."
-msgstr "[%s:%u] Nieprawidłowa mapa kanałów „%s”."
+msgstr "[%s:%u] Некарэктная схема каналаў «%s»."
#: ../src/daemon/daemon-conf.c:423
#, c-format
msgid "[%s:%u] Invalid number of fragments '%s'."
-msgstr "[%s:%u] Nieprawidłowa liczba fragmentów „%s”."
+msgstr "[%s:%u] Некарэктная колькасць фрагментаў «%s»."
#: ../src/daemon/daemon-conf.c:440
#, c-format
msgid "[%s:%u] Invalid fragment size '%s'."
-msgstr "[%s:%u] Nieprawidłowy rozmiar fragmentu „%s”."
+msgstr "[%s:%u] Некарэктная даўжыня фрагмента «%s»."
#: ../src/daemon/daemon-conf.c:457
#, c-format
msgid "[%s:%u] Invalid nice level '%s'."
-msgstr "[%s:%u] Nieprawidłowy poziom nice „%s”."
+msgstr "[%s:%u] Некарэктны ўзровень прыярытэту (nice) «%s»."
#: ../src/daemon/daemon-conf.c:500
#, c-format
msgid "[%s:%u] Invalid server type '%s'."
-msgstr "[%s:%u] Nieprawidłowy typ serwera „%s”."
+msgstr "[%s:%u] Некарэктны тып сервера «%s»."
#: ../src/daemon/daemon-conf.c:615
#, c-format
msgid "Failed to open configuration file: %s"
-msgstr "Otwarcie pliku konfiguracji się nie powiodło: %s"
+msgstr "Не атрымалася адкрыць файл канфігурацыі: %s"
#: ../src/daemon/daemon-conf.c:631
msgid ""
"The specified default channel map has a different number of channels than "
"the specified default number of channels."
msgstr ""
-"Podana domyślna mapa kanałów ma inną liczbę kanałów niż podana domyślna "
-"liczba kanałów."
+"У агаданай схеме каналаў колькасць каналаў не супадае з агаданай колькасцю"
+" каналаў."
#: ../src/daemon/daemon-conf.c:718
#, c-format
msgid "### Read from configuration file: %s ###\n"
-msgstr "### Odczytano z pliku konfiguracji: %s ###\n"
+msgstr "### Прачытана з файла канфігурацыі: %s ###\n"
#: ../src/daemon/dumpmodules.c:57
#, c-format
msgid "Name: %s\n"
-msgstr "Nazwa: %s\n"
+msgstr "Назва: %s\n"
#: ../src/daemon/dumpmodules.c:60
#, c-format
msgid "No module information available\n"
-msgstr "Brak dostępnych informacji o module\n"
+msgstr "Інфармацыя па модулю не даступна\n"
#: ../src/daemon/dumpmodules.c:63
#, c-format
msgid "Version: %s\n"
-msgstr "Wersja: %s\n"
+msgstr "Версія: %s\n"
#: ../src/daemon/dumpmodules.c:65
#, c-format
msgid "Description: %s\n"
-msgstr "Opis: %s\n"
+msgstr "Апісанне: %s\n"
#: ../src/daemon/dumpmodules.c:67
#, c-format
msgid "Author: %s\n"
-msgstr "Autor: %s\n"
+msgstr "Аўтар: %s\n"
#: ../src/daemon/dumpmodules.c:69
#, c-format
msgid "Usage: %s\n"
-msgstr "Użycie: %s\n"
+msgstr "Выкарыстанне: %s\n"
#: ../src/daemon/dumpmodules.c:70
#, c-format
msgid "Load Once: %s\n"
-msgstr "Wczytanie jednorazowe: %s\n"
+msgstr "Загружаць адзін раз: %s\n"
#: ../src/daemon/dumpmodules.c:72
#, c-format
msgid "DEPRECATION WARNING: %s\n"
-msgstr "OSTRZEŻENIE O PRZESTARZAŁOŚCI: %s\n"
+msgstr "Папярэджанне аб састарэласці: %s\n"
#: ../src/daemon/dumpmodules.c:76
#, c-format
msgid "Path: %s\n"
-msgstr "Ścieżka: %s\n"
+msgstr "Шлях: %s\n"
#: ../src/daemon/ltdl-bind-now.c:75
#, c-format
msgid "Failed to open module %s: %s"
-msgstr "Otwarcie modułu %s się nie powiodło: %s"
+msgstr "Не атрымалася адкрыць модуль %s: %s"
#: ../src/daemon/ltdl-bind-now.c:126
msgid "Failed to find original lt_dlopen loader."
-msgstr ""
-"Odnalezienie pierwotnego programu wczytującego lt_dlopen się nie powiodło."
+msgstr "Не атрымалася знайсці арыгінальны lt_dlopen-загрузчык."
#: ../src/daemon/ltdl-bind-now.c:131
msgid "Failed to allocate new dl loader."
-msgstr "Przydzielenie nowego programu wczytującego dl się nie powiodło."
+msgstr "Не атрымалася вылучыць новы dl-загрузчык."
#: ../src/daemon/ltdl-bind-now.c:144
msgid "Failed to add bind-now-loader."
-msgstr "Dodanie bind-now-loader się nie powiodło."
+msgstr "Не атрымалася дадаць bind-now-loader."
#: ../src/daemon/main.c:160
#, c-format
msgid "Failed to find user '%s'."
-msgstr "Odnalezienie użytkownika „%s” się nie powiodło."
+msgstr "Не атрымалася знайсці карыстальніка «%s»."
#: ../src/daemon/main.c:165
#, c-format
msgid "Failed to find group '%s'."
-msgstr "Odnalezienie grupy „%s” się nie powiodło."
+msgstr "Не атрымалася знайсці групу «%s»."
#: ../src/daemon/main.c:174
#, c-format
msgid "GID of user '%s' and of group '%s' don't match."
-msgstr "GID użytkownika „%s” i grupy „%s” się nie zgadzają."
+msgstr "GID карыстальніка «%s» і групы «%s» не супадаюць."
#: ../src/daemon/main.c:179
#, c-format
msgid "Home directory of user '%s' is not '%s', ignoring."
-msgstr "Katalogiem domowym użytkownika „%s” nie jest „%s”, ignorowanie."
+msgstr "Хатні каталог карыстальніка «%s» не «%s» — ігнаруецца."
#: ../src/daemon/main.c:182 ../src/daemon/main.c:187
#, c-format
msgid "Failed to create '%s': %s"
-msgstr "Utworzenie „%s” się nie powiodło: %s"
+msgstr "Не атрымалася стварыць «%s»: %s"
#: ../src/daemon/main.c:194
#, c-format
msgid "Failed to change group list: %s"
-msgstr "Zmiana listy grup się nie powiodła: %s"
+msgstr "Не атрымалася змяніць спіс груп: %s"
#: ../src/daemon/main.c:210
#, c-format
msgid "Failed to change GID: %s"
-msgstr "Zmiana GID się nie powiodła: %s"
+msgstr "Не атрымалася змяніць GID: %s"
#: ../src/daemon/main.c:226
#, c-format
msgid "Failed to change UID: %s"
-msgstr "Zmiana UID się nie powiodła: %s"
+msgstr "Не атрымалася змяніць UID: %s"
#: ../src/daemon/main.c:255
msgid "System wide mode unsupported on this platform."
-msgstr "Tryb systemowy nie jest obsługiwany na tej platformie."
+msgstr "Агульнасістэмны рэжым не падтрымліваецца на гэтай платформе."
#: ../src/daemon/main.c:484
msgid "Failed to parse command line."
-msgstr "Przetworzenie wiersza poleceń się nie powiodło."
+msgstr "Не атрымалася разабраць камандны радок."
#: ../src/daemon/main.c:523
msgid ""
"System mode refused for non-root user. Only starting the D-Bus server lookup "
"service."
msgstr ""
-"Odmówiono trybu systemowego dla użytkownika nie będącego rootem. "
-"Uruchamianie tylko usługi wyszukiwania serwera D-Bus."
+"Агульнасістэмны рэжым немагчымы для звычайнага карыстальніка. Будзе запушчаны"
+" толькі сэрвіс пошуку D-Bus-сервера."
#: ../src/daemon/main.c:622
#, c-format
msgid "Failed to kill daemon: %s"
-msgstr "Zniszczenie usługi się nie powiodło: %s"
+msgstr "Не атрымалася знішчыць сэрвіс: %s"
#: ../src/daemon/main.c:651
msgid ""
"This program is not intended to be run as root (unless --system is "
"specified)."
msgstr ""
-"Ten program nie powinien być uruchamiany jako root (chyba, że podano opcję --"
-"system)."
+"Гэтая праграма не прызначана для запуску пад карыстальнікам root (акрамя"
+" выпадку, калі зададзены параметр --system)."
#: ../src/daemon/main.c:654
msgid "Root privileges required."
-msgstr "Wymagane są uprawnienia roota."
+msgstr "Патрабуюцца прывілеі карыстальніка root."
#: ../src/daemon/main.c:661
msgid "--start not supported for system instances."
-msgstr "--start nie jest obsługiwane przy uruchamianiu systemowym."
+msgstr "--start не падтрымліваецца для агульнасістэмнага экзэмпляра."
#: ../src/daemon/main.c:701
#, c-format
msgid "User-configured server at %s, refusing to start/autospawn."
-msgstr ""
-"Serwer skonfigurowany przez użytkownika w %s, odmawianie uruchomienia/"
-"automatycznego wznowienia."
+msgstr "Выяўлены сервер карыстальніка ў %s — адмова ад запуску."
#: ../src/daemon/main.c:707
#, c-format
msgid ""
"User-configured server at %s, which appears to be local. Probing deeper."
msgstr ""
-"Serwer skonfigurowany przez użytkownika w %s, który jest lokalny. Dalsze "
-"wykrywanie."
+"Выяўлены сервер карыстальніка ў %s, які ўяўляецца як лакальны — прадаўжаем"
+" запуск."
#: ../src/daemon/main.c:712
msgid "Running in system mode, but --disallow-exit not set."
msgstr ""
-"Uruchamianie w trybie systemowym, ale --disallow-exit nie jest ustawione."
+"Выконваецца ў агульнасістэмным рэжыме, але --disallow-exit не зададзены."
#: ../src/daemon/main.c:715
msgid "Running in system mode, but --disallow-module-loading not set."
msgstr ""
-"Uruchamianie w trybie systemowym, ale --disallow-module-loading nie jest "
-"ustawione."
+"Выконваецца ў агульнасістэмным рэжыме, але --disallow-module-loading не"
+" зададзены."
#: ../src/daemon/main.c:718
msgid "Running in system mode, forcibly disabling SHM mode."
-msgstr "Uruchamianie w trybie systemowym, wymuszanie wyłączenia trybu SHM."
+msgstr "Выконваецца ў агульнасістэмным рэжыме — прымусова адключаны SHM-рэжым."
#: ../src/daemon/main.c:723
msgid "Running in system mode, forcibly disabling exit idle time."
msgstr ""
-"Uruchamianie w trybie systemowym, wymuszanie wyłączenia czasu oczekiwania na "
-"zakończenie."
+"Выконваецца ў агульнасістэмным рэжыме — прымусова адключана завяршэнне работы"
+" па бяздзеянню."
#: ../src/daemon/main.c:756
msgid "Failed to acquire stdio."
-msgstr "Uzyskanie standardowego wejścia/wyjścia się nie powiodło."
+msgstr "Не атрымалася атрымаць stdio."
#: ../src/daemon/main.c:762 ../src/daemon/main.c:833
#, c-format
msgid "pipe() failed: %s"
-msgstr "pipe() się nie powiodło: %s"
+msgstr "pipe() пацярпела няўдачу: %s"
#: ../src/daemon/main.c:767 ../src/daemon/main.c:838
#, c-format
msgid "fork() failed: %s"
-msgstr "fork() się nie powiodło: %s"
+msgstr "fork() пацярпела няўдачу: %s"
#: ../src/daemon/main.c:782 ../src/daemon/main.c:853 ../src/utils/pacat.c:568
#, c-format
msgid "read() failed: %s"
-msgstr "read() się nie powiodło: %s"
+msgstr "read() пацярпела няўдачу: %s"
#: ../src/daemon/main.c:788
msgid "Daemon startup failed."
-msgstr "Uruchomienie usługi się nie powiodło."
+msgstr "Не атрымалася запусціць фонавы сэрвіс."
#: ../src/daemon/main.c:821
#, c-format
msgid "setsid() failed: %s"
-msgstr "setsid() się nie powiodło: %s"
+msgstr "setsid() пацярпела няўдачу: %s"
#: ../src/daemon/main.c:948
msgid "Failed to get machine ID"
-msgstr "Uzyskanie identyfikatora komputera się nie powiodło"
+msgstr "Не атрымалася атрымаць ідэнтыфікатар машыны"
#: ../src/daemon/main.c:974
msgid ""
-"OK, so you are running PA in system mode. Please note that you most likely "
-"shouldn't be doing that.\n"
-"If you do it nonetheless then it's your own fault if things don't work as "
-"expected.\n"
+"OK, so you are running PA in system mode. Please make sure that you actually "
+"do want to do that.\n"
"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
"mode is usually a bad idea."
msgstr ""
-"OK, więc PA jest uruchomione w trybie systemowym. Proszę zauważyć, że "
-"prawdopodobnie tak nie powinno być.\n"
-"Jeśli mimo to tak jest, to wina użytkownika, jeśli coś nie działa tak jak "
-"powinno.\n"
-"Proszę przeczytać http://www.freedesktop.org/wiki/Software/PulseAudio/"
-"Documentation/User/WhatIsWrongWithSystemWide/ , gdzie wyjaśniono, dlaczego "
-"tryb systemowy jest zwykle złym pomysłem."
-
-#: ../src/daemon/main.c:991
+"Добра, вы запусцілі PA у агульнасістэмным рэжыме. Калі ласка, пераканайцеся,"
+" што вы на самай справе"
+"хочаце гэтага.\n"
+"Калі ласка, прачытайце http://www.freedesktop.org/wiki/Software/PulseAudio/Doc"
+"umentation/User/WhatIsWrongWithSystemWide/ для тлумачэння, што"
+" агульнасістэмны рэжым — звычайна дрэнная ідэя."
+
+#: ../src/daemon/main.c:990
msgid "pa_pid_file_create() failed."
-msgstr "pa_pid_file_create() się nie powiodło."
+msgstr "pa_pid_file_create() пацярпела няўдачу."
-#: ../src/daemon/main.c:1023
+#: ../src/daemon/main.c:1022
msgid "pa_core_new() failed."
-msgstr "pa_core_new() się nie powiodło."
+msgstr "pa_core_new() пацярпела няўдачу."
-#: ../src/daemon/main.c:1091
+#: ../src/daemon/main.c:1090
msgid "Failed to initialize daemon."
-msgstr "Zainicjowanie usługi się nie powiodło."
+msgstr "Не атрымалася ініцыялізаваць фонавы сэрвіс."
-#: ../src/daemon/main.c:1096
+#: ../src/daemon/main.c:1095
msgid "Daemon startup without any loaded modules, refusing to work."
msgstr ""
-"Uruchamianie usługi bez żadnych wczytanych modułów, odmawianie działania."
+"Запуск фонавага сэрвісу без якіх-небудзь загружаных модуляў — адмова ад працы."
#: ../src/daemon/pulseaudio.desktop.in.h:1
msgid "PulseAudio Sound System"
-msgstr "System dźwięku PulseAudio"
+msgstr "Гукавая сістэма PulseAudio"
#: ../src/daemon/pulseaudio.desktop.in.h:2
msgid "Start the PulseAudio Sound System"
-msgstr "Uruchomienie systemu dźwięku PulseAudio"
+msgstr "Запуск гукавой сістэмы PulseAudio"
#: ../src/modules/alsa/alsa-mixer.c:2378
msgid "Input"
-msgstr "Wejście"
+msgstr "Уваход"
#: ../src/modules/alsa/alsa-mixer.c:2379
msgid "Docking Station Input"
-msgstr "Wejście stacji dokującej"
+msgstr "Уваход док-станцыі"
#: ../src/modules/alsa/alsa-mixer.c:2380
msgid "Docking Station Microphone"
-msgstr "Mikrofon stacji dokującej"
+msgstr "Мікрафон док-станцыі"
#: ../src/modules/alsa/alsa-mixer.c:2381
msgid "Docking Station Line In"
-msgstr "Wejście liniowe stacji dokującej"
+msgstr "Лінейны ўваход док-станцыі"
#: ../src/modules/alsa/alsa-mixer.c:2382 ../src/modules/alsa/alsa-mixer.c:2467
msgid "Line In"
-msgstr "Wejście liniowe"
+msgstr "Лінейны ўваход"
#: ../src/modules/alsa/alsa-mixer.c:2383 ../src/modules/alsa/alsa-mixer.c:2461
#: ../src/modules/bluetooth/module-bluez4-device.c:2099
#: ../src/modules/bluetooth/module-bluez5-device.c:1710
msgid "Microphone"
-msgstr "Mikrofon"
+msgstr "Мікрафон"
#: ../src/modules/alsa/alsa-mixer.c:2384 ../src/modules/alsa/alsa-mixer.c:2462
msgid "Front Microphone"
-msgstr "Przedni mikrofon"
+msgstr "Пярэдні мікрафон"
#: ../src/modules/alsa/alsa-mixer.c:2385 ../src/modules/alsa/alsa-mixer.c:2463
msgid "Rear Microphone"
-msgstr "Tylny mikrofon"
+msgstr "Задні мікрафон"
#: ../src/modules/alsa/alsa-mixer.c:2386
msgid "External Microphone"
-msgstr "Zewnętrzny mikrofon"
+msgstr "Знешні мікрафон"
#: ../src/modules/alsa/alsa-mixer.c:2387 ../src/modules/alsa/alsa-mixer.c:2465
msgid "Internal Microphone"
-msgstr "Wewnętrzny mikrofon"
+msgstr "Убудаваны мікрафон"
#: ../src/modules/alsa/alsa-mixer.c:2388 ../src/modules/alsa/alsa-mixer.c:2468
msgid "Radio"
-msgstr "Radio"
+msgstr "Радыё"
#: ../src/modules/alsa/alsa-mixer.c:2389 ../src/modules/alsa/alsa-mixer.c:2469
msgid "Video"
-msgstr "Wideo"
+msgstr "Відэа"
#: ../src/modules/alsa/alsa-mixer.c:2390
msgid "Automatic Gain Control"
-msgstr "Automatyczna kontrola natężenia"
+msgstr "Аўтаматычнае рэгуляванне ўзмацнення"
#: ../src/modules/alsa/alsa-mixer.c:2391
msgid "No Automatic Gain Control"
-msgstr "Brak automatycznej kontroli natężenia"
+msgstr "Без аўтаматычнага рэгулявання ўзмацнення"
#: ../src/modules/alsa/alsa-mixer.c:2392
msgid "Boost"
-msgstr "Podbicie"
+msgstr "Узмацненне"
#: ../src/modules/alsa/alsa-mixer.c:2393
msgid "No Boost"
-msgstr "Brak podbicia"
+msgstr "Без ўзмацнення"
#: ../src/modules/alsa/alsa-mixer.c:2394
msgid "Amplifier"
-msgstr "Amplituner"
+msgstr "Узмацняльнік"
#: ../src/modules/alsa/alsa-mixer.c:2395
msgid "No Amplifier"
-msgstr "Brak amplitunera"
+msgstr "Без ўзмацняльніка"
#: ../src/modules/alsa/alsa-mixer.c:2396
msgid "Bass Boost"
-msgstr "Podbicie basów"
+msgstr "Узмацненне басоў"
#: ../src/modules/alsa/alsa-mixer.c:2397
msgid "No Bass Boost"
-msgstr "Brak podbicia basów"
+msgstr "Без ўзмацнення басоў"
#: ../src/modules/alsa/alsa-mixer.c:2398
#: ../src/modules/bluetooth/module-bluez4-device.c:2104
#: ../src/modules/bluetooth/module-bluez5-device.c:1717
msgid "Speaker"
-msgstr "Głośnik"
+msgstr "Дынамік"
#: ../src/modules/alsa/alsa-mixer.c:2399 ../src/modules/alsa/alsa-mixer.c:2471
msgid "Headphones"
-msgstr "Słuchawki"
+msgstr "Навушнікі"
#: ../src/modules/alsa/alsa-mixer.c:2460
msgid "Analog Input"
-msgstr "Wejście analogowe"
+msgstr "Аналагавы ўваход"
#: ../src/modules/alsa/alsa-mixer.c:2464
msgid "Dock Microphone"
-msgstr "Mikrofon stacji dokującej"
+msgstr "Мікрафон док-станцыі"
#: ../src/modules/alsa/alsa-mixer.c:2466
msgid "Headset Microphone"
-msgstr "Mikrofon na słuchawkach"
+msgstr "Мікрафон гарнітуры"
#: ../src/modules/alsa/alsa-mixer.c:2470
msgid "Analog Output"
-msgstr "Wyjście analogowe"
+msgstr "Аналагавы выхад"
#: ../src/modules/alsa/alsa-mixer.c:2472
msgid "LFE on Separate Mono Output"
-msgstr "Subwoofer na oddzielnym wyjściu mono"
+msgstr "Аналагавы выхад нізкіх частот"
#: ../src/modules/alsa/alsa-mixer.c:2473
msgid "Line Out"
-msgstr "Wyjście liniowe"
+msgstr "Лінейны выхад"
#: ../src/modules/alsa/alsa-mixer.c:2474
msgid "Analog Mono Output"
-msgstr "Analogowe wyjście mono"
+msgstr "Аналагавы монавыхад"
#: ../src/modules/alsa/alsa-mixer.c:2475
msgid "Speakers"
-msgstr "Głośniki"
+msgstr "Дынамікі"
#: ../src/modules/alsa/alsa-mixer.c:2476
msgid "HDMI / DisplayPort"
-msgstr "HDMI/DisplayPort"
+msgstr "HDMI / DisplayPort"
#: ../src/modules/alsa/alsa-mixer.c:2477
msgid "Digital Output (S/PDIF)"
-msgstr "Wyjście cyfrowe (S/PDIF)"
+msgstr "Лічбавы выхад (S/PDIF)"
#: ../src/modules/alsa/alsa-mixer.c:2478
msgid "Digital Input (S/PDIF)"
-msgstr "Wejście cyfrowe (S/PDIF)"
+msgstr "Лічбавы ўваход (S/PDIF)"
#: ../src/modules/alsa/alsa-mixer.c:2479
msgid "Digital Passthrough (S/PDIF)"
-msgstr "Cyfrowe przekazywanie (S/PDIF)"
+msgstr "Лічбавы скразны (S/PDIF)"
#: ../src/modules/alsa/alsa-mixer.c:2480
msgid "Multichannel Input"
-msgstr "Wejście wielokanałowe"
+msgstr "Шматканальны ўваход"
#: ../src/modules/alsa/alsa-mixer.c:2481
msgid "Multichannel Output"
-msgstr "Wyjście wielokanałowe"
+msgstr "Шматканальны выхад"
#: ../src/modules/alsa/alsa-mixer.c:3990
msgid "Analog Mono"
-msgstr "Analogowe mono"
+msgstr "Аналагавы мона"
#. Note: Not translated to "Analog Stereo Input", because the source
#. * name gets "Input" appended to it automatically, so adding "Input"
@@ -735,116 +730,116 @@ msgstr "Analogowe mono"
#: ../src/modules/alsa/alsa-mixer.c:3991 ../src/modules/alsa/alsa-mixer.c:3997
#: ../src/modules/alsa/alsa-mixer.c:3998
msgid "Analog Stereo"
-msgstr "Analogowe stereo"
+msgstr "Аналагавы стэрэа"
#: ../src/modules/alsa/alsa-mixer.c:3999 ../src/modules/alsa/alsa-mixer.c:4000
msgid "Multichannel"
-msgstr "Wielokanałowe"
+msgstr "Шматканальны"
#: ../src/modules/alsa/alsa-mixer.c:4001
msgid "Analog Surround 2.1"
-msgstr "Analogowe surround 2.1"
+msgstr "Аналагавы абʼёмны 2.1"
#: ../src/modules/alsa/alsa-mixer.c:4002
msgid "Analog Surround 3.0"
-msgstr "Analogowe surround 3.0"
+msgstr "Аналагавы абʼёмны 3.0"
#: ../src/modules/alsa/alsa-mixer.c:4003
msgid "Analog Surround 3.1"
-msgstr "Analogowe surround 3.1"
+msgstr "Аналагавы абʼёмны 3.1"
#: ../src/modules/alsa/alsa-mixer.c:4004
msgid "Analog Surround 4.0"
-msgstr "Analogowe surround 4.0"
+msgstr "Аналагавы абʼёмны 4.0"
#: ../src/modules/alsa/alsa-mixer.c:4005
msgid "Analog Surround 4.1"
-msgstr "Analogowe surround 4.1"
+msgstr "Аналагавы абʼёмны 4.1"
#: ../src/modules/alsa/alsa-mixer.c:4006
msgid "Analog Surround 5.0"
-msgstr "Analogowe surround 5.0"
+msgstr "Аналагавы абʼёмны 5.0"
#: ../src/modules/alsa/alsa-mixer.c:4007
msgid "Analog Surround 5.1"
-msgstr "Analogowe surround 5.1"
+msgstr "Аналагавы абʼёмны 5.1"
#: ../src/modules/alsa/alsa-mixer.c:4008
msgid "Analog Surround 6.0"
-msgstr "Analogowe surround 6.0"
+msgstr "Аналагавы абʼёмны 6.0"
#: ../src/modules/alsa/alsa-mixer.c:4009
msgid "Analog Surround 6.1"
-msgstr "Analogowe surround 6.1"
+msgstr "Аналагавы абʼёмны 6.1"
#: ../src/modules/alsa/alsa-mixer.c:4010
msgid "Analog Surround 7.0"
-msgstr "Analogowe surround 7.0"
+msgstr "Аналагавы абʼёмны 7.0"
#: ../src/modules/alsa/alsa-mixer.c:4011
msgid "Analog Surround 7.1"
-msgstr "Analogowe surround 7.1"
+msgstr "Аналагавы абʼёмны 7.1"
#: ../src/modules/alsa/alsa-mixer.c:4012
msgid "Digital Stereo (IEC958)"
-msgstr "Cyfrowe stereo (IEC958)"
+msgstr "Лічбавы стэрэа (IEC958)"
#: ../src/modules/alsa/alsa-mixer.c:4013
msgid "Digital Passthrough (IEC958)"
-msgstr "Cyfrowe przekazywanie (IEC958)"
+msgstr "Лічбавы скразны (IEC958)"
#: ../src/modules/alsa/alsa-mixer.c:4014
msgid "Digital Surround 4.0 (IEC958/AC3)"
-msgstr "Cyfrowe surround 4.0 (IEC958/AC3)"
+msgstr "Лічбавы абʼёмны 4.0 (IEC958/AC3)"
#: ../src/modules/alsa/alsa-mixer.c:4015
msgid "Digital Surround 5.1 (IEC958/AC3)"
-msgstr "Cyfrowe surround 5.1 (IEC958/AC3)"
+msgstr "Лічбавы абʼёмны 5.1 (IEC958/AC3)"
#: ../src/modules/alsa/alsa-mixer.c:4016
msgid "Digital Surround 5.1 (IEC958/DTS)"
-msgstr "Cyfrowe surround 5.1 (IEC958/DTS)"
+msgstr "Лічбавы абʼёмны 5.1 (IEC958/DTS)"
#: ../src/modules/alsa/alsa-mixer.c:4017
msgid "Digital Stereo (HDMI)"
-msgstr "Cyfrowe stereo (HDMI)"
+msgstr "Лічбавы стэрэа (HDMI)"
#: ../src/modules/alsa/alsa-mixer.c:4018
msgid "Digital Surround 5.1 (HDMI)"
-msgstr "Cyfrowe surround 5.1 (HDMI)"
+msgstr "Лічбавы абʼёмны 5.1 (HDMI)"
#: ../src/modules/alsa/alsa-mixer.c:4151
msgid "Analog Mono Duplex"
-msgstr "Analogowy dupleks mono"
+msgstr "Аналагавы мона дуплекс"
#: ../src/modules/alsa/alsa-mixer.c:4152
msgid "Analog Stereo Duplex"
-msgstr "Analogowy dupleks stereo"
+msgstr "Аналагавы стэрэа дуплекс"
#: ../src/modules/alsa/alsa-mixer.c:4153
msgid "Digital Stereo Duplex (IEC958)"
-msgstr "Cyfrowy dupleks stereo (IEC958)"
+msgstr "Лічбавы стэрэа дуплекс (IEC958)"
#: ../src/modules/alsa/alsa-mixer.c:4154
msgid "Multichannel Duplex"
-msgstr "Dupleks wielokanałowy"
+msgstr "Шматканальны дуплекс"
#: ../src/modules/alsa/alsa-mixer.c:4155
#: ../src/modules/alsa/module-alsa-card.c:186
#: ../src/modules/bluetooth/module-bluez4-device.c:2295
#: ../src/modules/bluetooth/module-bluez5-device.c:1941
msgid "Off"
-msgstr "Wyłączone"
+msgstr "Адключаны"
#: ../src/modules/alsa/alsa-mixer.c:4254
#, c-format
msgid "%s Output"
-msgstr "Wyjście %s"
+msgstr "%s выхад"
#: ../src/modules/alsa/alsa-mixer.c:4262
#, c-format
msgid "%s Input"
-msgstr "Wejście %s"
+msgstr "%s уваход"
#: ../src/modules/alsa/alsa-sink.c:570
#, c-format
@@ -856,12 +851,12 @@ msgid ""
"We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() "
"returned 0 or another value < min_avail."
msgstr ""
-"Usługa ALSA została wybudzona, aby zapisać nowe dane do urządzenia, ale nie "
-"było nic do zapisania.\n"
-"Prawdopodobnie jest to błąd w sterowniku ALSA „%s”. Proszę zgłosić ten "
-"problem programistom usługi ALSA.\n"
-"Wybudzono za pomocą ustawienia POLLOUT — ale jednoczesne wywołanie "
-"snd_pcm_avail() zwróciło zero lub inną wartość < min_avail."
+"ALSA разбудзіла нас, каб запісаць новыя дадзеныя ў прыладу, але, на самай"
+" справе, пісаць няма чаго.\n"
+"Хутчэй за ўсё, гэта памылка ў ALSA-драйверы «%s». Калі ласка, паведаміце аб"
+" гэтым распрацоўнікам ALSA.\n"
+"Мы прачнуліся з устаноўленым POLLOUT, аднак наступны выклік snd_pcm_avail()"
+" вярнуў 0 або іншае значэнне, меншае за min_avail."
#: ../src/modules/alsa/alsa-sink.c:747
#, c-format
@@ -873,12 +868,12 @@ msgid ""
"We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() "
"returned 0 or another value < min_avail."
msgstr ""
-"Usługa ALSA została wybudzona, aby zapisać nowe dane do urządzenia, ale nie "
-"było nic do zapisania.\n"
-"Prawdopodobnie jest to błąd w sterowniku ALSA „%s”. Proszę zgłosić ten "
-"problem programistom usługi ALSA.\n"
-"Wybudzono za pomocą ustawienia POLLOUT — ale jednoczesne wywołanie "
-"snd_pcm_avail() zwróciło zero lub inną wartość < min_avail."
+"ALSA разбудзіла нас, каб запісаць новыя дадзеныя ў прыладу, але, на самай"
+" справе, пісаць няма чаго!\n"
+"Хутчэй за ўсё, гэта памылка ў ALSA-драйверы «%s». Калі ласка, паведаміце аб"
+" гэтым распрацоўнікам ALSA.\n"
+"Мы прачнуліся з устаноўленым POLLOUT, аднак наступны выклік snd_pcm_avail()"
+" вярнуў 0 або іншае значэнне, меншае за min_avail."
#: ../src/modules/alsa/alsa-source.c:529
#, c-format
@@ -890,12 +885,12 @@ msgid ""
"We were woken up with POLLIN set -- however a subsequent snd_pcm_avail() "
"returned 0 or another value < min_avail."
msgstr ""
-"Usługa ALSA została wybudzona, aby odczytać nowe dane z urządzenia, ale nie "
-"było nic do odczytania.\n"
-"Prawdopodobnie jest to błąd w sterowniku ALSA „%s”. Proszę zgłosić ten "
-"problem programistom usługi ALSA.\n"
-"Wybudzono za pomocą ustawienia POLLIN — ale jednoczesne wywołanie "
-"snd_pcm_avail() zwróciło zero lub inną wartość < min_avail."
+"ALSA разбудзіла нас, каб прачытаць новыя дадзеныя з прылады, але, на самай"
+" справе, чытаць няма чаго.\n"
+"Хутчэй за ўсё, гэта памылка ў ALSA-драйверы «%s». Калі ласка, паведаміце аб"
+" гэтым распрацоўнікам ALSA.\n"
+"Мы прачнуліся з устаноўленым POLLIN, аднак наступны выклік snd_pcm_avail()"
+" вярнуў 0 або іншае значэнне, меншае за min_avail."
#: ../src/modules/alsa/alsa-source.c:680
#, c-format
@@ -907,12 +902,12 @@ msgid ""
"We were woken up with POLLIN set -- however a subsequent snd_pcm_avail() "
"returned 0 or another value < min_avail."
msgstr ""
-"Usługa ALSA została wybudzona, aby odczytać nowe dane z urządzenia, ale nie "
-"było nic do odczytania.\n"
-"Prawdopodobnie jest to błąd w sterowniku ALSA „%s”. Proszę zgłosić ten "
-"problem programistom usługi ALSA.\n"
-"Wybudzono za pomocą ustawienia POLLIN — ale jednoczesne wywołanie "
-"snd_pcm_avail() zwróciło zero lub inną wartość < min_avail."
+"ALSA разбудзіла нас, каб прачытаць новыя дадзеныя з прылады, але, на самай"
+" справе, чытаць няма чаго!\n"
+"Хутчэй за ўсё, гэта памылка ў ALSA-драйверы «%s». Калі ласка, паведаміце аб"
+" гэтым распрацоўнікам ALSA.\n"
+"Мы прачнуліся з устаноўленым POLLIN, аднак наступны выклік snd_pcm_avail()"
+" вярнуў 0 або іншае значэнне, меншае за min_avail."
#: ../src/modules/alsa/alsa-util.c:1166 ../src/modules/alsa/alsa-util.c:1241
#, c-format
@@ -922,9 +917,10 @@ msgid ""
"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
"to the ALSA developers."
msgstr ""
-"snd_pcm_avail() zwróciło wyjątkowo dużą wartość: %lu bajtów (%lu ms).\n"
-"Prawdopodobnie jest to błąd sterownika ALSA „%s”. Proszę zgłosić ten problem "
-"programistom usługi ALSA."
+"Выклік snd_pcm_avail() вярнуў выключна вялікае значэнне: %lu байтаў (%lu"
+" мс).\n"
+"Хутчэй за ўсё, гэта памылка ў ALSA-драйверы «%s». Калі ласка, паведаміце аб"
+" гэтым распрацоўнікам ALSA."
#: ../src/modules/alsa/alsa-util.c:1216
#, c-format
@@ -934,9 +930,10 @@ msgid ""
"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
"to the ALSA developers."
msgstr ""
-"snd_pcm_delay() zwróciło wyjątkowo dużą wartość: %li bajtów (%s%lu ms).\n"
-"Prawdopodobnie jest to błąd sterownika ALSA „%s”. Proszę zgłosić ten problem "
-"programistom usługi ALSA."
+"Выклік snd_pcm_delay() вярнуў выключна вялікае значэнне: %li байтаў (%s%lu"
+" мс).\n"
+"Хутчэй за ўсё, гэта памылка ў ALSA-драйверы «%s». Калі ласка, паведаміце аб"
+" гэтым распрацоўнікам ALSA."
#: ../src/modules/alsa/alsa-util.c:1257
#, c-format
@@ -946,10 +943,10 @@ msgid ""
"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
"to the ALSA developers."
msgstr ""
-"snd_pcm_avail_delay() zwróciło dziwne wartości: opóźnienie %lu jest mniejsze "
-"niż korzyść %lu.\n"
-"Prawdopodobnie jest to błąd sterownika ALSA „%s”. Proszę zgłosić ten problem "
-"programistom usługi ALSA."
+"Выклік snd_pcm_avail_delay() вярнуў дзіўнае значэнне: затрымка %lu меншая за"
+" даступную %lu.\n"
+"Хутчэй за ўсё, гэта памылка ў ALSA-драйверы «%s». Калі ласка, паведаміце аб"
+" гэтым распрацоўнікам ALSA."
#: ../src/modules/alsa/alsa-util.c:1300
#, c-format
@@ -959,51 +956,52 @@ msgid ""
"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
"to the ALSA developers."
msgstr ""
-"snd_pcm_mmap_begin() zwróciło wyjątkowo dużą wartość: %lu bajtów (%lu ms).\n"
-"Prawdopodobnie jest to błąd sterownika ALSA „%s”. Proszę zgłosić ten problem "
-"programistom usługi ALSA."
+"Выклік snd_pcm_mmap_begin() вярнуў выключна вялікае значэнне: %lu байтаў (%lu"
+" мс).\n"
+"Хутчэй за ўсё, гэта памылка ў ALSA-драйверы «%s». Калі ласка, паведаміце аб"
+" гэтым распрацоўнікам ALSA."
#: ../src/modules/bluetooth/module-bluez4-device.c:2089
#: ../src/modules/bluetooth/module-bluez5-device.c:1700
msgid "Headset"
-msgstr "Słuchawki z mikrofonem"
+msgstr "Гарнітура"
#: ../src/modules/bluetooth/module-bluez4-device.c:2094
#: ../src/modules/bluetooth/module-bluez5-device.c:1705
msgid "Handsfree"
-msgstr "Zestaw głośnomówiący"
+msgstr "Хэндс-фры"
#: ../src/modules/bluetooth/module-bluez4-device.c:2109
#: ../src/modules/bluetooth/module-bluez5-device.c:1723
msgid "Headphone"
-msgstr "Słuchawki"
+msgstr "Навушнік"
#: ../src/modules/bluetooth/module-bluez4-device.c:2114
#: ../src/modules/bluetooth/module-bluez5-device.c:1728
msgid "Portable"
-msgstr "Przenośne"
+msgstr "Партатыўная сістэма"
#: ../src/modules/bluetooth/module-bluez4-device.c:2119
#: ../src/modules/bluetooth/module-bluez5-device.c:1733
msgid "Car"
-msgstr "Samochód"
+msgstr "Аўтамабільная сістэма"
#: ../src/modules/bluetooth/module-bluez4-device.c:2124
#: ../src/modules/bluetooth/module-bluez5-device.c:1738
msgid "HiFi"
-msgstr "HiFi"
+msgstr "Hi-Fi"
#: ../src/modules/bluetooth/module-bluez4-device.c:2129
#: ../src/modules/bluetooth/module-bluez5-device.c:1743
msgid "Phone"
-msgstr "Telefon"
+msgstr "Тэлефон"
#: ../src/modules/bluetooth/module-bluez4-device.c:2137
#: ../src/modules/bluetooth/module-bluez5-device.c:1695
#: ../src/modules/bluetooth/module-bluez5-device.c:1711
#: ../src/modules/bluetooth/module-bluez5-device.c:1749
msgid "Bluetooth Output"
-msgstr "Wyjście Bluetooth"
+msgstr "Bluetooth-выхад"
#: ../src/modules/bluetooth/module-bluez4-device.c:2140
#: ../src/modules/bluetooth/module-bluez5-device.c:1694
@@ -1011,39 +1009,39 @@ msgstr "Wyjście Bluetooth"
#: ../src/modules/bluetooth/module-bluez5-device.c:1722
#: ../src/modules/bluetooth/module-bluez5-device.c:1748
msgid "Bluetooth Input"
-msgstr "Wejście Bluetooth"
+msgstr "Bluetooth-уваход"
#: ../src/modules/bluetooth/module-bluez4-device.c:2176
msgid "High Fidelity Playback (A2DP)"
-msgstr "Odtwarzanie o wysokiej dokładności (A2DP)"
+msgstr "Прайграванне высокай якасці (A2DP)"
#: ../src/modules/bluetooth/module-bluez4-device.c:2187
msgid "High Fidelity Capture (A2DP)"
-msgstr "Przechwytywanie o wysokiej dokładności (A2DP)"
+msgstr "Захоп высокай якасці (A2DP)"
#: ../src/modules/bluetooth/module-bluez4-device.c:2198
msgid "Telephony Duplex (HSP/HFP)"
-msgstr "Dupleks telefoniczny (HSP/HFP)"
+msgstr "Тэлефонны дуплекс (HSP/HFP)"
#: ../src/modules/bluetooth/module-bluez4-device.c:2210
msgid "Handsfree Gateway"
-msgstr "Zestaw głośnomówiący"
+msgstr "Шлюз хэндс-фры"
#: ../src/modules/bluetooth/module-bluez5-device.c:1786
msgid "High Fidelity Playback (A2DP Sink)"
-msgstr "Odtwarzanie o wysokiej dokładności (odpływ A2DP)"
+msgstr "Прайграванне высокай якасці (A2DP-прыёмнік)"
#: ../src/modules/bluetooth/module-bluez5-device.c:1797
msgid "High Fidelity Capture (A2DP Source)"
-msgstr "Przechwytywanie o wysokiej dokładności (źródło A2DP)"
+msgstr "Захоп высокай якасці (A2DP-крыніца)"
#: ../src/modules/bluetooth/module-bluez5-device.c:1808
msgid "Headset Head Unit (HSP/HFP)"
-msgstr "Jednostka główna słuchawek z mikrofonem (HSP/HFP)"
+msgstr "Навушнікі гарнітуры (HSP/HFP)"
#: ../src/modules/bluetooth/module-bluez5-device.c:1820
msgid "Headset Audio Gateway (HSP/HFP)"
-msgstr "Zestaw słuchawek z mikrofonem (HSP/HFP)"
+msgstr "Аўдыяшлюз гарнітуры (HSP/HFP)"
#: ../src/modules/echo-cancel/module-echo-cancel.c:61
msgid ""
@@ -1058,35 +1056,36 @@ msgid ""
"loaded automatically> use_volume_sharing=<yes or no> use_master_format=<yes "
"or no> "
msgstr ""
-"source_name=<nazwa źródła> source_properties=<właściwości źródła> "
-"source_master=<nazwa źródła do filtrowania> sink_name=<nazwa odpływu> "
-"sink_properties=<właściwości odpływu> sink_master=<nazwa odpływu do "
-"filtrowania> adjust_time=<jak często odczytywać częstotliwości w sekundach> "
-"adjust_threshold=<jak daleko odchodzić do odczytania w milisekundach> "
-"format=<format próbki> rate=<częstotliwość próbki> channels=<liczba kanałów> "
-"channel_map=<map kanałów> aec_method=<używana implementacja> "
-"aec_args=<parametry dla mechanizmu AEC> save_aec=<zapisywanie danych AEC w /"
-"tmp> autoloaded=<należy ustawić, jeśli moduł jest automatycznie wczytywany> "
-"use_volume_sharing=<yes lub no> use_master_format=<yes lub no> "
+"source_name=<назва крыніцы> source_properties=<уласьцівасьці крыніцы>"
+" source_master=<назва крыніцы для фільтрацыі> sink_name=<назва прыёмніка>"
+" sink_properties=<уласьцівасьці прыёмніка> sink_master=<назва прыёмніка для"
+" фільтрацыі> adjust_time=<частата карэтыроўкі ў секундах> adjust_threshold=<"
+"велічыня дрэйфу ў мілісекундах, пасля якой патрабуецца карэтыроўка> format=<"
+"фармат сэмлаў> rate=<частата сэмлаў> channels=<колькасць каналаў>"
+" channel_map=<схема каналаў> aec_method=<скарыстаная рэалізацыя> aec_args=<"
+"параметры сістэмы рэхападаўлення>"
+"save_aec=<захоўваць дадзеныя рэхападаўлення ў /tmp> autoloaded=<зададзены,"
+" калі гэты модуль загружаны аўтаматычна> use_volume_sharing=<yes ці no>"
+" use_master_format=<yes ці no> "
#. add on profile
#: ../src/modules/macosx/module-coreaudio-device.c:811
msgid "On"
-msgstr "Włączone"
+msgstr "Уключаны"
+
+#: ../src/modules/module-allow-passthrough.c:73
+#: ../src/modules/module-always-sink.c:82
+msgid "Dummy Output"
+msgstr "Фіктыўны выхад"
#: ../src/modules/module-always-sink.c:36
msgid "Always keeps at least one sink loaded even if it's a null one"
msgstr ""
-"Utrzymywanie zawsze co najmniej jednego wczytanego odpływu nawet, jeśli to "
-"pusty odpływ"
-
-#: ../src/modules/module-always-sink.c:82
-msgid "Dummy Output"
-msgstr "Głuche wyjście"
+"Заўсёды пакідаць хоць бы адзін прыёмнік загружаным, нават калі ён пусты"
#: ../src/modules/module-equalizer-sink.c:70
msgid "General Purpose Equalizer"
-msgstr "Korektor graficzny ogólnego przeznaczenia"
+msgstr "Эквалайзер агульнага прызначэння"
#: ../src/modules/module-equalizer-sink.c:74
msgid ""
@@ -1095,19 +1094,19 @@ msgid ""
"channels=<number of channels> channel_map=<channel map> autoloaded=<set if "
"this module is being loaded automatically> use_volume_sharing=<yes or no> "
msgstr ""
-"sink_name=<nazwa odpływu> sink_properties=<właściwości odpływu> "
-"sink_master=<nazwa odpływu do filtrowania> format=<format próbki> "
-"rate=<częstotliwość próbki> channels=<liczba kanałów> channel_map=<mapa "
-"kanałów> autoloaded=<należy ustawić, jeśli ten moduł jest automatycznie "
-"uruchamiany> use_volume_sharing=<yes lub no> "
+"sink_name=<назва прыёмніка> sink_properties=<уласцівасці прыёмніка>"
+" sink_master=<прыёмнік, з якім злучыцца> format=<фармат сэмлаў> rate=<"
+"частата сэмлаў> channels=<колькасць каналаў> channel_map=<схема каналаў>"
+" autoloaded=<зададзены, калі гэты модуль загружаны аўтаматычна>"
+" use_volume_sharing=<yes ці no> "
#: ../src/modules/module-filter-apply.c:47
msgid "autoclean=<automatically unload unused filters?>"
-msgstr "autoclean=<automatycznie usuwać nieużywane filtry?>"
+msgstr "autoclean=<аўтаматычна выгрузіць нявыкарыстаныя фільтры?>"
#: ../src/modules/module-ladspa-sink.c:51
msgid "Virtual LADSPA sink"
-msgstr "Wirtualny odpływ LADSPA"
+msgstr "Віртуальны LADSPA-прыёмнік"
#: ../src/modules/module-ladspa-sink.c:55
msgid ""
@@ -1119,38 +1118,37 @@ msgid ""
"LADSPA port names> output_ladspaport_map=<comma separated list of output "
"LADSPA port names> "
msgstr ""
-"sink_name=<nazwa odpływu> sink_properties=<właściwości odpływu> "
-"master=<nazwa odpływu do filtrowania> format=<format próbki> "
-"rate=<częstotliwość próbki> channels=<liczba kanałów> channel_map=<mapa "
-"kanałów> plugin=<nazwa wtyczki ladspa> label=<etykieta wtyczki ladspa> "
-"control=<lista wartości kontroli wejścia oddzielona przecinkami> "
-"input_ladspaport_map=<lista nazw wejściowych portów LADSPA oddzielona "
-"przecinkami> output_ladspaport_map=<lista nazw wyjściowych portów LADSPA "
-"oddzielona przecinkami> "
+"sink_name=<назва прыёмніка> sink_properties=<уласцівасці прыёмніка> master=<"
+"назва прыёмніка для фільтрацыі> format=<фармат сэмлаў> rate=<частата сэмлаў>"
+" channels=<колькасць каналаў> channel_map=<схема каналаў> plugin=<назва"
+" LADSPA-дадатку> label=<этыкетка LADSPA-дадатку> control=<спіс кантрольных"
+" значэнняў, падзеленых коскамі> input_ladspaport_map=<спіс назваў уваходных"
+" LADSPA-партоў, падзеленых коскамі> output_ladspaport_map=<спіс назваў"
+" выхадных LADSPA-партоў, падзеленых коскамі> "
#: ../src/modules/module-null-sink.c:47
msgid "Clocked NULL sink"
-msgstr "Zegarowy PUSTY odpływ"
+msgstr "Сінхронны пусты прыёмнік"
#: ../src/modules/module-null-sink.c:280
msgid "Null Output"
-msgstr "Puste wyjście"
+msgstr "Пусты выхад"
#: ../src/modules/module-rygel-media-server.c:508
#: ../src/modules/module-rygel-media-server.c:546
#: ../src/modules/module-rygel-media-server.c:905
msgid "Output Devices"
-msgstr "Urządzenia wyjściowe"
+msgstr "Прылады вываду"
#: ../src/modules/module-rygel-media-server.c:509
#: ../src/modules/module-rygel-media-server.c:547
#: ../src/modules/module-rygel-media-server.c:906
msgid "Input Devices"
-msgstr "Urządzenia wejściowe"
+msgstr "Прылады ўводу"
#: ../src/modules/module-rygel-media-server.c:1063
msgid "Audio on @HOSTNAME@"
-msgstr "Dźwięk na @HOSTNAME@"
+msgstr "Аўдыя на @HOSTNAME@"
#. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis at lazus'
#. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis at lazus'
@@ -1158,17 +1156,17 @@ msgstr "Dźwięk na @HOSTNAME@"
#: ../src/modules/module-tunnel-source-new.c:305
#, c-format
msgid "Tunnel for %s@%s"
-msgstr "Tunel dla %s@%s"
+msgstr "Тунэль для %s@%s"
#: ../src/modules/module-tunnel-sink-new.c:517
#: ../src/modules/module-tunnel-source-new.c:516
#, c-format
msgid "Tunnel to %s/%s"
-msgstr "Tunel do %s/%s"
+msgstr "Тунэль да %s/%s"
#: ../src/modules/module-virtual-surround-sink.c:47
msgid "Virtual surround sink"
-msgstr "Wirtualny odpływ Surround"
+msgstr "Віртуальны абʼёмны прыёмнік"
#: ../src/modules/module-virtual-surround-sink.c:51
msgid ""
@@ -1178,219 +1176,219 @@ msgid ""
"use_volume_sharing=<yes or no> force_flat_volume=<yes or no> hrir=/path/to/"
"left_hrir.wav "
msgstr ""
-"sink_name=<nazwa odpływu> sink_properties=<właściwości odpływu> "
-"sink_master=<nazwa odpływu do filtrowania> format=<format próbki> "
-"rate=<częstotliwość próbki> channels=<liczba kanałów> channel_map=<mapa "
-"kanałów> use_volume_sharing=<yes lub no> force_flat_volume=<yes lub no> "
-"hrir=/ścieżka/do/pliku/left_hrir.wav"
+"sink_name=<назва прыёмніка> sink_properties=<уласцівасці прыёмніка> master=<"
+"назва прыёмніка для фільтрацыі> format=<фармат сэмлаў> rate=<частата сэмлаў>"
+" channels=<number of channels> channel_map=<колькасць каналаў>"
+" use_volume_sharing=<yes ці no> force_flat_volume=<yes ці no> hrir=<шлях да"
+" left_hrir.wav> "
#: ../src/modules/reserve-wrap.c:149
msgid "PulseAudio Sound Server"
-msgstr "Serwer dźwięku PulseAudio"
+msgstr "Гукавы сервер PulseAudio"
#: ../src/pulse/channelmap.c:103 ../src/pulse/channelmap.c:771
msgid "Mono"
-msgstr "Mono"
+msgstr "Мона"
#: ../src/pulse/channelmap.c:105
msgid "Front Center"
-msgstr "Przedni środkowy"
+msgstr "Пярэдні цэнтральны"
#: ../src/pulse/channelmap.c:106
msgid "Front Left"
-msgstr "Przedni lewy"
+msgstr "Пярэдні левы"
#: ../src/pulse/channelmap.c:107
msgid "Front Right"
-msgstr "Przedni prawy"
+msgstr "Пярэдні правы"
#: ../src/pulse/channelmap.c:109
msgid "Rear Center"
-msgstr "Tylny środkowy"
+msgstr "Задні цэнтральны"
#: ../src/pulse/channelmap.c:110
msgid "Rear Left"
-msgstr "Tylny lewy"
+msgstr "Задні левы"
#: ../src/pulse/channelmap.c:111
msgid "Rear Right"
-msgstr "Tylny prawy"
+msgstr "Задні правы"
#: ../src/pulse/channelmap.c:113
msgid "Subwoofer"
-msgstr "Subwoofer"
+msgstr "Сабвуфер"
#: ../src/pulse/channelmap.c:115
msgid "Front Left-of-center"
-msgstr "Przedni lewy po środku"
+msgstr "Пярэдні левацэнтральны"
#: ../src/pulse/channelmap.c:116
msgid "Front Right-of-center"
-msgstr "Przedni prawy po środku"
+msgstr "Пярэдні правацэнтральны"
#: ../src/pulse/channelmap.c:118
msgid "Side Left"
-msgstr "Boczny lewy"
+msgstr "Бакавы левы"
#: ../src/pulse/channelmap.c:119
msgid "Side Right"
-msgstr "Boczny prawy"
+msgstr "Бакавы правы"
#: ../src/pulse/channelmap.c:121
msgid "Auxiliary 0"
-msgstr "Pomocniczy 0"
+msgstr "Дапаможны 0"
#: ../src/pulse/channelmap.c:122
msgid "Auxiliary 1"
-msgstr "Pomocniczy 1"
+msgstr "Дапаможны 1"
#: ../src/pulse/channelmap.c:123
msgid "Auxiliary 2"
-msgstr "Pomocniczy 2"
+msgstr "Дапаможны 2"
#: ../src/pulse/channelmap.c:124
msgid "Auxiliary 3"
-msgstr "Pomocniczy 3"
+msgstr "Дапаможны 3"
#: ../src/pulse/channelmap.c:125
msgid "Auxiliary 4"
-msgstr "Pomocniczy 4"
+msgstr "Дапаможны 4"
#: ../src/pulse/channelmap.c:126
msgid "Auxiliary 5"
-msgstr "Pomocniczy 5"
+msgstr "Дапаможны 5"
#: ../src/pulse/channelmap.c:127
msgid "Auxiliary 6"
-msgstr "Pomocniczy 6"
+msgstr "Дапаможны 6"
#: ../src/pulse/channelmap.c:128
msgid "Auxiliary 7"
-msgstr "Pomocniczy 7"
+msgstr "Дапаможны 7"
#: ../src/pulse/channelmap.c:129
msgid "Auxiliary 8"
-msgstr "Pomocniczy 8"
+msgstr "Дапаможны 8"
#: ../src/pulse/channelmap.c:130
msgid "Auxiliary 9"
-msgstr "Pomocniczy 9"
+msgstr "Дапаможны 9"
#: ../src/pulse/channelmap.c:131
msgid "Auxiliary 10"
-msgstr "Pomocniczy 10"
+msgstr "Дапаможны 10"
#: ../src/pulse/channelmap.c:132
msgid "Auxiliary 11"
-msgstr "Pomocniczy 11"
+msgstr "Дапаможны 11"
#: ../src/pulse/channelmap.c:133
msgid "Auxiliary 12"
-msgstr "Pomocniczy 12"
+msgstr "Дапаможны 12"
#: ../src/pulse/channelmap.c:134
msgid "Auxiliary 13"
-msgstr "Pomocniczy 13"
+msgstr "Дапаможны 13"
#: ../src/pulse/channelmap.c:135
msgid "Auxiliary 14"
-msgstr "Pomocniczy 14"
+msgstr "Дапаможны 14"
#: ../src/pulse/channelmap.c:136
msgid "Auxiliary 15"
-msgstr "Pomocniczy 15"
+msgstr "Дапаможны 15"
#: ../src/pulse/channelmap.c:137
msgid "Auxiliary 16"
-msgstr "Pomocniczy 16"
+msgstr "Дапаможны 16"
#: ../src/pulse/channelmap.c:138
msgid "Auxiliary 17"
-msgstr "Pomocniczy 17"
+msgstr "Дапаможны 17"
#: ../src/pulse/channelmap.c:139
msgid "Auxiliary 18"
-msgstr "Pomocniczy 18"
+msgstr "Дапаможны 18"
#: ../src/pulse/channelmap.c:140
msgid "Auxiliary 19"
-msgstr "Pomocniczy 19"
+msgstr "Дапаможны 19"
#: ../src/pulse/channelmap.c:141
msgid "Auxiliary 20"
-msgstr "Pomocniczy 20"
+msgstr "Дапаможны 20"
#: ../src/pulse/channelmap.c:142
msgid "Auxiliary 21"
-msgstr "Pomocniczy 21"
+msgstr "Дапаможны 21"
#: ../src/pulse/channelmap.c:143
msgid "Auxiliary 22"
-msgstr "Pomocniczy 22"
+msgstr "Дапаможны 22"
#: ../src/pulse/channelmap.c:144
msgid "Auxiliary 23"
-msgstr "Pomocniczy 23"
+msgstr "Дапаможны 23"
#: ../src/pulse/channelmap.c:145
msgid "Auxiliary 24"
-msgstr "Pomocniczy 24"
+msgstr "Дапаможны 24"
#: ../src/pulse/channelmap.c:146
msgid "Auxiliary 25"
-msgstr "Pomocniczy 25"
+msgstr "Дапаможны 25"
#: ../src/pulse/channelmap.c:147
msgid "Auxiliary 26"
-msgstr "Pomocniczy 26"
+msgstr "Дапаможны 26"
#: ../src/pulse/channelmap.c:148
msgid "Auxiliary 27"
-msgstr "Pomocniczy 27"
+msgstr "Дапаможны 27"
#: ../src/pulse/channelmap.c:149
msgid "Auxiliary 28"
-msgstr "Pomocniczy 28"
+msgstr "Дапаможны 28"
#: ../src/pulse/channelmap.c:150
msgid "Auxiliary 29"
-msgstr "Pomocniczy 29"
+msgstr "Дапаможны 29"
#: ../src/pulse/channelmap.c:151
msgid "Auxiliary 30"
-msgstr "Pomocniczy 30"
+msgstr "Дапаможны 30"
#: ../src/pulse/channelmap.c:152
msgid "Auxiliary 31"
-msgstr "Pomocniczy 31"
+msgstr "Дапаможны 31"
#: ../src/pulse/channelmap.c:154
msgid "Top Center"
-msgstr "Górny środkowy"
+msgstr "Верхні цэнтральны"
#: ../src/pulse/channelmap.c:156
msgid "Top Front Center"
-msgstr "Górny przedni środkowy"
+msgstr "Верхні пярэдні цэнтральны"
#: ../src/pulse/channelmap.c:157
msgid "Top Front Left"
-msgstr "Górny przedni lewy"
+msgstr "Верхні пярэдні левы"
#: ../src/pulse/channelmap.c:158
msgid "Top Front Right"
-msgstr "Górny przedni prawy"
+msgstr "Верхні пярэдні правы"
#: ../src/pulse/channelmap.c:160
msgid "Top Rear Center"
-msgstr "Górny tylny środkowy"
+msgstr "Верхні задні цэнтральны"
#: ../src/pulse/channelmap.c:161
msgid "Top Rear Left"
-msgstr "Górny tylny lewy"
+msgstr "Верхні задні левы"
#: ../src/pulse/channelmap.c:162
msgid "Top Rear Right"
-msgstr "Górny tylny prawy"
+msgstr "Верхні задні правы"
#: ../src/pulse/channelmap.c:479 ../src/pulse/format.c:121
#: ../src/pulse/sample.c:175 ../src/pulse/volume.c:294
@@ -1398,43 +1396,43 @@ msgstr "Górny tylny prawy"
#: ../src/pulse/volume.c:372 ../src/pulse/volume.c:412
#: ../src/pulse/volume.c:431
msgid "(invalid)"
-msgstr "(nieprawidłowe)"
+msgstr "(некарэктнае)"
#: ../src/pulse/channelmap.c:775
msgid "Stereo"
-msgstr "Stereo"
+msgstr "Стэрэа"
#: ../src/pulse/channelmap.c:780
msgid "Surround 4.0"
-msgstr "Surround 4.0"
+msgstr "Абʼёмны 4.0"
#: ../src/pulse/channelmap.c:786
msgid "Surround 4.1"
-msgstr "Surround 4.1"
+msgstr "Абʼёмны 4.1"
#: ../src/pulse/channelmap.c:792
msgid "Surround 5.0"
-msgstr "Surround 5.0"
+msgstr "Абʼёмны 5.0"
#: ../src/pulse/channelmap.c:798
msgid "Surround 5.1"
-msgstr "Surround 5.1"
+msgstr "Абʼёмны 5.1"
#: ../src/pulse/channelmap.c:805
msgid "Surround 7.1"
-msgstr "Surround 7.1"
+msgstr "Абʼёмны 7.1"
#: ../src/pulse/client-conf-x11.c:53 ../src/utils/pax11publish.c:97
msgid "xcb_connect() failed"
-msgstr "xcb_connect() się nie powiodło: %s"
+msgstr "xcb_connect() пацярпела няўдачу"
#: ../src/pulse/client-conf-x11.c:58 ../src/utils/pax11publish.c:102
msgid "xcb_connection_has_error() returned true"
-msgstr "xcb_connection_has_error() zwróciło wartość „true”"
+msgstr "Выклік xcb_connection_has_error() вярнуў true"
#: ../src/pulse/client-conf-x11.c:94
msgid "Failed to parse cookie data"
-msgstr "Przetworzenie danych ciasteczka się nie powiodło"
+msgstr "Не атрымалася разабраць дадзеныя cookie"
#: ../src/pulse/context.c:702
#, c-format
@@ -1444,28 +1442,28 @@ msgstr "fork(): %s"
#: ../src/pulse/context.c:757
#, c-format
msgid "waitpid(): %s"
-msgstr "waitpid(): %s"
+msgstr "fork(): %s"
#: ../src/pulse/context.c:1463
#, c-format
msgid "Received message for unknown extension '%s'"
-msgstr "Otrzymano komunikat dla nieznanego rozszerzenia „%s”"
+msgstr "Атрымана паведамленне для невядомага пашырэння «%s»"
#: ../src/pulse/direction.c:37
msgid "input"
-msgstr "wejście"
+msgstr "увод"
#: ../src/pulse/direction.c:39
msgid "output"
-msgstr "wyjście"
+msgstr "вывад"
#: ../src/pulse/direction.c:41
msgid "bidirectional"
-msgstr "dwukierunkowe"
+msgstr "двунакіраваны"
#: ../src/pulse/direction.c:43
msgid "invalid"
-msgstr "nieprawidłowe"
+msgstr "некарэктны"
#: ../src/pulsecore/core-util.c:1836
#, c-format
@@ -1474,192 +1472,190 @@ msgid ""
"e g happen if you try to connect to a non-root PulseAudio as a root user, "
"over the native protocol. Don't do that.)"
msgstr ""
-"Właścicielem XDG_RUNTIME_DIR (%s) nie jest UID %d, ale UID %d (może to być "
-"spowodowane próbą połączenia do kopii PulseAudio niebędącej rootem jako "
-"użytkownik root przez natywny protokół, czego nie należy robić)."
+"XDG_RUNTIME_DIR (%s) не належыць нам (uid %d), а — uid %d! (Гэта можа"
+" адбыцца, напрыклад, калі вы спрабуеце злучыцца з PulseAudio звычайнага"
+" карыстальніка як карыстальнік root па ўбудаваным пратаколе. Не рабіце так.)"
#: ../src/pulsecore/core-util.h:97
msgid "yes"
-msgstr "tak"
+msgstr "так"
#: ../src/pulsecore/core-util.h:97
msgid "no"
-msgstr "nie"
+msgstr "не"
#: ../src/pulsecore/lock-autospawn.c:141 ../src/pulsecore/lock-autospawn.c:227
msgid "Cannot access autospawn lock."
-msgstr "Nie można uzyskać dostępu do blokady automatycznego wznawiania."
+msgstr "Не атрымалася даступіцца да блакіроўкі для аўтазапуску."
#: ../src/pulsecore/log.c:165
#, c-format
msgid "Failed to open target file '%s'."
-msgstr "Otwarcie pliku docelowego „%s” się nie powiodło."
+msgstr "Не атрымалася адкрыць файл журнала «%s»."
#: ../src/pulsecore/log.c:188
#, c-format
msgid ""
"Tried to open target file '%s', '%s.1', '%s.2' ... '%s.%d', but all failed."
-msgstr ""
-"Próbowano otworzyć plik docelowy „%s”, „%s.1”, „%s.2” … „%s.%d”, ale "
-"wszystkie się nie powiodły."
+msgstr "Не атрымалася адкрыць файлы журнала «%s», «%s.1», «%s.2» … «%s.%d»."
#: ../src/pulsecore/log.c:651
msgid "Invalid log target."
-msgstr "Nieprawidłowy dziennik docelowy."
+msgstr "Некарэктны журнал."
-#: ../src/pulsecore/sink.c:3461
+#: ../src/pulsecore/sink.c:3459
msgid "Built-in Audio"
-msgstr "Wbudowany dźwięk"
+msgstr "Убудаванае аўдыя"
-#: ../src/pulsecore/sink.c:3466
+#: ../src/pulsecore/sink.c:3464
msgid "Modem"
-msgstr "Modem"
+msgstr "Мадэм"
#: ../src/pulse/error.c:38
msgid "OK"
-msgstr "OK"
+msgstr "Добра"
#: ../src/pulse/error.c:39
msgid "Access denied"
-msgstr "Odmowa dostępu"
+msgstr "Доступ забаронены"
#: ../src/pulse/error.c:40
msgid "Unknown command"
-msgstr "Nieznane polecenie"
+msgstr "Невядомая каманда"
#: ../src/pulse/error.c:41
msgid "Invalid argument"
-msgstr "Nieprawidłowy parametr"
+msgstr "Некарэктны аргумент"
#: ../src/pulse/error.c:42
msgid "Entity exists"
-msgstr "Jednostka istnieje"
+msgstr "Абʼект існуе"
#: ../src/pulse/error.c:43
msgid "No such entity"
-msgstr "Brak jednostki"
+msgstr "Няма такога абʼекта"
#: ../src/pulse/error.c:44
msgid "Connection refused"
-msgstr "Odrzucono połączenie"
+msgstr "Злучэнне адкінута"
#: ../src/pulse/error.c:45
msgid "Protocol error"
-msgstr "Błąd protokołu"
+msgstr "Памылка пратакола"
#: ../src/pulse/error.c:46
msgid "Timeout"
-msgstr "Przekroczono czas oczekiwania"
+msgstr "Таймаут"
#: ../src/pulse/error.c:47
msgid "No authentication key"
-msgstr "Brak klucza uwierzytelnienia"
+msgstr "Няма ключа аўтэнтыфікацыі"
#: ../src/pulse/error.c:48
msgid "Internal error"
-msgstr "Wewnętrzny błąd"
+msgstr "Унутраная памылка"
#: ../src/pulse/error.c:49
msgid "Connection terminated"
-msgstr "Zniszczono połączenie"
+msgstr "Злучэнне завяршылася"
#: ../src/pulse/error.c:50
msgid "Entity killed"
-msgstr "Zniszczono jednostkę"
+msgstr "Абʼект знішчаны"
#: ../src/pulse/error.c:51
msgid "Invalid server"
-msgstr "Nieprawidłowy serwer"
+msgstr "Некарэктны сервер"
#: ../src/pulse/error.c:52
msgid "Module initialization failed"
-msgstr "Zainicjowanie modułu się nie powiodło"
+msgstr "Не атрымалася ініцыялізаваць модуль"
#: ../src/pulse/error.c:53
msgid "Bad state"
-msgstr "Błędny stan"
+msgstr "Дрэнны стан"
#: ../src/pulse/error.c:54
msgid "No data"
-msgstr "Brak danych"
+msgstr "Няма дадзеных"
#: ../src/pulse/error.c:55
msgid "Incompatible protocol version"
-msgstr "Niezgodna wersja protokołu"
+msgstr "Несумяшчальныя версіі пратаколу"
#: ../src/pulse/error.c:56
msgid "Too large"
-msgstr "Za duże"
+msgstr "Занадта вялікі"
#: ../src/pulse/error.c:57
msgid "Not supported"
-msgstr "Nieobsługiwane"
+msgstr "Не падтрымліваецца"
#: ../src/pulse/error.c:58
msgid "Unknown error code"
-msgstr "Nieznany kod błędu"
+msgstr "Невядомы код памылкі"
#: ../src/pulse/error.c:59
msgid "No such extension"
-msgstr "Nie ma takiego rozszerzenia"
+msgstr "Няма такога пашырэння"
#: ../src/pulse/error.c:60
msgid "Obsolete functionality"
-msgstr "Przestarzała funkcjonalność"
+msgstr "Састарэлая функцыянальнасць"
#: ../src/pulse/error.c:61
msgid "Missing implementation"
-msgstr "Brak implementacji"
+msgstr "Адсутнічае рэалізацыя"
#: ../src/pulse/error.c:62
msgid "Client forked"
-msgstr "Rozdzielono klienta"
+msgstr "Кліент падвоіўся"
#: ../src/pulse/error.c:63
msgid "Input/Output error"
-msgstr "Błąd wejścia/wyjścia"
+msgstr "Памылка ўводу/вываду"
#: ../src/pulse/error.c:64
msgid "Device or resource busy"
-msgstr "Urządzenie lub zasób jest zajęty"
+msgstr "Прылада ці рэсурс заняты"
#: ../src/pulse/sample.c:177
#, c-format
msgid "%s %uch %uHz"
-msgstr "%s %u k %u Hz"
+msgstr "%s %u-канальны %u Гц"
#: ../src/pulse/sample.c:189
#, c-format
msgid "%0.1f GiB"
-msgstr "%0.1f GiB"
+msgstr "%0.1f ГіБ"
#: ../src/pulse/sample.c:191
#, c-format
msgid "%0.1f MiB"
-msgstr "%0.1f MiB"
+msgstr "%0.1f МіБ"
#: ../src/pulse/sample.c:193
#, c-format
msgid "%0.1f KiB"
-msgstr "%0.1f KiB"
+msgstr "%0.1f КіБ"
#: ../src/pulse/sample.c:195
#, c-format
msgid "%u B"
-msgstr "%u B"
+msgstr "%u байт"
#: ../src/utils/pacat.c:117
#, c-format
msgid "Failed to drain stream: %s"
-msgstr "Opróżnienie potoku się nie powiodło: %s"
+msgstr "Не атрымалася зліць паток: %s"
#: ../src/utils/pacat.c:122
msgid "Playback stream drained."
-msgstr "Opróżniono potok odtwarzania."
+msgstr "Паток прайграванне зліты."
#: ../src/utils/pacat.c:133
msgid "Draining connection to server."
-msgstr "Opróżnianie połączenia z serwerem."
+msgstr "Зліццё злучэння з серверам."
#: ../src/utils/pacat.c:146
#, c-format
@@ -1669,160 +1665,161 @@ msgstr "pa_stream_drain(): %s"
#: ../src/utils/pacat.c:169
#, c-format
msgid "pa_stream_write() failed: %s"
-msgstr "pa_stream_write() się nie powiodło: %s"
+msgstr "pa_stream_write() пацярпела няўдачу: %s"
#: ../src/utils/pacat.c:210
#, c-format
msgid "pa_stream_begin_write() failed: %s"
-msgstr "pa_stream_begin_write() się nie powiodło: %s"
+msgstr "pa_stream_begin_write() пацярпела няўдачу: %s"
#: ../src/utils/pacat.c:260 ../src/utils/pacat.c:290
#, c-format
msgid "pa_stream_peek() failed: %s"
-msgstr "pa_stream_peek() się nie powiodło: %s"
+msgstr "pa_stream_peek() пацярпела няўдачу: %s"
#: ../src/utils/pacat.c:340
msgid "Stream successfully created."
-msgstr "Pomyślnie utworzono potok."
+msgstr "Паток паспяхова створаны."
#: ../src/utils/pacat.c:343
#, c-format
msgid "pa_stream_get_buffer_attr() failed: %s"
-msgstr "pa_stream_get_buffer_attr() się nie powiodło: %s"
+msgstr "pa_stream_get_buffer_attr() пацярпела няўдачу: %s"
#: ../src/utils/pacat.c:347
#, c-format
msgid "Buffer metrics: maxlength=%u, tlength=%u, prebuf=%u, minreq=%u"
-msgstr "Metryka bufora: maxlength=%u, tlength=%u, prebuf=%u, minreq=%u"
+msgstr "Метрыкі буфера: maxlength=%u, tlength=%u, prebuf=%u, minreq=%u"
#: ../src/utils/pacat.c:350
#, c-format
msgid "Buffer metrics: maxlength=%u, fragsize=%u"
-msgstr "Metryka bufora: maxlength=%u, fragsize=%u"
+msgstr "Метрыкі буфера: maxlength=%u, fragsize=%u"
#: ../src/utils/pacat.c:354
#, c-format
msgid "Using sample spec '%s', channel map '%s'."
-msgstr "Używanie przykładowego określenia „%s”, mapa kanałów „%s”."
+msgstr "Выкарыстоўваецца спецыфікацыя сэмплаў «%s» і схема каналаў «%s»."
#: ../src/utils/pacat.c:358
#, c-format
msgid "Connected to device %s (index: %u, suspended: %s)."
-msgstr "Połączono z urządzeniem %s (indeks: %u, wstrzymane: %s)."
+msgstr "Злучаны з прыладай %s (нумар: %u, прыпынены: %s)."
#: ../src/utils/pacat.c:368
#, c-format
msgid "Stream error: %s"
-msgstr "Błąd potoku: %s"
+msgstr "Памылка патоку: %s"
#: ../src/utils/pacat.c:378
#, c-format
msgid "Stream device suspended.%s"
-msgstr "Wstrzymano urządzenie potoku.%s"
+msgstr "Паток прыпынены.%s"
#: ../src/utils/pacat.c:380
#, c-format
msgid "Stream device resumed.%s"
-msgstr "Wznowiono urządzenie potoku.%s"
+msgstr "Паток узноўлены.%s"
#: ../src/utils/pacat.c:388
#, c-format
msgid "Stream underrun.%s"
-msgstr "Niedopełniony potok.%s"
+msgstr "Паток спустошаны.%s"
#: ../src/utils/pacat.c:395
#, c-format
msgid "Stream overrun.%s"
-msgstr "Przepełniony potok.%s"
+msgstr "Паток перапоўнены.%s"
#: ../src/utils/pacat.c:402
#, c-format
msgid "Stream started.%s"
-msgstr "Utworzono potok.%s"
+msgstr "Паток запушчаны.%s"
#: ../src/utils/pacat.c:409
#, c-format
msgid "Stream moved to device %s (%u, %ssuspended).%s"
-msgstr "Potok został przeniesiony do urządzenia %s (%u, %swstrzymane).%s"
+msgstr "Паток перасунуты ў прыладу %s (%u, %sпрыпынены).%s"
#: ../src/utils/pacat.c:409
msgid "not "
-msgstr "nie "
+msgstr "не"
#: ../src/utils/pacat.c:416
#, c-format
msgid "Stream buffer attributes changed.%s"
-msgstr "Zmieniono atrybuty bufora potoku.%s"
+msgstr "Змяніліся атрыбуты буфера патоку.%s"
#: ../src/utils/pacat.c:431
msgid "Cork request stack is empty: corking stream"
-msgstr "Stos żądań korka jest pusty: zatykanie potoku"
+msgstr "Стэк запытаў закаркавання пусты — паток закаркоўваецца"
#: ../src/utils/pacat.c:437
msgid "Cork request stack is empty: uncorking stream"
-msgstr "Stos żądań korka jest pusty: odtykanie potoku"
+msgstr "Стэк запытаў закаркавання пусты — паток адкаркоўваецца"
#: ../src/utils/pacat.c:441
msgid "Warning: Received more uncork requests than cork requests."
-msgstr "Ostrzeżenie: otrzymano więcej żądań odetkania niż żądań zatkania."
+msgstr ""
+"Папярэджанне: Атрымана запытаў адкаркавання больш, чым запытаў закаркавання."
#: ../src/utils/pacat.c:466
#, c-format
msgid "Connection established.%s"
-msgstr "Ustanowiono połączenie.%s"
+msgstr "Злучэнне ўстаноўлена.%s"
#: ../src/utils/pacat.c:469
#, c-format
msgid "pa_stream_new() failed: %s"
-msgstr "pa_stream_new() się nie powiodło: %s"
+msgstr "pa_stream_new() пацярпела няўдачу: %s"
#: ../src/utils/pacat.c:507
#, c-format
msgid "pa_stream_connect_playback() failed: %s"
-msgstr "pa_stream_connect_playback() się nie powiodło: %s"
+msgstr "pa_stream_connect_playback() пацярпела няўдачу: %s"
#: ../src/utils/pacat.c:513
#, c-format
msgid "Failed to set monitor stream: %s"
-msgstr "Ustawienie potoku monitora się nie powiodło: %s"
+msgstr "Не атрымалася ўсталяваць маніторны паток: %s"
#: ../src/utils/pacat.c:517
#, c-format
msgid "pa_stream_connect_record() failed: %s"
-msgstr "pa_stream_connect_record() się nie powiodło: %s"
+msgstr "pa_stream_connect_record() пацярпела няўдачу: %s"
#: ../src/utils/pacat.c:530 ../src/utils/pactl.c:1446
#, c-format
msgid "Connection failure: %s"
-msgstr "Połączenie się nie powiodło: %s"
+msgstr "Злучэнне не ўдалося: %s"
#: ../src/utils/pacat.c:563
msgid "Got EOF."
-msgstr "Otrzymano EOF."
+msgstr "Дасягнуты канец файла."
#: ../src/utils/pacat.c:600
#, c-format
msgid "write() failed: %s"
-msgstr "write() się nie powiodło: %s"
+msgstr "write() пацярпела няўдачу: %s"
#: ../src/utils/pacat.c:621
msgid "Got signal, exiting."
-msgstr "Otrzymano sygnał, kończenie działania."
+msgstr "Атрыманы сігнал — выхад."
#: ../src/utils/pacat.c:635
#, c-format
msgid "Failed to get latency: %s"
-msgstr "Uzyskanie opóźnienia się nie powiodło: %s"
+msgstr "Не атрымалася атрымаць затрымку: %s"
#: ../src/utils/pacat.c:640
#, c-format
msgid "Time: %0.3f sec; Latency: %0.0f usec."
-msgstr "Czas: %0.3f sekundy; opóźnienie: %0.0f usekundy."
+msgstr "Час: %0.3f с; Затрымка: %0.0f мкс."
#: ../src/utils/pacat.c:661
#, c-format
msgid "pa_stream_update_timing_info() failed: %s"
-msgstr "pa_stream_update_timing_info() się nie powiodło: %s"
+msgstr "pa_stream_update_timing_info() пацярпела няўдачу: %s"
#: ../src/utils/pacat.c:671
#, c-format
@@ -1891,98 +1888,86 @@ msgid ""
" --monitor-stream=INDEX Record from the sink input with "
"index INDEX.\n"
msgstr ""
-"%s [opcje]\n"
+"%s [параметры]\n"
"%s\n"
"\n"
-" -h, --help Wyświetla tę pomoc\n"
-" --version Wyświetla wersję\n"
+" -h, --help Паказаць гэту даведку.\n"
+" --version Паказаць версію.\n"
"\n"
-" -r, --record Tworzy połączenie do nagrywania\n"
-" -p, --playback Tworzy połączenie do odtwarzania\n"
+" -r, --record Стварыць злучэнне для запісу.\n"
+" -p, --playback Стварыць злучэнне для прайгравання.\n"
"\n"
-" -v, --verbose Wyświetla więcej informacji o\n"
-" działaniu\n"
+" -v, --verbose Павялічыць узровень інфарматыўнасці.\n"
"\n"
-" -s, --server=SERWER Nazwa serwera do połączenia się\n"
-" -d, --device=URZĄDZENIE Nazwa odpływu/źródła do połączenia\n"
-" się\n"
-" -n, --client-name=NAZWA Jak nazywać tego klienta na\n"
-" serwerze\n"
-" --stream-name=NAZWA Jak nazwać ten potok na serwerze\n"
-" --volume=POZIOMGŁOŚNOŚCI Określa początkowy (liniowy)\n"
-" poziom głośności z zakresie\n"
-" 0…65536\n"
-" --rate=CZĘSTOTLIWOŚĆPRÓBKI Częstotliwość próbki w Hz\n"
-" (domyślnie 44100)\n"
-" --format=FORMATPRÓBKI Typ próbki, jeden z s16le, s16be,\n"
+" -s, --server=СЕРВЕР Назва сервера для злучэння.\n"
+" -d, --device=ПРЫЛАДА Назва прыёмніка/крыніцы для\n"
+" злучэння.\n"
+" -n, --client-name=НАЗВА Назва гэтага кліента на серверы.\n"
+" --stream-name=НАЗВА Назва гэтага патоку на серверы.\n"
+" --volume=ГУЧНАСЦЬ Пачатковая (лінейная) гучнасць у\n"
+" дыяпазоне 0–65536.\n"
+" --rate=ЧАСТАТА Частата сэмплаў у Гц (агаданая\n"
+" 44100).\n"
+" --format=ФАРМАТ_СЭМПЛАЎ Тып сэмплаў, адзін з s16le, s16be,\n"
" u8, float32le, float32be, ulaw,\n"
" alaw, s32le, s32be, s24le, s24be,\n"
-" s24-32le, s24-32be (domyślnie\n"
-" s16ne)\n"
-" --channels=KANAŁY Liczba kanałów, 1 dla mono, 2 dla\n"
-" stereo\n"
-" (domyślnie 2)\n"
-" --channel-map=MAPAKANAŁÓW Mapa kanałów używa zamiast\n"
-" domyślnej\n"
-" --fix-format Pobiera format próbki z odpływu/\n"
-" źródła, z jakim połączony jest\n"
-" potok.\n"
-" --fix-rate Pobiera częstotliwość sampli z\n"
-" odpływu/źródła, z jakim połączony\n"
-" jest potok.\n"
-" --fix-channels Pobiera liczbę kanałów i mapę\n"
-" kanałów z odpływu/źródła, z jakim\n"
-" połączony jest potok.\n"
-" --no-remix Nie miesza kanałów w górę lub w\n"
-" dół.\n"
-" --no-remap Mapuje kanały przez indeks zamiast\n"
-" przez nazwę.\n"
-" --latency=BAJTY Żąda określonego opóźnienia w\n"
-" bajtach.\n"
-" --process-time=BAJTY Żąda określonego czasu procesu na\n"
-" żądanie w bajtach.\n"
-" --latency-msec=MSEKUNDY Żąda określonego opóźnienia w\n"
-" milisekundach.\n"
-" --process-time-msec=MSEKUNDY Żąda określonego czasu procesu na\n"
-" żądanie w milisekundach.\n"
-" --property=WŁAŚCIWOŚĆ=WARTOŚĆ Ustawia podaną właściwość na podaną\n"
-" wartość.\n"
-" --raw Nagrywa/odtwarza surowe dane PCM.\n"
-" --passthrough Przekazuje dane.\n"
-" --file-format=[=FFORMAT] Nagrywa/odtwarza sformatowane dane\n"
-" PCM.\n"
-" --list-file-formats Wyświetla listę dostępnych formatów\n"
-" plików.\n"
-" --monitor-stream=INDEKS Nagrywa z odpływu wejścia\n"
-" o INDEKSIE.\n"
+" s24-32le, s24-32be (агаданы s16ne)\n"
+" --channels=КАНАЛАЎ Колькасць каналаў: 1 для мона,\n"
+" 2 для стэрэа.\n"
+" (defaults to 2)\n"
+" --channel-map=СХЕМА_КАНАЛАЎ Схема каналаў замест агаданай.\n"
+" --fix-format Узяць фармат сэмплаў з прыёмніка\n"
+" або крыніцы, з якім злучаны паток.\n"
+" --fix-rate Узяць частату сэмплаў з прыёмніка\n"
+" або крыніцы, з якім злучаны паток.\n"
+" --fix-channels Узяць колькасць і схему каналаў з\n"
+" прыёмніка або крыніцы, з якім"
+" злучаны\n"
+" паток.\n"
+" --no-remix Не змешваць каналы.\n"
+" --no-remap Сумяшчаць каналы па нумару,\n"
+" а не па назве.\n"
+" --latency=БАЙТЫ Запытаць затрымку ў байтах.\n"
+" --process-time=БАЙТЫ Запытаць час апрацоўкі аднаго запыту\n"
+" ў байтах.\n"
+" --latency-msec=МКС Запытаць затрымку ў мікрасекундах.\n"
+" --process-time-msec=МКС Запытаць час апрацоўкі аднаго запыту\n"
+" ў мікрасекундах.\n"
+" --property=УЛАСЦІВАСЦЬ=ЗНАЧЭННЕ Задаць значэнне уласцівасці.\n"
+" --raw Запісваць або прайграваць сырыя\n"
+" PCM-дадзеныя.\n"
+" --passthrough Перадаваць дадзеныя наскрозь.\n"
+" --file-format[=ФАРМАТ_ФАЙЛА] Запісваць або прайграваць\n"
+" фарматаваныя PCM-дадзеныя.\n"
+" --list-file-formats Паказаць спіс даступных фарматаў\n"
+" файлаў.\n"
+" --monitor-stream=НУМАР Запісваць з увахода прыёмніка з\n"
+" зададзеным нумарам.\n"
#: ../src/utils/pacat.c:788
msgid "Play back encoded audio files on a PulseAudio sound server."
-msgstr ""
-"Odtwarza zakodowane pliki dźwiękowe za pomocą serwera dźwięku PulseAudio."
+msgstr "Прайграванне кадаваных аўдыёфайлаў на гукавым серверы PulseAudio."
#: ../src/utils/pacat.c:792
msgid ""
"Capture audio data from a PulseAudio sound server and write it to a file."
-msgstr ""
-"Przechwytuje dane dźwiękowe z serwera dźwięku PulseAudio i zapisuje je do "
-"pliku."
+msgstr "Захоп аўдыёдадзеных з гукавога сервера PulseAudio і запіс іх у файл."
#: ../src/utils/pacat.c:796
msgid ""
"Capture audio data from a PulseAudio sound server and write it to STDOUT or "
"the specified file."
msgstr ""
-"Przechwytuje dane dźwiękowe z serwera dźwięku PulseAudio i zapisuje je do "
-"STANDARDOWEGO-WYJŚCIA lub podanego pliku."
+"Захоп аўдыёдадзеных з гукавога сервера PulseAudio і запіс іх у STDOUT ці"
+" зададзены файл."
#: ../src/utils/pacat.c:800
msgid ""
"Play back audio data from STDIN or the specified file on a PulseAudio sound "
"server."
msgstr ""
-"Odtwarza dane dźwiękowe ze STANDARDOWEGO-WEJŚCIA lub podanego pliku za "
-"pomocą serwera dźwięku PulseAudio."
+"Прайграванне аўдыёдадзеных з STDIN ці зададзенага аўдыёфайла на гукавым"
+" серверы PulseAudio."
#: ../src/utils/pacat.c:814
#, c-format
@@ -1992,51 +1977,51 @@ msgid ""
"Linked with libpulse %s\n"
msgstr ""
"pacat %s\n"
-"Skompilowane za pomocą libpulse %s\n"
-"Skonsolidowane za pomocą libpulse %s\n"
+"Скампілявана з libpulse %s\n"
+"Звязана з libpulse %s\n"
#: ../src/utils/pacat.c:847 ../src/utils/pactl.c:1648
#, c-format
msgid "Invalid client name '%s'"
-msgstr "Nieprawidłowa nazwa klienta „%s”"
+msgstr "Некарэктная назва кліента «%s»"
#: ../src/utils/pacat.c:862
#, c-format
msgid "Invalid stream name '%s'"
-msgstr "Nieprawidłowa nazwa potoku „%s”"
+msgstr "Некарэктная назва патоку «%s»"
#: ../src/utils/pacat.c:899
#, c-format
msgid "Invalid channel map '%s'"
-msgstr "Nieprawidłowa mapa kanałów „%s”"
+msgstr "Некарэктная схема каналаў «%s»"
#: ../src/utils/pacat.c:928 ../src/utils/pacat.c:942
#, c-format
msgid "Invalid latency specification '%s'"
-msgstr "Nieprawidłowe określenie opóźnienia „%s”"
+msgstr "Некарэктная затрымка «%s»"
#: ../src/utils/pacat.c:935 ../src/utils/pacat.c:949
#, c-format
msgid "Invalid process time specification '%s'"
-msgstr "Nieprawidłowe określenie czasu procesu „%s”"
+msgstr "Некарэктная спецыфікацыя часу працэсу «%s»"
#: ../src/utils/pacat.c:961
#, c-format
msgid "Invalid property '%s'"
-msgstr "Nieprawidłowa właściwość „%s”"
+msgstr "Некарэктная ўласцівасць «%s»"
#: ../src/utils/pacat.c:980
#, c-format
msgid "Unknown file format %s."
-msgstr "Nieznany format pliku %s."
+msgstr "Невядомая фармат файла %s."
#: ../src/utils/pacat.c:995
msgid "Failed to parse the argument for --monitor-stream"
-msgstr "Przetworzenie parametru dla --monitor-stream się nie powiodło"
+msgstr "Не атрымалася разабраць значэнне для --monitor-stream"
#: ../src/utils/pacat.c:1006
msgid "Invalid sample specification"
-msgstr "Nieprawidłowe określenie próbki"
+msgstr "Некарэктная спецыфікацыя сэмплаў"
#: ../src/utils/pacat.c:1016
#, c-format
@@ -2050,144 +2035,144 @@ msgstr "dup2(): %s"
#: ../src/utils/pacat.c:1028
msgid "Too many arguments."
-msgstr "Za dużo parametrów."
+msgstr "Занадта шмат аргументаў."
#: ../src/utils/pacat.c:1039
msgid "Failed to generate sample specification for file."
-msgstr "Utworzenie określenia próbki dla pliku się nie powiodło."
+msgstr "Не атрымалася згенераваць спецыфікацыю сэмплаў для файла."
#: ../src/utils/pacat.c:1065
msgid "Failed to open audio file."
-msgstr "Otwarcie pliku dźwiękowego się nie powiodło."
+msgstr "Не атрымалася адкрыць аўдыяфайл."
#: ../src/utils/pacat.c:1071
msgid ""
"Warning: specified sample specification will be overwritten with "
"specification from file."
msgstr ""
-"Ostrzeżenie: podane określenie próbki zostanie zastąpione przez określenie z "
-"pliku."
+"Папярэджанне: зададзеная спецыфікацыя сэмплаў будзе перапісана спецыфікацыяй"
+" сэмплаў"
+" з файла."
#: ../src/utils/pacat.c:1074 ../src/utils/pactl.c:1712
msgid "Failed to determine sample specification from file."
-msgstr "Ustalenie określenia próbki z pliku nie się nie powiodło."
+msgstr "Не атрымалася вызначыць спецыфікацыю сэмплаў з файла."
#: ../src/utils/pacat.c:1083
msgid "Warning: Failed to determine channel map from file."
-msgstr "Ostrzeżenie: ustalenie mapy kanałów z pliku się nie powiodło."
+msgstr "Папярэджанне: Не атрымалася вызначыць схему каналаў з файла."
#: ../src/utils/pacat.c:1094
msgid "Channel map doesn't match sample specification"
-msgstr "Mapa kanałów nie zgadza się z określeniem próbki"
+msgstr "Схема каналаў не адпавядае спецыфікацыі сэмплаў"
#: ../src/utils/pacat.c:1105
msgid "Warning: failed to write channel map to file."
-msgstr "Ostrzeżenie: zapisanie mapy kanałów do pliku się nie powiodło."
+msgstr "Папярэджанне: не атрымалася запісаць схему каналаў у файл."
#: ../src/utils/pacat.c:1120
#, c-format
msgid ""
"Opening a %s stream with sample specification '%s' and channel map '%s'."
-msgstr ""
-"Otwieranie potoku %s za pomocą określenie próbki „%s” i mapy kanałów „%s”."
+msgstr "Адкрыццё патоку %s з спецыфікацыяй сэмплаў «%s» і схемай каналаў «%s»."
#: ../src/utils/pacat.c:1121
msgid "recording"
-msgstr "nagrywanie"
+msgstr "запіс"
#: ../src/utils/pacat.c:1121
msgid "playback"
-msgstr "odtwarzanie"
+msgstr "прайграванне"
#: ../src/utils/pacat.c:1145
msgid "Failed to set media name."
-msgstr "Ustawienie nazwy nośnika się nie powiodło."
+msgstr "Не атрымалася ўсталяваць назву патоку."
#: ../src/utils/pacat.c:1152 ../src/utils/pactl.c:2062
msgid "pa_mainloop_new() failed."
-msgstr "pa_mainloop_new() się nie powiodło."
+msgstr "pa_mainloop_new() пацярпела няўдачу."
#: ../src/utils/pacat.c:1175
msgid "io_new() failed."
-msgstr "io_new() się nie powiodło."
+msgstr "io_new() пацярпела няўдачу."
#: ../src/utils/pacat.c:1182 ../src/utils/pactl.c:2074
msgid "pa_context_new() failed."
-msgstr "pa_context_new() się nie powiodło."
+msgstr "pa_context_new() пацярпела няўдачу."
#: ../src/utils/pacat.c:1190 ../src/utils/pactl.c:2080
#, c-format
msgid "pa_context_connect() failed: %s"
-msgstr "pa_context_connect() się nie powiodło: %s"
+msgstr "pa_context_connect() пацярпела няўдачу: %s"
#: ../src/utils/pacat.c:1196
msgid "pa_context_rttime_new() failed."
-msgstr "pa_context_rttime_new() się nie powiodło."
+msgstr "pa_context_rttime_new() пацярпела няўдачу."
#: ../src/utils/pacat.c:1203 ../src/utils/pactl.c:2085
msgid "pa_mainloop_run() failed."
-msgstr "pa_mainloop_run() się nie powiodło."
+msgstr "pa_mainloop_run() пацярпела няўдачу."
#: ../src/utils/pacmd.c:51 ../src/utils/pactl.c:1570
msgid "NAME [ARGS ...]"
-msgstr "NAZWA [PARAMETRY…]"
+msgstr "НАЗВА [АРГУМЕНТЫ …]"
#: ../src/utils/pacmd.c:52 ../src/utils/pacmd.c:60 ../src/utils/pactl.c:1571
msgid "NAME|#N"
-msgstr "NAZWA|#N"
+msgstr "НАЗВА|НУМАР"
#: ../src/utils/pacmd.c:53 ../src/utils/pacmd.c:63 ../src/utils/pactl.c:1569
#: ../src/utils/pactl.c:1575
msgid "NAME"
-msgstr "NAZWA"
+msgstr "НАЗВА"
#: ../src/utils/pacmd.c:54
msgid "NAME|#N VOLUME"
-msgstr "NAZWA|#N GŁOŚNOŚĆ"
+msgstr "НАЗВА|НУМАР ГУЧНАСЦЬ"
#: ../src/utils/pacmd.c:55
msgid "#N VOLUME"
-msgstr "#N GŁOŚNOŚĆ"
+msgstr "НУМАР ГУЧНАСЦЬ"
#: ../src/utils/pacmd.c:56 ../src/utils/pacmd.c:70 ../src/utils/pactl.c:1573
msgid "NAME|#N 1|0"
-msgstr "NAZWA|#N 1|0"
+msgstr "НАЗВА|НУМАР 1|0"
#: ../src/utils/pacmd.c:57
msgid "#N 1|0"
-msgstr "#N 1|0"
+msgstr "НУМАР 1|0"
#: ../src/utils/pacmd.c:58
msgid "NAME|#N KEY=VALUE"
-msgstr "NAZWA|#N KLUCZ=WARTOŚĆ"
+msgstr "НАЗВА|НУМАР КЛЮЧ=ЗНАЧЭННЕ"
#: ../src/utils/pacmd.c:59
msgid "#N KEY=VALUE"
-msgstr "#N KLUCZ=WARTOŚĆ"
+msgstr "НУМАР КЛЮЧ=ЗНАЧЭННЕ"
#: ../src/utils/pacmd.c:61
msgid "#N"
-msgstr "#N"
+msgstr "НУМАР"
#: ../src/utils/pacmd.c:62
msgid "NAME SINK|#N"
-msgstr "NAZWA ODPŁYW|#N"
+msgstr "НАЗВА ПРЫЁМНІК|НУМАР"
#: ../src/utils/pacmd.c:64 ../src/utils/pacmd.c:65
msgid "NAME FILENAME"
-msgstr "NAZWA NAZWA-PLIKU"
+msgstr "НАЗВА НАЗВА_ФАЙЛА"
#: ../src/utils/pacmd.c:66
msgid "PATHNAME"
-msgstr "NAZWA-ŚCIEŻKI"
+msgstr "ШЛЯХ"
#: ../src/utils/pacmd.c:67
msgid "FILENAME SINK|#N"
-msgstr "NAZWA-PLIKU ODPŁYW|#N"
+msgstr "НАЗВА_ФАЙЛА ПРЫЁМНІК|НУМАР"
#: ../src/utils/pacmd.c:69 ../src/utils/pactl.c:1572
msgid "#N SINK|SOURCE"
-msgstr "#N ODPŁYW|ŹRÓDŁO"
+msgstr "НУМАР ПРЫЁМНІК|КРЫНІЦА"
#: ../src/utils/pacmd.c:71 ../src/utils/pacmd.c:77 ../src/utils/pacmd.c:78
msgid "1|0"
@@ -2195,27 +2180,27 @@ msgstr "1|0"
#: ../src/utils/pacmd.c:72 ../src/utils/pactl.c:1574
msgid "CARD PROFILE"
-msgstr "PROFIL KARTY"
+msgstr "КАРТКА ПРОФІЛЬ"
#: ../src/utils/pacmd.c:73 ../src/utils/pactl.c:1576
msgid "NAME|#N PORT"
-msgstr "NAZWA|#N PORT"
+msgstr "НАЗВА|НУМАР ПОРТ"
#: ../src/utils/pacmd.c:74 ../src/utils/pactl.c:1582
msgid "CARD-NAME|CARD-#N PORT OFFSET"
-msgstr "NAZWA-KARTY|KARTA-#N PORT OFFSET"
+msgstr "НАЗВА_КАРТКІ|№_КАРТЫ ПОРТ ЗРУХ"
#: ../src/utils/pacmd.c:75
msgid "TARGET"
-msgstr "CEL"
+msgstr "МЭТА"
#: ../src/utils/pacmd.c:76
msgid "NUMERIC-LEVEL"
-msgstr "POZIOM-NUMERYCZNY"
+msgstr "ЛІКАВЫ ЎЗРОВЕНЬ"
#: ../src/utils/pacmd.c:79
msgid "FRAMES"
-msgstr "RAMKI"
+msgstr "КАДРАЎ"
#: ../src/utils/pacmd.c:81
#, c-format
@@ -2226,10 +2211,9 @@ msgid ""
"When no command is given pacmd starts in the interactive mode.\n"
msgstr ""
"\n"
-" -h, --help Wyświetla tę pomoc\n"
-" --version Wyświetla wersję\n"
-"Jeśli nie podano polecenia, to program pacmd zostaje uruchomiony w trybie "
-"interaktywnym.\n"
+" -h, --help Паказаць гэтую даведку\n"
+" --version Паказаць версію\n"
+"Калі каманда не азначана, pacmd запусціцца ў інтэрактыўным рэжыме.\n"
#: ../src/utils/pacmd.c:128
#, c-format
@@ -2239,19 +2223,17 @@ msgid ""
"Linked with libpulse %s\n"
msgstr ""
"pacmd %s\n"
-"Skompilowane za pomocą libpulse %s\n"
-"Skonsolidowane za pomocą libpulse %s\n"
+"Скампілявана з libpulse %s\n"
+"Звязана з libpulse %s\n"
#: ../src/utils/pacmd.c:142
msgid "No PulseAudio daemon running, or not running as session daemon."
-msgstr ""
-"Usługa PulseAudio nie jest uruchomiona, lub nie jest uruchomiona jako usługa "
-"sesji."
+msgstr "Няма запушчанага сэрвісу PulseAudio ці ён не працуе як сесійны сэрвіс."
#: ../src/utils/pacmd.c:147
#, c-format
msgid "socket(PF_UNIX, SOCK_STREAM, 0): %s"
-msgstr "gniazdo(PF_UNIX, SOCK_STREAM, 0): %s"
+msgstr "socket(PF_UNIX, SOCK_STREAM, 0): %s"
#: ../src/utils/pacmd.c:164
#, c-format
@@ -2260,11 +2242,11 @@ msgstr "connect(): %s"
#: ../src/utils/pacmd.c:172
msgid "Failed to kill PulseAudio daemon."
-msgstr "Zniszczenie usługi PulseAudio się nie powiodło."
+msgstr "Не атрымалася знішчыць фонавы сэрвіс PulseAudio."
#: ../src/utils/pacmd.c:180
msgid "Daemon not responding."
-msgstr "Usługa nie odpowiada."
+msgstr "Фонавы сэрвіс не адказвае."
#: ../src/utils/pacmd.c:212 ../src/utils/pacmd.c:321 ../src/utils/pacmd.c:339
#, c-format
@@ -2274,7 +2256,7 @@ msgstr "write(): %s"
#: ../src/utils/pacmd.c:268
#, c-format
msgid "poll(): %s"
-msgstr "poll(): %s"
+msgstr "read(): %s"
#: ../src/utils/pacmd.c:279 ../src/utils/pacmd.c:299
#, c-format
@@ -2284,29 +2266,30 @@ msgstr "read(): %s"
#: ../src/utils/pactl.c:164
#, c-format
msgid "Failed to get statistics: %s"
-msgstr "Uzyskanie statystyk się nie powiodło: %s"
+msgstr "Не атрымалася атрымаць статыстыку: %s"
#: ../src/utils/pactl.c:170
#, c-format
msgid "Currently in use: %u blocks containing %s bytes total.\n"
-msgstr "Obecnie używane: %u bloków zawierających razem %s bajtów.\n"
+msgstr ""
+"Выкарыстоўваецца ў дадзены момант: %u блокаў агульным памерам %s байтаў.\n"
#: ../src/utils/pactl.c:173
#, c-format
msgid "Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
msgstr ""
-"Przydzielono podczas całego czasu uruchomienia: %u bloków zawierających "
-"razem %s bajtów.\n"
+"Выдзелена на працягу ўсяго тэрміну службы: %u блокаў агульным памерам %s"
+" байтаў.\n"
#: ../src/utils/pactl.c:176
#, c-format
msgid "Sample cache size: %s\n"
-msgstr "Rozmiar pamięci podręcznej próbek: %s\n"
+msgstr "Памер кэшу сэмплаў: %s\n"
#: ../src/utils/pactl.c:185
#, c-format
msgid "Failed to get server information: %s"
-msgstr "Uzyskanie informacji o serwerze się nie powiodło: %s"
+msgstr "Не атрымалася атрымаць інфармацыю аб серверы: %s"
#: ../src/utils/pactl.c:190
#, c-format
@@ -2318,12 +2301,12 @@ msgid ""
"Client Index: %u\n"
"Tile Size: %zu\n"
msgstr ""
-"Ciąg serwera: %s\n"
-"Wersja protokołu biblioteki: %u\n"
-"Wersja protokołu serwera: %u\n"
-"Czy jest lokalny: %s\n"
-"Indeks klienta: %u\n"
-"Rozmiar kafla: %zu\n"
+"Серверны радок: %s\n"
+"Версія пратакола бібліятэкі: %u\n"
+"Версія пратакола сервера: %u\n"
+"Ці лакальны: %s\n"
+"Нумар кліента: %u\n"
+"Памер блока: %zu\n"
#: ../src/utils/pactl.c:206
#, c-format
@@ -2338,20 +2321,20 @@ msgid ""
"Default Source: %s\n"
"Cookie: %04x:%04x\n"
msgstr ""
-"Nazwa użytkownika: %s\n"
-"Nazwa komputera: %s\n"
-"Nazwa serwera: %s\n"
-"Wersja serwera: %s\n"
-"Domyślne określenie próbki: %s\n"
-"Domyślna mapa kanałów: %s\n"
-"Domyślny odpływ: %s\n"
-"Domyślne źródło: %s\n"
-"Ciasteczko: %04x:%04x\n"
+"Імя карыстальніка: %s\n"
+"Назва вузла: %s\n"
+"Назва сервера: %s\n"
+"Версія сервера: %s\n"
+"Агаданая спецыфікацыя сэмлаў: %s\n"
+"Агаданая схема каналаў: %s\n"
+"Агаданы прыёмнік: %s\n"
+"Агаданая крыніца: %s\n"
+"Cookie: %04x:%04x\n"
#: ../src/utils/pactl.c:255 ../src/utils/pactl.c:900 ../src/utils/pactl.c:978
#, c-format
msgid "Failed to get sink information: %s"
-msgstr "Uzyskanie informacji o odpływie się nie powiodło: %s"
+msgstr "Не атрымалася атрымаць інфармацыю аб прыёмніку: %s"
#: ../src/utils/pactl.c:281
#, c-format
@@ -2374,43 +2357,43 @@ msgid ""
"\tProperties:\n"
"\t\t%s\n"
msgstr ""
-"Odpływ #%u\n"
-"\tStan: %s\n"
-"\tNazwa: %s\n"
-"\tOpis: %s\n"
-"\tSterownik: %s\n"
-"\tOkreślenie próbki: %s\n"
-"\tMapa kanałów: %s\n"
-"\tWłaściciel modułu: %u\n"
-"\tWyciszenie: %s\n"
-"\tPoziom głośności: %s\n"
-"\t balans %0.2f\n"
-"\tGłośność podstawowa: %s\n"
-"\tŹródło monitora: %s\n"
-"\tOpóźnienie: %0.0f usekundy, skonfigurowano %0.0f usekundy\n"
-"\tFlagi: %s%s%s%s%s%s%s\n"
-"\tWłaściwości:\n"
+"Прыёмнік № %u\n"
+"\tСтан: %s\n"
+"\tНазва: %s\n"
+"\tАпісанне: %s\n"
+"\tДрайвер: %s\n"
+"\tСпецыфікацыя сэмлаў: %s\n"
+"\tСхема каналаў: %s\n"
+"\tМодуль-уладальнік: %u\n"
+"\tАбязгучаны: %s\n"
+"\tГучнасць: %s\n"
+"\t баланс %0.2f\n"
+"\tБазавая гучнасць: %s\n"
+"\tМаніторная крыніца: %s\n"
+"\tЗатрымка: %0.0f мкс, сканфігуравана %0.0f мкс\n"
+"\tФлагі: %s%s%s%s%s%s%s\n"
+"\tУласцівасці:\n"
"\t\t%s\n"
#: ../src/utils/pactl.c:325 ../src/utils/pactl.c:431 ../src/utils/pactl.c:592
#, c-format
msgid "\tPorts:\n"
-msgstr "\tPorty:\n"
+msgstr "\tПарты:\n"
#: ../src/utils/pactl.c:332 ../src/utils/pactl.c:438
#, c-format
msgid "\tActive Port: %s\n"
-msgstr "\tAktywny port: %s\n"
+msgstr "\tАктыўны порт: %s\n"
#: ../src/utils/pactl.c:338 ../src/utils/pactl.c:444
#, c-format
msgid "\tFormats:\n"
-msgstr "\tFormaty:\n"
+msgstr "\tФарматы:\n"
#: ../src/utils/pactl.c:362 ../src/utils/pactl.c:920 ../src/utils/pactl.c:993
#, c-format
msgid "Failed to get source information: %s"
-msgstr "Uzyskanie informacji o źródle się nie powiodło: %s"
+msgstr "Не атрымалася атрымаць інфармацыю аб крыніцы: %s"
#: ../src/utils/pactl.c:388
#, c-format
@@ -2433,22 +2416,22 @@ msgid ""
"\tProperties:\n"
"\t\t%s\n"
msgstr ""
-"Źródło #%u\n"
-"\tStan: %s\n"
-"\tNazwa: %s\n"
-"\tOpis: %s\n"
-"\tSterownik: %s\n"
-"\tOkreślenie próbki: %s\n"
-"\tMapa kanałów: %s\n"
-"\tWłaściciel modułu: %u\n"
-"\tWyciszenie: %s\n"
-"\tPoziom głośności: %s\n"
-"\t balans %0.2f\n"
-"\tGłośność podstawowa: %s\n"
-"\tMonitor odpływu: %s\n"
-"\tOpóźnienie: %0.0f usekundy, skonfigurowano %0.0f usekundy\n"
-"\tFlagi: %s%s%s%s%s%s\n"
-"\tWłaściwości:\n"
+"Крыніца № %u\n"
+"\tСтан: %s\n"
+"\tНазва: %s\n"
+"\tАпісанне: %s\n"
+"\tДрайвер: %s\n"
+"\tСпецыфікацыя сэмплаў: %s\n"
+"\tСхема каналаў: %s\n"
+"\tМодуль-уладальнік: %u\n"
+"\tАбязгучана: %s\n"
+"\tГучнасць: %s\n"
+"\t баланс %0.2f\n"
+"\tБазавая гучнасць: %s\n"
+"\tЦі манітор прыёмніка: %s\n"
+"\tЗатрымка: %0.0f мкс, сканфігуравана %0.0f мкс\n"
+"\tФлагі: %s%s%s%s%s%s\n"
+"\tУласцівасці:\n"
"\t\t%s\n"
#: ../src/utils/pactl.c:416 ../src/utils/pactl.c:486 ../src/utils/pactl.c:529
@@ -2457,12 +2440,12 @@ msgstr ""
#: ../src/utils/pactl.c:751 ../src/utils/pactl.c:802 ../src/utils/pactl.c:803
#: ../src/utils/pactl.c:809
msgid "n/a"
-msgstr "nie dotyczy"
+msgstr "н/д"
#: ../src/utils/pactl.c:455 ../src/utils/pactl.c:859
#, c-format
msgid "Failed to get module information: %s"
-msgstr "Uzyskanie informacji o module się nie powiodło: %s"
+msgstr "Не атрымалася атрымаць інфармацыю аб модулі: %s"
#: ../src/utils/pactl.c:478
#, c-format
@@ -2474,17 +2457,17 @@ msgid ""
"\tProperties:\n"
"\t\t%s\n"
msgstr ""
-"Moduł #%u\n"
-"\tNazwa: %s\n"
-"\tParametr: %s\n"
-"\tLicznik użycia: %s\n"
-"\tWłaściwości:\n"
+"Модуль № %u\n"
+"\tНазва: %s\n"
+"\tАргументы: %s\n"
+"\tЛічыльнік выкарыстання: %s\n"
+"\tУласцівасці:\n"
"\t\t%s\n"
#: ../src/utils/pactl.c:497
#, c-format
msgid "Failed to get client information: %s"
-msgstr "Uzyskanie informacji o kliencie się nie powiodło: %s"
+msgstr "Не атрымалася атрымаць інфармацыю аб кліенце: %s"
#: ../src/utils/pactl.c:523
#, c-format
@@ -2495,16 +2478,16 @@ msgid ""
"\tProperties:\n"
"\t\t%s\n"
msgstr ""
-"Klient #%u\n"
-"\tSterownik: %s\n"
-"\tWłaściciel modułu: %s\n"
-"\tWłaściwości:\n"
+"Кліент № %u\n"
+"\tДрайвер: %s\n"
+"\tМодуль-уладальнік: %s\n"
+"\tУласцівасці:\n"
"\t\t%s\n"
#: ../src/utils/pactl.c:540
#, c-format
msgid "Failed to get card information: %s"
-msgstr "Uzyskanie informacji o karcie się nie powiodło: %s"
+msgstr "Не атрымалася атрымаць інфармацыю аб картцы: %s"
#: ../src/utils/pactl.c:563
#, c-format
@@ -2516,27 +2499,27 @@ msgid ""
"\tProperties:\n"
"\t\t%s\n"
msgstr ""
-"Karta #%u\n"
-"\tNazwa: %s\n"
-"\tSterownik: %s\n"
-"\tWłaściciel modułu: %s\n"
-"\tWłaściwości:\n"
+"Картка № %u\n"
+"\tНазва: %s\n"
+"\tДрайвер: %s\n"
+"\tМодуль-уладальнік: %s\n"
+"\tУласцівасці:\n"
"\t\t%s\n"
#: ../src/utils/pactl.c:579
#, c-format
msgid "\tProfiles:\n"
-msgstr "\tProfile:\n"
+msgstr "\tПрофілі:\n"
#: ../src/utils/pactl.c:581
#, c-format
msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
-msgstr "\t\t%s: %s (odpływy: %u, źródła: %u, priorytet: %u, dostępne: %s)\n"
+msgstr "\t\t%s: %s (прыёмнікаў: %u, крыніц: %u, прыярытэт: %u, даступны: %s)\n"
#: ../src/utils/pactl.c:586
#, c-format
msgid "\tActive Profile: %s\n"
-msgstr "\tAktywny profil: %s\n"
+msgstr "\tАктыўны профіль: %s\n"
#: ../src/utils/pactl.c:600
#, c-format
@@ -2544,18 +2527,18 @@ msgid ""
"\t\t\tProperties:\n"
"\t\t\t\t%s\n"
msgstr ""
-"\t\t\tWłaściwości:\n"
+"\t\t\tУласцівасці:\n"
"\t\t\t\t%s\n"
#: ../src/utils/pactl.c:605
#, c-format
msgid "\t\t\tPart of profile(s): %s"
-msgstr "\t\t\tCzęść profilu: %s"
+msgstr "\t\t\tЧастка профілю(яў): %s"
#: ../src/utils/pactl.c:622 ../src/utils/pactl.c:940 ../src/utils/pactl.c:1008
#, c-format
msgid "Failed to get sink input information: %s"
-msgstr "Uzyskanie informacji o odpływie wejścia się nie powiodło: %s"
+msgstr "Не атрымалася атрымаць інфармацыю аб уваходзе прыёмніка: %s"
#: ../src/utils/pactl.c:651
#, c-format
@@ -2578,28 +2561,28 @@ msgid ""
"\tProperties:\n"
"\t\t%s\n"
msgstr ""
-"Odpływ wejścia #%u\n"
-"\tSterownik: %s\n"
-"\tWłaściciel modułu: %s\n"
-"\tKlient: %s\n"
-"\tOdpływ: %u\n"
-"\tOkreślenie próbki: %s\n"
-"\tMapa kanałów: %s\n"
-"\tFormat: %s\n"
-"\tZakorkowane: %s\n"
-"\tWyciszenie: %s\n"
-"\tPoziom głośności: %s\n"
-"\t balans %0.2f\n"
-"\tOpóźnienie bufora: %0.0f usekundy\n"
-"\tOpóźnienie odpływu: %0.0f usekundy\n"
-"\tMetoda resamplingu: %s\n"
-"\tWłaściwości:\n"
+"Уваход прыёмніка № %u\n"
+"\tДрайвер: %s\n"
+"\tМодуль-уладальнік: %s\n"
+"\tКліент: %s\n"
+"\tПрыёмнік: %u\n"
+"\tСпецыфікацыя сэмплаў: %s\n"
+"\tСхема каналаў: %s\n"
+"\tФармат: %s\n"
+"\tЗакаркаваны: %s\n"
+"\tАбязгучаны: %s\n"
+"\tГучнасць: %s\n"
+"\t баланс %0.2f\n"
+"\tЗатрымка буфера: %0.0f мкс\n"
+"\tЗатрымка прыёмніка: %0.0f мкс\n"
+"\tМетад перадыскрэтызацыі: %s\n"
+"\tУласцівасці:\n"
"\t\t%s\n"
#: ../src/utils/pactl.c:692 ../src/utils/pactl.c:960 ../src/utils/pactl.c:1023
#, c-format
msgid "Failed to get source output information: %s"
-msgstr "Uzyskanie informacji o wyjściu źródła się nie powiodło: %s"
+msgstr "Не атрымалася атрымаць інфармацыю аб выхадзе крыніцы: %s"
#: ../src/utils/pactl.c:721
#, c-format
@@ -2622,28 +2605,28 @@ msgid ""
"\tProperties:\n"
"\t\t%s\n"
msgstr ""
-"Odpływ wejścia #%u\n"
-"\tSterownik: %s\n"
-"\tWłaściciel modułu: %s\n"
-"\tKlient: %s\n"
-"\tOdpływ: %u\n"
-"\tOkreślenie próbki: %s\n"
-"\tMapa kanałów: %s\n"
-"\tFormat: %s\n"
-"\tZakorkowane: %s\n"
-"\tWyciszenie: %s\n"
-"\tPoziom głośności: %s\n"
-"\t balans %0.2f\n"
-"\tOpóźnienie bufora: %0.0f usekundy\n"
-"\tOpóźnienie odpływu: %0.0f usekundy\n"
-"\tMetoda resamplingu: %s\n"
-"\tWłaściwości:\n"
+"Выхад крыніцы № %u\n"
+"\tДрайвер: %s\n"
+"\tМодуль-уладальнік: %s\n"
+"\tКліент: %s\n"
+"\tКрыніца: %u\n"
+"\tСпецыфікацыя сэмплаў: %s\n"
+"\tСхема каналаў: %s\n"
+"\tФармат: %s\n"
+"\tЗакаркаваны: %s\n"
+"\tАбязгучаны: %s\n"
+"\tГучнасць: %s\n"
+"\t баланс %0.2f\n"
+"\tЗатрымка буфера: %0.0f мкс\n"
+"\tЗатрымка крыніцы: %0.0f мкс\n"
+"\tМетад перадыскрэтызацыі: %s\n"
+"\tУласцівасці:\n"
"\t\t%s\n"
#: ../src/utils/pactl.c:762
#, c-format
msgid "Failed to get sample information: %s"
-msgstr "Uzyskanie informacji o próbce się nie powiodło: %s"
+msgstr "Не атрымалася атрымаць інфармацыю аб сэмпле: %s"
#: ../src/utils/pactl.c:789
#, c-format
@@ -2661,29 +2644,28 @@ msgid ""
"\tProperties:\n"
"\t\t%s\n"
msgstr ""
-"Próbka #%u\n"
-"\tNazwa: %s\n"
-"\tOkreślenie próbki: %s\n"
-"\tMapa kanałów: %s\n"
-"\tPoziom głośności: %s\n"
-"\t balans %0.2f\n"
-"\tCzas trwania: %0.1fs\n"
-"\tRozmiar: %s\n"
-"\tLazy: %s\n"
-"\tNazwa pliku: %s\n"
-"\tWłaściwości:\n"
+"Сэмпл № %u\n"
+"\tНазва: %s\n"
+"\tСпецыфікацыя: %s\n"
+"\tСхема каналаў: %s\n"
+"\tГучнасць: %s\n"
+"\t баланс %0.2f\n"
+"\tПрацягласць: %0.1fs\n"
+"\tПамер: %s\n"
+"\tЛянівы: %s\n"
+"\tНазва файла: %s\n"
+"\tУласцівасці:\n"
"\t\t%s\n"
#: ../src/utils/pactl.c:817 ../src/utils/pactl.c:827
#, c-format
msgid "Failure: %s"
-msgstr "Niepowodzenie: %s"
+msgstr "Няўдача: %s"
#: ../src/utils/pactl.c:866
-#, c-format
+#, fuzzy, c-format
msgid "Failed to unload module: Module %s not loaded"
-msgstr ""
-"Usunięcie modułu z pamięci się nie powiodło: moduł %s nie jest wczytany"
+msgstr "Не атрымалася выгрузіць модуль: модуль не загружаны"
#: ../src/utils/pactl.c:884
#, c-format
@@ -2691,99 +2673,99 @@ msgid ""
"Failed to set volume: You tried to set volumes for %d channels, whereas "
"channel/s supported = %d\n"
msgstr ""
-"Uzyskanie głośności się nie powiodło: próbowano ustawić głośność dla %d "
-"kanałów, kiedy obsługiwane kanały = %d\n"
+"Не атрымалася задаць гучнасць: вы спрабуеце задаць гучнасць для %d каналаў,"
+" але агульная колькасць каналаў %d\n"
#: ../src/utils/pactl.c:1050
#, c-format
msgid "Failed to set format: invalid format string %s"
-msgstr "Ustawienie formatu się nie powiodło: nieprawidłowy ciąg formatu %s"
+msgstr "Не атрымалася задаць фармат: некарэктны фармат «%s»"
#: ../src/utils/pactl.c:1093
#, c-format
msgid "Failed to upload sample: %s"
-msgstr "Wysłanie próbki się nie powiodło: %s"
+msgstr "Не атрымалася выгрузіць сэмпл: %s"
#: ../src/utils/pactl.c:1110
msgid "Premature end of file"
-msgstr "Przedwczesny koniec pliku"
+msgstr "Заўчасны канец файла"
#: ../src/utils/pactl.c:1130
msgid "new"
-msgstr "nowy"
+msgstr "зʼяўленне"
#: ../src/utils/pactl.c:1133
msgid "change"
-msgstr "zmień"
+msgstr "змяненне"
#: ../src/utils/pactl.c:1136
msgid "remove"
-msgstr "usuń"
+msgstr "выдаленне"
#: ../src/utils/pactl.c:1139 ../src/utils/pactl.c:1174
msgid "unknown"
-msgstr "nieznany"
+msgstr "невядомая"
#: ../src/utils/pactl.c:1147
msgid "sink"
-msgstr "odpływ"
+msgstr "прыёмніка"
#: ../src/utils/pactl.c:1150
msgid "source"
-msgstr "źródło"
+msgstr "крыніцы"
#: ../src/utils/pactl.c:1153
msgid "sink-input"
-msgstr "wejście-odpływu"
+msgstr "уваходу прыёмніка"
#: ../src/utils/pactl.c:1156
msgid "source-output"
-msgstr "wyjście-źródła"
+msgstr "выхаду крыніцы"
#: ../src/utils/pactl.c:1159
msgid "module"
-msgstr "moduł"
+msgstr "модуля"
#: ../src/utils/pactl.c:1162
msgid "client"
-msgstr "klient"
+msgstr "кліента"
#: ../src/utils/pactl.c:1165
msgid "sample-cache"
-msgstr "bufor-próbki"
+msgstr "кэша сэмплаў"
#: ../src/utils/pactl.c:1168
msgid "server"
-msgstr "serwer"
+msgstr "сервера"
#: ../src/utils/pactl.c:1171
msgid "card"
-msgstr "karta"
+msgstr "карткі"
#: ../src/utils/pactl.c:1180
#, c-format
msgid "Event '%s' on %s #%u\n"
-msgstr "Zdarzenie „%s” w %s #%u\n"
+msgstr "Падзея %s %s № %u\n"
#: ../src/utils/pactl.c:1452
msgid "Got SIGINT, exiting."
-msgstr "Otrzymano SIGINT, kończenie działania."
+msgstr "Атрыманы сігнал SIGINT — выхад."
#: ../src/utils/pactl.c:1485
msgid "Invalid volume specification"
-msgstr "Nieprawidłowe określenie głośności"
+msgstr "Некарэктная гучнасць"
#: ../src/utils/pactl.c:1508
msgid "Volume outside permissible range.\n"
-msgstr "Głośność jest poza dozwolonym zakresem.\n"
+msgstr "Гучнасць па-за дапушчальны дыяпазоне.\n"
#: ../src/utils/pactl.c:1521
msgid "Invalid number of volume specifications.\n"
-msgstr "Nieprawidłowa liczba określeń głośności.\n"
+msgstr "Некарэктная колькасць значэнняў гучнасці.\n"
#: ../src/utils/pactl.c:1533
msgid "Inconsistent volume specification.\n"
-msgstr "Niespójne określenie głośności.\n"
+msgstr "Супярэчлівае значэнне гучнасці.\n"
#: ../src/utils/pactl.c:1563 ../src/utils/pactl.c:1564
#: ../src/utils/pactl.c:1565 ../src/utils/pactl.c:1566
@@ -2797,39 +2779,39 @@ msgstr "Niespójne określenie głośności.\n"
#: ../src/utils/pactl.c:1581 ../src/utils/pactl.c:1582
#: ../src/utils/pactl.c:1583
msgid "[options]"
-msgstr "[opcje]"
+msgstr "[параметры]"
#: ../src/utils/pactl.c:1565
msgid "[TYPE]"
-msgstr "[TYP]"
+msgstr "[ТЫП]"
#: ../src/utils/pactl.c:1567
msgid "FILENAME [NAME]"
-msgstr "NAZWA-PLIKU [NAZWA]"
+msgstr "НАЗВА_ФАЙЛА [НАЗВА]"
#: ../src/utils/pactl.c:1568
msgid "NAME [SINK]"
-msgstr "NAZWA [ODPŁYW]"
+msgstr "НАЗВА [ПРЫЁМНІК]"
#: ../src/utils/pactl.c:1577
msgid "NAME|#N VOLUME [VOLUME ...]"
-msgstr "NAZWA|#N GŁOŚNOŚĆ [GŁOŚNOŚĆ…]"
+msgstr "НАЗВА|НУМАР ГУЧНАСЦЬ [ГУЧНАСЦЬ …]"
#: ../src/utils/pactl.c:1578
msgid "#N VOLUME [VOLUME ...]"
-msgstr "#N GŁOŚNOŚĆ [GŁOŚNOŚĆ…]"
+msgstr "НУМАР ГУЧНАСЦЬ [ГУЧНАСЦЬ …]"
#: ../src/utils/pactl.c:1579
msgid "NAME|#N 1|0|toggle"
-msgstr "NAZWA|#N 1|0|toggle"
+msgstr "НАЗВА|НУМАР 1|0|toggle"
#: ../src/utils/pactl.c:1580
msgid "#N 1|0|toggle"
-msgstr "#N 1|0|toggle"
+msgstr "НУМАР 1|0|toggle"
#: ../src/utils/pactl.c:1581
msgid "#N FORMATS"
-msgstr "#N FORMATY"
+msgstr "НУМАР ФАРМАТЫ"
#: ../src/utils/pactl.c:1584
#, c-format
@@ -2839,8 +2821,9 @@ msgid ""
"can be used to specify the default sink, source and monitor.\n"
msgstr ""
"\n"
-"Specjalne nazwy @DEFAULT_SINK@, @DEFAULT_SOURCE@ i @DEFAULT_MONITOR@\n"
-"mogą być używane do podania domyślnego odpływu, źródła i monitora.\n"
+"Адмысловыя назвы: @DEFAULT_SINK@, @DEFAULT_SOURCE@ і @DEFAULT_MONITOR@ —\n"
+"могуць быць скарыстаны для ўказання агаданага прыёмніка, крыніцы ці"
+" манітора.\n"
#: ../src/utils/pactl.c:1587
#, c-format
@@ -2855,11 +2838,11 @@ msgid ""
"server\n"
msgstr ""
"\n"
-" -h, --help Wyświetla tę pomoc\n"
-" --version Wyświetla wersję\n"
+" -h, --help Паказаць гэтую даведку\n"
+" --version Паказаць версію\n"
"\n"
-" -s, --server=SERWER Nazwa serwera do połączenia się\n"
-" -n, --client-name=NAZWA Jak nazwać tego klienta w serwerze\n"
+" -s, --server=СЕРВЕР Назва сервера для злучэння\n"
+" -n, --client-name=НАЗВА Назва гэтага кліента на серверы\n"
#: ../src/utils/pactl.c:1628
#, c-format
@@ -2869,170 +2852,172 @@ msgid ""
"Linked with libpulse %s\n"
msgstr ""
"pactl %s\n"
-"Skompilowane za pomocą libpulse %s\n"
-"Skonsolidowane za pomocą libpulse %s\n"
+"Скампілявана з libpulse %s\n"
+"Звязана з libpulse %s\n"
#: ../src/utils/pactl.c:1684
#, c-format
msgid "Specify nothing, or one of: %s"
-msgstr "Należy podać nic lub jedno z: %s"
+msgstr "Нічога не задавайце ці адно з: %s"
#: ../src/utils/pactl.c:1694
msgid "Please specify a sample file to load"
-msgstr "Proszę podać plik próbki do wczytania"
+msgstr "Калі ласка, задайце файл сэмплаў для загрузкі"
#: ../src/utils/pactl.c:1707
msgid "Failed to open sound file."
-msgstr "Otwarcie pliku dźwiękowego się nie powiodło."
+msgstr "Не атрымалася адкрыць аўдыяфайл."
#: ../src/utils/pactl.c:1719
msgid "Warning: Failed to determine sample specification from file."
-msgstr "Ostrzeżenie: ustalenie określenia próbki z pliku się nie powiodło."
+msgstr "Папярэджанне: Не атрымалася вызначыць спецыфікацыю сэмплаў з файла."
#: ../src/utils/pactl.c:1729
msgid "You have to specify a sample name to play"
-msgstr "Należy podać nazwę próbki do odtworzenia"
+msgstr "Неабходна задаць назву сэмпла для прайгравання"
#: ../src/utils/pactl.c:1741
msgid "You have to specify a sample name to remove"
-msgstr "Należy podać nazwę próbki do usunięcia"
+msgstr "Неабходна задаць назву сэмпла для выдалення"
#: ../src/utils/pactl.c:1750
msgid "You have to specify a sink input index and a sink"
-msgstr "Należy podać indeks odpływu wejścia i odpływ"
+msgstr "Неабходна задаць нумар уваходу прыёмніка і прыёмнік"
#: ../src/utils/pactl.c:1760
msgid "You have to specify a source output index and a source"
-msgstr "Należy podać indeks źródła wyjścia i źródło"
+msgstr "Неабходна задаць нумар выхаду крыніцы і крыніцу"
#: ../src/utils/pactl.c:1775
msgid "You have to specify a module name and arguments."
-msgstr "Należy podać nazwę modułu i parametry."
+msgstr "Неабходна задаць назву модуля і аргументы."
#: ../src/utils/pactl.c:1795
msgid "You have to specify a module index or name"
-msgstr "Należy podać indeks lub nazwę modułu"
+msgstr "Неабходна задаць нумар модуля ці яго назву"
#: ../src/utils/pactl.c:1808
msgid ""
"You may not specify more than one sink. You have to specify a boolean value."
msgstr ""
-"Nie można podać więcej niż jednego odpływu. Należy podać wartość logiczną."
+"Вы не можаце задаць больш аднаго прыёмніка. Неабходна задаць булева значэнне."
#: ../src/utils/pactl.c:1813 ../src/utils/pactl.c:1833
msgid "Invalid suspend specification."
-msgstr "Nieprawidłowe określenie uśpienia."
+msgstr "Некарэктная спецыфікацыя прыпынення."
#: ../src/utils/pactl.c:1828
msgid ""
"You may not specify more than one source. You have to specify a boolean "
"value."
msgstr ""
-"Nie można podać więcej niż jednego źródła. Należy podać wartość logiczną."
+"Вы не можаце задаць больш адной крыніцы. Неабходна задаць булева значэнне."
#: ../src/utils/pactl.c:1845
msgid "You have to specify a card name/index and a profile name"
-msgstr "Należy podać nazwę karty/indeks i nazwę profilu"
+msgstr "Неабходна задаць нумар ці назву карткі і назву профілю"
#: ../src/utils/pactl.c:1856
msgid "You have to specify a sink name/index and a port name"
-msgstr "Należy podać nazwę odpływu/indeks i nazwę portu"
+msgstr "Неабходна задаць нумар ці назву прыёмніка і назву порта"
#: ../src/utils/pactl.c:1867
msgid "You have to specify a sink name"
-msgstr "Należy podać nazwę odpływu"
+msgstr "Неабходна задаць назву прыёмніка"
#: ../src/utils/pactl.c:1877
msgid "You have to specify a source name/index and a port name"
-msgstr "Należy podać nazwę źródła/indeks i nazwę portu"
+msgstr "Неабходна задаць нумар ці назву крыніцы і назву порта"
#: ../src/utils/pactl.c:1888
msgid "You have to specify a source name"
-msgstr "Należy podać nazwę źródła"
+msgstr "Неабходна задаць назву крыніцы"
#: ../src/utils/pactl.c:1898
msgid "You have to specify a sink name/index and a volume"
-msgstr "Należy podać nazwę odpływu/indeks i głośność"
+msgstr "Неабходна задаць нумар ці назву прыёмніка і гучнасць"
#: ../src/utils/pactl.c:1911
msgid "You have to specify a source name/index and a volume"
-msgstr "Należy podać nazwę źródła/indeks i głośność"
+msgstr "Неабходна задаць нумар ці назву крыніцы і гучнасць"
#: ../src/utils/pactl.c:1924
msgid "You have to specify a sink input index and a volume"
-msgstr "Należy podać indeks odpływu wejścia i głośność"
+msgstr "Неабходна задаць нумар ўваходу прыёмніка і гучнасць"
#: ../src/utils/pactl.c:1929
msgid "Invalid sink input index"
-msgstr "Nieprawidłowy indeks odpływ wejścia"
+msgstr "Некарэктны нумар уваходу прыёмніка"
#: ../src/utils/pactl.c:1940
msgid "You have to specify a source output index and a volume"
-msgstr "Należy podać indeks źródła wyjścia i głośność"
+msgstr "Неабходна задаць нумар выхаду крыніцы і гучнасць"
#: ../src/utils/pactl.c:1945
msgid "Invalid source output index"
-msgstr "Nieprawidłowy indeks wejścia źródła"
+msgstr "Некарэктны нумар выхаду крыніцы"
#: ../src/utils/pactl.c:1956
msgid ""
"You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
msgstr ""
-"Należy podać nazwę odpływu/indeks i działanie wyciszenia (0, 1 lub „toggle”)"
+"Неабходна задаць нумар ці назву прыёмніка і дзеянне абязгучвання (0 —"
+" адключыць, 1 — уключыць, toggle — пераключыць)"
#: ../src/utils/pactl.c:1961 ../src/utils/pactl.c:1976
#: ../src/utils/pactl.c:1996 ../src/utils/pactl.c:2014
msgid "Invalid mute specification"
-msgstr "Nieprawidłowe określenie wyciszenia"
+msgstr "Некарэктная спецыфікацыя абязгучвання"
#: ../src/utils/pactl.c:1971
msgid ""
"You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
msgstr ""
-"Należy podać nazwę źródła/indeks i działanie wyciszenia (0, 1 lub „toggle”)"
+"Неабходна задаць нумар ці назву крыніцы і дзеянне абязгучвання (0 —"
+" адключыць, 1 — уключыць, toggle — пераключыць)"
#: ../src/utils/pactl.c:1986
msgid ""
"You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
msgstr ""
-"Należy podać indeks odpływu wejścia i działanie wyciszenia (0, 1 lub "
-"„toggle”)"
+"Неабходна задаць нумар уваходу прыёмніка і дзеянне абязгучвання (0 —"
+" адключыць, 1 — уключыць, toggle — пераключыць)"
#: ../src/utils/pactl.c:1991
msgid "Invalid sink input index specification"
-msgstr "Nieprawidłowe określenie indeksu odpływu wejścia"
+msgstr "Некарэктны нумар уваходу прыёмніка"
#: ../src/utils/pactl.c:2004
msgid ""
"You have to specify a source output index and a mute action (0, 1, or "
"'toggle')"
msgstr ""
-"Należy podać nazwę indeks wyjścia źródła i działanie wyciszenia (0, 1 lub "
-"„toggle”)"
+"Неабходна задаць нумар выхаду крыніцы і дзеянне абязгучвання (0 — адключыць,"
+" 1 — уключыць, toggle — пераключыць)"
#: ../src/utils/pactl.c:2009
msgid "Invalid source output index specification"
-msgstr "Nieprawidłowe określenie indeksu wyjścia źródła"
+msgstr "Некарэктны нумар выхаду крыніцы"
#: ../src/utils/pactl.c:2026
msgid ""
"You have to specify a sink index and a semicolon-separated list of supported "
"formats"
msgstr ""
-"Należy podać nazwę indeks odpływu listę obsługiwanych formatów oddzielonych "
-"średnikami"
+"Неабходна задаць нумар прыёмніка і спіс фарматаў, падзеленых кропкамі з"
+" коскамі"
#: ../src/utils/pactl.c:2038
msgid "You have to specify a card name/index, a port name and a latency offset"
-msgstr "Należy podać nazwę karty/indeks, nazwę portu i offset opóźnienia"
+msgstr "Неабходна задаць нумар ці назву карткі, назву порту і зрух затрымкі."
#: ../src/utils/pactl.c:2045
msgid "Could not parse latency offset"
-msgstr "Nie można przetworzyć offsetu opóźnienia"
+msgstr "Немагчыма разабраць зрух затрымкі"
#: ../src/utils/pactl.c:2057
msgid "No valid command specified."
-msgstr "Nie podano prawidłowego polecenia."
+msgstr "Зададзена некарэктная каманда."
#: ../src/utils/pasuspender.c:79
#, c-format
@@ -3047,33 +3032,32 @@ msgstr "execvp(): %s\n"
#: ../src/utils/pasuspender.c:111
#, c-format
msgid "Failure to resume: %s\n"
-msgstr "Wznowienie się nie powiodło: %s\n"
+msgstr "Не ўдалося ўзнавіць: %s\n"
#: ../src/utils/pasuspender.c:145
#, c-format
msgid "Failure to suspend: %s\n"
-msgstr "Wstrzymanie się nie powiodło: %s\n"
+msgstr "Не ўдалося прыпыніць: %s\n"
#: ../src/utils/pasuspender.c:170
#, c-format
msgid "WARNING: Sound server is not local, not suspending.\n"
-msgstr ""
-"OSTRZEŻENIE: serwer dźwięku nie jest lokalny, nie zostanie wstrzymany.\n"
+msgstr "Папярэджанне: Нелакальны гукавы сервер не прыпыняецца.\n"
#: ../src/utils/pasuspender.c:183
#, c-format
msgid "Connection failure: %s\n"
-msgstr "Połączenie się nie powiodło: %s\n"
+msgstr "Злучэнне не ўдалося: %s\n"
#: ../src/utils/pasuspender.c:201
#, c-format
msgid "Got SIGINT, exiting.\n"
-msgstr "Otrzymano SIGINT, kończenie działania.\n"
+msgstr "Атрыманы сігнал SIGINT — выхад.\n"
#: ../src/utils/pasuspender.c:219
#, c-format
msgid "WARNING: Child process terminated by signal %u\n"
-msgstr "OSTRZEŻENIE: proces potomny został zniszczony przez sygnał %u\n"
+msgstr "Папярэджанне: даччын працэс завяршыўся па сігналу %u\n"
#: ../src/utils/pasuspender.c:228
#, c-format
@@ -3086,11 +3070,11 @@ msgid ""
"to\n"
"\n"
msgstr ""
-"%s [opcje] … \n"
+"%s [параметры] … \n"
"\n"
-" -h, --help Wyświetla tę pomoc\n"
-" --version Wyświetla wersję\n"
-" -s, --server=SERWER Nazwa serwera do połączenia się\n"
+" -h, --help Паказаць гэту даведку.\n"
+" --version Паказаць версію.\n"
+" -s, --server=СЕРВЕР Назва сервера для злучэння.\n"
"\n"
#: ../src/utils/pasuspender.c:266
@@ -3101,23 +3085,23 @@ msgid ""
"Linked with libpulse %s\n"
msgstr ""
"pasuspender %s\n"
-"Skompilowane za pomocą libpulse %s\n"
-"Skonsolidowane za pomocą libpulse %s\n"
+"Скампілявана з libpulse %s\n"
+"Звязана з libpulse %s\n"
#: ../src/utils/pasuspender.c:295
#, c-format
msgid "pa_mainloop_new() failed.\n"
-msgstr "pa_mainloop_new() się nie powiodło.\n"
+msgstr "pa_mainloop_new() пацярпела няўдачу.\n"
#: ../src/utils/pasuspender.c:308
#, c-format
msgid "pa_context_new() failed.\n"
-msgstr "pa_context_new() się nie powiodło.\n"
+msgstr "pa_context_new() пацярпела няўдачу.\n"
#: ../src/utils/pasuspender.c:320
#, c-format
msgid "pa_mainloop_run() failed.\n"
-msgstr "pa_mainloop_run() się nie powiodło.\n"
+msgstr "pa_mainloop_run() пацярпела няўдачу.\n"
#: ../src/utils/pax11publish.c:58
#, c-format
@@ -3130,60 +3114,62 @@ msgid ""
"variables and cookie file.\n"
" -r Remove PulseAudio data from X11 display\n"
msgstr ""
-"%s [-D ekran] [-S serwer] [-O odpływ] [-I źródło] [-c plik] [-d|-e|-i|-r]\n"
+"%s [-D дысплей] [-S сервер] [-O прыёмнік] [-I крыніца] [-c файл]"
+" [-d|-e|-i|-r]\n"
"\n"
-" -d Wyświetla dane PulseAudio dołączone do ekranu X11 (domyślne)\n"
-" -e Eksportuje lokalne dane PulseAudio na ekran X11\n"
-" -i Importuje dane PulseAudio z ekranu X11 do lokalnych zmiennych\n"
-" środowiskowych i pliku ciasteczka.\n"
-" -r Usuwa dane PulseAudio z ekranu X11\n"
+" -d Паказаць бягучыя дадзеныя PulseAudio, прымацаваныя да X11-дысплея"
+" (агаданая)\n"
+" -e Экспартаваць дадзеныя PulseAudio у X11-дысплей\n"
+" -i Імпартаваць дадзеныя PulseAudio з X11-дысплея ў лакальныя зменныя"
+" асяроддзя.\n"
+" -r Выдаліць дадзеныя PulseAudio з X11-дысплея\n"
#: ../src/utils/pax11publish.c:91
#, c-format
msgid "Failed to parse command line.\n"
-msgstr "Przetworzenie wiersza poleceń się nie powiodło.\n"
+msgstr "Не атрымалася разабраць камандны радок.\n"
#: ../src/utils/pax11publish.c:110
#, c-format
msgid "Server: %s\n"
-msgstr "Serwer: %s\n"
+msgstr "Сервер: %s\n"
#: ../src/utils/pax11publish.c:112
#, c-format
msgid "Source: %s\n"
-msgstr "Źródło: %s\n"
+msgstr "Крыніца: %s\n"
#: ../src/utils/pax11publish.c:114
#, c-format
msgid "Sink: %s\n"
-msgstr "Odpływ: %s\n"
+msgstr "Прыёмнік: %s\n"
#: ../src/utils/pax11publish.c:116
#, c-format
msgid "Cookie: %s\n"
-msgstr "Ciasteczko: %s\n"
+msgstr "Cookie: %s\n"
#: ../src/utils/pax11publish.c:134
#, c-format
msgid "Failed to parse cookie data\n"
-msgstr "Przetworzenie danych ciasteczka się nie powiodło\n"
+msgstr "Не атрымалася разабраць дадзеныя cookie\n"
#: ../src/utils/pax11publish.c:139
#, c-format
msgid "Failed to save cookie data\n"
-msgstr "Zapisanie danych ciasteczka się nie powiodło\n"
+msgstr "Не атрымалася захаваць дадзеныя cookie\n"
#: ../src/utils/pax11publish.c:168
#, c-format
msgid "Failed to get FQDN.\n"
-msgstr "Uzyskanie FQDN się nie powiodło.\n"
+msgstr "Не атрымалася атрымаць поўнае даменнае імя (FQDN).\n"
#: ../src/utils/pax11publish.c:188
#, c-format
msgid "Failed to load cookie data\n"
-msgstr "Wczytanie danych ciasteczka się nie powiodło\n"
+msgstr "Не атрымалася загрузіць дадзеныя cookie\n"
#: ../src/utils/pax11publish.c:206
#, c-format
msgid "Not yet implemented.\n"
-msgstr "Niezaimplementowane.\n"
+msgstr "Не рэалізованы.\n"
diff --git a/po/de.po b/po/de.po
index d8c81f0..e73b652 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,457 +7,26 @@
# Fabian Affolter <fab at fedoraproject.org>, 2008-2009.
# Micha Pietsch <barney at fedoraproject.org>, 2008, 2009.
# Hedda Peters <hpeters at redhat.com>, 2009, 2012.
+# Mario Blättermann <mario.blaettermann at gmail.com>, 2016.
#
msgid ""
msgstr ""
"Project-Id-Version: pulseaudio.master-tx.de\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-30 10:10+0000\n"
-"PO-Revision-Date: 2012-01-30 09:52+0000\n"
-"Last-Translator: Hedda Peters <hpeters at redhat.com>\n"
+"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?"
+"product=PulseAudio&keywords=I18N+L10N&component=misc\n"
+"POT-Creation-Date: 2016-09-24 21:48+0200\n"
+"PO-Revision-Date: 2016-09-29 12:52+0200\n"
+"Last-Translator: Mario Blättermann <mario.blaettermann at gmail.com>\n"
"Language-Team: \n"
-"Language: \n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Language: German\n"
-"X-Generator: KBabel 1.11.4\n"
-
-#: ../src/modules/alsa/alsa-util.c:1136 ../src/modules/alsa/alsa-util.c:1204
-#, c-format
-msgid ""
-"snd_pcm_avail() returned a value that is exceptionally large: %lu bytes (%lu "
-"ms).\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers."
-msgstr ""
-"snd_pcm_avail() gibt einen Wert zurück, der ausserordentlich gross ist: %lu "
-"bytes (%lu ms).\n"
-"Dies ist wahrscheinlich ein Fehler im ALSA-Treiber '%s'. Bitte melden Sie "
-"dieses Problem den ALSA-Entwicklern."
-
-#: ../src/modules/alsa/alsa-util.c:1179
-#, c-format
-msgid ""
-"snd_pcm_delay() returned a value that is exceptionally large: %li bytes (%s"
-"%lu ms).\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers."
-msgstr ""
-"snd_pcm_delay() gibt einen Wert zurück, der ausserordentlich gross ist: %li "
-"bytes (%s%lu ms).\n"
-"Dies ist wahrscheinlich ein Fehler im ALSA-Treiber '%s'. Bitte melden Sie "
-"dieses Problem den ALSA-Entwicklern."
-
-#: ../src/modules/alsa/alsa-util.c:1220
-#, fuzzy, c-format
-msgid ""
-"snd_pcm_avail_delay() returned strange values: delay %lu is less than avail "
-"%lu.\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers."
-msgstr ""
-"snd_pcm_avail() gibt einen Wert zurück, der ausserordentlich gross ist: %lu "
-"bytes (%lu ms).\n"
-"Dies ist wahrscheinlich ein Fehler im ALSA-Treiber '%s'. Bitte melden Sie "
-"dieses Problem den ALSA-Entwicklern."
-
-#: ../src/modules/alsa/alsa-util.c:1263
-#, c-format
-msgid ""
-"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu bytes "
-"(%lu ms).\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers."
-msgstr ""
-"snd_pcm_mmap_begin() gibt einen Wert zurück, der ausserordentlich gross ist: "
-"%lu bytes (%lu ms).\n"
-"Dies ist wahrscheinlich ein Fehler im ALSA-Treiber '%s'. Bitte melden Sie "
-"dieses Problem den ALSA-Entwicklern."
-
-#: ../src/modules/module-always-sink.c:38
-msgid "Always keeps at least one sink loaded even if it's a null one"
-msgstr "Hält stets einen Sink geladen, selbst wenn dies ein Null-Sink ist"
-
-#: ../src/modules/module-always-sink.c:82
-msgid "Dummy Output"
-msgstr "Dummy-Ausgabe"
-
-#: ../src/modules/module-ladspa-sink.c:48
-msgid "Virtual LADSPA sink"
-msgstr "Virtueller LADSPA-Sink"
-
-#: ../src/modules/module-ladspa-sink.c:52
-#, fuzzy
-msgid ""
-"sink_name=<name for the sink> sink_properties=<properties for the sink> "
-"master=<name of sink to filter> format=<sample format> rate=<sample rate> "
-"channels=<number of channels> channel_map=<input channel map> plugin=<ladspa "
-"plugin name> label=<ladspa plugin label> control=<comma separated list of "
-"input control values> input_ladspaport_map=<comma separated list of input "
-"LADSPA port names> output_ladspaport_map=<comma separated list of output "
-"LADSPA port names> "
-msgstr ""
-"sink_name=<Name des Sinks> sink_properties=<Eigenschaften des Sinks> "
-"master=<Name des zu filternden Sinks> format=<Sample-Format> rate=<Sample-"
-"Rate> channels=<Anzahl der Channels> channel_map=<Channel-Map> "
-"plugin=<ladspa Plugin-Name> label=<ladspa Plugin-Label> "
-"control=<kommagetrennte Liste von Eingabekontrollwerten>"
-
-#: ../src/modules/module-null-sink.c:49
-msgid "Clocked NULL sink"
-msgstr "Clocked NULL Sink"
-
-#: ../src/modules/module-null-sink.c:284
-msgid "Null Output"
-msgstr "Null-Ausgabe"
-
-#: ../src/pulsecore/sink.c:3349
-msgid "Built-in Audio"
-msgstr "Internes Audio"
-
-#: ../src/pulsecore/sink.c:3354
-msgid "Modem"
-msgstr "Modem"
-
-#: ../src/daemon/ltdl-bind-now.c:127
-msgid "Failed to find original lt_dlopen loader."
-msgstr "Ursprünglicher dlopen-Loader konnte nicht gefunden werden."
-
-#: ../src/daemon/ltdl-bind-now.c:132
-msgid "Failed to allocate new dl loader."
-msgstr "Neuer dlopen-Loader konnte nicht gefunden werden."
-
-#: ../src/daemon/ltdl-bind-now.c:145
-msgid "Failed to add bind-now-loader."
-msgstr "Hinzufügen von Bind-Now-Loader fehlgeschlagen."
-
-#: ../src/daemon/main.c:139
-#, c-format
-msgid "Got signal %s."
-msgstr "Signal %s empfangen."
-
-#: ../src/daemon/main.c:166
-msgid "Exiting."
-msgstr "Wird beendet."
-
-#: ../src/daemon/main.c:184
-#, c-format
-msgid "Failed to find user '%s'."
-msgstr "Benutzer '%s' nicht gefunden."
-
-#: ../src/daemon/main.c:189
-#, c-format
-msgid "Failed to find group '%s'."
-msgstr "Gruppe '%s' nicht gefunden."
-
-#: ../src/daemon/main.c:193
-#, c-format
-msgid "Found user '%s' (UID %lu) and group '%s' (GID %lu)."
-msgstr "Benutzer '%s' (UID %lu) und Gruppe '%s' (GID %lu) gefunden."
-
-#: ../src/daemon/main.c:198
-#, c-format
-msgid "GID of user '%s' and of group '%s' don't match."
-msgstr "GID von Benutzer '%s' und Gruppe '%s' stimmen nicht überein."
-
-#: ../src/daemon/main.c:203
-#, c-format
-msgid "Home directory of user '%s' is not '%s', ignoring."
-msgstr "Benutzerverzeichnis von Benutzer '%s' ist nicht '%s', ignoriere."
-
-#: ../src/daemon/main.c:206 ../src/daemon/main.c:211
-#, c-format
-msgid "Failed to create '%s': %s"
-msgstr "Konnte '%s' nciht erzeugen: %s"
-
-#: ../src/daemon/main.c:218
-#, c-format
-msgid "Failed to change group list: %s"
-msgstr "Wechseln der Gruppen-Liste fehlgeschlagen: %s"
-
-#: ../src/daemon/main.c:234
-#, c-format
-msgid "Failed to change GID: %s"
-msgstr "Wechseln der GID fehlgeschlagen: %s"
-
-#: ../src/daemon/main.c:250
-#, c-format
-msgid "Failed to change UID: %s"
-msgstr "Wechseln der UID fehlgeschlagen: %s"
-
-#: ../src/daemon/main.c:269
-msgid "Successfully dropped root privileges."
-msgstr "Root-Berechtigungen erfolgreich zurückgesetzt."
-
-#: ../src/daemon/main.c:277
-msgid "System wide mode unsupported on this platform."
-msgstr "System-Modus auf dieser Plattform nicht unterstützt."
-
-#: ../src/daemon/main.c:295
-#, c-format
-msgid "setrlimit(%s, (%u, %u)) failed: %s"
-msgstr "setrlimit(%s, (%u, %u)) fehlgeschlagen: %s"
-
-#: ../src/daemon/main.c:496
-msgid "Failed to parse command line."
-msgstr "Parsen der Kommandzeile fehlgeschlagen."
-
-#: ../src/daemon/main.c:529
-msgid ""
-"System mode refused for non-root user. Only starting the D-Bus server lookup "
-"service."
-msgstr ""
-
-#: ../src/daemon/main.c:611
-msgid "Daemon not running"
-msgstr "Daemon läuft nicht"
-
-#: ../src/daemon/main.c:613
-#, c-format
-msgid "Daemon running as PID %u"
-msgstr "Daemon läuft als PID %u"
-
-#: ../src/daemon/main.c:628
-#, c-format
-msgid "Failed to kill daemon: %s"
-msgstr "Konnte Prozess nicht abbrechen: %s"
-
-#: ../src/daemon/main.c:657
-msgid ""
-"This program is not intended to be run as root (unless --system is "
-"specified)."
-msgstr ""
-"Dieses Programm sollte ohne die Option --system nicht als Administrator "
-"ausgeführt werden."
-
-#: ../src/daemon/main.c:660
-msgid "Root privileges required."
-msgstr "Root-Berechtigungen benötigt."
-
-#: ../src/daemon/main.c:667
-msgid "--start not supported for system instances."
-msgstr "--start nicht unterstützt für System-Instanzen."
-
-#: ../src/daemon/main.c:707
-#, c-format
-msgid "User-configured server at %s, refusing to start/autospawn."
-msgstr ""
-
-#: ../src/daemon/main.c:713
-#, c-format
-msgid ""
-"User-configured server at %s, which appears to be local. Probing deeper."
-msgstr ""
-
-#: ../src/daemon/main.c:718
-msgid "Running in system mode, but --disallow-exit not set!"
-msgstr "System-Modus aktiv, jeodch --disallow-exit nicht gesetzt!"
-
-#: ../src/daemon/main.c:721
-msgid "Running in system mode, but --disallow-module-loading not set!"
-msgstr "System-Modus aktiv, jedoch --disallow-module-loading nicht gesetzt!"
-
-#: ../src/daemon/main.c:724
-msgid "Running in system mode, forcibly disabling SHM mode!"
-msgstr "System-Modus aktiv, SHM-Modus gezwungenermaßen deaktiviert!"
-
-#: ../src/daemon/main.c:729
-msgid "Running in system mode, forcibly disabling exit idle time!"
-msgstr "System-Modus aktiv, Exit-Idle-Time gezwungenermaßen deaktiviert!"
-
-#: ../src/daemon/main.c:757
-msgid "Failed to acquire stdio."
-msgstr "Reservieren von STDIO fehlgeschlagen."
-
-#: ../src/daemon/main.c:763 ../src/daemon/main.c:828
-#, fuzzy, c-format
-msgid "pipe() failed: %s"
-msgstr "pipe fehlgeschlagen: %s"
-
-#: ../src/daemon/main.c:768 ../src/daemon/main.c:833
-#, c-format
-msgid "fork() failed: %s"
-msgstr "fork() fehlgeschlagen: %s"
-
-#: ../src/daemon/main.c:783 ../src/daemon/main.c:848 ../src/utils/pacat.c:550
-#, c-format
-msgid "read() failed: %s"
-msgstr "read() fehlgeschlagen: %s"
-
-#: ../src/daemon/main.c:789
-msgid "Daemon startup failed."
-msgstr "Start des Daemons fehlgeschlagen."
-
-#: ../src/daemon/main.c:791
-msgid "Daemon startup successful."
-msgstr "Start des Daemons erfolgreich."
-
-#: ../src/daemon/main.c:816
-#, fuzzy, c-format
-msgid "setsid() failed: %s"
-msgstr "read() fehlgeschlagen: %s"
-
-#: ../src/daemon/main.c:901
-#, c-format
-msgid "This is PulseAudio %s"
-msgstr "Dies ist PulseAudio %s"
-
-#: ../src/daemon/main.c:902
-#, c-format
-msgid "Compilation host: %s"
-msgstr "Kompilier-Host: %s"
-
-#: ../src/daemon/main.c:903 ../src/tests/resampler-test.c:418
-#, c-format
-msgid "Compilation CFLAGS: %s"
-msgstr "Kompilier-CFLAGS: %s"
-
-#: ../src/daemon/main.c:906
-#, c-format
-msgid "Running on host: %s"
-msgstr "Laufe auf Host: %s"
-
-#: ../src/daemon/main.c:909
-#, c-format
-msgid "Found %u CPUs."
-msgstr "%u CPUs gefunden."
-
-#: ../src/daemon/main.c:911
-#, c-format
-msgid "Page size is %lu bytes"
-msgstr "Seitengröße ist %lu Bytes."
-
-#: ../src/daemon/main.c:914
-msgid "Compiled with Valgrind support: yes"
-msgstr "Kompiliere mit Valgrind-Unterstützung: ja"
-
-#: ../src/daemon/main.c:916
-msgid "Compiled with Valgrind support: no"
-msgstr "Kompiliere mit Valgrind-Unterstützung: nein"
-
-#: ../src/daemon/main.c:919
-#, c-format
-msgid "Running in valgrind mode: %s"
-msgstr "Läuft im Valgrind-Modus: %s"
-
-#: ../src/daemon/main.c:921
-#, fuzzy, c-format
-msgid "Running in VM: %s"
-msgstr "Laufe auf Host: %s"
-
-#: ../src/daemon/main.c:924
-msgid "Optimized build: yes"
-msgstr "Optimiertes Build: ja"
-
-#: ../src/daemon/main.c:926
-msgid "Optimized build: no"
-msgstr "Optimiertes Build: nein"
-
-#: ../src/daemon/main.c:930
-msgid "NDEBUG defined, all asserts disabled."
-msgstr "NDEBUG definiert, alle Ansprüche deaktiviert."
-
-#: ../src/daemon/main.c:932
-msgid "FASTPATH defined, only fast path asserts disabled."
-msgstr "FASTPATH definiert, nur fast-path-Ansprüche deaktiviert."
-
-#: ../src/daemon/main.c:934
-msgid "All asserts enabled."
-msgstr "Alle Ansprüche aktiviert."
-
-#: ../src/daemon/main.c:938
-msgid "Failed to get machine ID"
-msgstr "Beziehen der Maschinen-ID fehlgeschlagen"
-
-#: ../src/daemon/main.c:941
-#, c-format
-msgid "Machine ID is %s."
-msgstr "System- ID ist %s."
-
-#: ../src/daemon/main.c:945
-#, c-format
-msgid "Session ID is %s."
-msgstr "System- ID ist %s."
-
-#: ../src/daemon/main.c:951
-#, c-format
-msgid "Using runtime directory %s."
-msgstr "Nutze Laufzeit-Verzeichnis %s."
-
-#: ../src/daemon/main.c:956
-#, c-format
-msgid "Using state directory %s."
-msgstr "Nutze Zustands-Verzeichnis %s."
-
-#: ../src/daemon/main.c:959
-#, c-format
-msgid "Using modules directory %s."
-msgstr "Modul-Verzeichnis %s benutzen."
-
-#: ../src/daemon/main.c:961
-#, c-format
-msgid "Running in system mode: %s"
-msgstr "Laufe im System-Modus: %s"
-
-#: ../src/daemon/main.c:964
-msgid ""
-"OK, so you are running PA in system mode. Please note that you most likely "
-"shouldn't be doing that.\n"
-"If you do it nonetheless then it's your own fault if things don't work as "
-"expected.\n"
-"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
-"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
-"mode is usually a bad idea."
-msgstr ""
-"OK, nun wird PA im System Mode betrieben. Vorsicht, dies sollte man nicht "
-"tun.\n"
-"Bei Nichtbeachtung, selber Schuld wenn Dinge nicht funktionieren.\n"
-"Für eine Erklärung warum System Mode eine schlechte Idee ist, bitte http://"
-"www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/"
-"WhatIsWrongWithSystemWide/ lesen"
-
-#: ../src/daemon/main.c:981
-msgid "pa_pid_file_create() failed."
-msgstr "pa_pid_file_create() fehlgeschlagen."
-
-#: ../src/daemon/main.c:991
-msgid "Fresh high-resolution timers available! Bon appetit!"
-msgstr "Neue hochauslösende Timer verfügbar! Guten Appetit!"
-
-#: ../src/daemon/main.c:993
-msgid ""
-"Dude, your kernel stinks! The chef's recommendation today is Linux with high-"
-"resolution timers enabled!"
-msgstr "Der Chefkoch empfiehlt: Linux mit aktivierten hochauslösenden Timern!"
-
-#: ../src/daemon/main.c:1011
-msgid "pa_core_new() failed."
-msgstr "pa_core_new() fehlgeschlagen."
-
-#: ../src/daemon/main.c:1087
-msgid "Failed to initialize daemon."
-msgstr "Konnte Daemon nicht initialisieren."
-
-#: ../src/daemon/main.c:1092
-msgid "Daemon startup without any loaded modules, refusing to work."
-msgstr "Daemon verweigert Ausführung, da keine Module geladen."
-
-#: ../src/daemon/main.c:1130
-msgid "Daemon startup complete."
-msgstr "Start des Daemons abgeschlossen."
-
-#: ../src/daemon/main.c:1136
-msgid "Daemon shutdown initiated."
-msgstr "Herunterfahren des Daemon gestartet."
-
-#: ../src/daemon/main.c:1167
-msgid "Daemon terminated."
-msgstr "Daemon beendet."
+"X-Generator: Poedit 1.8.9\n"
#: ../src/daemon/cmdline.c:113
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s [options]\n"
"\n"
@@ -498,8 +67,8 @@ msgid ""
"and\n"
" this time passed\n"
" --log-level[=LEVEL] Increase or set verbosity level\n"
-" -v Increase the verbosity level\n"
-" --log-target={auto,syslog,stderr,file:PATH}\n"
+" -v --verbose Increase the verbosity level\n"
+" --log-target={auto,syslog,stderr,file:PATH,newfile:PATH}\n"
" Specify the log target\n"
" --log-meta[=BOOL] Include code location in log "
"messages\n"
@@ -515,6 +84,7 @@ msgid ""
" --no-cpu-limit[=BOOL] Do not install CPU load limiter on\n"
" platforms that support it.\n"
" --disable-shm[=BOOL] Disable shared memory support.\n"
+" --enable-memfd[=BOOL] Enable memfd shared memory support.\n"
"\n"
"STARTUP SCRIPT:\n"
" -L, --load=\"MODULE ARGUMENTS\" Load the specified plugin module "
@@ -527,259 +97,237 @@ msgid ""
"\n"
" -n Don't load default script file\n"
msgstr ""
-"%s [options]\n"
+"%s [Optionen]\n"
"\n"
"BEFEHLE:\n"
-" -h, --help Zeige diese Hilfe\n"
-" --version Zeige Version\n"
-" --dump-conf Zeige Standardkonfiguration\n"
-" --dump-modules Zeige Liste verfügbarer Module\n"
-" --dump-resample-methods Zeige verfügbare Resample-Methoden\n"
-" --cleanup-shm Bereinige veraltete Bereiche des "
+" -h, --help zeigt diese Hilfe an\n"
+" --version zeigt die Version an\n"
+" --dump-conf zeigt die Standardkonfiguration an\n"
+" --dump-modules zeigt die Liste verfügbarer Module "
+"an\n"
+" --dump-resample-methods zeigt die verfügbaren Resample-"
+"Methoden an\n"
+" --cleanup-shm bereinigt veraltete Bereiche des "
"gemeinsamen Speichers\n"
-" --start Starte Daemon, falls noch nicht "
-"geschehen\n"
-" -k --kill Laufenden Daemon beenden\n"
-" --check Prüfe laufende Daemone (gibt nur "
-"einen Exit-Code zurück)\n"
+" --start startet den Hintergrunddienst, falls "
+"noch nicht geschehen\n"
+" -k --kill beendet den laufenden "
+"Hintergrunddienst\n"
+" --check prüft auf laufende "
+"Hintergrunddienste\n"
+" (gibt nur einen Exit-Code zurück)\n"
"\n"
-"OPTIONS:\n"
-" --system[=BOOL] Als systemweite Instanz ausführen\n"
-" -D, --daemonize[=BOOL] Nach Start zum Daemon machen\n"
-" --fail[=BOOL] Beenden, wenn Start fehlschlägt\n"
-" --high-priority[=BOOL] Versuche höchste Priorität zu "
+"OPTIONEN:\n"
+" --system[=BOOL] führt eine systemweite Instanz aus\n"
+" -D, --daemonize[=BOOL] wird nach Start zum "
+"Hintergrunddienst\n"
+" --fail[=BOOL] beendet, wenn Start fehlschlägt\n"
+" --high-priority[=BOOL] versuch, die höchste Priorität zu "
"setzen\n"
-" (Nur verfügbar als root, wenn SUID "
+" (Nur verfügbar als root, wenn SUID "
"oder\n"
-" mit erhöhtem RLIMIT_NICE)\n"
-" --realtime[=BOOL] Versuche, Echtzeit-Scheduling zu "
+" mit erhöhtem RLIMIT_NICE)\n"
+" --realtime[=BOOL] versucht, Echtzeit-Scheduling zu "
"aktivieren\n"
-" (Nur verfügbar als root, wenn SUID "
+" (Nur verfügbar als root, wenn SUID "
"oder\n"
-" mit erhöhtem RLIMIT_RTPRIO)\n"
-" --disallow-module-loading[=BOOL] Verbiete (Ent-)laden durch Nutzer "
-"angefordertere\n"
-" Module nach dem Start\n"
-" --disallow-exit[=BOOL] Verbiete Beenden auf Anfrage des "
+" mit erhöhtem RLIMIT_RTPRIO)\n"
+" --disallow-module-loading[=BOOL] verbietet (Ent-)laden durch Nutzer "
+"angeforderte\n"
+" Module nach dem Start\n"
+" --disallow-exit[=BOOL] verbietet Beenden auf Anfrage des "
"Nutzers\n"
-" --exit-idle-time=SECS Beende Daemon, wenn für diese Zeit\n"
-" untätig\n"
-" --module-idle-time=SECS Entlade untätige Module nach dieser "
-"Zeit\n"
-" --scache-idle-time=SECS Entlade untätige automatisch "
+" --exit-idle-time=SEK beendet den Hintergrunddienst, wenn "
+"für\n"
+" diese Zeit untätig\n"
+" --scache-idle-time=SEK entlädt untätige automatisch "
"geladene\n"
-" Samples nach dieser Zeit\n"
-" --log-level[=LEVEL] Grad der Ausführlichkeit angeben\n"
-" -v Ausführliche Meldungen\n"
-" --log-target={auto,syslog,stderr} Protokoll-Ziel angeben\n"
-" --log-meta[=BOOL] Speicherort des Codes in "
-"Protokollnachrichtenangeben\n"
-" --log-time[=BOOL] Zeitstempel in Protokollnachrichten "
-"angeben\n"
+" Samples nach dieser Zeit\n"
+" --log-level[=GRAD] erhöht oder setzt den Grad der "
+"Ausführlichkeit\n"
+" -v --verbose erhöht den Grad der Ausführlichkeit\n"
+" --log-target={auto,syslog,stderr,file:PFAD,newfile:PFAD}\n"
+" gibt das Protokoll-Ziel an\n"
+" --log-meta[=BOOL] gibt den Speicherort des Codes in "
+"Protokollnachrichten an\n"
+" --log-time[=BOOL] gibt den Zeitstempel in "
+"Protokollnachrichten an\n"
" --log-backtrace=FRAMES Backtrace in Protokollnachrichten "
"angeben\n"
-" -p, --dl-search-path=PATH Suchpfad für dynamisch freigegebene\n"
-" Objekte (Plugins) angeben\n"
-" --resample-method=METHOD Nutze diese Resampling-Methode\n"
-" (Siehe --dump-resample-methods für\n"
-" mögliche Werte)\n"
-" --use-pid-file[=BOOL] Eine PID-Datei erstellen\n"
-" --no-cpu-limit[=BOOL] CPU-Lastbegrenzung auf "
-"unterstützten\n"
-" Systemen nicht installieren.\n"
-" --disable-shm[=BOOL] Unterstützung für Shared Memory "
-"deaktivieren.\n"
+" -p, --dl-search-path=PFAD gibt den Suchpfad für dynamisch "
+"freigegebene\n"
+" Objekte (Plugins) an\n"
+" --resample-method=METHOD nutzt diese Resampling-Methode "
+"(siehe --dump-resample-methods\n"
+" für mögliche Werte)\n"
+" --use-pid-file[=BOOL] erstellt eine PID-Datei\n"
+" --no-cpu-limit[=BOOL] installiert keine CPU-Lastbegrenzung "
+"auf\n"
+" unterstützten Systemen\n"
+" --disable-shm[=BOOL] deaktiviert die Unterstützung für "
+"Shared Memory\n"
+" --enable-memfd[=BOOL] aktiviert die Unterstützung für "
+"Shared Memory durch memfd\n"
"\n"
-"STARTUP SCRIPT:\n"
-" -L, --load=\"MODULE ARGUMENTS\" Plugin-Modul mit diesen "
+"STARTSKRIPT:\n"
+" -L, --load=\"MODUL ARGUMENTE\" lädt das Plugin-Modul mit diesen "
"Parametern\n"
-" laden.\n"
-" -F, --file=FILENAME Dieses Skript ausführen\n"
-" -C Nach Start auf laufendem TTY\n"
-" eine Kommandozeile öffnen\n"
+" -F, --file=DATEINAME führt dieses Skript aus\n"
+" -C öffnet nach dem Start auf laufendem "
+"TTY\n"
+" eine Befehlszeile\n"
"\n"
-" -n Standardskript nicht laden\n"
+" -n lädt kein Standardskript\n"
-#: ../src/daemon/cmdline.c:244
+#: ../src/daemon/cmdline.c:246
msgid "--daemonize expects boolean argument"
-msgstr "--daemonize erfordert Boolsche Variable"
+msgstr "--daemonize erfordert boolesche Variable"
-#: ../src/daemon/cmdline.c:251
+#: ../src/daemon/cmdline.c:254
msgid "--fail expects boolean argument"
-msgstr "--fail erfordert Boolsche Variable"
+msgstr "--fail erfordert boolesche Variable"
-#: ../src/daemon/cmdline.c:261
+#: ../src/daemon/cmdline.c:265
msgid ""
"--log-level expects log level argument (either numeric in range 0..4 or one "
"of debug, info, notice, warn, error)."
msgstr ""
"--log-level erfordert Parameter für Grad der Protokollierung (entweder "
-"numerisch im Bereich 0..4 or einen dieser: debug, info, notice, warn, error)."
+"numerisch im Bereich 0..4 oder einen dieser: debug, info, notice, warn, "
+"error)."
-#: ../src/daemon/cmdline.c:273
+#: ../src/daemon/cmdline.c:277
msgid "--high-priority expects boolean argument"
-msgstr "--high-priority erfordert Boolsche Variable"
+msgstr "--high-priority erfordert boolesche Variable"
-#: ../src/daemon/cmdline.c:280
+#: ../src/daemon/cmdline.c:285
msgid "--realtime expects boolean argument"
-msgstr "--realtime erfordert Boolsche Variable"
+msgstr "--realtime erfordert boolesche Variable"
-#: ../src/daemon/cmdline.c:287
+#: ../src/daemon/cmdline.c:293
msgid "--disallow-module-loading expects boolean argument"
-msgstr "--disallow-module-loading erfordert Boolsche Variable"
+msgstr "--disallow-module-loading erfordert boolesche Variable"
-#: ../src/daemon/cmdline.c:294
+#: ../src/daemon/cmdline.c:301
msgid "--disallow-exit expects boolean argument"
-msgstr "--disallow-exit erfordert Boolsche Variable"
+msgstr "--disallow-exit erfordert boolesche Variable"
-#: ../src/daemon/cmdline.c:301
+#: ../src/daemon/cmdline.c:309
msgid "--use-pid-file expects boolean argument"
-msgstr "--use-pid-file erfordert Boolsche Variable"
+msgstr "--use-pid-file erfordert boolesche Variable"
+
+#: ../src/daemon/cmdline.c:328
+msgid ""
+"Invalid log target: use either 'syslog', 'journal','stderr' or 'auto' or a "
+"valid file name 'file:<path>', 'newfile:<path>'."
+msgstr ""
+"Ungültiges Protokollziel: Benutzen Sie entweder »syslog«, »journal«, "
+"»stderr« oder »auto« oder einen gültigen Dateinamen »file:<Pfad>«, »newfile:"
+"<Pfad>«."
-#: ../src/daemon/cmdline.c:318
-#, fuzzy
+#: ../src/daemon/cmdline.c:330
msgid ""
"Invalid log target: use either 'syslog', 'stderr' or 'auto' or a valid file "
-"name 'file:<path>'."
+"name 'file:<path>', 'newfile:<path>'."
msgstr ""
-"Ungültiges Log-Ziel: Benutzen Sie entweder 'syslog', 'stderr' oder 'auto'."
+"Ungültiges Protokollziel: Benutzen Sie entweder »syslog«, »stderr« oder "
+"»auto« oder einen gültigen Dateinamen »file:<Pfad>«, »newfile:<Pfad>«."
-#: ../src/daemon/cmdline.c:325
+#: ../src/daemon/cmdline.c:338
msgid "--log-time expects boolean argument"
-msgstr "--realtime erfordert Boolsche Variable"
+msgstr "--realtime erfordert boolesche Variable"
-#: ../src/daemon/cmdline.c:332
+#: ../src/daemon/cmdline.c:346
msgid "--log-meta expects boolean argument"
-msgstr "--log-meta erfordert Boolsche Variable"
+msgstr "--log-meta erfordert boolesche Variable"
-#: ../src/daemon/cmdline.c:351
+#: ../src/daemon/cmdline.c:366
#, c-format
msgid "Invalid resample method '%s'."
-msgstr "Ungültige Resample-Methode '%s'."
+msgstr "Ungültige Resample-Methode »%s«."
-#: ../src/daemon/cmdline.c:358
+#: ../src/daemon/cmdline.c:373
msgid "--system expects boolean argument"
-msgstr "--system erfordert Boolsche Variable"
+msgstr "--system erfordert boolesche Variable"
-#: ../src/daemon/cmdline.c:365
+#: ../src/daemon/cmdline.c:381
msgid "--no-cpu-limit expects boolean argument"
-msgstr "--no-cpu-limit erfordert Boolsche Variable"
+msgstr "--no-cpu-limit erfordert boolesche Variable"
-#: ../src/daemon/cmdline.c:372
+#: ../src/daemon/cmdline.c:389
msgid "--disable-shm expects boolean argument"
-msgstr "--disable-shm erfordert Boolsche Variable"
+msgstr "--disable-shm erfordert boolesche Variable"
-#: ../src/daemon/dumpmodules.c:59
+#: ../src/daemon/cmdline.c:397
+msgid "--enable-memfd expects boolean argument"
+msgstr "--enable-memfd erfordert boolesche Variable"
+
+#: ../src/daemon/daemon-conf.c:260
#, c-format
-msgid "Name: %s\n"
-msgstr "Name: %s\n"
+msgid "[%s:%u] Invalid log target '%s'."
+msgstr "[%s:%u] Ungültiges Protokollziel »%s«."
-#: ../src/daemon/dumpmodules.c:62
+#: ../src/daemon/daemon-conf.c:275
#, c-format
-msgid "No module information available\n"
-msgstr "Keine Modul-Informationen verfügbar\n"
+msgid "[%s:%u] Invalid log level '%s'."
+msgstr "[%s:%u] Ungültige Protokollierstufe »%s«."
-#: ../src/daemon/dumpmodules.c:65
+#: ../src/daemon/daemon-conf.c:290
#, c-format
-msgid "Version: %s\n"
-msgstr "Version: %s\n"
+msgid "[%s:%u] Invalid resample method '%s'."
+msgstr "[%s:%u] Ungültige Resample-Methode »%s«."
-#: ../src/daemon/dumpmodules.c:67
+#: ../src/daemon/daemon-conf.c:312
#, c-format
-msgid "Description: %s\n"
-msgstr "Beschreibung: %s\n"
+msgid "[%s:%u] Invalid rlimit '%s'."
+msgstr "[%s:%u] Ungültiges rlimit »%s«."
-#: ../src/daemon/dumpmodules.c:69
-#, c-format
-msgid "Author: %s\n"
-msgstr "Autor: %s\n"
-
-#: ../src/daemon/dumpmodules.c:71
-#, c-format
-msgid "Usage: %s\n"
-msgstr "Verwendung: %s\n"
-
-#: ../src/daemon/dumpmodules.c:72
-#, c-format
-msgid "Load Once: %s\n"
-msgstr "Lade einmalig: %s\n"
-
-#: ../src/daemon/dumpmodules.c:74
-#, c-format
-msgid "DEPRECATION WARNING: %s\n"
-msgstr "WARNUNG (DEPRECATION): %s\n"
-
-#: ../src/daemon/dumpmodules.c:78
-#, c-format
-msgid "Path: %s\n"
-msgstr "Pfad: %s\n"
-
-#: ../src/daemon/daemon-conf.c:275
-#, c-format
-msgid "[%s:%u] Invalid log target '%s'."
-msgstr "[%s:%u] Ungültiges Log-Ziel '%s'."
-
-#: ../src/daemon/daemon-conf.c:291
-#, c-format
-msgid "[%s:%u] Invalid log level '%s'."
-msgstr "[%s:%u] Ungültige Log-Stufe '%s'."
-
-#: ../src/daemon/daemon-conf.c:307
-#, c-format
-msgid "[%s:%u] Invalid resample method '%s'."
-msgstr "[%s:%u] Ungültige Resample-Methode '%s'."
-
-#: ../src/daemon/daemon-conf.c:330
-#, c-format
-msgid "[%s:%u] Invalid rlimit '%s'."
-msgstr "[%s:%u] Ungültiges rlimit '%s'."
-
-#: ../src/daemon/daemon-conf.c:351
+#: ../src/daemon/daemon-conf.c:332
#, c-format
msgid "[%s:%u] Invalid sample format '%s'."
-msgstr "[%s:%u] Ungültiges Sample-Format '%s'."
+msgstr "[%s:%u] Ungültiges Sample-Format »%s«."
-#: ../src/daemon/daemon-conf.c:370 ../src/daemon/daemon-conf.c:389
+#: ../src/daemon/daemon-conf.c:349 ../src/daemon/daemon-conf.c:366
#, c-format
msgid "[%s:%u] Invalid sample rate '%s'."
-msgstr "[%s:%u] Ungültige Sample-Rate '%s'."
+msgstr "[%s:%u] Ungültige Sample-Rate »%s«."
-#: ../src/daemon/daemon-conf.c:413
+#: ../src/daemon/daemon-conf.c:389
#, c-format
msgid "[%s:%u] Invalid sample channels '%s'."
-msgstr "[%s:%u] Ungültige Sample-Kanäle '%s'."
+msgstr "[%s:%u] Ungültige Sample-Kanäle »%s«."
-#: ../src/daemon/daemon-conf.c:431
+#: ../src/daemon/daemon-conf.c:406
#, c-format
msgid "[%s:%u] Invalid channel map '%s'."
-msgstr "[%s:%u] Ungültige Kanal-Zuordnung '%s'."
+msgstr "[%s:%u] Ungültige Kanal-Zuordnung »%s«."
-#: ../src/daemon/daemon-conf.c:449
+#: ../src/daemon/daemon-conf.c:423
#, c-format
msgid "[%s:%u] Invalid number of fragments '%s'."
-msgstr "[%s:%u] Ungültige Anzahl von Fragmenten '%s'."
+msgstr "[%s:%u] Ungültige Anzahl von Fragmenten »%s«."
-#: ../src/daemon/daemon-conf.c:467
+#: ../src/daemon/daemon-conf.c:440
#, c-format
msgid "[%s:%u] Invalid fragment size '%s'."
-msgstr "[%s:%u] Ungültige Fragmentgröße '%s'."
+msgstr "[%s:%u] Ungültige Fragmentgröße »%s«."
-#: ../src/daemon/daemon-conf.c:485
+#: ../src/daemon/daemon-conf.c:457
#, c-format
msgid "[%s:%u] Invalid nice level '%s'."
-msgstr "[%s:%u] Ungültige Nice-Stufe '%s'."
+msgstr "[%s:%u] Ungültige Prioritätsstufe »%s«."
-#: ../src/daemon/daemon-conf.c:528
-#, fuzzy, c-format
+#: ../src/daemon/daemon-conf.c:500
+#, c-format
msgid "[%s:%u] Invalid server type '%s'."
-msgstr "[%s:%u] Ungültige Sample-Rate '%s'."
+msgstr "[%s:%u] Ungültiger Servertyp »%s«."
-#: ../src/daemon/daemon-conf.c:641
+#: ../src/daemon/daemon-conf.c:615
#, c-format
msgid "Failed to open configuration file: %s"
msgstr "Öffnen der Konfigurationsdatei fehlgeschlagen : %s"
-#: ../src/daemon/daemon-conf.c:657
+#: ../src/daemon/daemon-conf.c:631
msgid ""
"The specified default channel map has a different number of channels than "
"the specified default number of channels."
@@ -787,2258 +335,2876 @@ msgstr ""
"Die angegebene Standard-Kanalzuordnung hat eine andere Anzahl von Kanälen "
"als die angegebene Standard-Kanal-Anzahl."
-#: ../src/daemon/daemon-conf.c:743
+#: ../src/daemon/daemon-conf.c:718
#, c-format
msgid "### Read from configuration file: %s ###\n"
-msgstr "### Lese von Konfigurationsdatei: %s ###\n"
+msgstr "### Aus Konfigurationsdatei wird gelesen: %s ###\n"
-#: ../src/daemon/caps.c:58
-msgid "Cleaning up privileges."
-msgstr "Root-Privilegien aufräumen."
+#: ../src/daemon/dumpmodules.c:57
+#, c-format
+msgid "Name: %s\n"
+msgstr "Name: %s\n"
-#: ../src/daemon/pulseaudio.desktop.in.h:1
-msgid "PulseAudio Sound System"
-msgstr "PulseAudio Sound System"
+#: ../src/daemon/dumpmodules.c:60
+#, c-format
+msgid "No module information available\n"
+msgstr "Keine Modul-Informationen verfügbar\n"
-#: ../src/daemon/pulseaudio.desktop.in.h:2
-msgid "Start the PulseAudio Sound System"
-msgstr "Das PulseAudio Sound System starten"
+#: ../src/daemon/dumpmodules.c:63
+#, c-format
+msgid "Version: %s\n"
+msgstr "Version: %s\n"
-#: ../src/daemon/pulseaudio-kde.desktop.in.h:1
-#, fuzzy
-msgid "PulseAudio Sound System KDE Routing Policy"
-msgstr "PulseAudio Sound System"
+#: ../src/daemon/dumpmodules.c:65
+#, c-format
+msgid "Description: %s\n"
+msgstr "Beschreibung: %s\n"
-#: ../src/daemon/pulseaudio-kde.desktop.in.h:2
-#, fuzzy
-msgid "Start the PulseAudio Sound System with KDE Routing Policy"
-msgstr "Das PulseAudio Sound System starten"
+#: ../src/daemon/dumpmodules.c:67
+#, c-format
+msgid "Author: %s\n"
+msgstr "Autor: %s\n"
-#: ../src/pulse/channelmap.c:105 ../src/pulse/channelmap.c:757
-msgid "Mono"
-msgstr "Mono"
+#: ../src/daemon/dumpmodules.c:69
+#, c-format
+msgid "Usage: %s\n"
+msgstr "Aufruf: %s\n"
-#: ../src/pulse/channelmap.c:107
-msgid "Front Center"
-msgstr "Vorne Mitte"
+#: ../src/daemon/dumpmodules.c:70
+#, c-format
+msgid "Load Once: %s\n"
+msgstr "Einmalig laden: %s\n"
-#: ../src/pulse/channelmap.c:108
-msgid "Front Left"
-msgstr "Vorne Links"
+#: ../src/daemon/dumpmodules.c:72
+#, c-format
+msgid "DEPRECATION WARNING: %s\n"
+msgstr "WARNUNG (DEPRECATION): %s\n"
-#: ../src/pulse/channelmap.c:109
-msgid "Front Right"
-msgstr "Vorne Rechts"
+#: ../src/daemon/dumpmodules.c:76
+#, c-format
+msgid "Path: %s\n"
+msgstr "Pfad: %s\n"
-#: ../src/pulse/channelmap.c:111
-msgid "Rear Center"
-msgstr "Hinten Mitte"
+#: ../src/daemon/ltdl-bind-now.c:75
+#, c-format
+msgid "Failed to open module %s: %s"
+msgstr "Modul »%s« konnte nicht geladen werden: %s"
-#: ../src/pulse/channelmap.c:112
-msgid "Rear Left"
-msgstr "Hinten Links"
+#: ../src/daemon/ltdl-bind-now.c:126
+msgid "Failed to find original lt_dlopen loader."
+msgstr "Ursprünglicher lt_dlopen-Lader konnte nicht gefunden werden."
-#: ../src/pulse/channelmap.c:113
-msgid "Rear Right"
-msgstr "Hinten Rechts"
+#: ../src/daemon/ltdl-bind-now.c:131
+msgid "Failed to allocate new dl loader."
+msgstr "Neuer dlopen-Loader konnte nicht zugewiesen werden."
-#: ../src/pulse/channelmap.c:115
-msgid "Subwoofer"
-msgstr ""
+#: ../src/daemon/ltdl-bind-now.c:144
+msgid "Failed to add bind-now-loader."
+msgstr "Hinzufügen von bind-now-loader fehlgeschlagen."
-#: ../src/pulse/channelmap.c:117
-msgid "Front Left-of-center"
-msgstr "Vorne Links der Mitte"
+#: ../src/daemon/main.c:160
+#, c-format
+msgid "Failed to find user '%s'."
+msgstr "Benutzer »%s« wurde nicht gefunden."
-#: ../src/pulse/channelmap.c:118
-msgid "Front Right-of-center"
-msgstr "Vorne Rechts der Mitte"
+#: ../src/daemon/main.c:165
+#, c-format
+msgid "Failed to find group '%s'."
+msgstr "Gruppe »%s« wurde nicht gefunden."
-#: ../src/pulse/channelmap.c:120
-msgid "Side Left"
-msgstr "Seite Links"
+#: ../src/daemon/main.c:174
+#, c-format
+msgid "GID of user '%s' and of group '%s' don't match."
+msgstr ""
+"Gruppenkennung von Benutzer »%s« und Gruppe »%s« stimmen nicht überein."
-#: ../src/pulse/channelmap.c:121
-msgid "Side Right"
-msgstr "Seite Rechts"
+#: ../src/daemon/main.c:179
+#, c-format
+msgid "Home directory of user '%s' is not '%s', ignoring."
+msgstr "Benutzerverzeichnis von Benutzer »%s« ist nicht »%s«, wird ignoriert."
-#: ../src/pulse/channelmap.c:123
-msgid "Auxiliary 0"
-msgstr "Zusatz 0"
+#: ../src/daemon/main.c:182 ../src/daemon/main.c:187
+#, c-format
+msgid "Failed to create '%s': %s"
+msgstr "»%s« konnte nicht erzeugt werden: %s"
-#: ../src/pulse/channelmap.c:124
-msgid "Auxiliary 1"
-msgstr "Zusatz 1"
+#: ../src/daemon/main.c:194
+#, c-format
+msgid "Failed to change group list: %s"
+msgstr "Wechseln der Gruppen-Liste fehlgeschlagen: %s"
-#: ../src/pulse/channelmap.c:125
-msgid "Auxiliary 2"
-msgstr "Zusatz 2"
+#: ../src/daemon/main.c:210
+#, c-format
+msgid "Failed to change GID: %s"
+msgstr "Wechseln der Gruppenkennung fehlgeschlagen: %s"
-#: ../src/pulse/channelmap.c:126
-msgid "Auxiliary 3"
-msgstr "Zusatz 3"
+#: ../src/daemon/main.c:226
+#, c-format
+msgid "Failed to change UID: %s"
+msgstr "Wechseln der UID fehlgeschlagen: %s"
-#: ../src/pulse/channelmap.c:127
-msgid "Auxiliary 4"
-msgstr "Zusatz 4"
+#: ../src/daemon/main.c:255
+msgid "System wide mode unsupported on this platform."
+msgstr "System-Modus auf dieser Plattform nicht unterstützt."
-#: ../src/pulse/channelmap.c:128
-msgid "Auxiliary 5"
-msgstr "Zusatz 5"
+#: ../src/daemon/main.c:484
+msgid "Failed to parse command line."
+msgstr "Befehlszeile konnte nicht ausgewertet werden."
-#: ../src/pulse/channelmap.c:129
-msgid "Auxiliary 6"
-msgstr "Zusatz 6"
+#: ../src/daemon/main.c:523
+msgid ""
+"System mode refused for non-root user. Only starting the D-Bus server lookup "
+"service."
+msgstr ""
+"Der Systemmodus wurde für einen Nicht-Root-Benutzer verweigert. Es wird nur "
+"der Suchdienst für D-Bus-Server gestartet."
-#: ../src/pulse/channelmap.c:130
-msgid "Auxiliary 7"
-msgstr "Zusatz 7"
+#: ../src/daemon/main.c:622
+#, c-format
+msgid "Failed to kill daemon: %s"
+msgstr "Hintergrundprozess konnte nicht abgebrochen werden: %s"
-#: ../src/pulse/channelmap.c:131
-msgid "Auxiliary 8"
-msgstr "Zusatz 8"
+#: ../src/daemon/main.c:651
+msgid ""
+"This program is not intended to be run as root (unless --system is "
+"specified)."
+msgstr ""
+"Dieses Programm sollte ohne die Option --system nicht als Administrator "
+"ausgeführt werden."
-#: ../src/pulse/channelmap.c:132
-msgid "Auxiliary 9"
-msgstr "Zusatz 9"
+#: ../src/daemon/main.c:654
+msgid "Root privileges required."
+msgstr "Root-Berechtigungen benötigt."
-#: ../src/pulse/channelmap.c:133
-msgid "Auxiliary 10"
-msgstr "Zusatz 10"
+#: ../src/daemon/main.c:661
+msgid "--start not supported for system instances."
+msgstr "--start wird für System-Instanzen nicht unterstützt."
-#: ../src/pulse/channelmap.c:134
-msgid "Auxiliary 11"
-msgstr "Zusatz 11"
+#: ../src/daemon/main.c:701
+#, c-format
+msgid "User-configured server at %s, refusing to start/autospawn."
+msgstr ""
+"Durch Benutzer eingerichteter Server auf %s, Start oder Autospawn wird "
+"verweigert."
-#: ../src/pulse/channelmap.c:135
-msgid "Auxiliary 12"
-msgstr "Zusatz 12"
+#: ../src/daemon/main.c:707
+#, c-format
+msgid ""
+"User-configured server at %s, which appears to be local. Probing deeper."
+msgstr ""
+"Durch Benutzer eingerichteter Server auf %s, welcher lokal zu sein scheint. "
+"Weitere Prüfungen werden ausgeführt."
-#: ../src/pulse/channelmap.c:136
-msgid "Auxiliary 13"
-msgstr "Zusatz 13"
+#: ../src/daemon/main.c:712
+msgid "Running in system mode, but --disallow-exit not set."
+msgstr "System-Modus aktiv, jedoch --disallow-exit nicht gesetzt."
-#: ../src/pulse/channelmap.c:137
-msgid "Auxiliary 14"
-msgstr "Zusatz 14"
+#: ../src/daemon/main.c:715
+msgid "Running in system mode, but --disallow-module-loading not set."
+msgstr "System-Modus aktiv, jedoch --disallow-module-loading nicht gesetzt."
-#: ../src/pulse/channelmap.c:138
-msgid "Auxiliary 15"
-msgstr "Zusatz 15"
+#: ../src/daemon/main.c:718
+msgid "Running in system mode, forcibly disabling SHM mode."
+msgstr "System-Modus aktiv, SHM-Modus gezwungenermaßen deaktiviert."
-#: ../src/pulse/channelmap.c:139
-msgid "Auxiliary 16"
-msgstr "Zusatz 16"
+#: ../src/daemon/main.c:723
+msgid "Running in system mode, forcibly disabling exit idle time."
+msgstr "System-Modus aktiv, Exit-Idle-Time gezwungenermaßen deaktiviert."
-#: ../src/pulse/channelmap.c:140
-msgid "Auxiliary 17"
-msgstr "Zusatz 17"
+#: ../src/daemon/main.c:756
+msgid "Failed to acquire stdio."
+msgstr "Reservieren von STDIO fehlgeschlagen."
-#: ../src/pulse/channelmap.c:141
-msgid "Auxiliary 18"
-msgstr "Zusatz 18"
+#: ../src/daemon/main.c:762 ../src/daemon/main.c:833
+#, c-format
+msgid "pipe() failed: %s"
+msgstr "pipe() fehlgeschlagen: %s"
-#: ../src/pulse/channelmap.c:142
-msgid "Auxiliary 19"
-msgstr "Zusatz 19"
+#: ../src/daemon/main.c:767 ../src/daemon/main.c:838
+#, c-format
+msgid "fork() failed: %s"
+msgstr "fork() fehlgeschlagen: %s"
-#: ../src/pulse/channelmap.c:143
-msgid "Auxiliary 20"
-msgstr "Zusatz 20"
+#: ../src/daemon/main.c:782 ../src/daemon/main.c:853 ../src/utils/pacat.c:568
+#, c-format
+msgid "read() failed: %s"
+msgstr "read() fehlgeschlagen: %s"
-#: ../src/pulse/channelmap.c:144
-msgid "Auxiliary 21"
-msgstr "Zusatz 21"
+#: ../src/daemon/main.c:788
+msgid "Daemon startup failed."
+msgstr "Start des Hintergrunddienstes fehlgeschlagen."
-#: ../src/pulse/channelmap.c:145
-msgid "Auxiliary 22"
-msgstr "Zusatz 22"
+#: ../src/daemon/main.c:821
+#, c-format
+msgid "setsid() failed: %s"
+msgstr "setsid() fehlgeschlagen: %s"
-#: ../src/pulse/channelmap.c:146
-msgid "Auxiliary 23"
-msgstr "Zusatz 23"
+#: ../src/daemon/main.c:948
+msgid "Failed to get machine ID"
+msgstr "Beziehen der Maschinen-ID fehlgeschlagen"
-#: ../src/pulse/channelmap.c:147
-msgid "Auxiliary 24"
-msgstr "Zusatz 24"
+#: ../src/daemon/main.c:974
+msgid ""
+"OK, so you are running PA in system mode. Please make sure that you actually "
+"do want to do that.\n"
+"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
+"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
+"mode is usually a bad idea."
+msgstr ""
+"OK, nun wird PulseAudio im Systemmodus betrieben. Bitte überlegen Sie, ob "
+"Sie dies wirklich tun wollen.\n"
+"Für eine Erklärung, warum der Systemmodus eine schlechte Idee ist, lesen Sie "
+"bitte http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/"
+"WhatIsWrongWithSystemWide/."
-#: ../src/pulse/channelmap.c:148
-msgid "Auxiliary 25"
-msgstr "Zusatz 25"
+#: ../src/daemon/main.c:990
+msgid "pa_pid_file_create() failed."
+msgstr "pa_pid_file_create() fehlgeschlagen."
-#: ../src/pulse/channelmap.c:149
-msgid "Auxiliary 26"
-msgstr "Zusatz 26"
+#: ../src/daemon/main.c:1022
+msgid "pa_core_new() failed."
+msgstr "pa_core_new() fehlgeschlagen."
-#: ../src/pulse/channelmap.c:150
-msgid "Auxiliary 27"
-msgstr "Zusatz 26"
+#: ../src/daemon/main.c:1090
+msgid "Failed to initialize daemon."
+msgstr "Hintergrunddienst konnte nicht initialisiert werden."
-#: ../src/pulse/channelmap.c:151
-msgid "Auxiliary 28"
-msgstr "Zusatz 28"
+#: ../src/daemon/main.c:1095
+msgid "Daemon startup without any loaded modules, refusing to work."
+msgstr "Hintergrunddienst verweigert Ausführung, da keine Module geladen."
-#: ../src/pulse/channelmap.c:152
-msgid "Auxiliary 29"
-msgstr "Zusatz 29"
+#: ../src/daemon/pulseaudio.desktop.in.h:1
+msgid "PulseAudio Sound System"
+msgstr "PulseAudio Soundsystem"
-#: ../src/pulse/channelmap.c:153
-msgid "Auxiliary 30"
-msgstr "Zusatz 30"
-
-#: ../src/pulse/channelmap.c:154
-msgid "Auxiliary 31"
-msgstr "Zusatz 31"
+#: ../src/daemon/pulseaudio.desktop.in.h:2
+msgid "Start the PulseAudio Sound System"
+msgstr "Das PulseAudio Soundsystem starten"
-#: ../src/pulse/channelmap.c:156
-msgid "Top Center"
-msgstr "Oben Mitte"
+#: ../src/modules/alsa/alsa-mixer.c:2378
+msgid "Input"
+msgstr "Eingabe"
-#: ../src/pulse/channelmap.c:158
-msgid "Top Front Center"
-msgstr "Oben Vorne Mitte"
+#: ../src/modules/alsa/alsa-mixer.c:2379
+msgid "Docking Station Input"
+msgstr "Eingabe über Docking-Station"
-#: ../src/pulse/channelmap.c:159
-msgid "Top Front Left"
-msgstr "Oben Vorne Links"
+#: ../src/modules/alsa/alsa-mixer.c:2380
+msgid "Docking Station Microphone"
+msgstr "Mikrofon der Docking-Station"
-#: ../src/pulse/channelmap.c:160
-msgid "Top Front Right"
-msgstr "Oben Vorne Rechts"
+#: ../src/modules/alsa/alsa-mixer.c:2381
+msgid "Docking Station Line In"
+msgstr "Line-Eingang der Docking-Station"
-#: ../src/pulse/channelmap.c:162
-msgid "Top Rear Center"
-msgstr "Oben Hinten Mitte"
+#: ../src/modules/alsa/alsa-mixer.c:2382 ../src/modules/alsa/alsa-mixer.c:2467
+msgid "Line In"
+msgstr "Line-Eingang"
-#: ../src/pulse/channelmap.c:163
-msgid "Top Rear Left"
-msgstr "Oben Hinten Links"
+#: ../src/modules/alsa/alsa-mixer.c:2383 ../src/modules/alsa/alsa-mixer.c:2461
+#: ../src/modules/bluetooth/module-bluez4-device.c:2099
+#: ../src/modules/bluetooth/module-bluez5-device.c:1710
+msgid "Microphone"
+msgstr "Mikrofon"
-#: ../src/pulse/channelmap.c:164
-msgid "Top Rear Right"
-msgstr "Oben Hinten Rechts"
+#: ../src/modules/alsa/alsa-mixer.c:2384 ../src/modules/alsa/alsa-mixer.c:2462
+msgid "Front Microphone"
+msgstr "Vorderes Mikrofon"
-#: ../src/pulse/channelmap.c:484 ../src/pulse/sample.c:169
-#: ../src/pulse/volume.c:297 ../src/pulse/volume.c:323
-#: ../src/pulse/volume.c:343 ../src/pulse/volume.c:373
-#: ../src/pulse/format.c:125
-msgid "(invalid)"
-msgstr "(ungültig)"
+#: ../src/modules/alsa/alsa-mixer.c:2385 ../src/modules/alsa/alsa-mixer.c:2463
+msgid "Rear Microphone"
+msgstr "Rückwärtiges Mikrofon"
-#: ../src/pulse/channelmap.c:761
-msgid "Stereo"
-msgstr "Stereo"
+#: ../src/modules/alsa/alsa-mixer.c:2386
+msgid "External Microphone"
+msgstr "Externes Mikrofon"
-#: ../src/pulse/channelmap.c:766
-msgid "Surround 4.0"
-msgstr "Surround 4.0"
+#: ../src/modules/alsa/alsa-mixer.c:2387 ../src/modules/alsa/alsa-mixer.c:2465
+msgid "Internal Microphone"
+msgstr "Internes Mikrofon"
-#: ../src/pulse/channelmap.c:772
-msgid "Surround 4.1"
-msgstr "Surround 4.1"
+#: ../src/modules/alsa/alsa-mixer.c:2388 ../src/modules/alsa/alsa-mixer.c:2468
+msgid "Radio"
+msgstr "Radio"
-#: ../src/pulse/channelmap.c:778
-msgid "Surround 5.0"
-msgstr "Surround 5.0"
+#: ../src/modules/alsa/alsa-mixer.c:2389 ../src/modules/alsa/alsa-mixer.c:2469
+msgid "Video"
+msgstr "Video"
-#: ../src/pulse/channelmap.c:784
-msgid "Surround 5.1"
-msgstr "Surround 5.1"
+#: ../src/modules/alsa/alsa-mixer.c:2390
+msgid "Automatic Gain Control"
+msgstr "Automatische Verstärkungsregelung"
-#: ../src/pulse/channelmap.c:791
-msgid "Surround 7.1"
-msgstr "Surround 7.1"
+#: ../src/modules/alsa/alsa-mixer.c:2391
+msgid "No Automatic Gain Control"
+msgstr "Keine automatische Verstärkungsregelung"
-#: ../src/pulse/error.c:40
-msgid "OK"
-msgstr "OK"
+#: ../src/modules/alsa/alsa-mixer.c:2392
+msgid "Boost"
+msgstr "Boost"
-#: ../src/pulse/error.c:41
-msgid "Access denied"
-msgstr "Zugriff verweigert"
+#: ../src/modules/alsa/alsa-mixer.c:2393
+msgid "No Boost"
+msgstr "Kein Boost"
-#: ../src/pulse/error.c:42
-msgid "Unknown command"
-msgstr "Unbekannter Befehl"
+#: ../src/modules/alsa/alsa-mixer.c:2394
+msgid "Amplifier"
+msgstr "Verstärker"
-#: ../src/pulse/error.c:43
-msgid "Invalid argument"
-msgstr "Ungültiger Parameter"
+#: ../src/modules/alsa/alsa-mixer.c:2395
+msgid "No Amplifier"
+msgstr "Kein Verstärker"
-#: ../src/pulse/error.c:44
-msgid "Entity exists"
-msgstr "Entität existiert bereits"
+#: ../src/modules/alsa/alsa-mixer.c:2396
+msgid "Bass Boost"
+msgstr "Bassverstärkung"
-#: ../src/pulse/error.c:45
-msgid "No such entity"
-msgstr "Entität nicht vorhanden"
+#: ../src/modules/alsa/alsa-mixer.c:2397
+msgid "No Bass Boost"
+msgstr "Keine Bassverstärkung"
-#: ../src/pulse/error.c:46
-msgid "Connection refused"
-msgstr "Verbindung verweigert"
+#: ../src/modules/alsa/alsa-mixer.c:2398
+#: ../src/modules/bluetooth/module-bluez4-device.c:2104
+#: ../src/modules/bluetooth/module-bluez5-device.c:1717
+msgid "Speaker"
+msgstr "Lautsprecher"
-#: ../src/pulse/error.c:47
-msgid "Protocol error"
-msgstr "Protokollfehler"
+#: ../src/modules/alsa/alsa-mixer.c:2399 ../src/modules/alsa/alsa-mixer.c:2471
+msgid "Headphones"
+msgstr "Kopfhörer"
-#: ../src/pulse/error.c:48
-msgid "Timeout"
-msgstr "Zeitüberschreitung"
+#: ../src/modules/alsa/alsa-mixer.c:2460
+msgid "Analog Input"
+msgstr "Analoger Eingang"
-#: ../src/pulse/error.c:49
-msgid "No authorization key"
-msgstr "Kein Authorisierungsschlüssel"
+#: ../src/modules/alsa/alsa-mixer.c:2464
+msgid "Dock Microphone"
+msgstr "Mikrofon der Docking-Station"
-#: ../src/pulse/error.c:50
-msgid "Internal error"
-msgstr "Interner Fehler"
+#: ../src/modules/alsa/alsa-mixer.c:2466
+msgid "Headset Microphone"
+msgstr "Mikrofon am Kopfhörer"
-#: ../src/pulse/error.c:51
-msgid "Connection terminated"
-msgstr "Verbindung beendet"
+#: ../src/modules/alsa/alsa-mixer.c:2470
+msgid "Analog Output"
+msgstr "Analoge Ausgabe"
-#: ../src/pulse/error.c:52
-msgid "Entity killed"
-msgstr "Entität terminiert"
+#: ../src/modules/alsa/alsa-mixer.c:2472
+msgid "LFE on Separate Mono Output"
+msgstr "LFE mit separater Mono-Ausgabe"
-#: ../src/pulse/error.c:53
-msgid "Invalid server"
-msgstr "Ungültiger Server"
+#: ../src/modules/alsa/alsa-mixer.c:2473
+msgid "Line Out"
+msgstr "Line-Ausgang"
-#: ../src/pulse/error.c:54
-msgid "Module initialization failed"
-msgstr "Modulinitialisierung fehlgeschlagen"
+#: ../src/modules/alsa/alsa-mixer.c:2474
+msgid "Analog Mono Output"
+msgstr "Analoge Mono-Ausgabe"
-#: ../src/pulse/error.c:55
-msgid "Bad state"
-msgstr "Ungültiger Zustand"
+#: ../src/modules/alsa/alsa-mixer.c:2475
+msgid "Speakers"
+msgstr "Lautsprecher"
-#: ../src/pulse/error.c:56
-msgid "No data"
-msgstr "Keine Daten"
+#: ../src/modules/alsa/alsa-mixer.c:2476
+msgid "HDMI / DisplayPort"
+msgstr "HDMI / DisplayPort"
-#: ../src/pulse/error.c:57
-msgid "Incompatible protocol version"
-msgstr "Inkompatible Protokollversion"
+#: ../src/modules/alsa/alsa-mixer.c:2477
+msgid "Digital Output (S/PDIF)"
+msgstr "Digitalausgang (S/PDIF)"
-#: ../src/pulse/error.c:58
-msgid "Too large"
-msgstr "Zu groß"
+#: ../src/modules/alsa/alsa-mixer.c:2478
+msgid "Digital Input (S/PDIF)"
+msgstr "Digitaleingang (S/PDIF)"
-#: ../src/pulse/error.c:59
-msgid "Not supported"
-msgstr "Nicht unterstützt"
+#: ../src/modules/alsa/alsa-mixer.c:2479
+msgid "Digital Passthrough (S/PDIF)"
+msgstr "Digitale Durchschleifung (S/PDIF)"
-#: ../src/pulse/error.c:60
-msgid "Unknown error code"
-msgstr "Unbekannter Fehlercode"
+#: ../src/modules/alsa/alsa-mixer.c:2480
+msgid "Multichannel Input"
+msgstr "Mehrkanaleingang"
-#: ../src/pulse/error.c:61
-msgid "No such extension"
-msgstr "Erweiterung nicht vorhanden"
+#: ../src/modules/alsa/alsa-mixer.c:2481
+msgid "Multichannel Output"
+msgstr "Mehrkanalausgang"
-#: ../src/pulse/error.c:62
-msgid "Obsolete functionality"
-msgstr "Veraltete Funktion"
+#: ../src/modules/alsa/alsa-mixer.c:3990
+msgid "Analog Mono"
+msgstr "Analog Mono"
-#: ../src/pulse/error.c:63
-msgid "Missing implementation"
-msgstr "Fehlende Implementation"
+#. Note: Not translated to "Analog Stereo Input", because the source
+#. * name gets "Input" appended to it automatically, so adding "Input"
+#. * here would lead to the source name to become "Analog Stereo Input
+#. * Input". The same logic applies to analog-stereo-output,
+#. * multichannel-input and multichannel-output.
+#: ../src/modules/alsa/alsa-mixer.c:3991 ../src/modules/alsa/alsa-mixer.c:3997
+#: ../src/modules/alsa/alsa-mixer.c:3998
+msgid "Analog Stereo"
+msgstr "Analog Stereo"
-#: ../src/pulse/error.c:64
-msgid "Client forked"
-msgstr "Client geteilt"
+#: ../src/modules/alsa/alsa-mixer.c:3999 ../src/modules/alsa/alsa-mixer.c:4000
+msgid "Multichannel"
+msgstr "Mehrkanal"
-#: ../src/pulse/error.c:65
-msgid "Input/Output error"
-msgstr "Eingabe/Ausgabe-Fehler"
+#: ../src/modules/alsa/alsa-mixer.c:4001
+msgid "Analog Surround 2.1"
+msgstr "Analog Surround 2.1"
-#: ../src/pulse/error.c:66
-msgid "Device or resource busy"
-msgstr "Gerät oder Ressource beschäftigt"
+#: ../src/modules/alsa/alsa-mixer.c:4002
+msgid "Analog Surround 3.0"
+msgstr "Analog Surround 3.0"
-#: ../src/pulse/sample.c:171
-#, c-format
-msgid "%s %uch %uHz"
-msgstr "%s %uch %uHz"
+#: ../src/modules/alsa/alsa-mixer.c:4003
+msgid "Analog Surround 3.1"
+msgstr "Analog Surround 3.1"
-#: ../src/pulse/sample.c:183
-#, c-format
-msgid "%0.1f GiB"
-msgstr "%0.1f GB"
+#: ../src/modules/alsa/alsa-mixer.c:4004
+msgid "Analog Surround 4.0"
+msgstr "Analog Surround 4.0"
-#: ../src/pulse/sample.c:185
-#, c-format
-msgid "%0.1f MiB"
-msgstr "%0.1f MB"
+#: ../src/modules/alsa/alsa-mixer.c:4005
+msgid "Analog Surround 4.1"
+msgstr "Analog Surround 4.1"
-#: ../src/pulse/sample.c:187
-#, c-format
-msgid "%0.1f KiB"
-msgstr "%0.1f KB"
+#: ../src/modules/alsa/alsa-mixer.c:4006
+msgid "Analog Surround 5.0"
+msgstr "Analog Surround 5.0"
-#: ../src/pulse/sample.c:189
-#, c-format
-msgid "%u B"
-msgstr "%u B"
+#: ../src/modules/alsa/alsa-mixer.c:4007
+msgid "Analog Surround 5.1"
+msgstr "Analog Surround 5.1"
-#: ../src/pulse/client-conf-x11.c:54 ../src/utils/pax11publish.c:100
-#, fuzzy
-msgid "xcb_connect() failed"
-msgstr "pa_context_new() fehlgeschlagen: %s"
+#: ../src/modules/alsa/alsa-mixer.c:4008
+msgid "Analog Surround 6.0"
+msgstr "Analog Surround 6.0"
-#: ../src/pulse/client-conf-x11.c:59 ../src/utils/pax11publish.c:105
-msgid "xcb_connection_has_error() returned true"
-msgstr ""
+#: ../src/modules/alsa/alsa-mixer.c:4009
+msgid "Analog Surround 6.1"
+msgstr "Analog Surround 6.1"
-#: ../src/pulse/client-conf-x11.c:97
-msgid "Failed to parse cookie data"
-msgstr "Parsen der Cookie-Daten fehlgeschlagen"
+#: ../src/modules/alsa/alsa-mixer.c:4010
+msgid "Analog Surround 7.0"
+msgstr "Analog Surround 7.0"
-#: ../src/pulse/client-conf.c:117
-#, c-format
-msgid "Failed to open configuration file '%s': %s"
-msgstr "Konfigurationsdatei '%s' konnte nicht geöffnet werden: %s"
+#: ../src/modules/alsa/alsa-mixer.c:4011
+msgid "Analog Surround 7.1"
+msgstr "Analog Surround 7.1"
-#: ../src/pulse/context.c:528
-msgid "No cookie loaded. Attempting to connect without."
-msgstr "Verbindungsversuch ohne Cookie, da keines geladen."
+#: ../src/modules/alsa/alsa-mixer.c:4012
+msgid "Digital Stereo (IEC958)"
+msgstr "Digital Stereo (IEC958)"
-#: ../src/pulse/context.c:675
-#, c-format
-msgid "fork(): %s"
-msgstr "fork(): %s"
+#: ../src/modules/alsa/alsa-mixer.c:4013
+msgid "Digital Passthrough (IEC958)"
+msgstr "Digitale Durchschleifung (IEC958)"
-#: ../src/pulse/context.c:730
-#, c-format
-msgid "waitpid(): %s"
-msgstr "waitpid(): %s"
+#: ../src/modules/alsa/alsa-mixer.c:4014
+msgid "Digital Surround 4.0 (IEC958/AC3)"
+msgstr "Digital Surround 4.0 (IEC958/AC3)"
-#: ../src/pulse/context.c:1431
-#, c-format
-msgid "Received message for unknown extension '%s'"
-msgstr "Nachricht für unbekannte Erweiterung '%s' erhalten"
+#: ../src/modules/alsa/alsa-mixer.c:4015
+msgid "Digital Surround 5.1 (IEC958/AC3)"
+msgstr "Digital Surround 5.1 (IEC958/AC3)"
-#: ../src/utils/pacat.c:112
-#, c-format
-msgid "Failed to drain stream: %s"
-msgstr "Entleeren des Streams fehlgeschlagen: %s"
+#: ../src/modules/alsa/alsa-mixer.c:4016
+msgid "Digital Surround 5.1 (IEC958/DTS)"
+msgstr "Digital Surround 5.1 (IEC958/DTS)"
-#: ../src/utils/pacat.c:117
-msgid "Playback stream drained."
-msgstr "Wiedergabe-Stream entleert."
+#: ../src/modules/alsa/alsa-mixer.c:4017
+msgid "Digital Stereo (HDMI)"
+msgstr "Digital Stereo (HDMI)"
-#: ../src/utils/pacat.c:128
-msgid "Draining connection to server."
-msgstr "Verbindung zu Server entleert."
+#: ../src/modules/alsa/alsa-mixer.c:4018
+msgid "Digital Surround 5.1 (HDMI)"
+msgstr "Digital Surround 5.1 (HDMI)"
-#: ../src/utils/pacat.c:141
-#, c-format
-msgid "pa_stream_drain(): %s"
-msgstr "pa_stream_drain(): %s"
+#: ../src/modules/alsa/alsa-mixer.c:4151
+msgid "Analog Mono Duplex"
+msgstr "Analog Mono Duplex"
-#: ../src/utils/pacat.c:164
-#, c-format
-msgid "pa_stream_write() failed: %s"
-msgstr "pa_stream_write() fehlgeschlagen: %s"
+#: ../src/modules/alsa/alsa-mixer.c:4152
+msgid "Analog Stereo Duplex"
+msgstr "Analog Stereo Duplex"
-#: ../src/utils/pacat.c:205
-#, c-format
-msgid "pa_stream_begin_write() failed: %s"
-msgstr "pa_stream_write() fehlgeschlagen: %s"
+#: ../src/modules/alsa/alsa-mixer.c:4153
+msgid "Digital Stereo Duplex (IEC958)"
+msgstr "Digital Stereo Duplex (IEC958)"
-#: ../src/utils/pacat.c:255 ../src/utils/pacat.c:285
-#, c-format
-msgid "pa_stream_peek() failed: %s"
-msgstr "pa_stream_peek() fehlgeschlagen: %s"
+#: ../src/modules/alsa/alsa-mixer.c:4154
+msgid "Multichannel Duplex"
+msgstr "Mehrkanal-Duplex"
-#: ../src/utils/pacat.c:325
-msgid "Stream successfully created."
-msgstr "Stream wurde erfolgreich erstellt."
+#: ../src/modules/alsa/alsa-mixer.c:4155
+#: ../src/modules/alsa/module-alsa-card.c:186
+#: ../src/modules/bluetooth/module-bluez4-device.c:2319
+#: ../src/modules/bluetooth/module-bluez5-device.c:1965
+msgid "Off"
+msgstr "Aus"
-#: ../src/utils/pacat.c:328
+#: ../src/modules/alsa/alsa-mixer.c:4254
#, c-format
-msgid "pa_stream_get_buffer_attr() failed: %s"
-msgstr "pa_stream_get_buffer_attr() fehlgeschlagen: %s"
+msgid "%s Output"
+msgstr "%s-Ausgabe"
-#: ../src/utils/pacat.c:332
+#: ../src/modules/alsa/alsa-mixer.c:4262
#, c-format
-msgid "Buffer metrics: maxlength=%u, tlength=%u, prebuf=%u, minreq=%u"
-msgstr "Pufferdaten: maxlenght=%u, tlength=%u, prebuf=%u, minreq=%u"
+msgid "%s Input"
+msgstr "%s-Eingabe"
-#: ../src/utils/pacat.c:335
+#: ../src/modules/alsa/alsa-sink.c:570
#, c-format
-msgid "Buffer metrics: maxlength=%u, fragsize=%u"
-msgstr "Pufferdaten: maxlength=%u, fragsize=%u"
+msgid ""
+"ALSA woke us up to write new data to the device, but there was actually "
+"nothing to write.\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers.\n"
+"We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() "
+"returned 0 or another value < min_avail."
+msgstr ""
+"ALSA weckte uns auf, um neue Daten auf das Gerät zu schreiben, doch es gab "
+"nichts zum Schreiben!\n"
+"Dies ist höchstwahrscheinlich ein Fehler im ALSA-Treiber »%s«. Bitte melden "
+"Sie diesen Fehler den ALSA-Entwicklern.\n"
+"Wir wurden durch das POLLOUT-Set geweckt, allerdings lieferte ein "
+"anschließender snd_pcm_avail() den Wert 0 oder einen anderen Wert < "
+"min_avail."
-#: ../src/utils/pacat.c:339
+#: ../src/modules/alsa/alsa-sink.c:747
#, c-format
-msgid "Using sample spec '%s', channel map '%s'."
-msgstr "Benutze Sample-Angabe '%s', Kanalzuordnung '%s'."
+msgid ""
+"ALSA woke us up to write new data to the device, but there was actually "
+"nothing to write!\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers.\n"
+"We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() "
+"returned 0 or another value < min_avail."
+msgstr ""
+"ALSA weckte uns auf, um neue Daten auf das Gerät zu schreiben, doch es gab "
+"nichts zum Schreiben!\n"
+"Dies ist höchstwahrscheinlich ein Fehler im ALSA-Treiber »%s«. Bitte melden "
+"Sie diesen Fehler den ALSA-Entwicklern.\n"
+"Wir wurden durch das POLLOUT-Set geweckt, allerdings lieferte ein "
+"anschließender snd_pcm_avail() den Wert 0 oder einen anderen Wert < "
+"min_avail."
-#: ../src/utils/pacat.c:343
+#: ../src/modules/alsa/alsa-source.c:529
#, c-format
-msgid "Connected to device %s (%u, %ssuspended)."
-msgstr "Verbunden mit Gerät %s (%u, %sausgesetzt)."
+msgid ""
+"ALSA woke us up to read new data from the device, but there was actually "
+"nothing to read.\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers.\n"
+"We were woken up with POLLIN set -- however a subsequent snd_pcm_avail() "
+"returned 0 or another value < min_avail."
+msgstr ""
+"ALSA weckte uns auf, um neue Daten vom Gerät zu lesen, doch es gab nichts "
+"zum Lesen!\n"
+"Dies ist höchstwahrscheinlich ein Fehler im ALSA-Treiber »%s«. Bitte melden "
+"Sie diesen Fehler den ALSA-Entwicklern.\n"
+"Wir wurden durch das POLLIN-Set geweckt, allerdings lieferte ein "
+"anschließender snd_pcm_avail() den Wert 0 oder einen anderen Wert < "
+"min_avail."
-#: ../src/utils/pacat.c:353
+#: ../src/modules/alsa/alsa-source.c:680
#, c-format
-msgid "Stream error: %s"
-msgstr "Stream-Fehler: %s"
+msgid ""
+"ALSA woke us up to read new data from the device, but there was actually "
+"nothing to read!\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers.\n"
+"We were woken up with POLLIN set -- however a subsequent snd_pcm_avail() "
+"returned 0 or another value < min_avail."
+msgstr ""
+"ALSA weckte uns auf, um neue Daten vom Gerät zu lesen, doch es gab nichts "
+"zum Lesen!\n"
+"Dies ist höchstwahrscheinlich ein Fehler im ALSA-Treiber »%s«. Bitte melden "
+"Sie diesen Fehler den ALSA-Entwicklern.\n"
+"Wir wurden durch das POLLIN-Set geweckt, allerdings lieferte ein "
+"anschließender snd_pcm_avail() den Wert 0 oder einen anderen Wert < "
+"min_avail."
-#: ../src/utils/pacat.c:363
+#: ../src/modules/alsa/alsa-util.c:1166 ../src/modules/alsa/alsa-util.c:1241
#, c-format
-msgid "Stream device suspended.%s"
-msgstr "Stream-Gerät ausgesetzt.%s"
+msgid ""
+"snd_pcm_avail() returned a value that is exceptionally large: %lu bytes (%lu "
+"ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgstr ""
+"snd_pcm_avail() gibt einen Wert zurück, der außerordentlich groß ist: %lu "
+"bytes (%lu ms).\n"
+"Dies ist wahrscheinlich ein Fehler im ALSA-Treiber »%s«. Bitte melden Sie "
+"dieses Problem den ALSA-Entwicklern."
-#: ../src/utils/pacat.c:365
+#: ../src/modules/alsa/alsa-util.c:1216
#, c-format
-msgid "Stream device resumed.%s"
-msgstr "Stream-Gerät reaktiviert.%s"
+msgid ""
+"snd_pcm_delay() returned a value that is exceptionally large: %li bytes (%s"
+"%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgstr ""
+"snd_pcm_delay() gibt einen Wert zurück, der außerordentlich groß ist: %li "
+"Bytes (%s%lu ms).\n"
+"Dies ist wahrscheinlich ein Fehler im ALSA-Treiber »%s«. Bitte melden Sie "
+"dieses Problem den ALSA-Entwicklern."
-#: ../src/utils/pacat.c:373
+#: ../src/modules/alsa/alsa-util.c:1257
#, c-format
-msgid "Stream underrun.%s"
-msgstr "Stream leergelaufen.%s"
+msgid ""
+"snd_pcm_avail_delay() returned strange values: delay %lu is less than avail "
+"%lu.\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgstr ""
+"snd_pcm_avail_delay() gibt einen ungewöhnlichen Wert zurück: Verzögerung %lu "
+"ist kleiner als das verfügbare %lu.\n"
+"Dies ist wahrscheinlich ein Fehler im ALSA-Treiber »%s«. Bitte melden Sie "
+"dieses Problem den ALSA-Entwicklern."
-#: ../src/utils/pacat.c:380
+#: ../src/modules/alsa/alsa-util.c:1300
#, c-format
-msgid "Stream overrun.%s"
-msgstr "Stream überlaufen.%s "
+msgid ""
+"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu bytes "
+"(%lu ms).\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers."
+msgstr ""
+"snd_pcm_mmap_begin() gibt einen Wert zurück, der außerordentlich groß ist: "
+"%lu Bytes (%lu ms).\n"
+"Dies ist wahrscheinlich ein Fehler im ALSA-Treiber »%s«. Bitte melden Sie "
+"dieses Problem den ALSA-Entwicklern."
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2089
+#: ../src/modules/bluetooth/module-bluez5-device.c:1700
+msgid "Headset"
+msgstr "Headset"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2094
+#: ../src/modules/bluetooth/module-bluez5-device.c:1705
+msgid "Handsfree"
+msgstr "Freisprecheinrichtung"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2109
+#: ../src/modules/bluetooth/module-bluez5-device.c:1723
+msgid "Headphone"
+msgstr "Kopfhörer"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2114
+#: ../src/modules/bluetooth/module-bluez5-device.c:1728
+msgid "Portable"
+msgstr ""
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2119
+#: ../src/modules/bluetooth/module-bluez5-device.c:1733
+msgid "Car"
+msgstr "Auto"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2124
+#: ../src/modules/bluetooth/module-bluez5-device.c:1738
+msgid "HiFi"
+msgstr "HiFi"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2129
+#: ../src/modules/bluetooth/module-bluez5-device.c:1743
+msgid "Phone"
+msgstr "Telefon"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2137
+#: ../src/modules/bluetooth/module-bluez5-device.c:1695
+#: ../src/modules/bluetooth/module-bluez5-device.c:1711
+#: ../src/modules/bluetooth/module-bluez5-device.c:1749
+msgid "Bluetooth Output"
+msgstr "Bluetooth-Ausgabe"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2140
+#: ../src/modules/bluetooth/module-bluez5-device.c:1694
+#: ../src/modules/bluetooth/module-bluez5-device.c:1716
+#: ../src/modules/bluetooth/module-bluez5-device.c:1722
+#: ../src/modules/bluetooth/module-bluez5-device.c:1748
+msgid "Bluetooth Input"
+msgstr "Bluetooth-Eingabe"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2181
+msgid "High Fidelity Playback (A2DP)"
+msgstr "High Fidelity Playback (A2DP)"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2193
+msgid "High Fidelity Capture (A2DP)"
+msgstr "High Fidelity Capture (A2DP)"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2205
+msgid "Telephony Duplex (HSP/HFP)"
+msgstr "Telephony Duplex (HSP/HFP)"
+
+#: ../src/modules/bluetooth/module-bluez4-device.c:2218
+msgid "Handsfree Gateway"
+msgstr ""
+
+#: ../src/modules/bluetooth/module-bluez5-device.c:1790
+msgid "High Fidelity Playback (A2DP Sink)"
+msgstr "High Fidelity Playback (A2DP-Ziel)"
+
+#: ../src/modules/bluetooth/module-bluez5-device.c:1802
+msgid "High Fidelity Capture (A2DP Source)"
+msgstr "High Fidelity Capture (A2DP-Quelle)"
+
+#: ../src/modules/bluetooth/module-bluez5-device.c:1814
+msgid "Headset Head Unit (HSP/HFP)"
+msgstr ""
+
+#: ../src/modules/bluetooth/module-bluez5-device.c:1827
+msgid "Headset Audio Gateway (HSP/HFP)"
+msgstr ""
+
+#: ../src/modules/echo-cancel/module-echo-cancel.c:61
+msgid ""
+"source_name=<name for the source> source_properties=<properties for the "
+"source> source_master=<name of source to filter> sink_name=<name for the "
+"sink> sink_properties=<properties for the sink> sink_master=<name of sink to "
+"filter> adjust_time=<how often to readjust rates in s> adjust_threshold=<how "
+"much drift to readjust after in ms> format=<sample format> rate=<sample "
+"rate> channels=<number of channels> channel_map=<channel map> "
+"aec_method=<implementation to use> aec_args=<parameters for the AEC engine> "
+"save_aec=<save AEC data in /tmp> autoloaded=<set if this module is being "
+"loaded automatically> use_volume_sharing=<yes or no> use_master_format=<yes "
+"or no> "
+msgstr ""
+"source_name=<Name der Quelle> source_properties=<Eigenschaften der Quelle> "
+"source_master=<Name der zu filternden Quelle> sink_name=<Name des Ziels> "
+"sink_properties=<Eigenschaften des Ziels> sink_master=<Name des zu "
+"filternden Ziels> adjust_time=<Intervall zur Neujustierung der Rate in "
+"Sekunden> adjust_threshold=<maximale Abweichung zur Neujustierung in "
+"Millisekunden> format=<Sample-Format> rate=<Samplerate> channels=<Anzahl der "
+"Kanäle> channel_map=<Kanalzuordnung> aec_method=<zu verwendende "
+"Implementation> aec_args=<Parameter für die AEC-Engine> "
+"save_aec=<Speicherung der AEC-Daten in /tmp> autoloaded=<setzen, wenn dieses "
+"Modul automatisch geladen wird> use_volume_sharing=<yes oder no> "
+"use_master_format=<yes oder no> "
+
+#. add on profile
+#: ../src/modules/macosx/module-coreaudio-device.c:811
+msgid "On"
+msgstr "Ein"
+
+#: ../src/modules/module-allow-passthrough.c:73
+#: ../src/modules/module-always-sink.c:82
+msgid "Dummy Output"
+msgstr "Dummy-Ausgabe"
+
+#: ../src/modules/module-always-sink.c:36
+msgid "Always keeps at least one sink loaded even if it's a null one"
+msgstr "Hält stets ein Ziel geladen, selbst wenn dies ein Null-Ziel ist"
+
+#: ../src/modules/module-equalizer-sink.c:70
+msgid "General Purpose Equalizer"
+msgstr "Allzweck-Equalizer"
+
+#: ../src/modules/module-equalizer-sink.c:74
+msgid ""
+"sink_name=<name of the sink> sink_properties=<properties for the sink> "
+"sink_master=<sink to connect to> format=<sample format> rate=<sample rate> "
+"channels=<number of channels> channel_map=<channel map> autoloaded=<set if "
+"this module is being loaded automatically> use_volume_sharing=<yes or no> "
+msgstr ""
+"sink_name=<Name des Ziels> sink_properties=<Eigenschaften des Ziels> "
+"sink_master=<Ziel, zu dem verbunden werden soll> format=<Sample-Format> "
+"rate=<Samplerate> channels=<Anzahl der Kanäle> channel_map=<Kanalzuordnung> "
+"autoloaded=<setzen, wenn dieses Modul automatisch geladen wird> "
+"use_volume_sharing=<yes oder no> "
+
+#: ../src/modules/module-filter-apply.c:47
+msgid "autoclean=<automatically unload unused filters?>"
+msgstr "autoclean=<ungenutzte Filter automatisch entladen?>"
+
+#: ../src/modules/module-ladspa-sink.c:51
+msgid "Virtual LADSPA sink"
+msgstr "Virtuelles LADSPA-Ziel"
+
+#: ../src/modules/module-ladspa-sink.c:55
+msgid ""
+"sink_name=<name for the sink> sink_properties=<properties for the sink> "
+"master=<name of sink to filter> format=<sample format> rate=<sample rate> "
+"channels=<number of channels> channel_map=<input channel map> plugin=<ladspa "
+"plugin name> label=<ladspa plugin label> control=<comma separated list of "
+"input control values> input_ladspaport_map=<comma separated list of input "
+"LADSPA port names> output_ladspaport_map=<comma separated list of output "
+"LADSPA port names> "
+msgstr ""
+"sink_name=<Name des Ziels> sink_properties=<Eigenschaften des Ziels> "
+"master=<Name des zu filternden Ziels> format=<Sample-Format> "
+"rate=<Samplerate> channels=<Anzahl der Kanäle> "
+"channel_map=<Eingabekanalzuordnung> plugin=<Name des LADSPA-Plugins> "
+"label=<Bezeichnung des LADSPA-Plugins> control=<durch Kommata getrennte "
+"Liste von Eingabekontrollwerten> input_ladspaport_map=<durch Kommata "
+"getrennte Liste von Namen der LADSPA-Eingabeports> "
+"output_ladspaport_map=<durch Kommata getrennte Liste von Namen der LADSPA-"
+"Ausgabeports> "
+
+#: ../src/modules/module-null-sink.c:47
+msgid "Clocked NULL sink"
+msgstr "Getaktetes NULL-Ziel"
-#: ../src/utils/pacat.c:387
+#: ../src/modules/module-null-sink.c:280
+msgid "Null Output"
+msgstr "Null-Ausgabe"
+
+#: ../src/modules/module-rygel-media-server.c:508
+#: ../src/modules/module-rygel-media-server.c:546
+#: ../src/modules/module-rygel-media-server.c:905
+msgid "Output Devices"
+msgstr "Ausgabegeräte"
+
+#: ../src/modules/module-rygel-media-server.c:509
+#: ../src/modules/module-rygel-media-server.c:547
+#: ../src/modules/module-rygel-media-server.c:906
+msgid "Input Devices"
+msgstr "Eingabegeräte"
+
+#: ../src/modules/module-rygel-media-server.c:1063
+msgid "Audio on @HOSTNAME@"
+msgstr "Audio auf @HOSTNAME@"
+
+#. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis at lazus'
+#. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis at lazus'
+#: ../src/modules/module-tunnel-sink-new.c:307
+#: ../src/modules/module-tunnel-source-new.c:305
#, c-format
-msgid "Stream started.%s"
-msgstr "Stream gestartet: %s"
+msgid "Tunnel for %s@%s"
+msgstr "Tunnel für %s@%s"
-#: ../src/utils/pacat.c:394
+#: ../src/modules/module-tunnel-sink-new.c:517
+#: ../src/modules/module-tunnel-source-new.c:516
#, c-format
-msgid "Stream moved to device %s (%u, %ssuspended).%s"
-msgstr "Stream an Gerät %s übergeben (%u, %sausgesetzt).%s"
+msgid "Tunnel to %s/%s"
+msgstr "Tunnel zu %s/%s"
-#: ../src/utils/pacat.c:394
-msgid "not "
-msgstr "nicht "
+#: ../src/modules/module-virtual-surround-sink.c:47
+msgid "Virtual surround sink"
+msgstr "Virtuelles Surround-Ziel"
+
+#: ../src/modules/module-virtual-surround-sink.c:51
+msgid ""
+"sink_name=<name for the sink> sink_properties=<properties for the sink> "
+"master=<name of sink to filter> format=<sample format> rate=<sample rate> "
+"channels=<number of channels> channel_map=<channel map> "
+"use_volume_sharing=<yes or no> force_flat_volume=<yes or no> hrir=/path/to/"
+"left_hrir.wav "
+msgstr ""
+"sink_name=<Name des Ziels> sink_properties=<Eigenschaften des Ziels> "
+"master=<Name des zu filternden Ziels> format=<Abtastformat> "
+"rate=<Abtastrate> channels=<Anzahl der Kanäle> channel_map=<Kanalzuordnung> "
+"use_volume_sharing=<yes oder no> force_flat_volume=<yes oder no> hrir=/Pfad/"
+"zu/left_hrir.wav "
+
+#: ../src/modules/reserve-wrap.c:149
+msgid "PulseAudio Sound Server"
+msgstr "PulseAudio Soundserver"
-#: ../src/utils/pacat.c:401
+#: ../src/pulse/channelmap.c:103 ../src/pulse/channelmap.c:771
+msgid "Mono"
+msgstr "Mono"
+
+#: ../src/pulse/channelmap.c:105
+msgid "Front Center"
+msgstr "Vorne Mitte"
+
+#: ../src/pulse/channelmap.c:106
+msgid "Front Left"
+msgstr "Vorne links"
+
+#: ../src/pulse/channelmap.c:107
+msgid "Front Right"
+msgstr "Vorne rechts"
+
+#: ../src/pulse/channelmap.c:109
+msgid "Rear Center"
+msgstr "Hinten Mitte"
+
+#: ../src/pulse/channelmap.c:110
+msgid "Rear Left"
+msgstr "Hinten links"
+
+#: ../src/pulse/channelmap.c:111
+msgid "Rear Right"
+msgstr "Hinten rechts"
+
+#: ../src/pulse/channelmap.c:113
+msgid "Subwoofer"
+msgstr "Subwoofer"
+
+#: ../src/pulse/channelmap.c:115
+msgid "Front Left-of-center"
+msgstr "Vorne links der Mitte"
+
+#: ../src/pulse/channelmap.c:116
+msgid "Front Right-of-center"
+msgstr "Vorne rechts der Mitte"
+
+#: ../src/pulse/channelmap.c:118
+msgid "Side Left"
+msgstr "Seite links"
+
+#: ../src/pulse/channelmap.c:119
+msgid "Side Right"
+msgstr "Seite rechts"
+
+#: ../src/pulse/channelmap.c:121
+msgid "Auxiliary 0"
+msgstr "Zusatz 0"
+
+#: ../src/pulse/channelmap.c:122
+msgid "Auxiliary 1"
+msgstr "Zusatz 1"
+
+#: ../src/pulse/channelmap.c:123
+msgid "Auxiliary 2"
+msgstr "Zusatz 2"
+
+#: ../src/pulse/channelmap.c:124
+msgid "Auxiliary 3"
+msgstr "Zusatz 3"
+
+#: ../src/pulse/channelmap.c:125
+msgid "Auxiliary 4"
+msgstr "Zusatz 4"
+
+#: ../src/pulse/channelmap.c:126
+msgid "Auxiliary 5"
+msgstr "Zusatz 5"
+
+#: ../src/pulse/channelmap.c:127
+msgid "Auxiliary 6"
+msgstr "Zusatz 6"
+
+#: ../src/pulse/channelmap.c:128
+msgid "Auxiliary 7"
+msgstr "Zusatz 7"
+
+#: ../src/pulse/channelmap.c:129
+msgid "Auxiliary 8"
+msgstr "Zusatz 8"
+
+#: ../src/pulse/channelmap.c:130
+msgid "Auxiliary 9"
+msgstr "Zusatz 9"
+
+#: ../src/pulse/channelmap.c:131
+msgid "Auxiliary 10"
+msgstr "Zusatz 10"
+
+#: ../src/pulse/channelmap.c:132
+msgid "Auxiliary 11"
+msgstr "Zusatz 11"
+
+#: ../src/pulse/channelmap.c:133
+msgid "Auxiliary 12"
+msgstr "Zusatz 12"
+
+#: ../src/pulse/channelmap.c:134
+msgid "Auxiliary 13"
+msgstr "Zusatz 13"
+
+#: ../src/pulse/channelmap.c:135
+msgid "Auxiliary 14"
+msgstr "Zusatz 14"
+
+#: ../src/pulse/channelmap.c:136
+msgid "Auxiliary 15"
+msgstr "Zusatz 15"
+
+#: ../src/pulse/channelmap.c:137
+msgid "Auxiliary 16"
+msgstr "Zusatz 16"
+
+#: ../src/pulse/channelmap.c:138
+msgid "Auxiliary 17"
+msgstr "Zusatz 17"
+
+#: ../src/pulse/channelmap.c:139
+msgid "Auxiliary 18"
+msgstr "Zusatz 18"
+
+#: ../src/pulse/channelmap.c:140
+msgid "Auxiliary 19"
+msgstr "Zusatz 19"
+
+#: ../src/pulse/channelmap.c:141
+msgid "Auxiliary 20"
+msgstr "Zusatz 20"
+
+#: ../src/pulse/channelmap.c:142
+msgid "Auxiliary 21"
+msgstr "Zusatz 21"
+
+#: ../src/pulse/channelmap.c:143
+msgid "Auxiliary 22"
+msgstr "Zusatz 22"
+
+#: ../src/pulse/channelmap.c:144
+msgid "Auxiliary 23"
+msgstr "Zusatz 23"
+
+#: ../src/pulse/channelmap.c:145
+msgid "Auxiliary 24"
+msgstr "Zusatz 24"
+
+#: ../src/pulse/channelmap.c:146
+msgid "Auxiliary 25"
+msgstr "Zusatz 25"
+
+#: ../src/pulse/channelmap.c:147
+msgid "Auxiliary 26"
+msgstr "Zusatz 26"
+
+#: ../src/pulse/channelmap.c:148
+msgid "Auxiliary 27"
+msgstr "Zusatz 26"
+
+#: ../src/pulse/channelmap.c:149
+msgid "Auxiliary 28"
+msgstr "Zusatz 28"
+
+#: ../src/pulse/channelmap.c:150
+msgid "Auxiliary 29"
+msgstr "Zusatz 29"
+
+#: ../src/pulse/channelmap.c:151
+msgid "Auxiliary 30"
+msgstr "Zusatz 30"
+
+#: ../src/pulse/channelmap.c:152
+msgid "Auxiliary 31"
+msgstr "Zusatz 31"
+
+#: ../src/pulse/channelmap.c:154
+msgid "Top Center"
+msgstr "Oben Mitte"
+
+#: ../src/pulse/channelmap.c:156
+msgid "Top Front Center"
+msgstr "Oben vorne Mitte"
+
+#: ../src/pulse/channelmap.c:157
+msgid "Top Front Left"
+msgstr "Oben vorne Links"
+
+#: ../src/pulse/channelmap.c:158
+msgid "Top Front Right"
+msgstr "Oben vorne Rechts"
+
+#: ../src/pulse/channelmap.c:160
+msgid "Top Rear Center"
+msgstr "Oben hinten Mitte"
+
+#: ../src/pulse/channelmap.c:161
+msgid "Top Rear Left"
+msgstr "Oben hinten links"
+
+#: ../src/pulse/channelmap.c:162
+msgid "Top Rear Right"
+msgstr "Oben hinten rechts"
+
+#: ../src/pulse/channelmap.c:479 ../src/pulse/format.c:121
+#: ../src/pulse/sample.c:174 ../src/pulse/volume.c:294
+#: ../src/pulse/volume.c:320 ../src/pulse/volume.c:340
+#: ../src/pulse/volume.c:372 ../src/pulse/volume.c:412
+#: ../src/pulse/volume.c:431
+msgid "(invalid)"
+msgstr "(ungültig)"
+
+#: ../src/pulse/channelmap.c:775
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../src/pulse/channelmap.c:780
+msgid "Surround 4.0"
+msgstr "Surround 4.0"
+
+#: ../src/pulse/channelmap.c:786
+msgid "Surround 4.1"
+msgstr "Surround 4.1"
+
+#: ../src/pulse/channelmap.c:792
+msgid "Surround 5.0"
+msgstr "Surround 5.0"
+
+#: ../src/pulse/channelmap.c:798
+msgid "Surround 5.1"
+msgstr "Surround 5.1"
+
+#: ../src/pulse/channelmap.c:805
+msgid "Surround 7.1"
+msgstr "Surround 7.1"
+
+#: ../src/pulse/client-conf-x11.c:53 ../src/utils/pax11publish.c:97
+msgid "xcb_connect() failed"
+msgstr "xcb_connect() fehlgeschlagen"
+
+#: ../src/pulse/client-conf-x11.c:58 ../src/utils/pax11publish.c:102
+msgid "xcb_connection_has_error() returned true"
+msgstr "xcb_connection_has_error() hat »wahr« zurückgegeben"
+
+#: ../src/pulse/client-conf-x11.c:94
+msgid "Failed to parse cookie data"
+msgstr "Auswerten der Cookie-Daten fehlgeschlagen"
+
+#: ../src/pulse/context.c:702
#, c-format
-msgid "Stream buffer attributes changed.%s"
-msgstr "Stream-Zwischenspeicher-Attribute geändert.%s"
+msgid "fork(): %s"
+msgstr "fork(): %s"
-#: ../src/utils/pacat.c:416
-msgid "Cork request stack is empty: corking stream"
+#: ../src/pulse/context.c:757
+#, c-format
+msgid "waitpid(): %s"
+msgstr "waitpid(): %s"
+
+#: ../src/pulse/context.c:1463
+#, c-format
+msgid "Received message for unknown extension '%s'"
+msgstr "Nachricht für unbekannte Erweiterung »%s« erhalten"
+
+#: ../src/pulse/direction.c:37
+msgid "input"
+msgstr "Eingabe"
+
+#: ../src/pulse/direction.c:39
+msgid "output"
+msgstr "Ausgabe"
+
+#: ../src/pulse/direction.c:41
+msgid "bidirectional"
+msgstr "Bidirektional"
+
+#: ../src/pulse/direction.c:43
+msgid "invalid"
+msgstr "ungültig"
+
+#: ../src/pulsecore/core-util.c:1837
+#, c-format
+msgid ""
+"XDG_RUNTIME_DIR (%s) is not owned by us (uid %d), but by uid %d! (This could "
+"e g happen if you try to connect to a non-root PulseAudio as a root user, "
+"over the native protocol. Don't do that.)"
msgstr ""
+"XDG_RUNTIME_DIR (%s) gehört uns (Benutzerkennung %d) nicht, sondern der "
+"Benutzerkennung %d! Dies kann beispielsweise passieren, wenn Sie sich über "
+"das native Protokoll als Root-Benutzer mit einem ohne Root-Rechte "
+"betriebenen PulseAudio-Server verbinden wollen. Sie sollten dies nicht tun."
+
+#: ../src/pulsecore/core-util.h:97
+msgid "yes"
+msgstr "ja"
+
+#: ../src/pulsecore/core-util.h:97
+msgid "no"
+msgstr "nein"
+
+#: ../src/pulsecore/lock-autospawn.c:141 ../src/pulsecore/lock-autospawn.c:227
+msgid "Cannot access autospawn lock."
+msgstr "Fehler beim Zugriff auf Autostart-Sperre."
+
+#: ../src/pulsecore/log.c:165
+#, c-format
+msgid "Failed to open target file '%s'."
+msgstr "Zieldatei »%s« konnte nicht geöffnet werden."
+
+#: ../src/pulsecore/log.c:188
+#, c-format
+msgid ""
+"Tried to open target file '%s', '%s.1', '%s.2' ... '%s.%d', but all failed."
+msgstr ""
+"Es wurde versucht, die Zieldateien »%s«, »%s.1«, »%s.2« … »%s.%d« zu öffnen, "
+"was jedes Mal fehlschlug."
+
+#: ../src/pulsecore/log.c:651
+msgid "Invalid log target."
+msgstr "Ungültiges Protokollziel."
+
+#: ../src/pulsecore/sink.c:3459
+msgid "Built-in Audio"
+msgstr "Internes Audio"
+
+#: ../src/pulsecore/sink.c:3464
+msgid "Modem"
+msgstr "Modem"
+
+#: ../src/pulse/error.c:38
+msgid "OK"
+msgstr "OK"
+
+#: ../src/pulse/error.c:39
+msgid "Access denied"
+msgstr "Zugriff verweigert"
+
+#: ../src/pulse/error.c:40
+msgid "Unknown command"
+msgstr "Unbekannter Befehl"
+
+#: ../src/pulse/error.c:41
+msgid "Invalid argument"
+msgstr "Ungültiger Parameter"
+
+#: ../src/pulse/error.c:42
+msgid "Entity exists"
+msgstr "Entität existiert bereits"
+
+#: ../src/pulse/error.c:43
+msgid "No such entity"
+msgstr "Entität nicht vorhanden"
+
+#: ../src/pulse/error.c:44
+msgid "Connection refused"
+msgstr "Verbindung verweigert"
+
+#: ../src/pulse/error.c:45
+msgid "Protocol error"
+msgstr "Protokollfehler"
+
+#: ../src/pulse/error.c:46
+msgid "Timeout"
+msgstr "Zeitüberschreitung"
+
+#: ../src/pulse/error.c:47
+msgid "No authentication key"
+msgstr "Kein Legitimierungsschlüssel"
+
+#: ../src/pulse/error.c:48
+msgid "Internal error"
+msgstr "Interner Fehler"
+
+#: ../src/pulse/error.c:49
+msgid "Connection terminated"
+msgstr "Verbindung beendet"
-#: ../src/utils/pacat.c:422
-msgid "Cork request stack is empty: uncorking stream"
-msgstr ""
+#: ../src/pulse/error.c:50
+msgid "Entity killed"
+msgstr "Entität terminiert"
-#: ../src/utils/pacat.c:426
-msgid "Warning: Received more uncork requests than cork requests!"
-msgstr ""
+#: ../src/pulse/error.c:51
+msgid "Invalid server"
+msgstr "Ungültiger Server"
-#: ../src/utils/pacat.c:451
-#, c-format
-msgid "Connection established.%s"
-msgstr "Verbindung hergestellt.%s"
+#: ../src/pulse/error.c:52
+msgid "Module initialization failed"
+msgstr "Modulinitialisierung fehlgeschlagen"
-#: ../src/utils/pacat.c:454
-#, c-format
-msgid "pa_stream_new() failed: %s"
-msgstr "pa_stream_new() fehlgeschlagen: %s"
+#: ../src/pulse/error.c:53
+msgid "Bad state"
+msgstr "Ungültiger Zustand"
-#: ../src/utils/pacat.c:492
-#, c-format
-msgid "pa_stream_connect_playback() failed: %s"
-msgstr "pa_stream_connect_playback() fehlgeschlagen: %s"
+#: ../src/pulse/error.c:54
+msgid "No data"
+msgstr "Keine Daten"
-#: ../src/utils/pacat.c:498
-#, c-format
-msgid "pa_stream_connect_record() failed: %s"
-msgstr "pa_stream_connect_record() fehlgeschlagen: %s"
+#: ../src/pulse/error.c:55
+msgid "Incompatible protocol version"
+msgstr "Inkompatible Protokollversion"
-#: ../src/utils/pacat.c:512 ../src/utils/pactl.c:1252
-#, c-format
-msgid "Connection failure: %s"
-msgstr "Verbindungsfehler: %s"
+#: ../src/pulse/error.c:56
+msgid "Too large"
+msgstr "Zu groß"
-#: ../src/utils/pacat.c:545
-msgid "Got EOF."
-msgstr "EOF empfangen."
+#: ../src/pulse/error.c:57
+msgid "Not supported"
+msgstr "Nicht unterstützt"
-#: ../src/utils/pacat.c:582
-#, c-format
-msgid "write() failed: %s"
-msgstr "write() fehlgeschlagen: %s"
+#: ../src/pulse/error.c:58
+msgid "Unknown error code"
+msgstr "Unbekannter Fehlercode"
-#: ../src/utils/pacat.c:603
-msgid "Got signal, exiting."
-msgstr "Signal empfangen, beenden."
+#: ../src/pulse/error.c:59
+msgid "No such extension"
+msgstr "Erweiterung nicht vorhanden"
-#: ../src/utils/pacat.c:617
-#, c-format
-msgid "Failed to get latency: %s"
-msgstr "Erhalten der Latenz fehlgeschlagen: %s"
+#: ../src/pulse/error.c:60
+msgid "Obsolete functionality"
+msgstr "Veraltete Funktion"
-#: ../src/utils/pacat.c:622
-#, c-format
-msgid "Time: %0.3f sec; Latency: %0.0f usec."
-msgstr "Zeit: %0.3f sec; Latenz: %0.0f usec."
+#: ../src/pulse/error.c:61
+msgid "Missing implementation"
+msgstr "Fehlende Implementation"
-#: ../src/utils/pacat.c:643
-#, c-format
-msgid "pa_stream_update_timing_info() failed: %s"
-msgstr "pa_stream_update_timing_info() fehlgeschlagen: %s"
+#: ../src/pulse/error.c:62
+msgid "Client forked"
+msgstr "Client geteilt"
-#: ../src/utils/pacat.c:653
-#, fuzzy, c-format
-msgid ""
-"%s [options]\n"
-"\n"
-" -h, --help Show this help\n"
-" --version Show version\n"
-"\n"
-" -r, --record Create a connection for recording\n"
-" -p, --playback Create a connection for playback\n"
-"\n"
-" -v, --verbose Enable verbose operations\n"
-"\n"
-" -s, --server=SERVER The name of the server to connect "
-"to\n"
-" -d, --device=DEVICE The name of the sink/source to "
-"connect to\n"
-" -n, --client-name=NAME How to call this client on the "
-"server\n"
-" --stream-name=NAME How to call this stream on the "
-"server\n"
-" --volume=VOLUME Specify the initial (linear) volume "
-"in range 0...65536\n"
-" --rate=SAMPLERATE The sample rate in Hz (defaults to "
-"44100)\n"
-" --format=SAMPLEFORMAT The sample type, one of s16le, "
-"s16be, u8, float32le,\n"
-" float32be, ulaw, alaw, s32le, s32be, "
-"s24le, s24be,\n"
-" s24-32le, s24-32be (defaults to "
-"s16ne)\n"
-" --channels=CHANNELS The number of channels, 1 for mono, "
-"2 for stereo\n"
-" (defaults to 2)\n"
-" --channel-map=CHANNELMAP Channel map to use instead of the "
-"default\n"
-" --fix-format Take the sample format from the sink "
-"the stream is\n"
-" being connected to.\n"
-" --fix-rate Take the sampling rate from the sink "
-"the stream is\n"
-" being connected to.\n"
-" --fix-channels Take the number of channels and the "
-"channel map\n"
-" from the sink the stream is being "
-"connected to.\n"
-" --no-remix Don't upmix or downmix channels.\n"
-" --no-remap Map channels by index instead of "
-"name.\n"
-" --latency=BYTES Request the specified latency in "
-"bytes.\n"
-" --process-time=BYTES Request the specified process time "
-"per request in bytes.\n"
-" --latency-msec=MSEC Request the specified latency in "
-"msec.\n"
-" --process-time-msec=MSEC Request the specified process time "
-"per request in msec.\n"
-" --property=PROPERTY=VALUE Set the specified property to the "
-"specified value.\n"
-" --raw Record/play raw PCM data.\n"
-" --passthrough passthrough data \n"
-" --file-format[=FFORMAT] Record/play formatted PCM data.\n"
-" --list-file-formats List available file formats.\n"
-msgstr ""
-"%s [options]\n"
-"\n"
-" -h, --help Diese Hilfe anzeigen\n"
-" --version Version anzeigen\n"
-"\n"
-" -r, --record Aufnahme-Verbindung aufbauen\n"
-" -p, --playback Wiedergabe-Verbindung aufbauen\n"
-"\n"
-" -v, --verbose Ausführliche Meldungen\n"
-"\n"
-" -s, --server=SERVER Name des zu verbindenden Servers\n"
-" -d, --device=DEVICE Name des/der zu verbindender Sink/"
-"Quelle\n"
-" -n, --client-name=NAME Rufname des Clients auf dem Server\n"
-" --stream-name=NAME Rufname des Streams auf dem Server\n"
-" --volume=VOLUME Initiale (lineare) Lautstärke "
-"zwischen 0...65536 angeben\n"
-" --rate=SAMPLERATE Sample-Rate in Hz (Standard 44100)\n"
-" --format=SAMPLEFORMAT Ein Sample-Format von s16le, s16be, "
-"u8, float32le,\n"
-" float32be, ulaw, alaw, s32le, s32be, "
-"s24le, s24be,\n"
-" s24-32le, s24-32be (Standard ist "
-"s16ne)\n"
-" --channels=CHANNELS Anzahl Kanäle, 1 für Mono, 2 für "
-"Stereo\n"
-" (Standard ist 2)\n"
-" --channel-map=CHANNELMAP Diese geänderte Kanalzuordnung "
-"nutzen\n"
-" --fix-format Sample-Format des mit Sink\n"
-" verbundenen Streams nutzen.\n"
-" --fix-rate Sample-Rate des mit Sink\n"
-" verbundenen Streams nutzen.\n"
-" --fix-channels Anzahl und Zuordnung der Kanäle\n"
-" des mit Sink verbundenen\n"
-" Streams nutzen.\n"
-" --no-remix Kanäle nicht up-/down-mischen.\n"
-" --no-remap Kanäle nach Index statt Name "
-"zuordnen.\n"
-" --latency=BYTES Diese Latenz verwenden.\n"
-" --process-time=BYTES Diese Prozesszeit pro Anfrage "
-"verwenden.\n"
-" --property=PROPERTY=VALUE Die angegebene Eigenschaft auf "
-"denspezifizierten Wert setzen.\n"
-" --raw PCM-Rohdaten aufnehmen/wiedergeben.\n"
-" --file-format=FFORMAT Formatierte PCM-Daten aufnehmen/"
-"wiedergeben.\n"
-" --list-file-formats Verfügbare Dateiformate auflisten.\n"
-
-#: ../src/utils/pacat.c:786
-#, c-format
-msgid ""
-"pacat %s\n"
-"Compiled with libpulse %s\n"
-"Linked with libpulse %s\n"
-msgstr ""
-"pacat %s\n"
-"Kompiliert mit libpulse %s\n"
-"Gelinkt mit libpulse %s\n"
+#: ../src/pulse/error.c:63
+msgid "Input/Output error"
+msgstr "Eingabe/Ausgabe-Fehler"
-#: ../src/utils/pacat.c:819 ../src/utils/pactl.c:1400
-#, c-format
-msgid "Invalid client name '%s'"
-msgstr "Ungültiger Client-Name '%s'"
+#: ../src/pulse/error.c:64
+msgid "Device or resource busy"
+msgstr "Gerät oder Ressource ist belegt"
-#: ../src/utils/pacat.c:834
+#: ../src/pulse/sample.c:176
#, c-format
-msgid "Invalid stream name '%s'"
-msgstr "Ungültiger Stream-Name '%s'"
+msgid "%s %uch %uHz"
+msgstr "%s %uch %uHz"
-#: ../src/utils/pacat.c:871
+#: ../src/pulse/sample.c:188
#, c-format
-msgid "Invalid channel map '%s'"
-msgstr "Ungültige Kanal-Zuweisung '%s'"
+msgid "%0.1f GiB"
+msgstr "%0.1f GiB"
-#: ../src/utils/pacat.c:900 ../src/utils/pacat.c:914
+#: ../src/pulse/sample.c:190
#, c-format
-msgid "Invalid latency specification '%s'"
-msgstr "Ungültige Latenz-Angaben '%s'"
+msgid "%0.1f MiB"
+msgstr "%0.1f MiB"
-#: ../src/utils/pacat.c:907 ../src/utils/pacat.c:921
+#: ../src/pulse/sample.c:192
#, c-format
-msgid "Invalid process time specification '%s'"
-msgstr "Ungültige Prozesszeit-Angaben '%s'"
+msgid "%0.1f KiB"
+msgstr "%0.1f KiB"
-#: ../src/utils/pacat.c:933
+#: ../src/pulse/sample.c:194
#, c-format
-msgid "Invalid property '%s'"
-msgstr "Ungültige Eigenschaft '%s'"
+msgid "%u B"
+msgstr "%u B"
-#: ../src/utils/pacat.c:952
+#: ../src/utils/pacat.c:117
#, c-format
-msgid "Unknown file format %s."
-msgstr "Unbekanntes Dateiformat %s."
+msgid "Failed to drain stream: %s"
+msgstr "Entleeren des Streams fehlgeschlagen: %s"
-#: ../src/utils/pacat.c:971
-msgid "Invalid sample specification"
-msgstr "Ungültige Sample-Angaben"
+#: ../src/utils/pacat.c:122
+msgid "Playback stream drained."
+msgstr "Wiedergabe-Stream entleert."
-#: ../src/utils/pacat.c:981
-#, c-format
-msgid "open(): %s"
-msgstr "open(): %s"
+#: ../src/utils/pacat.c:133
+msgid "Draining connection to server."
+msgstr "Verbindung zu Server entleert."
-#: ../src/utils/pacat.c:986
+#: ../src/utils/pacat.c:146
#, c-format
-msgid "dup2(): %s"
-msgstr "dup2(): %s"
-
-#: ../src/utils/pacat.c:993
-msgid "Too many arguments."
-msgstr "Zu viele Argumente."
-
-#: ../src/utils/pacat.c:1004
-msgid "Failed to generate sample specification for file."
-msgstr "Beziehen der Sample-Informationen für die Datei fehlgeschlagen."
-
-#: ../src/utils/pacat.c:1030
-msgid "Failed to open audio file."
-msgstr "Öffnen der Audio-Datei fehlgeschlagen."
-
-#: ../src/utils/pacat.c:1036
-msgid ""
-"Warning: specified sample specification will be overwritten with "
-"specification from file."
-msgstr "Warnung: Beziehen der Sample-Angabe aus Datei fehlgeschlagen."
-
-#: ../src/utils/pacat.c:1039 ../src/utils/pactl.c:1467
-msgid "Failed to determine sample specification from file."
-msgstr "Beziehen der Sample-Informationen der Datei fehlgeschlagen."
-
-#: ../src/utils/pacat.c:1048
-msgid "Warning: Failed to determine channel map from file."
-msgstr "Warnung: Bestimmung der Kanalzuordnung aus Datei fehlgeschlagen."
-
-#: ../src/utils/pacat.c:1059
-msgid "Channel map doesn't match sample specification"
-msgstr "Kanalzuordnung entspricht nicht Einstellungen des Samples"
-
-#: ../src/utils/pacat.c:1070
-msgid "Warning: failed to write channel map to file."
-msgstr "Warnung: Schreiben der Kanalzuordnung in Datei fehlgeschlagen."
+msgid "pa_stream_drain(): %s"
+msgstr "pa_stream_drain(): %s"
-#: ../src/utils/pacat.c:1085
+#: ../src/utils/pacat.c:169
#, c-format
-msgid ""
-"Opening a %s stream with sample specification '%s' and channel map '%s'."
-msgstr ""
-"Öffnen eines %s-Streams mit Sample-Angabe '%s' und Kanalzuordnung '%s'."
-
-#: ../src/utils/pacat.c:1086
-msgid "recording"
-msgstr "aufnehmen"
-
-#: ../src/utils/pacat.c:1086
-msgid "playback"
-msgstr "abspielen"
-
-#: ../src/utils/pacat.c:1110
-#, fuzzy
-msgid "Failed to set media name."
-msgstr "Parsen der Kommandzeile fehlgeschlagen."
-
-#: ../src/utils/pacat.c:1117 ../src/utils/pactl.c:1777
-msgid "pa_mainloop_new() failed."
-msgstr "pa_mainloop_new() fehlgeschlagen"
-
-#: ../src/utils/pacat.c:1136
-msgid "io_new() failed."
-msgstr "io_new() fehlgeschlagen."
+msgid "pa_stream_write() failed: %s"
+msgstr "pa_stream_write() fehlgeschlagen: %s"
-#: ../src/utils/pacat.c:1143 ../src/utils/pactl.c:1789
-msgid "pa_context_new() failed."
-msgstr "pa_context_new() fehlgeschlagen."
+#: ../src/utils/pacat.c:210
+#, c-format
+msgid "pa_stream_begin_write() failed: %s"
+msgstr "pa_stream_write() fehlgeschlagen: %s"
-#: ../src/utils/pacat.c:1151 ../src/utils/pactl.c:1795
+#: ../src/utils/pacat.c:260 ../src/utils/pacat.c:290
#, c-format
-msgid "pa_context_connect() failed: %s"
-msgstr "pa_context_new() fehlgeschlagen: %s"
+msgid "pa_stream_peek() failed: %s"
+msgstr "pa_stream_peek() fehlgeschlagen: %s"
-#: ../src/utils/pacat.c:1157
-msgid "pa_context_rttime_new() failed."
-msgstr "pa_context_new() fehlgeschlagen."
+#: ../src/utils/pacat.c:340
+msgid "Stream successfully created."
+msgstr "Stream wurde erfolgreich erstellt."
-#: ../src/utils/pacat.c:1164 ../src/utils/pactl.c:1800
-msgid "pa_mainloop_run() failed."
-msgstr "pa_mainloop_run() fehlgeschlagen."
+#: ../src/utils/pacat.c:343
+#, c-format
+msgid "pa_stream_get_buffer_attr() failed: %s"
+msgstr "pa_stream_get_buffer_attr() fehlgeschlagen: %s"
-#: ../src/utils/pasuspender.c:79
+#: ../src/utils/pacat.c:347
#, c-format
-msgid "fork(): %s\n"
-msgstr "fork(): %s\n"
+msgid "Buffer metrics: maxlength=%u, tlength=%u, prebuf=%u, minreq=%u"
+msgstr "Pufferdaten: maxlenght=%u, tlength=%u, prebuf=%u, minreq=%u"
-#: ../src/utils/pasuspender.c:90
+#: ../src/utils/pacat.c:350
#, c-format
-msgid "execvp(): %s\n"
-msgstr "execvp(): %s\n"
+msgid "Buffer metrics: maxlength=%u, fragsize=%u"
+msgstr "Pufferdaten: maxlength=%u, fragsize=%u"
-#: ../src/utils/pasuspender.c:107
+#: ../src/utils/pacat.c:354
#, c-format
-msgid "Failure to suspend: %s\n"
-msgstr "Aussetzen fehlgeschlagen: %s\n"
+msgid "Using sample spec '%s', channel map '%s'."
+msgstr "Abtastwert-Angabe »%s« wird benutzt, Kanalzuordnung »%s«."
-#: ../src/utils/pasuspender.c:122
+#: ../src/utils/pacat.c:358
#, c-format
-msgid "Failure to resume: %s\n"
-msgstr "Resume fehlgeschlagen: %s\n"
+msgid "Connected to device %s (index: %u, suspended: %s)."
+msgstr "Verbunden mit Gerät %s (Index: %u, ausgesetzt: %s)."
-#: ../src/utils/pasuspender.c:145
+#: ../src/utils/pacat.c:368
#, c-format
-msgid "WARNING: Sound server is not local, not suspending.\n"
-msgstr "WARNUNG: Sound-Server läuft nicht lokal, nicht ausgesetzt.\n"
+msgid "Stream error: %s"
+msgstr "Stream-Fehler: %s"
-#: ../src/utils/pasuspender.c:157
+#: ../src/utils/pacat.c:378
#, c-format
-msgid "Connection failure: %s\n"
-msgstr "Verbindungsfehler: %s\n"
+msgid "Stream device suspended.%s"
+msgstr "Stream-Gerät ausgesetzt.%s"
-#: ../src/utils/pasuspender.c:174
+#: ../src/utils/pacat.c:380
#, c-format
-msgid "Got SIGINT, exiting.\n"
-msgstr "SIGINT empfangen, beende.\n"
+msgid "Stream device resumed.%s"
+msgstr "Stream-Gerät reaktiviert.%s"
-#: ../src/utils/pasuspender.c:192
+#: ../src/utils/pacat.c:388
#, c-format
-msgid "WARNING: Child process terminated by signal %u\n"
-msgstr "WARNUNG: Kind-Prozess durch Signal %u beendet\n"
+msgid "Stream underrun.%s"
+msgstr "Stream leergelaufen.%s"
-#: ../src/utils/pasuspender.c:210
+#: ../src/utils/pacat.c:395
#, c-format
-msgid ""
-"%s [options] ... \n"
-"\n"
-" -h, --help Show this help\n"
-" --version Show version\n"
-" -s, --server=SERVER The name of the server to connect "
-"to\n"
-"\n"
-msgstr ""
-"%s [options] ... \n"
-"\n"
-" -h, --help Diese Hilfe zeigen\n"
-" --version Zeige Version\n"
-" -s, --server=SERVER Name des Zielservers\n"
-"\n"
+msgid "Stream overrun.%s"
+msgstr "Stream überlaufen.%s "
-#: ../src/utils/pasuspender.c:248
+#: ../src/utils/pacat.c:402
#, c-format
-msgid ""
-"pasuspender %s\n"
-"Compiled with libpulse %s\n"
-"Linked with libpulse %s\n"
-msgstr ""
-"pasuspender %s\n"
-"kompiliert mit libpulse %s\n"
-"Gelinkt mit libpulse %s\n"
+msgid "Stream started.%s"
+msgstr "Stream gestartet: %s"
-#: ../src/utils/pasuspender.c:277
+#: ../src/utils/pacat.c:409
#, c-format
-msgid "pa_mainloop_new() failed.\n"
-msgstr "pa_mainloop_new() fehlgeschlagen.\n"
+msgid "Stream moved to device %s (%u, %ssuspended).%s"
+msgstr "Stream an Gerät %s übergeben (%u, %sausgesetzt).%s"
-#: ../src/utils/pasuspender.c:290
-#, c-format
-msgid "pa_context_new() failed.\n"
-msgstr "pa_context_new() fehlgeschlagen.\n"
+#: ../src/utils/pacat.c:409
+msgid "not "
+msgstr "nicht "
-#: ../src/utils/pasuspender.c:298
+#: ../src/utils/pacat.c:416
#, c-format
-msgid "pa_mainloop_run() failed.\n"
-msgstr "pa_mainloop_run() fehlgeschlagen.\n"
+msgid "Stream buffer attributes changed.%s"
+msgstr "Stream-Zwischenspeicher-Attribute geändert.%s"
-#: ../src/utils/pactl.c:150
+# Was ist Corking?
+# https://lists.freedesktop.org/archives/pulseaudio-discuss/2009-December/005767.html
+#: ../src/utils/pacat.c:431
+msgid "Cork request stack is empty: corking stream"
+msgstr "Stapel der Unterbrechungsanfragen ist leer: Stream wird unterbrochen"
+
+#: ../src/utils/pacat.c:437
+msgid "Cork request stack is empty: uncorking stream"
+msgstr ""
+"Stapel der Unterbrechungsanfragen ist leer: Stream wird wiederaufgenommen"
+
+#: ../src/utils/pacat.c:441
+msgid "Warning: Received more uncork requests than cork requests."
+msgstr ""
+"Warnung: Es wurden mehr Anfragen zur Wiederaufnahme des Streams als zu "
+"dessen Unterbrechung empfangen."
+
+#: ../src/utils/pacat.c:466
#, c-format
-msgid "Failed to get statistics: %s"
-msgstr "Beziehen der Statistik fehlgeschlagen: %s"
+msgid "Connection established.%s"
+msgstr "Verbindung hergestellt.%s"
-#: ../src/utils/pactl.c:156
+#: ../src/utils/pacat.c:469
#, c-format
-msgid "Currently in use: %u blocks containing %s bytes total.\n"
-msgstr "Momentane Nutzung: %u Blöcke mit insgesamt %s Bytes.\n"
+msgid "pa_stream_new() failed: %s"
+msgstr "pa_stream_new() fehlgeschlagen: %s"
-#: ../src/utils/pactl.c:159
+#: ../src/utils/pacat.c:507
#, c-format
-msgid "Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
-msgstr "Während gesamter Laufzeit: %u Blöcke mit insgesamt %s Bytes.\n"
+msgid "pa_stream_connect_playback() failed: %s"
+msgstr "pa_stream_connect_playback() fehlgeschlagen: %s"
-#: ../src/utils/pactl.c:162
+#: ../src/utils/pacat.c:513
#, c-format
-msgid "Sample cache size: %s\n"
-msgstr "Sample-Pufferspeichergrösse: %s\n"
+msgid "Failed to set monitor stream: %s"
+msgstr "Einrichten der Überwachung des Streams fehlgeschlagen: %s"
-#: ../src/utils/pactl.c:171
+#: ../src/utils/pacat.c:517
#, c-format
-msgid "Failed to get server information: %s"
-msgstr "Beziehen der Server-Information fehlgeschlagen: %s"
+msgid "pa_stream_connect_record() failed: %s"
+msgstr "pa_stream_connect_record() fehlgeschlagen: %s"
-#: ../src/utils/pactl.c:176
+#: ../src/utils/pacat.c:530 ../src/utils/pactl.c:1446
#, c-format
-msgid ""
-"Server String: %s\n"
-"Library Protocol Version: %u\n"
-"Server Protocol Version: %u\n"
-"Is Local: %s\n"
-"Client Index: %u\n"
-"Tile Size: %zu\n"
-msgstr ""
+msgid "Connection failure: %s"
+msgstr "Verbindungsfehler: %s"
-#: ../src/utils/pactl.c:192
-#, fuzzy, c-format
-msgid ""
-"User Name: %s\n"
-"Host Name: %s\n"
-"Server Name: %s\n"
-"Server Version: %s\n"
-"Default Sample Specification: %s\n"
-"Default Channel Map: %s\n"
-"Default Sink: %s\n"
-"Default Source: %s\n"
-"Cookie: %04x:%04x\n"
-msgstr ""
-"Name des Nutzers: %s\n"
-"Rechnername: %s\n"
-"Name des Servers: %s\n"
-"Version des Servers: %s\n"
-"Standard-Sample-Angabe: %s\n"
-"Standard-Kanal-Zuordnung: %s\n"
-"Standard-Sink: %s\n"
-"Standard-Quelle: %s\n"
-"Cookie: %08x\n"
+#: ../src/utils/pacat.c:563
+msgid "Got EOF."
+msgstr "EOF empfangen."
-#: ../src/utils/pactl.c:244 ../src/utils/pactl.c:830
+#: ../src/utils/pacat.c:600
#, c-format
-msgid "Failed to get sink information: %s"
-msgstr "Erhalten der Sink-Informationen fehlgeschlagen: %s"
+msgid "write() failed: %s"
+msgstr "write() fehlgeschlagen: %s"
-#: ../src/utils/pactl.c:270
-#, fuzzy, c-format
-msgid ""
-"Sink #%u\n"
-"\tState: %s\n"
-"\tName: %s\n"
-"\tDescription: %s\n"
-"\tDriver: %s\n"
-"\tSample Specification: %s\n"
-"\tChannel Map: %s\n"
-"\tOwner Module: %u\n"
-"\tMute: %s\n"
-"\tVolume: %s%s%s\n"
-"\t balance %0.2f\n"
-"\tBase Volume: %s%s%s\n"
-"\tMonitor Source: %s\n"
-"\tLatency: %0.0f usec, configured %0.0f usec\n"
-"\tFlags: %s%s%s%s%s%s%s\n"
-"\tProperties:\n"
-"\t\t%s\n"
-msgstr ""
-"Sink #%u\n"
-"\tStatus: %s\n"
-"\tName: %s\n"
-"\tBeschreibung: %s\n"
-"\tTreiber: %s\n"
-"\tSample-Angabe: %s\n"
-"\tKanalzuordnung: %s\n"
-"\tBesitzer-Modul: %u\n"
-"\tStumm: %s\n"
-"\tLautstärke: %s%s%s\n"
-"\t Verteilung %0.2f\n"
-"\tBasis-Lautstärke: %s%s%s\n"
-"\tQuellen-Monitor: %s\n"
-"\tLatenz: %0.0f usec, eingestellt %0.0f usec\n"
-"\tFlags: %s%s%s%s%s%s\n"
-"\tEigenschaften:\n"
-"\t\t%s\n"
+#: ../src/utils/pacat.c:621
+msgid "Got signal, exiting."
+msgstr "Signal empfangen, wird beendet."
-#: ../src/utils/pactl.c:318 ../src/utils/pactl.c:430
+#: ../src/utils/pacat.c:635
#, c-format
-msgid "\tPorts:\n"
-msgstr "\tProfile:\n"
+msgid "Failed to get latency: %s"
+msgstr "Erhalten der Latenz fehlgeschlagen: %s"
-#: ../src/utils/pactl.c:325 ../src/utils/pactl.c:437
+#: ../src/utils/pacat.c:640
#, c-format
-msgid "\tActive Port: %s\n"
-msgstr "\tAktive Profile: %s\n"
-
-#: ../src/utils/pactl.c:331 ../src/utils/pactl.c:443
-#, fuzzy, c-format
-msgid "\tFormats:\n"
-msgstr "\tProfile:\n"
+msgid "Time: %0.3f sec; Latency: %0.0f usec."
+msgstr "Zeit: %0.3f sec; Latenz: %0.0f usec."
-#: ../src/utils/pactl.c:357 ../src/utils/pactl.c:849
+#: ../src/utils/pacat.c:661
#, c-format
-msgid "Failed to get source information: %s"
-msgstr "Beziehen der Quellen-Informationen fehlgeschlagen: %s"
+msgid "pa_stream_update_timing_info() failed: %s"
+msgstr "pa_stream_update_timing_info() fehlgeschlagen: %s"
-#: ../src/utils/pactl.c:383
+#: ../src/utils/pacat.c:671
#, c-format
msgid ""
-"Source #%u\n"
-"\tState: %s\n"
-"\tName: %s\n"
-"\tDescription: %s\n"
-"\tDriver: %s\n"
-"\tSample Specification: %s\n"
-"\tChannel Map: %s\n"
-"\tOwner Module: %u\n"
-"\tMute: %s\n"
-"\tVolume: %s%s%s\n"
-"\t balance %0.2f\n"
-"\tBase Volume: %s%s%s\n"
-"\tMonitor of Sink: %s\n"
-"\tLatency: %0.0f usec, configured %0.0f usec\n"
-"\tFlags: %s%s%s%s%s%s\n"
-"\tProperties:\n"
-"\t\t%s\n"
+"%s [options]\n"
+"%s\n"
+"\n"
+" -h, --help Show this help\n"
+" --version Show version\n"
+"\n"
+" -r, --record Create a connection for recording\n"
+" -p, --playback Create a connection for playback\n"
+"\n"
+" -v, --verbose Enable verbose operations\n"
+"\n"
+" -s, --server=SERVER The name of the server to connect "
+"to\n"
+" -d, --device=DEVICE The name of the sink/source to "
+"connect to\n"
+" -n, --client-name=NAME How to call this client on the "
+"server\n"
+" --stream-name=NAME How to call this stream on the "
+"server\n"
+" --volume=VOLUME Specify the initial (linear) volume "
+"in range 0...65536\n"
+" --rate=SAMPLERATE The sample rate in Hz (defaults to "
+"44100)\n"
+" --format=SAMPLEFORMAT The sample type, one of s16le, "
+"s16be, u8, float32le,\n"
+" float32be, ulaw, alaw, s32le, s32be, "
+"s24le, s24be,\n"
+" s24-32le, s24-32be (defaults to "
+"s16ne)\n"
+" --channels=CHANNELS The number of channels, 1 for mono, "
+"2 for stereo\n"
+" (defaults to 2)\n"
+" --channel-map=CHANNELMAP Channel map to use instead of the "
+"default\n"
+" --fix-format Take the sample format from the sink/"
+"source the stream is\n"
+" being connected to.\n"
+" --fix-rate Take the sampling rate from the sink/"
+"source the stream is\n"
+" being connected to.\n"
+" --fix-channels Take the number of channels and the "
+"channel map\n"
+" from the sink/source the stream is "
+"being connected to.\n"
+" --no-remix Don't upmix or downmix channels.\n"
+" --no-remap Map channels by index instead of "
+"name.\n"
+" --latency=BYTES Request the specified latency in "
+"bytes.\n"
+" --process-time=BYTES Request the specified process time "
+"per request in bytes.\n"
+" --latency-msec=MSEC Request the specified latency in "
+"msec.\n"
+" --process-time-msec=MSEC Request the specified process time "
+"per request in msec.\n"
+" --property=PROPERTY=VALUE Set the specified property to the "
+"specified value.\n"
+" --raw Record/play raw PCM data.\n"
+" --passthrough Passthrough data.\n"
+" --file-format[=FFORMAT] Record/play formatted PCM data.\n"
+" --list-file-formats List available file formats.\n"
+" --monitor-stream=INDEX Record from the sink input with "
+"index INDEX.\n"
msgstr ""
-"Quelle #%u\n"
-"\tStatus: %s\n"
-"\tName: %s\n"
-"\tBeschreibung: %s\n"
-"\tTreiber: %s\n"
-"\tSample-Angabe: %s\n"
-"\tKanalzuordnung: %s\n"
-"\tBesitzer-Modul: %u\n"
-"\tStumm: %s\n"
-"\tLautstärke: %s%s%s\n"
-"\t Verteilung %0.2f\n"
-"\tBasis-Lautstärke: %s%s%s\n"
-"\tSink-Monitor: %s\n"
-"\tLatenz: %0.0f usec, eingestellt %0.0f usec\n"
-"\tFlags: %s%s%s%s%s%s\n"
-"\tEigenschaften:\n"
-"\t\t%s\n"
-
-#: ../src/utils/pactl.c:415 ../src/utils/pactl.c:485 ../src/utils/pactl.c:528
-#: ../src/utils/pactl.c:570 ../src/utils/pactl.c:640 ../src/utils/pactl.c:641
-#: ../src/utils/pactl.c:652 ../src/utils/pactl.c:711 ../src/utils/pactl.c:712
-#: ../src/utils/pactl.c:723 ../src/utils/pactl.c:775 ../src/utils/pactl.c:776
-#: ../src/utils/pactl.c:783
-msgid "n/a"
-msgstr "k. A."
-
-#: ../src/utils/pactl.c:454
-#, c-format
-msgid "Failed to get module information: %s"
-msgstr "Beziehen der Modul-Information fehlgeschlagen: %s"
+"%s [Optionen]\n"
+"%s\n"
+"\n"
+" -h, --help zeigt diese Hilfe an\n"
+" --version zeigt die Version an\n"
+"\n"
+" -r, --record baut eine Aufnahme-Verbindung auf\n"
+" -p, --playback baut eine Wiedergabe-Verbindung auf\n"
+"\n"
+" -v, --verbose zeigt ausführliche Meldungen an\n"
+"\n"
+" -s, --server=SERVER Name des zu verbindenden Servers\n"
+" -d, --device=GERÄT Name des/der zu verbindenden Ziels/"
+"Quelle\n"
+" -n, --client-name=NAME Name des Clients auf dem Server\n"
+" --stream-name=NAME Name des Streams auf dem Server\n"
+" --volume=VOLUME gibt die initiale (lineare) "
+"Lautstärke zwischen 0...65536 an\n"
+" --rate=ABTASTRATE Abtastate in Hz (Standard 44100)\n"
+" --format=ABTASTFORMAT gibt ein Abtastformat von s16le, "
+"s16be, u8, float32le,\n"
+" float32be, ulaw, alaw, s32le, "
+"s32be, s24le, s24be,\n"
+" s24-32le, s24-32be an (Standard "
+"ist s16ne)\n"
+" --channels=CHANNELS Anzahl Kanäle, 1 für Mono, 2 für "
+"Stereo\n"
+" (Standard ist 2)\n"
+" --channel-map=KANALZUORDNUNG nutzt diese geänderte "
+"Kanalzuordnung\n"
+" --fix-format nutzt das Abtastformat des mit dem "
+"Ziel\n"
+" verbundenen Streams.\n"
+" --fix-rate nutzt die Abtastrate des mit dem "
+"Ziel\n"
+" verbundenen Streams.\n"
+" --fix-channels nutzt die Anzahl und Zuordnung der "
+"Kanäle\n"
+" des mit dem Ziel verbundenen "
+"Streams.\n"
+" --no-remix mischt Kanäle nicht up-/down.\n"
+" --no-remap ordnet Kanäle nach Index statt Name "
+"zu.\n"
+" --latency=BYTES fordert diese Latenz in Bytes an.\n"
+" --process-time=BYTES fordert diese Prozesszeit pro "
+"Anfrage in Bytes an.\n"
+" --latency-msec=MSEC fordert diese Latenz in "
+"Millisekunden an.\n"
+" --process-time-msec=MSEC fordert diese Prozesszeit pro "
+"Anfrage in Millisekunden an.\n"
+" --property=EIGENSCHAFT=WERT setzt die angegebene Eigenschaft auf "
+"den angegebenen Wert.\n"
+" --raw nimmt PCM-Rohdaten auf oder spielt "
+"diese ab.\n"
+" --passthrough gibt die Daten unverändert weiter.\n"
+" --file-format[=FFORMAT] nimmt formatierte PCM-Daten auf oder "
+"spielt diese ab.\n"
+" --list-file-formats listet verfügbare Dateiformate auf.\n"
+" --monitor-stream=INDEX zeichnet von der Ziel-Eingabe mit "
+"dem Index INDEX auf.\n"
+"\n"
-#: ../src/utils/pactl.c:477
-#, c-format
+#: ../src/utils/pacat.c:788
+msgid "Play back encoded audio files on a PulseAudio sound server."
+msgstr "Kodierte Audio-Dateien auf einem PulseAudio-Soundserver wiedergeben."
+
+#: ../src/utils/pacat.c:792
msgid ""
-"Module #%u\n"
-"\tName: %s\n"
-"\tArgument: %s\n"
-"\tUsage counter: %s\n"
-"\tProperties:\n"
-"\t\t%s\n"
+"Capture audio data from a PulseAudio sound server and write it to a file."
msgstr ""
-"Modul #%u\n"
-"\tName: %s\n"
-"\tArgument: %s\n"
-"\tNutzungszähler: %s\n"
-"\tEigenschaften:\n"
-"\t\t%s\n"
-
-#: ../src/utils/pactl.c:496
-#, c-format
-msgid "Failed to get client information: %s"
-msgstr "Beziehen der Client-Information fehlgeschlagen: %s"
+"Audio-Daten von einem PulseAudio-Soundserver aufnehmen und in eine Datei "
+"schreiben."
-#: ../src/utils/pactl.c:522
-#, c-format
+#: ../src/utils/pacat.c:796
msgid ""
-"Client #%u\n"
-"\tDriver: %s\n"
-"\tOwner Module: %s\n"
-"\tProperties:\n"
-"\t\t%s\n"
+"Capture audio data from a PulseAudio sound server and write it to STDOUT or "
+"the specified file."
msgstr ""
-"Client #%u\n"
-"\tTreiber: %s\n"
-"\tOwner-Modul: %s\n"
-"\tEigenschaften:\n"
-"\t\t%s\n"
+"Audio-Daten von einem PulseAudio-Soundserver aufnehmen und in die "
+"Standardausgabe oder eine angegebene Datei schreiben."
-#: ../src/utils/pactl.c:539
-#, c-format
-msgid "Failed to get card information: %s"
-msgstr "Beziehen der Karten-Information fehlgeschlagen: %s"
+#: ../src/utils/pacat.c:800
+msgid ""
+"Play back audio data from STDIN or the specified file on a PulseAudio sound "
+"server."
+msgstr ""
+"Audio-Daten aus der Standardeingabe oder der angegebenen Datei auf einem "
+"PulseAudio-Soundserver wiedergeben."
-#: ../src/utils/pactl.c:562
+#: ../src/utils/pacat.c:814
#, c-format
msgid ""
-"Card #%u\n"
-"\tName: %s\n"
-"\tDriver: %s\n"
-"\tOwner Module: %s\n"
-"\tProperties:\n"
-"\t\t%s\n"
+"pacat %s\n"
+"Compiled with libpulse %s\n"
+"Linked with libpulse %s\n"
msgstr ""
-"Karte #%u\n"
-"\tName: %s\n"
-"\tTreiber: %s\n"
-"\tOwner-Modul: %s\n"
-"\tEigenschaften:\n"
-"\t\t%s\n"
+"pacat %s\n"
+"Kompiliert mit libpulse %s\n"
+"Gelinkt mit libpulse %s\n"
-#: ../src/utils/pactl.c:576
+#: ../src/utils/pacat.c:847 ../src/utils/pactl.c:1648
#, c-format
-msgid "\tProfiles:\n"
-msgstr "\tProfile:\n"
+msgid "Invalid client name '%s'"
+msgstr "Ungültiger Client-Name »%s«"
-#: ../src/utils/pactl.c:582
+#: ../src/utils/pacat.c:862
#, c-format
-msgid "\tActive Profile: %s\n"
-msgstr "\tAktive Profile: %s\n"
+msgid "Invalid stream name '%s'"
+msgstr "Ungültiger Stream-Name »%s«"
-#: ../src/utils/pactl.c:593 ../src/utils/pactl.c:868
+#: ../src/utils/pacat.c:899
#, c-format
-msgid "Failed to get sink input information: %s"
-msgstr "Erhalten der Sink-Eingabe-Informationen fehlgeschlagen: %s"
+msgid "Invalid channel map '%s'"
+msgstr "Ungültige Kanal-Zuweisung »%s«"
-#: ../src/utils/pactl.c:622
-#, fuzzy, c-format
-msgid ""
-"Sink Input #%u\n"
-"\tDriver: %s\n"
-"\tOwner Module: %s\n"
-"\tClient: %s\n"
-"\tSink: %u\n"
-"\tSample Specification: %s\n"
-"\tChannel Map: %s\n"
-"\tFormat: %s\n"
-"\tMute: %s\n"
-"\tVolume: %s\n"
-"\t %s\n"
-"\t balance %0.2f\n"
-"\tBuffer Latency: %0.0f usec\n"
-"\tSink Latency: %0.0f usec\n"
-"\tResample method: %s\n"
-"\tProperties:\n"
-"\t\t%s\n"
-msgstr ""
-"Sink-Eingabe #%u\n"
-"\tTreiber: %s\n"
-"\tBesitzer-Modul: %s\n"
-"\tClient: %s\n"
-"\tSink: %u\n"
-"\tSample-Angabe: %s\n"
-"\tKanalzuordnung: %s\n"
-"\tStumm: %s\n"
-"\tLautstärke: %s\n"
-"\t %s\n"
-"\t Verteilung %0.2f\n"
-"\tPufferlatenz: %0.0f usec\n"
-"\tSink-Latenz: %0.0f usec\n"
-"\tResample-Methode: %s\n"
-"\tEigenschaften:\n"
-"\t\t%s\n"
+#: ../src/utils/pacat.c:928 ../src/utils/pacat.c:942
+#, c-format
+msgid "Invalid latency specification '%s'"
+msgstr "Ungültige Latenz-Angaben »%s«"
-#: ../src/utils/pactl.c:663 ../src/utils/pactl.c:887
+#: ../src/utils/pacat.c:935 ../src/utils/pacat.c:949
#, c-format
-msgid "Failed to get source output information: %s"
-msgstr "Konnte Informationen über Quell-Ausgabe nicht holen: %s"
+msgid "Invalid process time specification '%s'"
+msgstr "Ungültige Prozesszeit-Angaben »%s«"
-#: ../src/utils/pactl.c:693
-#, fuzzy, c-format
-msgid ""
-"Source Output #%u\n"
-"\tDriver: %s\n"
-"\tOwner Module: %s\n"
-"\tClient: %s\n"
-"\tSource: %u\n"
-"\tSample Specification: %s\n"
-"\tChannel Map: %s\n"
-"\tFormat: %s\n"
-"\tMute: %s\n"
-"\tVolume: %s\n"
-"\t %s\n"
-"\t balance %0.2f\n"
-"\tBuffer Latency: %0.0f usec\n"
-"\tSource Latency: %0.0f usec\n"
-"\tResample method: %s\n"
-"\tProperties:\n"
-"\t\t%s\n"
-msgstr ""
-"Sink-Eingabe #%u\n"
-"\tTreiber: %s\n"
-"\tBesitzer-Modul: %s\n"
-"\tClient: %s\n"
-"\tSink: %u\n"
-"\tSample-Angabe: %s\n"
-"\tKanalzuordnung: %s\n"
-"\tStumm: %s\n"
-"\tLautstärke: %s\n"
-"\t %s\n"
-"\t Verteilung %0.2f\n"
-"\tPufferlatenz: %0.0f usec\n"
-"\tSink-Latenz: %0.0f usec\n"
-"\tResample-Methode: %s\n"
-"\tEigenschaften:\n"
-"\t\t%s\n"
+#: ../src/utils/pacat.c:961
+#, c-format
+msgid "Invalid property '%s'"
+msgstr "Ungültige Eigenschaft »%s«"
-#: ../src/utils/pactl.c:734
+#: ../src/utils/pacat.c:980
#, c-format
-msgid "Failed to get sample information: %s"
-msgstr "Beziehen der Sample-Informationen fehlgeschlagen: %s"
+msgid "Unknown file format %s."
+msgstr "Unbekanntes Dateiformat %s."
-#: ../src/utils/pactl.c:761
+#: ../src/utils/pacat.c:995
+msgid "Failed to parse the argument for --monitor-stream"
+msgstr "Der Parameter für --monitor-stream konnte nicht ausgewertet werden."
+
+#: ../src/utils/pacat.c:1006
+msgid "Invalid sample specification"
+msgstr "Ungültige Abtastwert-Angaben"
+
+#: ../src/utils/pacat.c:1016
#, c-format
-msgid ""
-"Sample #%u\n"
-"\tName: %s\n"
-"\tSample Specification: %s\n"
-"\tChannel Map: %s\n"
-"\tVolume: %s\n"
-"\t %s\n"
-"\t balance %0.2f\n"
-"\tDuration: %0.1fs\n"
-"\tSize: %s\n"
-"\tLazy: %s\n"
-"\tFilename: %s\n"
-"\tProperties:\n"
-"\t\t%s\n"
-msgstr ""
-"Sample #%u\n"
-"\tName: %s\n"
-"\tSample Specification: %s\n"
-"\tChannel Map: %s\n"
-"\tLautstärke: %s\n"
-"\t %s\n"
-"\t Verteilung %0.2f\n"
-"\tDauer: %0.1fs\n"
-"\tGrösse: %s\n"
-"\tLazy: %s\n"
-"\tDateinamen: %s\n"
-"\tEigenschaften:\n"
-"\t\t%s\n"
+msgid "open(): %s"
+msgstr "open(): %s"
-#: ../src/utils/pactl.c:791 ../src/utils/pactl.c:801
+#: ../src/utils/pacat.c:1021
#, c-format
-msgid "Failure: %s"
-msgstr "Fehlgeschlagen: %s"
+msgid "dup2(): %s"
+msgstr "dup2(): %s"
-#: ../src/utils/pactl.c:915
-#, fuzzy, c-format
-msgid "Failed to set format: invalid format string %s"
-msgstr "Beziehen der Quellen-Informationen fehlgeschlagen: %s"
+#: ../src/utils/pacat.c:1028
+msgid "Too many arguments."
+msgstr "Zu viele Argumente."
-#: ../src/utils/pactl.c:954
-#, c-format
-msgid "Failed to upload sample: %s"
-msgstr "Hochladen des Sample fehlgeschlagen: %s"
+#: ../src/utils/pacat.c:1039
+msgid "Failed to generate sample specification for file."
+msgstr "Beziehen der Abtastwert-Informationen für die Datei fehlgeschlagen."
-#: ../src/utils/pactl.c:971
-msgid "Premature end of file"
-msgstr "Dateiende ist zu früh aufgetreten"
+#: ../src/utils/pacat.c:1065
+msgid "Failed to open audio file."
+msgstr "Öffnen der Audio-Datei fehlgeschlagen."
-#: ../src/utils/pactl.c:991
-msgid "new"
-msgstr ""
+#: ../src/utils/pacat.c:1071
+msgid ""
+"Warning: specified sample specification will be overwritten with "
+"specification from file."
+msgstr "Warnung: Beziehen der Abtastwert-Angabe aus Datei fehlgeschlagen."
-#: ../src/utils/pactl.c:994
-msgid "change"
-msgstr ""
+#: ../src/utils/pacat.c:1074 ../src/utils/pactl.c:1712
+msgid "Failed to determine sample specification from file."
+msgstr "Beziehen der Abtastwert-Informationen der Datei fehlgeschlagen."
-#: ../src/utils/pactl.c:997
-msgid "remove"
-msgstr ""
+#: ../src/utils/pacat.c:1083
+msgid "Warning: Failed to determine channel map from file."
+msgstr "Warnung: Bestimmung der Kanalzuordnung aus Datei fehlgeschlagen."
-#: ../src/utils/pactl.c:1000 ../src/utils/pactl.c:1035
-msgid "unknown"
-msgstr ""
+#: ../src/utils/pacat.c:1094
+msgid "Channel map doesn't match sample specification"
+msgstr "Kanalzuordnung entspricht nicht Abtastwert-Angaben"
-#: ../src/utils/pactl.c:1008
-msgid "sink"
-msgstr ""
+#: ../src/utils/pacat.c:1105
+msgid "Warning: failed to write channel map to file."
+msgstr "Warnung: Schreiben der Kanalzuordnung in Datei fehlgeschlagen."
-#: ../src/utils/pactl.c:1011
-msgid "source"
+#: ../src/utils/pacat.c:1120
+#, c-format
+msgid ""
+"Opening a %s stream with sample specification '%s' and channel map '%s'."
msgstr ""
+"%s-Stream mit Abtastwert-Angabe »%s« und Kanalzuordnung »%s« wird geöffnet."
-#: ../src/utils/pactl.c:1014
-msgid "sink-input"
-msgstr ""
+#: ../src/utils/pacat.c:1121
+msgid "recording"
+msgstr "aufnehmen"
-#: ../src/utils/pactl.c:1017
-msgid "source-output"
-msgstr ""
+#: ../src/utils/pacat.c:1121
+msgid "playback"
+msgstr "abspielen"
-#: ../src/utils/pactl.c:1020
-msgid "module"
-msgstr ""
+#: ../src/utils/pacat.c:1145
+msgid "Failed to set media name."
+msgstr "Medienname konnte nicht gesetzt werden."
-#: ../src/utils/pactl.c:1023
-msgid "client"
-msgstr ""
+#: ../src/utils/pacat.c:1152 ../src/utils/pactl.c:2062
+msgid "pa_mainloop_new() failed."
+msgstr "pa_mainloop_new() fehlgeschlagen"
-#: ../src/utils/pactl.c:1026
-msgid "sample-cache"
-msgstr ""
+#: ../src/utils/pacat.c:1175
+msgid "io_new() failed."
+msgstr "io_new() fehlgeschlagen."
-#: ../src/utils/pactl.c:1029 ../src/utils/pactl.c:1032
-#, fuzzy
-msgid "server"
-msgstr "Ungültiger Server"
+#: ../src/utils/pacat.c:1182 ../src/utils/pactl.c:2074
+msgid "pa_context_new() failed."
+msgstr "pa_context_new() fehlgeschlagen."
-#: ../src/utils/pactl.c:1041
+#: ../src/utils/pacat.c:1190 ../src/utils/pactl.c:2080
#, c-format
-msgid "Event '%s' on %s #%u\n"
-msgstr ""
+msgid "pa_context_connect() failed: %s"
+msgstr "pa_context_new() fehlgeschlagen: %s"
-#: ../src/utils/pactl.c:1258
-msgid "Got SIGINT, exiting."
-msgstr "SIGINT empfangen, beenden."
+#: ../src/utils/pacat.c:1196
+msgid "pa_context_rttime_new() failed."
+msgstr "pa_context_rttime_new() fehlgeschlagen."
-#: ../src/utils/pactl.c:1285
-msgid "Invalid volume specification"
-msgstr "Ungültige Sample-Angaben"
+#: ../src/utils/pacat.c:1203 ../src/utils/pactl.c:2085
+msgid "pa_mainloop_run() failed."
+msgstr "pa_mainloop_run() fehlgeschlagen."
-#: ../src/utils/pactl.c:1308
-msgid "Volume outside permissible range.\n"
-msgstr ""
+#: ../src/utils/pacmd.c:51 ../src/utils/pactl.c:1570
+msgid "NAME [ARGS ...]"
+msgstr "NAME [ARGUMENTE …]"
-#: ../src/utils/pactl.c:1319 ../src/utils/pactl.c:1320
-#: ../src/utils/pactl.c:1321 ../src/utils/pactl.c:1322
-#: ../src/utils/pactl.c:1323 ../src/utils/pactl.c:1324
-#: ../src/utils/pactl.c:1325 ../src/utils/pactl.c:1326
-#: ../src/utils/pactl.c:1327 ../src/utils/pactl.c:1328
-#: ../src/utils/pactl.c:1329 ../src/utils/pactl.c:1330
-#: ../src/utils/pactl.c:1331 ../src/utils/pactl.c:1332
-#: ../src/utils/pactl.c:1333 ../src/utils/pactl.c:1334
-#: ../src/utils/pactl.c:1335 ../src/utils/pactl.c:1336
-#: ../src/utils/pactl.c:1337
-msgid "[options]"
-msgstr ""
+#: ../src/utils/pacmd.c:52 ../src/utils/pacmd.c:60 ../src/utils/pactl.c:1571
+msgid "NAME|#N"
+msgstr "NAME|#N"
-#: ../src/utils/pactl.c:1321
-msgid "[TYPE]"
-msgstr ""
+#: ../src/utils/pacmd.c:53 ../src/utils/pacmd.c:63 ../src/utils/pactl.c:1569
+#: ../src/utils/pactl.c:1575
+msgid "NAME"
+msgstr "NAME"
-#: ../src/utils/pactl.c:1323
-msgid "FILENAME [NAME]"
-msgstr ""
+#: ../src/utils/pacmd.c:54
+msgid "NAME|#N VOLUME"
+msgstr "NAME|#N LAUTSTÄRKE"
-#: ../src/utils/pactl.c:1324
-msgid "NAME [SINK]"
-msgstr ""
+#: ../src/utils/pacmd.c:55
+msgid "#N VOLUME"
+msgstr "#N LAUTSTÄRKE"
-#: ../src/utils/pactl.c:1325
-msgid "NAME"
-msgstr ""
+#: ../src/utils/pacmd.c:56 ../src/utils/pacmd.c:70 ../src/utils/pactl.c:1573
+msgid "NAME|#N 1|0"
+msgstr "NAME|#N 1|0"
-#: ../src/utils/pactl.c:1326
-msgid "NAME [ARGS ...]"
-msgstr ""
+#: ../src/utils/pacmd.c:57
+msgid "#N 1|0"
+msgstr "#N 1|0"
-#: ../src/utils/pactl.c:1327
+#: ../src/utils/pacmd.c:58
+msgid "NAME|#N KEY=VALUE"
+msgstr "NAME|#N SCHLÜSSEL=WERT"
+
+#: ../src/utils/pacmd.c:59
+msgid "#N KEY=VALUE"
+msgstr "#N SCHLÜSSEL=WERT"
+
+#: ../src/utils/pacmd.c:61
msgid "#N"
-msgstr ""
+msgstr "#N"
+
+#: ../src/utils/pacmd.c:62
+msgid "NAME SINK|#N"
+msgstr "NAME ZIEL|#N"
+
+#: ../src/utils/pacmd.c:64 ../src/utils/pacmd.c:65
+msgid "NAME FILENAME"
+msgstr "NAME DATEINAME"
+
+#: ../src/utils/pacmd.c:66
+msgid "PATHNAME"
+msgstr "PFADNAME"
+
+#: ../src/utils/pacmd.c:67
+msgid "FILENAME SINK|#N"
+msgstr "DATEINAME ZIEL|#N"
-#: ../src/utils/pactl.c:1328
+#: ../src/utils/pacmd.c:69 ../src/utils/pactl.c:1572
msgid "#N SINK|SOURCE"
-msgstr ""
+msgstr "#N ZIEL|QUELLE"
-#: ../src/utils/pactl.c:1329 ../src/utils/pactl.c:1334
-msgid "NAME|#N 1|0"
-msgstr ""
+#: ../src/utils/pacmd.c:71 ../src/utils/pacmd.c:77 ../src/utils/pacmd.c:78
+msgid "1|0"
+msgstr "1|0"
-#: ../src/utils/pactl.c:1330
+#: ../src/utils/pacmd.c:72 ../src/utils/pactl.c:1574
msgid "CARD PROFILE"
-msgstr ""
+msgstr "KARTENPROFIL"
-#: ../src/utils/pactl.c:1331
+#: ../src/utils/pacmd.c:73 ../src/utils/pactl.c:1576
msgid "NAME|#N PORT"
-msgstr ""
+msgstr "NAME|#N PORT"
-#: ../src/utils/pactl.c:1332
-msgid "NAME|#N VOLUME"
-msgstr ""
+#: ../src/utils/pacmd.c:74 ../src/utils/pactl.c:1582
+msgid "CARD-NAME|CARD-#N PORT OFFSET"
+msgstr "KARTENNAME|KARTEN-#N PORT POSITION"
-#: ../src/utils/pactl.c:1333
-msgid "#N VOLUME"
-msgstr ""
+#: ../src/utils/pacmd.c:75
+msgid "TARGET"
+msgstr "ZIEL"
-#: ../src/utils/pactl.c:1335
-msgid "#N 1|0"
-msgstr ""
+#: ../src/utils/pacmd.c:76
+msgid "NUMERIC-LEVEL"
+msgstr "NUMERISCHE STUFE"
-#: ../src/utils/pactl.c:1336
-msgid "#N FORMATS"
-msgstr ""
+#: ../src/utils/pacmd.c:79
+msgid "FRAMES"
+msgstr "FRAMES"
-#: ../src/utils/pactl.c:1339
-#, fuzzy, c-format
+#: ../src/utils/pacmd.c:81
+#, c-format
msgid ""
"\n"
" -h, --help Show this help\n"
" --version Show version\n"
-"\n"
-" -s, --server=SERVER The name of the server to connect "
-"to\n"
-" -n, --client-name=NAME How to call this client on the "
-"server\n"
+"When no command is given pacmd starts in the interactive mode.\n"
msgstr ""
-"%s [options] ... \n"
-"\n"
-" -h, --help Diese Hilfe zeigen\n"
-" --version Zeige Version\n"
-" -s, --server=SERVER Name des Zielservers\n"
"\n"
+" -h, --help zeigt diese Hilfe an\n"
+" --version zeigt die Version an\n"
+"Wenn kein Befehl angegeben ist, startet pacmd im interaktiven Modus.\n"
-#: ../src/utils/pactl.c:1380
+#: ../src/utils/pacmd.c:128
#, c-format
msgid ""
-"pactl %s\n"
+"pacmd %s\n"
"Compiled with libpulse %s\n"
"Linked with libpulse %s\n"
msgstr ""
-"pactl %s\n"
+"pacmd %s\n"
"Kompiliert mit libpulse %s\n"
"Gelinkt mit libpulse %s\n"
-#: ../src/utils/pactl.c:1439
+#: ../src/utils/pacmd.c:142
+msgid "No PulseAudio daemon running, or not running as session daemon."
+msgstr "Es läuft kein PulseAudio-Dienst oder nicht als Sitzungsdienst."
+
+#: ../src/utils/pacmd.c:147
#, c-format
-msgid "Specify nothing, or one of: %s"
-msgstr ""
+msgid "socket(PF_UNIX, SOCK_STREAM, 0): %s"
+msgstr "socket(PF_UNIX, SOCK_STREAM, 0): %s"
-#: ../src/utils/pactl.c:1449
-msgid "Please specify a sample file to load"
-msgstr "Geben Sie eine zu öffnende Sample-Datei an"
+#: ../src/utils/pacmd.c:164
+#, c-format
+msgid "connect(): %s"
+msgstr "connect(): %s"
-#: ../src/utils/pactl.c:1462
-msgid "Failed to open sound file."
-msgstr "Öffnen der Audio-Datei fehlgeschlagen."
+#: ../src/utils/pacmd.c:172
+msgid "Failed to kill PulseAudio daemon."
+msgstr "Beenden des PulseAudio-Dienstes fehlgeschlagen."
-#: ../src/utils/pactl.c:1474
-msgid "Warning: Failed to determine sample specification from file."
-msgstr "Warnung: Beziehen der Sample-Angabe aus Datei fehlgeschlagen."
+#: ../src/utils/pacmd.c:180
+msgid "Daemon not responding."
+msgstr "Dienst antwortet nicht."
-#: ../src/utils/pactl.c:1484
-msgid "You have to specify a sample name to play"
-msgstr "Sie müssen eine abzuspielende Sample-Datei angeben"
+#: ../src/utils/pacmd.c:212 ../src/utils/pacmd.c:321 ../src/utils/pacmd.c:339
+#, c-format
+msgid "write(): %s"
+msgstr "write(): %s"
-#: ../src/utils/pactl.c:1496
-msgid "You have to specify a sample name to remove"
-msgstr "Sie müssen eine zu löschende Sample-Datei angeben"
+#: ../src/utils/pacmd.c:268
+#, c-format
+msgid "poll(): %s"
+msgstr "poll(): %s"
-#: ../src/utils/pactl.c:1505
-msgid "You have to specify a sink input index and a sink"
-msgstr "Sie müssen einen Sink-Eingabe-Indexwert und einen Sink angeben"
+#: ../src/utils/pacmd.c:279 ../src/utils/pacmd.c:299
+#, c-format
+msgid "read(): %s"
+msgstr "read(): %s"
-#: ../src/utils/pactl.c:1515
-msgid "You have to specify a source output index and a source"
-msgstr ""
-"Sie müssen eine Indexwert für die Quell-Ausgabe und eine Quelle angeben"
+#: ../src/utils/pactl.c:164
+#, c-format
+msgid "Failed to get statistics: %s"
+msgstr "Beziehen der Statistik fehlgeschlagen: %s"
-#: ../src/utils/pactl.c:1530
-msgid "You have to specify a module name and arguments."
-msgstr "Sie müssen einen Modulnamen angeben und Argumente übergeben."
+#: ../src/utils/pactl.c:170
+#, c-format
+msgid "Currently in use: %u blocks containing %s bytes total.\n"
+msgstr "Momentane Nutzung: %u Blöcke mit insgesamt %s Bytes.\n"
-#: ../src/utils/pactl.c:1550
-msgid "You have to specify a module index"
-msgstr "Sie müssen einen Indexwert für ein Modul angeben"
+#: ../src/utils/pactl.c:173
+#, c-format
+msgid "Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
+msgstr "Während gesamter Laufzeit: %u Blöcke mit insgesamt %s Bytes.\n"
+
+#: ../src/utils/pactl.c:176
+#, c-format
+msgid "Sample cache size: %s\n"
+msgstr "Abtast-Pufferspeichergröße: %s\n"
+
+#: ../src/utils/pactl.c:185
+#, c-format
+msgid "Failed to get server information: %s"
+msgstr "Beziehen der Server-Information fehlgeschlagen: %s"
-#: ../src/utils/pactl.c:1560
+#: ../src/utils/pactl.c:190
+#, c-format
msgid ""
-"You may not specify more than one sink. You have to specify a boolean value."
+"Server String: %s\n"
+"Library Protocol Version: %u\n"
+"Server Protocol Version: %u\n"
+"Is Local: %s\n"
+"Client Index: %u\n"
+"Tile Size: %zu\n"
msgstr ""
-"Sie sollten nur einen Sink angeben. Sie müssen zumindest eine Boolsche "
-"Variable übergeben."
+"Server-Zeichenkette: %s\n"
+"Bibliotheks-Protokollversion: %u\n"
+"Server-Protokollversion: %u\n"
+"ist lokal: %s\n"
+"Client-Index: %u\n"
+"Tile-Größe: %zu\n"
-#: ../src/utils/pactl.c:1573
+#: ../src/utils/pactl.c:206
+#, c-format
msgid ""
-"You may not specify more than one source. You have to specify a boolean "
-"value."
+"User Name: %s\n"
+"Host Name: %s\n"
+"Server Name: %s\n"
+"Server Version: %s\n"
+"Default Sample Specification: %s\n"
+"Default Channel Map: %s\n"
+"Default Sink: %s\n"
+"Default Source: %s\n"
+"Cookie: %04x:%04x\n"
msgstr ""
-"Sie sollten nur eine Quelle angeben. Sie müssen zumindest eine Boolsche "
-"Variable übergeben."
-
-#: ../src/utils/pactl.c:1585
-msgid "You have to specify a card name/index and a profile name"
-msgstr "Sie müssen einen Karten-Name/Indexwert und einen Profilnamen angeben"
-
-#: ../src/utils/pactl.c:1596
-msgid "You have to specify a sink name/index and a port name"
-msgstr "Sie müssen einen Sink-Namen/-Indexwert und einen Portnamen angeben"
-
-#: ../src/utils/pactl.c:1607
-msgid "You have to specify a source name/index and a port name"
-msgstr "Sie müssen einen Quellennamen/-Indexwert und einen Portnamen angeben"
-
-#: ../src/utils/pactl.c:1618
-msgid "You have to specify a sink name/index and a volume"
-msgstr "Sie müssen einen Sink-Namen/-Indexwert und eine Lautstärke angeben"
-
-#: ../src/utils/pactl.c:1631
-msgid "You have to specify a source name/index and a volume"
-msgstr "Sie müssen einen Quellennamen/-Indexwert und einen Portnamen angeben"
-
-#: ../src/utils/pactl.c:1644
-msgid "You have to specify a sink input index and a volume"
-msgstr "Sie müssen einen Sink-Eingabe-Indexwert und eine Lautstärke angeben."
+"Name des Benutzers: %s\n"
+"Rechnername: %s\n"
+"Name des Servers: %s\n"
+"Version des Servers: %s\n"
+"Standard-Abtastwert-Angabe: %s\n"
+"Standard-Kanal-Zuordnung: %s\n"
+"Standard-Ziel: %s\n"
+"Standard-Quelle: %s\n"
+"Cookie: %04x:%04x\n"
-#: ../src/utils/pactl.c:1649
-msgid "Invalid sink input index"
-msgstr "Ungültiger Sink-Eingabe-Index"
+#: ../src/utils/pactl.c:255 ../src/utils/pactl.c:900 ../src/utils/pactl.c:978
+#, c-format
+msgid "Failed to get sink information: %s"
+msgstr "Erhalten der Ziel-Informationen fehlgeschlagen: %s"
-#: ../src/utils/pactl.c:1660
-#, fuzzy
-msgid "You have to specify a source output index and a volume"
+#: ../src/utils/pactl.c:281
+#, c-format
+msgid ""
+"Sink #%u\n"
+"\tState: %s\n"
+"\tName: %s\n"
+"\tDescription: %s\n"
+"\tDriver: %s\n"
+"\tSample Specification: %s\n"
+"\tChannel Map: %s\n"
+"\tOwner Module: %u\n"
+"\tMute: %s\n"
+"\tVolume: %s\n"
+"\t balance %0.2f\n"
+"\tBase Volume: %s\n"
+"\tMonitor Source: %s\n"
+"\tLatency: %0.0f usec, configured %0.0f usec\n"
+"\tFlags: %s%s%s%s%s%s%s\n"
+"\tProperties:\n"
+"\t\t%s\n"
msgstr ""
-"Sie müssen eine Indexwert für die Quell-Ausgabe und eine Quelle angeben"
+"Ziel #%u\n"
+"\tStatus: %s\n"
+"\tName: %s\n"
+"\tBeschreibung: %s\n"
+"\tTreiber: %s\n"
+"\tAbtastwert-Angabe: %s\n"
+"\tKanalzuordnung: %s\n"
+"\tBesitzer-Modul: %u\n"
+"\tStumm: %s\n"
+"\tLautstärke: %s\n"
+"\t Verteilung %0.2f\n"
+"\tBasis-Lautstärke: %s\n"
+"\tQuellen-Monitor: %s\n"
+"\tLatenz: %0.0f usec, eingestellt %0.0f usec\n"
+"\tFlags: %s%s%s%s%s%s%s\n"
+"\tEigenschaften:\n"
+"\t\t%s\n"
-#: ../src/utils/pactl.c:1665
-#, fuzzy
-msgid "Invalid source output index"
-msgstr "Ungültiger Sink-Eingabe-Index"
+#: ../src/utils/pactl.c:325 ../src/utils/pactl.c:431 ../src/utils/pactl.c:592
+#, c-format
+msgid "\tPorts:\n"
+msgstr "\tPorts:\n"
-#: ../src/utils/pactl.c:1677
-msgid "You have to specify a sink name/index and a mute boolean"
-msgstr ""
-"Sie müssen einen Sink-Namen/-Indexwert und eine Boolsche Variable für "
-"Stummschaltung angeben"
+#: ../src/utils/pactl.c:332 ../src/utils/pactl.c:438
+#, c-format
+msgid "\tActive Port: %s\n"
+msgstr "\tAktiver Port: %s\n"
-#: ../src/utils/pactl.c:1682 ../src/utils/pactl.c:1699
-#: ../src/utils/pactl.c:1721 ../src/utils/pactl.c:1742
-#, fuzzy
-msgid "Invalid mute specification"
-msgstr "Ungültige Sample-Angaben"
+#: ../src/utils/pactl.c:338 ../src/utils/pactl.c:444
+#, c-format
+msgid "\tFormats:\n"
+msgstr "\tFormate:\n"
-#: ../src/utils/pactl.c:1694
-msgid "You have to specify a source name/index and a mute boolean"
-msgstr ""
-"Sie müssen einen Quellennamen/-Indexwert und eine Boolsche Variable für "
-"Stummschaltung angeben"
+#: ../src/utils/pactl.c:362 ../src/utils/pactl.c:920 ../src/utils/pactl.c:993
+#, c-format
+msgid "Failed to get source information: %s"
+msgstr "Beziehen der Quellen-Informationen fehlgeschlagen: %s"
-#: ../src/utils/pactl.c:1711
-msgid "You have to specify a sink input index and a mute boolean"
+#: ../src/utils/pactl.c:388
+#, c-format
+msgid ""
+"Source #%u\n"
+"\tState: %s\n"
+"\tName: %s\n"
+"\tDescription: %s\n"
+"\tDriver: %s\n"
+"\tSample Specification: %s\n"
+"\tChannel Map: %s\n"
+"\tOwner Module: %u\n"
+"\tMute: %s\n"
+"\tVolume: %s\n"
+"\t balance %0.2f\n"
+"\tBase Volume: %s\n"
+"\tMonitor of Sink: %s\n"
+"\tLatency: %0.0f usec, configured %0.0f usec\n"
+"\tFlags: %s%s%s%s%s%s\n"
+"\tProperties:\n"
+"\t\t%s\n"
msgstr ""
-"Sie müssen einen Sink-Eingabe-Indexwert und eine Boolsche Variable für "
-"Stummschaltung angeben"
+"Quelle #%u\n"
+"\tStatus: %s\n"
+"\tName: %s\n"
+"\tBeschreibung: %s\n"
+"\tTreiber: %s\n"
+"\tAbtastwert-Angabe: %s\n"
+"\tKanalzuordnung: %s\n"
+"\tBesitzer-Modul: %u\n"
+"\tStumm: %s\n"
+"\tLautstärke: %s\n"
+"\t Verteilung %0.2f\n"
+"\tBasis-Lautstärke: %s\n"
+"\tZiel-Monitor: %s\n"
+"\tLatenz: %0.0f usec, eingestellt %0.0f usec\n"
+"\tFlags: %s%s%s%s%s%s\n"
+"\tEigenschaften:\n"
+"\t\t%s\n"
-#: ../src/utils/pactl.c:1716
-msgid "Invalid sink input index specification"
-msgstr "Ungültige Sink-Eingabe-Index-Angaben"
+#: ../src/utils/pactl.c:416 ../src/utils/pactl.c:486 ../src/utils/pactl.c:529
+#: ../src/utils/pactl.c:571 ../src/utils/pactl.c:669 ../src/utils/pactl.c:670
+#: ../src/utils/pactl.c:681 ../src/utils/pactl.c:739 ../src/utils/pactl.c:740
+#: ../src/utils/pactl.c:751 ../src/utils/pactl.c:802 ../src/utils/pactl.c:803
+#: ../src/utils/pactl.c:809
+msgid "n/a"
+msgstr "k. A."
+
+#: ../src/utils/pactl.c:455 ../src/utils/pactl.c:859
+#, c-format
+msgid "Failed to get module information: %s"
+msgstr "Beziehen der Modul-Information fehlgeschlagen: %s"
-#: ../src/utils/pactl.c:1732
-#, fuzzy
-msgid "You have to specify a source output index and a mute boolean"
+#: ../src/utils/pactl.c:478
+#, c-format
+msgid ""
+"Module #%u\n"
+"\tName: %s\n"
+"\tArgument: %s\n"
+"\tUsage counter: %s\n"
+"\tProperties:\n"
+"\t\t%s\n"
msgstr ""
-"Sie müssen einen Quellennamen/-Indexwert und eine Boolsche Variable für "
-"Stummschaltung angeben"
+"Modul #%u\n"
+"\tName: %s\n"
+"\tArgument: %s\n"
+"\tNutzungszähler: %s\n"
+"\tEigenschaften:\n"
+"\t\t%s\n"
-#: ../src/utils/pactl.c:1737
-#, fuzzy
-msgid "Invalid source output index specification"
-msgstr "Ungültige Sink-Eingabe-Index-Angaben"
+#: ../src/utils/pactl.c:497
+#, c-format
+msgid "Failed to get client information: %s"
+msgstr "Beziehen der Client-Information fehlgeschlagen: %s"
-#: ../src/utils/pactl.c:1756
-#, fuzzy
+#: ../src/utils/pactl.c:523
+#, c-format
msgid ""
-"You have to specify a sink index and a semicolon-separated list of supported "
-"formats"
+"Client #%u\n"
+"\tDriver: %s\n"
+"\tOwner Module: %s\n"
+"\tProperties:\n"
+"\t\t%s\n"
msgstr ""
-"Sie müssen einen Sink-Namen/-Indexwert und eine Boolsche Variable für "
-"Stummschaltung angeben"
+"Client #%u\n"
+"\tTreiber: %s\n"
+"\tOwner-Modul: %s\n"
+"\tEigenschaften:\n"
+"\t\t%s\n"
-#: ../src/utils/pactl.c:1772
-msgid "No valid command specified."
-msgstr "Kein gültiger Befehl angegeben."
+#: ../src/utils/pactl.c:540
+#, c-format
+msgid "Failed to get card information: %s"
+msgstr "Beziehen der Karten-Information fehlgeschlagen: %s"
-#: ../src/utils/pax11publish.c:61
+#: ../src/utils/pactl.c:563
#, c-format
msgid ""
-"%s [-D display] [-S server] [-O sink] [-I source] [-c file] [-d|-e|-i|-r]\n"
-"\n"
-" -d Show current PulseAudio data attached to X11 display (default)\n"
-" -e Export local PulseAudio data to X11 display\n"
-" -i Import PulseAudio data from X11 display to local environment "
-"variables and cookie file.\n"
-" -r Remove PulseAudio data from X11 display\n"
+"Card #%u\n"
+"\tName: %s\n"
+"\tDriver: %s\n"
+"\tOwner Module: %s\n"
+"\tProperties:\n"
+"\t\t%s\n"
msgstr ""
-"%s [-D display] [-S server] [-O sink] [-I source] [-c file] [-d|-e|-i|-r]\n"
-"\n"
-" -d Zeige aktuell mit X11-Anzeige verbundene PulseAudio-Daten (Standard)\n"
-" -e Lokale PulseAudio-Daten an X11-Anzeige exportieren\n"
-" -i PulseAudio-Daten von X11-Anzeige in lokale Umgebungsvariablen und "
-"Cookie importieren.\n"
-" -r PulseAudio-Daten von X11-Anzeige löschen\n"
+"Karte #%u\n"
+"\tName: %s\n"
+"\tTreiber: %s\n"
+"\tOwner-Modul: %s\n"
+"\tEigenschaften:\n"
+"\t\t%s\n"
-#: ../src/utils/pax11publish.c:94
+#: ../src/utils/pactl.c:579
#, c-format
-msgid "Failed to parse command line.\n"
-msgstr "Parsen der Kommandozeile fehlgeschlagen.\n"
+msgid "\tProfiles:\n"
+msgstr "\tProfile:\n"
-#: ../src/utils/pax11publish.c:113
+#: ../src/utils/pactl.c:581
#, c-format
-msgid "Server: %s\n"
-msgstr "Server: %s\n"
+msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
+msgstr "\t\t%s: %s (Ziele: %u, Quellen: %u, Priorität: %u, verfügbar: %s)\n"
-#: ../src/utils/pax11publish.c:115
+#: ../src/utils/pactl.c:586
#, c-format
-msgid "Source: %s\n"
-msgstr "Quelle: %s\n"
+msgid "\tActive Profile: %s\n"
+msgstr "\tAktives Profil: %s\n"
-#: ../src/utils/pax11publish.c:117
+#: ../src/utils/pactl.c:600
#, c-format
-msgid "Sink: %s\n"
-msgstr "Sink: %s\n"
+msgid ""
+"\t\t\tProperties:\n"
+"\t\t\t\t%s\n"
+msgstr ""
+"\t\t\tEigenschaften:\n"
+"\t\t\t\t%s\n"
-#: ../src/utils/pax11publish.c:119
+#: ../src/utils/pactl.c:605
#, c-format
-msgid "Cookie: %s\n"
-msgstr "Cookie: %s\n"
+msgid "\t\t\tPart of profile(s): %s"
+msgstr "\t\t\tTeil der/des Profil(s): %s"
-#: ../src/utils/pax11publish.c:137
+#: ../src/utils/pactl.c:622 ../src/utils/pactl.c:940 ../src/utils/pactl.c:1008
#, c-format
-msgid "Failed to parse cookie data\n"
-msgstr "Parsen der Cookie-Daten fehlgeschlagen.\n"
+msgid "Failed to get sink input information: %s"
+msgstr "Erhalten der Ziel-Eingabe-Informationen fehlgeschlagen: %s"
-#: ../src/utils/pax11publish.c:142
+#: ../src/utils/pactl.c:651
#, c-format
-msgid "Failed to save cookie data\n"
-msgstr "Speichern der Cookie-Daten fehlgeschlagen\n"
+msgid ""
+"Sink Input #%u\n"
+"\tDriver: %s\n"
+"\tOwner Module: %s\n"
+"\tClient: %s\n"
+"\tSink: %u\n"
+"\tSample Specification: %s\n"
+"\tChannel Map: %s\n"
+"\tFormat: %s\n"
+"\tCorked: %s\n"
+"\tMute: %s\n"
+"\tVolume: %s\n"
+"\t balance %0.2f\n"
+"\tBuffer Latency: %0.0f usec\n"
+"\tSink Latency: %0.0f usec\n"
+"\tResample method: %s\n"
+"\tProperties:\n"
+"\t\t%s\n"
+msgstr ""
+"Ziel-Eingabe #%u\n"
+"\tTreiber: %s\n"
+"\tBesitzer-Modul: %s\n"
+"\tClient: %s\n"
+"\tZiel: %u\n"
+"\tAbtastwert-Angabe: %s\n"
+"\tKanalzuordnung: %s\n"
+"\tFormat: %s\n"
+"\tUnterbrochen: %s\n"
+"\tStumm: %s\n"
+"\tLautstärke: %s\n"
+"\t Verteilung %0.2f\n"
+"\tPufferlatenz: %0.0f usec\n"
+"\tZiel-Latenz: %0.0f usec\n"
+"\tResample-Methode: %s\n"
+"\tEigenschaften:\n"
+"\t\t%s\n"
-#: ../src/utils/pax11publish.c:157
+#: ../src/utils/pactl.c:692 ../src/utils/pactl.c:960 ../src/utils/pactl.c:1023
#, c-format
-msgid "Failed to load client configuration file.\n"
-msgstr "Laden der Client-Konfigurationsdatei fehlgeschlagen.\n"
+msgid "Failed to get source output information: %s"
+msgstr "Informationen über Quell-Ausgabe konnten nicht erhalten werden: %s"
-#: ../src/utils/pax11publish.c:162
+#: ../src/utils/pactl.c:721
#, c-format
-msgid "Failed to read environment configuration data.\n"
-msgstr "Lesen the Umgebungsdaten fehlgeschlagen.\n"
+msgid ""
+"Source Output #%u\n"
+"\tDriver: %s\n"
+"\tOwner Module: %s\n"
+"\tClient: %s\n"
+"\tSource: %u\n"
+"\tSample Specification: %s\n"
+"\tChannel Map: %s\n"
+"\tFormat: %s\n"
+"\tCorked: %s\n"
+"\tMute: %s\n"
+"\tVolume: %s\n"
+"\t balance %0.2f\n"
+"\tBuffer Latency: %0.0f usec\n"
+"\tSource Latency: %0.0f usec\n"
+"\tResample method: %s\n"
+"\tProperties:\n"
+"\t\t%s\n"
+msgstr ""
+"Quellen-Ausgabe #%u\n"
+"\tTreiber: %s\n"
+"\tBesitzer-Modul: %s\n"
+"\tClient: %s\n"
+"\tQuelle: %u\n"
+"\tAbtastwert-Angabe: %s\n"
+"\tKanalzuordnung: %s\n"
+"\tFormat: %s\n"
+"\tUnterbrochen: %s\n"
+"\tStumm: %s\n"
+"\tLautstärke: %s\n"
+"\t Verteilung %0.2f\n"
+"\tPufferlatenz: %0.0f usec\n"
+"\tQuellen-Latenz: %0.0f usec\n"
+"\tResampling-Methode: %s\n"
+"\tEigenschaften:\n"
+"\t\t%s\n"
-#: ../src/utils/pax11publish.c:179
+#: ../src/utils/pactl.c:762
#, c-format
-msgid "Failed to get FQDN.\n"
-msgstr "Beziehen des FQDN fehlgeschlagen.\n"
+msgid "Failed to get sample information: %s"
+msgstr "Beziehen der Abtastwert-Informationen fehlgeschlagen: %s"
-#: ../src/utils/pax11publish.c:199
+#: ../src/utils/pactl.c:789
#, c-format
-msgid "Failed to load cookie data\n"
-msgstr "Laden der Cookie-Daten fehlgeschlagen\n"
+msgid ""
+"Sample #%u\n"
+"\tName: %s\n"
+"\tSample Specification: %s\n"
+"\tChannel Map: %s\n"
+"\tVolume: %s\n"
+"\t balance %0.2f\n"
+"\tDuration: %0.1fs\n"
+"\tSize: %s\n"
+"\tLazy: %s\n"
+"\tFilename: %s\n"
+"\tProperties:\n"
+"\t\t%s\n"
+msgstr ""
+"Sample #%u\n"
+"\tName: %s\n"
+"\tAbtastwert-Angabe: %s\n"
+"\tKanalzuordnung: %s\n"
+"\tLautstärke: %s\n"
+"\t Verteilung %0.2f\n"
+"\tDauer: %0.1fs\n"
+"\tGröße: %s\n"
+"\tLazy: %s\n"
+"\tDateiname: %s\n"
+"\tEigenschaften:\n"
+"\t\t%s\n"
-#: ../src/utils/pax11publish.c:217
+#: ../src/utils/pactl.c:817 ../src/utils/pactl.c:827
#, c-format
-msgid "Not yet implemented.\n"
-msgstr "Noch nicht implementiert.\n"
+msgid "Failure: %s"
+msgstr "Fehlgeschlagen: %s"
-#: ../src/utils/pacmd.c:66
-msgid "No PulseAudio daemon running, or not running as session daemon."
-msgstr "Es läuft kein PulseAudio-Dienst oder nicht als Sessiondienst."
+#: ../src/utils/pactl.c:866
+#, c-format
+msgid "Failed to unload module: Module %s not loaded"
+msgstr "Modul konnte nicht entladen werden: Modul %s ist nicht geladen"
-#: ../src/utils/pacmd.c:71
+#: ../src/utils/pactl.c:884
#, c-format
-msgid "socket(PF_UNIX, SOCK_STREAM, 0): %s"
-msgstr "socket(PF_UNIX, SOCK_STREAM, 0): %s"
+msgid ""
+"Failed to set volume: You tried to set volumes for %d channels, whereas "
+"channel/s supported = %d\n"
+msgstr ""
+"Lautstärke konnte nicht gesetzt werden: Sie haben versucht, die Lautstärke "
+"für %d Kanäle einzustellen, aber es werden nur %d Kanäle unterstützt.\n"
-#: ../src/utils/pacmd.c:88
+#: ../src/utils/pactl.c:1050
#, c-format
-msgid "connect(): %s"
-msgstr "connect(): %s"
+msgid "Failed to set format: invalid format string %s"
+msgstr "Format konnte nicht gesetzt werden: Formatzeichenkette %s ist ungültig"
-#: ../src/utils/pacmd.c:96
-msgid "Failed to kill PulseAudio daemon."
-msgstr "Beenden des PulseAudio-Daemon fehlgeschlagen."
+#: ../src/utils/pactl.c:1093
+#, c-format
+msgid "Failed to upload sample: %s"
+msgstr "Hochladen des Sample fehlgeschlagen: %s"
-#: ../src/utils/pacmd.c:104
-msgid "Daemon not responding."
-msgstr "Daemon antwortet nicht."
+#: ../src/utils/pactl.c:1110
+msgid "Premature end of file"
+msgstr "Dateiende ist zu früh aufgetreten"
-#: ../src/utils/pacmd.c:184
-#, c-format
-msgid "poll(): %s"
-msgstr "poll(): %s"
+#: ../src/utils/pactl.c:1130
+msgid "new"
+msgstr "neu"
-#: ../src/utils/pacmd.c:195 ../src/utils/pacmd.c:215
-#, c-format
-msgid "read(): %s"
-msgstr "read(): %s"
+#: ../src/utils/pactl.c:1133
+msgid "change"
+msgstr "ändern"
-#: ../src/utils/pacmd.c:237 ../src/utils/pacmd.c:255
-#, c-format
-msgid "write(): %s"
-msgstr "write(): %s"
+#: ../src/utils/pactl.c:1136
+msgid "remove"
+msgstr "entfernen"
-#: ../src/pulsecore/lock-autospawn.c:136 ../src/pulsecore/lock-autospawn.c:222
-msgid "Cannot access autospawn lock."
-msgstr "Fehler beim Zugriff auf Autostart-Sperre."
+#: ../src/utils/pactl.c:1139 ../src/utils/pactl.c:1174
+msgid "unknown"
+msgstr "unbekannt"
-#: ../src/modules/alsa/alsa-sink.c:560 ../src/modules/alsa/alsa-sink.c:726
-#, c-format
-msgid ""
-"ALSA woke us up to write new data to the device, but there was actually "
-"nothing to write!\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers.\n"
-"We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() "
-"returned 0 or another value < min_avail."
-msgstr ""
-"ALSA weckte uns auf, um neue Daten auf das Gerät zu schreiben, doch es gab "
-"nichts zum Schreiben!\n"
-"Dies ist höchstwahrscheinlich ein Fehler im ALSA-Treiber '%s'. Bitte melden "
-"Sie diesen Fehler den ALSA-Entwicklern.\n"
-"Wir wurden durch das POLLOUT-Set geweckt, allerdings lieferte ein "
-"anschliessender snd_pcm_avail() den Wert 0 oder einen anderen Wert < "
-"min_avail."
+#: ../src/utils/pactl.c:1147
+msgid "sink"
+msgstr "Ziel"
-#: ../src/modules/alsa/alsa-source.c:519 ../src/modules/alsa/alsa-source.c:672
-#, c-format
-msgid ""
-"ALSA woke us up to read new data from the device, but there was actually "
-"nothing to read!\n"
-"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
-"to the ALSA developers.\n"
-"We were woken up with POLLIN set -- however a subsequent snd_pcm_avail() "
-"returned 0 or another value < min_avail."
-msgstr ""
-"ALSA weckte uns auf, um neue Daten vom Gerät zu lesen, doch es gab nichts "
-"zum Lesen!\n"
-"Dies ist höchstwahrscheinlich ein Fehler im ALSA-Treiber '%s'. Bitte melden "
-"Sie diesen Fehler den ALSA-Entwicklern.\n"
-"Wir wurden durch das POLLIN-Set geweckt, allerdings lieferte ein "
-"anschliessender snd_pcm_avail() den Wert 0 oder einen anderen Wert < "
-"min_avail."
+#: ../src/utils/pactl.c:1150
+msgid "source"
+msgstr "Quelle"
-#: ../src/modules/alsa/module-alsa-card.c:167
-#: ../src/modules/bluetooth/module-bluetooth-device.c:2796
-#: ../src/modules/alsa/alsa-mixer.c:3898
-msgid "Off"
-msgstr "Aus"
+#: ../src/utils/pactl.c:1153
+msgid "sink-input"
+msgstr "Ziel-Eingabe"
-#: ../src/modules/bluetooth/module-bluetooth-device.c:2738
-msgid "High Fidelity Playback (A2DP)"
-msgstr "High Fidelity Playback (A2DP)"
+#: ../src/utils/pactl.c:1156
+msgid "source-output"
+msgstr "Quellen-Eingabe"
-#: ../src/modules/bluetooth/module-bluetooth-device.c:2752
-msgid "High Fidelity Capture (A2DP)"
-msgstr "High Fidelity-Wiedergabe (A2DP)"
+#: ../src/utils/pactl.c:1159
+msgid "module"
+msgstr "Modul"
-#: ../src/modules/bluetooth/module-bluetooth-device.c:2767
-msgid "Telephony Duplex (HSP/HFP)"
-msgstr "Telephony Duplex (HSP/HFP)"
+#: ../src/utils/pactl.c:1162
+msgid "client"
+msgstr "Client"
-#: ../src/modules/bluetooth/module-bluetooth-device.c:2781
-msgid "Handsfree Gateway"
-msgstr ""
+#: ../src/utils/pactl.c:1165
+msgid "sample-cache"
+msgstr "Sample-Pufferspeicher"
-#: ../src/modules/reserve-wrap.c:151
-msgid "PulseAudio Sound Server"
-msgstr "PulseAudio Sound Server"
+#: ../src/utils/pactl.c:1168
+msgid "server"
+msgstr "Server"
-#: ../src/modules/module-rygel-media-server.c:510
-#: ../src/modules/module-rygel-media-server.c:548
-#: ../src/modules/module-rygel-media-server.c:903
-msgid "Output Devices"
-msgstr "Ausgabegeräte"
+#: ../src/utils/pactl.c:1171
+msgid "card"
+msgstr "Karte"
-#: ../src/modules/module-rygel-media-server.c:511
-#: ../src/modules/module-rygel-media-server.c:549
-#: ../src/modules/module-rygel-media-server.c:904
-msgid "Input Devices"
-msgstr "Eingabegeräte"
+#: ../src/utils/pactl.c:1180
+#, c-format
+msgid "Event '%s' on %s #%u\n"
+msgstr "Ereignis »%s« auf %s #%u\n"
-#: ../src/modules/module-rygel-media-server.c:1056
-msgid "Audio on @HOSTNAME@"
-msgstr "Audio auf @HOSTNAME@"
+#: ../src/utils/pactl.c:1452
+msgid "Got SIGINT, exiting."
+msgstr "SIGINT empfangen, wird beendet."
-#: ../src/modules/alsa/alsa-mixer.c:2219
-msgid "Input"
-msgstr "Eingabe"
+#: ../src/utils/pactl.c:1485
+msgid "Invalid volume specification"
+msgstr "Ungültige Angabe der Lautstärke"
-#: ../src/modules/alsa/alsa-mixer.c:2220
-msgid "Docking Station Input"
-msgstr "Docking Station Eingabe"
+#: ../src/utils/pactl.c:1508
+msgid "Volume outside permissible range.\n"
+msgstr "Lautstärke ist außerhalb des einstellbaren Bereichs.\n"
+
+#: ../src/utils/pactl.c:1521
+msgid "Invalid number of volume specifications.\n"
+msgstr "Ungültige Anzahl in der Lautstärkeangabe.\n"
+
+#: ../src/utils/pactl.c:1533
+msgid "Inconsistent volume specification.\n"
+msgstr "Inkonsistente Angabe der Lautstärke.\n"
+
+#: ../src/utils/pactl.c:1563 ../src/utils/pactl.c:1564
+#: ../src/utils/pactl.c:1565 ../src/utils/pactl.c:1566
+#: ../src/utils/pactl.c:1567 ../src/utils/pactl.c:1568
+#: ../src/utils/pactl.c:1569 ../src/utils/pactl.c:1570
+#: ../src/utils/pactl.c:1571 ../src/utils/pactl.c:1572
+#: ../src/utils/pactl.c:1573 ../src/utils/pactl.c:1574
+#: ../src/utils/pactl.c:1575 ../src/utils/pactl.c:1576
+#: ../src/utils/pactl.c:1577 ../src/utils/pactl.c:1578
+#: ../src/utils/pactl.c:1579 ../src/utils/pactl.c:1580
+#: ../src/utils/pactl.c:1581 ../src/utils/pactl.c:1582
+#: ../src/utils/pactl.c:1583
+msgid "[options]"
+msgstr "[Optionen]"
-#: ../src/modules/alsa/alsa-mixer.c:2221
-#, fuzzy
-msgid "Docking Station Microphone"
-msgstr "Docking Station Mikrofon"
+#: ../src/utils/pactl.c:1565
+msgid "[TYPE]"
+msgstr "[TYP]"
-#: ../src/modules/alsa/alsa-mixer.c:2222
-#, fuzzy
-msgid "Docking Station Line In"
-msgstr "Docking Station Eingabe"
+#: ../src/utils/pactl.c:1567
+msgid "FILENAME [NAME]"
+msgstr "DATEINAME [NAME]"
-#: ../src/modules/alsa/alsa-mixer.c:2223 ../src/modules/alsa/alsa-mixer.c:2307
-msgid "Line In"
-msgstr "Line In"
+#: ../src/utils/pactl.c:1568
+msgid "NAME [SINK]"
+msgstr "NAME [ZIEL]"
-#: ../src/modules/alsa/alsa-mixer.c:2224 ../src/modules/alsa/alsa-mixer.c:2302
-msgid "Microphone"
-msgstr "Mikrofon"
+#: ../src/utils/pactl.c:1577
+msgid "NAME|#N VOLUME [VOLUME ...]"
+msgstr "NAME|#N LAUTSTÄRKE [LAUTSTÄRKE …]"
-#: ../src/modules/alsa/alsa-mixer.c:2225 ../src/modules/alsa/alsa-mixer.c:2303
-#, fuzzy
-msgid "Front Microphone"
-msgstr "Docking Station Mikrofon"
+#: ../src/utils/pactl.c:1578
+msgid "#N VOLUME [VOLUME ...]"
+msgstr "#N LAUTSTÄRKE [LAUTSTÄRKE …]"
-#: ../src/modules/alsa/alsa-mixer.c:2226 ../src/modules/alsa/alsa-mixer.c:2304
-#, fuzzy
-msgid "Rear Microphone"
-msgstr "Mikrofon"
+#: ../src/utils/pactl.c:1579
+msgid "NAME|#N 1|0|toggle"
+msgstr "NAME|#N 1|0|toggle"
-#: ../src/modules/alsa/alsa-mixer.c:2227
-msgid "External Microphone"
-msgstr "Externes Mikrofon"
+#: ../src/utils/pactl.c:1580
+msgid "#N 1|0|toggle"
+msgstr "#N 1|0|toggle"
-#: ../src/modules/alsa/alsa-mixer.c:2228 ../src/modules/alsa/alsa-mixer.c:2306
-msgid "Internal Microphone"
-msgstr "Internes Mikrofon"
+#: ../src/utils/pactl.c:1581
+msgid "#N FORMATS"
+msgstr "#N FORMATE"
-#: ../src/modules/alsa/alsa-mixer.c:2229 ../src/modules/alsa/alsa-mixer.c:2308
-msgid "Radio"
-msgstr "Radio"
+#: ../src/utils/pactl.c:1584
+#, c-format
+msgid ""
+"\n"
+"The special names @DEFAULT_SINK@, @DEFAULT_SOURCE@ and @DEFAULT_MONITOR@\n"
+"can be used to specify the default sink, source and monitor.\n"
+msgstr ""
+"\n"
+"Die speziellen Bezeichnungen @DEFAULT_SINK@, @DEFAULT_SOURCE@ und "
+"@DEFAULT_MONITOR@\n"
+"können zur Angabe des Standard-Ziels, der Standard-Quelle und der Standard-"
+"Überwachung verwendet werden.\n"
-#: ../src/modules/alsa/alsa-mixer.c:2230 ../src/modules/alsa/alsa-mixer.c:2309
-msgid "Video"
-msgstr "Video"
+#: ../src/utils/pactl.c:1587
+#, c-format
+msgid ""
+"\n"
+" -h, --help Show this help\n"
+" --version Show version\n"
+"\n"
+" -s, --server=SERVER The name of the server to connect "
+"to\n"
+" -n, --client-name=NAME How to call this client on the "
+"server\n"
+msgstr ""
+"\n"
+" -h, --help zeigt diese Hilfe an\n"
+" --version zeigt die Version an\n"
+"\n"
+" -s, --server=SERVER gibt den Namen des Servers an, mit "
+"dem\n"
+" verbunden werden soll\n"
+" -n, --client-name=NAME gibt den Namen dieses Clients auf "
+"dem Server an\n"
-#: ../src/modules/alsa/alsa-mixer.c:2231
-msgid "Automatic Gain Control"
-msgstr "Automatische Verstärkungsregelung"
+#: ../src/utils/pactl.c:1628
+#, c-format
+msgid ""
+"pactl %s\n"
+"Compiled with libpulse %s\n"
+"Linked with libpulse %s\n"
+msgstr ""
+"pactl %s\n"
+"Kompiliert mit libpulse %s\n"
+"Gelinkt mit libpulse %s\n"
-#: ../src/modules/alsa/alsa-mixer.c:2232
-msgid "No Automatic Gain Control"
-msgstr "Keine automatische Verstärkungsregelung"
+#: ../src/utils/pactl.c:1684
+#, c-format
+msgid "Specify nothing, or one of: %s"
+msgstr "Geben Sie nichts oder eines der Folgenden an: %s"
-#: ../src/modules/alsa/alsa-mixer.c:2233
-msgid "Boost"
-msgstr "Boost"
+#: ../src/utils/pactl.c:1694
+msgid "Please specify a sample file to load"
+msgstr "Geben Sie eine zu öffnende Sample-Datei an"
-#: ../src/modules/alsa/alsa-mixer.c:2234
-msgid "No Boost"
-msgstr "Kein Boost"
+#: ../src/utils/pactl.c:1707
+msgid "Failed to open sound file."
+msgstr "Öffnen der Audio-Datei fehlgeschlagen."
-#: ../src/modules/alsa/alsa-mixer.c:2235
-msgid "Amplifier"
-msgstr "Verstärker"
+#: ../src/utils/pactl.c:1719
+msgid "Warning: Failed to determine sample specification from file."
+msgstr "Warnung: Beziehen der Abtastwert-Angabe aus Datei fehlgeschlagen."
-#: ../src/modules/alsa/alsa-mixer.c:2236
-msgid "No Amplifier"
-msgstr "Kein Verstärker"
+#: ../src/utils/pactl.c:1729
+msgid "You have to specify a sample name to play"
+msgstr "Sie müssen eine abzuspielende Sample-Datei angeben"
-#: ../src/modules/alsa/alsa-mixer.c:2237
-#, fuzzy
-msgid "Bass Boost"
-msgstr "Boost"
+#: ../src/utils/pactl.c:1741
+msgid "You have to specify a sample name to remove"
+msgstr "Sie müssen eine zu löschende Sample-Datei angeben"
-#: ../src/modules/alsa/alsa-mixer.c:2238
-#, fuzzy
-msgid "No Bass Boost"
-msgstr "Kein Boost"
+#: ../src/utils/pactl.c:1750
+msgid "You have to specify a sink input index and a sink"
+msgstr "Sie müssen einen Ziel-Eingabe-Indexwert und ein Ziel angeben"
-#: ../src/modules/alsa/alsa-mixer.c:2239
-msgid "Speaker"
+#: ../src/utils/pactl.c:1760
+msgid "You have to specify a source output index and a source"
msgstr ""
+"Sie müssen eine Indexwert für die Quell-Ausgabe und eine Quelle angeben"
-#: ../src/modules/alsa/alsa-mixer.c:2240 ../src/modules/alsa/alsa-mixer.c:2311
-msgid "Headphones"
-msgstr "Analoge Kopfhörer"
+#: ../src/utils/pactl.c:1775
+msgid "You have to specify a module name and arguments."
+msgstr "Sie müssen einen Modulnamen angeben und Argumente übergeben."
-#: ../src/modules/alsa/alsa-mixer.c:2301
-msgid "Analog Input"
-msgstr "Analoge Eingabe"
+#: ../src/utils/pactl.c:1795
+msgid "You have to specify a module index or name"
+msgstr "Sie müssen einen Indexwert für ein Modul oder einen Namen angeben"
-#: ../src/modules/alsa/alsa-mixer.c:2305
-msgid "Dock Microphone"
-msgstr "Docking Station Mikrofon"
+#: ../src/utils/pactl.c:1808
+msgid ""
+"You may not specify more than one sink. You have to specify a boolean value."
+msgstr ""
+"Sie dürfen nicht mehrere Ziele angeben. Sie müssen zumindest eine boolesche "
+"Variable übergeben."
-#: ../src/modules/alsa/alsa-mixer.c:2310
-msgid "Analog Output"
-msgstr "Analoge Ausgabe"
+#: ../src/utils/pactl.c:1813 ../src/utils/pactl.c:1833
+msgid "Invalid suspend specification."
+msgstr "Ungültige Aussetzungs-Angaben."
-#: ../src/modules/alsa/alsa-mixer.c:2312
-msgid "LFE on Separate Mono Output"
-msgstr "Analoge Ausgabe (LFE)"
+#: ../src/utils/pactl.c:1828
+msgid ""
+"You may not specify more than one source. You have to specify a boolean "
+"value."
+msgstr ""
+"Sie dürfen nicht mehrere Quellen angeben. Sie müssen zumindest eine "
+"boolesche Variable übergeben."
-#: ../src/modules/alsa/alsa-mixer.c:2313
-#, fuzzy
-msgid "Line Out"
-msgstr "Line In"
+#: ../src/utils/pactl.c:1845
+msgid "You have to specify a card name/index and a profile name"
+msgstr "Sie müssen einen Karten-Namen/Indexwert und einen Profilnamen angeben."
-#: ../src/modules/alsa/alsa-mixer.c:2314
-msgid "Analog Mono Output"
-msgstr "Analoge Mono-Ausgabe"
+#: ../src/utils/pactl.c:1856
+msgid "You have to specify a sink name/index and a port name"
+msgstr "Sie müssen einen Ziel-Namen/-Indexwert und einen Portnamen angeben."
-#: ../src/modules/alsa/alsa-mixer.c:2315
-#, fuzzy
-msgid "Speakers"
-msgstr "Analog Stereo"
+#: ../src/utils/pactl.c:1867
+msgid "You have to specify a sink name"
+msgstr "Sie müssen einen Ziel-Namen angeben."
-#: ../src/modules/alsa/alsa-mixer.c:2316
-msgid "HDMI / DisplayPort"
-msgstr ""
+#: ../src/utils/pactl.c:1877
+msgid "You have to specify a source name/index and a port name"
+msgstr "Sie müssen einen Quellennamen/-Indexwert und einen Portnamen angeben."
-#: ../src/modules/alsa/alsa-mixer.c:2317
-#, fuzzy
-msgid "Digital Output (S/PDIF)"
-msgstr "Digital Stereo (HDMI)"
+#: ../src/utils/pactl.c:1888
+msgid "You have to specify a source name"
+msgstr "Sie müssen einen Quellennamen angeben."
-#: ../src/modules/alsa/alsa-mixer.c:2318
-#, fuzzy
-msgid "Digital Passthrough (S/PDIF)"
-msgstr "Digital Stereo (HDMI)"
+#: ../src/utils/pactl.c:1898
+msgid "You have to specify a sink name/index and a volume"
+msgstr "Sie müssen einen Ziel-Namen/-Indexwert und eine Lautstärke angeben."
-#: ../src/modules/alsa/alsa-mixer.c:3756
-msgid "Analog Mono"
-msgstr "Analog Mono"
+#: ../src/utils/pactl.c:1911
+msgid "You have to specify a source name/index and a volume"
+msgstr "Sie müssen einen Quellennamen/-Indexwert und einen Portnamen angeben"
-#: ../src/modules/alsa/alsa-mixer.c:3757
-msgid "Analog Stereo"
-msgstr "Analog Stereo"
+#: ../src/utils/pactl.c:1924
+msgid "You have to specify a sink input index and a volume"
+msgstr "Sie müssen einen Ziel-Eingabe-Indexwert und eine Lautstärke angeben."
-#: ../src/modules/alsa/alsa-mixer.c:3758
-msgid "Analog Surround 2.1"
-msgstr "Analog Surround 2.1"
+#: ../src/utils/pactl.c:1929
+msgid "Invalid sink input index"
+msgstr "Ungültiger Ziel-Eingabe-Index"
-#: ../src/modules/alsa/alsa-mixer.c:3759
-msgid "Analog Surround 3.0"
-msgstr "Analog Surround 3.0"
+#: ../src/utils/pactl.c:1940
+msgid "You have to specify a source output index and a volume"
+msgstr ""
+"Sie müssen eine Indexwert für die Quell-Ausgabe und eine Lautstärke angeben."
-#: ../src/modules/alsa/alsa-mixer.c:3760
-msgid "Analog Surround 3.1"
-msgstr "Analog Surround 3.1"
+#: ../src/utils/pactl.c:1945
+msgid "Invalid source output index"
+msgstr "Ungültiger Quellen-Ausgabe-Index"
-#: ../src/modules/alsa/alsa-mixer.c:3761
-msgid "Analog Surround 4.0"
-msgstr "Analog Surround 4.0"
+#: ../src/utils/pactl.c:1956
+msgid ""
+"You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
+msgstr ""
+"Sie müssen einen Ziel-Namen/-Indexwert und eine Aktion für die "
+"Stummschaltung angeben (0, 1, oder »toggle«)."
-#: ../src/modules/alsa/alsa-mixer.c:3762
-msgid "Analog Surround 4.1"
-msgstr "Analog Surround 4.1"
+#: ../src/utils/pactl.c:1961 ../src/utils/pactl.c:1976
+#: ../src/utils/pactl.c:1996 ../src/utils/pactl.c:2014
+msgid "Invalid mute specification"
+msgstr "Ungültige Angaben zur Stummschaltung"
-#: ../src/modules/alsa/alsa-mixer.c:3763
-msgid "Analog Surround 5.0"
-msgstr "Analog Surround 5.0"
+#: ../src/utils/pactl.c:1971
+msgid ""
+"You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
+msgstr ""
+"Sie müssen einen Quellennamen/-Indexwert und eine Aktion für die "
+"Stummschaltung angeben (0, 1, oder »toggle«)."
-#: ../src/modules/alsa/alsa-mixer.c:3764
-msgid "Analog Surround 5.1"
-msgstr "Analog Surround 5.1"
+#: ../src/utils/pactl.c:1986
+msgid ""
+"You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
+msgstr ""
+"Sie müssen einen Ziel-Eingabe-Index und eine Aktion für die Stummschaltung "
+"angeben (0, 1, oder »toggle«)."
-#: ../src/modules/alsa/alsa-mixer.c:3765
-msgid "Analog Surround 6.0"
-msgstr "Analog Surround 6.0"
+#: ../src/utils/pactl.c:1991
+msgid "Invalid sink input index specification"
+msgstr "Ungültige Ziel-Eingabe-Index-Angaben"
-#: ../src/modules/alsa/alsa-mixer.c:3766
-msgid "Analog Surround 6.1"
-msgstr "Analog Surround 6.1"
+#: ../src/utils/pactl.c:2004
+msgid ""
+"You have to specify a source output index and a mute action (0, 1, or "
+"'toggle')"
+msgstr ""
+"Sie müssen einen Quellen-Ausgabe-Index und eine Aktion für die "
+"Stummschaltung angeben (0, 1, oder »toggle«)."
-#: ../src/modules/alsa/alsa-mixer.c:3767
-msgid "Analog Surround 7.0"
-msgstr "Analog Surround 7.0"
+#: ../src/utils/pactl.c:2009
+msgid "Invalid source output index specification"
+msgstr "Ungültige Quellen-Ausgabe-Index-Angaben"
-#: ../src/modules/alsa/alsa-mixer.c:3768
-msgid "Analog Surround 7.1"
-msgstr "Analog Surround 7.1"
+#: ../src/utils/pactl.c:2026
+msgid ""
+"You have to specify a sink index and a semicolon-separated list of supported "
+"formats"
+msgstr ""
+"Sie müssen einen Ziel-Indexwert und eine durch Kommata getrennte Liste der "
+"unterstützten Formate angeben"
-#: ../src/modules/alsa/alsa-mixer.c:3769
-msgid "Digital Stereo (IEC958)"
-msgstr "Digital Stereo (IEC958)"
+#: ../src/utils/pactl.c:2038
+msgid "You have to specify a card name/index, a port name and a latency offset"
+msgstr ""
+"Sie müssen einen Karten-Namen/Indexwert, einen Portnamen und einen "
+"Latenzversatz angeben"
-#: ../src/modules/alsa/alsa-mixer.c:3770
-#, fuzzy
-msgid "Digital Passthrough (IEC958)"
-msgstr "Digital Stereo (IEC958)"
+#: ../src/utils/pactl.c:2045
+msgid "Could not parse latency offset"
+msgstr "Latenzversatz konnte nicht ausgewertet werden"
-#: ../src/modules/alsa/alsa-mixer.c:3771
-msgid "Digital Surround 4.0 (IEC958/AC3)"
-msgstr "Digital Surround 4.0 (IEC958/AC3)"
+#: ../src/utils/pactl.c:2057
+msgid "No valid command specified."
+msgstr "Kein gültiger Befehl angegeben."
-#: ../src/modules/alsa/alsa-mixer.c:3772
-msgid "Digital Surround 5.1 (IEC958/AC3)"
-msgstr "Digital Surround 5.1 (IEC958/AC3)"
+#: ../src/utils/pasuspender.c:79
+#, c-format
+msgid "fork(): %s\n"
+msgstr "fork(): %s\n"
-#: ../src/modules/alsa/alsa-mixer.c:3773
-msgid "Digital Stereo (HDMI)"
-msgstr "Digital Stereo (HDMI)"
+#: ../src/utils/pasuspender.c:92
+#, c-format
+msgid "execvp(): %s\n"
+msgstr "execvp(): %s\n"
-#: ../src/modules/alsa/alsa-mixer.c:3774
-#, fuzzy
-msgid "Digital Surround 5.1 (HDMI)"
-msgstr "Digital Surround 5.1 (IEC958/AC3)"
+#: ../src/utils/pasuspender.c:111
+#, c-format
+msgid "Failure to resume: %s\n"
+msgstr "Wiederaufnahme fehlgeschlagen: %s\n"
-#: ../src/modules/alsa/alsa-mixer.c:3895
-msgid "Analog Mono Duplex"
-msgstr "Analog Mono Duplex"
+#: ../src/utils/pasuspender.c:145
+#, c-format
+msgid "Failure to suspend: %s\n"
+msgstr "Aussetzen fehlgeschlagen: %s\n"
-#: ../src/modules/alsa/alsa-mixer.c:3896
-msgid "Analog Stereo Duplex"
-msgstr "Analog Stereo Duplex"
+#: ../src/utils/pasuspender.c:170
+#, c-format
+msgid "WARNING: Sound server is not local, not suspending.\n"
+msgstr "WARNUNG: Sound-Server läuft nicht lokal, nicht ausgesetzt.\n"
-#: ../src/modules/alsa/alsa-mixer.c:3897
-msgid "Digital Stereo Duplex (IEC958)"
-msgstr "Digital Stereo Duplex (IEC958)"
+#: ../src/utils/pasuspender.c:183
+#, c-format
+msgid "Connection failure: %s\n"
+msgstr "Verbindungsfehler: %s\n"
-#: ../src/modules/alsa/alsa-mixer.c:3997
-#, fuzzy, c-format
-msgid "%s Output"
-msgstr "Null-Ausgabe"
+#: ../src/utils/pasuspender.c:201
+#, c-format
+msgid "Got SIGINT, exiting.\n"
+msgstr "SIGINT empfangen, wird beendet.\n"
-#: ../src/modules/alsa/alsa-mixer.c:4005
-#, fuzzy, c-format
-msgid "%s Input"
-msgstr "Eingabe"
+#: ../src/utils/pasuspender.c:219
+#, c-format
+msgid "WARNING: Child process terminated by signal %u\n"
+msgstr "WARNUNG: Kind-Prozess durch Signal %u beendet\n"
-#: ../src/modules/echo-cancel/module-echo-cancel.c:63
+#: ../src/utils/pasuspender.c:228
+#, c-format
msgid ""
-"source_name=<name for the source> source_properties=<properties for the "
-"source> source_master=<name of source to filter> sink_name=<name for the "
-"sink> sink_properties=<properties for the sink> sink_master=<name of sink to "
-"filter> adjust_time=<how often to readjust rates in s> adjust_threshold=<how "
-"much drift to readjust after in ms> format=<sample format> rate=<sample "
-"rate> channels=<number of channels> channel_map=<channel map> "
-"aec_method=<implementation to use> aec_args=<parameters for the AEC engine> "
-"save_aec=<save AEC data in /tmp> autoloaded=<set if this module is being "
-"loaded automatically> use_volume_sharing=<yes or no> "
-msgstr ""
-
-#: ../src/modules/module-equalizer-sink.c:72
-msgid "General Purpose Equalizer"
+"%s [options] ... \n"
+"\n"
+" -h, --help Show this help\n"
+" --version Show version\n"
+" -s, --server=SERVER The name of the server to connect "
+"to\n"
+"\n"
msgstr ""
+"%s [Optionen] … \n"
+"\n"
+" -h, --help zeigt diese Hilfe an\n"
+" --version zeigt die Version an\n"
+" -s, --server=SERVER gibt den Namen des Zielservers an\n"
+"\n"
-#: ../src/modules/module-equalizer-sink.c:76
-#, fuzzy
+#: ../src/utils/pasuspender.c:266
+#, c-format
msgid ""
-"sink_name=<name of the sink> sink_properties=<properties for the sink> "
-"sink_master=<sink to connect to> format=<sample format> rate=<sample rate> "
-"channels=<number of channels> channel_map=<channel map> autoloaded=<set if "
-"this module is being loaded automatically> use_volume_sharing=<yes or no> "
+"pasuspender %s\n"
+"Compiled with libpulse %s\n"
+"Linked with libpulse %s\n"
msgstr ""
-"sink_name=<Name des Sinks> sink_properties=<Eigenschaften des Sinks> "
-"master=<Name des zu filternden Sinks> format=<Sample-Format> rate=<Sample-"
-"Rate> channels=<Anzahl der Channels> channel_map=<Channel-Map> "
-"plugin=<ladspa Plugin-Name> label=<ladspa Plugin-Label> "
-"control=<kommagetrennte Liste von Eingabekontrollwerten>"
+"pasuspender %s\n"
+"kompiliert mit libpulse %s\n"
+"Gelinkt mit libpulse %s\n"
-#: ../src/modules/module-filter-apply.c:48
-msgid "autoclean=<automatically unload unused filters?>"
-msgstr ""
+#: ../src/utils/pasuspender.c:295
+#, c-format
+msgid "pa_mainloop_new() failed.\n"
+msgstr "pa_mainloop_new() fehlgeschlagen.\n"
+
+#: ../src/utils/pasuspender.c:308
+#, c-format
+msgid "pa_context_new() failed.\n"
+msgstr "pa_context_new() fehlgeschlagen.\n"
+
+#: ../src/utils/pasuspender.c:320
+#, c-format
+msgid "pa_mainloop_run() failed.\n"
+msgstr "pa_mainloop_run() fehlgeschlagen.\n"
-#: ../src/tests/resampler-test.c:257
+#: ../src/utils/pax11publish.c:58
#, c-format
msgid ""
-"%s [options]\n"
-"\n"
-"-h, --help Show this help\n"
-"-v, --verbose Print debug messages\n"
-" --from-rate=SAMPLERATE From sample rate in Hz (defaults to "
-"44100)\n"
-" --from-format=SAMPLEFORMAT From sample type (defaults to s16le)\n"
-" --from-channels=CHANNELS From number of channels (defaults to "
-"1)\n"
-" --to-rate=SAMPLERATE To sample rate in Hz (defaults to "
-"44100)\n"
-" --to-format=SAMPLEFORMAT To sample type (defaults to s16le)\n"
-" --to-channels=CHANNELS To number of channels (defaults to 1)\n"
-" --resample-method=METHOD Resample method (defaults to auto)\n"
-" --seconds=SECONDS From stream duration (defaults to 60)\n"
-"\n"
-"If the formats are not specified, the test performs all formats "
-"combinations,\n"
-"back and forth.\n"
+"%s [-D display] [-S server] [-O sink] [-I source] [-c file] [-d|-e|-i|-r]\n"
"\n"
-"Sample type must be one of s16le, s16be, u8, float32le, float32be, ulaw, "
-"alaw,\n"
-"32le, s32be (defaults to s16ne)\n"
+" -d Show current PulseAudio data attached to X11 display (default)\n"
+" -e Export local PulseAudio data to X11 display\n"
+" -i Import PulseAudio data from X11 display to local environment "
+"variables and cookie file.\n"
+" -r Remove PulseAudio data from X11 display\n"
+msgstr ""
+"%s [-D Anzeige] [-S Server] [-O Ziel] [-I Quelle] [-c Datei] [-d|-e|-i|-r]\n"
"\n"
-"See --dump-resample-methods for possible values of resample methods.\n"
-msgstr ""
-
-#: ../src/tests/resampler-test.c:356
-#, fuzzy, c-format
-msgid "%s %s\n"
-msgstr "%s %s"
-
-#: ../src/tests/resampler-test.c:419
-#, c-format
-msgid "=== %d seconds: %d Hz %d ch (%s) -> %d Hz %d ch (%s)"
-msgstr ""
-
-#~ msgid "[%s:%u] rlimit not supported on this platform."
-#~ msgstr "[%s:%u] rlimit auf dieser Plattform nicht unterstützt."
-
-#~ msgid "XOpenDisplay() failed"
-#~ msgstr "XOpenDisplay() fehlgeschlagen"
-
-#~ msgid ""
-#~ "Source Output #%u\n"
-#~ "\tDriver: %s\n"
-#~ "\tOwner Module: %s\n"
-#~ "\tClient: %s\n"
-#~ "\tSource: %u\n"
-#~ "\tSample Specification: %s\n"
-#~ "\tChannel Map: %s\n"
-#~ "\tBuffer Latency: %0.0f usec\n"
-#~ "\tSource Latency: %0.0f usec\n"
-#~ "\tResample method: %s\n"
-#~ "\tProperties:\n"
-#~ "\t\t%s\n"
-#~ msgstr ""
-#~ "Quell-Ausgabe #%u\n"
-#~ "\tTreiber: %s\n"
-#~ "\tOwner-Modul: %s\n"
-#~ "\tClient: %s\n"
-#~ "\tQuelle: %u\n"
-#~ "\tSample-Spezifizierung: %s\n"
-#~ "\tKanalzuordnung: %s\n"
-#~ "\tPufferlatenz: %0.0f usec\n"
-#~ "\tQuelllatenz: %0.0f usec\n"
-#~ "\tResample-Methode: %s\n"
-#~ "\tEigenschaften:\n"
-#~ "\t\t%s\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "%s [options] stat\n"
-#~ "%s [options] list\n"
-#~ "%s [options] exit\n"
-#~ "%s [options] upload-sample FILENAME [NAME]\n"
-#~ "%s [options] play-sample NAME [SINK]\n"
-#~ "%s [options] remove-sample NAME\n"
-#~ "%s [options] move-sink-input SINKINPUT SINK\n"
-#~ "%s [options] move-source-output SOURCEOUTPUT SOURCE\n"
-#~ "%s [options] load-module NAME [ARGS ...]\n"
-#~ "%s [options] unload-module MODULE\n"
-#~ "%s [options] suspend-sink SINK 1|0\n"
-#~ "%s [options] suspend-source SOURCE 1|0\n"
-#~ "%s [options] set-card-profile CARD PROFILE\n"
-#~ "%s [options] set-sink-port SINK PORT\n"
-#~ "%s [options] set-source-port SOURCE PORT\n"
-#~ "%s [options] set-sink-volume SINK VOLUME\n"
-#~ "%s [options] set-source-volume SOURCE VOLUME\n"
-#~ "%s [options] set-sink-input-volume SINKINPUT VOLUME\n"
-#~ "%s [options] set-sink-mute SINK 1|0\n"
-#~ "%s [options] set-source-mute SOURCE 1|0\n"
-#~ "%s [options] set-sink-input-mute SINKINPUT 1|0\n"
-#~ "%s [options] subscribe\n"
-#~ "\n"
-#~ " -h, --help Show this help\n"
-#~ " --version Show version\n"
-#~ "\n"
-#~ " -s, --server=SERVER The name of the server to connect "
-#~ "to\n"
-#~ " -n, --client-name=NAME How to call this client on the "
-#~ "server\n"
-#~ msgstr ""
-#~ "%s [options] stat\n"
-#~ "%s [options] list\n"
-#~ "%s [options] exit\n"
-#~ "%s [options] upload-sample FILENAME [NAME]\n"
-#~ "%s [options] play-sample NAME [SINK]\n"
-#~ "%s [options] remove-sample NAME\n"
-#~ "%s [options] move-sink-input SINKINPUT SINK\n"
-#~ "%s [options] move-source-output SOURCEOUTPUT SOURCE\n"
-#~ "%s [options] load-module NAME [ARGS ...]\n"
-#~ "%s [options] unload-module MODULE\n"
-#~ "%s [options] suspend-sink SINK 1|0\n"
-#~ "%s [options] suspend-source SOURCE 1|0\n"
-#~ "%s [options] set-card-profile CARD PROFILE\n"
-#~ "%s [options] set-sink-port SINK PORT\n"
-#~ "%s [options] set-source-port SOURCE PORT\n"
-#~ "%s [options] set-sink-volume SINK VOLUME\n"
-#~ "%s [options] set-source-volume SOURCE VOLUME\n"
-#~ "%s [options] set-sink-input-volume SINKINPUT VOLUME\n"
-#~ "%s [options] set-sink-mute SINK 1|0\n"
-#~ "%s [options] set-source-mute SOURCE 1|0\n"
-#~ "%s [options] set-sink-input-mute SINKINPUT 1|0\n"
-#~ "\n"
-#~ " -h, --help Diese Hilfe anzeigen\n"
-#~ " --version Version anzeigen\n"
-#~ "\n"
-#~ " -s, --server=SERVER Name des Zielservers\n"
-#~ " -n, --client-name=NAME Rufname des Clients auf dem "
-#~ "Server\n"
-
-#~ msgid "%s+%s"
-#~ msgstr "%s+%s"
-
-#~ msgid "%s / %s"
-#~ msgstr "%s / %s"
-
-#~ msgid "Digital Surround 4.0 (IEC958)"
-#~ msgstr "Digital Surround 4.0 (IEC958)"
-
-#~ msgid "Low Frequency Emmiter"
-#~ msgstr "Niedrigfrequenzemitter"
+" -d zeigt aktuell mit X11-Anzeige verbundene PulseAudio-Daten an "
+"(Standard)\n"
+" -e exportiert lokale PulseAudio-Daten an X11-Anzeige\n"
+" -i importiert PulseAudio-Daten von X11-Anzeige in lokale "
+"Umgebungsvariablen und Cookie-Datei.\n"
+" -r löscht PulseAudio-Daten von X11-Anzeige\n"
+
+#: ../src/utils/pax11publish.c:91
+#, c-format
+msgid "Failed to parse command line.\n"
+msgstr "Auswerten der Befehlszeile fehlgeschlagen.\n"
+
+#: ../src/utils/pax11publish.c:110
+#, c-format
+msgid "Server: %s\n"
+msgstr "Server: %s\n"
+
+#: ../src/utils/pax11publish.c:112
+#, c-format
+msgid "Source: %s\n"
+msgstr "Quelle: %s\n"
+
+#: ../src/utils/pax11publish.c:114
+#, c-format
+msgid "Sink: %s\n"
+msgstr "Ziel: %s\n"
+
+#: ../src/utils/pax11publish.c:116
+#, c-format
+msgid "Cookie: %s\n"
+msgstr "Cookie: %s\n"
+
+#: ../src/utils/pax11publish.c:134
+#, c-format
+msgid "Failed to parse cookie data\n"
+msgstr "Auswerten der Cookie-Daten fehlgeschlagen.\n"
+
+#: ../src/utils/pax11publish.c:139
+#, c-format
+msgid "Failed to save cookie data\n"
+msgstr "Speichern der Cookie-Daten fehlgeschlagen\n"
+
+#: ../src/utils/pax11publish.c:168
+#, c-format
+msgid "Failed to get FQDN.\n"
+msgstr "Beziehen des FQDN fehlgeschlagen.\n"
+
+#: ../src/utils/pax11publish.c:188
+#, c-format
+msgid "Failed to load cookie data\n"
+msgstr "Laden der Cookie-Daten fehlgeschlagen\n"
+
+#: ../src/utils/pax11publish.c:206
+#, c-format
+msgid "Not yet implemented.\n"
+msgstr "Noch nicht implementiert.\n"
diff --git a/po/de.po b/po/gl.po
similarity index 51%
copy from po/de.po
copy to po/gl.po
index d8c81f0..6c33e8a 100644
--- a/po/de.po
+++ b/po/gl.po
@@ -1,28 +1,25 @@
-# translation of pulseaudio.master-tx.de.po to
-# German translation of pulseaudio
-# Copyright (C) 2008 pulseaudio
-# This file is distributed under the same license as the pulseaudio package.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
#
-#
-# Fabian Affolter <fab at fedoraproject.org>, 2008-2009.
-# Micha Pietsch <barney at fedoraproject.org>, 2008, 2009.
-# Hedda Peters <hpeters at redhat.com>, 2009, 2012.
+# Translators:
+# bassball93 <bassball93 at gmail.com>, 2011.
+# mbouzada <mbouzada at gmail.com>, 2011.
+# Fran Dieguez <frandieguez at gnome.org>, 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: pulseaudio.master-tx.de\n"
+"Project-Id-Version: PulseAudio\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-30 10:10+0000\n"
-"PO-Revision-Date: 2012-01-30 09:52+0000\n"
-"Last-Translator: Hedda Peters <hpeters at redhat.com>\n"
-"Language-Team: \n"
-"Language: \n"
+"POT-Creation-Date: 2012-04-14 14:50+0200\n"
+"PO-Revision-Date: 2012-04-14 18:57+0200\n"
+"Last-Translator: Fran Dieguez <frandieguez at gnome.org>\n"
+"Language-Team: Galician <gnome-l10n-gl at gnome.org>\n"
+"Language: gl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Language: German\n"
-"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
#: ../src/modules/alsa/alsa-util.c:1136 ../src/modules/alsa/alsa-util.c:1204
#, c-format
@@ -32,10 +29,10 @@ msgid ""
"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
"to the ALSA developers."
msgstr ""
-"snd_pcm_avail() gibt einen Wert zurück, der ausserordentlich gross ist: %lu "
-"bytes (%lu ms).\n"
-"Dies ist wahrscheinlich ein Fehler im ALSA-Treiber '%s'. Bitte melden Sie "
-"dieses Problem den ALSA-Entwicklern."
+"snd_pcm_avail() devolveu un valor que é excepcionalmente grande: %lu bytes "
+"(%lu ms).\n"
+"O máis probábel é que sexa un erro do controlador ALSA «%s». Informe disto "
+"aos desenvolvedores de ALSA."
#: ../src/modules/alsa/alsa-util.c:1179
#, c-format
@@ -45,23 +42,23 @@ msgid ""
"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
"to the ALSA developers."
msgstr ""
-"snd_pcm_delay() gibt einen Wert zurück, der ausserordentlich gross ist: %li "
-"bytes (%s%lu ms).\n"
-"Dies ist wahrscheinlich ein Fehler im ALSA-Treiber '%s'. Bitte melden Sie "
-"dieses Problem den ALSA-Entwicklern."
+"snd_pcm_delay() devolveu un valor que é excepcionalmente grande: %li bytes "
+"(%s%lu ms).\n"
+"O máis probábel é que sexa un erro do controlador ALSA «%s». Informe disto "
+"aos desenvolvedores de ALSA."
#: ../src/modules/alsa/alsa-util.c:1220
-#, fuzzy, c-format
+#, c-format
msgid ""
"snd_pcm_avail_delay() returned strange values: delay %lu is less than avail "
"%lu.\n"
"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
"to the ALSA developers."
msgstr ""
-"snd_pcm_avail() gibt einen Wert zurück, der ausserordentlich gross ist: %lu "
-"bytes (%lu ms).\n"
-"Dies ist wahrscheinlich ein Fehler im ALSA-Treiber '%s'. Bitte melden Sie "
-"dieses Problem den ALSA-Entwicklern."
+"snd_pcm_avail_delay() devolveu valores estraños: o atraso de %lu é menor que "
+"o dispoñíbel %lu.\n"
+"O máis probábel é que sexa un erro do controlador ALSA «%s». Informe disto "
+"aos desenvolvedores de ALSA."
#: ../src/modules/alsa/alsa-util.c:1263
#, c-format
@@ -71,25 +68,24 @@ msgid ""
"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
"to the ALSA developers."
msgstr ""
-"snd_pcm_mmap_begin() gibt einen Wert zurück, der ausserordentlich gross ist: "
-"%lu bytes (%lu ms).\n"
-"Dies ist wahrscheinlich ein Fehler im ALSA-Treiber '%s'. Bitte melden Sie "
-"dieses Problem den ALSA-Entwicklern."
+"snd_pcm_mmap_beginl() devolveu un valor que é excepcionalmente grande: %lu "
+"bytes (%lu ms).\n"
+"O máis probábel é que sexa un erro do controlador ALSA «%s». Informe disto "
+"aos desenvolvedores de ALSA."
#: ../src/modules/module-always-sink.c:38
msgid "Always keeps at least one sink loaded even if it's a null one"
-msgstr "Hält stets einen Sink geladen, selbst wenn dies ein Null-Sink ist"
+msgstr "Manter sempre polo menos un destino cargado aínda que sexa nulo"
#: ../src/modules/module-always-sink.c:82
msgid "Dummy Output"
-msgstr "Dummy-Ausgabe"
+msgstr "Saída parva"
#: ../src/modules/module-ladspa-sink.c:48
msgid "Virtual LADSPA sink"
-msgstr "Virtueller LADSPA-Sink"
+msgstr "Destino virtual LADSPA"
#: ../src/modules/module-ladspa-sink.c:52
-#, fuzzy
msgid ""
"sink_name=<name for the sink> sink_properties=<properties for the sink> "
"master=<name of sink to filter> format=<sample format> rate=<sample rate> "
@@ -99,307 +95,318 @@ msgid ""
"LADSPA port names> output_ladspaport_map=<comma separated list of output "
"LADSPA port names> "
msgstr ""
-"sink_name=<Name des Sinks> sink_properties=<Eigenschaften des Sinks> "
-"master=<Name des zu filternden Sinks> format=<Sample-Format> rate=<Sample-"
-"Rate> channels=<Anzahl der Channels> channel_map=<Channel-Map> "
-"plugin=<ladspa Plugin-Name> label=<ladspa Plugin-Label> "
-"control=<kommagetrennte Liste von Eingabekontrollwerten>"
+"sink_name=<nome para o destino> sink_properties=<propiedades para o destino> "
+"master=<nome do destino a filtrar> format=<formato de mostra> rate=<taxa de "
+"mostra> channels=<cantidade de canles> channel_map=<asignación de canles> "
+"plugin=<nome do engadido ladspa> label=<etiqueta do engadido ladspa> "
+"control=<lista separada por vírgula de valores de control de entrada> "
+"input_ladspaport_map=<lista separada por comas dos nomes de portos LADSPA de "
+"entrada> output_ladspaport_map=<lista separada por comas dos nomes dos "
+"portos LADSPA de saída> "
#: ../src/modules/module-null-sink.c:49
msgid "Clocked NULL sink"
-msgstr "Clocked NULL Sink"
+msgstr "Destino nulo sincronizado"
#: ../src/modules/module-null-sink.c:284
msgid "Null Output"
-msgstr "Null-Ausgabe"
+msgstr "Saída nula"
-#: ../src/pulsecore/sink.c:3349
+#: ../src/pulsecore/sink.c:3377
msgid "Built-in Audio"
-msgstr "Internes Audio"
+msgstr "Audio interno"
-#: ../src/pulsecore/sink.c:3354
+#: ../src/pulsecore/sink.c:3382
msgid "Modem"
-msgstr "Modem"
+msgstr "Módem"
#: ../src/daemon/ltdl-bind-now.c:127
msgid "Failed to find original lt_dlopen loader."
-msgstr "Ursprünglicher dlopen-Loader konnte nicht gefunden werden."
+msgstr "Produciuse un fallo ao buscar o cargador llt_dlopen orixinal."
#: ../src/daemon/ltdl-bind-now.c:132
msgid "Failed to allocate new dl loader."
-msgstr "Neuer dlopen-Loader konnte nicht gefunden werden."
+msgstr "Produciuse un fallo ao asignar o cargador dl novo."
#: ../src/daemon/ltdl-bind-now.c:145
msgid "Failed to add bind-now-loader."
-msgstr "Hinzufügen von Bind-Now-Loader fehlgeschlagen."
+msgstr "Produciuse un fallo ao engadir o bind-now-loader."
#: ../src/daemon/main.c:139
#, c-format
msgid "Got signal %s."
-msgstr "Signal %s empfangen."
+msgstr "Obtívose o sinal %s."
#: ../src/daemon/main.c:166
msgid "Exiting."
-msgstr "Wird beendet."
+msgstr "Saíndo."
#: ../src/daemon/main.c:184
#, c-format
msgid "Failed to find user '%s'."
-msgstr "Benutzer '%s' nicht gefunden."
+msgstr "Produciuse un fallo ao buscar o usuario «%s»."
#: ../src/daemon/main.c:189
#, c-format
msgid "Failed to find group '%s'."
-msgstr "Gruppe '%s' nicht gefunden."
+msgstr "Produciuse un fallo ao buscar o grupo «%s»."
#: ../src/daemon/main.c:193
#, c-format
msgid "Found user '%s' (UID %lu) and group '%s' (GID %lu)."
-msgstr "Benutzer '%s' (UID %lu) und Gruppe '%s' (GID %lu) gefunden."
+msgstr "Atopáronse o usuario «%s» (UID %lu) e o grupo «%s» (GID %lu)."
#: ../src/daemon/main.c:198
#, c-format
msgid "GID of user '%s' and of group '%s' don't match."
-msgstr "GID von Benutzer '%s' und Gruppe '%s' stimmen nicht überein."
+msgstr "O GID do usuario «%s» e do grupo «%s» non coinciden."
#: ../src/daemon/main.c:203
#, c-format
msgid "Home directory of user '%s' is not '%s', ignoring."
-msgstr "Benutzerverzeichnis von Benutzer '%s' ist nicht '%s', ignoriere."
+msgstr "O cartafol de inicio do usuario «%s» non é «%s», ignorando."
#: ../src/daemon/main.c:206 ../src/daemon/main.c:211
#, c-format
msgid "Failed to create '%s': %s"
-msgstr "Konnte '%s' nciht erzeugen: %s"
+msgstr "Produciuse un fallo ao crear «%s»: %s"
#: ../src/daemon/main.c:218
#, c-format
msgid "Failed to change group list: %s"
-msgstr "Wechseln der Gruppen-Liste fehlgeschlagen: %s"
+msgstr "Produciuse un fallo ao cambiar a lista do grupo: %s"
#: ../src/daemon/main.c:234
#, c-format
msgid "Failed to change GID: %s"
-msgstr "Wechseln der GID fehlgeschlagen: %s"
+msgstr "Produciuse un fallo ao cambiar o GID: %s"
#: ../src/daemon/main.c:250
#, c-format
msgid "Failed to change UID: %s"
-msgstr "Wechseln der UID fehlgeschlagen: %s"
+msgstr "Produciuse un fallo ao cambiar o UID: %s"
#: ../src/daemon/main.c:269
msgid "Successfully dropped root privileges."
-msgstr "Root-Berechtigungen erfolgreich zurückgesetzt."
+msgstr "Liberáronse satisfactoriamente os privilexios de superusuario."
#: ../src/daemon/main.c:277
msgid "System wide mode unsupported on this platform."
-msgstr "System-Modus auf dieser Plattform nicht unterstützt."
+msgstr "O modo a todo do sistema non esta permitido nesta plataforma."
#: ../src/daemon/main.c:295
#, c-format
msgid "setrlimit(%s, (%u, %u)) failed: %s"
-msgstr "setrlimit(%s, (%u, %u)) fehlgeschlagen: %s"
+msgstr "Produciuse un fallo setrlimit(%s, (%u, %u)): %s"
#: ../src/daemon/main.c:496
msgid "Failed to parse command line."
-msgstr "Parsen der Kommandzeile fehlgeschlagen."
+msgstr "Produciuse un fallo ao analizar a liña de ordes."
#: ../src/daemon/main.c:529
msgid ""
"System mode refused for non-root user. Only starting the D-Bus server lookup "
"service."
msgstr ""
+"O modo de sistema foi rexeitado por un usuario sen privilexios. Soamente "
+"iniciarase o servizo de busca do servidor D-Bus."
#: ../src/daemon/main.c:611
msgid "Daemon not running"
-msgstr "Daemon läuft nicht"
+msgstr "O daemon non se está executando"
#: ../src/daemon/main.c:613
#, c-format
msgid "Daemon running as PID %u"
-msgstr "Daemon läuft als PID %u"
+msgstr "O daemon está executándose como PID %u"
#: ../src/daemon/main.c:628
#, c-format
msgid "Failed to kill daemon: %s"
-msgstr "Konnte Prozess nicht abbrechen: %s"
+msgstr "Non foi posíbel deter o daemon: %s"
#: ../src/daemon/main.c:657
msgid ""
"This program is not intended to be run as root (unless --system is "
"specified)."
msgstr ""
-"Dieses Programm sollte ohne die Option --system nicht als Administrator "
-"ausgeführt werden."
+"Este programa non precisa ser executado como superusuario (a non ser que se "
+"especifique --system)."
#: ../src/daemon/main.c:660
msgid "Root privileges required."
-msgstr "Root-Berechtigungen benötigt."
+msgstr "Precísanse privilexios de superusuario."
#: ../src/daemon/main.c:667
msgid "--start not supported for system instances."
-msgstr "--start nicht unterstützt für System-Instanzen."
+msgstr "--start no está permitido para as instancias do sistema."
#: ../src/daemon/main.c:707
#, c-format
msgid "User-configured server at %s, refusing to start/autospawn."
-msgstr ""
+msgstr "Servidor configurado polo usuario %s sen start/autospawning."
#: ../src/daemon/main.c:713
#, c-format
msgid ""
"User-configured server at %s, which appears to be local. Probing deeper."
msgstr ""
+"Servidor configurado polo usuario %s que aparece como local. Probando máis "
+"polo miúdo."
#: ../src/daemon/main.c:718
msgid "Running in system mode, but --disallow-exit not set!"
-msgstr "System-Modus aktiv, jeodch --disallow-exit nicht gesetzt!"
+msgstr ""
+"Executándose en modo de sistema, máis non se configurou --disallow-exit!"
#: ../src/daemon/main.c:721
msgid "Running in system mode, but --disallow-module-loading not set!"
-msgstr "System-Modus aktiv, jedoch --disallow-module-loading nicht gesetzt!"
+msgstr ""
+"Executándose en modo de sistema, máis non se configurou --disallow-module-"
+"loading!"
#: ../src/daemon/main.c:724
msgid "Running in system mode, forcibly disabling SHM mode!"
-msgstr "System-Modus aktiv, SHM-Modus gezwungenermaßen deaktiviert!"
+msgstr "Executándose en modo de sistema, forzase a desactivación do modo SHM!"
#: ../src/daemon/main.c:729
msgid "Running in system mode, forcibly disabling exit idle time!"
-msgstr "System-Modus aktiv, Exit-Idle-Time gezwungenermaßen deaktiviert!"
+msgstr ""
+"Executándose en modo de sistema, forzase a desactivación de exit idle time!"
#: ../src/daemon/main.c:757
msgid "Failed to acquire stdio."
-msgstr "Reservieren von STDIO fehlgeschlagen."
+msgstr "Produciuse un fallo ao tentar adquirir stdio."
#: ../src/daemon/main.c:763 ../src/daemon/main.c:828
-#, fuzzy, c-format
+#, c-format
msgid "pipe() failed: %s"
-msgstr "pipe fehlgeschlagen: %s"
+msgstr "Produciuse un fallo na canalización pipe(): %s"
#: ../src/daemon/main.c:768 ../src/daemon/main.c:833
#, c-format
msgid "fork() failed: %s"
-msgstr "fork() fehlgeschlagen: %s"
+msgstr "Produciuse un fallo na bifurcación fork(): %s"
#: ../src/daemon/main.c:783 ../src/daemon/main.c:848 ../src/utils/pacat.c:550
#, c-format
msgid "read() failed: %s"
-msgstr "read() fehlgeschlagen: %s"
+msgstr "Produciuse un fallo na lectura read(): %s"
#: ../src/daemon/main.c:789
msgid "Daemon startup failed."
-msgstr "Start des Daemons fehlgeschlagen."
+msgstr "Produciuse un fallo no inicio do daemon."
#: ../src/daemon/main.c:791
msgid "Daemon startup successful."
-msgstr "Start des Daemons erfolgreich."
+msgstr "O daemon iniciouse satisfactoriamente."
#: ../src/daemon/main.c:816
-#, fuzzy, c-format
+#, c-format
msgid "setsid() failed: %s"
-msgstr "read() fehlgeschlagen: %s"
+msgstr "Produciuse un fallo na sesión setsid(): %s"
#: ../src/daemon/main.c:901
#, c-format
msgid "This is PulseAudio %s"
-msgstr "Dies ist PulseAudio %s"
+msgstr "Isto é PulseAudio %s"
#: ../src/daemon/main.c:902
#, c-format
msgid "Compilation host: %s"
-msgstr "Kompilier-Host: %s"
+msgstr "Anfitrión de compilación: %s"
#: ../src/daemon/main.c:903 ../src/tests/resampler-test.c:418
#, c-format
msgid "Compilation CFLAGS: %s"
-msgstr "Kompilier-CFLAGS: %s"
+msgstr "Compilación CFLAGS: %s"
#: ../src/daemon/main.c:906
#, c-format
msgid "Running on host: %s"
-msgstr "Laufe auf Host: %s"
+msgstr "Executándose no anfitrión: %s"
#: ../src/daemon/main.c:909
#, c-format
msgid "Found %u CPUs."
-msgstr "%u CPUs gefunden."
+msgstr "Atopáronse %u CPU."
#: ../src/daemon/main.c:911
#, c-format
msgid "Page size is %lu bytes"
-msgstr "Seitengröße ist %lu Bytes."
+msgstr "O tamaño da páxina é de %lu bytes"
#: ../src/daemon/main.c:914
msgid "Compiled with Valgrind support: yes"
-msgstr "Kompiliere mit Valgrind-Unterstützung: ja"
+msgstr "Compilado con compatibilidade con Valgrind: si"
#: ../src/daemon/main.c:916
msgid "Compiled with Valgrind support: no"
-msgstr "Kompiliere mit Valgrind-Unterstützung: nein"
+msgstr "Compilado con compatibilidade con Valgrind: non"
#: ../src/daemon/main.c:919
#, c-format
msgid "Running in valgrind mode: %s"
-msgstr "Läuft im Valgrind-Modus: %s"
+msgstr "Executándose en modo valgrind: %s"
#: ../src/daemon/main.c:921
-#, fuzzy, c-format
+#, c-format
msgid "Running in VM: %s"
-msgstr "Laufe auf Host: %s"
+msgstr "Executándose en VM: %s"
#: ../src/daemon/main.c:924
msgid "Optimized build: yes"
-msgstr "Optimiertes Build: ja"
+msgstr "Construción optimizada: si"
#: ../src/daemon/main.c:926
msgid "Optimized build: no"
-msgstr "Optimiertes Build: nein"
+msgstr "Construción optimizada: non"
#: ../src/daemon/main.c:930
msgid "NDEBUG defined, all asserts disabled."
-msgstr "NDEBUG definiert, alle Ansprüche deaktiviert."
+msgstr "Definido NDEBUG, desactivadas todas as comprobacións."
#: ../src/daemon/main.c:932
msgid "FASTPATH defined, only fast path asserts disabled."
-msgstr "FASTPATH definiert, nur fast-path-Ansprüche deaktiviert."
+msgstr "Definido FASTPATH, só se desactivan as comprobacións rápidas de ruta."
#: ../src/daemon/main.c:934
msgid "All asserts enabled."
-msgstr "Alle Ansprüche aktiviert."
+msgstr "Activadas todas as comprobacións."
#: ../src/daemon/main.c:938
msgid "Failed to get machine ID"
-msgstr "Beziehen der Maschinen-ID fehlgeschlagen"
+msgstr "Produciuse un fallo ao tentar obter o ID da máquina"
#: ../src/daemon/main.c:941
#, c-format
msgid "Machine ID is %s."
-msgstr "System- ID ist %s."
+msgstr "O ID da máquina é %s"
#: ../src/daemon/main.c:945
#, c-format
msgid "Session ID is %s."
-msgstr "System- ID ist %s."
+msgstr "O ID da sesión é %s."
#: ../src/daemon/main.c:951
#, c-format
msgid "Using runtime directory %s."
-msgstr "Nutze Laufzeit-Verzeichnis %s."
+msgstr "Utilizando o directorio de tempo de execución %s."
#: ../src/daemon/main.c:956
#, c-format
msgid "Using state directory %s."
-msgstr "Nutze Zustands-Verzeichnis %s."
+msgstr "Utilizando o directorio de estado %s."
#: ../src/daemon/main.c:959
#, c-format
msgid "Using modules directory %s."
-msgstr "Modul-Verzeichnis %s benutzen."
+msgstr "Utilizando o directorio de módulos %s."
#: ../src/daemon/main.c:961
#, c-format
msgid "Running in system mode: %s"
-msgstr "Laufe im System-Modus: %s"
+msgstr "Executándose en modo de sistema: %s"
#: ../src/daemon/main.c:964
msgid ""
@@ -407,57 +414,61 @@ msgid ""
"shouldn't be doing that.\n"
"If you do it nonetheless then it's your own fault if things don't work as "
"expected.\n"
-"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
-"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
-"mode is usually a bad idea."
+"Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
+"explanation why system mode is usually a bad idea."
msgstr ""
-"OK, nun wird PA im System Mode betrieben. Vorsicht, dies sollte man nicht "
-"tun.\n"
-"Bei Nichtbeachtung, selber Schuld wenn Dinge nicht funktionieren.\n"
-"Für eine Erklärung warum System Mode eine schlechte Idee ist, bitte http://"
-"www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/"
-"WhatIsWrongWithSystemWide/ lesen"
+"Conforme, polo que se ve, está executando PA no modo de sistema de PA. Teña "
+"en conta que o máis probable é que non debería de estar facéndoo.\n"
+"Se, aínda así, segue facéndoo, entón será culpa súa se as cousas non "
+"funcionan como se agardaba.\n"
+"Por favor, lea http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode para "
+"obter unha explicación de por qué o modo de sistema adoita ser unha mala "
+"idea."
#: ../src/daemon/main.c:981
msgid "pa_pid_file_create() failed."
-msgstr "pa_pid_file_create() fehlgeschlagen."
+msgstr "Fallou pa_pid_file_create()."
#: ../src/daemon/main.c:991
msgid "Fresh high-resolution timers available! Bon appetit!"
-msgstr "Neue hochauslösende Timer verfügbar! Guten Appetit!"
+msgstr ""
+"Existen cronómetros de alta resolución novos e dispoñíbeis! Bo proveito!"
#: ../src/daemon/main.c:993
msgid ""
"Dude, your kernel stinks! The chef's recommendation today is Linux with high-"
"resolution timers enabled!"
-msgstr "Der Chefkoch empfiehlt: Linux mit aktivierten hochauslösenden Timern!"
+msgstr ""
+"Meu, o seu núcleo mete medo! A recomendación de hoxe do chef é Linux con "
+"cronómetros de alta resolución activados!"
#: ../src/daemon/main.c:1011
msgid "pa_core_new() failed."
-msgstr "pa_core_new() fehlgeschlagen."
+msgstr "Produciuse un fallo en pa_core_new()."
-#: ../src/daemon/main.c:1087
+#: ../src/daemon/main.c:1089
msgid "Failed to initialize daemon."
-msgstr "Konnte Daemon nicht initialisieren."
+msgstr "Produciuse un fallo ao tentar iniciar o daemon."
-#: ../src/daemon/main.c:1092
+#: ../src/daemon/main.c:1094
msgid "Daemon startup without any loaded modules, refusing to work."
-msgstr "Daemon verweigert Ausführung, da keine Module geladen."
+msgstr ""
+"Iniciouse o daemon sen ningún módulo cargado, polo que se nega a funcionar."
-#: ../src/daemon/main.c:1130
+#: ../src/daemon/main.c:1132
msgid "Daemon startup complete."
-msgstr "Start des Daemons abgeschlossen."
+msgstr "O daemon iniciouse completamente."
-#: ../src/daemon/main.c:1136
+#: ../src/daemon/main.c:1138
msgid "Daemon shutdown initiated."
-msgstr "Herunterfahren des Daemon gestartet."
+msgstr "Comeza a apagarse o daemon."
-#: ../src/daemon/main.c:1167
+#: ../src/daemon/main.c:1169
msgid "Daemon terminated."
-msgstr "Daemon beendet."
+msgstr "O daemon rematou."
#: ../src/daemon/cmdline.c:113
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s [options]\n"
"\n"
@@ -527,167 +538,178 @@ msgid ""
"\n"
" -n Don't load default script file\n"
msgstr ""
-"%s [options]\n"
+"%s [opcións]\n"
"\n"
-"BEFEHLE:\n"
-" -h, --help Zeige diese Hilfe\n"
-" --version Zeige Version\n"
-" --dump-conf Zeige Standardkonfiguration\n"
-" --dump-modules Zeige Liste verfügbarer Module\n"
-" --dump-resample-methods Zeige verfügbare Resample-Methoden\n"
-" --cleanup-shm Bereinige veraltete Bereiche des "
-"gemeinsamen Speichers\n"
-" --start Starte Daemon, falls noch nicht "
-"geschehen\n"
-" -k --kill Laufenden Daemon beenden\n"
-" --check Prüfe laufende Daemone (gibt nur "
-"einen Exit-Code zurück)\n"
+"ORDES:\n"
+" -h, --help Mostra esta axuda\n"
+" --version Mostra a versión\n"
+" --dump-conf Envorca a configuración "
+"predeterminada\n"
+" --dump-modules Envorca unha lista de módulos "
+"dispoñíbeis\n"
+" --dump-resample-methods Envorca os métodos dispoñíbeis de "
+"nova mostraxe\n"
+" --cleanup-shm Limpa os segmentos de memoria "
+"compartidos\n"
+" --start Inicia o «daemon», se aínda non está "
+"executándose\n"
+" -k --kill Detén un «daemon» que estea "
+"executándose\n"
+" --check Verifica que «daemon» están "
+"executándose\n"
"\n"
-"OPTIONS:\n"
-" --system[=BOOL] Als systemweite Instanz ausführen\n"
-" -D, --daemonize[=BOOL] Nach Start zum Daemon machen\n"
-" --fail[=BOOL] Beenden, wenn Start fehlschlägt\n"
-" --high-priority[=BOOL] Versuche höchste Priorität zu "
-"setzen\n"
-" (Nur verfügbar als root, wenn SUID "
-"oder\n"
-" mit erhöhtem RLIMIT_NICE)\n"
-" --realtime[=BOOL] Versuche, Echtzeit-Scheduling zu "
-"aktivieren\n"
-" (Nur verfügbar als root, wenn SUID "
-"oder\n"
-" mit erhöhtem RLIMIT_RTPRIO)\n"
-" --disallow-module-loading[=BOOL] Verbiete (Ent-)laden durch Nutzer "
-"angefordertere\n"
-" Module nach dem Start\n"
-" --disallow-exit[=BOOL] Verbiete Beenden auf Anfrage des "
-"Nutzers\n"
-" --exit-idle-time=SECS Beende Daemon, wenn für diese Zeit\n"
-" untätig\n"
-" --module-idle-time=SECS Entlade untätige Module nach dieser "
-"Zeit\n"
-" --scache-idle-time=SECS Entlade untätige automatisch "
-"geladene\n"
-" Samples nach dieser Zeit\n"
-" --log-level[=LEVEL] Grad der Ausführlichkeit angeben\n"
-" -v Ausführliche Meldungen\n"
-" --log-target={auto,syslog,stderr} Protokoll-Ziel angeben\n"
-" --log-meta[=BOOL] Speicherort des Codes in "
-"Protokollnachrichtenangeben\n"
-" --log-time[=BOOL] Zeitstempel in Protokollnachrichten "
-"angeben\n"
-" --log-backtrace=FRAMES Backtrace in Protokollnachrichten "
-"angeben\n"
-" -p, --dl-search-path=PATH Suchpfad für dynamisch freigegebene\n"
-" Objekte (Plugins) angeben\n"
-" --resample-method=METHOD Nutze diese Resampling-Methode\n"
-" (Siehe --dump-resample-methods für\n"
-" mögliche Werte)\n"
-" --use-pid-file[=BOOL] Eine PID-Datei erstellen\n"
-" --no-cpu-limit[=BOOL] CPU-Lastbegrenzung auf "
-"unterstützten\n"
-" Systemen nicht installieren.\n"
-" --disable-shm[=BOOL] Unterstützung für Shared Memory "
-"deaktivieren.\n"
+"OPCIÓNS:\n"
+" --system[=BOOL] Executase como única instancia a "
+"nivel do sistema\n"
+" -D, --daemonize[=BOOL] Convertese en daemon despois de "
+"iniciarse\n"
+" --fail[=BOOL] Pechase cando falla o inicio\n"
+" --high-priority[=BOOL] Tenta estabelecer un nivel alto "
+"agradábel\n"
+" (só dispoñíbel como root, cando o "
+"SUID ou\n"
+" RLIMIT_NICE son elevados)\n"
+" --realtime[=BOOL] Tenta activar a planificación en "
+"tempo real\n"
+" (só dispoñíbel como root, cando o "
+"SUID ou\n"
+" RLIMIT_NICE son elevados)\n"
+" --disallow-module-loading[=BOOL] Non permite a carga/descarga do "
+"módulo polo usuario\n"
+" despois de que se teña iniciado\n"
+" --disallow-exit[=BOOL] Non permite a petición do usuario de "
+"abandonar o programa\n"
+" --exit-idle-time=SECS Desactiva un daemon cando está "
+"desocupado e\n"
+" transcorreu esa cantidade de tempo\n"
+" --module-idle-time=SECS Descarga os módulos que foron "
+"cargados automaticamente cando están\n"
+" desocupados e transcorreu esa "
+"cantidade de tempo\n"
+" --scache-idle-time=SECS Descarga mostras cargadas "
+"automaticamente cando están\n"
+" desocupados e transcorreu esa "
+"cantidade de tempo\n"
+" --log-level[=LEVEL] Aumenta ou define o grao da saída a "
+"utilizar\n"
+" -v Aumenta o grao da saída\n"
+" --log-target={auto,syslog,stderr} Especifica o destino do rexistro\n"
+" --log-meta[=BOOL] Incluír a localización do código nos "
+"mensaxes de rexistro\n"
+" --log-time[=BOOL] Incluír a pegada de tempo nos "
+"mensaxes de rexistro\n"
+" -p, --dl-search-path=PATH Estabelece a ruta de busca (search "
+"path) para engadidos\n"
+" (plugins) compartidos\n"
+" --resample-method=METHOD Utiliza un método de nova mostraxe "
+"específico\n"
+" (Ver en --dump-resample-methods os "
+"valores posibles)\n"
+" --use-pid-file[=BOOL] Crea o ficheiro PID\n"
+" --no-cpu-limit[=BOOL] Non instala un limitador de carga de "
+"CPU en\n"
+" plataformas que o admitan.\n"
+" --disable-shm[=BOOL] Desactiva a compatibilidade para "
+"memoria compartida.\n"
"\n"
-"STARTUP SCRIPT:\n"
-" -L, --load=\"MODULE ARGUMENTS\" Plugin-Modul mit diesen "
-"Parametern\n"
-" laden.\n"
-" -F, --file=FILENAME Dieses Skript ausführen\n"
-" -C Nach Start auf laufendem TTY\n"
-" eine Kommandozeile öffnen\n"
+"SCRIPT DE INICIO:\n"
+" -L, --load=\"ARGUMENTOS DO MODULO\" Carga o módulo engadido cos "
+"parámetros indicados\n"
+" -F, --file=FILENAME Executa o script especificado\n"
+" -C Abre unha liña de ordes na TTY "
+"actual despois de iniciar\n"
"\n"
-" -n Standardskript nicht laden\n"
+" -n Non carga o ficheiro script "
+"predeterminado\n"
#: ../src/daemon/cmdline.c:244
msgid "--daemonize expects boolean argument"
-msgstr "--daemonize erfordert Boolsche Variable"
+msgstr "--daemonize agarda un argumento booleano"
#: ../src/daemon/cmdline.c:251
msgid "--fail expects boolean argument"
-msgstr "--fail erfordert Boolsche Variable"
+msgstr "--fail agarda un argumento booleano"
#: ../src/daemon/cmdline.c:261
msgid ""
"--log-level expects log level argument (either numeric in range 0..4 or one "
"of debug, info, notice, warn, error)."
msgstr ""
-"--log-level erfordert Parameter für Grad der Protokollierung (entweder "
-"numerisch im Bereich 0..4 or einen dieser: debug, info, notice, warn, error)."
+"--log-level agarda un argumento no nivel do rexistro (xa sexa numérico, "
+"dentro do rango de 0..4; xa sexa un de debug, info, notice, warn, ou error)."
#: ../src/daemon/cmdline.c:273
msgid "--high-priority expects boolean argument"
-msgstr "--high-priority erfordert Boolsche Variable"
+msgstr "--high-priority agarda un argumento booleano"
#: ../src/daemon/cmdline.c:280
msgid "--realtime expects boolean argument"
-msgstr "--realtime erfordert Boolsche Variable"
+msgstr "--realtime agarda un argumento booleano"
#: ../src/daemon/cmdline.c:287
msgid "--disallow-module-loading expects boolean argument"
-msgstr "--disallow-module-loading erfordert Boolsche Variable"
+msgstr "--disallow-module-loading agarda un argumento booleano"
#: ../src/daemon/cmdline.c:294
msgid "--disallow-exit expects boolean argument"
-msgstr "--disallow-exit erfordert Boolsche Variable"
+msgstr "--disallow-exit agarda un argumento booleano"
#: ../src/daemon/cmdline.c:301
msgid "--use-pid-file expects boolean argument"
-msgstr "--use-pid-file erfordert Boolsche Variable"
+msgstr "--use pid-file agarda un argumento booleano"
#: ../src/daemon/cmdline.c:318
-#, fuzzy
msgid ""
"Invalid log target: use either 'syslog', 'stderr' or 'auto' or a valid file "
"name 'file:<path>'."
msgstr ""
-"Ungültiges Log-Ziel: Benutzen Sie entweder 'syslog', 'stderr' oder 'auto'."
+"Rexistro de destino non válido: use «syslog», «stderr», «auto» ou un nome "
+"de ficheiro válido «file:<ruta>»."
#: ../src/daemon/cmdline.c:325
msgid "--log-time expects boolean argument"
-msgstr "--realtime erfordert Boolsche Variable"
+msgstr "--log-time agarda un argumento booleano"
#: ../src/daemon/cmdline.c:332
msgid "--log-meta expects boolean argument"
-msgstr "--log-meta erfordert Boolsche Variable"
+msgstr "--log-meta agarda un argumento booleano"
#: ../src/daemon/cmdline.c:351
#, c-format
msgid "Invalid resample method '%s'."
-msgstr "Ungültige Resample-Methode '%s'."
+msgstr "Método de nova mostraxe incorrecto «%s»"
#: ../src/daemon/cmdline.c:358
msgid "--system expects boolean argument"
-msgstr "--system erfordert Boolsche Variable"
+msgstr "--system agarda un argumento booleano"
#: ../src/daemon/cmdline.c:365
msgid "--no-cpu-limit expects boolean argument"
-msgstr "--no-cpu-limit erfordert Boolsche Variable"
+msgstr "--no-cpu-limit agarda un argumento booleano"
#: ../src/daemon/cmdline.c:372
msgid "--disable-shm expects boolean argument"
-msgstr "--disable-shm erfordert Boolsche Variable"
+msgstr "--disable-shm agarda un argumento booleano"
#: ../src/daemon/dumpmodules.c:59
#, c-format
msgid "Name: %s\n"
-msgstr "Name: %s\n"
+msgstr "Nome: %s\n"
#: ../src/daemon/dumpmodules.c:62
#, c-format
msgid "No module information available\n"
-msgstr "Keine Modul-Informationen verfügbar\n"
+msgstr "Non existe información dispoñíbel acerca do módulo\n"
#: ../src/daemon/dumpmodules.c:65
#, c-format
msgid "Version: %s\n"
-msgstr "Version: %s\n"
+msgstr "Versión: %s\n"
#: ../src/daemon/dumpmodules.c:67
#, c-format
msgid "Description: %s\n"
-msgstr "Beschreibung: %s\n"
+msgstr "Descrición: %s\n"
#: ../src/daemon/dumpmodules.c:69
#, c-format
@@ -697,122 +719,120 @@ msgstr "Autor: %s\n"
#: ../src/daemon/dumpmodules.c:71
#, c-format
msgid "Usage: %s\n"
-msgstr "Verwendung: %s\n"
+msgstr "Utilización: %s\n"
#: ../src/daemon/dumpmodules.c:72
#, c-format
msgid "Load Once: %s\n"
-msgstr "Lade einmalig: %s\n"
+msgstr "Carga unha vez: %s\n"
#: ../src/daemon/dumpmodules.c:74
#, c-format
msgid "DEPRECATION WARNING: %s\n"
-msgstr "WARNUNG (DEPRECATION): %s\n"
+msgstr "AVISO DE OBSOLESCENCIA: %s\n"
#: ../src/daemon/dumpmodules.c:78
#, c-format
msgid "Path: %s\n"
-msgstr "Pfad: %s\n"
+msgstr "Ruta: %s\n"
#: ../src/daemon/daemon-conf.c:275
#, c-format
msgid "[%s:%u] Invalid log target '%s'."
-msgstr "[%s:%u] Ungültiges Log-Ziel '%s'."
+msgstr "[%s:%u] Destino do rexistro incorrecto «%s»."
#: ../src/daemon/daemon-conf.c:291
#, c-format
msgid "[%s:%u] Invalid log level '%s'."
-msgstr "[%s:%u] Ungültige Log-Stufe '%s'."
+msgstr "[%s:%u] Nivel do rexistro incorrecto «%s»."
#: ../src/daemon/daemon-conf.c:307
#, c-format
msgid "[%s:%u] Invalid resample method '%s'."
-msgstr "[%s:%u] Ungültige Resample-Methode '%s'."
+msgstr "[%s:%u] Método de nova mostraxe incorrecto «%s»."
#: ../src/daemon/daemon-conf.c:330
#, c-format
msgid "[%s:%u] Invalid rlimit '%s'."
-msgstr "[%s:%u] Ungültiges rlimit '%s'."
+msgstr "[%s:%u] Rlimit incorrecto «%s»."
#: ../src/daemon/daemon-conf.c:351
#, c-format
msgid "[%s:%u] Invalid sample format '%s'."
-msgstr "[%s:%u] Ungültiges Sample-Format '%s'."
+msgstr "[%s:%u] Formato de mostra «%s» incorrecto"
#: ../src/daemon/daemon-conf.c:370 ../src/daemon/daemon-conf.c:389
#, c-format
msgid "[%s:%u] Invalid sample rate '%s'."
-msgstr "[%s:%u] Ungültige Sample-Rate '%s'."
+msgstr "[%s:%u] Taxa de mostraxe incorrecta «%s»."
#: ../src/daemon/daemon-conf.c:413
#, c-format
msgid "[%s:%u] Invalid sample channels '%s'."
-msgstr "[%s:%u] Ungültige Sample-Kanäle '%s'."
+msgstr "[%s:%u] Canles de mostra incorrectas «%s»."
#: ../src/daemon/daemon-conf.c:431
#, c-format
msgid "[%s:%u] Invalid channel map '%s'."
-msgstr "[%s:%u] Ungültige Kanal-Zuordnung '%s'."
+msgstr "[%s:%u] Mapa de canles incorrecto «%s»."
#: ../src/daemon/daemon-conf.c:449
#, c-format
msgid "[%s:%u] Invalid number of fragments '%s'."
-msgstr "[%s:%u] Ungültige Anzahl von Fragmenten '%s'."
+msgstr "[%s:%u] Cantidade incorrecta de fragmentos «%s»."
#: ../src/daemon/daemon-conf.c:467
#, c-format
msgid "[%s:%u] Invalid fragment size '%s'."
-msgstr "[%s:%u] Ungültige Fragmentgröße '%s'."
+msgstr "[%s:%u] Tamaño incorrecto de fragmento «%s»."
#: ../src/daemon/daemon-conf.c:485
#, c-format
msgid "[%s:%u] Invalid nice level '%s'."
-msgstr "[%s:%u] Ungültige Nice-Stufe '%s'."
+msgstr "[%s:%u] Nivel de amabilidade incorrecto «%s»."
#: ../src/daemon/daemon-conf.c:528
-#, fuzzy, c-format
+#, c-format
msgid "[%s:%u] Invalid server type '%s'."
-msgstr "[%s:%u] Ungültige Sample-Rate '%s'."
+msgstr "[%s:%u] Tipo de servidor incorrecto «%s»."
#: ../src/daemon/daemon-conf.c:641
#, c-format
msgid "Failed to open configuration file: %s"
-msgstr "Öffnen der Konfigurationsdatei fehlgeschlagen : %s"
+msgstr "Non foi posíbel abrir o ficheiro de configuración: %s"
#: ../src/daemon/daemon-conf.c:657
msgid ""
"The specified default channel map has a different number of channels than "
"the specified default number of channels."
msgstr ""
-"Die angegebene Standard-Kanalzuordnung hat eine andere Anzahl von Kanälen "
-"als die angegebene Standard-Kanal-Anzahl."
+"O mapa de canles predeterminado especificado ten un número de canles "
+"distinto ao especificado como predeterminado."
#: ../src/daemon/daemon-conf.c:743
#, c-format
msgid "### Read from configuration file: %s ###\n"
-msgstr "### Lese von Konfigurationsdatei: %s ###\n"
+msgstr "### Lendo desde o ficheiro de configuración: %s ###\n"
#: ../src/daemon/caps.c:58
msgid "Cleaning up privileges."
-msgstr "Root-Privilegien aufräumen."
+msgstr "Limpeza de privilexios."
#: ../src/daemon/pulseaudio.desktop.in.h:1
msgid "PulseAudio Sound System"
-msgstr "PulseAudio Sound System"
+msgstr "Sistema de son PulseAudio"
#: ../src/daemon/pulseaudio.desktop.in.h:2
msgid "Start the PulseAudio Sound System"
-msgstr "Das PulseAudio Sound System starten"
+msgstr "Iniciar o Sistema de son PulseAudio"
#: ../src/daemon/pulseaudio-kde.desktop.in.h:1
-#, fuzzy
msgid "PulseAudio Sound System KDE Routing Policy"
-msgstr "PulseAudio Sound System"
+msgstr "Normativa de enrutado de KDE do Sistema de son PulseAudio"
#: ../src/daemon/pulseaudio-kde.desktop.in.h:2
-#, fuzzy
msgid "Start the PulseAudio Sound System with KDE Routing Policy"
-msgstr "Das PulseAudio Sound System starten"
+msgstr "Iniciar o Sistema de son PulseAudio coa normativa de enrutado de KDE"
#: ../src/pulse/channelmap.c:105 ../src/pulse/channelmap.c:757
msgid "Mono"
@@ -820,342 +840,342 @@ msgstr "Mono"
#: ../src/pulse/channelmap.c:107
msgid "Front Center"
-msgstr "Vorne Mitte"
+msgstr "Fronte central"
#: ../src/pulse/channelmap.c:108
msgid "Front Left"
-msgstr "Vorne Links"
+msgstr "Fronte esquerda"
#: ../src/pulse/channelmap.c:109
msgid "Front Right"
-msgstr "Vorne Rechts"
+msgstr "Fronte dereita"
#: ../src/pulse/channelmap.c:111
msgid "Rear Center"
-msgstr "Hinten Mitte"
+msgstr "Traseira central"
#: ../src/pulse/channelmap.c:112
msgid "Rear Left"
-msgstr "Hinten Links"
+msgstr "Traseira esquerda"
#: ../src/pulse/channelmap.c:113
msgid "Rear Right"
-msgstr "Hinten Rechts"
+msgstr "Traseira dereita"
#: ../src/pulse/channelmap.c:115
msgid "Subwoofer"
-msgstr ""
+msgstr "Subgraves"
#: ../src/pulse/channelmap.c:117
msgid "Front Left-of-center"
-msgstr "Vorne Links der Mitte"
+msgstr "Frontal esquerda central"
#: ../src/pulse/channelmap.c:118
msgid "Front Right-of-center"
-msgstr "Vorne Rechts der Mitte"
+msgstr "Frontal dereita central"
#: ../src/pulse/channelmap.c:120
msgid "Side Left"
-msgstr "Seite Links"
+msgstr "Lateral esquerda"
#: ../src/pulse/channelmap.c:121
msgid "Side Right"
-msgstr "Seite Rechts"
+msgstr "Lateral dereita"
#: ../src/pulse/channelmap.c:123
msgid "Auxiliary 0"
-msgstr "Zusatz 0"
+msgstr "Auxiliar 0"
#: ../src/pulse/channelmap.c:124
msgid "Auxiliary 1"
-msgstr "Zusatz 1"
+msgstr "Auxiliar 1"
#: ../src/pulse/channelmap.c:125
msgid "Auxiliary 2"
-msgstr "Zusatz 2"
+msgstr "Auxiliar 2"
#: ../src/pulse/channelmap.c:126
msgid "Auxiliary 3"
-msgstr "Zusatz 3"
+msgstr "Auxiliar 3"
#: ../src/pulse/channelmap.c:127
msgid "Auxiliary 4"
-msgstr "Zusatz 4"
+msgstr "Auxiliar 4"
#: ../src/pulse/channelmap.c:128
msgid "Auxiliary 5"
-msgstr "Zusatz 5"
+msgstr "Auxiliar 5"
#: ../src/pulse/channelmap.c:129
msgid "Auxiliary 6"
-msgstr "Zusatz 6"
+msgstr "Auxiliar 6"
#: ../src/pulse/channelmap.c:130
msgid "Auxiliary 7"
-msgstr "Zusatz 7"
+msgstr "Auxiliar 7"
#: ../src/pulse/channelmap.c:131
msgid "Auxiliary 8"
-msgstr "Zusatz 8"
+msgstr "Auxiliar 8"
#: ../src/pulse/channelmap.c:132
msgid "Auxiliary 9"
-msgstr "Zusatz 9"
+msgstr "Auxiliar 9"
#: ../src/pulse/channelmap.c:133
msgid "Auxiliary 10"
-msgstr "Zusatz 10"
+msgstr "Auxiliar 10"
#: ../src/pulse/channelmap.c:134
msgid "Auxiliary 11"
-msgstr "Zusatz 11"
+msgstr "Auxiliar 11"
#: ../src/pulse/channelmap.c:135
msgid "Auxiliary 12"
-msgstr "Zusatz 12"
+msgstr "Auxiliar 12"
#: ../src/pulse/channelmap.c:136
msgid "Auxiliary 13"
-msgstr "Zusatz 13"
+msgstr "Auxiliar 13"
#: ../src/pulse/channelmap.c:137
msgid "Auxiliary 14"
-msgstr "Zusatz 14"
+msgstr "Auxiliar 14"
#: ../src/pulse/channelmap.c:138
msgid "Auxiliary 15"
-msgstr "Zusatz 15"
+msgstr "Auxiliar 15"
#: ../src/pulse/channelmap.c:139
msgid "Auxiliary 16"
-msgstr "Zusatz 16"
+msgstr "Auxiliar 16"
#: ../src/pulse/channelmap.c:140
msgid "Auxiliary 17"
-msgstr "Zusatz 17"
+msgstr "Auxiliar 17"
#: ../src/pulse/channelmap.c:141
msgid "Auxiliary 18"
-msgstr "Zusatz 18"
+msgstr "Auxiliar 18"
#: ../src/pulse/channelmap.c:142
msgid "Auxiliary 19"
-msgstr "Zusatz 19"
+msgstr "Auxiliar 19"
#: ../src/pulse/channelmap.c:143
msgid "Auxiliary 20"
-msgstr "Zusatz 20"
+msgstr "Auxiliar 20"
#: ../src/pulse/channelmap.c:144
msgid "Auxiliary 21"
-msgstr "Zusatz 21"
+msgstr "Auxiliar 21"
#: ../src/pulse/channelmap.c:145
msgid "Auxiliary 22"
-msgstr "Zusatz 22"
+msgstr "Auxiliar 22"
#: ../src/pulse/channelmap.c:146
msgid "Auxiliary 23"
-msgstr "Zusatz 23"
+msgstr "Auxiliar 23"
#: ../src/pulse/channelmap.c:147
msgid "Auxiliary 24"
-msgstr "Zusatz 24"
+msgstr "Auxiliar 24"
#: ../src/pulse/channelmap.c:148
msgid "Auxiliary 25"
-msgstr "Zusatz 25"
+msgstr "Auxiliar 25"
#: ../src/pulse/channelmap.c:149
msgid "Auxiliary 26"
-msgstr "Zusatz 26"
+msgstr "Auxiliar 26"
#: ../src/pulse/channelmap.c:150
msgid "Auxiliary 27"
-msgstr "Zusatz 26"
+msgstr "Auxiliar 27"
#: ../src/pulse/channelmap.c:151
msgid "Auxiliary 28"
-msgstr "Zusatz 28"
+msgstr "Auxiliar 28"
#: ../src/pulse/channelmap.c:152
msgid "Auxiliary 29"
-msgstr "Zusatz 29"
+msgstr "Auxiliar 29"
#: ../src/pulse/channelmap.c:153
msgid "Auxiliary 30"
-msgstr "Zusatz 30"
+msgstr "Auxiliar 30"
#: ../src/pulse/channelmap.c:154
msgid "Auxiliary 31"
-msgstr "Zusatz 31"
+msgstr "Auxiliar 31"
#: ../src/pulse/channelmap.c:156
msgid "Top Center"
-msgstr "Oben Mitte"
+msgstr "Arriba centro"
#: ../src/pulse/channelmap.c:158
msgid "Top Front Center"
-msgstr "Oben Vorne Mitte"
+msgstr "Central superior frontal"
#: ../src/pulse/channelmap.c:159
msgid "Top Front Left"
-msgstr "Oben Vorne Links"
+msgstr "Frontal superior esquerda"
#: ../src/pulse/channelmap.c:160
msgid "Top Front Right"
-msgstr "Oben Vorne Rechts"
+msgstr "Frontal superior dereito"
#: ../src/pulse/channelmap.c:162
msgid "Top Rear Center"
-msgstr "Oben Hinten Mitte"
+msgstr "Traseira superior central"
#: ../src/pulse/channelmap.c:163
msgid "Top Rear Left"
-msgstr "Oben Hinten Links"
+msgstr "Traseira superior esquerda"
#: ../src/pulse/channelmap.c:164
msgid "Top Rear Right"
-msgstr "Oben Hinten Rechts"
+msgstr "Traseira superior dereita"
#: ../src/pulse/channelmap.c:484 ../src/pulse/sample.c:169
#: ../src/pulse/volume.c:297 ../src/pulse/volume.c:323
#: ../src/pulse/volume.c:343 ../src/pulse/volume.c:373
#: ../src/pulse/format.c:125
msgid "(invalid)"
-msgstr "(ungültig)"
+msgstr "(incorrecto)"
#: ../src/pulse/channelmap.c:761
msgid "Stereo"
-msgstr "Stereo"
+msgstr "Estéreo"
#: ../src/pulse/channelmap.c:766
msgid "Surround 4.0"
-msgstr "Surround 4.0"
+msgstr "Envolvente 4.0"
#: ../src/pulse/channelmap.c:772
msgid "Surround 4.1"
-msgstr "Surround 4.1"
+msgstr "Envolvente 4.1"
#: ../src/pulse/channelmap.c:778
msgid "Surround 5.0"
-msgstr "Surround 5.0"
+msgstr "Envolvente 5.0"
#: ../src/pulse/channelmap.c:784
msgid "Surround 5.1"
-msgstr "Surround 5.1"
+msgstr "Envolvente 5.1"
#: ../src/pulse/channelmap.c:791
msgid "Surround 7.1"
-msgstr "Surround 7.1"
+msgstr "Envolvente 7.1"
#: ../src/pulse/error.c:40
msgid "OK"
-msgstr "OK"
+msgstr "Aceptar"
#: ../src/pulse/error.c:41
msgid "Access denied"
-msgstr "Zugriff verweigert"
+msgstr "Acceso denegado"
#: ../src/pulse/error.c:42
msgid "Unknown command"
-msgstr "Unbekannter Befehl"
+msgstr "Orde descoñecida"
#: ../src/pulse/error.c:43
msgid "Invalid argument"
-msgstr "Ungültiger Parameter"
+msgstr "Argumento incorrecto"
#: ../src/pulse/error.c:44
msgid "Entity exists"
-msgstr "Entität existiert bereits"
+msgstr "Entidade existente"
#: ../src/pulse/error.c:45
msgid "No such entity"
-msgstr "Entität nicht vorhanden"
+msgstr "Non existe esa entidade"
#: ../src/pulse/error.c:46
msgid "Connection refused"
-msgstr "Verbindung verweigert"
+msgstr "Conexión rexeitada"
#: ../src/pulse/error.c:47
msgid "Protocol error"
-msgstr "Protokollfehler"
+msgstr "Produciuse un erro de protocolo"
#: ../src/pulse/error.c:48
msgid "Timeout"
-msgstr "Zeitüberschreitung"
+msgstr "Tempo límite"
#: ../src/pulse/error.c:49
msgid "No authorization key"
-msgstr "Kein Authorisierungsschlüssel"
+msgstr "Sen chave de autorización"
#: ../src/pulse/error.c:50
msgid "Internal error"
-msgstr "Interner Fehler"
+msgstr "Produciuse un erro interno"
#: ../src/pulse/error.c:51
msgid "Connection terminated"
-msgstr "Verbindung beendet"
+msgstr "Conexión rematada"
#: ../src/pulse/error.c:52
msgid "Entity killed"
-msgstr "Entität terminiert"
+msgstr "Entidade rematada"
#: ../src/pulse/error.c:53
msgid "Invalid server"
-msgstr "Ungültiger Server"
+msgstr "Servidor incorrecto"
#: ../src/pulse/error.c:54
msgid "Module initialization failed"
-msgstr "Modulinitialisierung fehlgeschlagen"
+msgstr "Fallou a inicialización do módulo"
#: ../src/pulse/error.c:55
msgid "Bad state"
-msgstr "Ungültiger Zustand"
+msgstr "Estado defectuoso"
#: ../src/pulse/error.c:56
msgid "No data"
-msgstr "Keine Daten"
+msgstr "Sen datos"
#: ../src/pulse/error.c:57
msgid "Incompatible protocol version"
-msgstr "Inkompatible Protokollversion"
+msgstr "A versión de protocolo non é compatíbel"
#: ../src/pulse/error.c:58
msgid "Too large"
-msgstr "Zu groß"
+msgstr "Demasiado longo"
#: ../src/pulse/error.c:59
msgid "Not supported"
-msgstr "Nicht unterstützt"
+msgstr "Non admitido"
#: ../src/pulse/error.c:60
msgid "Unknown error code"
-msgstr "Unbekannter Fehlercode"
+msgstr "Código de erro descoñecido"
#: ../src/pulse/error.c:61
msgid "No such extension"
-msgstr "Erweiterung nicht vorhanden"
+msgstr "Non existe esa extensión"
#: ../src/pulse/error.c:62
msgid "Obsolete functionality"
-msgstr "Veraltete Funktion"
+msgstr "Funcionalidade obsoleta"
#: ../src/pulse/error.c:63
msgid "Missing implementation"
-msgstr "Fehlende Implementation"
+msgstr "Non se atopa a implementación"
#: ../src/pulse/error.c:64
msgid "Client forked"
-msgstr "Client geteilt"
+msgstr "Cliente bifurcado"
#: ../src/pulse/error.c:65
msgid "Input/Output error"
-msgstr "Eingabe/Ausgabe-Fehler"
+msgstr "Produciuse un erro de entrada/saída"
#: ../src/pulse/error.c:66
msgid "Device or resource busy"
-msgstr "Gerät oder Ressource beschäftigt"
+msgstr "Dispositivo ou recurso ocupado"
#: ../src/pulse/sample.c:171
#, c-format
@@ -1165,17 +1185,17 @@ msgstr "%s %uch %uHz"
#: ../src/pulse/sample.c:183
#, c-format
msgid "%0.1f GiB"
-msgstr "%0.1f GB"
+msgstr "%0.1f GiB"
#: ../src/pulse/sample.c:185
#, c-format
msgid "%0.1f MiB"
-msgstr "%0.1f MB"
+msgstr "%0.1f MiB"
#: ../src/pulse/sample.c:187
#, c-format
msgid "%0.1f KiB"
-msgstr "%0.1f KB"
+msgstr "%0.1f KiB"
#: ../src/pulse/sample.c:189
#, c-format
@@ -1183,54 +1203,53 @@ msgid "%u B"
msgstr "%u B"
#: ../src/pulse/client-conf-x11.c:54 ../src/utils/pax11publish.c:100
-#, fuzzy
msgid "xcb_connect() failed"
-msgstr "pa_context_new() fehlgeschlagen: %s"
+msgstr "xcb_connect() fallou"
#: ../src/pulse/client-conf-x11.c:59 ../src/utils/pax11publish.c:105
msgid "xcb_connection_has_error() returned true"
-msgstr ""
+msgstr "devolveu_verdadeiro_xcb_connection() has error"
#: ../src/pulse/client-conf-x11.c:97
msgid "Failed to parse cookie data"
-msgstr "Parsen der Cookie-Daten fehlgeschlagen"
+msgstr "Produciuse un fallo ao analizar os datos da cookie"
#: ../src/pulse/client-conf.c:117
#, c-format
msgid "Failed to open configuration file '%s': %s"
-msgstr "Konfigurationsdatei '%s' konnte nicht geöffnet werden: %s"
+msgstr "Produciuse un fallo ao abrir o ficheiro de configuración «%s»: %s"
#: ../src/pulse/context.c:528
msgid "No cookie loaded. Attempting to connect without."
-msgstr "Verbindungsversuch ohne Cookie, da keines geladen."
+msgstr "Non se cargou ningunha cookie. Tentando conectar de todos os xeitos."
-#: ../src/pulse/context.c:675
+#: ../src/pulse/context.c:679
#, c-format
msgid "fork(): %s"
msgstr "fork(): %s"
-#: ../src/pulse/context.c:730
+#: ../src/pulse/context.c:734
#, c-format
msgid "waitpid(): %s"
msgstr "waitpid(): %s"
-#: ../src/pulse/context.c:1431
+#: ../src/pulse/context.c:1435
#, c-format
msgid "Received message for unknown extension '%s'"
-msgstr "Nachricht für unbekannte Erweiterung '%s' erhalten"
+msgstr "Recibiuse unha mensaxe para unha extensión descoñecida «%s»"
#: ../src/utils/pacat.c:112
#, c-format
msgid "Failed to drain stream: %s"
-msgstr "Entleeren des Streams fehlgeschlagen: %s"
+msgstr "Produciuse un fallo ao drenar o fluxo: %s"
#: ../src/utils/pacat.c:117
msgid "Playback stream drained."
-msgstr "Wiedergabe-Stream entleert."
+msgstr "O fluxo de reprodución foi drenado."
#: ../src/utils/pacat.c:128
msgid "Draining connection to server."
-msgstr "Verbindung zu Server entleert."
+msgstr "Drenando a conexión co servidor."
#: ../src/utils/pacat.c:141
#, c-format
@@ -1240,90 +1259,90 @@ msgstr "pa_stream_drain(): %s"
#: ../src/utils/pacat.c:164
#, c-format
msgid "pa_stream_write() failed: %s"
-msgstr "pa_stream_write() fehlgeschlagen: %s"
+msgstr "Produciuse un fallo en pa_stream_write(): %s"
#: ../src/utils/pacat.c:205
#, c-format
msgid "pa_stream_begin_write() failed: %s"
-msgstr "pa_stream_write() fehlgeschlagen: %s"
+msgstr "Produciuse un fallo en pa_stream_write(): %s"
#: ../src/utils/pacat.c:255 ../src/utils/pacat.c:285
#, c-format
msgid "pa_stream_peek() failed: %s"
-msgstr "pa_stream_peek() fehlgeschlagen: %s"
+msgstr "Produciuse un fallo en pa_stream_peek(): %s"
#: ../src/utils/pacat.c:325
msgid "Stream successfully created."
-msgstr "Stream wurde erfolgreich erstellt."
+msgstr "Creouse satisfactoriamente o fluxo (stream)."
#: ../src/utils/pacat.c:328
#, c-format
msgid "pa_stream_get_buffer_attr() failed: %s"
-msgstr "pa_stream_get_buffer_attr() fehlgeschlagen: %s"
+msgstr "Produciuse un fallo en pa_stream_get_buffer_attr(): %s"
#: ../src/utils/pacat.c:332
#, c-format
msgid "Buffer metrics: maxlength=%u, tlength=%u, prebuf=%u, minreq=%u"
-msgstr "Pufferdaten: maxlenght=%u, tlength=%u, prebuf=%u, minreq=%u"
+msgstr "Métrica do búfer: maxlenght=%u, tlenghth=%u, prebuf=%u, minreq=%u"
#: ../src/utils/pacat.c:335
#, c-format
msgid "Buffer metrics: maxlength=%u, fragsize=%u"
-msgstr "Pufferdaten: maxlength=%u, fragsize=%u"
+msgstr " Métrica do búfer: maxlenght=%u, fragsize=%u"
#: ../src/utils/pacat.c:339
#, c-format
msgid "Using sample spec '%s', channel map '%s'."
-msgstr "Benutze Sample-Angabe '%s', Kanalzuordnung '%s'."
+msgstr "Utilizando especificacións de mostra «%s», mapa de canles «%s»."
#: ../src/utils/pacat.c:343
#, c-format
msgid "Connected to device %s (%u, %ssuspended)."
-msgstr "Verbunden mit Gerät %s (%u, %sausgesetzt)."
+msgstr "Conectado a dispositivo %s (%u, %ssuspended)."
#: ../src/utils/pacat.c:353
#, c-format
msgid "Stream error: %s"
-msgstr "Stream-Fehler: %s"
+msgstr "Produciuse un erro de fluxo: %s"
#: ../src/utils/pacat.c:363
#, c-format
msgid "Stream device suspended.%s"
-msgstr "Stream-Gerät ausgesetzt.%s"
+msgstr "Dispositivo de fluxo suspendido.%s"
#: ../src/utils/pacat.c:365
#, c-format
msgid "Stream device resumed.%s"
-msgstr "Stream-Gerät reaktiviert.%s"
+msgstr "Dispositivo de fluxo restabelecido.%s"
#: ../src/utils/pacat.c:373
#, c-format
msgid "Stream underrun.%s"
-msgstr "Stream leergelaufen.%s"
+msgstr "Fluxo esgotado.%s"
#: ../src/utils/pacat.c:380
#, c-format
msgid "Stream overrun.%s"
-msgstr "Stream überlaufen.%s "
+msgstr "Fluxo saturado.%s"
#: ../src/utils/pacat.c:387
#, c-format
msgid "Stream started.%s"
-msgstr "Stream gestartet: %s"
+msgstr "Fluxo iniciado.%s"
#: ../src/utils/pacat.c:394
#, c-format
msgid "Stream moved to device %s (%u, %ssuspended).%s"
-msgstr "Stream an Gerät %s übergeben (%u, %sausgesetzt).%s"
+msgstr "Fluxo trasladado ao dispositivo %s (%u, %ssuspended).%s"
#: ../src/utils/pacat.c:394
msgid "not "
-msgstr "nicht "
+msgstr "sen"
#: ../src/utils/pacat.c:401
#, c-format
msgid "Stream buffer attributes changed.%s"
-msgstr "Stream-Zwischenspeicher-Attribute geändert.%s"
+msgstr "Cambiaron os atributos do búfer do fluxo.%s"
#: ../src/utils/pacat.c:416
msgid "Cork request stack is empty: corking stream"
@@ -1340,58 +1359,58 @@ msgstr ""
#: ../src/utils/pacat.c:451
#, c-format
msgid "Connection established.%s"
-msgstr "Verbindung hergestellt.%s"
+msgstr "Conexión estabelecida.%s"
#: ../src/utils/pacat.c:454
#, c-format
msgid "pa_stream_new() failed: %s"
-msgstr "pa_stream_new() fehlgeschlagen: %s"
+msgstr "Produciuse un fallo en pa_stream_new(): %s"
#: ../src/utils/pacat.c:492
#, c-format
msgid "pa_stream_connect_playback() failed: %s"
-msgstr "pa_stream_connect_playback() fehlgeschlagen: %s"
+msgstr "Produciuse un fallo en pa_stream_connect_playback(): %s"
#: ../src/utils/pacat.c:498
#, c-format
msgid "pa_stream_connect_record() failed: %s"
-msgstr "pa_stream_connect_record() fehlgeschlagen: %s"
+msgstr "Produciuse un fallo en pa_stream_connect_record(): %s"
-#: ../src/utils/pacat.c:512 ../src/utils/pactl.c:1252
+#: ../src/utils/pacat.c:512 ../src/utils/pactl.c:1273
#, c-format
msgid "Connection failure: %s"
-msgstr "Verbindungsfehler: %s"
+msgstr "Produciuse un fallo na conexión: %s"
#: ../src/utils/pacat.c:545
msgid "Got EOF."
-msgstr "EOF empfangen."
+msgstr "Obtívose EOF."
#: ../src/utils/pacat.c:582
#, c-format
msgid "write() failed: %s"
-msgstr "write() fehlgeschlagen: %s"
+msgstr "Produciuse un fallo en write(): %s"
#: ../src/utils/pacat.c:603
msgid "Got signal, exiting."
-msgstr "Signal empfangen, beenden."
+msgstr "Obtívose sinal, saíndo."
#: ../src/utils/pacat.c:617
#, c-format
msgid "Failed to get latency: %s"
-msgstr "Erhalten der Latenz fehlgeschlagen: %s"
+msgstr "Non se puido obter a latencia: %s"
#: ../src/utils/pacat.c:622
#, c-format
msgid "Time: %0.3f sec; Latency: %0.0f usec."
-msgstr "Zeit: %0.3f sec; Latenz: %0.0f usec."
+msgstr "Tempo: %0.3f seg; latencia: %0.0f useg."
#: ../src/utils/pacat.c:643
#, c-format
msgid "pa_stream_update_timing_info() failed: %s"
-msgstr "pa_stream_update_timing_info() fehlgeschlagen: %s"
+msgstr "Produciuse un fallo en pa_stream_update_timing_info(): %s"
#: ../src/utils/pacat.c:653
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s [options]\n"
"\n"
@@ -1454,54 +1473,65 @@ msgid ""
" --file-format[=FFORMAT] Record/play formatted PCM data.\n"
" --list-file-formats List available file formats.\n"
msgstr ""
-"%s [options]\n"
+"%s [opcións]\n"
"\n"
-" -h, --help Diese Hilfe anzeigen\n"
-" --version Version anzeigen\n"
+" -h, --help Mostra esta axuda\n"
+" --version Mostra a versión\n"
"\n"
-" -r, --record Aufnahme-Verbindung aufbauen\n"
-" -p, --playback Wiedergabe-Verbindung aufbauen\n"
+" -r, --record Crea unha conexión para gravar\n"
+" -p, --playback Crea unha conexión para reproducir\n"
"\n"
-" -v, --verbose Ausführliche Meldungen\n"
+" -v, --verbose Activa operacións detalladas\n"
"\n"
-" -s, --server=SERVER Name des zu verbindenden Servers\n"
-" -d, --device=DEVICE Name des/der zu verbindender Sink/"
-"Quelle\n"
-" -n, --client-name=NAME Rufname des Clients auf dem Server\n"
-" --stream-name=NAME Rufname des Streams auf dem Server\n"
-" --volume=VOLUME Initiale (lineare) Lautstärke "
-"zwischen 0...65536 angeben\n"
-" --rate=SAMPLERATE Sample-Rate in Hz (Standard 44100)\n"
-" --format=SAMPLEFORMAT Ein Sample-Format von s16le, s16be, "
-"u8, float32le,\n"
-" float32be, ulaw, alaw, s32le, s32be, "
-"s24le, s24be,\n"
-" s24-32le, s24-32be (Standard ist "
-"s16ne)\n"
-" --channels=CHANNELS Anzahl Kanäle, 1 für Mono, 2 für "
-"Stereo\n"
-" (Standard ist 2)\n"
-" --channel-map=CHANNELMAP Diese geänderte Kanalzuordnung "
-"nutzen\n"
-" --fix-format Sample-Format des mit Sink\n"
-" verbundenen Streams nutzen.\n"
-" --fix-rate Sample-Rate des mit Sink\n"
-" verbundenen Streams nutzen.\n"
-" --fix-channels Anzahl und Zuordnung der Kanäle\n"
-" des mit Sink verbundenen\n"
-" Streams nutzen.\n"
-" --no-remix Kanäle nicht up-/down-mischen.\n"
-" --no-remap Kanäle nach Index statt Name "
-"zuordnen.\n"
-" --latency=BYTES Diese Latenz verwenden.\n"
-" --process-time=BYTES Diese Prozesszeit pro Anfrage "
-"verwenden.\n"
-" --property=PROPERTY=VALUE Die angegebene Eigenschaft auf "
-"denspezifizierten Wert setzen.\n"
-" --raw PCM-Rohdaten aufnehmen/wiedergeben.\n"
-" --file-format=FFORMAT Formatierte PCM-Daten aufnehmen/"
-"wiedergeben.\n"
-" --list-file-formats Verfügbare Dateiformate auflisten.\n"
+" -s, --server=SERVIDOR O nome do servidor co que "
+"conectarse\n"
+" -d, --device=DISPOSITIVO O nome da saída/orixe á que "
+"conectarse\n"
+" -n, --client-name=NOME Como chamar a este cliente no "
+"servidor\n"
+" --stream-name=NOME Como chamar a este fluxo no "
+"servidor\n"
+" --volume=VOLUME Especifica o volume inicial (linear) "
+"dentro do rango 0...65536\n"
+" --rate=TAXAMOSTRA Taxa da mostra en Hz (estabelecida "
+"en 44100 por omisión)\n"
+" --format=FORMATOMOSTRA O tipo de mostra, algún entre s16le, "
+"s16be, u8, float32le,\n"
+" float32be, ulaw, alaw, s32le, s32be "
+"(estabelecido en s16ne por omisión)\n"
+" --channels=CANLES A cantidade de canles, 1 para mono, "
+"2 para estéreo\n"
+" (establecido en 2 por omisión)\n"
+" --channel-map=MAPACANLES Mapa de canles a ser usado no canto "
+"do predeterminado\n"
+" --fix-format Obter o formato da mostra desde a "
+"saída á que está\n"
+" conectado o fluxo.\n"
+" --fix-rate Obtén a taxa da mostra desde o "
+"destino ao que está\n"
+" conectado o fluxo.\n"
+" --fix-channels Obter o mapa e a cantidade de canles "
+"desde a saída\n"
+" á que está conectado o fluxo.\n"
+" --no-remix Non realiza un upmix ou un downmix "
+"das canles.\n"
+" --no-remap Mapea canles por índices no canto de "
+"por nomes.\n"
+" --latency=BYTES Solicita a latencia especificada en "
+"bytes.\n"
+" --process-time=BYTES Solicita o tempo dos procesos "
+"especificados en bytes.\n"
+" --latency-msec=MSEC Solicita a latencia especificada en "
+"msec.\n"
+" --process-time-msec=MSEC Solicita o tempo de proceso "
+"especificado por solicitude en msec.\n"
+" --raw Grava/reproduce datos PCM con "
+"formato raw.\n"
+" --passthrough pasar datos directamente\n"
+" --file-format=FFORMATO Grava/reproduce datos PCM "
+"formatados.\n"
+" --list-file-formats Mostra unha lista cos formatos de "
+"ficheiro dispoñíbeis.\n"
#: ../src/utils/pacat.c:786
#, c-format
@@ -1511,47 +1541,47 @@ msgid ""
"Linked with libpulse %s\n"
msgstr ""
"pacat %s\n"
-"Kompiliert mit libpulse %s\n"
-"Gelinkt mit libpulse %s\n"
+"Compilado con libpulse %s\n"
+"Vinculado con libpulse %s\n"
-#: ../src/utils/pacat.c:819 ../src/utils/pactl.c:1400
+#: ../src/utils/pacat.c:819 ../src/utils/pactl.c:1421
#, c-format
msgid "Invalid client name '%s'"
-msgstr "Ungültiger Client-Name '%s'"
+msgstr "Nome do cliente «%s» incorrecto"
#: ../src/utils/pacat.c:834
#, c-format
msgid "Invalid stream name '%s'"
-msgstr "Ungültiger Stream-Name '%s'"
+msgstr "Nome do fluxo «%s» incorrecto"
#: ../src/utils/pacat.c:871
#, c-format
msgid "Invalid channel map '%s'"
-msgstr "Ungültige Kanal-Zuweisung '%s'"
+msgstr "Mapa de canles «%s» incorrecto"
#: ../src/utils/pacat.c:900 ../src/utils/pacat.c:914
#, c-format
msgid "Invalid latency specification '%s'"
-msgstr "Ungültige Latenz-Angaben '%s'"
+msgstr "Especificación da latencia «%s» incorrecta"
#: ../src/utils/pacat.c:907 ../src/utils/pacat.c:921
#, c-format
msgid "Invalid process time specification '%s'"
-msgstr "Ungültige Prozesszeit-Angaben '%s'"
+msgstr "Especificación de tempo de proceso «%s» incorrecta"
#: ../src/utils/pacat.c:933
#, c-format
msgid "Invalid property '%s'"
-msgstr "Ungültige Eigenschaft '%s'"
+msgstr "Propiedade «%s» incorrecta"
#: ../src/utils/pacat.c:952
#, c-format
msgid "Unknown file format %s."
-msgstr "Unbekanntes Dateiformat %s."
+msgstr "Formato de ficheiro descoñecido %s."
#: ../src/utils/pacat.c:971
msgid "Invalid sample specification"
-msgstr "Ungültige Sample-Angaben"
+msgstr "Especificación de mostra incorrecta"
#: ../src/utils/pacat.c:981
#, c-format
@@ -1565,82 +1595,86 @@ msgstr "dup2(): %s"
#: ../src/utils/pacat.c:993
msgid "Too many arguments."
-msgstr "Zu viele Argumente."
+msgstr "Demasiados argumentos."
#: ../src/utils/pacat.c:1004
msgid "Failed to generate sample specification for file."
-msgstr "Beziehen der Sample-Informationen für die Datei fehlgeschlagen."
+msgstr "Fallou ao xerar a especificación de exemplo para o ficheiro."
#: ../src/utils/pacat.c:1030
msgid "Failed to open audio file."
-msgstr "Öffnen der Audio-Datei fehlgeschlagen."
+msgstr "Produciuse un fallo ao abrir o ficheiro de son."
#: ../src/utils/pacat.c:1036
msgid ""
"Warning: specified sample specification will be overwritten with "
"specification from file."
-msgstr "Warnung: Beziehen der Sample-Angabe aus Datei fehlgeschlagen."
+msgstr ""
+"Aviso: o exemplo de especificación indicado vai ser sobrescrito coas "
+"especificacións do ficheiro."
-#: ../src/utils/pacat.c:1039 ../src/utils/pactl.c:1467
+#: ../src/utils/pacat.c:1039 ../src/utils/pactl.c:1488
msgid "Failed to determine sample specification from file."
-msgstr "Beziehen der Sample-Informationen der Datei fehlgeschlagen."
+msgstr ""
+"Produciuse un fallo ao determinar a especificación de exemplo do ficheiro."
#: ../src/utils/pacat.c:1048
msgid "Warning: Failed to determine channel map from file."
-msgstr "Warnung: Bestimmung der Kanalzuordnung aus Datei fehlgeschlagen."
+msgstr ""
+"Aviso: produciuse un fallo ao determinar o mapa de canles desde o ficheiro."
#: ../src/utils/pacat.c:1059
msgid "Channel map doesn't match sample specification"
-msgstr "Kanalzuordnung entspricht nicht Einstellungen des Samples"
+msgstr "O mapa de canles non coincide coa especificación da mostra"
#: ../src/utils/pacat.c:1070
msgid "Warning: failed to write channel map to file."
-msgstr "Warnung: Schreiben der Kanalzuordnung in Datei fehlgeschlagen."
+msgstr "Aviso: produciuse un fallo ao escribir o mapa de canles no ficheiro."
#: ../src/utils/pacat.c:1085
#, c-format
msgid ""
"Opening a %s stream with sample specification '%s' and channel map '%s'."
msgstr ""
-"Öffnen eines %s-Streams mit Sample-Angabe '%s' und Kanalzuordnung '%s'."
+"Abrindo un fluxo %s coa especificación da mostra «%s» e o mapa de canles "
+"«%s»."
#: ../src/utils/pacat.c:1086
msgid "recording"
-msgstr "aufnehmen"
+msgstr "gravando"
#: ../src/utils/pacat.c:1086
msgid "playback"
-msgstr "abspielen"
+msgstr "reproducir"
#: ../src/utils/pacat.c:1110
-#, fuzzy
msgid "Failed to set media name."
-msgstr "Parsen der Kommandzeile fehlgeschlagen."
+msgstr "Produciuse un fallo ao estabelecer o nome do multimedia."
-#: ../src/utils/pacat.c:1117 ../src/utils/pactl.c:1777
+#: ../src/utils/pacat.c:1117 ../src/utils/pactl.c:1798
msgid "pa_mainloop_new() failed."
-msgstr "pa_mainloop_new() fehlgeschlagen"
+msgstr "Produciuse un fallo en pa_mainloop_new()."
#: ../src/utils/pacat.c:1136
msgid "io_new() failed."
-msgstr "io_new() fehlgeschlagen."
+msgstr "Produciuse un fallo en io_new()."
-#: ../src/utils/pacat.c:1143 ../src/utils/pactl.c:1789
+#: ../src/utils/pacat.c:1143 ../src/utils/pactl.c:1810
msgid "pa_context_new() failed."
-msgstr "pa_context_new() fehlgeschlagen."
+msgstr "Produciuse un fallo en pa_context_new()."
-#: ../src/utils/pacat.c:1151 ../src/utils/pactl.c:1795
+#: ../src/utils/pacat.c:1151 ../src/utils/pactl.c:1816
#, c-format
msgid "pa_context_connect() failed: %s"
-msgstr "pa_context_new() fehlgeschlagen: %s"
+msgstr "Produciuse un fallo en pa_context_connect(): %s"
#: ../src/utils/pacat.c:1157
msgid "pa_context_rttime_new() failed."
-msgstr "pa_context_new() fehlgeschlagen."
+msgstr "Produciuse un fallo en pa_context_rttime_new()."
-#: ../src/utils/pacat.c:1164 ../src/utils/pactl.c:1800
+#: ../src/utils/pacat.c:1164 ../src/utils/pactl.c:1821
msgid "pa_mainloop_run() failed."
-msgstr "pa_mainloop_run() fehlgeschlagen."
+msgstr "Produciuse un fallo en pa_mainloop_run()."
#: ../src/utils/pasuspender.c:79
#, c-format
@@ -1655,32 +1689,32 @@ msgstr "execvp(): %s\n"
#: ../src/utils/pasuspender.c:107
#, c-format
msgid "Failure to suspend: %s\n"
-msgstr "Aussetzen fehlgeschlagen: %s\n"
+msgstr "Produciuse un erro ao suspender: %s\n"
#: ../src/utils/pasuspender.c:122
#, c-format
msgid "Failure to resume: %s\n"
-msgstr "Resume fehlgeschlagen: %s\n"
+msgstr "Produciuse un erro ao continuar: %s\n"
#: ../src/utils/pasuspender.c:145
#, c-format
msgid "WARNING: Sound server is not local, not suspending.\n"
-msgstr "WARNUNG: Sound-Server läuft nicht lokal, nicht ausgesetzt.\n"
+msgstr "AVISO: o servidor de son non é local, non se suspende.\n"
#: ../src/utils/pasuspender.c:157
#, c-format
msgid "Connection failure: %s\n"
-msgstr "Verbindungsfehler: %s\n"
+msgstr "Produciuse un erro na conexión: %s\n"
#: ../src/utils/pasuspender.c:174
#, c-format
msgid "Got SIGINT, exiting.\n"
-msgstr "SIGINT empfangen, beende.\n"
+msgstr "Obtívose SIGINT, saíndo.\n"
#: ../src/utils/pasuspender.c:192
#, c-format
msgid "WARNING: Child process terminated by signal %u\n"
-msgstr "WARNUNG: Kind-Prozess durch Signal %u beendet\n"
+msgstr "AVISO: o proceso fillo foi rematado polo sinal %u\n"
#: ../src/utils/pasuspender.c:210
#, c-format
@@ -1693,11 +1727,12 @@ msgid ""
"to\n"
"\n"
msgstr ""
-"%s [options] ... \n"
+"%s [opcións] ... \n"
"\n"
-" -h, --help Diese Hilfe zeigen\n"
-" --version Zeige Version\n"
-" -s, --server=SERVER Name des Zielservers\n"
+" -h, --help Mostra esta axuda\n"
+" --version Mostra a versión\n"
+" -s, --server=SERVIDOR O nome do servidor co que "
+"conectarse\n"
"\n"
#: ../src/utils/pasuspender.c:248
@@ -1708,48 +1743,48 @@ msgid ""
"Linked with libpulse %s\n"
msgstr ""
"pasuspender %s\n"
-"kompiliert mit libpulse %s\n"
-"Gelinkt mit libpulse %s\n"
+"Compilado con libpulse %s\n"
+"Vinculado con libpulse %s\n"
#: ../src/utils/pasuspender.c:277
#, c-format
msgid "pa_mainloop_new() failed.\n"
-msgstr "pa_mainloop_new() fehlgeschlagen.\n"
+msgstr "Produciuse un fallo en pa_mainloop_new().\n"
#: ../src/utils/pasuspender.c:290
#, c-format
msgid "pa_context_new() failed.\n"
-msgstr "pa_context_new() fehlgeschlagen.\n"
+msgstr "Produciuse un fallo en pa_context_new() .\n"
#: ../src/utils/pasuspender.c:298
#, c-format
msgid "pa_mainloop_run() failed.\n"
-msgstr "pa_mainloop_run() fehlgeschlagen.\n"
+msgstr "Produciuse un fallo en pa_mainloop_run().\n"
#: ../src/utils/pactl.c:150
#, c-format
msgid "Failed to get statistics: %s"
-msgstr "Beziehen der Statistik fehlgeschlagen: %s"
+msgstr "Produciuse un fallo ao tentar obter as estatísticas: %s"
#: ../src/utils/pactl.c:156
#, c-format
msgid "Currently in use: %u blocks containing %s bytes total.\n"
-msgstr "Momentane Nutzung: %u Blöcke mit insgesamt %s Bytes.\n"
+msgstr "Actualmente en uso: %u bloques contendo %s bytes en total.\n"
#: ../src/utils/pactl.c:159
#, c-format
msgid "Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
-msgstr "Während gesamter Laufzeit: %u Blöcke mit insgesamt %s Bytes.\n"
+msgstr "Asignados ao longo do tempo: %u bloques contendo %s bytes en total.\n"
#: ../src/utils/pactl.c:162
#, c-format
msgid "Sample cache size: %s\n"
-msgstr "Sample-Pufferspeichergrösse: %s\n"
+msgstr "Tamaño da caché de mostra: %s\n"
#: ../src/utils/pactl.c:171
#, c-format
msgid "Failed to get server information: %s"
-msgstr "Beziehen der Server-Information fehlgeschlagen: %s"
+msgstr "Produciuse un fallo ao tentar obter información do servidor: %s"
#: ../src/utils/pactl.c:176
#, c-format
@@ -1761,9 +1796,15 @@ msgid ""
"Client Index: %u\n"
"Tile Size: %zu\n"
msgstr ""
+"Cadea do servidor: %s\n"
+"Versión do protocolo da biblioteca: %u\n"
+"Versión do protocolo do servidor: %u\n"
+"É local: %s\n"
+"Índice do cliente: %u\n"
+"Tamaño do recadro: %zu\n"
#: ../src/utils/pactl.c:192
-#, fuzzy, c-format
+#, c-format
msgid ""
"User Name: %s\n"
"Host Name: %s\n"
@@ -1775,23 +1816,23 @@ msgid ""
"Default Source: %s\n"
"Cookie: %04x:%04x\n"
msgstr ""
-"Name des Nutzers: %s\n"
-"Rechnername: %s\n"
-"Name des Servers: %s\n"
-"Version des Servers: %s\n"
-"Standard-Sample-Angabe: %s\n"
-"Standard-Kanal-Zuordnung: %s\n"
-"Standard-Sink: %s\n"
-"Standard-Quelle: %s\n"
-"Cookie: %08x\n"
-
-#: ../src/utils/pactl.c:244 ../src/utils/pactl.c:830
+"Nome de usuario: %s\n"
+"Nome do equipo: %s\n"
+"Nome do servidor: %s\n"
+"Versión do servidor: %s\n"
+"Especificación de mostra predeterminada: %s\n"
+"Mapa de canles predeterminado: %s\n"
+"Destino predeterminado: %s\n"
+"Orixe predeterminada: %s\n"
+"Cookie: %04x:%04x\n"
+
+#: ../src/utils/pactl.c:244 ../src/utils/pactl.c:851
#, c-format
msgid "Failed to get sink information: %s"
-msgstr "Erhalten der Sink-Informationen fehlgeschlagen: %s"
+msgstr "Produciuse un fallo ao tentar obter información do destino: %s"
#: ../src/utils/pactl.c:270
-#, fuzzy, c-format
+#, c-format
msgid ""
"Sink #%u\n"
"\tState: %s\n"
@@ -1811,43 +1852,43 @@ msgid ""
"\tProperties:\n"
"\t\t%s\n"
msgstr ""
-"Sink #%u\n"
-"\tStatus: %s\n"
-"\tName: %s\n"
-"\tBeschreibung: %s\n"
-"\tTreiber: %s\n"
-"\tSample-Angabe: %s\n"
-"\tKanalzuordnung: %s\n"
-"\tBesitzer-Modul: %u\n"
-"\tStumm: %s\n"
-"\tLautstärke: %s%s%s\n"
-"\t Verteilung %0.2f\n"
-"\tBasis-Lautstärke: %s%s%s\n"
-"\tQuellen-Monitor: %s\n"
-"\tLatenz: %0.0f usec, eingestellt %0.0f usec\n"
-"\tFlags: %s%s%s%s%s%s\n"
-"\tEigenschaften:\n"
+"Destino #%u\n"
+"\tEstado: %s\n"
+"\tNome: %s\n"
+"\tDescrición: %s\n"
+"\tControlador: %s\n"
+"\tEspecificación da mostra: %s\n"
+"\tMapa de canles: %s\n"
+"\tPropietario do módulo: %u\n"
+"\tSilenciado: %s\n"
+"\tVolume: %s%s%s\n"
+"\t balance %0.2f\n"
+"\tVolume base: %s%s%s\n"
+"\tMonitorizar a orixe: %s\n"
+"\tLatencia: %0.0f usec, configurado %0.0f useg\n"
+"\tMarcas: %s%s%s%s%s%s%s\n"
+"\tPropiedades:\n"
"\t\t%s\n"
-#: ../src/utils/pactl.c:318 ../src/utils/pactl.c:430
+#: ../src/utils/pactl.c:318 ../src/utils/pactl.c:430 ../src/utils/pactl.c:588
#, c-format
msgid "\tPorts:\n"
-msgstr "\tProfile:\n"
+msgstr "\tPortos:\n"
#: ../src/utils/pactl.c:325 ../src/utils/pactl.c:437
#, c-format
msgid "\tActive Port: %s\n"
-msgstr "\tAktive Profile: %s\n"
+msgstr "\tPorto activo: %s\n"
#: ../src/utils/pactl.c:331 ../src/utils/pactl.c:443
-#, fuzzy, c-format
+#, c-format
msgid "\tFormats:\n"
-msgstr "\tProfile:\n"
+msgstr "\tFormatos:\n"
-#: ../src/utils/pactl.c:357 ../src/utils/pactl.c:849
+#: ../src/utils/pactl.c:357 ../src/utils/pactl.c:870
#, c-format
msgid "Failed to get source information: %s"
-msgstr "Beziehen der Quellen-Informationen fehlgeschlagen: %s"
+msgstr "Produciuse un fallo ao tentar obter información da orixe: %s"
#: ../src/utils/pactl.c:383
#, c-format
@@ -1870,36 +1911,36 @@ msgid ""
"\tProperties:\n"
"\t\t%s\n"
msgstr ""
-"Quelle #%u\n"
-"\tStatus: %s\n"
-"\tName: %s\n"
-"\tBeschreibung: %s\n"
-"\tTreiber: %s\n"
-"\tSample-Angabe: %s\n"
-"\tKanalzuordnung: %s\n"
-"\tBesitzer-Modul: %u\n"
-"\tStumm: %s\n"
-"\tLautstärke: %s%s%s\n"
-"\t Verteilung %0.2f\n"
-"\tBasis-Lautstärke: %s%s%s\n"
-"\tSink-Monitor: %s\n"
-"\tLatenz: %0.0f usec, eingestellt %0.0f usec\n"
-"\tFlags: %s%s%s%s%s%s\n"
-"\tEigenschaften:\n"
+"Orixe #%u\n"
+"\tEstado: %s\n"
+"\tNome: %s\n"
+"\tDescrición: %s\n"
+"\tControlador: %s\n"
+"\tEspecificación da mostra: %s\n"
+"\tMapa de canles: %s\n"
+"\tPropietario do módulo: %u\n"
+"\tSilenciado: %s\n"
+"\tVolume: %s%s%s\n"
+"\t balance %0.2f\n"
+"\tVolume base: %s%s%s\n"
+"\tMonitorización do destino: %s\n"
+"\tLatencia: %0.0f usec, configurado %0.0f useg\n"
+"\tMarcas: %s%s%s%s%s%s\n"
+"\tPropiedades:\n"
"\t\t%s\n"
#: ../src/utils/pactl.c:415 ../src/utils/pactl.c:485 ../src/utils/pactl.c:528
-#: ../src/utils/pactl.c:570 ../src/utils/pactl.c:640 ../src/utils/pactl.c:641
-#: ../src/utils/pactl.c:652 ../src/utils/pactl.c:711 ../src/utils/pactl.c:712
-#: ../src/utils/pactl.c:723 ../src/utils/pactl.c:775 ../src/utils/pactl.c:776
-#: ../src/utils/pactl.c:783
+#: ../src/utils/pactl.c:570 ../src/utils/pactl.c:661 ../src/utils/pactl.c:662
+#: ../src/utils/pactl.c:673 ../src/utils/pactl.c:732 ../src/utils/pactl.c:733
+#: ../src/utils/pactl.c:744 ../src/utils/pactl.c:796 ../src/utils/pactl.c:797
+#: ../src/utils/pactl.c:804
msgid "n/a"
-msgstr "k. A."
+msgstr "n/d"
#: ../src/utils/pactl.c:454
#, c-format
msgid "Failed to get module information: %s"
-msgstr "Beziehen der Modul-Information fehlgeschlagen: %s"
+msgstr "Produciuse un fallo ao tentar obter información do módulo: %s"
#: ../src/utils/pactl.c:477
#, c-format
@@ -1911,17 +1952,17 @@ msgid ""
"\tProperties:\n"
"\t\t%s\n"
msgstr ""
-"Modul #%u\n"
-"\tName: %s\n"
-"\tArgument: %s\n"
-"\tNutzungszähler: %s\n"
-"\tEigenschaften:\n"
+"Módulo #%u\n"
+"\tNome: %s\n"
+"\tArgumento: %s\n"
+"\tContador de uso: %s\n"
+"\tPropiedades:\n"
"\t\t%s\n"
#: ../src/utils/pactl.c:496
#, c-format
msgid "Failed to get client information: %s"
-msgstr "Beziehen der Client-Information fehlgeschlagen: %s"
+msgstr "Produciuse un fallo ao tentar obter información do cliente: %s"
#: ../src/utils/pactl.c:522
#, c-format
@@ -1932,16 +1973,16 @@ msgid ""
"\tProperties:\n"
"\t\t%s\n"
msgstr ""
-"Client #%u\n"
-"\tTreiber: %s\n"
-"\tOwner-Modul: %s\n"
-"\tEigenschaften:\n"
+"Cliente #%u\n"
+"\tControlador: %s\n"
+"\tPropietario do módulo: %s\n"
+"\tPropiedades:\n"
"\t\t%s\n"
#: ../src/utils/pactl.c:539
#, c-format
msgid "Failed to get card information: %s"
-msgstr "Beziehen der Karten-Information fehlgeschlagen: %s"
+msgstr "Produciuse un fallo ao obter a información da tarxeta: %s"
#: ../src/utils/pactl.c:562
#, c-format
@@ -1953,30 +1994,41 @@ msgid ""
"\tProperties:\n"
"\t\t%s\n"
msgstr ""
-"Karte #%u\n"
-"\tName: %s\n"
-"\tTreiber: %s\n"
-"\tOwner-Modul: %s\n"
-"\tEigenschaften:\n"
+"Tarxeta #%u\n"
+"\tNome: %s\n"
+"\tControlador: %s\n"
+"\tpropietario do módulo: %s\n"
+"\tPropiedades:\n"
"\t\t%s\n"
#: ../src/utils/pactl.c:576
#, c-format
msgid "\tProfiles:\n"
-msgstr "\tProfile:\n"
+msgstr "\tPerfís:\n"
#: ../src/utils/pactl.c:582
#, c-format
msgid "\tActive Profile: %s\n"
-msgstr "\tAktive Profile: %s\n"
+msgstr "\tPerfil activo: %s\n"
-#: ../src/utils/pactl.c:593 ../src/utils/pactl.c:868
+#: ../src/utils/pactl.c:591
+#, c-format
+msgid "\t\t%s: %s (priority: %u%s)\n"
+msgstr "\t\t%s: %s (prioridade: %u%s)\n"
+
+#: ../src/utils/pactl.c:595
+#, c-format
+msgid "\t\t\tPart of profile(s): %s"
+msgstr "\t\t\tParte do(s) perfil(es): %s"
+
+#: ../src/utils/pactl.c:614 ../src/utils/pactl.c:889
#, c-format
msgid "Failed to get sink input information: %s"
-msgstr "Erhalten der Sink-Eingabe-Informationen fehlgeschlagen: %s"
+msgstr ""
+"Produciuse un fallo ao tentar obter información da entrada do destino: %s"
-#: ../src/utils/pactl.c:622
-#, fuzzy, c-format
+#: ../src/utils/pactl.c:643
+#, c-format
msgid ""
"Sink Input #%u\n"
"\tDriver: %s\n"
@@ -1996,30 +2048,31 @@ msgid ""
"\tProperties:\n"
"\t\t%s\n"
msgstr ""
-"Sink-Eingabe #%u\n"
-"\tTreiber: %s\n"
-"\tBesitzer-Modul: %s\n"
-"\tClient: %s\n"
-"\tSink: %u\n"
-"\tSample-Angabe: %s\n"
-"\tKanalzuordnung: %s\n"
-"\tStumm: %s\n"
-"\tLautstärke: %s\n"
-"\t %s\n"
-"\t Verteilung %0.2f\n"
-"\tPufferlatenz: %0.0f usec\n"
-"\tSink-Latenz: %0.0f usec\n"
-"\tResample-Methode: %s\n"
-"\tEigenschaften:\n"
+"Entrada do sumideiro #%u\n"
+"\tControlador: %s\n"
+"\tMódulo propietario: %s\n"
+"\tCliente: %s\n"
+"\tSumideiro: %u\n"
+"\tEspecificación da mostra: %s\n"
+"\tMapa de canles: %s\n"
+"\tFormato: %s\n"
+"\tSilenciado: %s\n"
+"\tVolume: %s\n"
+"\t %s\n"
+"\t balance %0.2f\n"
+"\tLatencia do búfer: %0.0f useg\n"
+"\tLatencia do sumideiro: %0.0f useg\n"
+"\tMétodo de nova mostraxe: %s\n"
+"\tPropiedades:\n"
"\t\t%s\n"
-#: ../src/utils/pactl.c:663 ../src/utils/pactl.c:887
+#: ../src/utils/pactl.c:684 ../src/utils/pactl.c:908
#, c-format
msgid "Failed to get source output information: %s"
-msgstr "Konnte Informationen über Quell-Ausgabe nicht holen: %s"
+msgstr "Fallou ao obter información de saída da orixe: %s"
-#: ../src/utils/pactl.c:693
-#, fuzzy, c-format
+#: ../src/utils/pactl.c:714
+#, c-format
msgid ""
"Source Output #%u\n"
"\tDriver: %s\n"
@@ -2039,29 +2092,30 @@ msgid ""
"\tProperties:\n"
"\t\t%s\n"
msgstr ""
-"Sink-Eingabe #%u\n"
-"\tTreiber: %s\n"
-"\tBesitzer-Modul: %s\n"
-"\tClient: %s\n"
-"\tSink: %u\n"
-"\tSample-Angabe: %s\n"
-"\tKanalzuordnung: %s\n"
-"\tStumm: %s\n"
-"\tLautstärke: %s\n"
-"\t %s\n"
-"\t Verteilung %0.2f\n"
-"\tPufferlatenz: %0.0f usec\n"
-"\tSink-Latenz: %0.0f usec\n"
-"\tResample-Methode: %s\n"
-"\tEigenschaften:\n"
+"Entrada do destino #%u\n"
+"\tControlador: %s\n"
+"\tPropietario do módulo: %s\n"
+"\tCliente: %s\n"
+"\tDestino: %u\n"
+"\tEspecificación da mostra: %s\n"
+"\tMapa de canles: %s\n"
+"\tFormato: %s\n"
+"\tSilenciado: %s\n"
+"\tVolume: %s\n"
+"\t %s\n"
+"\t balance %0.2f\n"
+"\tLatencia do búfer: %0.0f useg\n"
+"\tLatencia do destino: %0.0f useg\n"
+"\tMétodo de nova mostraxe: %s\n"
+"\tPropiedades:\n"
"\t\t%s\n"
-#: ../src/utils/pactl.c:734
+#: ../src/utils/pactl.c:755
#, c-format
msgid "Failed to get sample information: %s"
-msgstr "Beziehen der Sample-Informationen fehlgeschlagen: %s"
+msgstr "Fallou ao obter información da mostra: %s"
-#: ../src/utils/pactl.c:761
+#: ../src/utils/pactl.c:782
#, c-format
msgid ""
"Sample #%u\n"
@@ -2078,176 +2132,176 @@ msgid ""
"\tProperties:\n"
"\t\t%s\n"
msgstr ""
-"Sample #%u\n"
-"\tName: %s\n"
-"\tSample Specification: %s\n"
-"\tChannel Map: %s\n"
-"\tLautstärke: %s\n"
-"\t %s\n"
-"\t Verteilung %0.2f\n"
-"\tDauer: %0.1fs\n"
-"\tGrösse: %s\n"
-"\tLazy: %s\n"
-"\tDateinamen: %s\n"
-"\tEigenschaften:\n"
+"Mostra #%u\n"
+"\tNome: %s\n"
+"\tEspecificación da mostra: %s\n"
+"\tMapa de canles: %s\n"
+"\tVolume: %s\n"
+"\t %s\n"
+"\t balance %0.2f\n"
+"\tDuración: %0.1fs\n"
+"\tTamaño: %s\n"
+"\tPreguiza: %s\n"
+"\tNome do ficheiro: %s\n"
+"\tPropiedades:\n"
"\t\t%s\n"
-#: ../src/utils/pactl.c:791 ../src/utils/pactl.c:801
+#: ../src/utils/pactl.c:812 ../src/utils/pactl.c:822
#, c-format
msgid "Failure: %s"
-msgstr "Fehlgeschlagen: %s"
+msgstr "Produciuse un fallo en: %s"
-#: ../src/utils/pactl.c:915
-#, fuzzy, c-format
+#: ../src/utils/pactl.c:936
+#, c-format
msgid "Failed to set format: invalid format string %s"
-msgstr "Beziehen der Quellen-Informationen fehlgeschlagen: %s"
+msgstr ""
+"Produciuse un fallo ao estabelecer o formato: cadea de formato non válida %s"
-#: ../src/utils/pactl.c:954
+#: ../src/utils/pactl.c:975
#, c-format
msgid "Failed to upload sample: %s"
-msgstr "Hochladen des Sample fehlgeschlagen: %s"
+msgstr "Produciuse un fallo ao enviar a mostra: %s"
-#: ../src/utils/pactl.c:971
+#: ../src/utils/pactl.c:992
msgid "Premature end of file"
-msgstr "Dateiende ist zu früh aufgetreten"
+msgstr "Fin prematuro de ficheiro"
-#: ../src/utils/pactl.c:991
+#: ../src/utils/pactl.c:1012
msgid "new"
-msgstr ""
+msgstr "novo"
-#: ../src/utils/pactl.c:994
+#: ../src/utils/pactl.c:1015
msgid "change"
-msgstr ""
+msgstr "cambiar"
-#: ../src/utils/pactl.c:997
+#: ../src/utils/pactl.c:1018
msgid "remove"
-msgstr ""
+msgstr "retirar"
-#: ../src/utils/pactl.c:1000 ../src/utils/pactl.c:1035
+#: ../src/utils/pactl.c:1021 ../src/utils/pactl.c:1056
msgid "unknown"
-msgstr ""
+msgstr "descoñecido"
-#: ../src/utils/pactl.c:1008
+#: ../src/utils/pactl.c:1029
msgid "sink"
-msgstr ""
+msgstr "destino"
-#: ../src/utils/pactl.c:1011
+#: ../src/utils/pactl.c:1032
msgid "source"
-msgstr ""
+msgstr "orixe"
-#: ../src/utils/pactl.c:1014
+#: ../src/utils/pactl.c:1035
msgid "sink-input"
-msgstr ""
+msgstr "entrada-destino"
-#: ../src/utils/pactl.c:1017
+#: ../src/utils/pactl.c:1038
msgid "source-output"
-msgstr ""
+msgstr "saída-orixe"
-#: ../src/utils/pactl.c:1020
+#: ../src/utils/pactl.c:1041
msgid "module"
-msgstr ""
+msgstr "módulo"
-#: ../src/utils/pactl.c:1023
+#: ../src/utils/pactl.c:1044
msgid "client"
-msgstr ""
+msgstr "cliente"
-#: ../src/utils/pactl.c:1026
+#: ../src/utils/pactl.c:1047
msgid "sample-cache"
-msgstr ""
+msgstr "caché-mostraxe"
-#: ../src/utils/pactl.c:1029 ../src/utils/pactl.c:1032
-#, fuzzy
+#: ../src/utils/pactl.c:1050 ../src/utils/pactl.c:1053
msgid "server"
-msgstr "Ungültiger Server"
+msgstr "servidor"
-#: ../src/utils/pactl.c:1041
+#: ../src/utils/pactl.c:1062
#, c-format
msgid "Event '%s' on %s #%u\n"
-msgstr ""
+msgstr "Evento «%s» en %s #%u\n"
-#: ../src/utils/pactl.c:1258
+#: ../src/utils/pactl.c:1279
msgid "Got SIGINT, exiting."
-msgstr "SIGINT empfangen, beenden."
+msgstr "Obtívose SIGINT, saíndo."
-#: ../src/utils/pactl.c:1285
+#: ../src/utils/pactl.c:1306
msgid "Invalid volume specification"
-msgstr "Ungültige Sample-Angaben"
+msgstr "Especificación incorrecta de volume"
-#: ../src/utils/pactl.c:1308
+#: ../src/utils/pactl.c:1329
msgid "Volume outside permissible range.\n"
-msgstr ""
-
-#: ../src/utils/pactl.c:1319 ../src/utils/pactl.c:1320
-#: ../src/utils/pactl.c:1321 ../src/utils/pactl.c:1322
-#: ../src/utils/pactl.c:1323 ../src/utils/pactl.c:1324
-#: ../src/utils/pactl.c:1325 ../src/utils/pactl.c:1326
-#: ../src/utils/pactl.c:1327 ../src/utils/pactl.c:1328
-#: ../src/utils/pactl.c:1329 ../src/utils/pactl.c:1330
-#: ../src/utils/pactl.c:1331 ../src/utils/pactl.c:1332
-#: ../src/utils/pactl.c:1333 ../src/utils/pactl.c:1334
-#: ../src/utils/pactl.c:1335 ../src/utils/pactl.c:1336
-#: ../src/utils/pactl.c:1337
+msgstr "Volume fóra do rango permitido.\n"
+
+#: ../src/utils/pactl.c:1340 ../src/utils/pactl.c:1341
+#: ../src/utils/pactl.c:1342 ../src/utils/pactl.c:1343
+#: ../src/utils/pactl.c:1344 ../src/utils/pactl.c:1345
+#: ../src/utils/pactl.c:1346 ../src/utils/pactl.c:1347
+#: ../src/utils/pactl.c:1348 ../src/utils/pactl.c:1349
+#: ../src/utils/pactl.c:1350 ../src/utils/pactl.c:1351
+#: ../src/utils/pactl.c:1352 ../src/utils/pactl.c:1353
+#: ../src/utils/pactl.c:1354 ../src/utils/pactl.c:1355
+#: ../src/utils/pactl.c:1356 ../src/utils/pactl.c:1357
+#: ../src/utils/pactl.c:1358
msgid "[options]"
-msgstr ""
+msgstr "[opcións]"
-#: ../src/utils/pactl.c:1321
+#: ../src/utils/pactl.c:1342
msgid "[TYPE]"
-msgstr ""
+msgstr "[TIPO]"
-#: ../src/utils/pactl.c:1323
+#: ../src/utils/pactl.c:1344
msgid "FILENAME [NAME]"
-msgstr ""
+msgstr "NOME_DE_FICHEIRO [NOME]"
-#: ../src/utils/pactl.c:1324
+#: ../src/utils/pactl.c:1345
msgid "NAME [SINK]"
-msgstr ""
+msgstr "NOME [SUMIDEIRO]"
-#: ../src/utils/pactl.c:1325
+#: ../src/utils/pactl.c:1346
msgid "NAME"
-msgstr ""
+msgstr "NOME"
-#: ../src/utils/pactl.c:1326
+#: ../src/utils/pactl.c:1347
msgid "NAME [ARGS ...]"
-msgstr ""
+msgstr "NOME [ARGS ...]"
-#: ../src/utils/pactl.c:1327
+#: ../src/utils/pactl.c:1348
msgid "#N"
-msgstr ""
+msgstr "#N"
-#: ../src/utils/pactl.c:1328
+#: ../src/utils/pactl.c:1349
msgid "#N SINK|SOURCE"
-msgstr ""
+msgstr "#N SUMIDEIRO|ORIXE"
-#: ../src/utils/pactl.c:1329 ../src/utils/pactl.c:1334
+#: ../src/utils/pactl.c:1350 ../src/utils/pactl.c:1355
msgid "NAME|#N 1|0"
-msgstr ""
+msgstr "NOME|#N 1|0"
-#: ../src/utils/pactl.c:1330
+#: ../src/utils/pactl.c:1351
msgid "CARD PROFILE"
-msgstr ""
+msgstr "PERFIL DA TARXETA"
-#: ../src/utils/pactl.c:1331
+#: ../src/utils/pactl.c:1352
msgid "NAME|#N PORT"
-msgstr ""
+msgstr "NOME|#N PORTO"
-#: ../src/utils/pactl.c:1332
+#: ../src/utils/pactl.c:1353
msgid "NAME|#N VOLUME"
-msgstr ""
+msgstr "NOME|#N VOLUME"
-#: ../src/utils/pactl.c:1333
+#: ../src/utils/pactl.c:1354
msgid "#N VOLUME"
-msgstr ""
+msgstr "#N VOLUME"
-#: ../src/utils/pactl.c:1335
+#: ../src/utils/pactl.c:1356
msgid "#N 1|0"
-msgstr ""
+msgstr "#N 1|0"
-#: ../src/utils/pactl.c:1336
+#: ../src/utils/pactl.c:1357
msgid "#N FORMATS"
-msgstr ""
+msgstr "#N FORMATOS"
-#: ../src/utils/pactl.c:1339
-#, fuzzy, c-format
+#: ../src/utils/pactl.c:1360
+#, c-format
msgid ""
"\n"
" -h, --help Show this help\n"
@@ -2258,14 +2312,14 @@ msgid ""
" -n, --client-name=NAME How to call this client on the "
"server\n"
msgstr ""
-"%s [options] ... \n"
"\n"
-" -h, --help Diese Hilfe zeigen\n"
-" --version Zeige Version\n"
-" -s, --server=SERVER Name des Zielservers\n"
+" -h, --help Mostra esta axuda\n"
+" --version Mostra a versión\n"
+" -s, --server=SERVIDOR O nome do servidor co que "
+"conectarse\n"
"\n"
-#: ../src/utils/pactl.c:1380
+#: ../src/utils/pactl.c:1401
#, c-format
msgid ""
"pactl %s\n"
@@ -2273,157 +2327,146 @@ msgid ""
"Linked with libpulse %s\n"
msgstr ""
"pactl %s\n"
-"Kompiliert mit libpulse %s\n"
-"Gelinkt mit libpulse %s\n"
+"Compilado con libpulse %s\n"
+"Vinculado con libpulse %s\n"
-#: ../src/utils/pactl.c:1439
+#: ../src/utils/pactl.c:1460
#, c-format
msgid "Specify nothing, or one of: %s"
-msgstr ""
+msgstr "Non especifique nada, ou un de: %s"
-#: ../src/utils/pactl.c:1449
+#: ../src/utils/pactl.c:1470
msgid "Please specify a sample file to load"
-msgstr "Geben Sie eine zu öffnende Sample-Datei an"
+msgstr "Por favor, especifique un ficheiro de mostra para cargar"
-#: ../src/utils/pactl.c:1462
+#: ../src/utils/pactl.c:1483
msgid "Failed to open sound file."
-msgstr "Öffnen der Audio-Datei fehlgeschlagen."
+msgstr "Produciuse un fallo ao tentar abrir o ficheiro de son."
-#: ../src/utils/pactl.c:1474
+#: ../src/utils/pactl.c:1495
msgid "Warning: Failed to determine sample specification from file."
-msgstr "Warnung: Beziehen der Sample-Angabe aus Datei fehlgeschlagen."
+msgstr ""
+"Aviso: produciuse un fallo ao tentar determinar a especificación da mostra "
+"desde o ficheiro."
-#: ../src/utils/pactl.c:1484
+#: ../src/utils/pactl.c:1505
msgid "You have to specify a sample name to play"
-msgstr "Sie müssen eine abzuspielende Sample-Datei angeben"
+msgstr "Debe especificar un nome de mostra para reproducir"
-#: ../src/utils/pactl.c:1496
+#: ../src/utils/pactl.c:1517
msgid "You have to specify a sample name to remove"
-msgstr "Sie müssen eine zu löschende Sample-Datei angeben"
+msgstr "Debe especificar un nome de mostra para eliminar"
-#: ../src/utils/pactl.c:1505
+#: ../src/utils/pactl.c:1526
msgid "You have to specify a sink input index and a sink"
-msgstr "Sie müssen einen Sink-Eingabe-Indexwert und einen Sink angeben"
+msgstr "Debe especificar un índice para a entrada ao destino e un destino"
-#: ../src/utils/pactl.c:1515
+#: ../src/utils/pactl.c:1536
msgid "You have to specify a source output index and a source"
-msgstr ""
-"Sie müssen eine Indexwert für die Quell-Ausgabe und eine Quelle angeben"
+msgstr "Debe especificar un índice para a saída da orixe e unha orixe"
-#: ../src/utils/pactl.c:1530
+#: ../src/utils/pactl.c:1551
msgid "You have to specify a module name and arguments."
-msgstr "Sie müssen einen Modulnamen angeben und Argumente übergeben."
+msgstr "Debe especificar un nome de módulo e os argumentos."
-#: ../src/utils/pactl.c:1550
+#: ../src/utils/pactl.c:1571
msgid "You have to specify a module index"
-msgstr "Sie müssen einen Indexwert für ein Modul angeben"
+msgstr "Debe especificar un índice de módulo"
-#: ../src/utils/pactl.c:1560
+#: ../src/utils/pactl.c:1581
msgid ""
"You may not specify more than one sink. You have to specify a boolean value."
msgstr ""
-"Sie sollten nur einen Sink angeben. Sie müssen zumindest eine Boolsche "
-"Variable übergeben."
+"Non se pode especificar máis dun destino. Ten que especificar un valor "
+"booleano."
-#: ../src/utils/pactl.c:1573
+#: ../src/utils/pactl.c:1594
msgid ""
"You may not specify more than one source. You have to specify a boolean "
"value."
msgstr ""
-"Sie sollten nur eine Quelle angeben. Sie müssen zumindest eine Boolsche "
-"Variable übergeben."
+"Non se pode especificar máis dunha orixe. Ten que especificar un valor "
+"booleano."
-#: ../src/utils/pactl.c:1585
+#: ../src/utils/pactl.c:1606
msgid "You have to specify a card name/index and a profile name"
-msgstr "Sie müssen einen Karten-Name/Indexwert und einen Profilnamen angeben"
+msgstr "Debe especificar un nome/índice de tarxeta e un nome de perfil"
-#: ../src/utils/pactl.c:1596
+#: ../src/utils/pactl.c:1617
msgid "You have to specify a sink name/index and a port name"
-msgstr "Sie müssen einen Sink-Namen/-Indexwert und einen Portnamen angeben"
+msgstr "Debe especificar un nome/índice de destino e un nome de porto"
-#: ../src/utils/pactl.c:1607
+#: ../src/utils/pactl.c:1628
msgid "You have to specify a source name/index and a port name"
-msgstr "Sie müssen einen Quellennamen/-Indexwert und einen Portnamen angeben"
+msgstr "Debe especificar un nome/índice de orixe e un nome de porto"
-#: ../src/utils/pactl.c:1618
+#: ../src/utils/pactl.c:1639
msgid "You have to specify a sink name/index and a volume"
-msgstr "Sie müssen einen Sink-Namen/-Indexwert und eine Lautstärke angeben"
+msgstr "Debe especificar un nome/índice de destino e un volume"
-#: ../src/utils/pactl.c:1631
+#: ../src/utils/pactl.c:1652
msgid "You have to specify a source name/index and a volume"
-msgstr "Sie müssen einen Quellennamen/-Indexwert und einen Portnamen angeben"
+msgstr "Debe especificar un nome/índice de orixe e un volume"
-#: ../src/utils/pactl.c:1644
+#: ../src/utils/pactl.c:1665
msgid "You have to specify a sink input index and a volume"
-msgstr "Sie müssen einen Sink-Eingabe-Indexwert und eine Lautstärke angeben."
+msgstr "Debe especificar un índice de destino e un volume"
-#: ../src/utils/pactl.c:1649
+#: ../src/utils/pactl.c:1670
msgid "Invalid sink input index"
-msgstr "Ungültiger Sink-Eingabe-Index"
+msgstr "Índice de entrada a destino incorrecto"
-#: ../src/utils/pactl.c:1660
-#, fuzzy
+#: ../src/utils/pactl.c:1681
msgid "You have to specify a source output index and a volume"
-msgstr ""
-"Sie müssen eine Indexwert für die Quell-Ausgabe und eine Quelle angeben"
+msgstr "Debe especificar un índice de saída de orixe e un volume"
-#: ../src/utils/pactl.c:1665
-#, fuzzy
+#: ../src/utils/pactl.c:1686
msgid "Invalid source output index"
-msgstr "Ungültiger Sink-Eingabe-Index"
+msgstr "Índice de saída de orixe non válido"
-#: ../src/utils/pactl.c:1677
+#: ../src/utils/pactl.c:1698
msgid "You have to specify a sink name/index and a mute boolean"
msgstr ""
-"Sie müssen einen Sink-Namen/-Indexwert und eine Boolsche Variable für "
-"Stummschaltung angeben"
+"Debe especificar un nome/índice de destino e un booleano para silenciado"
-#: ../src/utils/pactl.c:1682 ../src/utils/pactl.c:1699
-#: ../src/utils/pactl.c:1721 ../src/utils/pactl.c:1742
-#, fuzzy
+#: ../src/utils/pactl.c:1703 ../src/utils/pactl.c:1720
+#: ../src/utils/pactl.c:1742 ../src/utils/pactl.c:1763
msgid "Invalid mute specification"
-msgstr "Ungültige Sample-Angaben"
+msgstr "Especificación de silenciado non válida"
-#: ../src/utils/pactl.c:1694
+#: ../src/utils/pactl.c:1715
msgid "You have to specify a source name/index and a mute boolean"
-msgstr ""
-"Sie müssen einen Quellennamen/-Indexwert und eine Boolsche Variable für "
-"Stummschaltung angeben"
+msgstr "Debe especificar un nome/índice de orixe e un booleano para silenciado"
-#: ../src/utils/pactl.c:1711
+#: ../src/utils/pactl.c:1732
msgid "You have to specify a sink input index and a mute boolean"
msgstr ""
-"Sie müssen einen Sink-Eingabe-Indexwert und eine Boolsche Variable für "
-"Stummschaltung angeben"
+"Debe especificar un índice de entrada a destino e un booleano para silenciado"
-#: ../src/utils/pactl.c:1716
+#: ../src/utils/pactl.c:1737
msgid "Invalid sink input index specification"
-msgstr "Ungültige Sink-Eingabe-Index-Angaben"
+msgstr "Especificación incorrecta de índice de entrada a destino"
-#: ../src/utils/pactl.c:1732
-#, fuzzy
+#: ../src/utils/pactl.c:1753
msgid "You have to specify a source output index and a mute boolean"
msgstr ""
-"Sie müssen einen Quellennamen/-Indexwert und eine Boolsche Variable für "
-"Stummschaltung angeben"
+"Debe especificar un índice de saída de orixe e un booleano de silenciado"
-#: ../src/utils/pactl.c:1737
-#, fuzzy
+#: ../src/utils/pactl.c:1758
msgid "Invalid source output index specification"
-msgstr "Ungültige Sink-Eingabe-Index-Angaben"
+msgstr "Especificación de índice de saída de orixe non válida"
-#: ../src/utils/pactl.c:1756
-#, fuzzy
+#: ../src/utils/pactl.c:1777
msgid ""
"You have to specify a sink index and a semicolon-separated list of supported "
"formats"
msgstr ""
-"Sie müssen einen Sink-Namen/-Indexwert und eine Boolsche Variable für "
-"Stummschaltung angeben"
+"Debe especificar un índice de sumideiro e unha lista separada por puntos e "
+"comas dos formatos admitidos"
-#: ../src/utils/pactl.c:1772
+#: ../src/utils/pactl.c:1793
msgid "No valid command specified."
-msgstr "Kein gültiger Befehl angegeben."
+msgstr "Non se especificou ningunha orde correcta"
#: ../src/utils/pax11publish.c:61
#, c-format
@@ -2436,33 +2479,35 @@ msgid ""
"variables and cookie file.\n"
" -r Remove PulseAudio data from X11 display\n"
msgstr ""
-"%s [-D display] [-S server] [-O sink] [-I source] [-c file] [-d|-e|-i|-r]\n"
+"%s [-D pantalla] [-S servidor] [-O destino] [-I orixe] [-c ficheiro] [-d|-"
+"e|-i|-r]\n"
"\n"
-" -d Zeige aktuell mit X11-Anzeige verbundene PulseAudio-Daten (Standard)\n"
-" -e Lokale PulseAudio-Daten an X11-Anzeige exportieren\n"
-" -i PulseAudio-Daten von X11-Anzeige in lokale Umgebungsvariablen und "
-"Cookie importieren.\n"
-" -r PulseAudio-Daten von X11-Anzeige löschen\n"
+" -d Mostra os datos actuais de PulseAudio asociados a unha pantalla X11 "
+"(por omisión)\n"
+" -e Exporta os datos locais de PulseAudio a unha pantalla X11\n"
+" -i Importa os datos de PulseAudio dunha pantalla X11 cara ás variables "
+"de contorno local e o ficheiro de cookies.\n"
+" -r Elimina todos os datos de PulseAudio dunha pantalla X11\n"
#: ../src/utils/pax11publish.c:94
#, c-format
msgid "Failed to parse command line.\n"
-msgstr "Parsen der Kommandozeile fehlgeschlagen.\n"
+msgstr "Fallou ao interpretar unha liña de ordes.\n"
#: ../src/utils/pax11publish.c:113
#, c-format
msgid "Server: %s\n"
-msgstr "Server: %s\n"
+msgstr "Servidor: %s\n"
#: ../src/utils/pax11publish.c:115
#, c-format
msgid "Source: %s\n"
-msgstr "Quelle: %s\n"
+msgstr "Orixe: %s\n"
#: ../src/utils/pax11publish.c:117
#, c-format
msgid "Sink: %s\n"
-msgstr "Sink: %s\n"
+msgstr "Destino: %s\n"
#: ../src/utils/pax11publish.c:119
#, c-format
@@ -2472,41 +2517,46 @@ msgstr "Cookie: %s\n"
#: ../src/utils/pax11publish.c:137
#, c-format
msgid "Failed to parse cookie data\n"
-msgstr "Parsen der Cookie-Daten fehlgeschlagen.\n"
+msgstr "Fallou ao interpretar os datos da cookie\n"
#: ../src/utils/pax11publish.c:142
#, c-format
msgid "Failed to save cookie data\n"
-msgstr "Speichern der Cookie-Daten fehlgeschlagen\n"
+msgstr "Produciuse un fallo ao tentar gardar os datos da cookie\n"
#: ../src/utils/pax11publish.c:157
#, c-format
msgid "Failed to load client configuration file.\n"
-msgstr "Laden der Client-Konfigurationsdatei fehlgeschlagen.\n"
+msgstr ""
+"Produciuse un fallo ao tentar cargar o ficheiro de configuración do "
+"cliente.\n"
#: ../src/utils/pax11publish.c:162
#, c-format
msgid "Failed to read environment configuration data.\n"
-msgstr "Lesen the Umgebungsdaten fehlgeschlagen.\n"
+msgstr ""
+"Produciuse un fallo ao tentar ler os datos de configuración do contorno.\n"
#: ../src/utils/pax11publish.c:179
#, c-format
msgid "Failed to get FQDN.\n"
-msgstr "Beziehen des FQDN fehlgeschlagen.\n"
+msgstr "Produciuse un fallo ao obter FQDN.\n"
#: ../src/utils/pax11publish.c:199
#, c-format
msgid "Failed to load cookie data\n"
-msgstr "Laden der Cookie-Daten fehlgeschlagen\n"
+msgstr "Fallou ao cargar os datos da cookie\n"
#: ../src/utils/pax11publish.c:217
#, c-format
msgid "Not yet implemented.\n"
-msgstr "Noch nicht implementiert.\n"
+msgstr "Aínda non está implementado.\n"
#: ../src/utils/pacmd.c:66
msgid "No PulseAudio daemon running, or not running as session daemon."
-msgstr "Es läuft kein PulseAudio-Dienst oder nicht als Sessiondienst."
+msgstr ""
+"O daemon PulseAudio no está executándose, ou non se está executando como un "
+"daemon de sesión."
#: ../src/utils/pacmd.c:71
#, c-format
@@ -2520,11 +2570,11 @@ msgstr "connect(): %s"
#: ../src/utils/pacmd.c:96
msgid "Failed to kill PulseAudio daemon."
-msgstr "Beenden des PulseAudio-Daemon fehlgeschlagen."
+msgstr "Produciuse un fallo ao tentar deter o daemon de PulseAudio."
#: ../src/utils/pacmd.c:104
msgid "Daemon not responding."
-msgstr "Daemon antwortet nicht."
+msgstr "O daemon non responde."
#: ../src/utils/pacmd.c:184
#, c-format
@@ -2543,9 +2593,9 @@ msgstr "write(): %s"
#: ../src/pulsecore/lock-autospawn.c:136 ../src/pulsecore/lock-autospawn.c:222
msgid "Cannot access autospawn lock."
-msgstr "Fehler beim Zugriff auf Autostart-Sperre."
+msgstr "Non se pode acceder ao bloqueo de autoxeración."
-#: ../src/modules/alsa/alsa-sink.c:560 ../src/modules/alsa/alsa-sink.c:726
+#: ../src/modules/alsa/alsa-sink.c:558 ../src/modules/alsa/alsa-sink.c:724
#, c-format
msgid ""
"ALSA woke us up to write new data to the device, but there was actually "
@@ -2555,15 +2605,14 @@ msgid ""
"We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() "
"returned 0 or another value < min_avail."
msgstr ""
-"ALSA weckte uns auf, um neue Daten auf das Gerät zu schreiben, doch es gab "
-"nichts zum Schreiben!\n"
-"Dies ist höchstwahrscheinlich ein Fehler im ALSA-Treiber '%s'. Bitte melden "
-"Sie diesen Fehler den ALSA-Entwicklern.\n"
-"Wir wurden durch das POLLOUT-Set geweckt, allerdings lieferte ein "
-"anschliessender snd_pcm_avail() den Wert 0 oder einen anderen Wert < "
-"min_avail."
+"ALSA espertounos para escribir novos datos no dispositivo, mais, certamente, "
+"non hai nada que escribir!\n"
+"Probablemente sexa un erro no controlador ALSA «%s». Por favor, informe "
+"disto aos desenvolvedores de ALSA.\n"
+"Espertounos con POLLOUT marcado -- aínda así, unha chamada a snd_pcm_avail() "
+"devolveu 0 ou outro valor < min_avail."
-#: ../src/modules/alsa/alsa-source.c:519 ../src/modules/alsa/alsa-source.c:672
+#: ../src/modules/alsa/alsa-source.c:517 ../src/modules/alsa/alsa-source.c:670
#, c-format
msgid ""
"ALSA woke us up to read new data from the device, but there was actually "
@@ -2573,293 +2622,284 @@ msgid ""
"We were woken up with POLLIN set -- however a subsequent snd_pcm_avail() "
"returned 0 or another value < min_avail."
msgstr ""
-"ALSA weckte uns auf, um neue Daten vom Gerät zu lesen, doch es gab nichts "
-"zum Lesen!\n"
-"Dies ist höchstwahrscheinlich ein Fehler im ALSA-Treiber '%s'. Bitte melden "
-"Sie diesen Fehler den ALSA-Entwicklern.\n"
-"Wir wurden durch das POLLIN-Set geweckt, allerdings lieferte ein "
-"anschliessender snd_pcm_avail() den Wert 0 oder einen anderen Wert < "
-"min_avail."
-
-#: ../src/modules/alsa/module-alsa-card.c:167
-#: ../src/modules/bluetooth/module-bluetooth-device.c:2796
-#: ../src/modules/alsa/alsa-mixer.c:3898
+"ALSA espertounos para ler novos datos desde o dispositivo, mais, certamente, "
+"non hai nada que ler!\n"
+"Probablemente sexa un erro no controlador ALSA «%s». Por favor, informe "
+"disto aos desenvolvedores de ALSA.\n"
+"Espertounos con POLLIN marcado -- aínda así, unha chamada a snd_pcm_avail() "
+"devolveu 0 ou outro valor < min_avail."
+
+#: ../src/modules/alsa/module-alsa-card.c:173
+#: ../src/modules/bluetooth/module-bluetooth-device.c:2793
+#: ../src/modules/alsa/alsa-mixer.c:4021
msgid "Off"
-msgstr "Aus"
+msgstr "Apagado"
-#: ../src/modules/bluetooth/module-bluetooth-device.c:2738
+#: ../src/modules/bluetooth/module-bluetooth-device.c:2735
msgid "High Fidelity Playback (A2DP)"
-msgstr "High Fidelity Playback (A2DP)"
+msgstr "Reprodución de alta fidelidade (A2DP)"
-#: ../src/modules/bluetooth/module-bluetooth-device.c:2752
+#: ../src/modules/bluetooth/module-bluetooth-device.c:2749
msgid "High Fidelity Capture (A2DP)"
-msgstr "High Fidelity-Wiedergabe (A2DP)"
+msgstr "Captura de alta fidelidade (A2DP)"
-#: ../src/modules/bluetooth/module-bluetooth-device.c:2767
+#: ../src/modules/bluetooth/module-bluetooth-device.c:2764
msgid "Telephony Duplex (HSP/HFP)"
-msgstr "Telephony Duplex (HSP/HFP)"
+msgstr "Telefonía dúplex (HSP/HFP)"
-#: ../src/modules/bluetooth/module-bluetooth-device.c:2781
+#: ../src/modules/bluetooth/module-bluetooth-device.c:2778
msgid "Handsfree Gateway"
-msgstr ""
+msgstr "Pasarela do mans libres"
#: ../src/modules/reserve-wrap.c:151
msgid "PulseAudio Sound Server"
-msgstr "PulseAudio Sound Server"
+msgstr "Servidor de son PulseAudio"
#: ../src/modules/module-rygel-media-server.c:510
#: ../src/modules/module-rygel-media-server.c:548
#: ../src/modules/module-rygel-media-server.c:903
msgid "Output Devices"
-msgstr "Ausgabegeräte"
+msgstr "Dispositivos de saída"
#: ../src/modules/module-rygel-media-server.c:511
#: ../src/modules/module-rygel-media-server.c:549
#: ../src/modules/module-rygel-media-server.c:904
msgid "Input Devices"
-msgstr "Eingabegeräte"
+msgstr "Dispositivos de entrada"
#: ../src/modules/module-rygel-media-server.c:1056
msgid "Audio on @HOSTNAME@"
-msgstr "Audio auf @HOSTNAME@"
+msgstr "Son en @HOSTNAME@"
-#: ../src/modules/alsa/alsa-mixer.c:2219
+#: ../src/modules/alsa/alsa-mixer.c:2280
msgid "Input"
-msgstr "Eingabe"
+msgstr "Entrada"
-#: ../src/modules/alsa/alsa-mixer.c:2220
+#: ../src/modules/alsa/alsa-mixer.c:2281
msgid "Docking Station Input"
-msgstr "Docking Station Eingabe"
+msgstr "Entrada de estación acoplada (Docking Station)"
-#: ../src/modules/alsa/alsa-mixer.c:2221
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2282
msgid "Docking Station Microphone"
-msgstr "Docking Station Mikrofon"
+msgstr "Micrófono da estación acoplada (Docking Station)"
-#: ../src/modules/alsa/alsa-mixer.c:2222
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2283
msgid "Docking Station Line In"
-msgstr "Docking Station Eingabe"
+msgstr "Entrada de estación acoplada (Docking Station)"
-#: ../src/modules/alsa/alsa-mixer.c:2223 ../src/modules/alsa/alsa-mixer.c:2307
+#: ../src/modules/alsa/alsa-mixer.c:2284 ../src/modules/alsa/alsa-mixer.c:2368
msgid "Line In"
-msgstr "Line In"
+msgstr "Liña de entrada"
-#: ../src/modules/alsa/alsa-mixer.c:2224 ../src/modules/alsa/alsa-mixer.c:2302
+#: ../src/modules/alsa/alsa-mixer.c:2285 ../src/modules/alsa/alsa-mixer.c:2363
msgid "Microphone"
-msgstr "Mikrofon"
+msgstr "Micrófono"
-#: ../src/modules/alsa/alsa-mixer.c:2225 ../src/modules/alsa/alsa-mixer.c:2303
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2286 ../src/modules/alsa/alsa-mixer.c:2364
msgid "Front Microphone"
-msgstr "Docking Station Mikrofon"
+msgstr "Micrófono frontal"
-#: ../src/modules/alsa/alsa-mixer.c:2226 ../src/modules/alsa/alsa-mixer.c:2304
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2287 ../src/modules/alsa/alsa-mixer.c:2365
msgid "Rear Microphone"
-msgstr "Mikrofon"
+msgstr "Micrófono traseiro"
-#: ../src/modules/alsa/alsa-mixer.c:2227
+#: ../src/modules/alsa/alsa-mixer.c:2288
msgid "External Microphone"
-msgstr "Externes Mikrofon"
+msgstr "Micrófono externo"
-#: ../src/modules/alsa/alsa-mixer.c:2228 ../src/modules/alsa/alsa-mixer.c:2306
+#: ../src/modules/alsa/alsa-mixer.c:2289 ../src/modules/alsa/alsa-mixer.c:2367
msgid "Internal Microphone"
-msgstr "Internes Mikrofon"
+msgstr "Micrófono interno"
-#: ../src/modules/alsa/alsa-mixer.c:2229 ../src/modules/alsa/alsa-mixer.c:2308
+#: ../src/modules/alsa/alsa-mixer.c:2290 ../src/modules/alsa/alsa-mixer.c:2369
msgid "Radio"
msgstr "Radio"
-#: ../src/modules/alsa/alsa-mixer.c:2230 ../src/modules/alsa/alsa-mixer.c:2309
+#: ../src/modules/alsa/alsa-mixer.c:2291 ../src/modules/alsa/alsa-mixer.c:2370
msgid "Video"
-msgstr "Video"
+msgstr "Vídeo"
-#: ../src/modules/alsa/alsa-mixer.c:2231
+#: ../src/modules/alsa/alsa-mixer.c:2292
msgid "Automatic Gain Control"
-msgstr "Automatische Verstärkungsregelung"
+msgstr "Control automático de ganancia"
-#: ../src/modules/alsa/alsa-mixer.c:2232
+#: ../src/modules/alsa/alsa-mixer.c:2293
msgid "No Automatic Gain Control"
-msgstr "Keine automatische Verstärkungsregelung"
+msgstr "Sen control automático de ganancia"
-#: ../src/modules/alsa/alsa-mixer.c:2233
+#: ../src/modules/alsa/alsa-mixer.c:2294
msgid "Boost"
-msgstr "Boost"
+msgstr "Enfatizador"
-#: ../src/modules/alsa/alsa-mixer.c:2234
+#: ../src/modules/alsa/alsa-mixer.c:2295
msgid "No Boost"
-msgstr "Kein Boost"
+msgstr "Sen enfatizador"
-#: ../src/modules/alsa/alsa-mixer.c:2235
+#: ../src/modules/alsa/alsa-mixer.c:2296
msgid "Amplifier"
-msgstr "Verstärker"
+msgstr "Amplificador"
-#: ../src/modules/alsa/alsa-mixer.c:2236
+#: ../src/modules/alsa/alsa-mixer.c:2297
msgid "No Amplifier"
-msgstr "Kein Verstärker"
+msgstr "Sen amplificador"
-#: ../src/modules/alsa/alsa-mixer.c:2237
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2298
msgid "Bass Boost"
-msgstr "Boost"
+msgstr "Enfatizador baixo"
-#: ../src/modules/alsa/alsa-mixer.c:2238
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2299
msgid "No Bass Boost"
-msgstr "Kein Boost"
+msgstr "Sen enfatizador baixo"
-#: ../src/modules/alsa/alsa-mixer.c:2239
+#: ../src/modules/alsa/alsa-mixer.c:2300
msgid "Speaker"
-msgstr ""
+msgstr "Altofalante"
-#: ../src/modules/alsa/alsa-mixer.c:2240 ../src/modules/alsa/alsa-mixer.c:2311
+#: ../src/modules/alsa/alsa-mixer.c:2301 ../src/modules/alsa/alsa-mixer.c:2372
msgid "Headphones"
-msgstr "Analoge Kopfhörer"
+msgstr "Auriculares"
-#: ../src/modules/alsa/alsa-mixer.c:2301
+#: ../src/modules/alsa/alsa-mixer.c:2362
msgid "Analog Input"
-msgstr "Analoge Eingabe"
+msgstr "Entrada analóxica"
-#: ../src/modules/alsa/alsa-mixer.c:2305
+#: ../src/modules/alsa/alsa-mixer.c:2366
msgid "Dock Microphone"
-msgstr "Docking Station Mikrofon"
+msgstr "Micrófono do acople"
-#: ../src/modules/alsa/alsa-mixer.c:2310
+#: ../src/modules/alsa/alsa-mixer.c:2371
msgid "Analog Output"
-msgstr "Analoge Ausgabe"
+msgstr "Saída analóxica"
-#: ../src/modules/alsa/alsa-mixer.c:2312
+#: ../src/modules/alsa/alsa-mixer.c:2373
msgid "LFE on Separate Mono Output"
-msgstr "Analoge Ausgabe (LFE)"
+msgstr "LFE en Saída Mono analóxica"
-#: ../src/modules/alsa/alsa-mixer.c:2313
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2374
msgid "Line Out"
-msgstr "Line In"
+msgstr "Liña de saída"
-#: ../src/modules/alsa/alsa-mixer.c:2314
+#: ../src/modules/alsa/alsa-mixer.c:2375
msgid "Analog Mono Output"
-msgstr "Analoge Mono-Ausgabe"
+msgstr "Saída monoaural analóxica"
-#: ../src/modules/alsa/alsa-mixer.c:2315
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2376
msgid "Speakers"
-msgstr "Analog Stereo"
+msgstr "Altofalantes"
-#: ../src/modules/alsa/alsa-mixer.c:2316
+#: ../src/modules/alsa/alsa-mixer.c:2377
msgid "HDMI / DisplayPort"
-msgstr ""
+msgstr "HDMI / DisplayPort"
-#: ../src/modules/alsa/alsa-mixer.c:2317
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2378
msgid "Digital Output (S/PDIF)"
-msgstr "Digital Stereo (HDMI)"
+msgstr "Saída dixital (S/PDIF)"
-#: ../src/modules/alsa/alsa-mixer.c:2318
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2379
msgid "Digital Passthrough (S/PDIF)"
-msgstr "Digital Stereo (HDMI)"
+msgstr "«Passthrough» dixital (S/PDIF)"
-#: ../src/modules/alsa/alsa-mixer.c:3756
+#: ../src/modules/alsa/alsa-mixer.c:3878
msgid "Analog Mono"
-msgstr "Analog Mono"
+msgstr "Monoaural analóxico"
-#: ../src/modules/alsa/alsa-mixer.c:3757
+#: ../src/modules/alsa/alsa-mixer.c:3879
msgid "Analog Stereo"
-msgstr "Analog Stereo"
+msgstr "Estéreo analóxico"
-#: ../src/modules/alsa/alsa-mixer.c:3758
+#: ../src/modules/alsa/alsa-mixer.c:3880
msgid "Analog Surround 2.1"
-msgstr "Analog Surround 2.1"
+msgstr "Envolvente analóxico 2.1"
-#: ../src/modules/alsa/alsa-mixer.c:3759
+#: ../src/modules/alsa/alsa-mixer.c:3881
msgid "Analog Surround 3.0"
-msgstr "Analog Surround 3.0"
+msgstr "Envolvente analóxico 3.0"
-#: ../src/modules/alsa/alsa-mixer.c:3760
+#: ../src/modules/alsa/alsa-mixer.c:3882
msgid "Analog Surround 3.1"
-msgstr "Analog Surround 3.1"
+msgstr "Envolvente analóxico 3.1"
-#: ../src/modules/alsa/alsa-mixer.c:3761
+#: ../src/modules/alsa/alsa-mixer.c:3883
msgid "Analog Surround 4.0"
-msgstr "Analog Surround 4.0"
+msgstr "Envolvente analóxico 4.0"
-#: ../src/modules/alsa/alsa-mixer.c:3762
+#: ../src/modules/alsa/alsa-mixer.c:3884
msgid "Analog Surround 4.1"
-msgstr "Analog Surround 4.1"
+msgstr "Envolvente analóxico 4.1"
-#: ../src/modules/alsa/alsa-mixer.c:3763
+#: ../src/modules/alsa/alsa-mixer.c:3885
msgid "Analog Surround 5.0"
-msgstr "Analog Surround 5.0"
+msgstr "Envolvente analóxico 5.0"
-#: ../src/modules/alsa/alsa-mixer.c:3764
+#: ../src/modules/alsa/alsa-mixer.c:3886
msgid "Analog Surround 5.1"
-msgstr "Analog Surround 5.1"
+msgstr "Envolvente analóxico 5.1"
-#: ../src/modules/alsa/alsa-mixer.c:3765
+#: ../src/modules/alsa/alsa-mixer.c:3887
msgid "Analog Surround 6.0"
-msgstr "Analog Surround 6.0"
+msgstr "Envolvente analóxico 6.0"
-#: ../src/modules/alsa/alsa-mixer.c:3766
+#: ../src/modules/alsa/alsa-mixer.c:3888
msgid "Analog Surround 6.1"
-msgstr "Analog Surround 6.1"
+msgstr "Envolvente analóxico 6.1"
-#: ../src/modules/alsa/alsa-mixer.c:3767
+#: ../src/modules/alsa/alsa-mixer.c:3889
msgid "Analog Surround 7.0"
-msgstr "Analog Surround 7.0"
+msgstr "Envolvente analóxico 7.0"
-#: ../src/modules/alsa/alsa-mixer.c:3768
+#: ../src/modules/alsa/alsa-mixer.c:3890
msgid "Analog Surround 7.1"
-msgstr "Analog Surround 7.1"
+msgstr "Envolvente analóxico 7.1"
-#: ../src/modules/alsa/alsa-mixer.c:3769
+#: ../src/modules/alsa/alsa-mixer.c:3891
msgid "Digital Stereo (IEC958)"
-msgstr "Digital Stereo (IEC958)"
+msgstr "Estéreo dixital (IEC958)"
-#: ../src/modules/alsa/alsa-mixer.c:3770
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:3892
msgid "Digital Passthrough (IEC958)"
-msgstr "Digital Stereo (IEC958)"
+msgstr "«Passthrough» dixital (IEC958)"
-#: ../src/modules/alsa/alsa-mixer.c:3771
+#: ../src/modules/alsa/alsa-mixer.c:3893
msgid "Digital Surround 4.0 (IEC958/AC3)"
-msgstr "Digital Surround 4.0 (IEC958/AC3)"
+msgstr "Envolvente dixital 4.0 (IEC958/AC3)"
-#: ../src/modules/alsa/alsa-mixer.c:3772
+#: ../src/modules/alsa/alsa-mixer.c:3894
msgid "Digital Surround 5.1 (IEC958/AC3)"
-msgstr "Digital Surround 5.1 (IEC958/AC3)"
+msgstr "Envolvente dixital 5.1 (IEC958/AC3)"
-#: ../src/modules/alsa/alsa-mixer.c:3773
+#: ../src/modules/alsa/alsa-mixer.c:3895
+msgid "Digital Surround 5.1 (IEC958/DTS)"
+msgstr "Envolvente dixital 5.1 (IEC958/ACDTS)"
+
+#: ../src/modules/alsa/alsa-mixer.c:3896
msgid "Digital Stereo (HDMI)"
-msgstr "Digital Stereo (HDMI)"
+msgstr "Estéreo dixital (HDMI)"
-#: ../src/modules/alsa/alsa-mixer.c:3774
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:3897
msgid "Digital Surround 5.1 (HDMI)"
-msgstr "Digital Surround 5.1 (IEC958/AC3)"
+msgstr "Envolvente dixital 5.1 (HDMI)"
-#: ../src/modules/alsa/alsa-mixer.c:3895
+#: ../src/modules/alsa/alsa-mixer.c:4018
msgid "Analog Mono Duplex"
-msgstr "Analog Mono Duplex"
+msgstr "Monoaural analóxico dúplex"
-#: ../src/modules/alsa/alsa-mixer.c:3896
+#: ../src/modules/alsa/alsa-mixer.c:4019
msgid "Analog Stereo Duplex"
-msgstr "Analog Stereo Duplex"
+msgstr "Estéreo analóxico dúplex"
-#: ../src/modules/alsa/alsa-mixer.c:3897
+#: ../src/modules/alsa/alsa-mixer.c:4020
msgid "Digital Stereo Duplex (IEC958)"
-msgstr "Digital Stereo Duplex (IEC958)"
+msgstr "Estéreo dixital dúplex (IEC958)"
-#: ../src/modules/alsa/alsa-mixer.c:3997
-#, fuzzy, c-format
+#: ../src/modules/alsa/alsa-mixer.c:4120
+#, c-format
msgid "%s Output"
-msgstr "Null-Ausgabe"
+msgstr "Saída %s"
-#: ../src/modules/alsa/alsa-mixer.c:4005
-#, fuzzy, c-format
+#: ../src/modules/alsa/alsa-mixer.c:4128
+#, c-format
msgid "%s Input"
-msgstr "Eingabe"
+msgstr "Entrada %s"
#: ../src/modules/echo-cancel/module-echo-cancel.c:63
msgid ""
@@ -2873,28 +2913,37 @@ msgid ""
"save_aec=<save AEC data in /tmp> autoloaded=<set if this module is being "
"loaded automatically> use_volume_sharing=<yes or no> "
msgstr ""
+"source_name=<nome da orixe> source_properties=<propiedades da orixe> "
+"source_master=<nome da orixe a filtrar> sink_name=<nome do sumideiro> "
+"sink_properties=<propiedades para o sumideiro> sink_master=<nome do "
+"sumideiro a filtrar> adjust_time=<cada canto reaxustar as taxas en s> "
+"adjust_threshold=<canta derixa reaxustar despis en ms> format=<formato da "
+"mostra> rate=<taxa de mostraxe> channels=<número das canles> "
+"channel_map=<mapa de canles> aec_method=<implementación a usar> "
+"aec_args=<parámetros do motor AEC> save_aec=<gardar os datos AEC en /tmp> "
+"autoloaded=<estabeleza se este módulo se carga automaticamente> "
+"use_volume_sharing=<si ou non> "
#: ../src/modules/module-equalizer-sink.c:72
msgid "General Purpose Equalizer"
-msgstr ""
+msgstr "Ecualizador de propósito xeral"
#: ../src/modules/module-equalizer-sink.c:76
-#, fuzzy
msgid ""
"sink_name=<name of the sink> sink_properties=<properties for the sink> "
"sink_master=<sink to connect to> format=<sample format> rate=<sample rate> "
"channels=<number of channels> channel_map=<channel map> autoloaded=<set if "
"this module is being loaded automatically> use_volume_sharing=<yes or no> "
msgstr ""
-"sink_name=<Name des Sinks> sink_properties=<Eigenschaften des Sinks> "
-"master=<Name des zu filternden Sinks> format=<Sample-Format> rate=<Sample-"
-"Rate> channels=<Anzahl der Channels> channel_map=<Channel-Map> "
-"plugin=<ladspa Plugin-Name> label=<ladspa Plugin-Label> "
-"control=<kommagetrennte Liste von Eingabekontrollwerten>"
+"sink_name=<nome para o destino> sink_properties=<propiedades para o destino> "
+"sink_master=<sumideiro ao que conectarse> format=<formato de mostra> "
+"rate=<taxa de mostra> channels=<cantidade de canles> channel_map=<asignación "
+"de canles> autoloaded=<estabelezao se este módulo se carga automaticamente> "
+"use_volume_sharing=<si ou non> "
#: ../src/modules/module-filter-apply.c:48
msgid "autoclean=<automatically unload unused filters?>"
-msgstr ""
+msgstr "autoclean=<descarga automaticamente os filtros non usados?>"
#: ../src/tests/resampler-test.c:257
#, c-format
@@ -2925,22 +2974,71 @@ msgid ""
"\n"
"See --dump-resample-methods for possible values of resample methods.\n"
msgstr ""
+"%s [opcións]\n"
+"\n"
+"-h, --help Mostra esta axuda\n"
+"-v, --verbose Imprimir mensaxes de depuración\n"
+" --from-rate=SAMPLERATE Taxa de mostraxe da orixe en Hz (por "
+"omisión 44100)\n"
+" --from-format=SAMPLEFORMAT Tipo de mostraxe da orixe (defaults to "
+"s16le)\n"
+" --from-channels=CHANNELS Canles da orixe (defaults to 1)\n"
+" --to-rate=SAMPLERATE Taxa de mostraxe do destino en Hz "
+"(defaults to 44100)\n"
+" --to-format=SAMPLEFORMAT Tipo de mostraxe do destino (defaults "
+"to s16le)\n"
+" --to-channels=CHANNELS Canles do destino (defaults to 1)\n"
+" --resample-method=METHOD Método de remostraxe (defaults to "
+"auto)\n"
+" --seconds=SECONDS Duración do fluxo de orixe (defaults "
+"to 60)\n"
+"\n"
+"Se non se especifican os formatos, a proba leva a cabo todas as combinacións "
+"de\n"
+"formatos.\n"
+"\n"
+"O tipo de mostraxe debe ser s16le, s16be, u8, float32le, float32be, ulaw, "
+"alaw,\n"
+"32le, s32be (por omisión s16ne)\n"
+"\n"
+"See --dump-resample-methods for possible values of resample methods.\n"
#: ../src/tests/resampler-test.c:356
-#, fuzzy, c-format
+#, c-format
msgid "%s %s\n"
-msgstr "%s %s"
+msgstr "%s %s\n"
#: ../src/tests/resampler-test.c:419
#, c-format
msgid "=== %d seconds: %d Hz %d ch (%s) -> %d Hz %d ch (%s)"
+msgstr "=== %d segundos: %d Hz %d ch (%s) -> %d Hz %d ch (%s)"
+
+#: ../src/modules/module-virtual-surround-sink.c:49
+msgid "Virtual surround sink"
+msgstr "Sumideiro envolvente virtual"
+
+#: ../src/modules/module-virtual-surround-sink.c:53
+msgid ""
+"sink_name=<name for the sink> sink_properties=<properties for the sink> "
+"master=<name of sink to filter> format=<sample format> rate=<sample rate> "
+"channels=<number of channels> channel_map=<channel map> "
+"use_volume_sharing=<yes or no> force_flat_volume=<yes or no> hrir=/path/to/"
+"left_hrir.wav "
msgstr ""
+"sink_name=<nome para o destino> sink_properties=<propiedades para o destino> "
+"master=<nome do destino a filtrar> format=<formato de mostra> rate=<taxa de "
+"mostra> channels=<cantidade de canles> channel_map=<asignación de canles> "
+"use_volume_sharing=<si ou non> force_flat_volume=<si ou non> hrir=/ruta/ao/"
+"left_hrir.wav "
+
+#~ msgid "Internal Audio"
+#~ msgstr "Son interno"
#~ msgid "[%s:%u] rlimit not supported on this platform."
-#~ msgstr "[%s:%u] rlimit auf dieser Plattform nicht unterstützt."
+#~ msgstr "[%s:%u] Rlimit non está admitido nesta plataforma."
#~ msgid "XOpenDisplay() failed"
-#~ msgstr "XOpenDisplay() fehlgeschlagen"
+#~ msgstr "Produciuse un fallo en XOpenDisplay()"
#~ msgid ""
#~ "Source Output #%u\n"
@@ -2956,20 +3054,19 @@ msgstr ""
#~ "\tProperties:\n"
#~ "\t\t%s\n"
#~ msgstr ""
-#~ "Quell-Ausgabe #%u\n"
-#~ "\tTreiber: %s\n"
-#~ "\tOwner-Modul: %s\n"
-#~ "\tClient: %s\n"
-#~ "\tQuelle: %u\n"
-#~ "\tSample-Spezifizierung: %s\n"
-#~ "\tKanalzuordnung: %s\n"
-#~ "\tPufferlatenz: %0.0f usec\n"
-#~ "\tQuelllatenz: %0.0f usec\n"
-#~ "\tResample-Methode: %s\n"
-#~ "\tEigenschaften:\n"
+#~ "Saída da orixe #%u\n"
+#~ "\tControlador: %s\n"
+#~ "\tPropietario do módulo: %s\n"
+#~ "\tCliente: %s\n"
+#~ "\tOrixe: %u\n"
+#~ "\tEspecificación da mostra: %s\n"
+#~ "\tMapa de canles: %s\n"
+#~ "\tLatencia do búfer: %0.0f useg\n"
+#~ "\tLatencia da orixe: %0.0f useg\n"
+#~ "\tMétodo de nova mostraxe: %s\n"
+#~ "\tPropiedades:\n"
#~ "\t\t%s\n"
-#, fuzzy
#~ msgid ""
#~ "%s [options] stat\n"
#~ "%s [options] list\n"
@@ -3002,34 +3099,56 @@ msgstr ""
#~ " -n, --client-name=NAME How to call this client on the "
#~ "server\n"
#~ msgstr ""
-#~ "%s [options] stat\n"
-#~ "%s [options] list\n"
-#~ "%s [options] exit\n"
-#~ "%s [options] upload-sample FILENAME [NAME]\n"
-#~ "%s [options] play-sample NAME [SINK]\n"
-#~ "%s [options] remove-sample NAME\n"
-#~ "%s [options] move-sink-input SINKINPUT SINK\n"
-#~ "%s [options] move-source-output SOURCEOUTPUT SOURCE\n"
-#~ "%s [options] load-module NAME [ARGS ...]\n"
-#~ "%s [options] unload-module MODULE\n"
-#~ "%s [options] suspend-sink SINK 1|0\n"
-#~ "%s [options] suspend-source SOURCE 1|0\n"
-#~ "%s [options] set-card-profile CARD PROFILE\n"
-#~ "%s [options] set-sink-port SINK PORT\n"
-#~ "%s [options] set-source-port SOURCE PORT\n"
-#~ "%s [options] set-sink-volume SINK VOLUME\n"
-#~ "%s [options] set-source-volume SOURCE VOLUME\n"
-#~ "%s [options] set-sink-input-volume SINKINPUT VOLUME\n"
-#~ "%s [options] set-sink-mute SINK 1|0\n"
-#~ "%s [options] set-source-mute SOURCE 1|0\n"
-#~ "%s [options] set-sink-input-mute SINKINPUT 1|0\n"
+#~ "%s [opcións] estatística\n"
+#~ "%s [opcións] lista\n"
+#~ "%s [opcións] saída\n"
+#~ "%s [opcións] envío-exemplo NOMEFICHEIRO [NOME]\n"
+#~ "%s [opcións] reproducir-exemplo NOME [DESTINO]\n"
+#~ "%s [opcións] eliminar-exemplo NOME\n"
+#~ "%s [opcións] mover-entrada-destino ID DESTINO\n"
+#~ "%s [opcións] mover-saída-orixe ID ORIXE\n"
+#~ "%s [opcións] cargar-módulo NOME [ARGS ...]\n"
+#~ "%s [opcións] descargar-módulo ID\n"
+#~ "%s [opcións] suspender-destino [DESTINO] 1|0\n"
+#~ "%s [opcións] suspender-orixe [ORIXE] 1|0\n"
+#~ "%s [opcións] definir-perfil-tarxeta [TARXETA] [PERFIL] \n"
+#~ "%s [opcións] definir-porto-destino [DESTINO] [PORTO] \n"
+#~ "%s [opcións] definir-porto-orixe [ORIXE] [PORTO] \n"
+#~ "%s [opcións] definir-volume-destino DESTINO VOLUME\n"
+#~ "%s [opcións] definir-volume-orixe ORIXE VOLUME\n"
+#~ "%s [opcións] definir-volume-entrada-destino ENTRADADESTINO VOLUME\n"
+#~ "%s [opcións] definir-silenciado-destino DESTINO 1|0\n"
+#~ "%s [opcións] definir-silenciado-orixe ORIXE 1|0\n"
+#~ "%s [opcións] definir-silenciado-entrada-destino ENTRADADESTINO 1|0\n"
+#~ "%s [options] subscribirse\n"
#~ "\n"
-#~ " -h, --help Diese Hilfe anzeigen\n"
-#~ " --version Version anzeigen\n"
+#~ " -h, --help Mostra esta axuda\n"
+#~ " --version Mostra a versión\n"
#~ "\n"
-#~ " -s, --server=SERVER Name des Zielservers\n"
-#~ " -n, --client-name=NAME Rufname des Clients auf dem "
-#~ "Server\n"
+#~ " -s, --server=SERVIDOR O nome do servidor ao que "
+#~ "conectarse\n"
+#~ " -n, --client-name=NOME O nome deste cliente no servidor\n"
+
+#~ msgid "Analog Microphone"
+#~ msgstr "Micrófono analóxico"
+
+#~ msgid "Analog Line-In"
+#~ msgstr "Entrada en liña analóxica"
+
+#~ msgid "Analog Radio"
+#~ msgstr "Radio analóxica"
+
+#~ msgid "Analog Video"
+#~ msgstr "Vídeo analóxico"
+
+#~ msgid "Analog Headphones"
+#~ msgstr "Auriculares analóxicos"
+
+#~ msgid "Analog Output (LFE)"
+#~ msgstr "Saída analóxica (LFE)"
+
+#~ msgid "Analog Speakers"
+#~ msgstr "Altofalantes analóxicos"
#~ msgid "%s+%s"
#~ msgstr "%s+%s"
@@ -3038,7 +3157,4 @@ msgstr ""
#~ msgstr "%s / %s"
#~ msgid "Digital Surround 4.0 (IEC958)"
-#~ msgstr "Digital Surround 4.0 (IEC958)"
-
-#~ msgid "Low Frequency Emmiter"
-#~ msgstr "Niedrigfrequenzemitter"
+#~ msgstr "Envolvente dixital 4.0 (IEC958)"
diff --git a/po/hu.po b/po/hu.po
index 85c33d5..bcb39d8 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -4,14 +4,15 @@
#
# KAMI <kami911 at gmail.com>, 2012.
# Gabor Kelemen <kelemeng at ubuntu dot com>, 2016.
+# Balázs Úr <urbalazs at gmail dot com>, 2016.
msgid ""
msgstr ""
"Project-Id-Version: PulseAudio master\n"
"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?"
"product=PulseAudio&keywords=I18N+L10N&component=misc\n"
-"POT-Creation-Date: 2016-03-07 14:26+0000\n"
-"PO-Revision-Date: 2016-03-07 22:25+0100\n"
-"Last-Translator: Gabor Kelemen <kelemeng at ubuntu dot com>\n"
+"POT-Creation-Date: 2016-08-23 02:28+0000\n"
+"PO-Revision-Date: 2016-08-23 12:10+0200\n"
+"Last-Translator: Balázs Úr <urbalazs at gmail.com>\n"
"Language-Team: Hungarian <openscope at googlegroups dot com>\n"
"Language: hu\n"
"MIME-Version: 1.0\n"
@@ -21,9 +22,9 @@ msgstr ""
"X-Poedit-Country: HUNGARY\n"
"X-Poedit-SourceCharset: utf-8\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 1.2\n"
-#: ../src/daemon/cmdline.c:111
+#: ../src/daemon/cmdline.c:113
#, c-format
msgid ""
"%s [options]\n"
@@ -82,6 +83,7 @@ msgid ""
" --no-cpu-limit[=BOOL] Do not install CPU load limiter on\n"
" platforms that support it.\n"
" --disable-shm[=BOOL] Disable shared memory support.\n"
+" --enable-memfd[=BOOL] Enable memfd shared memory support.\n"
"\n"
"STARTUP SCRIPT:\n"
" -L, --load=\"MODULE ARGUMENTS\" Load the specified plugin module "
@@ -121,11 +123,13 @@ msgstr ""
" emelt RLIMIT_NICE esetén)\n"
" --realtime[=LOGIKAI] Kísérlet valós idejű ütemezés\n"
" bekapcsolására (csak rootként,\n"
-" SUID-ként vagy emelt RLIMIT_RTPRIO\n"
+" SUID-ként vagy emelt "
+"RLIMIT_RTPRIO\n"
" esetén)\n"
" --disallow-module-loading[=LOGIKAI] Felhasználó által kért "
"modulbetöltés/\n"
-" -eltávolítás tiltása indítás után\n"
+" -eltávolítás tiltása indítás "
+"után\n"
" --disallow-exit[=LOGIKAI] Felhasználó által kért kilépés "
"tiltása\n"
" --exit-idle-time=MP A démon befejeztetése, ha "
@@ -159,6 +163,8 @@ msgstr ""
" az azt támogató platformokon\n"
" --disable-shm[=LOGIKAI] Megosztott memória támogatásának "
"tiltása\n"
+" --enable-memfd[=LOGIKAI] A memfd megosztott memória\n"
+" támogatásának engedélyezése\n"
"\n"
"INDÍTÓ PARANCSFÁJL:\n"
" -L, --load=\"MODUL ARGUMENTUMOK\" A megadott bővítménymodul "
@@ -172,15 +178,15 @@ msgstr ""
" -n Ne töltse be az alapértelmezett\n"
" parancsfájlt\n"
-#: ../src/daemon/cmdline.c:243
+#: ../src/daemon/cmdline.c:246
msgid "--daemonize expects boolean argument"
msgstr "a --daemonize paraméter logikai értéket vár"
-#: ../src/daemon/cmdline.c:251
+#: ../src/daemon/cmdline.c:254
msgid "--fail expects boolean argument"
msgstr "a --fail paraméter logikai értéket vár"
-#: ../src/daemon/cmdline.c:262
+#: ../src/daemon/cmdline.c:265
msgid ""
"--log-level expects log level argument (either numeric in range 0..4 or one "
"of debug, info, notice, warn, error)."
@@ -188,27 +194,27 @@ msgstr ""
"a --log-level paraméter a naplózás szintjének értékét várja (Ez lehet a 0..4 "
"tartomány, vagy a következők egyike: debug, info, notice, warn, error)."
-#: ../src/daemon/cmdline.c:274
+#: ../src/daemon/cmdline.c:277
msgid "--high-priority expects boolean argument"
msgstr "a --high-priority paraméter logikai értéket vár"
-#: ../src/daemon/cmdline.c:282
+#: ../src/daemon/cmdline.c:285
msgid "--realtime expects boolean argument"
msgstr "a --realtime paraméter logikai értéket vár"
-#: ../src/daemon/cmdline.c:290
+#: ../src/daemon/cmdline.c:293
msgid "--disallow-module-loading expects boolean argument"
msgstr "a --disallow-module-loading paraméter logikai értéket vár"
-#: ../src/daemon/cmdline.c:298
+#: ../src/daemon/cmdline.c:301
msgid "--disallow-exit expects boolean argument"
msgstr "a --disallow-exit paraméter logikai értéket vár"
-#: ../src/daemon/cmdline.c:306
+#: ../src/daemon/cmdline.c:309
msgid "--use-pid-file expects boolean argument"
msgstr "a --use-pid-file paraméter logikai értéket vár"
-#: ../src/daemon/cmdline.c:325
+#: ../src/daemon/cmdline.c:328
msgid ""
"Invalid log target: use either 'syslog', 'journal','stderr' or 'auto' or a "
"valid file name 'file:<path>', 'newfile:<path>'."
@@ -217,7 +223,7 @@ msgstr ""
"„auto” egyikét, vagy egy érvényes fájlnevet: „file:<útvonal>”, „newfile:"
"<útvonal>”."
-#: ../src/daemon/cmdline.c:327
+#: ../src/daemon/cmdline.c:330
msgid ""
"Invalid log target: use either 'syslog', 'stderr' or 'auto' or a valid file "
"name 'file:<path>', 'newfile:<path>'."
@@ -225,97 +231,101 @@ msgstr ""
"Érvénytelen naplózási cél: használja a „syslog”, „stderr” vagy az „auto” "
"egyikét, vagy egy érvényes fájlnevet: „file:<útvonal>”, „newfile:<útvonal>”."
-#: ../src/daemon/cmdline.c:335
+#: ../src/daemon/cmdline.c:338
msgid "--log-time expects boolean argument"
msgstr "a --log-time paraméter logikai értéket vár"
-#: ../src/daemon/cmdline.c:343
+#: ../src/daemon/cmdline.c:346
msgid "--log-meta expects boolean argument"
msgstr "a --log-meta paraméter logikai értéket vár"
-#: ../src/daemon/cmdline.c:363
+#: ../src/daemon/cmdline.c:366
#, c-format
msgid "Invalid resample method '%s'."
msgstr "Érvénytelen újramintavételezési eljárás: „%s”."
-#: ../src/daemon/cmdline.c:370
+#: ../src/daemon/cmdline.c:373
msgid "--system expects boolean argument"
msgstr "a --system paraméter logikai értéket vár"
-#: ../src/daemon/cmdline.c:378
+#: ../src/daemon/cmdline.c:381
msgid "--no-cpu-limit expects boolean argument"
msgstr "a --no-cpu-limit paraméter logikai értéket vár"
-#: ../src/daemon/cmdline.c:386
+#: ../src/daemon/cmdline.c:389
msgid "--disable-shm expects boolean argument"
msgstr "a --disable-shm paraméter logikai értéket vár"
-#: ../src/daemon/daemon-conf.c:259
+#: ../src/daemon/cmdline.c:397
+msgid "--enable-memfd expects boolean argument"
+msgstr "a --enable-memfd paraméter logikai értéket vár"
+
+#: ../src/daemon/daemon-conf.c:260
#, c-format
msgid "[%s:%u] Invalid log target '%s'."
msgstr "[%s:%u] Érvénytelen naplózási cél: „%s”."
-#: ../src/daemon/daemon-conf.c:274
+#: ../src/daemon/daemon-conf.c:275
#, c-format
msgid "[%s:%u] Invalid log level '%s'."
msgstr "[%s:%u] Érvénytelen naplózási szint: „%s”."
-#: ../src/daemon/daemon-conf.c:289
+#: ../src/daemon/daemon-conf.c:290
#, c-format
msgid "[%s:%u] Invalid resample method '%s'."
msgstr "[%s:%u] Érvénytelen újramintavételezési eljárás: „%s”."
-#: ../src/daemon/daemon-conf.c:311
+#: ../src/daemon/daemon-conf.c:312
#, c-format
msgid "[%s:%u] Invalid rlimit '%s'."
msgstr "[%s:%u] Érvénytelen rlimit érték: „%s”."
-#: ../src/daemon/daemon-conf.c:331
+#: ../src/daemon/daemon-conf.c:332
#, c-format
msgid "[%s:%u] Invalid sample format '%s'."
msgstr "[%s:%u] Érvénytelen mintavételi formátum: „%s”."
-#: ../src/daemon/daemon-conf.c:348 ../src/daemon/daemon-conf.c:365
+#: ../src/daemon/daemon-conf.c:349 ../src/daemon/daemon-conf.c:366
#, c-format
msgid "[%s:%u] Invalid sample rate '%s'."
msgstr "[%s:%u] Érvénytelen mintavételezési gyakoriság: „%s”."
-#: ../src/daemon/daemon-conf.c:388
+#: ../src/daemon/daemon-conf.c:389
#, c-format
msgid "[%s:%u] Invalid sample channels '%s'."
msgstr "[%s:%u] Érvénytelen minta csatornák: „%s”."
-#: ../src/daemon/daemon-conf.c:405
+#: ../src/daemon/daemon-conf.c:406
#, c-format
msgid "[%s:%u] Invalid channel map '%s'."
msgstr "[%s:%u] Érvénytelen csatornaleképzés: „%s”."
-#: ../src/daemon/daemon-conf.c:422
+#: ../src/daemon/daemon-conf.c:423
#, c-format
msgid "[%s:%u] Invalid number of fragments '%s'."
msgstr "[%s:%u] Érvénytelen a részek száma: „%s”."
-#: ../src/daemon/daemon-conf.c:439
+#: ../src/daemon/daemon-conf.c:440
#, c-format
msgid "[%s:%u] Invalid fragment size '%s'."
msgstr "[%s:%u] Érvénytelen a részek mérete: „%s”."
-#: ../src/daemon/daemon-conf.c:456
+#: ../src/daemon/daemon-conf.c:457
#, c-format
msgid "[%s:%u] Invalid nice level '%s'."
msgstr "[%s:%u] Érvénytelen a prioritási érték: „%s”."
-#: ../src/daemon/daemon-conf.c:499
+#: ../src/daemon/daemon-conf.c:500
#, c-format
msgid "[%s:%u] Invalid server type '%s'."
msgstr "[%s:%u] Érvénytelen kiszolgálótípus: „%s”."
-#: ../src/daemon/daemon-conf.c:613
+#: ../src/daemon/daemon-conf.c:615
#, c-format
msgid "Failed to open configuration file: %s"
msgstr "Nem sikerült megnyitni a konfigurációs fájlt: %s"
-#: ../src/daemon/daemon-conf.c:629
+#: ../src/daemon/daemon-conf.c:631
msgid ""
"The specified default channel map has a different number of channels than "
"the specified default number of channels."
@@ -323,7 +333,7 @@ msgstr ""
"A megadott alapértelmezett csatornaleképzés csatornáinak száma eltér az "
"megadott alapértelmezett csatornaszámtól."
-#: ../src/daemon/daemon-conf.c:716
+#: ../src/daemon/daemon-conf.c:718
#, c-format
msgid "### Read from configuration file: %s ###\n"
msgstr "### Olvasás a következő konfigurációs fájlból: %s ###\n"
@@ -540,35 +550,31 @@ msgstr "Nem sikerült lekérni a számítógép azonosítóját"
#: ../src/daemon/main.c:974
msgid ""
-"OK, so you are running PA in system mode. Please note that you most likely "
-"shouldn't be doing that.\n"
-"If you do it nonetheless then it's your own fault if things don't work as "
-"expected.\n"
+"OK, so you are running PA in system mode. Please make sure that you actually "
+"do want to do that.\n"
"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
"mode is usually a bad idea."
msgstr ""
-"A PulseAudio rendszer üzemmódban fut. Általánosságban ezen üzemmód "
-"használata nem ajánlott.\n"
-"Ha mindenképpen ilyen üzemmódban kívánja futtatni a PulseAudio rendszert, ne "
-"lepődjön meg, ha egyes funkciók esetleg nem az elvárások szerint működnek.\n"
+"A PulseAudio rendszer üzemmódban fut. Győződjön meg arról, hogy valóban ezt "
+"szeretné-e tenni.\n"
"További tájékoztatás: http://www.freedesktop.org/wiki/Software/PulseAudio/"
"Documentation/User/WhatIsWrongWithSystemWide/ amelyből megtudhatja miért nem "
"tanácsos a rendszer üzemmód használata."
-#: ../src/daemon/main.c:991
+#: ../src/daemon/main.c:990
msgid "pa_pid_file_create() failed."
msgstr "A „pa_pid_file_create()” függvényhívás meghiúsult."
-#: ../src/daemon/main.c:1021
+#: ../src/daemon/main.c:1022
msgid "pa_core_new() failed."
msgstr "A „pa_core_new()” függvényhívás meghiúsult: %s"
-#: ../src/daemon/main.c:1089
+#: ../src/daemon/main.c:1090
msgid "Failed to initialize daemon."
msgstr "Nem sikerült előkészíteni a démont."
-#: ../src/daemon/main.c:1094
+#: ../src/daemon/main.c:1095
msgid "Daemon startup without any loaded modules, refusing to work."
msgstr ""
"A démont noha elindult, de nem töltött be modulokat, így a hangrendszer nem "
@@ -582,155 +588,155 @@ msgstr "PulseAudio hangrendszer"
msgid "Start the PulseAudio Sound System"
msgstr "A PulseAudio hangrendszer elindítása"
-#: ../src/modules/alsa/alsa-mixer.c:2402
+#: ../src/modules/alsa/alsa-mixer.c:2378
msgid "Input"
msgstr "Bemenet"
-#: ../src/modules/alsa/alsa-mixer.c:2403
+#: ../src/modules/alsa/alsa-mixer.c:2379
msgid "Docking Station Input"
msgstr "Dokkolóállomás bemenet"
-#: ../src/modules/alsa/alsa-mixer.c:2404
+#: ../src/modules/alsa/alsa-mixer.c:2380
msgid "Docking Station Microphone"
msgstr "Dokkolóállomás mikrofon"
-#: ../src/modules/alsa/alsa-mixer.c:2405
+#: ../src/modules/alsa/alsa-mixer.c:2381
msgid "Docking Station Line In"
msgstr "Dokkolóállomás vonalbemenet"
-#: ../src/modules/alsa/alsa-mixer.c:2406 ../src/modules/alsa/alsa-mixer.c:2491
+#: ../src/modules/alsa/alsa-mixer.c:2382 ../src/modules/alsa/alsa-mixer.c:2467
msgid "Line In"
msgstr "Vonalbemenet"
-#: ../src/modules/alsa/alsa-mixer.c:2407 ../src/modules/alsa/alsa-mixer.c:2485
+#: ../src/modules/alsa/alsa-mixer.c:2383 ../src/modules/alsa/alsa-mixer.c:2461
#: ../src/modules/bluetooth/module-bluez4-device.c:2099
#: ../src/modules/bluetooth/module-bluez5-device.c:1710
msgid "Microphone"
msgstr "Mikrofon"
-#: ../src/modules/alsa/alsa-mixer.c:2408 ../src/modules/alsa/alsa-mixer.c:2486
+#: ../src/modules/alsa/alsa-mixer.c:2384 ../src/modules/alsa/alsa-mixer.c:2462
msgid "Front Microphone"
msgstr "Első mikrofon"
-#: ../src/modules/alsa/alsa-mixer.c:2409 ../src/modules/alsa/alsa-mixer.c:2487
+#: ../src/modules/alsa/alsa-mixer.c:2385 ../src/modules/alsa/alsa-mixer.c:2463
msgid "Rear Microphone"
msgstr "Hátsó mikrofon"
-#: ../src/modules/alsa/alsa-mixer.c:2410
+#: ../src/modules/alsa/alsa-mixer.c:2386
msgid "External Microphone"
msgstr "Külső mikrofon"
-#: ../src/modules/alsa/alsa-mixer.c:2411 ../src/modules/alsa/alsa-mixer.c:2489
+#: ../src/modules/alsa/alsa-mixer.c:2387 ../src/modules/alsa/alsa-mixer.c:2465
msgid "Internal Microphone"
msgstr "Belső mikrofon"
-#: ../src/modules/alsa/alsa-mixer.c:2412 ../src/modules/alsa/alsa-mixer.c:2492
+#: ../src/modules/alsa/alsa-mixer.c:2388 ../src/modules/alsa/alsa-mixer.c:2468
msgid "Radio"
msgstr "Rádió"
-#: ../src/modules/alsa/alsa-mixer.c:2413 ../src/modules/alsa/alsa-mixer.c:2493
+#: ../src/modules/alsa/alsa-mixer.c:2389 ../src/modules/alsa/alsa-mixer.c:2469
msgid "Video"
msgstr "Videó"
-#: ../src/modules/alsa/alsa-mixer.c:2414
+#: ../src/modules/alsa/alsa-mixer.c:2390
msgid "Automatic Gain Control"
msgstr "Automatikus erősítésszabályzás"
-#: ../src/modules/alsa/alsa-mixer.c:2415
+#: ../src/modules/alsa/alsa-mixer.c:2391
msgid "No Automatic Gain Control"
msgstr "Nincs automatikus erősítésszabályzás"
-#: ../src/modules/alsa/alsa-mixer.c:2416
+#: ../src/modules/alsa/alsa-mixer.c:2392
msgid "Boost"
msgstr "Erősítés"
-#: ../src/modules/alsa/alsa-mixer.c:2417
+#: ../src/modules/alsa/alsa-mixer.c:2393
msgid "No Boost"
msgstr "Nincs erősítés"
-#: ../src/modules/alsa/alsa-mixer.c:2418
+#: ../src/modules/alsa/alsa-mixer.c:2394
msgid "Amplifier"
msgstr "Erősítő"
-#: ../src/modules/alsa/alsa-mixer.c:2419
+#: ../src/modules/alsa/alsa-mixer.c:2395
msgid "No Amplifier"
msgstr "Nincs erősítő"
-#: ../src/modules/alsa/alsa-mixer.c:2420
+#: ../src/modules/alsa/alsa-mixer.c:2396
msgid "Bass Boost"
msgstr "Basszuskiemelés"
-#: ../src/modules/alsa/alsa-mixer.c:2421
+#: ../src/modules/alsa/alsa-mixer.c:2397
msgid "No Bass Boost"
msgstr "Nincs basszuskiemelés"
-#: ../src/modules/alsa/alsa-mixer.c:2422
+#: ../src/modules/alsa/alsa-mixer.c:2398
#: ../src/modules/bluetooth/module-bluez4-device.c:2104
#: ../src/modules/bluetooth/module-bluez5-device.c:1717
msgid "Speaker"
msgstr "Hangszóró"
-#: ../src/modules/alsa/alsa-mixer.c:2423 ../src/modules/alsa/alsa-mixer.c:2495
+#: ../src/modules/alsa/alsa-mixer.c:2399 ../src/modules/alsa/alsa-mixer.c:2471
msgid "Headphones"
msgstr "Analóg fejhallgató"
-#: ../src/modules/alsa/alsa-mixer.c:2484
+#: ../src/modules/alsa/alsa-mixer.c:2460
msgid "Analog Input"
msgstr "Analóg bemenet"
-#: ../src/modules/alsa/alsa-mixer.c:2488
+#: ../src/modules/alsa/alsa-mixer.c:2464
msgid "Dock Microphone"
msgstr "Dokkolóállomás mikrofon"
-#: ../src/modules/alsa/alsa-mixer.c:2490
+#: ../src/modules/alsa/alsa-mixer.c:2466
msgid "Headset Microphone"
msgstr "Fejhallgató mikrofon"
-#: ../src/modules/alsa/alsa-mixer.c:2494
+#: ../src/modules/alsa/alsa-mixer.c:2470
msgid "Analog Output"
msgstr "Analóg kimenet"
-#: ../src/modules/alsa/alsa-mixer.c:2496
+#: ../src/modules/alsa/alsa-mixer.c:2472
msgid "LFE on Separate Mono Output"
msgstr "Analóg kimenet (mély)"
-#: ../src/modules/alsa/alsa-mixer.c:2497
+#: ../src/modules/alsa/alsa-mixer.c:2473
msgid "Line Out"
msgstr "Vonalkimenet"
-#: ../src/modules/alsa/alsa-mixer.c:2498
+#: ../src/modules/alsa/alsa-mixer.c:2474
msgid "Analog Mono Output"
msgstr "Analóg mono kimenet"
-#: ../src/modules/alsa/alsa-mixer.c:2499
+#: ../src/modules/alsa/alsa-mixer.c:2475
msgid "Speakers"
msgstr "Hangszórók"
-#: ../src/modules/alsa/alsa-mixer.c:2500
+#: ../src/modules/alsa/alsa-mixer.c:2476
msgid "HDMI / DisplayPort"
msgstr "HDMI / DisplayPort"
-#: ../src/modules/alsa/alsa-mixer.c:2501
+#: ../src/modules/alsa/alsa-mixer.c:2477
msgid "Digital Output (S/PDIF)"
msgstr "Digitális kimenet (S/PDIF)"
-#: ../src/modules/alsa/alsa-mixer.c:2502
+#: ../src/modules/alsa/alsa-mixer.c:2478
msgid "Digital Input (S/PDIF)"
msgstr "Digitális bemenet (S/PDIF)"
-#: ../src/modules/alsa/alsa-mixer.c:2503
+#: ../src/modules/alsa/alsa-mixer.c:2479
msgid "Digital Passthrough (S/PDIF)"
msgstr "Digitális Passthrough (S/PDIF)"
-#: ../src/modules/alsa/alsa-mixer.c:2504
+#: ../src/modules/alsa/alsa-mixer.c:2480
msgid "Multichannel Input"
msgstr "Többcsatornás bemenet"
-#: ../src/modules/alsa/alsa-mixer.c:2505
+#: ../src/modules/alsa/alsa-mixer.c:2481
msgid "Multichannel Output"
msgstr "Többcsatornás kimenet"
-#: ../src/modules/alsa/alsa-mixer.c:4014
+#: ../src/modules/alsa/alsa-mixer.c:3990
msgid "Analog Mono"
msgstr "Analóg mono"
@@ -739,116 +745,116 @@ msgstr "Analóg mono"
#. * here would lead to the source name to become "Analog Stereo Input
#. * Input". The same logic applies to analog-stereo-output,
#. * multichannel-input and multichannel-output.
-#: ../src/modules/alsa/alsa-mixer.c:4015 ../src/modules/alsa/alsa-mixer.c:4021
-#: ../src/modules/alsa/alsa-mixer.c:4022
+#: ../src/modules/alsa/alsa-mixer.c:3991 ../src/modules/alsa/alsa-mixer.c:3997
+#: ../src/modules/alsa/alsa-mixer.c:3998
msgid "Analog Stereo"
msgstr "Analóg sztereó"
-#: ../src/modules/alsa/alsa-mixer.c:4023 ../src/modules/alsa/alsa-mixer.c:4024
+#: ../src/modules/alsa/alsa-mixer.c:3999 ../src/modules/alsa/alsa-mixer.c:4000
msgid "Multichannel"
msgstr "Többcsatornás"
-#: ../src/modules/alsa/alsa-mixer.c:4025
+#: ../src/modules/alsa/alsa-mixer.c:4001
msgid "Analog Surround 2.1"
msgstr "Analóg térhatású 2.1"
-#: ../src/modules/alsa/alsa-mixer.c:4026
+#: ../src/modules/alsa/alsa-mixer.c:4002
msgid "Analog Surround 3.0"
msgstr "Analóg térhatású 3.0"
-#: ../src/modules/alsa/alsa-mixer.c:4027
+#: ../src/modules/alsa/alsa-mixer.c:4003
msgid "Analog Surround 3.1"
msgstr "Analóg térhatású 3.1"
-#: ../src/modules/alsa/alsa-mixer.c:4028
+#: ../src/modules/alsa/alsa-mixer.c:4004
msgid "Analog Surround 4.0"
msgstr "Analóg térhatású 4.0"
-#: ../src/modules/alsa/alsa-mixer.c:4029
+#: ../src/modules/alsa/alsa-mixer.c:4005
msgid "Analog Surround 4.1"
msgstr "Analóg térhatású 4.1"
-#: ../src/modules/alsa/alsa-mixer.c:4030
+#: ../src/modules/alsa/alsa-mixer.c:4006
msgid "Analog Surround 5.0"
msgstr "Analóg térhatású 5.0"
-#: ../src/modules/alsa/alsa-mixer.c:4031
+#: ../src/modules/alsa/alsa-mixer.c:4007
msgid "Analog Surround 5.1"
msgstr "Analóg térhatású 5.1"
-#: ../src/modules/alsa/alsa-mixer.c:4032
+#: ../src/modules/alsa/alsa-mixer.c:4008
msgid "Analog Surround 6.0"
msgstr "Analóg térhatású 6.0"
-#: ../src/modules/alsa/alsa-mixer.c:4033
+#: ../src/modules/alsa/alsa-mixer.c:4009
msgid "Analog Surround 6.1"
msgstr "Analóg térhatású 6.1"
-#: ../src/modules/alsa/alsa-mixer.c:4034
+#: ../src/modules/alsa/alsa-mixer.c:4010
msgid "Analog Surround 7.0"
msgstr "Analóg térhatású 7.0"
-#: ../src/modules/alsa/alsa-mixer.c:4035
+#: ../src/modules/alsa/alsa-mixer.c:4011
msgid "Analog Surround 7.1"
msgstr "Analóg térhatású 7.1"
-#: ../src/modules/alsa/alsa-mixer.c:4036
+#: ../src/modules/alsa/alsa-mixer.c:4012
msgid "Digital Stereo (IEC958)"
msgstr "Digitális sztereó (IEC958)"
-#: ../src/modules/alsa/alsa-mixer.c:4037
+#: ../src/modules/alsa/alsa-mixer.c:4013
msgid "Digital Passthrough (IEC958)"
msgstr "Digitális Passthrough (IEC958)"
-#: ../src/modules/alsa/alsa-mixer.c:4038
+#: ../src/modules/alsa/alsa-mixer.c:4014
msgid "Digital Surround 4.0 (IEC958/AC3)"
msgstr "Digitális térhatású 4.0 (IEC958/AC3)"
-#: ../src/modules/alsa/alsa-mixer.c:4039
+#: ../src/modules/alsa/alsa-mixer.c:4015
msgid "Digital Surround 5.1 (IEC958/AC3)"
msgstr "Digitális térhatású 5.1 (IEC958/AC3)"
-#: ../src/modules/alsa/alsa-mixer.c:4040
+#: ../src/modules/alsa/alsa-mixer.c:4016
msgid "Digital Surround 5.1 (IEC958/DTS)"
msgstr "Digitális térhatású 5.1 (IEC958/DTS)"
-#: ../src/modules/alsa/alsa-mixer.c:4041
+#: ../src/modules/alsa/alsa-mixer.c:4017
msgid "Digital Stereo (HDMI)"
msgstr "Digitális térhatású (HDMI)"
-#: ../src/modules/alsa/alsa-mixer.c:4042
+#: ../src/modules/alsa/alsa-mixer.c:4018
msgid "Digital Surround 5.1 (HDMI)"
msgstr "Digitális térhatású 5.1 (HDMI)"
-#: ../src/modules/alsa/alsa-mixer.c:4175
+#: ../src/modules/alsa/alsa-mixer.c:4151
msgid "Analog Mono Duplex"
msgstr "Analóg mono duplex"
-#: ../src/modules/alsa/alsa-mixer.c:4176
+#: ../src/modules/alsa/alsa-mixer.c:4152
msgid "Analog Stereo Duplex"
msgstr "Analóg sztereó duplex"
-#: ../src/modules/alsa/alsa-mixer.c:4177
+#: ../src/modules/alsa/alsa-mixer.c:4153
msgid "Digital Stereo Duplex (IEC958)"
msgstr "Analóg sztereó duplex (IEC958)"
-#: ../src/modules/alsa/alsa-mixer.c:4178
+#: ../src/modules/alsa/alsa-mixer.c:4154
msgid "Multichannel Duplex"
msgstr "Többcsatornás duplex"
-#: ../src/modules/alsa/alsa-mixer.c:4179
+#: ../src/modules/alsa/alsa-mixer.c:4155
#: ../src/modules/alsa/module-alsa-card.c:186
-#: ../src/modules/bluetooth/module-bluez4-device.c:2295
-#: ../src/modules/bluetooth/module-bluez5-device.c:1941
+#: ../src/modules/bluetooth/module-bluez4-device.c:2319
+#: ../src/modules/bluetooth/module-bluez5-device.c:1965
msgid "Off"
msgstr "Kikapcsolva"
-#: ../src/modules/alsa/alsa-mixer.c:4278
+#: ../src/modules/alsa/alsa-mixer.c:4254
#, c-format
msgid "%s Output"
msgstr "%s kimenet"
-#: ../src/modules/alsa/alsa-mixer.c:4286
+#: ../src/modules/alsa/alsa-mixer.c:4262
#, c-format
msgid "%s Input"
msgstr "%s bemenet"
@@ -1028,50 +1034,39 @@ msgstr "Bluetooth kimenet"
msgid "Bluetooth Input"
msgstr "Bluetooth bemenet"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2176
+#: ../src/modules/bluetooth/module-bluez4-device.c:2181
msgid "High Fidelity Playback (A2DP)"
msgstr "Hi-Fi lejátszás (A2DP)"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2187
+#: ../src/modules/bluetooth/module-bluez4-device.c:2193
msgid "High Fidelity Capture (A2DP)"
msgstr "Hi-Fi felvétel (A2DP)"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2198
+#: ../src/modules/bluetooth/module-bluez4-device.c:2205
msgid "Telephony Duplex (HSP/HFP)"
msgstr "Telefon duplex (HSP/HFP)"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2210
+#: ../src/modules/bluetooth/module-bluez4-device.c:2218
msgid "Handsfree Gateway"
msgstr "Kihangosító átjáró"
-#: ../src/modules/bluetooth/module-bluez5-device.c:1786
+#: ../src/modules/bluetooth/module-bluez5-device.c:1790
msgid "High Fidelity Playback (A2DP Sink)"
msgstr "Hi-Fi lejátszás (A2DP bemenet)"
-#: ../src/modules/bluetooth/module-bluez5-device.c:1797
+#: ../src/modules/bluetooth/module-bluez5-device.c:1802
msgid "High Fidelity Capture (A2DP Source)"
msgstr "Hi-Fi felvétel (A2DP forrás)"
-#: ../src/modules/bluetooth/module-bluez5-device.c:1808
+#: ../src/modules/bluetooth/module-bluez5-device.c:1814
msgid "Headset Head Unit (HSP/HFP)"
msgstr "Fejhallgató fejegység (HSP/HFP)"
-#: ../src/modules/bluetooth/module-bluez5-device.c:1820
+#: ../src/modules/bluetooth/module-bluez5-device.c:1827
msgid "Headset Audio Gateway (HSP/HFP)"
msgstr "Fejhallgató hangátjáró (HSP/HFP)"
#: ../src/modules/echo-cancel/module-echo-cancel.c:61
-#| msgid ""
-#| "source_name=<name for the source> source_properties=<properties for the "
-#| "source> source_master=<name of source to filter> sink_name=<name for the "
-#| "sink> sink_properties=<properties for the sink> sink_master=<name of sink "
-#| "to filter> adjust_time=<how often to readjust rates in s> "
-#| "adjust_threshold=<how much drift to readjust after in ms> format=<sample "
-#| "format> rate=<sample rate> channels=<number of channels> "
-#| "channel_map=<channel map> aec_method=<implementation to use> "
-#| "aec_args=<parameters for the AEC engine> save_aec=<save AEC data in /tmp> "
-#| "autoloaded=<set if this module is being loaded automatically> "
-#| "use_volume_sharing=<yes or no> "
msgid ""
"source_name=<name for the source> source_properties=<properties for the "
"source> source_master=<name of source to filter> sink_name=<name for the "
@@ -1100,15 +1095,16 @@ msgstr ""
msgid "On"
msgstr "Be"
+#: ../src/modules/module-allow-passthrough.c:73
+#: ../src/modules/module-always-sink.c:82
+msgid "Dummy Output"
+msgstr "Látszólagos kimenet"
+
#: ../src/modules/module-always-sink.c:36
msgid "Always keeps at least one sink loaded even if it's a null one"
msgstr ""
"Mindig maradjon betöltve legalább egy nyelő, még ha az csak az üres nyelő is"
-#: ../src/modules/module-always-sink.c:82
-msgid "Dummy Output"
-msgstr "Látszólagos kimenet"
-
#: ../src/modules/module-equalizer-sink.c:70
msgid "General Purpose Equalizer"
msgstr "Általános célú hangszínszabályzó"
@@ -1126,7 +1122,7 @@ msgstr ""
"channel_map=<csatornaleképzés> autoloaded=<beállítva, ha ez a modul "
"automatikusan betöltődik> use_volume_sharing=<igen vagy nem>"
-#: ../src/modules/module-filter-apply.c:46
+#: ../src/modules/module-filter-apply.c:47
msgid "autoclean=<automatically unload unused filters?>"
msgstr "autoclean=<nem használt szűrők automatikus eltávolítása?>"
@@ -1417,7 +1413,7 @@ msgstr "Felső hátsó bal"
msgid "Top Rear Right"
msgstr "Felső hátsó jobb"
-#: ../src/pulse/channelmap.c:479 ../src/pulse/format.c:127
+#: ../src/pulse/channelmap.c:479 ../src/pulse/format.c:121
#: ../src/pulse/sample.c:175 ../src/pulse/volume.c:294
#: ../src/pulse/volume.c:320 ../src/pulse/volume.c:340
#: ../src/pulse/volume.c:372 ../src/pulse/volume.c:412
@@ -1461,17 +1457,17 @@ msgstr "az xcb_connection_has_error() igaz értéket adott vissza"
msgid "Failed to parse cookie data"
msgstr "Nem sikerült feldolgozni a süti adatait"
-#: ../src/pulse/context.c:660
+#: ../src/pulse/context.c:702
#, c-format
msgid "fork(): %s"
msgstr "Programindítás: %s"
-#: ../src/pulse/context.c:715
+#: ../src/pulse/context.c:757
#, c-format
msgid "waitpid(): %s"
msgstr "waitpid(): %s"
-#: ../src/pulse/context.c:1421
+#: ../src/pulse/context.c:1463
#, c-format
msgid "Received message for unknown extension '%s'"
msgstr "Üzenet érkezett az ismeretlen „%s” kiterjesztéstől"
@@ -1516,12 +1512,12 @@ msgstr "nem"
msgid "Cannot access autospawn lock."
msgstr "Nem érhető zárolás az automatikus indításhoz."
-#: ../src/pulsecore/log.c:154
+#: ../src/pulsecore/log.c:165
#, c-format
msgid "Failed to open target file '%s'."
msgstr "Nem sikerült megnyitni a cél „%s” fájlt."
-#: ../src/pulsecore/log.c:177
+#: ../src/pulsecore/log.c:188
#, c-format
msgid ""
"Tried to open target file '%s', '%s.1', '%s.2' ... '%s.%d', but all failed."
@@ -1529,15 +1525,15 @@ msgstr ""
"Kísérlet történt a cél fájlok megnyitására: „%s”, „%s.1”, „%s.2” ... „%s."
"%d”, de mind meghiúsult."
-#: ../src/pulsecore/log.c:640
+#: ../src/pulsecore/log.c:651
msgid "Invalid log target."
msgstr "Érvénytelen naplózási cél."
-#: ../src/pulsecore/sink.c:3460
+#: ../src/pulsecore/sink.c:3459
msgid "Built-in Audio"
msgstr "Belső hangforrás"
-#: ../src/pulsecore/sink.c:3465
+#: ../src/pulsecore/sink.c:3464
msgid "Modem"
msgstr "Modem"
@@ -1674,42 +1670,6 @@ msgstr "%0.1f KiB"
msgid "%u B"
msgstr "%u B"
-# Ez egy unit teszt program. Senki nem fogja látni. Fordíthatósága inkább bug.
-#: ../src/tests/resampler-test.c:255
-#, c-format
-msgid ""
-"%s [options]\n"
-"\n"
-"-h, --help Show this help\n"
-"-v, --verbose Print debug messages\n"
-" --from-rate=SAMPLERATE From sample rate in Hz (defaults to "
-"44100)\n"
-" --from-format=SAMPLEFORMAT From sample type (defaults to s16le)\n"
-" --from-channels=CHANNELS From number of channels (defaults to "
-"1)\n"
-" --to-rate=SAMPLERATE To sample rate in Hz (defaults to "
-"44100)\n"
-" --to-format=SAMPLEFORMAT To sample type (defaults to s16le)\n"
-" --to-channels=CHANNELS To number of channels (defaults to 1)\n"
-" --resample-method=METHOD Resample method (defaults to auto)\n"
-" --seconds=SECONDS From stream duration (defaults to 60)\n"
-"\n"
-"If the formats are not specified, the test performs all formats "
-"combinations,\n"
-"back and forth.\n"
-"\n"
-"Sample type must be one of s16le, s16be, u8, float32le, float32be, ulaw, "
-"alaw,\n"
-"s24le, s24be, s24-32le, s24-32be, s32le, s32be (defaults to s16ne)\n"
-"\n"
-"See --dump-resample-methods for possible values of resample methods.\n"
-msgstr ""
-
-#: ../src/tests/resampler-test.c:353
-#, c-format
-msgid "%s %s\n"
-msgstr "%s %s\n"
-
#: ../src/utils/pacat.c:117
#, c-format
msgid "Failed to drain stream: %s"
@@ -3257,241 +3217,3 @@ msgstr "Nem sikerült betölteni a sütiadatokat\n"
#, c-format
msgid "Not yet implemented.\n"
msgstr "Még nincs elkészítve.\n"
-
-#~ msgid "Got signal %s."
-#~ msgstr "Szignál: %s."
-
-#~ msgid "Exiting."
-#~ msgstr "Kilépés."
-
-#~ msgid "Found user '%s' (UID %lu) and group '%s' (GID %lu)."
-#~ msgstr "Létező felhasználó „%s” (UID: %lu) és csoport „%s” (GID: %lu)."
-
-#~ msgid "Successfully dropped root privileges."
-#~ msgstr "A rendszergazdai jogosultságok sikeresen visszaadva."
-
-#~ msgid "setrlimit(%s, (%u, %u)) failed: %s"
-#~ msgstr "setrlimit(%s, (%u, %u)) meghiúsult: %s"
-
-#~ msgid "Daemon not running"
-#~ msgstr "A démon nem fut."
-
-#~ msgid "Daemon running as PID %u"
-#~ msgstr "A démon a következő PID azonosítóval fut: %u"
-
-#~ msgid "Daemon startup successful."
-#~ msgstr "A démon sikeresen elindult."
-
-#~ msgid "This is PulseAudio %s"
-#~ msgstr "PulseAudio %s"
-
-#~ msgid "Compilation host: %s"
-#~ msgstr "Összeépítő számítógép: %s"
-
-#~ msgid "Compilation CFLAGS: %s"
-#~ msgstr "Összeépítési CFLAGS jelzők: %s"
-
-#~ msgid "Running on host: %s"
-#~ msgstr "Kiszolgáló: %s"
-
-#~ msgid "Found %u CPUs."
-#~ msgstr "%u CPU található a rendszerben."
-
-#~ msgid "Page size is %lu bytes"
-#~ msgstr "Oldalméret: %lu bájt"
-
-#~ msgid "Compiled with Valgrind support: yes"
-#~ msgstr "Összeépítés Valgrind támogatással: Igen"
-
-#~ msgid "Compiled with Valgrind support: no"
-#~ msgstr "Összeépítés Valgrind támogatással: Nem"
-
-#~ msgid "Running in valgrind mode: %s"
-#~ msgstr "Futás Valgrind üzemmódban: %s"
-
-#, fuzzy
-#~ msgid "Running in VM: %s"
-#~ msgstr "Kiszolgáló: %s"
-
-#~ msgid "Optimized build: yes"
-#~ msgstr "Optimalizált összeépítés: Igen"
-
-#~ msgid "Optimized build: no"
-#~ msgstr "Optimalizált összeépítés: Nem"
-
-#~ msgid "NDEBUG defined, all asserts disabled."
-#~ msgstr "NDEBUG megadva, minden érvényesítés letiltva."
-
-#~ msgid "FASTPATH defined, only fast path asserts disabled."
-#~ msgstr ""
-#~ "FASTPATH megadva, így csak a gyors útvonal-érvényesítés lesz letiltva."
-
-#~ msgid "All asserts enabled."
-#~ msgstr "Minden érvényesítés engedélyezve."
-
-#~ msgid "Machine ID is %s."
-#~ msgstr "Számítógép-azonosító: %s."
-
-#~ msgid "Session ID is %s."
-#~ msgstr "Munkamenet-azonosító: %s."
-
-#~ msgid "Using runtime directory %s."
-#~ msgstr "A futásidőben használt mappa: %s."
-
-#~ msgid "Using state directory %s."
-#~ msgstr "Az állapottároló mappa: %s."
-
-#~ msgid "Using modules directory %s."
-#~ msgstr "A modulok mappája: %s."
-
-#~ msgid "Running in system mode: %s"
-#~ msgstr "Futás rendszer üzemmódban: %s"
-
-#~ msgid "Fresh high-resolution timers available! Bon appetit!"
-#~ msgstr "A nagypontosságú időzítők elérhetőek."
-
-#~ msgid ""
-#~ "Dude, your kernel stinks! The chef's recommendation today is Linux with "
-#~ "high-resolution timers enabled!"
-#~ msgstr ""
-#~ "A nagypontosságú időzítők nem érhetőek el. Napjaink Linux rendszereiben "
-#~ "érdemes engedélyezni a nagypontosságú időzítőket."
-
-#~ msgid "Daemon startup complete."
-#~ msgstr "A démon elindítása sikeres."
-
-#~ msgid "Daemon shutdown initiated."
-#~ msgstr "A démon leállítása kezdeményezve."
-
-#~ msgid "Daemon terminated."
-#~ msgstr "A démon leállítva."
-
-#~ msgid "Cleaning up privileges."
-#~ msgstr "Jogosultságok letisztázása."
-
-#, fuzzy
-#~ msgid "PulseAudio Sound System KDE Routing Policy"
-#~ msgstr "PulseAudio hangrendszer"
-
-#, fuzzy
-#~ msgid "Start the PulseAudio Sound System with KDE Routing Policy"
-#~ msgstr "A PulseAudio hangrendszer elindítása"
-
-#~ msgid "No cookie loaded. Attempting to connect without."
-#~ msgstr ""
-#~ "Nincs betölthető süti. Kísérlet a kapcsolat felvételére sütik használata "
-#~ "nélkül."
-
-#~ msgid "Failed to load client configuration file.\n"
-#~ msgstr "Nem sikerült betölteni a kliens konfigurációs fájlt.\n"
-
-#~ msgid "Failed to read environment configuration data.\n"
-#~ msgstr "Nem sikerült elolvasni a környezetváltozó konfigurációs adatokat.\n"
-
-#~ msgid "[%s:%u] rlimit not supported on this platform."
-#~ msgstr "[%s:%u] Az rlimit nem támogatott ezen az operációs rendszeren."
-
-#~ msgid "XOpenDisplay() failed"
-#~ msgstr "Az XOpenDisplay() függvényhívás meghiúsult."
-
-#~ msgid ""
-#~ "Source Output #%u\n"
-#~ "\tDriver: %s\n"
-#~ "\tOwner Module: %s\n"
-#~ "\tClient: %s\n"
-#~ "\tSource: %u\n"
-#~ "\tSample Specification: %s\n"
-#~ "\tChannel Map: %s\n"
-#~ "\tBuffer Latency: %0.0f usec\n"
-#~ "\tSource Latency: %0.0f usec\n"
-#~ "\tResample method: %s\n"
-#~ "\tProperties:\n"
-#~ "\t\t%s\n"
-#~ msgstr ""
-#~ "Forrás kimenet #%u\n"
-#~ "\tEszközmeghajtó: %s\n"
-#~ "\tTulajdonos modul: %s\n"
-#~ "\tKliens: %s\n"
-#~ "\tForrás: %u\n"
-#~ "\tMintavételi leírás: %s\n"
-#~ "\tCsatornaleképzés: %s\n"
-#~ "\tPuffer késleltetés: %0.0f usec\n"
-#~ "\tForrás késleltetés: %0.0f usec\n"
-#~ "\tÚjramintavételezési eljárás: %s\n"
-#~ "\tTulajdonságok:\n"
-#~ "\t\t%s\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "%s [options] stat\n"
-#~ "%s [options] list\n"
-#~ "%s [options] exit\n"
-#~ "%s [options] upload-sample FILENAME [NAME]\n"
-#~ "%s [options] play-sample NAME [SINK]\n"
-#~ "%s [options] remove-sample NAME\n"
-#~ "%s [options] move-sink-input SINKINPUT SINK\n"
-#~ "%s [options] move-source-output SOURCEOUTPUT SOURCE\n"
-#~ "%s [options] load-module NAME [ARGS ...]\n"
-#~ "%s [options] unload-module MODULE\n"
-#~ "%s [options] suspend-sink SINK 1|0\n"
-#~ "%s [options] suspend-source SOURCE 1|0\n"
-#~ "%s [options] set-card-profile CARD PROFILE\n"
-#~ "%s [options] set-sink-port SINK PORT\n"
-#~ "%s [options] set-source-port SOURCE PORT\n"
-#~ "%s [options] set-sink-volume SINK VOLUME\n"
-#~ "%s [options] set-source-volume SOURCE VOLUME\n"
-#~ "%s [options] set-sink-input-volume SINKINPUT VOLUME\n"
-#~ "%s [options] set-sink-mute SINK 1|0\n"
-#~ "%s [options] set-source-mute SOURCE 1|0\n"
-#~ "%s [options] set-sink-input-mute SINKINPUT 1|0\n"
-#~ "%s [options] subscribe\n"
-#~ "\n"
-#~ " -h, --help Show this help\n"
-#~ " --version Show version\n"
-#~ "\n"
-#~ " -s, --server=SERVER The name of the server to connect "
-#~ "to\n"
-#~ " -n, --client-name=NAME How to call this client on the "
-#~ "server\n"
-#~ msgstr ""
-#~ "%s [options] stat\n"
-#~ "%s [options] list\n"
-#~ "%s [options] exit\n"
-#~ "%s [options] upload-sample FÁJLNÉV [NÉV]\n"
-#~ "%s [options] play-sample NÉV [NYELŐ]\n"
-#~ "%s [options] remove-sample NÉV\n"
-#~ "%s [options] move-sink-input NYELŐBEMENET NYELŐ\n"
-#~ "%s [options] move-source-output FORRÁSKIMENET FORRÁS\n"
-#~ "%s [options] load-module NÉV [PARAMÉTEREK ...]\n"
-#~ "%s [options] unload-module MODUL\n"
-#~ "%s [options] suspend-sink NYELŐ 1|0\n"
-#~ "%s [options] suspend-source FORRÁS 1|0\n"
-#~ "%s [options] set-card-profile KÁRTYA PROFIL\n"
-#~ "%s [options] set-sink-port NYELŐ PORT\n"
-#~ "%s [options] set-source-port FORRÁS PORT\n"
-#~ "%s [options] set-sink-volume NYELŐ HANGERŐ\n"
-#~ "%s [options] set-source-volume FORRÁS HANGERŐ\n"
-#~ "%s [options] set-sink-input-volume NYELŐBEMENET HANGERŐ\n"
-#~ "%s [options] set-sink-mute NYELŐ 1|0\n"
-#~ "%s [options] set-source-mute FORRÁS 1|0\n"
-#~ "%s [options] set-sink-input-mute NYELŐBEMENET 1|0\n"
-#~ "\n"
-#~ " -h, --help Megjeleníti ezt a súgót\n"
-#~ " --version Az alkalmazás verziószámának "
-#~ "megjelenítése\n"
-#~ "\n"
-#~ " -s, --server=KISZOLGÁLÓ Kapcsolódás a megadott "
-#~ "KISZOLGÁLÓ kiszolgálóhoz\n"
-#~ " -n, --client-name=NÉV A kliens neve ezen a szerveren\n"
-
-#~ msgid "%s+%s"
-#~ msgstr "%s+%s"
-
-#~ msgid "%s / %s"
-#~ msgstr "%s / %s"
-
-#~ msgid "Digital Surround 4.0 (IEC958)"
-#~ msgstr "Digitális térhatású 4.0 (IEC958)"
-
-#~ msgid "Low Frequency Emmiter"
-#~ msgstr "Mély-hangszóró (LFE)"
diff --git a/po/ko.po b/po/ko.po
index 9fd5940..7e2e5c8 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
# eukim <eukim at redhat.com>, 2013. #zanata
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: pulseaudio\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-08-06 14:45+0530\n"
"MIME-Version: 1.0\n"
@@ -2124,7 +2124,7 @@ msgid "server"
msgstr "서버 "
#: ../src/utils/pactl.c:1100
-#, c-format
+#, fuzzy, c-format
msgid "Event '%s' on %s #%u\n"
msgstr "%s #%u에서 이벤트 '%s'\n"
diff --git a/po/oc.po b/po/oc.po
index 3269a66..4a65fb5 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -1,33 +1,31 @@
# French translation of pulseaudio.
# Copyright (C) 2006-2008 Lennart Poettering
# This file is distributed under the same license as the pulseaudio package.
-#
-#
# Robert-André Mauchin <zebob.m at pengzone.org>, 2008.
# Michaël Ughetto <telimektar esraonline com>, 2008.
# Pablo Martin-Gomez <pablo.martin-gomez at laposte.net>, 2008.
# Corentin Perard <corentin.perard at gmail.com>, 2009.
# Thomas Canniot <mrtom at fedoraproject.org>, 2009, 2012.
# Cédric Valmary (Tot en Òc) <cvalmary at yahoo.fr>, 2015.
+# Cédric Valmary (totenoc.eu) <cvalmary at yahoo.fr>, 2016.
msgid ""
msgstr ""
"Project-Id-Version: pulseaudio trunk\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2015-04-20 16:00+0000\n"
-"PO-Revision-Date: 2015-05-22 09:14+0200\n"
-"Last-Translator: Cédric Valmary (Tot en Òc) <cvalmary at yahoo.fr>\n"
-"Language-Team: www.totenoc.eu\n"
+"POT-Creation-Date: 2016-09-19 19:24+0000\n"
+"PO-Revision-Date: 2016-10-12 22:20+0200\n"
+"Last-Translator: Cédric Valmary (totenoc.eu) <cvalmary at yahoo.fr>\n"
+"Language-Team: Tot En Òc\n"
"Language: oc\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Virtaal 0.7.0\n"
-"X-Launchpad-Export-Date: 2015-05-21 17:32+0000\n"
+"X-Generator: Virtaal 0.7.1\n"
+"X-Launchpad-Export-Date: 2016-10-12 20:12+0000\n"
-#: ../src/daemon/cmdline.c:111
+#: ../src/daemon/cmdline.c:113
#, c-format
-#, fuzzy, c-format
msgid ""
"%s [options]\n"
"\n"
@@ -85,6 +83,7 @@ msgid ""
" --no-cpu-limit[=BOOL] Do not install CPU load limiter on\n"
" platforms that support it.\n"
" --disable-shm[=BOOL] Disable shared memory support.\n"
+" --enable-memfd[=BOOL] Enable memfd shared memory support.\n"
"\n"
"STARTUP SCRIPT:\n"
" -L, --load=\"MODULE ARGUMENTS\" Load the specified plugin module "
@@ -97,105 +96,16 @@ msgid ""
"\n"
" -n Don't load default script file\n"
msgstr ""
-"%s [options]\n"
-"\n"
-"COMANDAS :\n"
-" -h, --help Aficha cette aide\n"
-" --version Aficha la version\n"
-" --dump-conf Aficha la configuration par défaut\n"
-" --dump-modules Aficha la liste des moduls "
-"disponibles\n"
-" --dump-resample-methods Aficha la liste des méthodes "
-"d'escandalhatgenage disponibles\n"
-" --cleanup-shm Nettoie les segments de mémoire "
-"partagée périmés\n"
-" --start Démarre lo demòni s'il n'est pas "
-"lancé\n"
-" -k --kill Tue un demòni en cours d'exécution\n"
-" --check Vérifie s'il existe un demòni en "
-"cours d'exécution (ne retourne que lo code de sortida)\n"
-"\n"
-"OPCIONS :\n"
-" --system[=BOOL] Exécuter en tant qu'instance système\n"
-" -D, --daemonize[=BOOL] Définir en tant que demòni après lo "
-"démarrage\n"
-" --fail[=BOOL] Quitte quand lo démarrage échoue\n"
-" --high-priority[=BOOL] Tente de définir un niveau nice plus "
-"élevé\n"
-" (seulement disponible en tant que "
-"root, avec lo SUID ou\n"
-" avec un RLIMIT_NICE élevé)\n"
-" --realtime[=BOOL] Tente d'activer une planification en "
-"temps réel\n"
-" (seulement disponible en tant que "
-"root, avec lo SUID ou\n"
-" ave un RLIMIT_RTPRIO élevé)\n"
-" --disallow-module-loading[=BOOL] Empêche les "
-"chargements/déchargements de modul\n"
-" demandés par l'utilisateur après lo "
-"démarrage\n"
-" --disallow-exit[=BOOL] Empêche les fermetures demandées par "
-"l'utilisateur\n"
-" --exit-idle-time=SECS Termine lo demòni quand la durada "
-"d'inactivité \n"
-" et ce temps se sont écoulés\n"
-" --module-idle-time=SECS Décharge les moduls chargés "
-"automatiquement \n"
-" quand la durada d'inactivité et ce "
-"temps se sont écoulés\n"
-" --scache-idle-time=SECS Décharge les escandalhatges chargés "
-"automatiquement \n"
-" quand la durada d'inactivité et ce "
-"temps se sont écoulés\n"
-" --log-level[=NIVEAU] Augmente ou définit lo niveau de "
-"verbosité\n"
-" -v Augmente lo niveau de verbosité\n"
-" --log-target={auto,syslog,stderr} Indique la cible du journal\n"
-" --log-meta[=BOOL] Inclure la position du code dans les "
-"messages ·du journal\n"
-" --log-time[=BOOL] Inclure la date dans les messages du "
-"journal\n"
-" --log-backtrace=TRAMES Inclure un traçage de la pile dans "
-"les messages du journal\n"
-" -p, --dl-search-path=CHEMIN Définit lo chemin de recherche pour "
-"les objets dynamiques\n"
-" partagés (extensions)\n"
-" --resample-method=MÉTHODE Utilise la méthode de "
-"réescandalhatgenage indiquée\n"
-" (Voir --dump-resample-methods pour\n"
-" les valeurs possibles)\n"
-" --use-pid-file[=BOOL] Crée un fichier PID\n"
-" --no-cpu-limit[=BOOL] Ne pas installer de limiteur de "
-"charge CPU\n"
-" sur les plateformes qui lo "
-"supportent.\n"
-" --disable-shm[=BOOL] Désactive la prise en charge de la "
-"mémoire partagée.\n"
-"\n"
-"SCRIPT DE DÉMARRAGE :\n"
-" -L, --load=\"PARAMÈTRES DU MODULE\" Charge lo modul d'extension indiqué "
-"avec\n"
-" lo paramètre indiqué\n"
-" -F, --file=NOMDEFICHIER Exécute lo script indiqué\n"
-" -C Ouvre une ligne de commande sur lo "
-"TTY en cours \n"
-" après lo démarrage\n"
-"\n"
-" -n Ne pas charger les fichiers de "
-"scripts par défaut\n"
-#: ../src/daemon/cmdline.c:243
-#, fuzzy
+#: ../src/daemon/cmdline.c:246
msgid "--daemonize expects boolean argument"
msgstr "--daemonize requerís un paramètre boolean"
-#: ../src/daemon/cmdline.c:251
-#, fuzzy
+#: ../src/daemon/cmdline.c:254
msgid "--fail expects boolean argument"
msgstr "--fail requerís un paramètre boolean"
-#: ../src/daemon/cmdline.c:262
-#, fuzzy
+#: ../src/daemon/cmdline.c:265
msgid ""
"--log-level expects log level argument (either numeric in range 0..4 or one "
"of debug, info, notice, warn, error)."
@@ -203,146 +113,135 @@ msgstr ""
"--log-level requesís un paramètre de nivèl de jornal (siá numeric entre 0 e "
"4, siá de desbugatge : info, notice, warn , error)."
-#: ../src/daemon/cmdline.c:274
-#, fuzzy
+#: ../src/daemon/cmdline.c:277
msgid "--high-priority expects boolean argument"
msgstr "--high-priority requerís un paramètre boolean"
-#: ../src/daemon/cmdline.c:282
-#, fuzzy
+#: ../src/daemon/cmdline.c:285
msgid "--realtime expects boolean argument"
msgstr "--realtime requerís un paramètre boolean"
-#: ../src/daemon/cmdline.c:290
-#, fuzzy
+#: ../src/daemon/cmdline.c:293
msgid "--disallow-module-loading expects boolean argument"
msgstr "--disallow-module-loading requerís un paramètre boolean"
-#: ../src/daemon/cmdline.c:298
-#, fuzzy
+#: ../src/daemon/cmdline.c:301
msgid "--disallow-exit expects boolean argument"
msgstr "--disallow-exit requerís un paramètre boolean"
-#: ../src/daemon/cmdline.c:306
-#, fuzzy
+#: ../src/daemon/cmdline.c:309
msgid "--use-pid-file expects boolean argument"
msgstr "--use-pid-file requerís un paramètre boolean"
-#: ../src/daemon/cmdline.c:325
-#, fuzzy
+#: ../src/daemon/cmdline.c:328
msgid ""
"Invalid log target: use either 'syslog', 'journal','stderr' or 'auto' or a "
"valid file name 'file:<path>', 'newfile:<path>'."
msgstr ""
-"Cible du journal invalide : utilisez « syslog », « stderr » ou « auto »."
-#: ../src/daemon/cmdline.c:327
-#, fuzzy
+#: ../src/daemon/cmdline.c:330
msgid ""
"Invalid log target: use either 'syslog', 'stderr' or 'auto' or a valid file "
"name 'file:<path>', 'newfile:<path>'."
msgstr ""
-"Cible du journal invalide : utilisez « syslog », « stderr » ou « auto »."
+"Cibla de jornal invalida : utilizatz « syslog », « stderr » o « auto », o un "
+"nom de fichièr valid « fichièr:<camin> », « fichièr_novèl:<camin> »."
-#: ../src/daemon/cmdline.c:335
-#, fuzzy
+#: ../src/daemon/cmdline.c:338
msgid "--log-time expects boolean argument"
msgstr "--log-time requerís un paramètre boolean"
-#: ../src/daemon/cmdline.c:343
-#, fuzzy
+#: ../src/daemon/cmdline.c:346
msgid "--log-meta expects boolean argument"
msgstr "--log-meta requerís un paramètre boolean"
-#: ../src/daemon/cmdline.c:363
-#, c-format, fuzzy
+#: ../src/daemon/cmdline.c:366
+#, c-format
msgid "Invalid resample method '%s'."
msgstr "Metòde de reescandalhatge invalid « %s »."
-#: ../src/daemon/cmdline.c:370
-#, fuzzy
+#: ../src/daemon/cmdline.c:373
msgid "--system expects boolean argument"
msgstr "--system requerís un paramètre boolean"
-#: ../src/daemon/cmdline.c:378
-#, fuzzy
+#: ../src/daemon/cmdline.c:381
msgid "--no-cpu-limit expects boolean argument"
msgstr "--no-cpu-limit requerís un paramètre boolean"
-#: ../src/daemon/cmdline.c:386
-#, fuzzy
+#: ../src/daemon/cmdline.c:389
msgid "--disable-shm expects boolean argument"
msgstr "--disable-shm requerís un paramètre boolean"
-# dans les lignes suivantes [%s = nom de fichier: %u = ligne dans celui-ci]
-#: ../src/daemon/daemon-conf.c:258
-#, c-format, fuzzy
+#: ../src/daemon/cmdline.c:397
+msgid "--enable-memfd expects boolean argument"
+msgstr ""
+
+#: ../src/daemon/daemon-conf.c:260
+#, c-format
msgid "[%s:%u] Invalid log target '%s'."
msgstr "[%s:%u] Cibla del jornal « %s » invalida."
-#: ../src/daemon/daemon-conf.c:273
-#, c-format, fuzzy
+#: ../src/daemon/daemon-conf.c:275
+#, c-format
msgid "[%s:%u] Invalid log level '%s'."
msgstr "[%s:%u] Nivèl del jornal « %s » invalid."
-#: ../src/daemon/daemon-conf.c:288
-#, c-format, fuzzy
+#: ../src/daemon/daemon-conf.c:290
+#, c-format
msgid "[%s:%u] Invalid resample method '%s'."
msgstr "[%s:%u] Metòde de reescandalhatge « %s » invalid."
-#: ../src/daemon/daemon-conf.c:310
-#, c-format, fuzzy
+#: ../src/daemon/daemon-conf.c:312
+#, c-format
msgid "[%s:%u] Invalid rlimit '%s'."
msgstr "[%s:%u] rlimit « %s » invalid."
-#: ../src/daemon/daemon-conf.c:330
-#, c-format, fuzzy
+#: ../src/daemon/daemon-conf.c:332
+#, c-format
msgid "[%s:%u] Invalid sample format '%s'."
msgstr "[%s:%u] Format d'escandalhatge « %s » invalid."
-#: ../src/daemon/daemon-conf.c:347 ../src/daemon/daemon-conf.c:364
-#, c-format, fuzzy
+#: ../src/daemon/daemon-conf.c:349 ../src/daemon/daemon-conf.c:366
+#, c-format
msgid "[%s:%u] Invalid sample rate '%s'."
msgstr "[%s:%u] Taus d'escandalhatge « %s » invalid."
-#: ../src/daemon/daemon-conf.c:387
-#, c-format, fuzzy
+#: ../src/daemon/daemon-conf.c:389
+#, c-format
msgid "[%s:%u] Invalid sample channels '%s'."
msgstr "[%s:%u] Canals d'escandalhatge « %s » invalid."
-#: ../src/daemon/daemon-conf.c:404
-#, c-format, fuzzy
+#: ../src/daemon/daemon-conf.c:406
+#, c-format
msgid "[%s:%u] Invalid channel map '%s'."
msgstr "[%s:%u] Plan de canals « %s » invalid."
-#: ../src/daemon/daemon-conf.c:421
-#, c-format, fuzzy
+#: ../src/daemon/daemon-conf.c:423
+#, c-format
msgid "[%s:%u] Invalid number of fragments '%s'."
msgstr "[%s:%u] Nombre de fragments « %s » invalid."
-#: ../src/daemon/daemon-conf.c:438
-#, c-format, fuzzy
+#: ../src/daemon/daemon-conf.c:440
+#, c-format
msgid "[%s:%u] Invalid fragment size '%s'."
msgstr "[%s:%u] Talha del fragment « %s » invalida."
-#: ../src/daemon/daemon-conf.c:455
-#, c-format, fuzzy
+#: ../src/daemon/daemon-conf.c:457
+#, c-format
msgid "[%s:%u] Invalid nice level '%s'."
msgstr "[%s:%u] Nivèl de prioritat (nice) « %s » invalid."
-#: ../src/daemon/daemon-conf.c:498
+#: ../src/daemon/daemon-conf.c:500
#, c-format
-#, fuzzy, c-format
msgid "[%s:%u] Invalid server type '%s'."
-msgstr "[%s:%u] Taux d'escandalhatgenage « %s » invalide."
+msgstr "[%s:%u] Tipe de servidor invalid '%s'."
-#: ../src/daemon/daemon-conf.c:611
-#, c-format, fuzzy
+#: ../src/daemon/daemon-conf.c:615
+#, c-format
msgid "Failed to open configuration file: %s"
msgstr "Fracàs al moment de la dobertura del fichièr de configuracion : %s"
-#: ../src/daemon/daemon-conf.c:627
-#, fuzzy
+#: ../src/daemon/daemon-conf.c:631
msgid ""
"The specified default channel map has a different number of channels than "
"the specified default number of channels."
@@ -350,124 +249,118 @@ msgstr ""
"Lo plan de canals especificat per defaut a un nombre de canals diferent del "
"nombre especificat per defaut."
-#: ../src/daemon/daemon-conf.c:714
-#, c-format, fuzzy
+#: ../src/daemon/daemon-conf.c:718
+#, c-format
msgid "### Read from configuration file: %s ###\n"
msgstr "### Lectura a partir del fichièr de configuracion : %s ###\n"
#: ../src/daemon/dumpmodules.c:57
-#, c-format, fuzzy
+#, c-format
msgid "Name: %s\n"
msgstr "Nom : %s\n"
#: ../src/daemon/dumpmodules.c:60
-#, c-format, fuzzy
+#, c-format
msgid "No module information available\n"
msgstr "Pas cap d'entresenha de modul disponibla\n"
#: ../src/daemon/dumpmodules.c:63
-#, c-format, fuzzy
+#, c-format
msgid "Version: %s\n"
msgstr "Version : %s\n"
#: ../src/daemon/dumpmodules.c:65
-#, c-format, fuzzy
+#, c-format
msgid "Description: %s\n"
msgstr "Descripcion : %s\n"
#: ../src/daemon/dumpmodules.c:67
-#, c-format, fuzzy
+#, c-format
msgid "Author: %s\n"
msgstr "Autor : %s\n"
#: ../src/daemon/dumpmodules.c:69
-#, c-format, fuzzy
+#, c-format
msgid "Usage: %s\n"
msgstr "Utilizacion : %s\n"
#: ../src/daemon/dumpmodules.c:70
-#, c-format, fuzzy
+#, c-format
msgid "Load Once: %s\n"
msgstr "Cargament unic : %s\n"
#: ../src/daemon/dumpmodules.c:72
-#, c-format, fuzzy
+#, c-format
msgid "DEPRECATION WARNING: %s\n"
msgstr "AVERTIMENT D'OBSOLESCÉNCIA : %s\n"
#: ../src/daemon/dumpmodules.c:76
-#, c-format, fuzzy
+#, c-format
msgid "Path: %s\n"
msgstr "Camin : %s\n"
#: ../src/daemon/ltdl-bind-now.c:75
#, c-format
-#, fuzzy, c-format
msgid "Failed to open module %s: %s"
-msgstr "Échec lors de l'ouverture du fichier « %s »\n"
+msgstr "Impossible de dobrir lo modul %s : %s"
#: ../src/daemon/ltdl-bind-now.c:126
-#, fuzzy
msgid "Failed to find original lt_dlopen loader."
msgstr "Fracàs al moment de la recèrca del cargador lt_dlopen original."
#: ../src/daemon/ltdl-bind-now.c:131
-#, fuzzy
msgid "Failed to allocate new dl loader."
msgstr "Fracàs al moment de l'atribucion del cargador dl novèl."
#: ../src/daemon/ltdl-bind-now.c:144
-#, fuzzy
msgid "Failed to add bind-now-loader."
msgstr "Fracàs al moment de l'apondon del cargador bind-now."
#: ../src/daemon/main.c:161
-#, c-format, fuzzy
+#, c-format
msgid "Failed to find user '%s'."
msgstr "Impossible de trobar l'utilizaire « %s »."
#: ../src/daemon/main.c:166
-#, c-format, fuzzy
+#, c-format
msgid "Failed to find group '%s'."
msgstr "Impossible de trobar lo grop « %s »."
#: ../src/daemon/main.c:175
-#, c-format, fuzzy
+#, c-format
msgid "GID of user '%s' and of group '%s' don't match."
msgstr "Lo GID de l'utilizaire « %s » e del grop « %s » son pas identics."
#: ../src/daemon/main.c:180
-#, c-format, fuzzy
+#, c-format
msgid "Home directory of user '%s' is not '%s', ignoring."
msgstr "Lo dorsièr personal de l'utilizaire « %s » es pas « %s », ignorat."
#: ../src/daemon/main.c:183 ../src/daemon/main.c:188
-#, c-format, fuzzy
+#, c-format
msgid "Failed to create '%s': %s"
msgstr "Impossible de crear « %s » : %s"
#: ../src/daemon/main.c:195
-#, c-format, fuzzy
+#, c-format
msgid "Failed to change group list: %s"
msgstr "Fracàs al moment del cambiament de la lista del grop : %s"
#: ../src/daemon/main.c:211
-#, c-format, fuzzy
+#, c-format
msgid "Failed to change GID: %s"
msgstr "Fracàs al moment del cambiament de GID : %s"
#: ../src/daemon/main.c:227
-#, c-format, fuzzy
+#, c-format
msgid "Failed to change UID: %s"
msgstr "Fracàs al moment del cambiament d'UID : %s"
#: ../src/daemon/main.c:256
-#, fuzzy
msgid "System wide mode unsupported on this platform."
msgstr "Mòde sistèma espandit pas pres en carga sus aquela plataforma."
#: ../src/daemon/main.c:494
-#, fuzzy
msgid "Failed to parse command line."
msgstr "Fracàs al moment de l'analisi de la linha de comanda"
@@ -480,12 +373,11 @@ msgstr ""
"servici de recèrca del servidor D-Bus unicament."
#: ../src/daemon/main.c:632
-#, c-format, fuzzy
+#, c-format
msgid "Failed to kill daemon: %s"
msgstr "Impossible de tuar lo demòni : %s"
#: ../src/daemon/main.c:661
-#, fuzzy
msgid ""
"This program is not intended to be run as root (unless --system is "
"specified)."
@@ -494,12 +386,10 @@ msgstr ""
"system es entresenhat)."
#: ../src/daemon/main.c:664
-#, fuzzy
msgid "Root privileges required."
msgstr "Los privilègis root son necessaris."
#: ../src/daemon/main.c:671
-#, fuzzy
msgid "--start not supported for system instances."
msgstr "--start es pas pres en carga per las instàncias del sistèma."
@@ -507,73 +397,62 @@ msgstr "--start es pas pres en carga per las instàncias del sistèma."
#, c-format
msgid "User-configured server at %s, refusing to start/autospawn."
msgstr ""
+"Lo servidor configurat per un utilizaire a l'adreça %s refusa d'aviar/de se "
+"lançar automaticament."
#: ../src/daemon/main.c:717
#, c-format
msgid ""
"User-configured server at %s, which appears to be local. Probing deeper."
msgstr ""
+"Servidor configurat per l'utilizaire a l'adreça %s, que sembla èsser local. "
+"Examèn mai aprigondit."
#: ../src/daemon/main.c:722
-#, fuzzy
-msgid "Running in system mode, but --disallow-exit not set!"
+msgid "Running in system mode, but --disallow-exit not set."
msgstr ""
-"Lo demòni s'executa en mòde sistèma, mas --disallow-exit es pas definit."
#: ../src/daemon/main.c:725
-#, fuzzy
-msgid "Running in system mode, but --disallow-module-loading not set!"
+msgid "Running in system mode, but --disallow-module-loading not set."
msgstr ""
-"Lo demòni s'executa en mòde sistèma, mas --disallow-module-loading es pas "
-"definit."
#: ../src/daemon/main.c:728
-#, fuzzy
-msgid "Running in system mode, forcibly disabling SHM mode!"
+msgid "Running in system mode, forcibly disabling SHM mode."
msgstr ""
-"Lo demòni s'executa en mòde sistèma, desactivacion forçada del mòde SHM."
#: ../src/daemon/main.c:733
-#, fuzzy
-msgid "Running in system mode, forcibly disabling exit idle time!"
+msgid "Running in system mode, forcibly disabling exit idle time."
msgstr ""
-"Lo demòni s'executa en mòde sistèma, desactivacion forçada de la tampadura "
-"aprèp relambi d'inactivitat."
#: ../src/daemon/main.c:766
-#, fuzzy
msgid "Failed to acquire stdio."
msgstr "Fracàs al moment de l'aquisicion de stdio."
#: ../src/daemon/main.c:772 ../src/daemon/main.c:843
#, c-format
-#, fuzzy, c-format
msgid "pipe() failed: %s"
-msgstr "Échec du tube : %s"
+msgstr "pipe() a fracassat : %s"
#: ../src/daemon/main.c:777 ../src/daemon/main.c:848
-#, c-format, fuzzy
+#, c-format
msgid "fork() failed: %s"
msgstr "fracàs de « fork » : %s"
-#: ../src/daemon/main.c:792 ../src/daemon/main.c:863 ../src/utils/pacat.c:567
-#, c-format, fuzzy
+#: ../src/daemon/main.c:792 ../src/daemon/main.c:863 ../src/utils/pacat.c:568
+#, c-format
msgid "read() failed: %s"
msgstr "Fracàs de read() : %s"
#: ../src/daemon/main.c:798
-#, fuzzy
msgid "Daemon startup failed."
msgstr "Fracàs al moment de l'aviada del demòni."
#: ../src/daemon/main.c:831
#, c-format
-#, fuzzy, c-format
msgid "setsid() failed: %s"
-msgstr "Échec de read() : %s"
+msgstr "setsid() a fracassat : %s"
#: ../src/daemon/main.c:958
-#, fuzzy
msgid "Failed to get machine ID"
msgstr "Fracàs al moment de l'obtencion de l'ID de la maquina"
@@ -592,354 +471,320 @@ msgstr ""
"cela.\n"
"Si vous choisissez malgré tout de lo faire, vous êtes responsable de tout "
"dysfonctionnement inattendu.\n"
-"Veuillez lire http://www.freedesktop.org/wiki/Software/PulseAudio/Documentat"
-"ion/User/WhatIsWrongWithSystemWide/ pour comprendre pourquoi lo mode système "
-"est généralement une mauvaise idée."
+"Veuillez lire "
+"http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIs"
+"WrongWithSystemWide/ pour comprendre pourquoi lo mode système est "
+"généralement une mauvaise idée."
#: ../src/daemon/main.c:1001
-#, fuzzy
msgid "pa_pid_file_create() failed."
msgstr "Fracàs de pa_pid_file_create()."
-#: ../src/daemon/main.c:1031
-#, fuzzy
+#: ../src/daemon/main.c:1033
msgid "pa_core_new() failed."
msgstr "Fracàs de pa_core_new()."
-#: ../src/daemon/main.c:1101
-#, fuzzy
+#: ../src/daemon/main.c:1104
msgid "Failed to initialize daemon."
msgstr "Fracàs al moment de l'inicializacion del demòni"
-#: ../src/daemon/main.c:1106
-#, fuzzy
+#: ../src/daemon/main.c:1109
msgid "Daemon startup without any loaded modules, refusing to work."
msgstr "Aviada del demòni sens cap de modul cargat : refús de foncionar."
#: ../src/daemon/pulseaudio.desktop.in.h:1
-#, fuzzy
msgid "PulseAudio Sound System"
msgstr "Sistèma de son PulseAudio"
#: ../src/daemon/pulseaudio.desktop.in.h:2
-#, fuzzy
msgid "Start the PulseAudio Sound System"
msgstr "Aviar lo sistèma de son PulseAudio"
-#: ../src/modules/alsa/alsa-mixer.c:2294
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2378
msgid "Input"
msgstr "Entrada"
-#: ../src/modules/alsa/alsa-mixer.c:2295
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2379
msgid "Docking Station Input"
msgstr "Entrada de l'estacion d'acuèlh"
-#: ../src/modules/alsa/alsa-mixer.c:2296
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2380
msgid "Docking Station Microphone"
-msgstr "Microphone de la station d'accueil"
+msgstr "Microfòn de l'estacion d'acuèlh"
-#: ../src/modules/alsa/alsa-mixer.c:2297
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2381
msgid "Docking Station Line In"
-msgstr "Entrada de la station d'accueil"
+msgstr "Entrada linha de l'estacion d'acuèlh"
-#: ../src/modules/alsa/alsa-mixer.c:2298 ../src/modules/alsa/alsa-mixer.c:2383
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2382 ../src/modules/alsa/alsa-mixer.c:2467
msgid "Line In"
msgstr "Entrada linha"
-#: ../src/modules/alsa/alsa-mixer.c:2299 ../src/modules/alsa/alsa-mixer.c:2377
-#: ../src/modules/bluetooth/module-bluez4-device.c:2176
-#: ../src/modules/bluetooth/module-bluez5-device.c:1710
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2383 ../src/modules/alsa/alsa-mixer.c:2461
+#: ../src/modules/bluetooth/module-bluez4-device.c:2173
+#: ../src/modules/bluetooth/module-bluez5-device.c:1937
msgid "Microphone"
msgstr "Micrò"
-#: ../src/modules/alsa/alsa-mixer.c:2300 ../src/modules/alsa/alsa-mixer.c:2378
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2384 ../src/modules/alsa/alsa-mixer.c:2462
msgid "Front Microphone"
-msgstr "Microphone de la station d'accueil"
+msgstr "Microfòn avant"
-#: ../src/modules/alsa/alsa-mixer.c:2301 ../src/modules/alsa/alsa-mixer.c:2379
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2385 ../src/modules/alsa/alsa-mixer.c:2463
msgid "Rear Microphone"
-msgstr "Microphone"
+msgstr "Microfòn arrièr"
-#: ../src/modules/alsa/alsa-mixer.c:2302
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2386
msgid "External Microphone"
msgstr "Microfòn extèrne"
-#: ../src/modules/alsa/alsa-mixer.c:2303 ../src/modules/alsa/alsa-mixer.c:2381
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2387 ../src/modules/alsa/alsa-mixer.c:2465
msgid "Internal Microphone"
msgstr "Microfòn intèrne"
-#: ../src/modules/alsa/alsa-mixer.c:2304 ../src/modules/alsa/alsa-mixer.c:2384
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2388 ../src/modules/alsa/alsa-mixer.c:2468
msgid "Radio"
msgstr "Ràdio"
-#: ../src/modules/alsa/alsa-mixer.c:2305 ../src/modules/alsa/alsa-mixer.c:2385
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2389 ../src/modules/alsa/alsa-mixer.c:2469
msgid "Video"
msgstr "Vidèo"
-#: ../src/modules/alsa/alsa-mixer.c:2306
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2390
msgid "Automatic Gain Control"
msgstr "Contraròtle automatic del ganh"
-#: ../src/modules/alsa/alsa-mixer.c:2307
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2391
msgid "No Automatic Gain Control"
msgstr "Pas de contraròtle automatic del ganh"
-#: ../src/modules/alsa/alsa-mixer.c:2308
+#: ../src/modules/alsa/alsa-mixer.c:2392
msgid "Boost"
msgstr "Boost"
-#: ../src/modules/alsa/alsa-mixer.c:2309
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2393
msgid "No Boost"
msgstr "Sens boost"
-#: ../src/modules/alsa/alsa-mixer.c:2310
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2394
msgid "Amplifier"
msgstr "Amplificador"
-#: ../src/modules/alsa/alsa-mixer.c:2311
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2395
msgid "No Amplifier"
msgstr "Pas d'amplificador"
-#: ../src/modules/alsa/alsa-mixer.c:2312
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2396
msgid "Bass Boost"
-msgstr "Boost"
+msgstr "Amplificacion bassas"
-#: ../src/modules/alsa/alsa-mixer.c:2313
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2397
msgid "No Bass Boost"
-msgstr "Pas de boost"
+msgstr "Pas d'amplificacion de las bassas"
-#: ../src/modules/alsa/alsa-mixer.c:2314
-#: ../src/modules/bluetooth/module-bluez4-device.c:2181
-#: ../src/modules/bluetooth/module-bluez5-device.c:1717
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2398
+#: ../src/modules/bluetooth/module-bluez4-device.c:2178
+#: ../src/modules/bluetooth/module-bluez5-device.c:1944
msgid "Speaker"
msgstr "Nautparlaire"
-#: ../src/modules/alsa/alsa-mixer.c:2315 ../src/modules/alsa/alsa-mixer.c:2387
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2399 ../src/modules/alsa/alsa-mixer.c:2471
msgid "Headphones"
msgstr "Escotadors"
-#: ../src/modules/alsa/alsa-mixer.c:2376
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2460
msgid "Analog Input"
msgstr "Entrada analogica"
-#: ../src/modules/alsa/alsa-mixer.c:2380
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2464
msgid "Dock Microphone"
msgstr "Microfòn de l'estacion d'acuèlh"
-#: ../src/modules/alsa/alsa-mixer.c:2382
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2466
msgid "Headset Microphone"
-msgstr "Microphone"
+msgstr "Micro-casc"
-#: ../src/modules/alsa/alsa-mixer.c:2386
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2470
msgid "Analog Output"
msgstr "Sortida analogica"
-#: ../src/modules/alsa/alsa-mixer.c:2388
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2472
msgid "LFE on Separate Mono Output"
msgstr "Sortida analogica (LFE)"
-#: ../src/modules/alsa/alsa-mixer.c:2389
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2473
msgid "Line Out"
-msgstr "Entrada-ligne"
+msgstr "Sortida linha"
-#: ../src/modules/alsa/alsa-mixer.c:2390
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2474
msgid "Analog Mono Output"
msgstr "Sortida Analogica Monò"
-#: ../src/modules/alsa/alsa-mixer.c:2391
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2475
msgid "Speakers"
-msgstr "Stéréo analogique"
+msgstr "Nauts parlaires"
-#: ../src/modules/alsa/alsa-mixer.c:2392
+#: ../src/modules/alsa/alsa-mixer.c:2476
msgid "HDMI / DisplayPort"
msgstr "HDMI / DisplayPort"
-#: ../src/modules/alsa/alsa-mixer.c:2393
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2477
msgid "Digital Output (S/PDIF)"
-msgstr "Stéréo numérique (HDMI)"
+msgstr "Sortida numerica (S/PDIF)"
-#: ../src/modules/alsa/alsa-mixer.c:2394
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2478
msgid "Digital Input (S/PDIF)"
-msgstr "Stéréo numérique (HDMI)"
+msgstr "Entrada numerica (S/PDIF)"
-#: ../src/modules/alsa/alsa-mixer.c:2395
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:2479
msgid "Digital Passthrough (S/PDIF)"
-msgstr "Stéréo numérique (HDMI)"
+msgstr "Connector numeric (S/PDIF)"
+
+#: ../src/modules/alsa/alsa-mixer.c:2480
+msgid "Multichannel Input"
+msgstr ""
+
+#: ../src/modules/alsa/alsa-mixer.c:2481
+msgid "Multichannel Output"
+msgstr ""
-#: ../src/modules/alsa/alsa-mixer.c:3901
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:3990
msgid "Analog Mono"
msgstr "Monò analogic"
-#: ../src/modules/alsa/alsa-mixer.c:3902
-#, fuzzy
+#. Note: Not translated to "Analog Stereo Input", because the source
+#. * name gets "Input" appended to it automatically, so adding "Input"
+#. * here would lead to the source name to become "Analog Stereo Input
+#. * Input". The same logic applies to analog-stereo-output,
+#. * multichannel-input and multichannel-output.
+#: ../src/modules/alsa/alsa-mixer.c:3991 ../src/modules/alsa/alsa-mixer.c:3997
+#: ../src/modules/alsa/alsa-mixer.c:3998
msgid "Analog Stereo"
msgstr "Esterèo analogic"
-#: ../src/modules/alsa/alsa-mixer.c:3903
+#: ../src/modules/alsa/alsa-mixer.c:3999 ../src/modules/alsa/alsa-mixer.c:4000
msgid "Multichannel"
msgstr ""
-#: ../src/modules/alsa/alsa-mixer.c:3904
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:4001
msgid "Analog Surround 2.1"
msgstr "Surround analogic 2.1"
-#: ../src/modules/alsa/alsa-mixer.c:3905
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:4002
msgid "Analog Surround 3.0"
msgstr "Surround analogic 3.0"
-#: ../src/modules/alsa/alsa-mixer.c:3906
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:4003
msgid "Analog Surround 3.1"
msgstr "Surround analogic 3.1"
-#: ../src/modules/alsa/alsa-mixer.c:3907
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:4004
msgid "Analog Surround 4.0"
msgstr "Surround analogic 4.0"
-#: ../src/modules/alsa/alsa-mixer.c:3908
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:4005
msgid "Analog Surround 4.1"
msgstr "Surround analogic 4.1"
-#: ../src/modules/alsa/alsa-mixer.c:3909
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:4006
msgid "Analog Surround 5.0"
msgstr "Surround analogic 5.0"
-#: ../src/modules/alsa/alsa-mixer.c:3910
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:4007
msgid "Analog Surround 5.1"
msgstr "Surround analogic 5.1"
-#: ../src/modules/alsa/alsa-mixer.c:3911
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:4008
msgid "Analog Surround 6.0"
msgstr "Surround analogic 6.0"
-#: ../src/modules/alsa/alsa-mixer.c:3912
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:4009
msgid "Analog Surround 6.1"
msgstr "Surround analogic 6.1"
-#: ../src/modules/alsa/alsa-mixer.c:3913
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:4010
msgid "Analog Surround 7.0"
msgstr "Surround analogic 7.0"
-#: ../src/modules/alsa/alsa-mixer.c:3914
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:4011
msgid "Analog Surround 7.1"
msgstr "Surround analogic 7.1"
-#: ../src/modules/alsa/alsa-mixer.c:3915
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:4012
msgid "Digital Stereo (IEC958)"
msgstr "Esterèo numeric (IEC958)"
-#: ../src/modules/alsa/alsa-mixer.c:3916
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:4013
msgid "Digital Passthrough (IEC958)"
-msgstr "Stéréo numérique (IEC958)"
+msgstr "Connector numeric (IEC958)"
-#: ../src/modules/alsa/alsa-mixer.c:3917
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:4014
msgid "Digital Surround 4.0 (IEC958/AC3)"
msgstr "Surround numeric 4.0 (IEC958/AC3)"
-#: ../src/modules/alsa/alsa-mixer.c:3918
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:4015
msgid "Digital Surround 5.1 (IEC958/AC3)"
msgstr "Surround numeric 5.1 (IEC958/AC3)"
-#: ../src/modules/alsa/alsa-mixer.c:3919
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:4016
msgid "Digital Surround 5.1 (IEC958/DTS)"
-msgstr "Surround numérique 5.1 (IEC958/AC3)"
+msgstr "Digital Surround 5.1 (IEC958/DTS)"
-#: ../src/modules/alsa/alsa-mixer.c:3920
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:4017
msgid "Digital Stereo (HDMI)"
msgstr "Esterèo numeric (HDMI)"
-#: ../src/modules/alsa/alsa-mixer.c:3921
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:4018
msgid "Digital Surround 5.1 (HDMI)"
-msgstr "Surround numérique 5.1 (IEC958/AC3)"
+msgstr "Digital Surround 5.1 (HDMI)"
-#: ../src/modules/alsa/alsa-mixer.c:4052
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:4151
msgid "Analog Mono Duplex"
msgstr "Duplèx Mono analogic"
-#: ../src/modules/alsa/alsa-mixer.c:4053
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:4152
msgid "Analog Stereo Duplex"
msgstr "Duplèx esterèo analogic"
-#: ../src/modules/alsa/alsa-mixer.c:4054
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:4153
msgid "Digital Stereo Duplex (IEC958)"
msgstr "Duplèx estèreo numeric (IEC958)"
-#: ../src/modules/alsa/alsa-mixer.c:4055
-#: ../src/modules/alsa/module-alsa-card.c:190
-#: ../src/modules/bluetooth/module-bluez4-device.c:2372
-#: ../src/modules/bluetooth/module-bluez5-device.c:1941
-#: ../src/modules/droid/module-droid-card.c:166
-#, fuzzy
+#: ../src/modules/alsa/alsa-mixer.c:4154
+msgid "Multichannel Duplex"
+msgstr ""
+
+#: ../src/modules/alsa/alsa-mixer.c:4155
+#: ../src/modules/alsa/module-alsa-card.c:186
+#: ../src/modules/bluetooth/module-bluez4-device.c:2369
+#: ../src/modules/bluetooth/module-bluez5-device.c:2173
+#: ../src/modules/droid/module-droid-card.c:221
msgid "Off"
msgstr "Atudat"
-#: ../src/modules/alsa/alsa-mixer.c:4154
+#: ../src/modules/alsa/alsa-mixer.c:4254
#, c-format
-#, fuzzy, c-format
msgid "%s Output"
-msgstr "Sortida vide"
+msgstr "%s Sortida"
-#: ../src/modules/alsa/alsa-mixer.c:4162
+#: ../src/modules/alsa/alsa-mixer.c:4262
#, c-format
-#, fuzzy, c-format
msgid "%s Input"
-msgstr "Entrada"
+msgstr "%s Entrada"
-#: ../src/modules/alsa/alsa-sink.c:570 ../src/modules/alsa/alsa-sink.c:747
-#, c-format, fuzzy
+#: ../src/modules/alsa/alsa-sink.c:570
+#, c-format
+msgid ""
+"ALSA woke us up to write new data to the device, but there was actually "
+"nothing to write.\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers.\n"
+"We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() "
+"returned 0 or another value < min_avail."
+msgstr ""
+
+#: ../src/modules/alsa/alsa-sink.c:747
+#, c-format
msgid ""
"ALSA woke us up to write new data to the device, but there was actually "
"nothing to write!\n"
@@ -949,14 +794,25 @@ msgid ""
"returned 0 or another value < min_avail."
msgstr ""
"ALSA nos a desrevelhat per legir de donadas novèlas a partir del periferic, "
-"mas, en fach, i aviá pas res a escriure !\n"
+"mas, en fait, i aviá pas res a escriure !\n"
"S'agís fòrt probablament d'un bug dins lo pilòt ALSA « %s ». Raportatz "
"aqueste problèma als desvolopaires d'ALSA. Sèm estats desrevelhats amb lo "
"jòc POLLOUT -- çaquelà un snd_pcm_avail() ulterior a tornat 0 o una autra "
"valor < min_avail."
-#: ../src/modules/alsa/alsa-source.c:529 ../src/modules/alsa/alsa-source.c:680
-#, c-format, fuzzy
+#: ../src/modules/alsa/alsa-source.c:529
+#, c-format
+msgid ""
+"ALSA woke us up to read new data from the device, but there was actually "
+"nothing to read.\n"
+"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
+"to the ALSA developers.\n"
+"We were woken up with POLLIN set -- however a subsequent snd_pcm_avail() "
+"returned 0 or another value < min_avail."
+msgstr ""
+
+#: ../src/modules/alsa/alsa-source.c:680
+#, c-format
msgid ""
"ALSA woke us up to read new data from the device, but there was actually "
"nothing to read!\n"
@@ -966,14 +822,14 @@ msgid ""
"returned 0 or another value < min_avail."
msgstr ""
"ALSA nos a desrevelhat per legir de donadas novèlas a partir del periferic, "
-"mas, en fach, i aviá pas res a escriure !\n"
+"mas, en fait, i aviá pas res a escriure !\n"
"S'agís fòrt probablament d'un bug dins lo pilòt ALSA « %s ». Raportatz "
"aqueste problèma als desvolopaires d'ALSA. Sèm estats desrevelhats amb lo "
"jòc POLLIN -- çaquelà un snd_pcm_avail() ulterior a tornat 0 o una autra "
"valor < min_avail."
-#: ../src/modules/alsa/alsa-util.c:1134 ../src/modules/alsa/alsa-util.c:1209
-#, c-format, fuzzy
+#: ../src/modules/alsa/alsa-util.c:1166 ../src/modules/alsa/alsa-util.c:1241
+#, c-format
msgid ""
"snd_pcm_avail() returned a value that is exceptionally large: %lu bytes (%lu "
"ms).\n"
@@ -985,8 +841,8 @@ msgstr ""
"S'agís fòrt probablament d'un bug dins lo pilòt ALSA « %s ». Raportatz "
"aqueste problèma als desvolopaires d'ALSA."
-#: ../src/modules/alsa/alsa-util.c:1184
-#, c-format, fuzzy
+#: ../src/modules/alsa/alsa-util.c:1216
+#, c-format
msgid ""
"snd_pcm_delay() returned a value that is exceptionally large: %li bytes "
"(%s%lu ms).\n"
@@ -998,22 +854,21 @@ msgstr ""
"S'agís fòrt probablament d'un bug dins lo pilòt ALSA « %s ». Raportatz "
"aqueste problèma als desvolopaires d'ALSA."
-#: ../src/modules/alsa/alsa-util.c:1225
+#: ../src/modules/alsa/alsa-util.c:1257
#, c-format
-#, fuzzy, c-format
msgid ""
"snd_pcm_avail_delay() returned strange values: delay %lu is less than avail "
"%lu.\n"
"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
"to the ALSA developers."
msgstr ""
-"snd_pcm_avail() a retourné une valeur qui est exceptionnellement large : %lu "
-"octets (%lu ms).\n"
-"Il s'agit très probablement d'un bogue dans lo pilote ALSA « %s ». Veuillez "
-"rapporter ce problème aux développeurs d'ALSA."
+"snd_pcm_avail_delay() a tornat de resultats anormals : lo relambi %lu es mai "
+"pichon que %lu.\n"
+"Es fòrt probablament un bug dins lo pilòt ALSA '%s'. Senhalatz-lo als "
+"desvolopaires d'ALSA."
-#: ../src/modules/alsa/alsa-util.c:1268
-#, c-format, fuzzy
+#: ../src/modules/alsa/alsa-util.c:1300
+#, c-format
msgid ""
"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu bytes "
"(%lu ms).\n"
@@ -1025,92 +880,85 @@ msgstr ""
"S'agís fòrt probablament d'un bug dins lo pilòt ALSA « %s ». Raportatz "
"aqueste problèma als desvolopaires d'ALSA."
-#: ../src/modules/bluetooth/module-bluez4-device.c:2166
-#: ../src/modules/bluetooth/module-bluez5-device.c:1700
+#: ../src/modules/bluetooth/module-bluez4-device.c:2163
+#: ../src/modules/bluetooth/module-bluez5-device.c:1927
msgid "Headset"
msgstr "Casc àudio"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2171
-#: ../src/modules/bluetooth/module-bluez5-device.c:1705
+#: ../src/modules/bluetooth/module-bluez4-device.c:2168
+#: ../src/modules/bluetooth/module-bluez5-device.c:1932
msgid "Handsfree"
-msgstr ""
+msgstr "Mans liuras"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2186
-#: ../src/modules/bluetooth/module-bluez5-device.c:1723
-#, fuzzy
+#: ../src/modules/bluetooth/module-bluez4-device.c:2183
+#: ../src/modules/bluetooth/module-bluez5-device.c:1950
msgid "Headphone"
-msgstr "Casques analogiques"
+msgstr "Escotadors"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2191
-#: ../src/modules/bluetooth/module-bluez5-device.c:1728
+#: ../src/modules/bluetooth/module-bluez4-device.c:2188
+#: ../src/modules/bluetooth/module-bluez5-device.c:1955
msgid "Portable"
msgstr "Portable"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2196
-#: ../src/modules/bluetooth/module-bluez5-device.c:1733
+#: ../src/modules/bluetooth/module-bluez4-device.c:2193
+#: ../src/modules/bluetooth/module-bluez5-device.c:1960
msgid "Car"
msgstr "Telefòn de veitura"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2201
-#: ../src/modules/bluetooth/module-bluez5-device.c:1738
+#: ../src/modules/bluetooth/module-bluez4-device.c:2198
+#: ../src/modules/bluetooth/module-bluez5-device.c:1965
msgid "HiFi"
msgstr "HiFi"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2206
-#: ../src/modules/bluetooth/module-bluez5-device.c:1743
+#: ../src/modules/bluetooth/module-bluez4-device.c:2203
+#: ../src/modules/bluetooth/module-bluez5-device.c:1970
msgid "Phone"
msgstr "Telefòn"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2214
-#: ../src/modules/bluetooth/module-bluez5-device.c:1695
-#: ../src/modules/bluetooth/module-bluez5-device.c:1711
-#: ../src/modules/bluetooth/module-bluez5-device.c:1749
-#, fuzzy
+#: ../src/modules/bluetooth/module-bluez4-device.c:2211
+#: ../src/modules/bluetooth/module-bluez5-device.c:1922
+#: ../src/modules/bluetooth/module-bluez5-device.c:1938
+#: ../src/modules/bluetooth/module-bluez5-device.c:1976
msgid "Bluetooth Output"
-msgstr "Sortida analogique"
+msgstr "Sortida Bluetooth"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2217
-#: ../src/modules/bluetooth/module-bluez5-device.c:1694
-#: ../src/modules/bluetooth/module-bluez5-device.c:1716
-#: ../src/modules/bluetooth/module-bluez5-device.c:1722
-#: ../src/modules/bluetooth/module-bluez5-device.c:1748
+#: ../src/modules/bluetooth/module-bluez4-device.c:2214
+#: ../src/modules/bluetooth/module-bluez5-device.c:1921
+#: ../src/modules/bluetooth/module-bluez5-device.c:1943
+#: ../src/modules/bluetooth/module-bluez5-device.c:1949
+#: ../src/modules/bluetooth/module-bluez5-device.c:1975
msgid "Bluetooth Input"
msgstr "Entrada Bluetooth"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2253
-#, fuzzy
+#: ../src/modules/bluetooth/module-bluez4-device.c:2250
msgid "High Fidelity Playback (A2DP)"
msgstr "Lectura nauta fidelitat (A2DP)"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2264
-#, fuzzy
+#: ../src/modules/bluetooth/module-bluez4-device.c:2261
msgid "High Fidelity Capture (A2DP)"
msgstr "Captura Hi-Fi (A2DP)"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2275
-#, fuzzy
+#: ../src/modules/bluetooth/module-bluez4-device.c:2272
msgid "Telephony Duplex (HSP/HFP)"
msgstr "Telefonia en duplèx (HSP/HFP)"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2287
+#: ../src/modules/bluetooth/module-bluez4-device.c:2284
msgid "Handsfree Gateway"
-msgstr ""
+msgstr "Pòrt mans liuras"
-#: ../src/modules/bluetooth/module-bluez5-device.c:1786
-#, fuzzy
+#: ../src/modules/bluetooth/module-bluez5-device.c:2013
msgid "High Fidelity Playback (A2DP Sink)"
-msgstr "Lectura nauta f (A2DP)"
+msgstr ""
-#: ../src/modules/bluetooth/module-bluez5-device.c:1797
-#, fuzzy
+#: ../src/modules/bluetooth/module-bluez5-device.c:2024
msgid "High Fidelity Capture (A2DP Source)"
-msgstr "Capture nauta fidelitat (A2DP)"
+msgstr ""
-#: ../src/modules/bluetooth/module-bluez5-device.c:1808
+#: ../src/modules/bluetooth/module-bluez5-device.c:2035
msgid "Headset Head Unit (HSP/HFP)"
msgstr ""
-#: ../src/modules/bluetooth/module-bluez5-device.c:1820
+#: ../src/modules/bluetooth/module-bluez5-device.c:2047
msgid "Headset Audio Gateway (HSP/HFP)"
msgstr ""
@@ -1124,21 +972,27 @@ msgid ""
"rate> channels=<number of channels> channel_map=<channel map> "
"aec_method=<implementation to use> aec_args=<parameters for the AEC engine> "
"save_aec=<save AEC data in /tmp> autoloaded=<set if this module is being "
-"loaded automatically> use_volume_sharing=<yes or no> "
+"loaded automatically> use_volume_sharing=<yes or no> use_master_format=<yes "
+"or no> "
msgstr ""
#. add on profile
-#: ../src/modules/macosx/module-coreaudio-device.c:754
+#: ../src/modules/macosx/module-coreaudio-device.c:811
msgid "On"
msgstr "Activar"
+#. / TRANSLATORS: The app icon and name appears above this string. If the phrase
+#. / can't be translated in this language, translate the whole sentence
+#. / 'This app wants to record audio.'
+#: ../src/modules/trust-store/module-trust-store.c:154
+msgid "wants to record audio."
+msgstr ""
+
#: ../src/modules/module-always-sink.c:36
-#, fuzzy
msgid "Always keeps at least one sink loaded even if it's a null one"
msgstr "Garda totjorn al mens una destinacion quitament s'es voida"
-#: ../src/modules/module-always-sink.c:80
-#, fuzzy
+#: ../src/modules/module-always-sink.c:82
msgid "Dummy Output"
msgstr "Sortida factícia"
@@ -1147,31 +1001,22 @@ msgid "General Purpose Equalizer"
msgstr "Egalizador d'usatge general"
#: ../src/modules/module-equalizer-sink.c:74
-#, fuzzy
msgid ""
"sink_name=<name of the sink> sink_properties=<properties for the sink> "
"sink_master=<sink to connect to> format=<sample format> rate=<sample rate> "
"channels=<number of channels> channel_map=<channel map> autoloaded=<set if "
"this module is being loaded automatically> use_volume_sharing=<yes or no> "
msgstr ""
-"sink_name=<nom de la destinacion> sink_properties=<propriétés de la "
-"destinacion> master=<nom de la destinacion à filter> format=<format de "
-"l'escandalhatge> rate=<taux d'escandalhatgeage> channels=<nombre de canaux> "
-"channel_map=<plan des canaux> plugin=<nom de l'extension ladspa> "
-"label=<étiquette de l'extension ladspa> control=<liste des valeurs de "
-"contrôle de l'entrada séparées par des virgules>"
-
-#: ../src/modules/module-filter-apply.c:46
+
+#: ../src/modules/module-filter-apply.c:47
msgid "autoclean=<automatically unload unused filters?>"
-msgstr ""
+msgstr "autonetejatge=<descargar automaticament los filtres inutilizats ?>"
#: ../src/modules/module-ladspa-sink.c:51
-#, fuzzy
msgid "Virtual LADSPA sink"
msgstr "Destinacion virtuala LADSPA"
#: ../src/modules/module-ladspa-sink.c:55
-#, fuzzy
msgid ""
"sink_name=<name for the sink> sink_properties=<properties for the sink> "
"master=<name of sink to filter> format=<sample format> rate=<sample rate> "
@@ -1181,41 +1026,39 @@ msgid ""
"LADSPA port names> output_ladspaport_map=<comma separated list of output "
"LADSPA port names> "
msgstr ""
-"sink_name=<nom de la destinacion> sink_properties=<propriétés de la "
-"destinacion> master=<nom de la destinacion à filter> format=<format de "
-"l'escandalhatge> rate=<taux d'escandalhatgeage> channels=<nombre de canaux> "
-"channel_map=<plan des canaux> plugin=<nom de l'extension ladspa> "
-"label=<étiquette de l'extension ladspa> control=<liste des valeurs de "
-"contrôle de l'entrada séparées par des virgules>"
+"sink_name=<nom de la destinacion> sink_properties=<proprietats de la "
+"destinacion> master=<nom de la destinacion de filtrar> format=<format de "
+"l'escandalhatge> rate=<taus d'escandalhatge> channels=<nombre de canals> "
+"channel_map=<mapa dels canals d'entrada> plugin=<nom de l'empeuton ladspa> "
+"label=<etiqueta de l'empeuton ladspa> control=<lista de las valors de "
+"contraròtle d'entrada separadas per de virgulas> input_ladspaport_map=<lista "
+"dels noms dels pòrts d'entrada LADSPA separats per de virgulas> "
+"output_ladspaport_map=<lista dels noms dels pòrts de sortida LADSPA separats "
+"per de virgulas> "
#: ../src/modules/module-null-sink.c:47
-#, fuzzy
msgid "Clocked NULL sink"
msgstr "Relòtge de la destinacion void"
-#: ../src/modules/module-null-sink.c:278
-#, fuzzy
+#: ../src/modules/module-null-sink.c:280
msgid "Null Output"
msgstr "Sortida voida"
#: ../src/modules/module-rygel-media-server.c:508
#: ../src/modules/module-rygel-media-server.c:546
#: ../src/modules/module-rygel-media-server.c:905
-#, fuzzy
msgid "Output Devices"
msgstr "Periferics de sortida"
#: ../src/modules/module-rygel-media-server.c:509
#: ../src/modules/module-rygel-media-server.c:547
#: ../src/modules/module-rygel-media-server.c:906
-#, fuzzy
msgid "Input Devices"
msgstr "Periferics d'entrada"
#: ../src/modules/module-rygel-media-server.c:1063
-#, fuzzy
msgid "Audio on @HOSTNAME@"
-msgstr "Àudio sus @HOSTNAME@"
+msgstr "Audio sus @HOSTNAME@"
#. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis at lazus'
#. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis at lazus'
@@ -1232,12 +1075,10 @@ msgid "Tunnel to %s/%s"
msgstr ""
#: ../src/modules/module-virtual-surround-sink.c:47
-#, fuzzy
msgid "Virtual surround sink"
-msgstr "Destinacion virtuelle LADSPA"
+msgstr "Collector ambiofonic virtual"
#: ../src/modules/module-virtual-surround-sink.c:51
-#, fuzzy
msgid ""
"sink_name=<name for the sink> sink_properties=<properties for the sink> "
"master=<name of sink to filter> format=<sample format> rate=<sample rate> "
@@ -1245,19 +1086,12 @@ msgid ""
"use_volume_sharing=<yes or no> force_flat_volume=<yes or no> "
"hrir=/path/to/left_hrir.wav "
msgstr ""
-"sink_name=<nom de la destinacion> sink_properties=<propriétés de la "
-"destinacion> master=<nom de la destinacion à filter> format=<format de "
-"l'escandalhatge> rate=<taux d'escandalhatgeage> channels=<nombre de canaux> "
-"channel_map=<plan des canaux> plugin=<nom de l'extension ladspa> "
-"label=<étiquette de l'extension ladspa> control=<liste des valeurs de "
-"contrôle de l'entrada séparées par des virgules>"
#: ../src/modules/reserve-wrap.c:149
-#, fuzzy
msgid "PulseAudio Sound Server"
msgstr "Servidor de son PulseAudio"
-#: ../src/pulse/channelmap.c:103 ../src/pulse/channelmap.c:758
+#: ../src/pulse/channelmap.c:103 ../src/pulse/channelmap.c:771
msgid "Mono"
msgstr "Mono"
@@ -1266,332 +1100,277 @@ msgid "Front Center"
msgstr "Avant centre"
#: ../src/pulse/channelmap.c:106
-#, fuzzy
msgid "Front Left"
msgstr "Avant esquèrra"
#: ../src/pulse/channelmap.c:107
-#, fuzzy
msgid "Front Right"
-msgstr "Avant drecha"
+msgstr "Avant dreita"
#: ../src/pulse/channelmap.c:109
-#, fuzzy
msgid "Rear Center"
msgstr "Arrièr centre"
#: ../src/pulse/channelmap.c:110
-#, fuzzy
msgid "Rear Left"
msgstr "Arrièr esquèrra"
#: ../src/pulse/channelmap.c:111
-#, fuzzy
msgid "Rear Right"
-msgstr "Arrièr drecha"
+msgstr "Arrièr dreita"
#: ../src/pulse/channelmap.c:113
msgid "Subwoofer"
msgstr "Caisson de bassa"
#: ../src/pulse/channelmap.c:115
-#, fuzzy
msgid "Front Left-of-center"
msgstr "Avant a esquèrra del centre"
#: ../src/pulse/channelmap.c:116
-#, fuzzy
msgid "Front Right-of-center"
-msgstr "Avant a drecha del centre"
+msgstr "Avant a dreita del centre"
#: ../src/pulse/channelmap.c:118
-#, fuzzy
msgid "Side Left"
msgstr "Costat d'esquèrra"
#: ../src/pulse/channelmap.c:119
-#, fuzzy
msgid "Side Right"
-msgstr "Costat de drecha"
+msgstr "Costat de dreita"
#: ../src/pulse/channelmap.c:121
-#, fuzzy
msgid "Auxiliary 0"
msgstr "Auxiliar 0"
#: ../src/pulse/channelmap.c:122
-#, fuzzy
msgid "Auxiliary 1"
msgstr "Auxiliar 1"
#: ../src/pulse/channelmap.c:123
-#, fuzzy
msgid "Auxiliary 2"
msgstr "Auxiliar 2"
#: ../src/pulse/channelmap.c:124
-#, fuzzy
msgid "Auxiliary 3"
msgstr "Auxiliar 3"
#: ../src/pulse/channelmap.c:125
-#, fuzzy
msgid "Auxiliary 4"
msgstr "Auxiliar 4"
#: ../src/pulse/channelmap.c:126
-#, fuzzy
msgid "Auxiliary 5"
msgstr "Auxiliar 5"
#: ../src/pulse/channelmap.c:127
-#, fuzzy
msgid "Auxiliary 6"
msgstr "Auxiliar 6"
#: ../src/pulse/channelmap.c:128
-#, fuzzy
msgid "Auxiliary 7"
msgstr "Auxiliar 7"
#: ../src/pulse/channelmap.c:129
-#, fuzzy
msgid "Auxiliary 8"
msgstr "Auxiliar 8"
#: ../src/pulse/channelmap.c:130
-#, fuzzy
msgid "Auxiliary 9"
msgstr "Auxiliar 9"
#: ../src/pulse/channelmap.c:131
-#, fuzzy
msgid "Auxiliary 10"
msgstr "Auxiliar 10"
#: ../src/pulse/channelmap.c:132
-#, fuzzy
msgid "Auxiliary 11"
msgstr "Auxiliar 11"
#: ../src/pulse/channelmap.c:133
-#, fuzzy
msgid "Auxiliary 12"
msgstr "Auxiliar 12"
#: ../src/pulse/channelmap.c:134
-#, fuzzy
msgid "Auxiliary 13"
msgstr "Auxiliar 13"
#: ../src/pulse/channelmap.c:135
-#, fuzzy
msgid "Auxiliary 14"
msgstr "Auxiliar 14"
#: ../src/pulse/channelmap.c:136
-#, fuzzy
msgid "Auxiliary 15"
msgstr "Auxiliar 15"
#: ../src/pulse/channelmap.c:137
-#, fuzzy
msgid "Auxiliary 16"
msgstr "Auxiliar 16"
#: ../src/pulse/channelmap.c:138
-#, fuzzy
msgid "Auxiliary 17"
msgstr "Auxiliar 17"
#: ../src/pulse/channelmap.c:139
-#, fuzzy
msgid "Auxiliary 18"
msgstr "Auxiliar 18"
#: ../src/pulse/channelmap.c:140
-#, fuzzy
msgid "Auxiliary 19"
msgstr "Auxiliar 19"
#: ../src/pulse/channelmap.c:141
-#, fuzzy
msgid "Auxiliary 20"
msgstr "Auxiliar 20"
#: ../src/pulse/channelmap.c:142
-#, fuzzy
msgid "Auxiliary 21"
msgstr "Auxiliar 21"
#: ../src/pulse/channelmap.c:143
-#, fuzzy
msgid "Auxiliary 22"
msgstr "Auxiliar 22"
#: ../src/pulse/channelmap.c:144
-#, fuzzy
msgid "Auxiliary 23"
msgstr "Auxiliar 23"
#: ../src/pulse/channelmap.c:145
-#, fuzzy
msgid "Auxiliary 24"
msgstr "Auxiliar 24"
#: ../src/pulse/channelmap.c:146
-#, fuzzy
msgid "Auxiliary 25"
msgstr "Auxiliar 25"
#: ../src/pulse/channelmap.c:147
-#, fuzzy
msgid "Auxiliary 26"
msgstr "Auxiliar 26"
#: ../src/pulse/channelmap.c:148
-#, fuzzy
msgid "Auxiliary 27"
msgstr "Auxiliar 27"
#: ../src/pulse/channelmap.c:149
-#, fuzzy
msgid "Auxiliary 28"
msgstr "Auxiliar 28"
#: ../src/pulse/channelmap.c:150
-#, fuzzy
msgid "Auxiliary 29"
msgstr "Auxiliar 29"
#: ../src/pulse/channelmap.c:151
-#, fuzzy
msgid "Auxiliary 30"
msgstr "Auxiliar 30"
#: ../src/pulse/channelmap.c:152
-#, fuzzy
msgid "Auxiliary 31"
msgstr "Auxiliar 31"
#: ../src/pulse/channelmap.c:154
-#, fuzzy
msgid "Top Center"
msgstr "Amont al centre"
#: ../src/pulse/channelmap.c:156
-#, fuzzy
msgid "Top Front Center"
msgstr "Avant centre naut"
#: ../src/pulse/channelmap.c:157
-#, fuzzy
msgid "Top Front Left"
msgstr "Avant esquèrra naut"
#: ../src/pulse/channelmap.c:158
-#, fuzzy
msgid "Top Front Right"
-msgstr "Avant drecha naut"
+msgstr "Avant dreita naut"
#: ../src/pulse/channelmap.c:160
-#, fuzzy
msgid "Top Rear Center"
msgstr "Arrièr centre naut"
#: ../src/pulse/channelmap.c:161
-#, fuzzy
msgid "Top Rear Left"
msgstr "Arrièr esquèrra naut"
#: ../src/pulse/channelmap.c:162
-#, fuzzy
msgid "Top Rear Right"
-msgstr "Arrièr drecha naut"
+msgstr "Arrièr dreita naut"
#: ../src/pulse/channelmap.c:479 ../src/pulse/format.c:121
#: ../src/pulse/sample.c:175 ../src/pulse/volume.c:294
#: ../src/pulse/volume.c:320 ../src/pulse/volume.c:340
#: ../src/pulse/volume.c:372 ../src/pulse/volume.c:412
#: ../src/pulse/volume.c:431
-#, fuzzy
msgid "(invalid)"
msgstr "(invalid)"
-#: ../src/pulse/channelmap.c:762
-#, fuzzy
+#: ../src/pulse/channelmap.c:775
msgid "Stereo"
msgstr "Esterèo"
-#: ../src/pulse/channelmap.c:767
+#: ../src/pulse/channelmap.c:780
msgid "Surround 4.0"
msgstr "Surround 4.0"
-#: ../src/pulse/channelmap.c:773
+#: ../src/pulse/channelmap.c:786
msgid "Surround 4.1"
msgstr "Surround 4.1"
-#: ../src/pulse/channelmap.c:779
+#: ../src/pulse/channelmap.c:792
msgid "Surround 5.0"
msgstr "Surround 5.0"
-#: ../src/pulse/channelmap.c:785
+#: ../src/pulse/channelmap.c:798
msgid "Surround 5.1"
msgstr "Surround 5.1"
-#: ../src/pulse/channelmap.c:792
+#: ../src/pulse/channelmap.c:805
msgid "Surround 7.1"
msgstr "Surround 7.1"
#: ../src/pulse/client-conf-x11.c:53 ../src/utils/pax11publish.c:97
-#, fuzzy
msgid "xcb_connect() failed"
-msgstr "Échec de pa_context_connect() : %s"
+msgstr "xcb_connect() a fracassat"
#: ../src/pulse/client-conf-x11.c:58 ../src/utils/pax11publish.c:102
msgid "xcb_connection_has_error() returned true"
msgstr "xcb_connection_has_error() a tornat verai"
#: ../src/pulse/client-conf-x11.c:94
-#, fuzzy
msgid "Failed to parse cookie data"
msgstr "Fracàs al moment de l'analisi de las donadas del cookie"
-#: ../src/pulse/context.c:656
-#, c-format, fuzzy
+#: ../src/pulse/context.c:702
+#, c-format
msgid "fork(): %s"
msgstr "fork() : %s"
-#: ../src/pulse/context.c:711
-#, c-format, fuzzy
+#: ../src/pulse/context.c:757
+#, c-format
msgid "waitpid(): %s"
msgstr "waitpid() : %s"
-#: ../src/pulse/context.c:1412
-#, c-format, fuzzy
+#: ../src/pulse/context.c:1463
+#, c-format
msgid "Received message for unknown extension '%s'"
msgstr "Messatge recebut per una extension desconeguda « %s »"
#: ../src/pulse/direction.c:37
-#, fuzzy
msgid "input"
-msgstr "Entrada"
+msgstr ""
#: ../src/pulse/direction.c:39
-#, fuzzy
msgid "output"
-msgstr "Sortida vide"
+msgstr "sortida"
#: ../src/pulse/direction.c:41
msgid "bidirectional"
-msgstr ""
+msgstr "bidireccional"
#: ../src/pulse/direction.c:43
-#, fuzzy
msgid "invalid"
-msgstr "(invalide)"
+msgstr "invalid"
-#: ../src/pulsecore/core-util.c:1820
+#: ../src/pulsecore/core-util.c:1836
#, c-format
msgid ""
"XDG_RUNTIME_DIR (%s) is not owned by us (uid %d), but by uid %d! (This could "
@@ -1599,171 +1378,146 @@ msgid ""
"over the native protocol. Don't do that.)"
msgstr ""
+#: ../src/pulsecore/core-util.h:97
+msgid "yes"
+msgstr "òc"
+
+#: ../src/pulsecore/core-util.h:97
+msgid "no"
+msgstr "non"
+
#: ../src/pulsecore/lock-autospawn.c:141 ../src/pulsecore/lock-autospawn.c:227
-#, fuzzy
msgid "Cannot access autospawn lock."
-msgstr "Impossible d'accedir al varrolh autonòme."
+msgstr "Impossible d'accedir al verrolh autonòme."
-#: ../src/pulsecore/log.c:153
+#: ../src/pulsecore/log.c:165
#, c-format
-#, fuzzy, c-format
msgid "Failed to open target file '%s'."
-msgstr "Échec lors de l'ouverture du fichier « %s »\n"
+msgstr ""
-#: ../src/pulsecore/log.c:176
+#: ../src/pulsecore/log.c:188
#, c-format
msgid ""
"Tried to open target file '%s', '%s.1', '%s.2' ... '%s.%d', but all failed."
msgstr ""
-# dans les lignes suivantes [%s = nom de fichier: %u = ligne dans celui-ci]
-#: ../src/pulsecore/log.c:631
-#, fuzzy
+#: ../src/pulsecore/log.c:651
msgid "Invalid log target."
-msgstr "[%s:%u] Cible du journal « %s » invalide."
+msgstr ""
-#: ../src/pulsecore/sink.c:3427
-#, fuzzy
+#: ../src/pulsecore/sink.c:3461
msgid "Built-in Audio"
msgstr "Àudio integrat"
-#: ../src/pulsecore/sink.c:3432
-#, fuzzy
+#: ../src/pulsecore/sink.c:3466
msgid "Modem"
msgstr "Modèm"
#: ../src/pulse/error.c:38
-#, fuzzy
msgid "OK"
msgstr "D'acòrdi"
#: ../src/pulse/error.c:39
-#, fuzzy
msgid "Access denied"
msgstr "Accès refusat"
#: ../src/pulse/error.c:40
-#, fuzzy
msgid "Unknown command"
msgstr "Comanda desconeguda"
#: ../src/pulse/error.c:41
-#, fuzzy
msgid "Invalid argument"
msgstr "Argument invalid"
#: ../src/pulse/error.c:42
-#, fuzzy
msgid "Entity exists"
msgstr "L'entitat existís"
#: ../src/pulse/error.c:43
-#, fuzzy
msgid "No such entity"
msgstr "Pas cap d'identitat d'aquel tipe"
#: ../src/pulse/error.c:44
-#, fuzzy
msgid "Connection refused"
msgstr "Connexion refusada"
#: ../src/pulse/error.c:45
-#, fuzzy
msgid "Protocol error"
msgstr "Error de protocòl"
#: ../src/pulse/error.c:46
-#, fuzzy
msgid "Timeout"
msgstr "Relambi d'espèra depassat"
#: ../src/pulse/error.c:47
-#, fuzzy
msgid "No authentication key"
-msgstr "Aucune clé d'autorisation"
+msgstr ""
#: ../src/pulse/error.c:48
-#, fuzzy
msgid "Internal error"
msgstr "Error intèrna"
#: ../src/pulse/error.c:49
-#, fuzzy
msgid "Connection terminated"
msgstr "Connexion acabada"
#: ../src/pulse/error.c:50
-#, fuzzy
msgid "Entity killed"
msgstr "L'entitat es estada tuada"
#: ../src/pulse/error.c:51
-#, fuzzy
msgid "Invalid server"
msgstr "Servidor invalid"
#: ../src/pulse/error.c:52
-#, fuzzy
msgid "Module initialization failed"
msgstr "Fracàs al moment de l'inicializacion del modul"
#: ../src/pulse/error.c:53
-#, fuzzy
msgid "Bad state"
msgstr "Estat incorrècte"
#: ../src/pulse/error.c:54
-#, fuzzy
msgid "No data"
msgstr "Pas de donadas"
#: ../src/pulse/error.c:55
-#, fuzzy
msgid "Incompatible protocol version"
msgstr "Version del protocòl invalida"
#: ../src/pulse/error.c:56
-#, fuzzy
msgid "Too large"
msgstr "Tròp grand"
#: ../src/pulse/error.c:57
-#, fuzzy
msgid "Not supported"
msgstr "Pas pres en carga"
#: ../src/pulse/error.c:58
-#, fuzzy
msgid "Unknown error code"
msgstr "Còde d'error desconegut"
#: ../src/pulse/error.c:59
-#, fuzzy
msgid "No such extension"
msgstr "Pas cap d'extension d'aquel tipe"
#: ../src/pulse/error.c:60
-#, fuzzy
msgid "Obsolete functionality"
msgstr "Foncionalitat despreciada"
#: ../src/pulse/error.c:61
-#, fuzzy
msgid "Missing implementation"
msgstr "Implantacion mancanta"
#: ../src/pulse/error.c:62
-#, fuzzy
msgid "Client forked"
msgstr "Lo client s'es devesit (Client forked)"
#: ../src/pulse/error.c:63
-#, fuzzy
msgid "Input/Output error"
msgstr "Error d'entrada/sortida"
#: ../src/pulse/error.c:64
-#, fuzzy
msgid "Device or resource busy"
msgstr "Periferic o ressorsa ocupat"
@@ -1792,233 +1546,189 @@ msgstr "%0.1f Kio"
msgid "%u B"
msgstr "%u B"
-#: ../src/tests/resampler-test.c:255
+#: ../src/utils/pacat.c:117
#, c-format
-msgid ""
-"%s [options]\n"
-"\n"
-"-h, --help Show this help\n"
-"-v, --verbose Print debug messages\n"
-" --from-rate=SAMPLERATE From sample rate in Hz (defaults to "
-"44100)\n"
-" --from-format=SAMPLEFORMAT From sample type (defaults to s16le)\n"
-" --from-channels=CHANNELS From number of channels (defaults to "
-"1)\n"
-" --to-rate=SAMPLERATE To sample rate in Hz (defaults to "
-"44100)\n"
-" --to-format=SAMPLEFORMAT To sample type (defaults to s16le)\n"
-" --to-channels=CHANNELS To number of channels (defaults to 1)\n"
-" --resample-method=METHOD Resample method (defaults to auto)\n"
-" --seconds=SECONDS From stream duration (defaults to 60)\n"
-"\n"
-"If the formats are not specified, the test performs all formats "
-"combinations,\n"
-"back and forth.\n"
-"\n"
-"Sample type must be one of s16le, s16be, u8, float32le, float32be, ulaw, "
-"alaw,\n"
-"s24le, s24be, s24-32le, s24-32be, s32le, s32be (defaults to s16ne)\n"
-"\n"
-"See --dump-resample-methods for possible values of resample methods.\n"
-msgstr ""
-
-#: ../src/tests/resampler-test.c:354
-#, c-format
-#, fuzzy, c-format
-msgid "%s %s\n"
-msgstr "%s %s"
-
-#: ../src/utils/pacat.c:116
-#, c-format, fuzzy
msgid "Failed to drain stream: %s"
msgstr "Fracàs al moment del voidatge del flux : %s"
-#: ../src/utils/pacat.c:121
-#, fuzzy
+#: ../src/utils/pacat.c:122
msgid "Playback stream drained."
msgstr "Flux de lectura voidat."
-#: ../src/utils/pacat.c:132
-#, fuzzy
+#: ../src/utils/pacat.c:133
msgid "Draining connection to server."
msgstr "Drenatge de la connexion cap al servidor."
-#: ../src/utils/pacat.c:145
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:146
+#, c-format
msgid "pa_stream_drain(): %s"
msgstr "pa_stream_drain() : %s"
-#: ../src/utils/pacat.c:168
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:169
+#, c-format
msgid "pa_stream_write() failed: %s"
msgstr "pa_stream_write() a fracassat : %s"
-#: ../src/utils/pacat.c:209
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:210
+#, c-format
msgid "pa_stream_begin_write() failed: %s"
msgstr "pa_stream_begin_write() a fracassat : %s"
-#: ../src/utils/pacat.c:259 ../src/utils/pacat.c:289
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:260 ../src/utils/pacat.c:290
+#, c-format
msgid "pa_stream_peek() failed: %s"
msgstr "pa_stream_peek() a fracassat : %s"
-#: ../src/utils/pacat.c:339
-#, fuzzy
+#: ../src/utils/pacat.c:340
msgid "Stream successfully created."
msgstr "Flux creat amb succès"
-#: ../src/utils/pacat.c:342
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:343
+#, c-format
msgid "pa_stream_get_buffer_attr() failed: %s"
msgstr "pa_stream_get_buffer_attr() a fracassat : %s"
-#: ../src/utils/pacat.c:346
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:347
+#, c-format
msgid "Buffer metrics: maxlength=%u, tlength=%u, prebuf=%u, minreq=%u"
msgstr "Mesuras del tampon : maxlength=%u, tlength=%u, prebuf=%u, minreq=%u"
-#: ../src/utils/pacat.c:349
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:350
+#, c-format
msgid "Buffer metrics: maxlength=%u, fragsize=%u"
msgstr "Mesuras del tampon : maxlength=%u, fragsize=%u"
-#: ../src/utils/pacat.c:353
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:354
+#, c-format
msgid "Using sample spec '%s', channel map '%s'."
msgstr ""
"Utilizacion de l'especificacion d'escandalhatge « %s », plan dels canals "
"« %s »."
-# l'espace manquant entre %s et suspended est voulu
-#: ../src/utils/pacat.c:357
+#: ../src/utils/pacat.c:358
#, c-format
-#, fuzzy, c-format
msgid "Connected to device %s (index: %u, suspended: %s)."
-msgstr "Connecté au périphérique %s (%u, %ssuspendu)."
+msgstr ""
-#: ../src/utils/pacat.c:367
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:368
+#, c-format
msgid "Stream error: %s"
msgstr "Error de flux : %s"
-#: ../src/utils/pacat.c:377
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:378
+#, c-format
msgid "Stream device suspended.%s"
msgstr "Periferic de flux arrestat.%s"
-#: ../src/utils/pacat.c:379
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:380
+#, c-format
msgid "Stream device resumed.%s"
msgstr "Periferic de flux reaviat.%s"
-#: ../src/utils/pacat.c:387
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:388
+#, c-format
msgid "Stream underrun.%s"
msgstr "Flux void.%s"
-#: ../src/utils/pacat.c:394
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:395
+#, c-format
msgid "Stream overrun.%s"
msgstr "Flux saturat.%s"
-#: ../src/utils/pacat.c:401
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:402
+#, c-format
msgid "Stream started.%s"
msgstr "Flux aviat.%s"
-#: ../src/utils/pacat.c:408
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:409
+#, c-format
msgid "Stream moved to device %s (%u, %ssuspended).%s"
msgstr "Flux desplaçat cap al periferic %s (%u, %sarrestat).%s"
-# suspendu ou non suspendu
-#: ../src/utils/pacat.c:408
+#: ../src/utils/pacat.c:409
msgid "not "
msgstr "non "
-#: ../src/utils/pacat.c:415
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:416
+#, c-format
msgid "Stream buffer attributes changed.%s"
msgstr "D'atributs del tampon de flux an cambiat.%s"
-#: ../src/utils/pacat.c:430
+#: ../src/utils/pacat.c:431
msgid "Cork request stack is empty: corking stream"
msgstr ""
-#: ../src/utils/pacat.c:436
+#: ../src/utils/pacat.c:437
msgid "Cork request stack is empty: uncorking stream"
msgstr ""
-#: ../src/utils/pacat.c:440
-msgid "Warning: Received more uncork requests than cork requests!"
+#: ../src/utils/pacat.c:441
+msgid "Warning: Received more uncork requests than cork requests."
msgstr ""
-#: ../src/utils/pacat.c:465
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:466
+#, c-format
msgid "Connection established.%s"
msgstr "Connexion establida.%s"
-#: ../src/utils/pacat.c:468
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:469
+#, c-format
msgid "pa_stream_new() failed: %s"
msgstr "pa_stream_new() a fracassat : %s"
-#: ../src/utils/pacat.c:506
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:507
+#, c-format
msgid "pa_stream_connect_playback() failed: %s"
msgstr "pa_stream_connect_playback() a fracassat : %s"
-#: ../src/utils/pacat.c:512
+#: ../src/utils/pacat.c:513
#, c-format
-#, fuzzy, c-format
msgid "Failed to set monitor stream: %s"
-msgstr "Échec lors du vidage du flux : %s"
+msgstr ""
-#: ../src/utils/pacat.c:516
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:517
+#, c-format
msgid "pa_stream_connect_record() failed: %s"
msgstr "pa_stream_connect_record() a fracassat : %s"
-#: ../src/utils/pacat.c:529 ../src/utils/pactl.c:1446
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:530 ../src/utils/pactl.c:1446
+#, c-format
msgid "Connection failure: %s"
msgstr "Fracàs de connexion : %s"
-#: ../src/utils/pacat.c:562
-#, fuzzy
+#: ../src/utils/pacat.c:563
msgid "Got EOF."
msgstr "Fin de fichièr atencha."
-#: ../src/utils/pacat.c:599
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:600
+#, c-format
msgid "write() failed: %s"
msgstr "write() a fracassat : %s"
-#: ../src/utils/pacat.c:620
-#, fuzzy
+#: ../src/utils/pacat.c:621
msgid "Got signal, exiting."
msgstr "Senhal recebut, sortida en cors."
-#: ../src/utils/pacat.c:634
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:635
+#, c-format
msgid "Failed to get latency: %s"
msgstr "Fracàs al moment de l'obtencion de la laténcia : %s"
-#: ../src/utils/pacat.c:639
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:640
+#, c-format
msgid "Time: %0.3f sec; Latency: %0.0f usec."
msgstr "Durada : %0.3f seg. ; Laténcia : %0.0f µseg."
-#: ../src/utils/pacat.c:660
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:661
+#, c-format
msgid "pa_stream_update_timing_info() failed: %s"
msgstr "pa_stream_update_timing_info() a fracassat : %s"
-#: ../src/utils/pacat.c:670
+#: ../src/utils/pacat.c:671
#, c-format
msgid ""
"%s [options]\n"
+"%s\n"
"\n"
" -h, --help Show this help\n"
" --version Show version\n"
@@ -2082,8 +1792,29 @@ msgid ""
"index INDEX.\n"
msgstr ""
-#: ../src/utils/pacat.c:808
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:788
+msgid "Play back encoded audio files on a PulseAudio sound server."
+msgstr ""
+
+#: ../src/utils/pacat.c:792
+msgid ""
+"Capture audio data from a PulseAudio sound server and write it to a file."
+msgstr ""
+
+#: ../src/utils/pacat.c:796
+msgid ""
+"Capture audio data from a PulseAudio sound server and write it to STDOUT or "
+"the specified file."
+msgstr ""
+
+#: ../src/utils/pacat.c:800
+msgid ""
+"Play back audio data from STDIN or the specified file on a PulseAudio sound "
+"server."
+msgstr ""
+
+#: ../src/utils/pacat.c:814
+#, c-format
msgid ""
"pacat %s\n"
"Compiled with libpulse %s\n"
@@ -2093,79 +1824,74 @@ msgstr ""
"Compilat amb libpulse %s\n"
"Ligat amb libpulse %s\n"
-#: ../src/utils/pacat.c:841 ../src/utils/pactl.c:1642
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:847 ../src/utils/pactl.c:1648
+#, c-format
msgid "Invalid client name '%s'"
msgstr "Nom del client invalid « %s »"
-#: ../src/utils/pacat.c:856
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:862
+#, c-format
msgid "Invalid stream name '%s'"
msgstr "Nom del flux invalid « %s »"
-#: ../src/utils/pacat.c:893
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:899
+#, c-format
msgid "Invalid channel map '%s'"
msgstr "Plan dels canals invalid « %s »"
-#: ../src/utils/pacat.c:922 ../src/utils/pacat.c:936
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:928 ../src/utils/pacat.c:942
+#, c-format
msgid "Invalid latency specification '%s'"
msgstr "Especificacion de laténcia invalida « %s »"
-#: ../src/utils/pacat.c:929 ../src/utils/pacat.c:943
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:935 ../src/utils/pacat.c:949
+#, c-format
msgid "Invalid process time specification '%s'"
msgstr "Especificacion de temps de tractament invalida « %s »"
-#: ../src/utils/pacat.c:955
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:961
+#, c-format
msgid "Invalid property '%s'"
msgstr "Proprietat invalida « %s »"
-#: ../src/utils/pacat.c:974
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:980
+#, c-format
msgid "Unknown file format %s."
msgstr "Format de fichièr desconegut %s."
-#: ../src/utils/pacat.c:989
+#: ../src/utils/pacat.c:995
msgid "Failed to parse the argument for --monitor-stream"
msgstr ""
-#: ../src/utils/pacat.c:1000
-#, fuzzy
+#: ../src/utils/pacat.c:1006
msgid "Invalid sample specification"
msgstr "Especificacion d'escandalhatge invalida"
-#: ../src/utils/pacat.c:1010
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:1016
+#, c-format
msgid "open(): %s"
msgstr "open(): %s"
-#: ../src/utils/pacat.c:1015
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:1021
+#, c-format
msgid "dup2(): %s"
msgstr "dup2(): %s"
-#: ../src/utils/pacat.c:1022
-#, fuzzy
+#: ../src/utils/pacat.c:1028
msgid "Too many arguments."
msgstr "Tròp de paramètres."
-#: ../src/utils/pacat.c:1033
-#, fuzzy
+#: ../src/utils/pacat.c:1039
msgid "Failed to generate sample specification for file."
msgstr ""
"Fracàs al moment de la generacion de las informacions de l'escandalhatge del "
"fichièr."
-#: ../src/utils/pacat.c:1059
-#, fuzzy
+#: ../src/utils/pacat.c:1065
msgid "Failed to open audio file."
msgstr "Fracàs al moment de la dobertura del fichièr àudio."
-#: ../src/utils/pacat.c:1065
-#, fuzzy
+#: ../src/utils/pacat.c:1071
msgid ""
"Warning: specified sample specification will be overwritten with "
"specification from file."
@@ -2173,96 +1899,84 @@ msgstr ""
"Avertiment : las especificacions de l'escandalhatge especificat seràn "
"espotidas per las del fichièr."
-#: ../src/utils/pacat.c:1068 ../src/utils/pactl.c:1706
-#, fuzzy
+#: ../src/utils/pacat.c:1074 ../src/utils/pactl.c:1712
msgid "Failed to determine sample specification from file."
msgstr ""
"Fracàs al moment de l'obtencion de las informacions de l'escandalhatge del "
"fichièr."
-#: ../src/utils/pacat.c:1077
-#, fuzzy
+#: ../src/utils/pacat.c:1083
msgid "Warning: Failed to determine channel map from file."
msgstr ""
"Avertiment : fracàs al moment de l'obtencion de las informacions del plan "
"dels canals del fichièr."
-#: ../src/utils/pacat.c:1088
-#, fuzzy
+#: ../src/utils/pacat.c:1094
msgid "Channel map doesn't match sample specification"
msgstr ""
"Lo plan dels canals correspond pas a l'especificacion d'escandalhatge"
-#: ../src/utils/pacat.c:1099
-#, fuzzy
+#: ../src/utils/pacat.c:1105
msgid "Warning: failed to write channel map to file."
msgstr ""
"Avertiment : Fracàs al moment de l'escritura del plan dels canals dins lo "
"fichièr."
-#: ../src/utils/pacat.c:1114
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:1120
+#, c-format
msgid ""
"Opening a %s stream with sample specification '%s' and channel map '%s'."
msgstr ""
"Dobertura d'un flux %s amb una especificacion d'escandalhatge « %s » e un "
"plan dels canals « %s »."
-#: ../src/utils/pacat.c:1115
-#, fuzzy
+#: ../src/utils/pacat.c:1121
msgid "recording"
msgstr "enregistrament"
-#: ../src/utils/pacat.c:1115
-#, fuzzy
+#: ../src/utils/pacat.c:1121
msgid "playback"
msgstr "lectura"
-#: ../src/utils/pacat.c:1139
-#, fuzzy
+#: ../src/utils/pacat.c:1145
msgid "Failed to set media name."
-msgstr "Échec lors de l'analyse de la ligne de commande"
+msgstr "Impossible de definir lo nom del supòrt."
-#: ../src/utils/pacat.c:1146 ../src/utils/pactl.c:2056
-#, fuzzy
+#: ../src/utils/pacat.c:1152 ../src/utils/pactl.c:2062
msgid "pa_mainloop_new() failed."
msgstr "pa_mainloop_new() a fracassat."
-#: ../src/utils/pacat.c:1169
-#, fuzzy
+#: ../src/utils/pacat.c:1175
msgid "io_new() failed."
msgstr "io_new() a fracassat."
-#: ../src/utils/pacat.c:1176 ../src/utils/pactl.c:2068
-#, fuzzy
+#: ../src/utils/pacat.c:1182 ../src/utils/pactl.c:2074
msgid "pa_context_new() failed."
msgstr "pa_context_new() a fracassat."
-#: ../src/utils/pacat.c:1184 ../src/utils/pactl.c:2074
-#, c-format, fuzzy
+#: ../src/utils/pacat.c:1190 ../src/utils/pactl.c:2080
+#, c-format
msgid "pa_context_connect() failed: %s"
msgstr "Fracàs de pa_context_connect() : %s"
-#: ../src/utils/pacat.c:1190
-#, fuzzy
+#: ../src/utils/pacat.c:1196
msgid "pa_context_rttime_new() failed."
msgstr "pa_context_rttime_new() a fracassat."
-#: ../src/utils/pacat.c:1197 ../src/utils/pactl.c:2079
-#, fuzzy
+#: ../src/utils/pacat.c:1203 ../src/utils/pactl.c:2085
msgid "pa_mainloop_run() failed."
msgstr "pa_mainloop_run() a fracassat."
-#: ../src/utils/pacmd.c:51 ../src/utils/pactl.c:1564
+#: ../src/utils/pacmd.c:51 ../src/utils/pactl.c:1570
msgid "NAME [ARGS ...]"
msgstr "NOM [ARGS ...]"
-#: ../src/utils/pacmd.c:52 ../src/utils/pacmd.c:60 ../src/utils/pactl.c:1565
+#: ../src/utils/pacmd.c:52 ../src/utils/pacmd.c:60 ../src/utils/pactl.c:1571
msgid "NAME|#N"
msgstr "NOM|#N"
-#: ../src/utils/pacmd.c:53 ../src/utils/pacmd.c:63 ../src/utils/pactl.c:1563
-#: ../src/utils/pactl.c:1569
+#: ../src/utils/pacmd.c:53 ../src/utils/pacmd.c:63 ../src/utils/pactl.c:1569
+#: ../src/utils/pactl.c:1575
msgid "NAME"
msgstr "NOM"
@@ -2274,7 +1988,7 @@ msgstr "NOM|#N VOLUM"
msgid "#N VOLUME"
msgstr "#N VOLUM"
-#: ../src/utils/pacmd.c:56 ../src/utils/pacmd.c:70 ../src/utils/pactl.c:1567
+#: ../src/utils/pacmd.c:56 ../src/utils/pacmd.c:70 ../src/utils/pactl.c:1573
msgid "NAME|#N 1|0"
msgstr "NOM|#N 1|0"
@@ -2300,131 +2014,119 @@ msgstr "NAME SINK|#N"
#: ../src/utils/pacmd.c:64 ../src/utils/pacmd.c:65
msgid "NAME FILENAME"
-msgstr ""
+msgstr "NOM NOMDELFICHIÈR"
#: ../src/utils/pacmd.c:66
msgid "PATHNAME"
-msgstr ""
+msgstr "NOM D'ACCÈS"
#: ../src/utils/pacmd.c:67
msgid "FILENAME SINK|#N"
-msgstr ""
+msgstr "NOMDELFICHIÈR COLLECTOR|#N"
-#: ../src/utils/pacmd.c:69 ../src/utils/pactl.c:1566
+#: ../src/utils/pacmd.c:69 ../src/utils/pactl.c:1572
msgid "#N SINK|SOURCE"
-msgstr ""
+msgstr "#N COLLECTOR|FONT"
#: ../src/utils/pacmd.c:71 ../src/utils/pacmd.c:77 ../src/utils/pacmd.c:78
msgid "1|0"
msgstr "1|0"
-#: ../src/utils/pacmd.c:72 ../src/utils/pactl.c:1568
+#: ../src/utils/pacmd.c:72 ../src/utils/pactl.c:1574
msgid "CARD PROFILE"
msgstr "PERFIL DE LA CARTA"
-#: ../src/utils/pacmd.c:73 ../src/utils/pactl.c:1570
+#: ../src/utils/pacmd.c:73 ../src/utils/pactl.c:1576
msgid "NAME|#N PORT"
msgstr "NOM|#N PÒRT"
-#: ../src/utils/pacmd.c:74 ../src/utils/pactl.c:1576
+#: ../src/utils/pacmd.c:74 ../src/utils/pactl.c:1582
msgid "CARD-NAME|CARD-#N PORT OFFSET"
-msgstr ""
+msgstr "NOM-DE-CARTA|CARTA-#N PÒRT OFFSET"
#: ../src/utils/pacmd.c:75
msgid "TARGET"
msgstr "CIBLA"
#: ../src/utils/pacmd.c:76
-msgid "NUMERIC LEVEL"
+msgid "NUMERIC-LEVEL"
msgstr ""
#: ../src/utils/pacmd.c:79
msgid "FRAMES"
-msgstr ""
+msgstr "TRAMAS"
#: ../src/utils/pacmd.c:81
#, c-format
-#, fuzzy, c-format
msgid ""
"\n"
" -h, --help Show this help\n"
" --version Show version\n"
"When no command is given pacmd starts in the interactive mode.\n"
msgstr ""
-"%s [options] ... \n"
-"\n"
-" -h, --help Aficha cette aide\n"
-" --version Aficha la version\n"
-" -s, --server=SERVEUR Lo nom du serveur auquel se "
-"connecter\n"
-"\n"
#: ../src/utils/pacmd.c:128
#, c-format
-#, fuzzy, c-format
msgid ""
"pacmd %s\n"
"Compiled with libpulse %s\n"
"Linked with libpulse %s\n"
msgstr ""
-"pacat %s\n"
-"Compilé avec libpulse %s\n"
-"Lié avec libpulse %s\n"
+"pacmd %s\n"
+"Compilat amb libpulse %s\n"
+"Ligat amb libpulse %s\n"
#: ../src/utils/pacmd.c:142
-#, fuzzy
msgid "No PulseAudio daemon running, or not running as session daemon."
msgstr ""
"Pas cap de demòni PulseAudio en cors d'execucion, o que s'executa pas dins "
-"una sesilha de tipe demòni."
+"una session de tipe demòni."
#: ../src/utils/pacmd.c:147
-#, c-format, fuzzy
+#, c-format
msgid "socket(PF_UNIX, SOCK_STREAM, 0): %s"
msgstr "socket(PF_UNIX, SOCK_STREAM, 0) : %s"
#: ../src/utils/pacmd.c:164
-#, c-format, fuzzy
+#, c-format
msgid "connect(): %s"
msgstr "connect() : %s"
#: ../src/utils/pacmd.c:172
-#, fuzzy
msgid "Failed to kill PulseAudio daemon."
msgstr "Impossible de tuar lo demòni PulseAudio."
#: ../src/utils/pacmd.c:180
-#, fuzzy
msgid "Daemon not responding."
msgstr "Lo demòni respond pas."
#: ../src/utils/pacmd.c:212 ../src/utils/pacmd.c:321 ../src/utils/pacmd.c:339
-#, c-format, fuzzy
+#, c-format
msgid "write(): %s"
msgstr "write() : %s"
#: ../src/utils/pacmd.c:268
-#, c-format, fuzzy
+#, c-format
msgid "poll(): %s"
msgstr "poll() : %s"
#: ../src/utils/pacmd.c:279 ../src/utils/pacmd.c:299
-#, c-format, fuzzy
+#, c-format
msgid "read(): %s"
msgstr "read() : %s"
#: ../src/utils/pactl.c:164
-#, c-format, fuzzy
+#, c-format
msgid "Failed to get statistics: %s"
msgstr "Fracàs al moment de la recuperacion de las estatisticas : %s"
#: ../src/utils/pactl.c:170
-#, c-format, fuzzy
+#, c-format
msgid "Currently in use: %u blocks containing %s bytes total.\n"
msgstr "En cors d'utilizacion : %u blòts que conten al total %s octets.\n"
#: ../src/utils/pactl.c:173
-#, c-format, fuzzy
+#, c-format
msgid ""
"Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
msgstr ""
@@ -2432,12 +2134,12 @@ msgstr ""
"al total %s octets.\n"
#: ../src/utils/pactl.c:176
-#, c-format, fuzzy
+#, c-format
msgid "Sample cache size: %s\n"
-msgstr "Talha de l'escondedor de l'escandalhatge : %s\n"
+msgstr "Talha de l'amagatal de l'escandalhatge : %s\n"
#: ../src/utils/pactl.c:185
-#, c-format, fuzzy
+#, c-format
msgid "Failed to get server information: %s"
msgstr ""
"Fracàs al moment de la recuperacion de las informacions del servidor : %s"
@@ -2452,10 +2154,15 @@ msgid ""
"Client Index: %u\n"
"Tile Size: %zu\n"
msgstr ""
+"Nom del servidor : %s\n"
+"Version del protocòl de la bibliotèca : %u\n"
+"Version del protocòl del servidor : %u\n"
+"Es local : %s\n"
+"Indèx del client : %u\n"
+"Talha del teule : %zu\n"
#: ../src/utils/pactl.c:206
#, c-format
-#, fuzzy, c-format
msgid ""
"User Name: %s\n"
"Host Name: %s\n"
@@ -2467,26 +2174,24 @@ msgid ""
"Default Source: %s\n"
"Cookie: %04x:%04x\n"
msgstr ""
-"Nom d'utilisateur : %s\n"
-"Nom d'hôte : %s\n"
-"Nom du serveur : %s\n"
-"Version du serveur : %s\n"
-"Especificacion d'escandalhatge par défaut : %s\n"
-"Plan de canaux par défaut : %s\n"
-"Destinacion par défaut : %s\n"
-"Source par défaut : %s\n"
-"Cookie : %08x\n"
+"Nom d'utilizaire : %s\n"
+"Nom d'òste : %s\n"
+"Nom del servidor[nbsp): %s\n"
+"Version del servidor : %s\n"
+"Especificacion de l'escandalhatge per defaut : %s\n"
+"Correspondéncia dels canals per defaut : %s\n"
+"Sortida àudio per defaut : %s\n"
+"Font per defaut : %s\n"
+"Cookie : %04x:%04x\n"
#: ../src/utils/pactl.c:255 ../src/utils/pactl.c:900 ../src/utils/pactl.c:978
-#, c-format, fuzzy
+#, c-format
msgid "Failed to get sink information: %s"
msgstr ""
"Fracàs al moment de l'obtencion de las informacions sus la destinacion : %s"
-# demander à Lennart s'il s'agit de monitor of source
#: ../src/utils/pactl.c:281
#, c-format
-#, fuzzy, c-format
msgid ""
"Sink #%u\n"
"\tState: %s\n"
@@ -2506,48 +2211,29 @@ msgid ""
"\tProperties:\n"
"\t\t%s\n"
msgstr ""
-"Destinacion #%u\n"
-"\tÉtat : %s\n"
-"\tNom : %s\n"
-"\tDescription : %s\n"
-"\tPilote : %s\n"
-"\tEspecificacion de l'escandalhatge : %s\n"
-"\tPlan des canaux : %s\n"
-"\tModul propriétaire : %u\n"
-"\tMuet : %s\n"
-"\tVolume : %s%s%s\n"
-"\t balance %0.2f\n"
-"\tVolume de base : %s%s%s\n"
-"\tMoniteur de la source : %s\n"
-"\tLatence : %0.0f·µs, configurée %0.0f·µs\n"
-"\tDrapeaux : %s%s%s%s%s%s\n"
-"\tPropriétés :\n"
-"\t\t%s\n"
#: ../src/utils/pactl.c:325 ../src/utils/pactl.c:431 ../src/utils/pactl.c:592
-#, c-format, fuzzy
+#, c-format
msgid "\tPorts:\n"
msgstr "\tPòrts :\n"
#: ../src/utils/pactl.c:332 ../src/utils/pactl.c:438
-#, c-format, fuzzy
+#, c-format
msgid "\tActive Port: %s\n"
msgstr "\tPòrt actiu : %s\n"
#: ../src/utils/pactl.c:338 ../src/utils/pactl.c:444
#, c-format
-#, fuzzy, c-format
msgid "\tFormats:\n"
-msgstr "\tPorts :\n"
+msgstr "\tFormats :\n"
#: ../src/utils/pactl.c:362 ../src/utils/pactl.c:920 ../src/utils/pactl.c:993
-#, c-format, fuzzy
+#, c-format
msgid "Failed to get source information: %s"
msgstr "Fracàs al moment de l'obtencion de las informacions sus la font : %s"
#: ../src/utils/pactl.c:388
#, c-format
-#, fuzzy, c-format
msgid ""
"Source #%u\n"
"\tState: %s\n"
@@ -2567,23 +2253,6 @@ msgid ""
"\tProperties:\n"
"\t\t%s\n"
msgstr ""
-"Source #%u\n"
-"\tÉtat : %s\n"
-"\tNom : %s\n"
-"\tDescription : %s\n"
-"\tPilote : %s\n"
-"\tEspecificacion de l'escandalhatge : %s\n"
-"\tPlan des canaux : %s\n"
-"\tModul propriétaire : %u\n"
-"\tMuet : %s\n"
-"\tVolume : %s%s%s\n"
-"\t balance %0.2f\n"
-"\tVolume de base : %s%s%s\n"
-"\tMoniteur de la destinacion : %s\n"
-"\tLatence : %0.0f µs, configurée %0.0f µs\n"
-"\tDrapeaux : %s%s%s%s%s%s\n"
-"\tPropriétés :\n"
-"\t\t%s\n"
#: ../src/utils/pactl.c:416 ../src/utils/pactl.c:486 ../src/utils/pactl.c:529
#: ../src/utils/pactl.c:571 ../src/utils/pactl.c:669 ../src/utils/pactl.c:670
@@ -2594,13 +2263,13 @@ msgid "n/a"
msgstr "n/d"
#: ../src/utils/pactl.c:455 ../src/utils/pactl.c:859
-#, c-format, fuzzy
+#, c-format
msgid "Failed to get module information: %s"
msgstr ""
"Fracàs al moment de la recuperacion de las informacions sul modul : %s"
#: ../src/utils/pactl.c:478
-#, c-format, fuzzy
+#, c-format
msgid ""
"Module #%u\n"
"\tName: %s\n"
@@ -2617,13 +2286,13 @@ msgstr ""
"\t\t%s\n"
#: ../src/utils/pactl.c:497
-#, c-format, fuzzy
+#, c-format
msgid "Failed to get client information: %s"
msgstr ""
"Fracàs al moment de la recuperacion de las informacions sul client : %s"
#: ../src/utils/pactl.c:523
-#, c-format, fuzzy
+#, c-format
msgid ""
"Client #%u\n"
"\tDriver: %s\n"
@@ -2638,13 +2307,13 @@ msgstr ""
"\t\t%s\n"
#: ../src/utils/pactl.c:540
-#, c-format, fuzzy
+#, c-format
msgid "Failed to get card information: %s"
msgstr ""
"Fracàs al moment de la recuperacion de las informacions sus la carta : %s"
#: ../src/utils/pactl.c:563
-#, c-format, fuzzy
+#, c-format
msgid ""
"Card #%u\n"
"\tName: %s\n"
@@ -2661,12 +2330,17 @@ msgstr ""
"\t\t%s\n"
#: ../src/utils/pactl.c:579
-#, c-format, fuzzy
+#, c-format
msgid "\tProfiles:\n"
msgstr "\tPerfils :\n"
+#: ../src/utils/pactl.c:581
+#, c-format
+msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
+msgstr ""
+
#: ../src/utils/pactl.c:586
-#, c-format, fuzzy
+#, c-format
msgid "\tActive Profile: %s\n"
msgstr "\tPerfil actiu : %s\n"
@@ -2676,14 +2350,16 @@ msgid ""
"\t\t\tProperties:\n"
"\t\t\t\t%s\n"
msgstr ""
+"\t\t\tProprietats :\n"
+"\t\t\t\t%s\n"
#: ../src/utils/pactl.c:605
#, c-format
msgid "\t\t\tPart of profile(s): %s"
-msgstr ""
+msgstr "\t\t\tPartida del o dels perfil(s) : %s"
#: ../src/utils/pactl.c:622 ../src/utils/pactl.c:940 ../src/utils/pactl.c:1008
-#, c-format, fuzzy
+#, c-format
msgid "Failed to get sink input information: %s"
msgstr ""
"Fracàs al moment de la recuperacion de las informacions sus l'entrada de la "
@@ -2691,7 +2367,6 @@ msgstr ""
#: ../src/utils/pactl.c:651
#, c-format
-#, fuzzy, c-format
msgid ""
"Sink Input #%u\n"
"\tDriver: %s\n"
@@ -2711,25 +2386,9 @@ msgid ""
"\tProperties:\n"
"\t\t%s\n"
msgstr ""
-"Entrada de la destinacion #%u\n"
-"\tPilote : %s\n"
-"\tModul propriétaire : %s\n"
-"\tClient : %s\n"
-"\tDestinacion : %u\n"
-"\tEspecificacion de l'escandalhatge : %s\n"
-"\tPlan des canaux : %s\n"
-"\tMuet : %s\n"
-"\tVolume : %s\n"
-"\t %s\n"
-"\t balance %0.2f\n"
-"\tLatence du tampon : %0.0f µs\n"
-"\tLatence de la destinacion : %0.0f µs\n"
-"\tMéthode de réescandalhatgenage : %s\n"
-"\tPropriétés :\n"
-"\t\t%s\n"
#: ../src/utils/pactl.c:692 ../src/utils/pactl.c:960 ../src/utils/pactl.c:1023
-#, c-format, fuzzy
+#, c-format
msgid "Failed to get source output information: %s"
msgstr ""
"Fracàs al moment de la recuperacion de las informacions sus la sortida de la "
@@ -2737,7 +2396,6 @@ msgstr ""
#: ../src/utils/pactl.c:721
#, c-format
-#, fuzzy, c-format
msgid ""
"Source Output #%u\n"
"\tDriver: %s\n"
@@ -2757,36 +2415,16 @@ msgid ""
"\tProperties:\n"
"\t\t%s\n"
msgstr ""
-"Entrada de la destinacion #%u\n"
-"\tPilote : %s\n"
-"\tModul propriétaire : %s\n"
-"\tClient : %s\n"
-"\tDestinacion : %u\n"
-"\tEspecificacion de l'escandalhatge : %s\n"
-"\tPlan des canaux : %s\n"
-"\tMuet : %s\n"
-"\tVolume : %s\n"
-"\t %s\n"
-"\t balance %0.2f\n"
-"\tLatence du tampon : %0.0f µs\n"
-"\tLatence de la destinacion : %0.0f µs\n"
-"\tMéthode de réescandalhatgenage : %s\n"
-"\tPropriétés :\n"
-"\t\t%s\n"
#: ../src/utils/pactl.c:762
-#, c-format, fuzzy
+#, c-format
msgid "Failed to get sample information: %s"
msgstr ""
"Fracàs al moment de la recuperacion de las informacions sus l'escandalhatge "
" : %s"
-# Lazy ?
-# load-sample-lazy = Create a new entry in the sample cache, but don't load
-# the sample immediately. The sample is loaded only when it is first used
#: ../src/utils/pactl.c:789
#, c-format
-#, fuzzy, c-format
msgid ""
"Sample #%u\n"
"\tName: %s\n"
@@ -2801,30 +2439,16 @@ msgid ""
"\tProperties:\n"
"\t\t%s\n"
msgstr ""
-"Escandalhatge #%u\n"
-"\tNom : %s\n"
-"\tEspecificacion de l'escandalhatge : %s\n"
-"\tPlan des canaux : %s\n"
-"\tVolume : %s\n"
-"\t %s\n"
-"\t balance %0.2f\n"
-"\tDurada : %0.1f s\n"
-"\tTaille : %s\n"
-"\tCache retardé : %s\n"
-"\tNom de fichier : %s\n"
-"\tPropriétés :\n"
-"\t\t%s\n"
#: ../src/utils/pactl.c:817 ../src/utils/pactl.c:827
-#, c-format, fuzzy
+#, c-format
msgid "Failure: %s"
msgstr "Fracàs : %s"
#: ../src/utils/pactl.c:866
#, c-format
-#, fuzzy, c-format
msgid "Failed to unload module: Module %s not loaded"
-msgstr "Échec lors de l'envoi de l'escandalhatge : %s"
+msgstr "Impossible de descargar lo modul : Modul %s pas cargat"
#: ../src/utils/pactl.c:884
#, c-format
@@ -2835,17 +2459,15 @@ msgstr ""
#: ../src/utils/pactl.c:1050
#, c-format
-#, fuzzy, c-format
msgid "Failed to set format: invalid format string %s"
-msgstr "Échec lors de l'obtention des informations sur la source : %s"
+msgstr "Impossible de definir le format : nom de format invalid %s"
#: ../src/utils/pactl.c:1093
-#, c-format, fuzzy
+#, c-format
msgid "Failed to upload sample: %s"
msgstr "Impossible de mandar l'escandalhatge : %s"
#: ../src/utils/pactl.c:1110
-#, fuzzy
msgid "Premature end of file"
msgstr "Fin de fichièr prematurada (EOF)."
@@ -2866,23 +2488,20 @@ msgid "unknown"
msgstr "desconegut"
#: ../src/utils/pactl.c:1147
-#, fuzzy
msgid "sink"
msgstr "destinacion"
#: ../src/utils/pactl.c:1150
-#, fuzzy
msgid "source"
msgstr "font"
#: ../src/utils/pactl.c:1153
msgid "sink-input"
-msgstr ""
+msgstr "entrada de collector"
#: ../src/utils/pactl.c:1156
-#, fuzzy
msgid "source-output"
-msgstr "source"
+msgstr "sortida de font"
#: ../src/utils/pactl.c:1159
msgid "module"
@@ -2894,12 +2513,11 @@ msgstr "client"
#: ../src/utils/pactl.c:1165
msgid "sample-cache"
-msgstr ""
+msgstr "cache per l'escandalhatge"
#: ../src/utils/pactl.c:1168
-#, fuzzy
msgid "server"
-msgstr "Serveur invalide"
+msgstr "servidor"
#: ../src/utils/pactl.c:1171
msgid "card"
@@ -2911,32 +2529,25 @@ msgid "Event '%s' on %s #%u\n"
msgstr "eveniment '%s' sus %s #%u\n"
#: ../src/utils/pactl.c:1452
-#, fuzzy
msgid "Got SIGINT, exiting."
msgstr "SIGINT recebut, tampadura."
-#: ../src/utils/pactl.c:1479
-#, fuzzy
+#: ../src/utils/pactl.c:1485
msgid "Invalid volume specification"
msgstr "Especificacion de volume invalid"
-#: ../src/utils/pactl.c:1502
+#: ../src/utils/pactl.c:1508
msgid "Volume outside permissible range.\n"
msgstr "Volum de delà del sulhet autorizat.\n"
-#: ../src/utils/pactl.c:1515
-#, fuzzy
+#: ../src/utils/pactl.c:1521
msgid "Invalid number of volume specifications.\n"
-msgstr "Especificacion de volume invalide"
+msgstr ""
-#: ../src/utils/pactl.c:1527
-#, fuzzy
+#: ../src/utils/pactl.c:1533
msgid "Inconsistent volume specification.\n"
-msgstr "Especificacion de volume invalide"
+msgstr ""
-#: ../src/utils/pactl.c:1557 ../src/utils/pactl.c:1558
-#: ../src/utils/pactl.c:1559 ../src/utils/pactl.c:1560
-#: ../src/utils/pactl.c:1561 ../src/utils/pactl.c:1562
#: ../src/utils/pactl.c:1563 ../src/utils/pactl.c:1564
#: ../src/utils/pactl.c:1565 ../src/utils/pactl.c:1566
#: ../src/utils/pactl.c:1567 ../src/utils/pactl.c:1568
@@ -2944,53 +2555,59 @@ msgstr "Especificacion de volume invalide"
#: ../src/utils/pactl.c:1571 ../src/utils/pactl.c:1572
#: ../src/utils/pactl.c:1573 ../src/utils/pactl.c:1574
#: ../src/utils/pactl.c:1575 ../src/utils/pactl.c:1576
-#: ../src/utils/pactl.c:1577
+#: ../src/utils/pactl.c:1577 ../src/utils/pactl.c:1578
+#: ../src/utils/pactl.c:1579 ../src/utils/pactl.c:1580
+#: ../src/utils/pactl.c:1581 ../src/utils/pactl.c:1582
+#: ../src/utils/pactl.c:1583
msgid "[options]"
msgstr "[opcions]"
-#: ../src/utils/pactl.c:1559
+#: ../src/utils/pactl.c:1565
msgid "[TYPE]"
msgstr "[TIPE]"
-#: ../src/utils/pactl.c:1561
+#: ../src/utils/pactl.c:1567
msgid "FILENAME [NAME]"
-msgstr ""
+msgstr "NOM_DE_FICHIÈR [NOM]"
-#: ../src/utils/pactl.c:1562
+#: ../src/utils/pactl.c:1568
msgid "NAME [SINK]"
-msgstr ""
+msgstr "NOM [COLLECTOR]"
-#: ../src/utils/pactl.c:1571
+#: ../src/utils/pactl.c:1577
msgid "NAME|#N VOLUME [VOLUME ...]"
msgstr ""
-#: ../src/utils/pactl.c:1572
+#: ../src/utils/pactl.c:1578
msgid "#N VOLUME [VOLUME ...]"
msgstr ""
-#: ../src/utils/pactl.c:1573
+#: ../src/utils/pactl.c:1579
msgid "NAME|#N 1|0|toggle"
-msgstr ""
+msgstr "NOM|#N 1|0|bascular"
-#: ../src/utils/pactl.c:1574
+#: ../src/utils/pactl.c:1580
msgid "#N 1|0|toggle"
-msgstr ""
+msgstr "#N 1|0|bascular"
-#: ../src/utils/pactl.c:1575
+#: ../src/utils/pactl.c:1581
msgid "#N FORMATS"
msgstr "#N FORMATS"
-#: ../src/utils/pactl.c:1578
+#: ../src/utils/pactl.c:1584
#, c-format
msgid ""
"\n"
"The special names @DEFAULT_SINK@, @DEFAULT_SOURCE@ and @DEFAULT_MONITOR@\n"
"can be used to specify the default sink, source and monitor.\n"
msgstr ""
+"\n"
+"Los noms especials @DEFAULT_SINK@, @DEFAULT_SOURCE@ e @DEFAULT_MONITOR@\n"
+"pòdon èsser utilizats per especificar la destinacion, la font e lo monitor "
+"per defaut.\n"
-#: ../src/utils/pactl.c:1581
+#: ../src/utils/pactl.c:1587
#, c-format
-#, fuzzy, c-format
msgid ""
"\n"
" -h, --help Show this help\n"
@@ -3001,16 +2618,17 @@ msgid ""
" -n, --client-name=NAME How to call this client on the "
"server\n"
msgstr ""
-"%s [options] ... \n"
"\n"
-" -h, --help Aficha cette aide\n"
-" --version Aficha la version\n"
-" -s, --server=SERVEUR Lo nom du serveur auquel se "
-"connecter\n"
+" -h, --help Mòstra aquesta ajuda\n"
+" --version Mòstra la version\n"
"\n"
+" -s, --server=SERVER Lo nom del servidor al qual se "
+"connectar\n"
+" -n, --client-name=NAME Cossí apelar aqueste client sul "
+"servidor\n"
-#: ../src/utils/pactl.c:1622
-#, c-format, fuzzy
+#: ../src/utils/pactl.c:1628
+#, c-format
msgid ""
"pactl %s\n"
"Compiled with libpulse %s\n"
@@ -3020,233 +2638,209 @@ msgstr ""
"Compilat amb libpulse %s\n"
"Ligat amb libpulse %s\n"
-#: ../src/utils/pactl.c:1678
+#: ../src/utils/pactl.c:1684
#, c-format
msgid "Specify nothing, or one of: %s"
-msgstr ""
+msgstr "Especificar pas res, o una valor demest : %s"
-#: ../src/utils/pactl.c:1688
-#, fuzzy
+#: ../src/utils/pactl.c:1694
msgid "Please specify a sample file to load"
msgstr "Indicatz un fichièr d'escandalhatge de cargar"
-#: ../src/utils/pactl.c:1701
-#, fuzzy
+#: ../src/utils/pactl.c:1707
msgid "Failed to open sound file."
msgstr "Fracàs al moment de la dobertura d'un fichièr sonòr."
-#: ../src/utils/pactl.c:1713
-#, fuzzy
+#: ../src/utils/pactl.c:1719
msgid "Warning: Failed to determine sample specification from file."
msgstr ""
"Avertiment : Fracàs al moment de l'obtencion de las especificacions de "
"l'escandalhatge del fichièr."
-#: ../src/utils/pactl.c:1723
-#, fuzzy
+#: ../src/utils/pactl.c:1729
msgid "You have to specify a sample name to play"
msgstr "Vos cal indicar un nom d'escandalhatge de legir"
-#: ../src/utils/pactl.c:1735
-#, fuzzy
+#: ../src/utils/pactl.c:1741
msgid "You have to specify a sample name to remove"
msgstr "Vos cal indicar un nom d'escandalhatge de suprimir"
-#: ../src/utils/pactl.c:1744
-#, fuzzy
+#: ../src/utils/pactl.c:1750
msgid "You have to specify a sink input index and a sink"
msgstr "Vos cal indicar un indèx d'entrada de destinacion e una destinacion"
-#: ../src/utils/pactl.c:1754
-#, fuzzy
+#: ../src/utils/pactl.c:1760
msgid "You have to specify a source output index and a source"
msgstr "Vos cal indicar un indèx de sortida de font e una font"
-#: ../src/utils/pactl.c:1769
-#, fuzzy
+#: ../src/utils/pactl.c:1775
msgid "You have to specify a module name and arguments."
msgstr "Vos cal indicar un nom de modul e de paramètres."
-#: ../src/utils/pactl.c:1789
-#, fuzzy
+#: ../src/utils/pactl.c:1795
msgid "You have to specify a module index or name"
-msgstr "Vos cal indicar un indèx de modul"
+msgstr "Vos cal especificar l'indèx o lo nom d'un modul"
-#: ../src/utils/pactl.c:1802
-#, fuzzy
+#: ../src/utils/pactl.c:1808
msgid ""
"You may not specify more than one sink. You have to specify a boolean value."
msgstr ""
"Podètz pas indicar mai d'una destinacion. Vos cal indicar una valor booleana."
-#: ../src/utils/pactl.c:1807 ../src/utils/pactl.c:1827
-#, fuzzy
+#: ../src/utils/pactl.c:1813 ../src/utils/pactl.c:1833
msgid "Invalid suspend specification."
-msgstr "Especificacion d'escandalhatge invalide"
+msgstr "Especificacion de suspension invalida"
-#: ../src/utils/pactl.c:1822
-#, fuzzy
+#: ../src/utils/pactl.c:1828
msgid ""
"You may not specify more than one source. You have to specify a boolean "
"value."
msgstr ""
"Podètz pas indicar mai d'una font. Vos cal indicar una valor booleana."
-#: ../src/utils/pactl.c:1839
-#, fuzzy
+#: ../src/utils/pactl.c:1845
msgid "You have to specify a card name/index and a profile name"
msgstr "Vos cal indicar un nom/un indèx de mapa e un nom de perfil"
-#: ../src/utils/pactl.c:1850
-#, fuzzy
+#: ../src/utils/pactl.c:1856
msgid "You have to specify a sink name/index and a port name"
msgstr "Vos cal indicar un nom/un indèx de destinacion e un nom de pòrt"
-#: ../src/utils/pactl.c:1861
-#, fuzzy
+#: ../src/utils/pactl.c:1867
msgid "You have to specify a sink name"
-msgstr "Vos cal indicar un nom d'escandalhatge à lire"
+msgstr "Vos cal especificar lo nom de la destinacion"
-#: ../src/utils/pactl.c:1871
-#, fuzzy
+#: ../src/utils/pactl.c:1877
msgid "You have to specify a source name/index and a port name"
msgstr "Vos cal indicar un nom/un indèx de font e un nom de pòrt"
-#: ../src/utils/pactl.c:1882
-#, fuzzy
+#: ../src/utils/pactl.c:1888
msgid "You have to specify a source name"
-msgstr "Vos cal indicar un indèx de modul"
+msgstr "Vos cal especificar lo nom de la font"
-#: ../src/utils/pactl.c:1892
-#, fuzzy
+#: ../src/utils/pactl.c:1898
msgid "You have to specify a sink name/index and a volume"
msgstr "Vos cal indicar un nom/un indèx de destinacion e un volum"
-#: ../src/utils/pactl.c:1905
-#, fuzzy
+#: ../src/utils/pactl.c:1911
msgid "You have to specify a source name/index and a volume"
msgstr "Vos cal indicar un nom/un indèx de font e un volum"
-#: ../src/utils/pactl.c:1918
-#, fuzzy
+#: ../src/utils/pactl.c:1924
msgid "You have to specify a sink input index and a volume"
msgstr "Vos cal indicar un indèx d'entrada de destinacion e un volum"
-#: ../src/utils/pactl.c:1923
-#, fuzzy
+#: ../src/utils/pactl.c:1929
msgid "Invalid sink input index"
msgstr "Indèx invalid d'entrada de la destinacion"
-#: ../src/utils/pactl.c:1934
-#, fuzzy
+#: ../src/utils/pactl.c:1940
msgid "You have to specify a source output index and a volume"
-msgstr "Vos cal indicar un indèx de sortida de source et une source"
+msgstr "Vos cal especificar un indèx de font àudio e un volum"
-#: ../src/utils/pactl.c:1939
-#, fuzzy
+#: ../src/utils/pactl.c:1945
msgid "Invalid source output index"
-msgstr "Index invalide d'entrada de la destinacion"
+msgstr "Indèx de font àudio invalid"
-#: ../src/utils/pactl.c:1950
-#, fuzzy
-msgid "You have to specify a sink name/index and a mute boolean"
-msgstr "Vos cal indicar un nom/un indèx de destinacion e un boolean mut"
+#: ../src/utils/pactl.c:1956
+msgid ""
+"You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
+msgstr ""
-#: ../src/utils/pactl.c:1955 ../src/utils/pactl.c:1970
-#: ../src/utils/pactl.c:1990 ../src/utils/pactl.c:2008
-#, fuzzy
+#: ../src/utils/pactl.c:1961 ../src/utils/pactl.c:1976
+#: ../src/utils/pactl.c:1996 ../src/utils/pactl.c:2014
msgid "Invalid mute specification"
-msgstr "Especificacion d'escandalhatge invalide"
+msgstr "Especificacion indicador mut invalid"
-#: ../src/utils/pactl.c:1965
-#, fuzzy
-msgid "You have to specify a source name/index and a mute boolean"
-msgstr "Vos cal indicar un nom/un indèx de font e un boolean mut"
+#: ../src/utils/pactl.c:1971
+msgid ""
+"You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
+msgstr ""
-#: ../src/utils/pactl.c:1980
-#, fuzzy
-msgid "You have to specify a sink input index and a mute boolean"
-msgstr "Vos cal indicar un indèx d'entrada de destinacion e un boolean mut"
+#: ../src/utils/pactl.c:1986
+msgid ""
+"You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
+msgstr ""
-#: ../src/utils/pactl.c:1985
-#, fuzzy
+#: ../src/utils/pactl.c:1991
msgid "Invalid sink input index specification"
msgstr "Especificacion d'indèx d'entrada de la destinacion invalida"
-#: ../src/utils/pactl.c:1998
-#, fuzzy
-msgid "You have to specify a source output index and a mute boolean"
-msgstr "Vos cal indicar un nom/un indèx de source et un booléen muet"
+#: ../src/utils/pactl.c:2004
+msgid ""
+"You have to specify a source output index and a mute action (0, 1, or "
+"'toggle')"
+msgstr ""
-#: ../src/utils/pactl.c:2003
-#, fuzzy
+#: ../src/utils/pactl.c:2009
msgid "Invalid source output index specification"
-msgstr "Especificacion d'indèx d'entrada de la destinacion invalide"
+msgstr "Especificacion d'indèx de sortida activa invalida"
-#: ../src/utils/pactl.c:2020
-#, fuzzy
+#: ../src/utils/pactl.c:2026
msgid ""
"You have to specify a sink index and a semicolon-separated list of supported "
"formats"
-msgstr "Vos cal indicar un nom/un indèx de destinacion et un booléen muet"
+msgstr ""
+"Vos cal especificar un indèx de collector e una lista dels formats preses en "
+"carga separada per de punt-virgulas"
-#: ../src/utils/pactl.c:2032
-#, fuzzy
+#: ../src/utils/pactl.c:2038
msgid ""
"You have to specify a card name/index, a port name and a latency offset"
-msgstr "Vos cal indicar un nom/un indèx de carte et un nom de profil"
+msgstr ""
+"Vos cal especificar un nom/indèx de carta, un nom de pòrt e una "
+"compensacion de laténcia"
-#: ../src/utils/pactl.c:2039
+#: ../src/utils/pactl.c:2045
msgid "Could not parse latency offset"
-msgstr ""
+msgstr "Impossible d'analisar la compensacion de la laténcia"
-#: ../src/utils/pactl.c:2051
-#, fuzzy
+#: ../src/utils/pactl.c:2057
msgid "No valid command specified."
msgstr "Cap de comanda valida pas indicada."
#: ../src/utils/pasuspender.c:79
-#, c-format, fuzzy
+#, c-format
msgid "fork(): %s\n"
msgstr "fork() : %s\n"
#: ../src/utils/pasuspender.c:92
-#, c-format, fuzzy
+#, c-format
msgid "execvp(): %s\n"
msgstr "execvp() : %s\n"
#: ../src/utils/pasuspender.c:111
-#, c-format, fuzzy
+#, c-format
msgid "Failure to resume: %s\n"
msgstr "Fracàs de la represa : %s\n"
#: ../src/utils/pasuspender.c:145
-#, c-format, fuzzy
+#, c-format
msgid "Failure to suspend: %s\n"
msgstr "Fracàs al moment de la suspension : %s\n"
#: ../src/utils/pasuspender.c:170
-#, c-format, fuzzy
+#, c-format
msgid "WARNING: Sound server is not local, not suspending.\n"
msgstr "AVERTIMENT : lo servidor de son es pas local, suspension anullada.\n"
#: ../src/utils/pasuspender.c:183
-#, c-format, fuzzy
+#, c-format
msgid "Connection failure: %s\n"
msgstr "Fracàs al moment de la connexion : %s\n"
#: ../src/utils/pasuspender.c:201
-#, c-format, fuzzy
+#, c-format
msgid "Got SIGINT, exiting.\n"
msgstr "SIGINT recebut, tampadura.\n"
#: ../src/utils/pasuspender.c:219
-#, c-format, fuzzy
+#, c-format
msgid "WARNING: Child process terminated by signal %u\n"
msgstr "AVERTIMENT : lo processus filh es estat acabat pel senhal %u\n"
#: ../src/utils/pasuspender.c:228
-#, c-format, fuzzy
+#, c-format
msgid ""
"%s [options] ... \n"
"\n"
@@ -3265,7 +2859,7 @@ msgstr ""
"\n"
#: ../src/utils/pasuspender.c:266
-#, c-format, fuzzy
+#, c-format
msgid ""
"pasuspender %s\n"
"Compiled with libpulse %s\n"
@@ -3276,22 +2870,22 @@ msgstr ""
"Ligat amb libpulse %s\n"
#: ../src/utils/pasuspender.c:295
-#, c-format, fuzzy
+#, c-format
msgid "pa_mainloop_new() failed.\n"
msgstr "Fracàs de pa_mainloop_new().\n"
#: ../src/utils/pasuspender.c:308
-#, c-format, fuzzy
+#, c-format
msgid "pa_context_new() failed.\n"
msgstr "Fracàs de pa_context_new().\n"
#: ../src/utils/pasuspender.c:320
-#, c-format, fuzzy
+#, c-format
msgid "pa_mainloop_run() failed.\n"
msgstr "Fracàs de pa_mainloop_run().\n"
#: ../src/utils/pax11publish.c:58
-#, c-format, fuzzy
+#, c-format
msgid ""
"%s [-D display] [-S server] [-O sink] [-I source] [-c file] [-d|-e|-i|-r]\n"
"\n"
@@ -3301,8 +2895,8 @@ msgid ""
"variables and cookie file.\n"
" -r Remove PulseAudio data from X11 display\n"
msgstr ""
-"%s [-D visual] [-S servidor] [-O destinacion] [-I font] [-c fichièr] "
-"[-d|-e|-i|-r]\n"
+"%s [-D visual] [-S servidor] [-O destinacion] [-I font] [-c fichièr] [-d|-"
+"e|-i|-r]\n"
"\n"
" -d Aficha las donadas PulseAudio actualas estacadas al visual X11 (per "
"defaut)\n"
@@ -3312,826 +2906,55 @@ msgstr ""
" -r Lèva las donadas PulseAudio del visual X11\n"
#: ../src/utils/pax11publish.c:91
-#, c-format, fuzzy
+#, c-format
msgid "Failed to parse command line.\n"
msgstr "Fracàs al moment de l'analisi de la linha de comanda.\n"
#: ../src/utils/pax11publish.c:110
-#, c-format, fuzzy
+#, c-format
msgid "Server: %s\n"
msgstr "Servidor : %s\n"
#: ../src/utils/pax11publish.c:112
-#, c-format, fuzzy
+#, c-format
msgid "Source: %s\n"
msgstr "Font : %s\n"
#: ../src/utils/pax11publish.c:114
-#, c-format, fuzzy
+#, c-format
msgid "Sink: %s\n"
msgstr "Destinacion : %s\n"
#: ../src/utils/pax11publish.c:116
-#, c-format, fuzzy
+#, c-format
msgid "Cookie: %s\n"
msgstr "Cookie : %s\n"
#: ../src/utils/pax11publish.c:134
-#, c-format, fuzzy
+#, c-format
msgid "Failed to parse cookie data\n"
msgstr "Fracàs al moment de l'analisi de las donadas del cookie\n"
#: ../src/utils/pax11publish.c:139
-#, c-format, fuzzy
+#, c-format
msgid "Failed to save cookie data\n"
msgstr "Fracàs al moment de l'enregistrament de las donadas del cookie\n"
-# Fully Qualified Domain Name
#: ../src/utils/pax11publish.c:168
-#, c-format, fuzzy
+#, c-format
msgid "Failed to get FQDN.\n"
-msgstr ""
-"Fracàs al moment de l'obtencion du FQDN (« nom de domeni complet »).\n"
+msgstr "Fracàs al moment de l'obtencion del FQDN (« nom de domeni complet »).\n"
#: ../src/utils/pax11publish.c:188
-#, c-format, fuzzy
+#, c-format
msgid "Failed to load cookie data\n"
msgstr "Fracàs al moment del cargament de las donadas del cookie\n"
#: ../src/utils/pax11publish.c:206
-#, c-format, fuzzy
+#, c-format
msgid "Not yet implemented.\n"
msgstr "Pas encara implementat.\n"
#, c-format
-#~ msgid "Got signal %s."
-#~ msgstr "Senhal %s obtengut."
-
-#~ msgid "Exiting."
-#~ msgstr "Tampadura."
-
-#, c-format
-#~ msgid "setrlimit(%s, (%u, %u)) failed: %s"
-#~ msgstr "setrlimit(%s, (%u, %u)) a fracassat : %s"
-
-#, c-format
-#~ msgid "This is PulseAudio %s"
-#~ msgstr "Pulseaudio %s"
-
-#, c-format
-#~ msgid "Compilation CFLAGS: %s"
-#~ msgstr "CFLAGS de compilacion : %s"
-
-#, c-format
-#~ msgid "Running on host: %s"
-#~ msgstr "Execucion sus l'òste : %s"
-
-#~ msgid "All asserts enabled."
-#~ msgstr "Totes los messatges d'error son activats."
-
-#~ msgid "Optimized build: no"
-#~ msgstr "Construccion optimizada : non"
-
-#, c-format
-#~ msgid "Machine ID is %s."
-#~ msgstr "L'ID de la maquina es %s."
-
-#, c-format
-#~ msgid "Found user '%s' (UID %lu) and group '%s' (GID %lu)."
-#~ msgstr "Utilizaire « %s ” (UID %lu) e grop « %s » (GID %lu) trobat."
-
-#, c-format
-#~ msgid "Daemon running as PID %u"
-#~ msgstr "Lo demòni es aviat amb lo PID %u"
-
-#, c-format
-#~ msgid "Found %u CPUs."
-#~ msgstr "%u processors trobats."
-
-#, c-format
-#~ msgid "Running in valgrind mode: %s"
-#~ msgstr "Execucion en mòde valgrind : %s"
-
-#~ msgid "Optimized build: yes"
-#~ msgstr "Construccion optimizada : òc"
-
-#, c-format
-#~ msgid "Compilation host: %s"
-#~ msgstr "Òste de compilacion : %s"
-
-#~ msgid "Daemon startup successful."
-#~ msgstr "Aviada del demòni capitada."
-
-#, c-format
-#~ msgid "Using runtime directory %s."
-#~ msgstr "Utilizacion del repertòri d'execucion %s."
-
-#, c-format
-#~ msgid "Using state directory %s."
-#~ msgstr "Utilizacion del repertòri d'estat %s."
-
-#~ msgid "Compiled with Valgrind support: yes"
-#~ msgstr "Compilat amb la presa en carga Valgrind : òc"
-
-#~ msgid "Compiled with Valgrind support: no"
-#~ msgstr "Compilat amb la presa en carga Valgrind : non"
-
-#~ msgid "Daemon shutdown initiated."
-#~ msgstr "Tampadura del demòni iniciada."
-
-#~ msgid "Daemon startup complete."
-#~ msgstr "Aviada del demòni efectuada."
-
-#, c-format
-#~ msgid "Running in system mode: %s"
-#~ msgstr "Execucion en mòde sistèma : %s"
-
-#~ msgid "Daemon terminated."
-#~ msgstr "Demòni acabat."
-
-#~ msgid "Daemon not running"
-#~ msgstr "Lo demòni es pas aviat"
-
-#, c-format
-#~ msgid "Page size is %lu bytes"
-#~ msgstr "La talha de la pagina es de %lu octets"
-
-#~ msgid "NDEBUG defined, all asserts disabled."
-#~ msgstr "NDEBUG definit, totes los messatges d'error son desactivats."
-
-#~ msgid "FASTPATH defined, only fast path asserts disabled."
-#~ msgstr ""
-#~ "FASTPATH definit, sonque los messatges d'error fastpath son estats "
-#~ "desactivats."
-
-#, c-format
-#~ msgid "Session ID is %s."
-#~ msgstr "L'ID de la sesilha es %s."
-
-#~ msgid "Fresh high-resolution timers available! Bon appetit!"
-#~ msgstr ""
-#~ "De relòtges de nauta resolucion novèls son disponibles ! Bon apetís !"
-
-#~ msgid "No authorization key"
-#~ msgstr "Pas cap de clau d'autorizacion"
-
-#, c-format
-#~ msgid "Failed to open configuration file '%s': %s"
-#~ msgstr ""
-#~ "Fracàs al moment de la dobertura del fichièr de configuracion « %s » :%s"
-
-#~ msgid "No cookie loaded. Attempting to connect without."
-#~ msgstr "Cap de cookie pas cargat. Temptativa de connexion sens aqueste."
-
-#, c-format
-#~ msgid ""
-#~ "Source #%u\n"
-#~ "\tState: %s\n"
-#~ "\tName: %s\n"
-#~ "\tDescription: %s\n"
-#~ "\tDriver: %s\n"
-#~ "\tSample Specification: %s\n"
-#~ "\tChannel Map: %s\n"
-#~ "\tOwner Module: %u\n"
-#~ "\tMute: %s\n"
-#~ "\tVolume: %s%s%s\n"
-#~ "\t balance %0.2f\n"
-#~ "\tBase Volume: %s%s%s\n"
-#~ "\tMonitor of Sink: %s\n"
-#~ "\tLatency: %0.0f usec, configured %0.0f usec\n"
-#~ "\tFlags: %s%s%s%s%s%s\n"
-#~ "\tProperties:\n"
-#~ "\t\t%s\n"
-#~ msgstr ""
-#~ "Font #%u\n"
-#~ "\tEstat : %s\n"
-#~ "\tNom : %s\n"
-#~ "\tDescripcion : %s\n"
-#~ "\tPilòt : %s\n"
-#~ "\tEspecificacion de l'escandalhatge : %s\n"
-#~ "\tPlan dels canals : %s\n"
-#~ "\tModul proprietari : %u\n"
-#~ "\tMut : %s\n"
-#~ "\tVolum : %s%s%s\n"
-#~ "\t balança %0.2f\n"
-#~ "\tVolum de basa : %s%s%s\n"
-#~ "\tMonitor de la destinacion : %s\n"
-#~ "\tLaténcia : %0.0f µs, configurada %0.0f µs\n"
-#~ "\tBandièras : %s%s%s%s%s%s\n"
-#~ "\tProprietats :\n"
-#~ "\t\t%s\n"
-
-#, c-format
-#~ msgid "Failed to load client configuration file.\n"
-#~ msgstr ""
-#~ "Fracàs al moment del cargament del fichièr de configuracion del client\n"
-
-#, c-format
-#~ msgid "Failed to read environment configuration data.\n"
-#~ msgstr ""
-#~ "Fracàs al moment de la lectura de las donadas de configuracion de "
-#~ "l'environament\n"
-
-#, c-format
-#~ msgid "Using modules directory %s."
-#~ msgstr "Utilizacion del repertòri de moduls %s."
-
-#~ msgid ""
-#~ "OK, so you are running PA in system mode. Please note that you most likely "
-#~ "shouldn't be doing that.\n"
-#~ "If you do it nonetheless then it's your own fault if things don't work as "
-#~ "expected.\n"
-#~ "Please read http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode for an "
-#~ "explanation why system mode is usually a bad idea."
-#~ msgstr ""
-#~ "D'acòrdi, utilizatz actualament PulseAudio en mòde sistèma. Notatz que "
-#~ "deuriatz pas far aquò.\n"
-#~ "S'o fasètz volontàriament, alara es de vòstra fauta se tot fonciona pas coma "
-#~ "previst.\n"
-#~ "Legissètz http://pulseaudio.org/wiki/WhatIsWrongWithSystemMode per descobrir "
-#~ "perqué lo mòde sistèma es en general una marrida idèa."
-
-#~ msgid ""
-#~ "Dude, your kernel stinks! The chef's recommendation today is Linux with high-"
-#~ "resolution timers enabled!"
-#~ msgstr ""
-#~ "E tu, ton nucli val pas res ! La recomandacion d'uèi del patron es d'activar "
-#~ "los relòtges de nauta resolucion sus ton Linux."
-
-#, c-format
-#~ msgid ""
-#~ "Sample #%u\n"
-#~ "\tName: %s\n"
-#~ "\tSample Specification: %s\n"
-#~ "\tChannel Map: %s\n"
-#~ "\tVolume: %s\n"
-#~ "\t %s\n"
-#~ "\t balance %0.2f\n"
-#~ "\tDuration: %0.1fs\n"
-#~ "\tSize: %s\n"
-#~ "\tLazy: %s\n"
-#~ "\tFilename: %s\n"
-#~ "\tProperties:\n"
-#~ "\t\t%s\n"
-#~ msgstr ""
-#~ "Escandalhatge #%u\n"
-#~ "\tNom : %s\n"
-#~ "\tEspecificacion de l'escandalhatge : %s\n"
-#~ "\tPlan dels canals : %s\n"
-#~ "\tVolum : %s\n"
-#~ "\t %s\n"
-#~ "\t balança %0.2f\n"
-#~ "\tDurada : %0.1f s\n"
-#~ "\tTalha : %s\n"
-#~ "\tEscondedor retardat : %s\n"
-#~ "\tNom de fichièr : %s\n"
-#~ "\tProprietats :\n"
-#~ "\t\t%s\n"
-
-#~ msgid "Cleaning up privileges."
-#~ msgstr "Netejatge dels privilègis."
-
-#, c-format
-#~ msgid "Connected to device %s (%u, %ssuspended)."
-#~ msgstr "Connectat al periferic %s (%u, %sarrestat)."
-
-#, c-format
-#~ msgid "Running in VM: %s"
-#~ msgstr "Execucion dins una maquina virtuala : %s"
-
-#~ msgid "PulseAudio Sound System KDE Routing Policy"
-#~ msgstr "Politica de rotatge del sistèma de son KDE PulseAudio"
-
-#~ msgid "Start the PulseAudio Sound System with KDE Routing Policy"
-#~ msgstr "Aviar lo sistèma de son PulseAudio amb la politica de rotatge KDE"
-
-#, c-format
-#~ msgid "=== %d seconds: %d Hz %d ch (%s) -> %d Hz %d ch (%s)"
-#~ msgstr "=== %d segondas : %d Hz %d ch (%s) -> %d Hz %d ch (%s)"
-
-#, fuzzy
-#~| msgid "Null Output"
-#~ msgid "Multichannel Output"
-#~ msgstr "Sortie vide"
-
-#, fuzzy
-#~| msgid "Mono"
-#~ msgid "no"
-#~ msgstr "Mono"
-
-# downmix = par ex. convertir 5 canaux en 2 canaux
-# upmixer = par ex. convertir 2 canaux en 5 canaux
-# https://bugzilla.redhat.com/show_bug.cgi?id=460798
-#, fuzzy, c-format
-#~ msgid ""
-#~ "%s [options]\n"
-#~ "%s\n"
-#~ "\n"
-#~ " -h, --help Show this help\n"
-#~ " --version Show version\n"
-#~ "\n"
-#~ " -r, --record Create a connection for recording\n"
-#~ " -p, --playback Create a connection for playback\n"
-#~ "\n"
-#~ " -v, --verbose Enable verbose operations\n"
-#~ "\n"
-#~ " -s, --server=SERVER The name of the server to connect "
-#~ "to\n"
-#~ " -d, --device=DEVICE The name of the sink/source to "
-#~ "connect to\n"
-#~ " -n, --client-name=NAME How to call this client on the "
-#~ "server\n"
-#~ " --stream-name=NAME How to call this stream on the "
-#~ "server\n"
-#~ " --volume=VOLUME Specify the initial (linear) volume "
-#~ "in range 0...65536\n"
-#~ " --rate=SAMPLERATE The sample rate in Hz (defaults to "
-#~ "44100)\n"
-#~ " --format=SAMPLEFORMAT The sample type, one of s16le, "
-#~ "s16be, u8, float32le,\n"
-#~ " float32be, ulaw, alaw, s32le, s32be, "
-#~ "s24le, s24be,\n"
-#~ " s24-32le, s24-32be (defaults to "
-#~ "s16ne)\n"
-#~ " --channels=CHANNELS The number of channels, 1 for mono, "
-#~ "2 for stereo\n"
-#~ " (defaults to 2)\n"
-#~ " --channel-map=CHANNELMAP Channel map to use instead of the "
-#~ "default\n"
-#~ " --fix-format Take the sample format from the sink/"
-#~ "source the stream is\n"
-#~ " being connected to.\n"
-#~ " --fix-rate Take the sampling rate from the sink/"
-#~ "source the stream is\n"
-#~ " being connected to.\n"
-#~ " --fix-channels Take the number of channels and the "
-#~ "channel map\n"
-#~ " from the sink/source the stream is "
-#~ "being connected to.\n"
-#~ " --no-remix Don't upmix or downmix channels.\n"
-#~ " --no-remap Map channels by index instead of "
-#~ "name.\n"
-#~ " --latency=BYTES Request the specified latency in "
-#~ "bytes.\n"
-#~ " --process-time=BYTES Request the specified process time "
-#~ "per request in bytes.\n"
-#~ " --latency-msec=MSEC Request the specified latency in "
-#~ "msec.\n"
-#~ " --process-time-msec=MSEC Request the specified process time "
-#~ "per request in msec.\n"
-#~ " --property=PROPERTY=VALUE Set the specified property to the "
-#~ "specified value.\n"
-#~ " --raw Record/play raw PCM data.\n"
-#~ " --passthrough Passthrough data.\n"
-#~ " --file-format[=FFORMAT] Record/play formatted PCM data.\n"
-#~ " --list-file-formats List available file formats.\n"
-#~ " --monitor-stream=INDEX Record from the sink input with "
-#~ "index INDEX.\n"
-#~ msgstr ""
-#~ "%s [options]\n"
-#~ "\n"
-#~ " -h, --help Affiche cette aide\n"
-#~ " --version Affiche la version\n"
-#~ "\n"
-#~ " -r, --record Crée une connexion pour "
-#~ "l'enregistrement\n"
-#~ " -p, --playback Crée une connexion pour la "
-#~ "relecture\n"
-#~ "\n"
-#~ " -v, --verbose Active le mode verbeux\n"
-#~ "\n"
-#~ " -s, --server=SERVEUR Le nom du serveur auquel se "
-#~ "connecter\n"
-#~ " -d, --device=PÉRIPHÉRIQUE Le nom de la destination/source à "
-#~ "laquelle se connecter\n"
-#~ " -n, --client-name=NOM Définit le nom de ce client sur le "
-#~ "serveur\n"
-#~ " --stream-name=NOM Définit le nom de ce flux sur le "
-#~ "serveur\n"
-#~ " --volume=VOLUME Indique le volume initial (linéaire) "
-#~ "entre 0 et 65536\n"
-#~ " --rate=TAUXDÉCHANTILLONNAGE Le taux d'échantillonnage en Hz (par "
-#~ "défaut 44100)\n"
-#~ " --format=FORMATDELÉCHANTILLON Le type de l'échantillon, parmi : "
-#~ "s16le, s16be, u8, float32le,\n"
-#~ " float32be, ulaw, alaw (par défaut "
-#~ "s16ne)\n"
-#~ " --channels=CANAUX Le nombre de canaux, 1 pour mono, 2 "
-#~ "pour stéréo\n"
-#~ " (par défaut 2)\n"
-#~ " --channel-map=PLANDESCANAUX Plan des canaux à utiliser au lieu "
-#~ "de celui par défaut\n"
-#~ " --fix-format Prend le format de l'échantillon de "
-#~ "la destination où le flux\n"
-#~ " est en train de se connecter.\n"
-#~ " --fix-rate Prend le taux d'échantillonnage de "
-#~ "la destination où le flux\n"
-#~ " est en train de se connecter.\n"
-#~ " --fix-channels Prend le nombre et le plan des "
-#~ "canaux de la destination \n"
-#~ " où le flux est en train de se "
-#~ "connecter.\n"
-#~ " --no-remix Ne pas augmenter ou diminuer le "
-#~ "nombre de canaux par mixage.\n"
-#~ " --no-remap Créer le plan des canaux par index "
-#~ "et non par nom.\n"
-#~ " --latency=OCTETS Demande la latence indiquée en "
-#~ "octets.\n"
-#~ " --process-time=OCTETS Demande le temps de traitement "
-#~ "indiqué par requête en octets.\n"
-#~ " --property=PROPRIÉTÉ=VALEUR Attribut la propriété définie à la "
-#~ "valeur définie.\n"
-#~ " --raw Enregistre/lit les données PCM "
-#~ "brutes.\n"
-#~ " --file-format=FFORMAT Enregistre/lit les données PCM "
-#~ "formatées.\n"
-#~ " --list-file-formats Liste les formats de fichiers "
-#~ "disponibles.\n"
-
-#~ msgid "Successfully dropped root privileges."
-#~ msgstr "Les privilèges root ont été correctement abandonnés."
-
-#~ msgid "[%s:%u] rlimit not supported on this platform."
-#~ msgstr "[%s:%u] rlimit n'est pas pris en charge sur cette plateforme."
-
-#~ msgid "XOpenDisplay() failed"
-#~ msgstr "Échec de XOpenDisplay()"
-
-#~ msgid ""
-#~ "Source Output #%u\n"
-#~ "\tDriver: %s\n"
-#~ "\tOwner Module: %s\n"
-#~ "\tClient: %s\n"
-#~ "\tSource: %u\n"
-#~ "\tSample Specification: %s\n"
-#~ "\tChannel Map: %s\n"
-#~ "\tBuffer Latency: %0.0f usec\n"
-#~ "\tSource Latency: %0.0f usec\n"
-#~ "\tResample method: %s\n"
-#~ "\tProperties:\n"
-#~ "\t\t%s\n"
-#~ msgstr ""
-#~ "Sortie de la source #%u\n"
-#~ "\tPilote : %s\n"
-#~ "\tModule propriétaire : %s\n"
-#~ "\tClient : %s\n"
-#~ "\tSource : %u\n"
-#~ "\tSpécification de l'échantillon : %s\n"
-#~ "\tPlan des canaux : %s\n"
-#~ "\tLatence du tampon : %0.0f µs\n"
-#~ "\tLatence de la source : %0.0f µs\n"
-#~ "\tMéthode de rééchantillonnage : %s\n"
-#~ "\tPropriétés :\n"
-#~ "\t\t%s\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "%s [options] stat\n"
-#~ "%s [options] list\n"
-#~ "%s [options] exit\n"
-#~ "%s [options] upload-sample FILENAME [NAME]\n"
-#~ "%s [options] play-sample NAME [SINK]\n"
-#~ "%s [options] remove-sample NAME\n"
-#~ "%s [options] move-sink-input SINKINPUT SINK\n"
-#~ "%s [options] move-source-output SOURCEOUTPUT SOURCE\n"
-#~ "%s [options] load-module NAME [ARGS ...]\n"
-#~ "%s [options] unload-module MODULE\n"
-#~ "%s [options] suspend-sink SINK 1|0\n"
-#~ "%s [options] suspend-source SOURCE 1|0\n"
-#~ "%s [options] set-card-profile CARD PROFILE\n"
-#~ "%s [options] set-sink-port SINK PORT\n"
-#~ "%s [options] set-source-port SOURCE PORT\n"
-#~ "%s [options] set-sink-volume SINK VOLUME\n"
-#~ "%s [options] set-source-volume SOURCE VOLUME\n"
-#~ "%s [options] set-sink-input-volume SINKINPUT VOLUME\n"
-#~ "%s [options] set-sink-mute SINK 1|0\n"
-#~ "%s [options] set-source-mute SOURCE 1|0\n"
-#~ "%s [options] set-sink-input-mute SINKINPUT 1|0\n"
-#~ "%s [options] subscribe\n"
-#~ "\n"
-#~ " -h, --help Show this help\n"
-#~ " --version Show version\n"
-#~ "\n"
-#~ " -s, --server=SERVER The name of the server to connect "
-#~ "to\n"
-#~ " -n, --client-name=NAME How to call this client on the "
-#~ "server\n"
-#~ msgstr ""
-#~ "%s [options] stat\n"
-#~ "%s [options] list\n"
-#~ "%s [options] exit\n"
-#~ "%s [options] upload-sample NOMDEFICHIER [NOM]\n"
-#~ "%s [options] play-sample NOM [DEST]\n"
-#~ "%s [options] remove-sample NOM\n"
-#~ "%s [options] move-sink-input ID DEST\n"
-#~ "%s [options] move-source-output ID SOURCE\n"
-#~ "%s [options] load-module NOM [PARAMS ...]\n"
-#~ "%s [options] unload-module ID\n"
-#~ "%s [options] suspend-sink [DEST] 1|0\n"
-#~ "%s [options] suspend-source [SOURCE] 1|0\n"
-#~ "%s·[options]·set-card-profile·[CARTE]·[PROFIL]·\n"
-#~ "%s [options] set-sink-port DEST PORT\n"
-#~ "%s [options] set-source-port SOURCE PORT\n"
-#~ "%s [options] set-sink-volume DEST VOLUME\n"
-#~ "%s [options] set-source-volume SOURCE VOLUME\n"
-#~ "%s [options] set-sink-input-volume ENTREEDEST VOLUME\n"
-#~ "%s [options] set-sink-mute DEST 1|0\n"
-#~ "%s [options] set-source-mute SOURCE 1|0\n"
-#~ "%s [options] set-sink-input-mute ENTREEDEST 1|0\n"
-#~ "\n"
-#~ " -h, --help Affiche cette aide\n"
-#~ " --version Affiche la version\n"
-#~ "\n"
-#~ " -s, --server=SERVEUR Le nom du serveur auquel se "
-#~ "connecter\n"
-#~ " -n, --client-name=NOM Définit le nom de ce client sur "
-#~ "le serveur\n"
-
-#~ msgid "%s+%s"
-#~ msgstr "%s+%s"
-
-#~ msgid "%s / %s"
-#~ msgstr "%s / %s"
-
-#~ msgid "Digital Surround 4.0 (IEC958)"
-#~ msgstr "Surround numérique 4.0 (IEC958)"
-
-#~ msgid "Low Frequency Emmiter"
-#~ msgstr "Émetteur à basse fréquence"
-
-#~ msgid "Invalid client name '%s'\n"
-#~ msgstr "Plan des canaux invalide « %s »\n"
-
-#~ msgid "Failed to determine sample specification from file.\n"
-#~ msgstr "Échec lors de l'obtention des informations de l'échantillon : %s\n"
-
-#~ msgid "select(): %s"
-#~ msgstr "select() : %s"
-
-#~ msgid "Cannot connect to system bus: %s"
-#~ msgstr "Impossible de se connecter au bus système : %s"
-
-#~ msgid "Cannot get caller from PID: %s"
-#~ msgstr "Impossible d'obtenir le programme appelant à partir du PID : %s"
-
-#~ msgid "Cannot set UID on caller object."
-#~ msgstr "Impossible de définir un UID sur l'objet appelant."
-
-#~ msgid "Failed to get CK session."
-#~ msgstr "Échec lors de l'obtention de la session CK."
-
-#~ msgid "Cannot set UID on session object."
-#~ msgstr "Impossible de définir l'UID sur l'objet de session."
-
-#~ msgid "Cannot allocate PolKitAction."
-#~ msgstr "Impossible d'allouer PolKitAction."
-
-#~ msgid "Cannot set action_id"
-#~ msgstr "Impossible de définir action_id."
-
-#~ msgid "Cannot allocate PolKitContext."
-#~ msgstr "Impossible d'allouer PolKitContext."
-
-#~ msgid "Cannot initialize PolKitContext: %s"
-#~ msgstr "Impossible d'initialiser PolKitContext : %s"
-
-#~ msgid "Could not determine whether caller is authorized: %s"
-#~ msgstr "Impossible de déterminer si le programme appelant est autorisé : %s"
-
-#~ msgid "Cannot obtain auth: %s"
-#~ msgstr "Impossible d'obtenir l'authentification : %s"
-
-#~ msgid "PolicyKit responded with '%s'"
-#~ msgstr "PolicyKit a renvoyé « %s »"
-
-#~ msgid ""
-#~ "High-priority scheduling (negative Unix nice level) for the PulseAudio "
-#~ "daemon"
-#~ msgstr ""
-#~ "Ordonnancement haute priorité (niveau Unix « nice » négatif) pour le "
-#~ "démon PulseAudio"
-
-#~ msgid "Real-time scheduling for the PulseAudio daemon"
-#~ msgstr "Ordonnancement en temps réel pour le démon PulseAudio"
-
-#~ msgid ""
-#~ "System policy prevents PulseAudio from acquiring high-priority scheduling."
-#~ msgstr ""
-#~ "La politique du système empêche PulseAudio d'acquérir un ordonnancement "
-#~ "haute priorité"
-
-#~ msgid ""
-#~ "System policy prevents PulseAudio from acquiring real-time scheduling."
-#~ msgstr ""
-#~ "La politique du système empêche PulseAudio d'acquérir un ordonnancement "
-#~ "en temps réel"
-
-#~ msgid "read() failed: %s\n"
-#~ msgstr "Échec de read() : %s\n"
-
-#~ msgid "pa_context_connect() failed: %s\n"
-#~ msgstr "Échec de pa_context_connect() : %s"
-
-#~ msgid "We're in the group '%s', allowing high-priority scheduling."
-#~ msgstr ""
-#~ "Nous sommes dans le groupe « %s », permettant une planification à haute "
-#~ "priorité."
-
-#~ msgid "We're in the group '%s', allowing real-time scheduling."
-#~ msgstr ""
-#~ "Nous sommes dans le groupe « %s », permettant un ordonnancement en temps "
-#~ "réel."
-
-#~ msgid "PolicyKit grants us acquire-high-priority privilege."
-#~ msgstr ""
-#~ "PolicyKit a accordé l'acquisition des permissions de haute priorité."
-
-#~ msgid "PolicyKit refuses acquire-high-priority privilege."
-#~ msgstr "PolicyKit a refusé l'acquisition des permissions de haute priorité."
-
-#~ msgid "PolicyKit grants us acquire-real-time privilege."
-#~ msgstr "PolicyKit a accordé l'acquisition des permissions de temps réel."
-
-#~ msgid "PolicyKit refuses acquire-real-time privilege."
-#~ msgstr "PolicyKit a refusé l'acquisition des permissions de temps réel."
-
-#~ msgid ""
-#~ "Called SUID root and real-time and/or high-priority scheduling was "
-#~ "requested in the configuration. However, we lack the necessary "
-#~ "privileges:\n"
-#~ "We are not in group '%s', PolicyKit refuse to grant us the requested "
-#~ "privileges and we have no increase RLIMIT_NICE/RLIMIT_RTPRIO resource "
-#~ "limits.\n"
-#~ "For enabling real-time/high-priority scheduling please acquire the "
-#~ "appropriate PolicyKit privileges, or become a member of '%s', or increase "
-#~ "the RLIMIT_NICE/RLIMIT_RTPRIO resource limits for this user."
-#~ msgstr ""
-#~ "Le SUID root et l'ordonnancement en temps réel et/ou haute priorité ont "
-#~ "été spécifiés dans la configuration. Cependant, il nous manque les "
-#~ "privilèges nécessaires :\n"
-#~ "Nous ne sommes pas dans le groupe « %s », PolicyKit refuse de nous "
-#~ "accorder les privilèges demandés et nous devons augmenter les limites de "
-#~ "ressources RLIMIT_NICE/RLIMIT_RTPRIO.\n"
-#~ "Pour activer l'ordonnancement en temps réel/haute priorité, veuillez "
-#~ "acquérir les privilèges PolicyKit apropriés, ou devenir membre de « %s », "
-#~ "ou augmenter les limites de ressources RLIMIT_NICE/RLIMIT_RTPRIO pour cet "
-#~ "utilisateur."
-
-#~ msgid ""
-#~ "High-priority scheduling enabled in configuration but not allowed by "
-#~ "policy."
-#~ msgstr ""
-#~ "La planification à haute priorité est activée dans la configuration mais "
-#~ "n'est pas permise par la politique."
-
-#~ msgid "Successfully increased RLIMIT_RTPRIO"
-#~ msgstr "Augmentation de RLIMIT_RTPRIO réussie"
-
-#~ msgid "RLIMIT_RTPRIO failed: %s"
-#~ msgstr "RLIMIT_RTPRIO a échoué : %s"
-
-#~ msgid "Giving up CAP_NICE"
-#~ msgstr "Abandon de CAP_NICE"
-
-#~ msgid ""
-#~ "Real-time scheduling enabled in configuration but not allowed by policy."
-#~ msgstr ""
-#~ "La planification en temps réel est activée mais n'est pas permise par la "
-#~ "politique."
-
-#~ msgid "Limited capabilities successfully to CAP_SYS_NICE."
-#~ msgstr "Limitation des capacités à CAP_SYS_NICE réussie."
-
-#~ msgid "time_new() failed.\n"
-#~ msgstr "Échec de time_new().\n"
-
-#~ msgid "Output %s + Input %s"
-#~ msgstr "Sortie %s + Entrée %s"
-
-#~ msgid "Stream successfully created\n"
-#~ msgstr "Création du flux réussie\n"
-
-#~ msgid "Stream errror: %s\n"
-#~ msgstr "Erreur du flux : %s\n"
-
-#~ msgid "Connection established.\n"
-#~ msgstr "Connexion établie.\n"
-
-#~ msgid ""
-#~ "%s [options] [FILE]\n"
-#~ "\n"
-#~ " -h, --help Show this help\n"
-#~ " --version Show version\n"
-#~ "\n"
-#~ " -v, --verbose Enable verbose operation\n"
-#~ "\n"
-#~ " -s, --server=SERVER The name of the server to connect "
-#~ "to\n"
-#~ " -d, --device=DEVICE The name of the sink to connect "
-#~ "to\n"
-#~ " -n, --client-name=NAME How to call this client on the "
-#~ "server\n"
-#~ " --stream-name=NAME How to call this stream on the "
-#~ "server\n"
-#~ " --volume=VOLUME Specify the initial (linear) "
-#~ "volume in range 0...65536\n"
-#~ " --channel-map=CHANNELMAP Set the channel map to the use\n"
-#~ msgstr ""
-#~ "%s [options] [FICHIER]\n"
-#~ "\n"
-#~ " -h, --help Affiche cette aide\n"
-#~ " --version Affiche la version\n"
-#~ "\n"
-#~ " -v, --verbose Active le mode verbeux\n"
-#~ "\n"
-#~ " -s, --server=SERVEUR Le nom du serveur auquel se "
-#~ "connecter\n"
-#~ " -d, --device=PÉRIPHÉRIQUE Le nom de la destination à "
-#~ "laquelle se connecter\n"
-#~ " -n, --client-name=NOM Définit le nom de ce client sur "
-#~ "le serveur\n"
-#~ " --stream-name=NOM Définit le nom de ce flux sur le "
-#~ "serveur\n"
-#~ " --volume=VOLUME Définit le volume initial "
-#~ "(linéaire) entre 0 et 65536\n"
-#~ " --channel-map=PLANDESCANAUX Définit le plan des canaux à "
-#~ "utiliser\n"
-
-#~ msgid ""
-#~ "paplay %s\n"
-#~ "Compiled with libpulse %s\n"
-#~ "Linked with libpulse %s\n"
-#~ msgstr ""
-#~ "paplay %s\n"
-#~ "Compilé avec libpulse %s\n"
-#~ "Lié avec libpulse %s\n"
-
-#~ msgid "Invalid channel map\n"
-#~ msgstr "Plan des canaux invalide\n"
-
-#~ msgid "Channel map doesn't match file.\n"
-#~ msgstr "Le plan des canaux ne correspond pas au fichier.\n"
-
-#~ msgid "Using sample spec '%s'\n"
-#~ msgstr "Utilisation de la spécification de l'échantillon « %s »\n"
-
-#~ msgid ""
-#~ "Called SUID root and real-time and/or high-priority scheduling was "
-#~ "requested in the configuration. However, we lack the necessary "
-#~ "privileges:\n"
-#~ "We are not in group '"
-#~ msgstr ""
-#~ "Le SUID root a été appelé et la planification à haute priorité/en temps "
-#~ "réel demandée dans la configuration. Néanmoins nous n'avons pas les "
-#~ "permissions nécessaires :\n"
-#~ "nous ne somme pas dans le groupe "
-
-#~ msgid "--log-time boolean argument"
-#~ msgstr "--disallow-exit requiert un paramètre booléen"
-
-#~ msgid "Default sink name (%s) does not exist in name register."
-#~ msgstr ""
-#~ "Le nom de la destination par défaut (%s) n'existe pas dans le registre "
-#~ "des noms."
-
-#~ msgid "Buffer overrun, dropping incoming data\n"
-#~ msgstr "Saturation du tampon, abandon des données entrantes\n"
-
-#~ msgid "pa_stream_drop() failed: %s\n"
-#~ msgstr "Échec de pa_stream_drop() : %s\n"
-
-#~ msgid "muted"
-#~ msgstr "en sourdine"
-
-#~ msgid ""
-#~ "*** Autoload Entry #%u ***\n"
-#~ "Name: %s\n"
-#~ "Type: %s\n"
-#~ "Module: %s\n"
-#~ "Argument: %s\n"
-#~ msgstr ""
-#~ "*** Entrée de chargement automatique #%u ***\n"
-#~ "Nom : %s\n"
-#~ "Type : %s\n"
-#~ "Module : %s\n"
-#~ "Paramètre : %s\n"
-
-#~ msgid ""
-#~ "' and PolicyKit refuse to grant us priviliges. Dropping SUID again.\n"
-#~ "For enabling real-time scheduling please acquire the appropriate "
-#~ "PolicyKit priviliges, or become a member of '"
-#~ msgstr ""
-#~ " et PolicyKit refuse de nous accorder les permissions. Abandon du SUID à "
-#~ "nouveau.\n"
-#~ "Pour activer la planification en temps réel, veuillez aquérir les "
-#~ "permissions PolicyKit appropriées, ou devenez membre de "
-
-#~ msgid ""
-#~ "', or increase the RLIMIT_NICE/RLIMIT_RTPRIO resource limits for this "
-#~ "user."
-#~ msgstr ""
-#~ ", ou augmentez les limites de ressource RLIMIT_NICE/RLIMIT_RTPRIO pour "
-#~ "cet utilisateur."
-
-#~ msgid "socketpair(): %s"
-#~ msgstr "socketpair() : %s"
+#~ msgid "%s %s\n"
+#~ msgstr "%s %s\n"
diff --git a/po/pl.po b/po/pl.po
index 2065718..bbbcec4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,12 +1,14 @@
-# translation of pl.po to Polish
-# Piotr Drąg <piotrdrag at gmail.com>, 2008, 2012, 2013, 2014, 2015, 2016.
+# Polish translation for pulseaudio.
+# Copyright © 2008-2016 the pulseaudio authors.
+# This file is distributed under the same license as the pulseaudio package.
+# Piotr Drąg <piotrdrag at gmail.com>, 2008, 2012-2016.
#
msgid ""
msgstr ""
"Project-Id-Version: pulseaudio\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-16 13:50+0200\n"
-"PO-Revision-Date: 2016-05-16 13:51+0200\n"
+"POT-Creation-Date: 2016-11-27 16:49+0100\n"
+"PO-Revision-Date: 2016-11-27 16:50+0100\n"
"Last-Translator: Piotr Drąg <piotrdrag at gmail.com>\n"
"Language-Team: Polish <trans-pl at lists.fedoraproject.org>\n"
"Language: pl\n"
@@ -98,35 +100,35 @@ msgstr ""
" --dump-resample-methods Zrzuca dostępne metody resamplingu\n"
" --cleanup-shm Czyści stare fragmenty pamięci\n"
" współdzielonej\n"
-" --start Uruchamia usługi, jeśli nie jest\n"
-" uruchomiona\n"
+" --start Uruchamia usługi, jeśli nie\n"
+" jest uruchomiona\n"
" -k --kill Niszczy uruchomioną usługę\n"
" --check Sprawdza, czy usługa jest\n"
-" uruchomiona (zwraca tylko kod\n"
-" wyjścia)\n"
+" uruchomiona (zwraca tylko\n"
+" kod wyjścia)\n"
"\n"
"OPCJE:\n"
-" --system[=ZMIENNALOGICZNA] Uruchamia w trybie systemowym\n"
+" --system[=ZMIENNALOGICZNA] Uruchamia w trybie systemowym\n"
" -D, --daemonize[=ZMIENNALOGICZNA] Tworzy usługę po uruchomieniu\n"
-" --fail[=ZMIENNALOGICZNA] Wyłącza, kiedy uruchomienie się nie\n"
-" powiedzie\n"
+" --fail[=ZMIENNALOGICZNA] Wyłącza, kiedy uruchomienie\n"
+" się nie powiedzie\n"
" --high-priority[=ZMIENNALOGICZNA] Próbuje ustawić wysoki poziom nice\n"
" (dostępne tylko jako root, na SUID\n"
-" lub z podniesionym RLIMIT_NICE)\n"
-" --realtime[=ZMIENNALOGICZNA] Próbuje ustawić szeregowanie w\n"
-" czasie rzeczywistym\n"
+" lub z podniesionym RLIMIT_NICE)\n"
+" --realtime[=ZMIENNALOGICZNA] Próbuje ustawić szeregowanie\n"
+" w czasie rzeczywistym\n"
" (dostępne tylko jako root, na SUID\n"
-" lub z podniesionym RLIMIT_RTPRIO)\n"
+" lub z podniesionym RLIMIT_RTPRIO)\n"
" --disallow-module-loading[=ZMIENNALOGICZNA] Nie zezwala\n"
" użytkownikowi modułu na żądanie\n"
-" wczytania/usunięcia modułu po\n"
-" uruchomieniu\n"
-" --disallow-exit[=ZMIENNALOGICZNA] Nie zezwala użytkownikowi na\n"
-" żądanie wyłączenia\n"
-" --exit-idle-time=SEKUNDY Niszczy usługę, kiedy jest zajęta i\n"
-" upłynął podany czas\n"
+" wczytania/usunięcia modułu\n"
+" po uruchomieniu\n"
+" --disallow-exit[=ZMIENNALOGICZNA] Nie zezwala użytkownikowi\n"
+" na żądanie wyłączenia\n"
+" --exit-idle-time=SEKUNDY Niszczy usługę, kiedy jest zajęta\n"
+" i upłynął podany czas\n"
" --scache-idle-time=SEKUNDY Usuwa automatycznie wczytane\n"
-" próbki, kiedy jest zajęty i upłynął\n"
+" próbki, kiedy jest zajęty i upłynął\n"
" podany czas\n"
" --log-level[=POZIOM] Zwiększa lub ustawia poziom\n"
" wyświetlanych informacji\n"
@@ -134,11 +136,11 @@ msgstr ""
" informacji\n"
" --log-target={auto,syslog,stderr,file:ŚCIEŻKA,newfile:ŚCIEŻKA}\n"
" Określa dziennik docelowy\n"
-" --log-meta[=ZMIENNALOGICZNA] Dołącza położenie kodu do\n"
-" komunikatów dziennika\n"
-" --log-time[=ZMIENNALOGICZNA] Dołącza czas w komunikatach\n"
+" --log-meta[=ZMIENNALOGICZNA] Dołącza położenie kodu\n"
+" do komunikatów dziennika\n"
+" --log-time[=ZMIENNALOGICZNA] Dołącza czas w komunikatach\n"
" dziennika\n"
-" --log-backtrace=RAMKI Dołącza błąd w komunikatach\n"
+" --log-backtrace=RAMKI Dołącza błąd w komunikatach\n"
" dziennika\n"
" -p, --dl-search-path=ŚCIEŻKA Ustawia ścieżkę wyszukiwania dla\n"
" dynamicznie współdzielonych\n"
@@ -148,22 +150,22 @@ msgstr ""
" aby poznać możliwe wartości)\n"
" --use-pid-file[=ZMIENNALOGICZNA] Tworzy plik PID\n"
" --no-cpu-limit[=ZMIENNALOGICZNA] Nie instaluje ograniczenia zasobów\n"
-" procesora na obsługujących je\n"
-" platformach.\n"
+" procesora na obsługujących\n"
+" je platformach.\n"
" --disable-shm[=ZMIENNALOGICZNA] Wyłącza obsługę pamięci\n"
" współdzielonej.\n"
" --enable-memfd[=ZMIENNALOGICZNA] Włącza obsługę pamięci\n"
" współdzielonej memfd.\n"
"\n"
"SKRYPT STARTOWY:\n"
-" -L, --load=\"PARAMETRY MODUŁU\" Wczytuje podany moduł wtyczki z\n"
-" podanym parametrem\n"
+" -L, --load=\"PARAMETRY MODUŁU\" Wczytuje podany moduł wtyczki\n"
+" z podanym parametrem\n"
" -F, --file=NAZWAPLIKU Wykonuje podany skrypt\n"
" -C Otwiera wiersz poleceń na\n"
" uruchomionym TTY po uruchomieniu\n"
"\n"
-" -n Nie wczytuje domyślnego pliku\n"
-" skryptu\n"
+" -n Nie wczytuje domyślnego\n"
+" pliku skryptu\n"
#: ../src/daemon/cmdline.c:246
msgid "--daemonize expects boolean argument"
@@ -178,8 +180,8 @@ msgid ""
"--log-level expects log level argument (either numeric in range 0..4 or one "
"of debug, info, notice, warn, error)."
msgstr ""
-"--log-level oczekuje parametru poziomu dziennika (numeryczny w zakresie 0..4 "
-"lub jeden z debug, info, notice, warn, error)."
+"--log-level oczekuje parametru poziomu dziennika (numeryczny w zakresie 0..4 "
+"lub jeden z debug, info, notice, warn, error)."
#: ../src/daemon/cmdline.c:277
msgid "--high-priority expects boolean argument"
@@ -322,7 +324,7 @@ msgstr ""
#: ../src/daemon/daemon-conf.c:718
#, c-format
msgid "### Read from configuration file: %s ###\n"
-msgstr "### Odczytano z pliku konfiguracji: %s ###\n"
+msgstr "### Odczytano z pliku konfiguracji: %s ###\n"
#: ../src/daemon/dumpmodules.c:57
#, c-format
@@ -332,7 +334,7 @@ msgstr "Nazwa: %s\n"
#: ../src/daemon/dumpmodules.c:60
#, c-format
msgid "No module information available\n"
-msgstr "Brak dostępnych informacji o module\n"
+msgstr "Brak dostępnych informacji o module\n"
#: ../src/daemon/dumpmodules.c:63
#, c-format
@@ -362,7 +364,7 @@ msgstr "Wczytanie jednorazowe: %s\n"
#: ../src/daemon/dumpmodules.c:72
#, c-format
msgid "DEPRECATION WARNING: %s\n"
-msgstr "OSTRZEŻENIE O PRZESTARZAŁOŚCI: %s\n"
+msgstr "OSTRZEŻENIE O PRZESTARZAŁOŚCI: %s\n"
#: ../src/daemon/dumpmodules.c:76
#, c-format
@@ -400,7 +402,7 @@ msgstr "Odnalezienie grupy „%s” się nie powiodło."
#: ../src/daemon/main.c:174
#, c-format
msgid "GID of user '%s' and of group '%s' don't match."
-msgstr "GID użytkownika „%s” i grupy „%s” się nie zgadzają."
+msgstr "GID użytkownika „%s” i grupy „%s” się nie zgadzają."
#: ../src/daemon/main.c:179
#, c-format
@@ -440,8 +442,8 @@ msgid ""
"System mode refused for non-root user. Only starting the D-Bus server lookup "
"service."
msgstr ""
-"Odmówiono trybu systemowego dla użytkownika nie będącego rootem. "
-"Uruchamianie tylko usługi wyszukiwania serwera D-Bus."
+"Odmówiono trybu systemowego dla użytkownika niebędącego rootem. Uruchamianie "
+"tylko usługi wyszukiwania serwera D-Bus."
#: ../src/daemon/main.c:622
#, c-format
@@ -453,7 +455,7 @@ msgid ""
"This program is not intended to be run as root (unless --system is "
"specified)."
msgstr ""
-"Ten program nie powinien być uruchamiany jako root (chyba, że podano opcję --"
+"Ten program nie powinien być uruchamiany jako root (chyba że podano opcję --"
"system)."
#: ../src/daemon/main.c:654
@@ -468,7 +470,7 @@ msgstr "--start nie jest obsługiwane przy uruchamianiu systemowym."
#, c-format
msgid "User-configured server at %s, refusing to start/autospawn."
msgstr ""
-"Serwer skonfigurowany przez użytkownika w %s, odmawianie uruchomienia/"
+"Serwer skonfigurowany przez użytkownika w %s, odmawianie uruchomienia/"
"automatycznego wznowienia."
#: ../src/daemon/main.c:707
@@ -476,28 +478,28 @@ msgstr ""
msgid ""
"User-configured server at %s, which appears to be local. Probing deeper."
msgstr ""
-"Serwer skonfigurowany przez użytkownika w %s, który jest lokalny. Dalsze "
+"Serwer skonfigurowany przez użytkownika w %s, który jest lokalny. Dalsze "
"wykrywanie."
#: ../src/daemon/main.c:712
msgid "Running in system mode, but --disallow-exit not set."
msgstr ""
-"Uruchamianie w trybie systemowym, ale --disallow-exit nie jest ustawione."
+"Uruchamianie w trybie systemowym, ale --disallow-exit nie jest ustawione."
#: ../src/daemon/main.c:715
msgid "Running in system mode, but --disallow-module-loading not set."
msgstr ""
-"Uruchamianie w trybie systemowym, ale --disallow-module-loading nie jest "
+"Uruchamianie w trybie systemowym, ale --disallow-module-loading nie jest "
"ustawione."
#: ../src/daemon/main.c:718
msgid "Running in system mode, forcibly disabling SHM mode."
-msgstr "Uruchamianie w trybie systemowym, wymuszanie wyłączenia trybu SHM."
+msgstr "Uruchamianie w trybie systemowym, wymuszanie wyłączenia trybu SHM."
#: ../src/daemon/main.c:723
msgid "Running in system mode, forcibly disabling exit idle time."
msgstr ""
-"Uruchamianie w trybie systemowym, wymuszanie wyłączenia czasu oczekiwania na "
+"Uruchamianie w trybie systemowym, wymuszanie wyłączenia czasu oczekiwania na "
"zakończenie."
#: ../src/daemon/main.c:756
@@ -514,7 +516,7 @@ msgstr "pipe() się nie powiodło: %s"
msgid "fork() failed: %s"
msgstr "fork() się nie powiodło: %s"
-#: ../src/daemon/main.c:782 ../src/daemon/main.c:853 ../src/utils/pacat.c:568
+#: ../src/daemon/main.c:782 ../src/daemon/main.c:853 ../src/utils/pacat.c:569
#, c-format
msgid "read() failed: %s"
msgstr "read() się nie powiodło: %s"
@@ -534,35 +536,31 @@ msgstr "Uzyskanie identyfikatora komputera się nie powiodło"
#: ../src/daemon/main.c:974
msgid ""
-"OK, so you are running PA in system mode. Please note that you most likely "
-"shouldn't be doing that.\n"
-"If you do it nonetheless then it's your own fault if things don't work as "
-"expected.\n"
+"OK, so you are running PA in system mode. Please make sure that you actually "
+"do want to do that.\n"
"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/"
"Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system "
"mode is usually a bad idea."
msgstr ""
-"OK, więc PA jest uruchomione w trybie systemowym. Proszę zauważyć, że "
-"prawdopodobnie tak nie powinno być.\n"
-"Jeśli mimo to tak jest, to wina użytkownika, jeśli coś nie działa tak jak "
-"powinno.\n"
+"PulseAudio jest uruchomione w trybie systemowym. Proszę się upewnić, że na "
+"pewno tak ma być.\n"
"Proszę przeczytać http://www.freedesktop.org/wiki/Software/PulseAudio/"
"Documentation/User/WhatIsWrongWithSystemWide/ , gdzie wyjaśniono, dlaczego "
"tryb systemowy jest zwykle złym pomysłem."
-#: ../src/daemon/main.c:991
+#: ../src/daemon/main.c:990
msgid "pa_pid_file_create() failed."
msgstr "pa_pid_file_create() się nie powiodło."
-#: ../src/daemon/main.c:1023
+#: ../src/daemon/main.c:1022
msgid "pa_core_new() failed."
msgstr "pa_core_new() się nie powiodło."
-#: ../src/daemon/main.c:1091
+#: ../src/daemon/main.c:1090
msgid "Failed to initialize daemon."
msgstr "Zainicjowanie usługi się nie powiodło."
-#: ../src/daemon/main.c:1096
+#: ../src/daemon/main.c:1095
msgid "Daemon startup without any loaded modules, refusing to work."
msgstr ""
"Uruchamianie usługi bez żadnych wczytanych modułów, odmawianie działania."
@@ -627,11 +625,11 @@ msgstr "Wideo"
#: ../src/modules/alsa/alsa-mixer.c:2390
msgid "Automatic Gain Control"
-msgstr "Automatyczna kontrola natężenia"
+msgstr "Automatyczne sterowanie natężeniem"
#: ../src/modules/alsa/alsa-mixer.c:2391
msgid "No Automatic Gain Control"
-msgstr "Brak automatycznej kontroli natężenia"
+msgstr "Brak automatycznego sterowania natężeniem"
#: ../src/modules/alsa/alsa-mixer.c:2392
msgid "Boost"
@@ -685,7 +683,7 @@ msgstr "Wyjście analogowe"
#: ../src/modules/alsa/alsa-mixer.c:2472
msgid "LFE on Separate Mono Output"
-msgstr "Subwoofer na oddzielnym wyjściu mono"
+msgstr "Głośnik niskotonowy na oddzielnym wyjściu mono"
#: ../src/modules/alsa/alsa-mixer.c:2473
msgid "Line Out"
@@ -743,47 +741,47 @@ msgstr "Wielokanałowe"
#: ../src/modules/alsa/alsa-mixer.c:4001
msgid "Analog Surround 2.1"
-msgstr "Analogowe surround 2.1"
+msgstr "Analogowe przestrzenne 2.1"
#: ../src/modules/alsa/alsa-mixer.c:4002
msgid "Analog Surround 3.0"
-msgstr "Analogowe surround 3.0"
+msgstr "Analogowe przestrzenne 3.0"
#: ../src/modules/alsa/alsa-mixer.c:4003
msgid "Analog Surround 3.1"
-msgstr "Analogowe surround 3.1"
+msgstr "Analogowe przestrzenne 3.1"
#: ../src/modules/alsa/alsa-mixer.c:4004
msgid "Analog Surround 4.0"
-msgstr "Analogowe surround 4.0"
+msgstr "Analogowe przestrzenne 4.0"
#: ../src/modules/alsa/alsa-mixer.c:4005
msgid "Analog Surround 4.1"
-msgstr "Analogowe surround 4.1"
+msgstr "Analogowe przestrzenne 4.1"
#: ../src/modules/alsa/alsa-mixer.c:4006
msgid "Analog Surround 5.0"
-msgstr "Analogowe surround 5.0"
+msgstr "Analogowe przestrzenne 5.0"
#: ../src/modules/alsa/alsa-mixer.c:4007
msgid "Analog Surround 5.1"
-msgstr "Analogowe surround 5.1"
+msgstr "Analogowe przestrzenne 5.1"
#: ../src/modules/alsa/alsa-mixer.c:4008
msgid "Analog Surround 6.0"
-msgstr "Analogowe surround 6.0"
+msgstr "Analogowe przestrzenne 6.0"
#: ../src/modules/alsa/alsa-mixer.c:4009
msgid "Analog Surround 6.1"
-msgstr "Analogowe surround 6.1"
+msgstr "Analogowe przestrzenne 6.1"
#: ../src/modules/alsa/alsa-mixer.c:4010
msgid "Analog Surround 7.0"
-msgstr "Analogowe surround 7.0"
+msgstr "Analogowe przestrzenne 7.0"
#: ../src/modules/alsa/alsa-mixer.c:4011
msgid "Analog Surround 7.1"
-msgstr "Analogowe surround 7.1"
+msgstr "Analogowe przestrzenne 7.1"
#: ../src/modules/alsa/alsa-mixer.c:4012
msgid "Digital Stereo (IEC958)"
@@ -795,15 +793,15 @@ msgstr "Cyfrowe przekazywanie (IEC958)"
#: ../src/modules/alsa/alsa-mixer.c:4014
msgid "Digital Surround 4.0 (IEC958/AC3)"
-msgstr "Cyfrowe surround 4.0 (IEC958/AC3)"
+msgstr "Cyfrowe przestrzenne 4.0 (IEC958/AC3)"
#: ../src/modules/alsa/alsa-mixer.c:4015
msgid "Digital Surround 5.1 (IEC958/AC3)"
-msgstr "Cyfrowe surround 5.1 (IEC958/AC3)"
+msgstr "Cyfrowe przestrzenne 5.1 (IEC958/AC3)"
#: ../src/modules/alsa/alsa-mixer.c:4016
msgid "Digital Surround 5.1 (IEC958/DTS)"
-msgstr "Cyfrowe surround 5.1 (IEC958/DTS)"
+msgstr "Cyfrowe przestrzenne 5.1 (IEC958/DTS)"
#: ../src/modules/alsa/alsa-mixer.c:4017
msgid "Digital Stereo (HDMI)"
@@ -811,7 +809,7 @@ msgstr "Cyfrowe stereo (HDMI)"
#: ../src/modules/alsa/alsa-mixer.c:4018
msgid "Digital Surround 5.1 (HDMI)"
-msgstr "Cyfrowe surround 5.1 (HDMI)"
+msgstr "Cyfrowe przestrzenne 5.1 (HDMI)"
#: ../src/modules/alsa/alsa-mixer.c:4151
msgid "Analog Mono Duplex"
@@ -831,8 +829,8 @@ msgstr "Dupleks wielokanałowy"
#: ../src/modules/alsa/alsa-mixer.c:4155
#: ../src/modules/alsa/module-alsa-card.c:186
-#: ../src/modules/bluetooth/module-bluez4-device.c:2295
-#: ../src/modules/bluetooth/module-bluez5-device.c:1941
+#: ../src/modules/bluetooth/module-bluez4-device.c:2319
+#: ../src/modules/bluetooth/module-bluez5-device.c:1965
msgid "Off"
msgstr "Wyłączone"
@@ -858,7 +856,7 @@ msgid ""
msgstr ""
"Usługa ALSA została wybudzona, aby zapisać nowe dane do urządzenia, ale nie "
"było nic do zapisania.\n"
-"Prawdopodobnie jest to błąd w sterowniku ALSA „%s”. Proszę zgłosić ten "
+"Prawdopodobnie jest to błąd w sterowniku ALSA „%s”. Proszę zgłosić ten "
"problem programistom usługi ALSA.\n"
"Wybudzono za pomocą ustawienia POLLOUT — ale jednoczesne wywołanie "
"snd_pcm_avail() zwróciło zero lub inną wartość < min_avail."
@@ -875,7 +873,7 @@ msgid ""
msgstr ""
"Usługa ALSA została wybudzona, aby zapisać nowe dane do urządzenia, ale nie "
"było nic do zapisania.\n"
-"Prawdopodobnie jest to błąd w sterowniku ALSA „%s”. Proszę zgłosić ten "
+"Prawdopodobnie jest to błąd w sterowniku ALSA „%s”. Proszę zgłosić ten "
"problem programistom usługi ALSA.\n"
"Wybudzono za pomocą ustawienia POLLOUT — ale jednoczesne wywołanie "
"snd_pcm_avail() zwróciło zero lub inną wartość < min_avail."
@@ -890,9 +888,9 @@ msgid ""
"We were woken up with POLLIN set -- however a subsequent snd_pcm_avail() "
"returned 0 or another value < min_avail."
msgstr ""
-"Usługa ALSA została wybudzona, aby odczytać nowe dane z urządzenia, ale nie "
+"Usługa ALSA została wybudzona, aby odczytać nowe dane z urządzenia, ale nie "
"było nic do odczytania.\n"
-"Prawdopodobnie jest to błąd w sterowniku ALSA „%s”. Proszę zgłosić ten "
+"Prawdopodobnie jest to błąd w sterowniku ALSA „%s”. Proszę zgłosić ten "
"problem programistom usługi ALSA.\n"
"Wybudzono za pomocą ustawienia POLLIN — ale jednoczesne wywołanie "
"snd_pcm_avail() zwróciło zero lub inną wartość < min_avail."
@@ -907,9 +905,9 @@ msgid ""
"We were woken up with POLLIN set -- however a subsequent snd_pcm_avail() "
"returned 0 or another value < min_avail."
msgstr ""
-"Usługa ALSA została wybudzona, aby odczytać nowe dane z urządzenia, ale nie "
+"Usługa ALSA została wybudzona, aby odczytać nowe dane z urządzenia, ale nie "
"było nic do odczytania.\n"
-"Prawdopodobnie jest to błąd w sterowniku ALSA „%s”. Proszę zgłosić ten "
+"Prawdopodobnie jest to błąd w sterowniku ALSA „%s”. Proszę zgłosić ten "
"problem programistom usługi ALSA.\n"
"Wybudzono za pomocą ustawienia POLLIN — ale jednoczesne wywołanie "
"snd_pcm_avail() zwróciło zero lub inną wartość < min_avail."
@@ -922,7 +920,7 @@ msgid ""
"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
"to the ALSA developers."
msgstr ""
-"snd_pcm_avail() zwróciło wyjątkowo dużą wartość: %lu bajtów (%lu ms).\n"
+"snd_pcm_avail() zwróciło wyjątkowo dużą wartość: %lu B (%lu ms).\n"
"Prawdopodobnie jest to błąd sterownika ALSA „%s”. Proszę zgłosić ten problem "
"programistom usługi ALSA."
@@ -934,7 +932,7 @@ msgid ""
"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
"to the ALSA developers."
msgstr ""
-"snd_pcm_delay() zwróciło wyjątkowo dużą wartość: %li bajtów (%s%lu ms).\n"
+"snd_pcm_delay() zwróciło wyjątkowo dużą wartość: %li B (%s%lu ms).\n"
"Prawdopodobnie jest to błąd sterownika ALSA „%s”. Proszę zgłosić ten problem "
"programistom usługi ALSA."
@@ -959,14 +957,14 @@ msgid ""
"Most likely this is a bug in the ALSA driver '%s'. Please report this issue "
"to the ALSA developers."
msgstr ""
-"snd_pcm_mmap_begin() zwróciło wyjątkowo dużą wartość: %lu bajtów (%lu ms).\n"
+"snd_pcm_mmap_begin() zwróciło wyjątkowo dużą wartość: %lu B (%lu ms).\n"
"Prawdopodobnie jest to błąd sterownika ALSA „%s”. Proszę zgłosić ten problem "
"programistom usługi ALSA."
#: ../src/modules/bluetooth/module-bluez4-device.c:2089
#: ../src/modules/bluetooth/module-bluez5-device.c:1700
msgid "Headset"
-msgstr "Słuchawki z mikrofonem"
+msgstr "Słuchawki z mikrofonem"
#: ../src/modules/bluetooth/module-bluez4-device.c:2094
#: ../src/modules/bluetooth/module-bluez5-device.c:1705
@@ -1013,37 +1011,37 @@ msgstr "Wyjście Bluetooth"
msgid "Bluetooth Input"
msgstr "Wejście Bluetooth"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2176
+#: ../src/modules/bluetooth/module-bluez4-device.c:2181
msgid "High Fidelity Playback (A2DP)"
-msgstr "Odtwarzanie o wysokiej dokładności (A2DP)"
+msgstr "Odtwarzanie o wysokiej dokładności (A2DP)"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2187
+#: ../src/modules/bluetooth/module-bluez4-device.c:2193
msgid "High Fidelity Capture (A2DP)"
-msgstr "Przechwytywanie o wysokiej dokładności (A2DP)"
+msgstr "Przechwytywanie o wysokiej dokładności (A2DP)"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2198
+#: ../src/modules/bluetooth/module-bluez4-device.c:2205
msgid "Telephony Duplex (HSP/HFP)"
msgstr "Dupleks telefoniczny (HSP/HFP)"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2210
+#: ../src/modules/bluetooth/module-bluez4-device.c:2218
msgid "Handsfree Gateway"
msgstr "Zestaw głośnomówiący"
-#: ../src/modules/bluetooth/module-bluez5-device.c:1786
+#: ../src/modules/bluetooth/module-bluez5-device.c:1790
msgid "High Fidelity Playback (A2DP Sink)"
-msgstr "Odtwarzanie o wysokiej dokładności (odpływ A2DP)"
+msgstr "Odtwarzanie o wysokiej dokładności (odpływ A2DP)"
-#: ../src/modules/bluetooth/module-bluez5-device.c:1797
+#: ../src/modules/bluetooth/module-bluez5-device.c:1802
msgid "High Fidelity Capture (A2DP Source)"
-msgstr "Przechwytywanie o wysokiej dokładności (źródło A2DP)"
+msgstr "Przechwytywanie o wysokiej dokładności (źródło A2DP)"
-#: ../src/modules/bluetooth/module-bluez5-device.c:1808
+#: ../src/modules/bluetooth/module-bluez5-device.c:1814
msgid "Headset Head Unit (HSP/HFP)"
-msgstr "Jednostka główna słuchawek z mikrofonem (HSP/HFP)"
+msgstr "Jednostka główna słuchawek z mikrofonem (HSP/HFP)"
-#: ../src/modules/bluetooth/module-bluez5-device.c:1820
+#: ../src/modules/bluetooth/module-bluez5-device.c:1827
msgid "Headset Audio Gateway (HSP/HFP)"
-msgstr "Zestaw słuchawek z mikrofonem (HSP/HFP)"
+msgstr "Zestaw słuchawek z mikrofonem (HSP/HFP)"
#: ../src/modules/echo-cancel/module-echo-cancel.c:61
msgid ""
@@ -1061,11 +1059,11 @@ msgstr ""
"source_name=<nazwa źródła> source_properties=<właściwości źródła> "
"source_master=<nazwa źródła do filtrowania> sink_name=<nazwa odpływu> "
"sink_properties=<właściwości odpływu> sink_master=<nazwa odpływu do "
-"filtrowania> adjust_time=<jak często odczytywać częstotliwości w sekundach> "
-"adjust_threshold=<jak daleko odchodzić do odczytania w milisekundach> "
+"filtrowania> adjust_time=<jak często odczytywać częstotliwości w sekundach> "
+"adjust_threshold=<jak daleko odchodzić do odczytania w milisekundach> "
"format=<format próbki> rate=<częstotliwość próbki> channels=<liczba kanałów> "
"channel_map=<map kanałów> aec_method=<używana implementacja> "
-"aec_args=<parametry dla mechanizmu AEC> save_aec=<zapisywanie danych AEC w /"
+"aec_args=<parametry dla mechanizmu AEC> save_aec=<zapisywanie danych AEC w /"
"tmp> autoloaded=<należy ustawić, jeśli moduł jest automatycznie wczytywany> "
"use_volume_sharing=<yes lub no> use_master_format=<yes lub no> "
@@ -1074,16 +1072,17 @@ msgstr ""
msgid "On"
msgstr "Włączone"
+#: ../src/modules/module-allow-passthrough.c:73
+#: ../src/modules/module-always-sink.c:82
+msgid "Dummy Output"
+msgstr "Głuche wyjście"
+
#: ../src/modules/module-always-sink.c:36
msgid "Always keeps at least one sink loaded even if it's a null one"
msgstr ""
-"Utrzymywanie zawsze co najmniej jednego wczytanego odpływu nawet, jeśli to "
+"Utrzymywanie zawsze co najmniej jednego wczytanego odpływu, nawet jeśli to "
"pusty odpływ"
-#: ../src/modules/module-always-sink.c:82
-msgid "Dummy Output"
-msgstr "Głuche wyjście"
-
#: ../src/modules/module-equalizer-sink.c:70
msgid "General Purpose Equalizer"
msgstr "Korektor graficzny ogólnego przeznaczenia"
@@ -1123,7 +1122,7 @@ msgstr ""
"master=<nazwa odpływu do filtrowania> format=<format próbki> "
"rate=<częstotliwość próbki> channels=<liczba kanałów> channel_map=<mapa "
"kanałów> plugin=<nazwa wtyczki ladspa> label=<etykieta wtyczki ladspa> "
-"control=<lista wartości kontroli wejścia oddzielona przecinkami> "
+"control=<lista wartości sterowania wejściem oddzielona przecinkami> "
"input_ladspaport_map=<lista nazw wejściowych portów LADSPA oddzielona "
"przecinkami> output_ladspaport_map=<lista nazw wyjściowych portów LADSPA "
"oddzielona przecinkami> "
@@ -1168,7 +1167,7 @@ msgstr "Tunel do %s/%s"
#: ../src/modules/module-virtual-surround-sink.c:47
msgid "Virtual surround sink"
-msgstr "Wirtualny odpływ Surround"
+msgstr "Wirtualny odpływ wielokanałowy"
#: ../src/modules/module-virtual-surround-sink.c:51
msgid ""
@@ -1218,15 +1217,15 @@ msgstr "Tylny prawy"
#: ../src/pulse/channelmap.c:113
msgid "Subwoofer"
-msgstr "Subwoofer"
+msgstr "Głośnik niskotonowy"
#: ../src/pulse/channelmap.c:115
msgid "Front Left-of-center"
-msgstr "Przedni lewy po środku"
+msgstr "Przedni lewy pośrodku"
#: ../src/pulse/channelmap.c:116
msgid "Front Right-of-center"
-msgstr "Przedni prawy po środku"
+msgstr "Przedni prawy pośrodku"
#: ../src/pulse/channelmap.c:118
msgid "Side Left"
@@ -1393,7 +1392,7 @@ msgid "Top Rear Right"
msgstr "Górny tylny prawy"
#: ../src/pulse/channelmap.c:479 ../src/pulse/format.c:121
-#: ../src/pulse/sample.c:175 ../src/pulse/volume.c:294
+#: ../src/pulse/sample.c:174 ../src/pulse/volume.c:294
#: ../src/pulse/volume.c:320 ../src/pulse/volume.c:340
#: ../src/pulse/volume.c:372 ../src/pulse/volume.c:412
#: ../src/pulse/volume.c:431
@@ -1406,23 +1405,23 @@ msgstr "Stereo"
#: ../src/pulse/channelmap.c:780
msgid "Surround 4.0"
-msgstr "Surround 4.0"
+msgstr "Przestrzenne 4.0"
#: ../src/pulse/channelmap.c:786
msgid "Surround 4.1"
-msgstr "Surround 4.1"
+msgstr "Przestrzenne 4.1"
#: ../src/pulse/channelmap.c:792
msgid "Surround 5.0"
-msgstr "Surround 5.0"
+msgstr "Przestrzenne 5.0"
#: ../src/pulse/channelmap.c:798
msgid "Surround 5.1"
-msgstr "Surround 5.1"
+msgstr "Przestrzenne 5.1"
#: ../src/pulse/channelmap.c:805
msgid "Surround 7.1"
-msgstr "Surround 7.1"
+msgstr "Przestrzenne 7.1"
#: ../src/pulse/client-conf-x11.c:53 ../src/utils/pax11publish.c:97
msgid "xcb_connect() failed"
@@ -1467,7 +1466,7 @@ msgstr "dwukierunkowe"
msgid "invalid"
msgstr "nieprawidłowe"
-#: ../src/pulsecore/core-util.c:1836
+#: ../src/pulsecore/core-util.c:1837
#, c-format
msgid ""
"XDG_RUNTIME_DIR (%s) is not owned by us (uid %d), but by uid %d! (This could "
@@ -1507,11 +1506,11 @@ msgstr ""
msgid "Invalid log target."
msgstr "Nieprawidłowy dziennik docelowy."
-#: ../src/pulsecore/sink.c:3461
+#: ../src/pulsecore/sink.c:3459
msgid "Built-in Audio"
msgstr "Wbudowany dźwięk"
-#: ../src/pulsecore/sink.c:3466
+#: ../src/pulsecore/sink.c:3464
msgid "Modem"
msgstr "Modem"
@@ -1623,27 +1622,27 @@ msgstr "Błąd wejścia/wyjścia"
msgid "Device or resource busy"
msgstr "Urządzenie lub zasób jest zajęty"
-#: ../src/pulse/sample.c:177
+#: ../src/pulse/sample.c:176
#, c-format
msgid "%s %uch %uHz"
msgstr "%s %u k %u Hz"
-#: ../src/pulse/sample.c:189
+#: ../src/pulse/sample.c:188
#, c-format
msgid "%0.1f GiB"
msgstr "%0.1f GiB"
-#: ../src/pulse/sample.c:191
+#: ../src/pulse/sample.c:190
#, c-format
msgid "%0.1f MiB"
msgstr "%0.1f MiB"
-#: ../src/pulse/sample.c:193
+#: ../src/pulse/sample.c:192
#, c-format
msgid "%0.1f KiB"
msgstr "%0.1f KiB"
-#: ../src/pulse/sample.c:195
+#: ../src/pulse/sample.c:194
#, c-format
msgid "%u B"
msgstr "%u B"
@@ -1659,7 +1658,7 @@ msgstr "Opróżniono potok odtwarzania."
#: ../src/utils/pacat.c:133
msgid "Draining connection to server."
-msgstr "Opróżnianie połączenia z serwerem."
+msgstr "Opróżnianie połączenia z serwerem."
#: ../src/utils/pacat.c:146
#, c-format
@@ -1708,7 +1707,7 @@ msgstr "Używanie przykładowego określenia „%s”, mapa kanałów „%s”."
#: ../src/utils/pacat.c:358
#, c-format
msgid "Connected to device %s (index: %u, suspended: %s)."
-msgstr "Połączono z urządzeniem %s (indeks: %u, wstrzymane: %s)."
+msgstr "Połączono z urządzeniem %s (indeks: %u, wstrzymane: %s)."
#: ../src/utils/pacat.c:368
#, c-format
@@ -1769,7 +1768,7 @@ msgstr "Ostrzeżenie: otrzymano więcej żądań odetkania niż żądań zatkani
#: ../src/utils/pacat.c:466
#, c-format
msgid "Connection established.%s"
-msgstr "Ustanowiono połączenie.%s"
+msgstr "Nawiązano połączenie.%s"
#: ../src/utils/pacat.c:469
#, c-format
@@ -1796,35 +1795,35 @@ msgstr "pa_stream_connect_record() się nie powiodło: %s"
msgid "Connection failure: %s"
msgstr "Połączenie się nie powiodło: %s"
-#: ../src/utils/pacat.c:563
+#: ../src/utils/pacat.c:564
msgid "Got EOF."
msgstr "Otrzymano EOF."
-#: ../src/utils/pacat.c:600
+#: ../src/utils/pacat.c:601
#, c-format
msgid "write() failed: %s"
msgstr "write() się nie powiodło: %s"
-#: ../src/utils/pacat.c:621
+#: ../src/utils/pacat.c:622
msgid "Got signal, exiting."
msgstr "Otrzymano sygnał, kończenie działania."
-#: ../src/utils/pacat.c:635
+#: ../src/utils/pacat.c:636
#, c-format
msgid "Failed to get latency: %s"
msgstr "Uzyskanie opóźnienia się nie powiodło: %s"
-#: ../src/utils/pacat.c:640
+#: ../src/utils/pacat.c:641
#, c-format
msgid "Time: %0.3f sec; Latency: %0.0f usec."
-msgstr "Czas: %0.3f sekundy; opóźnienie: %0.0f usekundy."
+msgstr "Czas: %0.3f s, opóźnienie: %0.0f us."
-#: ../src/utils/pacat.c:661
+#: ../src/utils/pacat.c:662
#, c-format
msgid "pa_stream_update_timing_info() failed: %s"
msgstr "pa_stream_update_timing_info() się nie powiodło: %s"
-#: ../src/utils/pacat.c:671
+#: ../src/utils/pacat.c:672
#, c-format
msgid ""
"%s [options]\n"
@@ -1900,21 +1899,21 @@ msgstr ""
" -r, --record Tworzy połączenie do nagrywania\n"
" -p, --playback Tworzy połączenie do odtwarzania\n"
"\n"
-" -v, --verbose Wyświetla więcej informacji o\n"
-" działaniu\n"
+" -v, --verbose Wyświetla więcej informacji\n"
+" o działaniu\n"
"\n"
" -s, --server=SERWER Nazwa serwera do połączenia się\n"
-" -d, --device=URZĄDZENIE Nazwa odpływu/źródła do połączenia\n"
-" się\n"
-" -n, --client-name=NAZWA Jak nazywać tego klienta na\n"
-" serwerze\n"
+" -d, --device=URZĄDZENIE Nazwa odpływu/źródła\n"
+" do połączenia się\n"
+" -n, --client-name=NAZWA Jak nazywać tego klienta\n"
+" na serwerze\n"
" --stream-name=NAZWA Jak nazwać ten potok na serwerze\n"
" --volume=POZIOMGŁOŚNOŚCI Określa początkowy (liniowy)\n"
-" poziom głośności z zakresie\n"
+" poziom głośności w zakresie\n"
" 0…65536\n"
-" --rate=CZĘSTOTLIWOŚĆPRÓBKI Częstotliwość próbki w Hz\n"
+" --rate=CZĘSTOTLIWOŚĆPRÓBKI Częstotliwość próbki w Hz\n"
" (domyślnie 44100)\n"
-" --format=FORMATPRÓBKI Typ próbki, jeden z s16le, s16be,\n"
+" --format=FORMATPRÓBKI Typ próbki, jeden z s16le, s16be,\n"
" u8, float32le, float32be, ulaw,\n"
" alaw, s32le, s32be, s24le, s24be,\n"
" s24-32le, s24-32be (domyślnie\n"
@@ -1924,27 +1923,27 @@ msgstr ""
" (domyślnie 2)\n"
" --channel-map=MAPAKANAŁÓW Mapa kanałów używa zamiast\n"
" domyślnej\n"
-" --fix-format Pobiera format próbki z odpływu/\n"
-" źródła, z jakim połączony jest\n"
+" --fix-format Pobiera format próbki z odpływu/\n"
+" źródła, z jakim połączony jest\n"
" potok.\n"
-" --fix-rate Pobiera częstotliwość sampli z\n"
-" odpływu/źródła, z jakim połączony\n"
+" --fix-rate Pobiera częstotliwość sampli\n"
+" z odpływu/źródła, z jakim połączony\n"
" jest potok.\n"
-" --fix-channels Pobiera liczbę kanałów i mapę\n"
-" kanałów z odpływu/źródła, z jakim\n"
+" --fix-channels Pobiera liczbę kanałów i mapę\n"
+" kanałów z odpływu/źródła, z jakim\n"
" połączony jest potok.\n"
-" --no-remix Nie miesza kanałów w górę lub w\n"
-" dół.\n"
+" --no-remix Nie miesza kanałów w górę\n"
+" lub w dół.\n"
" --no-remap Mapuje kanały przez indeks zamiast\n"
" przez nazwę.\n"
-" --latency=BAJTY Żąda określonego opóźnienia w\n"
-" bajtach.\n"
-" --process-time=BAJTY Żąda określonego czasu procesu na\n"
-" żądanie w bajtach.\n"
-" --latency-msec=MSEKUNDY Żąda określonego opóźnienia w\n"
-" milisekundach.\n"
-" --process-time-msec=MSEKUNDY Żąda określonego czasu procesu na\n"
-" żądanie w milisekundach.\n"
+" --latency=BAJTY Żąda określonego opóźnienia\n"
+" w bajtach.\n"
+" --process-time=BAJTY Żąda określonego czasu procesu\n"
+" na żądanie w bajtach.\n"
+" --latency-msec=MSEKUNDY Żąda określonego opóźnienia\n"
+" w milisekundach.\n"
+" --process-time-msec=MSEKUNDY Żąda określonego czasu procesu\n"
+" na żądanie w milisekundach.\n"
" --property=WŁAŚCIWOŚĆ=WARTOŚĆ Ustawia podaną właściwość na podaną\n"
" wartość.\n"
" --raw Nagrywa/odtwarza surowe dane PCM.\n"
@@ -1953,30 +1952,30 @@ msgstr ""
" PCM.\n"
" --list-file-formats Wyświetla listę dostępnych formatów\n"
" plików.\n"
-" --monitor-stream=INDEKS Nagrywa z odpływu wejścia\n"
-" o INDEKSIE.\n"
+" --monitor-stream=INDEKS Nagrywa z odpływu wejścia\n"
+" o INDEKSIE.\n"
-#: ../src/utils/pacat.c:788
+#: ../src/utils/pacat.c:789
msgid "Play back encoded audio files on a PulseAudio sound server."
msgstr ""
"Odtwarza zakodowane pliki dźwiękowe za pomocą serwera dźwięku PulseAudio."
-#: ../src/utils/pacat.c:792
+#: ../src/utils/pacat.c:793
msgid ""
"Capture audio data from a PulseAudio sound server and write it to a file."
msgstr ""
-"Przechwytuje dane dźwiękowe z serwera dźwięku PulseAudio i zapisuje je do "
+"Przechwytuje dane dźwiękowe z serwera dźwięku PulseAudio i zapisuje je do "
"pliku."
-#: ../src/utils/pacat.c:796
+#: ../src/utils/pacat.c:797
msgid ""
"Capture audio data from a PulseAudio sound server and write it to STDOUT or "
"the specified file."
msgstr ""
-"Przechwytuje dane dźwiękowe z serwera dźwięku PulseAudio i zapisuje je do "
+"Przechwytuje dane dźwiękowe z serwera dźwięku PulseAudio i zapisuje je do "
"STANDARDOWEGO-WYJŚCIA lub podanego pliku."
-#: ../src/utils/pacat.c:800
+#: ../src/utils/pacat.c:801
msgid ""
"Play back audio data from STDIN or the specified file on a PulseAudio sound "
"server."
@@ -1984,7 +1983,7 @@ msgstr ""
"Odtwarza dane dźwiękowe ze STANDARDOWEGO-WEJŚCIA lub podanego pliku za "
"pomocą serwera dźwięku PulseAudio."
-#: ../src/utils/pacat.c:814
+#: ../src/utils/pacat.c:815
#, c-format
msgid ""
"pacat %s\n"
@@ -1995,136 +1994,136 @@ msgstr ""
"Skompilowane za pomocą libpulse %s\n"
"Skonsolidowane za pomocą libpulse %s\n"
-#: ../src/utils/pacat.c:847 ../src/utils/pactl.c:1648
+#: ../src/utils/pacat.c:848 ../src/utils/pactl.c:1648
#, c-format
msgid "Invalid client name '%s'"
msgstr "Nieprawidłowa nazwa klienta „%s”"
-#: ../src/utils/pacat.c:862
+#: ../src/utils/pacat.c:863
#, c-format
msgid "Invalid stream name '%s'"
msgstr "Nieprawidłowa nazwa potoku „%s”"
-#: ../src/utils/pacat.c:899
+#: ../src/utils/pacat.c:900
#, c-format
msgid "Invalid channel map '%s'"
msgstr "Nieprawidłowa mapa kanałów „%s”"
-#: ../src/utils/pacat.c:928 ../src/utils/pacat.c:942
+#: ../src/utils/pacat.c:929 ../src/utils/pacat.c:943
#, c-format
msgid "Invalid latency specification '%s'"
msgstr "Nieprawidłowe określenie opóźnienia „%s”"
-#: ../src/utils/pacat.c:935 ../src/utils/pacat.c:949
+#: ../src/utils/pacat.c:936 ../src/utils/pacat.c:950
#, c-format
msgid "Invalid process time specification '%s'"
msgstr "Nieprawidłowe określenie czasu procesu „%s”"
-#: ../src/utils/pacat.c:961
+#: ../src/utils/pacat.c:962
#, c-format
msgid "Invalid property '%s'"
msgstr "Nieprawidłowa właściwość „%s”"
-#: ../src/utils/pacat.c:980
+#: ../src/utils/pacat.c:981
#, c-format
msgid "Unknown file format %s."
msgstr "Nieznany format pliku %s."
-#: ../src/utils/pacat.c:995
+#: ../src/utils/pacat.c:996
msgid "Failed to parse the argument for --monitor-stream"
msgstr "Przetworzenie parametru dla --monitor-stream się nie powiodło"
-#: ../src/utils/pacat.c:1006
+#: ../src/utils/pacat.c:1007
msgid "Invalid sample specification"
msgstr "Nieprawidłowe określenie próbki"
-#: ../src/utils/pacat.c:1016
+#: ../src/utils/pacat.c:1017
#, c-format
msgid "open(): %s"
msgstr "open(): %s"
-#: ../src/utils/pacat.c:1021
+#: ../src/utils/pacat.c:1022
#, c-format
msgid "dup2(): %s"
msgstr "dup2(): %s"
-#: ../src/utils/pacat.c:1028
+#: ../src/utils/pacat.c:1029
msgid "Too many arguments."
msgstr "Za dużo parametrów."
-#: ../src/utils/pacat.c:1039
+#: ../src/utils/pacat.c:1040
msgid "Failed to generate sample specification for file."
msgstr "Utworzenie określenia próbki dla pliku się nie powiodło."
-#: ../src/utils/pacat.c:1065
+#: ../src/utils/pacat.c:1066
msgid "Failed to open audio file."
msgstr "Otwarcie pliku dźwiękowego się nie powiodło."
-#: ../src/utils/pacat.c:1071
+#: ../src/utils/pacat.c:1072
msgid ""
"Warning: specified sample specification will be overwritten with "
"specification from file."
msgstr ""
-"Ostrzeżenie: podane określenie próbki zostanie zastąpione przez określenie z "
-"pliku."
+"Ostrzeżenie: podane określenie próbki zostanie zastąpione przez określenie "
+"z pliku."
-#: ../src/utils/pacat.c:1074 ../src/utils/pactl.c:1712
+#: ../src/utils/pacat.c:1075 ../src/utils/pactl.c:1712
msgid "Failed to determine sample specification from file."
-msgstr "Ustalenie określenia próbki z pliku nie się nie powiodło."
+msgstr "Ustalenie określenia próbki z pliku nie się nie powiodło."
-#: ../src/utils/pacat.c:1083
+#: ../src/utils/pacat.c:1084
msgid "Warning: Failed to determine channel map from file."
-msgstr "Ostrzeżenie: ustalenie mapy kanałów z pliku się nie powiodło."
+msgstr "Ostrzeżenie: ustalenie mapy kanałów z pliku się nie powiodło."
-#: ../src/utils/pacat.c:1094
+#: ../src/utils/pacat.c:1095
msgid "Channel map doesn't match sample specification"
-msgstr "Mapa kanałów nie zgadza się z określeniem próbki"
+msgstr "Mapa kanałów nie zgadza się z określeniem próbki"
-#: ../src/utils/pacat.c:1105
+#: ../src/utils/pacat.c:1106
msgid "Warning: failed to write channel map to file."
msgstr "Ostrzeżenie: zapisanie mapy kanałów do pliku się nie powiodło."
-#: ../src/utils/pacat.c:1120
+#: ../src/utils/pacat.c:1121
#, c-format
msgid ""
"Opening a %s stream with sample specification '%s' and channel map '%s'."
msgstr ""
-"Otwieranie potoku %s za pomocą określenie próbki „%s” i mapy kanałów „%s”."
+"Otwieranie potoku %s za pomocą określenie próbki „%s” i mapy kanałów „%s”."
-#: ../src/utils/pacat.c:1121
+#: ../src/utils/pacat.c:1122
msgid "recording"
msgstr "nagrywanie"
-#: ../src/utils/pacat.c:1121
+#: ../src/utils/pacat.c:1122
msgid "playback"
msgstr "odtwarzanie"
-#: ../src/utils/pacat.c:1145
+#: ../src/utils/pacat.c:1146
msgid "Failed to set media name."
msgstr "Ustawienie nazwy nośnika się nie powiodło."
-#: ../src/utils/pacat.c:1152 ../src/utils/pactl.c:2062
+#: ../src/utils/pacat.c:1153 ../src/utils/pactl.c:2062
msgid "pa_mainloop_new() failed."
msgstr "pa_mainloop_new() się nie powiodło."
-#: ../src/utils/pacat.c:1175
+#: ../src/utils/pacat.c:1176
msgid "io_new() failed."
msgstr "io_new() się nie powiodło."
-#: ../src/utils/pacat.c:1182 ../src/utils/pactl.c:2074
+#: ../src/utils/pacat.c:1183 ../src/utils/pactl.c:2074
msgid "pa_context_new() failed."
msgstr "pa_context_new() się nie powiodło."
-#: ../src/utils/pacat.c:1190 ../src/utils/pactl.c:2080
+#: ../src/utils/pacat.c:1191 ../src/utils/pactl.c:2080
#, c-format
msgid "pa_context_connect() failed: %s"
msgstr "pa_context_connect() się nie powiodło: %s"
-#: ../src/utils/pacat.c:1196
+#: ../src/utils/pacat.c:1197
msgid "pa_context_rttime_new() failed."
msgstr "pa_context_rttime_new() się nie powiodło."
-#: ../src/utils/pacat.c:1203 ../src/utils/pactl.c:2085
+#: ../src/utils/pacat.c:1204 ../src/utils/pactl.c:2085
msgid "pa_mainloop_run() failed."
msgstr "pa_mainloop_run() się nie powiodło."
@@ -2228,7 +2227,7 @@ msgstr ""
"\n"
" -h, --help Wyświetla tę pomoc\n"
" --version Wyświetla wersję\n"
-"Jeśli nie podano polecenia, to program pacmd zostaje uruchomiony w trybie "
+"Jeśli nie podano polecenia, to program pacmd zostaje uruchomiony w trybie "
"interaktywnym.\n"
#: ../src/utils/pacmd.c:128
@@ -2289,14 +2288,14 @@ msgstr "Uzyskanie statystyk się nie powiodło: %s"
#: ../src/utils/pactl.c:170
#, c-format
msgid "Currently in use: %u blocks containing %s bytes total.\n"
-msgstr "Obecnie używane: %u bloków zawierających razem %s bajtów.\n"
+msgstr "Obecnie używane: %u bloków zawierających razem %s B.\n"
#: ../src/utils/pactl.c:173
#, c-format
msgid "Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
msgstr ""
"Przydzielono podczas całego czasu uruchomienia: %u bloków zawierających "
-"razem %s bajtów.\n"
+"razem %s B.\n"
#: ../src/utils/pactl.c:176
#, c-format
@@ -2306,7 +2305,7 @@ msgstr "Rozmiar pamięci podręcznej próbek: %s\n"
#: ../src/utils/pactl.c:185
#, c-format
msgid "Failed to get server information: %s"
-msgstr "Uzyskanie informacji o serwerze się nie powiodło: %s"
+msgstr "Uzyskanie informacji o serwerze się nie powiodło: %s"
#: ../src/utils/pactl.c:190
#, c-format
@@ -2351,7 +2350,7 @@ msgstr ""
#: ../src/utils/pactl.c:255 ../src/utils/pactl.c:900 ../src/utils/pactl.c:978
#, c-format
msgid "Failed to get sink information: %s"
-msgstr "Uzyskanie informacji o odpływie się nie powiodło: %s"
+msgstr "Uzyskanie informacji o odpływie się nie powiodło: %s"
#: ../src/utils/pactl.c:281
#, c-format
@@ -2387,7 +2386,7 @@ msgstr ""
"\t balans %0.2f\n"
"\tGłośność podstawowa: %s\n"
"\tŹródło monitora: %s\n"
-"\tOpóźnienie: %0.0f usekundy, skonfigurowano %0.0f usekundy\n"
+"\tOpóźnienie: %0.0f us, skonfigurowano %0.0f us\n"
"\tFlagi: %s%s%s%s%s%s%s\n"
"\tWłaściwości:\n"
"\t\t%s\n"
@@ -2410,7 +2409,7 @@ msgstr "\tFormaty:\n"
#: ../src/utils/pactl.c:362 ../src/utils/pactl.c:920 ../src/utils/pactl.c:993
#, c-format
msgid "Failed to get source information: %s"
-msgstr "Uzyskanie informacji o źródle się nie powiodło: %s"
+msgstr "Uzyskanie informacji o źródle się nie powiodło: %s"
#: ../src/utils/pactl.c:388
#, c-format
@@ -2446,7 +2445,7 @@ msgstr ""
"\t balans %0.2f\n"
"\tGłośność podstawowa: %s\n"
"\tMonitor odpływu: %s\n"
-"\tOpóźnienie: %0.0f usekundy, skonfigurowano %0.0f usekundy\n"
+"\tOpóźnienie: %0.0f us, skonfigurowano %0.0f us\n"
"\tFlagi: %s%s%s%s%s%s\n"
"\tWłaściwości:\n"
"\t\t%s\n"
@@ -2462,7 +2461,7 @@ msgstr "nie dotyczy"
#: ../src/utils/pactl.c:455 ../src/utils/pactl.c:859
#, c-format
msgid "Failed to get module information: %s"
-msgstr "Uzyskanie informacji o module się nie powiodło: %s"
+msgstr "Uzyskanie informacji o module się nie powiodło: %s"
#: ../src/utils/pactl.c:478
#, c-format
@@ -2484,7 +2483,7 @@ msgstr ""
#: ../src/utils/pactl.c:497
#, c-format
msgid "Failed to get client information: %s"
-msgstr "Uzyskanie informacji o kliencie się nie powiodło: %s"
+msgstr "Uzyskanie informacji o kliencie się nie powiodło: %s"
#: ../src/utils/pactl.c:523
#, c-format
@@ -2504,7 +2503,7 @@ msgstr ""
#: ../src/utils/pactl.c:540
#, c-format
msgid "Failed to get card information: %s"
-msgstr "Uzyskanie informacji o karcie się nie powiodło: %s"
+msgstr "Uzyskanie informacji o karcie się nie powiodło: %s"
#: ../src/utils/pactl.c:563
#, c-format
@@ -2555,7 +2554,7 @@ msgstr "\t\t\tCzęść profilu: %s"
#: ../src/utils/pactl.c:622 ../src/utils/pactl.c:940 ../src/utils/pactl.c:1008
#, c-format
msgid "Failed to get sink input information: %s"
-msgstr "Uzyskanie informacji o odpływie wejścia się nie powiodło: %s"
+msgstr "Uzyskanie informacji o odpływie wejścia się nie powiodło: %s"
#: ../src/utils/pactl.c:651
#, c-format
@@ -2590,8 +2589,8 @@ msgstr ""
"\tWyciszenie: %s\n"
"\tPoziom głośności: %s\n"
"\t balans %0.2f\n"
-"\tOpóźnienie bufora: %0.0f usekundy\n"
-"\tOpóźnienie odpływu: %0.0f usekundy\n"
+"\tOpóźnienie bufora: %0.0f us\n"
+"\tOpóźnienie odpływu: %0.0f us\n"
"\tMetoda resamplingu: %s\n"
"\tWłaściwości:\n"
"\t\t%s\n"
@@ -2599,7 +2598,7 @@ msgstr ""
#: ../src/utils/pactl.c:692 ../src/utils/pactl.c:960 ../src/utils/pactl.c:1023
#, c-format
msgid "Failed to get source output information: %s"
-msgstr "Uzyskanie informacji o wyjściu źródła się nie powiodło: %s"
+msgstr "Uzyskanie informacji o wyjściu źródła się nie powiodło: %s"
#: ../src/utils/pactl.c:721
#, c-format
@@ -2634,8 +2633,8 @@ msgstr ""
"\tWyciszenie: %s\n"
"\tPoziom głośności: %s\n"
"\t balans %0.2f\n"
-"\tOpóźnienie bufora: %0.0f usekundy\n"
-"\tOpóźnienie odpływu: %0.0f usekundy\n"
+"\tOpóźnienie bufora: %0.0f us\n"
+"\tOpóźnienie odpływu: %0.0f us\n"
"\tMetoda resamplingu: %s\n"
"\tWłaściwości:\n"
"\t\t%s\n"
@@ -2643,7 +2642,7 @@ msgstr ""
#: ../src/utils/pactl.c:762
#, c-format
msgid "Failed to get sample information: %s"
-msgstr "Uzyskanie informacji o próbce się nie powiodło: %s"
+msgstr "Uzyskanie informacji o próbce się nie powiodło: %s"
#: ../src/utils/pactl.c:789
#, c-format
@@ -2683,7 +2682,7 @@ msgstr "Niepowodzenie: %s"
#, c-format
msgid "Failed to unload module: Module %s not loaded"
msgstr ""
-"Usunięcie modułu z pamięci się nie powiodło: moduł %s nie jest wczytany"
+"Usunięcie modułu z pamięci się nie powiodło: moduł %s nie jest wczytany"
#: ../src/utils/pactl.c:884
#, c-format
@@ -2763,7 +2762,7 @@ msgstr "karta"
#: ../src/utils/pactl.c:1180
#, c-format
msgid "Event '%s' on %s #%u\n"
-msgstr "Zdarzenie „%s” w %s #%u\n"
+msgstr "Zdarzenie „%s” w %s #%u\n"
#: ../src/utils/pactl.c:1452
msgid "Got SIGINT, exiting."
@@ -2839,8 +2838,8 @@ msgid ""
"can be used to specify the default sink, source and monitor.\n"
msgstr ""
"\n"
-"Specjalne nazwy @DEFAULT_SINK@, @DEFAULT_SOURCE@ i @DEFAULT_MONITOR@\n"
-"mogą być używane do podania domyślnego odpływu, źródła i monitora.\n"
+"Specjalne nazwy @DEFAULT_SINK@, @DEFAULT_SOURCE@ i @DEFAULT_MONITOR@\n"
+"mogą być używane do podania domyślnego odpływu, źródła i monitora.\n"
#: ../src/utils/pactl.c:1587
#, c-format
@@ -2859,7 +2858,7 @@ msgstr ""
" --version Wyświetla wersję\n"
"\n"
" -s, --server=SERWER Nazwa serwera do połączenia się\n"
-" -n, --client-name=NAZWA Jak nazwać tego klienta w serwerze\n"
+" -n, --client-name=NAZWA Jak nazwać tego klienta w serwerze\n"
#: ../src/utils/pactl.c:1628
#, c-format
@@ -2887,7 +2886,7 @@ msgstr "Otwarcie pliku dźwiękowego się nie powiodło."
#: ../src/utils/pactl.c:1719
msgid "Warning: Failed to determine sample specification from file."
-msgstr "Ostrzeżenie: ustalenie określenia próbki z pliku się nie powiodło."
+msgstr "Ostrzeżenie: ustalenie określenia próbki z pliku się nie powiodło."
#: ../src/utils/pactl.c:1729
msgid "You have to specify a sample name to play"
@@ -2899,15 +2898,15 @@ msgstr "Należy podać nazwę próbki do usunięcia"
#: ../src/utils/pactl.c:1750
msgid "You have to specify a sink input index and a sink"
-msgstr "Należy podać indeks odpływu wejścia i odpływ"
+msgstr "Należy podać indeks odpływu wejścia i odpływ"
#: ../src/utils/pactl.c:1760
msgid "You have to specify a source output index and a source"
-msgstr "Należy podać indeks źródła wyjścia i źródło"
+msgstr "Należy podać indeks źródła wyjścia i źródło"
#: ../src/utils/pactl.c:1775
msgid "You have to specify a module name and arguments."
-msgstr "Należy podać nazwę modułu i parametry."
+msgstr "Należy podać nazwę modułu i parametry."
#: ../src/utils/pactl.c:1795
msgid "You have to specify a module index or name"
@@ -2932,11 +2931,11 @@ msgstr ""
#: ../src/utils/pactl.c:1845
msgid "You have to specify a card name/index and a profile name"
-msgstr "Należy podać nazwę karty/indeks i nazwę profilu"
+msgstr "Należy podać nazwę karty/indeks i nazwę profilu"
#: ../src/utils/pactl.c:1856
msgid "You have to specify a sink name/index and a port name"
-msgstr "Należy podać nazwę odpływu/indeks i nazwę portu"
+msgstr "Należy podać nazwę odpływu/indeks i nazwę portu"
#: ../src/utils/pactl.c:1867
msgid "You have to specify a sink name"
@@ -2944,7 +2943,7 @@ msgstr "Należy podać nazwę odpływu"
#: ../src/utils/pactl.c:1877
msgid "You have to specify a source name/index and a port name"
-msgstr "Należy podać nazwę źródła/indeks i nazwę portu"
+msgstr "Należy podać nazwę źródła/indeks i nazwę portu"
#: ../src/utils/pactl.c:1888
msgid "You have to specify a source name"
@@ -2952,15 +2951,15 @@ msgstr "Należy podać nazwę źródła"
#: ../src/utils/pactl.c:1898
msgid "You have to specify a sink name/index and a volume"
-msgstr "Należy podać nazwę odpływu/indeks i głośność"
+msgstr "Należy podać nazwę odpływu/indeks i głośność"
#: ../src/utils/pactl.c:1911
msgid "You have to specify a source name/index and a volume"
-msgstr "Należy podać nazwę źródła/indeks i głośność"
+msgstr "Należy podać nazwę źródła/indeks i głośność"
#: ../src/utils/pactl.c:1924
msgid "You have to specify a sink input index and a volume"
-msgstr "Należy podać indeks odpływu wejścia i głośność"
+msgstr "Należy podać indeks odpływu wejścia i głośność"
#: ../src/utils/pactl.c:1929
msgid "Invalid sink input index"
@@ -2968,7 +2967,7 @@ msgstr "Nieprawidłowy indeks odpływ wejścia"
#: ../src/utils/pactl.c:1940
msgid "You have to specify a source output index and a volume"
-msgstr "Należy podać indeks źródła wyjścia i głośność"
+msgstr "Należy podać indeks źródła wyjścia i głośność"
#: ../src/utils/pactl.c:1945
msgid "Invalid source output index"
@@ -2978,7 +2977,7 @@ msgstr "Nieprawidłowy indeks wejścia źródła"
msgid ""
"You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
msgstr ""
-"Należy podać nazwę odpływu/indeks i działanie wyciszenia (0, 1 lub „toggle”)"
+"Należy podać nazwę odpływu/indeks i działanie wyciszenia (0, 1 lub „toggle”)"
#: ../src/utils/pactl.c:1961 ../src/utils/pactl.c:1976
#: ../src/utils/pactl.c:1996 ../src/utils/pactl.c:2014
@@ -2989,13 +2988,13 @@ msgstr "Nieprawidłowe określenie wyciszenia"
msgid ""
"You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
msgstr ""
-"Należy podać nazwę źródła/indeks i działanie wyciszenia (0, 1 lub „toggle”)"
+"Należy podać nazwę źródła/indeks i działanie wyciszenia (0, 1 lub „toggle”)"
#: ../src/utils/pactl.c:1986
msgid ""
"You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
msgstr ""
-"Należy podać indeks odpływu wejścia i działanie wyciszenia (0, 1 lub "
+"Należy podać indeks odpływu wejścia i działanie wyciszenia (0, 1 lub "
"„toggle”)"
#: ../src/utils/pactl.c:1991
@@ -3007,7 +3006,7 @@ msgid ""
"You have to specify a source output index and a mute action (0, 1, or "
"'toggle')"
msgstr ""
-"Należy podać nazwę indeks wyjścia źródła i działanie wyciszenia (0, 1 lub "
+"Należy podać nazwę indeks wyjścia źródła i działanie wyciszenia (0, 1 lub "
"„toggle”)"
#: ../src/utils/pactl.c:2009
@@ -3024,7 +3023,7 @@ msgstr ""
#: ../src/utils/pactl.c:2038
msgid "You have to specify a card name/index, a port name and a latency offset"
-msgstr "Należy podać nazwę karty/indeks, nazwę portu i offset opóźnienia"
+msgstr "Należy podać nazwę karty/indeks, nazwę portu i offset opóźnienia"
#: ../src/utils/pactl.c:2045
msgid "Could not parse latency offset"
@@ -3134,9 +3133,9 @@ msgstr ""
"\n"
" -d Wyświetla dane PulseAudio dołączone do ekranu X11 (domyślne)\n"
" -e Eksportuje lokalne dane PulseAudio na ekran X11\n"
-" -i Importuje dane PulseAudio z ekranu X11 do lokalnych zmiennych\n"
-" środowiskowych i pliku ciasteczka.\n"
-" -r Usuwa dane PulseAudio z ekranu X11\n"
+" -i Importuje dane PulseAudio z ekranu X11 do lokalnych zmiennych\n"
+" środowiskowych i pliku ciasteczka.\n"
+" -r Usuwa dane PulseAudio z ekranu X11\n"
#: ../src/utils/pax11publish.c:91
#, c-format
diff --git a/po/sk.po b/po/sk.po
index 68756aa..730c234 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: PulseAudio master\n"
"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?"
"product=PulseAudio&keywords=I18N+L10N&component=misc\n"
-"POT-Creation-Date: 2015-09-12 15:47+0000\n"
-"PO-Revision-Date: 2015-09-22 20:59+0200\n"
+"POT-Creation-Date: 2016-06-22 13:54+0000\n"
+"PO-Revision-Date: 2016-07-06 17:20+0200\n"
"Last-Translator: Dušan Kazik <prescott66 at gmail.com>\n"
"Language-Team: Slovak <gnome-sk-list at gnome.org>\n"
"Language: sk\n"
@@ -17,9 +17,9 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Generator: Poedit 1.8.4\n"
+"X-Generator: Poedit 1.8.7.1\n"
-#: ../src/daemon/cmdline.c:111
+#: ../src/daemon/cmdline.c:113
#, c-format
msgid ""
"%s [options]\n"
@@ -78,6 +78,7 @@ msgid ""
" --no-cpu-limit[=BOOL] Do not install CPU load limiter on\n"
" platforms that support it.\n"
" --disable-shm[=BOOL] Disable shared memory support.\n"
+" --enable-memfd[=BOOL] Enable memfd shared memory support.\n"
"\n"
"STARTUP SCRIPT:\n"
" -L, --load=\"MODULE ARGUMENTS\" Load the specified plugin module "
@@ -91,143 +92,147 @@ msgid ""
" -n Don't load default script file\n"
msgstr ""
-#: ../src/daemon/cmdline.c:243
+#: ../src/daemon/cmdline.c:246
msgid "--daemonize expects boolean argument"
msgstr ""
-#: ../src/daemon/cmdline.c:251
+#: ../src/daemon/cmdline.c:254
msgid "--fail expects boolean argument"
msgstr ""
-#: ../src/daemon/cmdline.c:262
+#: ../src/daemon/cmdline.c:265
msgid ""
"--log-level expects log level argument (either numeric in range 0..4 or one "
"of debug, info, notice, warn, error)."
msgstr ""
-#: ../src/daemon/cmdline.c:274
+#: ../src/daemon/cmdline.c:277
msgid "--high-priority expects boolean argument"
msgstr ""
-#: ../src/daemon/cmdline.c:282
+#: ../src/daemon/cmdline.c:285
msgid "--realtime expects boolean argument"
msgstr ""
-#: ../src/daemon/cmdline.c:290
+#: ../src/daemon/cmdline.c:293
msgid "--disallow-module-loading expects boolean argument"
msgstr ""
-#: ../src/daemon/cmdline.c:298
+#: ../src/daemon/cmdline.c:301
msgid "--disallow-exit expects boolean argument"
msgstr ""
-#: ../src/daemon/cmdline.c:306
+#: ../src/daemon/cmdline.c:309
msgid "--use-pid-file expects boolean argument"
msgstr ""
-#: ../src/daemon/cmdline.c:325
+#: ../src/daemon/cmdline.c:328
msgid ""
"Invalid log target: use either 'syslog', 'journal','stderr' or 'auto' or a "
"valid file name 'file:<path>', 'newfile:<path>'."
msgstr ""
-#: ../src/daemon/cmdline.c:327
+#: ../src/daemon/cmdline.c:330
msgid ""
"Invalid log target: use either 'syslog', 'stderr' or 'auto' or a valid file "
"name 'file:<path>', 'newfile:<path>'."
msgstr ""
-#: ../src/daemon/cmdline.c:335
+#: ../src/daemon/cmdline.c:338
msgid "--log-time expects boolean argument"
msgstr ""
-#: ../src/daemon/cmdline.c:343
+#: ../src/daemon/cmdline.c:346
msgid "--log-meta expects boolean argument"
msgstr ""
-#: ../src/daemon/cmdline.c:363
+#: ../src/daemon/cmdline.c:366
#, c-format
msgid "Invalid resample method '%s'."
msgstr "Neplatná metóda prevzorkovania „%s“."
-#: ../src/daemon/cmdline.c:370
+#: ../src/daemon/cmdline.c:373
msgid "--system expects boolean argument"
msgstr "Voľba --system očakáva booleovský parameter"
-#: ../src/daemon/cmdline.c:378
+#: ../src/daemon/cmdline.c:381
msgid "--no-cpu-limit expects boolean argument"
msgstr ""
-#: ../src/daemon/cmdline.c:386
+#: ../src/daemon/cmdline.c:389
msgid "--disable-shm expects boolean argument"
msgstr ""
-#: ../src/daemon/daemon-conf.c:259
+#: ../src/daemon/cmdline.c:397
+msgid "--enable-memfd expects boolean argument"
+msgstr "Voľba --enable-memfd očakáva booleovský parameter"
+
+#: ../src/daemon/daemon-conf.c:260
#, c-format
msgid "[%s:%u] Invalid log target '%s'."
-msgstr ""
+msgstr "[%s:%u] Neplatný cieľ záznamu „%s“."
-#: ../src/daemon/daemon-conf.c:274
+#: ../src/daemon/daemon-conf.c:275
#, c-format
msgid "[%s:%u] Invalid log level '%s'."
-msgstr ""
+msgstr "[%s:%u] Neplatná úroveň záznamu „%s“."
-#: ../src/daemon/daemon-conf.c:289
+#: ../src/daemon/daemon-conf.c:290
#, c-format
msgid "[%s:%u] Invalid resample method '%s'."
-msgstr ""
+msgstr "[%s:%u] Neplatný spôsob prevzorkovania „%s“."
-#: ../src/daemon/daemon-conf.c:311
+#: ../src/daemon/daemon-conf.c:312
#, c-format
msgid "[%s:%u] Invalid rlimit '%s'."
-msgstr ""
+msgstr "[%s:%u] Neplatný rlimit „%s“."
-#: ../src/daemon/daemon-conf.c:331
+#: ../src/daemon/daemon-conf.c:332
#, c-format
msgid "[%s:%u] Invalid sample format '%s'."
-msgstr ""
+msgstr "[%s:%u] Neplatný formát vzoriek „%s“."
-#: ../src/daemon/daemon-conf.c:348 ../src/daemon/daemon-conf.c:365
+#: ../src/daemon/daemon-conf.c:349 ../src/daemon/daemon-conf.c:366
#, c-format
msgid "[%s:%u] Invalid sample rate '%s'."
-msgstr ""
+msgstr "[%s:%u] Neplatná frekvencia vzoriek „%s“."
-#: ../src/daemon/daemon-conf.c:388
+#: ../src/daemon/daemon-conf.c:389
#, c-format
msgid "[%s:%u] Invalid sample channels '%s'."
msgstr ""
-#: ../src/daemon/daemon-conf.c:405
+#: ../src/daemon/daemon-conf.c:406
#, c-format
msgid "[%s:%u] Invalid channel map '%s'."
-msgstr ""
+msgstr "[%s:%u] Neplatná mapa kanálov „%s“."
-#: ../src/daemon/daemon-conf.c:422
+#: ../src/daemon/daemon-conf.c:423
#, c-format
msgid "[%s:%u] Invalid number of fragments '%s'."
-msgstr ""
+msgstr "[%s:%u] Neplatný počet fragmentov „%s“."
-#: ../src/daemon/daemon-conf.c:439
+#: ../src/daemon/daemon-conf.c:440
#, c-format
msgid "[%s:%u] Invalid fragment size '%s'."
-msgstr ""
+msgstr "[%s:%u] Neplatná veľkosť fragmentu „%s“."
-#: ../src/daemon/daemon-conf.c:456
+#: ../src/daemon/daemon-conf.c:457
#, c-format
msgid "[%s:%u] Invalid nice level '%s'."
-msgstr ""
+msgstr "[%s:%u] Neplatná úroveň nice „%s“."
-#: ../src/daemon/daemon-conf.c:499
+#: ../src/daemon/daemon-conf.c:500
#, c-format
msgid "[%s:%u] Invalid server type '%s'."
-msgstr ""
+msgstr "[%s:%u] Neplatný typ servera „%s“."
-#: ../src/daemon/daemon-conf.c:613
+#: ../src/daemon/daemon-conf.c:615
#, c-format
msgid "Failed to open configuration file: %s"
msgstr "Zlyhalo otvorenie konfiguračného súboru: %s"
-#: ../src/daemon/daemon-conf.c:629
+#: ../src/daemon/daemon-conf.c:631
msgid ""
"The specified default channel map has a different number of channels than "
"the specified default number of channels."
@@ -235,7 +240,7 @@ msgstr ""
"Určená predvolená mapa kanálov obsahuje odlišný počet kanálov ako je určený "
"predvolený počet kanálov."
-#: ../src/daemon/daemon-conf.c:716
+#: ../src/daemon/daemon-conf.c:718
#, c-format
msgid "### Read from configuration file: %s ###\n"
msgstr "### Čítať z konfiguračného súboru: %s ###\n"
@@ -359,7 +364,7 @@ msgstr ""
#: ../src/daemon/main.c:622
#, c-format
msgid "Failed to kill daemon: %s"
-msgstr "Zlyhalo zabitie služby: %s"
+msgstr "Zlyhalo zabitie démona: %s"
#: ../src/daemon/main.c:651
msgid ""
@@ -423,7 +428,7 @@ msgstr ""
#: ../src/daemon/main.c:788
msgid "Daemon startup failed."
-msgstr "Zlyhalo spustenie služby."
+msgstr "Zlyhalo spustenie démona."
#: ../src/daemon/main.c:821
#, c-format
@@ -449,15 +454,15 @@ msgstr ""
msgid "pa_pid_file_create() failed."
msgstr ""
-#: ../src/daemon/main.c:1021
+#: ../src/daemon/main.c:1023
msgid "pa_core_new() failed."
msgstr ""
-#: ../src/daemon/main.c:1089
+#: ../src/daemon/main.c:1091
msgid "Failed to initialize daemon."
-msgstr "Zlyhala inicializácia služby."
+msgstr "Zlyhala inicializácia démona."
-#: ../src/daemon/main.c:1094
+#: ../src/daemon/main.c:1096
msgid "Daemon startup without any loaded modules, refusing to work."
msgstr ""
@@ -469,155 +474,155 @@ msgstr "Zvukový systém PulseAudio"
msgid "Start the PulseAudio Sound System"
msgstr "Spustenie zvukového systému PulseAudio"
-#: ../src/modules/alsa/alsa-mixer.c:2394
+#: ../src/modules/alsa/alsa-mixer.c:2378
msgid "Input"
msgstr "Vstup"
-#: ../src/modules/alsa/alsa-mixer.c:2395
+#: ../src/modules/alsa/alsa-mixer.c:2379
msgid "Docking Station Input"
msgstr "Vstup dokovacej stanice"
-#: ../src/modules/alsa/alsa-mixer.c:2396
+#: ../src/modules/alsa/alsa-mixer.c:2380
msgid "Docking Station Microphone"
msgstr "Mikrofón dokovacej stanice"
-#: ../src/modules/alsa/alsa-mixer.c:2397
+#: ../src/modules/alsa/alsa-mixer.c:2381
msgid "Docking Station Line In"
msgstr "Vstupná linka dokovacej stanice"
-#: ../src/modules/alsa/alsa-mixer.c:2398 ../src/modules/alsa/alsa-mixer.c:2483
+#: ../src/modules/alsa/alsa-mixer.c:2382 ../src/modules/alsa/alsa-mixer.c:2467
msgid "Line In"
msgstr "Vstupná linka"
-#: ../src/modules/alsa/alsa-mixer.c:2399 ../src/modules/alsa/alsa-mixer.c:2477
-#: ../src/modules/bluetooth/module-bluez4-device.c:2102
+#: ../src/modules/alsa/alsa-mixer.c:2383 ../src/modules/alsa/alsa-mixer.c:2461
+#: ../src/modules/bluetooth/module-bluez4-device.c:2099
#: ../src/modules/bluetooth/module-bluez5-device.c:1710
msgid "Microphone"
msgstr "Mikrofón"
-#: ../src/modules/alsa/alsa-mixer.c:2400 ../src/modules/alsa/alsa-mixer.c:2478
+#: ../src/modules/alsa/alsa-mixer.c:2384 ../src/modules/alsa/alsa-mixer.c:2462
msgid "Front Microphone"
msgstr "Predný mikrofón"
-#: ../src/modules/alsa/alsa-mixer.c:2401 ../src/modules/alsa/alsa-mixer.c:2479
+#: ../src/modules/alsa/alsa-mixer.c:2385 ../src/modules/alsa/alsa-mixer.c:2463
msgid "Rear Microphone"
msgstr "Zadný mikrofón"
-#: ../src/modules/alsa/alsa-mixer.c:2402
+#: ../src/modules/alsa/alsa-mixer.c:2386
msgid "External Microphone"
msgstr "Externý mikrofón"
-#: ../src/modules/alsa/alsa-mixer.c:2403 ../src/modules/alsa/alsa-mixer.c:2481
+#: ../src/modules/alsa/alsa-mixer.c:2387 ../src/modules/alsa/alsa-mixer.c:2465
msgid "Internal Microphone"
msgstr "Vstavaný mikrofón"
-#: ../src/modules/alsa/alsa-mixer.c:2404 ../src/modules/alsa/alsa-mixer.c:2484
+#: ../src/modules/alsa/alsa-mixer.c:2388 ../src/modules/alsa/alsa-mixer.c:2468
msgid "Radio"
msgstr "Rádio"
-#: ../src/modules/alsa/alsa-mixer.c:2405 ../src/modules/alsa/alsa-mixer.c:2485
+#: ../src/modules/alsa/alsa-mixer.c:2389 ../src/modules/alsa/alsa-mixer.c:2469
msgid "Video"
msgstr "Video"
-#: ../src/modules/alsa/alsa-mixer.c:2406
+#: ../src/modules/alsa/alsa-mixer.c:2390
msgid "Automatic Gain Control"
msgstr "Automatické ovládanie zosilnenia"
-#: ../src/modules/alsa/alsa-mixer.c:2407
+#: ../src/modules/alsa/alsa-mixer.c:2391
msgid "No Automatic Gain Control"
msgstr "Bez automatického ovládania zosilnenia"
-#: ../src/modules/alsa/alsa-mixer.c:2408
+#: ../src/modules/alsa/alsa-mixer.c:2392
msgid "Boost"
msgstr "Zosilnenie"
-#: ../src/modules/alsa/alsa-mixer.c:2409
+#: ../src/modules/alsa/alsa-mixer.c:2393
msgid "No Boost"
msgstr "Bez zosilnenia"
-#: ../src/modules/alsa/alsa-mixer.c:2410
+#: ../src/modules/alsa/alsa-mixer.c:2394
msgid "Amplifier"
msgstr "Zosilňovač"
-#: ../src/modules/alsa/alsa-mixer.c:2411
+#: ../src/modules/alsa/alsa-mixer.c:2395
msgid "No Amplifier"
msgstr "Bez zosilňovača"
-#: ../src/modules/alsa/alsa-mixer.c:2412
+#: ../src/modules/alsa/alsa-mixer.c:2396
msgid "Bass Boost"
msgstr "Zosilnenie basov"
-#: ../src/modules/alsa/alsa-mixer.c:2413
+#: ../src/modules/alsa/alsa-mixer.c:2397
msgid "No Bass Boost"
msgstr "Bez zosilnenia basov"
-#: ../src/modules/alsa/alsa-mixer.c:2414
-#: ../src/modules/bluetooth/module-bluez4-device.c:2107
+#: ../src/modules/alsa/alsa-mixer.c:2398
+#: ../src/modules/bluetooth/module-bluez4-device.c:2104
#: ../src/modules/bluetooth/module-bluez5-device.c:1717
msgid "Speaker"
msgstr "Reproduktor"
-#: ../src/modules/alsa/alsa-mixer.c:2415 ../src/modules/alsa/alsa-mixer.c:2487
+#: ../src/modules/alsa/alsa-mixer.c:2399 ../src/modules/alsa/alsa-mixer.c:2471
msgid "Headphones"
msgstr "Slúchadlá"
-#: ../src/modules/alsa/alsa-mixer.c:2476
+#: ../src/modules/alsa/alsa-mixer.c:2460
msgid "Analog Input"
msgstr "Analógový vstup"
-#: ../src/modules/alsa/alsa-mixer.c:2480
+#: ../src/modules/alsa/alsa-mixer.c:2464
msgid "Dock Microphone"
msgstr "Mikrofón doku"
-#: ../src/modules/alsa/alsa-mixer.c:2482
+#: ../src/modules/alsa/alsa-mixer.c:2466
msgid "Headset Microphone"
msgstr "Mikrofón headsetu"
-#: ../src/modules/alsa/alsa-mixer.c:2486
+#: ../src/modules/alsa/alsa-mixer.c:2470
msgid "Analog Output"
msgstr "Analógový výstup"
-#: ../src/modules/alsa/alsa-mixer.c:2488
+#: ../src/modules/alsa/alsa-mixer.c:2472
msgid "LFE on Separate Mono Output"
msgstr "Kanál LFE na oddelenom mono výstupe"
-#: ../src/modules/alsa/alsa-mixer.c:2489
+#: ../src/modules/alsa/alsa-mixer.c:2473
msgid "Line Out"
msgstr "Výstupná linka"
-#: ../src/modules/alsa/alsa-mixer.c:2490
+#: ../src/modules/alsa/alsa-mixer.c:2474
msgid "Analog Mono Output"
msgstr "Analógový mono výstup"
-#: ../src/modules/alsa/alsa-mixer.c:2491
+#: ../src/modules/alsa/alsa-mixer.c:2475
msgid "Speakers"
msgstr "Reproduktory"
-#: ../src/modules/alsa/alsa-mixer.c:2492
+#: ../src/modules/alsa/alsa-mixer.c:2476
msgid "HDMI / DisplayPort"
msgstr "HDMI / DisplayPort"
-#: ../src/modules/alsa/alsa-mixer.c:2493
+#: ../src/modules/alsa/alsa-mixer.c:2477
msgid "Digital Output (S/PDIF)"
msgstr "Digitálny výstup (S/PDIF)"
-#: ../src/modules/alsa/alsa-mixer.c:2494
+#: ../src/modules/alsa/alsa-mixer.c:2478
msgid "Digital Input (S/PDIF)"
msgstr "Digitálny vstup (S/PDIF)"
-#: ../src/modules/alsa/alsa-mixer.c:2495
+#: ../src/modules/alsa/alsa-mixer.c:2479
msgid "Digital Passthrough (S/PDIF)"
msgstr "Digitálny prechod (S/PDIF)"
-#: ../src/modules/alsa/alsa-mixer.c:2496
+#: ../src/modules/alsa/alsa-mixer.c:2480
msgid "Multichannel Input"
msgstr "Viackanálový vstup"
-#: ../src/modules/alsa/alsa-mixer.c:2497
+#: ../src/modules/alsa/alsa-mixer.c:2481
msgid "Multichannel Output"
msgstr "Viackanálový výstup"
-#: ../src/modules/alsa/alsa-mixer.c:4003
+#: ../src/modules/alsa/alsa-mixer.c:3990
msgid "Analog Mono"
msgstr "Analógový mono"
@@ -626,116 +631,116 @@ msgstr "Analógový mono"
#. * here would lead to the source name to become "Analog Stereo Input
#. * Input". The same logic applies to analog-stereo-output,
#. * multichannel-input and multichannel-output.
-#: ../src/modules/alsa/alsa-mixer.c:4004 ../src/modules/alsa/alsa-mixer.c:4010
-#: ../src/modules/alsa/alsa-mixer.c:4011
+#: ../src/modules/alsa/alsa-mixer.c:3991 ../src/modules/alsa/alsa-mixer.c:3997
+#: ../src/modules/alsa/alsa-mixer.c:3998
msgid "Analog Stereo"
msgstr "Analógový stereo"
-#: ../src/modules/alsa/alsa-mixer.c:4012 ../src/modules/alsa/alsa-mixer.c:4013
+#: ../src/modules/alsa/alsa-mixer.c:3999 ../src/modules/alsa/alsa-mixer.c:4000
msgid "Multichannel"
msgstr "Viackanálový"
-#: ../src/modules/alsa/alsa-mixer.c:4014
+#: ../src/modules/alsa/alsa-mixer.c:4001
msgid "Analog Surround 2.1"
msgstr "Analógový priestorový 2.1"
-#: ../src/modules/alsa/alsa-mixer.c:4015
+#: ../src/modules/alsa/alsa-mixer.c:4002
msgid "Analog Surround 3.0"
msgstr "Analógový priestorový 3.0"
-#: ../src/modules/alsa/alsa-mixer.c:4016
+#: ../src/modules/alsa/alsa-mixer.c:4003
msgid "Analog Surround 3.1"
msgstr "Analógový priestorový 3.1"
-#: ../src/modules/alsa/alsa-mixer.c:4017
+#: ../src/modules/alsa/alsa-mixer.c:4004
msgid "Analog Surround 4.0"
msgstr "Analógový priestorový 4.0"
-#: ../src/modules/alsa/alsa-mixer.c:4018
+#: ../src/modules/alsa/alsa-mixer.c:4005
msgid "Analog Surround 4.1"
msgstr "Analógový priestorový 4.1"
-#: ../src/modules/alsa/alsa-mixer.c:4019
+#: ../src/modules/alsa/alsa-mixer.c:4006
msgid "Analog Surround 5.0"
msgstr "Analógový priestorový 5.0"
-#: ../src/modules/alsa/alsa-mixer.c:4020
+#: ../src/modules/alsa/alsa-mixer.c:4007
msgid "Analog Surround 5.1"
msgstr "Analógový priestorový 5.1"
-#: ../src/modules/alsa/alsa-mixer.c:4021
+#: ../src/modules/alsa/alsa-mixer.c:4008
msgid "Analog Surround 6.0"
msgstr "Analógový priestorový 6.0"
-#: ../src/modules/alsa/alsa-mixer.c:4022
+#: ../src/modules/alsa/alsa-mixer.c:4009
msgid "Analog Surround 6.1"
msgstr "Analógový priestorový 6.1"
-#: ../src/modules/alsa/alsa-mixer.c:4023
+#: ../src/modules/alsa/alsa-mixer.c:4010
msgid "Analog Surround 7.0"
msgstr "Analógový priestorový 7.0"
-#: ../src/modules/alsa/alsa-mixer.c:4024
+#: ../src/modules/alsa/alsa-mixer.c:4011
msgid "Analog Surround 7.1"
msgstr "Analógový priestorový 7.1"
-#: ../src/modules/alsa/alsa-mixer.c:4025
+#: ../src/modules/alsa/alsa-mixer.c:4012
msgid "Digital Stereo (IEC958)"
msgstr "Digitálne stereo (IEC958)"
-#: ../src/modules/alsa/alsa-mixer.c:4026
+#: ../src/modules/alsa/alsa-mixer.c:4013
msgid "Digital Passthrough (IEC958)"
msgstr "Digitálny prechod (IEC958)"
-#: ../src/modules/alsa/alsa-mixer.c:4027
+#: ../src/modules/alsa/alsa-mixer.c:4014
msgid "Digital Surround 4.0 (IEC958/AC3)"
msgstr "Digitálny priestorový 4.0 (IEC958/AC3)"
-#: ../src/modules/alsa/alsa-mixer.c:4028
+#: ../src/modules/alsa/alsa-mixer.c:4015
msgid "Digital Surround 5.1 (IEC958/AC3)"
msgstr "Digitálny priestorový 5.1 (IEC958/AC3)"
-#: ../src/modules/alsa/alsa-mixer.c:4029
+#: ../src/modules/alsa/alsa-mixer.c:4016
msgid "Digital Surround 5.1 (IEC958/DTS)"
msgstr "Digitálny priestorový 5.1 (IEC958/DTS)"
-#: ../src/modules/alsa/alsa-mixer.c:4030
+#: ../src/modules/alsa/alsa-mixer.c:4017
msgid "Digital Stereo (HDMI)"
msgstr "Digitálny stereo (HDMI)"
-#: ../src/modules/alsa/alsa-mixer.c:4031
+#: ../src/modules/alsa/alsa-mixer.c:4018
msgid "Digital Surround 5.1 (HDMI)"
msgstr "Digitálny priestorový 5.1 (HDMI)"
-#: ../src/modules/alsa/alsa-mixer.c:4162
+#: ../src/modules/alsa/alsa-mixer.c:4151
msgid "Analog Mono Duplex"
msgstr "Obojsmerný analógový mono"
-#: ../src/modules/alsa/alsa-mixer.c:4163
+#: ../src/modules/alsa/alsa-mixer.c:4152
msgid "Analog Stereo Duplex"
msgstr "Obojsmerný analógový stereo"
-#: ../src/modules/alsa/alsa-mixer.c:4164
+#: ../src/modules/alsa/alsa-mixer.c:4153
msgid "Digital Stereo Duplex (IEC958)"
msgstr "Obojsmerný digitálny stereo (IEC958)"
-#: ../src/modules/alsa/alsa-mixer.c:4165
+#: ../src/modules/alsa/alsa-mixer.c:4154
msgid "Multichannel Duplex"
msgstr "Obojsmerný viackanálový"
-#: ../src/modules/alsa/alsa-mixer.c:4166
-#: ../src/modules/alsa/module-alsa-card.c:184
-#: ../src/modules/bluetooth/module-bluez4-device.c:2298
+#: ../src/modules/alsa/alsa-mixer.c:4155
+#: ../src/modules/alsa/module-alsa-card.c:186
+#: ../src/modules/bluetooth/module-bluez4-device.c:2295
#: ../src/modules/bluetooth/module-bluez5-device.c:1941
msgid "Off"
msgstr "Vypnuté"
-#: ../src/modules/alsa/alsa-mixer.c:4265
+#: ../src/modules/alsa/alsa-mixer.c:4254
#, c-format
msgid "%s Output"
msgstr "%s výstup"
-#: ../src/modules/alsa/alsa-mixer.c:4273
+#: ../src/modules/alsa/alsa-mixer.c:4262
#, c-format
msgid "%s Input"
msgstr "%s vstup"
@@ -784,7 +789,7 @@ msgid ""
"returned 0 or another value < min_avail."
msgstr ""
-#: ../src/modules/alsa/alsa-util.c:1149 ../src/modules/alsa/alsa-util.c:1224
+#: ../src/modules/alsa/alsa-util.c:1166 ../src/modules/alsa/alsa-util.c:1241
#, c-format
msgid ""
"snd_pcm_avail() returned a value that is exceptionally large: %lu bytes (%lu "
@@ -793,7 +798,7 @@ msgid ""
"to the ALSA developers."
msgstr ""
-#: ../src/modules/alsa/alsa-util.c:1199
+#: ../src/modules/alsa/alsa-util.c:1216
#, c-format
msgid ""
"snd_pcm_delay() returned a value that is exceptionally large: %li bytes (%s"
@@ -802,7 +807,7 @@ msgid ""
"to the ALSA developers."
msgstr ""
-#: ../src/modules/alsa/alsa-util.c:1240
+#: ../src/modules/alsa/alsa-util.c:1257
#, c-format
msgid ""
"snd_pcm_avail_delay() returned strange values: delay %lu is less than avail "
@@ -811,7 +816,7 @@ msgid ""
"to the ALSA developers."
msgstr ""
-#: ../src/modules/alsa/alsa-util.c:1283
+#: ../src/modules/alsa/alsa-util.c:1300
#, c-format
msgid ""
"snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu bytes "
@@ -820,49 +825,49 @@ msgid ""
"to the ALSA developers."
msgstr ""
-#: ../src/modules/bluetooth/module-bluez4-device.c:2092
+#: ../src/modules/bluetooth/module-bluez4-device.c:2089
#: ../src/modules/bluetooth/module-bluez5-device.c:1700
msgid "Headset"
msgstr "Headset"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2097
+#: ../src/modules/bluetooth/module-bluez4-device.c:2094
#: ../src/modules/bluetooth/module-bluez5-device.c:1705
msgid "Handsfree"
msgstr "Handsfree"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2112
+#: ../src/modules/bluetooth/module-bluez4-device.c:2109
#: ../src/modules/bluetooth/module-bluez5-device.c:1723
msgid "Headphone"
msgstr "Slúchadlo"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2117
+#: ../src/modules/bluetooth/module-bluez4-device.c:2114
#: ../src/modules/bluetooth/module-bluez5-device.c:1728
msgid "Portable"
msgstr "Prenosné"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2122
+#: ../src/modules/bluetooth/module-bluez4-device.c:2119
#: ../src/modules/bluetooth/module-bluez5-device.c:1733
msgid "Car"
msgstr "Automobil"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2127
+#: ../src/modules/bluetooth/module-bluez4-device.c:2124
#: ../src/modules/bluetooth/module-bluez5-device.c:1738
msgid "HiFi"
msgstr "HiFi"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2132
+#: ../src/modules/bluetooth/module-bluez4-device.c:2129
#: ../src/modules/bluetooth/module-bluez5-device.c:1743
msgid "Phone"
msgstr "Telefón"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2140
+#: ../src/modules/bluetooth/module-bluez4-device.c:2137
#: ../src/modules/bluetooth/module-bluez5-device.c:1695
#: ../src/modules/bluetooth/module-bluez5-device.c:1711
#: ../src/modules/bluetooth/module-bluez5-device.c:1749
msgid "Bluetooth Output"
msgstr "Výstup cez Bluetooth"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2143
+#: ../src/modules/bluetooth/module-bluez4-device.c:2140
#: ../src/modules/bluetooth/module-bluez5-device.c:1694
#: ../src/modules/bluetooth/module-bluez5-device.c:1716
#: ../src/modules/bluetooth/module-bluez5-device.c:1722
@@ -870,21 +875,21 @@ msgstr "Výstup cez Bluetooth"
msgid "Bluetooth Input"
msgstr "Vstup cez Bluetooth"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2179
+#: ../src/modules/bluetooth/module-bluez4-device.c:2176
msgid "High Fidelity Playback (A2DP)"
-msgstr ""
+msgstr "Hi-Fi prehrávanie (A2DP)"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2190
+#: ../src/modules/bluetooth/module-bluez4-device.c:2187
msgid "High Fidelity Capture (A2DP)"
-msgstr ""
+msgstr "Hi-Fi zaznamenávanie (A2DP)"
-#: ../src/modules/bluetooth/module-bluez4-device.c:2201
+#: ../src/modules/bluetooth/module-bluez4-device.c:2198
msgid "Telephony Duplex (HSP/HFP)"
msgstr ""
-#: ../src/modules/bluetooth/module-bluez4-device.c:2213
+#: ../src/modules/bluetooth/module-bluez4-device.c:2210
msgid "Handsfree Gateway"
-msgstr ""
+msgstr "Brána pre handsfree"
#: ../src/modules/bluetooth/module-bluez5-device.c:1786
msgid "High Fidelity Playback (A2DP Sink)"
@@ -900,7 +905,7 @@ msgstr ""
#: ../src/modules/bluetooth/module-bluez5-device.c:1820
msgid "Headset Audio Gateway (HSP/HFP)"
-msgstr ""
+msgstr "Brána zvuku pre handsfree (HSP/HFP)"
#: ../src/modules/echo-cancel/module-echo-cancel.c:61
msgid ""
@@ -912,22 +917,24 @@ msgid ""
"rate> channels=<number of channels> channel_map=<channel map> "
"aec_method=<implementation to use> aec_args=<parameters for the AEC engine> "
"save_aec=<save AEC data in /tmp> autoloaded=<set if this module is being "
-"loaded automatically> use_volume_sharing=<yes or no> "
+"loaded automatically> use_volume_sharing=<yes or no> use_master_format=<yes "
+"or no> "
msgstr ""
#. add on profile
-#: ../src/modules/macosx/module-coreaudio-device.c:755
+#: ../src/modules/macosx/module-coreaudio-device.c:811
msgid "On"
msgstr "Zapnutý"
+#: ../src/modules/module-allow-passthrough.c:73
+#: ../src/modules/module-always-sink.c:82
+msgid "Dummy Output"
+msgstr "Fiktívny výstup"
+
#: ../src/modules/module-always-sink.c:36
msgid "Always keeps at least one sink loaded even if it's a null one"
msgstr ""
-#: ../src/modules/module-always-sink.c:83
-msgid "Dummy Output"
-msgstr "Fiktívny výstup"
-
#: ../src/modules/module-equalizer-sink.c:70
msgid "General Purpose Equalizer"
msgstr "Univerzálny ekvalizér"
@@ -940,7 +947,7 @@ msgid ""
"this module is being loaded automatically> use_volume_sharing=<yes or no> "
msgstr ""
-#: ../src/modules/module-filter-apply.c:46
+#: ../src/modules/module-filter-apply.c:47
msgid "autoclean=<automatically unload unused filters?>"
msgstr ""
@@ -963,7 +970,7 @@ msgstr ""
msgid "Clocked NULL sink"
msgstr ""
-#: ../src/modules/module-null-sink.c:278
+#: ../src/modules/module-null-sink.c:280
msgid "Null Output"
msgstr "Prázdny výstup"
@@ -981,7 +988,7 @@ msgstr "Vstupné zariadenia"
#: ../src/modules/module-rygel-media-server.c:1063
msgid "Audio on @HOSTNAME@"
-msgstr "Audio na @HOSTNAME@"
+msgstr "Zvuk na @HOSTNAME@"
#. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis at lazus'
#. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis at lazus'
@@ -1014,7 +1021,7 @@ msgstr ""
msgid "PulseAudio Sound Server"
msgstr "Zvukový server PulseAudio"
-#: ../src/pulse/channelmap.c:103 ../src/pulse/channelmap.c:758
+#: ../src/pulse/channelmap.c:103 ../src/pulse/channelmap.c:771
msgid "Mono"
msgstr "Mono"
@@ -1226,27 +1233,27 @@ msgstr "Horný zadný pravý"
msgid "(invalid)"
msgstr "(neplatné)"
-#: ../src/pulse/channelmap.c:762
+#: ../src/pulse/channelmap.c:775
msgid "Stereo"
msgstr "Stereo"
-#: ../src/pulse/channelmap.c:767
+#: ../src/pulse/channelmap.c:780
msgid "Surround 4.0"
msgstr "Priestorový 4.0"
-#: ../src/pulse/channelmap.c:773
+#: ../src/pulse/channelmap.c:786
msgid "Surround 4.1"
msgstr "Priestorový 4.1"
-#: ../src/pulse/channelmap.c:779
+#: ../src/pulse/channelmap.c:792
msgid "Surround 5.0"
msgstr "Priestorový 5.0"
-#: ../src/pulse/channelmap.c:785
+#: ../src/pulse/channelmap.c:798
msgid "Surround 5.1"
msgstr "Priestorový 5.1"
-#: ../src/pulse/channelmap.c:792
+#: ../src/pulse/channelmap.c:805
msgid "Surround 7.1"
msgstr "Priestorový 7.1"
@@ -1262,20 +1269,20 @@ msgstr ""
msgid "Failed to parse cookie data"
msgstr ""
-#: ../src/pulse/context.c:656
+#: ../src/pulse/context.c:702
#, c-format
msgid "fork(): %s"
msgstr ""
-#: ../src/pulse/context.c:711
+#: ../src/pulse/context.c:757
#, c-format
msgid "waitpid(): %s"
msgstr ""
-#: ../src/pulse/context.c:1417
+#: ../src/pulse/context.c:1463
#, c-format
msgid "Received message for unknown extension '%s'"
-msgstr ""
+msgstr "Prijatá správa pre neznáme rozšírenie „%s“"
#: ../src/pulse/direction.c:37
msgid "input"
@@ -1293,7 +1300,7 @@ msgstr "obojsmerný"
msgid "invalid"
msgstr "neplatný"
-#: ../src/pulsecore/core-util.c:1833
+#: ../src/pulsecore/core-util.c:1836
#, c-format
msgid ""
"XDG_RUNTIME_DIR (%s) is not owned by us (uid %d), but by uid %d! (This could "
@@ -1313,26 +1320,26 @@ msgstr "nie"
msgid "Cannot access autospawn lock."
msgstr ""
-#: ../src/pulsecore/log.c:153
+#: ../src/pulsecore/log.c:165
#, c-format
msgid "Failed to open target file '%s'."
-msgstr ""
+msgstr "Zlyhalo otvorenie cieľového súboru „%s“."
-#: ../src/pulsecore/log.c:176
+#: ../src/pulsecore/log.c:188
#, c-format
msgid ""
"Tried to open target file '%s', '%s.1', '%s.2' ... '%s.%d', but all failed."
msgstr ""
-#: ../src/pulsecore/log.c:631
+#: ../src/pulsecore/log.c:651
msgid "Invalid log target."
msgstr "Neplatný cieľ záznamu."
-#: ../src/pulsecore/sink.c:3436
+#: ../src/pulsecore/sink.c:3459
msgid "Built-in Audio"
-msgstr "Vstavané audio"
+msgstr "Vstavaný zvuk"
-#: ../src/pulsecore/sink.c:3441
+#: ../src/pulsecore/sink.c:3464
msgid "Modem"
msgstr "Modem"
@@ -1354,15 +1361,15 @@ msgstr "Neplatný parameter"
#: ../src/pulse/error.c:42
msgid "Entity exists"
-msgstr ""
+msgstr "Entita existuje"
#: ../src/pulse/error.c:43
msgid "No such entity"
-msgstr ""
+msgstr "Entita neexistuje"
#: ../src/pulse/error.c:44
msgid "Connection refused"
-msgstr ""
+msgstr "Pripojenie odmietnuté"
#: ../src/pulse/error.c:45
msgid "Protocol error"
@@ -1386,7 +1393,7 @@ msgstr "Pripojenie prerušené"
#: ../src/pulse/error.c:50
msgid "Entity killed"
-msgstr ""
+msgstr "Entita zabitá"
#: ../src/pulse/error.c:51
msgid "Invalid server"
@@ -1469,41 +1476,6 @@ msgstr "%0.1f KiB"
msgid "%u B"
msgstr "%u B"
-#: ../src/tests/resampler-test.c:255
-#, c-format
-msgid ""
-"%s [options]\n"
-"\n"
-"-h, --help Show this help\n"
-"-v, --verbose Print debug messages\n"
-" --from-rate=SAMPLERATE From sample rate in Hz (defaults to "
-"44100)\n"
-" --from-format=SAMPLEFORMAT From sample type (defaults to s16le)\n"
-" --from-channels=CHANNELS From number of channels (defaults to "
-"1)\n"
-" --to-rate=SAMPLERATE To sample rate in Hz (defaults to "
-"44100)\n"
-" --to-format=SAMPLEFORMAT To sample type (defaults to s16le)\n"
-" --to-channels=CHANNELS To number of channels (defaults to 1)\n"
-" --resample-method=METHOD Resample method (defaults to auto)\n"
-" --seconds=SECONDS From stream duration (defaults to 60)\n"
-"\n"
-"If the formats are not specified, the test performs all formats "
-"combinations,\n"
-"back and forth.\n"
-"\n"
-"Sample type must be one of s16le, s16be, u8, float32le, float32be, ulaw, "
-"alaw,\n"
-"s24le, s24be, s24-32le, s24-32be, s32le, s32be (defaults to s16ne)\n"
-"\n"
-"See --dump-resample-methods for possible values of resample methods.\n"
-msgstr ""
-
-#: ../src/tests/resampler-test.c:353
-#, c-format
-msgid "%s %s\n"
-msgstr "%s %s\n"
-
#: ../src/utils/pacat.c:117
#, c-format
msgid "Failed to drain stream: %s"
@@ -1584,17 +1556,17 @@ msgstr ""
#: ../src/utils/pacat.c:388
#, c-format
msgid "Stream underrun.%s"
-msgstr ""
+msgstr "Podtečenie prúdu.%s"
#: ../src/utils/pacat.c:395
#, c-format
msgid "Stream overrun.%s"
-msgstr ""
+msgstr "Pretečenie prúdu.%s"
#: ../src/utils/pacat.c:402
#, c-format
msgid "Stream started.%s"
-msgstr ""
+msgstr "Spustenie prúdu.%s"
#: ../src/utils/pacat.c:409
#, c-format
@@ -1625,7 +1597,7 @@ msgstr ""
#: ../src/utils/pacat.c:466
#, c-format
msgid "Connection established.%s"
-msgstr ""
+msgstr "Spojenie nadviazané.%s"
#: ../src/utils/pacat.c:469
#, c-format
@@ -1840,7 +1812,7 @@ msgstr "Zlyhalo generovanie špecifikácie vzoriek pre súbor."
#: ../src/utils/pacat.c:1065
msgid "Failed to open audio file."
-msgstr "Zlyhalo otvorenie audio súboru."
+msgstr "Zlyhalo otvorenie zvukového súboru."
#: ../src/utils/pacat.c:1071
msgid ""
@@ -2455,11 +2427,11 @@ msgstr "Neplatná špecifikácia hlasitosti"
#: ../src/utils/pactl.c:1508
msgid "Volume outside permissible range.\n"
-msgstr ""
+msgstr "Hlasitosť mimo povoleného rozsahu.\n"
#: ../src/utils/pactl.c:1521
msgid "Invalid number of volume specifications.\n"
-msgstr ""
+msgstr "Neplatný počet špecifikácií hlasitosti.\n"
#: ../src/utils/pactl.c:1533
msgid "Inconsistent volume specification.\n"
@@ -2693,7 +2665,7 @@ msgstr "Musíte určiť názov/číslo karty, názov portu a posunutie oneskoren
#: ../src/utils/pactl.c:2045
msgid "Could not parse latency offset"
-msgstr ""
+msgstr "Nepodarilo sa analyzovať posun oneskorenia"
#: ../src/utils/pactl.c:2057
msgid "No valid command specified."
@@ -2732,12 +2704,12 @@ msgstr "Zlyhanie pripojenia: %s\n"
#: ../src/utils/pasuspender.c:201
#, c-format
msgid "Got SIGINT, exiting.\n"
-msgstr ""
+msgstr "Získaný signál SIGINT, ukončuje sa.\n"
#: ../src/utils/pasuspender.c:219
#, c-format
msgid "WARNING: Child process terminated by signal %u\n"
-msgstr ""
+msgstr "UPOZORNENIE: Podradený proces bol ukončený signálom %u\n"
#: ../src/utils/pasuspender.c:228
#, c-format
@@ -2841,3 +2813,6 @@ msgstr "Zlyhalo načítanie údajov súboru cookie\n"
#, c-format
msgid "Not yet implemented.\n"
msgstr "Zatiaľ nie je implementované.\n"
+
+#~ msgid "%s %s\n"
+#~ msgstr "%s %s\n"
diff --git a/src/.gitignore b/src/.gitignore
index 8a5dfb0..f7ec1bc 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -35,6 +35,7 @@ asyncq-test
channelmap-test
close-test
connect-stress
+core-util-test
cpulimit-test
cpulimit-test2
cpu-sconv-test
@@ -49,6 +50,7 @@ gtk-test
hook-list-test
interpol-test
ipacl-test
+json-test
lfe-filter-test
lock-autospawn-test
lo-latency-test
diff --git a/src/Makefile.am b/src/Makefile.am
index b600dfb..498a386 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -91,6 +91,7 @@ MODULE_LIBADD = $(AM_LIBADD) libpulsecore- at PA_MAJORMINOR@.la libpulsecommon- at PA_
EXTRA_DIST = \
pulse/client.conf.in \
pulse/version.h.in \
+ pulsecore/filter/LICENSE.WEBKIT \
daemon/daemon.conf.in \
daemon/default.pa.in \
daemon/system.pa.in \
@@ -240,6 +241,7 @@ endif
noinst_LTLIBRARIES =
TESTS_default = \
+ core-util-test \
mainloop-test \
strlist-test \
close-test \
@@ -248,6 +250,7 @@ TESTS_default = \
thread-mainloop-test \
utf8-test \
format-test \
+ json-test \
get-binary-name-test \
hook-list-test \
memblock-test \
@@ -355,6 +358,11 @@ check-daemon:
endif
+core_util_test_SOURCES = tests/core-util-test.c
+core_util_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
+core_util_test_LDADD = $(AM_LDADD) libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
+core_util_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
+
mainloop_test_SOURCES = tests/mainloop-test.c
mainloop_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
mainloop_test_LDADD = $(AM_LDADD) libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
@@ -375,6 +383,11 @@ format_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
format_test_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINOR@.la libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
format_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
+json_test_SOURCES = tests/json-test.c
+json_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
+json_test_LDADD = $(AM_LDADD) libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
+json_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
+
srbchannel_test_SOURCES = tests/srbchannel-test.c
srbchannel_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
srbchannel_test_LDADD = $(AM_LDADD) libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
@@ -646,6 +659,7 @@ libpulsecommon_ at PA_MAJORMINOR@_la_SOURCES = \
pulse/client-conf.c pulse/client-conf.h \
pulse/fork-detect.c pulse/fork-detect.h \
pulse/format.c pulse/format.h \
+ pulse/json.c pulse/json.h \
pulse/xmalloc.c pulse/xmalloc.h \
pulse/proplist.c pulse/proplist.h \
pulse/utf8.c pulse/utf8.h \
@@ -726,9 +740,9 @@ else
libpulsecommon_ at PA_MAJORMINOR@_la_SOURCES += pulsecore/poll-posix.c pulsecore/poll.h
endif
-libpulsecommon_ at PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(LIBJSON_CFLAGS) $(LIBSNDFILE_CFLAGS)
+libpulsecommon_ at PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
libpulsecommon_ at PA_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) $(AM_LIBLDFLAGS) -avoid-version
-libpulsecommon_ at PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBJSON_LIBS) $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBSNDFILE_LIBS)
+libpulsecommon_ at PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBSNDFILE_LIBS)
if HAVE_MEMFD
libpulsecommon_ at PA_MAJORMINOR@_la_SOURCES += \
@@ -880,8 +894,8 @@ libpulse_la_SOURCES = \
pulse/volume.c pulse/volume.h \
pulse/xmalloc.c pulse/xmalloc.h
-libpulse_la_CFLAGS = $(AM_CFLAGS) $(LIBJSON_CFLAGS)
-libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBJSON_LIBS) libpulsecommon- at PA_MAJORMINOR@.la
+libpulse_la_CFLAGS = $(AM_CFLAGS)
+libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV) libpulsecommon- at PA_MAJORMINOR@.la
libpulse_la_LDFLAGS = $(AM_LDFLAGS) $(AM_LIBLDFLAGS) $(VERSIONING_LDFLAGS) -version-info $(LIBPULSE_VERSION_INFO)
if HAVE_DBUS
@@ -1205,7 +1219,8 @@ modlibexec_LTLIBRARIES += \
module-switch-on-port-available.la \
module-filter-apply.la \
module-filter-heuristics.la \
- module-role-ducking.la
+ module-role-ducking.la \
+ module-allow-passthrough.la
if HAVE_ESOUND
modlibexec_LTLIBRARIES += \
@@ -1359,12 +1374,6 @@ modlibexec_LTLIBRARIES += \
module-lirc.la
endif
-if HAVE_XEN
-modlibexec_LTLIBRARIES += \
- module-xenpv-sink.la
-endif
-
-
if HAVE_EVDEV
modlibexec_LTLIBRARIES += \
module-mmkbd-evdev.la
@@ -1489,7 +1498,6 @@ SYMDEF_FILES = \
module-zeroconf-discover-symdef.h \
module-bonjour-publish-symdef.h \
module-lirc-symdef.h \
- module-xenpv-sink-symdef.h \
module-mmkbd-evdev-symdef.h \
module-http-protocol-tcp-symdef.h \
module-http-protocol-unix-symdef.h \
@@ -1548,7 +1556,8 @@ SYMDEF_FILES = \
module-switch-on-connect-symdef.h \
module-switch-on-port-available-symdef.h \
module-filter-apply-symdef.h \
- module-filter-heuristics-symdef.h
+ module-filter-heuristics-symdef.h \
+ module-allow-passthrough-symdef.h
if HAVE_ESOUND
SYMDEF_FILES += \
@@ -1884,8 +1893,8 @@ module_solaris_la_LIBADD = $(MODULE_LIBADD)
module_zeroconf_publish_la_SOURCES = modules/module-zeroconf-publish.c
module_zeroconf_publish_la_LDFLAGS = $(MODULE_LDFLAGS)
-module_zeroconf_publish_la_LIBADD = $(MODULE_LIBADD) $(AVAHI_LIBS) libavahi-wrap.la libprotocol-native.la
-module_zeroconf_publish_la_CFLAGS = $(AM_CFLAGS) $(AVAHI_CFLAGS)
+module_zeroconf_publish_la_LIBADD = $(MODULE_LIBADD) $(AVAHI_LIBS) $(DBUS_LIBS) libavahi-wrap.la libprotocol-native.la
+module_zeroconf_publish_la_CFLAGS = $(AM_CFLAGS) $(AVAHI_CFLAGS) $(DBUS_CFLAGS)
module_zeroconf_discover_la_SOURCES = modules/module-zeroconf-discover.c
module_zeroconf_discover_la_LDFLAGS = $(MODULE_LDFLAGS)
@@ -1907,14 +1916,6 @@ module_lirc_la_LIBADD = $(MODULE_LIBADD) $(LIRC_LIBS)
module_lirc_la_CFLAGS = $(AM_CFLAGS) $(LIRC_CFLAGS)
-# Xen PV driver
-
-module_xenpv_sink_la_SOURCES = modules/xen/module-xenpv-sink.c modules/xen/gntalloc.h modules/xen/gntdev.h
-module_xenpv_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
-module_xenpv_sink_la_LIBADD = $(MODULE_LIBADD) $(XEN_LIBS)
-module_xenpv_sink_la_CFLAGS = $(AM_CFLAGS) $(XEN_CFLAGS) -I$(top_srcdir)/src/modules/xen
-
-
# Linux evdev
module_mmkbd_evdev_la_SOURCES = modules/module-mmkbd-evdev.c
@@ -2207,6 +2208,12 @@ module_rygel_media_server_la_LDFLAGS = $(MODULE_LDFLAGS)
module_rygel_media_server_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) libprotocol-http.la
module_rygel_media_server_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
+# Allow passthrough module
+module_allow_passthrough_la_SOURCES = modules/module-allow-passthrough.c
+module_allow_passthrough_la_LDFLAGS = $(MODULE_LDFLAGS)
+module_allow_passthrough_la_LIBADD = $(MODULE_LIBADD)
+module_allow_passthrough_la_CFLAGS = $(AM_CFLAGS)
+
###################################
# Some minor stuff #
###################################
diff --git a/src/Makefile.in b/src/Makefile.in
index 25c8668..4a58866 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -361,51 +361,48 @@ pulselibexec_PROGRAMS = $(am__EXEEXT_15)
@HAVE_LIRC_TRUE at am__append_99 = \
@HAVE_LIRC_TRUE@ module-lirc.la
- at HAVE_XEN_TRUE@am__append_100 = \
- at HAVE_XEN_TRUE@ module-xenpv-sink.la
-
- at HAVE_EVDEV_TRUE@am__append_101 = \
+ at HAVE_EVDEV_TRUE@am__append_100 = \
@HAVE_EVDEV_TRUE@ module-mmkbd-evdev.la
- at HAVE_JACK_TRUE@am__append_102 = \
+ at HAVE_JACK_TRUE@am__append_101 = \
@HAVE_JACK_TRUE@ module-jack-sink.la \
@HAVE_JACK_TRUE@ module-jack-source.la
- at HAVE_DBUS_TRUE@@HAVE_JACK_TRUE at am__append_103 = \
+ at HAVE_DBUS_TRUE@@HAVE_JACK_TRUE at am__append_102 = \
@HAVE_DBUS_TRUE@@HAVE_JACK_TRUE@ module-jackdbus-detect.la
- at HAVE_GCONF_TRUE@am__append_104 = \
+ at HAVE_GCONF_TRUE@am__append_103 = \
@HAVE_GCONF_TRUE@ module-gconf.la
- at HAVE_GCONF_TRUE@am__append_105 = \
+ at HAVE_GCONF_TRUE@am__append_104 = \
@HAVE_GCONF_TRUE@ gconf-helper
- at HAVE_WAVEOUT_TRUE@am__append_106 = \
+ at HAVE_WAVEOUT_TRUE@am__append_105 = \
@HAVE_WAVEOUT_TRUE@ module-waveout.la
- at HAVE_HAL_COMPAT_TRUE@am__append_107 = \
+ at HAVE_HAL_COMPAT_TRUE@am__append_106 = \
@HAVE_HAL_COMPAT_TRUE@ module-hal-detect.la
- at HAVE_UDEV_TRUE@am__append_108 = \
+ at HAVE_UDEV_TRUE@am__append_107 = \
@HAVE_UDEV_TRUE@ module-udev-detect.la
- at HAVE_SYSTEMD_LOGIN_TRUE@am__append_109 = \
+ at HAVE_SYSTEMD_LOGIN_TRUE@am__append_108 = \
@HAVE_SYSTEMD_LOGIN_TRUE@ module-systemd-login.la
- at HAVE_DBUS_TRUE@am__append_110 = \
+ at HAVE_DBUS_TRUE@am__append_109 = \
@HAVE_DBUS_TRUE@ module-rygel-media-server.la \
@HAVE_DBUS_TRUE@ module-dbus-protocol.la
- at HAVE_BLUEZ_TRUE@am__append_111 = \
+ at HAVE_BLUEZ_TRUE@am__append_110 = \
@HAVE_BLUEZ_TRUE@ module-bluetooth-discover.la \
@HAVE_BLUEZ_TRUE@ module-bluetooth-policy.la
- at HAVE_BLUEZ_4_TRUE@am__append_112 = \
+ at HAVE_BLUEZ_4_TRUE@am__append_111 = \
@HAVE_BLUEZ_4_TRUE@ libbluez4-util.la \
@HAVE_BLUEZ_4_TRUE@ module-bluez4-discover.la \
@HAVE_BLUEZ_4_TRUE@ module-bluez4-device.la
- at HAVE_BLUEZ_5_TRUE@am__append_113 = \
+ at HAVE_BLUEZ_5_TRUE@am__append_112 = \
@HAVE_BLUEZ_5_TRUE@ libbluez5-util.la \
@HAVE_BLUEZ_5_TRUE@ module-bluez5-discover.la \
@HAVE_BLUEZ_5_TRUE@ module-bluez5-device.la
@@ -413,53 +410,53 @@ pulselibexec_PROGRAMS = $(am__EXEEXT_15)
# RAOP depends on RTP, and we don't support RTP on Windows, see comment at
# librtp.la above.
- at HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE at am__append_114 = \
+ at HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE at am__append_113 = \
@HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE@ libraop.la \
@HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE@ module-raop-sink.la
- at HAVE_AVAHI_TRUE@@HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE at am__append_115 = \
+ at HAVE_AVAHI_TRUE@@HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE at am__append_114 = \
@HAVE_AVAHI_TRUE@@HAVE_OPENSSL_TRUE@@OS_IS_WIN32_FALSE@ module-raop-discover.la
- at HAVE_DBUS_TRUE@@HAVE_FFTW_TRUE at am__append_116 = \
+ at HAVE_DBUS_TRUE@@HAVE_FFTW_TRUE at am__append_115 = \
@HAVE_DBUS_TRUE@@HAVE_FFTW_TRUE@ module-equalizer-sink.la
- at HAVE_DBUS_TRUE@@HAVE_FFTW_TRUE at am__append_117 = utils/qpaeq
- at HAVE_ESOUND_TRUE@am__append_118 = \
+ at HAVE_DBUS_TRUE@@HAVE_FFTW_TRUE at am__append_116 = utils/qpaeq
+ at HAVE_ESOUND_TRUE@am__append_117 = \
@HAVE_ESOUND_TRUE@ module-esound-protocol-tcp-symdef.h \
@HAVE_ESOUND_TRUE@ module-esound-protocol-unix-symdef.h \
@HAVE_ESOUND_TRUE@ module-esound-compat-spawnfd-symdef.h \
@HAVE_ESOUND_TRUE@ module-esound-compat-spawnpid-symdef.h \
@HAVE_ESOUND_TRUE@ module-esound-sink-symdef.h
- at HAVE_DBUS_TRUE@am__append_119 = $(DBUS_CFLAGS)
- at HAVE_DBUS_TRUE@am__append_120 = $(DBUS_LIBS)
- at HAVE_UDEV_TRUE@am__append_121 = modules/udev-util.h modules/udev-util.c
- at HAVE_UDEV_TRUE@am__append_122 = $(UDEV_LIBS)
- at HAVE_UDEV_TRUE@am__append_123 = $(UDEV_CFLAGS)
- at HAVE_DBUS_TRUE@am__append_124 = modules/reserve.h modules/reserve.c modules/reserve-monitor.h modules/reserve-monitor.c
- at HAVE_DBUS_TRUE@am__append_125 = $(DBUS_LIBS)
- at HAVE_DBUS_TRUE@am__append_126 = $(DBUS_CFLAGS)
- at HAVE_DBUS_TRUE@am__append_127 = $(DBUS_LIBS)
- at HAVE_DBUS_TRUE@am__append_128 = $(DBUS_CFLAGS)
- at HAVE_DBUS_TRUE@am__append_129 = $(DBUS_LIBS)
- at HAVE_DBUS_TRUE@am__append_130 = $(DBUS_CFLAGS)
- at HAVE_ADRIAN_EC_TRUE@am__append_131 = \
+ at HAVE_DBUS_TRUE@am__append_118 = $(DBUS_CFLAGS)
+ at HAVE_DBUS_TRUE@am__append_119 = $(DBUS_LIBS)
+ at HAVE_UDEV_TRUE@am__append_120 = modules/udev-util.h modules/udev-util.c
+ at HAVE_UDEV_TRUE@am__append_121 = $(UDEV_LIBS)
+ at HAVE_UDEV_TRUE@am__append_122 = $(UDEV_CFLAGS)
+ at HAVE_DBUS_TRUE@am__append_123 = modules/reserve.h modules/reserve.c modules/reserve-monitor.h modules/reserve-monitor.c
+ at HAVE_DBUS_TRUE@am__append_124 = $(DBUS_LIBS)
+ at HAVE_DBUS_TRUE@am__append_125 = $(DBUS_CFLAGS)
+ at HAVE_DBUS_TRUE@am__append_126 = $(DBUS_LIBS)
+ at HAVE_DBUS_TRUE@am__append_127 = $(DBUS_CFLAGS)
+ at HAVE_DBUS_TRUE@am__append_128 = $(DBUS_LIBS)
+ at HAVE_DBUS_TRUE@am__append_129 = $(DBUS_CFLAGS)
+ at HAVE_ADRIAN_EC_TRUE@am__append_130 = \
@HAVE_ADRIAN_EC_TRUE@ modules/echo-cancel/adrian-aec.c modules/echo-cancel/adrian-aec.h \
@HAVE_ADRIAN_EC_TRUE@ modules/echo-cancel/adrian.c modules/echo-cancel/adrian.h
- at HAVE_ADRIAN_EC_TRUE@am__append_132 = -DHAVE_ADRIAN_EC=1
- at HAVE_ADRIAN_EC_TRUE@am__append_133 = modules/echo-cancel/adrian-aec
- at HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE at am__append_134 = $(ORC_LIBS)
- at HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE at am__append_135 = $(ORC_CFLAGS) -I$(top_builddir)/src/modules/echo-cancel
- at HAVE_SPEEX_TRUE@am__append_136 = modules/echo-cancel/speex.c
- at HAVE_SPEEX_TRUE@am__append_137 = $(LIBSPEEX_CFLAGS)
- at HAVE_SPEEX_TRUE@am__append_138 = $(LIBSPEEX_LIBS)
- at HAVE_WEBRTC_TRUE@am__append_139 = -DHAVE_WEBRTC=1
- at HAVE_WEBRTC_TRUE@am__append_140 = libwebrtc-util.la
- at HAVE_BLUEZ_5_OFONO_HEADSET_TRUE@am__append_141 = \
+ at HAVE_ADRIAN_EC_TRUE@am__append_131 = -DHAVE_ADRIAN_EC=1
+ at HAVE_ADRIAN_EC_TRUE@am__append_132 = modules/echo-cancel/adrian-aec
+ at HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE at am__append_133 = $(ORC_LIBS)
+ at HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE at am__append_134 = $(ORC_CFLAGS) -I$(top_builddir)/src/modules/echo-cancel
+ at HAVE_SPEEX_TRUE@am__append_135 = modules/echo-cancel/speex.c
+ at HAVE_SPEEX_TRUE@am__append_136 = $(LIBSPEEX_CFLAGS)
+ at HAVE_SPEEX_TRUE@am__append_137 = $(LIBSPEEX_LIBS)
+ at HAVE_WEBRTC_TRUE@am__append_138 = -DHAVE_WEBRTC=1
+ at HAVE_WEBRTC_TRUE@am__append_139 = libwebrtc-util.la
+ at HAVE_BLUEZ_5_OFONO_HEADSET_TRUE@am__append_140 = \
@HAVE_BLUEZ_5_OFONO_HEADSET_TRUE@ modules/bluetooth/backend-ofono.c
- at HAVE_BLUEZ_5_NATIVE_HEADSET_TRUE@am__append_142 = \
+ at HAVE_BLUEZ_5_NATIVE_HEADSET_TRUE@am__append_141 = \
@HAVE_BLUEZ_5_NATIVE_HEADSET_TRUE@ modules/bluetooth/backend-native.c
subdir = src
@@ -712,8 +709,8 @@ libpulse_simple_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(libpulse_simple_la_CFLAGS) $(CFLAGS) \
$(libpulse_simple_la_LDFLAGS) $(LDFLAGS) -o $@
libpulse_la_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- libpulsecommon- at PA_MAJORMINOR@.la $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_1) libpulsecommon- at PA_MAJORMINOR@.la \
+ $(am__DEPENDENCIES_5)
am_libpulse_la_OBJECTS = pulse/libpulse_la-channelmap.lo \
pulse/libpulse_la-context.lo pulse/libpulse_la-direction.lo \
pulse/libpulse_la-error.lo \
@@ -739,12 +736,12 @@ libpulse_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
libpulsecommon_ at PA_MAJORMINOR@_la_DEPENDENCIES = \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_5)
am__libpulsecommon_ at PA_MAJORMINOR@_la_SOURCES_DIST = \
pulse/client-conf.c pulse/client-conf.h pulse/fork-detect.c \
- pulse/fork-detect.h pulse/format.c pulse/format.h \
- pulse/xmalloc.c pulse/xmalloc.h pulse/proplist.c \
+ pulse/fork-detect.h pulse/format.c pulse/format.h pulse/json.c \
+ pulse/json.h pulse/xmalloc.c pulse/xmalloc.h pulse/proplist.c \
pulse/proplist.h pulse/utf8.c pulse/utf8.h pulse/channelmap.c \
pulse/channelmap.h pulse/sample.c pulse/sample.h pulse/util.c \
pulse/util.h pulse/timeval.c pulse/timeval.h pulse/rtclock.c \
@@ -828,6 +825,7 @@ am_libpulsecommon_ at PA_MAJORMINOR@_la_OBJECTS = \
pulse/libpulsecommon_ at PA_MAJORMINOR@_la-client-conf.lo \
pulse/libpulsecommon_ at PA_MAJORMINOR@_la-fork-detect.lo \
pulse/libpulsecommon_ at PA_MAJORMINOR@_la-format.lo \
+ pulse/libpulsecommon_ at PA_MAJORMINOR@_la-json.lo \
pulse/libpulsecommon_ at PA_MAJORMINOR@_la-xmalloc.lo \
pulse/libpulsecommon_ at PA_MAJORMINOR@_la-proplist.lo \
pulse/libpulsecommon_ at PA_MAJORMINOR@_la-utf8.lo \
@@ -1120,6 +1118,14 @@ libwebrtc_util_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
$(libwebrtc_util_la_CXXFLAGS) $(CXXFLAGS) \
$(libwebrtc_util_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_WEBRTC_TRUE at am_libwebrtc_util_la_rpath = -rpath $(modlibexecdir)
+module_allow_passthrough_la_DEPENDENCIES = $(am__DEPENDENCIES_3)
+am_module_allow_passthrough_la_OBJECTS = modules/module_allow_passthrough_la-module-allow-passthrough.lo
+module_allow_passthrough_la_OBJECTS = \
+ $(am_module_allow_passthrough_la_OBJECTS)
+module_allow_passthrough_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(module_allow_passthrough_la_CFLAGS) $(CFLAGS) \
+ $(module_allow_passthrough_la_LDFLAGS) $(LDFLAGS) -o $@
module_alsa_card_la_DEPENDENCIES = $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) libalsa-util.la
am_module_alsa_card_la_OBJECTS = \
@@ -1388,7 +1394,7 @@ module_device_restore_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@ $(am__DEPENDENCIES_1)
module_echo_cancel_la_DEPENDENCIES = $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_13) $(am__DEPENDENCIES_10) \
- $(am__append_140)
+ $(am__append_139)
am__module_echo_cancel_la_SOURCES_DIST = \
modules/echo-cancel/module-echo-cancel.c \
modules/echo-cancel/null.c modules/echo-cancel/echo-cancel.h \
@@ -2027,16 +2033,6 @@ module_x11_xsmp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(module_x11_xsmp_la_CFLAGS) $(CFLAGS) \
$(module_x11_xsmp_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_X11_TRUE at am_module_x11_xsmp_la_rpath = -rpath $(modlibexecdir)
-module_xenpv_sink_la_DEPENDENCIES = $(am__DEPENDENCIES_3) \
- $(am__DEPENDENCIES_1)
-am_module_xenpv_sink_la_OBJECTS = \
- modules/xen/module_xenpv_sink_la-module-xenpv-sink.lo
-module_xenpv_sink_la_OBJECTS = $(am_module_xenpv_sink_la_OBJECTS)
-module_xenpv_sink_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- $(module_xenpv_sink_la_CFLAGS) $(CFLAGS) \
- $(module_xenpv_sink_la_LDFLAGS) $(LDFLAGS) -o $@
- at HAVE_XEN_TRUE@am_module_xenpv_sink_la_rpath = -rpath $(modlibexecdir)
module_zeroconf_discover_la_DEPENDENCIES = $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) libavahi-wrap.la
am_module_zeroconf_discover_la_OBJECTS = modules/module_zeroconf_discover_la-module-zeroconf-discover.lo
@@ -2049,7 +2045,8 @@ module_zeroconf_discover_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@HAVE_AVAHI_TRUE at am_module_zeroconf_discover_la_rpath = -rpath \
@HAVE_AVAHI_TRUE@ $(modlibexecdir)
module_zeroconf_publish_la_DEPENDENCIES = $(am__DEPENDENCIES_3) \
- $(am__DEPENDENCIES_1) libavahi-wrap.la libprotocol-native.la
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libavahi-wrap.la \
+ libprotocol-native.la
am_module_zeroconf_publish_la_OBJECTS = \
modules/module_zeroconf_publish_la-module-zeroconf-publish.lo
module_zeroconf_publish_la_OBJECTS = \
@@ -2069,10 +2066,11 @@ module_zeroconf_publish_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@OS_IS_DARWIN_FALSE at am__EXEEXT_6 = once-test$(EXEEXT)
@HAVE_GLIB20_TRUE at am__EXEEXT_7 = mainloop-test-glib$(EXEEXT)
@HAVE_ALSA_TRUE at am__EXEEXT_8 = alsa-mixer-path-test$(EXEEXT)
-am__EXEEXT_9 = mainloop-test$(EXEEXT) strlist-test$(EXEEXT) \
- close-test$(EXEEXT) memblockq-test$(EXEEXT) \
- channelmap-test$(EXEEXT) thread-mainloop-test$(EXEEXT) \
- utf8-test$(EXEEXT) format-test$(EXEEXT) \
+am__EXEEXT_9 = core-util-test$(EXEEXT) mainloop-test$(EXEEXT) \
+ strlist-test$(EXEEXT) close-test$(EXEEXT) \
+ memblockq-test$(EXEEXT) channelmap-test$(EXEEXT) \
+ thread-mainloop-test$(EXEEXT) utf8-test$(EXEEXT) \
+ format-test$(EXEEXT) json-test$(EXEEXT) \
get-binary-name-test$(EXEEXT) hook-list-test$(EXEEXT) \
memblock-test$(EXEEXT) asyncq-test$(EXEEXT) \
asyncmsgq-test$(EXEEXT) queue-test$(EXEEXT) \
@@ -2159,6 +2157,15 @@ connect_stress_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(connect_stress_CFLAGS) $(CFLAGS) $(connect_stress_LDFLAGS) \
$(LDFLAGS) -o $@
+am_core_util_test_OBJECTS = \
+ tests/core_util_test-core-util-test.$(OBJEXT)
+core_util_test_OBJECTS = $(am_core_util_test_OBJECTS)
+core_util_test_DEPENDENCIES = $(am__DEPENDENCIES_2) libpulse.la \
+ libpulsecommon- at PA_MAJORMINOR@.la
+core_util_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(core_util_test_CFLAGS) $(CFLAGS) $(core_util_test_LDFLAGS) \
+ $(LDFLAGS) -o $@
am_cpu_mix_test_OBJECTS = tests/cpu_mix_test-cpu-mix-test.$(OBJEXT)
cpu_mix_test_OBJECTS = $(am_cpu_mix_test_OBJECTS)
cpu_mix_test_DEPENDENCIES = $(am__DEPENDENCIES_2) \
@@ -2236,7 +2243,7 @@ nodist_echo_cancel_test_OBJECTS = $(am__objects_28)
echo_cancel_test_OBJECTS = $(am_echo_cancel_test_OBJECTS) \
$(nodist_echo_cancel_test_OBJECTS)
am__DEPENDENCIES_14 = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_13) \
- $(am__DEPENDENCIES_10) $(am__append_140)
+ $(am__DEPENDENCIES_10) $(am__append_139)
echo_cancel_test_DEPENDENCIES = $(am__DEPENDENCIES_14)
echo_cancel_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -2318,6 +2325,13 @@ ipacl_test_DEPENDENCIES = $(am__DEPENDENCIES_2) \
ipacl_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(ipacl_test_CFLAGS) \
$(CFLAGS) $(ipacl_test_LDFLAGS) $(LDFLAGS) -o $@
+am_json_test_OBJECTS = tests/json_test-json-test.$(OBJEXT)
+json_test_OBJECTS = $(am_json_test_OBJECTS)
+json_test_DEPENDENCIES = $(am__DEPENDENCIES_2) libpulse.la \
+ libpulsecommon- at PA_MAJORMINOR@.la
+json_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(json_test_CFLAGS) \
+ $(CFLAGS) $(json_test_LDFLAGS) $(LDFLAGS) -o $@
am_lfe_filter_test_OBJECTS = \
tests/lfe_filter_test-lfe-filter-test.$(OBJEXT)
lfe_filter_test_OBJECTS = $(am_lfe_filter_test_OBJECTS)
@@ -2708,6 +2722,7 @@ SOURCES = $(libalsa_util_la_SOURCES) $(libavahi_wrap_la_SOURCES) \
$(libpulsecore_sconv_neon_la_SOURCES) \
$(libpulsedsp_la_SOURCES) $(libraop_la_SOURCES) \
$(librtp_la_SOURCES) $(libwebrtc_util_la_SOURCES) \
+ $(module_allow_passthrough_la_SOURCES) \
$(module_alsa_card_la_SOURCES) $(module_alsa_sink_la_SOURCES) \
$(module_alsa_source_la_SOURCES) \
$(module_always_sink_la_SOURCES) \
@@ -2788,21 +2803,21 @@ SOURCES = $(libalsa_util_la_SOURCES) $(libavahi_wrap_la_SOURCES) \
$(module_waveout_la_SOURCES) $(module_x11_bell_la_SOURCES) \
$(module_x11_cork_request_la_SOURCES) \
$(module_x11_publish_la_SOURCES) $(module_x11_xsmp_la_SOURCES) \
- $(module_xenpv_sink_la_SOURCES) \
$(module_zeroconf_discover_la_SOURCES) \
$(module_zeroconf_publish_la_SOURCES) \
$(alsa_mixer_path_test_SOURCES) $(alsa_time_test_SOURCES) \
$(asyncmsgq_test_SOURCES) $(asyncq_test_SOURCES) \
$(channelmap_test_SOURCES) $(close_test_SOURCES) \
- $(connect_stress_SOURCES) $(cpu_mix_test_SOURCES) \
- $(cpu_remap_test_SOURCES) $(cpu_sconv_test_SOURCES) \
- $(cpu_volume_test_SOURCES) $(cpulimit_test_SOURCES) \
- $(cpulimit_test2_SOURCES) $(echo_cancel_test_SOURCES) \
- $(nodist_echo_cancel_test_SOURCES) $(extended_test_SOURCES) \
- $(flist_test_SOURCES) $(format_test_SOURCES) \
- $(gconf_helper_SOURCES) $(get_binary_name_test_SOURCES) \
- $(gtk_test_SOURCES) $(hook_list_test_SOURCES) \
- $(interpol_test_SOURCES) $(ipacl_test_SOURCES) \
+ $(connect_stress_SOURCES) $(core_util_test_SOURCES) \
+ $(cpu_mix_test_SOURCES) $(cpu_remap_test_SOURCES) \
+ $(cpu_sconv_test_SOURCES) $(cpu_volume_test_SOURCES) \
+ $(cpulimit_test_SOURCES) $(cpulimit_test2_SOURCES) \
+ $(echo_cancel_test_SOURCES) $(nodist_echo_cancel_test_SOURCES) \
+ $(extended_test_SOURCES) $(flist_test_SOURCES) \
+ $(format_test_SOURCES) $(gconf_helper_SOURCES) \
+ $(get_binary_name_test_SOURCES) $(gtk_test_SOURCES) \
+ $(hook_list_test_SOURCES) $(interpol_test_SOURCES) \
+ $(ipacl_test_SOURCES) $(json_test_SOURCES) \
$(lfe_filter_test_SOURCES) $(lo_latency_test_SOURCES) \
$(lock_autospawn_test_SOURCES) $(mainloop_test_SOURCES) \
$(mainloop_test_glib_SOURCES) $(mcalign_test_SOURCES) \
@@ -2840,6 +2855,7 @@ DIST_SOURCES = $(am__libalsa_util_la_SOURCES_DIST) \
$(am__libpulsecore_sconv_neon_la_SOURCES_DIST) \
$(libpulsedsp_la_SOURCES) $(libraop_la_SOURCES) \
$(librtp_la_SOURCES) $(am__libwebrtc_util_la_SOURCES_DIST) \
+ $(module_allow_passthrough_la_SOURCES) \
$(module_alsa_card_la_SOURCES) $(module_alsa_sink_la_SOURCES) \
$(module_alsa_source_la_SOURCES) \
$(module_always_sink_la_SOURCES) \
@@ -2919,21 +2935,21 @@ DIST_SOURCES = $(am__libalsa_util_la_SOURCES_DIST) \
$(module_waveout_la_SOURCES) $(module_x11_bell_la_SOURCES) \
$(module_x11_cork_request_la_SOURCES) \
$(module_x11_publish_la_SOURCES) $(module_x11_xsmp_la_SOURCES) \
- $(module_xenpv_sink_la_SOURCES) \
$(module_zeroconf_discover_la_SOURCES) \
$(module_zeroconf_publish_la_SOURCES) \
$(alsa_mixer_path_test_SOURCES) $(alsa_time_test_SOURCES) \
$(asyncmsgq_test_SOURCES) $(asyncq_test_SOURCES) \
$(channelmap_test_SOURCES) $(close_test_SOURCES) \
- $(connect_stress_SOURCES) $(cpu_mix_test_SOURCES) \
- $(cpu_remap_test_SOURCES) $(cpu_sconv_test_SOURCES) \
- $(cpu_volume_test_SOURCES) $(cpulimit_test_SOURCES) \
- $(cpulimit_test2_SOURCES) $(am__echo_cancel_test_SOURCES_DIST) \
- $(extended_test_SOURCES) $(flist_test_SOURCES) \
- $(format_test_SOURCES) $(gconf_helper_SOURCES) \
- $(get_binary_name_test_SOURCES) $(gtk_test_SOURCES) \
- $(hook_list_test_SOURCES) $(interpol_test_SOURCES) \
- $(ipacl_test_SOURCES) $(lfe_filter_test_SOURCES) \
+ $(connect_stress_SOURCES) $(core_util_test_SOURCES) \
+ $(cpu_mix_test_SOURCES) $(cpu_remap_test_SOURCES) \
+ $(cpu_sconv_test_SOURCES) $(cpu_volume_test_SOURCES) \
+ $(cpulimit_test_SOURCES) $(cpulimit_test2_SOURCES) \
+ $(am__echo_cancel_test_SOURCES_DIST) $(extended_test_SOURCES) \
+ $(flist_test_SOURCES) $(format_test_SOURCES) \
+ $(gconf_helper_SOURCES) $(get_binary_name_test_SOURCES) \
+ $(gtk_test_SOURCES) $(hook_list_test_SOURCES) \
+ $(interpol_test_SOURCES) $(ipacl_test_SOURCES) \
+ $(json_test_SOURCES) $(lfe_filter_test_SOURCES) \
$(lo_latency_test_SOURCES) $(lock_autospawn_test_SOURCES) \
$(mainloop_test_SOURCES) $(mainloop_test_glib_SOURCES) \
$(mcalign_test_SOURCES) $(memblock_test_SOURCES) \
@@ -3335,8 +3351,6 @@ LIBCHECK_CFLAGS = @LIBCHECK_CFLAGS@
LIBCHECK_LIBS = @LIBCHECK_LIBS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
-LIBJSON_CFLAGS = @LIBJSON_CFLAGS@
-LIBJSON_LIBS = @LIBJSON_LIBS@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBPULSE_MAINLOOP_GLIB_VERSION_INFO = @LIBPULSE_MAINLOOP_GLIB_VERSION_INFO@
@@ -3360,6 +3374,7 @@ LN_S = @LN_S@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
M4 = @M4@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -3446,8 +3461,6 @@ WEBRTC_CFLAGS = @WEBRTC_CFLAGS@
WEBRTC_LIBS = @WEBRTC_LIBS@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
-XEN_CFLAGS = @XEN_CFLAGS@
-XEN_LIBS = @XEN_LIBS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
@@ -3502,6 +3515,7 @@ prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
pulseconfdir = @pulseconfdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -3552,8 +3566,9 @@ MODULE_LIBADD = $(AM_LIBADD) libpulsecore- at PA_MAJORMINOR@.la libpulsecommon- at PA_
# Extra files #
###################################
EXTRA_DIST = pulse/client.conf.in pulse/version.h.in \
- daemon/daemon.conf.in daemon/default.pa.in daemon/system.pa.in \
- depmod.py daemon/esdcompat.in daemon/start-pulseaudio-x11.in \
+ pulsecore/filter/LICENSE.WEBKIT daemon/daemon.conf.in \
+ daemon/default.pa.in daemon/system.pa.in depmod.py \
+ daemon/esdcompat.in daemon/start-pulseaudio-x11.in \
daemon/systemd/user/pulseaudio.service.in \
daemon/systemd/user/pulseaudio.socket utils/padsp.in \
utils/qpaeq modules/module-defs.h.m4 \
@@ -3593,7 +3608,7 @@ CLEANFILES = $(am__append_7) $(am__append_50) \
@HAVE_ORC_TRUE at cp_v_gen = $(cp_v_gen_$(V))
@HAVE_ORC_TRUE at cp_v_gen_ = $(cp_v_gen_$(AM_DEFAULT_VERBOSITY))
@HAVE_ORC_TRUE at cp_v_gen_0 = @echo " CP $@";
-ORC_SOURCE = pulsecore/svolume $(am__append_133)
+ORC_SOURCE = pulsecore/svolume $(am__append_132)
pulseaudio_SOURCES = daemon/caps.c daemon/caps.h daemon/cmdline.c \
daemon/cmdline.h daemon/cpulimit.c daemon/cpulimit.h \
daemon/daemon-conf.c daemon/daemon-conf.h daemon/dumpmodules.c \
@@ -3621,7 +3636,7 @@ pulseaudio_DEPENDENCIES = libpulsecore- at PA_MAJORMINOR@.la libpulsecommon- at PA_MAJ
# Utility programs #
###################################
bin_SCRIPTS = esdcompat $(am__append_16) $(am__append_49) \
- $(am__append_117)
+ $(am__append_116)
pacat_SOURCES = utils/pacat.c
pacat_LDADD = $(AM_LDADD) libpulse.la libpulsecommon- at PA_MAJORMINOR@.la $(LIBSNDFILE_LIBS)
pacat_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
@@ -3654,15 +3669,16 @@ pax11publish_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
# We split the foreign code off to not be annoyed by warnings we don't care about
noinst_LTLIBRARIES = liblo-test-util.la $(am__append_51) \
libpulsecore-foreign.la
-TESTS_default = mainloop-test strlist-test close-test memblockq-test \
- channelmap-test thread-mainloop-test utf8-test format-test \
- get-binary-name-test hook-list-test memblock-test asyncq-test \
- asyncmsgq-test queue-test rtpoll-test resampler-test \
- smoother-test thread-test volume-test mix-test proplist-test \
- cpu-mix-test cpu-remap-test cpu-sconv-test cpu-volume-test \
- lock-autospawn-test mult-s16-test lfe-filter-test \
- $(am__append_17) $(am__append_18) $(am__append_19) \
- $(am__append_21) $(am__append_24)
+TESTS_default = core-util-test mainloop-test strlist-test close-test \
+ memblockq-test channelmap-test thread-mainloop-test utf8-test \
+ format-test json-test get-binary-name-test hook-list-test \
+ memblock-test asyncq-test asyncmsgq-test queue-test \
+ rtpoll-test resampler-test smoother-test thread-test \
+ volume-test mix-test proplist-test cpu-mix-test cpu-remap-test \
+ cpu-sconv-test cpu-volume-test lock-autospawn-test \
+ mult-s16-test lfe-filter-test $(am__append_17) \
+ $(am__append_18) $(am__append_19) $(am__append_21) \
+ $(am__append_24)
TESTS_norun = ipacl-test mcalign-test pacat-simple parec-simple \
flist-test remix-test rtstutter sig2str-test stripnul \
echo-cancel-test lo-latency-test $(am__append_20) \
@@ -3677,6 +3693,10 @@ TESTS_daemon = \
@HAVE_TESTS_FALSE at TESTS_ENVIRONMENT =
@HAVE_TESTS_TRUE at TESTS_ENVIRONMENT = MAKE_CHECK=1
+core_util_test_SOURCES = tests/core-util-test.c
+core_util_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
+core_util_test_LDADD = $(AM_LDADD) libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
+core_util_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
mainloop_test_SOURCES = tests/mainloop-test.c
mainloop_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
mainloop_test_LDADD = $(AM_LDADD) libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
@@ -3693,6 +3713,10 @@ format_test_SOURCES = tests/format-test.c
format_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
format_test_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINOR@.la libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
format_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
+json_test_SOURCES = tests/json-test.c
+json_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
+json_test_LDADD = $(AM_LDADD) libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
+json_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
srbchannel_test_SOURCES = tests/srbchannel-test.c
srbchannel_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
srbchannel_test_LDADD = $(AM_LDADD) libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
@@ -3910,24 +3934,24 @@ commonlib_LTLIBRARIES = \
# code allows us to prevent this circular linking.
libpulsecommon_ at PA_MAJORMINOR@_la_SOURCES = pulse/client-conf.c \
pulse/client-conf.h pulse/fork-detect.c pulse/fork-detect.h \
- pulse/format.c pulse/format.h pulse/xmalloc.c pulse/xmalloc.h \
- pulse/proplist.c pulse/proplist.h pulse/utf8.c pulse/utf8.h \
- pulse/channelmap.c pulse/channelmap.h pulse/sample.c \
- pulse/sample.h pulse/util.c pulse/util.h pulse/timeval.c \
- pulse/timeval.h pulse/rtclock.c pulse/rtclock.h pulse/volume.c \
- pulse/volume.h pulsecore/atomic.h pulsecore/authkey.c \
- pulsecore/authkey.h pulsecore/conf-parser.c \
- pulsecore/conf-parser.h pulsecore/core-error.c \
- pulsecore/core-error.h pulsecore/core-format.c \
- pulsecore/core-format.h pulsecore/core-rtclock.c \
- pulsecore/core-rtclock.h pulsecore/core-util.c \
- pulsecore/core-util.h pulsecore/creds.h pulsecore/dynarray.c \
- pulsecore/dynarray.h pulsecore/endianmacros.h \
- pulsecore/fdsem.c pulsecore/fdsem.h pulsecore/flist.c \
- pulsecore/flist.h pulsecore/g711.c pulsecore/g711.h \
- pulsecore/hashmap.c pulsecore/hashmap.h pulsecore/i18n.c \
- pulsecore/i18n.h pulsecore/idxset.c pulsecore/idxset.h \
- pulsecore/arpa-inet.c pulsecore/arpa-inet.h \
+ pulse/format.c pulse/format.h pulse/json.c pulse/json.h \
+ pulse/xmalloc.c pulse/xmalloc.h pulse/proplist.c \
+ pulse/proplist.h pulse/utf8.c pulse/utf8.h pulse/channelmap.c \
+ pulse/channelmap.h pulse/sample.c pulse/sample.h pulse/util.c \
+ pulse/util.h pulse/timeval.c pulse/timeval.h pulse/rtclock.c \
+ pulse/rtclock.h pulse/volume.c pulse/volume.h \
+ pulsecore/atomic.h pulsecore/authkey.c pulsecore/authkey.h \
+ pulsecore/conf-parser.c pulsecore/conf-parser.h \
+ pulsecore/core-error.c pulsecore/core-error.h \
+ pulsecore/core-format.c pulsecore/core-format.h \
+ pulsecore/core-rtclock.c pulsecore/core-rtclock.h \
+ pulsecore/core-util.c pulsecore/core-util.h pulsecore/creds.h \
+ pulsecore/dynarray.c pulsecore/dynarray.h \
+ pulsecore/endianmacros.h pulsecore/fdsem.c pulsecore/fdsem.h \
+ pulsecore/flist.c pulsecore/flist.h pulsecore/g711.c \
+ pulsecore/g711.h pulsecore/hashmap.c pulsecore/hashmap.h \
+ pulsecore/i18n.c pulsecore/i18n.h pulsecore/idxset.c \
+ pulsecore/idxset.h pulsecore/arpa-inet.c pulsecore/arpa-inet.h \
pulsecore/iochannel.c pulsecore/iochannel.h pulsecore/ioline.c \
pulsecore/ioline.h pulsecore/ipacl.c pulsecore/ipacl.h \
pulsecore/llist.h pulsecore/lock-autospawn.c \
@@ -3969,15 +3993,14 @@ libpulsecommon_ at PA_MAJORMINOR@_la_SOURCES = pulse/client-conf.c \
# proplist-util.h uses these header files, but not the library itself!
libpulsecommon_ at PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) \
- $(LIBJSON_CFLAGS) $(LIBSNDFILE_CFLAGS) $(am__append_29) \
- $(am__append_31) $(am__append_33) $(GLIB20_CFLAGS) \
- $(GTK30_CFLAGS) $(am__append_37) $(am__append_39) \
- $(am__append_43)
+ $(LIBSNDFILE_CFLAGS) $(am__append_29) $(am__append_31) \
+ $(am__append_33) $(GLIB20_CFLAGS) $(GTK30_CFLAGS) \
+ $(am__append_37) $(am__append_39) $(am__append_43)
libpulsecommon_ at PA_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) \
$(AM_LIBLDFLAGS) -avoid-version $(am__append_30) \
$(am__append_32) $(am__append_34)
libpulsecommon_ at PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) \
- $(LIBJSON_LIBS) $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) \
+ $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) \
$(LIBSNDFILE_LIBS) $(am__append_40) $(am__append_44)
###################################
@@ -4029,10 +4052,9 @@ libpulse_la_SOURCES = \
pulse/volume.c pulse/volume.h \
pulse/xmalloc.c pulse/xmalloc.h
-libpulse_la_CFLAGS = $(AM_CFLAGS) $(LIBJSON_CFLAGS) $(am__append_47)
+libpulse_la_CFLAGS = $(AM_CFLAGS) $(am__append_47)
libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV) \
- $(LIBJSON_LIBS) libpulsecommon- at PA_MAJORMINOR@.la \
- $(am__append_48)
+ libpulsecommon- at PA_MAJORMINOR@.la $(am__append_48)
libpulse_la_LDFLAGS = $(AM_LDFLAGS) $(AM_LIBLDFLAGS) $(VERSIONING_LDFLAGS) -version-info $(LIBPULSE_VERSION_INFO)
libpulse_simple_la_SOURCES = pulse/simple.c pulse/simple.h
libpulse_simple_la_CFLAGS = $(AM_CFLAGS)
@@ -4165,17 +4187,17 @@ modlibexec_LTLIBRARIES = libcli.la libprotocol-cli.la \
module-virtual-source.la module-virtual-surround-sink.la \
module-switch-on-connect.la module-switch-on-port-available.la \
module-filter-apply.la module-filter-heuristics.la \
- module-role-ducking.la $(am__append_85) $(am__append_86) \
- $(am__append_87) $(am__append_88) $(am__append_89) \
- $(am__append_90) $(am__append_91) $(am__append_92) \
- $(am__append_93) $(am__append_94) $(am__append_95) \
- $(am__append_96) $(am__append_97) $(am__append_98) \
- $(am__append_99) $(am__append_100) $(am__append_101) \
- $(am__append_102) $(am__append_103) $(am__append_104) \
- $(am__append_106) $(am__append_107) $(am__append_108) \
- $(am__append_109) $(am__append_110) $(am__append_111) \
- $(am__append_112) $(am__append_113) $(am__append_114) \
- $(am__append_115) $(am__append_116)
+ module-role-ducking.la module-allow-passthrough.la \
+ $(am__append_85) $(am__append_86) $(am__append_87) \
+ $(am__append_88) $(am__append_89) $(am__append_90) \
+ $(am__append_91) $(am__append_92) $(am__append_93) \
+ $(am__append_94) $(am__append_95) $(am__append_96) \
+ $(am__append_97) $(am__append_98) $(am__append_99) \
+ $(am__append_100) $(am__append_101) $(am__append_102) \
+ $(am__append_103) $(am__append_105) $(am__append_106) \
+ $(am__append_107) $(am__append_108) $(am__append_109) \
+ $(am__append_110) $(am__append_111) $(am__append_112) \
+ $(am__append_113) $(am__append_114) $(am__append_115)
libprotocol_simple_la_SOURCES = pulsecore/protocol-simple.c pulsecore/protocol-simple.h
libprotocol_simple_la_LDFLAGS = $(AM_LDFLAGS) $(AM_LIBLDFLAGS) -avoid-version
libprotocol_simple_la_LIBADD = $(AM_LIBADD) libpulsecore- at PA_MAJORMINOR@.la libpulsecommon- at PA_MAJORMINOR@.la libpulse.la
@@ -4294,8 +4316,7 @@ SYMDEF_FILES = module-cli-symdef.h module-cli-protocol-tcp-symdef.h \
module-zeroconf-publish-symdef.h \
module-zeroconf-discover-symdef.h \
module-bonjour-publish-symdef.h module-lirc-symdef.h \
- module-xenpv-sink-symdef.h module-mmkbd-evdev-symdef.h \
- module-http-protocol-tcp-symdef.h \
+ module-mmkbd-evdev-symdef.h module-http-protocol-tcp-symdef.h \
module-http-protocol-unix-symdef.h \
module-rygel-media-server-symdef.h module-x11-bell-symdef.h \
module-x11-publish-symdef.h module-x11-xsmp-symdef.h \
@@ -4329,7 +4350,7 @@ SYMDEF_FILES = module-cli-symdef.h module-cli-protocol-tcp-symdef.h \
module-switch-on-connect-symdef.h \
module-switch-on-port-available-symdef.h \
module-filter-apply-symdef.h module-filter-heuristics-symdef.h \
- $(am__append_118)
+ module-allow-passthrough-symdef.h $(am__append_117)
# Simple protocol
module_simple_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c
@@ -4464,10 +4485,10 @@ module_remap_source_la_LDFLAGS = $(MODULE_LDFLAGS)
module_remap_source_la_LIBADD = $(MODULE_LIBADD)
module_ladspa_sink_la_SOURCES = modules/module-ladspa-sink.c modules/ladspa.h
module_ladspa_sink_la_CFLAGS = -DLADSPA_PATH=\"$(libdir)/ladspa:/usr/local/lib/ladspa:/usr/lib/ladspa:/usr/local/lib64/ladspa:/usr/lib64/ladspa\" \
- $(AM_CFLAGS) $(SERVER_CFLAGS) $(am__append_119)
+ $(AM_CFLAGS) $(SERVER_CFLAGS) $(am__append_118)
module_ladspa_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
module_ladspa_sink_la_LIBADD = $(MODULE_LIBADD) $(LIBLTDL) \
- $(am__append_120)
+ $(am__append_119)
module_equalizer_sink_la_SOURCES = modules/module-equalizer-sink.c
module_equalizer_sink_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) $(DBUS_CFLAGS) $(FFTW_CFLAGS)
module_equalizer_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
@@ -4551,12 +4572,12 @@ libalsa_util_la_SOURCES = modules/alsa/alsa-util.c \
modules/alsa/alsa-mixer.h modules/alsa/alsa-sink.c \
modules/alsa/alsa-sink.h modules/alsa/alsa-source.c \
modules/alsa/alsa-source.h modules/reserve-wrap.c \
- modules/reserve-wrap.h $(am__append_121) $(am__append_124)
+ modules/reserve-wrap.h $(am__append_120) $(am__append_123)
libalsa_util_la_LDFLAGS = -avoid-version
libalsa_util_la_LIBADD = $(MODULE_LIBADD) $(ASOUNDLIB_LIBS) \
- $(am__append_122) $(am__append_125)
+ $(am__append_121) $(am__append_124)
libalsa_util_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) \
- $(ASOUNDLIB_CFLAGS) $(am__append_123) $(am__append_126)
+ $(ASOUNDLIB_CFLAGS) $(am__append_122) $(am__append_125)
module_alsa_sink_la_SOURCES = modules/alsa/module-alsa-sink.c
module_alsa_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
module_alsa_sink_la_LIBADD = $(MODULE_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la
@@ -4578,8 +4599,8 @@ module_solaris_la_LIBADD = $(MODULE_LIBADD)
# Avahi
module_zeroconf_publish_la_SOURCES = modules/module-zeroconf-publish.c
module_zeroconf_publish_la_LDFLAGS = $(MODULE_LDFLAGS)
-module_zeroconf_publish_la_LIBADD = $(MODULE_LIBADD) $(AVAHI_LIBS) libavahi-wrap.la libprotocol-native.la
-module_zeroconf_publish_la_CFLAGS = $(AM_CFLAGS) $(AVAHI_CFLAGS)
+module_zeroconf_publish_la_LIBADD = $(MODULE_LIBADD) $(AVAHI_LIBS) $(DBUS_LIBS) libavahi-wrap.la libprotocol-native.la
+module_zeroconf_publish_la_CFLAGS = $(AM_CFLAGS) $(AVAHI_CFLAGS) $(DBUS_CFLAGS)
module_zeroconf_discover_la_SOURCES = modules/module-zeroconf-discover.c
module_zeroconf_discover_la_LDFLAGS = $(MODULE_LDFLAGS)
module_zeroconf_discover_la_LIBADD = $(MODULE_LIBADD) $(AVAHI_LIBS) libavahi-wrap.la
@@ -4598,12 +4619,6 @@ module_lirc_la_LDFLAGS = $(MODULE_LDFLAGS)
module_lirc_la_LIBADD = $(MODULE_LIBADD) $(LIRC_LIBS)
module_lirc_la_CFLAGS = $(AM_CFLAGS) $(LIRC_CFLAGS)
-# Xen PV driver
-module_xenpv_sink_la_SOURCES = modules/xen/module-xenpv-sink.c modules/xen/gntalloc.h modules/xen/gntdev.h
-module_xenpv_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
-module_xenpv_sink_la_LIBADD = $(MODULE_LIBADD) $(XEN_LIBS)
-module_xenpv_sink_la_CFLAGS = $(AM_CFLAGS) $(XEN_CFLAGS) -I$(top_srcdir)/src/modules/xen
-
# Linux evdev
module_mmkbd_evdev_la_SOURCES = modules/module-mmkbd-evdev.c
module_mmkbd_evdev_la_LDFLAGS = $(MODULE_LDFLAGS)
@@ -4667,15 +4682,15 @@ module_device_manager_la_CFLAGS = $(AM_CFLAGS)
module_device_restore_la_SOURCES = modules/module-device-restore.c
module_device_restore_la_LDFLAGS = $(MODULE_LDFLAGS)
module_device_restore_la_LIBADD = $(MODULE_LIBADD) \
- libprotocol-native.la $(am__append_127)
-module_device_restore_la_CFLAGS = $(AM_CFLAGS) $(am__append_128)
+ libprotocol-native.la $(am__append_126)
+module_device_restore_la_CFLAGS = $(AM_CFLAGS) $(am__append_127)
# Stream volume/muted/device restore module
module_stream_restore_la_SOURCES = modules/module-stream-restore.c
module_stream_restore_la_LDFLAGS = $(MODULE_LDFLAGS)
module_stream_restore_la_LIBADD = $(MODULE_LIBADD) \
- libprotocol-native.la $(am__append_129)
-module_stream_restore_la_CFLAGS = $(AM_CFLAGS) $(am__append_130)
+ libprotocol-native.la $(am__append_128)
+module_stream_restore_la_CFLAGS = $(AM_CFLAGS) $(am__append_129)
# Card profile restore module
module_card_restore_la_SOURCES = modules/module-card-restore.c
@@ -4717,13 +4732,13 @@ module_suspend_on_idle_la_CFLAGS = $(AM_CFLAGS)
module_echo_cancel_la_SOURCES = \
modules/echo-cancel/module-echo-cancel.c \
modules/echo-cancel/null.c modules/echo-cancel/echo-cancel.h \
- $(am__append_131) $(am__append_136)
+ $(am__append_130) $(am__append_135)
module_echo_cancel_la_LDFLAGS = $(MODULE_LDFLAGS)
-module_echo_cancel_la_LIBADD = $(MODULE_LIBADD) $(am__append_134) \
- $(am__append_138) $(am__append_140)
+module_echo_cancel_la_LIBADD = $(MODULE_LIBADD) $(am__append_133) \
+ $(am__append_137) $(am__append_139)
module_echo_cancel_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) \
- $(am__append_132) $(am__append_135) $(am__append_137) \
- $(am__append_139)
+ $(am__append_131) $(am__append_134) $(am__append_136) \
+ $(am__append_138)
@HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE at nodist_module_echo_cancel_la_SOURCES = \
@HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@ modules/echo-cancel/adrian-aec-orc-gen.c \
@HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@ modules/echo-cancel/adrian-aec-orc-gen.h
@@ -4819,8 +4834,8 @@ module_bluez4_device_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) $(SBC_CFLAGS)
# Bluetooth BlueZ 5 sink / source
libbluez5_util_la_SOURCES = modules/bluetooth/bluez5-util.c \
modules/bluetooth/bluez5-util.h \
- modules/bluetooth/a2dp-codecs.h $(am__append_141) \
- $(am__append_142)
+ modules/bluetooth/a2dp-codecs.h $(am__append_140) \
+ $(am__append_141)
libbluez5_util_la_LDFLAGS = -avoid-version
libbluez5_util_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS)
libbluez5_util_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
@@ -4848,6 +4863,12 @@ module_rygel_media_server_la_SOURCES = modules/module-rygel-media-server.c
module_rygel_media_server_la_LDFLAGS = $(MODULE_LDFLAGS)
module_rygel_media_server_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS) libprotocol-http.la
module_rygel_media_server_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
+
+# Allow passthrough module
+module_allow_passthrough_la_SOURCES = modules/module-allow-passthrough.c
+module_allow_passthrough_la_LDFLAGS = $(MODULE_LDFLAGS)
+module_allow_passthrough_la_LIBADD = $(MODULE_LIBADD)
+module_allow_passthrough_la_CFLAGS = $(AM_CFLAGS)
DISTCLEANFILES = esdcompat client.conf default.pa system.pa daemon.conf start-pulseaudio-x11 pulseaudio.service
@OS_IS_WIN32_FALSE at SYMLINK_PROGRAM = ln -sf
@OS_IS_WIN32_TRUE at SYMLINK_PROGRAM = cd $(DESTDIR)$(bindir) && cp
@@ -5302,6 +5323,8 @@ pulse/libpulsecommon_ at PA_MAJORMINOR@_la-fork-detect.lo: \
pulse/$(am__dirstamp) pulse/$(DEPDIR)/$(am__dirstamp)
pulse/libpulsecommon_ at PA_MAJORMINOR@_la-format.lo: \
pulse/$(am__dirstamp) pulse/$(DEPDIR)/$(am__dirstamp)
+pulse/libpulsecommon_ at PA_MAJORMINOR@_la-json.lo: \
+ pulse/$(am__dirstamp) pulse/$(DEPDIR)/$(am__dirstamp)
pulse/libpulsecommon_ at PA_MAJORMINOR@_la-xmalloc.lo: \
pulse/$(am__dirstamp) pulse/$(DEPDIR)/$(am__dirstamp)
pulse/libpulsecommon_ at PA_MAJORMINOR@_la-proplist.lo: \
@@ -5695,6 +5718,11 @@ modules/echo-cancel/libwebrtc_util_la-webrtc.lo: \
libwebrtc-util.la: $(libwebrtc_util_la_OBJECTS) $(libwebrtc_util_la_DEPENDENCIES) $(EXTRA_libwebrtc_util_la_DEPENDENCIES)
$(AM_V_CXXLD)$(libwebrtc_util_la_LINK) $(am_libwebrtc_util_la_rpath) $(libwebrtc_util_la_OBJECTS) $(libwebrtc_util_la_LIBADD) $(LIBS)
+modules/module_allow_passthrough_la-module-allow-passthrough.lo: \
+ modules/$(am__dirstamp) modules/$(DEPDIR)/$(am__dirstamp)
+
+module-allow-passthrough.la: $(module_allow_passthrough_la_OBJECTS) $(module_allow_passthrough_la_DEPENDENCIES) $(EXTRA_module_allow_passthrough_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(module_allow_passthrough_la_LINK) -rpath $(modlibexecdir) $(module_allow_passthrough_la_OBJECTS) $(module_allow_passthrough_la_LIBADD) $(LIBS)
modules/alsa/module_alsa_card_la-module-alsa-card.lo: \
modules/alsa/$(am__dirstamp) \
modules/alsa/$(DEPDIR)/$(am__dirstamp)
@@ -6255,18 +6283,6 @@ modules/x11/module_x11_xsmp_la-module-x11-xsmp.lo: \
module-x11-xsmp.la: $(module_x11_xsmp_la_OBJECTS) $(module_x11_xsmp_la_DEPENDENCIES) $(EXTRA_module_x11_xsmp_la_DEPENDENCIES)
$(AM_V_CCLD)$(module_x11_xsmp_la_LINK) $(am_module_x11_xsmp_la_rpath) $(module_x11_xsmp_la_OBJECTS) $(module_x11_xsmp_la_LIBADD) $(LIBS)
-modules/xen/$(am__dirstamp):
- @$(MKDIR_P) modules/xen
- @: > modules/xen/$(am__dirstamp)
-modules/xen/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) modules/xen/$(DEPDIR)
- @: > modules/xen/$(DEPDIR)/$(am__dirstamp)
-modules/xen/module_xenpv_sink_la-module-xenpv-sink.lo: \
- modules/xen/$(am__dirstamp) \
- modules/xen/$(DEPDIR)/$(am__dirstamp)
-
-module-xenpv-sink.la: $(module_xenpv_sink_la_OBJECTS) $(module_xenpv_sink_la_DEPENDENCIES) $(EXTRA_module_xenpv_sink_la_DEPENDENCIES)
- $(AM_V_CCLD)$(module_xenpv_sink_la_LINK) $(am_module_xenpv_sink_la_rpath) $(module_xenpv_sink_la_OBJECTS) $(module_xenpv_sink_la_LIBADD) $(LIBS)
modules/module_zeroconf_discover_la-module-zeroconf-discover.lo: \
modules/$(am__dirstamp) modules/$(DEPDIR)/$(am__dirstamp)
@@ -6435,6 +6451,12 @@ tests/connect_stress-connect-stress.$(OBJEXT): tests/$(am__dirstamp) \
connect-stress$(EXEEXT): $(connect_stress_OBJECTS) $(connect_stress_DEPENDENCIES) $(EXTRA_connect_stress_DEPENDENCIES)
@rm -f connect-stress$(EXEEXT)
$(AM_V_CCLD)$(connect_stress_LINK) $(connect_stress_OBJECTS) $(connect_stress_LDADD) $(LIBS)
+tests/core_util_test-core-util-test.$(OBJEXT): tests/$(am__dirstamp) \
+ tests/$(DEPDIR)/$(am__dirstamp)
+
+core-util-test$(EXEEXT): $(core_util_test_OBJECTS) $(core_util_test_DEPENDENCIES) $(EXTRA_core_util_test_DEPENDENCIES)
+ @rm -f core-util-test$(EXEEXT)
+ $(AM_V_CCLD)$(core_util_test_LINK) $(core_util_test_OBJECTS) $(core_util_test_LDADD) $(LIBS)
tests/cpu_mix_test-cpu-mix-test.$(OBJEXT): tests/$(am__dirstamp) \
tests/$(DEPDIR)/$(am__dirstamp)
@@ -6558,6 +6580,12 @@ tests/ipacl_test-ipacl-test.$(OBJEXT): tests/$(am__dirstamp) \
ipacl-test$(EXEEXT): $(ipacl_test_OBJECTS) $(ipacl_test_DEPENDENCIES) $(EXTRA_ipacl_test_DEPENDENCIES)
@rm -f ipacl-test$(EXEEXT)
$(AM_V_CCLD)$(ipacl_test_LINK) $(ipacl_test_OBJECTS) $(ipacl_test_LDADD) $(LIBS)
+tests/json_test-json-test.$(OBJEXT): tests/$(am__dirstamp) \
+ tests/$(DEPDIR)/$(am__dirstamp)
+
+json-test$(EXEEXT): $(json_test_OBJECTS) $(json_test_DEPENDENCIES) $(EXTRA_json_test_DEPENDENCIES)
+ @rm -f json-test$(EXEEXT)
+ $(AM_V_CCLD)$(json_test_LINK) $(json_test_OBJECTS) $(json_test_LDADD) $(LIBS)
tests/lfe_filter_test-lfe-filter-test.$(OBJEXT): \
tests/$(am__dirstamp) tests/$(DEPDIR)/$(am__dirstamp)
@@ -6857,8 +6885,6 @@ mostlyclean-compile:
-rm -f modules/rtp/*.lo
-rm -f modules/x11/*.$(OBJEXT)
-rm -f modules/x11/*.lo
- -rm -f modules/xen/*.$(OBJEXT)
- -rm -f modules/xen/*.lo
-rm -f pulse/*.$(OBJEXT)
-rm -f pulse/*.lo
-rm -f pulsecore/*.$(OBJEXT)
@@ -6915,6 +6941,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at modules/$(DEPDIR)/module-tunnel-sink-new.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at modules/$(DEPDIR)/module-tunnel-source-new.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at modules/$(DEPDIR)/module-tunnel.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at modules/$(DEPDIR)/module_allow_passthrough_la-module-allow-passthrough.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at modules/$(DEPDIR)/module_always_sink_la-module-always-sink.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at modules/$(DEPDIR)/module_augment_properties_la-module-augment-properties.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at modules/$(DEPDIR)/module_card_restore_la-module-card-restore.Plo at am__quote@
@@ -7026,7 +7053,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at modules/x11/$(DEPDIR)/module_x11_cork_request_la-module-x11-cork-request.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at modules/x11/$(DEPDIR)/module_x11_publish_la-module-x11-publish.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at modules/x11/$(DEPDIR)/module_x11_xsmp_la-module-x11-xsmp.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at modules/xen/$(DEPDIR)/module_xenpv_sink_la-module-xenpv-sink.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at pulse/$(DEPDIR)/libpulse_la-channelmap.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at pulse/$(DEPDIR)/libpulse_la-context.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at pulse/$(DEPDIR)/libpulse_la-direction.Plo at am__quote@
@@ -7059,6 +7085,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at pulse/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-client-conf.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at pulse/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-fork-detect.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at pulse/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-format.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at pulse/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-json.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at pulse/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-proplist.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at pulse/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-rtclock.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at pulse/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-sample.Plo at am__quote@
@@ -7218,6 +7245,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/channelmap_test-channelmap-test.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/close_test-close-test.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/connect_stress-connect-stress.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/core_util_test-core-util-test.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/cpu_mix_test-cpu-mix-test.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/cpu_remap_test-cpu-remap-test.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/cpu_sconv_test-cpu-sconv-test.Po at am__quote@
@@ -7232,6 +7260,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/hook_list_test-hook-list-test.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/interpol_test-interpol-test.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/ipacl_test-ipacl-test.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/json_test-json-test.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/lfe_filter_test-lfe-filter-test.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/lo-test-util.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at tests/$(DEPDIR)/lo_latency_test-lo-latency-test.Po at am__quote@
@@ -7610,6 +7639,13 @@ pulse/libpulsecommon_ at PA_MAJORMINOR@_la-format.lo: pulse/format.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecommon_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o pulse/libpulsecommon_ at PA_MAJORMINOR@_la-format.lo `test -f 'pulse/format.c' || echo '$(srcdir)/'`pulse/format.c
+pulse/libpulsecommon_ at PA_MAJORMINOR@_la-json.lo: pulse/json.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecommon_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT pulse/libpulsecommon_ at PA_MAJORMINOR@_la-json.lo -MD -MP -MF pulse/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-json.Tpo -c -o pulse/libpulsecommon_ at PA_MAJORMINOR@_la-json.lo `test -f 'pulse/json.c' || echo '$(srcdir)/'`pulse/json.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pulse/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-json.Tpo pulse/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-json.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pulse/json.c' object='pulse/libpulsecommon_ at PA_MAJORMINOR@_la-json.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecommon_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -c -o pulse/libpulsecommon_ at PA_MAJORMINOR@_la-json.lo `test -f 'pulse/json.c' || echo '$(srcdir)/'`pulse/json.c
+
pulse/libpulsecommon_ at PA_MAJORMINOR@_la-xmalloc.lo: pulse/xmalloc.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpulsecommon_ at PA_MAJORMINOR@_la_CFLAGS) $(CFLAGS) -MT pulse/libpulsecommon_ at PA_MAJORMINOR@_la-xmalloc.lo -MD -MP -MF pulse/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-xmalloc.Tpo -c -o pulse/libpulsecommon_ at PA_MAJORMINOR@_la-xmalloc.lo `test -f 'pulse/xmalloc.c' || echo '$(srcdir)/'`pulse/xmalloc.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pulse/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-xmalloc.Tpo pulse/$(DEPDIR)/libpulsecommon_ at PA_MAJORMINOR@_la-xmalloc.Plo
@@ -8653,6 +8689,13 @@ modules/raop/libraop_la-base64.lo: modules/raop/base64.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libraop_la_CFLAGS) $(CFLAGS) -c -o modules/raop/libraop_la-base64.lo `test -f 'modules/raop/base64.c' || echo '$(srcdir)/'`modules/raop/base64.c
+modules/module_allow_passthrough_la-module-allow-passthrough.lo: modules/module-allow-passthrough.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_allow_passthrough_la_CFLAGS) $(CFLAGS) -MT modules/module_allow_passthrough_la-module-allow-passthrough.lo -MD -MP -MF modules/$(DEPDIR)/module_allow_passthrough_la-module-allow-passthrough.Tpo -c -o modules/module_allow_passthrough_la-module-allow-passthrough.lo `test -f 'modules/module-allow-pas [...]
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_allow_passthrough_la-module-allow-passthrough.Tpo modules/$(DEPDIR)/module_allow_passthrough_la-module-allow-passthrough.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='modules/module-allow-passthrough.c' object='modules/module_allow_passthrough_la-module-allow-passthrough.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_allow_passthrough_la_CFLAGS) $(CFLAGS) -c -o modules/module_allow_passthrough_la-module-allow-passthrough.lo `test -f 'modules/module-allow-passthrough.c' || echo '$(srcdir)/'`modules/module-allow-passthrough.c
+
modules/alsa/module_alsa_card_la-module-alsa-card.lo: modules/alsa/module-alsa-card.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_alsa_card_la_CFLAGS) $(CFLAGS) -MT modules/alsa/module_alsa_card_la-module-alsa-card.lo -MD -MP -MF modules/alsa/$(DEPDIR)/module_alsa_card_la-module-alsa-card.Tpo -c -o modules/alsa/module_alsa_card_la-module-alsa-card.lo `test -f 'modules/alsa/module-alsa-card.c' || echo '$(srcdir)/'`modules/als [...]
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) modules/alsa/$(DEPDIR)/module_alsa_card_la-module-alsa-card.Tpo modules/alsa/$(DEPDIR)/module_alsa_card_la-module-alsa-card.Plo
@@ -9213,13 +9256,6 @@ modules/x11/module_x11_xsmp_la-module-x11-xsmp.lo: modules/x11/module-x11-xsmp.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_x11_xsmp_la_CFLAGS) $(CFLAGS) -c -o modules/x11/module_x11_xsmp_la-module-x11-xsmp.lo `test -f 'modules/x11/module-x11-xsmp.c' || echo '$(srcdir)/'`modules/x11/module-x11-xsmp.c
-modules/xen/module_xenpv_sink_la-module-xenpv-sink.lo: modules/xen/module-xenpv-sink.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_xenpv_sink_la_CFLAGS) $(CFLAGS) -MT modules/xen/module_xenpv_sink_la-module-xenpv-sink.lo -MD -MP -MF modules/xen/$(DEPDIR)/module_xenpv_sink_la-module-xenpv-sink.Tpo -c -o modules/xen/module_xenpv_sink_la-module-xenpv-sink.lo `test -f 'modules/xen/module-xenpv-sink.c' || echo '$(srcdir)/'`modules [...]
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) modules/xen/$(DEPDIR)/module_xenpv_sink_la-module-xenpv-sink.Tpo modules/xen/$(DEPDIR)/module_xenpv_sink_la-module-xenpv-sink.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='modules/xen/module-xenpv-sink.c' object='modules/xen/module_xenpv_sink_la-module-xenpv-sink.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_xenpv_sink_la_CFLAGS) $(CFLAGS) -c -o modules/xen/module_xenpv_sink_la-module-xenpv-sink.lo `test -f 'modules/xen/module-xenpv-sink.c' || echo '$(srcdir)/'`modules/xen/module-xenpv-sink.c
-
modules/module_zeroconf_discover_la-module-zeroconf-discover.lo: modules/module-zeroconf-discover.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_zeroconf_discover_la_CFLAGS) $(CFLAGS) -MT modules/module_zeroconf_discover_la-module-zeroconf-discover.lo -MD -MP -MF modules/$(DEPDIR)/module_zeroconf_discover_la-module-zeroconf-discover.Tpo -c -o modules/module_zeroconf_discover_la-module-zeroconf-discover.lo `test -f 'modules/module-zeroconf- [...]
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) modules/$(DEPDIR)/module_zeroconf_discover_la-module-zeroconf-discover.Tpo modules/$(DEPDIR)/module_zeroconf_discover_la-module-zeroconf-discover.Plo
@@ -9332,6 +9368,20 @@ tests/connect_stress-connect-stress.obj: tests/connect-stress.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(connect_stress_CFLAGS) $(CFLAGS) -c -o tests/connect_stress-connect-stress.obj `if test -f 'tests/connect-stress.c'; then $(CYGPATH_W) 'tests/connect-stress.c'; else $(CYGPATH_W) '$(srcdir)/tests/connect-stress.c'; fi`
+tests/core_util_test-core-util-test.o: tests/core-util-test.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(core_util_test_CFLAGS) $(CFLAGS) -MT tests/core_util_test-core-util-test.o -MD -MP -MF tests/$(DEPDIR)/core_util_test-core-util-test.Tpo -c -o tests/core_util_test-core-util-test.o `test -f 'tests/core-util-test.c' || echo '$(srcdir)/'`tests/core-util-test.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) tests/$(DEPDIR)/core_util_test-core-util-test.Tpo tests/$(DEPDIR)/core_util_test-core-util-test.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tests/core-util-test.c' object='tests/core_util_test-core-util-test.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(core_util_test_CFLAGS) $(CFLAGS) -c -o tests/core_util_test-core-util-test.o `test -f 'tests/core-util-test.c' || echo '$(srcdir)/'`tests/core-util-test.c
+
+tests/core_util_test-core-util-test.obj: tests/core-util-test.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(core_util_test_CFLAGS) $(CFLAGS) -MT tests/core_util_test-core-util-test.obj -MD -MP -MF tests/$(DEPDIR)/core_util_test-core-util-test.Tpo -c -o tests/core_util_test-core-util-test.obj `if test -f 'tests/core-util-test.c'; then $(CYGPATH_W) 'tests/core-util-test.c'; else $(CYGPATH_W) '$(srcdir)/tests/core-util-test.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) tests/$(DEPDIR)/core_util_test-core-util-test.Tpo tests/$(DEPDIR)/core_util_test-core-util-test.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tests/core-util-test.c' object='tests/core_util_test-core-util-test.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(core_util_test_CFLAGS) $(CFLAGS) -c -o tests/core_util_test-core-util-test.obj `if test -f 'tests/core-util-test.c'; then $(CYGPATH_W) 'tests/core-util-test.c'; else $(CYGPATH_W) '$(srcdir)/tests/core-util-test.c'; fi`
+
tests/cpu_mix_test-cpu-mix-test.o: tests/cpu-mix-test.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cpu_mix_test_CFLAGS) $(CFLAGS) -MT tests/cpu_mix_test-cpu-mix-test.o -MD -MP -MF tests/$(DEPDIR)/cpu_mix_test-cpu-mix-test.Tpo -c -o tests/cpu_mix_test-cpu-mix-test.o `test -f 'tests/cpu-mix-test.c' || echo '$(srcdir)/'`tests/cpu-mix-test.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) tests/$(DEPDIR)/cpu_mix_test-cpu-mix-test.Tpo tests/$(DEPDIR)/cpu_mix_test-cpu-mix-test.Po
@@ -9654,6 +9704,20 @@ tests/ipacl_test-ipacl-test.obj: tests/ipacl-test.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ipacl_test_CFLAGS) $(CFLAGS) -c -o tests/ipacl_test-ipacl-test.obj `if test -f 'tests/ipacl-test.c'; then $(CYGPATH_W) 'tests/ipacl-test.c'; else $(CYGPATH_W) '$(srcdir)/tests/ipacl-test.c'; fi`
+tests/json_test-json-test.o: tests/json-test.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(json_test_CFLAGS) $(CFLAGS) -MT tests/json_test-json-test.o -MD -MP -MF tests/$(DEPDIR)/json_test-json-test.Tpo -c -o tests/json_test-json-test.o `test -f 'tests/json-test.c' || echo '$(srcdir)/'`tests/json-test.c
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) tests/$(DEPDIR)/json_test-json-test.Tpo tests/$(DEPDIR)/json_test-json-test.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tests/json-test.c' object='tests/json_test-json-test.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(json_test_CFLAGS) $(CFLAGS) -c -o tests/json_test-json-test.o `test -f 'tests/json-test.c' || echo '$(srcdir)/'`tests/json-test.c
+
+tests/json_test-json-test.obj: tests/json-test.c
+ at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(json_test_CFLAGS) $(CFLAGS) -MT tests/json_test-json-test.obj -MD -MP -MF tests/$(DEPDIR)/json_test-json-test.Tpo -c -o tests/json_test-json-test.obj `if test -f 'tests/json-test.c'; then $(CYGPATH_W) 'tests/json-test.c'; else $(CYGPATH_W) '$(srcdir)/tests/json-test.c'; fi`
+ at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) tests/$(DEPDIR)/json_test-json-test.Tpo tests/$(DEPDIR)/json_test-json-test.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tests/json-test.c' object='tests/json_test-json-test.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(json_test_CFLAGS) $(CFLAGS) -c -o tests/json_test-json-test.obj `if test -f 'tests/json-test.c'; then $(CYGPATH_W) 'tests/json-test.c'; else $(CYGPATH_W) '$(srcdir)/tests/json-test.c'; fi`
+
tests/lfe_filter_test-lfe-filter-test.o: tests/lfe-filter-test.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lfe_filter_test_CFLAGS) $(CFLAGS) -MT tests/lfe_filter_test-lfe-filter-test.o -MD -MP -MF tests/$(DEPDIR)/lfe_filter_test-lfe-filter-test.Tpo -c -o tests/lfe_filter_test-lfe-filter-test.o `test -f 'tests/lfe-filter-test.c' || echo '$(srcdir)/'`tests/lfe-filter-test.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) tests/$(DEPDIR)/lfe_filter_test-lfe-filter-test.Tpo tests/$(DEPDIR)/lfe_filter_test-lfe-filter-test.Po
@@ -10318,7 +10382,6 @@ clean-libtool:
-rm -rf modules/raop/.libs modules/raop/_libs
-rm -rf modules/rtp/.libs modules/rtp/_libs
-rm -rf modules/x11/.libs modules/x11/_libs
- -rm -rf modules/xen/.libs modules/xen/_libs
-rm -rf pulse/.libs pulse/_libs
-rm -rf pulsecore/.libs pulsecore/_libs
-rm -rf pulsecore/ffmpeg/.libs pulsecore/ffmpeg/_libs
@@ -10688,6 +10751,13 @@ recheck: all $(check_PROGRAMS)
am__force_recheck=am--force-recheck \
TEST_LOGS="$$log_list"; \
exit $$?
+core-util-test.log: core-util-test$(EXEEXT)
+ @p='core-util-test$(EXEEXT)'; \
+ b='core-util-test'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
mainloop-test.log: mainloop-test$(EXEEXT)
@p='mainloop-test$(EXEEXT)'; \
b='mainloop-test'; \
@@ -10744,6 +10814,13 @@ format-test.log: format-test$(EXEEXT)
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
+json-test.log: json-test$(EXEEXT)
+ @p='json-test$(EXEEXT)'; \
+ b='json-test'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
get-binary-name-test.log: get-binary-name-test$(EXEEXT)
@p='get-binary-name-test$(EXEEXT)'; \
b='get-binary-name-test'; \
@@ -11041,8 +11118,6 @@ distclean-generic:
-rm -f modules/rtp/$(am__dirstamp)
-rm -f modules/x11/$(DEPDIR)/$(am__dirstamp)
-rm -f modules/x11/$(am__dirstamp)
- -rm -f modules/xen/$(DEPDIR)/$(am__dirstamp)
- -rm -f modules/xen/$(am__dirstamp)
-rm -f pulse/$(DEPDIR)/$(am__dirstamp)
-rm -f pulse/$(am__dirstamp)
-rm -f pulsecore/$(DEPDIR)/$(am__dirstamp)
@@ -11073,7 +11148,7 @@ clean-am: clean-binPROGRAMS clean-checkPROGRAMS \
clean-pulselibexecPROGRAMS mostlyclean-am
distclean: distclean-am
- -rm -rf daemon/$(DEPDIR) modules/$(DEPDIR) modules/alsa/$(DEPDIR) modules/bluetooth/$(DEPDIR) modules/dbus/$(DEPDIR) modules/echo-cancel/$(DEPDIR) modules/gconf/$(DEPDIR) modules/jack/$(DEPDIR) modules/macosx/$(DEPDIR) modules/oss/$(DEPDIR) modules/raop/$(DEPDIR) modules/rtp/$(DEPDIR) modules/x11/$(DEPDIR) modules/xen/$(DEPDIR) pulse/$(DEPDIR) pulsecore/$(DEPDIR) pulsecore/ffmpeg/$(DEPDIR) pulsecore/filter/$(DEPDIR) pulsecore/resampler/$(DEPDIR) tests/$(DEPDIR) utils/$(DEPDIR)
+ -rm -rf daemon/$(DEPDIR) modules/$(DEPDIR) modules/alsa/$(DEPDIR) modules/bluetooth/$(DEPDIR) modules/dbus/$(DEPDIR) modules/echo-cancel/$(DEPDIR) modules/gconf/$(DEPDIR) modules/jack/$(DEPDIR) modules/macosx/$(DEPDIR) modules/oss/$(DEPDIR) modules/raop/$(DEPDIR) modules/rtp/$(DEPDIR) modules/x11/$(DEPDIR) pulse/$(DEPDIR) pulsecore/$(DEPDIR) pulsecore/ffmpeg/$(DEPDIR) pulsecore/filter/$(DEPDIR) pulsecore/resampler/$(DEPDIR) tests/$(DEPDIR) utils/$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -11126,7 +11201,7 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf daemon/$(DEPDIR) modules/$(DEPDIR) modules/alsa/$(DEPDIR) modules/bluetooth/$(DEPDIR) modules/dbus/$(DEPDIR) modules/echo-cancel/$(DEPDIR) modules/gconf/$(DEPDIR) modules/jack/$(DEPDIR) modules/macosx/$(DEPDIR) modules/oss/$(DEPDIR) modules/raop/$(DEPDIR) modules/rtp/$(DEPDIR) modules/x11/$(DEPDIR) modules/xen/$(DEPDIR) pulse/$(DEPDIR) pulsecore/$(DEPDIR) pulsecore/ffmpeg/$(DEPDIR) pulsecore/filter/$(DEPDIR) pulsecore/resampler/$(DEPDIR) tests/$(DEPDIR) utils/$(DEPDIR)
+ -rm -rf daemon/$(DEPDIR) modules/$(DEPDIR) modules/alsa/$(DEPDIR) modules/bluetooth/$(DEPDIR) modules/dbus/$(DEPDIR) modules/echo-cancel/$(DEPDIR) modules/gconf/$(DEPDIR) modules/jack/$(DEPDIR) modules/macosx/$(DEPDIR) modules/oss/$(DEPDIR) modules/raop/$(DEPDIR) modules/rtp/$(DEPDIR) modules/x11/$(DEPDIR) pulse/$(DEPDIR) pulsecore/$(DEPDIR) pulsecore/ffmpeg/$(DEPDIR) pulsecore/filter/$(DEPDIR) pulsecore/resampler/$(DEPDIR) tests/$(DEPDIR) utils/$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index 4277301..f0ed0b4 100644
--- a/src/daemon/daemon-conf.c
+++ b/src/daemon/daemon-conf.c
@@ -92,7 +92,7 @@ static const pa_daemon_conf default_conf = {
#endif
.no_cpu_limit = true,
.disable_shm = false,
- .disable_memfd = true,
+ .disable_memfd = false,
.lock_memory = false,
.deferred_volume = true,
.default_n_fragments = 4,
diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
index fcc9cb9..f3a1cc3 100644
--- a/src/daemon/daemon.conf.in
+++ b/src/daemon/daemon.conf.in
@@ -28,6 +28,7 @@ ifelse(@HAVE_DBUS@, 1, [dnl
; local-server-type = user
])dnl
; enable-shm = yes
+; enable-memfd = yes
; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
; lock-memory = no
; cpu-limit = no
diff --git a/src/daemon/main.c b/src/daemon/main.c
index ae1185d..dc5e5bc 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -550,7 +550,7 @@ int main(int argc, char *argv[]) {
case PA_CMD_DUMP_CONF: {
if (d < argc) {
- pa_log("Too many arguments.\n");
+ pa_log("Too many arguments.");
goto finish;
}
@@ -565,7 +565,7 @@ int main(int argc, char *argv[]) {
int i;
if (d < argc) {
- pa_log("Too many arguments.\n");
+ pa_log("Too many arguments.");
goto finish;
}
@@ -585,7 +585,7 @@ int main(int argc, char *argv[]) {
case PA_CMD_VERSION :
if (d < argc) {
- pa_log("Too many arguments.\n");
+ pa_log("Too many arguments.");
goto finish;
}
@@ -597,7 +597,7 @@ int main(int argc, char *argv[]) {
pid_t pid;
if (d < argc) {
- pa_log("Too many arguments.\n");
+ pa_log("Too many arguments.");
goto finish;
}
@@ -614,7 +614,7 @@ int main(int argc, char *argv[]) {
case PA_CMD_KILL:
if (d < argc) {
- pa_log("Too many arguments.\n");
+ pa_log("Too many arguments.");
goto finish;
}
@@ -628,7 +628,7 @@ int main(int argc, char *argv[]) {
case PA_CMD_CLEANUP_SHM:
if (d < argc) {
- pa_log("Too many arguments.\n");
+ pa_log("Too many arguments.");
goto finish;
}
@@ -642,7 +642,7 @@ int main(int argc, char *argv[]) {
}
if (d < argc) {
- pa_log("Too many arguments.\n");
+ pa_log("Too many arguments.");
goto finish;
}
@@ -918,7 +918,7 @@ int main(int argc, char *argv[]) {
pa_log_debug("Found %u CPUs.", pa_ncpus());
- pa_log_info("Page size is %lu bytes", (unsigned long) PA_PAGE_SIZE);
+ pa_log_info("Page size is %zu bytes", pa_page_size());
#ifdef HAVE_VALGRIND_MEMCHECK_H
pa_log_debug("Compiled with Valgrind support: yes");
@@ -971,8 +971,7 @@ int main(int argc, char *argv[]) {
pa_log_info("Running in system mode: %s", pa_yes_no(pa_in_system_mode()));
if (pa_in_system_mode())
- pa_log_warn(_("OK, so you are running PA in system mode. Please note that you most likely shouldn't be doing that.\n"
- "If you do it nonetheless then it's your own fault if things don't work as expected.\n"
+ pa_log_warn(_("OK, so you are running PA in system mode. Please make sure that you actually do want to do that.\n"
"Please read http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/ for an explanation why system mode is usually a bad idea."));
if (conf->use_pid_file) {
diff --git a/src/daemon/systemd/user/pulseaudio.service.in b/src/daemon/systemd/user/pulseaudio.service.in
index df42fc3..2bd780f 100644
--- a/src/daemon/systemd/user/pulseaudio.service.in
+++ b/src/daemon/systemd/user/pulseaudio.service.in
@@ -1,6 +1,20 @@
[Unit]
Description=Sound Service
+# We require pulseaudio.socket to be active before starting the daemon, because
+# while it is possible to use the service without the socket, it is not clear
+# why it would be desirable.
+#
+# A user installing pulseaudio and doing `systemctl --user start pulseaudio`
+# will not get the socket started, which might be confusing and problematic if
+# the server is to be restarted later on, as the client autospawn feature
+# might kick in. Also, a start of the socket unit will fail, adding to the
+# confusion.
+#
+# After=pulseaudio.socket is not needed, as it is already implicit in the
+# socket-service relationship, see systemd.socket(5).
+Requires=pulseaudio.socket
+
[Service]
# Note that notify will only work if --daemonize=no
Type=notify
diff --git a/src/module-allow-passthrough-symdef.h b/src/module-allow-passthrough-symdef.h
new file mode 100644
index 0000000..cdccd70
--- /dev/null
+++ b/src/module-allow-passthrough-symdef.h
@@ -0,0 +1,29 @@
+#ifndef foomoduleallowpassthroughsymdeffoo
+#define foomoduleallowpassthroughsymdeffoo
+
+#include <pulsecore/core.h>
+#include <pulsecore/module.h>
+#include <pulsecore/macro.h>
+
+#define pa__init module_allow_passthrough_LTX_pa__init
+#define pa__done module_allow_passthrough_LTX_pa__done
+#define pa__get_author module_allow_passthrough_LTX_pa__get_author
+#define pa__get_description module_allow_passthrough_LTX_pa__get_description
+#define pa__get_usage module_allow_passthrough_LTX_pa__get_usage
+#define pa__get_version module_allow_passthrough_LTX_pa__get_version
+#define pa__get_deprecated module_allow_passthrough_LTX_pa__get_deprecated
+#define pa__load_once module_allow_passthrough_LTX_pa__load_once
+#define pa__get_n_used module_allow_passthrough_LTX_pa__get_n_used
+
+int pa__init(pa_module*m);
+void pa__done(pa_module*m);
+int pa__get_n_used(pa_module*m);
+
+const char* pa__get_author(void);
+const char* pa__get_description(void);
+const char* pa__get_usage(void);
+const char* pa__get_version(void);
+const char* pa__get_deprecated(void);
+bool pa__load_once(void);
+
+#endif
diff --git a/src/module-xenpv-sink-symdef.h b/src/module-xenpv-sink-symdef.h
deleted file mode 100644
index af9c424..0000000
--- a/src/module-xenpv-sink-symdef.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef foomodulexenpvsinksymdeffoo
-#define foomodulexenpvsinksymdeffoo
-
-#include <pulsecore/core.h>
-#include <pulsecore/module.h>
-#include <pulsecore/macro.h>
-
-#define pa__init module_xenpv_sink_LTX_pa__init
-#define pa__done module_xenpv_sink_LTX_pa__done
-#define pa__get_author module_xenpv_sink_LTX_pa__get_author
-#define pa__get_description module_xenpv_sink_LTX_pa__get_description
-#define pa__get_usage module_xenpv_sink_LTX_pa__get_usage
-#define pa__get_version module_xenpv_sink_LTX_pa__get_version
-#define pa__get_deprecated module_xenpv_sink_LTX_pa__get_deprecated
-#define pa__load_once module_xenpv_sink_LTX_pa__load_once
-#define pa__get_n_used module_xenpv_sink_LTX_pa__get_n_used
-
-int pa__init(pa_module*m);
-void pa__done(pa_module*m);
-int pa__get_n_used(pa_module*m);
-
-const char* pa__get_author(void);
-const char* pa__get_description(void);
-const char* pa__get_usage(void);
-const char* pa__get_version(void);
-const char* pa__get_deprecated(void);
-bool pa__load_once(void);
-
-#endif
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index 8079147..3dbf6b1 100644
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -4754,6 +4754,7 @@ static pa_device_port* device_port_alsa_init(pa_hashmap *ports, /* card ports */
pa_proplist_update(p->proplist, PA_UPDATE_REPLACE, path->proplist);
data = PA_DEVICE_PORT_DATA(p);
+ /* Ownership of the path and setting is not transferred to the port data, so we don't deal with freeing them */
data->path = path;
data->setting = setting;
path->port = p;
diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
index 2fdebe0..886c735 100644
--- a/src/modules/alsa/alsa-sink.c
+++ b/src/modules/alsa/alsa-sink.c
@@ -2115,7 +2115,11 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca
u->first = true;
u->rewind_safeguard = rewind_safeguard;
u->rtpoll = pa_rtpoll_new();
- pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
+
+ if (pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll) < 0) {
+ pa_log("pa_thread_mq_init() failed.");
+ goto fail;
+ }
u->smoother = pa_smoother_new(
SMOOTHER_ADJUST_USEC,
@@ -2146,6 +2150,15 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca
b = use_mmap;
d = use_tsched;
+ /* Force ALSA to reread its configuration if module-alsa-card didn't
+ * do it for us. This matters if our device was hot-plugged after ALSA
+ * has already read its configuration - see
+ * https://bugs.freedesktop.org/show_bug.cgi?id=54029
+ */
+
+ if (!card)
+ snd_config_update_free_global();
+
if (mapping) {
if (!(dev_id = pa_modargs_get_value(ma, "device_id", NULL))) {
diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
index 4683dfe..b788df2 100644
--- a/src/modules/alsa/alsa-source.c
+++ b/src/modules/alsa/alsa-source.c
@@ -1823,7 +1823,11 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p
u->fixed_latency_range = fixed_latency_range;
u->first = true;
u->rtpoll = pa_rtpoll_new();
- pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
+
+ if (pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll) < 0) {
+ pa_log("pa_thread_mq_init() failed.");
+ goto fail;
+ }
u->smoother = pa_smoother_new(
SMOOTHER_ADJUST_USEC,
@@ -1854,6 +1858,15 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p
b = use_mmap;
d = use_tsched;
+ /* Force ALSA to reread its configuration if module-alsa-card didn't
+ * do it for us. This matters if our device was hot-plugged after ALSA
+ * has already read its configuration - see
+ * https://bugs.freedesktop.org/show_bug.cgi?id=54029
+ */
+
+ if (!card)
+ snd_config_update_free_global();
+
if (mapping) {
if (!(dev_id = pa_modargs_get_value(ma, "device_id", NULL))) {
diff --git a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c
index 42f3242..b42c040 100644
--- a/src/modules/alsa/alsa-ucm.c
+++ b/src/modules/alsa/alsa-ucm.c
@@ -90,9 +90,9 @@ struct ucm_port {
pa_dynarray *devices; /* pa_alsa_ucm_device */
};
-static struct ucm_port *ucm_port_new(pa_alsa_ucm_config *ucm, pa_device_port *core_port, pa_alsa_ucm_device **devices,
- unsigned n_devices);
-static void ucm_port_free(struct ucm_port *port);
+static void ucm_port_init(struct ucm_port *port, pa_alsa_ucm_config *ucm, pa_device_port *core_port,
+ pa_alsa_ucm_device **devices, unsigned n_devices);
+static void ucm_port_free(pa_device_port *port);
static void ucm_port_update_available(struct ucm_port *port);
static struct ucm_items item[] = {
@@ -576,8 +576,6 @@ int pa_alsa_ucm_query_profiles(pa_alsa_ucm_config *ucm, int card_index) {
const char **verb_list;
int num_verbs, i, err = 0;
- ucm->ports = pa_dynarray_new((pa_free_cb_t) ucm_port_free);
-
/* is UCM available for this card ? */
err = snd_card_get_name(card_index, &card_name);
if (err < 0) {
@@ -769,12 +767,12 @@ static void ucm_add_port_combination(
pa_device_port_new_data_set_description(&port_data, desc);
pa_device_port_new_data_set_direction(&port_data, is_sink ? PA_DIRECTION_OUTPUT : PA_DIRECTION_INPUT);
- port = pa_device_port_new(core, &port_data, sizeof(struct ucm_port *));
+ port = pa_device_port_new(core, &port_data, sizeof(struct ucm_port));
+ port->impl_free = ucm_port_free;
pa_device_port_new_data_done(&port_data);
- ucm_port = ucm_port_new(context->ucm, port, pdevices, num);
- pa_dynarray_append(context->ucm->ports, ucm_port);
- *((struct ucm_port **) PA_DEVICE_PORT_DATA(port)) = ucm_port;
+ ucm_port = PA_DEVICE_PORT_DATA(port);
+ ucm_port_init(ucm_port, context->ucm, port, pdevices, num);
pa_hashmap_put(ports, port->name, port);
pa_log_debug("Add port %s: %s", port->name, port->description);
@@ -1681,9 +1679,6 @@ void pa_alsa_ucm_free(pa_alsa_ucm_config *ucm) {
pa_alsa_ucm_verb *vi, *vn;
pa_alsa_jack *ji, *jn;
- if (ucm->ports)
- pa_dynarray_free(ucm->ports);
-
PA_LLIST_FOREACH_SAFE(vi, vn, ucm->verbs) {
PA_LLIST_REMOVE(pa_alsa_ucm_verb, ucm->verbs, vi);
free_verb(vi);
@@ -1838,16 +1833,14 @@ void pa_alsa_ucm_device_update_available(pa_alsa_ucm_device *device) {
device_set_available(device, available);
}
-static struct ucm_port *ucm_port_new(pa_alsa_ucm_config *ucm, pa_device_port *core_port, pa_alsa_ucm_device **devices,
- unsigned n_devices) {
- struct ucm_port *port;
+static void ucm_port_init(struct ucm_port *port, pa_alsa_ucm_config *ucm, pa_device_port *core_port,
+ pa_alsa_ucm_device **devices, unsigned n_devices) {
unsigned i;
pa_assert(ucm);
pa_assert(core_port);
pa_assert(devices);
- port = pa_xnew0(struct ucm_port, 1);
port->ucm = ucm;
port->core_port = core_port;
port->devices = pa_dynarray_new(NULL);
@@ -1858,17 +1851,17 @@ static struct ucm_port *ucm_port_new(pa_alsa_ucm_config *ucm, pa_device_port *co
}
ucm_port_update_available(port);
-
- return port;
}
-static void ucm_port_free(struct ucm_port *port) {
+static void ucm_port_free(pa_device_port *port) {
+ struct ucm_port *ucm_port;
+
pa_assert(port);
- if (port->devices)
- pa_dynarray_free(port->devices);
+ ucm_port = PA_DEVICE_PORT_DATA(port);
- pa_xfree(port);
+ if (ucm_port->devices)
+ pa_dynarray_free(ucm_port->devices);
}
static void ucm_port_update_available(struct ucm_port *port) {
diff --git a/src/modules/alsa/alsa-ucm.h b/src/modules/alsa/alsa-ucm.h
index 0930303..53abf3f 100644
--- a/src/modules/alsa/alsa-ucm.h
+++ b/src/modules/alsa/alsa-ucm.h
@@ -196,7 +196,6 @@ struct pa_alsa_ucm_config {
PA_LLIST_HEAD(pa_alsa_ucm_verb, verbs);
PA_LLIST_HEAD(pa_alsa_jack, jacks);
- pa_dynarray *ports; /* struct ucm_port */
};
struct pa_alsa_ucm_mapping_context {
diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
index a4bb449..dfb2aa7 100644
--- a/src/modules/alsa/alsa-util.c
+++ b/src/modules/alsa/alsa-util.c
@@ -474,32 +474,32 @@ int pa_alsa_set_sw_params(snd_pcm_t *pcm, snd_pcm_uframes_t avail_min, bool peri
snd_pcm_sw_params_alloca(&swparams);
if ((err = snd_pcm_sw_params_current(pcm, swparams)) < 0) {
- pa_log_warn("Unable to determine current swparams: %s\n", pa_alsa_strerror(err));
+ pa_log_warn("Unable to determine current swparams: %s", pa_alsa_strerror(err));
return err;
}
if ((err = snd_pcm_sw_params_set_period_event(pcm, swparams, period_event)) < 0) {
- pa_log_warn("Unable to disable period event: %s\n", pa_alsa_strerror(err));
+ pa_log_warn("Unable to disable period event: %s", pa_alsa_strerror(err));
return err;
}
if ((err = snd_pcm_sw_params_set_tstamp_mode(pcm, swparams, SND_PCM_TSTAMP_ENABLE)) < 0) {
- pa_log_warn("Unable to enable time stamping: %s\n", pa_alsa_strerror(err));
+ pa_log_warn("Unable to enable time stamping: %s", pa_alsa_strerror(err));
return err;
}
if ((err = snd_pcm_sw_params_get_boundary(swparams, &boundary)) < 0) {
- pa_log_warn("Unable to get boundary: %s\n", pa_alsa_strerror(err));
+ pa_log_warn("Unable to get boundary: %s", pa_alsa_strerror(err));
return err;
}
if ((err = snd_pcm_sw_params_set_stop_threshold(pcm, swparams, boundary)) < 0) {
- pa_log_warn("Unable to set stop threshold: %s\n", pa_alsa_strerror(err));
+ pa_log_warn("Unable to set stop threshold: %s", pa_alsa_strerror(err));
return err;
}
if ((err = snd_pcm_sw_params_set_start_threshold(pcm, swparams, (snd_pcm_uframes_t) -1)) < 0) {
- pa_log_warn("Unable to set start threshold: %s\n", pa_alsa_strerror(err));
+ pa_log_warn("Unable to set start threshold: %s", pa_alsa_strerror(err));
return err;
}
@@ -509,7 +509,7 @@ int pa_alsa_set_sw_params(snd_pcm_t *pcm, snd_pcm_uframes_t avail_min, bool peri
}
if ((err = snd_pcm_sw_params(pcm, swparams)) < 0) {
- pa_log_warn("Unable to set sw params: %s\n", pa_alsa_strerror(err));
+ pa_log_warn("Unable to set sw params: %s", pa_alsa_strerror(err));
return err;
}
@@ -1546,7 +1546,7 @@ static int mixer_class_event(snd_mixer_class_t *class, unsigned int mask,
return 0;
}
else
- pa_log_info("Got an unknown mixer class event for %s: mask 0x%x\n", name, mask);
+ pa_log_info("Got an unknown mixer class event for %s: mask 0x%x", name, mask);
return 0;
}
diff --git a/src/modules/alsa/module-alsa-card.c b/src/modules/alsa/module-alsa-card.c
index e5cc4ae..4f1236e 100644
--- a/src/modules/alsa/module-alsa-card.c
+++ b/src/modules/alsa/module-alsa-card.c
@@ -366,6 +366,7 @@ static int report_jack_state(snd_mixer_elem_t *melem, unsigned int mask) {
void *state;
pa_alsa_jack *jack;
struct temp_port_avail *tp, *tports;
+ pa_card_profile *profile;
pa_assert(u);
@@ -426,6 +427,32 @@ static int report_jack_state(snd_mixer_elem_t *melem, unsigned int mask) {
if (tp->avail == PA_AVAILABLE_NO)
pa_device_port_set_available(tp->port, tp->avail);
+ /* Update profile availabilities. The logic could be improved; for now we
+ * only set obviously unavailable profiles (those that contain only
+ * unavailable ports) to PA_AVAILABLE_NO and all others to
+ * PA_AVAILABLE_UNKNOWN. */
+ PA_HASHMAP_FOREACH(profile, u->card->profiles, state) {
+ pa_device_port *port;
+ void *state2;
+ pa_available_t available = PA_AVAILABLE_NO;
+
+ /* Don't touch the "off" profile. */
+ if (profile->n_sources == 0 && profile->n_sinks == 0)
+ continue;
+
+ PA_HASHMAP_FOREACH(port, u->card->ports, state2) {
+ if (!pa_hashmap_get(port->profiles, profile->name))
+ continue;
+
+ if (port->available != PA_AVAILABLE_NO) {
+ available = PA_AVAILABLE_UNKNOWN;
+ break;
+ }
+ }
+
+ pa_card_profile_set_available(profile, available);
+ }
+
pa_xfree(tports);
return 0;
}
@@ -671,7 +698,7 @@ int pa__init(pa_module *m) {
struct userdata *u;
pa_reserve_wrapper *reserve = NULL;
const char *description;
- const char *profile = NULL;
+ const char *profile_str = NULL;
char *fn = NULL;
bool namereg_fail = false;
@@ -714,7 +741,18 @@ int pa__init(pa_module *m) {
}
}
- pa_modargs_get_value_boolean(u->modargs, "use_ucm", &u->use_ucm);
+ if (pa_modargs_get_value_boolean(u->modargs, "use_ucm", &u->use_ucm) < 0) {
+ pa_log("Failed to parse use_ucm argument.");
+ goto fail;
+ }
+
+ /* Force ALSA to reread its configuration. This matters if our device
+ * was hot-plugged after ALSA has already read its configuration - see
+ * https://bugs.freedesktop.org/show_bug.cgi?id=54029
+ */
+
+ snd_config_update_free_global();
+
if (u->use_ucm && !pa_alsa_ucm_query_profiles(&u->ucm, u->alsa_card_index)) {
pa_log_info("Found UCM profiles");
@@ -799,9 +837,6 @@ int pa__init(pa_module *m) {
goto fail;
}
- if ((profile = pa_modargs_get_value(u->modargs, "profile", NULL)))
- pa_card_new_data_set_profile(&data, profile);
-
u->card = pa_card_new(m->core, &data);
pa_card_new_data_done(&data);
@@ -815,6 +850,26 @@ int pa__init(pa_module *m) {
(pa_hook_cb_t) card_suspend_changed, u);
init_jacks(u);
+
+ pa_card_choose_initial_profile(u->card);
+
+ /* If the "profile" modarg is given, we have to override whatever the usual
+ * policy chose in pa_card_choose_initial_profile(). */
+ profile_str = pa_modargs_get_value(u->modargs, "profile", NULL);
+ if (profile_str) {
+ pa_card_profile *profile;
+
+ profile = pa_hashmap_get(u->card->profiles, profile_str);
+ if (!profile) {
+ pa_log("No such profile: %s", profile_str);
+ goto fail;
+ }
+
+ pa_card_set_profile(u->card, profile, false);
+ }
+
+ pa_card_put(u->card);
+
init_profile(u);
init_eld_ctls(u);
diff --git a/src/modules/bluetooth/backend-native.c b/src/modules/bluetooth/backend-native.c
index 8d9d95c..cf88126 100644
--- a/src/modules/bluetooth/backend-native.c
+++ b/src/modules/bluetooth/backend-native.c
@@ -137,7 +137,7 @@ static int bluez5_sco_acquire_cb(pa_bluetooth_transport *t, bool optional, size_
addr.sco_family = AF_BLUETOOTH;
bacpy(&addr.sco_bdaddr, &dst);
- pa_log_info ("doing connect\n");
+ pa_log_info("doing connect");
err = connect(sock, (struct sockaddr *) &addr, sizeof(addr));
if (err < 0 && !(errno == EAGAIN || errno == EINPROGRESS)) {
pa_log_error("connect(): %s", pa_cstrerror(errno));
@@ -231,14 +231,17 @@ static void rfcomm_io_callback(pa_mainloop_api *io, pa_io_event *e, int fd, pa_i
ssize_t len;
int gain;
- len = read(fd, buf, 511);
+ len = pa_read(fd, buf, 511, NULL);
+ if (len < 0) {
+ pa_log_error("RFCOMM read error: %s", pa_cstrerror(errno));
+ goto fail;
+ }
buf[len] = 0;
pa_log_debug("RFCOMM << %s", buf);
if (sscanf(buf, "AT+VGS=%d", &gain) == 1) {
t->speaker_gain = gain;
pa_hook_fire(pa_bluetooth_discovery_hook(t->device->discovery, PA_BLUETOOTH_HOOK_TRANSPORT_SPEAKER_GAIN_CHANGED), t);
-
} else if (sscanf(buf, "AT+VGM=%d", &gain) == 1) {
t->microphone_gain = gain;
pa_hook_fire(pa_bluetooth_discovery_hook(t->device->discovery, PA_BLUETOOTH_HOOK_TRANSPORT_MICROPHONE_GAIN_CHANGED), t);
@@ -259,7 +262,6 @@ static void rfcomm_io_callback(pa_mainloop_api *io, pa_io_event *e, int fd, pa_i
fail:
pa_bluetooth_transport_unlink(t);
pa_bluetooth_transport_free(t);
- return;
}
static void transport_destroy(pa_bluetooth_transport *t) {
@@ -351,7 +353,7 @@ static DBusMessage *profile_new_connection(DBusConnection *conn, DBusMessage *m,
p = PA_BLUETOOTH_PROFILE_HEADSET_HEAD_UNIT;
pathfd = pa_sprintf_malloc ("%s/fd%d", path, fd);
- d->transports[p] = t = pa_bluetooth_transport_new(d, sender, pathfd, p, NULL, 0);
+ t = pa_bluetooth_transport_new(d, sender, pathfd, p, NULL, 0);
pa_xfree(pathfd);
t->acquire = bluez5_sco_acquire_cb;
diff --git a/src/modules/bluetooth/bluez4-util.c b/src/modules/bluetooth/bluez4-util.c
index 97b5ab0..542ce35 100644
--- a/src/modules/bluetooth/bluez4-util.c
+++ b/src/modules/bluetooth/bluez4-util.c
@@ -77,6 +77,7 @@ static pa_dbus_pending* send_and_add_to_pending(pa_bluez4_discovery *y, DBusMess
void *call_data);
static void found_adapter(pa_bluez4_discovery *y, const char *path);
static pa_bluez4_device *found_device(pa_bluez4_discovery *y, const char* path);
+static void transport_set_state(pa_bluez4_transport *transport, pa_bluez4_transport_state_t state);
static pa_bluez4_audio_state_t audio_state_from_string(const char* value) {
pa_assert(value);
@@ -95,13 +96,13 @@ static pa_bluez4_audio_state_t audio_state_from_string(const char* value) {
const char *pa_bluez4_profile_to_string(pa_bluez4_profile_t profile) {
switch(profile) {
- case PA_BLUEZ4_PROFILE_A2DP:
+ case PA_BLUEZ4_PROFILE_A2DP_SINK:
return "a2dp";
case PA_BLUEZ4_PROFILE_A2DP_SOURCE:
return "a2dp_source";
- case PA_BLUEZ4_PROFILE_HSP:
+ case PA_BLUEZ4_PROFILE_HEADSET_HEAD_UNIT:
return "hsp";
- case PA_BLUEZ4_PROFILE_HFGW:
+ case PA_BLUEZ4_PROFILE_HEADSET_AUDIO_GATEWAY:
return "hfgw";
case PA_BLUEZ4_PROFILE_OFF:
pa_assert_not_reached();
@@ -115,16 +116,16 @@ static int profile_from_interface(const char *interface, pa_bluez4_profile_t *p)
pa_assert(p);
if (pa_streq(interface, "org.bluez.AudioSink")) {
- *p = PA_BLUEZ4_PROFILE_A2DP;
+ *p = PA_BLUEZ4_PROFILE_A2DP_SINK;
return 0;
} else if (pa_streq(interface, "org.bluez.AudioSource")) {
*p = PA_BLUEZ4_PROFILE_A2DP_SOURCE;
return 0;
} else if (pa_streq(interface, "org.bluez.Headset")) {
- *p = PA_BLUEZ4_PROFILE_HSP;
+ *p = PA_BLUEZ4_PROFILE_HEADSET_HEAD_UNIT;
return 0;
} else if (pa_streq(interface, "org.bluez.HandsfreeGateway")) {
- *p = PA_BLUEZ4_PROFILE_HFGW;
+ *p = PA_BLUEZ4_PROFILE_HEADSET_AUDIO_GATEWAY;
return 0;
}
@@ -146,23 +147,6 @@ static pa_bluez4_transport_state_t audio_state_to_transport_state(pa_bluez4_audi
pa_assert_not_reached();
}
-static pa_bluez4_uuid *uuid_new(const char *uuid) {
- pa_bluez4_uuid *u;
-
- u = pa_xnew(pa_bluez4_uuid, 1);
- u->uuid = pa_xstrdup(uuid);
- PA_LLIST_INIT(pa_bluez4_uuid, u);
-
- return u;
-}
-
-static void uuid_free(pa_bluez4_uuid *u) {
- pa_assert(u);
-
- pa_xfree(u->uuid);
- pa_xfree(u);
-}
-
static pa_bluez4_device* device_new(pa_bluez4_discovery *discovery, const char *path) {
pa_bluez4_device *d;
unsigned i;
@@ -181,7 +165,7 @@ static pa_bluez4_device* device_new(pa_bluez4_discovery *discovery, const char *
d->path = pa_xstrdup(path);
d->paired = -1;
d->alias = NULL;
- PA_LLIST_HEAD_INIT(pa_bluez4_uuid, d->uuids);
+ d->uuids = pa_hashmap_new_full(pa_idxset_string_hash_func, pa_idxset_string_compare_func, NULL, pa_xfree);
d->address = NULL;
d->class = -1;
d->trusted = -1;
@@ -204,7 +188,6 @@ static void transport_free(pa_bluez4_transport *t) {
}
static void device_free(pa_bluez4_device *d) {
- pa_bluez4_uuid *u;
pa_bluez4_transport *t;
unsigned i;
@@ -216,15 +199,12 @@ static void device_free(pa_bluez4_device *d) {
d->transports[i] = NULL;
pa_hashmap_remove(d->discovery->transports, t->path);
- t->state = PA_BLUEZ4_TRANSPORT_STATE_DISCONNECTED;
- pa_hook_fire(&d->discovery->hooks[PA_BLUEZ4_HOOK_TRANSPORT_STATE_CHANGED], t);
+ transport_set_state(t, PA_BLUEZ4_TRANSPORT_STATE_DISCONNECTED);
transport_free(t);
}
- while ((u = d->uuids)) {
- PA_LLIST_REMOVE(pa_bluez4_uuid, d->uuids, u);
- uuid_free(u);
- }
+ if (d->uuids)
+ pa_hashmap_free(d->uuids);
pa_xfree(d->name);
pa_xfree(d->path);
@@ -416,7 +396,6 @@ static int parse_device_property(pa_bluez4_device *d, DBusMessageIter *i, bool i
}
case DBUS_TYPE_ARRAY: {
-
DBusMessageIter ai;
dbus_message_iter_recurse(&variant_i, &ai);
@@ -424,42 +403,46 @@ static int parse_device_property(pa_bluez4_device *d, DBusMessageIter *i, bool i
DBusMessage *m;
bool has_audio = false;
+ /* bluetoothd never removes UUIDs from a device object so we
+ * don't need to check for disappeared UUIDs here. */
while (dbus_message_iter_get_arg_type(&ai) != DBUS_TYPE_INVALID) {
- pa_bluez4_uuid *node;
const char *value;
+ char *uuid;
struct pa_bluez4_hook_uuid_data uuiddata;
dbus_message_iter_get_basic(&ai, &value);
- if (pa_bluez4_uuid_has(d->uuids, value)) {
+ if (pa_hashmap_get(d->uuids, value)) {
dbus_message_iter_next(&ai);
continue;
}
- node = uuid_new(value);
- PA_LLIST_PREPEND(pa_bluez4_uuid, d->uuids, node);
+ uuid = pa_xstrdup(value);
+ pa_hashmap_put(d->uuids, uuid, uuid);
+
+ pa_log_debug("%s: %s", key, value);
uuiddata.device = d;
uuiddata.uuid = value;
pa_hook_fire(&d->discovery->hooks[PA_BLUEZ4_HOOK_DEVICE_UUID_ADDED], &uuiddata);
/* Vudentz said the interfaces are here when the UUIDs are announced */
- if (strcasecmp(HSP_AG_UUID, value) == 0 || strcasecmp(HFP_AG_UUID, value) == 0) {
+ if (pa_streq(PA_BLUEZ4_UUID_HSP_AG, value) || pa_streq(PA_BLUEZ4_UUID_HFP_AG, value)) {
pa_assert_se(m = dbus_message_new_method_call("org.bluez", d->path, "org.bluez.HandsfreeGateway",
"GetProperties"));
send_and_add_to_pending(d->discovery, m, get_properties_reply, d);
has_audio = true;
- } else if (strcasecmp(HSP_HS_UUID, value) == 0 || strcasecmp(HFP_HS_UUID, value) == 0) {
+ } else if (pa_streq(PA_BLUEZ4_UUID_HSP_HS, value) || pa_streq(PA_BLUEZ4_UUID_HFP_HF, value)) {
pa_assert_se(m = dbus_message_new_method_call("org.bluez", d->path, "org.bluez.Headset",
"GetProperties"));
send_and_add_to_pending(d->discovery, m, get_properties_reply, d);
has_audio = true;
- } else if (strcasecmp(A2DP_SINK_UUID, value) == 0) {
+ } else if (pa_streq(PA_BLUEZ4_UUID_A2DP_SINK, value)) {
pa_assert_se(m = dbus_message_new_method_call("org.bluez", d->path, "org.bluez.AudioSink",
"GetProperties"));
send_and_add_to_pending(d->discovery, m, get_properties_reply, d);
has_audio = true;
- } else if (strcasecmp(A2DP_SOURCE_UUID, value) == 0) {
+ } else if (pa_streq(PA_BLUEZ4_UUID_A2DP_SOURCE, value)) {
pa_assert_se(m = dbus_message_new_method_call("org.bluez", d->path, "org.bluez.AudioSource",
"GetProperties"));
send_and_add_to_pending(d->discovery, m, get_properties_reply, d);
@@ -532,7 +515,6 @@ static int parse_audio_property(pa_bluez4_device *d, const char *interface, DBus
if (pa_streq(key, "State")) {
pa_bluez4_audio_state_t state = audio_state_from_string(value);
- pa_bluez4_transport_state_t old_state;
pa_log_debug("Device %s interface %s property 'State' changed to value '%s'", d->path, interface, value);
@@ -551,16 +533,7 @@ static int parse_audio_property(pa_bluez4_device *d, const char *interface, DBus
if (!transport)
break;
- old_state = transport->state;
- transport->state = audio_state_to_transport_state(state);
-
- if (transport->state != old_state) {
- pa_log_debug("Transport %s (profile %s) changed state from %s to %s.", transport->path,
- pa_bluez4_profile_to_string(transport->profile), transport_state_to_string(old_state),
- transport_state_to_string(transport->state));
-
- pa_hook_fire(&d->discovery->hooks[PA_BLUEZ4_HOOK_TRANSPORT_STATE_CHANGED], transport);
- }
+ transport_set_state(transport, audio_state_to_transport_state(state));
}
break;
@@ -684,13 +657,13 @@ static void get_properties_reply(DBusPendingCall *pending, void *userdata) {
pa_assert(p->call_data == d);
- if (d != NULL)
+ if (d != NULL) {
old_any_connected = pa_bluez4_device_any_audio_connected(d);
+ valid = dbus_message_get_type(r) == DBUS_MESSAGE_TYPE_ERROR ? -1 : 1;
- valid = dbus_message_get_type(r) == DBUS_MESSAGE_TYPE_ERROR ? -1 : 1;
-
- if (dbus_message_is_method_call(p->message, "org.bluez.Device", "GetProperties"))
- d->device_info_valid = valid;
+ if (dbus_message_is_method_call(p->message, "org.bluez.Device", "GetProperties"))
+ d->device_info_valid = valid;
+ }
if (dbus_message_is_error(r, DBUS_ERROR_SERVICE_UNKNOWN)) {
pa_log_debug("Bluetooth daemon is apparently not available.");
@@ -829,7 +802,7 @@ static void register_endpoint(pa_bluez4_discovery *y, const char *path, const ch
pa_dbus_append_basic_variant_dict_entry(&d, "Codec", DBUS_TYPE_BYTE, &codec);
- if (pa_streq(uuid, HFP_AG_UUID) || pa_streq(uuid, HFP_HS_UUID)) {
+ if (pa_streq(uuid, PA_BLUEZ4_UUID_HFP_AG) || pa_streq(uuid, PA_BLUEZ4_UUID_HFP_HF)) {
uint8_t capability = 0;
pa_dbus_append_basic_array_variant_dict_entry(&d, "Capabilities", DBUS_TYPE_BYTE, &capability, 1);
} else {
@@ -860,10 +833,10 @@ static void found_adapter(pa_bluez4_discovery *y, const char *path) {
pa_assert_se(m = dbus_message_new_method_call("org.bluez", path, "org.bluez.Adapter", "GetProperties"));
send_and_add_to_pending(y, m, get_properties_reply, NULL);
- register_endpoint(y, path, ENDPOINT_PATH_HFP_AG, HFP_AG_UUID);
- register_endpoint(y, path, ENDPOINT_PATH_HFP_HS, HFP_HS_UUID);
- register_endpoint(y, path, ENDPOINT_PATH_A2DP_SOURCE, A2DP_SOURCE_UUID);
- register_endpoint(y, path, ENDPOINT_PATH_A2DP_SINK, A2DP_SINK_UUID);
+ register_endpoint(y, path, ENDPOINT_PATH_HFP_AG, PA_BLUEZ4_UUID_HFP_AG);
+ register_endpoint(y, path, ENDPOINT_PATH_HFP_HS, PA_BLUEZ4_UUID_HFP_HF);
+ register_endpoint(y, path, ENDPOINT_PATH_A2DP_SOURCE, PA_BLUEZ4_UUID_A2DP_SOURCE);
+ register_endpoint(y, path, ENDPOINT_PATH_A2DP_SINK, PA_BLUEZ4_UUID_A2DP_SINK);
}
static void list_adapters(pa_bluez4_discovery *y) {
@@ -915,7 +888,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us
dbus_error_init(&err);
- pa_log_debug("dbus: interface=%s, path=%s, member=%s\n",
+ pa_log_debug("dbus: interface=%s, path=%s, member=%s",
dbus_message_get_interface(m),
dbus_message_get_path(m),
dbus_message_get_member(m));
@@ -1214,7 +1187,7 @@ void pa_bluez4_transport_set_microphone_gain(pa_bluez4_transport *t, uint16_t va
dbus_uint16_t gain = PA_MIN(value, HSP_MAX_GAIN);
pa_assert(t);
- pa_assert(t->profile == PA_BLUEZ4_PROFILE_HSP);
+ pa_assert(t->profile == PA_BLUEZ4_PROFILE_HEADSET_HEAD_UNIT);
set_property(t->device->discovery, "org.bluez", t->device->path, "org.bluez.Headset",
"MicrophoneGain", DBUS_TYPE_UINT16, &gain);
@@ -1224,7 +1197,7 @@ void pa_bluez4_transport_set_speaker_gain(pa_bluez4_transport *t, uint16_t value
dbus_uint16_t gain = PA_MIN(value, HSP_MAX_GAIN);
pa_assert(t);
- pa_assert(t->profile == PA_BLUEZ4_PROFILE_HSP);
+ pa_assert(t->profile == PA_BLUEZ4_PROFILE_HEADSET_HEAD_UNIT);
set_property(t->device->discovery, "org.bluez", t->device->path, "org.bluez.Headset",
"SpeakerGain", DBUS_TYPE_UINT16, &gain);
@@ -1265,6 +1238,18 @@ static pa_bluez4_transport *transport_new(pa_bluez4_device *d, const char *owner
return t;
}
+static void transport_set_state(pa_bluez4_transport *transport, pa_bluez4_transport_state_t state) {
+ if (transport->state == state)
+ return;
+
+ pa_log_debug("Transport %s state: %s -> %s",
+ transport->path, transport_state_to_string(transport->state), transport_state_to_string(state));
+
+ transport->state = state;
+
+ pa_hook_fire(&transport->device->discovery->hooks[PA_BLUEZ4_HOOK_TRANSPORT_STATE_CHANGED], transport);
+}
+
static DBusMessage *endpoint_set_configuration(DBusConnection *conn, DBusMessage *m, void *userdata) {
pa_bluez4_discovery *y = userdata;
pa_bluez4_device *d;
@@ -1344,11 +1329,11 @@ static DBusMessage *endpoint_set_configuration(DBusConnection *conn, DBusMessage
goto fail;
if (dbus_message_has_path(m, ENDPOINT_PATH_HFP_AG))
- p = PA_BLUEZ4_PROFILE_HSP;
+ p = PA_BLUEZ4_PROFILE_HEADSET_HEAD_UNIT;
else if (dbus_message_has_path(m, ENDPOINT_PATH_HFP_HS))
- p = PA_BLUEZ4_PROFILE_HFGW;
+ p = PA_BLUEZ4_PROFILE_HEADSET_AUDIO_GATEWAY;
else if (dbus_message_has_path(m, ENDPOINT_PATH_A2DP_SOURCE))
- p = PA_BLUEZ4_PROFILE_A2DP;
+ p = PA_BLUEZ4_PROFILE_A2DP_SINK;
else
p = PA_BLUEZ4_PROFILE_A2DP_SOURCE;
@@ -1409,8 +1394,7 @@ static DBusMessage *endpoint_clear_configuration(DBusConnection *c, DBusMessage
pa_log_debug("Clearing transport %s profile %d", t->path, t->profile);
t->device->transports[t->profile] = NULL;
pa_hashmap_remove(y->transports, t->path);
- t->state = PA_BLUEZ4_TRANSPORT_STATE_DISCONNECTED;
- pa_hook_fire(&y->hooks[PA_BLUEZ4_HOOK_TRANSPORT_STATE_CHANGED], t);
+ transport_set_state(t, PA_BLUEZ4_TRANSPORT_STATE_DISCONNECTED);
if (old_any_connected != pa_bluez4_device_any_audio_connected(t->device))
run_callback(t->device, false);
@@ -1888,16 +1872,3 @@ char *pa_bluez4_cleanup_name(const char *name) {
return t;
}
-
-bool pa_bluez4_uuid_has(pa_bluez4_uuid *uuids, const char *uuid) {
- pa_assert(uuid);
-
- while (uuids) {
- if (strcasecmp(uuids->uuid, uuid) == 0)
- return true;
-
- uuids = uuids->next;
- }
-
- return false;
-}
diff --git a/src/modules/bluetooth/bluez4-util.h b/src/modules/bluetooth/bluez4-util.h
index 7c76aac..ed588f1 100644
--- a/src/modules/bluetooth/bluez4-util.h
+++ b/src/modules/bluetooth/bluez4-util.h
@@ -27,39 +27,26 @@
#define PA_BLUEZ4_ERROR_NOT_SUPPORTED "org.bluez.Error.NotSupported"
-/* UUID copied from bluez/audio/device.h */
-#define GENERIC_AUDIO_UUID "00001203-0000-1000-8000-00805f9b34fb"
-
-#define HSP_HS_UUID "00001108-0000-1000-8000-00805f9b34fb"
-#define HSP_AG_UUID "00001112-0000-1000-8000-00805f9b34fb"
-
-#define HFP_HS_UUID "0000111e-0000-1000-8000-00805f9b34fb"
-#define HFP_AG_UUID "0000111f-0000-1000-8000-00805f9b34fb"
-
-#define ADVANCED_AUDIO_UUID "0000110d-0000-1000-8000-00805f9b34fb"
-
-#define A2DP_SOURCE_UUID "0000110a-0000-1000-8000-00805f9b34fb"
-#define A2DP_SINK_UUID "0000110b-0000-1000-8000-00805f9b34fb"
+#define PA_BLUEZ4_UUID_A2DP_SOURCE "0000110a-0000-1000-8000-00805f9b34fb"
+#define PA_BLUEZ4_UUID_A2DP_SINK "0000110b-0000-1000-8000-00805f9b34fb"
+#define PA_BLUEZ4_UUID_HSP_HS "00001108-0000-1000-8000-00805f9b34fb"
+#define PA_BLUEZ4_UUID_HSP_AG "00001112-0000-1000-8000-00805f9b34fb"
+#define PA_BLUEZ4_UUID_HFP_HF "0000111e-0000-1000-8000-00805f9b34fb"
+#define PA_BLUEZ4_UUID_HFP_AG "0000111f-0000-1000-8000-00805f9b34fb"
#define HSP_MAX_GAIN 15
-typedef struct pa_bluez4_uuid pa_bluez4_uuid;
typedef struct pa_bluez4_device pa_bluez4_device;
typedef struct pa_bluez4_discovery pa_bluez4_discovery;
typedef struct pa_bluez4_transport pa_bluez4_transport;
struct userdata;
-struct pa_bluez4_uuid {
- char *uuid;
- PA_LLIST_FIELDS(pa_bluez4_uuid);
-};
-
typedef enum pa_bluez4_profile {
- PA_BLUEZ4_PROFILE_A2DP,
+ PA_BLUEZ4_PROFILE_A2DP_SINK,
PA_BLUEZ4_PROFILE_A2DP_SOURCE,
- PA_BLUEZ4_PROFILE_HSP,
- PA_BLUEZ4_PROFILE_HFGW,
+ PA_BLUEZ4_PROFILE_HEADSET_HEAD_UNIT,
+ PA_BLUEZ4_PROFILE_HEADSET_AUDIO_GATEWAY,
PA_BLUEZ4_PROFILE_OFF
} pa_bluez4_profile_t;
@@ -123,9 +110,9 @@ struct pa_bluez4_device {
pa_bluez4_transport *transports[PA_BLUEZ4_PROFILE_COUNT];
int paired;
char *alias;
- PA_LLIST_HEAD(pa_bluez4_uuid, uuids);
char *address;
int class;
+ pa_hashmap *uuids; /* char* -> char* (hashmap-as-a-set) */
int trusted;
/* Audio state */
@@ -170,7 +157,6 @@ const char *pa_bluez4_form_factor_to_string(pa_bluez4_form_factor_t ff);
char *pa_bluez4_cleanup_name(const char *name);
-bool pa_bluez4_uuid_has(pa_bluez4_uuid *uuids, const char *uuid);
const char *pa_bluez4_profile_to_string(pa_bluez4_profile_t profile);
#endif
diff --git a/src/modules/bluetooth/bluez5-util.c b/src/modules/bluetooth/bluez5-util.c
index 03c76bf..7d63f35 100644
--- a/src/modules/bluetooth/bluez5-util.c
+++ b/src/modules/bluetooth/bluez5-util.c
@@ -21,6 +21,8 @@
#include <config.h>
#endif
+#include <pulse/rtclock.h>
+#include <pulse/timeval.h>
#include <pulse/xmalloc.h>
#include <pulsecore/core.h>
@@ -35,6 +37,8 @@
#include "bluez5-util.h"
+#define WAIT_FOR_PROFILES_TIMEOUT_USEC (3 * PA_USEC_PER_SEC)
+
#define BLUEZ_SERVICE "org.bluez"
#define BLUEZ_ADAPTER_INTERFACE BLUEZ_SERVICE ".Adapter1"
#define BLUEZ_DEVICE_INTERFACE BLUEZ_SERVICE ".Device1"
@@ -164,6 +168,95 @@ static const char *transport_state_to_string(pa_bluetooth_transport_state_t stat
return "invalid";
}
+static bool device_supports_profile(pa_bluetooth_device *device, pa_bluetooth_profile_t profile) {
+ switch (profile) {
+ case PA_BLUETOOTH_PROFILE_A2DP_SINK:
+ return !!pa_hashmap_get(device->uuids, PA_BLUETOOTH_UUID_A2DP_SINK);
+ case PA_BLUETOOTH_PROFILE_A2DP_SOURCE:
+ return !!pa_hashmap_get(device->uuids, PA_BLUETOOTH_UUID_A2DP_SOURCE);
+ case PA_BLUETOOTH_PROFILE_HEADSET_HEAD_UNIT:
+ return !!pa_hashmap_get(device->uuids, PA_BLUETOOTH_UUID_HSP_HS)
+ || !!pa_hashmap_get(device->uuids, PA_BLUETOOTH_UUID_HFP_HF);
+ case PA_BLUETOOTH_PROFILE_HEADSET_AUDIO_GATEWAY:
+ return !!pa_hashmap_get(device->uuids, PA_BLUETOOTH_UUID_HSP_AG)
+ || !!pa_hashmap_get(device->uuids, PA_BLUETOOTH_UUID_HFP_AG);
+ case PA_BLUETOOTH_PROFILE_OFF:
+ pa_assert_not_reached();
+ }
+
+ pa_assert_not_reached();
+}
+
+static bool device_is_profile_connected(pa_bluetooth_device *device, pa_bluetooth_profile_t profile) {
+ if (device->transports[profile] && device->transports[profile]->state != PA_BLUETOOTH_TRANSPORT_STATE_DISCONNECTED)
+ return true;
+ else
+ return false;
+}
+
+static unsigned device_count_disconnected_profiles(pa_bluetooth_device *device) {
+ pa_bluetooth_profile_t profile;
+ unsigned count = 0;
+
+ for (profile = 0; profile < PA_BLUETOOTH_PROFILE_COUNT; profile++) {
+ if (!device_supports_profile(device, profile))
+ continue;
+
+ if (!device_is_profile_connected(device, profile))
+ count++;
+ }
+
+ return count;
+}
+
+static void device_stop_waiting_for_profiles(pa_bluetooth_device *device) {
+ if (!device->wait_for_profiles_timer)
+ return;
+
+ device->discovery->core->mainloop->time_free(device->wait_for_profiles_timer);
+ device->wait_for_profiles_timer = NULL;
+}
+
+static void wait_for_profiles_cb(pa_mainloop_api *api, pa_time_event* event, const struct timeval *tv, void *userdata) {
+ pa_bluetooth_device *device = userdata;
+ pa_strbuf *buf;
+ pa_bluetooth_profile_t profile;
+ bool first = true;
+ char *profiles_str;
+
+ device_stop_waiting_for_profiles(device);
+
+ buf = pa_strbuf_new();
+
+ for (profile = 0; profile < PA_BLUETOOTH_PROFILE_COUNT; profile++) {
+ if (device_is_profile_connected(device, profile))
+ continue;
+
+ if (!device_supports_profile(device, profile))
+ continue;
+
+ if (first)
+ first = false;
+ else
+ pa_strbuf_puts(buf, ", ");
+
+ pa_strbuf_puts(buf, pa_bluetooth_profile_to_string(profile));
+ }
+
+ profiles_str = pa_strbuf_to_string_free(buf);
+ pa_log_debug("Timeout expired, and device %s still has disconnected profiles: %s",
+ device->path, profiles_str);
+ pa_xfree(profiles_str);
+ pa_hook_fire(&device->discovery->hooks[PA_BLUETOOTH_HOOK_DEVICE_CONNECTION_CHANGED], device);
+}
+
+static void device_start_waiting_for_profiles(pa_bluetooth_device *device) {
+ pa_assert(!device->wait_for_profiles_timer);
+ device->wait_for_profiles_timer = pa_core_rttime_new(device->discovery->core,
+ pa_rtclock_now() + WAIT_FOR_PROFILES_TIMEOUT_USEC,
+ wait_for_profiles_cb, device);
+}
+
void pa_bluetooth_transport_set_state(pa_bluetooth_transport *t, pa_bluetooth_transport_state_t state) {
bool old_any_connected;
@@ -174,15 +267,34 @@ void pa_bluetooth_transport_set_state(pa_bluetooth_transport *t, pa_bluetooth_tr
old_any_connected = pa_bluetooth_device_any_transport_connected(t->device);
- pa_log_debug("Transport %s state changed from %s to %s",
+ pa_log_debug("Transport %s state: %s -> %s",
t->path, transport_state_to_string(t->state), transport_state_to_string(state));
t->state = state;
pa_hook_fire(&t->device->discovery->hooks[PA_BLUETOOTH_HOOK_TRANSPORT_STATE_CHANGED], t);
- if (old_any_connected != pa_bluetooth_device_any_transport_connected(t->device))
- pa_hook_fire(&t->device->discovery->hooks[PA_BLUETOOTH_HOOK_DEVICE_CONNECTION_CHANGED], t->device);
+ if (old_any_connected != pa_bluetooth_device_any_transport_connected(t->device)) {
+ unsigned n_disconnected_profiles;
+
+ /* If there are profiles that are expected to get connected soon (based
+ * on the UUID list), we wait for a bit before announcing the new
+ * device, so that all profiles have time to get connected before the
+ * card object is created. If we didn't wait, the card would always
+ * have only one profile marked as available in the initial state,
+ * which would prevent module-card-restore from restoring the initial
+ * profile properly. */
+
+ n_disconnected_profiles = device_count_disconnected_profiles(t->device);
+
+ if (n_disconnected_profiles == 0)
+ device_stop_waiting_for_profiles(t->device);
+
+ if (!old_any_connected && n_disconnected_profiles > 0)
+ device_start_waiting_for_profiles(t->device);
+ else
+ pa_hook_fire(&t->device->discovery->hooks[PA_BLUETOOTH_HOOK_DEVICE_CONNECTION_CHANGED], t->device);
+ }
}
void pa_bluetooth_transport_put(pa_bluetooth_transport *t) {
@@ -416,6 +528,8 @@ static void device_free(pa_bluetooth_device *d) {
pa_assert(d);
+ device_stop_waiting_for_profiles(d);
+
for (i = 0; i < PA_BLUETOOTH_PROFILE_COUNT; i++) {
pa_bluetooth_transport *t;
@@ -618,8 +732,8 @@ static void parse_device_property(pa_bluetooth_device *d, DBusMessageIter *i) {
dbus_message_iter_recurse(&variant_i, &ai);
if (dbus_message_iter_get_arg_type(&ai) == DBUS_TYPE_STRING && pa_streq(key, "UUIDs")) {
- /* bluetoothd never removes UUIDs from a device object so there
- * is no need to handle it here. */
+ /* bluetoothd never removes UUIDs from a device object so we
+ * don't need to check for disappeared UUIDs here. */
while (dbus_message_iter_get_arg_type(&ai) != DBUS_TYPE_INVALID) {
const char *value;
char *uuid;
@@ -659,6 +773,7 @@ static void parse_device_properties(pa_bluetooth_device *d, DBusMessageIter *i)
if (!d->properties_received) {
d->properties_received = true;
+ device_update_valid(d);
if (!d->address || !d->adapter_path || !d->alias)
pa_log_error("Non-optional information missing for device %s", d->path);
diff --git a/src/modules/bluetooth/bluez5-util.h b/src/modules/bluetooth/bluez5-util.h
index d66e8a3..7f124e2 100644
--- a/src/modules/bluetooth/bluez5-util.h
+++ b/src/modules/bluetooth/bluez5-util.h
@@ -102,9 +102,11 @@ struct pa_bluetooth_device {
char *alias;
char *address;
uint32_t class_of_device;
- pa_hashmap *uuids;
+ pa_hashmap *uuids; /* char* -> char* (hashmap-as-a-set) */
pa_bluetooth_transport *transports[PA_BLUETOOTH_PROFILE_COUNT];
+
+ pa_time_event *wait_for_profiles_timer;
};
struct pa_bluetooth_adapter {
diff --git a/src/modules/bluetooth/module-bluetooth-policy.c b/src/modules/bluetooth/module-bluetooth-policy.c
index 4e51846..df702cc 100644
--- a/src/modules/bluetooth/module-bluetooth-policy.c
+++ b/src/modules/bluetooth/module-bluetooth-policy.c
@@ -33,16 +33,18 @@
#include "module-bluetooth-policy-symdef.h"
-PA_MODULE_AUTHOR("Frédéric Dalleau");
-PA_MODULE_DESCRIPTION("When a bluetooth sink or source is added, load module-loopback");
+PA_MODULE_AUTHOR("Frédéric Dalleau, Pali Rohár");
+PA_MODULE_DESCRIPTION("Policy module to make using bluetooth devices out-of-the-box easier");
PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_LOAD_ONCE(true);
PA_MODULE_USAGE(
+ "auto_switch=<Switch between hsp and a2dp profile?> "
"a2dp_source=<Handle a2dp_source card profile (sink role)?> "
"ag=<Handle headset_audio_gateway card profile (headset role)?> "
"hfgw=<Handle hfgw card profile (headset role)?> DEPRECATED");
static const char* const valid_modargs[] = {
+ "auto_switch",
"a2dp_source",
"ag",
"hfgw",
@@ -54,7 +56,12 @@ struct userdata {
bool enable_ag;
pa_hook_slot *source_put_slot;
pa_hook_slot *sink_put_slot;
+ pa_hook_slot *source_output_put_slot;
+ pa_hook_slot *source_output_unlink_slot;
+ pa_hook_slot *card_init_profile_slot;
+ pa_hook_slot *card_unlink_slot;
pa_hook_slot *profile_available_changed_slot;
+ pa_hashmap *will_need_revert_card_map;
};
/* When a source is created, loopback it to default sink */
@@ -137,6 +144,173 @@ static pa_hook_result_t sink_put_hook_callback(pa_core *c, pa_sink *sink, void *
return PA_HOOK_OK;
}
+static void card_set_profile(struct userdata *u, pa_card *card, bool revert_to_a2dp)
+{
+ pa_card_profile *profile;
+ void *state;
+
+ /* Find available profile and activate it */
+ PA_HASHMAP_FOREACH(profile, card->profiles, state) {
+ if (profile->available == PA_AVAILABLE_NO)
+ continue;
+
+ /* Check for correct profile based on revert_to_a2dp */
+ if (revert_to_a2dp) {
+ if (!pa_streq(profile->name, "a2dp") && !pa_streq(profile->name, "a2dp_sink"))
+ continue;
+ } else {
+ if (!pa_streq(profile->name, "hsp") && !pa_streq(profile->name, "headset_head_unit"))
+ continue;
+ }
+
+ pa_log_debug("Setting card '%s' to profile '%s'", card->name, profile->name);
+
+ if (pa_card_set_profile(card, profile, false) != 0) {
+ pa_log_warn("Could not set profile '%s'", profile->name);
+ continue;
+ }
+
+ /* When we are not in revert_to_a2dp phase flag this card for will_need_revert */
+ if (!revert_to_a2dp)
+ pa_hashmap_put(u->will_need_revert_card_map, card, PA_INT_TO_PTR(1));
+
+ break;
+ }
+}
+
+/* Switch profile for one card */
+static void switch_profile(pa_card *card, bool revert_to_a2dp, void *userdata) {
+ struct userdata *u = userdata;
+ const char *s;
+
+ /* Only consider bluetooth cards */
+ s = pa_proplist_gets(card->proplist, PA_PROP_DEVICE_BUS);
+ if (!s || !pa_streq(s, "bluetooth"))
+ return;
+
+ if (revert_to_a2dp) {
+ /* In revert_to_a2dp phase only consider cards with will_need_revert flag and remove it */
+ if (!pa_hashmap_remove(u->will_need_revert_card_map, card))
+ return;
+
+ /* Skip card if does not have active hsp profile */
+ if (!pa_streq(card->active_profile->name, "hsp") && !pa_streq(card->active_profile->name, "headset_head_unit"))
+ return;
+
+ /* Skip card if already has active a2dp profile */
+ if (pa_streq(card->active_profile->name, "a2dp") || pa_streq(card->active_profile->name, "a2dp_sink"))
+ return;
+ } else {
+ /* Skip card if does not have active a2dp profile */
+ if (!pa_streq(card->active_profile->name, "a2dp") && !pa_streq(card->active_profile->name, "a2dp_sink"))
+ return;
+
+ /* Skip card if already has active hsp profile */
+ if (pa_streq(card->active_profile->name, "hsp") || pa_streq(card->active_profile->name, "headset_head_unit"))
+ return;
+ }
+
+ card_set_profile(u, card, revert_to_a2dp);
+}
+
+/* Return true if we should ignore this source output */
+static bool ignore_output(pa_source_output *source_output) {
+ const char *s;
+
+ /* New applications could set media.role for identifying streams */
+ /* We are interested only in media.role=phone */
+ s = pa_proplist_gets(source_output->proplist, PA_PROP_MEDIA_ROLE);
+ if (s)
+ return !pa_streq(s, "phone");
+
+ return true;
+}
+
+static unsigned source_output_count(pa_core *c) {
+ pa_source_output *source_output;
+ uint32_t idx;
+ unsigned count = 0;
+
+ PA_IDXSET_FOREACH(source_output, c->source_outputs, idx)
+ if (!ignore_output(source_output))
+ ++count;
+
+ return count;
+}
+
+/* Switch profile for all cards */
+static void switch_profile_all(pa_idxset *cards, bool revert_to_a2dp, void *userdata) {
+ pa_card *card;
+ uint32_t idx;
+
+ PA_IDXSET_FOREACH(card, cards, idx)
+ switch_profile(card, revert_to_a2dp, userdata);
+}
+
+/* When a source output is created, switch profile a2dp to profile hsp */
+static pa_hook_result_t source_output_put_hook_callback(pa_core *c, pa_source_output *source_output, void *userdata) {
+ pa_assert(c);
+ pa_assert(source_output);
+
+ if (ignore_output(source_output))
+ return PA_HOOK_OK;
+
+ switch_profile_all(c->cards, false, userdata);
+ return PA_HOOK_OK;
+}
+
+/* When all source outputs are unlinked, switch profile hsp back back to profile a2dp */
+static pa_hook_result_t source_output_unlink_hook_callback(pa_core *c, pa_source_output *source_output, void *userdata) {
+ pa_assert(c);
+ pa_assert(source_output);
+
+ if (ignore_output(source_output))
+ return PA_HOOK_OK;
+
+ /* If there are still some source outputs do nothing. */
+ if (source_output_count(c) > 0)
+ return PA_HOOK_OK;
+
+ switch_profile_all(c->cards, true, userdata);
+ return PA_HOOK_OK;
+}
+
+static pa_hook_result_t card_init_profile_hook_callback(pa_core *c, pa_card *card, void *userdata) {
+ struct userdata *u = userdata;
+ const char *s;
+
+ pa_assert(c);
+ pa_assert(card);
+
+ if (source_output_count(c) == 0)
+ return PA_HOOK_OK;
+
+ /* Only consider bluetooth cards */
+ s = pa_proplist_gets(card->proplist, PA_PROP_DEVICE_BUS);
+ if (!s || !pa_streq(s, "bluetooth"))
+ return PA_HOOK_OK;
+
+ /* Ignore card if has already set other initial profile than a2dp */
+ if (card->active_profile &&
+ !pa_streq(card->active_profile->name, "a2dp") &&
+ !pa_streq(card->active_profile->name, "a2dp_sink"))
+ return PA_HOOK_OK;
+
+ /* Set initial profile to hsp */
+ card_set_profile(u, card, false);
+
+ /* Flag this card for will_need_revert */
+ pa_hashmap_put(u->will_need_revert_card_map, card, PA_INT_TO_PTR(1));
+ return PA_HOOK_OK;
+}
+
+static pa_hook_result_t card_unlink_hook_callback(pa_core *c, pa_card *card, void *userdata) {
+ pa_assert(c);
+ pa_assert(card);
+ switch_profile(card, true, userdata);
+ return PA_HOOK_OK;
+}
+
static pa_card_profile *find_best_profile(pa_card *card) {
void *state;
pa_card_profile *profile;
@@ -220,6 +394,7 @@ static void handle_all_profiles(pa_core *core) {
int pa__init(pa_module *m) {
pa_modargs *ma;
struct userdata *u;
+ bool auto_switch;
pa_assert(m);
@@ -230,6 +405,12 @@ int pa__init(pa_module *m) {
m->userdata = u = pa_xnew0(struct userdata, 1);
+ auto_switch = true;
+ if (pa_modargs_get_value_boolean(ma, "auto_switch", &auto_switch) < 0) {
+ pa_log("Failed to parse auto_switch argument.");
+ goto fail;
+ }
+
u->enable_a2dp_source = true;
if (pa_modargs_get_value_boolean(ma, "a2dp_source", &u->enable_a2dp_source) < 0) {
pa_log("Failed to parse a2dp_source argument.");
@@ -246,12 +427,28 @@ int pa__init(pa_module *m) {
goto fail;
}
+ u->will_need_revert_card_map = pa_hashmap_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
+
u->source_put_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_PUT], PA_HOOK_NORMAL,
(pa_hook_cb_t) source_put_hook_callback, u);
u->sink_put_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SINK_PUT], PA_HOOK_NORMAL,
(pa_hook_cb_t) sink_put_hook_callback, u);
+ if (auto_switch) {
+ u->source_output_put_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_PUT], PA_HOOK_NORMAL,
+ (pa_hook_cb_t) source_output_put_hook_callback, u);
+
+ u->source_output_unlink_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_UNLINK_POST], PA_HOOK_NORMAL,
+ (pa_hook_cb_t) source_output_unlink_hook_callback, u);
+
+ u->card_init_profile_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_CARD_CHOOSE_INITIAL_PROFILE], PA_HOOK_NORMAL,
+ (pa_hook_cb_t) card_init_profile_hook_callback, u);
+
+ u->card_unlink_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_CARD_UNLINK], PA_HOOK_NORMAL,
+ (pa_hook_cb_t) card_unlink_hook_callback, u);
+ }
+
u->profile_available_changed_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_CARD_PROFILE_AVAILABLE_CHANGED],
PA_HOOK_NORMAL, (pa_hook_cb_t) profile_available_hook_callback, u);
@@ -280,8 +477,22 @@ void pa__done(pa_module *m) {
if (u->sink_put_slot)
pa_hook_slot_free(u->sink_put_slot);
+ if (u->source_output_put_slot)
+ pa_hook_slot_free(u->source_output_put_slot);
+
+ if (u->source_output_unlink_slot)
+ pa_hook_slot_free(u->source_output_unlink_slot);
+
+ if (u->card_init_profile_slot)
+ pa_hook_slot_free(u->card_init_profile_slot);
+
+ if (u->card_unlink_slot)
+ pa_hook_slot_free(u->card_unlink_slot);
+
if (u->profile_available_changed_slot)
pa_hook_slot_free(u->profile_available_changed_slot);
+ pa_hashmap_free(u->will_need_revert_card_map);
+
pa_xfree(u);
}
diff --git a/src/modules/bluetooth/module-bluez4-device.c b/src/modules/bluetooth/module-bluez4-device.c
index 9a921a5..ac4ed63 100644
--- a/src/modules/bluetooth/module-bluez4-device.c
+++ b/src/modules/bluetooth/module-bluez4-device.c
@@ -198,7 +198,7 @@ enum {
#define MAX_PLAYBACK_CATCH_UP_USEC (100*PA_USEC_PER_MSEC)
-#define USE_SCO_OVER_PCM(u) (u->profile == PA_BLUEZ4_PROFILE_HSP && (u->hsp.sco_sink && u->hsp.sco_source))
+#define USE_SCO_OVER_PCM(u) (u->profile == PA_BLUEZ4_PROFILE_HEADSET_HEAD_UNIT && (u->hsp.sco_sink && u->hsp.sco_source))
static int init_profile(struct userdata *u);
@@ -241,7 +241,7 @@ static void a2dp_set_bitpool(struct userdata *u, uint8_t bitpool) {
/* from IO thread, except in SCO over PCM */
static void bt_transport_config_mtu(struct userdata *u) {
/* Calculate block sizes */
- if (u->profile == PA_BLUEZ4_PROFILE_HSP || u->profile == PA_BLUEZ4_PROFILE_HFGW) {
+ if (u->profile == PA_BLUEZ4_PROFILE_HEADSET_HEAD_UNIT || u->profile == PA_BLUEZ4_PROFILE_HEADSET_AUDIO_GATEWAY) {
u->read_block_size = u->read_link_mtu;
u->write_block_size = u->write_link_mtu;
} else {
@@ -260,7 +260,7 @@ static void bt_transport_config_mtu(struct userdata *u) {
if (u->sink) {
pa_sink_set_max_request_within_thread(u->sink, u->write_block_size);
pa_sink_set_fixed_latency_within_thread(u->sink,
- (u->profile == PA_BLUEZ4_PROFILE_A2DP ?
+ (u->profile == PA_BLUEZ4_PROFILE_A2DP_SINK ?
FIXED_LATENCY_PLAYBACK_A2DP : FIXED_LATENCY_PLAYBACK_HSP) +
pa_bytes_to_usec(u->write_block_size, &u->sample_spec));
}
@@ -291,7 +291,7 @@ static void setup_stream(struct userdata *u) {
pa_log_debug("Stream properly set up, we're ready to roll!");
- if (u->profile == PA_BLUEZ4_PROFILE_A2DP)
+ if (u->profile == PA_BLUEZ4_PROFILE_A2DP_SINK)
a2dp_set_bitpool(u, u->a2dp.max_bitpool);
u->rtpoll_item = pa_rtpoll_item_new(u->rtpoll, PA_RTPOLL_NEVER, 1);
@@ -550,7 +550,7 @@ static int hsp_process_render(struct userdata *u) {
int ret = 0;
pa_assert(u);
- pa_assert(u->profile == PA_BLUEZ4_PROFILE_HSP || u->profile == PA_BLUEZ4_PROFILE_HFGW);
+ pa_assert(u->profile == PA_BLUEZ4_PROFILE_HEADSET_HEAD_UNIT || u->profile == PA_BLUEZ4_PROFILE_HEADSET_AUDIO_GATEWAY);
pa_assert(u->sink);
/* First, render some data */
@@ -615,7 +615,7 @@ static int hsp_process_push(struct userdata *u) {
pa_memchunk memchunk;
pa_assert(u);
- pa_assert(u->profile == PA_BLUEZ4_PROFILE_HSP || u->profile == PA_BLUEZ4_PROFILE_HFGW);
+ pa_assert(u->profile == PA_BLUEZ4_PROFILE_HEADSET_HEAD_UNIT || u->profile == PA_BLUEZ4_PROFILE_HEADSET_AUDIO_GATEWAY);
pa_assert(u->source);
pa_assert(u->read_smoother);
@@ -733,7 +733,7 @@ static int a2dp_process_render(struct userdata *u) {
int ret = 0;
pa_assert(u);
- pa_assert(u->profile == PA_BLUEZ4_PROFILE_A2DP);
+ pa_assert(u->profile == PA_BLUEZ4_PROFILE_A2DP_SINK);
pa_assert(u->sink);
/* First, render some data */
@@ -1028,7 +1028,7 @@ static void thread_func(void *userdata) {
if (pollfd && (pollfd->revents & POLLIN)) {
int n_read;
- if (u->profile == PA_BLUEZ4_PROFILE_HSP || u->profile == PA_BLUEZ4_PROFILE_HFGW)
+ if (u->profile == PA_BLUEZ4_PROFILE_HEADSET_HEAD_UNIT || u->profile == PA_BLUEZ4_PROFILE_HEADSET_AUDIO_GATEWAY)
n_read = hsp_process_push(u);
else
n_read = a2dp_process_push(u);
@@ -1086,7 +1086,7 @@ static void thread_func(void *userdata) {
pa_memblock_unref(tmp.memblock);
u->write_index += skip_bytes;
- if (u->profile == PA_BLUEZ4_PROFILE_A2DP)
+ if (u->profile == PA_BLUEZ4_PROFILE_A2DP_SINK)
a2dp_reduce_bitpool(u);
}
}
@@ -1102,7 +1102,7 @@ static void thread_func(void *userdata) {
if (u->write_index <= 0)
u->started_at = pa_rtclock_now();
- if (u->profile == PA_BLUEZ4_PROFILE_A2DP) {
+ if (u->profile == PA_BLUEZ4_PROFILE_A2DP_SINK) {
if ((n_written = a2dp_process_render(u)) < 0)
goto io_fail;
} else {
@@ -1202,10 +1202,10 @@ static pa_available_t transport_state_to_availability(pa_bluez4_transport_state_
static pa_direction_t get_profile_direction(pa_bluez4_profile_t p) {
static const pa_direction_t profile_direction[] = {
- [PA_BLUEZ4_PROFILE_A2DP] = PA_DIRECTION_OUTPUT,
+ [PA_BLUEZ4_PROFILE_A2DP_SINK] = PA_DIRECTION_OUTPUT,
[PA_BLUEZ4_PROFILE_A2DP_SOURCE] = PA_DIRECTION_INPUT,
- [PA_BLUEZ4_PROFILE_HSP] = PA_DIRECTION_INPUT | PA_DIRECTION_OUTPUT,
- [PA_BLUEZ4_PROFILE_HFGW] = PA_DIRECTION_INPUT | PA_DIRECTION_OUTPUT,
+ [PA_BLUEZ4_PROFILE_HEADSET_HEAD_UNIT] = PA_DIRECTION_INPUT | PA_DIRECTION_OUTPUT,
+ [PA_BLUEZ4_PROFILE_HEADSET_AUDIO_GATEWAY] = PA_DIRECTION_INPUT | PA_DIRECTION_OUTPUT,
[PA_BLUEZ4_PROFILE_OFF] = 0
};
@@ -1327,7 +1327,7 @@ static void sink_set_volume_cb(pa_sink *s) {
pa_assert(u);
pa_assert(u->sink == s);
- pa_assert(u->profile == PA_BLUEZ4_PROFILE_HSP);
+ pa_assert(u->profile == PA_BLUEZ4_PROFILE_HEADSET_HEAD_UNIT);
pa_assert(u->transport);
gain = (dbus_uint16_t) round((double) pa_cvolume_max(&s->real_volume) * HSP_MAX_GAIN / PA_VOLUME_NORM);
@@ -1354,7 +1354,7 @@ static void source_set_volume_cb(pa_source *s) {
pa_assert(u);
pa_assert(u->source == s);
- pa_assert(u->profile == PA_BLUEZ4_PROFILE_HSP);
+ pa_assert(u->profile == PA_BLUEZ4_PROFILE_HEADSET_HEAD_UNIT);
pa_assert(u->transport);
gain = (dbus_uint16_t) round((double) pa_cvolume_max(&s->real_volume) * HSP_MAX_GAIN / PA_VOLUME_NORM);
@@ -1562,7 +1562,7 @@ static int add_sink(struct userdata *u) {
data.module = u->module;
pa_sink_new_data_set_sample_spec(&data, &u->sample_spec);
pa_proplist_sets(data.proplist, "bluetooth.protocol", pa_bluez4_profile_to_string(u->profile));
- if (u->profile == PA_BLUEZ4_PROFILE_HSP)
+ if (u->profile == PA_BLUEZ4_PROFILE_HEADSET_HEAD_UNIT)
pa_proplist_sets(data.proplist, PA_PROP_DEVICE_INTENDED_ROLES, "phone");
data.card = u->card;
data.name = get_name("sink", u->modargs, u->address, pa_bluez4_profile_to_string(u->profile), &b);
@@ -1577,11 +1577,11 @@ static int add_sink(struct userdata *u) {
if (!u->transport_acquired)
switch (u->profile) {
- case PA_BLUEZ4_PROFILE_A2DP:
- case PA_BLUEZ4_PROFILE_HSP:
+ case PA_BLUEZ4_PROFILE_A2DP_SINK:
+ case PA_BLUEZ4_PROFILE_HEADSET_HEAD_UNIT:
pa_assert_not_reached(); /* Profile switch should have failed */
break;
- case PA_BLUEZ4_PROFILE_HFGW:
+ case PA_BLUEZ4_PROFILE_HEADSET_AUDIO_GATEWAY:
data.suspend_cause = PA_SUSPEND_USER;
break;
case PA_BLUEZ4_PROFILE_A2DP_SOURCE:
@@ -1602,7 +1602,7 @@ static int add_sink(struct userdata *u) {
u->sink->set_port = sink_set_port_cb;
}
- if (u->profile == PA_BLUEZ4_PROFILE_HSP) {
+ if (u->profile == PA_BLUEZ4_PROFILE_HEADSET_HEAD_UNIT) {
pa_sink_set_set_volume_callback(u->sink, sink_set_volume_cb);
u->sink->n_volume_steps = 16;
@@ -1632,7 +1632,7 @@ static int add_source(struct userdata *u) {
data.module = u->module;
pa_source_new_data_set_sample_spec(&data, &u->sample_spec);
pa_proplist_sets(data.proplist, "bluetooth.protocol", pa_bluez4_profile_to_string(u->profile));
- if (u->profile == PA_BLUEZ4_PROFILE_HSP)
+ if (u->profile == PA_BLUEZ4_PROFILE_HEADSET_HEAD_UNIT)
pa_proplist_sets(data.proplist, PA_PROP_DEVICE_INTENDED_ROLES, "phone");
data.card = u->card;
@@ -1649,14 +1649,14 @@ static int add_source(struct userdata *u) {
if (!u->transport_acquired)
switch (u->profile) {
- case PA_BLUEZ4_PROFILE_HSP:
+ case PA_BLUEZ4_PROFILE_HEADSET_HEAD_UNIT:
pa_assert_not_reached(); /* Profile switch should have failed */
break;
case PA_BLUEZ4_PROFILE_A2DP_SOURCE:
- case PA_BLUEZ4_PROFILE_HFGW:
+ case PA_BLUEZ4_PROFILE_HEADSET_AUDIO_GATEWAY:
data.suspend_cause = PA_SUSPEND_USER;
break;
- case PA_BLUEZ4_PROFILE_A2DP:
+ case PA_BLUEZ4_PROFILE_A2DP_SINK:
case PA_BLUEZ4_PROFILE_OFF:
pa_assert_not_reached();
}
@@ -1674,12 +1674,12 @@ static int add_source(struct userdata *u) {
u->source->set_port = source_set_port_cb;
}
- if ((u->profile == PA_BLUEZ4_PROFILE_HSP) || (u->profile == PA_BLUEZ4_PROFILE_HFGW)) {
+ if ((u->profile == PA_BLUEZ4_PROFILE_HEADSET_HEAD_UNIT) || (u->profile == PA_BLUEZ4_PROFILE_HEADSET_AUDIO_GATEWAY)) {
pa_bluez4_transport *t = u->transport;
pa_proplist_sets(u->source->proplist, "bluetooth.nrec", t->nrec ? "1" : "0");
}
- if (u->profile == PA_BLUEZ4_PROFILE_HSP) {
+ if (u->profile == PA_BLUEZ4_PROFILE_HEADSET_HEAD_UNIT) {
pa_source_set_set_volume_callback(u->source, source_set_volume_cb);
u->source->n_volume_steps = 16;
@@ -1794,16 +1794,16 @@ static void bt_transport_config_a2dp(struct userdata *u) {
a2dp->max_bitpool = config->max_bitpool;
/* Set minimum bitpool for source to get the maximum possible block_size */
- a2dp->sbc.bitpool = u->profile == PA_BLUEZ4_PROFILE_A2DP ? a2dp->max_bitpool : a2dp->min_bitpool;
+ a2dp->sbc.bitpool = u->profile == PA_BLUEZ4_PROFILE_A2DP_SINK ? a2dp->max_bitpool : a2dp->min_bitpool;
a2dp->codesize = sbc_get_codesize(&a2dp->sbc);
a2dp->frame_length = sbc_get_frame_length(&a2dp->sbc);
- pa_log_info("SBC parameters:\n\tallocation=%u\n\tsubbands=%u\n\tblocks=%u\n\tbitpool=%u\n",
+ pa_log_info("SBC parameters:\n\tallocation=%u\n\tsubbands=%u\n\tblocks=%u\n\tbitpool=%u",
a2dp->sbc.allocation, a2dp->sbc.subbands, a2dp->sbc.blocks, a2dp->sbc.bitpool);
}
static void bt_transport_config(struct userdata *u) {
- if (u->profile == PA_BLUEZ4_PROFILE_HSP || u->profile == PA_BLUEZ4_PROFILE_HFGW) {
+ if (u->profile == PA_BLUEZ4_PROFILE_HEADSET_HEAD_UNIT || u->profile == PA_BLUEZ4_PROFILE_HEADSET_AUDIO_GATEWAY) {
u->sample_spec.format = PA_SAMPLE_S16LE;
u->sample_spec.channels = 1;
u->sample_spec.rate = 8000;
@@ -1842,7 +1842,7 @@ static int setup_transport(struct userdata *u) {
u->transport = t;
- if (u->profile == PA_BLUEZ4_PROFILE_A2DP_SOURCE || u->profile == PA_BLUEZ4_PROFILE_HFGW)
+ if (u->profile == PA_BLUEZ4_PROFILE_A2DP_SOURCE || u->profile == PA_BLUEZ4_PROFILE_HEADSET_AUDIO_GATEWAY)
bt_transport_acquire(u, true); /* In case of error, the sink/sources will be created suspended */
else if (bt_transport_acquire(u, false) < 0)
return -1; /* We need to fail here until the interactions with module-suspend-on-idle and alike get improved */
@@ -1863,15 +1863,15 @@ static int init_profile(struct userdata *u) {
pa_assert(u->transport);
- if (u->profile == PA_BLUEZ4_PROFILE_A2DP ||
- u->profile == PA_BLUEZ4_PROFILE_HSP ||
- u->profile == PA_BLUEZ4_PROFILE_HFGW)
+ if (u->profile == PA_BLUEZ4_PROFILE_A2DP_SINK ||
+ u->profile == PA_BLUEZ4_PROFILE_HEADSET_HEAD_UNIT ||
+ u->profile == PA_BLUEZ4_PROFILE_HEADSET_AUDIO_GATEWAY)
if (add_sink(u) < 0)
r = -1;
- if (u->profile == PA_BLUEZ4_PROFILE_HSP ||
+ if (u->profile == PA_BLUEZ4_PROFILE_HEADSET_HEAD_UNIT ||
u->profile == PA_BLUEZ4_PROFILE_A2DP_SOURCE ||
- u->profile == PA_BLUEZ4_PROFILE_HFGW)
+ u->profile == PA_BLUEZ4_PROFILE_HEADSET_AUDIO_GATEWAY)
if (add_source(u) < 0)
r = -1;
@@ -1914,7 +1914,7 @@ static void stop_thread(struct userdata *u) {
}
if (u->sink) {
- if (u->profile == PA_BLUEZ4_PROFILE_HSP) {
+ if (u->profile == PA_BLUEZ4_PROFILE_HEADSET_HEAD_UNIT) {
k = pa_sprintf_malloc("bluetooth-device@%p", (void*) u->sink);
pa_shared_remove(u->core, k);
pa_xfree(k);
@@ -1925,7 +1925,7 @@ static void stop_thread(struct userdata *u) {
}
if (u->source) {
- if (u->profile == PA_BLUEZ4_PROFILE_HSP) {
+ if (u->profile == PA_BLUEZ4_PROFILE_HEADSET_HEAD_UNIT) {
k = pa_sprintf_malloc("bluetooth-device@%p", (void*) u->source);
pa_shared_remove(u->core, k);
pa_xfree(k);
@@ -1949,7 +1949,11 @@ static int start_thread(struct userdata *u) {
pa_assert(!u->rtpoll_item);
u->rtpoll = pa_rtpoll_new();
- pa_thread_mq_init(&u->thread_mq, u->core->mainloop, u->rtpoll);
+
+ if (pa_thread_mq_init(&u->thread_mq, u->core->mainloop, u->rtpoll) < 0) {
+ pa_log("pa_thread_mq_init() failed.");
+ return -1;
+ }
if (USE_SCO_OVER_PCM(u)) {
if (sco_over_pcm_state_update(u, false) < 0) {
@@ -2162,18 +2166,23 @@ static void create_card_ports(struct userdata *u, pa_hashmap *ports) {
}
/* Run from main thread */
-static pa_card_profile *create_card_profile(struct userdata *u, const char *uuid, pa_hashmap *ports) {
+static pa_card_profile *create_card_profile(struct userdata *u, pa_bluez4_profile_t profile, pa_hashmap *ports) {
pa_device_port *input_port, *output_port;
+ const char *name;
pa_card_profile *p = NULL;
- pa_bluez4_profile_t *d;
+ pa_bluez4_profile_t *d = NULL;
+ pa_bluez4_transport *t;
pa_assert(u->input_port_name);
pa_assert(u->output_port_name);
pa_assert_se(input_port = pa_hashmap_get(ports, u->input_port_name));
pa_assert_se(output_port = pa_hashmap_get(ports, u->output_port_name));
- if (pa_streq(uuid, A2DP_SINK_UUID)) {
- p = pa_card_profile_new("a2dp", _("High Fidelity Playback (A2DP)"), sizeof(pa_bluez4_profile_t));
+ name = pa_bluez4_profile_to_string(profile);
+
+ switch (profile) {
+ case PA_BLUEZ4_PROFILE_A2DP_SINK:
+ p = pa_card_profile_new(name, _("High Fidelity Playback (A2DP)"), sizeof(pa_bluez4_profile_t));
p->priority = 10;
p->n_sinks = 1;
p->n_sources = 0;
@@ -2182,9 +2191,10 @@ static pa_card_profile *create_card_profile(struct userdata *u, const char *uuid
pa_hashmap_put(output_port->profiles, p->name, p);
d = PA_CARD_PROFILE_DATA(p);
- *d = PA_BLUEZ4_PROFILE_A2DP;
- } else if (pa_streq(uuid, A2DP_SOURCE_UUID)) {
- p = pa_card_profile_new("a2dp_source", _("High Fidelity Capture (A2DP)"), sizeof(pa_bluez4_profile_t));
+ break;
+
+ case PA_BLUEZ4_PROFILE_A2DP_SOURCE:
+ p = pa_card_profile_new(name, _("High Fidelity Capture (A2DP)"), sizeof(pa_bluez4_profile_t));
p->priority = 10;
p->n_sinks = 0;
p->n_sources = 1;
@@ -2193,9 +2203,10 @@ static pa_card_profile *create_card_profile(struct userdata *u, const char *uuid
pa_hashmap_put(input_port->profiles, p->name, p);
d = PA_CARD_PROFILE_DATA(p);
- *d = PA_BLUEZ4_PROFILE_A2DP_SOURCE;
- } else if (pa_streq(uuid, HSP_HS_UUID) || pa_streq(uuid, HFP_HS_UUID)) {
- p = pa_card_profile_new("hsp", _("Telephony Duplex (HSP/HFP)"), sizeof(pa_bluez4_profile_t));
+ break;
+
+ case PA_BLUEZ4_PROFILE_HEADSET_HEAD_UNIT:
+ p = pa_card_profile_new(name, _("Telephony Duplex (HSP/HFP)"), sizeof(pa_bluez4_profile_t));
p->priority = 20;
p->n_sinks = 1;
p->n_sources = 1;
@@ -2205,9 +2216,10 @@ static pa_card_profile *create_card_profile(struct userdata *u, const char *uuid
pa_hashmap_put(output_port->profiles, p->name, p);
d = PA_CARD_PROFILE_DATA(p);
- *d = PA_BLUEZ4_PROFILE_HSP;
- } else if (pa_streq(uuid, HFP_AG_UUID)) {
- p = pa_card_profile_new("hfgw", _("Handsfree Gateway"), sizeof(pa_bluez4_profile_t));
+ break;
+
+ case PA_BLUEZ4_PROFILE_HEADSET_AUDIO_GATEWAY:
+ p = pa_card_profile_new(name, _("Handsfree Gateway"), sizeof(pa_bluez4_profile_t));
p->priority = 20;
p->n_sinks = 1;
p->n_sources = 1;
@@ -2217,19 +2229,35 @@ static pa_card_profile *create_card_profile(struct userdata *u, const char *uuid
pa_hashmap_put(output_port->profiles, p->name, p);
d = PA_CARD_PROFILE_DATA(p);
- *d = PA_BLUEZ4_PROFILE_HFGW;
+ break;
+
+ case PA_BLUEZ4_PROFILE_OFF:
+ pa_assert_not_reached();
}
- if (p) {
- pa_bluez4_transport *t;
+ *d = profile;
- if ((t = u->device->transports[*d]))
- p->available = transport_state_to_availability(t->state);
- }
+ if ((t = u->device->transports[*d]))
+ p->available = transport_state_to_availability(t->state);
return p;
}
+static int uuid_to_profile(const char *uuid, pa_bluez4_profile_t *_r) {
+ if (pa_streq(uuid, PA_BLUEZ4_UUID_A2DP_SINK))
+ *_r = PA_BLUEZ4_PROFILE_A2DP_SINK;
+ else if (pa_streq(uuid, PA_BLUEZ4_UUID_A2DP_SOURCE))
+ *_r = PA_BLUEZ4_PROFILE_A2DP_SOURCE;
+ else if (pa_streq(uuid, PA_BLUEZ4_UUID_HSP_HS) || pa_streq(uuid, PA_BLUEZ4_UUID_HFP_HF))
+ *_r = PA_BLUEZ4_PROFILE_HEADSET_HEAD_UNIT;
+ else if (pa_streq(uuid, PA_BLUEZ4_UUID_HSP_AG) || pa_streq(uuid, PA_BLUEZ4_UUID_HFP_AG))
+ *_r = PA_BLUEZ4_PROFILE_HEADSET_AUDIO_GATEWAY;
+ else
+ return -PA_ERR_INVALID;
+
+ return 0;
+}
+
/* Run from main thread */
static int add_card(struct userdata *u) {
pa_card_new_data data;
@@ -2238,9 +2266,10 @@ static int add_card(struct userdata *u) {
pa_bluez4_profile_t *d;
pa_bluez4_form_factor_t ff;
char *n;
- const char *default_profile;
+ const char *profile_str;
const pa_bluez4_device *device;
- const pa_bluez4_uuid *uuid;
+ const char *uuid;
+ void *state;
pa_assert(u);
pa_assert(u->device);
@@ -2276,17 +2305,16 @@ static int add_card(struct userdata *u) {
create_card_ports(u, data.ports);
- PA_LLIST_FOREACH(uuid, device->uuids) {
- p = create_card_profile(u, uuid->uuid, data.ports);
+ PA_HASHMAP_FOREACH(uuid, device->uuids, state) {
+ pa_bluez4_profile_t profile;
- if (!p)
+ if (uuid_to_profile(uuid, &profile) < 0)
continue;
- if (pa_hashmap_get(data.profiles, p->name)) {
- pa_card_profile_free(p);
+ if (pa_hashmap_get(data.profiles, pa_bluez4_profile_to_string(profile)))
continue;
- }
+ p = create_card_profile(u, profile, data.ports);
pa_hashmap_put(data.profiles, p->name, p);
}
@@ -2298,13 +2326,6 @@ static int add_card(struct userdata *u) {
*d = PA_BLUEZ4_PROFILE_OFF;
pa_hashmap_put(data.profiles, p->name, p);
- if ((default_profile = pa_modargs_get_value(u->modargs, "profile", NULL))) {
- if (pa_hashmap_get(data.profiles, default_profile))
- pa_card_new_data_set_profile(&data, default_profile);
- else
- pa_log_warn("Profile '%s' not valid or not supported by device.", default_profile);
- }
-
u->card = pa_card_new(u->core, &data);
pa_card_new_data_done(&data);
@@ -2316,6 +2337,25 @@ static int add_card(struct userdata *u) {
u->card->userdata = u;
u->card->set_profile = card_set_profile;
+ pa_card_choose_initial_profile(u->card);
+
+ /* If the "profile" modarg is given, we have to override whatever the usual
+ * policy chose in pa_card_choose_initial_profile(). */
+ profile_str = pa_modargs_get_value(u->modargs, "profile", NULL);
+ if (profile_str) {
+ pa_card_profile *profile;
+
+ profile = pa_hashmap_get(u->card->profiles, profile_str);
+ if (!profile) {
+ pa_log("No such profile: %s", profile_str);
+ return -1;
+ }
+
+ pa_card_set_profile(u->card, profile, false);
+ }
+
+ pa_card_put(u->card);
+
d = PA_CARD_PROFILE_DATA(u->card->active_profile);
if (*d != PA_BLUEZ4_PROFILE_OFF && (!device->transports[*d] ||
@@ -2374,6 +2414,7 @@ static pa_bluez4_device* find_device(struct userdata *u, const char *address, co
/* Run from main thread */
static pa_hook_result_t uuid_added_cb(pa_bluez4_discovery *y, const struct pa_bluez4_hook_uuid_data *data,
struct userdata *u) {
+ pa_bluez4_profile_t profile;
pa_card_profile *p;
pa_assert(data);
@@ -2384,16 +2425,13 @@ static pa_hook_result_t uuid_added_cb(pa_bluez4_discovery *y, const struct pa_bl
if (data->device != u->device)
return PA_HOOK_OK;
- p = create_card_profile(u, data->uuid, u->card->ports);
-
- if (!p)
+ if (uuid_to_profile(data->uuid, &profile) < 0)
return PA_HOOK_OK;
- if (pa_hashmap_get(u->card->profiles, p->name)) {
- pa_card_profile_free(p);
+ if (pa_hashmap_get(u->card->profiles, pa_bluez4_profile_to_string(profile)))
return PA_HOOK_OK;
- }
+ p = create_card_profile(u, profile, u->card->ports);
pa_card_add_profile(u->card, p);
return PA_HOOK_OK;
diff --git a/src/modules/bluetooth/module-bluez4-discover.c b/src/modules/bluetooth/module-bluez4-discover.c
index e39036a..cac7510 100644
--- a/src/modules/bluetooth/module-bluez4-discover.c
+++ b/src/modules/bluetooth/module-bluez4-discover.c
@@ -124,7 +124,7 @@ static pa_hook_result_t load_module_for_device(pa_bluez4_discovery *y, const pa_
int pa__init(pa_module* m) {
struct userdata *u;
- pa_modargs *ma = NULL;
+ pa_modargs *ma;
pa_assert(m);
@@ -140,7 +140,6 @@ int pa__init(pa_module* m) {
u->module = m;
u->core = m->core;
u->modargs = ma;
- ma = NULL;
u->hashmap = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
if (!(u->discovery = pa_bluez4_discovery_get(u->core)))
@@ -154,9 +153,6 @@ int pa__init(pa_module* m) {
fail:
pa__done(m);
- if (ma)
- pa_modargs_free(ma);
-
return -1;
}
diff --git a/src/modules/bluetooth/module-bluez5-device.c b/src/modules/bluetooth/module-bluez5-device.c
index 84e6d55..065fcaa 100644
--- a/src/modules/bluetooth/module-bluez5-device.c
+++ b/src/modules/bluetooth/module-bluez5-device.c
@@ -947,7 +947,7 @@ static int add_source(struct userdata *u) {
data.module = u->module;
data.card = u->card;
data.driver = __FILE__;
- data.name = pa_sprintf_malloc("bluez_source.%s", u->device->address);
+ data.name = pa_sprintf_malloc("bluez_source.%s.%s", u->device->address, pa_bluetooth_profile_to_string(u->profile));
data.namereg_fail = false;
pa_proplist_sets(data.proplist, "bluetooth.protocol", pa_bluetooth_profile_to_string(u->profile));
pa_source_new_data_set_sample_spec(&data, &u->sample_spec);
@@ -1104,7 +1104,7 @@ static int add_sink(struct userdata *u) {
data.module = u->module;
data.card = u->card;
data.driver = __FILE__;
- data.name = pa_sprintf_malloc("bluez_sink.%s", u->device->address);
+ data.name = pa_sprintf_malloc("bluez_sink.%s.%s", u->device->address, pa_bluetooth_profile_to_string(u->profile));
data.namereg_fail = false;
pa_proplist_sets(data.proplist, "bluetooth.protocol", pa_bluetooth_profile_to_string(u->profile));
pa_sink_new_data_set_sample_spec(&data, &u->sample_spec);
@@ -1525,7 +1525,11 @@ static int start_thread(struct userdata *u) {
pa_assert(!u->rtpoll_item);
u->rtpoll = pa_rtpoll_new();
- pa_thread_mq_init(&u->thread_mq, u->core->mainloop, u->rtpoll);
+
+ if (pa_thread_mq_init(&u->thread_mq, u->core->mainloop, u->rtpoll) < 0) {
+ pa_log("pa_thread_mq_init() failed.");
+ return -1;
+ }
if (!(u->thread = pa_thread_new("bluetooth", thread_func, u))) {
pa_log_error("Failed to create IO thread");
@@ -1772,8 +1776,9 @@ static void create_card_ports(struct userdata *u, pa_hashmap *ports) {
}
/* Run from main thread */
-static pa_card_profile *create_card_profile(struct userdata *u, const char *uuid, pa_hashmap *ports) {
+static pa_card_profile *create_card_profile(struct userdata *u, pa_bluetooth_profile_t profile, pa_hashmap *ports) {
pa_device_port *input_port, *output_port;
+ const char *name;
pa_card_profile *cp = NULL;
pa_bluetooth_profile_t *p;
@@ -1782,8 +1787,11 @@ static pa_card_profile *create_card_profile(struct userdata *u, const char *uuid
pa_assert_se(input_port = pa_hashmap_get(ports, u->input_port_name));
pa_assert_se(output_port = pa_hashmap_get(ports, u->output_port_name));
- if (pa_streq(uuid, PA_BLUETOOTH_UUID_A2DP_SINK)) {
- cp = pa_card_profile_new("a2dp_sink", _("High Fidelity Playback (A2DP Sink)"), sizeof(pa_bluetooth_profile_t));
+ name = pa_bluetooth_profile_to_string(profile);
+
+ switch (profile) {
+ case PA_BLUETOOTH_PROFILE_A2DP_SINK:
+ cp = pa_card_profile_new(name, _("High Fidelity Playback (A2DP Sink)"), sizeof(pa_bluetooth_profile_t));
cp->priority = 10;
cp->n_sinks = 1;
cp->n_sources = 0;
@@ -1792,9 +1800,10 @@ static pa_card_profile *create_card_profile(struct userdata *u, const char *uuid
pa_hashmap_put(output_port->profiles, cp->name, cp);
p = PA_CARD_PROFILE_DATA(cp);
- *p = PA_BLUETOOTH_PROFILE_A2DP_SINK;
- } else if (pa_streq(uuid, PA_BLUETOOTH_UUID_A2DP_SOURCE)) {
- cp = pa_card_profile_new("a2dp_source", _("High Fidelity Capture (A2DP Source)"), sizeof(pa_bluetooth_profile_t));
+ break;
+
+ case PA_BLUETOOTH_PROFILE_A2DP_SOURCE:
+ cp = pa_card_profile_new(name, _("High Fidelity Capture (A2DP Source)"), sizeof(pa_bluetooth_profile_t));
cp->priority = 10;
cp->n_sinks = 0;
cp->n_sources = 1;
@@ -1803,9 +1812,10 @@ static pa_card_profile *create_card_profile(struct userdata *u, const char *uuid
pa_hashmap_put(input_port->profiles, cp->name, cp);
p = PA_CARD_PROFILE_DATA(cp);
- *p = PA_BLUETOOTH_PROFILE_A2DP_SOURCE;
- } else if (pa_streq(uuid, PA_BLUETOOTH_UUID_HSP_HS) || pa_streq(uuid, PA_BLUETOOTH_UUID_HFP_HF)) {
- cp = pa_card_profile_new("headset_head_unit", _("Headset Head Unit (HSP/HFP)"), sizeof(pa_bluetooth_profile_t));
+ break;
+
+ case PA_BLUETOOTH_PROFILE_HEADSET_HEAD_UNIT:
+ cp = pa_card_profile_new(name, _("Headset Head Unit (HSP/HFP)"), sizeof(pa_bluetooth_profile_t));
cp->priority = 20;
cp->n_sinks = 1;
cp->n_sources = 1;
@@ -1815,9 +1825,10 @@ static pa_card_profile *create_card_profile(struct userdata *u, const char *uuid
pa_hashmap_put(output_port->profiles, cp->name, cp);
p = PA_CARD_PROFILE_DATA(cp);
- *p = PA_BLUETOOTH_PROFILE_HEADSET_HEAD_UNIT;
- } else if (pa_streq(uuid, PA_BLUETOOTH_UUID_HSP_AG) || pa_streq(uuid, PA_BLUETOOTH_UUID_HFP_AG)) {
- cp = pa_card_profile_new("headset_audio_gateway", _("Headset Audio Gateway (HSP/HFP)"), sizeof(pa_bluetooth_profile_t));
+ break;
+
+ case PA_BLUETOOTH_PROFILE_HEADSET_AUDIO_GATEWAY:
+ cp = pa_card_profile_new(name, _("Headset Audio Gateway (HSP/HFP)"), sizeof(pa_bluetooth_profile_t));
cp->priority = 20;
cp->n_sinks = 1;
cp->n_sources = 1;
@@ -1827,16 +1838,19 @@ static pa_card_profile *create_card_profile(struct userdata *u, const char *uuid
pa_hashmap_put(output_port->profiles, cp->name, cp);
p = PA_CARD_PROFILE_DATA(cp);
- *p = PA_BLUETOOTH_PROFILE_HEADSET_AUDIO_GATEWAY;
- }
+ break;
- if (cp) {
- if (u->device->transports[*p])
- cp->available = transport_state_to_availability(u->device->transports[*p]->state);
- else
- cp->available = PA_AVAILABLE_NO;
+ case PA_BLUETOOTH_PROFILE_OFF:
+ pa_assert_not_reached();
}
+ *p = profile;
+
+ if (u->device->transports[*p])
+ cp->available = transport_state_to_availability(u->device->transports[*p]->state);
+ else
+ cp->available = PA_AVAILABLE_NO;
+
return cp;
}
@@ -1882,6 +1896,21 @@ off:
return -PA_ERR_IO;
}
+static int uuid_to_profile(const char *uuid, pa_bluetooth_profile_t *_r) {
+ if (pa_streq(uuid, PA_BLUETOOTH_UUID_A2DP_SINK))
+ *_r = PA_BLUETOOTH_PROFILE_A2DP_SINK;
+ else if (pa_streq(uuid, PA_BLUETOOTH_UUID_A2DP_SOURCE))
+ *_r = PA_BLUETOOTH_PROFILE_A2DP_SOURCE;
+ else if (pa_streq(uuid, PA_BLUETOOTH_UUID_HSP_HS) || pa_streq(uuid, PA_BLUETOOTH_UUID_HFP_HF))
+ *_r = PA_BLUETOOTH_PROFILE_HEADSET_HEAD_UNIT;
+ else if (pa_streq(uuid, PA_BLUETOOTH_UUID_HSP_AG) || pa_streq(uuid, PA_BLUETOOTH_UUID_HFP_AG))
+ *_r = PA_BLUETOOTH_PROFILE_HEADSET_AUDIO_GATEWAY;
+ else
+ return -PA_ERR_INVALID;
+
+ return 0;
+}
+
/* Run from main thread */
static int add_card(struct userdata *u) {
const pa_bluetooth_device *d;
@@ -1923,16 +1952,15 @@ static int add_card(struct userdata *u) {
create_card_ports(u, data.ports);
PA_HASHMAP_FOREACH(uuid, d->uuids, state) {
- cp = create_card_profile(u, uuid, data.ports);
+ pa_bluetooth_profile_t profile;
- if (!cp)
+ if (uuid_to_profile(uuid, &profile) < 0)
continue;
- if (pa_hashmap_get(data.profiles, cp->name)) {
- pa_card_profile_free(cp);
+ if (pa_hashmap_get(data.profiles, pa_bluetooth_profile_to_string(profile)))
continue;
- }
+ cp = create_card_profile(u, profile, data.ports);
pa_hashmap_put(data.profiles, cp->name, cp);
}
@@ -1953,6 +1981,8 @@ static int add_card(struct userdata *u) {
u->card->userdata = u;
u->card->set_profile = set_profile_cb;
+ pa_card_choose_initial_profile(u->card);
+ pa_card_put(u->card);
p = PA_CARD_PROFILE_DATA(u->card->active_profile);
u->profile = *p;
@@ -2116,7 +2146,8 @@ static int device_process_msg(pa_msgobject *obj, int code, void *data, int64_t o
pa_assert_se(pa_card_set_profile(m->card, pa_hashmap_get(m->card->profiles, "off"), false) >= 0);
break;
case BLUETOOTH_MESSAGE_STREAM_FD_HUP:
- pa_bluetooth_transport_set_state(u->transport, PA_BLUETOOTH_TRANSPORT_STATE_IDLE);
+ if (u->transport->state > PA_BLUETOOTH_TRANSPORT_STATE_IDLE)
+ pa_bluetooth_transport_set_state(u->transport, PA_BLUETOOTH_TRANSPORT_STATE_IDLE);
break;
}
@@ -2136,24 +2167,24 @@ int pa__init(pa_module* m) {
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
pa_log_error("Failed to parse module arguments");
- goto fail;
+ goto fail_free_modargs;
}
if (!(path = pa_modargs_get_value(ma, "path", NULL))) {
pa_log_error("Failed to get device path from module arguments");
- goto fail;
+ goto fail_free_modargs;
}
if ((u->discovery = pa_shared_get(u->core, "bluetooth-discovery")))
pa_bluetooth_discovery_ref(u->discovery);
else {
pa_log_error("module-bluez5-discover doesn't seem to be loaded, refusing to load module-bluez5-device");
- goto fail;
+ goto fail_free_modargs;
}
if (!(u->device = pa_bluetooth_discovery_get_device_by_path(u->discovery, path))) {
pa_log_error("%s is unknown", path);
- goto fail;
+ goto fail_free_modargs;
}
pa_modargs_free(ma);
@@ -2172,7 +2203,6 @@ int pa__init(pa_module* m) {
u->transport_microphone_gain_changed_slot =
pa_hook_connect(pa_bluetooth_discovery_hook(u->discovery, PA_BLUETOOTH_HOOK_TRANSPORT_MICROPHONE_GAIN_CHANGED), PA_HOOK_NORMAL, (pa_hook_cb_t) transport_microphone_gain_changed_cb, u);
-
if (add_card(u) < 0)
goto fail;
@@ -2199,11 +2229,13 @@ off:
return 0;
-fail:
+fail_free_modargs:
if (ma)
pa_modargs_free(ma);
+fail:
+
pa__done(m);
return -1;
diff --git a/src/modules/echo-cancel/module-echo-cancel.c b/src/modules/echo-cancel/module-echo-cancel.c
index c873648..dfd05b6 100644
--- a/src/modules/echo-cancel/module-echo-cancel.c
+++ b/src/modules/echo-cancel/module-echo-cancel.c
@@ -1757,6 +1757,11 @@ int pa__init(pa_module*m) {
goto fail;
u->asyncmsgq = pa_asyncmsgq_new(0);
+ if (!u->asyncmsgq) {
+ pa_log("pa_asyncmsgq_new() failed.");
+ goto fail;
+ }
+
u->need_realign = true;
source_output_ss = source_ss;
diff --git a/src/modules/echo-cancel/webrtc.cc b/src/modules/echo-cancel/webrtc.cc
index db6873d..aadb1af 100644
--- a/src/modules/echo-cancel/webrtc.cc
+++ b/src/modules/echo-cancel/webrtc.cc
@@ -184,8 +184,8 @@ static bool parse_mic_geometry(const char **mic_geometry, std::vector<webrtc::Po
/* The target direction is expected to be in spherical point form:
* a,e,r
*
- * Where 'a is the azimuth of the first mic channel, 'e' its elevation,
- * and 'r' the radius.
+ * Where 'a' is the azimuth of the target point relative to the center of
+ * the array, 'e' its elevation, and 'r' the radius.
*
* 0 radians azimuth is to the right of the array, and positive angles
* move in a counter-clockwise direction.
diff --git a/src/modules/jack/module-jack-sink.c b/src/modules/jack/module-jack-sink.c
index 38ba9ba..4d31493 100644
--- a/src/modules/jack/module-jack-sink.c
+++ b/src/modules/jack/module-jack-sink.c
@@ -320,10 +320,18 @@ int pa__init(pa_module*m) {
u->module = m;
u->saved_frame_time_valid = false;
u->rtpoll = pa_rtpoll_new();
- pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
+
+ if (pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll) < 0) {
+ pa_log("pa_thread_mq_init() failed.");
+ goto fail;
+ }
/* The queue linking the JACK thread and our RT thread */
u->jack_msgq = pa_asyncmsgq_new(0);
+ if (!u->jack_msgq) {
+ pa_log("pa_asyncmsgq_new() failed.");
+ goto fail;
+ }
/* The msgq from the JACK RT thread should have an even higher
* priority than the normal message queues, to match the guarantee
diff --git a/src/modules/jack/module-jack-source.c b/src/modules/jack/module-jack-source.c
index 1130947..e45f304 100644
--- a/src/modules/jack/module-jack-source.c
+++ b/src/modules/jack/module-jack-source.c
@@ -274,9 +274,18 @@ int pa__init(pa_module*m) {
u->module = m;
u->saved_frame_time_valid = false;
u->rtpoll = pa_rtpoll_new();
- pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
+
+ if (pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll) < 0) {
+ pa_log("pa_thread_mq_init() failed.");
+ goto fail;
+ }
u->jack_msgq = pa_asyncmsgq_new(0);
+ if (!u->jack_msgq) {
+ pa_log("pa_asyncmsgq_new() failed.");
+ goto fail;
+ }
+
u->rtpoll_item = pa_rtpoll_item_new_asyncmsgq_read(u->rtpoll, PA_RTPOLL_EARLY-1, u->jack_msgq);
if (!(u->client = jack_client_open(client_name, server_name ? JackServerName : JackNullOption, &status, server_name))) {
diff --git a/src/modules/macosx/module-coreaudio-device.c b/src/modules/macosx/module-coreaudio-device.c
index 6c9e55d..502fc51 100644
--- a/src/modules/macosx/module-coreaudio-device.c
+++ b/src/modules/macosx/module-coreaudio-device.c
@@ -821,10 +821,22 @@ int pa__init(pa_module *m) {
pa_card_new_data_done(&card_new_data);
u->card->userdata = u;
u->card->set_profile = card_set_profile;
+ pa_card_choose_initial_profile(u->card);
+ pa_card_put(u->card);
u->rtpoll = pa_rtpoll_new();
- pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
+
+ if (pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll) < 0) {
+ pa_log("pa_thread_mq_init() failed.");
+ goto fail;
+ }
+
u->async_msgq = pa_asyncmsgq_new(0);
+ if (!u->async_msgq) {
+ pa_log("pa_asyncmsgq_new() failed.");
+ goto fail;
+ }
+
pa_rtpoll_item_new_asyncmsgq_read(u->rtpoll, PA_RTPOLL_EARLY-1, u->async_msgq);
PA_LLIST_HEAD_INIT(coreaudio_sink, u->sinks);
@@ -908,9 +920,11 @@ void pa__done(pa_module *m) {
pa_asyncmsgq_send(u->thread_mq.inq, NULL, PA_MESSAGE_SHUTDOWN, NULL, 0, NULL);
pa_thread_free(u->thread);
pa_thread_mq_done(&u->thread_mq);
- pa_asyncmsgq_unref(u->async_msgq);
}
+ if (u->async_msgq)
+ pa_asyncmsgq_unref(u->async_msgq);
+
/* free sinks */
for (ca_sink = u->sinks; ca_sink;) {
coreaudio_sink *next = ca_sink->next;
diff --git a/src/modules/module-allow-passthrough.c b/src/modules/module-allow-passthrough.c
new file mode 100644
index 0000000..4b801e4
--- /dev/null
+++ b/src/modules/module-allow-passthrough.c
@@ -0,0 +1,312 @@
+/***
+ This file is part of PulseAudio.
+
+ Copyright (C) 2014 Collabora Ltd. <http://www.collabora.co.uk/>
+
+ PulseAudio is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License,
+ or (at your option) any later version.
+
+ PulseAudio is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with PulseAudio; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <pulse/xmalloc.h>
+
+#include <pulsecore/core.h>
+#include <pulsecore/i18n.h>
+#include <pulsecore/sink-input.h>
+#include <pulsecore/source-output.h>
+#include <pulsecore/modargs.h>
+#include <pulsecore/log.h>
+#include <pulsecore/namereg.h>
+#include <pulsecore/core-util.h>
+
+#include "module-allow-passthrough-symdef.h"
+
+PA_MODULE_AUTHOR("Guillaume Desmottes");
+PA_MODULE_DESCRIPTION("When a passthrough stream is requested, route all the other streams to a dummy device");
+PA_MODULE_VERSION(PACKAGE_VERSION);
+PA_MODULE_LOAD_ONCE(true);
+
+static const char* const valid_modargs[] = {
+ NULL,
+};
+
+struct userdata {
+ /* (pa_sink *) -> (pa_sink *)
+ * Map the 'real' muted sink to the null-sink currently being used to play
+ * its streams. */
+ pa_hashmap *null_sinks;
+
+ bool moving;
+};
+
+static pa_sink *ensure_null_sink_for_sink(struct userdata *u, pa_sink *s, pa_core *c) {
+ char *t;
+ pa_module *m;
+ pa_sink *sink;
+ uint32_t idx;
+ const char *name;
+
+ sink = pa_hashmap_get(u->null_sinks, s);
+ if (sink != NULL) {
+ /* We already have a null-sink for this sink */
+ return sink;
+ }
+
+ name = pa_proplist_gets(s->proplist, PA_PROP_MEDIA_NAME);
+
+ t = pa_sprintf_malloc("sink_name=allow_passthrough_null_%s sink_properties='device.description=\"%s\"'",
+ name ? name : "", _("Dummy Output"));
+ m = pa_module_load(c, "module-null-sink", t);
+ pa_xfree(t);
+
+ if (m == NULL)
+ return NULL;
+
+ PA_IDXSET_FOREACH(sink, c->sinks, idx) {
+ if (sink->module->index == m->index) {
+ pa_hashmap_put(u->null_sinks, s, sink);
+ return sink;
+ }
+ }
+
+ return NULL;
+}
+
+static void unload_null_sink_module_for_sink(struct userdata *u, pa_sink *s, pa_core *c) {
+ pa_sink *null_sink;
+
+ null_sink = pa_hashmap_get(u->null_sinks, s);
+ if (null_sink == NULL)
+ return;
+
+ pa_module_unload_request_by_index(c, null_sink->module->index, true);
+
+ pa_hashmap_remove(u->null_sinks, s);
+}
+
+static void move_stream(struct userdata *u, pa_sink_input *i, pa_sink *target) {
+ u->moving = true;
+ if (pa_sink_input_move_to(i, target, false) < 0)
+ pa_log_info("Failed to move sink input %u \"%s\" to %s.", i->index,
+ pa_strnull(pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME)), target->name);
+ else
+ pa_log_info("Successfully moved sink input %u \"%s\" to %s.", i->index,
+ pa_strnull(pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME)), target->name);
+ u->moving = false;
+}
+
+/* Check if @sink has any passthrough stream, ignoring @ignore */
+static bool sink_has_passthrough_stream(pa_sink *sink, pa_sink_input *ignore)
+{
+ pa_sink_input *stream;
+ uint32_t idx;
+
+ PA_IDXSET_FOREACH(stream, sink->inputs, idx) {
+ if (stream == ignore)
+ continue;
+
+ if (pa_sink_input_is_passthrough(stream))
+ return true;
+ }
+
+ return false;
+}
+
+static pa_hook_result_t new_passthrough_stream(struct userdata *u, pa_core *c, pa_sink *sink, pa_sink_input *i) {
+ uint32_t idx;
+ pa_sink_input *stream;
+ pa_sink *null_sink;
+
+ if (sink_has_passthrough_stream(sink, i)) {
+ pa_log_info("Dropping playing a passthrough stream; ignoring");
+ /* PulseAudio will reject the stream itself */
+ return PA_HOOK_OK;
+ }
+
+ pa_log_info("Just received a passthrough stream; pause all the others streams so it can play");
+
+ null_sink = ensure_null_sink_for_sink(u, sink, c);
+ if (null_sink == NULL)
+ return PA_HOOK_OK;
+
+ PA_IDXSET_FOREACH(stream, sink->inputs, idx) {
+ /* We don't want to move the stream which just moved to the sink and trigger this re-routing */
+ if (stream != i)
+ move_stream(u, stream, null_sink);
+ }
+
+ return PA_HOOK_OK;
+}
+
+/* return a null sink for the new stream if it needs to be re-routed */
+static pa_sink * new_normal_stream(struct userdata *u, pa_core *c, pa_sink *sink) {
+ if (!sink_has_passthrough_stream(sink, NULL))
+ return NULL;
+
+ /* A passthrough stream is already playing on this sink, re-route to a null sink */
+ return ensure_null_sink_for_sink(u, sink, c);
+}
+
+static pa_hook_result_t sink_input_new_cb(pa_core *core, pa_sink_input_new_data *new_data, struct userdata *u) {
+ pa_sink *null_sink;
+
+ pa_core_assert_ref(core);
+ /* This is a bit of a hack, to determine whether the input stream will use
+ * a passthrough stream, the sink should have been selected and a format
+ * renegotiated. This can either happen by an earlier module (e.g. one
+ * doing routing or other policies) and if not pulseaudio core will setup
+ * the defaults after all hooks for this event have been processed.
+ *
+ * Unfortunately if no other module decides on sink/format before this hook
+ * runs, pulse core doing it is too late, so if a sink and/or stream format
+ * haven't been setup & configured just yet do so now using the same code
+ * as pulsecore would use (default sink and higher priority negotiated
+ * format). */
+ if (!new_data->sink) {
+ pa_sink *sink = pa_namereg_get(core, NULL, PA_NAMEREG_SINK);
+ pa_return_val_if_fail(sink, -PA_ERR_NOENTITY);
+ pa_sink_input_new_data_set_sink(new_data, sink, false);
+ }
+
+ if (!new_data->format && new_data->nego_formats && !pa_idxset_isempty(new_data->nego_formats))
+ new_data->format = pa_format_info_copy(pa_idxset_first(new_data->nego_formats, NULL));
+
+ if (pa_sink_input_new_data_is_passthrough(new_data))
+ return new_passthrough_stream(u, core, new_data->sink, NULL);
+
+ null_sink = new_normal_stream(u, core, new_data->sink);
+
+ if (null_sink) {
+ pa_log_info("Already playing a passthrough stream; re-routing new stream to the null sink");
+ pa_sink_input_new_data_set_sink(new_data, null_sink, false);
+ }
+
+ return PA_HOOK_OK;
+}
+
+static pa_hook_result_t passthrough_stream_removed(struct userdata *u, pa_core *c, pa_sink_input *i) {
+ uint32_t idx;
+ pa_sink_input *stream;
+ pa_sink *null_sink;
+
+ pa_assert(i->sink);
+
+ null_sink = pa_hashmap_get(u->null_sinks, i->sink);
+ if (null_sink == NULL)
+ return PA_HOOK_OK;
+
+ pa_log_info("Passthrough stream removed; restore all streams");
+
+ PA_IDXSET_FOREACH(stream, null_sink->inputs, idx) {
+ move_stream(u, stream, i->sink);
+ }
+
+ unload_null_sink_module_for_sink(u, i->sink, c);
+
+ return PA_HOOK_OK;
+}
+
+static pa_hook_result_t sink_input_removed(pa_core *core, pa_sink_input *i, struct userdata *u) {
+ pa_sink_input_assert_ref(i);
+
+ if (pa_sink_input_is_passthrough(i))
+ return passthrough_stream_removed(u, core, i);
+
+ return PA_HOOK_OK;
+}
+
+static pa_hook_result_t sink_input_unlink_cb(pa_core *core, pa_sink_input *i, struct userdata *u) {
+ return sink_input_removed(core, i, u);
+}
+
+static pa_hook_result_t sink_input_move_start_cb(pa_core *core, pa_sink_input *i, struct userdata *u) {
+ if (u->moving)
+ return PA_HOOK_OK;
+
+ return sink_input_removed(core, i, u);
+}
+
+static pa_hook_result_t sink_input_move_finish_cb(pa_core *core, pa_sink_input *i, struct userdata *u) {
+ pa_sink *null_sink;
+
+ if (u->moving)
+ return PA_HOOK_OK;
+
+ if (pa_sink_input_is_passthrough(i))
+ /* Passthrough stream has been moved to a new sink */
+ return new_passthrough_stream(u, core, i->sink, i);
+
+ null_sink = new_normal_stream(u, core, i->sink);
+ if (null_sink) {
+ pa_log_info("Already playing a passthrough stream; re-routing moved stream to the null sink");
+ move_stream(u, i, null_sink);
+ }
+
+ return PA_HOOK_OK;
+}
+
+int pa__init(pa_module*m) {
+ pa_modargs *ma;
+ struct userdata *u;
+
+ pa_assert(m);
+
+ if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
+ pa_log("Failed to parse module arguments");
+ return -1;
+ }
+
+ m->userdata = u = pa_xnew(struct userdata, 1);
+
+ u->null_sinks = pa_hashmap_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
+
+ pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_SINK_INPUT_NEW], PA_HOOK_LATE, (pa_hook_cb_t) sink_input_new_cb, u);
+ pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_SINK_INPUT_UNLINK], PA_HOOK_LATE, (pa_hook_cb_t) sink_input_unlink_cb, u);
+ pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_SINK_INPUT_MOVE_START], PA_HOOK_LATE, (pa_hook_cb_t) sink_input_move_start_cb, u);
+ pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_SINK_INPUT_MOVE_FINISH], PA_HOOK_LATE, (pa_hook_cb_t) sink_input_move_finish_cb, u);
+
+ u->moving = false;
+
+ pa_modargs_free(ma);
+ return 0;
+}
+
+static void unload_all_null_sink_modules(struct userdata *u, pa_core *c) {
+ void *state = NULL;
+ pa_sink *null_sink;
+
+ PA_HASHMAP_FOREACH(null_sink, u->null_sinks, state)
+ pa_module_unload_request_by_index(c, null_sink->module->index, true);
+}
+
+void pa__done(pa_module*m) {
+ struct userdata *u;
+
+ pa_assert(m);
+
+ if (!(u = m->userdata))
+ return;
+
+ if (m->core->state != PA_CORE_SHUTDOWN)
+ unload_all_null_sink_modules(u, m->core);
+
+ if (u->null_sinks)
+ pa_hashmap_free(u->null_sinks);
+
+ pa_xfree(u);
+}
diff --git a/src/modules/module-card-restore.c b/src/modules/module-card-restore.c
index 7545aa5..3c0307b 100644
--- a/src/modules/module-card-restore.c
+++ b/src/modules/module-card-restore.c
@@ -479,36 +479,6 @@ static pa_hook_result_t card_profile_added_callback(pa_core *c, pa_card_profile
return PA_HOOK_OK;
}
-static pa_hook_result_t profile_available_changed_callback(void *hook_data, void *call_data, void *userdata) {
- pa_card_profile *profile = call_data;
- pa_card *card;
- struct userdata *u = userdata;
- struct entry *entry;
-
- pa_assert(profile);
- pa_assert(u);
-
- card = profile->card;
-
- if (profile->available == PA_AVAILABLE_NO)
- return PA_HOOK_OK;
-
- entry = entry_read(u, card->name);
- if (!entry)
- return PA_HOOK_OK;
-
- if (!pa_streq(profile->name, entry->profile)) {
- entry_free(entry);
- return PA_HOOK_OK;
- }
-
- pa_log_info("Card %s profile %s became available, activating.", card->name, profile->name);
- pa_card_set_profile(profile->card, profile, true);
-
- entry_free(entry);
- return PA_HOOK_OK;
-}
-
static pa_hook_result_t port_offset_change_callback(pa_core *c, pa_device_port *port, struct userdata *u) {
struct entry *entry;
pa_card *card;
@@ -551,16 +521,6 @@ static pa_hook_result_t card_new_hook_callback(pa_core *c, pa_card_new_data *new
if (!(e = entry_read(u, new_data->name)))
return PA_HOOK_OK;
- if (e->profile[0]) {
- if (!new_data->active_profile) {
- pa_card_new_data_set_profile(new_data, e->profile);
- pa_log_info("Restored profile '%s' for card %s.", new_data->active_profile, new_data->name);
- new_data->save_profile = true;
-
- } else
- pa_log_debug("Not restoring profile for card %s, because already set.", new_data->name);
- }
-
/* Always restore the latency offsets because their
* initial value is always 0 */
@@ -590,6 +550,30 @@ static pa_hook_result_t card_new_hook_callback(pa_core *c, pa_card_new_data *new
return PA_HOOK_OK;
}
+static pa_hook_result_t card_choose_initial_profile_callback(pa_core *core, pa_card *card, struct userdata *u) {
+ struct entry *e;
+
+ if (!(e = entry_read(u, card->name)))
+ return PA_HOOK_OK;
+
+ if (e->profile[0]) {
+ pa_card_profile *profile;
+
+ profile = pa_hashmap_get(card->profiles, e->profile);
+ if (profile) {
+ pa_log_info("Restoring profile '%s' for card %s.", card->active_profile->name, card->name);
+ pa_card_set_profile(card, profile, true);
+ } else {
+ pa_log_debug("Tried to restore profile %s for card %s, but the card doesn't have such profile.",
+ e->profile, card->name);
+ }
+ }
+
+ entry_free(e);
+
+ return PA_HOOK_OK;
+}
+
static pa_hook_result_t card_preferred_port_changed_callback(pa_core *core, pa_card_preferred_port_changed_hook_data *data,
struct userdata *u) {
struct entry *e;
@@ -634,12 +618,12 @@ int pa__init(pa_module*m) {
u->module = m;
pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_CARD_NEW], PA_HOOK_EARLY, (pa_hook_cb_t) card_new_hook_callback, u);
+ pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_CARD_CHOOSE_INITIAL_PROFILE], PA_HOOK_NORMAL,
+ (pa_hook_cb_t) card_choose_initial_profile_callback, u);
pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_CARD_PUT], PA_HOOK_NORMAL, (pa_hook_cb_t) card_put_hook_callback, u);
pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_CARD_PREFERRED_PORT_CHANGED], PA_HOOK_NORMAL, (pa_hook_cb_t) card_preferred_port_changed_callback, u);
pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_CARD_PROFILE_CHANGED], PA_HOOK_NORMAL, (pa_hook_cb_t) card_profile_changed_callback, u);
pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_CARD_PROFILE_ADDED], PA_HOOK_NORMAL, (pa_hook_cb_t) card_profile_added_callback, u);
- pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_CARD_PROFILE_AVAILABLE_CHANGED],
- PA_HOOK_NORMAL, profile_available_changed_callback, u);
pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_PORT_LATENCY_OFFSET_CHANGED], PA_HOOK_NORMAL, (pa_hook_cb_t) port_offset_change_callback, u);
if (!(fname = pa_state_path("card-database", true)))
diff --git a/src/modules/module-combine-sink.c b/src/modules/module-combine-sink.c
index b6322c6..250240a 100644
--- a/src/modules/module-combine-sink.c
+++ b/src/modules/module-combine-sink.c
@@ -1019,9 +1019,25 @@ static struct output *output_new(struct userdata *u, pa_sink *sink) {
o = pa_xnew0(struct output, 1);
o->userdata = u;
+
o->audio_inq = pa_asyncmsgq_new(0);
+ if (!o->audio_inq) {
+ pa_log("pa_asyncmsgq_new() failed.");
+ goto fail;
+ }
+
o->control_inq = pa_asyncmsgq_new(0);
+ if (!o->control_inq) {
+ pa_log("pa_asyncmsgq_new() failed.");
+ goto fail;
+ }
+
o->outq = pa_asyncmsgq_new(0);
+ if (!o->outq) {
+ pa_log("pa_asyncmsgq_new() failed.");
+ goto fail;
+ }
+
o->sink = sink;
o->memblockq = pa_memblockq_new(
"module-combine-sink output memblockq",
@@ -1038,6 +1054,11 @@ static struct output *output_new(struct userdata *u, pa_sink *sink) {
update_description(u);
return o;
+
+fail:
+ output_free(o);
+
+ return NULL;
}
/* Called from main context */
@@ -1280,7 +1301,12 @@ int pa__init(pa_module*m) {
u->core = m->core;
u->module = m;
u->rtpoll = pa_rtpoll_new();
- pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
+
+ if (pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll) < 0) {
+ pa_log("pa_thread_mq_init() failed.");
+ goto fail;
+ }
+
u->resample_method = resample_method;
u->outputs = pa_idxset_new(NULL, NULL);
u->thread_info.smoother = pa_smoother_new(
diff --git a/src/modules/module-esound-sink.c b/src/modules/module-esound-sink.c
index 76e380e..2ce0c85 100644
--- a/src/modules/module-esound-sink.c
+++ b/src/modules/module-esound-sink.c
@@ -564,7 +564,12 @@ int pa__init(pa_module*m) {
u->offset = 0;
u->rtpoll = pa_rtpoll_new();
- pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
+
+ if (pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll) < 0) {
+ pa_log("pa_thread_mq_init() failed.");
+ goto fail;
+ }
+
u->rtpoll_item = NULL;
u->format =
diff --git a/src/modules/module-ladspa-sink.c b/src/modules/module-ladspa-sink.c
index 38b94e3..c11fa5e 100644
--- a/src/modules/module-ladspa-sink.c
+++ b/src/modules/module-ladspa-sink.c
@@ -166,7 +166,7 @@ static void get_algorithm_parameters(DBusConnection *conn, DBusMessage *msg, voi
pa_dbus_append_basic_array(&struct_iter, DBUS_TYPE_DOUBLE, control, u->n_control);
pa_dbus_append_basic_array(&struct_iter, DBUS_TYPE_BOOLEAN, use_default, u->n_control);
- dbus_message_iter_close_container(&msg_iter, &struct_iter);
+ pa_assert_se(dbus_message_iter_close_container(&msg_iter, &struct_iter));
pa_assert_se(dbus_connection_send(conn, reply, NULL));
@@ -981,6 +981,11 @@ int pa__init(pa_module*m) {
goto fail;
}
+ if (ss.format != PA_SAMPLE_FLOAT32) {
+ pa_log("LADSPA accepts float format only");
+ goto fail;
+ }
+
if (!(plugin = pa_modargs_get_value(ma, "plugin", NULL))) {
pa_log("Missing LADSPA plugin name");
goto fail;
diff --git a/src/modules/module-loopback.c b/src/modules/module-loopback.c
index f4d0761..9410c98 100644
--- a/src/modules/module-loopback.c
+++ b/src/modules/module-loopback.c
@@ -59,7 +59,7 @@ PA_MODULE_USAGE(
#define DEFAULT_LATENCY_MSEC 200
-#define MEMBLOCKQ_MAXLENGTH (1024*1024*16)
+#define MEMBLOCKQ_MAXLENGTH (1024*1024*32)
#define DEFAULT_ADJUST_TIME_USEC (10*PA_USEC_PER_SEC)
@@ -85,19 +85,16 @@ struct userdata {
pa_usec_t latency;
bool in_pop;
- size_t min_memblockq_length;
struct {
int64_t send_counter;
- size_t source_output_buffer;
pa_usec_t source_latency;
+ pa_usec_t source_timestamp;
int64_t recv_counter;
size_t sink_input_buffer;
pa_usec_t sink_latency;
-
- size_t min_memblockq_length;
- size_t max_request;
+ pa_usec_t sink_timestamp;
} latency_snapshot;
};
@@ -121,8 +118,7 @@ static const char* const valid_modargs[] = {
enum {
SINK_INPUT_MESSAGE_POST = PA_SINK_INPUT_MESSAGE_MAX,
SINK_INPUT_MESSAGE_REWIND,
- SINK_INPUT_MESSAGE_LATENCY_SNAPSHOT,
- SINK_INPUT_MESSAGE_MAX_REQUEST_CHANGED
+ SINK_INPUT_MESSAGE_LATENCY_SNAPSHOT
};
enum {
@@ -167,65 +163,75 @@ static void teardown(struct userdata *u) {
}
}
+/* rate controller
+ * - maximum deviation from base rate is less than 1%
+ * - can create audible artifacts by changing the rate too quickly
+ * - exhibits hunting with USB or Bluetooth sources
+ */
+static uint32_t rate_controller(
+ uint32_t base_rate,
+ pa_usec_t adjust_time,
+ int32_t latency_difference_usec) {
+
+ uint32_t new_rate;
+ double min_cycles;
+
+ /* Calculate best rate to correct the current latency offset, limit at
+ * slightly below 1% difference from base_rate */
+ min_cycles = (double)abs(latency_difference_usec) / adjust_time / 0.01 + 1;
+ new_rate = base_rate * (1.0 + (double)latency_difference_usec / min_cycles / adjust_time);
+
+ return new_rate;
+}
+
/* Called from main context */
static void adjust_rates(struct userdata *u) {
- size_t buffer, fs;
+ size_t buffer;
uint32_t old_rate, base_rate, new_rate;
- pa_usec_t buffer_latency;
+ int32_t latency_difference;
+ pa_usec_t current_buffer_latency, snapshot_delay, current_source_sink_latency, current_latency, latency_at_optimum_rate;
+ pa_usec_t final_latency;
pa_assert(u);
pa_assert_ctl_context();
- pa_asyncmsgq_send(u->source_output->source->asyncmsgq, PA_MSGOBJECT(u->source_output), SOURCE_OUTPUT_MESSAGE_LATENCY_SNAPSHOT, NULL, 0, NULL);
- pa_asyncmsgq_send(u->sink_input->sink->asyncmsgq, PA_MSGOBJECT(u->sink_input), SINK_INPUT_MESSAGE_LATENCY_SNAPSHOT, NULL, 0, NULL);
-
- buffer =
- u->latency_snapshot.sink_input_buffer +
- u->latency_snapshot.source_output_buffer;
+ /* Rates and latencies*/
+ old_rate = u->sink_input->sample_spec.rate;
+ base_rate = u->source_output->sample_spec.rate;
+ buffer = u->latency_snapshot.sink_input_buffer;
if (u->latency_snapshot.recv_counter <= u->latency_snapshot.send_counter)
buffer += (size_t) (u->latency_snapshot.send_counter - u->latency_snapshot.recv_counter);
else
buffer = PA_CLIP_SUB(buffer, (size_t) (u->latency_snapshot.recv_counter - u->latency_snapshot.send_counter));
- buffer_latency = pa_bytes_to_usec(buffer, &u->sink_input->sample_spec);
+ current_buffer_latency = pa_bytes_to_usec(buffer, &u->sink_input->sample_spec);
+ snapshot_delay = u->latency_snapshot.source_timestamp - u->latency_snapshot.sink_timestamp;
+ current_source_sink_latency = u->latency_snapshot.sink_latency + u->latency_snapshot.source_latency - snapshot_delay;
+
+ /* Current latency */
+ current_latency = current_source_sink_latency + current_buffer_latency;
+
+ /* Latency at base rate */
+ latency_at_optimum_rate = current_source_sink_latency + current_buffer_latency * old_rate / base_rate;
+
+ final_latency = u->latency;
+ latency_difference = (int32_t)((int64_t)latency_at_optimum_rate - final_latency);
pa_log_debug("Loopback overall latency is %0.2f ms + %0.2f ms + %0.2f ms = %0.2f ms",
(double) u->latency_snapshot.sink_latency / PA_USEC_PER_MSEC,
- (double) buffer_latency / PA_USEC_PER_MSEC,
+ (double) current_buffer_latency / PA_USEC_PER_MSEC,
(double) u->latency_snapshot.source_latency / PA_USEC_PER_MSEC,
- ((double) u->latency_snapshot.sink_latency + buffer_latency + u->latency_snapshot.source_latency) / PA_USEC_PER_MSEC);
-
- pa_log_debug("Should buffer %zu bytes, buffered at minimum %zu bytes",
- u->latency_snapshot.max_request*2,
- u->latency_snapshot.min_memblockq_length);
+ (double) current_latency / PA_USEC_PER_MSEC);
- fs = pa_frame_size(&u->sink_input->sample_spec);
- old_rate = u->sink_input->sample_spec.rate;
- base_rate = u->source_output->sample_spec.rate;
-
- if (u->latency_snapshot.min_memblockq_length < u->latency_snapshot.max_request*2)
- new_rate = base_rate - (((u->latency_snapshot.max_request*2 - u->latency_snapshot.min_memblockq_length) / fs) *PA_USEC_PER_SEC)/u->adjust_time;
- else
- new_rate = base_rate + (((u->latency_snapshot.min_memblockq_length - u->latency_snapshot.max_request*2) / fs) *PA_USEC_PER_SEC)/u->adjust_time;
+ pa_log_debug("Loopback latency at base rate is %0.2f ms", (double)latency_at_optimum_rate / PA_USEC_PER_MSEC);
- if (new_rate < (uint32_t) (base_rate*0.8) || new_rate > (uint32_t) (base_rate*1.25)) {
- pa_log_warn("Sample rates too different, not adjusting (%u vs. %u).", base_rate, new_rate);
- new_rate = base_rate;
- } else {
- if (base_rate < new_rate + 20 && new_rate < base_rate + 20)
- new_rate = base_rate;
- /* Do the adjustment in small steps; 2‰ can be considered inaudible */
- if (new_rate < (uint32_t) (old_rate*0.998) || new_rate > (uint32_t) (old_rate*1.002)) {
- pa_log_info("New rate of %u Hz not within 2‰ of %u Hz, forcing smaller adjustment", new_rate, old_rate);
- new_rate = PA_CLAMP(new_rate, (uint32_t) (old_rate*0.998), (uint32_t) (old_rate*1.002));
- }
- }
+ /* Calculate new rate */
+ new_rate = rate_controller(base_rate, u->adjust_time, latency_difference);
+ /* Set rate */
pa_sink_input_set_rate(u->sink_input, new_rate);
pa_log_debug("[%s] Updated sampling rate to %lu Hz.", u->sink_input->sink->name, (unsigned long) new_rate);
-
- pa_core_rttime_restart(u->core, u->time_event, pa_rtclock_now() + u->adjust_time);
}
/* Called from main context */
@@ -236,16 +242,26 @@ static void time_callback(pa_mainloop_api *a, pa_time_event *e, const struct tim
pa_assert(a);
pa_assert(u->time_event == e);
+ /* Restart timer right away */
+ pa_core_rttime_restart(u->core, u->time_event, pa_rtclock_now() + u->adjust_time);
+
+ /* Get sink and source latency snapshot */
+ pa_asyncmsgq_send(u->sink_input->sink->asyncmsgq, PA_MSGOBJECT(u->sink_input), SINK_INPUT_MESSAGE_LATENCY_SNAPSHOT, NULL, 0, NULL);
+ pa_asyncmsgq_send(u->source_output->source->asyncmsgq, PA_MSGOBJECT(u->source_output), SOURCE_OUTPUT_MESSAGE_LATENCY_SNAPSHOT, NULL, 0, NULL);
+
adjust_rates(u);
}
-/* Called from main context */
+/* Called from main context
+ * When source or sink changes, give it a third of a second to settle down, then call adjust_rates for the first time */
static void enable_adjust_timer(struct userdata *u, bool enable) {
if (enable) {
- if (u->time_event || u->adjust_time <= 0)
+ if (!u->adjust_time)
return;
+ if (u->time_event)
+ u->core->mainloop->time_free(u->time_event);
- u->time_event = pa_core_rttime_new(u->module->core, pa_rtclock_now() + u->adjust_time, time_callback, u);
+ u->time_event = pa_core_rttime_new(u->module->core, pa_rtclock_now() + 333 * PA_USEC_PER_MSEC, time_callback, u);
} else {
if (!u->time_event)
return;
@@ -314,8 +330,10 @@ static int source_output_process_msg_cb(pa_msgobject *obj, int code, void *data,
length = pa_memblockq_get_length(u->source_output->thread_info.delay_memblockq);
u->latency_snapshot.send_counter = u->send_counter;
- u->latency_snapshot.source_output_buffer = u->source_output->thread_info.resampler ? pa_resampler_result(u->source_output->thread_info.resampler, length) : length;
- u->latency_snapshot.source_latency = pa_source_get_latency_within_thread(u->source_output->source);
+ /* Add content of delay memblockq to the source latency */
+ u->latency_snapshot.source_latency = pa_source_get_latency_within_thread(u->source_output->source) +
+ pa_bytes_to_usec(length, &u->source_output->source->sample_spec);
+ u->latency_snapshot.source_timestamp = pa_rtclock_now();
return 0;
}
@@ -439,20 +457,6 @@ static void source_output_suspend_cb(pa_source_output *o, bool suspended) {
}
/* Called from output thread context */
-static void update_min_memblockq_length(struct userdata *u) {
- size_t length;
-
- pa_assert(u);
- pa_sink_input_assert_io_context(u->sink_input);
-
- length = pa_memblockq_get_length(u->memblockq);
-
- if (u->min_memblockq_length == (size_t) -1 ||
- length < u->min_memblockq_length)
- u->min_memblockq_length = length;
-}
-
-/* Called from output thread context */
static int sink_input_pop_cb(pa_sink_input *i, size_t nbytes, pa_memchunk *chunk) {
struct userdata *u;
@@ -474,8 +478,6 @@ static int sink_input_pop_cb(pa_sink_input *i, size_t nbytes, pa_memchunk *chunk
chunk->length = PA_MIN(chunk->length, nbytes);
pa_memblockq_drop(u->memblockq, chunk->length);
- update_min_memblockq_length(u);
-
return 0;
}
@@ -517,8 +519,6 @@ static int sink_input_process_msg_cb(pa_msgobject *obj, int code, void *data, in
else
pa_memblockq_flush_write(u->memblockq, true);
- update_min_memblockq_length(u);
-
/* Is this the end of an underrun? Then let's start things
* right-away */
if (!u->in_pop &&
@@ -546,40 +546,20 @@ static int sink_input_process_msg_cb(pa_msgobject *obj, int code, void *data, in
u->recv_counter -= offset;
- update_min_memblockq_length(u);
-
return 0;
case SINK_INPUT_MESSAGE_LATENCY_SNAPSHOT: {
size_t length;
- update_min_memblockq_length(u);
-
length = pa_memblockq_get_length(u->sink_input->thread_info.render_memblockq);
u->latency_snapshot.recv_counter = u->recv_counter;
- u->latency_snapshot.sink_input_buffer =
- pa_memblockq_get_length(u->memblockq) +
- (u->sink_input->thread_info.resampler ? pa_resampler_request(u->sink_input->thread_info.resampler, length) : length);
- u->latency_snapshot.sink_latency = pa_sink_get_latency_within_thread(u->sink_input->sink);
-
- u->latency_snapshot.max_request = pa_sink_input_get_max_request(u->sink_input);
-
- u->latency_snapshot.min_memblockq_length = u->min_memblockq_length;
- u->min_memblockq_length = (size_t) -1;
-
- return 0;
- }
-
- case SINK_INPUT_MESSAGE_MAX_REQUEST_CHANGED: {
- /* This message is sent from the IO thread to the main
- * thread! So don't be confused. All the user cases above
- * are executed in thread context, but this one is not! */
-
- pa_assert_ctl_context();
+ u->latency_snapshot.sink_input_buffer = pa_memblockq_get_length(u->memblockq);
+ /* Add content of render memblockq to sink latency */
+ u->latency_snapshot.sink_latency = pa_sink_get_latency_within_thread(u->sink_input->sink) +
+ pa_bytes_to_usec(length, &u->sink_input->sink->sample_spec);
+ u->latency_snapshot.sink_timestamp = pa_rtclock_now();
- if (u->time_event)
- adjust_rates(u);
return 0;
}
}
@@ -602,8 +582,6 @@ static void sink_input_attach_cb(pa_sink_input *i) {
pa_memblockq_set_prebuf(u->memblockq, pa_sink_input_get_max_request(i)*2);
pa_memblockq_set_maxrewind(u->memblockq, pa_sink_input_get_max_rewind(i));
-
- u->min_memblockq_length = (size_t) -1;
}
/* Called from output thread context */
@@ -641,7 +619,6 @@ static void sink_input_update_max_request_cb(pa_sink_input *i, size_t nbytes) {
pa_memblockq_set_prebuf(u->memblockq, nbytes*2);
pa_log_info("Max request changed");
- pa_asyncmsgq_post(pa_thread_mq_get()->outq, PA_MSGOBJECT(u->sink_input), SINK_INPUT_MESSAGE_MAX_REQUEST_CHANGED, NULL, 0, NULL, NULL);
}
/* Called from main thread */
@@ -966,6 +943,10 @@ int pa__init(pa_module *m) {
pa_memblock_unref(silence.memblock);
u->asyncmsgq = pa_asyncmsgq_new(0);
+ if (!u->asyncmsgq) {
+ pa_log("pa_asyncmsgq_new() failed.");
+ goto fail;
+ }
if (!pa_proplist_contains(u->source_output->proplist, PA_PROP_MEDIA_NAME))
pa_proplist_setf(u->source_output->proplist, PA_PROP_MEDIA_NAME, "Loopback to %s",
diff --git a/src/modules/module-null-sink.c b/src/modules/module-null-sink.c
index 5b98ba5..b8157e8 100644
--- a/src/modules/module-null-sink.c
+++ b/src/modules/module-null-sink.c
@@ -269,7 +269,11 @@ int pa__init(pa_module*m) {
u->core = m->core;
u->module = m;
u->rtpoll = pa_rtpoll_new();
- pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
+
+ if (pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll) < 0) {
+ pa_log("pa_thread_mq_init() failed.");
+ goto fail;
+ }
pa_sink_new_data_init(&data);
data.driver = __FILE__;
diff --git a/src/modules/module-null-source.c b/src/modules/module-null-source.c
index 0c590bd..a75a04f 100644
--- a/src/modules/module-null-source.c
+++ b/src/modules/module-null-source.c
@@ -200,7 +200,11 @@ int pa__init(pa_module*m) {
u->core = m->core;
u->module = m;
u->rtpoll = pa_rtpoll_new();
- pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
+
+ if (pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll) < 0) {
+ pa_log("pa_thread_mq_init() failed.");
+ goto fail;
+ }
pa_source_new_data_init(&data);
data.driver = __FILE__;
diff --git a/src/modules/module-pipe-sink.c b/src/modules/module-pipe-sink.c
index 0a3a4fc..da65021 100644
--- a/src/modules/module-pipe-sink.c
+++ b/src/modules/module-pipe-sink.c
@@ -123,7 +123,7 @@ static int process_render(struct userdata *u) {
pa_assert(u);
if (u->memchunk.length <= 0)
- pa_sink_render(u->sink, pa_pipe_buf(u->fd), &u->memchunk);
+ pa_sink_render(u->sink, pa_frame_align(pa_pipe_buf(u->fd), &u->sink->sample_spec), &u->memchunk);
pa_assert(u->memchunk.length > 0);
@@ -247,7 +247,12 @@ int pa__init(pa_module *m) {
m->userdata = u;
pa_memchunk_reset(&u->memchunk);
u->rtpoll = pa_rtpoll_new();
- pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
+
+ if (pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll) < 0) {
+ pa_log("pa_thread_mq_init() failed.");
+ goto fail;
+ }
+
u->write_type = 0;
u->filename = pa_runtime_path(pa_modargs_get_value(ma, "file", DEFAULT_FILE_NAME));
@@ -301,7 +306,7 @@ int pa__init(pa_module *m) {
pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq);
pa_sink_set_rtpoll(u->sink, u->rtpoll);
- pa_sink_set_max_request(u->sink, pa_pipe_buf(u->fd));
+ pa_sink_set_max_request(u->sink, pa_frame_align(pa_pipe_buf(u->fd), &u->sink->sample_spec));
pa_sink_set_fixed_latency(u->sink, pa_bytes_to_usec(pa_pipe_buf(u->fd), &u->sink->sample_spec));
u->rtpoll_item = pa_rtpoll_item_new(u->rtpoll, PA_RTPOLL_NEVER, 1);
diff --git a/src/modules/module-pipe-source.c b/src/modules/module-pipe-source.c
index 1218674..f39fc55 100644
--- a/src/modules/module-pipe-source.c
+++ b/src/modules/module-pipe-source.c
@@ -234,7 +234,11 @@ int pa__init(pa_module *m) {
u->module = m;
pa_memchunk_reset(&u->memchunk);
u->rtpoll = pa_rtpoll_new();
- pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
+
+ if (pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll) < 0) {
+ pa_log("pa_thread_mq_init() failed.");
+ goto fail;
+ }
u->filename = pa_runtime_path(pa_modargs_get_value(ma, "file", DEFAULT_FILE_NAME));
diff --git a/src/modules/module-sine-source.c b/src/modules/module-sine-source.c
index 55d70c7..cdeb2c0 100644
--- a/src/modules/module-sine-source.c
+++ b/src/modules/module-sine-source.c
@@ -226,7 +226,11 @@ int pa__init(pa_module*m) {
u->core = m->core;
u->module = m;
u->rtpoll = pa_rtpoll_new();
- pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
+
+ if (pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll) < 0) {
+ pa_log("pa_thread_mq_init() failed.");
+ goto fail;
+ }
u->peek_index = 0;
pa_memchunk_sine(&u->memchunk, m->core->mempool, ss.rate, frequency);
diff --git a/src/modules/module-solaris.c b/src/modules/module-solaris.c
index 2fa0bff..ccff69f 100644
--- a/src/modules/module-solaris.c
+++ b/src/modules/module-solaris.c
@@ -911,7 +911,11 @@ int pa__init(pa_module *m) {
pa_memchunk_reset(&u->memchunk);
u->rtpoll = pa_rtpoll_new();
- pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
+
+ if (pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll) < 0) {
+ pa_log("pa_thread_mq_init() failed.");
+ goto fail;
+ }
u->rtpoll_item = NULL;
build_pollfd(u);
diff --git a/src/modules/module-suspend-on-idle.c b/src/modules/module-suspend-on-idle.c
index f7620db..a284f85 100644
--- a/src/modules/module-suspend-on-idle.c
+++ b/src/modules/module-suspend-on-idle.c
@@ -67,13 +67,13 @@ static void timeout_cb(pa_mainloop_api*a, pa_time_event* e, const struct timeval
d->userdata->core->mainloop->time_restart(d->time_event, NULL);
- if (d->sink && pa_sink_check_suspend(d->sink) <= 0 && !(d->sink->suspend_cause & PA_SUSPEND_IDLE)) {
+ if (d->sink && pa_sink_check_suspend(d->sink, NULL, NULL) <= 0 && !(d->sink->suspend_cause & PA_SUSPEND_IDLE)) {
pa_log_info("Sink %s idle for too long, suspending ...", d->sink->name);
pa_sink_suspend(d->sink, true, PA_SUSPEND_IDLE);
pa_core_maybe_vacuum(d->userdata->core);
}
- if (d->source && pa_source_check_suspend(d->source) <= 0 && !(d->source->suspend_cause & PA_SUSPEND_IDLE)) {
+ if (d->source && pa_source_check_suspend(d->source, NULL) <= 0 && !(d->source->suspend_cause & PA_SUSPEND_IDLE)) {
pa_log_info("Source %s idle for too long, suspending ...", d->source->name);
pa_source_suspend(d->source, true, PA_SUSPEND_IDLE);
pa_core_maybe_vacuum(d->userdata->core);
@@ -125,7 +125,7 @@ static pa_hook_result_t sink_input_fixate_hook_cb(pa_core *c, pa_sink_input_new_
if ((d = pa_hashmap_get(u->device_infos, data->sink))) {
resume(d);
- if (pa_sink_check_suspend(d->sink) <= 0)
+ if (pa_sink_check_suspend(d->sink, NULL, NULL) <= 0)
restart(d);
}
@@ -147,12 +147,12 @@ static pa_hook_result_t source_output_fixate_hook_cb(pa_core *c, pa_source_outpu
if (d) {
resume(d);
if (d->source) {
- if (pa_source_check_suspend(d->source) <= 0)
+ if (pa_source_check_suspend(d->source, NULL) <= 0)
restart(d);
} else {
/* The source output is connected to a monitor source. */
pa_assert(d->sink);
- if (pa_sink_check_suspend(d->sink) <= 0)
+ if (pa_sink_check_suspend(d->sink, NULL, NULL) <= 0)
restart(d);
}
}
@@ -168,7 +168,7 @@ static pa_hook_result_t sink_input_unlink_hook_cb(pa_core *c, pa_sink_input *s,
if (!s->sink)
return PA_HOOK_OK;
- if (pa_sink_check_suspend(s->sink) <= 0) {
+ if (pa_sink_check_suspend(s->sink, s, NULL) <= 0) {
struct device_info *d;
if ((d = pa_hashmap_get(u->device_infos, s->sink)))
restart(d);
@@ -188,10 +188,10 @@ static pa_hook_result_t source_output_unlink_hook_cb(pa_core *c, pa_source_outpu
return PA_HOOK_OK;
if (s->source->monitor_of) {
- if (pa_sink_check_suspend(s->source->monitor_of) <= 0)
+ if (pa_sink_check_suspend(s->source->monitor_of, NULL, s) <= 0)
d = pa_hashmap_get(u->device_infos, s->source->monitor_of);
} else {
- if (pa_source_check_suspend(s->source) <= 0)
+ if (pa_source_check_suspend(s->source, s) <= 0)
d = pa_hashmap_get(u->device_infos, s->source);
}
@@ -208,7 +208,7 @@ static pa_hook_result_t sink_input_move_start_hook_cb(pa_core *c, pa_sink_input
pa_sink_input_assert_ref(s);
pa_assert(u);
- if (pa_sink_check_suspend(s->sink) <= 1)
+ if (pa_sink_check_suspend(s->sink, s, NULL) <= 0)
if ((d = pa_hashmap_get(u->device_infos, s->sink)))
restart(d);
@@ -241,10 +241,10 @@ static pa_hook_result_t source_output_move_start_hook_cb(pa_core *c, pa_source_o
pa_assert(u);
if (s->source->monitor_of) {
- if (pa_sink_check_suspend(s->source->monitor_of) <= 1)
+ if (pa_sink_check_suspend(s->source->monitor_of, NULL, s) <= 0)
d = pa_hashmap_get(u->device_infos, s->source->monitor_of);
} else {
- if (pa_source_check_suspend(s->source) <= 1)
+ if (pa_source_check_suspend(s->source, s) <= 0)
d = pa_hashmap_get(u->device_infos, s->source);
}
@@ -354,8 +354,8 @@ static pa_hook_result_t device_new_hook_cb(pa_core *c, pa_object *o, struct user
pa_hashmap_put(u->device_infos, o, d);
- if ((d->sink && pa_sink_check_suspend(d->sink) <= 0) ||
- (d->source && pa_source_check_suspend(d->source) <= 0))
+ if ((d->sink && pa_sink_check_suspend(d->sink, NULL, NULL) <= 0) ||
+ (d->source && pa_source_check_suspend(d->source, NULL) <= 0))
restart(d);
return PA_HOOK_OK;
@@ -398,7 +398,7 @@ static pa_hook_result_t device_state_changed_hook_cb(pa_core *c, pa_object *o, s
pa_sink *s = PA_SINK(o);
pa_sink_state_t state = pa_sink_get_state(s);
- if (pa_sink_check_suspend(s) <= 0)
+ if (pa_sink_check_suspend(s, NULL, NULL) <= 0)
if (PA_SINK_IS_OPENED(state))
restart(d);
@@ -406,7 +406,7 @@ static pa_hook_result_t device_state_changed_hook_cb(pa_core *c, pa_object *o, s
pa_source *s = PA_SOURCE(o);
pa_source_state_t state = pa_source_get_state(s);
- if (pa_source_check_suspend(s) <= 0)
+ if (pa_source_check_suspend(s, NULL) <= 0)
if (PA_SOURCE_IS_OPENED(state))
restart(d);
}
@@ -454,8 +454,8 @@ int pa__init(pa_module*m) {
pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_SINK_INPUT_FIXATE], PA_HOOK_NORMAL, (pa_hook_cb_t) sink_input_fixate_hook_cb, u);
pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_FIXATE], PA_HOOK_NORMAL, (pa_hook_cb_t) source_output_fixate_hook_cb, u);
- pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_SINK_INPUT_UNLINK_POST], PA_HOOK_NORMAL, (pa_hook_cb_t) sink_input_unlink_hook_cb, u);
- pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_UNLINK_POST], PA_HOOK_NORMAL, (pa_hook_cb_t) source_output_unlink_hook_cb, u);
+ pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_SINK_INPUT_UNLINK], PA_HOOK_NORMAL, (pa_hook_cb_t) sink_input_unlink_hook_cb, u);
+ pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_UNLINK], PA_HOOK_NORMAL, (pa_hook_cb_t) source_output_unlink_hook_cb, u);
pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_SINK_INPUT_MOVE_START], PA_HOOK_NORMAL, (pa_hook_cb_t) sink_input_move_start_hook_cb, u);
pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_MOVE_START], PA_HOOK_NORMAL, (pa_hook_cb_t) source_output_move_start_hook_cb, u);
pa_module_hook_connect(m, &m->core->hooks[PA_CORE_HOOK_SINK_INPUT_MOVE_FINISH], PA_HOOK_NORMAL, (pa_hook_cb_t) sink_input_move_finish_hook_cb, u);
diff --git a/src/modules/module-tunnel-sink-new.c b/src/modules/module-tunnel-sink-new.c
index 7f83543..92f99df 100644
--- a/src/modules/module-tunnel-sink-new.c
+++ b/src/modules/module-tunnel-sink-new.c
@@ -497,7 +497,11 @@ int pa__init(pa_module *m) {
u->remote_sink_name = pa_xstrdup(pa_modargs_get_value(ma, "sink", NULL));
u->thread_mq = pa_xnew0(pa_thread_mq, 1);
- pa_thread_mq_init_thread_mainloop(u->thread_mq, m->core->mainloop, u->thread_mainloop_api);
+
+ if (pa_thread_mq_init_thread_mainloop(u->thread_mq, m->core->mainloop, u->thread_mainloop_api) < 0) {
+ pa_log("pa_thread_mq_init_thread_mainloop() failed.");
+ goto fail;
+ }
/* Create sink */
pa_sink_new_data_init(&sink_data);
diff --git a/src/modules/module-tunnel-source-new.c b/src/modules/module-tunnel-source-new.c
index 0f72dbf..e159c33 100644
--- a/src/modules/module-tunnel-source-new.c
+++ b/src/modules/module-tunnel-source-new.c
@@ -496,7 +496,11 @@ int pa__init(pa_module *m) {
u->remote_source_name = pa_xstrdup(pa_modargs_get_value(ma, "source", NULL));
u->thread_mq = pa_xnew0(pa_thread_mq, 1);
- pa_thread_mq_init_thread_mainloop(u->thread_mq, m->core->mainloop, u->thread_mainloop_api);
+
+ if (pa_thread_mq_init_thread_mainloop(u->thread_mq, m->core->mainloop, u->thread_mainloop_api) < 0) {
+ pa_log("pa_thread_mq_init_thread_mainloop() failed.");
+ goto fail;
+ }
/* Create source */
pa_source_new_data_init(&source_data);
diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c
index 5c8b84a..e08816b 100644
--- a/src/modules/module-tunnel.c
+++ b/src/modules/module-tunnel.c
@@ -1968,7 +1968,11 @@ int pa__init(pa_module*m) {
u->counter = u->counter_delta = 0;
u->rtpoll = pa_rtpoll_new();
- pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
+
+ if (pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll) < 0) {
+ pa_log("pa_thread_mq_init() failed.");
+ goto fail;
+ }
if (pa_modargs_get_value_boolean(ma, "auto", &automatic) < 0) {
pa_log("Failed to parse argument \"auto\".");
diff --git a/src/modules/module-waveout.c b/src/modules/module-waveout.c
index ab3ea74..0b219f1 100644
--- a/src/modules/module-waveout.c
+++ b/src/modules/module-waveout.c
@@ -684,7 +684,11 @@ int pa__init(pa_module *m) {
sink_get_volume_cb(u->sink);
u->rtpoll = pa_rtpoll_new();
- pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
+
+ if (pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll) < 0) {
+ pa_log("pa_thread_mq_init() failed.");
+ goto fail;
+ }
if (u->sink) {
pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq);
diff --git a/src/modules/module-zeroconf-discover.c b/src/modules/module-zeroconf-discover.c
index a165579..96476b7 100644
--- a/src/modules/module-zeroconf-discover.c
+++ b/src/modules/module-zeroconf-discover.c
@@ -149,6 +149,7 @@ static void resolver_cb(
const char *t;
char *if_suffix = NULL;
char at[AVAHI_ADDRESS_STR_MAX], cmt[PA_CHANNEL_MAP_SNPRINT_MAX];
+ char *properties = NULL;
pa_sample_spec ss;
pa_channel_map cm;
AvahiStringList *l;
@@ -172,7 +173,10 @@ static void resolver_cb(
ss.channels = (uint8_t) atoi(value);
else if (pa_streq(key, "format"))
ss.format = pa_parse_sample_format(value);
- else if (pa_streq(key, "channel_map")) {
+ else if (pa_streq(key, "icon-name")) {
+ pa_xfree(properties);
+ properties = pa_sprintf_malloc("device.icon_name=%s", value);
+ } else if (pa_streq(key, "channel_map")) {
pa_channel_map_parse(&cm, value);
channel_map_set = true;
}
@@ -187,12 +191,14 @@ static void resolver_cb(
if (!pa_sample_spec_valid(&ss)) {
pa_log("Service '%s' contains an invalid sample specification.", name);
avahi_free(device);
+ pa_xfree(properties);
goto finish;
}
if (!pa_channel_map_valid(&cm) || cm.channels != ss.channels) {
pa_log("Service '%s' contains an invalid channel map.", name);
avahi_free(device);
+ pa_xfree(properties);
goto finish;
}
@@ -205,6 +211,7 @@ static void resolver_cb(
pa_log("Cannot construct valid device name from credentials of service '%s'.", dname);
avahi_free(device);
pa_xfree(dname);
+ pa_xfree(properties);
goto finish;
}
@@ -220,6 +227,7 @@ static void resolver_cb(
"format=%s "
"channels=%u "
"rate=%u "
+ "%s_properties=%s "
"%s_name=%s "
"channel_map=%s",
avahi_address_snprint(at, sizeof(at), a),
@@ -228,6 +236,7 @@ static void resolver_cb(
pa_sample_format_to_string(ss.format),
ss.channels,
ss.rate,
+ t, properties ? properties : "",
t, dname,
pa_channel_map_snprint(cmt, sizeof(cmt), &cm));
@@ -243,6 +252,7 @@ static void resolver_cb(
pa_xfree(dname);
pa_xfree(args);
pa_xfree(if_suffix);
+ pa_xfree(properties);
avahi_free(device);
}
diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c
index ceedfe0..e971029 100644
--- a/src/modules/module-zeroconf-publish.c
+++ b/src/modules/module-zeroconf-publish.c
@@ -46,6 +46,14 @@
#include <pulsecore/avahi-wrap.h>
#include <pulsecore/protocol-native.h>
+#ifdef HAVE_DBUS
+#include <pulsecore/dbus-shared.h>
+
+#define HOSTNAME_DBUS_INTERFACE "org.freedesktop.hostname1"
+#define HOSTNAME_DBUS_PATH "/org/freedesktop/hostname1"
+#define HOSTNAME_DBUS_ICON_PROPERTY "IconName"
+#endif
+
#include "module-zeroconf-publish-symdef.h"
PA_MODULE_AUTHOR("Lennart Poettering");
@@ -133,6 +141,7 @@ struct userdata {
pa_hashmap *services; /* protect with mainloop lock */
char *service_name;
+ char *icon_name;
AvahiEntryGroup *main_entry_group;
@@ -308,8 +317,6 @@ static void publish_service(pa_mainloop_api *api PA_GCC_UNUSED, void *service) {
if ((t = pa_proplist_gets(s->proplist, PA_PROP_DEVICE_DESCRIPTION)))
txt = avahi_string_list_add_pair(txt, "description", t);
- if ((t = pa_proplist_gets(s->proplist, PA_PROP_DEVICE_ICON_NAME)))
- txt = avahi_string_list_add_pair(txt, "icon-name", t);
if ((t = pa_proplist_gets(s->proplist, PA_PROP_DEVICE_VENDOR_NAME)))
txt = avahi_string_list_add_pair(txt, "vendor-name", t);
if ((t = pa_proplist_gets(s->proplist, PA_PROP_DEVICE_PRODUCT_NAME)))
@@ -319,6 +326,12 @@ static void publish_service(pa_mainloop_api *api PA_GCC_UNUSED, void *service) {
if ((t = pa_proplist_gets(s->proplist, PA_PROP_DEVICE_FORM_FACTOR)))
txt = avahi_string_list_add_pair(txt, "form-factor", t);
+ if (s->userdata->icon_name) {
+ txt = avahi_string_list_add_pair(txt, "icon-name", s->userdata->icon_name);
+ } else if ((t = pa_proplist_gets(s->proplist, PA_PROP_DEVICE_ICON_NAME))) {
+ txt = avahi_string_list_add_pair(txt, "icon-name", t);
+ }
+
if (avahi_entry_group_add_service_strlst(
s->entry_group,
AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC,
@@ -653,6 +666,69 @@ static int avahi_process_msg(pa_msgobject *o, int code, void *data, int64_t offs
return 0;
}
+#ifdef HAVE_DBUS
+static char *get_icon_name(pa_module*m) {
+ const char *interface = HOSTNAME_DBUS_INTERFACE;
+ const char *property = HOSTNAME_DBUS_ICON_PROPERTY;
+ char *icon_name = NULL;
+ pa_dbus_connection *bus;
+ DBusError error;
+ DBusMessageIter args;
+ DBusMessage *msg = NULL;
+ DBusMessage *reply = NULL;
+ DBusConnection *conn = NULL;
+ DBusMessageIter sub;
+
+ if (!(bus = pa_dbus_bus_get(m->core, DBUS_BUS_SYSTEM, &error))) {
+ pa_log("Failed to get system bus connection: %s", error.message);
+ goto out;
+ }
+
+ conn = pa_dbus_connection_get(bus);
+
+ msg = dbus_message_new_method_call(HOSTNAME_DBUS_INTERFACE,
+ HOSTNAME_DBUS_PATH,
+ "org.freedesktop.DBus.Properties",
+ "Get");
+ dbus_message_append_args(msg, DBUS_TYPE_STRING, &interface, DBUS_TYPE_STRING, &property, DBUS_TYPE_INVALID);
+
+ dbus_error_init(&error);
+ if ((reply = dbus_connection_send_with_reply_and_block(conn, msg, -1, &error)) == NULL) {
+ pa_log("Failed to send: %s:%s", error.name, error.message);
+ dbus_error_free(&error);
+ goto out;
+ }
+
+ dbus_message_iter_init(reply, &args);
+ if (dbus_message_iter_get_arg_type(&args) != DBUS_TYPE_VARIANT) {
+ pa_log("Incorrect reply type");
+ goto out;
+ }
+
+ dbus_message_iter_recurse(&args, &sub);
+
+ if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRING) {
+ pa_log("Incorrect value type");
+ goto out;
+ }
+
+ dbus_message_iter_get_basic(&sub, &icon_name);
+ icon_name = pa_xstrdup(icon_name);
+
+out:
+ if (reply)
+ dbus_message_unref(reply);
+
+ if (msg)
+ dbus_message_unref(msg);
+
+ if (bus)
+ pa_dbus_connection_unref(bus);
+
+ return icon_name;
+}
+#endif
+
/* Runs in Avahi mainloop context */
static void client_callback(AvahiClient *c, AvahiClientState state, void *userdata) {
struct userdata *u = userdata;
@@ -666,6 +742,12 @@ static void client_callback(AvahiClient *c, AvahiClientState state, void *userda
case AVAHI_CLIENT_S_RUNNING:
/* Collect all sinks/sources, and publish them */
pa_asyncmsgq_post(u->thread_mq.outq, PA_MSGOBJECT(u->msg), AVAHI_MESSAGE_PUBLISH_ALL, u, 0, NULL, NULL);
+
+#ifdef HAVE_DBUS
+ /* Request icon name through D-BUS */
+ u->icon_name = get_icon_name(u->module);
+#endif
+
break;
case AVAHI_CLIENT_S_COLLISION:
@@ -744,7 +826,11 @@ int pa__init(pa_module*m) {
u->mainloop = pa_threaded_mainloop_new();
u->api = pa_threaded_mainloop_get_api(u->mainloop);
- pa_thread_mq_init(&u->thread_mq, u->core->mainloop, u->rtpoll);
+ if (pa_thread_mq_init(&u->thread_mq, u->core->mainloop, u->rtpoll) < 0) {
+ pa_log("pa_thread_mq_init() failed.");
+ goto fail;
+ }
+
u->msg = pa_msgobject_new(avahi_msg);
u->msg->parent.process_msg = avahi_process_msg;
@@ -766,7 +852,8 @@ int pa__init(pa_module*m) {
pa_xfree(hn);
pa_threaded_mainloop_set_name(u->mainloop, "avahi-ml");
- pa_threaded_mainloop_start(u->mainloop);
+ if (pa_threaded_mainloop_start(u->mainloop) < 0)
+ goto fail;
pa_threaded_mainloop_lock(u->mainloop);
pa_mainloop_api_once(u->api, create_client, u);
@@ -843,5 +930,6 @@ void pa__done(pa_module*m) {
pa_xfree(u->msg);
pa_xfree(u->service_name);
+ pa_xfree(u->icon_name);
pa_xfree(u);
}
diff --git a/src/modules/oss/module-oss.c b/src/modules/oss/module-oss.c
index 8537dd8..8a5a692 100644
--- a/src/modules/oss/module-oss.c
+++ b/src/modules/oss/module-oss.c
@@ -1270,7 +1270,12 @@ int pa__init(pa_module*m) {
u->orig_frag_size = orig_frag_size;
u->use_mmap = use_mmap;
u->rtpoll = pa_rtpoll_new();
- pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
+
+ if (pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll) < 0) {
+ pa_log("pa_thread_mq_init() failed.");
+ goto fail;
+ }
+
u->rtpoll_item = NULL;
build_pollfd(u);
diff --git a/src/modules/raop/base64.c b/src/modules/raop/base64.c
index cdf52a6..1e09740 100644
--- a/src/modules/raop/base64.c
+++ b/src/modules/raop/base64.c
@@ -19,7 +19,7 @@
/*
This file was originally inspired by a file developed by
- Kungliga Tekniska H�gskolan
+ Kungliga Tekniska högskolan
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/modules/raop/base64.h b/src/modules/raop/base64.h
index 352ab96..59160c9 100644
--- a/src/modules/raop/base64.h
+++ b/src/modules/raop/base64.h
@@ -5,7 +5,7 @@
This file is part of PulseAudio.
Copyright 2008 Colin Guthrie
- Copyright Kungliga Tekniska Høgskolan
+ Copyright Kungliga Tekniska högskolan
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
@@ -23,7 +23,7 @@
/*
This file was originally inspired by a file developed by
- Kungliga Tekniska Høgskolan
+ Kungliga Tekniska högskolan
*/
int pa_base64_encode(const void *data, int size, char **str);
diff --git a/src/modules/raop/module-raop-sink.c b/src/modules/raop/module-raop-sink.c
index 6037038..7a97e83 100644
--- a/src/modules/raop/module-raop-sink.c
+++ b/src/modules/raop/module-raop-sink.c
@@ -551,7 +551,12 @@ int pa__init(pa_module*m) {
u->encoding_ratio = 1.0;
u->rtpoll = pa_rtpoll_new();
- pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
+
+ if (pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll) < 0) {
+ pa_log("pa_thread_mq_init() failed.");
+ goto fail;
+ }
+
u->rtpoll_item = NULL;
/*u->format =
diff --git a/src/modules/raop/raop_client.c b/src/modules/raop/raop_client.c
index 3b6c36e..864c558 100644
--- a/src/modules/raop/raop_client.c
+++ b/src/modules/raop/raop_client.c
@@ -68,6 +68,21 @@
#define RAOP_PORT 5000
+/* Openssl 1.1.0 broke compatibility. Before 1.1.0 we had to set RSA->n and
+ * RSA->e manually, but after 1.1.0 the RSA struct is opaque and we have to use
+ * RSA_set0_key(). RSA_set0_key() is a new function added in 1.1.0. We could
+ * depend on openssl 1.1.0, but it may take some time before distributions will
+ * be able to upgrade to the new openssl version. To insulate ourselves from
+ * such transition problems, let's implement RSA_set0_key() ourselves if it's
+ * not available. */
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+static int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) {
+ r->n = n;
+ r->e = e;
+ return 1;
+}
+#endif
+
struct pa_raop_client {
pa_core *core;
char *host;
@@ -161,12 +176,15 @@ static int rsa_encrypt(uint8_t *text, int len, uint8_t *res) {
uint8_t exponent[8];
int size;
RSA *rsa;
+ BIGNUM *n_bn;
+ BIGNUM *e_bn;
rsa = RSA_new();
size = pa_base64_decode(n, modules);
- rsa->n = BN_bin2bn(modules, size, NULL);
+ n_bn = BN_bin2bn(modules, size, NULL);
size = pa_base64_decode(e, exponent);
- rsa->e = BN_bin2bn(exponent, size, NULL);
+ e_bn = BN_bin2bn(exponent, size, NULL);
+ RSA_set0_key(rsa, n_bn, e_bn, NULL);
size = RSA_public_encrypt(len, text, res, rsa, RSA_PKCS1_OAEP_PADDING);
RSA_free(rsa);
diff --git a/src/modules/rtp/rtp.c b/src/modules/rtp/rtp.c
index 17c8d3c..5ab80e7 100644
--- a/src/modules/rtp/rtp.c
+++ b/src/modules/rtp/rtp.c
@@ -54,6 +54,8 @@ pa_rtp_context* pa_rtp_context_init_send(pa_rtp_context *c, int fd, uint32_t ssr
c->payload = (uint8_t) (payload & 127U);
c->frame_size = frame_size;
+ c->recv_buf = NULL;
+ c->recv_buf_size = 0;
pa_memchunk_reset(&c->memchunk);
return c;
@@ -155,12 +157,16 @@ pa_rtp_context* pa_rtp_context_init_recv(pa_rtp_context *c, int fd, size_t frame
c->fd = fd;
c->frame_size = frame_size;
+ c->recv_buf_size = 2000;
+ c->recv_buf = pa_xmalloc(c->recv_buf_size);
pa_memchunk_reset(&c->memchunk);
return c;
}
int pa_rtp_recv(pa_rtp_context *c, pa_memchunk *chunk, pa_mempool *pool, struct timeval *tstamp) {
int size;
+ size_t audio_length;
+ size_t metadata_length;
struct msghdr m;
struct cmsghdr *cm;
struct iovec iov;
@@ -204,25 +210,17 @@ int pa_rtp_recv(pa_rtp_context *c, pa_memchunk *chunk, pa_mempool *pool, struct
size = 1;
}
- if (c->memchunk.length < (unsigned) size) {
- size_t l;
-
- if (c->memchunk.memblock)
- pa_memblock_unref(c->memchunk.memblock);
+ if (c->recv_buf_size < (size_t) size) {
+ do
+ c->recv_buf_size *= 2;
+ while (c->recv_buf_size < (size_t) size);
- l = PA_MAX((size_t) size, pa_mempool_block_size_max(pool));
-
- c->memchunk.memblock = pa_memblock_new(pool, l);
- c->memchunk.index = 0;
- c->memchunk.length = pa_memblock_get_length(c->memchunk.memblock);
+ c->recv_buf = pa_xrealloc(c->recv_buf, c->recv_buf_size);
}
- pa_assert(c->memchunk.length >= (size_t) size);
-
- chunk->memblock = pa_memblock_ref(c->memchunk.memblock);
- chunk->index = c->memchunk.index;
+ pa_assert(c->recv_buf_size >= (size_t) size);
- iov.iov_base = pa_memblock_acquire_chunk(chunk);
+ iov.iov_base = c->recv_buf;
iov.iov_len = (size_t) size;
m.msg_name = NULL;
@@ -234,7 +232,6 @@ int pa_rtp_recv(pa_rtp_context *c, pa_memchunk *chunk, pa_mempool *pool, struct
m.msg_flags = 0;
r = recvmsg(c->fd, &m, 0);
- pa_memblock_release(chunk->memblock);
if (r != size) {
if (r < 0 && errno != EAGAIN && errno != EINTR)
@@ -275,21 +272,42 @@ int pa_rtp_recv(pa_rtp_context *c, pa_memchunk *chunk, pa_mempool *pool, struct
c->payload = (uint8_t) ((header >> 16) & 127U);
c->sequence = (uint16_t) (header & 0xFFFFU);
- if (12 + cc*4 > (unsigned) size) {
+ metadata_length = 12 + cc * 4;
+
+ if (metadata_length > (unsigned) size) {
pa_log_warn("RTP packet too short. (CSRC)");
goto fail;
}
- chunk->index += 12 + cc*4;
- chunk->length = (size_t) size - 12 + cc*4;
+ audio_length = size - metadata_length;
- if (chunk->length % c->frame_size != 0) {
+ if (audio_length % c->frame_size != 0) {
pa_log_warn("Bad RTP packet size.");
goto fail;
}
- c->memchunk.index = chunk->index + chunk->length;
- c->memchunk.length = pa_memblock_get_length(c->memchunk.memblock) - c->memchunk.index;
+ if (c->memchunk.length < (unsigned) audio_length) {
+ size_t l;
+
+ if (c->memchunk.memblock)
+ pa_memblock_unref(c->memchunk.memblock);
+
+ l = PA_MAX((size_t) audio_length, pa_mempool_block_size_max(pool));
+
+ c->memchunk.memblock = pa_memblock_new(pool, l);
+ c->memchunk.index = 0;
+ c->memchunk.length = pa_memblock_get_length(c->memchunk.memblock);
+ }
+
+ memcpy(pa_memblock_acquire_chunk(&c->memchunk), c->recv_buf + metadata_length, audio_length);
+ pa_memblock_release(c->memchunk.memblock);
+
+ chunk->memblock = pa_memblock_ref(c->memchunk.memblock);
+ chunk->index = c->memchunk.index;
+ chunk->length = audio_length;
+
+ c->memchunk.index += audio_length;
+ c->memchunk.length -= audio_length;
if (c->memchunk.length <= 0) {
pa_memblock_unref(c->memchunk.memblock);
@@ -397,6 +415,10 @@ void pa_rtp_context_destroy(pa_rtp_context *c) {
if (c->memchunk.memblock)
pa_memblock_unref(c->memchunk.memblock);
+
+ pa_xfree(c->recv_buf);
+ c->recv_buf = NULL;
+ c->recv_buf_size = 0;
}
const char* pa_rtp_format_to_string(pa_sample_format_t f) {
diff --git a/src/modules/rtp/rtp.h b/src/modules/rtp/rtp.h
index bbd4278..0b877d5 100644
--- a/src/modules/rtp/rtp.h
+++ b/src/modules/rtp/rtp.h
@@ -34,6 +34,8 @@ typedef struct pa_rtp_context {
uint8_t payload;
size_t frame_size;
+ uint8_t *recv_buf;
+ size_t recv_buf_size;
pa_memchunk memchunk;
} pa_rtp_context;
diff --git a/src/modules/stream-interaction.c b/src/modules/stream-interaction.c
index 7a476c3..4184786 100644
--- a/src/modules/stream-interaction.c
+++ b/src/modules/stream-interaction.c
@@ -319,6 +319,7 @@ int pa_stream_interaction_init(pa_module *m, const char* const v_modargs[]) {
pa_modargs *ma = NULL;
struct userdata *u;
const char *roles;
+ char *roles_in_group = NULL;
bool global = false;
uint32_t i = 0;
@@ -396,8 +397,8 @@ int pa_stream_interaction_init(pa_module *m, const char* const v_modargs[]) {
roles = pa_modargs_get_value(ma, "trigger_roles", NULL);
if (roles) {
const char *group_split_state = NULL;
- char *roles_in_group = NULL;
i = 0;
+
while ((roles_in_group = pa_split(roles, "/", &group_split_state))) {
if (roles_in_group[0] != '\0') {
const char *split_state = NULL;
@@ -414,9 +415,10 @@ int pa_stream_interaction_init(pa_module *m, const char* const v_modargs[]) {
i++;
} else {
pa_log("empty trigger roles");
- pa_xfree(roles_in_group);
goto fail;
}
+
+ pa_xfree(roles_in_group);
}
}
if (pa_idxset_isempty(u->groups[0]->trigger_roles)) {
@@ -427,8 +429,8 @@ int pa_stream_interaction_init(pa_module *m, const char* const v_modargs[]) {
roles = pa_modargs_get_value(ma, u->duck ? "ducking_roles" : "cork_roles", NULL);
if (roles) {
const char *group_split_state = NULL;
- char *roles_in_group = NULL;
i = 0;
+
while ((roles_in_group = pa_split(roles, "/", &group_split_state))) {
if (roles_in_group[0] != '\0') {
const char *split_state = NULL;
@@ -445,9 +447,10 @@ int pa_stream_interaction_init(pa_module *m, const char* const v_modargs[]) {
i++;
} else {
pa_log("empty ducking roles");
- pa_xfree(roles_in_group);
goto fail;
}
+
+ pa_xfree(roles_in_group);
}
}
if (pa_idxset_isempty(u->groups[0]->interaction_roles)) {
@@ -503,6 +506,8 @@ fail:
if (ma)
pa_modargs_free(ma);
+ if (roles_in_group)
+ pa_xfree(roles_in_group);
return -1;
diff --git a/src/modules/xen/gntalloc.h b/src/modules/xen/gntalloc.h
deleted file mode 100644
index 4a9921c..0000000
--- a/src/modules/xen/gntalloc.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * This file is copied from the linux kernel headers. It defines the standard
- * interface to the xen/gntalloc device.
- *
- */
-
-/******************************************************************************
- * gntalloc.h
- *
- * Interface to /dev/xen/gntalloc.
- *
- * Author: Daniel De Graaf <dgdegra at tycho.nsa.gov>
- *
- * This file is in the public domain.
- */
-
-#ifndef __LINUX_PUBLIC_GNTALLOC_H__
-#define __LINUX_PUBLIC_GNTALLOC_H__
-
-/*
- * Allocates a new page and creates a new grant reference.
- */
-#define IOCTL_GNTALLOC_ALLOC_GREF \
-_IOC(_IOC_NONE, 'G', 5, sizeof(struct ioctl_gntalloc_alloc_gref))
-struct ioctl_gntalloc_alloc_gref {
- /* IN parameters */
- /* The ID of the domain to be given access to the grants. */
- uint16_t domid;
- /* Flags for this mapping */
- uint16_t flags;
- /* Number of pages to map */
- uint32_t count;
- /* OUT parameters */
- /* The offset to be used on a subsequent call to mmap(). */
- uint64_t index;
- /* The grant references of the newly created grant, one per page */
- /* Variable size, depending on count */
- uint32_t gref_ids[1];
-};
-
-#define GNTALLOC_FLAG_WRITABLE 1
-
-/*
- * Deallocates the grant reference, allowing the associated page to be freed if
- * no other domains are using it.
- */
-#define IOCTL_GNTALLOC_DEALLOC_GREF \
-_IOC(_IOC_NONE, 'G', 6, sizeof(struct ioctl_gntalloc_dealloc_gref))
-struct ioctl_gntalloc_dealloc_gref {
- /* IN parameters */
- /* The offset returned in the map operation */
- uint64_t index;
- /* Number of references to unmap */
- uint32_t count;
-};
-
-/*
- * Sets up an unmap notification within the page, so that the other side can do
- * cleanup if this side crashes. Required to implement cross-domain robust
- * mutexes or close notification on communication channels.
- *
- * Each mapped page only supports one notification; multiple calls referring to
- * the same page overwrite the previous notification. You must clear the
- * notification prior to the IOCTL_GNTALLOC_DEALLOC_GREF if you do not want it
- * to occur.
- */
-#define IOCTL_GNTALLOC_SET_UNMAP_NOTIFY \
-_IOC(_IOC_NONE, 'G', 7, sizeof(struct ioctl_gntalloc_unmap_notify))
-struct ioctl_gntalloc_unmap_notify {
- /* IN parameters */
- /* Offset in the file descriptor for a byte within the page (same as
- * used in mmap). If using UNMAP_NOTIFY_CLEAR_BYTE, this is the byte to
- * be cleared. Otherwise, it can be any byte in the page whose
- * notification we are adjusting.
- */
- uint64_t index;
- /* Action(s) to take on unmap */
- uint32_t action;
- /* Event channel to notify */
- uint32_t event_channel_port;
-};
-
-/* Clear (set to zero) the byte specified by index */
-#define UNMAP_NOTIFY_CLEAR_BYTE 0x1
-/* Send an interrupt on the indicated event channel */
-#define UNMAP_NOTIFY_SEND_EVENT 0x2
-
-#endif /* __LINUX_PUBLIC_GNTALLOC_H__ */
diff --git a/src/modules/xen/gntdev.h b/src/modules/xen/gntdev.h
deleted file mode 100644
index 7f65a38..0000000
--- a/src/modules/xen/gntdev.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * This file is copied from the linux kernel headers. It defines the standard
- * interface to the xen/gntdev device.
- *
- */
-
-/******************************************************************************
- * gntdev.h
- *
- * Interface to /dev/xen/gntdev.
- *
- * Copyright (c) 2007, D G Murray
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation; or, when distributed
- * separately from the Linux kernel or incorporated into other
- * software packages, subject to the following license:
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this source file (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy, modify,
- * merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-#ifndef __LINUX_PUBLIC_GNTDEV_H__
-#define __LINUX_PUBLIC_GNTDEV_H__
-
-struct ioctl_gntdev_grant_ref {
- /* The domain ID of the grant to be mapped. */
- uint32_t domid;
- /* The grant reference of the grant to be mapped. */
- uint32_t ref;
-};
-
-/*
- * Inserts the grant references into the mapping table of an instance
- * of gntdev. N.B. This does not perform the mapping, which is deferred
- * until mmap() is called with @index as the offset.
- */
-#define IOCTL_GNTDEV_MAP_GRANT_REF \
-_IOC(_IOC_NONE, 'G', 0, sizeof(struct ioctl_gntdev_map_grant_ref))
-struct ioctl_gntdev_map_grant_ref {
- /* IN parameters */
- /* The number of grants to be mapped. */
- uint32_t count;
- uint32_t pad;
- /* OUT parameters */
- /* The offset to be used on a subsequent call to mmap(). */
- uint64_t index;
- /* Variable IN parameter. */
- /* Array of grant references, of size @count. */
- struct ioctl_gntdev_grant_ref refs[1];
-};
-
-/*
- * Removes the grant references from the mapping table of an instance of
- * of gntdev. N.B. munmap() must be called on the relevant virtual address(es)
- * before this ioctl is called, or an error will result.
- */
-#define IOCTL_GNTDEV_UNMAP_GRANT_REF \
-_IOC(_IOC_NONE, 'G', 1, sizeof(struct ioctl_gntdev_unmap_grant_ref))
-struct ioctl_gntdev_unmap_grant_ref {
- /* IN parameters */
- /* The offset was returned by the corresponding map operation. */
- uint64_t index;
- /* The number of pages to be unmapped. */
- uint32_t count;
- uint32_t pad;
-};
-
-/*
- * Returns the offset in the driver's address space that corresponds
- * to @vaddr. This can be used to perform a munmap(), followed by an
- * UNMAP_GRANT_REF ioctl, where no state about the offset is retained by
- * the caller. The number of pages that were allocated at the same time as
- * @vaddr is returned in @count.
- *
- * N.B. Where more than one page has been mapped into a contiguous range, the
- * supplied @vaddr must correspond to the start of the range; otherwise
- * an error will result. It is only possible to munmap() the entire
- * contiguously-allocated range at once, and not any subrange thereof.
- */
-#define IOCTL_GNTDEV_GET_OFFSET_FOR_VADDR \
-_IOC(_IOC_NONE, 'G', 2, sizeof(struct ioctl_gntdev_get_offset_for_vaddr))
-struct ioctl_gntdev_get_offset_for_vaddr {
- /* IN parameters */
- /* The virtual address of the first mapped page in a range. */
- uint64_t vaddr;
- /* OUT parameters */
- /* The offset that was used in the initial mmap() operation. */
- uint64_t offset;
- /* The number of pages mapped in the VM area that begins at @vaddr. */
- uint32_t count;
- uint32_t pad;
-};
-
-/*
- * Sets the maximum number of grants that may mapped at once by this gntdev
- * instance.
- *
- * N.B. This must be called before any other ioctl is performed on the device.
- */
-#define IOCTL_GNTDEV_SET_MAX_GRANTS \
-_IOC(_IOC_NONE, 'G', 3, sizeof(struct ioctl_gntdev_set_max_grants))
-struct ioctl_gntdev_set_max_grants {
- /* IN parameter */
- /* The maximum number of grants that may be mapped at once. */
- uint32_t count;
-};
-
-/*
- * Sets up an unmap notification within the page, so that the other side can do
- * cleanup if this side crashes. Required to implement cross-domain robust
- * mutexes or close notification on communication channels.
- *
- * Each mapped page only supports one notification; multiple calls referring to
- * the same page overwrite the previous notification. You must clear the
- * notification prior to the IOCTL_GNTALLOC_DEALLOC_GREF if you do not want it
- * to occur.
- */
-#define IOCTL_GNTDEV_SET_UNMAP_NOTIFY \
-_IOC(_IOC_NONE, 'G', 7, sizeof(struct ioctl_gntdev_unmap_notify))
-struct ioctl_gntdev_unmap_notify {
- /* IN parameters */
- /* Offset in the file descriptor for a byte within the page (same as
- * used in mmap). If using UNMAP_NOTIFY_CLEAR_BYTE, this is the byte to
- * be cleared. Otherwise, it can be any byte in the page whose
- * notification we are adjusting.
- */
- uint64_t index;
- /* Action(s) to take on unmap */
- uint32_t action;
- /* Event channel to notify */
- uint32_t event_channel_port;
-};
-
-/* Clear (set to zero) the byte specified by index */
-#define UNMAP_NOTIFY_CLEAR_BYTE 0x1
-/* Send an interrupt on the indicated event channel */
-#define UNMAP_NOTIFY_SEND_EVENT 0x2
-
-#endif /* __LINUX_PUBLIC_GNTDEV_H__ */
diff --git a/src/modules/xen/module-xenpv-sink.c b/src/modules/xen/module-xenpv-sink.c
deleted file mode 100644
index 4813f10..0000000
--- a/src/modules/xen/module-xenpv-sink.c
+++ /dev/null
@@ -1,798 +0,0 @@
-/***
- This file is part of PulseAudio.
-
- Copyright 2004-2006 Lennart Poettering
- Copyright 2011 George Boutsioukis for Xen
-
- PulseAudio is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License,
- or (at your option) any later version.
-
- PulseAudio is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <limits.h>
-#include <sys/ioctl.h>
-#include <poll.h>
-#include <time.h>
-
-#include <pulse/xmalloc.h>
-
-#include <pulsecore/core-error.h>
-#include <pulsecore/sink.h>
-#include <pulsecore/module.h>
-#include <pulsecore/core-util.h>
-#include <pulsecore/modargs.h>
-#include <pulsecore/log.h>
-#include <pulsecore/thread.h>
-#include <pulsecore/thread-mq.h>
-#include <pulsecore/rtpoll.h>
-
-#include <sys/select.h>
-#include <sys/mman.h>
-#include <xenctrl.h>
-#include <xs.h>
-
-#include "module-xenpv-sink-symdef.h"
-#include "gntalloc.h"
-#include "gntdev.h"
-
-PA_MODULE_AUTHOR("Giorgos Boutsioukis");
-PA_MODULE_DESCRIPTION("Xen PV audio sink");
-PA_MODULE_VERSION(PACKAGE_VERSION);
-PA_MODULE_LOAD_ONCE(false);
-PA_MODULE_USAGE(
- "sink_name=<name for the sink> "
- "sink_properties=<properties for the sink> "
- "format=<sample format> "
- "rate=<sample rate>"
- "channels=<number of channels> "
- "channel_map=<channel map>");
-
-#define DEFAULT_SINK_NAME "xenpv_output"
-#define DEFAULT_FILE_NAME "xenpv_output"
-
-#define STATE_UNDEFINED 9999
-
-int device_id = -1;
-enum xenbus_state {
- XenbusStateUnknown = 0,
- XenbusStateInitialising = 1,
- XenbusStateInitWait = 2,
- XenbusStateInitialised = 3,
- XenbusStateConnected = 4,
- XenbusStateClosing = 5,
- XenbusStateClosed = 6,
- XenbusStateReconfiguring = 7,
- XenbusStateReconfigured = 8
-};
-
-static const char* xenbus_names[] = {
- "XenbusStateUnknown",
- "XenbusStateInitialising",
- "XenbusStateInitWait",
- "XenbusStateInitialised",
- "XenbusStateConnected",
- "XenbusStateClosing",
- "XenbusStateClosed",
- "XenbusStateReconfiguring",
- "XenbusStateReconfigured"
-};
-
-struct userdata {
- pa_core *core;
- pa_module *module;
- pa_sink *sink;
-
- pa_thread *thread;
- pa_thread_mq thread_mq;
- pa_rtpoll *rtpoll;
-
- pa_memchunk memchunk;
-
- pa_rtpoll_item *rtpoll_item;
-
- int write_type;
-};
-
-pa_sample_spec ss;
-pa_channel_map map;
-
-/* just to test non- frame-aligned size */
-#define BUFSIZE 2047
-
-struct ring {
- uint32_t cons_indx, prod_indx;
- uint32_t usable_buffer_space; /* kept here for convenience */
- uint8_t buffer[BUFSIZE];
-} *ioring;
-
-static const char* const valid_modargs[] = {
- "sink_name",
- "sink_properties",
- "file",
- "format",
- "rate",
- "channels",
- "channel_map",
- NULL
-};
-
-/* Xen globals*/
-xc_interface* xch;
-xc_evtchn* xce;
-evtchn_port_or_error_t xen_evtchn_port;
-static struct xs_handle *xsh;
-struct ioctl_gntalloc_alloc_gref gref;
-
-static int register_backend_state_watch(void);
-static int wait_for_backend_state_change(void);
-static int alloc_gref(struct ioctl_gntalloc_alloc_gref *gref, void **addr);
-static int ring_write(struct ring *r, void *src, int length);
-static int publish_spec(pa_sample_spec *ss);
-static int read_backend_default_spec(pa_sample_spec *ss);
-static int publish_param(const char *paramname, const char *value);
-static int publish_param_int(const char *paramname, const int value);
-static char* read_param(const char *paramname);
-
-static int set_state(int state) {
- static int current_state = 0;
- pa_log_debug("State transition %s->%s\n",
- xenbus_names[current_state], xenbus_names[state]);
-
- publish_param_int("state", state);
- current_state = state;
- return state;
-}
-#define NEGOTIATION_ERROR 2
-#define NEGOTIATION_OK 1
-
-/* negotiation callbacks */
-static int state_unknown_cb() {
- pa_log_debug("Xen audio sink: Backend state was XenbusStateUnknown\n");
- set_state(XenbusStateInitialising);
-
- return 0;
-}
-
-static int state_initialising_cb() {
- pa_log_debug("Xen audio sink: Backend state was XenbusStateInitialising\n");
- set_state(XenbusStateInitialised);
- return 0;
-}
-
-static int state_initwait_cb() {
- pa_log_debug("Xen audio sink: Backend state was XenbusStateInitWait\n");
- return 0;
-}
-
-static int state_initialised_cb() {
- pa_log_debug("Xen audio sink: Backend state was XenbusStateInitialised\n");
- /*Remind the backend we are ready*/
- set_state(XenbusStateInitialised);
- return 0;
-}
-
-static int state_connected_cb() {
- /* The backend accepted our parameters, sweet! */
- set_state(XenbusStateConnected);
- pa_log_debug("Xen audio sink: Backend state was XenbusStateConnected\n");
- return NEGOTIATION_OK;
-}
-
-static int state_closing_cb() {
- pa_log_debug("Xen audio sink: Backend state was XenbusStateClosing\n");
- return 0;
-}
-
-static int state_closed_cb() {
- pa_log_debug("Xen audio sink: Backend state was XenbusStateClosed\n");
- return 0;
-}
-
-static int state_reconfiguring_cb() {
- /* The backend rejected our sample spec */
- pa_log_debug("Xen audio sink: Backend state was XenbusStateReconfiguring\n");
- /* fall back to the backend's default parameters*/
- read_backend_default_spec(&ss);
- /* backend should accept these now */
- publish_spec(&ss);
- set_state(XenbusStateInitialised);
- return 0;
-}
-
-static int state_reconfigured_cb() {
- pa_log_debug("Xen audio sink: Backend state was XenbusStateReconfigured\n");
- return 0;
-}
-
-int (*state_callbacks[9])(void) = {
- state_unknown_cb,
- state_initialising_cb,
- state_initwait_cb,
- state_initialised_cb,
- state_connected_cb,
- state_closing_cb,
- state_closed_cb,
- state_reconfiguring_cb,
- state_reconfigured_cb
-};
-
-static void xen_cleanup() {
- char keybuf[64];
- /*XXX hardcoded*/
- munmap((void*)gref.index, 4096);
-
- set_state(XenbusStateClosing);
- /* send one last event to unblock the backend */
- xc_evtchn_notify(xce, xen_evtchn_port);
- /* close xen interfaces */
- xc_evtchn_close(xce);
- xc_interface_close(xch);
-
- /* delete xenstore keys */
- publish_param_int("state", XenbusStateClosed);
- snprintf(keybuf, sizeof(keybuf), "device/audio/%d", device_id);
- xs_rm(xsh, 0, keybuf);
- xs_daemon_close(xsh);
-}
-
-static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) {
- struct userdata *u = PA_SINK(o)->userdata;
-
- switch (code) {
-
- case PA_SINK_MESSAGE_GET_LATENCY: {
- size_t n = 0;
-
- n += u->memchunk.length;
-
- *((pa_usec_t*) data) = pa_bytes_to_usec(n, &u->sink->sample_spec);
- return 0;
- }
- }
-
- return pa_sink_process_msg(o, code, data, offset, chunk);
-}
-
-static int process_render(struct userdata *u) {
- pa_assert(u);
-
- if (u->memchunk.length <= 0)
- pa_sink_render(u->sink, ioring->usable_buffer_space, &u->memchunk);
-
- pa_assert(u->memchunk.length > 0);
-
- xc_evtchn_notify(xce, xen_evtchn_port);
- for (;;) {
- ssize_t l;
- void *p;
-
- p = pa_memblock_acquire(u->memchunk.memblock);
- /* xen: write data to ring buffer & notify backend */
- l = ring_write(ioring, (uint8_t*)p + u->memchunk.index, u->memchunk.length);
-
- pa_memblock_release(u->memchunk.memblock);
-
- pa_assert(l != 0);
-
- if (l < 0) {
- if (errno == EINTR)
- continue;
- else if (errno == EAGAIN)
- return 0;
- else {
- pa_log("Failed to write data to FIFO: %s", pa_cstrerror(errno));
- return -1;
- }
-
- } else {
-
- u->memchunk.index += (size_t) l;
- u->memchunk.length -= (size_t) l;
-
- if (u->memchunk.length <= 0) {
- pa_memblock_unref(u->memchunk.memblock);
- pa_memchunk_reset(&u->memchunk);
- }
- }
-
- return 0;
- }
-}
-
-static void thread_func(void *userdata) {
- struct userdata *u = userdata;
-
- pa_assert(u);
-
- pa_log_debug("Thread starting up");
-
- pa_thread_mq_install(&u->thread_mq);
-
- for(;;) {
- struct pollfd *pollfd;
- int ret;
-
- pollfd = pa_rtpoll_item_get_pollfd(u->rtpoll_item, NULL);
-
- if (PA_UNLIKELY(u->sink->thread_info.rewind_requested))
- pa_sink_process_rewind(u->sink, 0);
-
- /* Render some data and write it to the fifo */
- if (PA_SINK_IS_OPENED(u->sink->thread_info.state)) {
- if (pollfd->revents) {
- if (process_render(u) < 0)
- goto fail;
-
- pollfd->revents = 0;
- }
- }
-
- /* Hmm, nothing to do. Let's sleep */
-
- pollfd->events = (short) (u->sink->thread_info.state == PA_SINK_RUNNING ? POLLOUT : 0);
-
- if ((ret = pa_rtpoll_run(u->rtpoll)) < 0)
- goto fail;
-
- if (ret == 0)
- goto finish;
-
- pollfd = pa_rtpoll_item_get_pollfd(u->rtpoll_item, NULL);
-
- if (pollfd->revents & ~POLLOUT) {
- pa_log("FIFO shutdown.");
- goto fail;
- }
- }
-
-fail:
- /* If this was no regular exit from the loop we have to continue
- * processing messages until we received PA_MESSAGE_SHUTDOWN */
- pa_asyncmsgq_post(u->thread_mq.outq, PA_MSGOBJECT(u->core), PA_CORE_MESSAGE_UNLOAD_MODULE, u->module, 0, NULL, NULL);
- pa_asyncmsgq_wait_for(u->thread_mq.inq, PA_MESSAGE_SHUTDOWN);
- pa_log_debug("Shutting down Xen...");
- xen_cleanup();
-finish:
- pa_log_debug("Thread shutting down");
-}
-
-int pa__init(pa_module*m) {
-
- struct userdata *u;
- pa_modargs *ma;
- pa_sink_new_data data;
- int backend_state;
- int ret;
- char strbuf[100];
-
- pa_assert(m);
-
- if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
- pa_log("Failed to parse module arguments.");
- goto fail;
- }
-
- ss = m->core->default_sample_spec;
- map = m->core->default_channel_map;
-
- /* user arguments override these */
- if (pa_modargs_get_sample_spec_and_channel_map(ma, &ss, &map, PA_CHANNEL_MAP_DEFAULT) < 0) {
- pa_log("Invalid sample format specification or channel map");
- return 1;
- }
-
- /* Xen Basic init */
- xsh = xs_domain_open();
- if (xsh==NULL) {
- pa_log("xs_domain_open failed");
- goto fail;
- }
- set_state(XenbusStateUnknown);
-
- xch = xc_interface_open(NULL, NULL, 0);
- if (xch==0) {
- pa_log("xc_interface_open failed");
- goto fail;
- }
-
- xce = xc_evtchn_open(NULL, 0);
- if (xce==0) {
- pa_log("xc_evtchn_open failed");
- goto fail;
- }
-
- /* use only dom0 as the backend for now */
- xen_evtchn_port = xc_evtchn_bind_unbound_port(xce, 0);
- if (xen_evtchn_port == 0) {
- pa_log("xc_evtchn_bind_unbound_port failed");
- }
-
- /* get grant reference & map locally */
- if (alloc_gref(&gref, (void**)&ioring)) {
- pa_log("alloc_gref failed");
- };
- device_id = 0; /* hardcoded for now */
-
- if (register_backend_state_watch()) {
- pa_log("Xen sink: register xenstore watch failed");
- };
-
- publish_param_int("event-channel", xen_evtchn_port);
- publish_param_int("ring-ref", gref.gref_ids[0]);
-
- /* let's ask for something absurd and deal with rejection */
- ss.rate = 192000;
-
- publish_spec(&ss);
-
- ret=0;
- while (!ret) {
- backend_state = wait_for_backend_state_change();
- if (backend_state == STATE_UNDEFINED) {
- pa_log("Xen Backend is taking long to respond, still waiting...");
- continue;
- } else if (backend_state == -1) {
- pa_log("Error while waiting for backend: %s", strerror(errno));
- break;
- goto fail;
- }
- ret = state_callbacks[backend_state]();
- }
- if (ret!=NEGOTIATION_OK) {
- pa_log("Negotiation with Xen backend failed!");
- return 1;
- }
-
- pa_sample_spec_snprint(strbuf, 100, &ss);
- pa_log_debug("Negotiation ended, the result was: %s", strbuf);
-
- /* End of Phase 2, begin playback cycle */
-
- u = pa_xnew0(struct userdata, 1);
- u->core = m->core;
- u->module = m;
- m->userdata = u;
- pa_memchunk_reset(&u->memchunk);
- u->rtpoll = pa_rtpoll_new();
- pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
- u->write_type = 0;
-
- /* init ring buffer */
- ioring->prod_indx = ioring->cons_indx = 0;
- ioring->usable_buffer_space = BUFSIZE - BUFSIZE % pa_frame_size(&ss);
-
- pa_sink_new_data_init(&data);
- data.driver = __FILE__;
- data.module = m;
- pa_sink_new_data_set_name(&data, pa_modargs_get_value(ma, "sink_name", DEFAULT_SINK_NAME));
- pa_proplist_sets(data.proplist, PA_PROP_DEVICE_STRING, "xensink");
- pa_proplist_setf(data.proplist, PA_PROP_DEVICE_DESCRIPTION, "Xen PV audio sink");
- pa_sink_new_data_set_sample_spec(&data, &ss);
- pa_sink_new_data_set_channel_map(&data, &map);
-
- if (pa_modargs_get_proplist(ma, "sink_properties", data.proplist, PA_UPDATE_REPLACE) < 0) {
- pa_log("Invalid properties");
- pa_sink_new_data_done(&data);
- goto fail;
- }
-
- u->sink = pa_sink_new(m->core, &data, PA_SINK_LATENCY);
- pa_sink_new_data_done(&data);
-
- if (!u->sink) {
- pa_log("Failed to create sink.");
- goto fail;
- }
-
- u->sink->parent.process_msg = sink_process_msg;
- u->sink->userdata = u;
-
- pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq);
- pa_sink_set_rtpoll(u->sink, u->rtpoll);
- pa_sink_set_max_request(u->sink, ioring->usable_buffer_space);
- pa_sink_set_fixed_latency(u->sink, pa_bytes_to_usec(ioring->usable_buffer_space, &u->sink->sample_spec));
-
- u->rtpoll_item = pa_rtpoll_item_new(u->rtpoll, PA_RTPOLL_NEVER, 1);
-
- if (!(u->thread = pa_thread_new("xenpv-sink", thread_func, u))) {
- pa_log("Failed to create thread.");
- goto fail;
- }
-
- pa_sink_put(u->sink);
-
- pa_modargs_free(ma);
-
- return 0;
-
-fail:
- if (ma)
- pa_modargs_free(ma);
-
- pa__done(m);
-
- return -1;
-}
-
-int pa__get_n_used(pa_module *m) {
- struct userdata *u;
-
- pa_assert(m);
- pa_assert_se(u = m->userdata);
-
- return pa_sink_linked_by(u->sink);
-}
-
-void pa__done(pa_module*m) {
- struct userdata *u;
-
- pa_assert(m);
-
- if (!(u = m->userdata))
- return;
-
- if (u->sink)
- pa_sink_unlink(u->sink);
-
- if (u->thread) {
- pa_asyncmsgq_send(u->thread_mq.inq, NULL, PA_MESSAGE_SHUTDOWN, NULL, 0, NULL);
- pa_thread_free(u->thread);
- }
-
- pa_thread_mq_done(&u->thread_mq);
-
- if (u->sink)
- pa_sink_unref(u->sink);
-
- if (u->memchunk.memblock)
- pa_memblock_unref(u->memchunk.memblock);
-
- if (u->rtpoll_item)
- pa_rtpoll_item_free(u->rtpoll_item);
-
- if (u->rtpoll)
- pa_rtpoll_free(u->rtpoll);
-
- pa_xfree(u);
-
- xen_cleanup();
-
-}
-
-static int alloc_gref(struct ioctl_gntalloc_alloc_gref *gref_, void **addr) {
- int alloc_fd, dev_fd, rv;
-
- alloc_fd = open("/dev/xen/gntalloc", O_RDWR);
- if (alloc_fd<=0) {
- perror("Could not open /dev/xen/gntalloc! Have you loaded the xen_gntalloc module?");
- return 1;
- }
-
- dev_fd = open("/dev/xen/gntdev", O_RDWR);
- if (dev_fd<=0) {
- perror("Could not open /dev/xen/gntdev! Have you loaded the xen_gntdev module?");
- close(alloc_fd);
- return 1;
- }
-
- /* use dom0 */
- gref_->domid = 0;
- gref_->flags = GNTALLOC_FLAG_WRITABLE;
- gref_->count = 1;
-
- rv = ioctl(alloc_fd, IOCTL_GNTALLOC_ALLOC_GREF, gref_);
- if (rv) {
- pa_log_debug("Xen audio sink: src-add error: %s (rv=%d)\n", strerror(errno), rv);
- goto finish;
- }
-
- /*addr=NULL(default),length, prot, flags, fd, offset*/
- *addr = mmap(0, 4096, PROT_READ|PROT_WRITE, MAP_SHARED, alloc_fd, gref_->index);
- if (*addr == MAP_FAILED) {
- *addr = 0;
- pa_log_debug("Xen audio sink: mmap'ing shared page failed\n");
- goto finish;
- }
-
- pa_log_debug("Xen audio sink: Got grant #%d. Mapped locally at %Ld=%p\n",
- gref_->gref_ids[0], (long long)gref_->index, *addr);
-
- /* skip this for now
- struct ioctl_gntalloc_unmap_notify uarg = {
- .index = gref->index + offsetof(struct shr_page, notifies[0]),
- .action = UNMAP_NOTIFY_CLEAR_BYTE
- };
-
- rv = ioctl(a_fd, IOCTL_GNTALLOC_SET_UNMAP_NOTIFY, &uarg);
- if (rv)
- pa_log_debug("gntalloc unmap notify error: %s (rv=%d)\n", strerror(errno), rv);
- */
-finish:
- close(alloc_fd);
- close(dev_fd);
-
- return rv;
-}
-
-#define RING_FREE_BYTES ((r->usable_buffer_space - (r->prod_indx-r->cons_indx) -1) % r->usable_buffer_space)
-static int ring_write(struct ring *r, void *src, int length) {
- int full = 0;
- for (;;) {
- /* free space may be split over the end of the buffer */
- int first_chunk_size = (r->usable_buffer_space-r->prod_indx);
- int second_chunk_size = (r->cons_indx>=r->prod_indx)? (r->cons_indx) : 0;
- int l, fl, sl;
-
- /* full? */
- if (RING_FREE_BYTES==0) {
- /*XXX hardcoded*/
- if (full>=100) {
- errno = EINTR;
- return -1;
- }
- /*XXX hardcoded */
- usleep(1000);
- /* should return in 100ms max; definitely not midstream */
- full++;
- continue;
- }
-
- /* calculate lengths in case of a split buffer */
- l = PA_MIN((int)RING_FREE_BYTES, length);
- fl = PA_MIN(l, first_chunk_size);
- sl = PA_MIN(l-fl, second_chunk_size);
-
- memcpy(r->buffer+r->prod_indx, src, fl);
- if (sl)
- memcpy(r->buffer, ((char*)src)+fl, sl);
- r->prod_indx = (r->prod_indx+fl+sl) % r->usable_buffer_space;
-
- return sl+fl;
- }
-}
-
-static int publish_param(const char *paramname, const char *value) {
- char keybuf[128], valbuf[32];
-
- snprintf(keybuf, sizeof keybuf, "device/audio/%d/%s", device_id, paramname);
- snprintf(valbuf, sizeof valbuf, "%s", value);
- return xs_write(xsh, 0, keybuf, valbuf, strlen(valbuf));
-}
-
-static int publish_param_int(const char *paramname, const int value) {
- char keybuf[128], valbuf[32];
- snprintf(keybuf, sizeof keybuf, "device/audio/%d/%s", device_id, paramname);
- snprintf(valbuf, sizeof valbuf, "%d", value);
- return xs_write(xsh, 0, keybuf, valbuf, strlen(valbuf));
-}
-
-static char* read_param(const char *paramname) {
- char keybuf[128];
- unsigned int len;
- int my_domid;
-
- my_domid = atoi(xs_read(xsh, 0, "domid", &len));
- snprintf(keybuf, sizeof(keybuf), "/local/domain/0/backend/audio/%d/%d/%s", my_domid, device_id, paramname);
- /* remember to free lvalue! */
- return xs_read(xsh, 0, keybuf, &len);
-}
-
-static int publish_spec(pa_sample_spec *sample_spec) {
- /* Publish spec and set state to XenbusStateInitWait*/
- int ret;
-
- ret = publish_param("format", pa_sample_format_to_string(sample_spec->format));
- ret += publish_param_int("rate", sample_spec->rate);
- ret += publish_param_int("channels", sample_spec->channels);
-
- return ret;
-}
-
-static int read_backend_default_spec(pa_sample_spec *sample_spec) {
- /* Read spec from backend */
- char *out;
-
- out = read_param("default-format");
- sample_spec->format = pa_parse_sample_format(out);
- free(out);
-
- out = read_param("default-rate");
- sample_spec->rate = atoi(out);
- free(out);
-
- out = read_param("default-channels");
- sample_spec->channels = atoi(out);
- free(out);
-
- return 0;
-}
-
-static int register_backend_state_watch() {
- char keybuf[128];
- int my_domid;
- unsigned int len;
-
- my_domid = atoi(xs_read(xsh, 0, "domid", &len));
- snprintf(keybuf, sizeof(keybuf), "/local/domain/0/backend/audio/%d/%d/state", my_domid, device_id);
- if (!xs_watch(xsh, keybuf, "xenpvaudiofrontendsinktoken")) {
- perror("xs_watch failed");
- return -EINVAL;
- }
- return 0;
-}
-
-static int wait_for_backend_state_change() {
- char keybuf[128];
- int my_domid;
- unsigned int len;
-
- int backend_state;
- int seconds;
- char *buf, **vec;
- int ret;
-
- int xs_fd;
- struct timeval tv;
- fd_set watch_fdset;
- int start, now;
-
- backend_state = STATE_UNDEFINED;
- xs_fd = xs_fileno(xsh);
- start = now = time(NULL);
-
- my_domid = atoi(xs_read(xsh, 0, "domid", &len));
- snprintf(keybuf, sizeof(keybuf), "/local/domain/0/backend/audio/%d/%d/state", my_domid, device_id);
-
- /*XXX: hardcoded */
- seconds = 10;
- do {
- tv.tv_usec = 0;
- tv.tv_sec = (start + seconds) - now;
- FD_ZERO(&watch_fdset);
- FD_SET(xs_fd, &watch_fdset);
- ret=select(xs_fd + 1, &watch_fdset, NULL, NULL, &tv);
-
- if (ret==-1)
- /* error */
- return -1;
- else if (ret) {
-
- /* Read the watch to drain the buffer */
- vec = xs_read_watch(xsh, &len);
-
- buf = xs_read(xsh, XBT_NULL, vec[0], &len);
- if (buf == 0) {
- /* usually means that the backend isn't there yet */
- continue;
- };
- backend_state = atoi(buf);
-
- free(buf);
- free(vec);
- }
- /* else: timeout */
- } while (backend_state == STATE_UNDEFINED && \
- (now = time(NULL)) < start + seconds);
-
- return backend_state;
-}
diff --git a/src/pulse/context.c b/src/pulse/context.c
index 69be5f4..c39cbe7 100644
--- a/src/pulse/context.c
+++ b/src/pulse/context.c
@@ -504,17 +504,17 @@ static void setup_complete_callback(pa_pdispatch *pd, uint32_t command, uint32_t
/* Starting with protocol version 13 the MSB of the version
tag reflects if shm is available for this connection or
not. */
- if (c->version >= 13) {
- shm_on_remote = !!(c->version & 0x80000000U);
+ if ((c->version & PA_PROTOCOL_VERSION_MASK) >= 13) {
+ shm_on_remote = !!(c->version & PA_PROTOCOL_FLAG_SHM);
/* Starting with protocol version 31, the second MSB of the version
* tag reflects whether memfd is supported on the other PA end. */
- if (c->version >= 31)
- memfd_on_remote = !!(c->version & 0x40000000U);
+ if ((c->version & PA_PROTOCOL_VERSION_MASK) >= 31)
+ memfd_on_remote = !!(c->version & PA_PROTOCOL_FLAG_MEMFD);
/* Reserve the two most-significant _bytes_ of the version tag
* for flags. */
- c->version &= 0x0000FFFFU;
+ c->version &= PA_PROTOCOL_VERSION_MASK;
}
pa_log_debug("Protocol version: remote %u, local %u", c->version, PA_PROTOCOL_VERSION);
@@ -629,8 +629,8 @@ static void setup_context(pa_context *c, pa_iochannel *io) {
/* Starting with protocol version 13 we use the MSB of the version
* tag for informing the other side if we could do SHM or not.
* Starting from version 31, second MSB is used to flag memfd support. */
- pa_tagstruct_putu32(t, PA_PROTOCOL_VERSION | (c->do_shm ? 0x80000000U : 0) |
- (c->memfd_on_local ? 0x40000000 : 0));
+ pa_tagstruct_putu32(t, PA_PROTOCOL_VERSION | (c->do_shm ? PA_PROTOCOL_FLAG_SHM : 0) |
+ (c->memfd_on_local ? PA_PROTOCOL_FLAG_MEMFD: 0));
pa_tagstruct_put_arbitrary(t, cookie, sizeof(cookie));
#ifdef HAVE_CREDS
diff --git a/src/pulse/format.c b/src/pulse/format.c
index c2a1552..8474978 100644
--- a/src/pulse/format.c
+++ b/src/pulse/format.c
@@ -23,8 +23,7 @@
#include <config.h>
#endif
-#include <json.h>
-
+#include <pulse/json.h>
#include <pulse/internal.h>
#include <pulse/xmalloc.h>
@@ -32,6 +31,7 @@
#include <pulsecore/core-util.h>
#include <pulsecore/i18n.h>
#include <pulsecore/macro.h>
+#include <pulsecore/strbuf.h>
#include "format.h"
@@ -236,7 +236,8 @@ int pa_format_info_to_sample_spec(const pa_format_info *f, pa_sample_spec *ss, p
pa_prop_type_t pa_format_info_get_prop_type(const pa_format_info *f, const char *key) {
const char *str;
- json_object *o, *o1;
+ pa_json_object *o;
+ const pa_json_object *o1;
pa_prop_type_t type;
pa_assert(f);
@@ -246,47 +247,47 @@ pa_prop_type_t pa_format_info_get_prop_type(const pa_format_info *f, const char
if (!str)
return PA_PROP_TYPE_INVALID;
- o = json_tokener_parse(str);
+ o = pa_json_parse(str);
if (!o)
return PA_PROP_TYPE_INVALID;
- switch (json_object_get_type(o)) {
- case json_type_int:
+ switch (pa_json_object_get_type(o)) {
+ case PA_JSON_TYPE_INT:
type = PA_PROP_TYPE_INT;
break;
- case json_type_string:
+ case PA_JSON_TYPE_STRING:
type = PA_PROP_TYPE_STRING;
break;
- case json_type_array:
- if (json_object_array_length(o) == 0) {
+ case PA_JSON_TYPE_ARRAY:
+ if (pa_json_object_get_array_length(o) == 0) {
/* Unlikely, but let's account for this anyway. We need at
* least one element to figure out the array type. */
type = PA_PROP_TYPE_INVALID;
break;
}
- o1 = json_object_array_get_idx(o, 1);
+ o1 = pa_json_object_get_array_member(o, 0);
- if (json_object_get_type(o1) == json_type_int)
+ if (pa_json_object_get_type(o1) == PA_JSON_TYPE_INT)
type = PA_PROP_TYPE_INT_ARRAY;
- else if (json_object_get_type(o1) == json_type_string)
+ else if (pa_json_object_get_type(o1) == PA_JSON_TYPE_STRING)
type = PA_PROP_TYPE_STRING_ARRAY;
else
type = PA_PROP_TYPE_INVALID;
break;
- case json_type_object:
+ case PA_JSON_TYPE_OBJECT:
/* We actually know at this point that it's a int range, but let's
* confirm. */
- if (!json_object_object_get_ex(o, PA_JSON_MIN_KEY, NULL)) {
+ if (!pa_json_object_get_object_member(o, PA_JSON_MIN_KEY)) {
type = PA_PROP_TYPE_INVALID;
break;
}
- if (!json_object_object_get_ex(o, PA_JSON_MAX_KEY, NULL)) {
+ if (!pa_json_object_get_object_member(o, PA_JSON_MAX_KEY)) {
type = PA_PROP_TYPE_INVALID;
break;
}
@@ -299,13 +300,13 @@ pa_prop_type_t pa_format_info_get_prop_type(const pa_format_info *f, const char
break;
}
- json_object_put(o);
+ pa_json_object_free(o);
return type;
}
int pa_format_info_get_prop_int(const pa_format_info *f, const char *key, int *v) {
const char *str;
- json_object *o;
+ pa_json_object *o;
pa_assert(f);
pa_assert(key);
@@ -315,27 +316,28 @@ int pa_format_info_get_prop_int(const pa_format_info *f, const char *key, int *v
if (!str)
return -PA_ERR_NOENTITY;
- o = json_tokener_parse(str);
+ o = pa_json_parse(str);
if (!o) {
pa_log_debug("Failed to parse format info property '%s'.", key);
return -PA_ERR_INVALID;
}
- if (json_object_get_type(o) != json_type_int) {
+ if (pa_json_object_get_type(o) != PA_JSON_TYPE_INT) {
pa_log_debug("Format info property '%s' type is not int.", key);
- json_object_put(o);
+ pa_json_object_free(o);
return -PA_ERR_INVALID;
}
- *v = json_object_get_int(o);
- json_object_put(o);
+ *v = pa_json_object_get_int(o);
+ pa_json_object_free(o);
return 0;
}
int pa_format_info_get_prop_int_range(const pa_format_info *f, const char *key, int *min, int *max) {
const char *str;
- json_object *o, *o1;
+ pa_json_object *o;
+ const pa_json_object *o1;
int ret = -PA_ERR_INVALID;
pa_assert(f);
@@ -347,24 +349,26 @@ int pa_format_info_get_prop_int_range(const pa_format_info *f, const char *key,
if (!str)
return -PA_ERR_NOENTITY;
- o = json_tokener_parse(str);
+ o = pa_json_parse(str);
if (!o) {
pa_log_debug("Failed to parse format info property '%s'.", key);
return -PA_ERR_INVALID;
}
- if (json_object_get_type(o) != json_type_object)
+ if (pa_json_object_get_type(o) != PA_JSON_TYPE_OBJECT)
goto out;
- if (!json_object_object_get_ex(o, PA_JSON_MIN_KEY, &o1))
+ if (!(o1 = pa_json_object_get_object_member(o, PA_JSON_MIN_KEY)) ||
+ (pa_json_object_get_type(o1) != PA_JSON_TYPE_INT))
goto out;
- *min = json_object_get_int(o1);
+ *min = pa_json_object_get_int(o1);
- if (!json_object_object_get_ex(o, PA_JSON_MAX_KEY, &o1))
+ if (!(o1 = pa_json_object_get_object_member(o, PA_JSON_MAX_KEY)) ||
+ (pa_json_object_get_type(o1) != PA_JSON_TYPE_INT))
goto out;
- *max = json_object_get_int(o1);
+ *max = pa_json_object_get_int(o1);
ret = 0;
@@ -372,13 +376,14 @@ out:
if (ret < 0)
pa_log_debug("Format info property '%s' is not a valid int range.", key);
- json_object_put(o);
+ pa_json_object_free(o);
return ret;
}
int pa_format_info_get_prop_int_array(const pa_format_info *f, const char *key, int **values, int *n_values) {
const char *str;
- json_object *o, *o1;
+ pa_json_object *o;
+ const pa_json_object *o1;
int i, ret = -PA_ERR_INVALID;
pa_assert(f);
@@ -390,26 +395,26 @@ int pa_format_info_get_prop_int_array(const pa_format_info *f, const char *key,
if (!str)
return -PA_ERR_NOENTITY;
- o = json_tokener_parse(str);
+ o = pa_json_parse(str);
if (!o) {
pa_log_debug("Failed to parse format info property '%s'.", key);
return -PA_ERR_INVALID;
}
- if (json_object_get_type(o) != json_type_array)
+ if (pa_json_object_get_type(o) != PA_JSON_TYPE_ARRAY)
goto out;
- *n_values = json_object_array_length(o);
+ *n_values = pa_json_object_get_array_length(o);
*values = pa_xnew(int, *n_values);
for (i = 0; i < *n_values; i++) {
- o1 = json_object_array_get_idx(o, i);
+ o1 = pa_json_object_get_array_member(o, i);
- if (json_object_get_type(o1) != json_type_int) {
+ if (pa_json_object_get_type(o1) != PA_JSON_TYPE_INT) {
goto out;
}
- (*values)[i] = json_object_get_int(o1);
+ (*values)[i] = pa_json_object_get_int(o1);
}
ret = 0;
@@ -418,13 +423,13 @@ out:
if (ret < 0)
pa_log_debug("Format info property '%s' is not a valid int array.", key);
- json_object_put(o);
+ pa_json_object_free(o);
return ret;
}
int pa_format_info_get_prop_string(const pa_format_info *f, const char *key, char **v) {
const char *str = NULL;
- json_object *o;
+ pa_json_object *o;
pa_assert(f);
pa_assert(key);
@@ -434,27 +439,28 @@ int pa_format_info_get_prop_string(const pa_format_info *f, const char *key, cha
if (!str)
return -PA_ERR_NOENTITY;
- o = json_tokener_parse(str);
+ o = pa_json_parse(str);
if (!o) {
pa_log_debug("Failed to parse format info property '%s'.", key);
return -PA_ERR_INVALID;
}
- if (json_object_get_type(o) != json_type_string) {
+ if (pa_json_object_get_type(o) != PA_JSON_TYPE_STRING) {
pa_log_debug("Format info property '%s' type is not string.", key);
- json_object_put(o);
+ pa_json_object_free(o);
return -PA_ERR_INVALID;
}
- *v = pa_xstrdup(json_object_get_string(o));
- json_object_put(o);
+ *v = pa_xstrdup(pa_json_object_get_string(o));
+ pa_json_object_free(o);
return 0;
}
int pa_format_info_get_prop_string_array(const pa_format_info *f, const char *key, char ***values, int *n_values) {
const char *str;
- json_object *o, *o1;
+ pa_json_object *o;
+ const pa_json_object *o1;
int i, ret = -PA_ERR_INVALID;
pa_assert(f);
@@ -466,26 +472,26 @@ int pa_format_info_get_prop_string_array(const pa_format_info *f, const char *ke
if (!str)
return -PA_ERR_NOENTITY;
- o = json_tokener_parse(str);
+ o = pa_json_parse(str);
if (!o) {
pa_log_debug("Failed to parse format info property '%s'.", key);
return -PA_ERR_INVALID;
}
- if (json_object_get_type(o) != json_type_array)
+ if (pa_json_object_get_type(o) != PA_JSON_TYPE_ARRAY)
goto out;
- *n_values = json_object_array_length(o);
+ *n_values = pa_json_object_get_array_length(o);
*values = pa_xnew(char *, *n_values);
for (i = 0; i < *n_values; i++) {
- o1 = json_object_array_get_idx(o, i);
+ o1 = pa_json_object_get_array_member(o, i);
- if (json_object_get_type(o1) != json_type_string) {
+ if (pa_json_object_get_type(o1) != PA_JSON_TYPE_STRING) {
goto out;
}
- (*values)[i] = pa_xstrdup(json_object_get_string(o1));
+ (*values)[i] = pa_xstrdup(pa_json_object_get_string(o1));
}
ret = 0;
@@ -494,7 +500,7 @@ out:
if (ret < 0)
pa_log_debug("Format info property '%s' is not a valid string array.", key);
- json_object_put(o);
+ pa_json_object_free(o);
return ret;
}
@@ -528,85 +534,76 @@ void pa_format_info_set_channel_map(pa_format_info *f, const pa_channel_map *map
}
void pa_format_info_set_prop_int(pa_format_info *f, const char *key, int value) {
- json_object *o;
-
pa_assert(f);
pa_assert(key);
- o = json_object_new_int(value);
-
- pa_proplist_sets(f->plist, key, json_object_to_json_string(o));
-
- json_object_put(o);
+ pa_proplist_setf(f->plist, key, "%d", value);
}
void pa_format_info_set_prop_int_array(pa_format_info *f, const char *key, const int *values, int n_values) {
- json_object *o;
+ pa_strbuf *buf;
+ char *str;
int i;
pa_assert(f);
pa_assert(key);
+ pa_assert(n_values > 0);
- o = json_object_new_array();
+ buf = pa_strbuf_new();
- for (i = 0; i < n_values; i++)
- json_object_array_add(o, json_object_new_int(values[i]));
+ pa_strbuf_printf(buf, "[ %d", values[0]);
- pa_proplist_sets(f->plist, key, json_object_to_json_string(o));
+ for (i = 1; i < n_values; i++)
+ pa_strbuf_printf(buf, ", %d", values[i]);
- json_object_put(o);
+ pa_strbuf_printf(buf, " ]");
+ str = pa_strbuf_to_string_free(buf);
+
+ pa_proplist_sets(f->plist, key, str);
+ pa_xfree (str);
}
void pa_format_info_set_prop_int_range(pa_format_info *f, const char *key, int min, int max) {
- json_object *o;
-
pa_assert(f);
pa_assert(key);
- o = json_object_new_object();
-
- json_object_object_add(o, PA_JSON_MIN_KEY, json_object_new_int(min));
- json_object_object_add(o, PA_JSON_MAX_KEY, json_object_new_int(max));
-
- pa_proplist_sets(f->plist, key, json_object_to_json_string(o));
-
- json_object_put(o);
+ pa_proplist_setf(f->plist, key, "{ \"" PA_JSON_MIN_KEY "\": %d, \"" PA_JSON_MAX_KEY "\": %d }",
+ min, max);
}
void pa_format_info_set_prop_string(pa_format_info *f, const char *key, const char *value) {
- json_object *o;
-
pa_assert(f);
pa_assert(key);
- o = json_object_new_string(value);
-
- pa_proplist_sets(f->plist, key, json_object_to_json_string(o));
-
- json_object_put(o);
+ pa_proplist_setf(f->plist, key, "\"%s\"", value);
}
void pa_format_info_set_prop_string_array(pa_format_info *f, const char *key, const char **values, int n_values) {
- json_object *o;
+ pa_strbuf *buf;
+ char *str;
int i;
pa_assert(f);
pa_assert(key);
- o = json_object_new_array();
+ buf = pa_strbuf_new();
- for (i = 0; i < n_values; i++)
- json_object_array_add(o, json_object_new_string(values[i]));
+ pa_strbuf_printf(buf, "[ \"%s\"", values[0]);
+
+ for (i = 1; i < n_values; i++)
+ pa_strbuf_printf(buf, ", \"%s\"", values[i]);
- pa_proplist_sets(f->plist, key, json_object_to_json_string(o));
+ pa_strbuf_printf(buf, " ]");
+ str = pa_strbuf_to_string_free(buf);
- json_object_put(o);
+ pa_proplist_sets(f->plist, key, str);
+ pa_xfree (str);
}
-static bool pa_json_is_fixed_type(json_object *o) {
- switch(json_object_get_type(o)) {
- case json_type_object:
- case json_type_array:
+static bool pa_json_is_fixed_type(pa_json_object *o) {
+ switch(pa_json_object_get_type(o)) {
+ case PA_JSON_TYPE_OBJECT:
+ case PA_JSON_TYPE_ARRAY:
return false;
default:
@@ -614,20 +611,15 @@ static bool pa_json_is_fixed_type(json_object *o) {
}
}
-static int pa_json_value_equal(json_object *o1, json_object *o2) {
- return (json_object_get_type(o1) == json_object_get_type(o2)) &&
- pa_streq(json_object_to_json_string(o1), json_object_to_json_string(o2));
-}
-
static int pa_format_info_prop_compatible(const char *one, const char *two) {
- json_object *o1 = NULL, *o2 = NULL;
+ pa_json_object *o1 = NULL, *o2 = NULL;
int i, ret = 0;
- o1 = json_tokener_parse(one);
+ o1 = pa_json_parse(one);
if (!o1)
goto out;
- o2 = json_tokener_parse(two);
+ o2 = pa_json_parse(two);
if (!o2)
goto out;
@@ -635,46 +627,46 @@ static int pa_format_info_prop_compatible(const char *one, const char *two) {
pa_return_val_if_fail(pa_json_is_fixed_type(o1) || pa_json_is_fixed_type(o2), false);
if (pa_json_is_fixed_type(o1) && pa_json_is_fixed_type(o2)) {
- ret = pa_json_value_equal(o1, o2);
+ ret = pa_json_object_equal(o1, o2);
goto out;
}
if (pa_json_is_fixed_type(o1)) {
- json_object *tmp = o2;
+ pa_json_object *tmp = o2;
o2 = o1;
o1 = tmp;
}
/* o2 is now a fixed type, and o1 is not */
- if (json_object_get_type(o1) == json_type_array) {
- for (i = 0; i < json_object_array_length(o1); i++) {
- if (pa_json_value_equal(json_object_array_get_idx(o1, i), o2)) {
+ if (pa_json_object_get_type(o1) == PA_JSON_TYPE_ARRAY) {
+ for (i = 0; i < pa_json_object_get_array_length(o1); i++) {
+ if (pa_json_object_equal(pa_json_object_get_array_member(o1, i), o2)) {
ret = 1;
break;
}
}
- } else if (json_object_get_type(o1) == json_type_object) {
+ } else if (pa_json_object_get_type(o1) == PA_JSON_TYPE_OBJECT) {
/* o1 should be a range type */
int min, max, v;
- json_object *o_min = NULL, *o_max = NULL;
+ const pa_json_object *o_min = NULL, *o_max = NULL;
- if (json_object_get_type(o2) != json_type_int) {
+ if (pa_json_object_get_type(o2) != PA_JSON_TYPE_INT) {
/* We don't support non-integer ranges */
goto out;
}
- if (!json_object_object_get_ex(o1, PA_JSON_MIN_KEY, &o_min) ||
- json_object_get_type(o_min) != json_type_int)
+ if (!(o_min = pa_json_object_get_object_member(o1, PA_JSON_MIN_KEY)) ||
+ pa_json_object_get_type(o_min) != PA_JSON_TYPE_INT)
goto out;
- if (!json_object_object_get_ex(o1, PA_JSON_MAX_KEY, &o_max) ||
- json_object_get_type(o_max) != json_type_int)
+ if (!(o_max = pa_json_object_get_object_member(o1, PA_JSON_MAX_KEY)) ||
+ pa_json_object_get_type(o_max) != PA_JSON_TYPE_INT)
goto out;
- v = json_object_get_int(o2);
- min = json_object_get_int(o_min);
- max = json_object_get_int(o_max);
+ v = pa_json_object_get_int(o2);
+ min = pa_json_object_get_int(o_min);
+ max = pa_json_object_get_int(o_max);
ret = v >= min && v <= max;
} else {
@@ -683,9 +675,9 @@ static int pa_format_info_prop_compatible(const char *one, const char *two) {
out:
if (o1)
- json_object_put(o1);
+ pa_json_object_free(o1);
if (o2)
- json_object_put(o2);
+ pa_json_object_free(o2);
return ret;
}
diff --git a/src/pulse/internal.h b/src/pulse/internal.h
index 9bbb903..01d2b6e 100644
--- a/src/pulse/internal.h
+++ b/src/pulse/internal.h
@@ -49,6 +49,12 @@
#define DEFAULT_TIMEOUT (30)
+#define PA_PROTOCOL_FLAG_MASK 0xFFFF0000U
+#define PA_PROTOCOL_VERSION_MASK 0x0000FFFFU
+
+#define PA_PROTOCOL_FLAG_SHM 0x80000000U
+#define PA_PROTOCOL_FLAG_MEMFD 0x40000000U
+
struct pa_context {
PA_REFCNT_DECLARE;
diff --git a/src/pulse/json.c b/src/pulse/json.c
new file mode 100644
index 0000000..d126712
--- /dev/null
+++ b/src/pulse/json.c
@@ -0,0 +1,614 @@
+/***
+ This file is part of PulseAudio.
+
+ Copyright 2016 Arun Raghavan <mail at arunraghavan.net>
+
+ PulseAudio is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License,
+ or (at your option) any later version.
+
+ PulseAudio is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <math.h>
+
+#include <pulse/json.h>
+#include <pulse/xmalloc.h>
+#include <pulsecore/core-util.h>
+#include <pulsecore/hashmap.h>
+#include <pulsecore/strbuf.h>
+
+#define MAX_NESTING_DEPTH 20 /* Arbitrary number to make sure we don't have a stack overflow */
+
+struct pa_json_object {
+ pa_json_type type;
+
+ union {
+ int int_value;
+ double double_value;
+ bool bool_value;
+ char *string_value;
+ pa_hashmap *object_values; /* name -> object */
+ pa_idxset *array_values; /* objects */
+ };
+};
+
+static const char* parse_value(const char *str, const char *end, pa_json_object **obj, unsigned int depth);
+
+static pa_json_object* json_object_new(void) {
+ pa_json_object *obj;
+
+ obj = pa_xnew0(pa_json_object, 1);
+
+ return obj;
+}
+
+static bool is_whitespace(char c) {
+ return c == '\t' || c == '\n' || c == '\r' || c == ' ';
+}
+
+static bool is_digit(char c) {
+ return c >= '0' && c <= '9';
+}
+
+static bool is_end(const char c, const char *end) {
+ if (!end)
+ return c == '\0';
+ else {
+ while (*end) {
+ if (c == *end)
+ return true;
+ end++;
+ }
+ }
+
+ return false;
+}
+
+static const char* consume_string(const char *str, const char *expect) {
+ while (*expect) {
+ if (*str != *expect)
+ return NULL;
+
+ str++;
+ expect++;
+ }
+
+ return str;
+}
+
+static const char* parse_null(const char *str, pa_json_object *obj) {
+ str = consume_string(str, "null");
+
+ if (str)
+ obj->type = PA_JSON_TYPE_NULL;
+
+ return str;
+}
+
+static const char* parse_boolean(const char *str, pa_json_object *obj) {
+ const char *tmp;
+
+ tmp = consume_string(str, "true");
+
+ if (tmp) {
+ obj->type = PA_JSON_TYPE_BOOL;
+ obj->bool_value = true;
+ } else {
+ tmp = consume_string(str, "false");
+
+ if (str) {
+ obj->type = PA_JSON_TYPE_BOOL;
+ obj->bool_value = false;
+ }
+ }
+
+ return tmp;
+}
+
+static const char* parse_string(const char *str, pa_json_object *obj) {
+ pa_strbuf *buf = pa_strbuf_new();
+
+ str++; /* Consume leading '"' */
+
+ while (*str && *str != '"') {
+ if (*str != '\\') {
+ /* We only accept ASCII printable characters. */
+ if (*str < 0x20 || *str > 0x7E) {
+ pa_log("Invalid non-ASCII character: 0x%x", (unsigned int) *str);
+ goto error;
+ }
+
+ /* Normal character, juts consume */
+ pa_strbuf_putc(buf, *str);
+ } else {
+ /* Need to unescape */
+ str++;
+
+ switch (*str) {
+ case '"':
+ case '\\':
+ case '/':
+ pa_strbuf_putc(buf, *str);
+ break;
+
+ case 'b':
+ pa_strbuf_putc(buf, '\b' /* backspace */);
+ break;
+
+ case 'f':
+ pa_strbuf_putc(buf, '\f' /* form feed */);
+ break;
+
+ case 'n':
+ pa_strbuf_putc(buf, '\n' /* new line */);
+ break;
+
+ case 'r':
+ pa_strbuf_putc(buf, '\r' /* carriage return */);
+ break;
+
+ case 't':
+ pa_strbuf_putc(buf, '\t' /* horizontal tab */);
+ break;
+
+ case 'u':
+ pa_log("Unicode code points are currently unsupported");
+ goto error;
+
+ default:
+ pa_log("Unexepcted escape value: %c", *str);
+ goto error;
+ }
+ }
+
+ str++;
+ }
+
+ if (*str != '"') {
+ pa_log("Failed to parse remainder of string: %s", str);
+ goto error;
+ }
+
+ str++;
+
+ obj->type = PA_JSON_TYPE_STRING;
+ obj->string_value = pa_strbuf_to_string_free(buf);
+
+ return str;
+
+error:
+ pa_strbuf_free(buf);
+ return NULL;
+}
+
+static const char* parse_number(const char *str, pa_json_object *obj) {
+ bool negative = false, has_fraction = false, has_exponent = false, valid = false;
+ unsigned int integer = 0;
+ unsigned int fraction = 0;
+ unsigned int fraction_digits = 0;
+ int exponent = 0;
+
+ if (*str == '-') {
+ negative = true;
+ str++;
+ }
+
+ if (*str == '0') {
+ valid = true;
+ str++;
+ goto fraction;
+ }
+
+ while (is_digit(*str)) {
+ valid = true;
+
+ if (integer > ((negative ? INT_MAX : UINT_MAX) / 10)) {
+ pa_log("Integer overflow while parsing number");
+ goto error;
+ }
+
+ integer = (integer * 10) + (*str - '0');
+ str++;
+ }
+
+fraction:
+
+ if (!valid) {
+ pa_log("Missing digits while parsing number");
+ goto error;
+ }
+
+ if (*str == '.') {
+ has_fraction = true;
+ str++;
+ valid = false;
+
+ while (is_digit(*str)) {
+ valid = true;
+
+ if (fraction > (UINT_MAX / 10)) {
+ pa_log("Integer overflow while parsing fractional part of number");
+ goto error;
+ }
+
+ fraction = (fraction * 10) + (*str - '0');
+ fraction_digits++;
+ str++;
+ }
+
+ if (!valid) {
+ pa_log("No digit after '.' while parsing fraction");
+ goto error;
+ }
+ }
+
+ if (*str == 'e' || *str == 'E') {
+ bool exponent_negative = false;
+
+ has_exponent = true;
+ str++;
+ valid = false;
+
+ if (*str == '-') {
+ exponent_negative = true;
+ str++;
+ } else if (*str == '+')
+ str++;
+
+ while (is_digit(*str)) {
+ valid = true;
+
+ if (exponent > (INT_MAX / 10)) {
+ pa_log("Integer overflow while parsing exponent part of number");
+ goto error;
+ }
+
+ exponent = (exponent * 10) + (*str - '0');
+ str++;
+ }
+
+ if (!valid) {
+ pa_log("No digit in exponent while parsing fraction");
+ goto error;
+ }
+
+ if (exponent_negative)
+ exponent *= -1;
+ }
+
+ if (has_fraction || has_exponent) {
+ obj->type = PA_JSON_TYPE_DOUBLE;
+ obj->double_value =
+ (negative ? -1.0 : 1.0) * (integer + (double) fraction / pow(10, fraction_digits)) * pow(10, exponent);
+ } else {
+ obj->type = PA_JSON_TYPE_INT;
+ obj->int_value = (negative ? -1 : 1) * integer;
+ }
+
+ return str;
+
+error:
+ return NULL;
+}
+
+static const char *parse_object(const char *str, pa_json_object *obj, unsigned int depth) {
+ pa_json_object *name = NULL, *value = NULL;
+
+ obj->object_values = pa_hashmap_new_full(pa_idxset_string_hash_func, pa_idxset_string_compare_func,
+ pa_xfree, (pa_free_cb_t) pa_json_object_free);
+
+ while (*str != '}') {
+ str++; /* Consume leading '{' or ',' */
+
+ str = parse_value(str, ":", &name, depth + 1);
+ if (!str || pa_json_object_get_type(name) != PA_JSON_TYPE_STRING) {
+ pa_log("Could not parse key for object");
+ goto error;
+ }
+
+ /* Consume the ':' */
+ str++;
+
+ str = parse_value(str, ",}", &value, depth + 1);
+ if (!str) {
+ pa_log("Could not parse value for object");
+ goto error;
+ }
+
+ pa_hashmap_put(obj->object_values, pa_xstrdup(pa_json_object_get_string(name)), value);
+ pa_json_object_free(name);
+
+ name = NULL;
+ value = NULL;
+ }
+
+ /* Drop trailing '}' */
+ str++;
+
+ /* We now know the value was correctly parsed */
+ obj->type = PA_JSON_TYPE_OBJECT;
+
+ return str;
+
+error:
+ pa_hashmap_free(obj->object_values);
+ obj->object_values = NULL;
+
+ if (name)
+ pa_json_object_free(name);
+ if (value)
+ pa_json_object_free(value);
+
+ return NULL;
+}
+
+static const char *parse_array(const char *str, pa_json_object *obj, unsigned int depth) {
+ pa_json_object *value;
+
+ obj->array_values = pa_idxset_new(NULL, NULL);
+
+ while (*str != ']') {
+ str++; /* Consume leading '[' or ',' */
+
+ /* Need to chew up whitespaces as a special case to deal with the
+ * possibility of an empty array */
+ while (is_whitespace(*str))
+ str++;
+
+ if (*str == ']')
+ break;
+
+ str = parse_value(str, ",]", &value, depth + 1);
+ if (!str) {
+ pa_log("Could not parse value for array");
+ goto error;
+ }
+
+ pa_idxset_put(obj->array_values, value, NULL);
+ }
+
+ /* Drop trailing ']' */
+ str++;
+
+ /* We now know the value was correctly parsed */
+ obj->type = PA_JSON_TYPE_ARRAY;
+
+ return str;
+
+error:
+ pa_idxset_free(obj->array_values, (pa_free_cb_t) pa_json_object_free);
+ obj->array_values = NULL;
+ return NULL;
+}
+
+typedef enum {
+ JSON_PARSER_STATE_INIT,
+ JSON_PARSER_STATE_FINISH,
+} json_parser_state;
+
+static const char* parse_value(const char *str, const char *end, pa_json_object **obj, unsigned int depth) {
+ json_parser_state state = JSON_PARSER_STATE_INIT;
+ pa_json_object *o;
+
+ pa_assert(str != NULL);
+
+ o = json_object_new();
+
+ if (depth > MAX_NESTING_DEPTH) {
+ pa_log("Exceeded maximum permitted nesting depth of objects (%u)", MAX_NESTING_DEPTH);
+ goto error;
+ }
+
+ while (!is_end(*str, end)) {
+ switch (state) {
+ case JSON_PARSER_STATE_INIT:
+ if (is_whitespace(*str)) {
+ str++;
+ } else if (*str == 'n') {
+ str = parse_null(str, o);
+ state = JSON_PARSER_STATE_FINISH;
+ } else if (*str == 't' || *str == 'f') {
+ str = parse_boolean(str, o);
+ state = JSON_PARSER_STATE_FINISH;
+ } else if (*str == '"') {
+ str = parse_string(str, o);
+ state = JSON_PARSER_STATE_FINISH;
+ } else if (is_digit(*str) || *str == '-') {
+ str = parse_number(str, o);
+ state = JSON_PARSER_STATE_FINISH;
+ } else if (*str == '{') {
+ str = parse_object(str, o, depth);
+ state = JSON_PARSER_STATE_FINISH;
+ } else if (*str == '[') {
+ str = parse_array(str, o, depth);
+ state = JSON_PARSER_STATE_FINISH;
+ } else {
+ pa_log("Invalid JSON string: %s", str);
+ goto error;
+ }
+
+ if (!str)
+ goto error;
+
+ break;
+
+ case JSON_PARSER_STATE_FINISH:
+ /* Consume trailing whitespaces */
+ if (is_whitespace(*str)) {
+ str++;
+ } else {
+ goto error;
+ }
+ }
+ }
+
+ if (pa_json_object_get_type(o) == PA_JSON_TYPE_INIT) {
+ /* We didn't actually get any data */
+ pa_log("No data while parsing json string: '%s' till '%s'", str, pa_strnull(end));
+ goto error;
+ }
+
+ *obj = o;
+
+ return str;
+
+error:
+ pa_json_object_free(o);
+ return NULL;
+}
+
+
+pa_json_object* pa_json_parse(const char *str) {
+ pa_json_object *obj;
+
+ str = parse_value(str, NULL, &obj, 0);
+
+ if (!str) {
+ pa_log("JSON parsing failed");
+ return NULL;
+ }
+
+ if (*str != '\0') {
+ pa_log("Unable to parse complete JSON string, remainder is: %s", str);
+ pa_json_object_free(obj);
+ return NULL;
+ }
+
+ return obj;
+}
+
+pa_json_type pa_json_object_get_type(const pa_json_object *obj) {
+ return obj->type;
+}
+
+void pa_json_object_free(pa_json_object *obj) {
+
+ switch (pa_json_object_get_type(obj)) {
+ case PA_JSON_TYPE_INIT:
+ case PA_JSON_TYPE_INT:
+ case PA_JSON_TYPE_DOUBLE:
+ case PA_JSON_TYPE_BOOL:
+ case PA_JSON_TYPE_NULL:
+ break;
+
+ case PA_JSON_TYPE_STRING:
+ pa_xfree(obj->string_value);
+ break;
+
+ case PA_JSON_TYPE_OBJECT:
+ pa_hashmap_free(obj->object_values);
+ break;
+
+ case PA_JSON_TYPE_ARRAY:
+ pa_idxset_free(obj->array_values, (pa_free_cb_t) pa_json_object_free);
+ break;
+
+ default:
+ pa_assert_not_reached();
+ }
+
+ pa_xfree(obj);
+}
+
+int pa_json_object_get_int(const pa_json_object *o) {
+ pa_assert(pa_json_object_get_type(o) == PA_JSON_TYPE_INT);
+ return o->int_value;
+}
+
+double pa_json_object_get_double(const pa_json_object *o) {
+ pa_assert(pa_json_object_get_type(o) == PA_JSON_TYPE_DOUBLE);
+ return o->double_value;
+}
+
+bool pa_json_object_get_bool(const pa_json_object *o) {
+ pa_assert(pa_json_object_get_type(o) == PA_JSON_TYPE_BOOL);
+ return o->bool_value;
+}
+
+const char* pa_json_object_get_string(const pa_json_object *o) {
+ pa_assert(pa_json_object_get_type(o) == PA_JSON_TYPE_STRING);
+ return o->string_value;
+}
+
+const pa_json_object* pa_json_object_get_object_member(const pa_json_object *o, const char *name) {
+ pa_assert(pa_json_object_get_type(o) == PA_JSON_TYPE_OBJECT);
+ return pa_hashmap_get(o->object_values, name);
+}
+
+int pa_json_object_get_array_length(const pa_json_object *o) {
+ pa_assert(pa_json_object_get_type(o) == PA_JSON_TYPE_ARRAY);
+ return pa_idxset_size(o->array_values);
+}
+
+const pa_json_object* pa_json_object_get_array_member(const pa_json_object *o, int index) {
+ pa_assert(pa_json_object_get_type(o) == PA_JSON_TYPE_ARRAY);
+ return pa_idxset_get_by_index(o->array_values, index);
+}
+
+bool pa_json_object_equal(const pa_json_object *o1, const pa_json_object *o2) {
+ int i;
+
+ if (pa_json_object_get_type(o1) != pa_json_object_get_type(o2))
+ return false;
+
+ switch (pa_json_object_get_type(o1)) {
+ case PA_JSON_TYPE_NULL:
+ return true;
+
+ case PA_JSON_TYPE_BOOL:
+ return o1->bool_value == o2->bool_value;
+
+ case PA_JSON_TYPE_INT:
+ return o1->int_value == o2->int_value;
+
+ case PA_JSON_TYPE_DOUBLE:
+ return PA_DOUBLE_IS_EQUAL(o1->double_value, o2->double_value);
+
+ case PA_JSON_TYPE_STRING:
+ return pa_streq(o1->string_value, o2->string_value);
+
+ case PA_JSON_TYPE_ARRAY:
+ if (pa_json_object_get_array_length(o1) != pa_json_object_get_array_length(o2))
+ return false;
+
+ for (i = 0; i < pa_json_object_get_array_length(o1); i++) {
+ if (!pa_json_object_equal(pa_json_object_get_array_member(o1, i),
+ pa_json_object_get_array_member(o2, i)))
+ return false;
+ }
+
+ return true;
+
+ case PA_JSON_TYPE_OBJECT: {
+ void *state;
+ const char *key;
+ const pa_json_object *v1, *v2;
+
+ if (pa_hashmap_size(o1->object_values) != pa_hashmap_size(o2->object_values))
+ return false;
+
+ PA_HASHMAP_FOREACH_KV(key, v1, o1->object_values, state) {
+ v2 = pa_json_object_get_object_member(o2, key);
+ if (!v2 || !pa_json_object_equal(v1, v2))
+ return false;
+ }
+
+ return true;
+ }
+
+ default:
+ pa_assert_not_reached();
+ }
+}
diff --git a/src/pulse/json.h b/src/pulse/json.h
new file mode 100644
index 0000000..7759bf2
--- /dev/null
+++ b/src/pulse/json.h
@@ -0,0 +1,53 @@
+/***
+ This file is part of PulseAudio.
+
+ Copyright 2016 Arun Raghavan <mail at arunraghavan.net>
+
+ PulseAudio is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License,
+ or (at your option) any later version.
+
+ PulseAudio is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <stdbool.h>
+
+#define PA_DOUBLE_IS_EQUAL(x, y) (((x) - (y)) < 0.000001 && ((x) - (y)) > -0.000001)
+
+typedef enum {
+ PA_JSON_TYPE_INIT = 0,
+ PA_JSON_TYPE_NULL,
+ PA_JSON_TYPE_INT,
+ PA_JSON_TYPE_DOUBLE,
+ PA_JSON_TYPE_BOOL,
+ PA_JSON_TYPE_STRING,
+ PA_JSON_TYPE_ARRAY,
+ PA_JSON_TYPE_OBJECT,
+} pa_json_type;
+
+typedef struct pa_json_object pa_json_object;
+
+pa_json_object* pa_json_parse(const char *str);
+pa_json_type pa_json_object_get_type(const pa_json_object *obj);
+void pa_json_object_free(pa_json_object *obj);
+
+/* All pointer members that are returned are valid while the corresponding object is valid */
+
+int pa_json_object_get_int(const pa_json_object *o);
+double pa_json_object_get_double(const pa_json_object *o);
+bool pa_json_object_get_bool(const pa_json_object *o);
+const char* pa_json_object_get_string(const pa_json_object *o);
+
+const pa_json_object* pa_json_object_get_object_member(const pa_json_object *o, const char *name);
+
+int pa_json_object_get_array_length(const pa_json_object *o);
+const pa_json_object* pa_json_object_get_array_member(const pa_json_object *o, int index);
+
+bool pa_json_object_equal(const pa_json_object *o1, const pa_json_object *o2);
diff --git a/src/pulse/sample.c b/src/pulse/sample.c
index 1331c72..cb04254 100644
--- a/src/pulse/sample.c
+++ b/src/pulse/sample.c
@@ -56,37 +56,36 @@ size_t pa_sample_size_of_format(pa_sample_format_t f) {
}
size_t pa_sample_size(const pa_sample_spec *spec) {
-
pa_assert(spec);
- pa_return_val_if_fail(pa_sample_spec_valid(spec), 0);
+ pa_assert(pa_sample_spec_valid(spec));
return size_table[spec->format];
}
size_t pa_frame_size(const pa_sample_spec *spec) {
pa_assert(spec);
- pa_return_val_if_fail(pa_sample_spec_valid(spec), 0);
+ pa_assert(pa_sample_spec_valid(spec));
return size_table[spec->format] * spec->channels;
}
size_t pa_bytes_per_second(const pa_sample_spec *spec) {
pa_assert(spec);
- pa_return_val_if_fail(pa_sample_spec_valid(spec), 0);
+ pa_assert(pa_sample_spec_valid(spec));
return spec->rate * size_table[spec->format] * spec->channels;
}
pa_usec_t pa_bytes_to_usec(uint64_t length, const pa_sample_spec *spec) {
pa_assert(spec);
- pa_return_val_if_fail(pa_sample_spec_valid(spec), 0);
+ pa_assert(pa_sample_spec_valid(spec));
return (((pa_usec_t) (length / (size_table[spec->format] * spec->channels)) * PA_USEC_PER_SEC) / spec->rate);
}
size_t pa_usec_to_bytes(pa_usec_t t, const pa_sample_spec *spec) {
pa_assert(spec);
- pa_return_val_if_fail(pa_sample_spec_valid(spec), 0);
+ pa_assert(pa_sample_spec_valid(spec));
return (size_t) (((t * spec->rate) / PA_USEC_PER_SEC)) * (size_table[spec->format] * spec->channels);
}
diff --git a/src/pulse/stream.c b/src/pulse/stream.c
index 6fea996..ee95757 100644
--- a/src/pulse/stream.c
+++ b/src/pulse/stream.c
@@ -33,6 +33,7 @@
#include <pulse/fork-detect.h>
#include <pulsecore/pstream-util.h>
+#include <pulsecore/sample-util.h>
#include <pulsecore/log.h>
#include <pulsecore/hashmap.h>
#include <pulsecore/macro.h>
@@ -1137,18 +1138,16 @@ void pa_create_stream_callback(pa_pdispatch *pd, uint32_t command, uint32_t tag,
|| s->context->version >= 22) {
pa_format_info *f = pa_format_info_new();
- pa_tagstruct_get_format_info(t, f);
- if (pa_format_info_valid(f))
- s->format = f;
- else {
+ if (pa_tagstruct_get_format_info(t, f) < 0 || !pa_format_info_valid(f)) {
pa_format_info_free(f);
if (s->n_formats > 0) {
/* We used the extended API, so we should have got back a proper format */
pa_context_fail(s->context, PA_ERR_PROTOCOL);
goto finish;
}
- }
+ } else
+ s->format = f;
}
if (!pa_tagstruct_eof(t)) {
@@ -1534,8 +1533,12 @@ int pa_stream_write_ext_free(
chunk.length = t_length;
} else {
void *d;
+ size_t blk_size_max;
- chunk.length = PA_MIN(t_length, pa_mempool_block_size_max(s->context->mempool));
+ /* Break large audio streams into _aligned_ blocks or the
+ * other endpoint will happily discard them upon arrival. */
+ blk_size_max = pa_frame_align(pa_mempool_block_size_max(s->context->mempool), &s->sample_spec);
+ chunk.length = PA_MIN(t_length, blk_size_max);
chunk.memblock = pa_memblock_new(s->context->mempool, chunk.length);
d = pa_memblock_acquire(chunk.memblock);
diff --git a/src/pulse/version.h b/src/pulse/version.h
index c0b0105..2cb440b 100644
--- a/src/pulse/version.h
+++ b/src/pulse/version.h
@@ -33,7 +33,7 @@ PA_C_DECL_BEGIN
/** Return the version of the header files. Keep in mind that this is
a macro and not a function, so it is impossible to get the pointer of
it. */
-#define pa_get_headers_version() ("9.0.0")
+#define pa_get_headers_version() ("9.99.0")
/** Return the version of the library the current application is
* linked to. */
@@ -47,13 +47,13 @@ const char* pa_get_library_version(void);
/** The current protocol version. Version 8 relates to Polypaudio
* 0.8/PulseAudio 0.9. */
-#define PA_PROTOCOL_VERSION 31
+#define PA_PROTOCOL_VERSION 32
/** The major version of PA. \since 0.9.15 */
#define PA_MAJOR 9
/** The minor version of PA. \since 0.9.15 */
-#define PA_MINOR 0
+#define PA_MINOR 99
/** The micro version of PA (will always be 0 from v1.0 onwards). \since 0.9.15 */
#define PA_MICRO 0
diff --git a/src/pulsecore/asyncmsgq.c b/src/pulsecore/asyncmsgq.c
index dd33e30..47371ae 100644
--- a/src/pulsecore/asyncmsgq.c
+++ b/src/pulsecore/asyncmsgq.c
@@ -58,12 +58,17 @@ struct pa_asyncmsgq {
};
pa_asyncmsgq *pa_asyncmsgq_new(unsigned size) {
+ pa_asyncq *asyncq;
pa_asyncmsgq *a;
+ asyncq = pa_asyncq_new(size);
+ if (!asyncq)
+ return NULL;
+
a = pa_xnew(pa_asyncmsgq, 1);
PA_REFCNT_INIT(a);
- pa_assert_se(a->asyncq = pa_asyncq_new(size));
+ a->asyncq = asyncq;
pa_assert_se(a->mutex = pa_mutex_new(false, true));
a->current = NULL;
diff --git a/src/pulsecore/atomic.h b/src/pulsecore/atomic.h
index 4758c84..7657144 100644
--- a/src/pulsecore/atomic.h
+++ b/src/pulsecore/atomic.h
@@ -201,7 +201,7 @@ static inline u_int atomic_fetchadd_int(volatile u_int *p, u_int v) {
return (v);
}
-#elif defined(__sparc64__)
+#elif defined(__sparc__) && defined(__arch64__)
#define atomic_load_acq_64 atomic_load_acq_long
#define atomic_fetchadd_int atomic_add_int
#elif defined(__ia64__)
diff --git a/src/pulsecore/card.c b/src/pulsecore/card.c
index 410746b..bc5b75b 100644
--- a/src/pulsecore/card.c
+++ b/src/pulsecore/card.c
@@ -96,13 +96,6 @@ void pa_card_new_data_set_name(pa_card_new_data *data, const char *name) {
data->name = pa_xstrdup(name);
}
-void pa_card_new_data_set_profile(pa_card_new_data *data, const char *profile) {
- pa_assert(data);
-
- pa_xfree(data->active_profile);
- data->active_profile = pa_xstrdup(profile);
-}
-
void pa_card_new_data_set_preferred_port(pa_card_new_data *data, pa_direction_t direction, pa_device_port *port) {
pa_assert(data);
@@ -125,7 +118,6 @@ void pa_card_new_data_done(pa_card_new_data *data) {
pa_hashmap_free(data->ports);
pa_xfree(data->name);
- pa_xfree(data->active_profile);
}
pa_card *pa_card_new(pa_core *core, pa_card_new_data *data) {
@@ -149,12 +141,7 @@ pa_card *pa_card_new(pa_core *core, pa_card_new_data *data) {
}
pa_card_new_data_set_name(data, name);
-
- if (pa_hook_fire(&core->hooks[PA_CORE_HOOK_CARD_NEW], data) < 0) {
- pa_xfree(c);
- pa_namereg_unregister(core, name);
- return NULL;
- }
+ pa_hook_fire(&core->hooks[PA_CORE_HOOK_CARD_NEW], data);
c->core = core;
c->name = pa_xstrdup(data->name);
@@ -181,38 +168,56 @@ pa_card *pa_card_new(pa_core *core, pa_card_new_data *data) {
c->preferred_input_port = data->preferred_input_port;
c->preferred_output_port = data->preferred_output_port;
- if (data->active_profile)
- if ((c->active_profile = pa_hashmap_get(c->profiles, data->active_profile)))
- c->save_profile = data->save_profile;
+ pa_device_init_description(c->proplist, c);
+ pa_device_init_icon(c->proplist, true);
+ pa_device_init_intended_roles(c->proplist);
- if (!c->active_profile) {
- PA_HASHMAP_FOREACH(profile, c->profiles, state) {
- if (profile->available == PA_AVAILABLE_NO)
- continue;
+ return c;
+}
- if (!c->active_profile || profile->priority > c->active_profile->priority)
- c->active_profile = profile;
- }
- /* If all profiles are not available, then we still need to pick one */
- if (!c->active_profile) {
- PA_HASHMAP_FOREACH(profile, c->profiles, state)
- if (!c->active_profile || profile->priority > c->active_profile->priority)
- c->active_profile = profile;
+void pa_card_choose_initial_profile(pa_card *card) {
+ pa_card_profile *profile;
+ void *state;
+ pa_card_profile *best = NULL;
+
+ pa_assert(card);
+
+ /* By default, pick the highest priority profile that is not unavailable,
+ * or if all profiles are unavailable, pick the profile with the highest
+ * priority regardless of its availability. */
+
+ PA_HASHMAP_FOREACH(profile, card->profiles, state) {
+ if (profile->available == PA_AVAILABLE_NO)
+ continue;
+
+ if (!best || profile->priority > best->priority)
+ best = profile;
+ }
+
+ if (!best) {
+ PA_HASHMAP_FOREACH(profile, card->profiles, state) {
+ if (!best || profile->priority > best->priority)
+ best = profile;
}
- pa_assert(c->active_profile);
}
+ pa_assert(best);
- pa_device_init_description(c->proplist, c);
- pa_device_init_icon(c->proplist, true);
- pa_device_init_intended_roles(c->proplist);
+ card->active_profile = best;
+ card->save_profile = false;
+
+ /* Let policy modules override the default. */
+ pa_hook_fire(&card->core->hooks[PA_CORE_HOOK_CARD_CHOOSE_INITIAL_PROFILE], card);
+}
- pa_assert_se(pa_idxset_put(core->cards, c, &c->index) >= 0);
+void pa_card_put(pa_card *card) {
+ pa_assert(card);
- pa_log_info("Created %u \"%s\"", c->index, c->name);
- pa_subscription_post(core, PA_SUBSCRIPTION_EVENT_CARD|PA_SUBSCRIPTION_EVENT_NEW, c->index);
+ pa_assert_se(pa_idxset_put(card->core->cards, card, &card->index) >= 0);
+ card->linked = true;
- pa_hook_fire(&core->hooks[PA_CORE_HOOK_CARD_PUT], c);
- return c;
+ pa_log_info("Created %u \"%s\"", card->index, card->name);
+ pa_hook_fire(&card->core->hooks[PA_CORE_HOOK_CARD_PUT], card);
+ pa_subscription_post(card->core, PA_SUBSCRIPTION_EVENT_CARD|PA_SUBSCRIPTION_EVENT_NEW, card->index);
}
void pa_card_free(pa_card *c) {
@@ -223,15 +228,15 @@ void pa_card_free(pa_card *c) {
core = c->core;
- pa_hook_fire(&core->hooks[PA_CORE_HOOK_CARD_UNLINK], c);
+ if (c->linked) {
+ pa_hook_fire(&core->hooks[PA_CORE_HOOK_CARD_UNLINK], c);
- pa_namereg_unregister(core, c->name);
-
- pa_idxset_remove_by_data(c->core->cards, c, NULL);
-
- pa_log_info("Freed %u \"%s\"", c->index, c->name);
+ pa_idxset_remove_by_data(c->core->cards, c, NULL);
+ pa_log_info("Freed %u \"%s\"", c->index, c->name);
+ pa_subscription_post(c->core, PA_SUBSCRIPTION_EVENT_CARD|PA_SUBSCRIPTION_EVENT_REMOVE, c->index);
+ }
- pa_subscription_post(c->core, PA_SUBSCRIPTION_EVENT_CARD|PA_SUBSCRIPTION_EVENT_REMOVE, c->index);
+ pa_namereg_unregister(core, c->name);
pa_assert(pa_idxset_isempty(c->sinks));
pa_idxset_free(c->sinks, NULL);
@@ -303,20 +308,27 @@ int pa_card_set_profile(pa_card *c, pa_card_profile *profile, bool save) {
return 0;
}
- if ((r = c->set_profile(c, profile)) < 0)
+ /* If we're setting the initial profile, we shouldn't call set_profile(),
+ * because the implementations don't expect that (for historical reasons).
+ * We should just set c->active_profile, and the implementations will
+ * properly set up that profile after pa_card_put() has returned. It would
+ * be probably good to change this so that also the initial profile can be
+ * set up in set_profile(), but if set_profile() fails, that would need
+ * some better handling than what we do here currently. */
+ if (c->linked && (r = c->set_profile(c, profile)) < 0)
return r;
- pa_subscription_post(c->core, PA_SUBSCRIPTION_EVENT_CARD|PA_SUBSCRIPTION_EVENT_CHANGE, c->index);
-
- pa_log_info("Changed profile of card %u \"%s\" to %s", c->index, c->name, profile->name);
-
c->active_profile = profile;
c->save_profile = save;
if (save)
update_port_preferred_profile(c);
- pa_hook_fire(&c->core->hooks[PA_CORE_HOOK_CARD_PROFILE_CHANGED], c);
+ if (c->linked) {
+ pa_log_info("Changed profile of card %u \"%s\" to %s", c->index, c->name, profile->name);
+ pa_hook_fire(&c->core->hooks[PA_CORE_HOOK_CARD_PROFILE_CHANGED], c);
+ pa_subscription_post(c->core, PA_SUBSCRIPTION_EVENT_CARD|PA_SUBSCRIPTION_EVENT_CHANGE, c->index);
+ }
return 0;
}
diff --git a/src/pulsecore/card.h b/src/pulsecore/card.h
index d4970e3..5699475 100644
--- a/src/pulsecore/card.h
+++ b/src/pulsecore/card.h
@@ -86,6 +86,8 @@ struct pa_card {
pa_suspend_cause_t suspend_cause;
+ bool linked;
+
void *userdata;
int (*set_profile)(pa_card *c, pa_card_profile *profile);
@@ -99,15 +101,11 @@ typedef struct pa_card_new_data {
pa_module *module;
pa_hashmap *profiles;
- char *active_profile;
-
pa_hashmap *ports;
pa_device_port *preferred_input_port;
pa_device_port *preferred_output_port;
bool namereg_fail:1;
-
- bool save_profile:1;
} pa_card_new_data;
typedef struct {
@@ -123,11 +121,17 @@ void pa_card_profile_set_available(pa_card_profile *c, pa_available_t available)
pa_card_new_data *pa_card_new_data_init(pa_card_new_data *data);
void pa_card_new_data_set_name(pa_card_new_data *data, const char *name);
-void pa_card_new_data_set_profile(pa_card_new_data *data, const char *profile);
void pa_card_new_data_set_preferred_port(pa_card_new_data *data, pa_direction_t direction, pa_device_port *port);
void pa_card_new_data_done(pa_card_new_data *data);
pa_card *pa_card_new(pa_core *c, pa_card_new_data *data);
+
+/* Select the initial card profile according to the configured policies. This
+ * must be called between pa_card_new() and pa_card_put(), after the port and
+ * profile availablities have been initialized. */
+void pa_card_choose_initial_profile(pa_card *card);
+
+void pa_card_put(pa_card *c);
void pa_card_free(pa_card *c);
void pa_card_add_profile(pa_card *c, pa_card_profile *profile);
diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
index b6eb85a..873f86a 100644
--- a/src/pulsecore/core-util.c
+++ b/src/pulsecore/core-util.c
@@ -138,6 +138,7 @@
#include <pulsecore/strlist.h>
#include <pulsecore/cpu-x86.h>
#include <pulsecore/pipe.h>
+#include <pulsecore/once.h>
#include "core-util.h"
@@ -729,7 +730,7 @@ static int set_scheduler(int rtprio) {
/* Try to talk to RealtimeKit */
if (!(bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error))) {
- pa_log("Failed to connect to system bus: %s\n", error.message);
+ pa_log("Failed to connect to system bus: %s", error.message);
dbus_error_free(&error);
errno = -EIO;
return -1;
@@ -746,7 +747,7 @@ static int set_scheduler(int rtprio) {
r = getrlimit(RLIMIT_RTTIME, &rl);
if (r >= 0 && (long long) rl.rlim_max > rttime) {
- pa_log_info("Clamping rlimit-rttime to %lld for RealtimeKit\n", rttime);
+ pa_log_info("Clamping rlimit-rttime to %lld for RealtimeKit", rttime);
rl.rlim_cur = rl.rlim_max = rttime;
r = setrlimit(RLIMIT_RTTIME, &rl);
@@ -866,7 +867,7 @@ static int set_nice(int nice_level) {
/* Try to talk to RealtimeKit */
if (!(bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error))) {
- pa_log("Failed to connect to system bus: %s\n", error.message);
+ pa_log("Failed to connect to system bus: %s", error.message);
dbus_error_free(&error);
errno = -EIO;
return -1;
@@ -2553,6 +2554,7 @@ void *pa_will_need(const void *p, size_t l) {
size_t size;
int r = ENOTSUP;
size_t bs;
+ const size_t page_size = pa_page_size();
pa_assert(p);
pa_assert(l > 0);
@@ -2577,7 +2579,7 @@ void *pa_will_need(const void *p, size_t l) {
#ifdef RLIMIT_MEMLOCK
pa_assert_se(getrlimit(RLIMIT_MEMLOCK, &rlim) == 0);
- if (rlim.rlim_cur < PA_PAGE_SIZE) {
+ if (rlim.rlim_cur < page_size) {
pa_log_debug("posix_madvise() failed (or doesn't exist), resource limits don't allow mlock(), can't page in data: %s", pa_cstrerror(r));
errno = EPERM;
return (void*) p;
@@ -2585,7 +2587,7 @@ void *pa_will_need(const void *p, size_t l) {
bs = PA_PAGE_ALIGN((size_t) rlim.rlim_cur);
#else
- bs = PA_PAGE_SIZE*4;
+ bs = page_size*4;
#endif
pa_log_debug("posix_madvise() failed (or doesn't exist), trying mlock(): %s", pa_cstrerror(r));
@@ -3179,8 +3181,8 @@ void pa_reduce(unsigned *num, unsigned *den) {
unsigned pa_ncpus(void) {
long ncpus;
-#ifdef _SC_NPROCESSORS_CONF
- ncpus = sysconf(_SC_NPROCESSORS_CONF);
+#ifdef _SC_NPROCESSORS_ONLN
+ ncpus = sysconf(_SC_NPROCESSORS_ONLN);
#else
ncpus = 1;
#endif
@@ -3194,6 +3196,7 @@ char *pa_replace(const char*s, const char*a, const char *b) {
pa_assert(s);
pa_assert(a);
+ pa_assert(*a);
pa_assert(b);
an = strlen(a);
@@ -3490,6 +3493,16 @@ int pa_pipe_cloexec(int pipefd[2]) {
if ((r = pipe2(pipefd, O_CLOEXEC)) >= 0)
goto finish;
+ if (errno == EMFILE) {
+ pa_log_error("The per-process limit on the number of open file descriptors has been reached.");
+ return r;
+ }
+
+ if (errno == ENFILE) {
+ pa_log_error("The system-wide limit on the total number of open files has been reached.");
+ return r;
+ }
+
if (errno != EINVAL && errno != ENOSYS)
return r;
@@ -3498,6 +3511,16 @@ int pa_pipe_cloexec(int pipefd[2]) {
if ((r = pipe(pipefd)) >= 0)
goto finish;
+ if (errno == EMFILE) {
+ pa_log_error("The per-process limit on the number of open file descriptors has been reached.");
+ return r;
+ }
+
+ if (errno == ENFILE) {
+ pa_log_error("The system-wide limit on the total number of open files has been reached.");
+ return r;
+ }
+
/* return error */
return r;
@@ -3668,3 +3691,23 @@ bool pa_running_in_vm(void) {
return false;
}
+
+size_t pa_page_size(void) {
+#if defined(PAGE_SIZE)
+ return PAGE_SIZE;
+#elif defined(PAGESIZE)
+ return PAGESIZE;
+#elif defined(HAVE_SYSCONF)
+ static size_t page_size = 4096; /* Let's hope it's like x86. */
+
+ PA_ONCE_BEGIN {
+ long ret = sysconf(_SC_PAGE_SIZE);
+ if (ret > 0)
+ page_size = ret;
+ } PA_ONCE_END;
+
+ return page_size;
+#else
+ return 4096;
+#endif
+}
diff --git a/src/pulsecore/core-util.h b/src/pulsecore/core-util.h
index d5a2d39..ede1ae2 100644
--- a/src/pulsecore/core-util.h
+++ b/src/pulsecore/core-util.h
@@ -249,6 +249,10 @@ void pa_reduce(unsigned *num, unsigned *den);
unsigned pa_ncpus(void);
+/* Replaces all occurrences of `a' in `s' with `b'. The caller has to free the
+ * returned string. All parameters must be non-NULL and additionally `a' must
+ * not be a zero-length string.
+ */
char *pa_replace(const char*s, const char*a, const char *b);
/* Escapes p by inserting backslashes in front of backslashes. chars is a
@@ -298,4 +302,17 @@ bool pa_running_in_vm(void);
char *pa_win32_get_toplevel(HANDLE handle);
#endif
+size_t pa_page_size(void);
+
+/* Rounds down */
+static inline void* PA_PAGE_ALIGN_PTR(const void *p) {
+ return (void*) (((size_t) p) & ~(pa_page_size() - 1));
+}
+
+/* Rounds up */
+static inline size_t PA_PAGE_ALIGN(size_t l) {
+ size_t page_size = pa_page_size();
+ return (l + page_size - 1) & ~(page_size - 1);
+}
+
#endif
diff --git a/src/pulsecore/core.h b/src/pulsecore/core.h
index 00d7f2f..802111b 100644
--- a/src/pulsecore/core.h
+++ b/src/pulsecore/core.h
@@ -118,6 +118,7 @@ typedef enum pa_core_hook {
PA_CORE_HOOK_CLIENT_PROPLIST_CHANGED,
PA_CORE_HOOK_CLIENT_SEND_EVENT,
PA_CORE_HOOK_CARD_NEW,
+ PA_CORE_HOOK_CARD_CHOOSE_INITIAL_PROFILE,
PA_CORE_HOOK_CARD_PUT,
PA_CORE_HOOK_CARD_UNLINK,
PA_CORE_HOOK_CARD_PREFERRED_PORT_CHANGED,
diff --git a/src/pulsecore/device-port.c b/src/pulsecore/device-port.c
index 5807d3e..7c9ddf3 100644
--- a/src/pulsecore/device-port.c
+++ b/src/pulsecore/device-port.c
@@ -104,6 +104,9 @@ static void device_port_free(pa_object *o) {
pa_assert(p);
pa_assert(pa_device_port_refcnt(p) == 0);
+ if (p->impl_free)
+ p->impl_free(p);
+
if (p->proplist)
pa_proplist_free(p->proplist);
@@ -161,7 +164,7 @@ void pa_device_port_set_latency_offset(pa_device_port *p, int64_t offset) {
PA_IDXSET_FOREACH(sink, p->core->sinks, state) {
if (sink->active_port == p) {
- pa_sink_set_latency_offset(sink, p->latency_offset);
+ pa_sink_set_port_latency_offset(sink, p->latency_offset);
break;
}
}
@@ -174,7 +177,7 @@ void pa_device_port_set_latency_offset(pa_device_port *p, int64_t offset) {
PA_IDXSET_FOREACH(source, p->core->sources, state) {
if (source->active_port == p) {
- pa_source_set_latency_offset(source, p->latency_offset);
+ pa_source_set_port_latency_offset(source, p->latency_offset);
break;
}
}
diff --git a/src/pulsecore/device-port.h b/src/pulsecore/device-port.h
index 85c41fa..fbdce1a 100644
--- a/src/pulsecore/device-port.h
+++ b/src/pulsecore/device-port.h
@@ -52,6 +52,9 @@ struct pa_device_port {
pa_direction_t direction;
int64_t latency_offset;
+ /* Free the extra implementation specific data. Called before other members are freed. */
+ void (*impl_free)(pa_device_port *port);
+
/* .. followed by some implementation specific data */
};
diff --git a/src/pulsecore/filter/LICENSE.WEBKIT b/src/pulsecore/filter/LICENSE.WEBKIT
new file mode 100644
index 0000000..2f69d9f
--- /dev/null
+++ b/src/pulsecore/filter/LICENSE.WEBKIT
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
diff --git a/src/pulsecore/iochannel.c b/src/pulsecore/iochannel.c
index e62750b..8ace297 100644
--- a/src/pulsecore/iochannel.c
+++ b/src/pulsecore/iochannel.c
@@ -346,6 +346,8 @@ ssize_t pa_iochannel_write_with_creds(pa_iochannel*io, const void*data, size_t l
return r;
}
+/* For more details on FD passing, check the cmsg(3) manpage
+ * and IETF RFC #2292: "Advanced Sockets API for IPv6" */
ssize_t pa_iochannel_write_with_fds(pa_iochannel*io, const void*data, size_t l, int nfd, const int *fds) {
ssize_t r;
int *msgdata;
@@ -353,7 +355,7 @@ ssize_t pa_iochannel_write_with_fds(pa_iochannel*io, const void*data, size_t l,
struct iovec iov;
union {
struct cmsghdr hdr;
- uint8_t data[CMSG_SPACE(sizeof(int) * MAX_ANCIL_DATA_FDS)];
+ uint8_t data[CMSG_SPACE(sizeof(int) * nfd)];
} cmsg;
pa_assert(io);
diff --git a/src/pulsecore/macro.h b/src/pulsecore/macro.h
index 1e15f4f..2c5d5f2 100644
--- a/src/pulsecore/macro.h
+++ b/src/pulsecore/macro.h
@@ -44,17 +44,6 @@
#endif
#endif
-#if defined(PAGE_SIZE)
-#define PA_PAGE_SIZE ((size_t) PAGE_SIZE)
-#elif defined(PAGESIZE)
-#define PA_PAGE_SIZE ((size_t) PAGESIZE)
-#elif defined(HAVE_SYSCONF)
-#define PA_PAGE_SIZE ((size_t) (sysconf(_SC_PAGE_SIZE)))
-#else
-/* Let's hope it's like x86. */
-#define PA_PAGE_SIZE ((size_t) 4096)
-#endif
-
/* Rounds down */
static inline void* PA_ALIGN_PTR(const void *p) {
return (void*) (((size_t) p) & ~(sizeof(void*) - 1));
@@ -65,16 +54,6 @@ static inline size_t PA_ALIGN(size_t l) {
return ((l + sizeof(void*) - 1) & ~(sizeof(void*) - 1));
}
-/* Rounds down */
-static inline void* PA_PAGE_ALIGN_PTR(const void *p) {
- return (void*) (((size_t) p) & ~(PA_PAGE_SIZE - 1));
-}
-
-/* Rounds up */
-static inline size_t PA_PAGE_ALIGN(size_t l) {
- return (l + PA_PAGE_SIZE - 1) & ~(PA_PAGE_SIZE - 1);
-}
-
#if defined(__GNUC__)
#define PA_UNUSED __attribute__ ((unused))
#else
@@ -190,7 +169,7 @@ static inline size_t PA_PAGE_ALIGN(size_t l) {
#define pa_return_if_fail(expr) \
do { \
if (PA_UNLIKELY(!(expr))) { \
- pa_log_debug("Assertion '%s' failed at %s:%u, function %s.\n", #expr , __FILE__, __LINE__, PA_PRETTY_FUNCTION); \
+ pa_log_debug("Assertion '%s' failed at %s:%u, function %s.", #expr , __FILE__, __LINE__, PA_PRETTY_FUNCTION); \
return; \
} \
} while(false)
@@ -198,7 +177,7 @@ static inline size_t PA_PAGE_ALIGN(size_t l) {
#define pa_return_val_if_fail(expr, val) \
do { \
if (PA_UNLIKELY(!(expr))) { \
- pa_log_debug("Assertion '%s' failed at %s:%u, function %s.\n", #expr , __FILE__, __LINE__, PA_PRETTY_FUNCTION); \
+ pa_log_debug("Assertion '%s' failed at %s:%u, function %s.", #expr , __FILE__, __LINE__, PA_PRETTY_FUNCTION); \
return (val); \
} \
} while(false)
diff --git a/src/pulsecore/memblock.c b/src/pulsecore/memblock.c
index 17520ed..dbad32a 100644
--- a/src/pulsecore/memblock.c
+++ b/src/pulsecore/memblock.c
@@ -828,13 +828,14 @@ static void memblock_replace_import(pa_memblock *b) {
pa_mempool *pa_mempool_new(pa_mem_type_t type, size_t size, bool per_client) {
pa_mempool *p;
char t1[PA_BYTES_SNPRINT_MAX], t2[PA_BYTES_SNPRINT_MAX];
+ const size_t page_size = pa_page_size();
p = pa_xnew0(pa_mempool, 1);
PA_REFCNT_INIT(p);
p->block_size = PA_PAGE_ALIGN(PA_MEMPOOL_SLOT_SIZE);
- if (p->block_size < PA_PAGE_SIZE)
- p->block_size = PA_PAGE_SIZE;
+ if (p->block_size < page_size)
+ p->block_size = page_size;
if (size <= 0)
p->n_blocks = PA_MEMPOOL_SLOTS_MAX;
diff --git a/src/pulsecore/memblockq.c b/src/pulsecore/memblockq.c
index d283ed2..b132dd3 100644
--- a/src/pulsecore/memblockq.c
+++ b/src/pulsecore/memblockq.c
@@ -680,18 +680,6 @@ size_t pa_memblockq_get_length(pa_memblockq *bq) {
return (size_t) (bq->write_index - bq->read_index);
}
-size_t pa_memblockq_missing(pa_memblockq *bq) {
- size_t l;
- pa_assert(bq);
-
- if ((l = pa_memblockq_get_length(bq)) >= bq->tlength)
- return 0;
-
- l = bq->tlength - l;
-
- return l >= bq->minreq ? l : 0;
-}
-
void pa_memblockq_seek(pa_memblockq *bq, int64_t offset, pa_seek_mode_t seek, bool account) {
int64_t old;
pa_assert(bq);
@@ -840,6 +828,10 @@ size_t pa_memblockq_pop_missing(pa_memblockq *bq) {
if (bq->missing <= 0)
return 0;
+ if (((size_t) bq->missing < bq->minreq) &&
+ !pa_memblockq_prebuf_active(bq))
+ return 0;
+
l = (size_t) bq->missing;
bq->requested += bq->missing;
diff --git a/src/pulsecore/memblockq.h b/src/pulsecore/memblockq.h
index 301bb21..69dcebc 100644
--- a/src/pulsecore/memblockq.h
+++ b/src/pulsecore/memblockq.h
@@ -56,7 +56,7 @@ typedef struct pa_memblockq pa_memblockq;
if no data is in the queue and will never fail. Pass
(size_t) -1 for the default.
- - minreq: pa_memblockq_missing() will only return values greater
+ - minreq: pa_memblockq_pop_missing() will only return values greater
than this value. Pass 0 for the default.
- maxrewind: how many bytes of history to keep in the queue
@@ -112,9 +112,6 @@ bool pa_memblockq_is_readable(pa_memblockq *bq);
/* Return the length of the queue in bytes */
size_t pa_memblockq_get_length(pa_memblockq *bq);
-/* Return how many bytes are missing in queue to the specified fill amount */
-size_t pa_memblockq_missing(pa_memblockq *bq);
-
/* Return the number of bytes that are missing since the last call to
* this function, reset the internal counter to 0. */
size_t pa_memblockq_pop_missing(pa_memblockq *bq);
diff --git a/src/pulsecore/modargs.c b/src/pulsecore/modargs.c
index b3c0313..bce5891 100644
--- a/src/pulsecore/modargs.c
+++ b/src/pulsecore/modargs.c
@@ -43,7 +43,7 @@ struct entry {
char *key, *value;
};
-static int add_key_value(pa_modargs *ma, char *key, char *value, const char* const valid_keys[]) {
+static int add_key_value(pa_modargs *ma, char *key, char *value, const char* const valid_keys[], bool ignore_dupes) {
struct entry *e;
char *raw;
@@ -56,7 +56,11 @@ static int add_key_value(pa_modargs *ma, char *key, char *value, const char* con
if (pa_hashmap_get(ma->unescaped, key)) {
pa_xfree(key);
pa_xfree(value);
- return -1;
+
+ if (ignore_dupes)
+ return 0;
+ else
+ return -1;
}
if (valid_keys) {
@@ -100,7 +104,7 @@ static void free_func(void *p) {
pa_xfree(e);
}
-pa_modargs *pa_modargs_new(const char *args, const char* const* valid_keys) {
+static int parse(pa_modargs *ma, const char *args, const char* const* valid_keys, bool ignore_dupes) {
enum {
WHITESPACE,
KEY,
@@ -115,13 +119,6 @@ pa_modargs *pa_modargs_new(const char *args, const char* const* valid_keys) {
const char *p, *key = NULL, *value = NULL;
size_t key_len = 0, value_len = 0;
- pa_modargs *ma = pa_xnew(pa_modargs, 1);
-
- ma->raw = pa_hashmap_new_full(pa_idxset_string_hash_func, pa_idxset_string_compare_func, NULL, free_func);
- ma->unescaped = pa_hashmap_new_full(pa_idxset_string_hash_func, pa_idxset_string_compare_func, NULL, free_func);
-
- if (!args)
- return ma;
state = WHITESPACE;
@@ -160,7 +157,8 @@ pa_modargs *pa_modargs_new(const char *args, const char* const* valid_keys) {
if (add_key_value(ma,
pa_xstrndup(key, key_len),
pa_xstrdup(""),
- valid_keys) < 0)
+ valid_keys,
+ ignore_dupes) < 0)
goto fail;
state = WHITESPACE;
} else if (*p == '\\') {
@@ -179,7 +177,8 @@ pa_modargs *pa_modargs_new(const char *args, const char* const* valid_keys) {
if (add_key_value(ma,
pa_xstrndup(key, key_len),
pa_xstrndup(value, value_len),
- valid_keys) < 0)
+ valid_keys,
+ ignore_dupes) < 0)
goto fail;
state = WHITESPACE;
} else if (*p == '\\') {
@@ -199,7 +198,8 @@ pa_modargs *pa_modargs_new(const char *args, const char* const* valid_keys) {
if (add_key_value(ma,
pa_xstrndup(key, key_len),
pa_xstrndup(value, value_len),
- valid_keys) < 0)
+ valid_keys,
+ ignore_dupes) < 0)
goto fail;
state = WHITESPACE;
} else if (*p == '\\') {
@@ -219,7 +219,8 @@ pa_modargs *pa_modargs_new(const char *args, const char* const* valid_keys) {
if (add_key_value(ma,
pa_xstrndup(key, key_len),
pa_xstrndup(value, value_len),
- valid_keys) < 0)
+ valid_keys,
+ ignore_dupes) < 0)
goto fail;
state = WHITESPACE;
} else if (*p == '\\') {
@@ -237,23 +238,40 @@ pa_modargs *pa_modargs_new(const char *args, const char* const* valid_keys) {
}
if (state == VALUE_START) {
- if (add_key_value(ma, pa_xstrndup(key, key_len), pa_xstrdup(""), valid_keys) < 0)
+ if (add_key_value(ma, pa_xstrndup(key, key_len), pa_xstrdup(""), valid_keys, ignore_dupes) < 0)
goto fail;
} else if (state == VALUE_SIMPLE) {
- if (add_key_value(ma, pa_xstrndup(key, key_len), pa_xstrdup(value), valid_keys) < 0)
+ if (add_key_value(ma, pa_xstrndup(key, key_len), pa_xstrdup(value), valid_keys, ignore_dupes) < 0)
goto fail;
} else if (state != WHITESPACE)
goto fail;
- return ma;
+ return 0;
fail:
+ return -1;
+}
- pa_modargs_free(ma);
+pa_modargs *pa_modargs_new(const char *args, const char* const* valid_keys) {
+ pa_modargs *ma = pa_xnew(pa_modargs, 1);
+
+ ma->raw = pa_hashmap_new_full(pa_idxset_string_hash_func, pa_idxset_string_compare_func, NULL, free_func);
+ ma->unescaped = pa_hashmap_new_full(pa_idxset_string_hash_func, pa_idxset_string_compare_func, NULL, free_func);
+
+ if (args && parse(ma, args, valid_keys, false) < 0)
+ goto fail;
+ return ma;
+
+fail:
+ pa_modargs_free(ma);
return NULL;
}
+int pa_modargs_append(pa_modargs *ma, const char *args, const char* const* valid_keys) {
+ return parse(ma, args, valid_keys, true);
+}
+
void pa_modargs_free(pa_modargs*ma) {
pa_assert(ma);
diff --git a/src/pulsecore/modargs.h b/src/pulsecore/modargs.h
index 776a1e6..96132a3 100644
--- a/src/pulsecore/modargs.h
+++ b/src/pulsecore/modargs.h
@@ -34,33 +34,43 @@ typedef struct pa_modargs pa_modargs;
/* Parse the string args. The NULL-terminated array keys contains all valid arguments. */
pa_modargs *pa_modargs_new(const char *args, const char* const keys[]);
+/* Parse the string args, and add any keys that are not already present. */
+int pa_modargs_append(pa_modargs *ma, const char *args, const char* const* valid_keys);
void pa_modargs_free(pa_modargs*ma);
/* Return the module argument for the specified name as a string. If
* the argument was not specified, return def instead.*/
const char *pa_modargs_get_value(pa_modargs *ma, const char *key, const char *def);
-/* Return a module argument as unsigned 32bit value in *value */
+/* Return a module argument as unsigned 32bit value in *value. If the argument
+ * was not specified, *value remains unchanged. */
int pa_modargs_get_value_u32(pa_modargs *ma, const char *key, uint32_t *value);
int pa_modargs_get_value_s32(pa_modargs *ma, const char *key, int32_t *value);
int pa_modargs_get_value_boolean(pa_modargs *ma, const char *key, bool *value);
-/* Return a module argument as double value in *value */
+/* Return a module argument as double value in *value. If the argument was not
+ * specified, *value remains unchanged. */
int pa_modargs_get_value_double(pa_modargs *ma, const char *key, double *value);
-/* Return a module argument as pa_volume_t value in *value */
+/* Return a module argument as pa_volume_t value in *value. If the argument
+ * was not specified, *value remains unchanged. */
int pa_modargs_get_value_volume(pa_modargs *ma, const char *key, pa_volume_t *value);
-/* Return sample rate from the "rate" argument */
+/* Return sample rate from the "rate" argument. If the argument was not
+ * specified, *rate remains unchanged. */
int pa_modargs_get_sample_rate(pa_modargs *ma, uint32_t *rate);
-/* Return sample spec data from the three arguments "rate", "format" and "channels" */
+/* Return sample spec data from the three arguments "rate", "format" and
+ * "channels". If the argument was not specified, *ss remains unchanged. */
int pa_modargs_get_sample_spec(pa_modargs *ma, pa_sample_spec *ss);
-/* Return channel map data from the argument "channel_map" if name is NULL, otherwise read from the specified argument */
+/* Return channel map data from the argument "channel_map" if name is NULL,
+ * otherwise read from the specified argument. If the argument was not
+ * specified, *map remains unchanged. */
int pa_modargs_get_channel_map(pa_modargs *ma, const char *name, pa_channel_map *map);
-/* Return resample method from the argument "resample_method" */
+/* Return resample method from the argument "resample_method". If the argument
+ * was not specified, *method remains unchanged. */
int pa_modargs_get_resample_method(pa_modargs *ma, pa_resample_method_t *method);
/* Combination of pa_modargs_get_sample_spec() and
@@ -70,7 +80,8 @@ structure if no channel_map is found, using pa_channel_map_init_auto() */
int pa_modargs_get_sample_spec_and_channel_map(pa_modargs *ma, pa_sample_spec *ss, pa_channel_map *map, pa_channel_map_def_t def);
-/* Return alternate sample rate from "alternate_sample_rate" parameter */
+/* Return alternate sample rate from "alternate_sample_rate" parameter. If the
+ * argument was not specified, *alternate_rate remains unchanged. */
int pa_modargs_get_alternate_sample_rate(pa_modargs *ma, uint32_t *alternate_rate);
int pa_modargs_get_proplist(pa_modargs *ma, const char *name, pa_proplist *p, pa_update_mode_t m);
diff --git a/src/pulsecore/module.c b/src/pulsecore/module.c
index 7cba3a7..ac15815 100644
--- a/src/pulsecore/module.c
+++ b/src/pulsecore/module.c
@@ -228,6 +228,12 @@ fail:
return NULL;
}
+static void postponed_dlclose(pa_mainloop_api *api, void *userdata) {
+ lt_dlhandle dl = userdata;
+
+ lt_dlclose(dl);
+}
+
static void pa_module_free(pa_module *m) {
pa_assert(m);
pa_assert(m->core);
@@ -246,7 +252,15 @@ static void pa_module_free(pa_module *m) {
if (m->proplist)
pa_proplist_free(m->proplist);
- lt_dlclose(m->dl);
+ /* If a module unloads itself with pa_module_unload(), we can't call
+ * lt_dlclose() here, because otherwise pa_module_unload() may return to a
+ * code location that has been removed from memory. Therefore, let's
+ * postpone the lt_dlclose() call a bit.
+ *
+ * Apparently lt_dlclose() doesn't always remove the module from memory,
+ * but it can happen, as can be seen here:
+ * https://bugs.freedesktop.org/show_bug.cgi?id=96831 */
+ pa_mainloop_api_once(m->core->mainloop, postponed_dlclose, m->dl);
pa_hashmap_remove(m->core->modules_pending_unload, m);
diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index 5619b9c..13f4f62 100644
--- a/src/pulsecore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
@@ -261,158 +261,6 @@ static void source_output_send_event_cb(pa_source_output *o, const char *event,
static int sink_input_process_msg(pa_msgobject *o, int code, void *userdata, int64_t offset, pa_memchunk *chunk);
static int source_output_process_msg(pa_msgobject *o, int code, void *userdata, int64_t offset, pa_memchunk *chunk);
-static void command_exit(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_create_playback_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_drain_playback_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_create_record_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_delete_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_auth(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_set_client_name(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_lookup(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_stat(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_get_playback_latency(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_get_record_latency(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_create_upload_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_finish_upload_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_play_sample(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_remove_sample(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_get_info(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_get_info_list(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_get_server_info(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_subscribe(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_set_volume(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_set_mute(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_cork_playback_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_trigger_or_flush_or_prebuf_playback_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_set_default_sink_or_source(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_set_stream_name(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_kill(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_load_module(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_unload_module(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_cork_record_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_flush_record_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_move_stream(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_suspend(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_set_stream_buffer_attr(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_update_stream_sample_rate(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_update_proplist(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_remove_proplist(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_extension(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_set_card_profile(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_set_sink_or_source_port(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_set_port_latency_offset(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_enable_srbchannel(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-static void command_register_memfd_shmid(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata);
-
-static const pa_pdispatch_cb_t command_table[PA_COMMAND_MAX] = {
- [PA_COMMAND_ERROR] = NULL,
- [PA_COMMAND_TIMEOUT] = NULL,
- [PA_COMMAND_REPLY] = NULL,
- [PA_COMMAND_CREATE_PLAYBACK_STREAM] = command_create_playback_stream,
- [PA_COMMAND_DELETE_PLAYBACK_STREAM] = command_delete_stream,
- [PA_COMMAND_DRAIN_PLAYBACK_STREAM] = command_drain_playback_stream,
- [PA_COMMAND_CREATE_RECORD_STREAM] = command_create_record_stream,
- [PA_COMMAND_DELETE_RECORD_STREAM] = command_delete_stream,
- [PA_COMMAND_AUTH] = command_auth,
- [PA_COMMAND_REQUEST] = NULL,
- [PA_COMMAND_EXIT] = command_exit,
- [PA_COMMAND_SET_CLIENT_NAME] = command_set_client_name,
- [PA_COMMAND_LOOKUP_SINK] = command_lookup,
- [PA_COMMAND_LOOKUP_SOURCE] = command_lookup,
- [PA_COMMAND_STAT] = command_stat,
- [PA_COMMAND_GET_PLAYBACK_LATENCY] = command_get_playback_latency,
- [PA_COMMAND_GET_RECORD_LATENCY] = command_get_record_latency,
- [PA_COMMAND_CREATE_UPLOAD_STREAM] = command_create_upload_stream,
- [PA_COMMAND_DELETE_UPLOAD_STREAM] = command_delete_stream,
- [PA_COMMAND_FINISH_UPLOAD_STREAM] = command_finish_upload_stream,
- [PA_COMMAND_PLAY_SAMPLE] = command_play_sample,
- [PA_COMMAND_REMOVE_SAMPLE] = command_remove_sample,
- [PA_COMMAND_GET_SINK_INFO] = command_get_info,
- [PA_COMMAND_GET_SOURCE_INFO] = command_get_info,
- [PA_COMMAND_GET_CLIENT_INFO] = command_get_info,
- [PA_COMMAND_GET_CARD_INFO] = command_get_info,
- [PA_COMMAND_GET_MODULE_INFO] = command_get_info,
- [PA_COMMAND_GET_SINK_INPUT_INFO] = command_get_info,
- [PA_COMMAND_GET_SOURCE_OUTPUT_INFO] = command_get_info,
- [PA_COMMAND_GET_SAMPLE_INFO] = command_get_info,
- [PA_COMMAND_GET_SINK_INFO_LIST] = command_get_info_list,
- [PA_COMMAND_GET_SOURCE_INFO_LIST] = command_get_info_list,
- [PA_COMMAND_GET_MODULE_INFO_LIST] = command_get_info_list,
- [PA_COMMAND_GET_CLIENT_INFO_LIST] = command_get_info_list,
- [PA_COMMAND_GET_CARD_INFO_LIST] = command_get_info_list,
- [PA_COMMAND_GET_SINK_INPUT_INFO_LIST] = command_get_info_list,
- [PA_COMMAND_GET_SOURCE_OUTPUT_INFO_LIST] = command_get_info_list,
- [PA_COMMAND_GET_SAMPLE_INFO_LIST] = command_get_info_list,
- [PA_COMMAND_GET_SERVER_INFO] = command_get_server_info,
- [PA_COMMAND_SUBSCRIBE] = command_subscribe,
-
- [PA_COMMAND_SET_SINK_VOLUME] = command_set_volume,
- [PA_COMMAND_SET_SINK_INPUT_VOLUME] = command_set_volume,
- [PA_COMMAND_SET_SOURCE_VOLUME] = command_set_volume,
- [PA_COMMAND_SET_SOURCE_OUTPUT_VOLUME] = command_set_volume,
-
- [PA_COMMAND_SET_SINK_MUTE] = command_set_mute,
- [PA_COMMAND_SET_SINK_INPUT_MUTE] = command_set_mute,
- [PA_COMMAND_SET_SOURCE_MUTE] = command_set_mute,
- [PA_COMMAND_SET_SOURCE_OUTPUT_MUTE] = command_set_mute,
-
- [PA_COMMAND_SUSPEND_SINK] = command_suspend,
- [PA_COMMAND_SUSPEND_SOURCE] = command_suspend,
-
- [PA_COMMAND_CORK_PLAYBACK_STREAM] = command_cork_playback_stream,
- [PA_COMMAND_FLUSH_PLAYBACK_STREAM] = command_trigger_or_flush_or_prebuf_playback_stream,
- [PA_COMMAND_TRIGGER_PLAYBACK_STREAM] = command_trigger_or_flush_or_prebuf_playback_stream,
- [PA_COMMAND_PREBUF_PLAYBACK_STREAM] = command_trigger_or_flush_or_prebuf_playback_stream,
-
- [PA_COMMAND_CORK_RECORD_STREAM] = command_cork_record_stream,
- [PA_COMMAND_FLUSH_RECORD_STREAM] = command_flush_record_stream,
-
- [PA_COMMAND_SET_DEFAULT_SINK] = command_set_default_sink_or_source,
- [PA_COMMAND_SET_DEFAULT_SOURCE] = command_set_default_sink_or_source,
- [PA_COMMAND_SET_PLAYBACK_STREAM_NAME] = command_set_stream_name,
- [PA_COMMAND_SET_RECORD_STREAM_NAME] = command_set_stream_name,
- [PA_COMMAND_KILL_CLIENT] = command_kill,
- [PA_COMMAND_KILL_SINK_INPUT] = command_kill,
- [PA_COMMAND_KILL_SOURCE_OUTPUT] = command_kill,
- [PA_COMMAND_LOAD_MODULE] = command_load_module,
- [PA_COMMAND_UNLOAD_MODULE] = command_unload_module,
-
- [PA_COMMAND_GET_AUTOLOAD_INFO___OBSOLETE] = NULL,
- [PA_COMMAND_GET_AUTOLOAD_INFO_LIST___OBSOLETE] = NULL,
- [PA_COMMAND_ADD_AUTOLOAD___OBSOLETE] = NULL,
- [PA_COMMAND_REMOVE_AUTOLOAD___OBSOLETE] = NULL,
-
- [PA_COMMAND_MOVE_SINK_INPUT] = command_move_stream,
- [PA_COMMAND_MOVE_SOURCE_OUTPUT] = command_move_stream,
-
- [PA_COMMAND_SET_PLAYBACK_STREAM_BUFFER_ATTR] = command_set_stream_buffer_attr,
- [PA_COMMAND_SET_RECORD_STREAM_BUFFER_ATTR] = command_set_stream_buffer_attr,
-
- [PA_COMMAND_UPDATE_PLAYBACK_STREAM_SAMPLE_RATE] = command_update_stream_sample_rate,
- [PA_COMMAND_UPDATE_RECORD_STREAM_SAMPLE_RATE] = command_update_stream_sample_rate,
-
- [PA_COMMAND_UPDATE_RECORD_STREAM_PROPLIST] = command_update_proplist,
- [PA_COMMAND_UPDATE_PLAYBACK_STREAM_PROPLIST] = command_update_proplist,
- [PA_COMMAND_UPDATE_CLIENT_PROPLIST] = command_update_proplist,
-
- [PA_COMMAND_REMOVE_RECORD_STREAM_PROPLIST] = command_remove_proplist,
- [PA_COMMAND_REMOVE_PLAYBACK_STREAM_PROPLIST] = command_remove_proplist,
- [PA_COMMAND_REMOVE_CLIENT_PROPLIST] = command_remove_proplist,
-
- [PA_COMMAND_SET_CARD_PROFILE] = command_set_card_profile,
-
- [PA_COMMAND_SET_SINK_PORT] = command_set_sink_or_source_port,
- [PA_COMMAND_SET_SOURCE_PORT] = command_set_sink_or_source_port,
-
- [PA_COMMAND_SET_PORT_LATENCY_OFFSET] = command_set_port_latency_offset,
-
- [PA_COMMAND_ENABLE_SRBCHANNEL] = command_enable_srbchannel,
-
- [PA_COMMAND_REGISTER_MEMFD_SHMID] = command_register_memfd_shmid,
-
- [PA_COMMAND_EXTENSION] = command_extension
-};
-
/* structure management */
/* Called from main context */
@@ -1263,8 +1111,7 @@ out:
/* Called from IO context */
static void playback_stream_request_bytes(playback_stream *s) {
- size_t m, minreq;
- int previous_missing;
+ size_t m;
playback_stream_assert_ref(s);
@@ -1284,11 +1131,7 @@ static void playback_stream_request_bytes(playback_stream *s) {
pa_log("request_bytes(%lu)", (unsigned long) m);
#endif
- previous_missing = pa_atomic_add(&s->missing, (int) m);
- minreq = pa_memblockq_get_minreq(s->memblockq);
-
- if (pa_memblockq_prebuf_active(s->memblockq) ||
- (previous_missing < (int) minreq && previous_missing + (int) m >= (int) minreq))
+ if (pa_atomic_add(&s->missing, (int) m) <= 0)
pa_asyncmsgq_post(pa_thread_mq_get()->outq, PA_MSGOBJECT(s), PLAYBACK_STREAM_MESSAGE_REQUEST_DATA, NULL, 0, NULL, NULL);
}
@@ -2718,17 +2561,17 @@ static void command_auth(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta
/* Starting with protocol version 13 the MSB of the version tag
reflects if shm is available for this pa_native_connection or
not. */
- if (c->version >= 13) {
- shm_on_remote = !!(c->version & 0x80000000U);
+ if ((c->version & PA_PROTOCOL_VERSION_MASK) >= 13) {
+ shm_on_remote = !!(c->version & PA_PROTOCOL_FLAG_SHM);
/* Starting with protocol version 31, the second MSB of the version
* tag reflects whether memfd is supported on the other PA end. */
- if (c->version >= 31)
- memfd_on_remote = !!(c->version & 0x40000000U);
+ if ((c->version & PA_PROTOCOL_VERSION_MASK) >= 31)
+ memfd_on_remote = !!(c->version & PA_PROTOCOL_FLAG_MEMFD);
/* Reserve the two most-significant _bytes_ of the version tag
* for flags. */
- c->version &= 0x0000FFFFU;
+ c->version &= PA_PROTOCOL_VERSION_MASK;
}
pa_log_debug("Protocol version: remote %u, local %u", c->version, PA_PROTOCOL_VERSION);
@@ -2815,12 +2658,18 @@ static void command_auth(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta
pa_log_debug("Negotiated SHM: %s", pa_yes_no(do_shm));
pa_pstream_enable_shm(c->pstream, do_shm);
+ /* Do not declare memfd support for 9.0 client libraries (protocol v31).
+ *
+ * Although they support memfd transport, such 9.0 clients has an iochannel
+ * bug that would break memfd audio if they're run in 32-bit mode over a
+ * 64-bit kernel. Thus influence them to use the POSIX shared memory model
+ * instead. Check commit 451d1d676237c81 for further details. */
do_memfd =
- do_shm && pa_mempool_is_memfd_backed(c->protocol->core->mempool);
+ c->version >= 32 && do_shm && pa_mempool_is_memfd_backed(c->protocol->core->mempool);
shm_type = PA_MEM_TYPE_PRIVATE;
if (do_shm) {
- if (c->version >= 31 && memfd_on_remote && do_memfd) {
+ if (do_memfd && memfd_on_remote) {
pa_pstream_enable_memfd(c->pstream);
shm_type = PA_MEM_TYPE_SHARED_MEMFD;
} else
@@ -4977,6 +4826,115 @@ static void command_set_port_latency_offset(pa_pdispatch *pd, uint32_t command,
pa_pstream_send_simple_ack(c->pstream, tag);
}
+static const pa_pdispatch_cb_t command_table[PA_COMMAND_MAX] = {
+ [PA_COMMAND_ERROR] = NULL,
+ [PA_COMMAND_TIMEOUT] = NULL,
+ [PA_COMMAND_REPLY] = NULL,
+ [PA_COMMAND_CREATE_PLAYBACK_STREAM] = command_create_playback_stream,
+ [PA_COMMAND_DELETE_PLAYBACK_STREAM] = command_delete_stream,
+ [PA_COMMAND_DRAIN_PLAYBACK_STREAM] = command_drain_playback_stream,
+ [PA_COMMAND_CREATE_RECORD_STREAM] = command_create_record_stream,
+ [PA_COMMAND_DELETE_RECORD_STREAM] = command_delete_stream,
+ [PA_COMMAND_AUTH] = command_auth,
+ [PA_COMMAND_REQUEST] = NULL,
+ [PA_COMMAND_EXIT] = command_exit,
+ [PA_COMMAND_SET_CLIENT_NAME] = command_set_client_name,
+ [PA_COMMAND_LOOKUP_SINK] = command_lookup,
+ [PA_COMMAND_LOOKUP_SOURCE] = command_lookup,
+ [PA_COMMAND_STAT] = command_stat,
+ [PA_COMMAND_GET_PLAYBACK_LATENCY] = command_get_playback_latency,
+ [PA_COMMAND_GET_RECORD_LATENCY] = command_get_record_latency,
+ [PA_COMMAND_CREATE_UPLOAD_STREAM] = command_create_upload_stream,
+ [PA_COMMAND_DELETE_UPLOAD_STREAM] = command_delete_stream,
+ [PA_COMMAND_FINISH_UPLOAD_STREAM] = command_finish_upload_stream,
+ [PA_COMMAND_PLAY_SAMPLE] = command_play_sample,
+ [PA_COMMAND_REMOVE_SAMPLE] = command_remove_sample,
+ [PA_COMMAND_GET_SINK_INFO] = command_get_info,
+ [PA_COMMAND_GET_SOURCE_INFO] = command_get_info,
+ [PA_COMMAND_GET_CLIENT_INFO] = command_get_info,
+ [PA_COMMAND_GET_CARD_INFO] = command_get_info,
+ [PA_COMMAND_GET_MODULE_INFO] = command_get_info,
+ [PA_COMMAND_GET_SINK_INPUT_INFO] = command_get_info,
+ [PA_COMMAND_GET_SOURCE_OUTPUT_INFO] = command_get_info,
+ [PA_COMMAND_GET_SAMPLE_INFO] = command_get_info,
+ [PA_COMMAND_GET_SINK_INFO_LIST] = command_get_info_list,
+ [PA_COMMAND_GET_SOURCE_INFO_LIST] = command_get_info_list,
+ [PA_COMMAND_GET_MODULE_INFO_LIST] = command_get_info_list,
+ [PA_COMMAND_GET_CLIENT_INFO_LIST] = command_get_info_list,
+ [PA_COMMAND_GET_CARD_INFO_LIST] = command_get_info_list,
+ [PA_COMMAND_GET_SINK_INPUT_INFO_LIST] = command_get_info_list,
+ [PA_COMMAND_GET_SOURCE_OUTPUT_INFO_LIST] = command_get_info_list,
+ [PA_COMMAND_GET_SAMPLE_INFO_LIST] = command_get_info_list,
+ [PA_COMMAND_GET_SERVER_INFO] = command_get_server_info,
+ [PA_COMMAND_SUBSCRIBE] = command_subscribe,
+
+ [PA_COMMAND_SET_SINK_VOLUME] = command_set_volume,
+ [PA_COMMAND_SET_SINK_INPUT_VOLUME] = command_set_volume,
+ [PA_COMMAND_SET_SOURCE_VOLUME] = command_set_volume,
+ [PA_COMMAND_SET_SOURCE_OUTPUT_VOLUME] = command_set_volume,
+
+ [PA_COMMAND_SET_SINK_MUTE] = command_set_mute,
+ [PA_COMMAND_SET_SINK_INPUT_MUTE] = command_set_mute,
+ [PA_COMMAND_SET_SOURCE_MUTE] = command_set_mute,
+ [PA_COMMAND_SET_SOURCE_OUTPUT_MUTE] = command_set_mute,
+
+ [PA_COMMAND_SUSPEND_SINK] = command_suspend,
+ [PA_COMMAND_SUSPEND_SOURCE] = command_suspend,
+
+ [PA_COMMAND_CORK_PLAYBACK_STREAM] = command_cork_playback_stream,
+ [PA_COMMAND_FLUSH_PLAYBACK_STREAM] = command_trigger_or_flush_or_prebuf_playback_stream,
+ [PA_COMMAND_TRIGGER_PLAYBACK_STREAM] = command_trigger_or_flush_or_prebuf_playback_stream,
+ [PA_COMMAND_PREBUF_PLAYBACK_STREAM] = command_trigger_or_flush_or_prebuf_playback_stream,
+
+ [PA_COMMAND_CORK_RECORD_STREAM] = command_cork_record_stream,
+ [PA_COMMAND_FLUSH_RECORD_STREAM] = command_flush_record_stream,
+
+ [PA_COMMAND_SET_DEFAULT_SINK] = command_set_default_sink_or_source,
+ [PA_COMMAND_SET_DEFAULT_SOURCE] = command_set_default_sink_or_source,
+ [PA_COMMAND_SET_PLAYBACK_STREAM_NAME] = command_set_stream_name,
+ [PA_COMMAND_SET_RECORD_STREAM_NAME] = command_set_stream_name,
+ [PA_COMMAND_KILL_CLIENT] = command_kill,
+ [PA_COMMAND_KILL_SINK_INPUT] = command_kill,
+ [PA_COMMAND_KILL_SOURCE_OUTPUT] = command_kill,
+ [PA_COMMAND_LOAD_MODULE] = command_load_module,
+ [PA_COMMAND_UNLOAD_MODULE] = command_unload_module,
+
+ [PA_COMMAND_GET_AUTOLOAD_INFO___OBSOLETE] = NULL,
+ [PA_COMMAND_GET_AUTOLOAD_INFO_LIST___OBSOLETE] = NULL,
+ [PA_COMMAND_ADD_AUTOLOAD___OBSOLETE] = NULL,
+ [PA_COMMAND_REMOVE_AUTOLOAD___OBSOLETE] = NULL,
+
+ [PA_COMMAND_MOVE_SINK_INPUT] = command_move_stream,
+ [PA_COMMAND_MOVE_SOURCE_OUTPUT] = command_move_stream,
+
+ [PA_COMMAND_SET_PLAYBACK_STREAM_BUFFER_ATTR] = command_set_stream_buffer_attr,
+ [PA_COMMAND_SET_RECORD_STREAM_BUFFER_ATTR] = command_set_stream_buffer_attr,
+
+ [PA_COMMAND_UPDATE_PLAYBACK_STREAM_SAMPLE_RATE] = command_update_stream_sample_rate,
+ [PA_COMMAND_UPDATE_RECORD_STREAM_SAMPLE_RATE] = command_update_stream_sample_rate,
+
+ [PA_COMMAND_UPDATE_RECORD_STREAM_PROPLIST] = command_update_proplist,
+ [PA_COMMAND_UPDATE_PLAYBACK_STREAM_PROPLIST] = command_update_proplist,
+ [PA_COMMAND_UPDATE_CLIENT_PROPLIST] = command_update_proplist,
+
+ [PA_COMMAND_REMOVE_RECORD_STREAM_PROPLIST] = command_remove_proplist,
+ [PA_COMMAND_REMOVE_PLAYBACK_STREAM_PROPLIST] = command_remove_proplist,
+ [PA_COMMAND_REMOVE_CLIENT_PROPLIST] = command_remove_proplist,
+
+ [PA_COMMAND_SET_CARD_PROFILE] = command_set_card_profile,
+
+ [PA_COMMAND_SET_SINK_PORT] = command_set_sink_or_source_port,
+ [PA_COMMAND_SET_SOURCE_PORT] = command_set_sink_or_source_port,
+
+ [PA_COMMAND_SET_PORT_LATENCY_OFFSET] = command_set_port_latency_offset,
+
+ [PA_COMMAND_ENABLE_SRBCHANNEL] = command_enable_srbchannel,
+
+ [PA_COMMAND_REGISTER_MEMFD_SHMID] = command_register_memfd_shmid,
+
+ [PA_COMMAND_EXTENSION] = command_extension
+};
+
/*** pstream callbacks ***/
static void pstream_packet_callback(pa_pstream *p, pa_packet *packet, pa_cmsg_ancil_data *ancil_data, void *userdata) {
diff --git a/src/pulsecore/pstream.c b/src/pulsecore/pstream.c
index bbff2f6..3b94a3a 100644
--- a/src/pulsecore/pstream.c
+++ b/src/pulsecore/pstream.c
@@ -186,9 +186,34 @@ struct pa_pstream {
};
#ifdef HAVE_CREDS
-/* Don't close the ancillary fds by your own! Always call this method;
- * it guarantees necessary cleanups after fds close.. This method is
- * also multiple-invocations safe. */
+/*
+ * memfd-backed SHM pools blocks transfer occur without passing the pool's
+ * fd every time, thus minimizing overhead and avoiding fd leaks. A
+ * REGISTER_MEMFD_SHMID command is sent, with the pool's memfd fd, very early
+ * on. This command has an ID that uniquely identifies the pool in question.
+ * Further pool's block references can then be exclusively done using such ID;
+ * the fd can be safely closed – on both ends – afterwards.
+ *
+ * On the sending side of this command, we want to close the passed fds
+ * directly after being sent. Meanwhile we're only allowed to asynchronously
+ * schedule packet writes to the pstream, so the job of closing passed fds is
+ * left to the pstream's actual writing function do_write(): it knows the
+ * exact point in time where the fds are passed to the other end through
+ * iochannels and the sendmsg() system call.
+ *
+ * Nonetheless not all code paths in the system desire their socket-passed
+ * fds to be closed after the send. srbchannel needs the passed fds to still
+ * be open for further communication. System-wide global memfd-backed pools
+ * also require the passed fd to be open: they pass the same fd, with the same
+ * ID registration mechanism, for each newly connected client to the system.
+ *
+ * So from all of the above, never close the ancillary fds by your own and
+ * always call below method instead. It takes care of closing the passed fds
+ * _only if allowed_ by the code paths that originally created them to do so.
+ * Moreover, it is multiple-invocations safe: failure handlers can, and
+ * should, call it for passed fds cleanup without worrying too much about
+ * the system state.
+ */
void pa_cmsg_ancil_data_close_fds(struct pa_cmsg_ancil_data *ancil) {
if (ancil && ancil->nfd > 0 && ancil->close_fds_on_cleanup) {
int i;
@@ -1119,8 +1144,8 @@ void pa_pstream_set_revoke_callback(pa_pstream *p, pa_pstream_block_id_cb_t cb,
pa_assert(p);
pa_assert(PA_REFCNT_VALUE(p) > 0);
- p->release_callback = cb;
- p->release_callback_userdata = userdata;
+ p->revoke_callback = cb;
+ p->revoke_callback_userdata = userdata;
}
bool pa_pstream_is_pending(pa_pstream *p) {
diff --git a/src/pulsecore/sample-util.c b/src/pulsecore/sample-util.c
index 8ae5db9..b2a28eb 100644
--- a/src/pulsecore/sample-util.c
+++ b/src/pulsecore/sample-util.c
@@ -39,7 +39,7 @@
#include "sample-util.h"
-#define PA_SILENCE_MAX (PA_PAGE_SIZE*16)
+#define PA_SILENCE_MAX (pa_page_size()*16)
pa_memblock *pa_silence_memblock(pa_memblock* b, const pa_sample_spec *spec) {
void *data;
diff --git a/src/pulsecore/shm.c b/src/pulsecore/shm.c
index 9dea0a5..919d71a 100644
--- a/src/pulsecore/shm.c
+++ b/src/pulsecore/shm.c
@@ -126,7 +126,7 @@ static int privatemem_create(pa_shm *m, size_t size) {
{
int r;
- if ((r = posix_memalign(&m->ptr, PA_PAGE_SIZE, size)) < 0) {
+ if ((r = posix_memalign(&m->ptr, pa_page_size(), size)) < 0) {
pa_log("posix_memalign() failed: %s", pa_cstrerror(r));
return r;
}
@@ -201,12 +201,14 @@ static int sharedmem_create(pa_shm *m, pa_mem_type_t type, size_t size, mode_t m
/* For memfds, we keep the fd open until we pass it
* to the other PA endpoint over unix domain socket. */
- if (type == PA_MEM_TYPE_SHARED_MEMFD)
- m->fd = fd;
- else {
+ if (type != PA_MEM_TYPE_SHARED_MEMFD) {
pa_assert_se(pa_close(fd) == 0);
m->fd = -1;
}
+#if HAVE_MEMFD
+ else
+ m->fd = fd;
+#endif
return 0;
@@ -298,6 +300,7 @@ finish:
void pa_shm_punch(pa_shm *m, size_t offset, size_t size) {
void *ptr;
size_t o;
+ const size_t page_size = pa_page_size();
pa_assert(m);
pa_assert(m->ptr);
@@ -316,13 +319,13 @@ void pa_shm_punch(pa_shm *m, size_t offset, size_t size) {
o = (size_t) ((uint8_t*) ptr - (uint8_t*) PA_PAGE_ALIGN_PTR(ptr));
if (o > 0) {
- size_t delta = PA_PAGE_SIZE - o;
+ size_t delta = page_size - o;
ptr = (uint8_t*) ptr + delta;
size -= delta;
}
/* Align the size down to multiples of page size */
- size = (size / PA_PAGE_SIZE) * PA_PAGE_SIZE;
+ size = (size / page_size) * page_size;
#ifdef MADV_REMOVE
if (madvise(ptr, size, MADV_REMOVE) >= 0)
@@ -481,7 +484,7 @@ int pa_shm_cleanup(void) {
segment_name(fn, sizeof(fn), id);
if (shm_unlink(fn) < 0 && errno != EACCES && errno != ENOENT)
- pa_log_warn("Failed to remove SHM segment %s: %s\n", fn, pa_cstrerror(errno));
+ pa_log_warn("Failed to remove SHM segment %s: %s", fn, pa_cstrerror(errno));
}
closedir(d);
diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c
index c7d99ef..e9694f2 100644
--- a/src/pulsecore/sink-input.c
+++ b/src/pulsecore/sink-input.c
@@ -44,7 +44,7 @@
/* #define SINK_INPUT_DEBUG */
#define MEMBLOCKQ_MAXLENGTH (32*1024*1024)
-#define CONVERT_BUFFER_LENGTH (PA_PAGE_SIZE)
+#define CONVERT_BUFFER_LENGTH (pa_page_size())
PA_DEFINE_PUBLIC_CLASS(pa_sink_input, pa_msgobject);
@@ -645,7 +645,7 @@ void pa_sink_input_unlink(pa_sink_input *i) {
bool linked;
pa_source_output *o, PA_UNUSED *p = NULL;
- pa_assert(i);
+ pa_sink_input_assert_ref(i);
pa_assert_ctl_context();
/* See pa_sink_unlink() for a couple of comments how this function
@@ -697,11 +697,6 @@ void pa_sink_input_unlink(pa_sink_input *i) {
reset_callbacks(i);
- if (linked) {
- pa_subscription_post(i->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_REMOVE, i->index);
- pa_hook_fire(&i->core->hooks[PA_CORE_HOOK_SINK_INPUT_UNLINK_POST], i);
- }
-
if (i->sink) {
if (PA_SINK_IS_LINKED(pa_sink_get_state(i->sink)))
pa_sink_update_status(i->sink);
@@ -709,6 +704,11 @@ void pa_sink_input_unlink(pa_sink_input *i) {
i->sink = NULL;
}
+ if (linked) {
+ pa_subscription_post(i->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_REMOVE, i->index);
+ pa_hook_fire(&i->core->hooks[PA_CORE_HOOK_SINK_INPUT_UNLINK_POST], i);
+ }
+
pa_core_maybe_vacuum(i->core);
pa_sink_input_unref(i);
@@ -721,9 +721,7 @@ static void sink_input_free(pa_object *o) {
pa_assert(i);
pa_assert_ctl_context();
pa_assert(pa_sink_input_refcnt(i) == 0);
-
- if (PA_SINK_INPUT_IS_LINKED(i->state))
- pa_sink_input_unlink(i);
+ pa_assert(!PA_SINK_INPUT_IS_LINKED(i->state));
pa_log_info("Freeing input %u \"%s\"", i->index,
i->proplist ? pa_strnull(pa_proplist_gets(i->proplist, PA_PROP_MEDIA_NAME)) : "");
@@ -1435,10 +1433,10 @@ void pa_sink_input_set_property(pa_sink_input *i, const char *key, const char *v
if (pa_proplist_contains(i->proplist, key)) {
old_value = pa_xstrdup(pa_proplist_gets(i->proplist, key));
- if (value && old_value) {
- if (pa_streq(value, old_value))
- goto finish;
- } else
+ if (value && old_value && pa_streq(value, old_value))
+ goto finish;
+
+ if (!old_value)
old_value = pa_xstrdup("(data)");
} else {
if (!value)
@@ -2300,6 +2298,30 @@ int pa_sink_input_update_rate(pa_sink_input *i) {
return 0;
}
+/* Called from the IO thread. */
+void pa_sink_input_attach(pa_sink_input *i) {
+ pa_assert(i);
+ pa_assert(!i->thread_info.attached);
+
+ i->thread_info.attached = true;
+
+ if (i->attach)
+ i->attach(i);
+}
+
+/* Called from the IO thread. */
+void pa_sink_input_detach(pa_sink_input *i) {
+ pa_assert(i);
+
+ if (!i->thread_info.attached)
+ return;
+
+ i->thread_info.attached = false;
+
+ if (i->detach)
+ i->detach(i);
+}
+
/* Called from the main thread. */
void pa_sink_input_set_volume_direct(pa_sink_input *i, const pa_cvolume *volume) {
pa_cvolume old_volume;
diff --git a/src/pulsecore/sink-input.h b/src/pulsecore/sink-input.h
index 8bbee4e..f957a0e 100644
--- a/src/pulsecore/sink-input.h
+++ b/src/pulsecore/sink-input.h
@@ -413,6 +413,31 @@ bool pa_sink_input_process_underrun(pa_sink_input *i);
pa_memchunk* pa_sink_input_get_silence(pa_sink_input *i, pa_memchunk *ret);
+/* Calls the attach() callback if it's set. The input must be in detached
+ * state. */
+void pa_sink_input_attach(pa_sink_input *i);
+
+/* Calls the detach() callback if it's set and the input is attached. The input
+ * is allowed to be already detached, in which case this does nothing.
+ *
+ * The reason why this can be called for already-detached inputs is that when
+ * a filter sink's input is detached, it has to detach also all inputs
+ * connected to the filter sink. In case the filter sink's input was detached
+ * because the filter sink is being removed, those other inputs will be moved
+ * to another sink or removed, and moving and removing involve detaching the
+ * inputs, but the inputs at that point are already detached.
+ *
+ * XXX: Moving or removing an input also involves sending messages to the
+ * input's sink. If the input's sink is a detached filter sink, shouldn't
+ * sending messages to it be prohibited? The messages are processed in the
+ * root sink's IO thread, and when the filter sink is detached, it would seem
+ * logical to prohibit any interaction with the IO thread that isn't any more
+ * associated with the filter sink. Currently sending messages to detached
+ * filter sinks mostly works, because the filter sinks don't update their
+ * asyncmsgq pointer when detaching, so messages still find their way to the
+ * old IO thread. */
+void pa_sink_input_detach(pa_sink_input *i);
+
/* Called from the main thread, from sink.c only. The normal way to set the
* sink input volume is to call pa_sink_input_set_volume(), but the flat volume
* logic in sink.c needs also a function that doesn't do all the extra stuff
diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
index 3f1ef72..aa21822 100644
--- a/src/pulsecore/sink.c
+++ b/src/pulsecore/sink.c
@@ -50,7 +50,7 @@
#include "sink.h"
#define MAX_MIX_CHANNELS 32
-#define MIX_BUFFER_LENGTH (PA_PAGE_SIZE)
+#define MIX_BUFFER_LENGTH (pa_page_size())
#define ABSOLUTE_MIN_LATENCY (500)
#define ABSOLUTE_MAX_LATENCY (10*PA_USEC_PER_SEC)
#define DEFAULT_FIXED_LATENCY (250*PA_USEC_PER_MSEC)
@@ -310,9 +310,9 @@ pa_sink* pa_sink_new(
s->active_port = pa_device_port_find_best(s->ports);
if (s->active_port)
- s->latency_offset = s->active_port->latency_offset;
+ s->port_latency_offset = s->active_port->latency_offset;
else
- s->latency_offset = 0;
+ s->port_latency_offset = 0;
s->save_volume = data->save_volume;
s->save_muted = data->save_muted;
@@ -345,7 +345,7 @@ pa_sink* pa_sink_new(
pa_sw_cvolume_multiply(&s->thread_info.current_hw_volume, &s->soft_volume, &s->real_volume);
s->thread_info.volume_change_safety_margin = core->deferred_volume_safety_margin_usec;
s->thread_info.volume_change_extra_delay = core->deferred_volume_extra_delay_usec;
- s->thread_info.latency_offset = s->latency_offset;
+ s->thread_info.port_latency_offset = s->port_latency_offset;
/* FIXME: This should probably be moved to pa_sink_put() */
pa_assert_se(pa_idxset_put(core->sinks, s, &s->index) >= 0);
@@ -669,7 +669,7 @@ void pa_sink_unlink(pa_sink* s) {
bool linked;
pa_sink_input *i, PA_UNUSED *j = NULL;
- pa_assert(s);
+ pa_sink_assert_ref(s);
pa_assert_ctl_context();
/* Please note that pa_sink_unlink() does more than simply
@@ -722,9 +722,7 @@ static void sink_free(pa_object *o) {
pa_assert(s);
pa_assert_ctl_context();
pa_assert(pa_sink_refcnt(s) == 0);
-
- if (PA_SINK_IS_LINKED(s->state))
- pa_sink_unlink(s);
+ pa_assert(!PA_SINK_IS_LINKED(s->state));
pa_log_info("Freeing sink %u \"%s\"", s->index, s->name);
@@ -1508,8 +1506,8 @@ pa_usec_t pa_sink_get_latency(pa_sink *s) {
/* usec is unsigned, so check that the offset can be added to usec without
* underflowing. */
- if (-s->latency_offset <= (int64_t) usec)
- usec += s->latency_offset;
+ if (-s->port_latency_offset <= (int64_t) usec)
+ usec += s->port_latency_offset;
else
usec = 0;
@@ -1542,8 +1540,8 @@ pa_usec_t pa_sink_get_latency_within_thread(pa_sink *s) {
/* usec is unsigned, so check that the offset can be added to usec without
* underflowing. */
- if (-s->thread_info.latency_offset <= (int64_t) usec)
- usec += s->thread_info.latency_offset;
+ if (-s->thread_info.port_latency_offset <= (int64_t) usec)
+ usec += s->thread_info.port_latency_offset;
else
usec = 0;
@@ -2383,7 +2381,7 @@ unsigned pa_sink_used_by(pa_sink *s) {
}
/* Called from main thread */
-unsigned pa_sink_check_suspend(pa_sink *s) {
+unsigned pa_sink_check_suspend(pa_sink *s, pa_sink_input *ignore_input, pa_source_output *ignore_output) {
unsigned ret;
pa_sink_input *i;
uint32_t idx;
@@ -2399,6 +2397,9 @@ unsigned pa_sink_check_suspend(pa_sink *s) {
PA_IDXSET_FOREACH(i, s->inputs, idx) {
pa_sink_input_state_t st;
+ if (i == ignore_input)
+ continue;
+
st = pa_sink_input_get_state(i);
/* We do not assert here. It is perfectly valid for a sink input to
@@ -2419,7 +2420,7 @@ unsigned pa_sink_check_suspend(pa_sink *s) {
}
if (s->monitor_source)
- ret += pa_source_check_suspend(s->monitor_source);
+ ret += pa_source_check_suspend(s->monitor_source, ignore_output);
return ret;
}
@@ -2489,11 +2490,7 @@ int pa_sink_process_msg(pa_msgobject *o, int code, void *userdata, int64_t offse
i->thread_info.sync_next->thread_info.sync_prev = i;
}
- pa_assert(!i->thread_info.attached);
- i->thread_info.attached = true;
-
- if (i->attach)
- i->attach(i);
+ pa_sink_input_attach(i);
pa_sink_input_set_state_within_thread(i, i->state);
@@ -2535,14 +2532,10 @@ int pa_sink_process_msg(pa_msgobject *o, int code, void *userdata, int64_t offse
* sink input handling a few lines down at
* PA_SINK_MESSAGE_START_MOVE, too. */
- if (i->detach)
- i->detach(i);
+ pa_sink_input_detach(i);
pa_sink_input_set_state_within_thread(i, i->state);
- pa_assert(i->thread_info.attached);
- i->thread_info.attached = false;
-
/* Since the caller sleeps in pa_sink_input_unlink(),
* we can safely access data outside of thread_info even
* though it is mutable */
@@ -2634,11 +2627,7 @@ int pa_sink_process_msg(pa_msgobject *o, int code, void *userdata, int64_t offse
}
}
- if (i->detach)
- i->detach(i);
-
- pa_assert(i->thread_info.attached);
- i->thread_info.attached = false;
+ pa_sink_input_detach(i);
/* Let's remove the sink input ...*/
pa_hashmap_remove_and_free(s->thread_info.inputs, PA_UINT32_TO_PTR(i->index));
@@ -2664,11 +2653,7 @@ int pa_sink_process_msg(pa_msgobject *o, int code, void *userdata, int64_t offse
pa_hashmap_put(s->thread_info.inputs, PA_UINT32_TO_PTR(i->index), pa_sink_input_ref(i));
- pa_assert(!i->thread_info.attached);
- i->thread_info.attached = true;
-
- if (i->attach)
- i->attach(i);
+ pa_sink_input_attach(i);
if (i->thread_info.state != PA_SINK_INPUT_CORKED) {
pa_usec_t usec = 0;
@@ -2889,8 +2874,8 @@ int pa_sink_process_msg(pa_msgobject *o, int code, void *userdata, int64_t offse
pa_sink_get_mute(s, true);
return 0;
- case PA_SINK_MESSAGE_SET_LATENCY_OFFSET:
- s->thread_info.latency_offset = offset;
+ case PA_SINK_MESSAGE_SET_PORT_LATENCY_OFFSET:
+ s->thread_info.port_latency_offset = offset;
return 0;
case PA_SINK_MESSAGE_GET_LATENCY:
@@ -2931,8 +2916,7 @@ void pa_sink_detach_within_thread(pa_sink *s) {
pa_assert(PA_SINK_IS_LINKED(s->thread_info.state));
PA_HASHMAP_FOREACH(i, s->thread_info.inputs, state)
- if (i->detach)
- i->detach(i);
+ pa_sink_input_detach(i);
if (s->monitor_source)
pa_source_detach_within_thread(s->monitor_source);
@@ -2948,8 +2932,7 @@ void pa_sink_attach_within_thread(pa_sink *s) {
pa_assert(PA_SINK_IS_LINKED(s->thread_info.state));
PA_HASHMAP_FOREACH(i, s->thread_info.inputs, state)
- if (i->attach)
- i->attach(i);
+ pa_sink_input_attach(i);
if (s->monitor_source)
pa_source_attach_within_thread(s->monitor_source);
@@ -3289,15 +3272,15 @@ void pa_sink_set_fixed_latency_within_thread(pa_sink *s, pa_usec_t latency) {
}
/* Called from main context */
-void pa_sink_set_latency_offset(pa_sink *s, int64_t offset) {
+void pa_sink_set_port_latency_offset(pa_sink *s, int64_t offset) {
pa_sink_assert_ref(s);
- s->latency_offset = offset;
+ s->port_latency_offset = offset;
if (PA_SINK_IS_LINKED(s->state))
- pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_SET_LATENCY_OFFSET, NULL, offset, NULL) == 0);
+ pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_SET_PORT_LATENCY_OFFSET, NULL, offset, NULL) == 0);
else
- s->thread_info.latency_offset = offset;
+ s->thread_info.port_latency_offset = offset;
}
/* Called from main context */
@@ -3370,7 +3353,7 @@ int pa_sink_set_port(pa_sink *s, const char *name, bool save) {
s->active_port = port;
s->save_port = save;
- pa_sink_set_latency_offset(s, s->active_port->latency_offset);
+ pa_sink_set_port_latency_offset(s, s->active_port->latency_offset);
pa_hook_fire(&s->core->hooks[PA_CORE_HOOK_SINK_PORT_CHANGED], s);
diff --git a/src/pulsecore/sink.h b/src/pulsecore/sink.h
index b64a666..bc2a200 100644
--- a/src/pulsecore/sink.h
+++ b/src/pulsecore/sink.h
@@ -118,7 +118,7 @@ struct pa_sink {
pa_atomic_t mixer_dirty;
/* The latency offset is inherited from the currently active port */
- int64_t latency_offset;
+ int64_t port_latency_offset;
unsigned priority;
@@ -287,8 +287,8 @@ struct pa_sink {
* in changing it */
pa_usec_t fixed_latency; /* for sinks with PA_SINK_DYNAMIC_LATENCY this is 0 */
- /* This latency offset is a direct copy from s->latency_offset */
- int64_t latency_offset;
+ /* This latency offset is a direct copy from s->port_latency_offset */
+ int64_t port_latency_offset;
/* Delayed volume change events are queued here. The events
* are stored in expiration order. The one expiring next is in
@@ -337,7 +337,7 @@ typedef enum pa_sink_message {
PA_SINK_MESSAGE_SET_MAX_REQUEST,
PA_SINK_MESSAGE_SET_PORT,
PA_SINK_MESSAGE_UPDATE_VOLUME_AND_MUTE,
- PA_SINK_MESSAGE_SET_LATENCY_OFFSET,
+ PA_SINK_MESSAGE_SET_PORT_LATENCY_OFFSET,
PA_SINK_MESSAGE_MAX
} pa_sink_message_t;
@@ -423,7 +423,7 @@ unsigned pa_device_init_priority(pa_proplist *p);
/**** May be called by everyone, from main context */
int pa_sink_update_rate(pa_sink *s, uint32_t rate, bool passthrough);
-void pa_sink_set_latency_offset(pa_sink *s, int64_t offset);
+void pa_sink_set_port_latency_offset(pa_sink *s, int64_t offset);
/* The returned value is supposed to be in the time domain of the sound card! */
pa_usec_t pa_sink_get_latency(pa_sink *s);
@@ -466,7 +466,14 @@ void pa_sink_set_mixer_dirty(pa_sink *s, bool is_dirty);
unsigned pa_sink_linked_by(pa_sink *s); /* Number of connected streams */
unsigned pa_sink_used_by(pa_sink *s); /* Number of connected streams which are not corked */
-unsigned pa_sink_check_suspend(pa_sink *s); /* Returns how many streams are active that don't allow suspensions */
+
+/* Returns how many streams are active that don't allow suspensions. If
+ * "ignore_input" or "ignore_output" is non-NULL, that stream is not included
+ * in the count (the returned count includes the value from
+ * pa_source_check_suspend(), which is called for the monitor source, so that's
+ * why "ignore_output" may be relevant). */
+unsigned pa_sink_check_suspend(pa_sink *s, pa_sink_input *ignore_input, pa_source_output *ignore_output);
+
#define pa_sink_get_state(s) ((s)->state)
/* Moves all inputs away, and stores them in pa_queue */
diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c
index 6af1543..6714ea9 100644
--- a/src/pulsecore/source-output.c
+++ b/src/pulsecore/source-output.c
@@ -548,7 +548,8 @@ static void source_output_set_state(pa_source_output *o, pa_source_output_state_
/* Called from main context */
void pa_source_output_unlink(pa_source_output*o) {
bool linked;
- pa_assert(o);
+
+ pa_source_output_assert_ref(o);
pa_assert_ctl_context();
/* See pa_sink_unlink() for a couple of comments how this function
@@ -590,11 +591,6 @@ void pa_source_output_unlink(pa_source_output*o) {
reset_callbacks(o);
- if (linked) {
- pa_subscription_post(o->core, PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT|PA_SUBSCRIPTION_EVENT_REMOVE, o->index);
- pa_hook_fire(&o->core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_UNLINK_POST], o);
- }
-
if (o->source) {
if (PA_SOURCE_IS_LINKED(pa_source_get_state(o->source)))
pa_source_update_status(o->source);
@@ -602,6 +598,11 @@ void pa_source_output_unlink(pa_source_output*o) {
o->source = NULL;
}
+ if (linked) {
+ pa_subscription_post(o->core, PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT|PA_SUBSCRIPTION_EVENT_REMOVE, o->index);
+ pa_hook_fire(&o->core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_UNLINK_POST], o);
+ }
+
pa_core_maybe_vacuum(o->core);
pa_source_output_unref(o);
@@ -614,9 +615,7 @@ static void source_output_free(pa_object* mo) {
pa_assert(o);
pa_assert_ctl_context();
pa_assert(pa_source_output_refcnt(o) == 0);
-
- if (PA_SOURCE_OUTPUT_IS_LINKED(o->state))
- pa_source_output_unlink(o);
+ pa_assert(!PA_SOURCE_OUTPUT_IS_LINKED(o->state));
pa_log_info("Freeing output %u \"%s\"", o->index,
o->proplist ? pa_strnull(pa_proplist_gets(o->proplist, PA_PROP_MEDIA_NAME)) : "");
@@ -1087,10 +1086,10 @@ void pa_source_output_set_property(pa_source_output *o, const char *key, const c
if (pa_proplist_contains(o->proplist, key)) {
old_value = pa_xstrdup(pa_proplist_gets(o->proplist, key));
- if (value && old_value) {
- if (pa_streq(value, old_value))
- goto finish;
- } else
+ if (value && old_value && pa_streq(value, old_value))
+ goto finish;
+
+ if (!old_value)
old_value = pa_xstrdup("(data)");
} else {
if (!value)
@@ -1107,7 +1106,7 @@ void pa_source_output_set_property(pa_source_output *o, const char *key, const c
new_value = "(unset)";
}
- if (PA_SINK_INPUT_IS_LINKED(o->state)) {
+ if (PA_SOURCE_OUTPUT_IS_LINKED(o->state)) {
pa_log_debug("Source output %u: proplist[%s]: %s -> %s", o->index, key, old_value, new_value);
pa_hook_fire(&o->core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_PROPLIST_CHANGED], o);
pa_subscription_post(o->core, PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT | PA_SUBSCRIPTION_EVENT_CHANGE, o->index);
@@ -1754,6 +1753,30 @@ int pa_source_output_update_rate(pa_source_output *o) {
return 0;
}
+/* Called from the IO thread. */
+void pa_source_output_attach(pa_source_output *o) {
+ pa_assert(o);
+ pa_assert(!o->thread_info.attached);
+
+ o->thread_info.attached = true;
+
+ if (o->attach)
+ o->attach(o);
+}
+
+/* Called from the IO thread. */
+void pa_source_output_detach(pa_source_output *o) {
+ pa_assert(o);
+
+ if (!o->thread_info.attached)
+ return;
+
+ o->thread_info.attached = false;
+
+ if (o->detach)
+ o->detach(o);
+}
+
/* Called from the main thread. */
void pa_source_output_set_volume_direct(pa_source_output *o, const pa_cvolume *volume) {
pa_cvolume old_volume;
diff --git a/src/pulsecore/source-output.h b/src/pulsecore/source-output.h
index 7ac44bd..40e4e3a 100644
--- a/src/pulsecore/source-output.h
+++ b/src/pulsecore/source-output.h
@@ -349,6 +349,31 @@ int pa_source_output_process_msg(pa_msgobject *mo, int code, void *userdata, int
pa_usec_t pa_source_output_set_requested_latency_within_thread(pa_source_output *o, pa_usec_t usec);
+/* Calls the attach() callback if it's set. The output must be in detached
+ * state. */
+void pa_source_output_attach(pa_source_output *o);
+
+/* Calls the detach() callback if it's set and the output is attached. The
+ * output is allowed to be already detached, in which case this does nothing.
+ *
+ * The reason why this can be called for already-detached outputs is that when
+ * a filter source's output is detached, it has to detach also all outputs
+ * connected to the filter source. In case the filter source's output was
+ * detached because the filter source is being removed, those other outputs
+ * will be moved to another source or removed, and moving and removing involve
+ * detaching the outputs, but the outputs at that point are already detached.
+ *
+ * XXX: Moving or removing an output also involves sending messages to the
+ * output's source. If the output's source is a detached filter source,
+ * shouldn't sending messages to it be prohibited? The messages are processed
+ * in the root source's IO thread, and when the filter source is detached, it
+ * would seem logical to prohibit any interaction with the IO thread that isn't
+ * any more associated with the filter source. Currently sending messages to
+ * detached filter sources mostly works, because the filter sources don't
+ * update their asyncmsgq pointer when detaching, so messages still find their
+ * way to the old IO thread. */
+void pa_source_output_detach(pa_source_output *o);
+
/* Called from the main thread, from source.c only. The normal way to set the
* source output volume is to call pa_source_output_set_volume(), but the flat
* volume logic in source.c needs also a function that doesn't do all the extra
diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
index 98374ae..8ce7818 100644
--- a/src/pulsecore/source.c
+++ b/src/pulsecore/source.c
@@ -298,9 +298,9 @@ pa_source* pa_source_new(
s->active_port = pa_device_port_find_best(s->ports);
if (s->active_port)
- s->latency_offset = s->active_port->latency_offset;
+ s->port_latency_offset = s->active_port->latency_offset;
else
- s->latency_offset = 0;
+ s->port_latency_offset = 0;
s->save_volume = data->save_volume;
s->save_muted = data->save_muted;
@@ -330,7 +330,7 @@ pa_source* pa_source_new(
pa_sw_cvolume_multiply(&s->thread_info.current_hw_volume, &s->soft_volume, &s->real_volume);
s->thread_info.volume_change_safety_margin = core->deferred_volume_safety_margin_usec;
s->thread_info.volume_change_extra_delay = core->deferred_volume_extra_delay_usec;
- s->thread_info.latency_offset = s->latency_offset;
+ s->thread_info.port_latency_offset = s->port_latency_offset;
/* FIXME: This should probably be moved to pa_source_put() */
pa_assert_se(pa_idxset_put(core->sources, s, &s->index) >= 0);
@@ -612,7 +612,7 @@ void pa_source_unlink(pa_source *s) {
bool linked;
pa_source_output *o, PA_UNUSED *j = NULL;
- pa_assert(s);
+ pa_source_assert_ref(s);
pa_assert_ctl_context();
/* See pa_sink_unlink() for a couple of comments how this function
@@ -661,9 +661,7 @@ static void source_free(pa_object *o) {
pa_assert(s);
pa_assert_ctl_context();
pa_assert(pa_source_refcnt(s) == 0);
-
- if (PA_SOURCE_IS_LINKED(s->state))
- pa_source_unlink(s);
+ pa_assert(!PA_SOURCE_IS_LINKED(s->state));
pa_log_info("Freeing source %u \"%s\"", s->index, s->name);
@@ -1103,8 +1101,8 @@ pa_usec_t pa_source_get_latency(pa_source *s) {
/* usec is unsigned, so check that the offset can be added to usec without
* underflowing. */
- if (-s->latency_offset <= (int64_t) usec)
- usec += s->latency_offset;
+ if (-s->port_latency_offset <= (int64_t) usec)
+ usec += s->port_latency_offset;
else
usec = 0;
@@ -1137,8 +1135,8 @@ pa_usec_t pa_source_get_latency_within_thread(pa_source *s) {
/* usec is unsigned, so check that the offset can be added to usec without
* underflowing. */
- if (-s->thread_info.latency_offset <= (int64_t) usec)
- usec += s->thread_info.latency_offset;
+ if (-s->thread_info.port_latency_offset <= (int64_t) usec)
+ usec += s->thread_info.port_latency_offset;
else
usec = 0;
@@ -1945,7 +1943,7 @@ unsigned pa_source_used_by(pa_source *s) {
}
/* Called from main thread */
-unsigned pa_source_check_suspend(pa_source *s) {
+unsigned pa_source_check_suspend(pa_source *s, pa_source_output *ignore) {
unsigned ret;
pa_source_output *o;
uint32_t idx;
@@ -1961,6 +1959,9 @@ unsigned pa_source_check_suspend(pa_source *s) {
PA_IDXSET_FOREACH(o, s->outputs, idx) {
pa_source_output_state_t st;
+ if (o == ignore)
+ continue;
+
st = pa_source_output_get_state(o);
/* We do not assert here. It is perfectly valid for a source output to
@@ -2033,11 +2034,7 @@ int pa_source_process_msg(pa_msgobject *object, int code, void *userdata, int64_
pa_hashmap_put(o->thread_info.direct_on_input->thread_info.direct_outputs, PA_UINT32_TO_PTR(o->index), o);
}
- pa_assert(!o->thread_info.attached);
- o->thread_info.attached = true;
-
- if (o->attach)
- o->attach(o);
+ pa_source_output_attach(o);
pa_source_output_set_state_within_thread(o, o->state);
@@ -2061,11 +2058,7 @@ int pa_source_process_msg(pa_msgobject *object, int code, void *userdata, int64_
pa_source_output_set_state_within_thread(o, o->state);
- if (o->detach)
- o->detach(o);
-
- pa_assert(o->thread_info.attached);
- o->thread_info.attached = false;
+ pa_source_output_detach(o);
if (o->thread_info.direct_on_input) {
pa_hashmap_remove(o->thread_info.direct_on_input->thread_info.direct_outputs, PA_UINT32_TO_PTR(o->index));
@@ -2244,8 +2237,8 @@ int pa_source_process_msg(pa_msgobject *object, int code, void *userdata, int64_
pa_source_get_mute(s, true);
return 0;
- case PA_SOURCE_MESSAGE_SET_LATENCY_OFFSET:
- s->thread_info.latency_offset = offset;
+ case PA_SOURCE_MESSAGE_SET_PORT_LATENCY_OFFSET:
+ s->thread_info.port_latency_offset = offset;
return 0;
case PA_SOURCE_MESSAGE_MAX:
@@ -2288,8 +2281,7 @@ void pa_source_detach_within_thread(pa_source *s) {
pa_assert(PA_SOURCE_IS_LINKED(s->thread_info.state));
PA_HASHMAP_FOREACH(o, s->thread_info.outputs, state)
- if (o->detach)
- o->detach(o);
+ pa_source_output_detach(o);
}
/* Called from IO thread */
@@ -2302,8 +2294,7 @@ void pa_source_attach_within_thread(pa_source *s) {
pa_assert(PA_SOURCE_IS_LINKED(s->thread_info.state));
PA_HASHMAP_FOREACH(o, s->thread_info.outputs, state)
- if (o->attach)
- o->attach(o);
+ pa_source_output_attach(o);
}
/* Called from IO thread */
@@ -2572,15 +2563,15 @@ void pa_source_set_fixed_latency_within_thread(pa_source *s, pa_usec_t latency)
}
/* Called from main thread */
-void pa_source_set_latency_offset(pa_source *s, int64_t offset) {
+void pa_source_set_port_latency_offset(pa_source *s, int64_t offset) {
pa_source_assert_ref(s);
- s->latency_offset = offset;
+ s->port_latency_offset = offset;
if (PA_SOURCE_IS_LINKED(s->state))
- pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SOURCE_MESSAGE_SET_LATENCY_OFFSET, NULL, offset, NULL) == 0);
+ pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SOURCE_MESSAGE_SET_PORT_LATENCY_OFFSET, NULL, offset, NULL) == 0);
else
- s->thread_info.latency_offset = offset;
+ s->thread_info.port_latency_offset = offset;
}
/* Called from main thread */
@@ -2639,6 +2630,8 @@ int pa_source_set_port(pa_source *s, const char *name, bool save) {
s->active_port = port;
s->save_port = save;
+ pa_source_set_port_latency_offset(s, s->active_port->latency_offset);
+
pa_hook_fire(&s->core->hooks[PA_CORE_HOOK_SOURCE_PORT_CHANGED], s);
return 0;
diff --git a/src/pulsecore/source.h b/src/pulsecore/source.h
index 91e8674..e5b9333 100644
--- a/src/pulsecore/source.h
+++ b/src/pulsecore/source.h
@@ -119,7 +119,7 @@ struct pa_source {
pa_atomic_t mixer_dirty;
/* The latency offset is inherited from the currently active port */
- int64_t latency_offset;
+ int64_t port_latency_offset;
unsigned priority;
@@ -229,8 +229,8 @@ struct pa_source {
pa_usec_t fixed_latency; /* for sources with PA_SOURCE_DYNAMIC_LATENCY this is 0 */
- /* This latency offset is a direct copy from s->latency_offset */
- int64_t latency_offset;
+ /* This latency offset is a direct copy from s->port_latency_offset */
+ int64_t port_latency_offset;
/* Delayed volume change events are queued here. The events
* are stored in expiration order. The one expiring next is in
@@ -275,7 +275,7 @@ typedef enum pa_source_message {
PA_SOURCE_MESSAGE_SET_MAX_REWIND,
PA_SOURCE_MESSAGE_SET_PORT,
PA_SOURCE_MESSAGE_UPDATE_VOLUME_AND_MUTE,
- PA_SOURCE_MESSAGE_SET_LATENCY_OFFSET,
+ PA_SOURCE_MESSAGE_SET_PORT_LATENCY_OFFSET,
PA_SOURCE_MESSAGE_MAX
} pa_source_message_t;
@@ -356,7 +356,7 @@ void pa_source_update_flags(pa_source *s, pa_source_flags_t mask, pa_source_flag
/*** May be called by everyone, from main context */
-void pa_source_set_latency_offset(pa_source *s, int64_t offset);
+void pa_source_set_port_latency_offset(pa_source *s, int64_t offset);
/* The returned value is supposed to be in the time domain of the sound card! */
pa_usec_t pa_source_get_latency(pa_source *s);
@@ -400,7 +400,11 @@ int pa_source_update_rate(pa_source *s, uint32_t rate, bool passthrough);
unsigned pa_source_linked_by(pa_source *s); /* Number of connected streams */
unsigned pa_source_used_by(pa_source *s); /* Number of connected streams that are not corked */
-unsigned pa_source_check_suspend(pa_source *s); /* Returns how many streams are active that don't allow suspensions */
+
+/* Returns how many streams are active that don't allow suspensions. If
+ * "ignore" is non-NULL, that stream is not included in the count. */
+unsigned pa_source_check_suspend(pa_source *s, pa_source_output *ignore);
+
#define pa_source_get_state(s) ((pa_source_state_t) (s)->state)
/* Moves all inputs away, and stores them in pa_queue */
diff --git a/src/pulsecore/thread-mq.c b/src/pulsecore/thread-mq.c
index f4489ac..eaa8663 100644
--- a/src/pulsecore/thread-mq.c
+++ b/src/pulsecore/thread-mq.c
@@ -97,13 +97,20 @@ static void asyncmsgq_write_outq_cb(pa_mainloop_api *api, pa_io_event *e, int fd
pa_asyncmsgq_write_before_poll(q->outq);
}
-void pa_thread_mq_init_thread_mainloop(pa_thread_mq *q, pa_mainloop_api *main_mainloop, pa_mainloop_api *thread_mainloop) {
+int pa_thread_mq_init_thread_mainloop(pa_thread_mq *q, pa_mainloop_api *main_mainloop, pa_mainloop_api *thread_mainloop) {
pa_assert(q);
pa_assert(main_mainloop);
pa_assert(thread_mainloop);
- pa_assert_se(q->inq = pa_asyncmsgq_new(0));
- pa_assert_se(q->outq = pa_asyncmsgq_new(0));
+ pa_zero(*q);
+
+ q->inq = pa_asyncmsgq_new(0);
+ if (!q->inq)
+ goto fail;
+
+ q->outq = pa_asyncmsgq_new(0);
+ if (!q->outq)
+ goto fail;
q->main_mainloop = main_mainloop;
q->thread_mainloop = thread_mainloop;
@@ -117,17 +124,31 @@ void pa_thread_mq_init_thread_mainloop(pa_thread_mq *q, pa_mainloop_api *main_ma
pa_asyncmsgq_write_before_poll(q->inq);
pa_assert_se(q->read_thread_event = thread_mainloop->io_new(thread_mainloop, pa_asyncmsgq_read_fd(q->inq), PA_IO_EVENT_INPUT, asyncmsgq_read_cb, q));
pa_assert_se(q->write_main_event = main_mainloop->io_new(main_mainloop, pa_asyncmsgq_write_fd(q->inq), PA_IO_EVENT_INPUT, asyncmsgq_write_inq_cb, q));
+
+ return 0;
+
+fail:
+ pa_thread_mq_done(q);
+
+ return -1;
}
-void pa_thread_mq_init(pa_thread_mq *q, pa_mainloop_api *mainloop, pa_rtpoll *rtpoll) {
+int pa_thread_mq_init(pa_thread_mq *q, pa_mainloop_api *mainloop, pa_rtpoll *rtpoll) {
pa_assert(q);
pa_assert(mainloop);
+ pa_zero(*q);
+
q->main_mainloop = mainloop;
q->thread_mainloop = NULL;
- pa_assert_se(q->inq = pa_asyncmsgq_new(0));
- pa_assert_se(q->outq = pa_asyncmsgq_new(0));
+ q->inq = pa_asyncmsgq_new(0);
+ if (!q->inq)
+ goto fail;
+
+ q->outq = pa_asyncmsgq_new(0);
+ if (!q->outq)
+ goto fail;
pa_assert_se(pa_asyncmsgq_read_before_poll(q->outq) == 0);
pa_assert_se(q->read_main_event = mainloop->io_new(mainloop, pa_asyncmsgq_read_fd(q->outq), PA_IO_EVENT_INPUT, asyncmsgq_read_cb, q));
@@ -137,6 +158,13 @@ void pa_thread_mq_init(pa_thread_mq *q, pa_mainloop_api *mainloop, pa_rtpoll *rt
pa_rtpoll_item_new_asyncmsgq_read(rtpoll, PA_RTPOLL_EARLY, q->inq);
pa_rtpoll_item_new_asyncmsgq_write(rtpoll, PA_RTPOLL_LATE, q->outq);
+
+ return 0;
+
+fail:
+ pa_thread_mq_done(q);
+
+ return -1;
}
void pa_thread_mq_done(pa_thread_mq *q) {
diff --git a/src/pulsecore/thread-mq.h b/src/pulsecore/thread-mq.h
index b3a4a69..f6daa7f 100644
--- a/src/pulsecore/thread-mq.h
+++ b/src/pulsecore/thread-mq.h
@@ -36,8 +36,8 @@ typedef struct pa_thread_mq {
pa_io_event *read_thread_event, *write_thread_event;
} pa_thread_mq;
-void pa_thread_mq_init(pa_thread_mq *q, pa_mainloop_api *mainloop, pa_rtpoll *rtpoll);
-void pa_thread_mq_init_thread_mainloop(pa_thread_mq *q, pa_mainloop_api *main_mainloop, pa_mainloop_api *thread_mainloop);
+int pa_thread_mq_init(pa_thread_mq *q, pa_mainloop_api *mainloop, pa_rtpoll *rtpoll);
+int pa_thread_mq_init_thread_mainloop(pa_thread_mq *q, pa_mainloop_api *main_mainloop, pa_mainloop_api *thread_mainloop);
void pa_thread_mq_done(pa_thread_mq *q);
/* Install the specified pa_thread_mq object for the current thread */
diff --git a/src/tests/alsa-time-test.c b/src/tests/alsa-time-test.c
index b4eedab..a877cb8 100644
--- a/src/tests/alsa-time-test.c
+++ b/src/tests/alsa-time-test.c
@@ -60,6 +60,7 @@ int main(int argc, char *argv[]) {
dev = argc > 1 ? argv[1] : "front:0";
cap = argc > 2 ? atoi(argv[2]) : 0;
fillrate = argc > 3 ? atoi(argv[3]) : 1;
+ assert(fillrate > 0);
samples = calloc(fillrate, CHANNELS*sizeof(uint16_t));
assert(samples);
diff --git a/src/tests/core-util-test.c b/src/tests/core-util-test.c
new file mode 100644
index 0000000..8d1db0c
--- /dev/null
+++ b/src/tests/core-util-test.c
@@ -0,0 +1,284 @@
+/***
+ This file is part of PulseAudio.
+
+ PulseAudio is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License,
+ or (at your option) any later version.
+
+ PulseAudio is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <signal.h>
+
+#include <check.h>
+
+#include <pulse/xmalloc.h>
+#include <pulsecore/core-util.h>
+
+START_TEST (modargs_test_parse_boolean) {
+ ck_assert_int_eq(pa_parse_boolean("true"), true);
+ ck_assert_int_eq(pa_parse_boolean("yes"), true);
+ ck_assert_int_eq(pa_parse_boolean("1"), true);
+
+ ck_assert_int_eq(pa_parse_boolean("false"), false);
+ ck_assert_int_eq(pa_parse_boolean("no"), false);
+ ck_assert_int_eq(pa_parse_boolean("0"), false);
+
+ ck_assert_int_eq(pa_parse_boolean("maybe"), -1);
+ ck_assert_int_eq(pa_parse_boolean("42"), -1);
+}
+END_TEST
+
+START_TEST (modargs_test_parse_volume) {
+ pa_volume_t value;
+
+ // dB volumes
+ ck_assert_int_eq(pa_parse_volume("-20dB", &value), 0);
+ ck_assert_int_eq(value, 30419);
+ ck_assert_int_eq(pa_parse_volume("-10dB", &value), 0);
+ ck_assert_int_eq(value, 44649);
+ ck_assert_int_eq(pa_parse_volume("-1dB", &value), 0);
+ ck_assert_int_eq(value, 63069);
+ ck_assert_int_eq(pa_parse_volume("0dB", &value), 0);
+ ck_assert_int_eq(value, 65536);
+ ck_assert_int_eq(pa_parse_volume("1dB", &value), 0);
+ ck_assert_int_eq(value, 68100);
+ ck_assert_int_eq(pa_parse_volume("10dB", &value), 0);
+ ck_assert_int_eq(value, 96194);
+
+ // lowercase db
+ ck_assert_int_eq(pa_parse_volume("10db", &value), 0);
+ ck_assert_int_eq(value, 96194);
+
+ // percentage volumes
+ ck_assert_int_eq(pa_parse_volume("0%", &value), 0);
+ ck_assert_int_eq(value, 0);
+ ck_assert_int_eq(pa_parse_volume("50%", &value), 0);
+ ck_assert_int_eq(value, 32768);
+ ck_assert_int_eq(pa_parse_volume("100%", &value), 0);
+ ck_assert_int_eq(value, 65536);
+ ck_assert_int_eq(pa_parse_volume("150%", &value), 0);
+ ck_assert_int_eq(value, 98304);
+
+ // integer volumes`
+ ck_assert_int_eq(pa_parse_volume("0", &value), 0);
+ ck_assert_int_eq(value, 0);
+ ck_assert_int_eq(pa_parse_volume("100", &value), 0);
+ ck_assert_int_eq(value, 100);
+ ck_assert_int_eq(pa_parse_volume("1000", &value), 0);
+ ck_assert_int_eq(value, 1000);
+ ck_assert_int_eq(pa_parse_volume("65536", &value), 0);
+ ck_assert_int_eq(value, 65536);
+ ck_assert_int_eq(pa_parse_volume("100000", &value), 0);
+ ck_assert_int_eq(value, 100000);
+
+ // invalid volumes
+ ck_assert_int_lt(pa_parse_volume("", &value), 0);
+ ck_assert_int_lt(pa_parse_volume("-2", &value), 0);
+ ck_assert_int_lt(pa_parse_volume("on", &value), 0);
+ ck_assert_int_lt(pa_parse_volume("off", &value), 0);
+ ck_assert_int_lt(pa_parse_volume("none", &value), 0);
+}
+END_TEST
+
+START_TEST (modargs_test_atoi) {
+ int32_t value;
+
+ // decimal
+ ck_assert_int_eq(pa_atoi("100000", &value), 0);
+ ck_assert_int_eq(value, 100000);
+ ck_assert_int_eq(pa_atoi("-100000", &value), 0);
+ ck_assert_int_eq(value, -100000);
+
+ // hexadecimal
+ ck_assert_int_eq(pa_atoi("0x100000", &value), 0);
+ ck_assert_int_eq(value, 0x100000);
+ ck_assert_int_eq(pa_atoi("-0x100000", &value), 0);
+ ck_assert_int_eq(value, -0x100000);
+
+ // invalid values
+ ck_assert_int_lt(pa_atoi("3.14", &value), 0);
+ ck_assert_int_lt(pa_atoi("7*8", &value), 0);
+ ck_assert_int_lt(pa_atoi("false", &value), 0);
+}
+END_TEST
+
+START_TEST (modargs_test_atou) {
+ uint32_t value;
+
+ // decimal
+ ck_assert_int_eq(pa_atou("100000", &value), 0);
+ ck_assert_int_eq(value, 100000);
+
+ // hexadecimal
+ ck_assert_int_eq(pa_atou("0x100000", &value), 0);
+ ck_assert_int_eq(value, 0x100000);
+
+ // invalid values
+ ck_assert_int_lt(pa_atou("-100000", &value), 0);
+ ck_assert_int_lt(pa_atou("-0x100000", &value), 0);
+ ck_assert_int_lt(pa_atou("3.14", &value), 0);
+ ck_assert_int_lt(pa_atou("7*8", &value), 0);
+ ck_assert_int_lt(pa_atou("false", &value), 0);
+}
+END_TEST
+
+START_TEST (modargs_test_atol) {
+ long value;
+
+ // decimal
+ ck_assert_int_eq(pa_atol("100000", &value), 0);
+ ck_assert_int_eq(value, 100000l);
+ ck_assert_int_eq(pa_atol("-100000", &value), 0);
+ ck_assert_int_eq(value, -100000l);
+
+ // hexadecimal
+ ck_assert_int_eq(pa_atol("0x100000", &value), 0);
+ ck_assert_int_eq(value, 0x100000l);
+ ck_assert_int_eq(pa_atol("-0x100000", &value), 0);
+ ck_assert_int_eq(value, -0x100000l);
+
+ // invalid values
+ ck_assert_int_lt(pa_atol("3.14", &value), 0);
+ ck_assert_int_lt(pa_atol("7*8", &value), 0);
+ ck_assert_int_lt(pa_atol("false", &value), 0);
+}
+END_TEST
+
+START_TEST (modargs_test_atod) {
+ double value;
+ double epsilon = 0.001;
+
+ // decimal
+ ck_assert_int_eq(pa_atod("100000", &value), 0);
+ ck_assert(value > 100000 - epsilon);
+ ck_assert(value < 100000 + epsilon);
+ ck_assert_int_eq(pa_atod("-100000", &value), 0);
+ ck_assert(value > -100000 - epsilon);
+ ck_assert(value < -100000 + epsilon);
+ ck_assert_int_eq(pa_atod("3.14", &value), 0);
+ ck_assert(value > 3.14 - epsilon);
+ ck_assert(value < 3.14 + epsilon);
+
+ // invalid values
+ ck_assert_int_lt(pa_atod("7*8", &value), 0);
+ ck_assert_int_lt(pa_atod("false", &value), 0);
+}
+END_TEST
+
+START_TEST (modargs_test_replace) {
+ char* value;
+
+ value = pa_replace("abcde", "bcd", "XYZ");
+ ck_assert_str_eq(value, "aXYZe");
+ pa_xfree(value);
+
+ value = pa_replace("abe", "b", "bab");
+ ck_assert_str_eq(value, "ababe");
+ pa_xfree(value);
+
+ value = pa_replace("abe", "c", "bab");
+ ck_assert_str_eq(value, "abe");
+ pa_xfree(value);
+
+ value = pa_replace("abcde", "bcd", "");
+ ck_assert_str_eq(value, "ae");
+ pa_xfree(value);
+}
+END_TEST
+
+START_TEST (modargs_test_replace_fail_1) {
+ pa_replace(NULL, "b", "bab");
+}
+END_TEST
+
+START_TEST (modargs_test_replace_fail_2) {
+ pa_replace("abe", NULL, "bab");
+}
+END_TEST
+
+START_TEST (modargs_test_replace_fail_3) {
+ pa_replace("abcde", "b", NULL);
+}
+END_TEST
+
+START_TEST (modargs_test_escape) {
+ char* value;
+
+ value = pa_escape("abcde", "bcd");
+ ck_assert_str_eq(value, "a\\b\\c\\de");
+ pa_xfree(value);
+
+ value = pa_escape("\\", "bcd");
+ ck_assert_str_eq(value, "\\\\");
+ pa_xfree(value);
+
+ value = pa_escape("\\", NULL);
+ ck_assert_str_eq(value, "\\\\");
+ pa_xfree(value);
+}
+END_TEST
+
+START_TEST (modargs_test_replace_fail_4) {
+ pa_replace("abe", "", "bab");
+}
+END_TEST
+
+START_TEST (modargs_test_unescape) {
+ char* value;
+
+ value = pa_unescape(pa_xstrdup("a\\b\\c\\de"));
+ ck_assert_str_eq(value, "abcde");
+ pa_xfree(value);
+
+ value = pa_unescape(pa_xstrdup("\\\\"));
+ ck_assert_str_eq(value, "\\");
+ pa_xfree(value);
+}
+END_TEST
+
+int main(int argc, char *argv[]) {
+ int failed = 0;
+ Suite *s;
+ TCase *tc;
+ SRunner *sr;
+
+ if (!getenv("MAKE_CHECK"))
+ pa_log_set_level(PA_LOG_DEBUG);
+
+ s = suite_create("Core-Util");
+
+ tc = tcase_create("core-util");
+ suite_add_tcase(s, tc);
+ tcase_add_test(tc, modargs_test_parse_boolean);
+ tcase_add_test(tc, modargs_test_parse_volume);
+ tcase_add_test(tc, modargs_test_atoi);
+ tcase_add_test(tc, modargs_test_atou);
+ tcase_add_test(tc, modargs_test_atol);
+ tcase_add_test(tc, modargs_test_atod);
+ tcase_add_test(tc, modargs_test_replace);
+ tcase_add_test_raise_signal(tc, modargs_test_replace_fail_1, SIGABRT);
+ tcase_add_test_raise_signal(tc, modargs_test_replace_fail_2, SIGABRT);
+ tcase_add_test_raise_signal(tc, modargs_test_replace_fail_3, SIGABRT);
+ tcase_add_test_raise_signal(tc, modargs_test_replace_fail_4, SIGABRT);
+ tcase_add_test(tc, modargs_test_escape);
+ tcase_add_test(tc, modargs_test_unescape);
+
+ sr = srunner_create(s);
+ srunner_run_all(sr, CK_NORMAL);
+ failed = srunner_ntests_failed(sr);
+ srunner_free(sr);
+
+ return (failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/src/tests/cpu-mix-test.c b/src/tests/cpu-mix-test.c
index a3189b7..cad8984 100644
--- a/src/tests/cpu-mix-test.c
+++ b/src/tests/cpu-mix-test.c
@@ -114,7 +114,7 @@ static void run_mix_test(
for (i = 0; i < nsamples; i++) {
if (samples[i] != samples_ref[i]) {
pa_log_debug("Correctness test failed: align=%d, channels=%d", align, channels);
- pa_log_debug("%d: %hd != %04hd (%hd + %hd)\n",
+ pa_log_debug("%d: %hd != %04hd (%hd + %hd)",
i,
samples[i], samples_ref[i],
samples0[i], samples1[i]);
diff --git a/src/tests/cpu-remap-test.c b/src/tests/cpu-remap-test.c
index 7af5e29..c4eec45 100644
--- a/src/tests/cpu-remap-test.c
+++ b/src/tests/cpu-remap-test.c
@@ -68,7 +68,7 @@ static void run_remap_test_float(
for (i = 0; i < nsamples * n_oc; i++) {
if (fabsf(out[i] - out_ref[i]) > 0.0001f) {
pa_log_debug("Correctness test failed: align=%d", align);
- pa_log_debug("%d: %.24f != %.24f\n", i,
+ pa_log_debug("%d: %.24f != %.24f", i,
out[i], out_ref[i]);
ck_abort();
}
@@ -122,7 +122,7 @@ static void run_remap_test_s16(
for (i = 0; i < nsamples * n_oc; i++) {
if (abs(out[i] - out_ref[i]) > 3) {
pa_log_debug("Correctness test failed: align=%d", align);
- pa_log_debug("%d: %d != %d\n", i, out[i], out_ref[i]);
+ pa_log_debug("%d: %d != %d", i, out[i], out_ref[i]);
ck_abort();
}
}
diff --git a/src/tests/cpu-volume-test.c b/src/tests/cpu-volume-test.c
index 15f0658..535488e 100644
--- a/src/tests/cpu-volume-test.c
+++ b/src/tests/cpu-volume-test.c
@@ -76,7 +76,7 @@ static void run_volume_test(
for (i = 0; i < nsamples; i++) {
if (samples[i] != samples_ref[i]) {
pa_log_debug("Correctness test failed: align=%d, channels=%d", align, channels);
- pa_log_debug("%d: %04hx != %04hx (%04hx * %08x)\n", i, samples[i], samples_ref[i],
+ pa_log_debug("%d: %04hx != %04hx (%04hx * %08x)", i, samples[i], samples_ref[i],
samples_orig[i], volumes[i % channels]);
ck_abort();
}
diff --git a/src/tests/interpol-test.c b/src/tests/interpol-test.c
index b4cf18c..bb69e52 100644
--- a/src/tests/interpol-test.c
+++ b/src/tests/interpol-test.c
@@ -212,7 +212,7 @@ START_TEST (interpol_test) {
bool cork_now;
#endif
rtc = pa_timeval_diff(&now, &start);
- pa_log_info("%i\t%llu\t%llu\t%llu\t%llu\t%lli\t%u\t%u\t%llu\t%llu\n", k,
+ pa_log_info("%i\t%llu\t%llu\t%llu\t%llu\t%lli\t%u\t%u\t%llu\t%llu", k,
(unsigned long long) rtc,
(unsigned long long) t,
(unsigned long long) (rtc-old_rtc),
diff --git a/src/tests/json-test.c b/src/tests/json-test.c
new file mode 100644
index 0000000..3e956db
--- /dev/null
+++ b/src/tests/json-test.c
@@ -0,0 +1,280 @@
+/***
+ This file is part of PulseAudio.
+
+ Copyright 2016 Arun Raghavan <mail at arunraghavan.net>
+
+ PulseAudio is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License,
+ or (at your option) any later version.
+
+ PulseAudio is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <check.h>
+
+#include <pulse/json.h>
+#include <pulsecore/core-util.h>
+
+START_TEST (string_test) {
+ pa_json_object *o;
+ unsigned int i;
+ const char *strings_parse[] = {
+ "\"\"", "\"test\"", "\"test123\"", "\"123\"", "\"newline\\n\"", "\" spaces \"",
+ " \"lots of spaces\" ", "\"esc\\nape\"", "\"escape a \\\" quote\"",
+ };
+ const char *strings_compare[] = {
+ "", "test", "test123", "123", "newline\n", " spaces ",
+ "lots of spaces", "esc\nape", "escape a \" quote",
+ };
+
+ for (i = 0; i < PA_ELEMENTSOF(strings_parse); i++) {
+ o = pa_json_parse(strings_parse[i]);
+
+ fail_unless(o != NULL);
+ fail_unless(pa_json_object_get_type(o) == PA_JSON_TYPE_STRING);
+ fail_unless(pa_streq(pa_json_object_get_string(o), strings_compare[i]));
+
+ pa_json_object_free(o);
+ }
+}
+END_TEST
+
+START_TEST(int_test) {
+ pa_json_object *o;
+ unsigned int i;
+ const char *ints_parse[] = { "1", "-1", "1234", "0" };
+ const int ints_compare[] = { 1, -1, 1234, 0 };
+
+ for (i = 0; i < PA_ELEMENTSOF(ints_parse); i++) {
+ o = pa_json_parse(ints_parse[i]);
+
+ fail_unless(o != NULL);
+ fail_unless(pa_json_object_get_type(o) == PA_JSON_TYPE_INT);
+ fail_unless(pa_json_object_get_int(o) == ints_compare[i]);
+
+ pa_json_object_free(o);
+ }
+}
+END_TEST
+
+START_TEST(double_test) {
+ pa_json_object *o;
+ unsigned int i;
+ const char *doubles_parse[] = {
+ "1.0", "-1.1", "1234e2", "1234e0", "0.1234", "-0.1234", "1234e-1", "1234.5e-1", "1234.5e+2",
+ };
+ const double doubles_compare[] = {
+ 1.0, -1.1, 123400.0, 1234.0, 0.1234, -0.1234, 123.4, 123.45, 123450.0,
+ };
+
+ for (i = 0; i < PA_ELEMENTSOF(doubles_parse); i++) {
+ o = pa_json_parse(doubles_parse[i]);
+
+ fail_unless(o != NULL);
+ fail_unless(pa_json_object_get_type(o) == PA_JSON_TYPE_DOUBLE);
+ fail_unless(PA_DOUBLE_IS_EQUAL(pa_json_object_get_double(o), doubles_compare[i]));
+
+ pa_json_object_free(o);
+ }
+}
+END_TEST
+
+START_TEST(null_test) {
+ pa_json_object *o;
+
+ o = pa_json_parse("null");
+
+ fail_unless(o != NULL);
+ fail_unless(pa_json_object_get_type(o) == PA_JSON_TYPE_NULL);
+
+ pa_json_object_free(o);
+}
+END_TEST
+
+START_TEST(bool_test) {
+ pa_json_object *o;
+
+ o = pa_json_parse("true");
+
+ fail_unless(o != NULL);
+ fail_unless(pa_json_object_get_type(o) == PA_JSON_TYPE_BOOL);
+ fail_unless(pa_json_object_get_bool(o) == true);
+
+ pa_json_object_free(o);
+
+ o = pa_json_parse("false");
+
+ fail_unless(o != NULL);
+ fail_unless(pa_json_object_get_type(o) == PA_JSON_TYPE_BOOL);
+ fail_unless(pa_json_object_get_bool(o) == false);
+
+ pa_json_object_free(o);
+}
+END_TEST
+
+START_TEST(object_test) {
+ pa_json_object *o;
+ const pa_json_object *v;
+
+ o = pa_json_parse(" { \"name\" : \"A Person\" } ");
+
+ fail_unless(o != NULL);
+ fail_unless(pa_json_object_get_type(o) == PA_JSON_TYPE_OBJECT);
+
+ v = pa_json_object_get_object_member(o, "name");
+ fail_unless(v != NULL);
+ fail_unless(pa_json_object_get_type(v) == PA_JSON_TYPE_STRING);
+ fail_unless(pa_streq(pa_json_object_get_string(v), "A Person"));
+
+ pa_json_object_free(o);
+
+ o = pa_json_parse(" { \"age\" : -45.3e-0 } ");
+
+ fail_unless(o != NULL);
+ fail_unless(pa_json_object_get_type(o) == PA_JSON_TYPE_OBJECT);
+
+ v = pa_json_object_get_object_member(o, "age");
+ fail_unless(v != NULL);
+ fail_unless(pa_json_object_get_type(v) == PA_JSON_TYPE_DOUBLE);
+ fail_unless(PA_DOUBLE_IS_EQUAL(pa_json_object_get_double(v), -45.3));
+
+ pa_json_object_free(o);
+
+ o = pa_json_parse("{\"person\":true}");
+
+ fail_unless(o != NULL);
+ fail_unless(pa_json_object_get_type(o) == PA_JSON_TYPE_OBJECT);
+
+ v = pa_json_object_get_object_member(o, "person");
+ fail_unless(v != NULL);
+ fail_unless(pa_json_object_get_type(v) == PA_JSON_TYPE_BOOL);
+ fail_unless(pa_json_object_get_bool(v) == true);
+
+ pa_json_object_free(o);
+
+ o = pa_json_parse("{ \"parent\": { \"child\": false } }");
+ fail_unless(o != NULL);
+ fail_unless(pa_json_object_get_type(o) == PA_JSON_TYPE_OBJECT);
+
+ v = pa_json_object_get_object_member(o, "parent");
+ fail_unless(v != NULL);
+ fail_unless(pa_json_object_get_type(v) == PA_JSON_TYPE_OBJECT);
+ v = pa_json_object_get_object_member(v, "child");
+ fail_unless(pa_json_object_get_type(v) == PA_JSON_TYPE_BOOL);
+ fail_unless(pa_json_object_get_bool(v) == false);
+
+ pa_json_object_free(o);
+}
+END_TEST
+
+START_TEST(array_test) {
+ pa_json_object *o;
+ const pa_json_object *v, *v2;
+
+ o = pa_json_parse(" [ ] ");
+
+ fail_unless(o != NULL);
+ fail_unless(pa_json_object_get_type(o) == PA_JSON_TYPE_ARRAY);
+ fail_unless(pa_json_object_get_array_length(o) == 0);
+
+ pa_json_object_free(o);
+
+ o = pa_json_parse("[\"a member\"]");
+
+ fail_unless(o != NULL);
+ fail_unless(pa_json_object_get_type(o) == PA_JSON_TYPE_ARRAY);
+ fail_unless(pa_json_object_get_array_length(o) == 1);
+
+ v = pa_json_object_get_array_member(o, 0);
+ fail_unless(v != NULL);
+ fail_unless(pa_json_object_get_type(v) == PA_JSON_TYPE_STRING);
+ fail_unless(pa_streq(pa_json_object_get_string(v), "a member"));
+
+ pa_json_object_free(o);
+
+ o = pa_json_parse("[\"a member\", 1234.5, { \"another\": true } ]");
+
+ fail_unless(o != NULL);
+ fail_unless(pa_json_object_get_type(o) == PA_JSON_TYPE_ARRAY);
+ fail_unless(pa_json_object_get_array_length(o) == 3);
+
+ v = pa_json_object_get_array_member(o, 0);
+ fail_unless(v != NULL);
+ fail_unless(pa_json_object_get_type(v) == PA_JSON_TYPE_STRING);
+ fail_unless(pa_streq(pa_json_object_get_string(v), "a member"));
+ v = pa_json_object_get_array_member(o, 1);
+ fail_unless(v != NULL);
+ fail_unless(pa_json_object_get_type(v) == PA_JSON_TYPE_DOUBLE);
+ fail_unless(PA_DOUBLE_IS_EQUAL(pa_json_object_get_double(v), 1234.5));
+ v = pa_json_object_get_array_member(o, 2);
+ fail_unless(v != NULL);
+ fail_unless(pa_json_object_get_type(v) == PA_JSON_TYPE_OBJECT);
+ v2 =pa_json_object_get_object_member(v, "another");
+ fail_unless(v2 != NULL);
+ fail_unless(pa_json_object_get_type(v2) == PA_JSON_TYPE_BOOL);
+ fail_unless(pa_json_object_get_bool(v2) == true);
+
+ pa_json_object_free(o);
+}
+END_TEST
+
+START_TEST(bad_test) {
+ unsigned int i;
+ const char *bad_parse[] = {
+ "\"" /* Quote not closed */,
+ "123456789012345678901234567890" /* Overflow */,
+ "0.123456789012345678901234567890" /* Overflow */,
+ "1e123456789012345678901234567890" /* Overflow */,
+ "1e" /* Bad number string */,
+ "1." /* Bad number string */,
+ "1.e3" /* Bad number string */,
+ "-" /* Bad number string */,
+ "{ \"a\": { \"a\": { \"a\": { \"a\": { \"a\": { \"a\": { \"a\": { \"a\": { \"a\": { \"a\": { \"a\": { \"a\": { \"a\": { \"a\": { \"a\": { \"a\": { \"a\": { \"a\": { \"a\": { \"a\": { \"a\": { } } } } } } } } } } } } } } } } } } } } } }" /* Nested too deep */,
+ "[ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ { \"a\": \"b\" } ] ] ] ] ] ] ] ] ] ] ] ] ] ] ] ] ] ] ] ]" /* Nested too deep */,
+ "asdf" /* Unquoted string */,
+ "{ a: true }" /* Unquoted key in object */,
+ "\" \a\"" /* Alarm is not a valid character */
+ };
+
+ for (i = 0; i < PA_ELEMENTSOF(bad_parse); i++) {
+ fail_unless(pa_json_parse(bad_parse[i]) == NULL);
+ }
+}
+END_TEST
+
+int main(int argc, char *argv[]) {
+ int failed = 0;
+ Suite *s;
+ TCase *tc;
+ SRunner *sr;
+
+ s = suite_create("JSON");
+ tc = tcase_create("json");
+ tcase_add_test(tc, string_test);
+ tcase_add_test(tc, int_test);
+ tcase_add_test(tc, double_test);
+ tcase_add_test(tc, null_test);
+ tcase_add_test(tc, bool_test);
+ tcase_add_test(tc, object_test);
+ tcase_add_test(tc, array_test);
+ tcase_add_test(tc, bad_test);
+ suite_add_tcase(s, tc);
+
+ sr = srunner_create(s);
+ srunner_run_all(sr, CK_NORMAL);
+ failed = srunner_ntests_failed(sr);
+ srunner_free(sr);
+
+ return (failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/src/tests/lfe-filter-test.c b/src/tests/lfe-filter-test.c
index ba63895..d779e05 100644
--- a/src/tests/lfe-filter-test.c
+++ b/src/tests/lfe-filter-test.c
@@ -70,7 +70,7 @@ static int compare_data_block(struct lfe_filter_test *lft, void *a, void *b) {
for (i = 0; i < ONE_BLOCK_SAMPLES; i++) {
if (abs(*r++ - *u++) > TOLERANT_VARIATION) {
- pa_log_error("lfe-filter-test: test failed, the output data in the position 0x%x of a block does not equal!\n", i);
+ pa_log_error("lfe-filter-test: test failed, the output data in the position 0x%x of a block does not equal!", i);
ret = -1;
break;
}
@@ -88,7 +88,7 @@ static int lfe_filter_rewind_test(struct lfe_filter_test *lft, int rewind_sample
uint32_t fz = pa_frame_size(lft->ss);
if (rewind_samples > TOTAL_SAMPLES || rewind_samples < TOTAL_SAMPLES - ONE_BLOCK_SAMPLES) {
- pa_log_error("lfe-filter-test: Please keep %d samples < rewind_samples < %d samples\n", TOTAL_SAMPLES - ONE_BLOCK_SAMPLES, TOTAL_SAMPLES);
+ pa_log_error("lfe-filter-test: Please keep %d samples < rewind_samples < %d samples", TOTAL_SAMPLES - ONE_BLOCK_SAMPLES, TOTAL_SAMPLES);
return ret;
}
diff --git a/src/tests/lo-test-util.c b/src/tests/lo-test-util.c
index 2ff8cf8..fae91a2 100644
--- a/src/tests/lo-test-util.c
+++ b/src/tests/lo-test-util.c
@@ -38,11 +38,11 @@ static void nop_free_cb(void *p) {
}
static void underflow_cb(struct pa_stream *s, void *userdata) {
- pa_log_warn("Underflow\n");
+ pa_log_warn("Underflow");
}
static void overflow_cb(struct pa_stream *s, void *userdata) {
- pa_log_warn("Overlow\n");
+ pa_log_warn("Overlow");
}
/*
@@ -114,7 +114,7 @@ static void calibrate_read_cb(pa_stream *s, size_t nbytes, void *userdata) {
v += 0.02f;
if (v > 1.0) {
- pa_log_error("Capture signal too weak at 100%% volume (%g). Giving up.\n", pa_rms(in, nsamp));
+ pa_log_error("Capture signal too weak at 100%% volume (%g). Giving up.", pa_rms(in, nsamp));
pa_assert_not_reached();
}
@@ -126,7 +126,7 @@ static void calibrate_read_cb(pa_stream *s, size_t nbytes, void *userdata) {
/* Make sure the signal strength is steadily above our threshold */
if (++confirm > 5) {
#if 0
- pa_log_debug(stderr, "Capture volume = %g (%g)\n", v, pa_rms(in, nsamp));
+ pa_log_debug(stderr, "Capture volume = %g (%g)", v, pa_rms(in, nsamp));
#endif
cal_state = CALIBRATION_ZERO;
}
@@ -138,7 +138,7 @@ static void calibrate_read_cb(pa_stream *s, size_t nbytes, void *userdata) {
/* Now make sure silence doesn't trigger a false positive because
* of noise. */
if (pa_rms(in, nsamp) > 0.1f) {
- fprintf(stderr, "Too much noise on capture (%g). Giving up.\n", pa_rms(in, nsamp));
+ pa_log_warn("Too much noise on capture (%g). Giving up.", pa_rms(in, nsamp));
pa_assert_not_reached();
}
@@ -179,7 +179,7 @@ static void stream_state_callback(pa_stream *s, void *userdata) {
}
if (!o) {
- pa_log_error("Could not set stream volume: %s\n", pa_strerror(pa_context_errno(ctx->context)));
+ pa_log_error("Could not set stream volume: %s", pa_strerror(pa_context_errno(ctx->context)));
pa_assert_not_reached();
} else
pa_operation_unref(o);
@@ -189,7 +189,7 @@ static void stream_state_callback(pa_stream *s, void *userdata) {
case PA_STREAM_FAILED:
default:
- pa_log_error("Stream error: %s\n", pa_strerror(pa_context_errno(ctx->context)));
+ pa_log_error("Stream error: %s", pa_strerror(pa_context_errno(ctx->context)));
pa_assert_not_reached();
}
}
@@ -252,7 +252,7 @@ static void context_state_callback(pa_context *c, void *userdata) {
case PA_CONTEXT_FAILED:
default:
- pa_log_error("Context error: %s\n", pa_strerror(pa_context_errno(c)));
+ pa_log_error("Context error: %s", pa_strerror(pa_context_errno(c)));
pa_assert_not_reached();
}
}
@@ -271,7 +271,7 @@ int pa_lo_test_init(pa_lo_test_context *ctx) {
/* Connect the context */
if (pa_context_connect(ctx->context, NULL, PA_CONTEXT_NOFLAGS, NULL) < 0) {
- pa_log_error("pa_context_connect() failed.\n");
+ pa_log_error("pa_context_connect() failed.");
goto quit;
}
@@ -288,7 +288,7 @@ int pa_lo_test_run(pa_lo_test_context *ctx) {
int ret;
if (pa_mainloop_run(ctx->mainloop, &ret) < 0) {
- pa_log_error("pa_mainloop_run() failed.\n");
+ pa_log_error("pa_mainloop_run() failed.");
return -1;
}
diff --git a/src/tests/memblockq-test.c b/src/tests/memblockq-test.c
index 2404ee2..2a9b88a 100644
--- a/src/tests/memblockq-test.c
+++ b/src/tests/memblockq-test.c
@@ -42,6 +42,23 @@ static const char *manual[] = {
"__________________3333______________________________"
};
+/*
+ * utility function to create a memchunk
+ */
+static pa_memchunk memchunk_from_str(pa_mempool *p, const char* data)
+{
+ pa_memchunk res;
+ size_t size = strlen(data);
+
+ res.memblock = pa_memblock_new_fixed(p, (void*)data, size, true);
+ ck_assert_ptr_ne(res.memblock, NULL);
+
+ res.index = 0;
+ res.length = pa_memblock_get_length(res.memblock);
+
+ return res;
+}
+
static void dump_chunk(const pa_memchunk *chunk, pa_strbuf *buf) {
size_t n;
void *q;
@@ -93,55 +110,156 @@ static void dump(pa_memblockq *bq, int n) {
fprintf(stderr, "<\n");
}
-START_TEST (memblockq_test) {
- int ret;
+/*
+ * utility function to validate invariants
+ *
+ * The different values like base, maxlength etc follow certain rules.
+ * This convenience function makes sure that changes don't violate
+ * these rules.
+ */
+static void check_queue_invariants(pa_memblockq *bq) {
+ size_t base = pa_memblockq_get_base(bq);
+ size_t maxlength = pa_memblockq_get_maxlength(bq);
+ size_t tlength = pa_memblockq_get_tlength(bq);
+ size_t minreq = pa_memblockq_get_minreq(bq);
+ size_t prebuf = pa_memblockq_get_prebuf(bq);
+ size_t length = pa_memblockq_get_length(bq);
+
+ /* base > zero */
+ ck_assert_int_gt(base, 0);
+
+ /* maxlength multiple of base
+ * maxlength >= base */
+ ck_assert_int_eq(maxlength % base, 0);
+ ck_assert_int_ge(maxlength, base);
+
+ /* tlength multiple of base
+ * tlength >= base
+ * tlength <= maxlength */
+ ck_assert_int_eq(tlength % base, 0);
+ ck_assert_int_ge(tlength, base);
+ ck_assert_int_le(tlength, maxlength);
+
+ /* minreq multiple of base
+ * minreq >= base
+ * minreq <= tlength */
+ ck_assert_int_eq(minreq % base, 0);
+ ck_assert_int_ge(minreq, base);
+ ck_assert_int_le(minreq, tlength);
+
+ /* prebuf multiple of base
+ * prebuf >= 0
+ * prebuf <= tlength + base - minreq
+ * prebuf <= tlength (because minreq >= base) */
+ ck_assert_int_eq(prebuf % base, 0);
+ ck_assert_int_ge(prebuf, 0);
+ ck_assert_int_le(prebuf, tlength + base - minreq);
+ ck_assert_int_le(prebuf, tlength);
+
+ /* length >= 0
+ * length <= maxlength */
+ ck_assert_int_ge(length, 0);
+ ck_assert_int_le(length, maxlength);
+}
+
+START_TEST (memchunk_from_str_test) {
+ pa_mempool *p;
+ pa_memchunk chunk;
+ p = pa_mempool_new(PA_MEM_TYPE_PRIVATE, 0, true);
+ ck_assert_ptr_ne(p, NULL);
+
+ /* allocate memchunk and check default settings */
+ chunk = memchunk_from_str(p, "abcd");
+ ck_assert_ptr_ne(chunk.memblock, NULL);
+ ck_assert_int_eq(chunk.index, 0);
+ ck_assert_int_eq(chunk.length, 4);
+
+ /* cleanup */
+ pa_memblock_unref(chunk.memblock);
+ pa_mempool_unref(p);
+}
+END_TEST
+
+START_TEST (memblockq_test_initial_properties) {
pa_mempool *p;
pa_memblockq *bq;
- pa_memchunk chunk1, chunk2, chunk3, chunk4;
pa_memchunk silence;
pa_sample_spec ss = {
- .format = PA_SAMPLE_S16LE,
+ .format = PA_SAMPLE_S32BE,
.rate = 48000,
.channels = 1
};
-
- pa_log_set_level(PA_LOG_DEBUG);
+ int64_t idx = 0;
+ size_t maxlength = 100;
+ size_t tlength = 20;
+ size_t prebuf = 16;
+ size_t minreq = 8;
+ size_t maxrewind = 40;
p = pa_mempool_new(PA_MEM_TYPE_PRIVATE, 0, true);
+ ck_assert_ptr_ne(p, NULL);
- silence.memblock = pa_memblock_new_fixed(p, (char*) "__", 2, 1);
- fail_unless(silence.memblock != NULL);
-
- silence.index = 0;
- silence.length = pa_memblock_get_length(silence.memblock);
+ silence = memchunk_from_str(p, "__");
- bq = pa_memblockq_new("test memblockq", 0, 200, 10, &ss, 4, 4, 40, &silence);
+ bq = pa_memblockq_new("test memblockq", idx, maxlength, tlength, &ss, prebuf, minreq, maxrewind, &silence);
fail_unless(bq != NULL);
- chunk1.memblock = pa_memblock_new_fixed(p, (char*) "11", 2, 1);
- fail_unless(chunk1.memblock != NULL);
-
- chunk1.index = 0;
- chunk1.length = 2;
+ /* check initial properties */
+ ck_assert_int_eq(pa_memblockq_is_readable(bq), false);
+ ck_assert_int_eq(pa_memblockq_get_length(bq), 0);
+ ck_assert_int_eq(pa_memblockq_get_maxlength(bq), maxlength);
+ ck_assert_int_eq(pa_memblockq_get_tlength(bq), tlength);
+ ck_assert_int_eq(pa_memblockq_get_prebuf(bq), prebuf);
+ ck_assert_int_eq(pa_memblockq_get_minreq(bq), minreq);
+ ck_assert_int_eq(pa_memblockq_get_maxrewind(bq), maxrewind);
+ ck_assert_int_eq(pa_memblockq_get_base(bq), pa_frame_size(&ss));
+ ck_assert_int_eq(pa_memblockq_get_read_index(bq), 0);
+ ck_assert_int_eq(pa_memblockq_get_write_index(bq), 0);
+
+ check_queue_invariants(bq);
+
+ /* Check reporting of missing bytes:
+ * Initially, tlength bytes are missing. The second call doesn't
+ * report additional missing data since the first call. */
+ ck_assert_int_eq(pa_memblockq_pop_missing(bq), tlength);
+ ck_assert_int_eq(pa_memblockq_pop_missing(bq), 0);
+
+ /* cleanup */
+ pa_memblockq_free(bq);
+ pa_memblock_unref(silence.memblock);
+ pa_mempool_unref(p);
+}
+END_TEST
- chunk2.memblock = pa_memblock_new_fixed(p, (char*) "XX22", 4, 1);
- fail_unless(chunk2.memblock != NULL);
+START_TEST (memblockq_test) {
+ int ret;
- chunk2.index = 2;
- chunk2.length = 2;
+ pa_mempool *p;
+ pa_memblockq *bq;
+ pa_memchunk chunk1, chunk2, chunk3, chunk4;
+ pa_memchunk silence;
+ pa_sample_spec ss = {
+ .format = PA_SAMPLE_S16LE,
+ .rate = 48000,
+ .channels = 1
+ };
- chunk3.memblock = pa_memblock_new_fixed(p, (char*) "3333", 4, 1);
- fail_unless(chunk3.memblock != NULL);
+ p = pa_mempool_new(PA_MEM_TYPE_PRIVATE, 0, true);
+ ck_assert_ptr_ne(p, NULL);
- chunk3.index = 0;
- chunk3.length = 4;
+ silence = memchunk_from_str(p, "__");
- chunk4.memblock = pa_memblock_new_fixed(p, (char*) "44444444", 8, 1);
- fail_unless(chunk4.memblock != NULL);
+ bq = pa_memblockq_new("test memblockq", 0, 200, 10, &ss, 4, 4, 40, &silence);
+ fail_unless(bq != NULL);
+ check_queue_invariants(bq);
- chunk4.index = 0;
- chunk4.length = 8;
+ chunk1 = memchunk_from_str(p, "11");
+ chunk2 = memchunk_from_str(p, "XX22");
+ chunk2.index += 2;
+ chunk2.length -= 2;
+ chunk3 = memchunk_from_str(p, "3333");
+ chunk4 = memchunk_from_str(p, "44444444");
ret = pa_memblockq_push(bq, &chunk1);
fail_unless(ret == 0);
@@ -155,6 +273,8 @@ START_TEST (memblockq_test) {
ret = pa_memblockq_push(bq, &chunk4);
fail_unless(ret == 0);
+ check_queue_invariants(bq);
+
pa_memblockq_seek(bq, -6, 0, true);
ret = pa_memblockq_push(bq, &chunk3);
fail_unless(ret == 0);
@@ -201,6 +321,8 @@ START_TEST (memblockq_test) {
dump(bq, 1);
+ check_queue_invariants(bq);
+
pa_memblockq_free(bq);
pa_memblock_unref(silence.memblock);
pa_memblock_unref(chunk1.memblock);
@@ -212,15 +334,322 @@ START_TEST (memblockq_test) {
}
END_TEST
+START_TEST (memblockq_test_length_changes) {
+ pa_mempool *p;
+ pa_memblockq *bq;
+ pa_memchunk silence, data;
+ pa_sample_spec ss = {
+ .format = PA_SAMPLE_S32BE,
+ .rate = 48000,
+ .channels = 1
+ };
+ int64_t idx = 0;
+ size_t maxlength = 60;
+ size_t tlength = 40;
+ size_t prebuf = 16;
+ size_t minreq = 20;
+ size_t maxrewind = 40;
+
+ p = pa_mempool_new(PA_MEM_TYPE_PRIVATE, 0, true);
+ ck_assert_ptr_ne(p, NULL);
+
+ silence = memchunk_from_str(p, "____");
+
+ bq = pa_memblockq_new("test memblockq", idx, maxlength, tlength, &ss, prebuf, minreq, maxrewind, &silence);
+ fail_unless(bq != NULL);
+
+ data = memchunk_from_str(p, "12345678");
+
+ /* insert some data */
+ ck_assert_int_eq(pa_memblockq_push(bq, &data), 0);
+ ck_assert_int_eq(pa_memblockq_push(bq, &data), 0);
+ ck_assert_int_eq(pa_memblockq_push(bq, &data), 0);
+ ck_assert_int_eq(pa_memblockq_push(bq, &data), 0);
+
+ /* check state */
+ ck_assert_int_eq(pa_memblockq_get_length(bq), 32);
+
+ /* adjust maximum length
+ * This might modify tlength, prebuf, minreq, too. */
+ pa_memblockq_set_maxlength(bq, maxlength/2);
+ check_queue_invariants(bq);
+
+ /* adjust target length
+ * This might modify minreq, too. */
+ pa_memblockq_set_tlength(bq, tlength/2);
+ check_queue_invariants(bq);
+
+ /* adjust minimum requested length
+ * This might modify prebuf, too. */
+ pa_memblockq_set_minreq(bq, minreq/2);
+ check_queue_invariants(bq);
+
+ /* adjust prebuffer length */
+ pa_memblockq_set_prebuf(bq, prebuf/2);
+ check_queue_invariants(bq);
+
+ /* cleanup */
+ pa_memblockq_free(bq);
+ pa_memblock_unref(silence.memblock);
+ pa_memblock_unref(data.memblock);
+ pa_mempool_unref(p);
+}
+END_TEST
+
+START_TEST (memblockq_test_pop_missing) {
+ pa_mempool *p;
+ pa_memblockq *bq;
+ pa_memchunk silence, data, chunk;
+ pa_sample_spec ss = {
+ .format = PA_SAMPLE_S16BE,
+ .rate = 48000,
+ .channels = 1
+ };
+ int64_t idx = 0;
+ size_t maxlength = 200;
+ size_t tlength = 100;
+ size_t prebuf = 0;
+ size_t minreq = 80;
+ size_t maxrewind = 0;
+
+ p = pa_mempool_new(PA_MEM_TYPE_PRIVATE, 0, true);
+ ck_assert_ptr_ne(p, NULL);
+
+ silence = memchunk_from_str(p, "____");
+ data = memchunk_from_str(p, "1234567890");
+
+ bq = pa_memblockq_new("test memblockq", idx, maxlength, tlength, &ss, prebuf, minreq, maxrewind, &silence);
+ fail_unless(bq != NULL);
+
+ /* The following equation regarding the internal variables of a memblockq
+ * is always true:
+ *
+ * length + missing + requested = tlength
+ *
+ * "length" is the current memblockq length (write index minus read index)
+ * and "tlength" is the target length. The intuitive meaning of "missing"
+ * would be the difference between tlength and length, but actually
+ * "missing" and "requested" together constitute the amount that is missing
+ * from the queue. Writing to the queue decrements "requested" and reading
+ * from the queue increments "missing". pa_memblockq_pop_missing() resets
+ * "missing" to zero, returns the old "missing" value and adds the
+ * equivalent amount to "requested".
+ *
+ * This test has comments between each step documenting the assumed state
+ * of those internal variables. */
+
+ /* length + missing + requested = tlength
+ * 0 + 100 + 0 = 100 */
+
+ ck_assert_int_eq(pa_memblockq_pop_missing(bq), tlength);
+
+ /* length + missing + requested = tlength
+ * 0 + 0 + 100 = 100 */
+
+ for (int i = 0; i != 2; ++i)
+ ck_assert_int_eq(pa_memblockq_push(bq, &data), 0);
+ check_queue_invariants(bq);
+
+ /* length + missing + requested = tlength
+ * 20 + 0 + 80 = 100 */
+
+ ck_assert_int_eq(pa_memblockq_pop_missing(bq), 0);
+
+ /* length + missing + requested = tlength
+ * 20 + 0 + 80 = 100 */
+
+ for (int i = 0; i != 8; ++i)
+ ck_assert_int_eq(pa_memblockq_push(bq, &data), 0);
+ check_queue_invariants(bq);
+
+ /* length + missing + requested = tlength
+ * 100 + 0 + 0 = 100 */
+
+ ck_assert_int_eq(pa_memblockq_pop_missing(bq), 0);
+
+ /* length + missing + requested = tlength
+ * 100 + 0 + 0 = 100 */
+
+ ck_assert_int_eq(pa_memblockq_peek_fixed_size(bq, 40, &chunk), 0);
+ pa_memblockq_drop(bq, 40);
+ ck_assert_int_eq(chunk.length - chunk.index, 40);
+ pa_memblock_unref(chunk.memblock);
+ check_queue_invariants(bq);
+
+ /* length + missing + requested = tlength
+ * 60 + 40 + 0 = 100 */
+
+ /* 40 bytes are missing, but that's less than minreq, so 0 is reported */
+ ck_assert_int_eq(pa_memblockq_pop_missing(bq), 0);
+
+ /* length + missing + requested = tlength
+ * 60 + 40 + 0 = 100 */
+
+ /* Now we push 30 bytes even though it was not requested, so the requested
+ * counter goes negative! */
+ for (int i = 0; i != 3; ++i)
+ ck_assert_int_eq(pa_memblockq_push(bq, &data), 0);
+ check_queue_invariants(bq);
+
+ /* length + missing + requested = tlength
+ * 90 + 40 + -30 = 100 */
+
+ /* missing < minreq, so nothing is reported missing. */
+ ck_assert_int_eq(pa_memblockq_pop_missing(bq), 0);
+
+ /* length + missing + requested = tlength
+ * 90 + 40 + -30 = 100 */
+
+ ck_assert_int_eq(pa_memblockq_peek_fixed_size(bq, 20, &chunk), 0);
+ pa_memblockq_drop(bq, 20);
+ ck_assert_int_eq(chunk.length - chunk.index, 20);
+ pa_memblock_unref(chunk.memblock);
+ check_queue_invariants(bq);
+
+ /* length + missing + requested = tlength
+ * 70 + 60 + -30 = 100 */
+
+ /* missing < minreq, so nothing is reported missing. */
+ ck_assert_int_eq(pa_memblockq_pop_missing(bq), 0);
+
+ /* length + missing + requested = tlength
+ * 70 + 60 + -30 = 100 */
+
+ /* We push more data again even though it was not requested, so the
+ * requested counter goes further into the negative range. */
+ for (int i = 0; i != 5; ++i)
+ ck_assert_int_eq(pa_memblockq_push(bq, &data), 0);
+ check_queue_invariants(bq);
+
+ /* length + missing + requested = tlength
+ * 120 + 60 + -80 = 100 */
+
+ /* missing < minreq, so nothing is reported missing. */
+ ck_assert_int_eq(pa_memblockq_pop_missing(bq), 0);
+
+ /* length + missing + requested = tlength
+ * 120 + 60 + -80 = 100 */
+
+ ck_assert_int_eq(pa_memblockq_peek_fixed_size(bq, 20, &chunk), 0);
+ pa_memblockq_drop(bq, 20);
+ ck_assert_int_eq(chunk.length - chunk.index, 20);
+ pa_memblock_unref(chunk.memblock);
+ check_queue_invariants(bq);
+
+ /* length + missing + requested = tlength
+ * 100 + 80 + -80 = 100 */
+
+ /* missing has now reached the minreq threshold */
+ ck_assert_int_eq(pa_memblockq_pop_missing(bq), 80);
+
+ /* length + missing + requested = tlength
+ * 100 + 0 + 0 = 100 */
+
+ /* cleanup */
+ pa_memblockq_free(bq);
+ pa_memblock_unref(silence.memblock);
+ pa_memblock_unref(data.memblock);
+ pa_mempool_unref(p);
+}
+END_TEST
+
+START_TEST (memblockq_test_tlength_change) {
+ int ret;
+ size_t missing;
+
+ pa_mempool *p;
+ pa_memblockq *bq;
+ pa_memchunk chunk;
+ char buffer[2048];
+ pa_sample_spec ss = {
+ .format = PA_SAMPLE_S16LE,
+ .rate = 48000,
+ .channels = 1
+ };
+
+ pa_log_set_level(PA_LOG_DEBUG);
+
+ bq = pa_memblockq_new("test memblockq", 0, 4096, 2048, &ss, 0, 512, 512, NULL);
+ fail_unless(bq != NULL);
+
+ /* Empty buffer, so expect tlength */
+ missing = pa_memblockq_pop_missing(bq);
+ fail_unless(missing == 2048);
+
+ /* Everything requested, so should be satisfied */
+ missing = pa_memblockq_pop_missing(bq);
+ fail_unless(missing == 0);
+
+ p = pa_mempool_new(PA_MEM_TYPE_PRIVATE, 0, true);
+
+ chunk.memblock = pa_memblock_new_fixed(p, buffer, sizeof(buffer), 1);
+ fail_unless(chunk.memblock != NULL);
+
+ chunk.index = 0;
+ chunk.length = sizeof(buffer);
+
+ /* Fill buffer (i.e. satisfy earlier request) */
+ ret = pa_memblockq_push(bq, &chunk);
+ fail_unless(ret == 0);
+
+ /* Should still be happy */
+ missing = pa_memblockq_pop_missing(bq);
+ fail_unless(missing == 0);
+
+ /* Check that we don't request less than minreq */
+ pa_memblockq_drop(bq, 400);
+ missing = pa_memblockq_pop_missing(bq);
+ ck_assert_int_eq(missing, 0);
+
+ missing = pa_memblockq_pop_missing(bq);
+ fail_unless(missing == 0);
+
+ /* Reduce tlength under what's dropped and under previous minreq */
+ pa_memblockq_set_tlength(bq, 256);
+ pa_memblockq_set_minreq(bq, 64);
+
+ /* We are now overbuffered and should not request more */
+ missing = pa_memblockq_pop_missing(bq);
+ fail_unless(missing == 0);
+
+ /* Drop more data so we are below tlength again, but just barely */
+ pa_memblockq_drop(bq, 1400);
+
+ /* Should still honour minreq */
+ missing = pa_memblockq_pop_missing(bq);
+ fail_unless(missing == 0);
+
+ /* Finally drop enough to fall below minreq */
+ pa_memblockq_drop(bq, 80);
+
+ /* And expect a request */
+ missing = pa_memblockq_pop_missing(bq);
+ fail_unless(missing == 88);
+
+ pa_memblockq_free(bq);
+ pa_memblock_unref(chunk.memblock);
+ pa_mempool_unref(p);
+}
+END_TEST
+
+
int main(int argc, char *argv[]) {
int failed = 0;
Suite *s;
TCase *tc;
SRunner *sr;
+ if (!getenv("MAKE_CHECK"))
+ pa_log_set_level(PA_LOG_DEBUG);
+
s = suite_create("Memblock Queue");
tc = tcase_create("memblockq");
+ tcase_add_test(tc, memchunk_from_str_test);
+ tcase_add_test(tc, memblockq_test_initial_properties);
tcase_add_test(tc, memblockq_test);
+ tcase_add_test(tc, memblockq_test_length_changes);
+ tcase_add_test(tc, memblockq_test_pop_missing);
+ tcase_add_test(tc, memblockq_test_tlength_change);
suite_add_tcase(s, tc);
sr = srunner_create(s);
diff --git a/src/tests/mix-test.c b/src/tests/mix-test.c
index 972f5d7..d9255e3 100644
--- a/src/tests/mix-test.c
+++ b/src/tests/mix-test.c
@@ -299,7 +299,7 @@ START_TEST (mix_test) {
pa_mix_info m[2];
void *ptr;
- pa_log_debug("=== mixing: %s\n", pa_sample_format_to_string(a.format));
+ pa_log_debug("=== mixing: %s", pa_sample_format_to_string(a.format));
/* Generate block */
i.memblock = generate_block(pool, &a);
diff --git a/src/tests/remix-test.c b/src/tests/remix-test.c
index e21c109..1e58418 100644
--- a/src/tests/remix-test.c
+++ b/src/tests/remix-test.c
@@ -59,7 +59,7 @@ int main(int argc, char *argv[]) {
pa_resampler *r;
pa_sample_spec ss1, ss2;
- pa_log_info("Converting from '%s' to '%s'.\n", pa_channel_map_snprint(a, sizeof(a), &maps[i]), pa_channel_map_snprint(b, sizeof(b), &maps[j]));
+ pa_log_info("Converting from '%s' to '%s'.", pa_channel_map_snprint(a, sizeof(a), &maps[i]), pa_channel_map_snprint(b, sizeof(b), &maps[j]));
ss1.channels = maps[i].channels;
ss2.channels = maps[j].channels;
diff --git a/src/tests/rtpoll-test.c b/src/tests/rtpoll-test.c
index 7db7177..24c6619 100644
--- a/src/tests/rtpoll-test.c
+++ b/src/tests/rtpoll-test.c
@@ -60,7 +60,7 @@ START_TEST (rtpoll_test) {
pa_rtpoll_set_timer_relative(p, 10000000); /* 10 s */
- pa_rtpoll_run(p);
+ fail_unless(pa_rtpoll_run(p) >= 0);
pa_rtpoll_item_free(i);
@@ -72,7 +72,7 @@ START_TEST (rtpoll_test) {
pollfd->fd = 0;
pollfd->events = POLLIN;
- pa_rtpoll_run(p);
+ fail_unless(pa_rtpoll_run(p) >= 0);
pa_rtpoll_item_free(i);
diff --git a/src/tests/sigbus-test.c b/src/tests/sigbus-test.c
index 8a660ee..dbfc3d1 100644
--- a/src/tests/sigbus-test.c
+++ b/src/tests/sigbus-test.c
@@ -33,6 +33,7 @@ START_TEST (sigbus_test) {
void *p;
int fd;
pa_memtrap *m;
+ const size_t page_size = pa_page_size();
pa_log_set_level(PA_LOG_DEBUG);
pa_memtrap_install();
@@ -40,14 +41,14 @@ START_TEST (sigbus_test) {
/* Create the memory map */
fail_unless((fd = open("sigbus-test-map", O_RDWR|O_TRUNC|O_CREAT, 0660)) >= 0);
fail_unless(unlink("sigbus-test-map") == 0);
- fail_unless(ftruncate(fd, PA_PAGE_SIZE) >= 0);
- fail_unless((p = mmap(NULL, PA_PAGE_SIZE, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0)) != MAP_FAILED);
+ fail_unless(ftruncate(fd, page_size) >= 0);
+ fail_unless((p = mmap(NULL, page_size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0)) != MAP_FAILED);
/* Register memory map */
- m = pa_memtrap_add(p, PA_PAGE_SIZE);
+ m = pa_memtrap_add(p, page_size);
/* Use memory map */
- pa_snprintf(p, PA_PAGE_SIZE, "This is a test that should work fine.");
+ pa_snprintf(p, page_size, "This is a test that should work fine.");
/* Verify memory map */
pa_log("Let's see if this worked: %s", (char*) p);
@@ -58,7 +59,7 @@ START_TEST (sigbus_test) {
fail_unless(ftruncate(fd, 0) >= 0);
/* Use memory map */
- pa_snprintf(p, PA_PAGE_SIZE, "This is a test that should fail but get caught.");
+ pa_snprintf(p, page_size, "This is a test that should fail but get caught.");
/* Verify memory map */
pa_log("Let's see if this worked: %s", (char*) p);
@@ -66,7 +67,7 @@ START_TEST (sigbus_test) {
fail_unless(pa_memtrap_is_good(m) == false);
pa_memtrap_remove(m);
- munmap(p, PA_PAGE_SIZE);
+ munmap(p, page_size);
close(fd);
}
END_TEST
diff --git a/src/tests/stripnul.c b/src/tests/stripnul.c
index 75390bd..e4b07aa 100644
--- a/src/tests/stripnul.c
+++ b/src/tests/stripnul.c
@@ -26,6 +26,8 @@
#include <pulse/xmalloc.h>
#include <pulsecore/macro.h>
+#define MAX_BUFFER (16*1024)
+
int main(int argc, char *argv[]) {
FILE *i, *o;
size_t granularity;
@@ -34,13 +36,14 @@ int main(int argc, char *argv[]) {
pa_assert_se(argc >= 2);
pa_assert_se((granularity = (size_t) atoi(argv[1])) >= 1);
+ pa_assert(granularity <= MAX_BUFFER);
pa_assert_se((i = (argc >= 3) ? fopen(argv[2], "r") : stdin));
pa_assert_se((o = (argc >= 4) ? fopen(argv[3], "w") : stdout));
zero = pa_xmalloc0(granularity);
for (;;) {
- uint8_t buffer[16*1024], *p;
+ uint8_t buffer[MAX_BUFFER], *p;
size_t k;
k = fread(buffer, granularity, sizeof(buffer)/granularity, i);
diff --git a/src/tests/utf8-test.c b/src/tests/utf8-test.c
index 22a58c0..1e1e777 100644
--- a/src/tests/utf8-test.c
+++ b/src/tests/utf8-test.c
@@ -25,7 +25,7 @@ START_TEST (utf8_filter) {
{
char res1[] = { 0x68, 0x5f, 0x70, 0x66, 0x62, 0x75, 0x72, 0x67, '\0' };
c = pa_utf8_filter("h�pfburg");
- pa_log_debug("%s %s\n", res1, c);
+ pa_log_debug("%s %s", res1, c);
fail_unless(pa_streq(c, res1));
pa_xfree(c);
}
@@ -34,14 +34,14 @@ START_TEST (utf8_filter) {
char res2[] = { 0x68, 0xc3, 0xbc, 0x70, 0x66, 0x62, 0x75, 0x72, 0x67, '\0' };
c = pa_utf8_filter("hüpfburg");
fail_unless(pa_streq(c, res2));
- pa_log_debug("%s %s\n", res2, c);
+ pa_log_debug("%s %s", res2, c);
pa_xfree(c);
}
{
char res3[] = { 0x5f, 0x78, 0x6b, 0x6e, 0x5f, 0x72, 0x7a, 0x6d, 0x5f, 0x72, 0x7a, 0x65, 0x6c, 0x74, 0x5f, 0x72, 0x73, 0x7a, 0xdf, 0xb3, 0x5f, 0x64, 0x73, 0x6a, 0x6b, 0x66, 0x68, '\0' };
c = pa_utf8_filter("�xkn�rzm�rzelt�rsz߳�dsjkfh");
- pa_log_debug("%s %s\n", res3, c);
+ pa_log_debug("%s %s", res3, c);
fail_unless(pa_streq(c, res3));
pa_xfree(c);
}
diff --git a/src/utils/pacat.c b/src/utils/pacat.c
index 2ded613..4e1bbfc 100644
--- a/src/utils/pacat.c
+++ b/src/utils/pacat.c
@@ -56,6 +56,23 @@ static pa_context *context = NULL;
static pa_stream *stream = NULL;
static pa_mainloop_api *mainloop_api = NULL;
+/* Playback Mode (raw):
+ *
+ * We can only write audio to the PA stream in multiples of the stream's
+ * sample-spec frame size. Meanwhile, the STDIN read(2) system call can return
+ * a length much smaller than the frame-aligned size requested - leading to
+ * invalid writes. This can be reproduced by choosing a starved STDIN backend
+ * (e.g. "pacat /dev/random", "echo 1234 | pacat"), or an incomplete WAV file
+ * in raw non-paplay mode.
+ *
+ * Solve this by writing only frame-aligned sizes, while caching the resulting
+ * trailing partial frames here. This partial frame is then directly written
+ * in the next stream write iteration. Rinse and repeat.
+ */
+static void *partialframe_buf = NULL;
+static size_t partialframe_len = 0;
+
+/* Recording Mode buffers */
static void *buffer = NULL;
static size_t buffer_length = 0, buffer_index = 0;
@@ -153,34 +170,6 @@ static void start_drain(void) {
quit(0);
}
-/* Write some data to the stream */
-static void do_stream_write(size_t length) {
- size_t l;
- pa_assert(length);
-
- if (!buffer || !buffer_length)
- return;
-
- l = length;
- if (l > buffer_length)
- l = buffer_length;
-
- if (pa_stream_write(stream, (uint8_t*) buffer + buffer_index, l, NULL, 0, PA_SEEK_RELATIVE) < 0) {
- pa_log(_("pa_stream_write() failed: %s"), pa_strerror(pa_context_errno(context)));
- quit(1);
- return;
- }
-
- buffer_length -= l;
- buffer_index += l;
-
- if (!buffer_length) {
- pa_xfree(buffer);
- buffer = NULL;
- buffer_index = buffer_length = 0;
- }
-}
-
/* This is called whenever new data may be written to the stream */
static void stream_write_callback(pa_stream *s, size_t length, void *userdata) {
pa_assert(s);
@@ -192,11 +181,6 @@ static void stream_write_callback(pa_stream *s, size_t length, void *userdata) {
if (stdio_event)
mainloop_api->io_enable(stdio_event, PA_IO_EVENT_INPUT);
- if (!buffer)
- return;
-
- do_stream_write(length);
-
} else {
sf_count_t bytes;
void *data;
@@ -540,24 +524,34 @@ fail:
/* New data on STDIN **/
static void stdin_callback(pa_mainloop_api*a, pa_io_event *e, int fd, pa_io_event_flags_t f, void *userdata) {
- size_t l, w = 0;
- ssize_t r;
+ uint8_t *buf = NULL;
+ size_t writable, towrite, r;
pa_assert(a == mainloop_api);
pa_assert(e);
pa_assert(stdio_event == e);
- if (buffer) {
+ /* Stream not ready? */
+ if (!stream || pa_stream_get_state(stream) != PA_STREAM_READY ||
+ !(writable = pa_stream_writable_size(stream))) {
+
mainloop_api->io_enable(stdio_event, PA_IO_EVENT_NULL);
return;
}
- if (!stream || pa_stream_get_state(stream) != PA_STREAM_READY || !(l = w = pa_stream_writable_size(stream)))
- l = 4096;
+ if (pa_stream_begin_write(stream, (void **)&buf, &writable) < 0) {
+ pa_log(_("pa_stream_begin_write() failed: %s"), pa_strerror(pa_context_errno(context)));
+ quit(1);
+ return;
+ }
- buffer = pa_xmalloc(l);
+ /* Partial frame cached from a previous write iteration? */
+ if (partialframe_len) {
+ pa_assert(partialframe_len < pa_frame_size(&sample_spec));
+ memcpy(buf, partialframe_buf, partialframe_len);
+ }
- if ((r = pa_read(fd, buffer, l, userdata)) <= 0) {
+ if ((r = pa_read(fd, buf + partialframe_len, writable - partialframe_len, userdata)) <= 0) {
if (r == 0) {
if (verbose)
pa_log(_("Got EOF."));
@@ -573,12 +567,23 @@ static void stdin_callback(pa_mainloop_api*a, pa_io_event *e, int fd, pa_io_even
stdio_event = NULL;
return;
}
+ r += partialframe_len;
+
+ /* Cache any trailing partial frames for the next write */
+ towrite = pa_frame_align(r, &sample_spec);
+ partialframe_len = r - towrite;
- buffer_length = (uint32_t) r;
- buffer_index = 0;
+ if (partialframe_len)
+ memcpy(partialframe_buf, buf + towrite, partialframe_len);
- if (w)
- do_stream_write(w);
+ if (towrite) {
+ if (pa_stream_write(stream, buf, towrite, NULL, 0, PA_SEEK_RELATIVE) < 0) {
+ pa_log(_("pa_stream_write() failed: %s"), pa_strerror(pa_context_errno(context)));
+ quit(1);
+ return;
+ }
+ } else
+ pa_stream_cancel_write(stream);
}
/* Some data may be written to STDOUT */
@@ -1147,6 +1152,9 @@ int main(int argc, char *argv[]) {
}
}
+ if (raw && mode == PLAYBACK)
+ partialframe_buf = pa_xmalloc(pa_frame_size(&sample_spec));
+
/* Set up a new main loop */
if (!(m = pa_mainloop_new())) {
pa_log(_("pa_mainloop_new() failed."));
@@ -1228,6 +1236,7 @@ quit:
pa_xfree(silence_buffer);
pa_xfree(buffer);
+ pa_xfree(partialframe_buf);
pa_xfree(server);
pa_xfree(device);
diff --git a/src/utils/padsp.c b/src/utils/padsp.c
index 943479b..7a94114 100644
--- a/src/utils/padsp.c
+++ b/src/utils/padsp.c
@@ -1768,11 +1768,18 @@ static int dsp_flush_fd(int fd) {
while (l > 0) {
char buf[1024];
size_t k;
+ ssize_t r;
k = (size_t) l > sizeof(buf) ? sizeof(buf) : (size_t) l;
- if (read(fd, buf, k) < 0)
+ r = read(fd, buf, k);
+ if (r < 0) {
+ if (errno == EAGAIN)
+ break;
debug(DEBUG_LEVEL_NORMAL, __FILE__": read(): %s\n", strerror(errno));
- l -= k;
+ return -1;
+ } else if (r == 0)
+ break;
+ l -= r;
}
return 0;
diff --git a/src/utils/qpaeq b/src/utils/qpaeq
index 4b00e3a..ac4b9e4 100755
--- a/src/utils/qpaeq
+++ b/src/utils/qpaeq
@@ -299,7 +299,7 @@ class SliderArray(QtGui.QWidget):
def __init__(self,filter_state,parent=None):
super(SliderArray,self).__init__(parent)
#self.setStyleSheet('padding: 0px; border-width: 0px; margin: 0px;')
- #self.setStyleSheet('font-size: 7pt; font-family: monospace;'+outline%('blue'))
+ #self.setStyleSheet('font-family: monospace;'+outline%('blue'))
self.filter_state=filter_state
self.setLayout(QtGui.QHBoxLayout())
self.sub_array=None
@@ -367,7 +367,7 @@ class SliderArraySub(QtGui.QWidget):
self.slider=[None]*len(self.filter_state.frequencies)
self.label=[None]*len(self.slider)
#self.setStyleSheet('padding: 0px; border-width: 0px; margin: 0px;')
- #self.setStyleSheet('font-size: 7pt; font-family: monospace;'+outline%('blue'))
+ #self.setStyleSheet('font-family: monospace;'+outline%('blue'))
qt=QtCore.Qt
#self.layout().setHorizontalSpacing(1)
def add_slider(slider,label, c):
@@ -385,7 +385,7 @@ class SliderArraySub(QtGui.QWidget):
for i,hz in enumerate(self.filter_state.frequencies):
slider,label=create_slider(self.hz2label(hz))
self.slider[i]=slider
- #slider.setStyleSheet('font-size: 7pt; font-family: monospace;'+outline%('red',))
+ #slider.setStyleSheet('font-family: monospace;'+outline%('red',))
self.label[i]=label
c=i+1
add_slider(slider,label,i+1)
@@ -465,7 +465,7 @@ class SliderLabel(QtGui.QLabel):
clicked=QtCore.pyqtSignal()
def __init__(self,label_text,filter_state,parent=None):
super(SliderLabel,self).__init__(parent)
- self.setStyleSheet('font-size: 7pt; font-family: monospace;')
+ self.setStyleSheet('font-family: monospace;')
self.setText(label_text)
self.setMinimumSize(self.sizeHint())
def mouseDoubleClickEvent(self, event):
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git
More information about the pkg-pulseaudio-devel
mailing list